Merge master into staging

2018-05-10 09:30:56 +02:00
parent 7d8e16d939 67a8c66f68
commit 64c8c6dcb3
49 changed files with 1400 additions and 263 deletions
@@ -82,7 +82,7 @@ rec {
       => "//bin"
  */
  makeSearchPath = subDir: packages:
-    concatStringsSep ":" (map (path: path + "/" + subDir) packages);
+    concatStringsSep ":" (map (path: path + "/" + subDir) (builtins.filter (x: x != null) packages));

  /* Construct a Unix-style search path, using given package output.
     If no output is found, fallback to `.out` and then to the default.