From 7fdc46bb9d911838edfa723d985ede6a604c0c5a Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 6 Jul 2017 21:47:47 +0200
Subject: move source config from module system to 1systems/*/source.nix

---
 krebs/3modules/build.nix | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'krebs')

diff --git a/krebs/3modules/build.nix b/krebs/3modules/build.nix
index 976d378f..904deb16 100644
--- a/krebs/3modules/build.nix
+++ b/krebs/3modules/build.nix
@@ -14,16 +14,9 @@ with import <stockholm/lib>;
       default = "/nix/var/nix/profiles/system";
     };
 
-    source = mkOption {
-      type = types.attrsOf types.source;
-      default = {};
-    };
-
     # TODO deprecate krebs.build.user
     user = mkOption {
       type = types.user;
     };
   };
-
-  config.krebs.build.source.stockholm.file = mkDefault (toString <stockholm>);
 }
-- 
cgit v1.2.3


From 8fc6574c63d5727ef36292f24297bb291b9b4f06 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Wed, 12 Jul 2017 16:56:14 +0200
Subject: whatsupnix: exit != 0 on Nix errors

---
 krebs/5pkgs/simple/whatsupnix/whatsupnix.bash | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

(limited to 'krebs')

diff --git a/krebs/5pkgs/simple/whatsupnix/whatsupnix.bash b/krebs/5pkgs/simple/whatsupnix/whatsupnix.bash
index 2ad9aadc..e21e0f1b 100644
--- a/krebs/5pkgs/simple/whatsupnix/whatsupnix.bash
+++ b/krebs/5pkgs/simple/whatsupnix/whatsupnix.bash
@@ -14,15 +14,30 @@
 #
 #   1     Usage error; arguments couldn't be parsed.
 #
-#   2     Build error; at least one failed derivation could be found.
+#   2     Nix error; input looks like Nix failed.
+#
+#   3     Build error; at least one failed derivation could be found.
 #
 
-failed_drvs=$(mktemp --tmpdir whatsupnix.XXXXXXXX)
-trap 'rm -f -- "$failed_drvs"' EXIT
+tmpdir=$(mktemp -d --tmpdir whatsupnix.XXXXXXXX)
+failed_drvs=$tmpdir/failed_drvs; touch "$failed_drvs"
+nix_errors=$tmpdir/nix_errors; touch "$nix_errors"
+cleanup() {
+  rm "$failed_drvs"
+  rm "$nix_errors"
+  rmdir "$tmpdir"
+}
+trap cleanup EXIT
 
 exec >&2
 
-gawk -v failed_drvs="$failed_drvs" '
+gawk \
+    -v failed_drvs="$failed_drvs" \
+    -v nix_errors="$nix_errors" \
+'
+  /^(\033\[31;1m)?error:/ {
+    print $0 >> nix_errors
+  }
   match($0, /^builder for ‘(\/nix\/store\/[^’]+\.drv)’ failed/, m) {
     print m[1] >> failed_drvs
   }
@@ -73,8 +88,10 @@ while read -r drv; do
   echo
 done < "$failed_drvs"
 
-if test -s "$failed_drvs"; then
+if test -s "$nix_errors"; then
   exit 2
+elif test -s "$failed_drvs"; then
+  exit 3
 else
   exit 0
 fi
-- 
cgit v1.2.3