3
0
Fork 0
forked from mirrors/nixpkgs

haskell.packages: remove constraint on monoid-extras

Seems like the monoid-extras situation wasn't as bad as I thought and
some new releases in the meantime make every diagrams package we had
working previously work again.

* haskellPackages.monoid-extras: 0.5.1 -> 0.6
* haskellPackages.diagrams-lib: remove now unnecessary patch
* haskellPackages.namespace: jailbreak to build with new monoid-extras
This commit is contained in:
sternenseemann 2021-06-03 12:25:50 +02:00
parent da993f42ee
commit 52d69816b0
3 changed files with 7 additions and 54 deletions

View file

@ -703,22 +703,18 @@ self: super: {
# 2021-03-12: All of this libraries have to restrictive upper bounds
# https://github.com/diagrams/diagrams-core/issues/112
# https://github.com/diagrams/diagrams-cairo/issues/77
active = doJailbreak super.active;
statestack = doJailbreak super.statestack;
force-layout = doJailbreak super.force-layout;
size-based = doJailbreak super.size-based;
dual-tree = doJailbreak super.dual-tree;
diagrams-cairo = doJailbreak super.diagrams-cairo;
diagrams-core = doJailbreak super.diagrams-core;
diagrams-postscript = doJailbreak super.diagrams-postscript;
diagrams-svg = doJailbreak super.diagrams-svg;
diagrams-contrib = doJailbreak super.diagrams-contrib;
# apply patch from master to add compat with optparse-applicative >= 0.16
diagrams-lib = doJailbreak (appendPatch super.diagrams-lib
(pkgs.fetchpatch {
url = "https://github.com/diagrams/diagrams-lib/commit/4b9842c3e3d653be69af19778970337775e2404d.patch";
sha256 = "0xqvzh3ip9i0nv8xnh41afxki64r259pxq8ir1a4v99ggnldpjaa";
includes = [ "*/CmdLine.hs" ];
}));
diagrams-lib = doJailbreak super.diagrams-lib;
# https://github.com/danidiaz/streaming-eversion/issues/1
streaming-eversion = dontCheck super.streaming-eversion;
@ -1804,10 +1800,6 @@ self: super: {
passthru.updateScript = ../../../maintainers/scripts/haskell/update-cabal2nix-unstable.sh;
};
# Too strict version bounds on base and optparse-applicative
# https://github.com/diagrams/diagrams-cairo/issues/77
diagrams-cairo = doJailbreak super.diagrams-cairo;
# Too strict version bounds on base
# https://github.com/gibiansky/IHaskell/issues/1217
ihaskell-display = doJailbreak super.ihaskell-display;
@ -1950,4 +1942,8 @@ EOT
testTarget = "libarchive-test --test-options='-j1'";
};
# 2021-06-03: Too strict bounds on monoid-extras
# https://github.com/xu-hao/namespace/issues/1
namespace = doJailbreak super.namespace;
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

View file

@ -77,13 +77,6 @@ default-package-overrides:
- gi-javascriptcore < 4.0.23 #
- gi-soup < 2.4.24 #
- gi-webkit2 < 4.0.27 #
# 2021-05-11: not all diagrams libraries have adjusted to
# monoid-extras 0.6 yet, keep them pinned to lower versions
# until we can do a full migration, see
# https://github.com/diagrams/diagrams-core/issues/115
# We can keep this pin at most until base 4.15
- monoid-extras < 0.6
- diagrams-core < 1.5.0
# 2021-05-11: Pin for hls 1.1.0
- ghcide == 1.2.*
- hls-plugin-api == 1.1.0.0

View file

@ -74287,25 +74287,6 @@ self: {
}) {};
"diagrams-core" = callPackage
({ mkDerivation, adjunctions, base, containers, distributive
, dual-tree, lens, linear, monoid-extras, mtl, profunctors
, semigroups, unordered-containers
}:
mkDerivation {
pname = "diagrams-core";
version = "1.4.2";
sha256 = "0qgb43vy23g4fxh3nmxfq6jyp34imqvkhgflaa6rz0iq6d60gl43";
revision = "1";
editedCabalFile = "0w8mpy0z8kmx4l7cg8sgc1hyixysjfqffdgmnxy5p04airjlbpj7";
libraryHaskellDepends = [
adjunctions base containers distributive dual-tree lens linear
monoid-extras mtl profunctors semigroups unordered-containers
];
description = "Core libraries for diagrams EDSL";
license = lib.licenses.bsd3;
}) {};
"diagrams-core_1_5_0" = callPackage
({ mkDerivation, adjunctions, base, containers, distributive
, dual-tree, lens, linear, monoid-extras, mtl, profunctors
, semigroups, unordered-containers
@ -74320,7 +74301,6 @@ self: {
];
description = "Core libraries for diagrams EDSL";
license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
}) {};
"diagrams-graphviz" = callPackage
@ -177965,21 +177945,6 @@ self: {
}) {};
"monoid-extras" = callPackage
({ mkDerivation, base, criterion, groups, semigroupoids, semigroups
}:
mkDerivation {
pname = "monoid-extras";
version = "0.5.1";
sha256 = "0xfrkgqn9d31z54l617m3w3kkd5m9vjb4yl247r3zzql3mpb1f37";
revision = "2";
editedCabalFile = "0gbrwpr7rzh9mmf59yhs74hixgclmxngaxx51j7pvr6wnkbvz3a3";
libraryHaskellDepends = [ base groups semigroupoids semigroups ];
benchmarkHaskellDepends = [ base criterion semigroups ];
description = "Various extra monoid-related definitions and utilities";
license = lib.licenses.bsd3;
}) {};
"monoid-extras_0_6" = callPackage
({ mkDerivation, base, criterion, groups, semigroupoids, semigroups
}:
mkDerivation {
@ -177990,7 +177955,6 @@ self: {
benchmarkHaskellDepends = [ base criterion semigroups ];
description = "Various extra monoid-related definitions and utilities";
license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
}) {};
"monoid-owns" = callPackage