File tree Expand file tree Collapse file tree 9 files changed +69
-52
lines changed Expand file tree Collapse file tree 9 files changed +69
-52
lines changed Original file line number Diff line number Diff line change 1
1
# 'supportedSystems' restricts the set of systems that we will evaluate for. Useful when you're evaluating
2
2
# on a machine with e.g. no way to build the Darwin IFDs you need!
3
- { ifdLevel ? 3
3
+ { ifdLevel # This is passed in from flake.nix
4
4
, checkMaterialization ? false
5
5
, system ? builtins . currentSystem
6
6
, evalSystem ? builtins . currentSystem or "x86_64-linux"
Original file line number Diff line number Diff line change 97
97
let
98
98
callFlake = import flake-compat ;
99
99
100
+ ifdLevel = 3 ;
100
101
compiler = "ghc928" ;
101
102
config = import ./config.nix ;
102
103
208
209
stripAttrsForHydra ( filterDerivations (
209
210
# This is awkward.
210
211
import ./ci.nix {
211
- inherit system ;
212
+ inherit ifdLevel system ;
212
213
haskellNix = self ;
213
214
} ) ) ) ;
214
215
250
251
} ;
251
252
in cf . defaultNix . hydraJobs ;
252
253
in
253
- self . allJobs . ${ system } // { nix-tools = nix-tools-hydraJobs . ${ system } or { } ; }
254
+ self . allJobs . ${ system }
255
+ // lib . optionalAttrs ( ifdLevel > 2 )
256
+ { nix-tools = nix-tools-hydraJobs . ${ system } or { } ; }
254
257
) ;
255
258
256
259
devShells = forEachSystemPkgs ( pkgs :
284
287
"ghc921" "ghc922" "ghc923" ] )
285
288
) ;
286
289
} ; in with ( import nixpkgs { system = "x86_64-linux" ; } ) ;
287
- traceHydraJobs ( lib . recursiveUpdate flake {
290
+ traceHydraJobs ( lib . recursiveUpdate flake ( lib . optionalAttrs ( ifdLevel > 2 ) {
288
291
hydraJobs . nix-tools = pkgs . releaseTools . aggregate {
289
292
name = "nix-tools" ;
290
293
constituents = [
299
302
( writeText "gitrev" ( self . rev or "0000000000000000000000000000000000000000" ) )
300
303
] ;
301
304
} ;
302
- } ) ;
305
+ } ) ) ;
303
306
304
307
# --- Flake Local Nix Configuration ----------------------------
305
308
nixConfig = {
Original file line number Diff line number Diff line change 1
- pkgs : let baseurl = "https://github.com/input-output-hk/haskell.nix/releases/download/nix-tools-0.1.7 /" ; in {
1
+ pkgs : let baseurl = "https://github.com/input-output-hk/haskell.nix/releases/download/nix-tools-0.1.8 /" ; in {
2
2
aarch64-darwin = pkgs . fetchurl {
3
3
name = "aarch64-darwin-nix-tools-static" ;
4
4
url = "${ baseurl } aarch64-darwin-nix-tools-static.zip" ;
5
- sha256 = "sha256-f8XbWzHV+yriUvPCxEOt7CuVN5pfE4rbz37OPRG8j7U =" ;
5
+ sha256 = "sha256-du+QOnEkjVQFHiwHr7NGOku/fmvBUCFYRPipzU/MRPc =" ;
6
6
} ;
7
7
x86_64-darwin = pkgs . fetchurl {
8
8
name = "x86_64-darwin-nix-tools-static" ;
9
9
url = "${ baseurl } x86_64-darwin-nix-tools-static.zip" ;
10
- sha256 = "sha256-kLy9lqJKaISgnfkyiQf7uupRImt3vR/szwXxR+rmDic =" ;
10
+ sha256 = "sha256-I55Mn6iKYxy3uoQp3DyhuJOvUJ+mDP9In9DyuEaw6K4 =" ;
11
11
} ;
12
12
aarch64-linux = pkgs . fetchurl {
13
13
name = "aarch64-linux-nix-tools-static" ;
14
14
url = "${ baseurl } aarch64-linux-nix-tools-static.zip" ;
15
- sha256 = "sha256-GBq5/JsZamuUZLIXEWxVk5Xnj6eZeQU6vX7ceAcBmAM =" ;
15
+ sha256 = "sha256-kx06o5tzow6PCdkV+mlQW4TQHdkEZGtSvH4sij5ZaYk =" ;
16
16
} ;
17
17
x86_64-linux = pkgs . fetchurl {
18
18
name = "x86_64-linux-nix-tools-static" ;
19
19
url = "${ baseurl } x86_64-linux-nix-tools-static.zip" ;
20
- sha256 = "sha256-+tFokn7TNptt2BkROc6QVy2KgWNmPzPVv4tUCm/E7vI =" ;
20
+ sha256 = "sha256-02mBvbW5WT+0fY9n2RIbrNnMwpJIHZ5obgmFXDTz8Ds =" ;
21
21
} ;
22
22
}
Original file line number Diff line number Diff line change 1
1
index-state : 2024-03-28T00:00 :00Z
2
2
3
- with-compiler : ghc-9.2.8
4
-
5
3
packages : nix-tools
6
4
7
5
-- haskell.nix expects nix-tools to provide the cabal and hpack executables
8
6
-- so we put these two packages here, so they will be present even if nix-tools
9
7
-- dependencies change
10
- extra-packages : cabal-install, hpack
8
+ extra-packages : cabal-install, hpack, Cabal-syntax-json
11
9
12
10
test-show-details : direct
13
11
@@ -29,3 +27,9 @@ source-repository-package
29
27
location : https://github.com/michaelpj/hackage-db.git
30
28
tag : f3b9240212b036391871e4ea09891e91efcea7a1
31
29
--sha256 : sha256-n0ATmkwtR68E2FuZK3QIQgZirVmWbd21vIQmzhGKsRw=
30
+
31
+ source-repository-package
32
+ type : git
33
+ location : https://github.com/andreabedini/Cabal-syntax-json.git
34
+ tag : bf97be0038489239a11c61653b55afc77356ac1e
35
+ --sha256 : sha256-i9TEqQqRqFM07q1Lr6wcMlURhBkhkVxHhP1jQjSE+Yg=
Original file line number Diff line number Diff line change @@ -29,7 +29,7 @@ library
29
29
, Stack2nix.External.Resolve
30
30
, Stack2nix.Project
31
31
, Stack2nix.Stack
32
- build-depends : base >= 4 && < 4.18
32
+ build-depends : base >= 4 && < 4.20
33
33
, Cabal >= 3.10.3 && < 3.11
34
34
, Cabal-syntax >= 3.10 && < 3.11
35
35
, aeson >= 2.0 && < 2.3
@@ -46,7 +46,7 @@ library
46
46
-- Needs https://github.com/input-output-hk/iohk-nix/commit/6a8c29117eff36ce975e02e01efc8b25d93fcb90#diff-6fb0c6517b547a8baf082d5d2d604842
47
47
-- to work with the data-dir issues when building components.
48
48
-- This commit is included since 0.6.5.
49
- , hnix >= 0.6.5 && < 0.17
49
+ , hnix >= 0.6.5 && < 0.18
50
50
, hpack
51
51
, http-client
52
52
, http-client-tls
Original file line number Diff line number Diff line change 1
1
final : _prev :
2
2
3
3
let
4
- compiler-nix-name = "ghc8107 " ;
4
+ compiler-nix-name = "ghc964 " ;
5
5
6
6
nix-tools = nix-tools-set {
7
7
nix-tools = nix-tools-unchecked ;
18
18
src = ./. ;
19
19
20
20
compiler-nix-name = final . lib . mkDefault compiler-nix-name ;
21
- compilerSelection = p : p . haskell . compiler ;
21
+ # compilerSelection = p: p.haskell.compiler;
22
22
23
23
# tests need to fetch hackage
24
24
configureArgs = final . lib . mkDefault "--disable-tests" ;
54
54
55
55
inherit ( project . hsPkgs . hpack . components . exes )
56
56
hpack ;
57
+
58
+ inherit ( project . hsPkgs . Cabal-syntax-json . components . exes )
59
+ cabal2json ;
57
60
} ;
58
61
59
62
warning = final . lib . mapAttrs
Original file line number Diff line number Diff line change 40
40
plan-to-nix . dontStrip = false ;
41
41
stack-repos . dontStrip = false ;
42
42
} ;
43
+ packages . cabal-install . components . exes . cabal . dontStrip = false ;
44
+ packages . hpack . components . exes . hpack . dontStrip = false ;
45
+ packages . Cabal-syntax-json . components . exes . cabal2json . dontStrip = false ;
43
46
} ;
44
47
45
48
53
56
packages . nix-tools . ghcOptions = [
54
57
"-L${ pkgs . lib . getLib pkgs . static-gmp } /lib"
55
58
] ;
59
+ packages . Cabal-syntax-json . ghcOptions = [
60
+ "-L${ pkgs . lib . getLib pkgs . static-gmp } /lib"
61
+ ] ;
56
62
} ;
57
63
58
64
Original file line number Diff line number Diff line change 35
35
drvs' = [
36
36
hsPkgs . cabal-install . components . exes . cabal
37
37
hsPkgs . hpack . components . exes . hpack
38
+ hsPkgs . Cabal-syntax-json . components . exes . cabal2json
38
39
] ++ strippedNixToolsComponents ;
39
40
} ;
40
41
You can’t perform that action at this time.
0 commit comments