diff options
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/docker/examples.nix | 10 | ||||
| -rw-r--r-- | pkgs/build-support/setup-hooks/set-source-date-epoch-to-latest.sh | 3 |
2 files changed, 8 insertions, 5 deletions
diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix index 1a8b9c7f8ed4..498028fb0886 100644 --- a/pkgs/build-support/docker/examples.nix +++ b/pkgs/build-support/docker/examples.nix @@ -107,11 +107,13 @@ rec { nix = buildImageWithNixDb { name = "nix"; contents = [ - # nix-store -qR uses the 'more' program which is not included in - # the pkgs.nix dependencies. We then have to manually get it - # from the 'eject' package:/ - pkgs.eject + # nix-store uses cat program to display results as specified by + # the image env variable NIX_PAGER. + pkgs.coreutils pkgs.nix ]; + config = { + Env = [ "NIX_PAGER=cat" ]; + }; }; } diff --git a/pkgs/build-support/setup-hooks/set-source-date-epoch-to-latest.sh b/pkgs/build-support/setup-hooks/set-source-date-epoch-to-latest.sh index 6bf9a65b35af..84e40cd0514f 100644 --- a/pkgs/build-support/setup-hooks/set-source-date-epoch-to-latest.sh +++ b/pkgs/build-support/setup-hooks/set-source-date-epoch-to-latest.sh @@ -4,7 +4,8 @@ updateSourceDateEpoch() { # Get the last modification time of all regular files, sort them, # and get the most recent. Maybe we should use # https://github.com/0-wiz-0/findnewest here. - local -a res=($(find "$path" -type f -not -newer "$NIX_BUILD_TOP/.." -printf '%T@ %p\0' | sort -n --zero-terminated | tail -n1 --zero-terminated)) + local -a res=($(find "$path" -type f -not -newer "$NIX_BUILD_TOP/.." -printf '%T@ %p\0' \ + | sort -n --zero-terminated | tail -n1 --zero-terminated | head -c -1)) local time="${res[0]//\.[0-9]*/}" # remove the fraction part local newestFile="${res[1]}" |