diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 3283cd398b5ce..8708183cd58bd 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -936,11 +936,11 @@ self: super: builtins.intersectAttrs super { rel8 = addTestToolDepend pkgs.postgresql super.rel8; - cachix = generateOptparseApplicativeCompletion "cachix" (super.cachix.override { nix = pkgs.nix_2_3; }); + cachix = generateOptparseApplicativeCompletion "cachix" (super.cachix.override { nix = pkgs.nix_2_4; }); - hercules-ci-agent = super.hercules-ci-agent.override { nix = pkgs.nix_2_3; }; - hercules-ci-cnix-expr = super.hercules-ci-cnix-expr.override { nix = pkgs.nix_2_3; }; - hercules-ci-cnix-store = super.hercules-ci-cnix-store.override { nix = pkgs.nix_2_3; }; + hercules-ci-agent = appendConfigureFlag (super.hercules-ci-agent.override { nix = pkgs.nix_2_4; }) "-fnix-2_4"; + hercules-ci-cnix-expr = appendConfigureFlag (super.hercules-ci-cnix-expr.override { nix = pkgs.nix_2_4; }) "-fnix-2_4"; + hercules-ci-cnix-store = appendConfigureFlag (super.hercules-ci-cnix-store.override { nix = pkgs.nix_2_4; }) "-fnix-2_4"; # Enable extra optimisations which increase build time, but also # later compiler performance, so we should do this for user's benefit. diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index fc55902ce5fcf..f365348607aa2 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -58,7 +58,7 @@ common = ]; buildInputs = - [ curl libsodium openssl sqlite xz bzip2 nlohmann_json + [ curl libsodium openssl sqlite xz bzip2 brotli boost editline ] ++ lib.optionals stdenv.isDarwin [ Security ] @@ -209,6 +209,13 @@ common = ]; }); + # master: https://github.com/NixOS/nix/pull/5536 + # 2.4: https://github.com/NixOS/nix/pull/5537 + installNlohmannJsonPatch = fetchpatch { + url = "https://github.com/NixOS/nix/pull/5536.diff"; + sha256 = "sha256-SPnam4xNIjbMgnq6IP1AaM1V62X0yZNo4DEVmI8sHOo="; + }; + in rec { nix = nixStable; @@ -241,6 +248,8 @@ in rec { boehmgc = boehmgc_nixUnstable; + patches = [ installNlohmannJsonPatch ]; + inherit storeDir stateDir confDir; }); @@ -258,6 +267,8 @@ in rec { boehmgc = boehmgc_nixUnstable; + patches = [ installNlohmannJsonPatch ]; + inherit storeDir stateDir confDir; });