mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-22 21:30:45 +02:00
haskellPackages.stack: Fix build of dependencies
* persistent-sqlite * pantry
This commit is contained in:
parent
8a559a2a08
commit
dd75aa6b9b
|
@ -1423,4 +1423,6 @@ self: super: {
|
||||||
# https://github.com/haskell/hackage-security/issues/247
|
# https://github.com/haskell/hackage-security/issues/247
|
||||||
hackage-security = dontCheck super.hackage-security;
|
hackage-security = dontCheck super.hackage-security;
|
||||||
|
|
||||||
|
# 2020-11-17: persistent-test is ahead of the persistent version in stack
|
||||||
|
persistent-sqlite = dontCheck super.persistent-sqlite;
|
||||||
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
|
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
|
||||||
|
|
|
@ -83,14 +83,6 @@ self: super: {
|
||||||
sha256 = "0rgzrq0513nlc1vw7nw4km4bcwn4ivxcgi33jly4a7n3c1r32v1f";
|
sha256 = "0rgzrq0513nlc1vw7nw4km4bcwn4ivxcgi33jly4a7n3c1r32v1f";
|
||||||
});
|
});
|
||||||
|
|
||||||
# https://github.com/commercialhaskell/pantry/issues/21
|
|
||||||
pantry = appendPatch super.pantry (pkgs.fetchpatch {
|
|
||||||
name = "add-cabal-3.2.x-support.patch";
|
|
||||||
url = "https://patch-diff.githubusercontent.com/raw/commercialhaskell/pantry/pull/22.patch";
|
|
||||||
sha256 = "198hsfjsy83s7rp71llf05cwa3vkm74g73djg5p4sk4awm9s6vf2";
|
|
||||||
excludes = ["package.yaml"];
|
|
||||||
});
|
|
||||||
|
|
||||||
# hnix 0.9.0 does not provide an executable for ghc < 8.10, so define completions here for now.
|
# hnix 0.9.0 does not provide an executable for ghc < 8.10, so define completions here for now.
|
||||||
hnix = generateOptparseApplicativeCompletion "hnix"
|
hnix = generateOptparseApplicativeCompletion "hnix"
|
||||||
(overrideCabal super.hnix (drv: {
|
(overrideCabal super.hnix (drv: {
|
||||||
|
|
Loading…
Reference in a new issue