Skip to content

Commit 5198ff3

Browse files
committed
Pin libsodium to nixpkgs 23.11 version for ci
1 parent d5e28de commit 5198ff3

File tree

4 files changed

+10
-12
lines changed

4 files changed

+10
-12
lines changed

ci.nix

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,11 @@
3030
# set checkMaterialization as per top-level argument
3131
overlays = [
3232
haskellNix.overlay
33-
(_final: prev: {
33+
(final: prev: {
3434
haskell-nix = prev.haskell-nix // {
3535
inherit checkMaterialization;
3636
};
37+
inherit (import inputs.nixpkgs-2311 { system = final.system; }) libsodium;
3738
})
3839
];
3940
# Needed for dwarf tests

default.nix

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,12 @@ self // {
8888
pkgs-2305 = import self.inputs.nixpkgs-2305 (nixpkgsArgs // {
8989
localSystem = { inherit system; };
9090
});
91+
pkgs-2311 = import self.inputs.nixpkgs-2311 (nixpkgsArgs // {
92+
localSystem = { inherit system; };
93+
});
94+
pkgs-2405 = import self.inputs.nixpkgs-2405 (nixpkgsArgs // {
95+
localSystem = { inherit system; };
96+
});
9197
pkgs-unstable = import self.inputs.nixpkgs-unstable (nixpkgsArgs // {
9298
localSystem = { inherit system; };
9399
});

flake.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
let
9191
callFlake = import flake-compat;
9292

93-
ifdLevel = 0;
93+
ifdLevel = 1;
9494
compiler = "ghc928";
9595
config = import ./config.nix;
9696

test/cabal.project.local

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,7 @@ repository ghcjs-overlay
2929
secure: True
3030
root-keys:
3131
key-threshold: 0
32-
--sha256: sha256-jcOUSw6rtBdLXx5/yx1EMKaYfvVWJgpTVe567jA81Ls=<<<<<<< HEAD
33-
34-
-- This is needed because nixpkgs has 1.0.19, and libsodium has
35-
-- too tight bounds <1.0.18.
36-
if !os(ghcjs)
37-
source-repository-package
38-
type: git
39-
location: https://github.com/hamishmack/hs-libsodium.git
40-
tag: c094f210f3bd34d97204451ea57855a5d17e2086
41-
--sha256: sha256-6iCKvdLdjwg2jcoWMEj3qcFTvKe3P4BYxgKeXY3QwRM=
32+
--sha256: sha256-jcOUSw6rtBdLXx5/yx1EMKaYfvVWJgpTVe567jA81Ls=
4233

4334
if !impl(ghc>=9.11) && !os(ghcjs)
4435
active-repositories: hackage.haskell.org

0 commit comments

Comments
 (0)