colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tests.checkpoint-build: Fix evaluation with allowAliases false

Browse Source 
Was broken since introduced, but not caught due to
https://github.com/NixOS/nixpkgs/pull/271123#discussion_r1442134594
This commit is contained in:
Silvan Mosberger 2024-01-04 21:39:07 +01:00
parent 046d653f7e
commit 6946071175
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/test/checkpointBuild/default.nix
View File

@ -1,9 +1,9 @@
{ hello, checkpointBuildTools, runCommandNoCC, texinfo, stdenv, rsync }:
{ hello, checkpointBuildTools, runCommand, texinfo, stdenv, rsync }:
let
baseHelloArtifacts = checkpointBuildTools.prepareCheckpointBuild hello;
patchedHello = hello.overrideAttrs (old: {
buildInputs = [ texinfo ];
src = runCommandNoCC "patch-hello-src" { } ''
src = runCommand "patch-hello-src" { } ''
mkdir -p $out
cd $out
tar xf ${hello.src} --strip-components=1
@ -24,7 +24,7 @@ let
patches = [ ./hello-additionalFile.patch ];
}));
preparedHelloRemoveFileSrc = runCommandNoCC "patch-hello-src" { } ''
preparedHelloRemoveFileSrc = runCommand "patch-hello-src" { } ''
mkdir -p $out
cd $out
tar xf ${hello.src} --strip-components=1
@ -33,7 +33,7 @@ let
patchedHelloRemoveFile = hello.overrideAttrs (old: {
buildInputs = [ texinfo ];
src = runCommandNoCC "patch-hello-src" { } ''
src = runCommand "patch-hello-src" { } ''
mkdir -p $out
cd $out
${rsync}/bin/rsync -cutU --chown=$USER:$USER --chmod=+w -r ${preparedHelloRemoveFileSrc}/* .