From 67bb428465ceb3b32f33363bbfda66effb381cae Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sun, 10 Dec 2023 02:12:33 +0100 Subject: [PATCH] haskellPackages.selda: unbreak MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Support for GHC 9.4 and text ≥ 2 has been implemented but still unreleased on Hackage. --- .../haskell-modules/configuration-common.nix | 20 +++++++++++++++++++ .../configuration-hackage2nix/broken.yaml | 1 - .../haskell-modules/hackage-packages.nix | 1 - 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 795677ec2d67..198e4b209ff1 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -879,6 +879,26 @@ self: super: { # 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 = "2023-02-05-unstable"; + src = pkgs.fetchFromGitHub { + owner = "valderman"; + repo = "selda"; + rev = "ab9619db13b93867d1a244441bb4de03d3e1dadb"; + hash = "sha256-P0nqAYzbeTyEEgzMij/3mKcs++/p/Wgc7Y6bDudXt2U="; + } + "/${name}"; + }) super.${name}; + in + lib.genAttrs [ "selda" "selda-sqlite" "selda-json" ] mkSeldaPackage + ) + selda + selda-sqlite + selda-json + ; + # Build the latest git version instead of the official release. This isn't # ideal, but Chris doesn't seem to make official releases any more. structured-haskell-mode = overrideCabal (drv: { diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 17a1b3c3ee6f..593a0409b995 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -4842,7 +4842,6 @@ broken-packages: - secure-sockets # failure in job https://hydra.nixos.org/build/233254170 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/233234757 at 2023-09-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 - selinux # failure in job https://hydra.nixos.org/build/233192853 at 2023-09-02 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 1d5e1858e67d..a92ecbbc74fd 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -265266,7 +265266,6 @@ self: { description = "Multi-backend, high-level EDSL for interacting with SQL databases"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "selda-json" = callPackage