From d68e2539b1ce8cfeda1425cc81402a0203197fa3 Mon Sep 17 00:00:00 2001 From: Alexandre Esteves Date: Fri, 3 May 2024 16:18:30 +0100 Subject: [PATCH 1/5] haskellPackages.generics-sop: build with ghc 9.8 --- pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix index 15d0a9242a8e..92a2eddadc61 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix @@ -92,6 +92,7 @@ self: super: { diagrams-lib = doJailbreak super.diagrams-lib; # base <4.19, text <2.1 diagrams-postscript = doJailbreak super.diagrams-postscript; # base <4.19, bytestring <0.12 diagrams-svg = doJailbreak super.diagrams-svg; # base <4.19, text <2.1 + generics-sop = doJailbreak super.generics-sop_0_5_1_4; # th-abstraction >=0.6 && <0.7 ghc-trace-events = doJailbreak super.ghc-trace-events; # text < 2.1, bytestring < 0.12, base < 4.19 primitive-unlifted = doJailbreak super.primitive-unlifted; # bytestring < 0.12 statestack = doJailbreak super.statestack; # base < 4.19 From 109035a742033375f9c8b8cd6bfa0d0ab6477425 Mon Sep 17 00:00:00 2001 From: Alexandre Esteves Date: Fri, 3 May 2024 16:19:45 +0100 Subject: [PATCH 2/5] haskellPackages.records-sop: fix build --- pkgs/development/haskell-modules/configuration-common.nix | 6 +++--- .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 - .../configuration-hackage2nix/transitive-broken.yaml | 3 --- pkgs/development/haskell-modules/hackage-packages.nix | 5 ----- 4 files changed, 3 insertions(+), 12 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 604857d12df5..77561adc388c 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2625,10 +2625,10 @@ self: super: { # https://github.com/ngless-toolkit/ngless/issues/152 NGLess = dontCheck super.NGLess; - # Raise version bounds for hspec + # Raise version bounds: https://github.com/kosmikus/records-sop/pull/15 records-sop = appendPatch (fetchpatch { - url = "https://github.com/kosmikus/records-sop/pull/11/commits/d88831388ab3041190130fec3cdd679a4217b3c7.patch"; - sha256 = "sha256-O+v/OxvqnlWX3HaDvDIBZnJ+Og3xs/SJqI3gaouU3ZI="; + url = "https://github.com/kosmikus/records-sop/commit/fb149f453a816ff14d0cb20b3ea56b80ff49d9f1.patch"; + sha256 = "sha256-iHiF4EWL/GjJFnr/6aR+yMZKLMLAZK+gsgSxG8YaeDI="; }) super.records-sop; # Fix build failures for ghc 9 (https://github.com/mokus0/polynomial/pull/20) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index a8f948922b36..2ed731b2978a 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -4930,7 +4930,6 @@ broken-packages: - record-encode # failure in job https://hydra.nixos.org/build/233216156 at 2023-09-02 - record # failure in job https://hydra.nixos.org/build/233242406 at 2023-09-02 - records # failure in job https://hydra.nixos.org/build/233254822 at 2023-09-02 - - records-sop # failure in job https://hydra.nixos.org/build/233251652 at 2023-09-02 - record-wrangler # failure in job https://hydra.nixos.org/build/233212838 at 2023-09-02 - rec-smallarray # failure in job https://hydra.nixos.org/build/233258592 at 2023-09-02 - recursive-line-count # failure in job https://hydra.nixos.org/build/252736942 at 2024-03-16 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 262ebdfe76ac..9a3314cf506f 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -3785,9 +3785,6 @@ dont-distribute-packages: - sqlcli-odbc - sqlite-simple-interpolate - sqlite-simple-typed - - squeal-postgresql - - squeal-postgresql-ltree - - squeal-postgresql-uuid-ossp - squeeze - sr-extra - srt-dhall diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 726008450b58..ec4e7b436fcd 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -253405,8 +253405,6 @@ self: { ]; description = "Record subtyping and record utilities with generics-sop"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "records-th" = callPackage @@ -284256,7 +284254,6 @@ self: { ]; description = "Squeal PostgreSQL Library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "example"; }) {}; @@ -284274,7 +284271,6 @@ self: { ]; description = "LTree extension for Squeal"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "squeal-postgresql-uuid-ossp" = callPackage @@ -284286,7 +284282,6 @@ self: { libraryHaskellDepends = [ base squeal-postgresql ]; description = "UUID OSSP extension for Squeal"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "squeather" = callPackage From 3535522a6c07c60bcb6f01f29f9e91a3969c6727 Mon Sep 17 00:00:00 2001 From: Alexandre Esteves Date: Sat, 4 May 2024 00:10:47 +0100 Subject: [PATCH 3/5] haskellPackages.basic-sop: unmark broken --- .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 - pkgs/development/haskell-modules/hackage-packages.nix | 2 -- 2 files changed, 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 2ed731b2978a..b541d573c074 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -369,7 +369,6 @@ broken-packages: - bash # failure in job https://hydra.nixos.org/build/252719390 at 2024-03-16 - basic-gps # failure in job https://hydra.nixos.org/build/252718385 at 2024-03-16 - basics # failure in job https://hydra.nixos.org/build/236678238 at 2023-10-04 - - basic-sop # failure in job https://hydra.nixos.org/build/233253357 at 2023-09-02 - baskell # failure in job https://hydra.nixos.org/build/233246705 at 2023-09-02 - battlenet # failure in job https://hydra.nixos.org/build/233260076 at 2023-09-02 - battleplace # failure in job https://hydra.nixos.org/build/233230199 at 2023-09-02 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index ec4e7b436fcd..5dfa69fdf9a5 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -45897,8 +45897,6 @@ self: { ]; description = "Basic examples and functions for generics-sop"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "basics" = callPackage From 90e0533ffa6828a3e0e5a78e2667545370efc00b Mon Sep 17 00:00:00 2001 From: Alexandre Esteves Date: Sat, 4 May 2024 00:16:14 +0100 Subject: [PATCH 4/5] haskellPackages.lens-sop: unmark broken --- .../haskell-modules/configuration-common.nix | 12 ++++++++++++ .../configuration-hackage2nix/broken.yaml | 1 - .../configuration-hackage2nix/transitive-broken.yaml | 1 - .../development/haskell-modules/hackage-packages.nix | 3 --- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 77561adc388c..2be8105f1fea 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2625,6 +2625,18 @@ self: super: { # https://github.com/ngless-toolkit/ngless/issues/152 NGLess = dontCheck super.NGLess; + # Raise version bounds: https://github.com/well-typed/lens-sop/pull/4 + lens-sop = appendPatches [ + (fetchpatch { + url = "https://github.com/well-typed/lens-sop/commit/d8657f27c12191a7c0a91701c0fcd9a590e0090e.patch"; + sha256 = "sha256-9ODfbOb6Bs3EVTY9b7cUvkNmqzzZPWUmgmlAneaN3Tw="; + }) + (fetchpatch { + url = "https://github.com/well-typed/lens-sop/commit/b7ecffdeb836d19373871659e2f8cd24da6f7312.patch"; + sha256 = "sha256-hDUQ2fW9Qyom65YvtW9bsbz7XtueRmdsAbAB42D+gu4="; + }) + ] super.lens-sop; + # Raise version bounds: https://github.com/kosmikus/records-sop/pull/15 records-sop = appendPatch (fetchpatch { url = "https://github.com/kosmikus/records-sop/commit/fb149f453a816ff14d0cb20b3ea56b80ff49d9f1.patch"; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index b541d573c074..a25cd0239c2d 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -3428,7 +3428,6 @@ broken-packages: - lens-process # failure in job https://hydra.nixos.org/build/233242948 at 2023-09-02 - lensref # failure in job https://hydra.nixos.org/build/233205479 at 2023-09-02 - lens-simple # failure in job https://hydra.nixos.org/build/233245452 at 2023-09-02 - - lens-sop # failure in job https://hydra.nixos.org/build/252721754 at 2024-03-16 - lens-tell # failure in job https://hydra.nixos.org/build/233234619 at 2023-09-02 - lens-text-encoding # failure in job https://hydra.nixos.org/build/233222713 at 2023-09-02 - lens-th-rewrite # failure in job https://hydra.nixos.org/build/233201025 at 2023-09-02 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 9a3314cf506f..0ea793ebad72 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -2427,7 +2427,6 @@ dont-distribute-packages: - json-query - json-rpc-client - json-schema - - json-sop - json-spec-elm - json-spec-elm-servant - json-spec-openapi diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 5dfa69fdf9a5..e93f86cdc996 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -178028,7 +178028,6 @@ self: { ]; description = "Generics JSON (de)serialization using generics-sop"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "json-spec" = callPackage @@ -187518,8 +187517,6 @@ self: { ]; description = "Computing lenses generically using generics-sop"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "lens-tell" = callPackage From 67eb894b10ad927d12c06dddabf70306ecb1c648 Mon Sep 17 00:00:00 2001 From: Alexandre Esteves Date: Sat, 4 May 2024 00:16:26 +0100 Subject: [PATCH 5/5] haskellPackages.json-sop: build with ghc 9.8 --- pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix index 92a2eddadc61..3a74b6c24865 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix @@ -94,6 +94,7 @@ self: super: { diagrams-svg = doJailbreak super.diagrams-svg; # base <4.19, text <2.1 generics-sop = doJailbreak super.generics-sop_0_5_1_4; # th-abstraction >=0.6 && <0.7 ghc-trace-events = doJailbreak super.ghc-trace-events; # text < 2.1, bytestring < 0.12, base < 4.19 + json-sop = doJailbreak super.json-sop; # aeson <2.2, base <4.19, text <2.1 primitive-unlifted = doJailbreak super.primitive-unlifted; # bytestring < 0.12 statestack = doJailbreak super.statestack; # base < 4.19 newtype-generics = doJailbreak super.newtype-generics; # base < 4.19