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
base: 609eb86db707
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: b3909d1cb1d6
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Aug 16, 2020

  1. nixos/systemd.tmpfiles.packages: fix an edge case 

    symlinkJoin can break (silently) when the passed paths contain symlinks
to directories.  This should work now.

Down-side: when lib/tmpfiles.d doesn't exist for some passed package,
the error message is a little less explicit, because we never get
to the postBuild phase (and symlinkJoin doesn't provide a better way):
/nix/store/HASH-NAME/lib/tmpfiles.d: No such file or directory

Also, it seemed pointless to create symlinks for whole package trees
and using only a part of the result (usually very small part).
    @vcunat
    vcunat committed Aug 16, 2020
    Copy the full SHA
    3937923 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #95565 from vcunat/p/symlinkJoin 

    nixos/systemd.tmpfiles.packages: fix an edge case
    @flokli
    flokli committed Aug 16, 2020
    Copy the full SHA
    b3909d1 View commit details
    Browse the repository at this point in the history