lol
fork

Configure Feed

Select the types of activity you want to include in your feed.

make-system-tarball: use `__structuredAttrs`

Based on https://github.com/NixOS/nixpkgs/commit/ea81a2465eeef6d470786a4e8a8c5d8e9b5db9f3

+6 -13
+3 -3
nixos/lib/make-system-tarball.nix
··· 39 39 40 40 stdenv.mkDerivation { 41 41 name = "tarball"; 42 - builder = ./make-system-tarball.sh; 42 + __structuredAttrs = true; 43 + 44 + buildCommandPath = ./make-system-tarball.sh; 43 45 nativeBuildInputs = extraInputs; 44 46 45 47 inherit ··· 49 51 compressCommand 50 52 ; 51 53 52 - # !!! should use XML. 53 54 sources = map (x: x.source) contents; 54 55 targets = map (x: x.target) contents; 55 56 56 - # !!! should use XML. 57 57 inherit symlinks objects; 58 58 59 59 closureInfo = closureInfo {
+3 -10
nixos/lib/make-system-tarball.sh
··· 1 - sources_=($sources) 2 - targets_=($targets) 3 - 4 - objects=($objects) 5 - symlinks=($symlinks) 6 - 7 - 8 1 # Remove the initial slash from a path, since genisofs likes it that way. 9 2 stripSlash() { 10 3 res="$1" ··· 12 5 } 13 6 14 7 # Add the individual files. 15 - for ((i = 0; i < ${#targets_[@]}; i++)); do 16 - stripSlash "${targets_[$i]}" 8 + for ((i = 0; i < ${#targets[@]}; i++)); do 9 + stripSlash "${targets[$i]}" 17 10 mkdir -p "$(dirname "$res")" 18 - cp -a "${sources_[$i]}" "$res" 11 + cp -a "${sources[$i]}" "$res" 19 12 done 20 13 21 14