[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: gnu: nsis: Respect SOURCE-DATE-EPOCH for reproduc
From: |
guix-commits |
Subject: |
branch master updated: gnu: nsis: Respect SOURCE-DATE-EPOCH for reproducibility |
Date: |
Sat, 05 Jun 2021 11:21:34 -0400 |
This is an automated email from the git hooks/post-receive script.
carl pushed a commit to branch master
in repository guix.
The following commit(s) were added to refs/heads/master by this push:
new 20d9535 gnu: nsis: Respect SOURCE-DATE-EPOCH for reproducibility
20d9535 is described below
commit 20d9535e1bf981a37f39f171ad72f67cdb1e6919
Author: Carl Dong <contact@carldong.me>
AuthorDate: Sat May 29 01:28:10 2021 -0400
gnu: nsis: Respect SOURCE-DATE-EPOCH for reproducibility
* gnu/packages/patches/nsis-source-date-epoch.patch: New patch.
* gnu/local.mk (dist_patch_DATA): Register it.
* gnu/packages/installers.scm (make-nsis)[source]: Apply it.
---
gnu/local.mk | 1 +
gnu/packages/installers.scm | 3 ++-
gnu/packages/patches/nsis-source-date-epoch.patch | 23 +++++++++++++++++++++++
3 files changed, 26 insertions(+), 1 deletion(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index 8c235f5..870769c 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1468,6 +1468,7 @@ dist_patch_DATA =
\
%D%/packages/patches/network-manager-plugin-path.patch \
%D%/packages/patches/nginx-socket-cloexec.patch \
%D%/packages/patches/nsis-env-passthru.patch \
+ %D%/packages/patches/nsis-source-date-epoch.patch \
%D%/packages/patches/nss-increase-test-timeout.patch \
%D%/packages/patches/nss-3.56-pkgconfig.patch \
%D%/packages/patches/ntfs-3g-CVE-2019-9755.patch \
diff --git a/gnu/packages/installers.scm b/gnu/packages/installers.scm
index 775b91f..c768a36 100644
--- a/gnu/packages/installers.scm
+++ b/gnu/packages/installers.scm
@@ -42,7 +42,8 @@
(sha256
(base32
"1sbwx5vzpddharkb7nj4q5z3i5fbg4lan63ng738cw4hmc4v7qdn"))
- (patches (search-patches "nsis-env-passthru.patch"))))
+ (patches (search-patches "nsis-env-passthru.patch"
+ "nsis-source-date-epoch.patch"))))
(build-system scons-build-system)
(native-inputs `(("xgcc" ,xgcc)
("xbinutils" ,xbinutils)
diff --git a/gnu/packages/patches/nsis-source-date-epoch.patch
b/gnu/packages/patches/nsis-source-date-epoch.patch
new file mode 100644
index 0000000..744c2a8
--- /dev/null
+++ b/gnu/packages/patches/nsis-source-date-epoch.patch
@@ -0,0 +1,23 @@
+Honour SOURCE_DATE_EPOCH for VERSION default
+
+Merged upstream as cd3f1024a37a332f1d4fa96a817ca80dfa2a478c, but not yet in a
+release. GitHub PR: https://github.com/kichik/nsis/pull/13
+
+Python snippet from:
https://reproducible-builds.org/docs/source-date-epoch/#python
+
+
+diff --git a/SConstruct b/SConstruct
+index e8252c9..41786f2 100755
+--- a/SConstruct
++++ b/SConstruct
+@@ -95,8 +95,8 @@ default_doctype = 'html'
+ if defenv.WhereIs('hhc', os.environ['PATH']):
+ default_doctype = 'chm'
+
+-from time import strftime, gmtime
+-cvs_version = strftime('%d-%b-%Y.cvs', gmtime())
++import time
++cvs_version = time.strftime('%d-%b-%Y.cvs',
time.gmtime(int(os.environ.get('SOURCE_DATE_EPOCH', time.time()))))
+
+ opts = Variables()
+
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: gnu: nsis: Respect SOURCE-DATE-EPOCH for reproducibility,
guix-commits <=