From 9e61d1534a593f71fa7433fae0d4b04721b622d8 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 14 Mar 2017 22:09:33 -0400 Subject: [PATCH 01/20] gnu: bitcoin-core: Update to 0.14.0. * gnu/packages/finance.scm (bitcoin-core): Update to 0.14.0. --- gnu/packages/finance.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 234e40c281..3c305f4b2a 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -49,7 +49,7 @@ (define-public bitcoin-core (package (name "bitcoin-core") - (version "0.13.0") + (version "0.14.0") (source (origin (method url-fetch) (uri @@ -57,7 +57,7 @@ version "/bitcoin-" version ".tar.gz")) (sha256 (base32 - "1nhw2s8p1hg6715l6kc1c7psqhkzfwhfrrgiar17zccvd14p0z8c")))) + "07k4i9r033dsvkp5ii5g3hykidm8b19c8c0mz1bi8k0dda3d8hyp")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) From 13292ee57077be8c77aa379ea4e5f85f1e5358ef Mon Sep 17 00:00:00 2001 From: Mekeor Melire Date: Thu, 2 Mar 2017 23:30:18 +0100 Subject: [PATCH 02/20] gnu: Add libmesode. * gnu/packages/messaging.scm (libmesode): New variable. Signed-off-by: Leo Famulari --- gnu/packages/messaging.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 4e40567b1c..c14fb72386 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2016, 2017 ;;; Copyright © 2016 Andy Patterson ;;; Copyright © 2016, 2017 Clément Lassieur +;;; Copyright © 2017 Mekeor Melire ;;; ;;; This file is part of GNU Guix. ;;; @@ -1222,4 +1223,39 @@ is also scriptable and extensible via Guile.") (home-page "https://www.gnu.org/software/freetalk") (license license:gpl3+))) +(define-public libmesode + (package + (name "libmesode") + (version "0.9.1") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/boothj5/libmesode/archive/" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0iaj56fkd5bjvqpvq3324ni895rmbj1akbfqipjydnghfwaym4z6")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'configure 'bootstrap + (lambda _ + (zero? (system* "./bootstrap.sh"))))))) + (inputs + `(("expat" ,expat) + ("openssl" ,openssl))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool) + ("pkg-config" ,pkg-config))) + (synopsis "C library for writing XMPP clients") + (description "Libmesode is a fork of libstrophe for use with Profanity +XMPP Client. In particular, libmesode provides extra TLS functionality such as +manual SSL certificate verification.") + (home-page "https://github.com/boothj5/libmesode") + ;; Dual licensed. + (license (list license:gpl3+ license:x11)))) + ;;; messaging.scm ends here From 781d3b070cab20caf33a2b9ac8d48b3221622fab Mon Sep 17 00:00:00 2001 From: Mekeor Melire Date: Thu, 2 Mar 2017 23:31:09 +0100 Subject: [PATCH 03/20] gnu: Add libstrophe. * gnu/packages/messaging.scm (libstrophe): New variable. Signed-off-by: Leo Famulari --- gnu/packages/messaging.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index c14fb72386..493b18b666 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1258,4 +1258,39 @@ manual SSL certificate verification.") ;; Dual licensed. (license (list license:gpl3+ license:x11)))) +(define-public libstrophe + (package + (name "libstrophe") + (version "0.9.1") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/strophe/libstrophe/archive/" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1hzwdax4nsz0fncf5bjfza0cn0lc6xsf38y569ql1gg5hvwr6169")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'configure 'bootstrap + (lambda _ + (zero? (system* "./bootstrap.sh"))))))) + (inputs + `(("expat" ,expat) + ("openssl" ,openssl))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool) + ("pkg-config" ,pkg-config))) + (synopsis "C library for writing XMPP clients") + (description "Libstrophe is a minimal XMPP library written in C. It has +almost no external dependencies, only an XML parsing library (expat or libxml +are both supported).") + (home-page "http://strophe.im/libstrophe") + ;; Dual licensed. + (license (list license:gpl3+ license:x11)))) + ;;; messaging.scm ends here From a829c6501be67b700df4d95258e8593224f68000 Mon Sep 17 00:00:00 2001 From: Mekeor Melire Date: Thu, 2 Mar 2017 23:31:50 +0100 Subject: [PATCH 04/20] gnu: Add profanity. * gnu/packages/messaging.scm (profanity): New variable. Signed-off-by: Leo Famulari --- gnu/packages/messaging.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 493b18b666..559138ff39 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -44,6 +44,7 @@ #:use-module (gnu packages base) #:use-module (gnu packages check) #:use-module (gnu packages crypto) + #:use-module (gnu packages curl) #:use-module (gnu packages cyrus-sasl) #:use-module (gnu packages databases) #:use-module (gnu packages documentation) @@ -1293,4 +1294,38 @@ are both supported).") ;; Dual licensed. (license (list license:gpl3+ license:x11)))) +(define-public profanity + (package + (name "profanity") + (version "0.5.1") + (source (origin + (method url-fetch) + (uri "http://www.profanity.im/profanity-0.5.1.tar.gz") + (sha256 + (base32 + "1f7ylw3mhhnii52mmk40hyc4kqhpvjdr3hmsplzkdhsfww9kflg3")))) + (build-system gnu-build-system) + (inputs + `(("curl" ,curl) + ("expat" ,expat) + ("glib" ,glib) + ("gpgme" ,gpgme) + ("libmesode" ,libmesode) + ("libotr" ,libotr) + ("ncurses" ,ncurses) + ("openssl" ,openssl) + ("readline" ,readline))) + (native-inputs + `(("autoconf" ,autoconf) + ("autoconf-archive" ,autoconf-archive) + ("automake" ,automake) + ("cmocka" ,cmocka) + ("libtool" ,libtool) + ("pkg-config" ,pkg-config))) + (synopsis "Console-based XMPP client") + (description "Profanity is a console based XMPP client written in C +using ncurses and libmesode, inspired by Irssi.") + (home-page "http://www.profanity.im") + (license license:gpl3+))) + ;;; messaging.scm ends here From 4e128dd5822bca6981076727d5fbb4cc4a5e8ff1 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 15 Mar 2017 16:04:06 +0100 Subject: [PATCH 05/20] gnu: man-pages: Update to 4.10. * gnu/packages/man.scm (man-pages): Update to 4.10. [home-page]: Use HTTPS. --- gnu/packages/man.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/man.scm b/gnu/packages/man.scm index 3763292fe4..38986cdce1 100644 --- a/gnu/packages/man.scm +++ b/gnu/packages/man.scm @@ -134,7 +134,7 @@ the traditional flat-text whatis databases.") (define-public man-pages (package (name "man-pages") - (version "4.09") + (version "4.10") (source (origin (method url-fetch) (uri @@ -147,7 +147,7 @@ the traditional flat-text whatis databases.") "man-pages-" version ".tar.xz"))) (sha256 (base32 - "1740gq9sq28dp5a5sjn1ya7cvrv8mbky6knb7734v8k29a7a0x55")))) + "1yk3ibmbc1wamw798lqw8lh203xnrjddy8wdk5d3hifmj71xz5bk")))) (build-system gnu-build-system) (arguments '(#:phases (alist-delete 'configure %standard-phases) @@ -161,7 +161,7 @@ the traditional flat-text whatis databases.") #:make-flags (list (string-append "MANDIR=" (assoc-ref %outputs "out") "/share/man")))) - (home-page "http://www.kernel.org/doc/man-pages/") + (home-page "https://www.kernel.org/doc/man-pages/") (synopsis "Development manual pages from the Linux project") (description "This package provides traditional Unix \"man pages\" documenting the From 618e4bfbad0740c4addc9e88d9667d5dc65b0bce Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 15 Mar 2017 19:50:40 +0100 Subject: [PATCH 06/20] gnu: cryptsetup: Update to 1.7.4. * gnu/packages/cryptsetup.scm (cryptsetup): Update to 1.7.4. --- gnu/packages/cryptsetup.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cryptsetup.scm b/gnu/packages/cryptsetup.scm index da58facffb..900b004a50 100644 --- a/gnu/packages/cryptsetup.scm +++ b/gnu/packages/cryptsetup.scm @@ -32,7 +32,7 @@ (define-public cryptsetup (package (name "cryptsetup") - (version "1.7.3") + (version "1.7.4") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/linux/utils/cryptsetup/v" @@ -40,7 +40,7 @@ "/" name "-" version ".tar.xz")) (sha256 (base32 - "00nwd96m9yq4k3cayc04i5y7iakkzana35zxky6hpx2w8zl08axg")))) + "05m0ric8anrkl62smk8rafgi30j9jrxw20qzss9gnf4sywz8kkvw")))) (build-system gnu-build-system) (inputs `(("libgcrypt" ,libgcrypt) From f38607536e10f8991bf67d4f6dc5e0632f206f47 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 13 Mar 2017 16:19:06 +0100 Subject: [PATCH 07/20] gnu: Use INSTALL-FILE where appropriate. * gnu/packages/admin.scm (wpa-supplicant-minimal): Substitute the simpler INSTALL-FILE for COPY-FILE when invoked with redundant arguments. * gnu/packages/bioinformatics.scm (couger, aragorn, express-beta-diversity, edirect, fasttree, rsem, samtools-0.1): Likewise. * gnu/packages/code.scm (withershins): Likewise. * gnu/packages/conky.scm (conky): Likewise. * gnu/packages/debug.scm (delta, american-fuzzy-lop): Likewise. * gnu/packages/emacs.scm (emacs-mit-scheme-doc): Likewise. * gnu/packages/engineering.scm (librecad): Likewise. --- gnu/packages/admin.scm | 4 +--- gnu/packages/bioinformatics.scm | 37 +++++++++++++-------------------- gnu/packages/code.scm | 14 ++++++------- gnu/packages/conky.scm | 2 +- gnu/packages/debug.scm | 14 ++++++------- gnu/packages/emacs.scm | 2 +- gnu/packages/engineering.scm | 14 ++++++------- 7 files changed, 38 insertions(+), 49 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 4b14e0ef32..4197f63983 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -905,9 +905,7 @@ commands and their arguments.") (man8 (string-append man "/man8"))) (define (copy-man-page target) (lambda (file) - (copy-file file - (string-append target "/" - (basename file))))) + (install-file file target))) (mkdir-p man5) (mkdir man8) (for-each (copy-man-page man5) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 239b94b6c4..3387a2571a 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -151,11 +151,9 @@ and several other tools.") (bin (string-append out "/bin")) (man (string-append out "/share/man/man1"))) (mkdir-p bin) - (copy-file "aragorn" - (string-append bin "/aragorn")) + (install-file "aragorn" bin) (mkdir-p man) - (copy-file "aragorn.1" - (string-append man "/aragorn.1"))) + (install-file "aragorn.1" man)) #t))))) (home-page "http://mbio-serv2.mbioekol.lu.se/ARAGORN") (synopsis "Detect tRNA, mtRNA and tmRNA genes in nucleotide sequences") @@ -1700,15 +1698,16 @@ gene predictor designed to work with assembled, aligned RNA-seq transcripts.") (replace 'install (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin"))) (copy-recursively "src" (string-append out "/src")) - (mkdir (string-append out "/bin")) + (mkdir bin) ;; Add "src" directory to module lookup path. (substitute* "couger" (("from argparse") (string-append "import sys\nsys.path.append(\"" out "\")\nfrom argparse"))) - (copy-file "couger" (string-append out "/bin/couger"))) + (install-file "couger" bin)) #t)) (add-after 'install 'wrap-program @@ -2231,8 +2230,7 @@ quantitative phenotypes.") (let ((target (string-append (assoc-ref outputs "out") "/bin"))) (mkdir-p target) - (copy-file "edirect.pl" - (string-append target "/edirect.pl")) + (install-file "edirect.pl" target) #t))) (add-after 'install 'wrap-program @@ -2378,10 +2376,8 @@ ChIP-Seq, and analysis of metagenomic data.") (let ((bin (string-append (assoc-ref outputs "out") "/bin"))) (mkdir-p bin) - (copy-file "scripts/convertToEBD.py" - (string-append bin "/convertToEBD.py")) - (copy-file "bin/ExpressBetaDiversity" - (string-append bin "/ExpressBetaDiversity")) + (install-file "scripts/convertToEBD.py" bin) + (install-file "bin/ExpressBetaDiversity" bin) #t)))))) (inputs `(("python" ,python-2))) @@ -2440,10 +2436,8 @@ similarity of community members.") (let ((bin (string-append (assoc-ref outputs "out") "/bin"))) (mkdir-p bin) - (copy-file "FastTree" - (string-append bin "/FastTree")) - (copy-file "FastTreeMP" - (string-append bin "/FastTreeMP")) + (install-file "FastTree" bin) + (install-file "FastTreeMP" bin) #t)))))) (home-page "http://www.microbesonline.org/fasttree") (synopsis "Infers approximately-maximum-likelihood phylogenetic trees") @@ -4101,11 +4095,9 @@ phylogenies.") (mkdir-p bin) (mkdir-p perl) (for-each (lambda (file) - (copy-file file - (string-append bin (basename file)))) + (install-file file bin)) (find-files "." "rsem-.*")) - (copy-file "rsem_perl_utils.pm" - (string-append perl "/rsem_perl_utils.pm"))) + (install-file "rsem_perl_utils.pm" perl)) #t)) (add-after 'install 'wrap-program @@ -4336,8 +4328,7 @@ viewer.") (let ((bin (string-append (assoc-ref outputs "out") "/bin"))) (mkdir-p bin) - (copy-file "samtools" - (string-append bin "/samtools")) + (install-file "samtools" bin) #t))) (delete 'patch-tests) (delete 'configure)))))))) diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm index f91fdab153..3aaa754c09 100644 --- a/gnu/packages/code.scm +++ b/gnu/packages/code.scm @@ -271,13 +271,13 @@ features that are not supported by the standard @code{stdio} implementation.") (replace 'install (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (mkdir-p (string-append out "/lib")) - (mkdir (string-append out "/include")) - (copy-file "src/withershins.hpp" - (string-append out "/include/withershins.hpp")) - (copy-file "src/libwithershins.a" - (string-append out "/lib/libwithershins.a"))) + (let* ((out (assoc-ref outputs "out")) + (include (string-append out "/include")) + (lib (string-append out "/lib"))) + (mkdir-p include) + (install-file "src/withershins.hpp" include) + (mkdir-p lib) + (install-file "src/libwithershins.a" lib)) #t))))) (home-page "https://github.com/cameronwhite/withershins") (inputs diff --git a/gnu/packages/conky.scm b/gnu/packages/conky.scm index 9c933a4bc0..1f5b38eef4 100644 --- a/gnu/packages/conky.scm +++ b/gnu/packages/conky.scm @@ -64,7 +64,7 @@ (lambda* (#:key outputs #:allow-other-keys) (let ((bin (string-append (assoc-ref outputs "out") "/bin"))) (mkdir-p bin) - (copy-file "src/conky" (string-append bin "/conky")))) + (install-file "src/conky" bin))) %standard-phases)))) (inputs `(("freetype" ,freetype) diff --git a/gnu/packages/debug.scm b/gnu/packages/debug.scm index 6278f661ef..27193c8bba 100644 --- a/gnu/packages/debug.scm +++ b/gnu/packages/debug.scm @@ -68,10 +68,10 @@ (mkdir-p bin) (mkdir-p doc) (for-each (lambda (h) - (copy-file h (string-append doc "/" (basename h)))) + (install-file h doc)) `("License.txt" ,@(find-files "www" ".*\\.html"))) (for-each (lambda (b) - (copy-file b (string-append bin "/" b))) + (install-file b bin)) `("delta" "multidelta" "topformflat"))))) (alist-delete 'configure %standard-phases)))) (home-page "http://delta.tigris.org/") @@ -212,13 +212,13 @@ tools that process C/C++ code.") (system* "tar" "xf" (assoc-ref inputs "afl-src"))) (error "tar failed to unpack afl-src")) - (copy-file (string-append patch-dir - "/afl-qemu-cpu-inl.h") - "./afl-qemu-cpu-inl.h") + (install-file (string-append patch-dir + "/afl-qemu-cpu-inl.h") + ".") (copy-file (string-append afl-dir "/config.h") "./afl-config.h") - (copy-file (string-append afl-dir "/types.h") - "./types.h") + (install-file (string-append afl-dir "/types.h") + ".") (substitute* "afl-qemu-cpu-inl.h" (("\\.\\./\\.\\./config.h") "afl-config.h")) (substitute* (string-append patch-dir diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 3db5527e60..c6e62acb7a 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -2101,7 +2101,7 @@ to a key in your preferred mode.") ;; keep only file of interest '(begin (for-each delete-file '("dot-emacs.el" "Makefile")) - (copy-file "6.945-config/mit-scheme-doc.el" "mit-scheme-doc.el") + (install-file "6.945-config/mit-scheme-doc.el" ".") (delete-file-recursively "6.945-config"))) (file-name (string-append name "-" version ".tar.bz2")) (method url-fetch) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 23446bafa8..dd56af99da 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -96,13 +96,13 @@ (assoc-ref inputs "boost"))))) (replace 'install (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (mkdir-p (string-append out "/bin")) - (mkdir-p (string-append out "/share/librecad")) - (copy-file "unix/librecad" - (string-append out "/bin/librecad")) - (copy-recursively "unix/resources" - (string-append out "/share/librecad")))))))) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (share (string-append out "/share/librecad"))) + (mkdir-p bin) + (install-file "unix/librecad" bin) + (mkdir-p share) + (copy-recursively "unix/resources" share))))))) (inputs `(("boost" ,boost) ("muparser" ,muparser) From 7ea523853c127d123c5f770d0f58ca7a7070addc Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 15 Mar 2017 21:57:58 +0100 Subject: [PATCH 08/20] gnu: mailutils: Update to 3.2. * gnu/packages/mail.scm (mailutils): Update to 3.2. --- gnu/packages/mail.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index fa8a3aae6b..3bf0e66479 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -107,14 +107,14 @@ (define-public mailutils (package (name "mailutils") - (version "3.1.1") + (version "3.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/mailutils/mailutils-" version ".tar.bz2")) (sha256 (base32 - "1dpylyg79avi7brpkcmzaq7bqqkz45flp0ws6f2c8b1gyz4hdnzm")))) + "0c06yj5hgqibi24ib9sx865kq6i1h18wn201g6iwcfbpi2a7psdm")))) (build-system gnu-build-system) (arguments '(#:phases From 3d602acb13ea68a4cefc3f205b334bc64cdcc6ea Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 15 Mar 2017 21:09:19 +0100 Subject: [PATCH 09/20] gnu: no-more-secrets: Update to 0.3.2. * gnu/packages/games.scm (no-more-secrets): Update to 0.3.2. --- gnu/packages/games.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index f8152e0184..936cfaa9a6 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -3190,7 +3190,7 @@ to the Space Age.") (define-public no-more-secrets (package (name "no-more-secrets") - (version "0.3.0") + (version "0.3.2") (source (origin (method url-fetch) @@ -3199,7 +3199,7 @@ to the Space Age.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "038flwqr0kqv55im2v76xjn01zbvvkb3nzb5ridwm2kbnk9cgg4v")))) + "00mzdif859vm75n1igrffh8c07p1nr4rlm3yb7lrkwwxhrw8xzla")))) (build-system gnu-build-system) (arguments `(#:tests? #f From cf8d0687756fc5a3ce9ba3059292648cc658f1b7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 15 Mar 2017 21:58:59 +0100 Subject: [PATCH 10/20] gnu: units: Update to 2.14. * gnu/packages/maths.scm (units): Update to 2.14. --- gnu/packages/maths.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index d274d50bbc..03567ba083 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -185,13 +185,13 @@ programming languages.") (define-public units (package (name "units") - (version "2.13") + (version "2.14") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/units/units-" version ".tar.gz")) (sha256 (base32 - "1awhjw9zjlfb8s5g3yyx63f7ddfcr1sanlbxpqifmrgq24ql198b")))) + "1s421bxm36akjsy3qzg6da1d1g20gh094ac2slqxipgkh8yqjcwx")))) (build-system gnu-build-system) (synopsis "Conversion between thousands of scales") (description From dce8ac54b4d3648b7b63ae3a07292f43ceddf5a8 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 15 Mar 2017 17:18:47 -0400 Subject: [PATCH 11/20] gnu: profanity: Make the source URL version-agnostic. * gnu/packages/messaging.scm (profanity)[source]: Use (version) in the source URL. --- gnu/packages/messaging.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 559138ff39..7aa7b7bfe5 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1300,7 +1300,8 @@ are both supported).") (version "0.5.1") (source (origin (method url-fetch) - (uri "http://www.profanity.im/profanity-0.5.1.tar.gz") + (uri (string-append "http://www.profanity.im/profanity-" + version ".tar.gz")) (sha256 (base32 "1f7ylw3mhhnii52mmk40hyc4kqhpvjdr3hmsplzkdhsfww9kflg3")))) From 80a725726d3b3a62c69c9f80d35a898dcea8ad90 Mon Sep 17 00:00:00 2001 From: Andy Wingo Date: Wed, 15 Mar 2017 22:58:35 +0100 Subject: [PATCH 12/20] gnu: guile-next: Update to 2.2.0. * gnu/packages/guile.scm (guile-next): Update to 2.2.0. --- gnu/packages/guile.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 17c808d4bd..e44c0652bc 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -234,15 +234,15 @@ without requiring the source code to be rewritten.") (define-public guile-next (package (inherit guile-2.0) (name "guile-next") - (version "2.1.8") + (version "2.2.0") (replacement #f) (source (origin (method url-fetch) - (uri (string-append "ftp://alpha.gnu.org/gnu/guile/guile-" - version ".tar.xz")) + (uri (string-append "mirror://gnu/guile/guile-" version + ".tar.lz")) (sha256 (base32 - "0rh9vahqqwbyj79p1lc9pljkgxg8rczczf074dr8wl13j5h0y27m")) + "083vp6754dp4d5pvcy4bqvxq60cayf92v5slf5cgij8bnvixgyvr")) (modules '((guix build utils))) ;; Remove the pre-built object files. Instead, build everything From 5b5cf3c7659ee33bb981135708929c8f0a46aec8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor=20Boskovits?= Date: Wed, 15 Mar 2017 18:14:43 -0400 Subject: [PATCH 13/20] gnu: Add tftp-hpa. * gnu/packages/networking.scm (tftp-hpa): New variable. Signed-off-by: Leo Famulari --- gnu/packages/networking.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 95253687cd..e36903b8af 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -1141,3 +1141,28 @@ IPFIX, RSPAN, CLI, LACP, 802.1ag).") "Command line interface for testing internet bandwidth using speedtest.net.") (license license:asl2.0))) + +(define-public tftp-hpa + (package + (name "tftp-hpa") + (version "5.2") + (source (origin + (method url-fetch) + (uri (string-append "mirror://kernel.org/software/" + "network/tftp/tftp-hpa/tftp-hpa-" version + ".tar.xz")) + (sha256 + (base32 + "12vidchglhyc20znq5wdsbhi9mqg90jnl7qr9qs8hbvaz4fkdvmg")))) + (build-system gnu-build-system) + (arguments `(#:tests? #f)) ; no test target + (synopsis "HPA's tftp client") + (description + "This is a tftp client derived from OpenBSD tftp with some extra options +added and bugs fixed. The source includes readline support but it is not +enabled due to license conflicts between the BSD advertising clause and the GPL.") + (home-page "http://git.kernel.org/cgit/network/tftp/tftp-hpa.git/about/") + ;; Some source files are distributed under a 3-clause BSD license, and + ;; others under a 4-clause BSD license. Refer to the files in the source + ;; distribution for clarification. + (license (list license:bsd-3 license:bsd-4)))) From 26a657f06a24e62181fcfe1e25f4ab5bd21075b4 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Wed, 15 Mar 2017 23:14:42 -0400 Subject: [PATCH 14/20] gnu: Add prboom-plus. * gnu/packages/games.scm (prboom-plus): New variable. --- gnu/packages/games.scm | 47 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 46 insertions(+), 1 deletion(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 936cfaa9a6..f264ef206f 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -19,7 +19,7 @@ ;;; Copyright © 2016 Manolis Fragkiskos Ragkousis ;;; Copyright © 2016, 2017 ng0 ;;; Copyright © 2016 Albin Söderqvist -;;; Copyright © 2016 Kei Kebreau +;;; Copyright © 2016, 2017 Kei Kebreau ;;; Copyright © 2016 Alex Griffin ;;; Copyright © 2016 Efraim Flashner ;;; Copyright © 2016 Jan Nieuwenhuizen @@ -73,6 +73,7 @@ #:use-module (gnu packages libunwind) #:use-module (gnu packages haskell) #:use-module (gnu packages mp3) + #:use-module (gnu packages music) #:use-module (gnu packages icu4c) #:use-module (gnu packages image) #:use-module (gnu packages ncurses) @@ -195,6 +196,50 @@ scriptable with Guile.") Chess). It is similar to standard chess but this variant is far more complicated.") (license license:gpl3+))) +(define-public prboom-plus + (package + (name "prboom-plus") + (version "2.5.1.4") + (source (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/" name "/" name "/" + version "/" name "-" version ".tar.gz")) + (sha256 + (base32 + "151v6nign86m1a2vqz27krsccpc9m4d1jax4y43v2fa82wfj9qp0")) + (modules '((guix build utils))) + (snippet + '(substitute* "src/version.c" + (("__DATE__") "") + (("__TIME__") ""))))) + (build-system gnu-build-system) + (arguments + '(#:configure-flags '("--disable-cpu-opt") + #:make-flags `(,(string-append "gamesdir=" + (assoc-ref %outputs "out") "/bin")) + #:phases + (modify-phases %standard-phases + (add-after 'set-paths 'set-sdl'paths + (lambda* (#:key inputs #:allow-other-keys) + (setenv "CPATH" + (string-append (assoc-ref inputs "sdl-union") + "/include/SDL")) + #t))))) + (inputs + `(("fluidsynth" ,fluidsynth) + ("glu" ,glu) + ("libmad" ,libmad) + ("libpng" ,libpng) + ("libvorbis" ,libvorbis) + ("pcre" ,pcre) + ("portmidi" ,portmidi) + ("sdl-union" ,(sdl-union (list sdl sdl-image sdl-mixer sdl-net))))) + (home-page "http://prboom-plus.sourceforge.net/") + (synopsis "Version of the classic 3D shoot'em'up game Doom") + (description + "PrBoom+ is a Doom source port developed from the original PrBoom project.") + (license license:gpl2+))) + (define-public xshogi (package (name "xshogi") From 70fc93cb28c9782d02852e17d6845b50108e4aef Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 15 Mar 2017 23:36:57 +0100 Subject: [PATCH 15/20] gnu: python-ptyprocess: Update to 0.5.1. * gnu/packages/python.scm (python-ptyprocess): Update to 0.5.1. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index f6042d97f2..5d629d280e 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -6532,7 +6532,7 @@ markdown_py is also provided to convert Markdown files to HTML.") (define-public python-ptyprocess (package (name "python-ptyprocess") - (version "0.5") + (version "0.5.1") (source (origin (method url-fetch) @@ -6541,7 +6541,7 @@ markdown_py is also provided to convert Markdown files to HTML.") version ".tar.gz")) (sha256 (base32 - "0nggns5kikn32yyda2zrj1xdmh49pi3v0drggcdwljbv36r8zdyw")))) + "19l1xrjn4l9gjz01s3vg92gn2dd9d8mw1v86ppkzlnr9m5iwwc05")))) (build-system python-build-system) (native-inputs `(("python-nose" ,python-nose))) From d93985fe22d0920daaee31207685bda52a7d7f7c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 15 Mar 2017 23:37:35 +0100 Subject: [PATCH 16/20] gnu: python-botocore: Update to 1.5.26. * gnu/packages/python.scm (python-botocore): Update to 1.5.26. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 5d629d280e..2ca7fa0e23 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -9315,14 +9315,14 @@ document.") (define-public python-botocore (package (name "python-botocore") - (version "1.5.10") + (version "1.5.26") (source (origin (method url-fetch) (uri (pypi-uri "botocore" version)) (sha256 (base32 - "1hqvqwhgfcch4knm1l02ynx7qd1igxk3pj34c1x2b0r79jca524n")))) + "1b7l48hr88galrrc5q6k21z3sdadzxc87ppzs7k9fz4p1w8bfnvb")))) (build-system python-build-system) (arguments ;; FIXME: Many tests are failing. From 192b887a03154fe94bb1ea1e1c7471cd765610f2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 15 Mar 2017 23:38:24 +0100 Subject: [PATCH 17/20] gnu: awscli: Update to 1.11.63. * gnu/packages/python.scm (awscli): Update to 1.11.63. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 2ca7fa0e23..049a7945b6 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -9349,14 +9349,14 @@ interface to the Amazon Web Services (AWS) API.") (define-public awscli (package (name "awscli") - (version "1.11.47") + (version "1.11.63") (source (origin (method url-fetch) (uri (pypi-uri name version)) (sha256 (base32 - "0p0pila0k99fm87q1gb24wyd34ags0vkh37h1fa6hklq4mi69i1w")))) + "1r8aqv8w27k76lcsfk83w6qw9lz8gk2ibzwacp5wjhpp2gik911m")))) (build-system python-build-system) (propagated-inputs `(("python-colorama" ,python-colorama) From 918621626875272a7de182a365847eb4d4b205eb Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 15 Mar 2017 23:39:27 +0100 Subject: [PATCH 18/20] gnu: python-publicsuffix2: Update to 2.20160818. * gnu/packages/python.scm (python-publicsuffix2): Update to 2.20160818. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 049a7945b6..5706218f15 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -12053,14 +12053,14 @@ List.") (define-public python-publicsuffix2 (package (name "python-publicsuffix2") - (version "2.20160621") + (version "2.20160818") (source (origin (method url-fetch) (uri (pypi-uri "publicsuffix2" version ".tar.bz2")) (sha256 (base32 - "06lx603gdwad5hc3hmn763ngq0rq9bzz1ni3ga72nzk5n872arkd")))) + "1bb55yka9vkn7i6y1kjzxa516kh6v4gsrxa90w5wdz5p5n968r68")))) (build-system python-build-system) (arguments '(#:tests? #f)) ; The test suite requires network access. From f6ac3101ff4427af6250daf645c853caba629b4c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 5 Nov 2016 15:45:53 +0100 Subject: [PATCH 19/20] gnu: Add zstd. * gnu/packages/compression.scm (zstd): New variable. --- gnu/packages/compression.scm | 44 ++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index ef176c630d..d106ff26dd 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1173,3 +1173,47 @@ or junctions, and always follows hard links.") (description "Unrar is a simple command-line program to list and extract RAR archives.") (license license:gpl2+))) + +(define-public zstd + (package + (name "zstd") + (version "1.1.3") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/facebook/zstd/archive/v" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "02mgk7cbyksfx7mq95cykghb7dya797z0n2jxr5fx9j0x0m56v0h")) + (modules '((guix build utils))) + (snippet + ;; Remove non-free source files. + '(begin + (for-each delete-file-recursively + (list + ;; Commercial use of the following is not allowed. + "examples" + "LICENSE-examples")) + #t)))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (delete 'configure)) ; no configure script + #:make-flags + (list "CC=gcc" + (string-append "PREFIX=" (assoc-ref %outputs "out"))) + #:test-target "test")) + (home-page "http://zstd.net/") + (synopsis "Zstandard real-time compression algorithm") + (description "Zstandard (@command{zstd}) is a lossless compression algorithm +that combines very fast operation with a compression ratio comparable to that of +zlib. In most scenarios, both compression and decompression can be performed in +‘real time’. The compressor can be configured to provide the most suitable +trade-off between compression ratio and speed, without affecting decompression +speed.") + (license (list license:bsd-3 ; the main top-level LICENSE file + license:bsd-2 ; quite a few files have but 2 clauses + license:public-domain ; zlibWrapper/examples/fitblk* + license:zlib)))) ; zlibWrapper/{gz*.c,gzguts.h} From 0f03c5316819385f3a4047ae50736b3db760f451 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 20 Feb 2017 22:31:35 +0100 Subject: [PATCH 20/20] gnu: Add pzstd. * gnu/packages/compression.scm (pzstd): New variable. --- gnu/packages/compression.scm | 41 ++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index d106ff26dd..d19ba2290b 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -45,6 +45,7 @@ #:use-module (gnu packages autotools) #:use-module (gnu packages backup) #:use-module (gnu packages base) + #:use-module (gnu packages check) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) @@ -1217,3 +1218,43 @@ speed.") license:bsd-2 ; quite a few files have but 2 clauses license:public-domain ; zlibWrapper/examples/fitblk* license:zlib)))) ; zlibWrapper/{gz*.c,gzguts.h} + +(define-public pzstd + (package + (name "pzstd") + (version (package-version zstd)) + (source (package-source zstd)) + (build-system gnu-build-system) + (native-inputs + `(("googletest", googletest))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'enter-subdirectory + (lambda _ (chdir "contrib/pzstd"))) + (delete 'configure) ; no configure script + (add-before 'check 'compile-tests + (lambda* (#:key make-flags #:allow-other-keys) + (zero? (apply system* "make" "tests" make-flags)))) + (add-after 'install 'install-documentation + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (doc (string-append out "/share/doc/" ,name))) + (mkdir-p doc) + (install-file "README.md" doc) + #t)))) + #:make-flags + (list "CC=gcc" + (string-append "PREFIX=" (assoc-ref %outputs "out"))))) + (home-page (package-home-page zstd)) + (synopsis "Threaded implementation of the Zstandard compression algorithm") + (description "Parallel Zstandard (PZstandard or @command{pzstd}) is a +multi-threaded implementation of the @uref{http://zstd.net/, Zstandard +compression algorithm}. It is fully compatible with the original Zstandard file +format and command-line interface, and can be used as a drop-in replacement. + +Compression is distributed over multiple processor cores to improve performance, +as is the decompression of data compressed in this manner. Data compressed by +other implementations will only be decompressed by two threads: one performing +the actual decompression, the other input and output.") + (license (package-license zstd))))