diff options
| author | (cdep)illabout <cdep.illabout@gmail.com> | 2020-02-29 23:21:14 +0900 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2020-03-06 21:42:11 +0100 |
| commit | 2610d5e762030a3cb53168eb42527b4855a2f72e (patch) | |
| tree | 6ffd014291c9ae68cd9f85912f1fa2a9d552311f | |
| parent | 75087d8882c78707fdcc820145680fad27e1386d (diff) | |
haskellPackages.pantry: get building with ghc882
3 files changed, 23 insertions, 3 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 0901af4e7b31f..0e7aa40272ef9 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1401,4 +1401,27 @@ self: super: { # https://github.com/bergmark/feed/issues/43 feed = dontCheck super.feed; + pantry = appendPatches super.pantry [ + # Pantry has been updated for ghc-8.8 upstream, but there hasn't been a + # release yet with this patch. This can probably be removed when a + # version of pantry is released after 0.2.0.0. + # https://github.com/commercialhaskell/pantry/pull/6 + (pkgs.fetchpatch { + url = "https://github.com/commercialhaskell/pantry/pull/6.diff"; + sha256 = "0aml06jshpjh3aiscs5av7y33m3d6s6x5pzdvh7pky476izfg87k"; + excludes = [ + ".azure/azure-linux-template.yml" + ".azure/azure-osx-template.yml" + ".azure/azure-windows-template.yml" + "package.yaml" + "pantry.cabal" + "stack-lts-11.yaml" + "stack-lts-12.yaml" + "stack-nightly.yaml" + "stack-windows.yaml" + "stack.yaml" + ]; + }) + ]; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 42223a656f800..5dc173ae63257 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -8026,7 +8026,6 @@ broken-packages: - pangraph - panpipe - pansite - - pantry - pantry-tmp - papa - papa-base diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 7f596626cde33..b2775227fb955 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -181165,8 +181165,6 @@ self: { ]; description = "Content addressable Haskell package management"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "pantry-tmp" = callPackage |