git.iko.soy/typeable/nixpkgs
on master help sign in
Remove Nix 1.x
commit5d583db5a236c346b9c47b1a35f7f1c1c7b3b933 authorEelco Dolstra <edolstra@gmail.com> dateFri 3 Apr 2020, 23:04 (7 years ago) parenta3ee24b
2 files changed+10−30
pkgs/tools/package-management/nix/default.nix+10−29 pkgs/top-level/all-packages.nix−1
pkgs/tools/package-management/nix/default.nix+10−29
@@ -20,7 +20,7 @@ common =
2020 , withLibseccomp ? lib.any (lib.meta.platformMatch stdenv.hostPlatform) libseccomp.meta.platforms, libseccomp
2121 , withAWS ? stdenv.isLinux || stdenv.isDarwin, aws-sdk-cpp
2222
23− , name, suffix ? "", src, includesPerl ? false
23+ , name, suffix ? "", src
2424
2525 }:
2626 let
@@ -29,7 +29,6 @@ common =
2929 inherit name src;
3030 version = lib.getVersion name;
3131
32− is20 = lib.versionAtLeast version "2.0pre";
3332 is24 = lib.versionAtLeast version "2.4pre";
3433 isExactly23 = lib.versionAtLeast version "2.3" && lib.versionOlder version "2.4";
3534
@@ -39,15 +38,16 @@ common =
3938
4039 nativeBuildInputs =
4140 [ pkgconfig ]
42− ++ lib.optionals (!is20) [ curl perl ]
4341 ++ lib.optionals is24 [ jq ];
4442
45− buildInputs = [ curl openssl sqlite xz bzip2 nlohmann_json ]
43+ buildInputs =
44+ [ curl openssl sqlite xz bzip2 nlohmann_json
45+ brotli boost editline
46+ ]
4647 ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium
47− ++ lib.optionals is20 [ brotli boost editline ]
4848 ++ lib.optionals is24 [ libarchive rustc cargo ]
4949 ++ lib.optional withLibseccomp libseccomp
50− ++ lib.optional (withAWS && is20)
50+ ++ lib.optional withAWS
5151 ((aws-sdk-cpp.override {
5252 apis = ["s3" "transfer"];
5353 customMemoryManagement = false;
@@ -66,7 +66,7 @@ common =
6666 preConfigure =
6767 # Copy libboost_context so we don't get all of Boost in our closure.
6868 # https://github.com/NixOS/nixpkgs/issues/45462
69− lib.optionalString is20 ''
69+ ''
7070 mkdir -p $out/lib
7171 cp -pd ${boost}/lib/{libboost_context*,libboost_thread*,libboost_system*} $out/lib
7272 rm -f $out/lib/*.a
@@ -97,12 +97,7 @@ common =
9797 "--disable-init-state"
9898 "--enable-gc"
9999 ]
100− ++ lib.optionals (!is20) [
101− "--with-dbi=${perlPackages.DBI}/${perl.libPrefix}"
102− "--with-dbd-sqlite=${perlPackages.DBDSQLite}/${perl.libPrefix}"
103− "--with-www-curl=${perlPackages.WWWCurl}/${perl.libPrefix}"
104− "BDW_GC_LIBS=\"-lgc -lgccpp\""
105− ] ++ lib.optionals (is20 && stdenv.isLinux) [
100+ ++ lib.optionals stdenv.isLinux [
106101 "--with-sandbox-shell=${sh}/bin/busybox"
107102 ]
108103 ++ lib.optional (
@@ -143,7 +138,7 @@ common =
143138 };
144139
145140 passthru = {
146− perl-bindings = if includesPerl then nix else stdenv.mkDerivation {
141+ perl-bindings = stdenv.mkDerivation {
147142 pname = "nix-perl";
148143 inherit version;
149144
@@ -154,8 +149,7 @@ common =
154149 # This is not cross-compile safe, don't have time to fix right now
155150 # but noting for future travellers.
156151 nativeBuildInputs =
157− [ perl pkgconfig curl nix libsodium ]
158− ++ lib.optional is20 boost;
152+ [ perl pkgconfig curl nix libsodium boost ];
159153
160154 configureFlags =
161155 [ "--with-dbi=${perlPackages.DBI}/${perl.libPrefix}"
@@ -174,19 +168,6 @@ in rec {
174168
175169 nix = nixStable;
176170
177− nix1 = callPackage common rec {
178− name = "nix-1.11.16";
179− src = fetchurl {
180− url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz";
181− sha256 = "0ca5782fc37d62238d13a620a7b4bff6a200bab1bd63003709249a776162357c";
182− };
183−
184− # Nix1 has the perl bindings by default, so no need to build the manually.
185− includesPerl = true;
186−
187− inherit storeDir stateDir confDir boehmgc;
188− };
189−
190171 nixStable = callPackage common (rec {
191172 name = "nix-2.3.3";
192173 src = fetchurl {
pkgs/top-level/all-packages.nix−1
@@ -25383,7 +25383,6 @@ in
2538325383 boehmgc = boehmgc.override { enableLargeConfig = true; };
2538425384 })
2538525385 nix
25386− nix1
2538725386 nixStable
2538825387 nixUnstable
2538925388 nixFlakes;