Skip to content

Commit c26b6ac

Browse files
committed
support ghc 9.6
1 parent eac2f2b commit c26b6ac

File tree

3 files changed

+24
-7
lines changed

3 files changed

+24
-7
lines changed

default.nix

+5
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ let
33
sources = import ./nix/sources.nix;
44
nixos-22-05 = import sources."nixos-22.05" {};
55
nixos-22-11 = import sources."nixos-22.11" {};
6+
nixos-unstable = import sources."nixos-unstable" {};
67
inherit (nixos-22-11) haskell lib symlinkJoin;
78
inherit (lib) fold composeExtensions concatMap attrValues;
89

@@ -33,6 +34,10 @@ ghc."9.4" = nixos-22-11.haskell.packages.ghc94.override (old: {
3334
overrides = combineOverrides old [ sourceOverrides depOverrides ];
3435
});
3536

37+
ghc."9.6" = nixos-unstable.haskell.packages.ghc96.override (old: {
38+
overrides = combineOverrides old [ sourceOverrides depOverrides ];
39+
});
40+
3641
in
3742

3843
symlinkJoin {

nix/sources.json

+18-6
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
"homepage": "",
66
"owner": "NixOS",
77
"repo": "nixpkgs",
8-
"rev": "5cfefb9600de34ce9b8015be80948e5ce7458816",
9-
"sha256": "14vwma7lvx0vmq1gk2fp1f6k9s0009awb58z0dlv00rxzyyw02rc",
8+
"rev": "50fc86b75d2744e1ab3837ef74b53f103a9b55a0",
9+
"sha256": "15jvdj6gwfccbdixrxn8y5b9hb63pxci7a3lkl21yxkm2ix03bl5",
1010
"type": "tarball",
11-
"url": "https://github.com/NixOS/nixpkgs/archive/5cfefb9600de34ce9b8015be80948e5ce7458816.tar.gz",
11+
"url": "https://github.com/NixOS/nixpkgs/archive/50fc86b75d2744e1ab3837ef74b53f103a9b55a0.tar.gz",
1212
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
1313
},
1414
"nixos-22.11": {
@@ -17,10 +17,22 @@
1717
"homepage": "",
1818
"owner": "NixOS",
1919
"repo": "nixpkgs",
20-
"rev": "9898811c658d39b2692d0ab744377e02fd85d08b",
21-
"sha256": "0vk147ivb029h5pmg6nb127nvfgmy728nlnzk7x152dl1b68jmx0",
20+
"rev": "db1e4eeb0f9a9028bcb920e00abbc1409dd3ef36",
21+
"sha256": "1yc6ms5n8kjlpqpb625j8z4qnx5cgdgfdrm64bsdzqb3lg61flwh",
2222
"type": "tarball",
23-
"url": "https://github.com/NixOS/nixpkgs/archive/9898811c658d39b2692d0ab744377e02fd85d08b.tar.gz",
23+
"url": "https://github.com/NixOS/nixpkgs/archive/db1e4eeb0f9a9028bcb920e00abbc1409dd3ef36.tar.gz",
24+
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
25+
},
26+
"nixos-unstable": {
27+
"branch": "nixos-unstable",
28+
"description": "Nix Packages collection",
29+
"homepage": "",
30+
"owner": "NixOS",
31+
"repo": "nixpkgs",
32+
"rev": "da45bf6ec7bbcc5d1e14d3795c025199f28e0de0",
33+
"sha256": "0f4f9xh4rkgk9in2hzwm371vahppdixbdb73ki1v5dq1r2iv015h",
34+
"type": "tarball",
35+
"url": "https://github.com/NixOS/nixpkgs/archive/da45bf6ec7bbcc5d1e14d3795c025199f28e0de0.tar.gz",
2436
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
2537
}
2638
}

unfork/unfork.cabal

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ common base
4646
-Wall
4747
build-depends:
4848
async ^>= 2.2.4
49-
, base ^>= 4.14 || ^>= 4.15 || ^>= 4.16 || ^>= 4.17
49+
, base ^>= 4.14 || ^>= 4.15 || ^>= 4.16 || ^>= 4.17 || ^>= 4.18
5050
, safe-exceptions ^>= 0.1.7
5151
, stm ^>= 2.5
5252

0 commit comments

Comments
 (0)