[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/13: gnu: opendjk11: Improve regular expressions.
From: |
guix-commits |
Subject: |
03/13: gnu: opendjk11: Improve regular expressions. |
Date: |
Tue, 27 Sep 2022 10:10:56 -0400 (EDT) |
apteryx pushed a commit to branch master
in repository guix.
commit 6193d9871767694541a5f86e6a8fbcc520812186
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Mon Sep 26 20:01:30 2022 -0400
gnu: opendjk11: Improve regular expressions.
* gnu/packages/java.scm (openjdk11)
[phases]{strip-archive-timestamps}: Replace '.*.' with '\\.' in regexps.
---
gnu/packages/java.scm | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 79b73a19e3..424ccc5862 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -1946,7 +1946,7 @@ new Date();"))
(invoke "unzip" archive))
(delete-file archive)
(for-each (compose repack-archive
canonicalize-path)
- (find-files dir "(ct.sym|.*.jar)$"))
+ (find-files dir "(ct.sym|\\.jar)$"))
(let ((reset-file-timestamp
(lambda (file)
(let ((s (lstat file)))
@@ -1959,9 +1959,9 @@ new Date();"))
(let ((files (find-files "." ".*" #:directories?
#t)))
(apply invoke "zip" "-0" "-X" archive
files)))))))
(for-each repack-archive
- (find-files #$output:doc ".*.zip$"))
+ (find-files #$output:doc "\\.zip$"))
(for-each repack-archive
- (find-files #$output:jdk ".*.(zip|jar|diz)$"))
+ (find-files #$output:jdk "\\.(zip|jar|diz)$"))
(repack-archive (string-append #$output:jdk "/lib/ct.sym"))
(let ((repack-jmod
(lambda (file-name)
@@ -1992,7 +1992,7 @@ new Date();"))
file temp-file
(stat:size (stat temp-file))
0)))))))))))))
(for-each repack-jmod
- (find-files #$output:jdk ".*.jmod$"))))))
+ (find-files #$output:jdk "\\.jmod$"))))))
(add-after 'install 'remove-timestamp-from-api-summary
(lambda _
(substitute* (string-append #$output:doc
- branch master updated (79b8e52e64 -> 052c1b0643), guix-commits, 2022/09/27
- 12/13: gnu: docbook-xsl-ns: Rename to docbook-xsl-1.79.1 and use gexps., guix-commits, 2022/09/27
- 11/13: gnu: openjdk: Update to 18., guix-commits, 2022/09/27
- 06/13: gnu: openjdk13: Define with make-openjdk., guix-commits, 2022/09/27
- 10/13: gnu: openjdk17: Define with make-openjdk., guix-commits, 2022/09/27
- 09/13: gnu: openjdk16: Define with make-openjdk., guix-commits, 2022/09/27
- 03/13: gnu: opendjk11: Improve regular expressions.,
guix-commits <=
- 01/13: gnu: opendjk11: Remove trailing #t and use gexps., guix-commits, 2022/09/27
- 02/13: gnu: opendjk11: Remove input labels., guix-commits, 2022/09/27
- 04/13: gnu: opendjk11: Reduce size by removing extraneous files., guix-commits, 2022/09/27
- 07/13: gnu: openjdk14: Define with make-openjdk., guix-commits, 2022/09/27
- 05/13: gnu: openjdk12: Introduce 'make-openjdk' syntax and use it., guix-commits, 2022/09/27
- 13/13: gnu: colord: Update to 1.4.6., guix-commits, 2022/09/27
- 08/13: gnu: openjdk15: Define with make-openjdk., guix-commits, 2022/09/27