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

nix: adapt to 19.03 changes

Browse source
This commit is contained in:
steveej 2019-03-06 15:58:00 +01:00
parent 98812731b6
commit b185ffeefc
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nix/home-manager/configuration/graphical-fullblown.nix
View file

@ -150,7 +150,7 @@ in {
# virtualbox # virtualbox
vagrant vagrant
rkt rkt
# 2019-03-05: missing on 19.03 python27Packages.docker_compose docker_compose
# unstablepkgs.kubernetes # unstablepkgs.kubernetes
unstablepkgs.minikube unstablepkgs.minikube
unstablepkgs.openshift unstablepkgs.openshift

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

@ -2,5 +2,5 @@
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 | grep -oE '[0-9a-z]{52}' | head -n1) 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')
sed -E "s/0{52}/${hash}/" ${INFILE} > ${OUTFILE} sed -E "s/0{52}/${hash}/" ${INFILE} > ${OUTFILE}