From f43f9987c5f60aca5c73cb316b7a01d028bae4ec Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 26 Dec 2024 19:02:36 +0100 Subject: [PATCH] haskellPackages.repa*: drop obsolete patches haskellPackages.repa-{eval,scalar}: drop stale broken flag --- .../haskell-modules/configuration-common.nix | 30 ------------------- .../configuration-hackage2nix/broken.yaml | 2 -- .../haskell-modules/hackage-packages.nix | 4 --- 3 files changed, 36 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 4680f50cc4fe..c8b67a60f9bb 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2942,36 +2942,6 @@ self: super: { }) super.linux-namespaces; - inherit - (let - unbreakRepa = packageName: drv: lib.pipe drv [ - # 2023-12-23: Apply build fixes for ghc >=9.4 - (appendPatches (lib.optionals (lib.versionAtLeast self.ghc.version "9.4") (repaPatches.${packageName} or []))) - # 2023-12-23: jailbreak for base <4.17, vector <0.13 - doJailbreak - ]; - # https://github.com/haskell-repa/repa/pull/27 - repaPatches = lib.mapAttrs (relative: hash: lib.singleton (pkgs.fetchpatch { - name = "repa-pr-27.patch"; - url = "https://github.com/haskell-repa/repa/pull/27/commits/40cb2866bb4da51a8cac5e3792984744a64b016e.patch"; - inherit relative hash; - })) { - repa = "sha256-bcSnzvCJmmSBts9UQHA2dYL0Q+wXN9Fbz5LfkrmhCo8="; - repa-io = "sha256-KsIN7NPWCyTpVzhR+xaBKGl8vC6rYH94llvlTawSxFk="; - repa-examples = "sha256-//2JG1CW1h2sKS2BSJadVAujSE3v1TfS0F8zgcNkPI8="; - repa-algorithms = "sha256-z/a7DpT3xJrIsif4cbciYcTSjapAtCoNNVX7PrZtc4I="; - }; - in - lib.mapAttrs unbreakRepa super) - repa - repa-io - repa-examples - repa-algorithms - # The following packages aren't fixed yet, sorry: - # repa-array, repa-convert, repa-eval, repa-flow, - # repa-query, repa-scalar, repa-store, repa-stream - ; - # Use recent git version as the hackage version is outdated and not building on recent GHC versions haskell-to-elm = overrideSrc { version = "unstable-2023-12-02"; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 7301b7acb197..1d514e510c3b 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -5099,10 +5099,8 @@ broken-packages: - reorder-expression # failure in job https://hydra.nixos.org/build/233215573 at 2023-09-02 - repa-bytestring # failure in job https://hydra.nixos.org/build/252723812 at 2024-03-16 - repa-devil # failure in job https://hydra.nixos.org/build/252724171 at 2024-03-16 - - repa-eval # failure in job https://hydra.nixos.org/build/233259486 at 2023-09-02 - repa-examples # failure in job https://hydra.nixos.org/build/252712195 at 2024-03-16 - repa-linear-algebra # failure in job https://hydra.nixos.org/build/252713634 at 2024-03-16 - - repa-scalar # failure in job https://hydra.nixos.org/build/233213694 at 2023-09-02 - repa-series # failure in job https://hydra.nixos.org/build/233200085 at 2023-09-02 - ReplaceUmlaut # failure in job https://hydra.nixos.org/build/233228662 at 2023-09-02 - repl # failure in job https://hydra.nixos.org/build/233233135 at 2023-09-02 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 01d707e4e0d3..6461ff4912ed 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -265867,8 +265867,6 @@ self: { libraryHaskellDepends = [ base ]; description = "Low-level parallel operators on bulk random-accessble arrays"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "repa-examples" = callPackage @@ -265988,8 +265986,6 @@ self: { ]; description = "Scalar data types and conversions"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "repa-series" = callPackage