From d2f8eca2e84cfbf48c8b94472ace73a28f05a2e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Fri, 8 Jan 2021 20:42:50 +0100 Subject: [PATCH] fix cachix build --- .../haskell-modules/configuration-common.nix | 17 +---------------- .../haskell-modules/configuration-nix.nix | 10 ---------- 2 files changed, 1 insertion(+), 26 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 5c2a3cc537f5..7f8c18dae034 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -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; diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 8ee415a13d5b..6d4e16f83786 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -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)