diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2020-04-07 14:30:25 +0200 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2020-04-07 14:30:25 +0200 |
| commit | 03a4a3c95cf0e10cd05c1c4ce9dd35c9fc64c331 (patch) | |
| tree | 05a5c0f14d71e056f0aaa62360d6f2f662921390 /tests | |
| parent | 54955867a6de7b01f094bf3390d69db82d6c5d7c (diff) | |
| parent | 68b43e01ddf990182c87a924d647dc7aa93b34f7 (diff) | |
Merge branch 'flakes' of github.com:NixOS/nix into flakes
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/github-flakes.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/github-flakes.nix b/tests/github-flakes.nix index 195772ca7..02b78ffe0 100644 --- a/tests/github-flakes.nix +++ b/tests/github-flakes.nix @@ -44,7 +44,7 @@ let dir=NixOS-nixpkgs-${nixpkgs.shortRev} cp -prd ${nixpkgs} $dir # Set the correct timestamp in the tarball. - find $dir -print0 | xargs -0 touch -t ${builtins.substring 0 12 nixpkgs.lastModified}.${builtins.substring 12 2 nixpkgs.lastModified} -- + find $dir -print0 | xargs -0 touch -t ${builtins.substring 0 12 nixpkgs.lastModifiedDate}.${builtins.substring 12 2 nixpkgs.lastModifiedDate} -- tar cfz $out/tarball/${nixpkgs.rev} $dir --hard-dereference mkdir -p $out/commits @@ -128,7 +128,7 @@ makeTest ( $github->succeed("systemctl stop httpd.service"); my $date = $client->succeed("nix flake info nixpkgs --json | jq -M .lastModified"); - strftime("%Y%m%d%H%M%S", gmtime($date)) eq "${nixpkgs.lastModified}" or die "time mismatch"; + strftime("%Y%m%d%H%M%S", gmtime($date)) eq "${nixpkgs.lastModifiedDate}" or die "time mismatch"; $client->succeed("nix build nixpkgs#hello"); |