Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 37cde0036e9a
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8a98cf97e92c
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on May 9, 2018

  1. lib.makeSearchPath: allow null in search path 

    This makes things match ‘buildInputs’ where inputs are allowed to be
null.
    @matthewbauer
    matthewbauer committed May 9, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    bruth Byron Ruth
    GPG key ID: C0213119A58120BE
    Verified
    Learn about vigilant mode
    Copy the full SHA
    8a98cf9 View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 lib/strings.nix
2 changes: 1 addition & 1 deletion lib/strings.nix
View file
Original file line number Diff line number Diff line change
@@ -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.