diff options
| author | maralorn <mail@maralorn.de> | 2024-03-10 13:47:16 +0100 |
|---|---|---|
| committer | maralorn <mail@maralorn.de> | 2024-03-10 13:47:16 +0100 |
| commit | 84269dc031052cb3a0ca0c5b43b68bf49a840d4e (patch) | |
| tree | 2d363291db397d527b43e4a1e7e7dbac8d5075f6 /pkgs/development/haskell-modules | |
| parent | 13d10cc6e302e7d5800c6a08c1728b14c3801e26 (diff) | |
| download | nixlib-84269dc031052cb3a0ca0c5b43b68bf49a840d4e.tar nixlib-84269dc031052cb3a0ca0c5b43b68bf49a840d4e.tar.gz nixlib-84269dc031052cb3a0ca0c5b43b68bf49a840d4e.tar.bz2 nixlib-84269dc031052cb3a0ca0c5b43b68bf49a840d4e.tar.lz nixlib-84269dc031052cb3a0ca0c5b43b68bf49a840d4e.tar.xz nixlib-84269dc031052cb3a0ca0c5b43b68bf49a840d4e.tar.zst nixlib-84269dc031052cb3a0ca0c5b43b68bf49a840d4e.zip | |
haskellPackages.threadscope: Fix build
Diffstat (limited to 'pkgs/development/haskell-modules')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 33 |
1 files changed, 31 insertions, 2 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index fa715aed8c66..01a67c32c15b 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -311,8 +311,37 @@ self: super: { }) ]) super.memory; - # 2023-06-10: Too strict version bound on https://github.com/haskell/ThreadScope/issues/118 - threadscope = doJailbreak super.threadscope; + # 2024-03-10: Maintainance stalled, fixes unmerged: https://github.com/haskell/ThreadScope/pull/130 + threadscope = overrideCabal (drv: { + prePatch = drv.prePatch or "" + '' + ${pkgs.buildPackages.dos2unix}/bin/dos2unix *.cabal + ''; + editedCabalFile = null; + revision = null; + }) + (appendPatches [ + (fetchpatch { + name = "loosen-bounds-1.patch"; + url = "https://github.com/haskell/ThreadScope/commit/8f9f21449adb3af07eed539dcaf267c9c9ee987b.patch"; + sha256 = "sha256-egKM060QplSmUeDptHXoSom1vf5KBrvNcjb2Vk59N7A="; + }) + (fetchpatch { + name = "loosen-bounds-2.patch"; + url = "https://github.com/haskell/ThreadScope/commit/f366a9ee455eda16cd6a4dc26f0275e2cf2b5798.patch"; + sha256 = "sha256-DaPTK5LRbZZS1KDIr5X/eXQasqtofrCteTbUQUZPu0Q="; + }) + (fetchpatch { + name = "loosen-bounds-3.patch"; + url = "https://github.com/haskell/ThreadScope/commit/12819abaa2322976004b7582e598db1cf952707a.patch"; + sha256 = "sha256-r7MVw8wwKU4R5VmcypBzhOBfTlRCISoRJtwie3+2Vb0="; + }) + (fetchpatch { + name = "import-monad.patch"; + url = "https://github.com/haskell/ThreadScope/commit/8846508e9769a8dfd82b3ff66259ba4d58255932.patch"; + sha256 = "sha256-wBqDJWmqvmU1sFuw/ZlxHOb8xPhZO2RBuyYFP9bJCVI="; + }) + ] + super.threadscope); # http2 also overridden in all-packages.nix for mailctl. # twain is currently only used by mailctl, so the .overrideScope shouldn't |