haskellPackages.selda{,-json,-sqlite}: unbreak
The package has been finally fixed upstream.
This commit is contained in:
@@ -1240,49 +1240,6 @@ with haskellLib;
|
||||
# 2022-03-19: Testsuite is failing: https://github.com/puffnfresh/haskell-jwt/issues/2
|
||||
jwt = dontCheck super.jwt;
|
||||
|
||||
# Build Selda with the latest git version.
|
||||
# See https://github.com/valderman/selda/issues/187
|
||||
inherit
|
||||
(
|
||||
let
|
||||
mkSeldaPackage =
|
||||
name:
|
||||
overrideCabal (drv: {
|
||||
version = "2024-05-05-unstable";
|
||||
src =
|
||||
pkgs.fetchFromGitHub {
|
||||
owner = "valderman";
|
||||
repo = "selda";
|
||||
rev = "50c3ba5c5da72bb758a4112363ba2fe1c0e968ea";
|
||||
hash = "sha256-LEAJsSsDL0mmVHntnI16fH8m5DmePfcU0hFw9ErqTgQ=";
|
||||
}
|
||||
+ "/${name}";
|
||||
# 2025-04-09: jailbreak to allow bytestring >= 0.12, text >= 2.1
|
||||
# Note: jailbreak ignores constraints under an if(flag)
|
||||
postPatch = ''
|
||||
check_sed() {
|
||||
if ! test -s "$1"; then
|
||||
echo "sed: pattern '$2' doesn't match anything" >&2
|
||||
exit 1
|
||||
fi
|
||||
}
|
||||
sed -i ${name}.cabal \
|
||||
-e 's/\(bytestring\) .*/\1/w c1' \
|
||||
-e 's/\(text\) .*/\1/w c2' \
|
||||
-e 's/\(aeson\) .*/\1/w c3'
|
||||
check_sed c1 'bytestring .*'
|
||||
check_sed c2 'text .*'
|
||||
${lib.optionalString (name == "selda-json") "check_sed c3 'aeson .*'"}
|
||||
'';
|
||||
}) super.${name};
|
||||
in
|
||||
lib.genAttrs [ "selda" "selda-sqlite" "selda-json" ] mkSeldaPackage
|
||||
)
|
||||
selda
|
||||
selda-sqlite
|
||||
selda-json
|
||||
;
|
||||
|
||||
# 2024-03-10: Getting the test suite to run requires a correctly crafted GHC_ENVIRONMENT variable.
|
||||
graphql-client = dontCheck super.graphql-client;
|
||||
|
||||
|
||||
@@ -5564,7 +5564,6 @@ broken-packages:
|
||||
- SecureHash-SHA3 # failure in job https://hydra.nixos.org/build/233216866 at 2023-09-02
|
||||
- secureUDP # failure in job https://hydra.nixos.org/build/233215410 at 2023-09-02
|
||||
- SegmentTree # failure in job https://hydra.nixos.org/build/233216161 at 2023-09-02
|
||||
- selda # failure in job https://hydra.nixos.org/build/307521709 at 2025-09-19
|
||||
- selda-postgresql # failure in job https://hydra.nixos.org/build/245539286 at 2024-01-02
|
||||
- selectors # failure in job https://hydra.nixos.org/build/233227433 at 2023-09-02
|
||||
- selenium # failure in job https://hydra.nixos.org/build/233214276 at 2023-09-02
|
||||
|
||||
@@ -278,7 +278,6 @@ dont-distribute-packages:
|
||||
- birch-beer
|
||||
- bird
|
||||
- BirdPP
|
||||
- bisc
|
||||
- biscuit-servant
|
||||
- bishbosh
|
||||
- bit-array
|
||||
@@ -3092,8 +3091,6 @@ dont-distribute-packages:
|
||||
- secrm
|
||||
- sednaDBXML
|
||||
- seitz-symbol
|
||||
- selda-json
|
||||
- selda-sqlite
|
||||
- SelectSequencesFromMSA
|
||||
- selenium-server
|
||||
- semantic-source
|
||||
|
||||
@@ -107882,7 +107882,6 @@ self: {
|
||||
];
|
||||
description = "A small tool that clears cookies (and more)";
|
||||
license = lib.licenses.gpl3Only;
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
mainProgram = "bisc";
|
||||
}
|
||||
) { };
|
||||
@@ -602746,8 +602745,6 @@ self: {
|
||||
];
|
||||
description = "Multi-backend, high-level EDSL for interacting with SQL databases";
|
||||
license = lib.licenses.mit;
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
broken = true;
|
||||
}
|
||||
) { };
|
||||
|
||||
@@ -602773,7 +602770,6 @@ self: {
|
||||
];
|
||||
description = "JSON support for the Selda database library";
|
||||
license = lib.licenses.mit;
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
}
|
||||
) { };
|
||||
|
||||
@@ -602844,7 +602840,6 @@ self: {
|
||||
];
|
||||
description = "SQLite backend for the Selda database EDSL";
|
||||
license = lib.licenses.mit;
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
}
|
||||
) { };
|
||||
|
||||
|
||||
Reference in New Issue
Block a user