diff options
| author | Peter Simons <simons@cryp.to> | 2018-03-22 14:46:05 +0100 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2018-03-22 21:14:25 +0100 |
| commit | 1e8663ab9b37b172e00d17dec643d5fda5ba38fc (patch) | |
| tree | 755d79df9eb755d956821fa29777abc95cab93a0 /pkgs/development | |
| parent | 71beddad8cd7ab3f75f646cf9f7bf7ee035f8d5f (diff) | |
| download | nixpkgs-1e8663ab9b37b172e00d17dec643d5fda5ba38fc.tar nixpkgs-1e8663ab9b37b172e00d17dec643d5fda5ba38fc.tar.gz nixpkgs-1e8663ab9b37b172e00d17dec643d5fda5ba38fc.tar.bz2 nixpkgs-1e8663ab9b37b172e00d17dec643d5fda5ba38fc.tar.lz nixpkgs-1e8663ab9b37b172e00d17dec643d5fda5ba38fc.tar.xz nixpkgs-1e8663ab9b37b172e00d17dec643d5fda5ba38fc.tar.zst nixpkgs-1e8663ab9b37b172e00d17dec643d5fda5ba38fc.zip | |
haskell-json: use latest versions when building with GHC 8.4.1
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix index 116d89354a1..369f25a5232 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -659,16 +659,11 @@ self: super: { sha256 = "1wwdzrbsjqb7ih4nl28sq5bbj125mxf93a74yh4viv5gmxwj606a"; }); - # Fix missing semigroup instance. - json = appendPatch super.json (pkgs.fetchpatch - { url = https://github.com/GaloisInc/json/commit/9292150bbe02c2d126ad6a876242578b1a9d1bf2.patch; - sha256 = "1xw2gab0wzhszgcbjhg98kkzgnbfn9n3bx1qlk6g7ir6hhwppm9z"; - }); - # Older versions don't compile. brick = self.brick_0_35; getopt-generics = self.getopt-generics_0_13_0_2; HaTeX = self.HaTeX_3_19_0_0; + json = self.json_0_9_2; matrix = self.matrix_0_3_6_1; pandoc = self.pandoc_2_1_3; pandoc-types = self.pandoc-types_1_17_4_2; |