rename: incremental -> checkpointed builds

5 files changed, 9 insertions, 9 deletions

diff --git a/pkgs/test/incrementalBuild/default.nix b/pkgs/test/checkpointBuild/default.nix
index b962befbfbacd..4a59760230a6e 100644
--- a/pkgs/test/incrementalBuild/default.nix
+++ b/pkgs/test/checkpointBuild/default.nix
@@ -1,6 +1,6 @@
-{ hello, incrementalBuildTools, runCommandNoCC, texinfo, stdenv, rsync }:
+{ hello, checkpointBuildTools, runCommandNoCC, texinfo, stdenv, rsync }:
 let
-  baseHelloArtifacts = incrementalBuildTools.prepareIncrementalBuild hello;
+  baseHelloArtifacts = checkpointBuildTools.prepareCheckpointBuild hello;
   patchedHello = hello.overrideAttrs (old: {
     buildInputs = [ texinfo ];
     src = runCommandNoCC "patch-hello-src" { } ''
@@ -10,9 +10,9 @@ let
       patch -p1 < ${./hello.patch}
     '';
   });
-  incrementalBuiltHello = incrementalBuildTools.mkIncrementalBuild patchedHello baseHelloArtifacts;
+  checkpointBuiltHello = checkpointBuildTools.mkCheckpointedBuild patchedHello baseHelloArtifacts;
 
-  incrementalBuiltHelloWithCheck = incrementalBuiltHello.overrideAttrs (old: {
+  checkpointBuiltHelloWithCheck = checkpointBuiltHello.overrideAttrs (old: {
     doCheck = true;
     checkPhase = ''
       echo "checking if unchanged source file is not recompiled"
@@ -20,7 +20,7 @@ let
     '';
   });
 
-  baseHelloRemoveFileArtifacts = incrementalBuildTools.prepareIncrementalBuild (hello.overrideAttrs (old: {
+  baseHelloRemoveFileArtifacts = checkpointBuildTools.prepareCheckpointBuild (hello.overrideAttrs (old: {
     patches = [ ./hello-additionalFile.patch ];
   }));
 
@@ -41,7 +41,7 @@ let
     '';
   });
 
-  incrementalBuiltHelloWithRemovedFile = incrementalBuildTools.mkIncrementalBuild patchedHelloRemoveFile baseHelloRemoveFileArtifacts;
+  checkpointBuiltHelloWithRemovedFile = checkpointBuildTools.mkCheckpointedBuild patchedHelloRemoveFile baseHelloRemoveFileArtifacts;
 in
 stdenv.mkDerivation {
   name = "patched-hello-returns-correct-output";
@@ -49,9 +49,9 @@ stdenv.mkDerivation {
     touch $out
 
     echo "testing output of hello binary"
-    [ "$(${incrementalBuiltHelloWithCheck}/bin/hello)" = "Hello, incremental world!" ]
+    [ "$(${checkpointBuiltHelloWithCheck}/bin/hello)" = "Hello, incremental world!" ]
     echo "testing output of hello with removed file"
-    [ "$(${incrementalBuiltHelloWithRemovedFile}/bin/hello)" = "Hello, incremental world!" ]
+    [ "$(${checkpointBuiltHelloWithRemovedFile}/bin/hello)" = "Hello, incremental world!" ]
   '';
 }
 
diff --git a/pkgs/test/incrementalBuild/hello-additionalFile.patch b/pkgs/test/checkpointBuild/hello-additionalFile.patch
index 345bc10ee49e5..345bc10ee49e5 100644
--- a/pkgs/test/incrementalBuild/hello-additionalFile.patch
+++ b/pkgs/test/checkpointBuild/hello-additionalFile.patch
diff --git a/pkgs/test/incrementalBuild/hello-removeFile.patch b/pkgs/test/checkpointBuild/hello-removeFile.patch
index 2939790dabce1..2939790dabce1 100644
--- a/pkgs/test/incrementalBuild/hello-removeFile.patch
+++ b/pkgs/test/checkpointBuild/hello-removeFile.patch
diff --git a/pkgs/test/incrementalBuild/hello.patch b/pkgs/test/checkpointBuild/hello.patch
index 3d0d50c2f20e4..3d0d50c2f20e4 100644
--- a/pkgs/test/incrementalBuild/hello.patch
+++ b/pkgs/test/checkpointBuild/hello.patch
diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix
index 8ca6c4faf56eb..c23814747b417 100644
--- a/pkgs/test/default.nix
+++ b/pkgs/test/default.nix
@@ -113,7 +113,7 @@ with pkgs;
 
   install-shell-files = callPackage ./install-shell-files {};
 
-  incremental-build = callPackage ./incrementalBuild {};
+  checkpoint-build = callPackage ./checkpointBuild {};
 
   kernel-config = callPackage ./kernel.nix {};