diff options
Diffstat (limited to 'nixpkgs/pkgs/tools/package-management/nix/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/tools/package-management/nix/default.nix | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/nixpkgs/pkgs/tools/package-management/nix/default.nix b/nixpkgs/pkgs/tools/package-management/nix/default.nix index c54a5b28cee1..7eda5ae6f358 100644 --- a/nixpkgs/pkgs/tools/package-management/nix/default.nix +++ b/nixpkgs/pkgs/tools/package-management/nix/default.nix @@ -11,7 +11,7 @@ let common = { lib, stdenv, perl, curl, bzip2, sqlite, openssl ? null, xz , bash, coreutils, util-linuxMinimal, gzip, gnutar - , pkg-config, boehmgc, perlPackages, libsodium, brotli, boost, editline, nlohmann_json + , pkg-config, boehmgc, libsodium, brotli, boost, editline, nlohmann_json , autoreconfHook, autoconf-archive, bison, flex , jq, libarchive, libcpuid , lowdown, mdbook @@ -24,14 +24,13 @@ common = , withLibseccomp ? lib.any (lib.meta.platformMatch stdenv.hostPlatform) libseccomp.meta.platforms, libseccomp , withAWS ? !enableStatic && (stdenv.isLinux || stdenv.isDarwin), aws-sdk-cpp , enableStatic ? stdenv.hostPlatform.isStatic - , name, suffix ? "", src + , pname, version, suffix ? "", src , patches ? [ ] }: let sh = busybox-sandbox-shell; nix = stdenv.mkDerivation rec { - inherit name src patches; - version = lib.getVersion name; + inherit pname version src patches; is24 = lib.versionAtLeast version "2.4pre"; @@ -165,7 +164,7 @@ common = }; passthru = { - perl-bindings = stdenv.mkDerivation { + perl-bindings = perl.pkgs.toPerlModule (stdenv.mkDerivation { pname = "nix-perl"; inherit version; @@ -179,14 +178,14 @@ common = [ perl pkg-config curl nix libsodium boost autoreconfHook autoconf-archive nlohmann_json ]; configureFlags = - [ "--with-dbi=${perlPackages.DBI}/${perl.libPrefix}" - "--with-dbd-sqlite=${perlPackages.DBDSQLite}/${perl.libPrefix}" + [ "--with-dbi=${perl.pkgs.DBI}/${perl.libPrefix}" + "--with-dbd-sqlite=${perl.pkgs.DBDSQLite}/${perl.libPrefix}" ]; preConfigure = "export NIX_STATE_DIR=$TMPDIR"; preBuild = "unset NIX_INDENT_MAKE"; - }; + }); }; }; in nix; @@ -196,9 +195,10 @@ in rec { nix = nixStable; nixStable = callPackage common (rec { - name = "nix-2.3.10"; + pname = "nix"; + version = "2.3.10"; 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"; }; @@ -213,7 +213,8 @@ in rec { }); nixUnstable = lib.lowPrio (callPackage common rec { - name = "nix-2.4${suffix}"; + pname = "nix"; + version = "2.4${suffix}"; suffix = "pre20210326_dd77f71"; src = fetchFromGitHub { |