From 4bf84c57e28bf63d0791b64ec5626c9d9ddeb2e6 Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Sun, 15 May 2022 18:15:49 +0200 Subject: [PATCH] haskellPackages.squeal-postgresql: fix build --- pkgs/development/haskell-modules/configuration-common.nix | 7 +++++++ .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 - .../haskell-modules/configuration-hackage2nix/main.yaml | 1 + pkgs/development/haskell-modules/hackage-packages.nix | 2 -- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index a8ae26ecfb7..af633946cc8 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -208,6 +208,7 @@ self: super: { persistent-zookeeper = dontCheck super.persistent-zookeeper; pocket-dns = dontCheck super.pocket-dns; postgresql-simple = dontCheck super.postgresql-simple; + squeal-postgresql = dontCheck super.squeal-postgresql; postgrest = dontCheck super.postgrest; postgrest-ws = dontCheck super.postgrest-ws; snowball = dontCheck super.snowball; @@ -2650,4 +2651,10 @@ self: super: { sha256 = "0wxpqazjnal9naibapg63nm7x6qz0lklcfw2m5mzjrh2q9x2cvnd"; }) super.debian; + # Raise version bounds for hspec + records-sop = appendPatch (fetchpatch { + url = "https://github.com/kosmikus/records-sop/pull/11/commits/d88831388ab3041190130fec3cdd679a4217b3c7.patch"; + sha256 = "sha256-O+v/OxvqnlWX3HaDvDIBZnJ+Og3xs/SJqI3gaouU3ZI="; + }) super.records-sop; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 920a7ce3076..2f3f618b7ee 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -4216,7 +4216,6 @@ broken-packages: - record - record-encode - records - - records-sop - record-wrangler - recursion-schemes-ext - recursion-schemes-ix diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 9990e493bba..f27f89e873f 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -188,6 +188,7 @@ package-maintainers: - hakyll - hakyll-contrib-hyphenation - webify + - squeal-postgresql Gabriel439: - annah - bench diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index e40ff318ad3..4a42bb8b69b 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -229732,8 +229732,6 @@ self: { ]; description = "Record subtyping and record utilities with generics-sop"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "records-th" = callPackage