Skip to content

Commit d0e33ae

Browse files
committed
Put nixpkgs updates back in
1 parent 49a2b56 commit d0e33ae

File tree

3 files changed

+17
-21
lines changed

3 files changed

+17
-21
lines changed

flake.lock

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,7 @@
1010
nixpkgs-2211 = { url = "github:NixOS/nixpkgs/nixpkgs-22.11-darwin"; };
1111
nixpkgs-2305 = { url = "github:NixOS/nixpkgs/nixpkgs-23.05-darwin"; };
1212
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"; };
1714
ghc910X = {
1815
flake = false;
1916
url = "git+https://gitlab.haskell.org/ghc/ghc?ref=ghc-9.10&submodules=1";

test/cabal.project.local

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,12 @@ repository ghcjs-overlay
3030

3131
-- This is needed because nixpkgs has 1.0.19, and libsodium has
3232
-- 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=
4039

4140
if !impl(ghc>=9.10) && !os(ghcjs)
4241
active-repositories: hackage.haskell.org

0 commit comments

Comments
 (0)