diff options
author | Marius Bakke <mbakke@fastmail.com> | 2018-06-11 23:52:15 +0200 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2018-06-11 23:52:15 +0200 |
commit | a032b4454b3fc67e11e9fc2d8c2345288065fa29 (patch) | |
tree | c208124b79dbd2224b68c52106aa72ff2ebfa7ab /gnu/packages/certs.scm | |
parent | b5724230fed2d043206df20d12a45bb962b7ee77 (diff) | |
parent | 6321ce42ab4d9ab788d858cb19bde4aa7a0e3ecc (diff) | |
download | guix-a032b4454b3fc67e11e9fc2d8c2345288065fa29.tar guix-a032b4454b3fc67e11e9fc2d8c2345288065fa29.tar.gz |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/certs.scm')
-rw-r--r-- | gnu/packages/certs.scm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gnu/packages/certs.scm b/gnu/packages/certs.scm index b4c09c7750..3f592cf17b 100644 --- a/gnu/packages/certs.scm +++ b/gnu/packages/certs.scm @@ -63,7 +63,8 @@ (("crt") "pem")) (mkdir-p bin) (copy-file "certdata2pem.py" - (string-append bin "/certdata2pem.py")))))) + (string-append bin "/certdata2pem.py")) + #t)))) (synopsis "Python script to extract .pem data from certificate collection") (description "certdata2pem.py is a Python script to transform X.509 certificate @@ -121,7 +122,7 @@ (mkdir-p certsdir) (with-directory-excursion "nss/lib/ckfw/builtins/" ;; extract single certificates from blob - (system* "certdata2pem.py" "certdata.txt") + (invoke "certdata2pem.py" "certdata.txt") ;; copy selected .pem files into the output (for-each maybe-install-cert (find-files "." ".*\\.pem"))) @@ -170,10 +171,9 @@ taken from the NSS package and thus ultimately from the Mozilla project.") ;; Create hash symlinks suitable for OpenSSL ('SSL_CERT_DIR' and ;; similar.) (chdir (string-append %output "/etc/ssl/certs")) - (unless (zero? (system* (string-append perl "/bin/perl") - (string-append openssl "/bin/c_rehash") - ".")) - (error "'c_rehash' failed" openssl)))))) + (invoke (string-append perl "/bin/perl") + (string-append openssl "/bin/c_rehash") + "."))))) (native-inputs `(("openssl" ,openssl) ("perl" ,perl))) ;for 'c_rehash' |