Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 17 additions & 12 deletions pkgs/development/haskell-modules/configuration-common.nix
Original file line number Diff line number Diff line change
Expand Up @@ -220,10 +220,16 @@ self: super: {
fused-effects-random = doJailbreak super.fused-effects-random;
fused-effects-readline = doJailbreak super.fused-effects-readline;

# fix tests failure for base≥4.15 (https://github.com/kim/leveldb-haskell/pull/41)
leveldb-haskell = appendPatch (fetchpatch {
url = "https://github.com/kim/leveldb-haskell/commit/f5249081f589233890ddb1945ec548ca9fb717cf.patch";
sha256 = "14gllipl28lqry73c5dnclsskzk1bsrrgazibl4lkl8z98j2csjb";
leveldb-haskell = overrideCabal (drv: {
version = "2024-05-05-unstable";
# Fix tests on mtl ≥ 2.3
# https://github.com/kim/leveldb-haskell/pull/42
src = pkgs.fetchFromGitHub {
owner = "kim";
repo = "leveldb-haskell";
rev = "3a505f3a7de0f5d14463538d7c2c9a9881a60eb9";
sha256 = "sha256-okUn5ZuWcj8vPr0GWXvO1LygNCrDfttkDaUoOt+FLA0=";
};
}) super.leveldb-haskell;

# Arion's test suite needs a Nixpkgs, which is cumbersome to do from Nixpkgs
Expand Down Expand Up @@ -964,12 +970,12 @@ self: super: {
# See https://github.com/valderman/selda/issues/187
inherit (let
mkSeldaPackage = name: overrideCabal (drv: {
version = "2023-02-05-unstable";
version = "2024-05-05-unstable";
src = pkgs.fetchFromGitHub {
owner = "valderman";
repo = "selda";
rev = "ab9619db13b93867d1a244441bb4de03d3e1dadb";
hash = "sha256-P0nqAYzbeTyEEgzMij/3mKcs++/p/Wgc7Y6bDudXt2U=";
rev = "50c3ba5c5da72bb758a4112363ba2fe1c0e968ea";
hash = "sha256-LEAJsSsDL0mmVHntnI16fH8m5DmePfcU0hFw9ErqTgQ=";
} + "/${name}";
}) super.${name};
in
Expand Down Expand Up @@ -1360,18 +1366,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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3447,7 +3447,6 @@ broken-packages:
- lenz-template # failure in job https://hydra.nixos.org/build/233206822 at 2023-09-02
- less-arbitrary # failure in job https://hydra.nixos.org/build/233231412 at 2023-09-02
- Level0 # failure in job https://hydra.nixos.org/build/233220758 at 2023-09-02
- leveldb-haskell # failure in job https://hydra.nixos.org/build/252739424 at 2024-03-16
- level-monad # failure in job https://hydra.nixos.org/build/233257036 at 2023-09-02
- levmar # failure in job https://hydra.nixos.org/build/233254731 at 2023-09-02
- lfst # failure in job https://hydra.nixos.org/build/233240622 at 2023-09-02
Expand Down Expand Up @@ -5185,7 +5184,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
Expand Down Expand Up @@ -5241,7 +5239,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/252735635 at 2024-03-16
- selda-postgresql # failure in job https://hydra.nixos.org/build/245539286 at 2024-01-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
Expand Down
6 changes: 0 additions & 6 deletions pkgs/development/haskell-modules/hackage-packages.nix

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.