diff options
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/tools/package-management/nix/default.nix')
-rw-r--r-- | infra/libkookie/nixpkgs/pkgs/tools/package-management/nix/default.nix | 32 |
1 files changed, 19 insertions, 13 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/package-management/nix/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/package-management/nix/default.nix index e843e655300a..c17a1a82d9f3 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/package-management/nix/default.nix +++ b/infra/libkookie/nixpkgs/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 @@ -32,7 +33,7 @@ common = version = lib.getVersion name; is24 = lib.versionAtLeast version "2.4pre"; - isExactly23 = lib.versionAtLeast version "2.3" && lib.versionOlder version "2.4"; + isExactly24 = lib.versionAtLeast version "2.4" && lib.versionOlder version "2.4"; VERSION_SUFFIX = suffix; @@ -40,8 +41,13 @@ common = nativeBuildInputs = [ pkgconfig ] - ++ lib.optionals is24 [ autoreconfHook autoconf-archive bison flex libxml2 libxslt - docbook5 docbook_xsl_ns jq ]; + ++ lib.optionals is24 + [ autoreconfHook + autoconf-archive + bison flex + lowdown mdbook + jq + ]; buildInputs = [ curl openssl sqlite xz bzip2 nlohmann_json @@ -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 2.4, 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 && isExactly24) '' 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,24 +188,24 @@ in rec { nix = nixStable; nixStable = callPackage common (rec { - name = "nix-2.3.7"; + name = "nix-2.3.9"; src = fetchurl { url = "https://nixos.org/releases/nix/${name}/${name}.tar.xz"; - sha256 = "dd8f52849414e5a878afe7e797aa4e22bab77c875d9da5a38d5f1bada704e596"; + sha256 = "72331fdba220517a0ccabcf5c9735703c31674bfb4ef0b64da5d8f715d6022fa"; }; inherit storeDir stateDir confDir boehmgc; }); nixUnstable = lib.lowPrio (callPackage common rec { - name = "nix-3.0${suffix}"; - suffix = "pre20200829_f156513"; + name = "nix-2.4${suffix}"; + suffix = "pre20201201_5a6ddb3"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "f15651303f8596bf34c67fc8d536b1e9e7843a87"; - hash = "sha256-HqM3Z4DLdMrf+0PPZL9ysctGg+K+i3S/IHA1GsJj0Ro="; + rev = "5a6ddb3de14a1684af6c793d663764d093fa7846"; + sha256 = "0qhd3nxvqzszzsfvh89xhd239ycqb0kq2n0bzh9br78pcb60vj3g"; }; inherit storeDir stateDir confDir boehmgc; |