diff options
| author | Michael Alan Dorman <mdorman@ironicdesign.com> | 2020-02-22 19:27:06 -0500 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2020-02-28 20:42:30 +0100 |
| commit | df8a0d64b5caeff0fdc6822d0d0899ff8654dc1d (patch) | |
| tree | 34893ecfc5f8062d1c5a6f8d3716f0e16d9b3eec /pkgs/development/haskell-modules | |
| parent | 219776992d8f1435d15d715ccdd58bff7df2874c (diff) | |
| download | nixlib-df8a0d64b5caeff0fdc6822d0d0899ff8654dc1d.tar nixlib-df8a0d64b5caeff0fdc6822d0d0899ff8654dc1d.tar.gz nixlib-df8a0d64b5caeff0fdc6822d0d0899ff8654dc1d.tar.bz2 nixlib-df8a0d64b5caeff0fdc6822d0d0899ff8654dc1d.tar.lz nixlib-df8a0d64b5caeff0fdc6822d0d0899ff8654dc1d.tar.xz nixlib-df8a0d64b5caeff0fdc6822d0d0899ff8654dc1d.tar.zst nixlib-df8a0d64b5caeff0fdc6822d0d0899ff8654dc1d.zip | |
json: remove obsolete patches that break the build
The patchs in question fail to apply against the current versoin, and thus the package fails to build; `hasktags` is then collateral damage. Remove reference to the patch and make sure neither package will be marked broken going forward.
Diffstat (limited to 'pkgs/development/haskell-modules')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 7 | ||||
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 2 |
2 files changed, 0 insertions, 9 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 3160dfdd2d6e..d42c2c5f6cfd 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -83,13 +83,6 @@ self: super: { # 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' ''"; }); - # needs a release - json = overrideCabal super.json (drv: { prePatch = "substituteInPlace json.cabal --replace '4.13' '4.14'"; patches = [( - pkgs.fetchpatch { - url = "https://github.com/GaloisInc/json/commit/9d36ca5d865be7e4b2126b68a444b901941d2492.patch"; - sha256 = "0vyi5nbivkqg6zngq7rb3wwcj9043m4hmyk155nrcddl8j2smfzv"; - } - )]; }); # Upstream ships a broken Setup.hs file. csv = overrideCabal super.csv (drv: { prePatch = "rm Setup.hs"; }); diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 7a4f3a83c223..76b3dd98330f 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -5625,7 +5625,6 @@ broken-packages: - haskore-supercollider - haskore-synthesizer - HaskRel - - hasktags - hasktorch - hasktorch-codegen - hasktorch-ffi-th @@ -6673,7 +6672,6 @@ broken-packages: - jsaddle-wkwebview - JsContracts - jsmw - - json - json-assertions - json-ast-json-encoder - json-ast-quickcheck |