From 464f5447396fcec9b43f7eab71d5d42b522a157f Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 9 Mar 2018 23:11:48 +0100 Subject: gnu: 'autoconf-wrapper' is no longer a procedure. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes . Suggested by Björn Höfling . * gnu/packages/autotools.scm (autoconf-wrapper): Rename to... (make-autoconf-wrapper): ... this. Add 'properties' field. (autoconf-wrapper): New variable. * gnu/packages/gnunet.scm (guile-gnunet): Adjust accordingly. * gnu/packages/gnupg.scm (signing-party): Likewise. * gnu/packages/guile.scm (guile-ics, guile-bash): Likewise. * gnu/packages/libevent.scm (libuv): Likewise. * gnu/packages/logging.scm (glog): Likewise. * gnu/packages/mail.scm (libetpan): Likewise. * gnu/packages/mate.scm (mate-icon-theme-faenza) (mate-screensaver): Likewise. * gnu/packages/package-management.scm (guix): Likewise. * gnu/packages/sawfish.scm (librep): Likewise. * gnu/packages/video.scm (motion): Likewise. * gnu/packages/zile.scm (zile-on-guile): Likewise. --- gnu/packages/gnupg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnupg.scm') diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index eeab5c5afd..28f5b58887 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Ludovic Courtès +;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès ;;; Copyright © 2013, 2015 Andreas Enge ;;; Copyright © 2014 Eric Bavier ;;; Copyright © 2014, 2015, 2016 Mark H Weaver @@ -618,7 +618,7 @@ PGP keysigning parties.") "1n5bpcfpl9vg1xp6r1jhbyahrgdyxp05b5pria1rh4m0qnv8sifr")))) (build-system gnu-build-system) (native-inputs - `(("autoconf" ,(autoconf-wrapper)) + `(("autoconf" ,autoconf-wrapper) ("automake" ,automake))) (inputs `(("perl" ,perl) ("perl-text-template" ,perl-text-template) -- cgit v1.2.3 From 607d280ec82e8c4849926a380f4c717585a4ce80 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 5 Mar 2018 11:03:28 +0200 Subject: gnu: Add jetring. * gnu/packages/gnupg.scm (jetring): New variable. --- gnu/packages/gnupg.scm | 57 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 56 insertions(+), 1 deletion(-) (limited to 'gnu/packages/gnupg.scm') diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 28f5b58887..2696e332de 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2014 Eric Bavier ;;; Copyright © 2014, 2015, 2016 Mark H Weaver ;;; Copyright © 2015 Paul van der Walt -;;; Copyright © 2015, 2016, 2017 Efraim Flashner +;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner ;;; Copyright © 2015, 2016, 2017 Ricardo Wurmus ;;; Copyright © 2016 Christopher Allan Webber ;;; Copyright © 2016, 2017 ng0 @@ -929,3 +929,58 @@ keyring content. Parcimonie is a daemon that fetches one key at a time using the Tor network, waits a bit, changes the Tor circuit being used, and starts over.") (license license:gpl1+))) + +(define-public jetring + (package + (name "jetring") + (version "0.25") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://debian/pool/main/j/" name "/" + name "_" version ".tar.xz")) + (sha256 + (base32 + "0shcnnw0h31b08vmnvf18ni33dg40w18wv9smb69vkklz3h4jhpw")))) + (build-system gnu-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (delete 'configure) ; no configure script + (add-before 'install 'hardlink-gnupg + (lambda* (#:key inputs #:allow-other-keys) + (let ((gpg (string-append (assoc-ref inputs "gnupg") + "/bin/gpg"))) + (substitute* (find-files "." "jetring-[[:alpha:]]+$") + (("gpg -") (string-append gpg " -")) + (("\\\"gpg\\\"") (string-append "\"" gpg "\""))) + #t))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (man (string-append out "/share/man"))) + (for-each (lambda (file) + (install-file file (string-append out "/bin/"))) + (find-files "." "jetring-[[:alpha:]]+$")) + (for-each (lambda (file) + (install-file file (string-append man "/man1/"))) + (find-files "." ".*\\.1$")) + (install-file "jetring.7" (string-append man "/man7/")) + #t)))) + #:tests? #f)) ; no test phase + (inputs + `(("gnupg" ,gnupg) + ("perl" ,perl))) + (home-page "https://joeyh.name/code/jetring/") + (synopsis "GnuPG keyring maintenance using changesets") + (description + "Jetring is a collection of tools that allow for gpg keyrings to be +maintained using changesets. It was developed with the Debian keyring in mind, +and aims to solve the problem that a gpg keyring is a binary blob that's hard +for multiple people to collaboratively edit. + +With jetring, changesets can be submitted, reviewed to see exactly what they +will do, applied, and used to build a keyring. The origin of every change made +to the keyring is available for auditing, and gpg signatures can be used for +integrity guarantees.") + (license license:gpl2+))) -- cgit v1.2.3