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

haskellPackages.hourglass: Fix build and harmonize overrides

Browse Source
This commit is contained in:
maralorn 2024-06-23 13:10:27 +02:00
parent 7af87f035e
commit 102aadf228
No known key found for this signature in database
5 changed files with 14 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -246,6 +246,20 @@ self: super: {
}; };
}) super.leveldb-haskell; }) super.leveldb-haskell;
# 2024-06-23: Hourglass is archived and had its last commit 6 years ago.
# Patch is needed to add support for time 1.10, which is only used in the tests
# https://github.com/vincenthz/hs-hourglass/pull/56
# Jailbreak is needed because a hackage revision added the (correct) time <1.10 bound.
hourglass = doJailbreak
(appendPatches [
(pkgs.fetchpatch {
name = "hourglass-pr-56.patch";
url =
"https://github.com/vincenthz/hs-hourglass/commit/cfc2a4b01f9993b1b51432f0a95fa6730d9a558a.patch";
sha256 = "sha256-gntZf7RkaR4qzrhjrXSC69jE44SknPDBmfs4z9rVa5Q=";
})
] super.hourglass);
# Arion's test suite needs a Nixpkgs, which is cumbersome to do from Nixpkgs # Arion's test suite needs a Nixpkgs, which is cumbersome to do from Nixpkgs
# itself. For instance, pkgs.path has dirty sources and puts a huge .git in the # itself. For instance, pkgs.path has dirty sources and puts a huge .git in the
# store. Testing is done upstream. # store. Testing is done upstream.

3
pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix
View File

@ -101,9 +101,6 @@ self: super: {
# https://mail.haskell.org/pipermail/haskell-cafe/2022-October/135613.html # https://mail.haskell.org/pipermail/haskell-cafe/2022-October/135613.html
language-javascript_0_7_0_0 = dontCheck super.language-javascript_0_7_0_0; language-javascript_0_7_0_0 = dontCheck super.language-javascript_0_7_0_0;
# Tests depend on `parseTime` which is no longer available
hourglass = dontCheck super.hourglass;
# Needs to match ghc version # Needs to match ghc version
ghc-tags = doDistribute self.ghc-tags_1_5; ghc-tags = doDistribute self.ghc-tags_1_5;

3
pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix
View File

@ -78,9 +78,6 @@ in {
] ++ drv.testFlags or []; ] ++ drv.testFlags or [];
}) (doJailbreak super.hpack); }) (doJailbreak super.hpack);
# Tests depend on `parseTime` which is no longer available
hourglass = dontCheck super.hourglass;
# https://github.com/sjakobi/bsb-http-chunked/issues/38 # https://github.com/sjakobi/bsb-http-chunked/issues/38
bsb-http-chunked = dontCheck super.bsb-http-chunked; bsb-http-chunked = dontCheck super.bsb-http-chunked;

19
pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix
View File

@ -89,25 +89,6 @@ self: super: {
# Forbids base >= 4.18, fix proposed: https://github.com/sjakobi/newtype-generics/pull/25 # Forbids base >= 4.18, fix proposed: https://github.com/sjakobi/newtype-generics/pull/25
newtype-generics = jailbreakForCurrentVersion super.newtype-generics "0.6.2"; newtype-generics = jailbreakForCurrentVersion super.newtype-generics "0.6.2";
#
# Too strict bounds, waiting on Hackage release in nixpkgs
#
#
# Compilation failure workarounds
#
# Add support for time 1.10
# https://github.com/vincenthz/hs-hourglass/pull/56
hourglass = appendPatches [
(pkgs.fetchpatch {
name = "hourglass-pr-56.patch";
url =
"https://github.com/vincenthz/hs-hourglass/commit/cfc2a4b01f9993b1b51432f0a95fa6730d9a558a.patch";
sha256 = "sha256-gntZf7RkaR4qzrhjrXSC69jE44SknPDBmfs4z9rVa5Q=";
})
] (super.hourglass);
# Jailbreaks for servant <0.20 # Jailbreaks for servant <0.20
servant-lucid = doJailbreak super.servant-lucid; servant-lucid = doJailbreak super.servant-lucid;

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

@ -119,7 +119,6 @@ self: super: {
# #
unordered-containers = dontCheck super.unordered-containers; # ChasingBottoms doesn't support base 4.20 unordered-containers = dontCheck super.unordered-containers; # ChasingBottoms doesn't support base 4.20
lifted-base = dontCheck super.lifted-base; # doesn't compile with transformers == 0.6.* lifted-base = dontCheck super.lifted-base; # doesn't compile with transformers == 0.6.*
hourglass = dontCheck super.hourglass; # umaintained, test suite doesn't compile anymore
bsb-http-chunked = dontCheck super.bsb-http-chunked; # umaintained, test suite doesn't compile anymore bsb-http-chunked = dontCheck super.bsb-http-chunked; # umaintained, test suite doesn't compile anymore
pcre-heavy = dontCheck super.pcre-heavy; # GHC warnings cause the tests to fail pcre-heavy = dontCheck super.pcre-heavy; # GHC warnings cause the tests to fail