From 6e082f222c02b64c528637f82596f348ddf60e1c Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Fri, 6 Jan 2023 21:42:19 +0200 Subject: cachix,hercules-ci-{agent,cnix-expr,cnix-store}: bump nix pin to 2_12 --- pkgs/development/haskell-modules/configuration-nix.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'pkgs/development/haskell-modules') 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: { -- cgit 1.4.1 From 5828698df607f2a30882c482d63e40a4b357f636 Mon Sep 17 00:00:00 2001 From: Domen Kožar Date: Sun, 8 Jan 2023 12:23:33 +0000 Subject: cachix: fix build on darwin --- pkgs/development/haskell-modules/configuration-nix.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/development/haskell-modules') diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index b117f4333e4df..26d2e2aef4be5 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -876,7 +876,7 @@ self: super: builtins.intersectAttrs super { cachix = super.cachix.override { nix = self.hercules-ci-cnix-store.passthru.nixPackage; - fsnotify = super.fsnotify_0_4_1_0; + fsnotify = dontCheck super.fsnotify_0_4_1_0; hnix-store-core = super.hnix-store-core_0_6_1_0; }; -- cgit 1.4.1