From b185ffeefcaa99827ed337624a12a9b90e049d04 Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Wed, 6 Mar 2019 15:58:00 +0100
Subject: [PATCH] nix: adapt to 19.03 changes

---
 nix/home-manager/configuration/graphical-fullblown.nix | 2 +-
 nix/scripts/pre-eval-fixed.sh                          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nix/home-manager/configuration/graphical-fullblown.nix b/nix/home-manager/configuration/graphical-fullblown.nix
index 3498b45..9ce39a0 100644
--- a/nix/home-manager/configuration/graphical-fullblown.nix
+++ b/nix/home-manager/configuration/graphical-fullblown.nix
@@ -150,7 +150,7 @@ in {
       # virtualbox
       vagrant
       rkt
-      # 2019-03-05: missing on 19.03 python27Packages.docker_compose
+      docker_compose
       # unstablepkgs.kubernetes
       unstablepkgs.minikube
       unstablepkgs.openshift
diff --git a/nix/scripts/pre-eval-fixed.sh b/nix/scripts/pre-eval-fixed.sh
index 314346f..e6bc4a0 100755
--- a/nix/scripts/pre-eval-fixed.sh
+++ b/nix/scripts/pre-eval-fixed.sh
@@ -2,5 +2,5 @@
 set -xe
 INFILE="${1:?Please set arg1 to INFILE}"
 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}