diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index f94393f7748c..c4676a5c3b68 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -77,10 +77,13 @@ default-package-overrides: - gi-javascriptcore < 4.0.23 # - gi-soup < 2.4.24 # - gi-webkit2 < 4.0.27 # - # 2021-05-11: the diagrams libraries still depends on pre 0.6, - # e. g. https://github.com/diagrams/diagrams-core/issues/115 - # We can keep this pin presumably until base 4.15 + # 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 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 43ebaad69789..faa5443afd4b 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -74169,6 +74169,25 @@ 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 @@ -74183,6 +74202,7 @@ self: { ]; description = "Core libraries for diagrams EDSL"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "diagrams-graphviz" = callPackage