b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #208233 from Kranzes/2.11-cachix-hci

Browse source 
cachix,hercules-ci-{agent,cnix-expr,cnix-store}: bump nix pin to 2_12
This commit is contained in:
Domen Kožar 2023-01-08 09:42:31 +00:00 committed by GitHub
parent 18e2d50858 6e082f222c
commit d54b443ee6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkgs/development/haskell-modules/configuration-nix.nix
View file

@ -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: {