swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-21 12:59:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

haskell-dhall: update override for ghc-8.4.x to use the latest version

Browse source
This commit is contained in:
Peter Simons 2018-05-02 13:41:48 +02:00
parent 1d79794c79
commit 4519076421
1 changed files with 1 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
View file

@ -193,28 +193,6 @@ self: super: {
libraryHaskellDepends = (drv.libraryHaskellDepends or []) ++ (with self; [ data-or ]);
});
## Unmerged. PR: https://github.com/dhall-lang/dhall-haskell/pull/321
dhall = overrideCabal super.dhall (drv: {
## • No instance for (Semigroup (Parser Builder))
## arising from a use of ‘<>’
## There are instances for similar types:
src = pkgs.fetchFromGitHub {
owner = "deepfire";
repo = "dhall-haskell";
rev = "38f3d8c861e137da6d8ac8eab88aec1c359efcac";
sha256 = "1pya7lhdjsygk622k1g3whj0a7jqwyym26ikxbn1anxypnb0n2wy";
};
## Setup: Encountered missing dependencies:
## prettyprinter >=1.2.0.1 && <1.3
jailbreak = true;
## Setup: Encountered missing dependencies:
## insert-ordered-containers -any,
## lens-family-core -any,
## prettyprinter-ansi-terminal -any,
## repline -any
libraryHaskellDepends = (drv.libraryHaskellDepends or []) ++ (with self; [ insert-ordered-containers lens-family-core prettyprinter prettyprinter-ansi-terminal repline ]);
});
## Unmerged. PR: https://github.com/gregorycollins/hashtables/pull/46
hashtables = overrideCabal super.hashtables (drv: {
## • No instance for (Semigroup Slot)
@ -497,6 +475,7 @@ self: super: {
matrix = self.matrix_0_3_6_1;
pandoc = self.pandoc_2_2;
pandoc-types = self.pandoc-types_1_17_4_2;
dhall = self.dhall_1_13_0;
# https://github.com/xmonad/xmonad/issues/155
xmonad = addBuildDepend (appendPatch super.xmonad (pkgs.fetchpatch