diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-01-09 00:14:37 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-09 00:14:37 +0000 |
| commit | fb50c4dbba6e718666f2c964402e58bf853c75bc (patch) | |
| tree | 4cbad8db173331ec41befc1c5dd6484626521e44 /pkgs/development/haskell-modules | |
| parent | 43af53bc7f49b3c542604ddae08cbdb61a276c2b (diff) | |
| parent | 4769274f53e6ccf1512da30c20e26952633f8b59 (diff) | |
Merge master into haskell-updates
Diffstat (limited to 'pkgs/development/haskell-modules')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-nix.nix | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index a882824043b99..26d2e2aef4be5 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; - fsnotify = super.fsnotify_0_4_1_0; + nix = self.hercules-ci-cnix-store.passthru.nixPackage; + fsnotify = dontCheck 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: { |