diff options
| author | Ilan Joselevich <personal@ilanjoselevich.com> | 2023-01-06 21:42:19 +0200 |
|---|---|---|
| committer | Ilan Joselevich <personal@ilanjoselevich.com> | 2023-01-08 10:35:08 +0200 |
| commit | 6e082f222c02b64c528637f82596f348ddf60e1c (patch) | |
| tree | a78508b6fb1636730683ae4f9761e897db8c45a5 /pkgs | |
| parent | e9857feb1d4c30e0ac9e7b8d94a165c30f6c9ad3 (diff) | |
cachix,hercules-ci-{agent,cnix-expr,cnix-store}: bump nix pin to 2_12
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-nix.nix | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index a882824043b99..b117f4333e4df 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -875,17 +875,16 @@ self: super: builtins.intersectAttrs super { ]; cachix = super.cachix.override { - nix = pkgs.nixVersions.nix_2_10; + nix = self.hercules-ci-cnix-store.passthru.nixPackage; fsnotify = super.fsnotify_0_4_1_0; hnix-store-core = super.hnix-store-core_0_6_1_0; }; - hercules-ci-agent = super.hercules-ci-agent.override { nix = pkgs.nixVersions.nix_2_10; }; - hercules-ci-cnix-expr = - addTestToolDepend pkgs.git ( - super.hercules-ci-cnix-expr.override { nix = pkgs.nixVersions.nix_2_10; } - ); - hercules-ci-cnix-store = super.hercules-ci-cnix-store.override { nix = pkgs.nixVersions.nix_2_10; }; + hercules-ci-agent = super.hercules-ci-agent.override { nix = self.hercules-ci-cnix-store.passthru.nixPackage; }; + hercules-ci-cnix-expr = addTestToolDepend pkgs.git (super.hercules-ci-cnix-expr.override { nix = self.hercules-ci-cnix-store.passthru.nixPackage; }); + hercules-ci-cnix-store = (super.hercules-ci-cnix-store.override { nix = self.hercules-ci-cnix-store.passthru.nixPackage; }).overrideAttrs (_: { + passthru.nixPackage = pkgs.nixVersions.nix_2_12; + }); # the testsuite fails because of not finding tsc without some help aeson-typescript = overrideCabal (drv: { |