From 521674fc9f509b04b24f5c67ea813c89990a02a6 Mon Sep 17 00:00:00 2001 From: Ross Smyth Date: Sun, 2 Nov 2025 22:39:58 -0500 Subject: [PATCH] Revert "labs/basic: Validate environment variables" This reverts commit cabbf2372acb280974e320488f947839a02d4e3c. --- tidepool/src/builders/foundation/basic.nix | 32 +--------------------- 1 file changed, 1 insertion(+), 31 deletions(-) diff --git a/tidepool/src/builders/foundation/basic.nix b/tidepool/src/builders/foundation/basic.nix index fcd5300..6738aff 100644 --- a/tidepool/src/builders/foundation/basic.nix +++ b/tidepool/src/builders/foundation/basic.nix @@ -71,40 +71,10 @@ in (lib.packages.build packages.foundation.bash.versions."5.2.15-stage1" "x86_64-linux" system).package }/bin/bash"; - # Validates that the exported environment variables are stringy - validateEnvVarType = - name: var: - if builtins.isString var || builtins.isPath var || lib.packages.isDerivation var then - var - else - throw "${builtins.unsafeGetAttrPos name package.env}: 'env.${name}' at is not a string, path, or derivation"; - - # Essentially black-listed environment variable names - # this is a list of attributes on the builtin.derivation below, keep it in sync if possible. - reservedVars = [ - "name" - "script" - "system" - "script" - "env" - "__structuredAttrs" - "SHELL" - "builder" - "args" - ]; - validateEnvVarName = - name: var: - if !(builtins.elem name reservedVars) then - var - else - throw "${builtins.unsafeGetAttrPos name package.env}: 'env.${name}' is a reserved name"; - built = builtins.derivation ({ - inherit (package) name; + inherit (package) name env; inherit script system; - env = builtins.mapAttrs (lib.fp.compose validateEnvVarType validateEnvVarName) package.env; - __structuredAttrs = true; outputs = builtins.attrNames (lib.packages.getOutputs package);