diff options
| author | rnhmjoj <rnhmjoj@inventati.org> | 2024-06-05 12:46:17 +0200 |
|---|---|---|
| committer | rnhmjoj <rnhmjoj@inventati.org> | 2024-06-06 12:16:30 +0200 |
| commit | 4636757b18c6c3496f74d5908b871ba56c8273f6 (patch) | |
| tree | 660c725613e4287fd723573bff4d04196a229624 | |
| parent | 9106eb8ad99147c1bc5830a903479672d2bd8cdf (diff) | |
haskellPackages.scat: unbreak
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 9 | ||||
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml | 1 |
2 files changed, 4 insertions, 6 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 5252b2e6c1a0..20db1716580f 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1359,18 +1359,17 @@ self: super: { ''; }) super.PortMidi; - # Fix for base >= 4.11 scat = overrideCabal (drv: { patches = [ - # Fix build with base >= 4.11 + # Fix build with base >= 4.11 (https://github.com/redelmann/scat/pull/6) (fetchpatch { url = "https://github.com/redelmann/scat/commit/429f22944b7634b8789cb3805292bcc2b23e3e9f.diff"; hash = "sha256-FLr1KfBaSYzI6MiZIBY1CkgAb5sThvvgjrSAN8EV0h4="; }) - # Fix build with vector >= 0.13 + # Fix build with vector >= 0.13, mtl >= 2.3 (https://github.com/redelmann/scat/pull/8) (fetchpatch { - url = "https://github.com/redelmann/scat/commit/e21cc9c17b5b605b5bc0aacad66d44bbe0beb8c4.diff"; - hash = "sha256-MifHb2EKZx8skOcs+2t54CzxAS4PaEC0OTEfq4yVXzk="; + url = "https://github.com/redelmann/scat/compare/e8e064f7e6a152fe25a6ccd743573a16974239d0..c6a3636548d628f32d8edc73a333188ce24141a7.patch"; + hash = "sha256-BU4MUn/TnZHpZBlX1vDHE7QZva5yhlLTb8zwpx7UScI"; }) ]; }) super.scat; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 49153fe02b73..63db50732055 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -5187,7 +5187,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/252730427 at 2024-03-16 - 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 |