b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

cachix: make it build

Browse source
This commit is contained in:
Domen Kožar 2020-11-20 23:13:33 +01:00
parent f0aac91187
commit dc9f85e69e
No known key found for this signature in database
GPG key ID: C2FFBCAFD2C24246
2 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
View file

@ -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' ''"; });

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

@ -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 { };