From c9b8574c3e21e6236ca61f67f8c48814d9555877 Mon Sep 17 00:00:00 2001 From: Neil Mayhew Date: Mon, 16 May 2022 17:43:35 -0600 Subject: [PATCH 1/3] haskellPackages.polynomial: Fix build failures for ghc 9 --- .../haskell-modules/configuration-common.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index ce1ff5d66b5c..eeac38baf23a 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2657,4 +2657,17 @@ self: super: { sha256 = "sha256-O+v/OxvqnlWX3HaDvDIBZnJ+Og3xs/SJqI3gaouU3ZI="; }) super.records-sop; + # Fix build failures for ghc 9 (https://github.com/mokus0/polynomial/pull/20) + polynomial = appendPatch (fetchpatch { + name = "haskell-polynomial.20.patch"; + url = "https://github.com/mokus0/polynomial/pull/20.diff"; + sha256 = "1bwivimpi2hiil3zdnl5qkds1inyn239wgxbn3y8l2pwyppnnfl0"; + }) + (overrideCabal (drv: { + revision = null; + editedCabalFile = null; + doCheck = false; # Source dist doesn't include the checks + }) + super.polynomial); + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super From 23b890a3026e6654403822978a5d1268569e0200 Mon Sep 17 00:00:00 2001 From: Neil Mayhew Date: Tue, 17 May 2022 19:48:39 -0600 Subject: [PATCH 2/3] haskellPackages: Remove polynomial from the broken list --- .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 2f3f618b7eeb..15002095d231 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -3935,7 +3935,6 @@ broken-packages: - poly-control - polydata-core - polynom - - polynomial - polynomial-algebra - polysemy-check - polysemy-keyed-state From 6e028bd63297a2e49305d42d67b7be4c69c59c99 Mon Sep 17 00:00:00 2001 From: Neil Mayhew Date: Tue, 17 May 2022 20:00:50 -0600 Subject: [PATCH 3/3] haskellPackages: regenerate package set based on current config This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh --- pkgs/development/haskell-modules/hackage-packages.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 4a42bb8b69bb..49aa598dd9ad 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -215436,8 +215436,6 @@ self: { ]; description = "Polynomials"; license = lib.licenses.publicDomain; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "polynomial-algebra" = callPackage @@ -258116,6 +258114,7 @@ self: { description = "Squeal PostgreSQL Library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ erictapen ]; }) {}; "squeal-postgresql-ltree" = callPackage