From 30af4a9e27cdafd4be6997c9764c5c9b229ea550 Mon Sep 17 00:00:00 2001
From: Michael Gallagher <mjgallag@gmail.com>
Date: Thu, 15 Aug 2024 17:56:05 -0700
Subject: [PATCH 1/2] nix-daemon.sh profile script: operate under `set -u` in
 bash

see https://github.com/NixOS/nix/commit/d459d3307c7b1b10f6489ed048fff192e7834928
---
 scripts/nix-profile-daemon.sh.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/nix-profile-daemon.sh.in b/scripts/nix-profile-daemon.sh.in
index eb124c0b5..59c00d491 100644
--- a/scripts/nix-profile-daemon.sh.in
+++ b/scripts/nix-profile-daemon.sh.in
@@ -52,7 +52,7 @@ elif [ -e /etc/pki/tls/certs/ca-bundle.crt ]; then # Fedora, CentOS
 else
   # Fall back to what is in the nix profiles, favouring whatever is defined last.
   check_nix_profiles() {
-    if [ -n "$ZSH_VERSION" ]; then
+    if [ -n "${ZSH_VERSION:-}" ]; then
       # Zsh by default doesn't split words in unquoted parameter expansion.
       # Set local_options for these options to be reverted at the end of the function
       # and shwordsplit to force splitting words in $NIX_PROFILES below.

From 2f0db04da08e67f29577c27fae3c0eb758fc0879 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Mon, 19 Aug 2024 16:41:40 +0200
Subject: [PATCH 2/2] tests.installer: Load profile with -o unset

Tested with an ubuntu case. Might need revision depending on what hydra
thinks of the rest.
---
 tests/installer/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tests/installer/default.nix b/tests/installer/default.nix
index 4aed6eae4..7c82045ad 100644
--- a/tests/installer/default.nix
+++ b/tests/installer/default.nix
@@ -217,10 +217,16 @@ let
         $ssh <<EOF
           set -ex
 
+          # enable nounset while loading the profile
+          # this may or may not work on all distros, depending on the quality of their scripts
+          set -u
+
           # FIXME: get rid of this; ideally ssh should just work.
           source ~/.bash_profile || true
           source ~/.bash_login || true
           source ~/.profile || true
+          set +u
+
           source /etc/bashrc || true
 
           nix-env --version