summary refs log tree commit diff
path: root/pkgs/development/haskell-modules
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2018-04-28 12:27:21 +0200
committerPeter Simons <simons@cryp.to>2018-04-28 15:37:59 +0200
commit99dc2d6f0f8cfd6427e29bc7371ec0cabdcaa47a (patch)
tree6cfdbb4876a58b086ebf192acc6567ebe69ca248 /pkgs/development/haskell-modules
parente39a75cd350f03d13b3bded2bb605629f5031330 (diff)
downloadnixlib-99dc2d6f0f8cfd6427e29bc7371ec0cabdcaa47a.tar
nixlib-99dc2d6f0f8cfd6427e29bc7371ec0cabdcaa47a.tar.gz
nixlib-99dc2d6f0f8cfd6427e29bc7371ec0cabdcaa47a.tar.bz2
nixlib-99dc2d6f0f8cfd6427e29bc7371ec0cabdcaa47a.tar.lz
nixlib-99dc2d6f0f8cfd6427e29bc7371ec0cabdcaa47a.tar.xz
nixlib-99dc2d6f0f8cfd6427e29bc7371ec0cabdcaa47a.tar.zst
nixlib-99dc2d6f0f8cfd6427e29bc7371ec0cabdcaa47a.zip
haskell-hpack: use latest version for ghc-8.4.x to fix the build
Diffstat (limited to 'pkgs/development/haskell-modules')
-rw-r--r--pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix18
1 files changed, 1 insertions, 17 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 09de2116098d..2440e3b7a9dc 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -293,23 +293,6 @@ self: super: {
     };
   });
 
-  ## Unmerged.  PR: https://github.com/sol/hpack/pull/277
-  ## Issue: https://github.com/sol/hpack/issues/276
-  hpack = overrideCabal super.hpack (drv: {
-    ##     • No instance for (Semigroup Dependencies)
-    ##         arising from the 'deriving' clause of a data type declaration
-    ##       Possible fix:
-    src = pkgs.fetchFromGitHub {
-      owner  = "deepfire";
-      repo   = "hpack";
-      rev    = "acce0cffcc1d165a0fd9f0b83878dfbd622ea0d6";
-      sha256 = "1wv0ya1gb1hwd9w8g4z5aig694q3arsqhxv0d4wcp270xnq9ja8y";
-    };
-    ## Setup: Encountered missing dependencies:
-    ## http-client -any, http-client-tls -any, http-types -any
-    libraryHaskellDepends = (drv.libraryHaskellDepends or []) ++ (with self; [ http-client http-client-tls http-types ]);
-  });
-
   ## Unmerged.  PR: https://github.com/hanshoglund/monadplus/pull/3
   monadplus = overrideCabal super.monadplus (drv: {
     ##     • No instance for (Semigroup (Partial a b))
@@ -574,6 +557,7 @@ self: super: {
   # Older versions don't compile.
   brick = self.brick_0_36_2;
   HaTeX = self.HaTeX_3_19_0_0;
+  hpack = self.hpack_0_28_2;
   matrix = self.matrix_0_3_6_1;
   pandoc = self.pandoc_2_2;
   pandoc-types = self.pandoc-types_1_17_4_2;