mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-18 03:30:45 +00:00
Code Issues Wiki Activity

Merge pull request #314264 from domenkozar/cachix-1.7.4

Browse source 
cachix: 1.7.3 -> 1.7.4
This commit is contained in:
Domen Kožar 2024-05-24 15:21:09 +02:00 committed by GitHub
parent 6c7bc07bd7 6a289d26e0
commit 5ab519cc30
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 6 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
pkgs/development/haskell-modules/configuration-common.nix
View file

@ -423,22 +423,22 @@ self: super: {
# Manually maintained
cachix-api = overrideCabal (drv: {
version = "1.7.3";
version = "1.7.4";
src = pkgs.fetchFromGitHub {
owner = "cachix";
repo = "cachix";
rev = "v1.7.3";
sha256 = "sha256-BBhOFK4OuCD7ilNrdfeAILBR2snxl29gBk58szZ4460=";
rev = "v1.7.4";
sha256 = "sha256-lHy5kgx6J8uD+16SO47dPrbob98sh+W1tf4ceSqPVK4=";
};
postUnpack = "sourceRoot=$sourceRoot/cachix-api";
}) super.cachix-api;
cachix = (overrideCabal (drv: {
version = "1.7.3";
version = "1.7.4";
src = pkgs.fetchFromGitHub {
owner = "cachix";
repo = "cachix";
rev = "v1.7.3";
sha256 = "sha256-BBhOFK4OuCD7ilNrdfeAILBR2snxl29gBk58szZ4460=";
rev = "v1.7.4";
sha256 = "sha256-lHy5kgx6J8uD+16SO47dPrbob98sh+W1tf4ceSqPVK4=";
};
postUnpack = "sourceRoot=$sourceRoot/cachix";
}) (lib.pipe
@ -448,13 +448,6 @@ self: super: {
[
(addBuildTool self.hercules-ci-cnix-store.nixPackage)
(addBuildTool pkgs.buildPackages.pkg-config)
(addBuildDepend self.immortal)
# should be removed once hackage packages catch up
(addBuildDepend self.crypton)
(addBuildDepend self.generic-lens)
(addBuildDepend self.amazonka)
(addBuildDepend self.amazonka-core)
(addBuildDepend self.amazonka-s3)
]
));