amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: Fix indentation in OpenJDK packages.

Browse source 
* gnu/packages/java.scm (openjdk9, openjdk10, openjdk11, openjdk12)
(openjdk13, openjdk14): Untabify and indent with Emacs.
This commit is contained in:
Leo Prikler 2021-02-12 09:25:37 +01:00
parent 44425e1f2a
commit fb3b4ffbb7
No known key found for this signature in database
GPG key ID: 442A84B8C70E2F87
1 changed files with 97 additions and 97 deletions
Download patch file Download diff file Expand all files Collapse all files

194
gnu/packages/java.scm
View file

@ -1881,10 +1881,10 @@ new Date();"))
"01ihmyf7k5z17wbr7xig7y40l9f01d5zjgkcmawn1102hw5kchpq")) "01ihmyf7k5z17wbr7xig7y40l9f01d5zjgkcmawn1102hw5kchpq"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
`(begin `(begin
(for-each delete-file (for-each delete-file
(find-files "." ".*.(bin|exe|jar)$")) (find-files "." ".*.(bin|exe|jar)$"))
#t)))) #t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(outputs '("out" "jdk" "doc")) (outputs '("out" "jdk" "doc"))
(arguments (arguments
@ -1950,8 +1950,8 @@ new Date();"))
(lambda _ (lambda _
;; Those are safe to skip. ;; Those are safe to skip.
(format (current-error-port) (format (current-error-port)
"warning: failed to substitute: ~a~%" "warning: failed to substitute: ~a~%"
file)))) file))))
(find-files "." (find-files "."
"\\.c$|\\.h$")) "\\.c$|\\.h$"))
#t))) #t)))
@ -1968,9 +1968,9 @@ new Date();"))
(add-after 'install 'install-libjvm (add-after 'install 'install-libjvm
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((lib-out (string-append (assoc-ref outputs "out") (let* ((lib-out (string-append (assoc-ref outputs "out")
"/lib")) "/lib"))
(lib-jdk (string-append (assoc-ref outputs "jdk") (lib-jdk (string-append (assoc-ref outputs "jdk")
"/lib"))) "/lib")))
(symlink (string-append lib-jdk "/server/libjvm.so") (symlink (string-append lib-jdk "/server/libjvm.so")
(string-append lib-jdk "/libjvm.so")) (string-append lib-jdk "/libjvm.so"))
(symlink (string-append lib-out "/server/libjvm.so") (symlink (string-append lib-out "/server/libjvm.so")
@ -2000,11 +2000,11 @@ new Date();"))
(unless (eq? (stat:type s) 'symlink) (unless (eq? (stat:type s) 'symlink)
(format #t "reset ~a~%" file) (format #t "reset ~a~%" file)
(utime file 0 0 0 0)))) (utime file 0 0 0 0))))
(find-files dir #:directories? #t)) (find-files dir #:directories? #t))
(with-directory-excursion dir (with-directory-excursion dir
(let ((files (find-files "." ".*" #:directories? #t))) (let ((files (find-files "." ".*" #:directories? #t)))
(apply invoke "zip" "-0" "-X" zip files))))) (apply invoke "zip" "-0" "-X" zip files)))))
(find-files (assoc-ref outputs "doc") ".*.zip$")) (find-files (assoc-ref outputs "doc") ".*.zip$"))
#t))))) #t)))))
(inputs (inputs
`(("alsa-lib" ,alsa-lib) `(("alsa-lib" ,alsa-lib)
@ -2054,32 +2054,32 @@ new Date();"))
"openjdk-10-idlj-reproducibility.patch")) "openjdk-10-idlj-reproducibility.patch"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
`(begin `(begin
(for-each delete-file (find-files "." ".*.(bin|exe|jar)$")) (for-each delete-file (find-files "." ".*.(bin|exe|jar)$"))
#t)))) #t))))
(arguments (arguments
(substitute-keyword-arguments (package-arguments openjdk9) (substitute-keyword-arguments (package-arguments openjdk9)
((#:phases phases) ((#:phases phases)
`(modify-phases ,phases `(modify-phases ,phases
(replace 'fix-java-shebangs (replace 'fix-java-shebangs
(lambda _ (lambda _
;; This file was "fixed" by patch-source-shebangs, but it requires ;; This file was "fixed" by patch-source-shebangs, but it requires
;; this exact first line. ;; this exact first line.
(substitute* "make/data/blacklistedcertsconverter/blacklisted.certs.pem" (substitute* "make/data/blacklistedcertsconverter/blacklisted.certs.pem"
(("^#!.*") "#! java BlacklistedCertsConverter SHA-256\n")) (("^#!.*") "#! java BlacklistedCertsConverter SHA-256\n"))
#t)) #t))
(replace 'configure (replace 'configure
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(invoke "bash" "./configure" (invoke "bash" "./configure"
(string-append "--with-freetype=" (assoc-ref inputs "freetype")) (string-append "--with-freetype=" (assoc-ref inputs "freetype"))
"--disable-freetype-bundling" "--disable-freetype-bundling"
"--disable-warnings-as-errors" "--disable-warnings-as-errors"
"--disable-hotspot-gtest" "--disable-hotspot-gtest"
"--with-giflib=system" "--with-giflib=system"
"--with-libjpeg=system" "--with-libjpeg=system"
"--with-native-debug-symbols=zipped" "--with-native-debug-symbols=zipped"
(string-append "--prefix=" (assoc-ref outputs "out"))) (string-append "--prefix=" (assoc-ref outputs "out")))
#t)))))) #t))))))
(native-inputs (native-inputs
`(("openjdk9" ,openjdk9) `(("openjdk9" ,openjdk9)
("openjdk9:jdk" ,openjdk9 "jdk") ("openjdk9:jdk" ,openjdk9 "jdk")
@ -2101,9 +2101,9 @@ new Date();"))
"0v705w1s9lrqalzahir78pk397rkk9gfvzq821yv8h3xha0bqi6w")) "0v705w1s9lrqalzahir78pk397rkk9gfvzq821yv8h3xha0bqi6w"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
`(begin `(begin
(for-each delete-file (find-files "." ".*.(bin|exe|jar)$")) (for-each delete-file (find-files "." ".*.(bin|exe|jar)$"))
#t)))) #t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(outputs '("out" "jdk" "doc")) (outputs '("out" "jdk" "doc"))
(arguments (arguments
@ -2161,8 +2161,8 @@ new Date();"))
(lambda _ (lambda _
;; Those are safe to skip. ;; Those are safe to skip.
(format (current-error-port) (format (current-error-port)
"warning: failed to substitute: ~a~%" "warning: failed to substitute: ~a~%"
file)))) file))))
(find-files "." (find-files "."
"\\.c$|\\.h$")) "\\.c$|\\.h$"))
#t))) #t)))
@ -2216,9 +2216,9 @@ new Date();"))
(add-after 'install 'install-libjvm (add-after 'install 'install-libjvm
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((lib-out (string-append (assoc-ref outputs "out") (let* ((lib-out (string-append (assoc-ref outputs "out")
"/lib")) "/lib"))
(lib-jdk (string-append (assoc-ref outputs "jdk") (lib-jdk (string-append (assoc-ref outputs "jdk")
"/lib"))) "/lib")))
(symlink (string-append lib-jdk "/server/libjvm.so") (symlink (string-append lib-jdk "/server/libjvm.so")
(string-append lib-jdk "/libjvm.so")) (string-append lib-jdk "/libjvm.so"))
(symlink (string-append lib-out "/server/libjvm.so") (symlink (string-append lib-out "/server/libjvm.so")
@ -2238,8 +2238,8 @@ new Date();"))
(for-each (lambda (file) (for-each (lambda (file)
(substitute* file (substitute* file
(((string-append "This file was generated " (((string-append "This file was generated "
"AUTOMATICALLY from a template " "AUTOMATICALLY from a template "
"file.*")) "file.*"))
(string-append "This file was generated " (string-append "This file was generated "
"AUTOMATICALLY from a template " "AUTOMATICALLY from a template "
"file")))) "file"))))
@ -2253,24 +2253,24 @@ new Date();"))
(ice-9 binary-ports) (ice-9 binary-ports)
(rnrs bytevectors)) (rnrs bytevectors))
(letrec ((repack-archive (letrec ((repack-archive
(lambda (archive) (lambda (archive)
(let ((dir (mkdtemp! "zip-contents.XXXXXX"))) (let ((dir (mkdtemp! "zip-contents.XXXXXX")))
(with-directory-excursion dir (with-directory-excursion dir
(invoke "unzip" archive)) (invoke "unzip" archive))
(delete-file archive) (delete-file archive)
(for-each (compose repack-archive canonicalize-path) (for-each (compose repack-archive canonicalize-path)
(find-files dir "(ct.sym|.*.jar)$")) (find-files dir "(ct.sym|.*.jar)$"))
(let ((reset-file-timestamp (let ((reset-file-timestamp
(lambda (file) (lambda (file)
(let ((s (lstat file))) (let ((s (lstat file)))
(unless (eq? (stat:type s) 'symlink) (unless (eq? (stat:type s) 'symlink)
(format #t "reset ~a~%" file) (format #t "reset ~a~%" file)
(utime file 0 0 0 0)))))) (utime file 0 0 0 0))))))
(for-each reset-file-timestamp (for-each reset-file-timestamp
(find-files dir #:directories? #t))) (find-files dir #:directories? #t)))
(with-directory-excursion dir (with-directory-excursion dir
(let ((files (find-files "." ".*" #:directories? #t))) (let ((files (find-files "." ".*" #:directories? #t)))
(apply invoke "zip" "-0" "-X" archive files))))))) (apply invoke "zip" "-0" "-X" archive files)))))))
(for-each repack-archive (for-each repack-archive
(find-files (assoc-ref outputs "doc") ".*.zip$")) (find-files (assoc-ref outputs "doc") ".*.zip$"))
(for-each repack-archive (for-each repack-archive
@ -2293,21 +2293,21 @@ new Date();"))
(content-length (content-length
(- (stat:size (stat file)) (- (stat:size (stat file))
header-length))) header-length)))
(sendfile temp-file file content-length header-length) (sendfile temp-file file content-length header-length)
(delete-file file-name) (delete-file file-name)
(close-port temp-file) (close-port temp-file)
(repack-archive (canonicalize-path temp-filename)) (repack-archive (canonicalize-path temp-filename))
(call-with-output-file file-name (call-with-output-file file-name
(lambda (file) (lambda (file)
(put-bytevector file header) (put-bytevector file header)
(call-with-input-file temp-filename (call-with-input-file temp-filename
(lambda (temp-file) (lambda (temp-file)
(sendfile (sendfile
file temp-file file temp-file
(stat:size (stat temp-file)) 0))))))))))))) (stat:size (stat temp-file)) 0)))))))))))))
(for-each repack-jmod (for-each repack-jmod
(find-files (assoc-ref outputs "jdk") ".*.jmod$"))) (find-files (assoc-ref outputs "jdk") ".*.jmod$")))
#t))) #t)))
(add-after 'install 'remove-timestamp-from-api-summary (add-after 'install 'remove-timestamp-from-api-summary
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(substitute* (string-append (assoc-ref outputs "doc") (substitute* (string-append (assoc-ref outputs "doc")
@ -2393,17 +2393,17 @@ new Date();"))
(name "openjdk") (name "openjdk")
(version "13.0") (version "13.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri "http://hg.openjdk.java.net/jdk/jdk13/archive/9c250a7600e1.tar.bz2") (uri "http://hg.openjdk.java.net/jdk/jdk13/archive/9c250a7600e1.tar.bz2")
(file-name (string-append name "-" version ".tar.bz2")) (file-name (string-append name "-" version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"0v0ljvx5dyzp96dw4z4ksw3pvasil7783mgnmd1wk9gads5ab8iq")) "0v0ljvx5dyzp96dw4z4ksw3pvasil7783mgnmd1wk9gads5ab8iq"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
`(begin `(begin
(for-each delete-file (find-files "." ".*.(bin|exe|jar)$")) (for-each delete-file (find-files "." ".*.(bin|exe|jar)$"))
#t)))) #t))))
(inputs (inputs
`(("alsa-lib" ,alsa-lib) `(("alsa-lib" ,alsa-lib)
("cups" ,cups) ("cups" ,cups)
@ -2435,21 +2435,21 @@ new Date();"))
(name "openjdk") (name "openjdk")
(version "14.0") (version "14.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri "http://hg.openjdk.java.net/jdk/jdk14/archive/bc54620a3848.tar.bz2") (uri "http://hg.openjdk.java.net/jdk/jdk14/archive/bc54620a3848.tar.bz2")
(file-name (string-append name "-" version ".tar.bz2")) (file-name (string-append name "-" version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"0z485pk7r1xpw8004g4nrwrzj17sabgx8yfdbxwfvzkjp8qyajch")) "0z485pk7r1xpw8004g4nrwrzj17sabgx8yfdbxwfvzkjp8qyajch"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
`(begin `(begin
;; The m4 macro uses 'help' to search for builtins, which is ;; The m4 macro uses 'help' to search for builtins, which is
;; not available in bash-minimal ;; not available in bash-minimal
(substitute* "make/autoconf/basics.m4" (substitute* "make/autoconf/basics.m4"
(("if help") "if command -v")) (("if help") "if command -v"))
(for-each delete-file (find-files "." ".*.(bin|exe|jar)$")) (for-each delete-file (find-files "." ".*.(bin|exe|jar)$"))
#t)))) #t))))
(inputs (inputs
`(("alsa-lib" ,alsa-lib) `(("alsa-lib" ,alsa-lib)
("cups" ,cups) ("cups" ,cups)