[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: gnu: r-minimal: Respect SOURCE_DATE_EPOCH in srcfile.
From: |
Ricardo Wurmus |
Subject: |
01/01: gnu: r-minimal: Respect SOURCE_DATE_EPOCH in srcfile. |
Date: |
Sat, 10 Mar 2018 08:25:29 -0500 (EST) |
rekado pushed a commit to branch master
in repository guix.
commit 0fa4702c041a5746ec3a58b39e4276c39d18e7da
Author: Ricardo Wurmus <address@hidden>
Date: Fri Mar 9 22:25:40 2018 +0100
gnu: r-minimal: Respect SOURCE_DATE_EPOCH in srcfile.
Fixes <https://bugs.gnu.org/30729>.
* gnu/packages/statistics.scm (r-minimal)[arguments]: Replace timestamp hack
with patch to "srcfile" and "srcfilecopy".
---
gnu/packages/statistics.scm | 24 +++++++++---------------
1 file changed, 9 insertions(+), 15 deletions(-)
diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index 1324abd..af69703 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -172,21 +172,15 @@ be output in text, PostScript, PDF or HTML.")
;; queries the mtime of a given file and records it in an object.
;; This is acceptable at runtime to detect stale source files,
;; but it destroys reproducibility at build time.
- ;;
- ;; Instead of disabling this feature, which may have unexpected
- ;; consequences, we reset the mtime of generated files before
- ;; passing them to the "srcfile" procedure.
- (substitute* "src/library/Makefile.in"
- (("@\\(cd base && \\$\\(MAKE\\) mkdesc\\)" line)
- (string-append line "\n find
$(top_builddir)/library/tools | xargs touch -d '1970-01-01'; \n"))
- (("@\\$\\(MAKE\\) Rdobjects" line)
- (string-append "@find $(srcdir)/tools | xargs touch -d
'1970-01-01'; \n "
- line)))
- (substitute* "src/library/tools/Makefile.in"
- (("@\\$\\(INSTALL_DATA\\) all.R
\\$\\(top_builddir\\)/library/\\$\\(pkg\\)/R/\\$\\(pkg\\)" line)
- (string-append
- line
- "\n find $(srcdir)/$(pkg) $(top_builddir)/library/$(pkg) |
xargs touch -d \"1970-01-01\"; \n")))
+
+ ;; Similarly, the "srcfilecopy" procedure records the current
+ ;; time. We change both of them to respect SOURCE_DATE_EPOCH.
+ (substitute* "src/library/base/R/srcfile.R"
+ (("timestamp <- (timestamp.*|file.mtime.*)" _ time)
+ (string-append "timestamp <- \
+as.POSIXct(if (\"\" != Sys.getenv(\"SOURCE_DATE_EPOCH\")) {\
+ as.numeric(Sys.getenv(\"SOURCE_DATE_EPOCH\"))\
+} else { " time "}, origin=\"1970-01-01\")\n")))
;; This library is installed using "install_package_description",
;; so we need to pass the "builtStamp" argument.