MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 23:03:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix cachix build

Browse source
This commit is contained in:
Domen Kožar 2021-01-08 20:42:50 +01:00
parent 896e8ee2c6
commit d2f8eca2e8
No known key found for this signature in database
GPG key ID: C2FFBCAFD2C24246
2 changed files with 1 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1483,22 +1483,7 @@ self: super: {
# 2020-11-19: Jailbreaking until: https://github.com/snapframework/snap/pull/219
snap = doJailbreak super.snap;
# 2020-11-21: cachix + chachix-api needs a patch for ghc 8.10 compat. Can be removed once released
# https://github.com/cachix/cachix/pull/331
cachix-api = appendPatch super.cachix-api (pkgs.fetchpatch {
url = https://github.com/cachix/cachix/commit/bfeec151a03afad72401815fe8bbb1b0d5d63b0d.patch;
sha256 = "0rglyd77g4j72l5g0sj9zpq2hy3v992bm6nhj58pmj4j2aj67y74";
stripLen = 2;
extraPrefix = "";
includes = [ "src/Cachix/Types/Session.hs" "src/Cachix/API/Signing.hs" ];
});
cachix = generateOptparseApplicativeCompletion "cachix" (appendPatch super.cachix (pkgs.fetchpatch {
url = https://github.com/cachix/cachix/commit/bfeec151a03afad72401815fe8bbb1b0d5d63b0d.patch;
sha256 = "06jmpz8l5vh9cch5aqdbrln7bm3fghxsicwy1m93avli320kp8pp";
stripLen = 2;
extraPrefix = "";
excludes = [ "stack.yaml" "sources.json" "src/Cachix/Types/Session.hs" "src/Cachix/API/Signing.hs" "cachix-api.cabal" "workflows/test.yml" ];
}));
cachix = generateOptparseApplicativeCompletion "cachix" super.cachix;
# 2020-11-23: Jailbreaking until: https://github.com/michaelt/text-pipes/pull/29
pipes-text = doJailbreak super.pipes-text;

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

@ -94,16 +94,6 @@ self: super: builtins.intersectAttrs super {
# Won't find it's header files without help.
sfml-audio = appendConfigureFlag super.sfml-audio "--extra-include-dirs=${pkgs.openal}/include/AL";
# profiling is disabled to allow C++/C mess to work, which is fixed in GHC 8.8
cachix = overrideSrc (disableLibraryProfiling super.cachix) {
src = (pkgs.fetchFromGitHub {
owner = "cachix";
repo = "cachix";
rev = "1471050f5906ecb7cd0d72115503d07d2e3beb17";
sha256 = "1lkrmhv5x9dpy53w33kxnhv4x4qm711ha8hsgccrjmxaqcsdm59g";
}) + "/cachix";
version = "0.5.1";
};
hercules-ci-agent = disableLibraryProfiling super.hercules-ci-agent;
# avoid compiling twice by providing executable as a separate output (with small closure size)