diff options
| author | Domen Kožar <domen@dev.si> | 2020-11-20 23:13:33 +0100 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2020-11-20 23:13:51 +0100 |
| commit | dc9f85e69e09594a6c6847385398476f13e52b24 (patch) | |
| tree | 4ed0839a54c212936a60f18a1f3aa64f240c89e6 /pkgs | |
| parent | f0aac911871bbcbf9ba55f07aadf4bce3db2ca93 (diff) | |
cachix: make it build
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 18 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 17 insertions, 3 deletions
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index 497e201fb1a9..60a361250332 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -81,11 +81,25 @@ self: super: { snap-server = doJailbreak super.snap-server; exact-pi = doJailbreak super.exact-pi; time-compat = doJailbreak super.time-compat; - http-media = doJailbreak super.http-media; - servant-server = doJailbreak super.servant-server; + http-media = unmarkBroken (doJailbreak super.http-media); + servant-server = unmarkBroken (doJailbreak super.servant-server); foundation = dontCheck super.foundation; vault = dontHaddock super.vault; + servant = unmarkBroken super.servant; + servant-auth = unmarkBroken super.servant-auth; + servant-conduit = unmarkBroken super.servant-conduit; + servant-auth-client = unmarkBroken super.servant-auth-client; + servant-client = unmarkBroken super.servant-client; + servant-client-core = unmarkBroken super.servant-client-core; + servant-auth-server = unmarkBroken super.servant-auth-server; + servant-auth-swagger = unmarkBroken super.servant-auth-swagger; + servant-swagger = unmarkBroken super.servant-swagger; + servant-blaze = unmarkBroken super.servant-blaze; + servant-swagger-ui-core = unmarkBroken super.servant-swagger-ui-core; + swagger2 = unmarkBroken super.swagger2; + cachix-api = unmarkBroken super.cachix-api; + # https://github.com/snapframework/snap-core/issues/288 snap-core = overrideCabal super.snap-core (drv: { prePatch = "substituteInPlace src/Snap/Internal/Core.hs --replace 'fail = Fail.fail' ''"; }); diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 694ee99191e5..f2b3d51431f5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12298,7 +12298,7 @@ in 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 (haskell.lib.unmarkBroken haskell.packages.ghc883.cachix); hercules-ci-agent = callPackage ../development/tools/continuous-integration/hercules-ci-agent { }; |