Merge pull request #37880 from mpickering/i-37856

Use up-to-date versions of singletons and th-desguar for GHC 8.4.1
This commit is contained in:
Peter Simons 2018-03-26 20:46:19 +02:00 committed by GitHub
commit 519fa22241
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -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: {