From 75fc94d3ccdd680232910a0778a384bbb6db032c Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Tue, 11 May 2021 12:14:16 +0200 Subject: [PATCH] haskellPackages.monoid-extras: pin to < 0.6 The diagrams libraries universe still uses monoid-extras 0.5.1 and build failures start cropping up when upgrading it. Since no other packages I am aware of use this, we can pin it to 0.5.1 which still uses Option instead of Maybe (the former of which is deprecated). Patching this seems like a lot of work that'd break other stuff because Option is seemingly part of the public API. Let's hope they sort all of that out themselves before base 4.15 comes around in our main package set. --- .../configuration-hackage2nix/main.yaml | 4 ++++ .../haskell-modules/hackage-packages.nix | 16 ++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index cc33944d1eeb..cbfc20713755 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -77,6 +77,10 @@ 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 + - monoid-extras < 0.6 extra-packages: - base16-bytestring < 1 # required for cabal-install etc. diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 846b1f33256f..8455e8b9bf66 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -177278,6 +177278,21 @@ 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 { @@ -177288,6 +177303,7 @@ self: { benchmarkHaskellDepends = [ base criterion semigroups ]; description = "Various extra monoid-related definitions and utilities"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "monoid-owns" = callPackage