diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-03-16 18:01:20 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-16 18:01:20 +0000 |
| commit | 455127ad5e31ebf396f1fa861af121bb4ca49f9e (patch) | |
| tree | 78da7dc534da2ab7831274baa3dfc6d5f1809e31 /pkgs/stdenv/generic | |
| parent | 80a0ae17b54bcf6ce86c5a54663083970ef5cc37 (diff) | |
| parent | c3e12e57c3e3d5c84cc500420be4507b3de33e90 (diff) | |
| download | nixpkgs-455127ad5e31ebf396f1fa861af121bb4ca49f9e.tar nixpkgs-455127ad5e31ebf396f1fa861af121bb4ca49f9e.tar.gz nixpkgs-455127ad5e31ebf396f1fa861af121bb4ca49f9e.tar.bz2 nixpkgs-455127ad5e31ebf396f1fa861af121bb4ca49f9e.tar.lz nixpkgs-455127ad5e31ebf396f1fa861af121bb4ca49f9e.tar.xz nixpkgs-455127ad5e31ebf396f1fa861af121bb4ca49f9e.tar.zst nixpkgs-455127ad5e31ebf396f1fa861af121bb4ca49f9e.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/stdenv/generic')
| -rw-r--r-- | pkgs/stdenv/generic/make-derivation.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 7d8c311edce..50d4b58615b 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -214,7 +214,7 @@ let checkDependencyList = checkDependencyList' []; checkDependencyList' = positions: name: deps: lib.flip lib.imap1 deps (index: dep: - if lib.isDerivation dep || isNull dep || builtins.typeOf dep == "string" || builtins.typeOf dep == "path" then dep + if lib.isDerivation dep || dep == null || builtins.typeOf dep == "string" || builtins.typeOf dep == "path" then dep else if lib.isList dep then checkDependencyList' ([index] ++ positions) name dep else throw "Dependency is not of a valid type: ${lib.concatMapStrings (ix: "element ${toString ix} of ") ([index] ++ positions)}${name} for ${attrs.name or attrs.pname}"); in if builtins.length erroneousHardeningFlags != 0 |