diff options
Diffstat (limited to 'pkgs/tools/package-management/nix/default.nix')
| -rw-r--r-- | pkgs/tools/package-management/nix/default.nix | 34 |
1 files changed, 20 insertions, 14 deletions
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index e843e655300..791780ae095 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -11,8 +11,9 @@ common = { lib, stdenv, fetchpatch, perl, curl, bzip2, sqlite, openssl ? null, xz , bash, coreutils, gzip, gnutar , pkgconfig, boehmgc, perlPackages, libsodium, brotli, boost, editline, nlohmann_json - , autoreconfHook, autoconf-archive, bison, flex, libxml2, libxslt, docbook5, docbook_xsl_ns + , autoreconfHook, autoconf-archive, bison, flex , jq, libarchive + , lowdown, mdbook # Used by tests , gmock , busybox-sandbox-shell @@ -31,8 +32,8 @@ common = inherit name src; version = lib.getVersion name; - is24 = lib.versionAtLeast version "2.4pre"; - isExactly23 = lib.versionAtLeast version "2.3" && lib.versionOlder version "2.4"; + is30 = lib.versionAtLeast version "3.0pre"; + isExactly30 = lib.versionAtLeast version "2.3" && lib.versionOlder version "3.0"; VERSION_SUFFIX = suffix; @@ -40,15 +41,20 @@ common = nativeBuildInputs = [ pkgconfig ] - ++ lib.optionals is24 [ autoreconfHook autoconf-archive bison flex libxml2 libxslt - docbook5 docbook_xsl_ns jq ]; + ++ lib.optionals is30 + [ autoreconfHook + autoconf-archive + bison flex + lowdown mdbook + jq + ]; buildInputs = [ curl openssl sqlite xz bzip2 nlohmann_json brotli boost editline ] ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium - ++ lib.optionals is24 [ libarchive gmock ] + ++ lib.optionals is30 [ libarchive gmock ] ++ lib.optional withLibseccomp libseccomp ++ lib.optional withAWS ((aws-sdk-cpp.override { @@ -87,9 +93,9 @@ common = patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib $out/lib/libboost_thread.so.* ''} '' + - # For Nix-2.3, patch around an issue where the Nix configure step pulls in the + # For Nix 3.0, patch around an issue where the Nix configure step pulls in the # build system's bash and other utilities when cross-compiling - lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform && isExactly23) '' + lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform && isExactly30) '' mkdir tmp/ substitute corepkgs/config.nix.in tmp/config.nix.in \ --subst-var-by bash ${bash}/bin/bash \ @@ -162,7 +168,7 @@ common = # This is not cross-compile safe, don't have time to fix right now # but noting for future travellers. nativeBuildInputs = - [ perl pkgconfig curl nix libsodium boost autoreconfHook autoconf-archive ]; + [ perl pkgconfig curl nix libsodium boost autoreconfHook autoconf-archive nlohmann_json ]; configureFlags = [ "--with-dbi=${perlPackages.DBI}/${perl.libPrefix}" @@ -182,10 +188,10 @@ in rec { nix = nixStable; nixStable = callPackage common (rec { - name = "nix-2.3.7"; + name = "nix-2.3.8"; src = fetchurl { url = "https://nixos.org/releases/nix/${name}/${name}.tar.xz"; - sha256 = "dd8f52849414e5a878afe7e797aa4e22bab77c875d9da5a38d5f1bada704e596"; + sha256 = "c7119823c1eabdcc9e527cc96a91f11a0b0e63f3840a02fe7573538dad2dad2a"; }; inherit storeDir stateDir confDir boehmgc; @@ -193,13 +199,13 @@ in rec { nixUnstable = lib.lowPrio (callPackage common rec { name = "nix-3.0${suffix}"; - suffix = "pre20200829_f156513"; + suffix = "pre20201020_e0ca98c"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "f15651303f8596bf34c67fc8d536b1e9e7843a87"; - hash = "sha256-HqM3Z4DLdMrf+0PPZL9ysctGg+K+i3S/IHA1GsJj0Ro="; + rev = "e0ca98c2071b815578470e280df8fdb750c7e23b"; + hash = "sha256-KVS/Z6FzMBOl5XCyOLwfiVoX7G2LQRa9HMGNnJRPCoo="; }; inherit storeDir stateDir confDir boehmgc; |