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

nix{,Unstable}: pass pname, version to mkDerivation

Browse Source 
This allows stdenv.mkDerivation to append -static to the name for
pkgsStatic.nix / nixStatic which should make nix-env stop thinking
that nixStatic is a newer version of nix.

This change replaces #119310.
This commit is contained in:
sternenseemann 2021-04-13 13:10:56 +02:00
parent 851c0f1cb7
commit f4e8746cb2
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/tools/package-management/nix/default.nix
View File

@ -24,14 +24,13 @@ common =
, withLibseccomp ? lib.any (lib.meta.platformMatch stdenv.hostPlatform) libseccomp.meta.platforms, libseccomp , withLibseccomp ? lib.any (lib.meta.platformMatch stdenv.hostPlatform) libseccomp.meta.platforms, libseccomp
, withAWS ? !enableStatic && (stdenv.isLinux || stdenv.isDarwin), aws-sdk-cpp , withAWS ? !enableStatic && (stdenv.isLinux || stdenv.isDarwin), aws-sdk-cpp
, enableStatic ? stdenv.hostPlatform.isStatic , enableStatic ? stdenv.hostPlatform.isStatic
, name, suffix ? "", src , pname, version, suffix ? "", src
, patches ? [ ] , patches ? [ ]
}: }:
let let
sh = busybox-sandbox-shell; sh = busybox-sandbox-shell;
nix = stdenv.mkDerivation rec { nix = stdenv.mkDerivation rec {
inherit name src patches; inherit pname version src patches;
version = lib.getVersion name;
is24 = lib.versionAtLeast version "2.4pre"; is24 = lib.versionAtLeast version "2.4pre";
@ -196,9 +195,10 @@ in rec {
nix = nixStable; nix = nixStable;
nixStable = callPackage common (rec { nixStable = callPackage common (rec {
name = "nix-2.3.10"; pname = "nix";
version = "2.3.10";
src = fetchurl { src = fetchurl {
url = "https://nixos.org/releases/nix/${name}/${name}.tar.xz"; url = "https://nixos.org/releases/nix/${pname}-${version}/${pname}-${version}.tar.xz";
sha256 = "a8a85e55de43d017abbf13036edfb58674ca136691582f17080c1cd12787b7ab"; sha256 = "a8a85e55de43d017abbf13036edfb58674ca136691582f17080c1cd12787b7ab";
}; };
@ -213,7 +213,8 @@ in rec {
}); });
nixUnstable = lib.lowPrio (callPackage common rec { nixUnstable = lib.lowPrio (callPackage common rec {
name = "nix-2.4${suffix}"; pname = "nix";
version = "2.4${suffix}";
suffix = "pre20210326_dd77f71"; suffix = "pre20210326_dd77f71";
src = fetchFromGitHub { src = fetchFromGitHub {