File tree Expand file tree Collapse file tree 3 files changed +17
-21
lines changed Expand file tree Collapse file tree 3 files changed +17
-21
lines changed Original file line number Diff line number Diff line change 10
10
nixpkgs-2211 = { url = "github:NixOS/nixpkgs/nixpkgs-22.11-darwin" ; } ;
11
11
nixpkgs-2305 = { url = "github:NixOS/nixpkgs/nixpkgs-23.05-darwin" ; } ;
12
12
nixpkgs-2311 = { url = "github:NixOS/nixpkgs/nixpkgs-23.11-darwin" ; } ;
13
- # The libsodium bump in 85c6e70b555fe892a049fa3d9dce000dc23a9562 breaks th-dll tests.
14
- # And later it breaks in th-dll due to some change in the windows libs. We should probably
15
- # drop unsable.
16
- nixpkgs-unstable = { url = "github:NixOS/nixpkgs?rev=47585496bcb13fb72e4a90daeea2f434e2501998" ; } ; # nixpkgs-unstable };
13
+ nixpkgs-unstable = { url = "github:NixOS/nixpkgs/nixpkgs-unstable" ; } ;
17
14
ghc910X = {
18
15
flake = false ;
19
16
url = "git+https://gitlab.haskell.org/ghc/ghc?ref=ghc-9.10&submodules=1" ;
Original file line number Diff line number Diff line change @@ -30,13 +30,12 @@ repository ghcjs-overlay
30
30
31
31
-- This is needed because nixpkgs has 1.0.19, and libsodium has
32
32
-- too tight bounds <1.0.18.
33
- -- TODO put this back in if hackage is still not updated when we update nixpkgs-unstable
34
- --if !os(ghcjs)
35
- -- source-repository-package
36
- -- type: git
37
- -- location: https://github.com/hamishmack/hs-libsodium.git
38
- -- tag: c094f210f3bd34d97204451ea57855a5d17e2086
39
- -- --sha256: sha256-6iCKvdLdjwg2jcoWMEj3qcFTvKe3P4BYxgKeXY3QwRM=
33
+ if !os(ghcjs)
34
+ source-repository-package
35
+ type: git
36
+ location: https://github.com/hamishmack/hs-libsodium.git
37
+ tag: c094f210f3bd34d97204451ea57855a5d17e2086
38
+ --sha256: sha256-6iCKvdLdjwg2jcoWMEj3qcFTvKe3P4BYxgKeXY3QwRM=
40
39
41
40
if !impl(ghc>=9.10) && !os(ghcjs)
42
41
active-repositories: hackage.haskell.org
You can’t perform that action at this time.
0 commit comments