movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-14 21:49:34 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #311403 from alexfmpe/hnix

Browse source 
haskellPackages.hnix: build on 9.8
This commit is contained in:
maralorn 2024-05-13 22:26:11 +02:00 • committed by GitHub
commit 1c387916b7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
pkgs/development/haskell-modules/configuration-common.nix
View file

@ -732,7 +732,6 @@ self: super: {
Rlang-QQ = dontCheck super.Rlang-QQ; Rlang-QQ = dontCheck super.Rlang-QQ;
safecopy = dontCheck super.safecopy; safecopy = dontCheck super.safecopy;
sai-shape-syb = dontCheck super.sai-shape-syb; sai-shape-syb = dontCheck super.sai-shape-syb;
saltine = dontCheck super.saltine; # https://github.com/tel/saltine/pull/56
scp-streams = dontCheck super.scp-streams; scp-streams = dontCheck super.scp-streams;
sdl2 = dontCheck super.sdl2; # the test suite needs an x server sdl2 = dontCheck super.sdl2; # the test suite needs an x server
separated = dontCheck super.separated; separated = dontCheck super.separated;

2
pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix
View file

@ -94,6 +94,7 @@ self: super: {
diagrams-svg = doJailbreak super.diagrams-svg; # base <4.19, text <2.1 diagrams-svg = doJailbreak super.diagrams-svg; # base <4.19, text <2.1
generics-sop = doJailbreak super.generics-sop_0_5_1_4; # th-abstraction >=0.6 && <0.7 generics-sop = doJailbreak super.generics-sop_0_5_1_4; # th-abstraction >=0.6 && <0.7
ghc-trace-events = doJailbreak super.ghc-trace-events; # text < 2.1, bytestring < 0.12, base < 4.19 ghc-trace-events = doJailbreak super.ghc-trace-events; # text < 2.1, bytestring < 0.12, base < 4.19
hashing = doJailbreak super.hashing; # bytestring <0.12
json-sop = doJailbreak super.json-sop; # aeson <2.2, base <4.19, text <2.1 json-sop = doJailbreak super.json-sop; # aeson <2.2, base <4.19, text <2.1
primitive-unlifted = doJailbreak super.primitive-unlifted; # bytestring < 0.12 primitive-unlifted = doJailbreak super.primitive-unlifted; # bytestring < 0.12
statestack = doJailbreak super.statestack; # base < 4.19 statestack = doJailbreak super.statestack; # base < 4.19
@ -105,6 +106,7 @@ self: super: {
terminfo_0_4_1_6 = doJailbreak super.terminfo_0_4_1_6; terminfo_0_4_1_6 = doJailbreak super.terminfo_0_4_1_6;
HaskellNet-SSL = doJailbreak super.HaskellNet-SSL; # bytestring >=0.9 && <0.12 HaskellNet-SSL = doJailbreak super.HaskellNet-SSL; # bytestring >=0.9 && <0.12
raven-haskell = doJailbreak super.raven-haskell; # aeson <2.2 raven-haskell = doJailbreak super.raven-haskell; # aeson <2.2
saltine = doJailbreak super.saltine; # bytestring && <0.12, deepseq <1.5, text > 1.2 && <1.3 || >=2.0 && <2.1
stripe-concepts = doJailbreak super.stripe-concepts; # text >=1.2.5 && <1.3 || >=2.0 && <2.1 stripe-concepts = doJailbreak super.stripe-concepts; # text >=1.2.5 && <1.3 || >=2.0 && <2.1
stripe-signature = doJailbreak super.stripe-signature; # text >=1.2.5 && <1.3 || >=2.0 && <2.1 stripe-signature = doJailbreak super.stripe-signature; # text >=1.2.5 && <1.3 || >=2.0 && <2.1
string-random = doJailbreak super.string-random; # text >=1.2.2.1 && <2.1 string-random = doJailbreak super.string-random; # text >=1.2.2.1 && <2.1