Pass name argument through cleanGit (#437)

balsoft · web-flow · commit 78526fca3229 · 2020-02-08T16:09:23.000+13:00
diff --git a/lib/clean-git.nix b/lib/clean-git.nix
@@ -1,6 +1,6 @@
 # From https://github.com/NixOS/nix/issues/2944
 { lib, runCommand, git, cleanSourceWith }:
-{ src, subDir ? "" }:
+{ name ? null, src, subDir ? "" }:
 
 # The function call
 #
@@ -143,12 +143,12 @@ then
     filter = filter_from_list src whitelist;
   in
     cleanSourceWith {
-      inherit src subDir filter;
+      inherit name src subDir filter;
     }
 
 else
   trace "gitSource.nix: ${toString src} does not seem to be a git repository,\nassuming it is a clean checkout." (
     cleanSourceWith {
-      inherit src subDir;
+      inherit name src subDir;
     }
   )

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`# From https://github.com/NixOS/nix/issues/2944`
`2`	`2`	`{ lib, runCommand, git, cleanSourceWith }:`
`3`		`-{ src, subDir ? "" }:`
	`3`	`+{ name ? null, src, subDir ? "" }:`
`4`	`4`
`5`	`5`	`# The function call`
`6`	`6`	`#`
`@@ -143,12 +143,12 @@ then`
`143`	`143`	`filter = filter_from_list src whitelist;`
`144`	`144`	`in`
`145`	`145`	`cleanSourceWith {`
`146`		`- inherit src subDir filter;`
	`146`	`+ inherit name src subDir filter;`
`147`	`147`	`}`
`148`	`148`
`149`	`149`	`else`
`150`	`150`	`trace "gitSource.nix: ${toString src} does not seem to be a git repository,\nassuming it is a clean checkout." (`
`151`	`151`	`cleanSourceWith {`
`152`		`- inherit src subDir;`
	`152`	`+ inherit name src subDir;`
`153`	`153`	`}`
`154`	`154`	`)`