steveej/infra
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

update to nixUnstable

Browse source
This commit is contained in:
steveej 2022-01-03 21:03:05 +01:00
parent d20830e4d1
commit c2aa524d64
2 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
nix/os/profiles/common/system.nix
View file

@ -22,6 +22,7 @@
nix.maxJobs = lib.mkDefault "auto"; nix.maxJobs = lib.mkDefault "auto";
nix.buildCores = lib.mkDefault 0; nix.buildCores = lib.mkDefault 0;
nix.useSandbox = true; nix.useSandbox = true;
nix.package = pkgs.nixUnstable;
environment.etc."lvm/lvm.conf".text = '' environment.etc."lvm/lvm.conf".text = ''
devices { devices {

4
nix/scripts/pre-eval-fixed.sh
View file

@ -2,5 +2,7 @@
set -xe set -xe
INFILE="${1:?Please set arg1 to INFILE}" INFILE="${1:?Please set arg1 to INFILE}"
OUTFILE="${2:?Please set arg2 to OUTFILE}" OUTFILE="${2:?Please set arg2 to OUTFILE}"
hash=$(nix-build ${INFILE} --arg pkgs 'import <channels-nixos-stable> {}' --arg config 'null' 2>&1 | rg -o 'got.*sha256:([0-9a-z]{52})' -r '$1') # sha256-1fm94N2Y9ptXVN6ni0nJyPRK+nsvoeliqBcFyjlaTH4=
hash=$(nix-build ${INFILE} --arg pkgs 'import <channels-nixos-stable> {}' --arg config 'null' 2>&1 | rg -o 'got.*(sha256-.{44})' -r '$1')
sed -E "s/0{52}/${hash}/" ${INFILE} > ${OUTFILE} sed -E "s/0{52}/${hash}/" ${INFILE} > ${OUTFILE}