File tree Expand file tree Collapse file tree 4 files changed +10
-12
lines changed Expand file tree Collapse file tree 4 files changed +10
-12
lines changed Original file line number Diff line number Diff line change 30
30
# set checkMaterialization as per top-level argument
31
31
overlays = [
32
32
haskellNix . overlay
33
- ( _final : prev : {
33
+ ( final : prev : {
34
34
haskell-nix = prev . haskell-nix // {
35
35
inherit checkMaterialization ;
36
36
} ;
37
+ inherit ( import inputs . nixpkgs-2311 { system = final . system ; } ) libsodium ;
37
38
} )
38
39
] ;
39
40
# Needed for dwarf tests
Original file line number Diff line number Diff line change @@ -88,6 +88,12 @@ self // {
88
88
pkgs-2305 = import self . inputs . nixpkgs-2305 ( nixpkgsArgs // {
89
89
localSystem = { inherit system ; } ;
90
90
} ) ;
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
+ } ) ;
91
97
pkgs-unstable = import self . inputs . nixpkgs-unstable ( nixpkgsArgs // {
92
98
localSystem = { inherit system ; } ;
93
99
} ) ;
Original file line number Diff line number Diff line change 90
90
let
91
91
callFlake = import flake-compat ;
92
92
93
- ifdLevel = 0 ;
93
+ ifdLevel = 1 ;
94
94
compiler = "ghc928" ;
95
95
config = import ./config.nix ;
96
96
Original file line number Diff line number Diff line change @@ -29,16 +29,7 @@ repository ghcjs-overlay
29
29
secure: True
30
30
root-keys:
31
31
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=
42
33
43
34
if !impl(ghc>=9.11) && !os(ghcjs)
44
35
active-repositories: hackage.haskell.org
You can’t perform that action at this time.
0 commit comments