refactor: consistent naming for unsetSourceDateEpoch*

loqusion · Jan 3, 2025 · 29144f9 · 29144f9
1 parent 137ed74
commit 29144f9
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/lib/default.nix b/lib/default.nix
@@ -15,6 +15,6 @@ in {
   linkVirtualPaths = callPackage ./linkVirtualPaths.nix {};
   mkTypstDerivation = callPackage ./mkTypstDerivation.nix {};
   typstOptsFromArgs = callPackage ./typstOptsFromArgs.nix {};
-  unsetSourceDateEpoch = callPackage ./setupHooks/unsetSourceDateEpoch.nix {};
+  unsetSourceDateEpochHook = callPackage ./setupHooks/unsetSourceDateEpoch.nix {};
   watchTypstProject = callPackage ./watchTypstProject.nix {};
 })
diff --git a/lib/devShell.nix b/lib/devShell.nix
@@ -17,7 +17,7 @@
   inherit (lib) optionalAttrs optionalString;
   inherit (lib.strings) concatStringsSep;
 
-  unsetSourceDateEpochScript = builtins.readFile ./setupHooks/unsetSourceDateEpoch.sh;
+  unsetSourceDateEpochScript = builtins.readFile ./setupHooks/unsetSourceDateEpochScript.sh;
 
   cleanedArgs = removeAttrs args [
     "checks"

diff --git a/lib/mkTypstDerivation.nix b/lib/mkTypstDerivation.nix
@@ -3,7 +3,7 @@
   lib,
   stdenvNoCC,
   typst,
-  unsetSourceDateEpoch,
+  unsetSourceDateEpochHook,
 }: args @ {
   buildPhaseTypstCommand,
   fontPaths ? [],
@@ -49,7 +49,7 @@ in
         ++ [
           typst
           (copyVirtualPathsHook virtualPaths)
-          unsetSourceDateEpoch
+          unsetSourceDateEpochHook
         ];
 
       buildPhase =

diff --git a/lib/setupHooks/unsetSourceDateEpoch.nix b/lib/setupHooks/unsetSourceDateEpoch.nix
@@ -1,10 +1,10 @@
 {makeSetupHook}: let
-  unsetSourceDateEpoch = builtins.readFile ./unsetSourceDateEpoch.sh;
+  unsetSourceDateEpochScript = builtins.readFile ./unsetSourceDateEpochScript.sh;
 in
   makeSetupHook {
     name = "unsetSourceDateEpoch";
     substitutions = {
-      inherit unsetSourceDateEpoch;
+      inherit unsetSourceDateEpochScript;
     };
   }
   ./unsetSourceDateEpochHook.sh
diff --git a/lib/setupHooks/unsetSourceDateEpochHook.sh b/lib/setupHooks/unsetSourceDateEpochHook.sh
@@ -1,5 +1,5 @@
 unsetSourceDateEpoch() {
-    @unsetSourceDateEpoch@
+    @unsetSourceDateEpochScript@
 }
 
 preBuildHooks+=(unsetSourceDateEpoch)
diff --git a/lib/setupHooks/unsetSourceDateEpoch.sh → lib/setupHooks/unsetSourceDateEpochScript.sh b/lib/setupHooks/unsetSourceDateEpoch.sh → lib/setupHooks/unsetSourceDateEpochScript.sh
diff --git a/lib/watchTypstProject.nix b/lib/watchTypstProject.nix
@@ -24,7 +24,7 @@
       {inherit typstSource;} // args
     ));
 
-  unsetSourceDateEpochScript = builtins.readFile ./setupHooks/unsetSourceDateEpoch.sh;
+  unsetSourceDateEpochScript = builtins.readFile ./setupHooks/unsetSourceDateEpochScript.sh;
 
   cleanedArgs = removeAttrs args [
     "fontPaths"