Merge pull request #40 from loqusion/fix/unsetSourceDateEpoch

fix: unset `SOURCE_DATE_EPOCH` to allow Typst to use correct date
loqusion · Jan 3, 2025 · 137ed74 · 137ed74
2 parents fae09f6 + c010bbd
commit 137ed74
Show file tree

Hide file tree

Showing 9 changed files with 47 additions and 0 deletions.
diff --git a/checks/date/main.typ b/checks/date/main.typ
@@ -0,0 +1,9 @@
+#let UNIX_EPOCH = datetime(
+  year: 1980,
+  month: 1,
+  day: 1,
+)
+#assert.ne(
+  datetime.today(),
+  UNIX_EPOCH,
+)
diff --git a/checks/default.nix b/checks/default.nix
@@ -41,6 +41,15 @@ in
       '';
     };
 
+    date = myLib.buildTypstProject {
+      inherit typstSource;
+      src = myLib.cleanTypstSource ./date;
+    };
+    dateWatch = watch {} {
+      inherit typstSource;
+      src = myLib.cleanTypstSource ./date;
+    };
+
     devShell = myLib.devShell {
       inherit virtualPaths;
       checks = {

diff --git a/lib/default.nix b/lib/default.nix
@@ -15,5 +15,6 @@ in {
   linkVirtualPaths = callPackage ./linkVirtualPaths.nix {};
   mkTypstDerivation = callPackage ./mkTypstDerivation.nix {};
   typstOptsFromArgs = callPackage ./typstOptsFromArgs.nix {};
+  unsetSourceDateEpoch = callPackage ./setupHooks/unsetSourceDateEpoch.nix {};
   watchTypstProject = callPackage ./watchTypstProject.nix {};
 })
diff --git a/lib/devShell.nix b/lib/devShell.nix
@@ -17,6 +17,8 @@
   inherit (lib) optionalAttrs optionalString;
   inherit (lib.strings) concatStringsSep;
 
+  unsetSourceDateEpochScript = builtins.readFile ./setupHooks/unsetSourceDateEpoch.sh;
+
   cleanedArgs = removeAttrs args [
     "checks"
     "extraShellHook"
@@ -44,6 +46,9 @@ in
         or (optionalString (virtualPaths != []) (linkVirtualPaths {
           inherit virtualPaths forceVirtualPaths;
         }))
+        + ''
+          ${unsetSourceDateEpochScript}
+        ''
         + optionalString (extraShellHook != "") ''
 
           ${extraShellHook}

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

diff --git a/lib/setupHooks/unsetSourceDateEpoch.nix b/lib/setupHooks/unsetSourceDateEpoch.nix
@@ -0,0 +1,10 @@
+{makeSetupHook}: let
+  unsetSourceDateEpoch = builtins.readFile ./unsetSourceDateEpoch.sh;
+in
+  makeSetupHook {
+    name = "unsetSourceDateEpoch";
+    substitutions = {
+      inherit unsetSourceDateEpoch;
+    };
+  }
+  ./unsetSourceDateEpochHook.sh
diff --git a/lib/setupHooks/unsetSourceDateEpoch.sh b/lib/setupHooks/unsetSourceDateEpoch.sh
@@ -0,0 +1 @@
+unset SOURCE_DATE_EPOCH
diff --git a/lib/setupHooks/unsetSourceDateEpochHook.sh b/lib/setupHooks/unsetSourceDateEpochHook.sh
@@ -0,0 +1,5 @@
+unsetSourceDateEpoch() {
+    @unsetSourceDateEpoch@
+}
+
+preBuildHooks+=(unsetSourceDateEpoch)
diff --git a/lib/watchTypstProject.nix b/lib/watchTypstProject.nix
@@ -24,6 +24,8 @@
       {inherit typstSource;} // args
     ));
 
+  unsetSourceDateEpochScript = builtins.readFile ./setupHooks/unsetSourceDateEpoch.sh;
+
   cleanedArgs = removeAttrs args [
     "fontPaths"
     "forceVirtualPaths"
@@ -60,6 +62,9 @@ in
           ${toShellVars {inherit typstOutput typstSource;}}
           out=''${1:-''${typstOutput:?not defined}}
           mkdir -p "$(dirname "$out")"
+
+          ${unsetSourceDateEpochScript}
+
           ${typstWatchCommand} ${typstOptsString} "$typstSource" "$out"
         '';
     })