From 9ec40cc3bfd5915f1625ca741fb3fd2be7ea30c1 Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Mon, 5 Nov 2018 00:35:13 +0100 Subject: treewide: Fix overrides having wrong versions --- pkgs/applications/misc/k2pdfopt/default.nix | 1 + pkgs/applications/science/misc/sasview/xhtml2pdf.nix | 1 + pkgs/applications/virtualization/docker/default.nix | 9 ++++++--- pkgs/misc/emulators/retroarch/cores.nix | 18 +++++++++--------- pkgs/tools/virtualization/awsebcli/default.nix | 1 + pkgs/top-level/all-packages.nix | 1 + pkgs/top-level/python-packages.nix | 1 + 7 files changed, 20 insertions(+), 12 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/misc/k2pdfopt/default.nix b/pkgs/applications/misc/k2pdfopt/default.nix index ad2381394f46..0e84283a9ef7 100644 --- a/pkgs/applications/misc/k2pdfopt/default.nix +++ b/pkgs/applications/misc/k2pdfopt/default.nix @@ -28,6 +28,7 @@ stdenv.mkDerivation rec { let mupdf_modded = mupdf.overrideAttrs (attrs: { name = "mupdf-1.10a"; + version = "1.10a"; src = fetchurl { url = "https://mupdf.com/downloads/archive/mupdf-1.10a-source.tar.gz"; sha256 = "0dm8wcs8i29aibzkqkrn8kcnk4q0kd1v66pg48h5c3qqp4v1zk5a"; diff --git a/pkgs/applications/science/misc/sasview/xhtml2pdf.nix b/pkgs/applications/science/misc/sasview/xhtml2pdf.nix index 0b3d438843da..8eff2057928a 100644 --- a/pkgs/applications/science/misc/sasview/xhtml2pdf.nix +++ b/pkgs/applications/science/misc/sasview/xhtml2pdf.nix @@ -3,6 +3,7 @@ let #xhtml2pdf specifically requires version "1.0b10" of html5lib html5 = html5lib.overrideAttrs( oldAttrs: rec{ + name = "${oldAttrs.pname}-${version}"; version = "1.0b10"; src = oldAttrs.src.override { inherit version; diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index e83a1af44665..e9bfbffe41e2 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -16,7 +16,8 @@ rec { } : let docker-runc = runc.overrideAttrs (oldAttrs: rec { - name = "docker-runc"; + name = "docker-runc-${version}"; + inherit version; src = fetchFromGitHub { owner = "docker"; repo = "runc"; @@ -28,7 +29,8 @@ rec { }); docker-containerd = (containerd.override { inherit go; }).overrideAttrs (oldAttrs: rec { - name = "docker-containerd"; + name = "docker-containerd-${version}"; + inherit version; src = fetchFromGitHub { owner = "docker"; repo = "containerd"; @@ -42,7 +44,8 @@ rec { }); docker-tini = tini.overrideAttrs (oldAttrs: rec { - name = "docker-init"; + name = "docker-init-${version}"; + inherit version; src = fetchFromGitHub { owner = "krallin"; repo = "tini"; diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix index 2eef6009ac26..7a0a48db1185 100644 --- a/pkgs/misc/emulators/retroarch/cores.nix +++ b/pkgs/misc/emulators/retroarch/cores.nix @@ -67,7 +67,7 @@ in with stdenv.lib.licenses; buildPhase = "make"; }; - beetle-pce-fast = (mkLibRetroCore rec { + beetle-pce-fast = let der = (mkLibRetroCore rec { core = "mednafen-pce-fast"; src = fetchRetro { repo = "beetle-pce-fast-libretro"; @@ -76,12 +76,12 @@ in with stdenv.lib.licenses; }; description = "Port of Mednafen's PC Engine core to libretro"; license = gpl2; - }).override { + }); in der.override { 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"; src = fetchRetro { repo = "beetle-psx-libretro"; @@ -90,12 +90,12 @@ in with stdenv.lib.licenses; }; description = "Port of Mednafen's PSX Engine core to libretro"; license = gpl2; - }).override { + }); in der.override { buildPhase = "make"; - name = "beetle-psx"; + name = "beetle-psx-${der.version}"; }; - beetle-saturn = (mkLibRetroCore rec { + beetle-saturn = let der = (mkLibRetroCore rec { core = "mednafen-saturn"; src = fetchRetro { repo = "beetle-saturn-libretro"; @@ -104,9 +104,9 @@ in with stdenv.lib.licenses; }; description = "Port of Mednafen's Saturn core to libretro"; license = gpl2; - }).override { + }); in der.override { buildPhase = "make"; - name = "beetle-saturn"; + name = "beetle-saturn-${der.version}"; meta.platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/tools/virtualization/awsebcli/default.nix b/pkgs/tools/virtualization/awsebcli/default.nix index b1693bd262fe..fabdd5357743 100644 --- a/pkgs/tools/virtualization/awsebcli/default.nix +++ b/pkgs/tools/virtualization/awsebcli/default.nix @@ -20,6 +20,7 @@ let }); pathspec = super.pathspec.overridePythonAttrs (oldAttrs: rec { + name = "${oldAttrs.pname}-${version}"; version = "0.5.5"; src = oldAttrs.src.override { inherit version; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8a2fbd1b2fca..f0e44d058498 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10553,6 +10553,7 @@ with pkgs; in (gap.override { keepAllPackages = false; }).overrideAttrs (oldAttrs: { name = "libgap-${oldAttrs.pname}-${version}"; + inherit version; src = fetchurl { url = "https://www.gap-system.org/pub/gap/gap48/tar.bz2/gap${version}_${pkgVer}.tar.bz2"; sha256 = "19n2p1mdg33s2x9rs51iak7rgndc1cwr56jyqnah0g1ydgg1yh6b"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 233ffaa2f42e..1b363736694d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3727,6 +3727,7 @@ in { sphinx_1_2 = self.sphinx.overridePythonAttrs rec { name = "sphinx-1.2.3"; + version = "1.2.3"; src = pkgs.fetchurl { url = "mirror://pypi/s/sphinx/sphinx-1.2.3.tar.gz"; sha256 = "94933b64e2fe0807da0612c574a021c0dac28c7bd3c4a23723ae5a39ea8f3d04"; -- cgit 1.4.1