From d0662e31851ccb33d38a82938f2042fe013ecc33 Mon Sep 17 00:00:00 2001
From: Skryta Istota <6970043-hidden-being@users.noreply.gitlab.com>
Date: Sun, 30 Nov 2025 11:44:23 +0100
Subject: [PATCH 1/2] fix(helpers): use builtin nix store location indicator

---
 lib/impl/helpers.nix | 2 +-
 tests/cilib_test.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/impl/helpers.nix b/lib/impl/helpers.nix
index 48a79fc..754cead 100644
--- a/lib/impl/helpers.nix
+++ b/lib/impl/helpers.nix
@@ -50,7 +50,7 @@ in rec {
   filterJobVariables = shouldContain: job:
     concatMapAttrs (
       name: value:
-        optionalAttrs ((hasInfix "/nix/store/" value) == shouldContain) {
+        optionalAttrs ((hasInfix builtins.storeDir value) == shouldContain) {
           ${name} = value;
         }
     )
diff --git a/tests/cilib_test.nix b/tests/cilib_test.nix
index 78e99a3..b53308c 100644
--- a/tests/cilib_test.nix
+++ b/tests/cilib_test.nix
@@ -129,7 +129,7 @@
           # sh
           ''
             set -euo pipefail
-            ${ntlib.helpers.path [pkgs.jq pkgs.gnugrep pkgs.coreutils]}
+            ${ntlib.helpers.path (with pkgs; [jq gnugrep coreutils])}
             echo "two keys, one json one pretty"
             jq 'keys | length == 2' "${pipeline}" | grep -q true
             echo "key[0] is exactly 'gitlab-ci:pipeline:test'"

From 96e6fe59bffec37e89ef38d78d50c0a3de43ea44 Mon Sep 17 00:00:00 2001
From: Skryta Istota <6970043-hidden-being@users.noreply.gitlab.com>
Date: Sun, 30 Nov 2025 14:14:14 +0100
Subject: [PATCH 2/2] ci: fix oci image used for dog fooding & forks

---
 .gitlab-ci.yml  | 2 ++
 nix/repo/ci.nix | 1 +
 2 files changed, 3 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bff742c..e8c146c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -55,3 +55,5 @@ stages:
 - build-images
 - build
 - trigger
+variables:
+  NIX_CI_IMAGE: $CI_REGISTRY_IMAGE/nix-ci:$CI_COMMIT_SHORT_SHA
diff --git a/nix/repo/ci.nix b/nix/repo/ci.nix
index a76c0d8..157ede7 100644
--- a/nix/repo/ci.nix
+++ b/nix/repo/ci.nix
@@ -10,6 +10,7 @@ in
       # the child pipeline can then use the built images to test them
       extraData = {
         stages = ["build-images" "build" "trigger"];
+        variables.NIX_CI_IMAGE = "$CI_REGISTRY_IMAGE/nix-ci:$CI_COMMIT_SHORT_SHA";
         "build:image" = {
           stage = "build-images";
           parallel.matrix = [