File tree Expand file tree Collapse file tree 4 files changed +5
-22
lines changed Expand file tree Collapse file tree 4 files changed +5
-22
lines changed Original file line number Diff line number Diff line change 41
41
42
42
- label : ' Check that the haskell.nix roots do not require IFDs'
43
43
command :
44
- - yes | nix build .#roots.x86_64-linux --option allow-import-from-derivation false
44
+ - nix build .#roots.x86_64-linux --accept-flake-config --option allow-import-from-derivation false
45
45
agents :
46
46
system : x86_64-linux
47
47
Original file line number Diff line number Diff line change 35
35
36
36
cd ..
37
37
38
- yes | nix --experimental-features 'nix-command flakes' flake lock --update-input ${ name }
38
+ nix flack lock --accept-flake-config \
39
+ --experimental-features 'nix-command flakes' \
40
+ --update-input ${ name }
39
41
''
Load Diff This file was deleted.
Original file line number Diff line number Diff line change @@ -20,16 +20,7 @@ printf "*** Cleaning package build directories..." >& 2
20
20
rm -rvf * /cabal.project.local * /.ghc.environment* * /dist * /dist-newstyle * /.stack-work
21
21
echo >& 2
22
22
23
- # This was needed is first place to make hix template / flake devShell examples
24
- # not require interactive user confirmation. Because the IOG nix cache settings
25
- # are defined in the `nixConfig` flake attribute.
26
- if [ ! -z ${CI+x} ]; then
27
- printf " *** Set custom nix.conf for CI ..." >& 2
28
- export XDG_CONFIG_HOME=$HOME /.config
29
- mkdir -p $XDG_CONFIG_HOME /nix
30
- cp ./nix.conf $XDG_CONFIG_HOME /nix
31
- echo >& 2
32
- fi
23
+ alias nix=" nix --accept-flake-config"
33
24
34
25
printf " *** Running the nix-build tests...\n" >& 2
35
26
nix build $NIX_BUILD_ARGS \
You can’t perform that action at this time.
0 commit comments