diff options
author | Peter Simons <simons@cryp.to> | 2018-03-26 20:46:19 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-03-26 20:46:19 +0200 |
commit | 519fa2224150e7d3ec1302183ed5d5191e99e083 (patch) | |
tree | 020b043d295145d83cc6b62eb3ba17c4b8cdbc04 /pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix | |
parent | 47205202e3e7b6699c2c085bbd9d11d73c598d68 (diff) | |
parent | 5e7ab184372843735ed26ec1d536d170b04e785d (diff) | |
download | nixlib-519fa2224150e7d3ec1302183ed5d5191e99e083.tar nixlib-519fa2224150e7d3ec1302183ed5d5191e99e083.tar.gz nixlib-519fa2224150e7d3ec1302183ed5d5191e99e083.tar.bz2 nixlib-519fa2224150e7d3ec1302183ed5d5191e99e083.tar.lz nixlib-519fa2224150e7d3ec1302183ed5d5191e99e083.tar.xz nixlib-519fa2224150e7d3ec1302183ed5d5191e99e083.tar.zst nixlib-519fa2224150e7d3ec1302183ed5d5191e99e083.zip |
Merge pull request #37880 from mpickering/i-37856
Use up-to-date versions of singletons and th-desguar for GHC 8.4.1
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix')
-rw-r--r-- | pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix | 25 |
1 files changed, 2 insertions, 23 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 a8ba253839a6..b2914766d162 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -239,17 +239,7 @@ self: super: { }; }); - ## Upstreamed, awaiting a Hackage release - singletons = overrideCabal super.singletons (drv: { - ## Setup: Encountered missing dependencies: - ## th-desugar ==1.7.* - src = pkgs.fetchFromGitHub { - owner = "goldfirere"; - repo = "singletons"; - rev = "23aa4bdaf05ce025a2493b35ec3c26cc94e3fdce"; - sha256 = "0hw12v4z8jxmykc3j8z6g27swmfpxv40bgnx7nl0ialpwbz9mz27"; - }; - }); + singletons = super.singletons_2_4_1; ## Upstreamed, awaiting a Hackage release tar = overrideCabal super.tar (drv: { @@ -264,18 +254,7 @@ self: super: { }; }); - ## Upstreamed, awaiting a Hackage release - th-desugar = overrideCabal super.th-desugar (drv: { - ## • Could not deduce (MonadIO (DsM q)) - ## arising from the 'deriving' clause of a data type declaration - ## from the context: Quasi q - src = pkgs.fetchFromGitHub { - owner = "goldfirere"; - repo = "th-desugar"; - rev = "4ca98c6492015e6ad063d3ad1a2ad6c4f0a56837"; - sha256 = "1n3myd3gia9qsgdvrwqa023d3g7wkrhyv0wc8czwzz0lj9xzh7lw"; - }; - }); + th-desugar = super.th-desugar_1_8; ## Upstreamed, awaiting a Hackage release websockets = overrideCabal super.websockets (drv: { |