Update Crate.nix files

nagisa · kolloch · commit ca777b252d76 · 2021-01-07T21:03:36.000+01:00
diff --git a/crate2nix/Cargo.nix b/crate2nix/Cargo.nix
@@ -156,12 +156,12 @@ rec {
             name = "libc";
             packageId = "libc";
             usesDefaultFeatures = false;
-            target = { target, features }: target."unix";
+            target = { target, features }: (target."unix" or false);
           }
           {
             name = "winapi";
             packageId = "winapi";
-            target = { target, features }: target."windows";
+            target = { target, features }: (target."windows" or false);
             features = [ "consoleapi" "processenv" "minwinbase" "minwindef" "winbase" ];
           }
         ];
@@ -348,7 +348,7 @@ rec {
             name = "ansi_term";
             packageId = "ansi_term";
             optional = true;
-            target = { target, features }: (!target."windows");
+            target = { target, features }: (!(target."windows" or false));
           }
           {
             name = "atty";
@@ -825,7 +825,7 @@ rec {
           {
             name = "winapi-util";
             packageId = "winapi-util";
-            target = { target, features }: target."windows";
+            target = { target, features }: (target."windows" or false);
           }
         ];
         features = {
@@ -1229,7 +1229,7 @@ rec {
             name = "libc";
             packageId = "libc";
             optional = true;
-            target = { target, features }: target."unix";
+            target = { target, features }: (target."unix" or false);
           }
           {
             name = "rand_core";
@@ -1245,7 +1245,7 @@ rec {
           {
             name = "winapi";
             packageId = "winapi";
-            target = { target, features }: target."windows";
+            target = { target, features }: (target."windows" or false);
             features = [ "minwindef" "ntsecapi" "profileapi" "winnt" ];
           }
         ];
@@ -1386,7 +1386,7 @@ rec {
           {
             name = "winapi";
             packageId = "winapi";
-            target = { target, features }: target."windows";
+            target = { target, features }: (target."windows" or false);
             features = [ "std" "errhandlingapi" "winerror" "fileapi" "winbase" ];
           }
         ];
@@ -1415,7 +1415,7 @@ rec {
           {
             name = "winapi-util";
             packageId = "winapi-util";
-            target = { target, features }: target."windows";
+            target = { target, features }: (target."windows" or false);
           }
         ];
         
@@ -2064,13 +2064,13 @@ rec {
           {
             name = "winapi";
             packageId = "winapi";
-            target = { target, features }: target."windows";
+            target = { target, features }: (target."windows" or false);
             features = [ "std" "winnt" ];
           }
           {
             name = "winapi-util";
             packageId = "winapi-util";
-            target = { target, features }: target."windows";
+            target = { target, features }: (target."windows" or false);
           }
         ];
         
@@ -2122,7 +2122,7 @@ rec {
           {
             name = "winapi";
             packageId = "winapi";
-            target = { target, features }: target."windows";
+            target = { target, features }: (target."windows" or false);
             features = [ "std" "consoleapi" "errhandlingapi" "fileapi" "minwindef" "processenv" "winbase" "wincon" "winerror" "winnt" ];
           }
         ];
diff --git a/sample_projects/bin_with_git_submodule_dep/Cargo.nix b/sample_projects/bin_with_git_submodule_dep/Cargo.nix
@@ -138,12 +138,12 @@ rec {
             name = "libc";
             packageId = "libc";
             usesDefaultFeatures = false;
-            target = { target, features }: target."unix";
+            target = { target, features }: (target."unix" or false);
           }
           {
             name = "winapi";
             packageId = "winapi";
-            target = { target, features }: target."windows";
+            target = { target, features }: (target."windows" or false);
             features = [ "consoleapi" "processenv" "minwinbase" "minwindef" "winbase" ];
           }
         ];
@@ -465,7 +465,7 @@ rec {
             name = "ansi_term";
             packageId = "ansi_term";
             optional = true;
-            target = { target, features }: (!target."windows");
+            target = { target, features }: (!(target."windows" or false));
           }
           {
             name = "atty";
@@ -602,7 +602,7 @@ rec {
             name = "libc";
             packageId = "libc";
             usesDefaultFeatures = false;
-            target = { target, features }: target."unix";
+            target = { target, features }: (target."unix" or false);
           }
           {
             name = "wasi";
@@ -673,12 +673,12 @@ rec {
           {
             name = "getrandom";
             packageId = "getrandom";
-            target = { target, features }: target."windows";
+            target = { target, features }: (target."windows" or false);
           }
           {
             name = "libc";
             packageId = "libc";
-            target = { target, features }: target."unix";
+            target = { target, features }: (target."unix" or false);
           }
           {
             name = "log";
@@ -726,7 +726,7 @@ rec {
           {
             name = "winapi";
             packageId = "winapi";
-            target = { target, features }: target."windows";
+            target = { target, features }: (target."windows" or false);
             features = [ "winerror" "errhandlingapi" "libloaderapi" ];
           }
         ];
@@ -1060,7 +1060,7 @@ rec {
           {
             name = "wincolor";
             packageId = "wincolor";
-            target = { target, features }: target."windows";
+            target = { target, features }: (target."windows" or false);
           }
         ];
         
@@ -1253,7 +1253,7 @@ rec {
           {
             name = "winapi";
             packageId = "winapi";
-            target = { target, features }: target."windows";
+            target = { target, features }: (target."windows" or false);
             features = [ "std" "consoleapi" "errhandlingapi" "fileapi" "minwindef" "processenv" "winbase" "wincon" "winerror" "winnt" ];
           }
         ];
diff --git a/sample_projects/codegen/Cargo.nix b/sample_projects/codegen/Cargo.nix
@@ -116,12 +116,12 @@ rec {
             name = "libc";
             packageId = "libc";
             usesDefaultFeatures = false;
-            target = { target, features }: target."unix";
+            target = { target, features }: (target."unix" or false);
           }
           {
             name = "winapi";
             packageId = "winapi";
-            target = { target, features }: target."windows";
+            target = { target, features }: (target."windows" or false);
             features = [ "consoleapi" "processenv" "minwinbase" "minwindef" "winbase" ];
           }
         ];
@@ -162,7 +162,7 @@ rec {
             name = "ansi_term";
             packageId = "ansi_term";
             optional = true;
-            target = { target, features }: (!target."windows");
+            target = { target, features }: (!(target."windows" or false));
           }
           {
             name = "atty";

Original file line number	Diff line number	Diff line change
`@@ -156,12 +156,12 @@ rec {`
`156`	`156`	`name = "libc";`
`157`	`157`	`packageId = "libc";`
`158`	`158`	`usesDefaultFeatures = false;`
`159`		`- target = { target, features }: target."unix";`
	`159`	`+ target = { target, features }: (target."unix" or false);`
`160`	`160`	`}`
`161`	`161`	`{`
`162`	`162`	`name = "winapi";`
`163`	`163`	`packageId = "winapi";`
`164`		`- target = { target, features }: target."windows";`
	`164`	`+ target = { target, features }: (target."windows" or false);`
`165`	`165`	`features = [ "consoleapi" "processenv" "minwinbase" "minwindef" "winbase" ];`
`166`	`166`	`}`
`167`	`167`	`];`
`@@ -348,7 +348,7 @@ rec {`
`348`	`348`	`name = "ansi_term";`
`349`	`349`	`packageId = "ansi_term";`
`350`	`350`	`optional = true;`
`351`		`- target = { target, features }: (!target."windows");`
	`351`	`+ target = { target, features }: (!(target."windows" or false));`
`352`	`352`	`}`
`353`	`353`	`{`
`354`	`354`	`name = "atty";`
`@@ -825,7 +825,7 @@ rec {`
`825`	`825`	`{`
`826`	`826`	`name = "winapi-util";`
`827`	`827`	`packageId = "winapi-util";`
`828`		`- target = { target, features }: target."windows";`
	`828`	`+ target = { target, features }: (target."windows" or false);`
`829`	`829`	`}`
`830`	`830`	`];`
`831`	`831`	`features = {`
`@@ -1229,7 +1229,7 @@ rec {`
`1229`	`1229`	`name = "libc";`
`1230`	`1230`	`packageId = "libc";`
`1231`	`1231`	`optional = true;`
`1232`		`- target = { target, features }: target."unix";`
	`1232`	`+ target = { target, features }: (target."unix" or false);`
`1233`	`1233`	`}`
`1234`	`1234`	`{`
`1235`	`1235`	`name = "rand_core";`
`@@ -1245,7 +1245,7 @@ rec {`
`1245`	`1245`	`{`
`1246`	`1246`	`name = "winapi";`
`1247`	`1247`	`packageId = "winapi";`
`1248`		`- target = { target, features }: target."windows";`
	`1248`	`+ target = { target, features }: (target."windows" or false);`
`1249`	`1249`	`features = [ "minwindef" "ntsecapi" "profileapi" "winnt" ];`
`1250`	`1250`	`}`
`1251`	`1251`	`];`
`@@ -1386,7 +1386,7 @@ rec {`
`1386`	`1386`	`{`
`1387`	`1387`	`name = "winapi";`
`1388`	`1388`	`packageId = "winapi";`
`1389`		`- target = { target, features }: target."windows";`
	`1389`	`+ target = { target, features }: (target."windows" or false);`
`1390`	`1390`	`features = [ "std" "errhandlingapi" "winerror" "fileapi" "winbase" ];`
`1391`	`1391`	`}`
`1392`	`1392`	`];`
`@@ -1415,7 +1415,7 @@ rec {`
`1415`	`1415`	`{`
`1416`	`1416`	`name = "winapi-util";`
`1417`	`1417`	`packageId = "winapi-util";`
`1418`		`- target = { target, features }: target."windows";`
	`1418`	`+ target = { target, features }: (target."windows" or false);`
`1419`	`1419`	`}`
`1420`	`1420`	`];`
`1421`	`1421`
`@@ -2064,13 +2064,13 @@ rec {`
`2064`	`2064`	`{`
`2065`	`2065`	`name = "winapi";`
`2066`	`2066`	`packageId = "winapi";`
`2067`		`- target = { target, features }: target."windows";`
	`2067`	`+ target = { target, features }: (target."windows" or false);`
`2068`	`2068`	`features = [ "std" "winnt" ];`
`2069`	`2069`	`}`
`2070`	`2070`	`{`
`2071`	`2071`	`name = "winapi-util";`
`2072`	`2072`	`packageId = "winapi-util";`
`2073`		`- target = { target, features }: target."windows";`
	`2073`	`+ target = { target, features }: (target."windows" or false);`
`2074`	`2074`	`}`
`2075`	`2075`	`];`
`2076`	`2076`
`@@ -2122,7 +2122,7 @@ rec {`
`2122`	`2122`	`{`
`2123`	`2123`	`name = "winapi";`
`2124`	`2124`	`packageId = "winapi";`
`2125`		`- target = { target, features }: target."windows";`
	`2125`	`+ target = { target, features }: (target."windows" or false);`
`2126`	`2126`	`features = [ "std" "consoleapi" "errhandlingapi" "fileapi" "minwindef" "processenv" "winbase" "wincon" "winerror" "winnt" ];`
`2127`	`2127`	`}`
`2128`	`2128`	`];`
Original file line number	Diff line number	Diff line change
`@@ -138,12 +138,12 @@ rec {`
`138`	`138`	`name = "libc";`
`139`	`139`	`packageId = "libc";`
`140`	`140`	`usesDefaultFeatures = false;`
`141`		`- target = { target, features }: target."unix";`
	`141`	`+ target = { target, features }: (target."unix" or false);`
`142`	`142`	`}`
`143`	`143`	`{`
`144`	`144`	`name = "winapi";`
`145`	`145`	`packageId = "winapi";`
`146`		`- target = { target, features }: target."windows";`
	`146`	`+ target = { target, features }: (target."windows" or false);`
`147`	`147`	`features = [ "consoleapi" "processenv" "minwinbase" "minwindef" "winbase" ];`
`148`	`148`	`}`
`149`	`149`	`];`
`@@ -465,7 +465,7 @@ rec {`
`465`	`465`	`name = "ansi_term";`
`466`	`466`	`packageId = "ansi_term";`
`467`	`467`	`optional = true;`
`468`		`- target = { target, features }: (!target."windows");`
	`468`	`+ target = { target, features }: (!(target."windows" or false));`
`469`	`469`	`}`
`470`	`470`	`{`
`471`	`471`	`name = "atty";`
`@@ -602,7 +602,7 @@ rec {`
`602`	`602`	`name = "libc";`
`603`	`603`	`packageId = "libc";`
`604`	`604`	`usesDefaultFeatures = false;`
`605`		`- target = { target, features }: target."unix";`
	`605`	`+ target = { target, features }: (target."unix" or false);`
`606`	`606`	`}`
`607`	`607`	`{`
`608`	`608`	`name = "wasi";`
`@@ -673,12 +673,12 @@ rec {`
`673`	`673`	`{`
`674`	`674`	`name = "getrandom";`
`675`	`675`	`packageId = "getrandom";`
`676`		`- target = { target, features }: target."windows";`
	`676`	`+ target = { target, features }: (target."windows" or false);`
`677`	`677`	`}`
`678`	`678`	`{`
`679`	`679`	`name = "libc";`
`680`	`680`	`packageId = "libc";`
`681`		`- target = { target, features }: target."unix";`
	`681`	`+ target = { target, features }: (target."unix" or false);`
`682`	`682`	`}`
`683`	`683`	`{`
`684`	`684`	`name = "log";`
`@@ -726,7 +726,7 @@ rec {`
`726`	`726`	`{`
`727`	`727`	`name = "winapi";`
`728`	`728`	`packageId = "winapi";`
`729`		`- target = { target, features }: target."windows";`
	`729`	`+ target = { target, features }: (target."windows" or false);`
`730`	`730`	`features = [ "winerror" "errhandlingapi" "libloaderapi" ];`
`731`	`731`	`}`
`732`	`732`	`];`
`@@ -1060,7 +1060,7 @@ rec {`
`1060`	`1060`	`{`
`1061`	`1061`	`name = "wincolor";`
`1062`	`1062`	`packageId = "wincolor";`
`1063`		`- target = { target, features }: target."windows";`
	`1063`	`+ target = { target, features }: (target."windows" or false);`
`1064`	`1064`	`}`
`1065`	`1065`	`];`
`1066`	`1066`
`@@ -1253,7 +1253,7 @@ rec {`
`1253`	`1253`	`{`
`1254`	`1254`	`name = "winapi";`
`1255`	`1255`	`packageId = "winapi";`
`1256`		`- target = { target, features }: target."windows";`
	`1256`	`+ target = { target, features }: (target."windows" or false);`
`1257`	`1257`	`features = [ "std" "consoleapi" "errhandlingapi" "fileapi" "minwindef" "processenv" "winbase" "wincon" "winerror" "winnt" ];`
`1258`	`1258`	`}`
`1259`	`1259`	`];`
Original file line number	Diff line number	Diff line change
`@@ -116,12 +116,12 @@ rec {`
`116`	`116`	`name = "libc";`
`117`	`117`	`packageId = "libc";`
`118`	`118`	`usesDefaultFeatures = false;`
`119`		`- target = { target, features }: target."unix";`
	`119`	`+ target = { target, features }: (target."unix" or false);`
`120`	`120`	`}`
`121`	`121`	`{`
`122`	`122`	`name = "winapi";`
`123`	`123`	`packageId = "winapi";`
`124`		`- target = { target, features }: target."windows";`
	`124`	`+ target = { target, features }: (target."windows" or false);`
`125`	`125`	`features = [ "consoleapi" "processenv" "minwinbase" "minwindef" "winbase" ];`
`126`	`126`	`}`
`127`	`127`	`];`
`@@ -162,7 +162,7 @@ rec {`
`162`	`162`	`name = "ansi_term";`
`163`	`163`	`packageId = "ansi_term";`
`164`	`164`	`optional = true;`
`165`		`- target = { target, features }: (!target."windows");`
	`165`	`+ target = { target, features }: (!(target."windows" or false));`
`166`	`166`	`}`
`167`	`167`	`{`
`168`	`168`	`name = "atty";`