From 506f69d8a724226df751c9fbc6b9205023215135 Mon Sep 17 00:00:00 2001
From: Kevin Veen-Birkenbach <kevin@veen.world>
Date: Sat, 13 Dec 2025 15:27:06 +0100
Subject: [PATCH] Solved variable bug

---
 .github/workflows/test-e2e.yml         | 2 +-
 .github/workflows/test-env-nix.yml     | 2 +-
 .github/workflows/test-env-virtual.yml | 2 +-
 .github/workflows/test-virgin-root.yml | 2 +-
 .github/workflows/test-virgin-user.yml | 2 +-
 flake.nix                              | 4 ----
 scripts/build/image.sh                 | 2 +-
 7 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml
index 60b4da8..0068491 100644
--- a/.github/workflows/test-e2e.yml
+++ b/.github/workflows/test-e2e.yml
@@ -10,7 +10,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        distro: [arch, debian, ubuntu, fedora, centos]
+        PKGMGR_DISTRO: [arch, debian, ubuntu, fedora, centos]
 
     steps:
       - name: Checkout repository
diff --git a/.github/workflows/test-env-nix.yml b/.github/workflows/test-env-nix.yml
index 4161fb6..c7615fc 100644
--- a/.github/workflows/test-env-nix.yml
+++ b/.github/workflows/test-env-nix.yml
@@ -11,7 +11,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        distro: [arch, debian, ubuntu, fedora, centos]
+        PKGMGR_DISTRO: [arch, debian, ubuntu, fedora, centos]
 
     steps:
       - name: Checkout repository
diff --git a/.github/workflows/test-env-virtual.yml b/.github/workflows/test-env-virtual.yml
index f5f59d8..48441d5 100644
--- a/.github/workflows/test-env-virtual.yml
+++ b/.github/workflows/test-env-virtual.yml
@@ -10,7 +10,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        distro: [arch, debian, ubuntu, fedora, centos]
+        PKGMGR_DISTRO: [arch, debian, ubuntu, fedora, centos]
 
     steps:
       - name: Checkout repository
diff --git a/.github/workflows/test-virgin-root.yml b/.github/workflows/test-virgin-root.yml
index c856d5f..20f2bc5 100644
--- a/.github/workflows/test-virgin-root.yml
+++ b/.github/workflows/test-virgin-root.yml
@@ -10,7 +10,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        distro: [arch, debian, ubuntu, fedora, centos]
+        PKGMGR_DISTRO: [arch, debian, ubuntu, fedora, centos]
 
     steps:
       - name: Checkout repository
diff --git a/.github/workflows/test-virgin-user.yml b/.github/workflows/test-virgin-user.yml
index 8887938..b38eb02 100644
--- a/.github/workflows/test-virgin-user.yml
+++ b/.github/workflows/test-virgin-user.yml
@@ -10,7 +10,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        distro: [arch, debian, ubuntu, fedora, centos]
+        PKGMGR_DISTRO: [arch, debian, ubuntu, fedora, centos]
 
     steps:
       - name: Checkout repository
diff --git a/flake.nix b/flake.nix
index 1969d8b..032d818 100644
--- a/flake.nix
+++ b/flake.nix
@@ -26,10 +26,6 @@
       packages = forAllSystems (system:
         let
           pkgs = nixpkgs.legacyPackages.${system};
-
-          # Single source of truth for pkgmgr: Python 3.11
-          # - Matches pyproject.toml: requires-python = ">=3.11"
-          # - Uses python311Packages so that PyYAML etc. are available
           python = pkgs.python311;
           pyPkgs = pkgs.python311Packages;
         in
diff --git a/scripts/build/image.sh b/scripts/build/image.sh
index 61645eb..d8029d7 100755
--- a/scripts/build/image.sh
+++ b/scripts/build/image.sh
@@ -6,7 +6,7 @@ SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 # shellcheck source=./scripts/build/base.sh
 source "${SCRIPT_DIR}/base.sh"
 
-: "${distro:?Environment variable 'distro' must be set (arch|debian|ubuntu|fedora|centos)}"
+: "${PKGMGR_DISTRO:?Environment variable 'PKGMGR_DISTRO' must be set (arch|debian|ubuntu|fedora|centos)}"
 
 NO_CACHE=0
 MISSING_ONLY=0