Do not clobber files when creating tarballs

nixos-modules/make-system-tarball.sh

@@ -26,7 +26,7 @@ stripSlash() {
 for ((i = 0; i < ${#targets_[@]}; i++)); do
     stripSlash "${targets_[$i]}"
     mkdir -p "$(dirname "$res")"
-    cp -a "${sources_[$i]}" "$res"
+    cp -an "${sources_[$i]}" "$res"
 done
 
 

tests/bash.nix

@@ -5,8 +5,7 @@
     in {
       genode.init.children.bash = let
         extraErisInputs' = with pkgs.genodePackages; {
-          bash =
-            lib.getErisMainProgram "bash" (pkgs.bash // { pname = "bash"; });
+          bash = lib.getErisMainProgram (pkgs.bash // { pname = "bash"; });
           cached_fs_rom = lib.getErisMainProgram cached_fs_rom;
           vfs = lib.getErisMainProgram vfs;
           vfs_pipe = lib.getErisLib "vfs_pipe.lib.so" vfs_pipe;
@@ -22,7 +21,13 @@
         package = pkgs.genodePackages.init;
         extraErisInputs = builtins.attrValues extraErisInputs';
         configFile = pkgs.writeText "bash.child.dhall" ''
-          ${./bash.dhall} ${toDhall params}
+          ${./bash.dhall} {
+            , bash = "${pkgs.bash}"
+            , coreutils = "${pkgs.coreutils}"
+            , cached_fs_rom = ${extraErisInputs'.cached_fs_rom.cap}
+            , vfs = ${extraErisInputs'.vfs.cap}
+            , vfs_pipe = ${extraErisInputs'.vfs_pipe.cap}
+            }
         '';
         extraInputs = with pkgs.genodePackages; [ pkgs.bash libc posix ];
       };