public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: Fix overrides having wrong versions

Browse Source
This commit is contained in:
Patrick Hilhorst 2018-11-05 00:35:13 +01:00
parent b0e9fc131c
commit 9ec40cc3bf
No known key found for this signature in database
GPG Key ID: 589BB0A8DAFEF2B2
7 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/applications/misc/k2pdfopt/default.nix
View File

@ -28,6 +28,7 @@ stdenv.mkDerivation rec {
let let
mupdf_modded = mupdf.overrideAttrs (attrs: { mupdf_modded = mupdf.overrideAttrs (attrs: {
name = "mupdf-1.10a"; name = "mupdf-1.10a";
version = "1.10a";
src = fetchurl { src = fetchurl {
url = "https://mupdf.com/downloads/archive/mupdf-1.10a-source.tar.gz"; url = "https://mupdf.com/downloads/archive/mupdf-1.10a-source.tar.gz";
sha256 = "0dm8wcs8i29aibzkqkrn8kcnk4q0kd1v66pg48h5c3qqp4v1zk5a"; sha256 = "0dm8wcs8i29aibzkqkrn8kcnk4q0kd1v66pg48h5c3qqp4v1zk5a";

1
pkgs/applications/science/misc/sasview/xhtml2pdf.nix
View File

@ -3,6 +3,7 @@
let let
#xhtml2pdf specifically requires version "1.0b10" of html5lib #xhtml2pdf specifically requires version "1.0b10" of html5lib
html5 = html5lib.overrideAttrs( oldAttrs: rec{ html5 = html5lib.overrideAttrs( oldAttrs: rec{
name = "${oldAttrs.pname}-${version}";
version = "1.0b10"; version = "1.0b10";
src = oldAttrs.src.override { src = oldAttrs.src.override {
inherit version; inherit version;

9
pkgs/applications/virtualization/docker/default.nix
View File

@ -16,7 +16,8 @@ rec {
} : } :
let let
docker-runc = runc.overrideAttrs (oldAttrs: rec { docker-runc = runc.overrideAttrs (oldAttrs: rec {
name = "docker-runc"; name = "docker-runc-${version}";
inherit version;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "docker"; owner = "docker";
repo = "runc"; repo = "runc";
@ -28,7 +29,8 @@ rec {
}); });
docker-containerd = (containerd.override { inherit go; }).overrideAttrs (oldAttrs: rec { docker-containerd = (containerd.override { inherit go; }).overrideAttrs (oldAttrs: rec {
name = "docker-containerd"; name = "docker-containerd-${version}";
inherit version;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "docker"; owner = "docker";
repo = "containerd"; repo = "containerd";
@ -42,7 +44,8 @@ rec {
}); });
docker-tini = tini.overrideAttrs (oldAttrs: rec { docker-tini = tini.overrideAttrs (oldAttrs: rec {
name = "docker-init"; name = "docker-init-${version}";
inherit version;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "krallin"; owner = "krallin";
repo = "tini"; repo = "tini";

18
pkgs/misc/emulators/retroarch/cores.nix
View File

@ -67,7 +67,7 @@ in with stdenv.lib.licenses;
buildPhase = "make"; buildPhase = "make";
}; };
beetle-pce-fast = (mkLibRetroCore rec { beetle-pce-fast = let der = (mkLibRetroCore rec {
core = "mednafen-pce-fast"; core = "mednafen-pce-fast";
src = fetchRetro { src = fetchRetro {
repo = "beetle-pce-fast-libretro"; repo = "beetle-pce-fast-libretro";
@ -76,12 +76,12 @@ in with stdenv.lib.licenses;
}; };
description = "Port of Mednafen's PC Engine core to libretro"; description = "Port of Mednafen's PC Engine core to libretro";
license = gpl2; license = gpl2;
}).override { }); in der.override {
buildPhase = "make"; buildPhase = "make";
name = "beetle-pce-fast"; name = "beetle-pce-fast-${der.version}";
}; };
beetle-psx = (mkLibRetroCore rec { beetle-psx = let der = (mkLibRetroCore rec {
core = "mednafen-psx"; core = "mednafen-psx";
src = fetchRetro { src = fetchRetro {
repo = "beetle-psx-libretro"; repo = "beetle-psx-libretro";
@ -90,12 +90,12 @@ in with stdenv.lib.licenses;
}; };
description = "Port of Mednafen's PSX Engine core to libretro"; description = "Port of Mednafen's PSX Engine core to libretro";
license = gpl2; license = gpl2;
}).override { }); in der.override {
buildPhase = "make"; buildPhase = "make";
name = "beetle-psx"; name = "beetle-psx-${der.version}";
}; };
beetle-saturn = (mkLibRetroCore rec { beetle-saturn = let der = (mkLibRetroCore rec {
core = "mednafen-saturn"; core = "mednafen-saturn";
src = fetchRetro { src = fetchRetro {
repo = "beetle-saturn-libretro"; repo = "beetle-saturn-libretro";
@ -104,9 +104,9 @@ in with stdenv.lib.licenses;
}; };
description = "Port of Mednafen's Saturn core to libretro"; description = "Port of Mednafen's Saturn core to libretro";
license = gpl2; license = gpl2;
}).override { }); in der.override {
buildPhase = "make"; buildPhase = "make";
name = "beetle-saturn"; name = "beetle-saturn-${der.version}";
meta.platforms = [ "x86_64-linux" ]; meta.platforms = [ "x86_64-linux" ];
}; };

1
pkgs/tools/virtualization/awsebcli/default.nix
View File

@ -20,6 +20,7 @@ let
}); });
pathspec = super.pathspec.overridePythonAttrs (oldAttrs: rec { pathspec = super.pathspec.overridePythonAttrs (oldAttrs: rec {
name = "${oldAttrs.pname}-${version}";
version = "0.5.5"; version = "0.5.5";
src = oldAttrs.src.override { src = oldAttrs.src.override {
inherit version; inherit version;

1
pkgs/top-level/all-packages.nix
View File

@ -10553,6 +10553,7 @@ with pkgs;
in in
(gap.override { keepAllPackages = false; }).overrideAttrs (oldAttrs: { (gap.override { keepAllPackages = false; }).overrideAttrs (oldAttrs: {
name = "libgap-${oldAttrs.pname}-${version}"; name = "libgap-${oldAttrs.pname}-${version}";
inherit version;
src = fetchurl { src = fetchurl {
url = "https://www.gap-system.org/pub/gap/gap48/tar.bz2/gap${version}_${pkgVer}.tar.bz2"; url = "https://www.gap-system.org/pub/gap/gap48/tar.bz2/gap${version}_${pkgVer}.tar.bz2";
sha256 = "19n2p1mdg33s2x9rs51iak7rgndc1cwr56jyqnah0g1ydgg1yh6b"; sha256 = "19n2p1mdg33s2x9rs51iak7rgndc1cwr56jyqnah0g1ydgg1yh6b";

1
pkgs/top-level/python-packages.nix
View File

@ -3727,6 +3727,7 @@ in {
sphinx_1_2 = self.sphinx.overridePythonAttrs rec { sphinx_1_2 = self.sphinx.overridePythonAttrs rec {
name = "sphinx-1.2.3"; name = "sphinx-1.2.3";
version = "1.2.3";
src = pkgs.fetchurl { src = pkgs.fetchurl {
url = "mirror://pypi/s/sphinx/sphinx-1.2.3.tar.gz"; url = "mirror://pypi/s/sphinx/sphinx-1.2.3.tar.gz";
sha256 = "94933b64e2fe0807da0612c574a021c0dac28c7bd3c4a23723ae5a39ea8f3d04"; sha256 = "94933b64e2fe0807da0612c574a021c0dac28c7bd3c4a23723ae5a39ea8f3d04";