From e7678382514c6d8bd555be6721c8df91e2dec7cf Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sun, 23 Jul 2017 23:25:37 +0200
Subject: infest prepare: sed NIX_PATH more lenient everywhere

---
 krebs/4lib/infest/prepare.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'krebs')

diff --git a/krebs/4lib/infest/prepare.sh b/krebs/4lib/infest/prepare.sh
index d39aca348..92e32a905 100644
--- a/krebs/4lib/infest/prepare.sh
+++ b/krebs/4lib/infest/prepare.sh
@@ -217,7 +217,7 @@ prepare_common() {(
   mkdir -p bin
   rm -f bin/nixos-install
   cp "$(type -p nixos-install)" bin/nixos-install
-  sed -i "s@^NIX_PATH=\"[^\"]*\"@NIX_PATH=$target_path@" bin/nixos-install
+  sed -i "s@NIX_PATH=\"[^\"]*\"@NIX_PATH=$target_path@" bin/nixos-install
 
   if ! grep -q '^PATH.*#krebs' .bashrc; then
     echo '. /root/.nix-profile/etc/profile.d/nix.sh' >> .bashrc
-- 
cgit v1.2.3


From 05eb415beac2c27530d71d9db56b6af199e2fbb0 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sun, 23 Jul 2017 23:36:25 +0200
Subject: infest prepare nix: 1.10 -> 1.11.13

---
 krebs/4lib/infest/prepare.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'krebs')

diff --git a/krebs/4lib/infest/prepare.sh b/krebs/4lib/infest/prepare.sh
index 92e32a905..a16903db4 100644
--- a/krebs/4lib/infest/prepare.sh
+++ b/krebs/4lib/infest/prepare.sh
@@ -1,8 +1,8 @@
 #! /bin/sh
 set -efu
 
-nix_url=https://nixos.org/releases/nix/nix-1.10/nix-1.10-x86_64-linux.tar.bz2
-nix_sha256=504f7a3a85fceffb8766ae5e1005de9e02e489742f5a63cc3e7552120b138bf4
+nix_url=https://nixos.org/releases/nix/nix-1.11.13/nix-1.11.13-x86_64-linux.tar.bz2
+nix_sha256=c11411d52d8ad1ce3a68410015487282fd4651d3abefbbb13fa1f7803a2f60de
 
 prepare() {(
   if test -e /etc/os-release; then
-- 
cgit v1.2.3


From c5fef87af8cba674198cd55ab1153d586db18080 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 25 Jul 2017 12:32:37 +0200
Subject: writeOut: don't modify stdenv's shell

This fixes following (and maybe more) issues:
- /nix/store/*-stdenv/setup: line 125: showBuildStats: unbound variable
- /nix/store/*-stdenv/setup: line 69: !hookName: unbound variable
---
 krebs/5pkgs/writers.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'krebs')

diff --git a/krebs/5pkgs/writers.nix b/krebs/5pkgs/writers.nix
index 49ca3557e..f1626078e 100644
--- a/krebs/5pkgs/writers.nix
+++ b/krebs/5pkgs/writers.nix
@@ -144,9 +144,14 @@ with import <stockholm/lib>;
 
       env = filevars // { passAsFile = attrNames filevars; };
     in
+      # Use a subshell because <nixpkgs/stdenv/generic/setup.sh>'s genericBuild
+      # sources (or evaluates) the buildCommand and we don't want to modify its
+      # shell.  In particular, exitHandler breaks in multiple ways with set -u.
       pkgs.runCommand name env /* sh */ ''
-        set -efu
-        ${concatMapStringsSep "\n" (getAttr "install") files}
+        (
+          set -efu
+          ${concatMapStringsSep "\n" (getAttr "install") files}
+        )
       '';
 
     writeHaskell =
-- 
cgit v1.2.3


From a15592411e0703180d36dbd8fd50503a6d8d33bb Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 25 Jul 2017 17:48:42 +0200
Subject: infest prepare: drop support for CentOS 6

---
 krebs/4lib/infest/prepare.sh | 11 -----------
 1 file changed, 11 deletions(-)

(limited to 'krebs')

diff --git a/krebs/4lib/infest/prepare.sh b/krebs/4lib/infest/prepare.sh
index a16903db4..ccfc4f49b 100644
--- a/krebs/4lib/infest/prepare.sh
+++ b/krebs/4lib/infest/prepare.sh
@@ -14,10 +14,6 @@ prepare() {(
         ;;
       centos)
         case $VERSION_ID in
-          6)
-            prepare_centos "$@"
-            exit
-            ;;
           7)
             prepare_centos "$@"
             exit
@@ -51,13 +47,6 @@ prepare() {(
         esac
         ;;
     esac
-  elif test -e /etc/centos-release; then
-    case $(cat /etc/centos-release) in
-      'CentOS release 6.5 (Final)')
-        prepare_centos "$@"
-        exit
-        ;;
-    esac
   fi
   echo "$0 prepare: unknown OS" >&2
   exit -1
-- 
cgit v1.2.3