don't use "injected" pkgs anywhere

since we do weird pkgs pinning this is OK.

Author: Lillecarl

kubenix/builder.nix

@@ -1,9 +1,9 @@
 {
   config,
   lib,
-  pkgs,
   x86Pkgs,
   armPkgs,
+  curPkgs,
   mkNCSI,
   ...
 }:
@@ -38,7 +38,7 @@ in
             };
             resources = lib.mkOption {
               description = "Resource requests/limits for builder pods";
-              type = (pkgs.formats.json { }).type;
+              type = (curPkgs.formats.json { }).type;
               default = {
                 requests = {
                   cpu = "1";
@@ -68,7 +68,7 @@ in
       };
       nixConfig = lib.mkOption {
         description = "nix.conf for builder pods";
-        type = (import ./nixOptions.nix) pkgs;
+        type = (import ./nixOptions.nix) curPkgs;
       };
       deployments = lib.mkOption {
         type = lib.types.attrsOf deployType;

kubenix/cache.nix

@@ -1,9 +1,9 @@
 {
   config,
   lib,
-  pkgs,
   x86Pkgs,
   armPkgs,
+  curPkgs,
   mkNCSI,
   ...
 }:
@@ -16,7 +16,7 @@ in
     enable = lib.mkEnableOption "cache";
     nixConfig = lib.mkOption {
       description = "nix.conf for cache pod";
-      type = (import ./nixOptions.nix) pkgs;
+      type = (import ./nixOptions.nix) curPkgs;
     };
 
     storageClassName = lib.mkOption {

kubenix/ci/default.nix

@@ -1,6 +1,6 @@
 {
   config,
-  pkgs,
+  curPkgs,
   lib,
   mkNCSI,
   subPath,
@@ -9,7 +9,7 @@
 }:
 let
   cfg = config.nix-csi;
-  system = pkgs.stdenv.hostPlatform.system;
+  system = curPkgs.stdenv.hostPlatform.system;
 
   containers = lib.mkNamedList {
     hello = {
@@ -114,7 +114,7 @@ in
                 nix-csi.csi = {
                   driver = "nix.csi.store";
                   readOnly = true;
-                  volumeAttributes.${system} = pkgs.hello;
+                  volumeAttributes.${system} = curPkgs.hello;
                 };
               };
             };
@@ -127,7 +127,7 @@ in
             spec = {
               restartPolicy = "Never";
               containers = lib.recursiveUpdate containers {
-                hello.command = [ (lib.getExe pkgs.hello) ];
+                hello.command = [ (lib.getExe curPkgs.hello) ];
               };
               volumes = lib.mkNamedList {
                 nix-csi.csi = {
@@ -148,11 +148,11 @@ in
                 hello = {
                   command = [
                     (lib.getExe (
-                      pkgs.writeShellApplication {
+                      curPkgs.writeShellApplication {
                         name = "printer";
                         runtimeInputs = [
-                          pkgs.coreutils
-                          pkgs.hello
+                          curPkgs.coreutils
+                          curPkgs.hello
                         ];
                         text = # bash
                           ''
@@ -164,8 +164,8 @@ in
                     ))
                   ];
                   env = lib.mkNamedList {
-                    SSL_CERT_FILE.value = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt";
-                    SSL_CERT_DIR.value = "${pkgs.cacert}/etc/ssl/certs";
+                    SSL_CERT_FILE.value = "${curPkgs.cacert}/etc/ssl/certs/ca-bundle.crt";
+                    SSL_CERT_DIR.value = "${curPkgs.cacert}/etc/ssl/certs";
                   };
                   volumeMounts =
                     let
@@ -186,11 +186,11 @@ in
                           subPath = subPath "${if lib.pathExists sPath then sPath else throw "path no good homes"}";
                           readOnly = true;
                         };
-                      testEnv = pkgs.buildEnv {
+                      testEnv = curPkgs.buildEnv {
                         name = "testenv";
                         paths = [
-                          pkgs.dockerTools.fakeNss
-                          pkgs.dockerTools.binSh
+                          curPkgs.dockerTools.fakeNss
+                          curPkgs.dockerTools.binSh
                         ];
                       };
                     in

kubenix/config.nix

@@ -1,6 +1,5 @@
 {
   config,
-  pkgs,
   lib,
   mkNCSI,
   x86Pkgs,

kubenix/daemonset.nix

@@ -1,7 +1,6 @@
 {
   config,
   lib,
-  pkgs,
   x86Pkgs,
   armPkgs,
   curPkgs,
@@ -19,7 +18,7 @@ in
     };
     nixConfig = lib.mkOption {
       description = "nix.conf for CSI/mounter/DaemonSet pods";
-      type = (import ./nixOptions.nix) pkgs;
+      type = (import ./nixOptions.nix) curPkgs;
     };
   };
   config =

kubenix/options.nix

@@ -1,6 +1,6 @@
 {
   config,
-  pkgs,
+  curPkgs,
   lib,
   ...
 }:
@@ -53,7 +53,7 @@ in
     };
     metadata = lib.mkOption {
       description = "Labels added to nix-csi resources";
-      type = (pkgs.formats.json { }).type;
+      type = (curPkgs.formats.json { }).type;
       default = { };
     };
     version = lib.mkOption {
@@ -97,7 +97,7 @@ in
         Python logging configuration dict for nix-csi service.
         See https://docs.python.org/3/library/logging.config.html#logging-config-dictschema
       '';
-      type = (pkgs.formats.json { }).type;
+      type = (curPkgs.formats.json { }).type;
       default = {
         version = 1;
         formatters = {

kubenix/secret.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   config,
   lib,
   mkNCSI,