Merge pull request #1919 from cachix/fix-tests

tests: fix failing tests

Author: sandydoo

devenv/src/flake.tmpl.nix

@@ -120,9 +120,11 @@
             lib.concatMapAttrs
               (name: option:
                 if lib.isOption option then
-                  if lib.isType "output" option || lib.isType "outputOf" option then {
-                    ${name} = config.${name};
-                  } else { }
+                  let typeName = option.type.name or "";
+                  in
+                  if builtins.elem typeName [ "output" "outputOf" ] then
+                    { ${name} = config.${name}; }
+                  else { }
                 else
                   let v = build option config.${name};
                   in if v != { } then {

tests/direnv/.test.sh

@@ -5,7 +5,7 @@
 set -xeuo pipefail
 
 # Install direnv
-export PATH="$(nix build nixpkgs#direnv --print-out-paths --no-out-link)/bin:$PATH"
+export PATH="$(nix build nixpkgs#direnv --print-out-paths)/bin:$PATH"
 
 export TMPDIR=$(mktemp -d)
 export XDG_CONFIG_HOME=${TMPDIR}/config