From 3a7e6f7bd4b172c68dd67d37730c1b7709f7f343 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Wed, 26 Jan 2022 10:53:45 -0800 Subject: [PATCH] treewide: replace nix_2_4 with nixVersions.nix_2_4 --- pkgs/development/haskell-modules/configuration-nix.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index e6b2ff48c945..48ef3d1515e6 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -972,11 +972,11 @@ self: super: builtins.intersectAttrs super { rel8 = addTestToolDepend pkgs.postgresql super.rel8; - cachix = generateOptparseApplicativeCompletion "cachix" (super.cachix.override { nix = pkgs.nix_2_4; }); + cachix = generateOptparseApplicativeCompletion "cachix" (super.cachix.override { nix = pkgs.nixVersions.nix_2_4; }); - hercules-ci-agent = appendConfigureFlag "-fnix-2_4" (super.hercules-ci-agent.override { nix = pkgs.nix_2_4; }); - hercules-ci-cnix-expr = appendConfigureFlag "-fnix-2_4" (super.hercules-ci-cnix-expr.override { nix = pkgs.nix_2_4; }); - hercules-ci-cnix-store = appendConfigureFlag "-fnix-2_4" (super.hercules-ci-cnix-store.override { nix = pkgs.nix_2_4; }); + hercules-ci-agent = appendConfigureFlag "-fnix-2_4" (super.hercules-ci-agent.override { nix = pkgs.nixVersions.nix_2_4; }); + hercules-ci-cnix-expr = appendConfigureFlag "-fnix-2_4" (super.hercules-ci-cnix-expr.override { nix = pkgs.nixVersions.nix_2_4; }); + hercules-ci-cnix-store = appendConfigureFlag "-fnix-2_4" (super.hercules-ci-cnix-store.override { nix = pkgs.nixVersions.nix_2_4; }); # Enable extra optimisations which increase build time, but also # later compiler performance, so we should do this for user's benefit.