nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-26 08:53:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #227976 from domenkozar/cachix-1-3-3

Browse Source 
cachix: 1.4.2 -> 1.3.3
This commit is contained in:
Domen Kožar 2023-04-26 12:08:09 +02:00 committed by GitHub
commit 9eec23bf5c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/haskell-modules/configuration-nix.nix
View File

@ -988,11 +988,13 @@ self: super: builtins.intersectAttrs super {
hnix-store-core = super.hnix-store-core_0_6_1_0;
});
cachix_1_3_3 = super.cachix_1_3_3.override {
cachix_1_3_3 = overrideCabal (drv: {
hydraPlatforms = pkgs.lib.platforms.all;
}) (super.cachix_1_3_3.override {
nix = self.hercules-ci-cnix-store.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 = 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; });

2
pkgs/top-level/all-packages.nix
View File

@ -19555,7 +19555,7 @@ with pkgs;
c-blosc = callPackage ../development/libraries/c-blosc { };
# justStaticExecutables is needed due to https://github.com/NixOS/nix/issues/2990
cachix = haskell.lib.justStaticExecutables haskellPackages.cachix;
cachix = haskell.lib.justStaticExecutables haskellPackages.cachix_1_3_3;
calcium = callPackage ../development/libraries/calcium { };