Merge pull request #273211 from rnhmjoj/haskell-updates

haskellPackages.scat: unbreak
2023-12-10 01:09:21 +01:00
parent 4e4b31df11 d3fcf59b67
commit cc3d0ae21e
3 changed files with 12 additions and 7 deletions
@@ -1314,12 +1314,19 @@ self: super: {
    testToolDepends = (drv.testToolDepends or []) ++ [pkgs.postgresql];
  }) super.beam-postgres;

-  # Fix for base >= 4.11
  scat = overrideCabal (drv: {
-    patches = [(fetchpatch {
-      url    = "https://github.com/redelmann/scat/pull/6.diff";
-      sha256 = "07nj2p0kg05livhgp1hkkdph0j0a6lb216f8x348qjasy0lzbfhl";
-    })];
+    patches = [
+      # Fix build with base >= 4.11
+      (fetchpatch {
+        url = "https://github.com/redelmann/scat/commit/429f22944b7634b8789cb3805292bcc2b23e3e9f.diff";
+        hash = "sha256-FLr1KfBaSYzI6MiZIBY1CkgAb5sThvvgjrSAN8EV0h4=";
+      })
+      # Fix build with vector >= 0.13
+      (fetchpatch {
+        url = "https://github.com/redelmann/scat/commit/e21cc9c17b5b605b5bc0aacad66d44bbe0beb8c4.diff";
+        hash = "sha256-MifHb2EKZx8skOcs+2t54CzxAS4PaEC0OTEfq4yVXzk=";
+      })
+    ];
  }) super.scat;

  # Fix build with attr-2.4.48 (see #53716)
@@ -4793,7 +4793,6 @@ broken-packages:
  - scale # failure in job https://hydra.nixos.org/build/233222189 at 2023-09-02
  - scaleimage # failure in job https://hydra.nixos.org/build/233240688 at 2023-09-02
  - scalendar # failure in job https://hydra.nixos.org/build/233206581 at 2023-09-02
-  - scat # failure in job https://hydra.nixos.org/build/233199202 at 2023-09-02
  - scc # failure in job https://hydra.nixos.org/build/233247446 at 2023-09-02
  - scgi # failure in job https://hydra.nixos.org/build/233247314 at 2023-09-02
  - schedevr # failure in job https://hydra.nixos.org/build/233240124 at 2023-09-02
@@ -262949,7 +262949,6 @@ self: {
       platforms = lib.platforms.x86;
       hydraPlatforms = lib.platforms.none;
       mainProgram = "scat";
-       broken = true;
     }) {};

  "scc" = callPackage