git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #166591 from hercules-ci/hercules-ci-nix-update

cachix, hercules-ci-agent: nix_2_4 -> nix_2_7

commit9cd1fa9bcef3b578a732a391436aad804e03e3ca authorRobert Hensing <roberth@users.noreply.github.com> dateThu 31 Mar 2022, 19:11 (5 years ago) parent45f3f200a21bcd
1 file changed+4−4
pkgs/development/haskell-modules/configuration-nix.nix+4−4
pkgs/development/haskell-modules/configuration-nix.nix+4−4
@@ -866,11 +866,11 @@ self: super: builtins.intersectAttrs super {
866866
867867 rel8 = addTestToolDepend pkgs.postgresql super.rel8;
868868
869− cachix = generateOptparseApplicativeCompletion "cachix" (super.cachix.override { nix = pkgs.nixVersions.nix_2_4; });
869+ cachix = generateOptparseApplicativeCompletion "cachix" (super.cachix.override { nix = pkgs.nixVersions.nix_2_7; });
870870
871− hercules-ci-agent = appendConfigureFlag "-fnix-2_4" (super.hercules-ci-agent.override { nix = pkgs.nixVersions.nix_2_4; });
872− hercules-ci-cnix-expr = appendConfigureFlag "-fnix-2_4" (super.hercules-ci-cnix-expr.override { nix = pkgs.nixVersions.nix_2_4; });
873− hercules-ci-cnix-store = appendConfigureFlag "-fnix-2_4" (super.hercules-ci-cnix-store.override { nix = pkgs.nixVersions.nix_2_4; });
871+ hercules-ci-agent = super.hercules-ci-agent.override { nix = pkgs.nixVersions.nix_2_7; };
872+ hercules-ci-cnix-expr = super.hercules-ci-cnix-expr.override { nix = pkgs.nixVersions.nix_2_7; };
873+ hercules-ci-cnix-store = super.hercules-ci-cnix-store.override { nix = pkgs.nixVersions.nix_2_7; };
874874
875875 # Enable extra optimisations which increase build time, but also
876876 # later compiler performance, so we should do this for user's benefit.