lol

Merge pull request #273211 from rnhmjoj/haskell-updates

haskellPackages.scat: unbreak

authored by

Naïm Favier and committed by
GitHub
cc3d0ae2 4e4b31df

+12 -7
+12 -5
pkgs/development/haskell-modules/configuration-common.nix
··· 1314 1314 testToolDepends = (drv.testToolDepends or []) ++ [pkgs.postgresql]; 1315 1315 }) super.beam-postgres; 1316 1316 1317 - # Fix for base >= 4.11 1318 1317 scat = overrideCabal (drv: { 1319 - patches = [(fetchpatch { 1320 - url = "https://github.com/redelmann/scat/pull/6.diff"; 1321 - sha256 = "07nj2p0kg05livhgp1hkkdph0j0a6lb216f8x348qjasy0lzbfhl"; 1322 - })]; 1318 + patches = [ 1319 + # Fix build with base >= 4.11 1320 + (fetchpatch { 1321 + url = "https://github.com/redelmann/scat/commit/429f22944b7634b8789cb3805292bcc2b23e3e9f.diff"; 1322 + hash = "sha256-FLr1KfBaSYzI6MiZIBY1CkgAb5sThvvgjrSAN8EV0h4="; 1323 + }) 1324 + # Fix build with vector >= 0.13 1325 + (fetchpatch { 1326 + url = "https://github.com/redelmann/scat/commit/e21cc9c17b5b605b5bc0aacad66d44bbe0beb8c4.diff"; 1327 + hash = "sha256-MifHb2EKZx8skOcs+2t54CzxAS4PaEC0OTEfq4yVXzk="; 1328 + }) 1329 + ]; 1323 1330 }) super.scat; 1324 1331 1325 1332 # Fix build with attr-2.4.48 (see #53716)
-1
pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
··· 4793 4793 - scale # failure in job https://hydra.nixos.org/build/233222189 at 2023-09-02 4794 4794 - scaleimage # failure in job https://hydra.nixos.org/build/233240688 at 2023-09-02 4795 4795 - scalendar # failure in job https://hydra.nixos.org/build/233206581 at 2023-09-02 4796 - - scat # failure in job https://hydra.nixos.org/build/233199202 at 2023-09-02 4797 4796 - scc # failure in job https://hydra.nixos.org/build/233247446 at 2023-09-02 4798 4797 - scgi # failure in job https://hydra.nixos.org/build/233247314 at 2023-09-02 4799 4798 - schedevr # failure in job https://hydra.nixos.org/build/233240124 at 2023-09-02
-1
pkgs/development/haskell-modules/hackage-packages.nix
··· 262949 262949 platforms = lib.platforms.x86; 262950 262950 hydraPlatforms = lib.platforms.none; 262951 262951 mainProgram = "scat"; 262952 - broken = true; 262953 262952 }) {}; 262954 262953 262955 262954 "scc" = callPackage