diff options
| author | Silvan Mosberger <contact@infinisil.com> | 2020-04-02 05:58:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-02 05:58:13 +0200 |
| commit | f75c11cfdfff3448623250e151cb47df70d4f224 (patch) | |
| tree | 8948892200eb72dfc795004b0220bb8d57297c62 /lib/attrsets.nix | |
| parent | 783da8ca5106cc81fd24c746e1b0009a82faba86 (diff) | |
| parent | 4b206ac83ba23e44231088b1d5f23d96adbced05 (diff) | |
| download | nixpkgs-f75c11cfdfff3448623250e151cb47df70d4f224.tar nixpkgs-f75c11cfdfff3448623250e151cb47df70d4f224.tar.gz nixpkgs-f75c11cfdfff3448623250e151cb47df70d4f224.tar.bz2 nixpkgs-f75c11cfdfff3448623250e151cb47df70d4f224.tar.lz nixpkgs-f75c11cfdfff3448623250e151cb47df70d4f224.tar.xz nixpkgs-f75c11cfdfff3448623250e151cb47df70d4f224.tar.zst nixpkgs-f75c11cfdfff3448623250e151cb47df70d4f224.zip | |
Merge pull request #83241 from Infinisil/valid-drv-name
lib/strings: Add `sanitizeDerivationName` function
Diffstat (limited to 'lib/attrsets.nix')
| -rw-r--r-- | lib/attrsets.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/attrsets.nix b/lib/attrsets.nix index 72430522f7d..7d84c25de77 100644 --- a/lib/attrsets.nix +++ b/lib/attrsets.nix @@ -4,7 +4,7 @@ let inherit (builtins) head tail length; inherit (lib.trivial) and; - inherit (lib.strings) concatStringsSep; + inherit (lib.strings) concatStringsSep sanitizeDerivationName; inherit (lib.lists) fold concatMap concatLists; in @@ -310,7 +310,7 @@ rec { path' = builtins.storePath path; res = { type = "derivation"; - name = builtins.unsafeDiscardStringContext (builtins.substring 33 (-1) (baseNameOf path')); + name = sanitizeDerivationName (builtins.substring 33 (-1) (baseNameOf path')); outPath = path'; outputs = [ "out" ]; out = res; |