alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #206950 from hercules-ci/fix-hercules-ci-agent-cachix-1.1

Browse source 
Fix hercules ci agent for cachix 1.1
This commit is contained in:
Robert Hensing 2022-12-20 02:07:35 +01:00 committed by GitHub
parent 0d2eab489a b81c610ae4
commit 144b059ad3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -12,7 +12,7 @@
{ pkgs, haskellLib }:
let
inherit (pkgs) fetchpatch lib;
inherit (pkgs) fetchpatch fetchpatch2 lib;
inherit (lib) throwIfNot versionOlder;
in
@ -1733,6 +1733,14 @@ self: super: {
sha256 = "sha256-0dtmNL1rqzeXvXWinfANc57a5LIM3uNnhR3A+p8mH0A=";
stripLen = 1;
})
# haskell-updates branch, will be merged in 0.9.10
(fetchpatch2 {
name = "hercules-ci-agent-cachix-1.1";
url = "https://github.com/hercules-ci/hercules-ci-agent/commit/b76d888548da37a96ae47f1be871de6605d38edd.patch";
sha256 = "sha256-kqEkDHbatcYS8LuQlGV/1j/6LXWviQoDQAHDr6DBbDU=";
stripLen = 1;
includes = [ "*.hs" ];
})
])
(self.generateOptparseApplicativeCompletions [ "hercules-ci-agent" ])
];

8
pkgs/top-level/all-packages.nix
View file

@ -18628,7 +18628,13 @@ with pkgs;
c-blosc = callPackage ../development/libraries/c-blosc { };
# justStaticExecutables is needed due to https://github.com/NixOS/nix/issues/2990
cachix = haskell.lib.compose.justStaticExecutables haskellPackages.cachix;
cachix = (haskell.lib.compose.justStaticExecutables haskellPackages.cachix).overrideAttrs(o: {
passthru = o.passthru or {} // {
tests = o.passthru.tests or {} // {
inherit hci;
};
};
});
cubeb = callPackage ../development/libraries/audio/cubeb { };