nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-27 01:13:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #308919 from alexfmpe/haskellPackages-sop

Browse Source 
haskellPackages: fix build of SOP libraries
This commit is contained in:
Naïm Favier 2024-05-13 12:32:06 +02:00 committed by GitHub
commit 505712b35b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -2627,10 +2627,22 @@ 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/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/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;
# Need https://github.com/well-typed/large-records/pull/151

2
pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix
View File

@ -92,7 +92,9 @@ 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
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

3
pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
View File

@ -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
@ -3428,7 +3427,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
@ -4928,7 +4926,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

4
pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
View File

@ -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
@ -3784,9 +3783,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

10
pkgs/development/haskell-modules/hackage-packages.nix generated
View File

@ -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
@ -178058,7 +178056,6 @@ self: {
];
description = "Generics JSON (de)serialization using generics-sop";
license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
}) {};
"json-spec" = callPackage
@ -187547,8 +187544,6 @@ self: {
];
description = "Computing lenses generically using generics-sop";
license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
"lens-tell" = callPackage
@ -253430,8 +253425,6 @@ self: {
];
description = "Record subtyping and record utilities with generics-sop";
license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
"records-th" = callPackage
@ -284281,7 +284274,6 @@ self: {
];
description = "Squeal PostgreSQL Library";
license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
mainProgram = "example";
}) {};
@ -284299,7 +284291,6 @@ self: {
];
description = "LTree extension for Squeal";
license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
}) {};
"squeal-postgresql-uuid-ossp" = callPackage
@ -284311,7 +284302,6 @@ self: {
libraryHaskellDepends = [ base squeal-postgresql ];
description = "UUID OSSP extension for Squeal";
license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
}) {};
"squeather" = callPackage