JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

haskellPackages.ema: Fix build

Browse Source
This commit is contained in:
Malte Brandy 2022-02-25 22:16:16 +01:00
parent 0acc49e24d
commit ee745d0676
3 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -2272,7 +2272,7 @@ self: super: {
csv = overrideCabal (drv: { preCompileBuildDriver = "rm Setup.hs"; }) super.csv;
# 2022-02-25: Upstream fixes are not released. Remove this override on update.
cabal-fmt = assert super.cabal-fmt.version = "0.1.5.1"; pkgs.lib.pipe super.cabal-fmt [
cabal-fmt = assert super.cabal-fmt.version == "0.1.5.1"; pkgs.lib.pipe super.cabal-fmt [
doJailbreak
(appendPatch (pkgs.fetchpatch {
url = "https://github.com/phadej/cabal-fmt/commit/842630f70adb5397245109f77dba07662836e964.patch";
@ -2280,6 +2280,9 @@ self: super: {
}))
];
# 2022-02-25: Not compatible with relude 1.0
ema = assert super.ema.version == 0.6.0.0; super.ema.overrideScope (self: super: { relude = doJailbreak self.relude_0_7_0_0; });
# Too strict bounds on chell: https://github.com/fpco/haskell-filesystem/issues/24
system-fileio = doJailbreak super.system-fileio;
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

1
pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
View File

@ -124,6 +124,7 @@ extra-packages:
- ShellCheck == 0.7.2 # 2022-02-20: haskell-ci 0.14 needs this
- weeder == 2.2.* # 2022-02-21: preserve for GHC 8.10.7
- attoparsec == 0.13.* # 2022-02-23: Needed to compile elm for now
- relude == 0.7.0.0 # 2022-02-25: Needed for ema 0.6
package-maintainers:
abbradar:

22
pkgs/development/haskell-modules/hackage-packages.nix generated
View File

@ -227966,6 +227966,28 @@ self: {
license = lib.licenses.agpl3Plus;
}) {};
"relude_0_7_0_0" = callPackage
({ mkDerivation, base, bytestring, containers, deepseq, doctest
, gauge, ghc-prim, Glob, hashable, hedgehog, mtl, stm, text
, transformers, unordered-containers
}:
mkDerivation {
pname = "relude";
version = "0.7.0.0";
sha256 = "1gx1h3656wz80v72acqky88iv7a2shinfv6apzzyjxii8lc22jf7";
libraryHaskellDepends = [
base bytestring containers deepseq ghc-prim hashable mtl stm text
transformers unordered-containers
];
testHaskellDepends = [
base bytestring containers doctest Glob hedgehog text
];
benchmarkHaskellDepends = [ base gauge unordered-containers ];
description = "Safe, performant, user-friendly and lightweight Haskell Standard Library";
license = lib.licenses.mit;
hydraPlatforms = lib.platforms.none;
}) {};
"relude" = callPackage
({ mkDerivation, base, bytestring, containers, criterion, deepseq
, doctest, ghc-prim, Glob, hashable, hedgehog, mtl, stm, text