diff options
| author | Vivien Kraus <vivien@planete-kraus.eu> | 2022-08-02 17:23:05 +0200 |
|---|---|---|
| committer | 宋文武 <iyzsong@member.fsf.org> | 2022-08-03 14:23:00 +0800 |
| commit | e2ad0b0f8b9cdea88211827b40a5b46aa4d9f062 (patch) | |
| tree | dad4d2073a4532ddd1a4da1467078235bdfb5166 /gnu | |
| parent | cb14d802aef0aaa475147e0a5cc36ff71e631a62 (diff) | |
| download | guix-e2ad0b0f8b9cdea88211827b40a5b46aa4d9f062.tar.gz | |
gnu: nsis: Update to 3.08.
* gnu/packages/patches/nsis-source-date-epoch.patch: Drop this patch. * gnu/local.mk (dist_patch_DATA): Remove it. * gnu/packages/patches/nsis-env-passthru.patch: Adjust the patch. * gnu/packages/installers.scm (make-nsis): Update to 3.08. Signed-off-by: 宋文武 <iyzsong@member.fsf.org>
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/installers.scm | 9 | ||||
| -rw-r--r-- | gnu/packages/patches/nsis-env-passthru.patch | 17 | ||||
| -rw-r--r-- | gnu/packages/patches/nsis-source-date-epoch.patch | 23 |
4 files changed, 12 insertions, 38 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 10c3192ade..2e02af8b71 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1550,7 +1550,6 @@ dist_patch_DATA = \ %D%/packages/patches/nginx-socket-cloexec.patch \ %D%/packages/patches/nnpack-system-libraries.patch \ %D%/packages/patches/nsis-env-passthru.patch \ - %D%/packages/patches/nsis-source-date-epoch.patch \ %D%/packages/patches/nss-getcwd-nonnull.patch \ %D%/packages/patches/nss-increase-test-timeout.patch \ %D%/packages/patches/nss-3.56-pkgconfig.patch \ diff --git a/gnu/packages/installers.scm b/gnu/packages/installers.scm index 01ad03e6af..30cd0e4e6c 100644 --- a/gnu/packages/installers.scm +++ b/gnu/packages/installers.scm @@ -34,16 +34,15 @@ (xgcc (cross-gcc triplet #:libc xlibc))) (package (name (string-append "nsis-" machine)) - (version "3.05") + (version "3.08") (source (origin (method url-fetch) (uri (string-append "http://prdownloads.sourceforge.net/nsis/nsis-" version "-src.tar.bz2")) (sha256 (base32 - "1sbwx5vzpddharkb7nj4q5z3i5fbg4lan63ng738cw4hmc4v7qdn")) - (patches (search-patches "nsis-env-passthru.patch" - "nsis-source-date-epoch.patch")))) + "11qy1n1qdcqwal9hn8cmzm7gxjdyx7by6w14rfz2l646afnp0lm8")) + (patches (search-patches "nsis-env-passthru.patch")))) (build-system scons-build-system) (native-inputs `(("xgcc" ,xgcc) ("xbinutils" ,xbinutils) @@ -125,7 +124,7 @@ (lambda _ ;; NSIS target detection is screwed up, manually change ;; it ourselves - (substitute* "Source/build.cpp" (("m_target_type=TARGET_X86ANSI") + (substitute* "Source/build.cpp" (("m_target_type=TARGET_X86UNICODE") (string-append "m_target_type=" ,nsis-target-type)))))))) (home-page "https://nsis.sourceforge.io/Main_Page") (synopsis "System to create Windows installers") diff --git a/gnu/packages/patches/nsis-env-passthru.patch b/gnu/packages/patches/nsis-env-passthru.patch index 36b4092230..22b186f55a 100644 --- a/gnu/packages/patches/nsis-env-passthru.patch +++ b/gnu/packages/patches/nsis-env-passthru.patch @@ -1,12 +1,11 @@ ---- nsis-3.04-src/SConstruct 2019-05-30 14:53:30.276775332 -0400 -+++ nsis-3.04-src/SConstruct 2019-05-30 14:54:17.901232914 -0400 -@@ -77,6 +77,9 @@ - if not toolset and not path: - defenv = Environment(TARGET_ARCH = arch) +--- nsis-3.08-src/SConstruct 2021-01-15 17:31:10.000000000 +0100 ++++ nsis-3.08-src/SConstruct-passthru 2022-08-02 17:11:12.414702282 +0200 +@@ -71,7 +71,7 @@ -+import os; -+defenv['ENV'] = os.environ -+ - Export('defenv') + defenv = { + 'TARGET_ARCH': ARGUMENTS.get('TARGET_ARCH', 'x86'), +- 'ENV': {} ++ 'ENV': os.environ.copy() + } ###################################################################### diff --git a/gnu/packages/patches/nsis-source-date-epoch.patch b/gnu/packages/patches/nsis-source-date-epoch.patch deleted file mode 100644 index 744c2a8011..0000000000 --- a/gnu/packages/patches/nsis-source-date-epoch.patch +++ /dev/null @@ -1,23 +0,0 @@ -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() - |