Merge master into staging-next

2020-08-17 14:54:39 +02:00
parent 566683ab5e 914b9788fd
commit 0ac85bc455
531 changed files with 2778 additions and 6274 deletions
@@ -240,6 +240,8 @@ rec {
   * This creates a single derivation that replicates the directory structure
   * of all the input paths.
   *
+   * BEWARE: it may not "work right" when the passed paths contain symlinks to directories.
+   *
   * Examples:
   * # adds symlinks of hello to current build.
   * symlinkJoin { name = "myhello"; paths = [ pkgs.hello ]; }