public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #83201 from michaelpj/imp/sources-unnamed 

cleanSourceWith: don't use baseNameOf
This commit is contained in:
Robert Hensing 2020-03-24 10:05:32 +01:00 committed by GitHub
parent e93767d5a0 07f363fae3
commit 1484e1acfe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/sources.nix
View File

@ -63,17 +63,14 @@ rec {
# https://nixos.org/nix/manual/#builtin-filterSource # https://nixos.org/nix/manual/#builtin-filterSource
# #
# name: Optional name to use as part of the store path. # name: Optional name to use as part of the store path.
# This defaults `src.name` or otherwise `baseNameOf src`. # This defaults to `src.name` or otherwise `"source"`.
# We recommend setting `name` whenever `src` is syntactically `./.`.
# Otherwise, you depend on `./.`'s name in the parent directory,
# which can cause inconsistent names, defeating caching.
# #
cleanSourceWith = { filter ? _path: _type: true, src, name ? null }: cleanSourceWith = { filter ? _path: _type: true, src, name ? null }:
let let
isFiltered = src ? _isLibCleanSourceWith; isFiltered = src ? _isLibCleanSourceWith;
origSrc = if isFiltered then src.origSrc else src; origSrc = if isFiltered then src.origSrc else src;
filter' = if isFiltered then name: type: filter name type && src.filter name type else filter; filter' = if isFiltered then name: type: filter name type && src.filter name type else filter;
name' = if name != null then name else if isFiltered then src.name else baseNameOf src; name' = if name != null then name else if isFiltered then src.name else "source";
in { in {
inherit origSrc; inherit origSrc;
filter = filter'; filter = filter';