From 5fe9ba59ba1cea12a70d011aacbace52e3bfda18 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 14 Feb 2018 03:48:20 -0500 Subject: gnu: magit: Do not set 'magit-git-executable' to absolute file name. Fixes . Reported by Ricardo Wurmus . * gnu/packages/emacs.scm (magit)[arguments]: Do not modify the default value of 'magit-git-executable'. Remove "#:modules" and "#:imported-modules". --- gnu/packages/emacs.scm | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 2ddea646ac..dd3a6acf42 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 Taylan Ulrich Bayirli/Kammer ;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès -;;; Copyright © 2014, 2015, 2016 Mark H Weaver +;;; Copyright © 2014, 2015, 2016, 2018 Mark H Weaver ;;; Copyright © 2014, 2015, 2016, 2017 Alex Kost ;;; Copyright © 2015 Federico Beffa ;;; Copyright © 2015, 2016, 2017, 2018 Ricardo Wurmus @@ -449,13 +449,7 @@ (define-public magit ;; XXX Add 'magit-popup' dependency for the next release (after 2.11.0). ("with-editor" ,emacs-with-editor))) (arguments - `(#:modules ((guix build gnu-build-system) - (guix build utils) - (guix build emacs-utils)) - #:imported-modules (,@%gnu-build-system-modules - (guix build emacs-utils)) - - #:test-target "test" + `(#:test-target "test" #:tests? #f ; tests are not included in the release #:make-flags @@ -477,10 +471,7 @@ (define-public magit (add-before 'build 'patch-exec-paths (lambda* (#:key inputs #:allow-other-keys) - (let ((git (assoc-ref inputs "git")) - (perl (assoc-ref inputs "perl"))) - (emacs-substitute-variables "lisp/magit-git.el" - ("magit-git-executable" (string-append git "/bin/git"))) + (let ((perl (assoc-ref inputs "perl"))) (substitute* "lisp/magit-sequence.el" (("perl") (string-append perl "/bin/perl"))) #t)))))) -- cgit v1.2.3 From ac07b94ab53fb13bb56ea876a5143985e6dfaf11 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Sat, 3 Feb 2018 13:46:13 +0300 Subject: gnu: Add emacs-scratch-el. * gnu/packages/emacs.scm (emacs-scratch-el): New public variable. --- gnu/packages/emacs.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index dd3a6acf42..4829941ebf 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -7058,3 +7058,41 @@ (define-public org-tree-slide @code{org-tree-slide-mode} to enter the slideshow mode, and then @kbd{C->} and @kbd{C-<} to jump to the next and previous slide.") (license license:gpl3+)))) + +(define-public emacs-scratch-el + (let ((commit "2cdf2b841ce7a0987093f65b0cc431947549f897") + (revision "1")) + (package + (name "emacs-scratch-el") + (version (git-version "1.2" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ieure/scratch-el.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0wscsndynjmnliajqaz28r1ww81j8wh84zwaaswx51abhwgl0idf")))) + (build-system emacs-build-system) + (native-inputs + `(("texinfo" ,texinfo))) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'install 'install-doc + (lambda* (#:key outputs #:allow-other-keys) + (unless (invoke "makeinfo" "scratch.texi") + (error "makeinfo failed")) + (install-file "scratch.info" + (string-append (assoc-ref outputs "out") + "/share/info")) + #t))))) + (home-page "https://github.com/ieure/scratch-el/") + (synopsis "Create scratch buffers with the same mode as current buffer") + (description "Scratch is an extension to Emacs that enables one to create +scratch buffers that are in the same mode as the current buffer. This is +notably useful when working on code in some language; you may grab code into a +scratch buffer, and, by virtue of this extension, do so using the Emacs +formatting rules for that language.") + (license license:bsd-2)))) -- cgit v1.2.3 From 1a46a6d02d55e50062fd767ce14cadbbbdc0e9f5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 14 Feb 2018 20:12:54 +0100 Subject: gnu: fio: Update to 3.4. * gnu/packages/benchmark.scm (fio): Update to 3.4. --- gnu/packages/benchmark.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/benchmark.scm b/gnu/packages/benchmark.scm index 8d2b17ba48..ae7279f286 100644 --- a/gnu/packages/benchmark.scm +++ b/gnu/packages/benchmark.scm @@ -34,7 +34,7 @@ (define-module (gnu packages benchmark) (define-public fio (package (name "fio") - (version "3.3") + (version "3.4") (source (origin (method url-fetch) (uri (string-append @@ -42,7 +42,7 @@ (define-public fio "fio-" version ".tar.bz2")) (sha256 (base32 - "0mrilkm7qdn6fgzlprqp7w48bwwm362rmwxqirbzqmi54k3mj3ar")))) + "01dqvg5mgb4fh1jqqmi179k2rb517p4h4sr3mhlnd0alk1x12w8a")))) (build-system gnu-build-system) (arguments '(#:test-target "test" -- cgit v1.2.3 From 1bd08a268a52509aef06b6743cc707fcccd53784 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 14 Feb 2018 20:18:35 +0100 Subject: gnu: strace: Update to 4.21. * gnu/packages/linux.scm (strace): Update to 4.21. [source](uri): Releases are now served from GitHub. --- gnu/packages/linux.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 858f0885c0..bc1c658519 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -905,14 +905,14 @@ (define-public zerofree (define-public strace (package (name "strace") - (version "4.20") + (version "4.21") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/strace/strace/" version - "/strace-" version ".tar.xz")) + (uri (string-append "https://github.com/strace/strace/releases/" + "download/v" version "/strace-" version ".tar.xz")) (sha256 (base32 - "08y5b07vb8jc7ak5xc3x2kx1ly6xiwv1gnppcqjs81kks66i9wsv")))) + "0dsw6xcfrmygidp1dj2ch8cl8icrar7789snkb2r8gh78kdqhxjw")))) (build-system gnu-build-system) (arguments '(#:phases -- cgit v1.2.3 From f2ba6fc8bb69bab2e047eabf075a7039bddb4d62 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 14 Feb 2018 20:39:40 +0100 Subject: gnu: yadifa: Update to 2.3.8. * gnu/packages/dns.scm (yadifa): Update to 2.3.8. --- gnu/packages/dns.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index b9e75f349c..4208edf86b 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -443,16 +443,16 @@ (define-public unbound (define-public yadifa (package (name "yadifa") - (version "2.3.7") + (version "2.3.8") (source - (let ((build "7543")) + (let ((build "7713")) (origin (method url-fetch) (uri (string-append "http://cdn.yadifa.eu/sites/default/files/releases/" name "-" version "-" build ".tar.gz")) (sha256 - (base32 "0j4zj7h72ni3bbqbm1632z0vx8b9fjdrn4n1yx4yyzkpchsipwff"))))) + (base32 "15xhzg4crjcxascwpz6y8qpqcgypzv2p9bspdskp4nx1x1y4316c"))))) (build-system gnu-build-system) (native-inputs `(("which" ,which))) -- cgit v1.2.3 From 3bedac50571204643d5e3b204dc720ae7d571a1f Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 12 Jan 2018 23:08:50 +0100 Subject: gnu: Add cat-avatar-generator. * gnu/packages/web.scm (cat-avatar-generator): New variable. --- gnu/packages/web.scm | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 95937e291c..a7243f060b 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -24,6 +24,7 @@ ;;; Copyright © 2017 Petter ;;; Copyright © 2017 Pierre Langlois ;;; Copyright © 2017 Rutger Helling +;;; Copyright © 2018 Julien Lepiller ;;; ;;; This file is part of GNU Guix. ;;; @@ -6296,3 +6297,46 @@ (define-public geomyidae @item logging with multiple log levels. @end enumerate\n") (license l:expat))) + +(define-public cat-avatar-generator + (package + (name "cat-avatar-generator") + (version "1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://framagit.org/Deevad/cat-avatar-generator.git") + (commit "71c0c662742cafe8afd2d2d50ec84243113e35ad"))) + (file-name (string-append name "-" version)) + (sha256 + (base32 + "0s7b5whqsmfa57prbgl66ym551kg6ly0z14h5dgrlx4lqm70y2yw")))) + (build-system trivial-build-system) + (arguments + `(#:modules ((guix build utils) + (srfi srfi-1) + (srfi srfi-26)) + #:builder + (begin + (use-modules (guix build utils) + (srfi srfi-1) + (srfi srfi-26)) + (let ((source (assoc-ref %build-inputs "source")) + (php-dir (string-append %output "/share/web/" ,name "/"))) + ;; The cache directory must not be in the store, but in a writable + ;; location. The webserver will give us this location. + (copy-recursively source php-dir) + (substitute* (string-append php-dir "/cat-avatar-generator.php") + (("\\$cachepath = .*") + "if(isset($_SERVER['CACHE_DIR'])) +$cachepath = $_SERVER['CACHE_DIR']; +else +die('You need to set the CACHE_DIR variable first.');")))))) + (home-page "https://framagit.org/Deevad/cat-avatar-generator") + (synopsis "Random avatar generator") + (description "Cat avatar generator is a generator of cat pictures optimised +to generate random avatars, or defined avatar from a \"seed\". This is a +derivation by David Revoy from the original MonsterID by Andreas Gohr.") + ;; expat for the code, CC-BY 4.0 for the artwork + (license (list l:expat + l:cc-by4.0)))) -- cgit v1.2.3 From 499e499b8efc9b5a6086d3eb1bf2ad86607bf3af Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 14 Feb 2018 23:38:22 +0100 Subject: gnu: guile-sqlite3: Update to 10c13a7. * gnu/packages/guile.scm (guile-sqlite3): Update to 10c13a7. --- gnu/packages/guile.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 2a41a525e8..7c03a9c86b 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -1130,8 +1130,8 @@ (define-public guile2.2-gdbm-ffi (deprecated-package "guile2.2-gdbm-ffi" guile-gdbm-ffi)) (define-public guile-sqlite3 - (let ((commit "1cd1dec96a9999db48c0ff45bab907efc637247f") - (revision "3")) + (let ((commit "10c13a7e02ab1655c8a758e560cafc9d6eff26f4") + (revision "4")) (package (name "guile-sqlite3") (version (git-version "0.0" revision commit)) @@ -1147,7 +1147,7 @@ (define-public guile-sqlite3 (commit commit))) (sha256 (base32 - "0vvdgwcshrgl6dfz5cxf0l9bl44nkgah0ph3vv464d55nd8qh4b6")) + "0nhhswpd7nb2f0gfr55fzcc2xm3l2xx4rbljsd1clrm8fj2d7q9d")) (file-name (string-append name "-" version "-checkout")) (modules '((guix build utils))) (snippet -- cgit v1.2.3 From d1688e6ad465e92686349a56d12a0f05833504e0 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 14 Feb 2018 23:44:28 +0100 Subject: gnu: cuirass: Update to 8080c17. * gnu/packages/ci.scm (cuirass): Update to 8080c17. [inputs]: Add GUILE-FIBERS. [arguments] : Add Fibers to the search path in the wrapper. --- gnu/packages/ci.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index 2a22f222d3..fcb0727ce4 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -187,8 +187,8 @@ (define-public hydra (license l:gpl3+)))) (define-public cuirass - (let ((commit "9cfea9fe2e3ca6a3d1b832a6ec217426ec973c93") - (revision "10")) + (let ((commit "8080c17c21fc605674d1d257813e74bb4fb3cfc0") + (revision "11")) (package (name "cuirass") (version (string-append "0.0.1-" revision "." (string-take commit 7))) @@ -200,7 +200,7 @@ (define-public cuirass (file-name (string-append name "-" version)) (sha256 (base32 - "177klidmsw12kjk9dzawc0bqcwqlplgx45m87qpgjfx3cnk28i2b")))) + "1g9ra37b82bbd4n635fnfmaz99k7qafjhm6z8wzwwqzm80iyf1gb")))) (build-system gnu-build-system) (arguments '(#:modules ((guix build utils) @@ -231,6 +231,7 @@ (define-public cuirass (sqlite (assoc-ref inputs "guile-sqlite3")) (git (assoc-ref inputs "guile-git")) (bytes (assoc-ref inputs "guile-bytestructures")) + (fibers (assoc-ref inputs "guile-fibers")) (guix (assoc-ref inputs "guix")) (guile (assoc-ref %build-inputs "guile")) (effective (read-line @@ -245,6 +246,8 @@ (define-public cuirass effective ":" sqlite "/share/guile/site/" effective ":" + fibers "/share/guile/site/" + effective ":" guix "/share/guile/site/" effective))) ;; Make sure 'cuirass' can find the 'evaluate' command, as @@ -256,6 +259,7 @@ (define-public cuirass #t)))))) (inputs `(("guile" ,guile-2.2) + ("guile-fibers" ,guile-fibers) ("guile-json" ,guile-json) ("guile-sqlite3" ,guile-sqlite3) ("guile-git" ,guile-git) -- cgit v1.2.3 From 9859b5c190b43a2d53f03f1ac71bad20c74b632b Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 15 Feb 2018 10:16:00 +0100 Subject: gnu: nss-mdns: Update to 0.12.0. * gnu/packages/avahi.scm (nss-mdns): Update to 0.12 + patch. (nss-mdns-0.10.0): Remove. * gnu/services/avahi.scm (avahi-service-type): Use NSS-MDNS again. --- gnu/packages/avahi.scm | 45 +++++++++++++++------------------------------ gnu/services/avahi.scm | 4 +--- 2 files changed, 16 insertions(+), 33 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/avahi.scm b/gnu/packages/avahi.scm index 001afa8d48..f54495f402 100644 --- a/gnu/packages/avahi.scm +++ b/gnu/packages/avahi.scm @@ -77,22 +77,32 @@ (define-public avahi (define-public nss-mdns (package (name "nss-mdns") - (version "0.11") + (version "0.12") + (home-page "https://github.com/lathiat/nss-mdns") (source (origin (method url-fetch) - (uri (string-append "https://github.com/lathiat/nss-mdns" - "/releases/download/v" version "/" + (uri (string-append home-page "/releases/download/v" version "/" name "-" version ".tar.gz")) (sha256 (base32 - "14jwy6mklzgjz3mfmw67mxhszrw9d3d3yjjhg87j4crci6m19i39")))) + "1p2vj9fz4kzrjrj81ipf4qwgnr2n7a8cbzw4bpk18xyqhdx8h775")) + (patches + (list (origin + ;; See + ;; . + (uri (string-append + home-page + "/commit/31ccbec3b4f054e590c7c880d8a8a50cfc97127d.patch")) + (sha256 + (base32 + "0b1jmhnkpsczbph4ala7x3rafwxdg93277s30iaxh37jnvgjnhsd")) + (method url-fetch)))))) (build-system gnu-build-system) (arguments ;; The Avahi daemon socket is expected by src/Makefile.am to be at ;; "$(localstatedir)/run/avahi-daemon/socket", so set $(localstatedir) ;; appropriately. '(#:configure-flags '("--localstatedir=/var"))) - (home-page "https://github.com/lathiat/nss-mdns") (synopsis "Multicast DNS Name Service Switch (@dfn{NSS}) plug-in") (description "Nss-mdns is a plug-in for the GNU C Library's Name Service Switch @@ -100,28 +110,3 @@ (define-public nss-mdns most often used in home and other small networks without a local name server, to resolve host names in the @samp{.local} top-level domain.") (license lgpl2.1+))) - -(define-public nss-mdns-0.10 - ;; Kept here to work around in bug in 0.11: and - ;; . - (package - (inherit nss-mdns) - (version "0.10") - (source (origin - (method url-fetch) - (uri (list - (string-append - "mirror://debian/pool/main/n/nss-mdns/nss-mdns_" - version ".orig.tar.gz") - "http://pkgs.fedoraproject.org/repo/pkgs/nss-mdns/nss-mdns-0.10.tar.gz/03938f17646efbb50aa70ba5f99f51d7/nss-mdns-0.10.tar.gz" - - ;; This used to be the canonical URL but it vanished. - ;; See . - ;; (string-append - ;; "http://0pointer.de/lennart/projects/nss-mdns/nss-mdns-" - ;; version ".tar.gz") - )) - (sha256 - (base32 - "0vgs6j0qsl0mwzh5a0m0bykr7x6bx79vnbyn0r3q289rghp3qs0y")) - (file-name (string-append "nss-mdns-" version ".tar.gz")))))) diff --git a/gnu/services/avahi.scm b/gnu/services/avahi.scm index b4f89c4abf..a5305130af 100644 --- a/gnu/services/avahi.scm +++ b/gnu/services/avahi.scm @@ -131,10 +131,8 @@ (define avahi-service-type (const %avahi-accounts)) (service-extension activation-service-type (const %avahi-activation)) - - ;; Use 0.10 due to . (service-extension nscd-service-type - (const (list nss-mdns-0.10))) + (const (list nss-mdns))) ;; Provide 'avahi-browse', 'avahi-resolve', etc. in ;; the system profile. -- cgit v1.2.3 From 6ca15c9ef615979862a07c02bd316e7f12a0c7ca Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Thu, 8 Feb 2018 09:57:41 +0000 Subject: gnu: crypto++: Update to 6.0.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/crypto.scm (crypto++): Update to 6.0.0. * gnu/packages/patches/crypto++-fix-dos-in-asn.1-decoders.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. Signed-off-by: Ludovic Courtès --- gnu/local.mk | 1 - gnu/packages/crypto.scm | 6 +- .../crypto++-fix-dos-in-asn.1-decoders.patch | 65 ---------------------- 3 files changed, 2 insertions(+), 70 deletions(-) delete mode 100644 gnu/packages/patches/crypto++-fix-dos-in-asn.1-decoders.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index c5c9278201..4a258dd3cd 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -599,7 +599,6 @@ dist_patch_DATA = \ %D%/packages/patches/crawl-upgrade-saves.patch \ %D%/packages/patches/crda-optional-gcrypt.patch \ %D%/packages/patches/crossmap-allow-system-pysam.patch \ - %D%/packages/patches/crypto++-fix-dos-in-asn.1-decoders.patch \ %D%/packages/patches/clucene-contribs-lib.patch \ %D%/packages/patches/cube-nocheck.patch \ %D%/packages/patches/cursynth-wave-rand.patch \ diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index 5e5bc4de05..225c26378d 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -583,7 +583,7 @@ (define-public perl-math-random-secure (define-public crypto++ (package (name "crypto++") - (version "5.6.5") + (version "6.0.0") (source (origin (method url-fetch/zipbomb) (uri (string-append "https://cryptopp.com/cryptopp" @@ -591,9 +591,7 @@ (define-public crypto++ ".zip")) (sha256 (base32 - "0d1cqdz369ivi082k59025wvxzywvkizw7i0pf5h0a1izs3g8pm7")) - (patches - (search-patches "crypto++-fix-dos-in-asn.1-decoders.patch")))) + "1nidm6xbdza5cbgf5md2zznmaq692rfyjasycwipl6rzdfwjvb34")))) (build-system gnu-build-system) (arguments `(#:make-flags diff --git a/gnu/packages/patches/crypto++-fix-dos-in-asn.1-decoders.patch b/gnu/packages/patches/crypto++-fix-dos-in-asn.1-decoders.patch deleted file mode 100644 index 88b2e7f25a..0000000000 --- a/gnu/packages/patches/crypto++-fix-dos-in-asn.1-decoders.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 3d9181d7bdd8e491f745dbc9e34bd20b6f6da069 Mon Sep 17 00:00:00 2001 -From: Gergely Nagy -Date: Wed, 14 Dec 2016 13:19:01 +0100 -Subject: [PATCH] Fix possible DoS in ASN.1 decoders (CVE-2016-9939) - ---- - asn.cpp | 10 ++++++++++ - asn.h | 2 ++ - 2 files changed, 12 insertions(+) - -diff --git a/asn.cpp b/asn.cpp -index 297ff010..2e923ef7 100644 ---- a/asn.cpp -+++ b/asn.cpp -@@ -123,6 +123,8 @@ size_t BERDecodeOctetString(BufferedTransformation &bt, SecByteBlock &str) - size_t bc; - if (!BERLengthDecode(bt, bc)) - BERDecodeError(); -+ if (bc > bt.MaxRetrievable()) -+ BERDecodeError(); - - str.New(bc); - if (bc != bt.Get(str, bc)) -@@ -139,6 +141,8 @@ size_t BERDecodeOctetString(BufferedTransformation &bt, BufferedTransformation & - size_t bc; - if (!BERLengthDecode(bt, bc)) - BERDecodeError(); -+ if (bc > bt.MaxRetrievable()) -+ BERDecodeError(); - - bt.TransferTo(str, bc); - return bc; -@@ -161,6 +165,8 @@ size_t BERDecodeTextString(BufferedTransformation &bt, std::string &str, byte as - size_t bc; - if (!BERLengthDecode(bt, bc)) - BERDecodeError(); -+ if (bc > bt.MaxRetrievable()) -+ BERDecodeError(); - - SecByteBlock temp(bc); - if (bc != bt.Get(temp, bc)) -@@ -188,6 +194,10 @@ size_t BERDecodeBitString(BufferedTransformation &bt, SecByteBlock &str, unsigne - size_t bc; - if (!BERLengthDecode(bt, bc)) - BERDecodeError(); -+ if (bc == 0) -+ BERDecodeError(); -+ if (bc > bt.MaxRetrievable()) -+ BERDecodeError(); - - byte unused; - if (!bt.Get(unused)) -diff --git a/asn.h b/asn.h -index ed9de52c..33f0dd09 100644 ---- a/asn.h -+++ b/asn.h -@@ -498,6 +498,8 @@ void BERDecodeUnsigned(BufferedTransformation &in, T &w, byte asnTag = INTEGER, - bool definite = BERLengthDecode(in, bc); - if (!definite) - BERDecodeError(); -+ if (bc > in.MaxRetrievable()) -+ BERDecodeError(); - - SecByteBlock buf(bc); - -- cgit v1.2.3 From 2b870303e70d6f3cbe4ee156b1d454b44cd2709a Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 15 Feb 2018 10:32:20 +0100 Subject: gnu: cuirass: Update to 4ab2f2c. Previous revision had (web server fiberized) installed in the wrong place, and would thus fail to start. * gnu/packages/ci.scm (cuirass): Update to 4ab2f2c. --- gnu/packages/ci.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index fcb0727ce4..b5cfa7f1ab 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -187,8 +187,8 @@ (define-public hydra (license l:gpl3+)))) (define-public cuirass - (let ((commit "8080c17c21fc605674d1d257813e74bb4fb3cfc0") - (revision "11")) + (let ((commit "4ab2f2c3f084ffd9d0f77134cc1af0f8cf0e13be") + (revision "12")) (package (name "cuirass") (version (string-append "0.0.1-" revision "." (string-take commit 7))) @@ -200,7 +200,7 @@ (define-public cuirass (file-name (string-append name "-" version)) (sha256 (base32 - "1g9ra37b82bbd4n635fnfmaz99k7qafjhm6z8wzwwqzm80iyf1gb")))) + "1r97z5lkzg6vx014rfmv1pp3x3bl1shb6wkcgnlncwqf56a9bzi1")))) (build-system gnu-build-system) (arguments '(#:modules ((guix build utils) -- cgit v1.2.3 From 501e18471610ba9942567ce8c2d4ad40182bd141 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Tue, 13 Feb 2018 19:01:43 +0100 Subject: gnu: Add ifdtool. * gnu/packages/flashing-tools.scm (ifdtool): New variable. --- gnu/packages/flashing-tools.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/flashing-tools.scm b/gnu/packages/flashing-tools.scm index 9683c6b4a3..2a89b6ab0a 100644 --- a/gnu/packages/flashing-tools.scm +++ b/gnu/packages/flashing-tools.scm @@ -330,3 +330,36 @@ (define-public heimdall Loke and Heimdall communicate via the custom Samsung-developed protocol typically referred to as the \"Odin 3 protocol\".") (license license:expat))) + +(define-public ifdtool + (package + (name "ifdtool") + (version "4.7") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://review.coreboot.org/p/coreboot") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0nw555i0fm5kljha9h47bk70ykbwv8ddfk6qhz6kfqb79vzhy4h2")))) + (build-system gnu-build-system) + (arguments + `(#:make-flags + (list "CC=gcc" + "INSTALL=install" + (string-append "PREFIX=" (assoc-ref %outputs "out"))) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ + (chdir "util/ifdtool") + #t)) + (delete 'configure) + (delete 'check)))) + (home-page "https://github.com/corna/me_cleaner/") + (synopsis "Intel Firmware Descriptor dumper") + (description "This package provides @ifdtool}, a program to +dump Intel Firmware Descriptor data of an image file.") + (license license:gpl2))) -- cgit v1.2.3 From 9721c0b6ef80f10edb3f0bcf5d95033f701554f2 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Tue, 13 Feb 2018 23:48:09 +0100 Subject: gnu: Add intelmetool. * gnu/packages/flashing-tools.scm (intelmetool): New variable. --- gnu/packages/flashing-tools.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/flashing-tools.scm b/gnu/packages/flashing-tools.scm index 2a89b6ab0a..08073bac79 100644 --- a/gnu/packages/flashing-tools.scm +++ b/gnu/packages/flashing-tools.scm @@ -35,6 +35,7 @@ (define-module (gnu packages flashing-tools) #:use-module (gnu packages compression) #:use-module (gnu packages flex) #:use-module (gnu packages elf) + #:use-module (gnu packages pciutils) #:use-module (gnu packages pkg-config) #:use-module (gnu packages libusb) #:use-module (gnu packages libftdi) @@ -363,3 +364,41 @@ (define-public ifdtool (description "This package provides @ifdtool}, a program to dump Intel Firmware Descriptor data of an image file.") (license license:gpl2))) + +(define-public intelmetool + (package + (name "intelmetool") + (version "4.7") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://review.coreboot.org/p/coreboot") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0nw555i0fm5kljha9h47bk70ykbwv8ddfk6qhz6kfqb79vzhy4h2")))) + (build-system gnu-build-system) + (inputs + `(("pciutils" ,pciutils) + ("zlib" ,zlib))) + (arguments + `(#:make-flags + (list "CC=gcc" + "INSTALL=install" + (string-append "PREFIX=" (assoc-ref %outputs "out"))) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ + (chdir "util/intelmetool") + #t)) + (delete 'configure) + (delete 'check)))) + (home-page "https://github.com/zamaudio/intelmetool") + (synopsis "Intel ME tools") + (description "This package provides tools for working with Intel +Management Engine (ME). You need to @code{sudo rmmod mei_me} and +@code{sudo rmmod mei} before using this tool. Also pass +@code{iomem=relaxed} to the Linux kernel command line.") + (license license:gpl2))) -- cgit v1.2.3 From 0297a160a0373ec914545137ba05e1aefb9b4b16 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Tue, 13 Feb 2018 23:50:11 +0100 Subject: gnu: Add me-cleaner. * gnu/packages/flashing-tools.scm (me-cleaner): New variable. --- gnu/packages/flashing-tools.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/flashing-tools.scm b/gnu/packages/flashing-tools.scm index 08073bac79..eda70856a6 100644 --- a/gnu/packages/flashing-tools.scm +++ b/gnu/packages/flashing-tools.scm @@ -31,6 +31,7 @@ (define-module (gnu packages flashing-tools) #:use-module (gnu packages) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) + #:use-module (guix build-system python) #:use-module (gnu packages bison) #:use-module (gnu packages compression) #:use-module (gnu packages flex) @@ -402,3 +403,34 @@ (define-public intelmetool @code{sudo rmmod mei} before using this tool. Also pass @code{iomem=relaxed} to the Linux kernel command line.") (license license:gpl2))) + +(define-public me-cleaner + (package + (name "me-cleaner") + (version "1.1") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/corna/me_cleaner/" + "archive/v" version ".tar.gz")) + (sha256 + (base32 + "1pgwdqy0jly80nhxmlmyibs343497yjzs6dwfbkcw0l1gjm8i5hw")) + (file-name (string-append name "-" version ".tar.gz")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'create-setup.py + (lambda _ + (call-with-output-file "setup.py" + (lambda (port) + (format port "\ +from setuptools import setup +setup(name='me_cleaner', version='~a', scripts=['me_cleaner.py']) +" ,version))) + #t))))) + (home-page "https://github.com/corna/me_cleaner") + (synopsis "Intel ME cleaner") + (description "This package provides tools for disabling Intel +ME as far as possible (it only edits ME firmware image files).") + (license license:gpl3+))) -- cgit v1.2.3 From 8e60743d8b4114494787b873ad9e705b1b0e2595 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Thu, 15 Feb 2018 15:01:39 +0100 Subject: gnu: me-cleaner: Update synopsis. * gnu/packages/flashing-tools.scm (me-cleaner)[synopsis]: Modify. --- gnu/packages/flashing-tools.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/flashing-tools.scm b/gnu/packages/flashing-tools.scm index eda70856a6..f0200aa32d 100644 --- a/gnu/packages/flashing-tools.scm +++ b/gnu/packages/flashing-tools.scm @@ -397,7 +397,7 @@ (define-public intelmetool (delete 'configure) (delete 'check)))) (home-page "https://github.com/zamaudio/intelmetool") - (synopsis "Intel ME tools") + (synopsis "Intel Management Engine tools") (description "This package provides tools for working with Intel Management Engine (ME). You need to @code{sudo rmmod mei_me} and @code{sudo rmmod mei} before using this tool. Also pass -- cgit v1.2.3 From ec0f3d0a5bdc1f56308aeff5dabfbb3ab18b9810 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 15 Feb 2018 16:35:39 +0100 Subject: gnu: ifdtool: Fix Texinfo markup. * gnu/packages/flashing-tools.scm (ifdtool)[description]: Fix Texinfo markup. --- gnu/packages/flashing-tools.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/flashing-tools.scm b/gnu/packages/flashing-tools.scm index f0200aa32d..5b79c83a40 100644 --- a/gnu/packages/flashing-tools.scm +++ b/gnu/packages/flashing-tools.scm @@ -362,7 +362,7 @@ (define-public ifdtool (delete 'check)))) (home-page "https://github.com/corna/me_cleaner/") (synopsis "Intel Firmware Descriptor dumper") - (description "This package provides @ifdtool}, a program to + (description "This package provides @command{ifdtool}, a program to dump Intel Firmware Descriptor data of an image file.") (license license:gpl2))) -- cgit v1.2.3 From a124e4258ad911e1a65edb6c7d7d8f095249db5f Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Thu, 15 Feb 2018 17:19:28 +0100 Subject: gnu: ghc: Make memory allocator decommit memory on Linux < 4.5. * gnu/packages/patches/ghc-8.0-fall-back-to-madv_dontneed.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/haskell.scm (ghc-8): Use it. --- gnu/local.mk | 1 + gnu/packages/haskell.scm | 3 +- .../ghc-8.0-fall-back-to-madv_dontneed.patch | 61 ++++++++++++++++++++++ 3 files changed, 64 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/ghc-8.0-fall-back-to-madv_dontneed.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 4a258dd3cd..7fe374208b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -679,6 +679,7 @@ dist_patch_DATA = \ %D%/packages/patches/geoclue-config.patch \ %D%/packages/patches/gettext-multi-core.patch \ %D%/packages/patches/gettext-gnulib-multi-core.patch \ + %D%/packages/patches/ghc-8.0-fall-back-to-madv_dontneed.patch \ %D%/packages/patches/ghc-dont-pass-linker-flags-via-response-files.patch \ %D%/packages/patches/ghostscript-CVE-2017-8291.patch \ %D%/packages/patches/ghostscript-no-header-id.patch \ diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 2fc05596b9..426939ec5b 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -325,7 +325,8 @@ (define-public ghc-8 (base32 "1c8qc4fhkycynk4g1f9hvk53dj6a1vvqi6bklqznns6hw59m8qhi")) (patches (search-patches - "ghc-dont-pass-linker-flags-via-response-files.patch")))) + "ghc-dont-pass-linker-flags-via-response-files.patch" + "ghc-8.0-fall-back-to-madv_dontneed.patch")))) (build-system gnu-build-system) (supported-systems '("i686-linux" "x86_64-linux")) (outputs '("out" "doc")) diff --git a/gnu/packages/patches/ghc-8.0-fall-back-to-madv_dontneed.patch b/gnu/packages/patches/ghc-8.0-fall-back-to-madv_dontneed.patch new file mode 100644 index 0000000000..1838c5bd35 --- /dev/null +++ b/gnu/packages/patches/ghc-8.0-fall-back-to-madv_dontneed.patch @@ -0,0 +1,61 @@ +ghc runtime by default (otherwise depending on a "configure" option) +does memory allocation on their own by first mmapping a 1 TB range of +memory into the process and then parceling out chunks from it. + +If one of the chunks is not needed, the kernel needs to be informed - +otherwise the system would quickly run out of available RAM. + +ghc does that via madvise(2). + +There are two options when doing this informing: + +MADV_FREE - Means "I don't need this range or the data in it any more". +Kernel promises to fail later accesses to it. + +MADV_DONTNEED - Means "I don't need this range right now - and I don't +need the data in it anymore". Kernel promises to make later accesses to +it succeed (if necessary by providing a new page initialized with zeroes). + +MADV_FREE was introduced in Linux 4.5. +glibc 2.25 and later always define MADV_FREE. + +Unpatched ghc 8.0.2 will use either MADV_FREE or MADV_DONTNEED, determined +at ghc compile time. Which of them will actually succeed is determined +by the Linux kernel at run time. + +This patch makes ghc try MADV_FREE. If it doesn't work, it falls back to +MADV_DONTNEED. + +The end result is that ghc programs free their memory with Linux < 4.5 again. + +See https://git.haskell.org/ghc.git/commitdiff/6576bf83cdf4eac05eb88a24aa934a736c91e3da for more information. +--- a/rts/posix/OSMem.c ++++ b/rts/posix/OSMem.c +@@ -541,11 +541,24 @@ void osDecommitMemory(void *at, W_ size) + + #ifdef MADV_FREE + // Try MADV_FREE first, FreeBSD has both and MADV_DONTNEED +- // just swaps memory out ++ // just swaps memory out. Linux >= 4.5 has both DONTNEED and FREE; either ++ // will work as they both allow the system to free anonymous pages. ++ // It is important that we try both methods as the kernel which we were ++ // built on may differ from the kernel we are now running on. + r = madvise(at, size, MADV_FREE); +-#else +- r = madvise(at, size, MADV_DONTNEED); ++ if(r < 0) { ++ if (errno == EINVAL) { ++ // Perhaps the system doesn't support MADV_FREE; fall-through and ++ // try MADV_DONTNEED. ++ } else { ++ sysErrorBelch("unable to decommit memory"); ++ } ++ } else { ++ return; ++ } + #endif ++ ++ r = madvise(at, size, MADV_DONTNEED); + if(r < 0) + sysErrorBelch("unable to decommit memory"); + } -- cgit v1.2.3 From 5b2382929959db9d883982329ec8fdf4103a9351 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Mon, 12 Feb 2018 10:46:09 +0300 Subject: gnu: Add epipe. * gnu/packages/emacs.scm (epipe): New public variable. --- gnu/packages/emacs.scm | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 4829941ebf..0d25ea2b2c 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -7096,3 +7096,53 @@ (define-public emacs-scratch-el scratch buffer, and, by virtue of this extension, do so using the Emacs formatting rules for that language.") (license license:bsd-2)))) + +(define-public epipe + (package + (name "epipe") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/cute-jumper/epipe/archive/" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "05a036852g4j63k1mhvyfrcsgkl9lczayi7x61570ysw3cli5wp5")))) + (build-system trivial-build-system) + (inputs + `(("bash" ,bash) + ("perl" ,perl))) + (native-inputs + `(("tar" ,tar) + ("gzip" ,gzip))) + (arguments + `(#:modules + ((guix build utils)) + #:builder + (begin + (use-modules (guix build utils)) + ;; Extract source + (setenv "PATH" (string-append + (assoc-ref %build-inputs "tar") "/bin" ":" + (assoc-ref %build-inputs "gzip") "/bin")) + (system* "tar" "xvf" (assoc-ref %build-inputs "source")) + (chdir (string-append ,name "-" ,version)) + ;; Patch shebangs + (substitute* "epipe" + (("/usr/bin/env bash") + (string-append (assoc-ref %build-inputs "bash") "/bin/bash"))) + (patch-shebang "epipe.pl" + (list (string-append (assoc-ref %build-inputs "perl") + "/bin"))) + ;; Installation + (for-each (lambda (file) + (install-file file (string-append %output "/bin"))) + '("epipe" "epipe.pl")) + #t))) + (home-page "https://github.com/cute-jumper/epipe") + (synopsis "Pipe to the @code{emacsclient}") + (description "@code{epipe} provides an utility to use your editor in +the pipeline, featuring the support for running @code{emacsclient}.") + (license license:gpl3+))) -- cgit v1.2.3 From 3026de3fceddd27a4c8c99859a34956a6bcd1d31 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 15 Feb 2018 14:39:56 -0500 Subject: gnu: irssi: Update to 1.1.1 [fixes CVE-2018-{7050,7051,7052,7053,7054}]. * gnu/packages/irc.scm (irssi): Update to 1.1.1. --- gnu/packages/irc.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm index f2b3702645..b00fd6cc19 100644 --- a/gnu/packages/irc.scm +++ b/gnu/packages/irc.scm @@ -115,7 +115,7 @@ (define-public quassel (define-public irssi (package (name "irssi") - (version "1.1.0") + (version "1.1.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/irssi/irssi/" @@ -123,7 +123,7 @@ (define-public irssi version ".tar.xz")) (sha256 (base32 - "00jz5mf2cwzfig0qcs3y4jpp5v8icvwf239k5chr2qq47lbsp6qh")))) + "1gx1flfh4a09nb3b5pvf0ygnbl7rry3l4gph8wij29dsl7khfj3q")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From 46ddcf4a291cc7e922276f120f40f63b3be1fdfa Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sat, 3 Feb 2018 20:44:13 +0100 Subject: gnu: Add python-pyte. * gnu/packages/terminals.scm (python-pyte, python2-pyte): New variables. --- gnu/packages/terminals.scm | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index f296235b7b..229db1b62a 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2017 Kei Kebreau ;;; Copyright © 2017 Ricardo Wurmus ;;; Copyright © 2017 Petter +;;; Copyright © 2018 Hartmut Goebel ;;; ;;; This file is part of GNU Guix. ;;; @@ -38,6 +39,7 @@ (define-module (gnu packages terminals) #:use-module (guix packages) #:use-module (gnu packages) #:use-module (gnu packages autotools) + #:use-module (gnu packages check) #:use-module (gnu packages docbook) #:use-module (gnu packages freedesktop) #:use-module (gnu packages gettext) @@ -667,3 +669,44 @@ (define-public go-github.com-howeyc-gopass terminal or piped input.") (home-page "https://github.com/howeyc/gopass") (license license:isc)))) + +(define-public python-pyte + (package + (name "python-pyte") + (version "0.7.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pyte" version)) + (sha256 + (base32 + "1an54hvyjm8gncx8cgabz9mkpgjkdb0bkyjlkh7g7f94nr3wnfl7")))) + (build-system python-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'remove-failing-test + ;; TODO: Reenable when the `captured` files required by this test + ;; are included in the archive. + (lambda _ + (delete-file "tests/test_input_output.py") + #t))))) + (propagated-inputs + `(("python-wcwidth", python-wcwidth))) + (native-inputs + `(("python-pytest-runner" ,python-pytest-runner) + ("python-pytest" ,python-pytest))) + (home-page "https://pyte.readthedocs.io/") + (synopsis "Simple VTXXX-compatible terminal emulator") + (description "@code{pyte} is an in-memory VTxxx-compatible terminal +emulator. @var{VTxxx} stands for a series of video terminals, developed by +DEC between 1970 and 1995. The first and probably most famous one was the +VT100 terminal, which is now a de-facto standard for all virtual terminal +emulators. + +pyte is a fork of vt102, which was an incomplete pure Python implementation +of VT100 terminal.") + (license license:lgpl3+))) + +(define-public python2-pyte + (package-with-python2 python-pyte)) -- cgit v1.2.3 From 573450e60cc7c8f5475c2c1432c0a0ee11737ebc Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sat, 31 Dec 2016 14:59:36 +0100 Subject: gnu: Add python-blessings. * gnu/packages/terminals.scm (python-blessings, python2-blessings): New variables. --- gnu/packages/terminals.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 229db1b62a..3c74f9807d 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -710,3 +710,34 @@ (define-public python-pyte (define-public python2-pyte (package-with-python2 python-pyte)) + +(define-public python-blessings + (package + (name "python-blessings") + (version "1.6.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "blessings" version)) + (sha256 + (base32 + "1smngy65p8mi62lgm04icasx22v976szhs2aq95y2ljmi1srb4bl")))) + (build-system python-build-system) + (arguments + ;; TODO: For py3, 2to2 is used to convert the code, but test-suite fails + `(#:tests? #f)) + (native-inputs + `(("python-nose" ,python-nose))) + (home-page "https://github.com/erikrose/blessings") + (synopsis "Python module to manage terminal color, styling, and +positioning") + (description "Blessings is a pythonic API to manipulate terminal color, +styling, and positioning. It provides similar features to curses but avoids +some of curses’s limitations: it does not require clearing the whole screen +for little changes, provides a scroll-back buffer after the program exits, and +avoids styling altogether when the output is redirected to something other +than a terminal.") + (license license:expat))) + +(define-public python2-blessings + (package-with-python2 python-blessings)) -- cgit v1.2.3 From e79a8424ca0815d536913a39d91b45dd690062d0 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sat, 31 Dec 2016 15:00:35 +0100 Subject: gnu: Add python-curtsies. * gnu/packages/terminals.scm (python-curtsies, python2-curtsies): New variables. --- gnu/packages/terminals.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 3c74f9807d..eeae8bea41 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -741,3 +741,39 @@ (define-public python-blessings (define-public python2-blessings (package-with-python2 python-blessings)) + +(define-public python-curtsies + (package + (name "python-curtsies") + (version "0.2.11") + (source + (origin + (method url-fetch) + (uri (pypi-uri "curtsies" version)) + (sha256 + (base32 + "1vljmw3sy6lrqahhpyg4gk13mzcx3mwhvg8s41698ms3cpgkjipc")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda _ + (invoke "nosetests" "-v")))))) + (propagated-inputs + `(("python-blessings" ,python-blessings) + ("python-wcwidth", python-wcwidth))) + (native-inputs + `(("python-mock" ,python-mock) + ("python-pyte" ,python-pyte) + ("python-nose" ,python-nose))) + (home-page "https://github.com/thomasballinger/curtsies") + (synopsis "Library for curses-like terminal interaction with colored +strings") + (description "Curtsies is a Python library for interacting with the +terminal. It features string-like objects which carry formatting information, +per-line fullscreen terminal rendering, and keyboard input event reporting.") + (license license:expat))) + +(define-public python2-curtsies + (package-with-python2 python-curtsies)) -- cgit v1.2.3 From 34581f68c05e08ff3cf5419e598ef6ad4faa22da Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Mon, 2 Jan 2017 17:31:34 +0100 Subject: gnu: Add bpython. * gnu/packages/python.scm (bpython, bpython2): New variables. --- gnu/packages/python.scm | 92 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 91 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index f0eb376217..72b1d05e9f 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -19,7 +19,7 @@ ;;; Copyright © 2015, 2016 Chris Marusich ;;; Copyright © 2016 Danny Milosavljevic ;;; Copyright © 2016 Lukas Gradl -;;; Copyright © 2016 Hartmut Goebel +;;; Copyright © 2016, 2018 Hartmut Goebel ;;; Copyright © 2016 Daniel Pimentel ;;; Copyright © 2016 Sou Bunnbu ;;; Copyright © 2016, 2017 Troy Sankey @@ -112,6 +112,7 @@ (define-module (gnu packages python) #:use-module (gnu packages shells) #:use-module (gnu packages ssh) #:use-module (gnu packages statistics) + #:use-module (gnu packages terminals) #:use-module (gnu packages tex) #:use-module (gnu packages texinfo) #:use-module (gnu packages time) @@ -12555,3 +12556,92 @@ (define-public python-isoweek (define-public python2-isoweek (package-with-python2 python-isoweek)) + +(define-public bpython + (package + (name "bpython") + (version "0.17") + (source + (origin + (method url-fetch) + (uri (pypi-uri "bpython" version)) + (sha256 + (base32 + "1mbah208jhd7bsfaa17fwpi55f7fvif0ghjwgrjmpmx8w1vqab9l")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'remove-failing-test + (lambda _ + ;; Remove failing test. FIXME: make it pass + (delete-file "bpython/test/test_args.py") + #t)) + (add-after 'wrap 'add-aliases + ;; for symmetry to bpython2, add symlinks bypthon3, bpdb3, etc. + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (for-each + (lambda (old new) + (symlink old (string-append out "/bin/" new))) + '("bpython" "bpython-curses" "bpython-urwid" "bpdb") + '("bpython3" "bpython3-curses" "bpython3-urwid" "bpdb3"))) + #t))))) + (propagated-inputs + `(("python-pygments" ,python-pygments) + ("python-requests", python-requests) + ("python-babel" ,python-babel) ; optional, for internationalization + ("python-curtsies" ,python-curtsies) ; >= 0.1.18 + ("python-greenlet" ,python-greenlet) + ("python-urwid" ,python-urwid) ; for bpython-urwid only + ("python-six" ,python-six))) + (native-inputs + `(("python-sphinx" ,python-sphinx) + ("python-mock" ,python-mock))) + (home-page "https://bpython-interpreter.org/") + (synopsis "Fancy interface to the Python interpreter") + (description "Bpython is a fancy interface to the Python +interpreter. bpython's main features are + +@enumerate +@item in-line syntax highlighting, +@item readline-like autocomplete with suggestions displayed as you type, +@item expected parameter list for any Python function, +@item \"rewind\" function to pop the last line of code from memory and + re-evaluate, +@item send the code you've entered off to a pastebin, +@item save the code you've entered to a file, and +@item auto-indentation. +@end enumerate") + (license license:expat))) + +(define-public bpython2 + (let ((base (package-with-python2 + (strip-python2-variant bpython)))) + (package (inherit base) + (name "bpython2") + (arguments + `(#:python ,python-2 + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'remove-failing-test + (lambda _ + ;; Remove failing test. FIXME: make it pass + (delete-file "bpython/test/test_args.py") + ;; Disable failing test-cases (renaming inhibits they are + ;; discovered) + (substitute* "bpython/test/test_curtsies_repl.py" + (("^(\\s*def )(test_get_last_word_with_prev_line\\W)" _ a b) + (string-append a "xxx_off_" b)) + (("^(\\s*def )(test_complex\\W)" _ a b) + (string-append a "xxx_off_" b))) + #t)) + (add-before 'build 'rename-scripts + ;; rename the scripts to bypthon2, bpdb2, etc. + (lambda _ + (substitute* "setup.py" + (("^(\\s+'bpdb)(\\s+=.*',?)\\s*?$" _ name rest) + (string-append name "2" rest "\n")) + (("^(\\s+'bpython)(-\\S+)?(\\s+=.*',?)\\s*?$" _ name sub rest) + (string-append name "2" (or sub "") rest "\n"))) + #t)))))))) -- cgit v1.2.3 From aabcb6e57ce024e9581b8edd36b113034d4d0d83 Mon Sep 17 00:00:00 2001 From: Pjotr Prins Date: Thu, 15 Feb 2018 15:21:58 +0000 Subject: gnu: python-elasticsearch: Update to 6.1.1. * gnu/packages/python-web.scm (python-elasticsearch, python2-elasticsearch): Update to 6.1.1. Signed-off-by: Leo Famulari --- gnu/packages/python-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index b119fbd6b8..3cad440b9e 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -2050,14 +2050,14 @@ (define-public python2-cssmin (define-public python-elasticsearch (package (name "python-elasticsearch") - (version "1.0.0") + (version "6.1.1") (source (origin (method url-fetch) (uri (pypi-uri "elasticsearch" version)) (sha256 (base32 - "1sdw1r05cw7ihnmng8ra9v968fj7bq6sji8i1dikymsnkcpgc69g")))) + "1kjxl45yvvgfb5fmamx0kfsfg9pzphiqrwbkns3s28r1w7ya74cd")))) (build-system python-build-system) (native-inputs `(("python-mock" ,python-mock) -- cgit v1.2.3 From 5ebc8e7f41bfc292dedb9de3bf13b54bc0d0d2dd Mon Sep 17 00:00:00 2001 From: Ben Woodcroft Date: Fri, 16 Feb 2018 08:13:24 +1000 Subject: gnu: diamond: Update to 0.9.18. * gnu/packages/bioinformatics.scm (diamond): Update to 0.9.18. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 14a790bef0..00490dbcbb 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -2074,7 +2074,7 @@ (define-public deeptools (define-public diamond (package (name "diamond") - (version "0.9.17") + (version "0.9.18") (source (origin (method url-fetch) (uri (string-append @@ -2083,7 +2083,7 @@ (define-public diamond (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1p3fd1ad7hg2w09w3sjk4pxqx0p0gaqys8ipg3f4adg77mn9m9yd")))) + "1vi2nddmy7knrv8gsprwqp6a40k63n3f2dfvx22ipjhrg9xir96f")))) (build-system cmake-build-system) (arguments '(#:tests? #f ; no "check" target -- cgit v1.2.3 From 93dceea45ec5a4ec9a34efb6967981b5ce8e2126 Mon Sep 17 00:00:00 2001 From: Alex Vong Date: Fri, 16 Feb 2018 05:46:06 +0800 Subject: gnu: java-fasterxml-jackson-annotations: Update to 2.9.4. * gnu/packages/java.scm (java-fasterxml-jackson-annotations): Update to 2.9.4. Signed-off-by: Leo Famulari --- gnu/packages/java.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index e714a031c8..e8355e324c 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -6183,7 +6183,7 @@ (define-public java-ops4j-pax-exam-core-junit (define-public java-fasterxml-jackson-annotations (package (name "java-fasterxml-jackson-annotations") - (version "2.9.2") + (version "2.9.4") (source (origin (method url-fetch) (uri (string-append "https://github.com/FasterXML/" @@ -6191,7 +6191,7 @@ (define-public java-fasterxml-jackson-annotations "jackson-annotations-" version ".tar.gz")) (sha256 (base32 - "0b4wdxjxfbl3gkilylfdbl7fzimfpyih676jiwdf19i4056j8lqw")))) + "0mr95xd0da6a4g95zvrl1ryk5n5zv2rc696w3xnsr5hxk2gicfc4")))) (build-system ant-build-system) (arguments `(#:jar-name "jackson-annotations.jar" -- cgit v1.2.3 From 38a0fc384a8c45cdbf2adb20e8ae4fcc02c4c6e7 Mon Sep 17 00:00:00 2001 From: Alex Vong Date: Fri, 16 Feb 2018 05:46:31 +0800 Subject: gnu: java-fasterxml-jackson-core: Update to 2.9.4. * gnu/packages/java.scm (java-fasterxml-jackson-core): Update to 2.9.4. Signed-off-by: Leo Famulari --- gnu/packages/java.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index e8355e324c..8aca53ca31 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -6209,7 +6209,7 @@ (define-public java-fasterxml-jackson-annotations (define-public java-fasterxml-jackson-core (package (name "java-fasterxml-jackson-core") - (version "2.9.2") + (version "2.9.4") (source (origin (method url-fetch) (uri (string-append "https://github.com/FasterXML/" @@ -6217,7 +6217,7 @@ (define-public java-fasterxml-jackson-core "jackson-core-" version ".tar.gz")) (sha256 (base32 - "0q2d6qnylyxj5jh0sam1b095b5486f7ipzhxgwcgbm254ls7fqc1")))) + "159hsnk17jr1gyzkf01cxvsn45srnk37g949r7364qlsr527gjgd")))) (build-system ant-build-system) (arguments `(#:jar-name "jackson-core.jar" -- cgit v1.2.3 From 3c1edff5ca27e17d71ab08b2431761206e9a3ff0 Mon Sep 17 00:00:00 2001 From: Alex Vong Date: Fri, 16 Feb 2018 05:49:06 +0800 Subject: gnu: java-fasterxml-jackson-databind: Update to 2.9.4 [fixes CVE-{2017-17485, 2018-5968}]. * gnu/packages/java.scm (java-fasterxml-jackson-databind): Update to 2.9.4. Signed-off-by: Leo Famulari --- gnu/packages/java.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 8aca53ca31..e38614d9a4 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -6266,7 +6266,7 @@ (define-public java-fasterxml-jackson-core (define-public java-fasterxml-jackson-databind (package (name "java-fasterxml-jackson-databind") - (version "2.9.2") + (version "2.9.4") (source (origin (method url-fetch) (uri (string-append "https://github.com/FasterXML/" @@ -6274,7 +6274,7 @@ (define-public java-fasterxml-jackson-databind "jackson-databind-" version ".tar.gz")) (sha256 (base32 - "1d5ns8ypqhdy8d94i8q560ip9kka6q8lhnk6q7nfh2g9mr22cc4w")))) + "1zd2cw4z6kdkbx8za96xh9pyicv2a2l7y0rkcx2fqd8hv6d47s08")))) (build-system ant-build-system) (arguments `(#:jar-name "jackson-databind.jar" -- cgit v1.2.3 From 07207211df0f5fbc5c68ed5d47576a7467dccd7c Mon Sep 17 00:00:00 2001 From: Alex Vong Date: Fri, 16 Feb 2018 05:49:53 +0800 Subject: gnu: java-fasterxml-jackson-modules-base-jaxb: Update to 2.9.4. * gnu/packages/java.scm (java-fasterxml-jackson-modules-base-jaxb): Update to 2.9.4. Signed-off-by: Leo Famulari --- gnu/packages/java.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index e38614d9a4..803bb7ea95 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -6309,7 +6309,7 @@ (define-public java-fasterxml-jackson-databind (define-public java-fasterxml-jackson-modules-base-jaxb (package (name "java-fasterxml-jackson-modules-base-jaxb") - (version "2.9.2") + (version "2.9.4") (source (origin (method url-fetch) (uri (string-append "https://github.com/FasterXML/" @@ -6317,7 +6317,7 @@ (define-public java-fasterxml-jackson-modules-base-jaxb "jackson-modules-base-" version ".tar.gz")) (sha256 (base32 - "0kc19n5a188g4vpyay44xfb7qcabcbfnwzhx1g84lg0sac8lf0ng")))) + "1wws95xi8sppp6b0k2vvjdjyynl20r1a4dwrhai08lzlria6blp5")))) (build-system ant-build-system) (arguments `(#:jar-name "jackson-modules-base-jaxb.jar" -- cgit v1.2.3 From 1f2be88f26e1d4b99b5ccd830b8b27978b827d39 Mon Sep 17 00:00:00 2001 From: Alex Vong Date: Fri, 16 Feb 2018 05:50:15 +0800 Subject: gnu: java-fasterxml-jackson-dataformat-yaml: Update to 2.9.4. * gnu/packages/java.scm (java-fasterxml-jackson-dataformat-yaml): Update to 2.9.4. Signed-off-by: Leo Famulari --- gnu/packages/java.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 803bb7ea95..ad93722dbc 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -6379,7 +6379,7 @@ (define-public java-snakeyaml (define-public java-fasterxml-jackson-dataformat-yaml (package (name "java-fasterxml-jackson-dataformat-yaml") - (version "2.9.2") + (version "2.9.4") (source (origin (method url-fetch) (uri (string-append "https://github.com/FasterXML/" @@ -6387,7 +6387,7 @@ (define-public java-fasterxml-jackson-dataformat-yaml "jackson-dataformats-text-" version ".tar.gz")) (sha256 (base32 - "1x7c7v201jpb8ynjsmmq7jj7hyqzzp39jvpr053ggdndm022yzc7")))) + "1hikl06khaxbg439avf442qifcadap8w0lx13f0nnhp2vh3dkbz7")))) (build-system ant-build-system) (arguments `(#:jar-name "jackson-dataformat-yaml.jar" -- cgit v1.2.3 From f3bbe0291b535f21cc0261bd7c5cce4b5594a1f0 Mon Sep 17 00:00:00 2001 From: Alex Vong Date: Fri, 16 Feb 2018 05:51:00 +0800 Subject: gnu: java-fasterxml-jackson-dataformat-xml: Update to 2.9.4. * gnu/packages/java.scm (java-fasterxml-jackson-dataformat-xml): Update to 2.9.4. Signed-off-by: Leo Famulari --- gnu/packages/java.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index ad93722dbc..5c505fde1c 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -6488,7 +6488,7 @@ (define-public java-woodstox-core (define-public java-fasterxml-jackson-dataformat-xml (package (name "java-fasterxml-jackson-dataformat-xml") - (version "2.9.2") + (version "2.9.4") (source (origin (method url-fetch) (uri (string-append "https://github.com/FasterXML/" @@ -6496,7 +6496,7 @@ (define-public java-fasterxml-jackson-dataformat-xml "jackson-dataformat-xml-" version ".tar.gz")) (sha256 (base32 - "1j1qanvcdh6afagr67zqrlypjkf0n6wr1qzpbvkw79lii72j6pbr")))) + "111fkkl90w31jbf30kgj82qdcxlw4sxppki7i198liw0ck1jcavq")))) (build-system ant-build-system) (arguments `(#:jar-name "jackson-dataformat-xml.jar" -- cgit v1.2.3 From b907b364195dffb2e999e3a308fe0d9d8350cdf9 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sun, 20 Aug 2017 21:24:19 +0200 Subject: gnu: Add kholidays. * gnu/packages/kde.scm(kholidays): New variable. --- gnu/packages/kde.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index db4bfacc72..2ec5452a62 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -329,6 +329,41 @@ (define-public krita features include brush stabilizers, brush engines and wrap-around mode.") (license license:gpl2+))) +(define-public kholidays + (package + (name "kholidays") + (version "17.12.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/applications/" version "/src/" + name "-" version ".tar.xz")) + (sha256 + (base32 "0595d7wbnz8kyq1bnivdrp20lwdp8ykvdll1fmb0fgm4q24z0cl8")))) + (build-system cmake-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'check 'check-setup + (lambda _ + ;; blacklist a failing test function TODO: make it pass + (with-output-to-file "autotests/BLACKLIST" + (lambda _ + (display "[testDefaultRegions]\n*\n"))) + #t))))) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules) + ("qttools" ,qttools))) + (inputs + `(("qtbase" ,qtbase) + ("qtdeclarative" ,qtdeclarative))) + (home-page "https://cgit.kde.org/kholidays.git") + (synopsis "Library for regional holiday information") + (description "This library provides a C++ API that determines holiday and +other special events for a geographical region.") + (license license:lgpl2.0+))) + (define-public libkomparediff2 (package (name "libkomparediff2") -- cgit v1.2.3 From 6ca86ed7a3cbd61bbc3e1a3314b6b43abf42d83a Mon Sep 17 00:00:00 2001 From: David Thompson Date: Thu, 15 Feb 2018 19:14:31 -0500 Subject: gnu: python-botocore: Update to 1.8.43. * gnu/packages/python.scm (python-botocore): Update to 1.8.43. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 72b1d05e9f..91e1a8bf28 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -7375,14 +7375,14 @@ (define-public python2-jmespath (define-public python-botocore (package (name "python-botocore") - (version "1.8.36") + (version "1.8.43") (source (origin (method url-fetch) (uri (pypi-uri "botocore" version)) (sha256 (base32 - "0xd607qd9vkwpsvp552nqnrxppnx2n1rzh9kk9shz48ldpyy1jdj")))) + "12cqpbnz3vfv41mp9admvciw7bc7hz57sjpqs2bxaw9wnfmbw5lg")))) (build-system python-build-system) (arguments ;; FIXME: Many tests are failing. -- cgit v1.2.3 From 084067834288bd6ad2222440a00173d609bc38da Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 15 Feb 2018 21:43:43 -0500 Subject: gnu: quagga: Update to 1.2.3 [security fixes]. See the advisories at for more information about the security-related bugs fixed in this release. * gnu/packages/networking.scm (quagga): Update to 1.2.3. --- gnu/packages/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index fc20899a0c..69da2e21ab 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -1402,14 +1402,14 @@ (define-public spiped (define-public quagga (package (name "quagga") - (version "1.2.2") + (version "1.2.3") (source (origin (method url-fetch) (uri (string-append "mirror://savannah/quagga/quagga-" version ".tar.gz")) (sha256 (base32 - "0c99rjjc62xl5kwvx2pwyvs0709vbwax1qydqbqf6r7fpvr24bjj")) + "0cddxip9gd579parx64n6d7iq937ikrb8qxgvjxjm406l43hjb7f")) (patches (search-patches "quagga-reproducible-build.patch")))) (build-system gnu-build-system) -- cgit v1.2.3 From 469069b6e8e05a46e5fd52f1afa1102d2bb1d927 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 16 Feb 2018 10:54:57 +0100 Subject: gnu: ldc: Increase 'max-silent-time'. Reported by Pjotr Prins . * gnu/packages/ldc.scm (ldc-bootstrap)[properties]: New field. --- gnu/packages/ldc.scm | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ldc.scm b/gnu/packages/ldc.scm index 8e9ae1724a..8fe59679f8 100644 --- a/gnu/packages/ldc.scm +++ b/gnu/packages/ldc.scm @@ -165,6 +165,12 @@ (define-public ldc-bootstrap (sha256 (base32 "196mkfax5y3yqm3gz7jhqhnkjwrvr2m4a8nc9k41l0511ldzsk9x")))))) + + (properties + ;; Some of the tests take a very long time on ARMv7. See + ;; . + `((max-silent-time . ,(* 3600 3)))) + (home-page "http://wiki.dlang.org/LDC") (synopsis "LLVM compiler for the D programming language") (description -- cgit v1.2.3 From 89d159fef81763d4029e6902e9a0952a78a30990 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 16 Feb 2018 03:34:38 +0100 Subject: gnu: lzop: Update to 1.04. * gnu/packages/compression.scm (lzop): Update to 1.04. --- gnu/packages/compression.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 9983ee129e..dbdb9b3559 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -443,7 +443,7 @@ (define-public python2-lzo (define-public lzop (package (name "lzop") - (version "1.03") + (version "1.04") (source (origin (method url-fetch) @@ -451,7 +451,7 @@ (define-public lzop version ".tar.gz")) (sha256 (base32 - "1jdjvc4yjndf7ihmlcsyln2rbnbaxa86q4jskmkmm7ylfy65nhn1")))) + "0h9gb8q7y54m9mvy3jvsmxf21yx8fc3ylzh418hgbbv0i8mbcwky")))) (build-system gnu-build-system) (inputs `(("lzo" ,lzo))) (home-page "http://www.lzop.org/") -- cgit v1.2.3 From 6f465a51034f22c12dc010fc3066659aaf4bffa2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 16 Feb 2018 03:35:01 +0100 Subject: gnu: lzop: Use HTTPS home page. * gnu/packages/compression.scm (lzop)[home-page]: Use HTTPS. --- gnu/packages/compression.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index dbdb9b3559..23b129720e 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -454,7 +454,7 @@ (define-public lzop "0h9gb8q7y54m9mvy3jvsmxf21yx8fc3ylzh418hgbbv0i8mbcwky")))) (build-system gnu-build-system) (inputs `(("lzo" ,lzo))) - (home-page "http://www.lzop.org/") + (home-page "https://www.lzop.org/") (synopsis "Compress or expand files") (description "Lzop is a file compressor which is very similar to gzip. Lzop uses the -- cgit v1.2.3 From bf8677095028617932c43fb264d9f7325816edcd Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 16 Feb 2018 03:35:46 +0100 Subject: gnu: pbzip2: Update to 1.1.13. * gnu/packages/compression.scm (pbzip2): Update to 1.1.13. --- gnu/packages/compression.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 23b129720e..909b58c322 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -321,7 +321,7 @@ (define-public lbzip2 (define-public pbzip2 (package (name "pbzip2") - (version "1.1.12") + (version "1.1.13") (source (origin (method url-fetch) (uri (string-append "https://launchpad.net/pbzip2/" @@ -329,14 +329,14 @@ (define-public pbzip2 "/+download/" name "-" version ".tar.gz")) (sha256 (base32 - "1vk6065dv3a47p86vmp8hv3n1ygd9hraz0gq89gvzlx7lmcb6fsp")))) + "1rnvgcdixjzbrmcr1nv9b6ccrjfrhryaj7jwz28yxxv6lam3xlcg")))) (build-system gnu-build-system) (inputs `(("bzip2" ,bzip2))) (arguments - `(#:tests? #f ; no tests + `(#:tests? #f ; no tests #:phases (modify-phases %standard-phases - (delete 'configure)) + (delete 'configure)) ; no configure script #:make-flags (list (string-append "PREFIX=" %output)))) (home-page "http://compression.ca/pbzip2/") (synopsis "Parallel bzip2 implementation") -- cgit v1.2.3 From 910992e46df1a03a320523d7b9e6ecd94d0ec791 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 16 Feb 2018 04:13:01 +0100 Subject: gnu: lziprecover: Update to 1.20. * gnu/packages/compression.scm (lziprecover): Update to 1.20. --- gnu/packages/compression.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 909b58c322..f1a5b8bba5 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -487,14 +487,14 @@ (define-public lzip (define-public lziprecover (package (name "lziprecover") - (version "1.19") + (version "1.20") (source (origin (method url-fetch) (uri (string-append "mirror://savannah/lzip/" name "/" name "-" version ".tar.gz")) (sha256 (base32 - "0z5fbkm0qprypjf7kxkqganniibj0zml13zvfkrchnjafcmmzyld")))) + "0fpnmdxayvd1ff0rk9606dvr431ji6b1v71km4ww244rih1rmmzz")))) (build-system gnu-build-system) (home-page "http://www.nongnu.org/lzip/lziprecover.html") (synopsis "Recover and decompress data from damaged lzip files") -- cgit v1.2.3 From d6d1643b2ea558ea973723a3e5bbcbb75343bb5e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 16 Feb 2018 04:13:14 +0100 Subject: gnu: clzip: Update to 1.10. * gnu/packages/compression.scm (clzip): Update to 1.10. --- gnu/packages/compression.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index f1a5b8bba5..07064a35c4 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1986,14 +1986,14 @@ (define-public lunzip (define-public clzip (package (name "clzip") - (version "1.9") + (version "1.10") (source (origin (method url-fetch) (uri (string-append "mirror://savannah/lzip/" name "/" name "-" version ".tar.gz")) (sha256 - (base32 "1brvsnpihzj81cf4wk2x5bnr2qldlq0wncpdbzxmzvxapm1cq2yc")))) + (base32 "03xcmhl3dya4jrwmsqh09ikimpb36fr3vkh2bwfzz1sbcns0cdg3")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From d1c1d835f6747ef4cc54b0da7e33867ae906077c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 16 Feb 2018 04:13:25 +0100 Subject: gnu: lzlib: Update to 1.10. * gnu/packages/compression.scm (lzlib): Update to 1.10. --- gnu/packages/compression.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 07064a35c4..7478b30e2e 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -2012,14 +2012,14 @@ (define-public clzip (define-public lzlib (package (name "lzlib") - (version "1.9") + (version "1.10") (source (origin (method url-fetch) (uri (string-append "mirror://savannah/lzip/" name "/" name "-" version ".tar.gz")) (sha256 - (base32 "13mssf3hrcnmd4ijbqnxfk0zgj1q5lvpxxkm1hmrbl1h73czhwi4")))) + (base32 "0hqhnj2lzqacdbmmnpy91lsm1rd9zlngs1q6s9pyahsv1a0bfshx")))) (build-system gnu-build-system) ;; The included minilzip binary is only ~16 smaller than the ‘real’ lzip. ;; It's used during the test suite, but don't be tempted to install it. -- cgit v1.2.3 From 10cac630c249dcca0e43e0b3e1cbd28043796eb9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 16 Feb 2018 04:13:52 +0100 Subject: gnu: plzip: Update to 1.7. * gnu/packages/compression.scm (plzip): Update to 1.7. --- gnu/packages/compression.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 7478b30e2e..fc30ab746c 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -2040,14 +2040,14 @@ (define-public lzlib (define-public plzip (package (name "plzip") - (version "1.6") + (version "1.7") (source (origin (method url-fetch) (uri (string-append "mirror://savannah/lzip/" name "/" name "-" version ".tar.gz")) (sha256 - (base32 "0z2cs6vn4xl65wakd013xl3sdfpg8dr0cvcjwc2slh8y9bz7j7ax")))) + (base32 "1dzjp9r7krwpsn224bhcqbzd5aj5b4556sdi9yzl2bzbk3fjrqlm")))) (build-system gnu-build-system) (inputs `(("lzlib" ,lzlib))) -- cgit v1.2.3 From 340978d7b054dcde6c3334267b40a8293eb0ce85 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 16 Feb 2018 04:20:44 +0100 Subject: gnu: Use HTTPS for supported nongnu.org home pages. * gnu/packages/acl.scm (acl)[home-page]: Use HTTPS. * gnu/packages/admin.scm (dmidecode)[home-page]: Likewise. * gnu/packages/attr.scm (attr)[home-page]: Likewise. * gnu/packages/audio.scm (lash)[home-page]: Likewise. * gnu/packages/avr.scm (avr-libc)[home-page]: Likewise. * gnu/packages/backup.scm (rdiff-backup, libchop)[home-page]: Likewise. * gnu/packages/compression.scm (fastjar, lzip, lziprecover, atool) (lunzip, clzip, lzlib, plzip)[home-page]: Likewise. * gnu/packages/emacs.scm (geiser, bbdb, m17n-lib, m17n-lib)[home-page]: Likewise. * gnu/packages/flashing-tools.scm (avrdude)[home-page]: Likewise. * gnu/packages/fontutils.scm (libotf)[home-page]: Likewise. * gnu/packages/game-development.scm (gzochi)[home-page]: Likewise. * gnu/packages/games.scm (enigma)[home-page]: Likewise. * gnu/packages/gsasl.scm (libntlm)[home-page]: Likewise. * gnu/packages/gtk.scm (guile-cairo)[home-page]: Likewise. * gnu/packages/guile.scm (guile-reader, guile-lib, guile-json) (guile-redis, g-wrap)[home-page]: Likewise. * gnu/packages/libunwind.scm (libunwind)[home-page]: Likewise. * gnu/packages/lout.scm (lout)[home-page]: Likewise. * gnu/packages/mpd.scm (sonata)[home-page]: Likewise. * gnu/packages/networking.scm (quagga)[home-page]: Likewise. * gnu/packages/ratpoison.scm (ratpoison)[home-page]: Likewise. * gnu/packages/skribilo.scm (skribilo)[home-page]: Likewise. * gnu/packages/telephony.scm (exosip)[home-page]: Likewise. * gnu/packages/texinfo.scm (texi2html)[home-page]: Likewise. * gnu/packages/xdisorg.scm (xbindkeys)[home-page]: Likewise. --- gnu/packages/acl.scm | 2 +- gnu/packages/admin.scm | 2 +- gnu/packages/attr.scm | 2 +- gnu/packages/audio.scm | 2 +- gnu/packages/avr.scm | 2 +- gnu/packages/backup.scm | 4 ++-- gnu/packages/compression.scm | 16 ++++++++-------- gnu/packages/emacs.scm | 8 ++++---- gnu/packages/flashing-tools.scm | 2 +- gnu/packages/fontutils.scm | 2 +- gnu/packages/game-development.scm | 2 +- gnu/packages/games.scm | 2 +- gnu/packages/gsasl.scm | 2 +- gnu/packages/gtk.scm | 2 +- gnu/packages/guile.scm | 10 +++++----- gnu/packages/libunwind.scm | 2 +- gnu/packages/lout.scm | 2 +- gnu/packages/mpd.scm | 2 +- gnu/packages/networking.scm | 2 +- gnu/packages/ratpoison.scm | 2 +- gnu/packages/skribilo.scm | 2 +- gnu/packages/telephony.scm | 2 +- gnu/packages/texinfo.scm | 2 +- gnu/packages/xdisorg.scm | 2 +- 24 files changed, 39 insertions(+), 39 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/acl.scm b/gnu/packages/acl.scm index ae6764993b..31c37a6e7b 100644 --- a/gnu/packages/acl.scm +++ b/gnu/packages/acl.scm @@ -61,7 +61,7 @@ (define-public acl (native-inputs `(("gettext" ,gettext-minimal) ("perl" ,perl))) - (home-page "http://savannah.nongnu.org/projects/acl") + (home-page "https://savannah.nongnu.org/projects/acl") (synopsis "Library and tools for manipulating access control lists") (description diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 61ab9654f7..ccf62a6e24 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1183,7 +1183,7 @@ (define-public dmidecode #:tests? #f ; no 'check' target #:make-flags (list (string-append "prefix=" (assoc-ref %outputs "out"))))) - (home-page "http://www.nongnu.org/dmidecode/") + (home-page "https://www.nongnu.org/dmidecode/") (synopsis "Read hardware information from the BIOS") (description "Dmidecode reports information about your system's hardware as described diff --git a/gnu/packages/attr.scm b/gnu/packages/attr.scm index 4dbe09ceca..fe102d211c 100644 --- a/gnu/packages/attr.scm +++ b/gnu/packages/attr.scm @@ -71,7 +71,7 @@ (define-public attr (native-inputs `(("gettext" ,gettext-minimal))) - (home-page "http://savannah.nongnu.org/projects/attr/") + (home-page "https://savannah.nongnu.org/projects/attr/") (synopsis "Library and tools for manipulating extended attributes") (description "Portable library and tools for manipulating extended attributes.") diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index eb11d6cc4e..97fd32ed94 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -1591,7 +1591,7 @@ (define-public lash ("libxml2" ,libxml2))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.nongnu.org/lash/") + (home-page "https://www.nongnu.org/lash/") (synopsis "Audio application session manager") (description "LASH is a session management system for audio applications. It allows diff --git a/gnu/packages/avr.scm b/gnu/packages/avr.scm index e9e93cbb9a..4c7ebf5a8f 100644 --- a/gnu/packages/avr.scm +++ b/gnu/packages/avr.scm @@ -100,7 +100,7 @@ (define (avr-libc avr-gcc) #t))))) (native-inputs `(("avr-binutils" ,avr-binutils) ("avr-gcc" ,avr-gcc))) - (home-page "http://www.nongnu.org/avr-libc/") + (home-page "https://www.nongnu.org/avr-libc/") (synopsis "The AVR C Library") (description "AVR Libc is a project whose goal is to provide a high quality C library diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index a494a04047..ca53ffe3e3 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -372,7 +372,7 @@ (define-public rdiff-backup (arguments `(#:python ,python-2 #:tests? #f)) - (home-page "http://www.nongnu.org/rdiff-backup/") + (home-page "https://www.nongnu.org/rdiff-backup/") (synopsis "Local/remote mirroring+incremental backup") (description "Rdiff-backup backs up one directory to another, possibly over a network. @@ -452,7 +452,7 @@ (define-public libchop ("lzo" ,lzo) ("bzip2" ,bzip2) ("zlib" ,zlib))) - (home-page "http://nongnu.org/libchop/") + (home-page "https://nongnu.org/libchop/") (synopsis "Tools & library for data backup and distributed storage") (description "Libchop is a set of utilities and library for data backup and diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index fc30ab746c..9835735c84 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -153,7 +153,7 @@ (define-public fastjar "0iginbz2m15hcsa3x4y7v3mhk54gr1r7m3ghx0pg4n46vv2snmpi")))) (build-system gnu-build-system) (inputs `(("zlib" ,zlib))) - (home-page "http://savannah.nongnu.org/projects/fastjar") + (home-page "https://savannah.nongnu.org/projects/fastjar") (synopsis "Replacement for Sun's 'jar' utility") (description "FastJar is an attempt to create a much faster replacement for Sun's 'jar' @@ -475,7 +475,7 @@ (define-public lzip (base32 "1p8lvc22sv3damld9ng8y6i8z2dvvpsbi9v7yhr5bc2a20m8iya7")))) (build-system gnu-build-system) - (home-page "http://www.nongnu.org/lzip/lzip.html") + (home-page "https://www.nongnu.org/lzip/lzip.html") (synopsis "Lossless data compressor based on the LZMA algorithm") (description "Lzip is a lossless data compressor with a user interface similar to the @@ -496,7 +496,7 @@ (define-public lziprecover (base32 "0fpnmdxayvd1ff0rk9606dvr431ji6b1v71km4ww244rih1rmmzz")))) (build-system gnu-build-system) - (home-page "http://www.nongnu.org/lzip/lziprecover.html") + (home-page "https://www.nongnu.org/lzip/lziprecover.html") (synopsis "Recover and decompress data from damaged lzip files") (description "Lziprecover is a data recovery tool and decompressor for files in the lzip @@ -1890,7 +1890,7 @@ (define-public atool (inputs `(("perl" ,perl) ("file" ,file))) - (home-page "http://www.nongnu.org/atool/") + (home-page "https://www.nongnu.org/atool/") (synopsis "Universal tool to manage file archives of various types") (description "The main command is @command{aunpack} which extracts files from an archive. The other commands provided are @command{apack} (to create @@ -1971,7 +1971,7 @@ (define-public lunzip (arguments `(#:configure-flags (list "CC=gcc"))) - (home-page "http://www.nongnu.org/lzip/lunzip.html") + (home-page "https://www.nongnu.org/lzip/lunzip.html") (synopsis "Small, stand-alone lzip decompressor") (description "Lunzip is a decompressor for files in the lzip compression format (.lz), @@ -1998,7 +1998,7 @@ (define-public clzip (arguments `(#:configure-flags (list "CC=gcc"))) - (home-page "http://www.nongnu.org/lzip/clzip.html") + (home-page "https://www.nongnu.org/lzip/clzip.html") (synopsis "Small, stand-alone lzip compressor and decompressor") (description "Clzip is a compressor and decompressor for files in the lzip compression @@ -2027,7 +2027,7 @@ (define-public lzlib `(#:configure-flags (list "CC=gcc" "--enable-shared"))) ; only static (.a) is built by default - (home-page "http://www.nongnu.org/lzip/lzlib.html") + (home-page "https://www.nongnu.org/lzip/lzlib.html") (synopsis "Lzip data compression C library") (description "Lzlib is a C library for in-memory LZMA compression and decompression in @@ -2051,7 +2051,7 @@ (define-public plzip (build-system gnu-build-system) (inputs `(("lzlib" ,lzlib))) - (home-page "http://www.nongnu.org/lzip/plzip.html") + (home-page "https://www.nongnu.org/lzip/plzip.html") (synopsis "Parallel lossless data compressor for the lzip format") (description "Plzip is a massively parallel (multi-threaded) lossless data compressor diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 0d25ea2b2c..3fd41e1d44 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -334,7 +334,7 @@ (define-public geiser #t))))) (inputs `(("guile" ,guile-2.0))) (native-inputs `(("emacs" ,emacs-minimal))) - (home-page "http://nongnu.org/geiser/") + (home-page "https://nongnu.org/geiser/") (synopsis "Collection of Emacs modes for Guile and Racket hacking") (description "Geiser is a collection of Emacs major and minor modes that conspire with @@ -1026,7 +1026,7 @@ (define-public bbdb (symlink "bbdb-loaddefs.el" "bbdb-autoloads.el"))) #t))))) (native-inputs `(("emacs" ,emacs-minimal))) - (home-page "http://savannah.nongnu.org/projects/bbdb/") + (home-page "https://savannah.nongnu.org/projects/bbdb/") (synopsis "Contact management utility for Emacs") (description "BBDB is the Insidious Big Brother Database for GNU Emacs. It provides @@ -4632,7 +4632,7 @@ (define-public m17n-db ;; With `guix lint' the home-page URI returns a small page saying ;; that your browser does not handle frames. This triggers the "URI ;; returns suspiciously small file" warning. - (home-page "http://www.nongnu.org/m17n/") + (home-page "https://www.nongnu.org/m17n/") (synopsis "Multilingual text processing library (database)") (description "The m17n library realizes multilingualization of many aspects of applications. The m17n library represents @@ -4668,7 +4668,7 @@ (define-public m17n-lib ;; With `guix lint' the home-page URI returns a small page saying ;; that your browser does not handle frames. This triggers the "URI ;; returns suspiciously small file" warning. - (home-page "http://www.nongnu.org/m17n/") + (home-page "https://www.nongnu.org/m17n/") (synopsis "Multilingual text processing library (runtime)") (description "The m17n library realizes multilingualization of many aspects of applications. The m17n library represents diff --git a/gnu/packages/flashing-tools.scm b/gnu/packages/flashing-tools.scm index 5b79c83a40..5309510d40 100644 --- a/gnu/packages/flashing-tools.scm +++ b/gnu/packages/flashing-tools.scm @@ -140,7 +140,7 @@ (define-public avrdude (native-inputs `(("bison" ,bison) ("flex" ,flex))) - (home-page "http://www.nongnu.org/avrdude/") + (home-page "https://www.nongnu.org/avrdude/") (synopsis "AVR downloader and uploader") (description "AVRDUDE is a utility to download/upload/manipulate the ROM and diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index 19d5171956..387c4689d8 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -444,7 +444,7 @@ (define-public libotf (build-system gnu-build-system) (propagated-inputs `(("freetype" ,freetype))) - (home-page "http://www.nongnu.org/m17n/") + (home-page "https://www.nongnu.org/m17n/") (synopsis "Library for handling OpenType Font") (description "This library can read Open Type Layout Tables from an OTF file. Currently these tables are supported; head, name, cmap, GDEF, GSUB, and diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index a276be692b..5da40b1ae2 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -240,7 +240,7 @@ (define-public gzochi ("ncurses" ,ncurses) ("sdl" ,sdl) ("zlib" ,zlib))) - (home-page "http://www.nongnu.org/gzochi/") + (home-page "https://www.nongnu.org/gzochi/") (synopsis "Scalable middleware for multiplayer games") (description "gzochi is a framework for developing massively multiplayer online games. diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 286d0feef2..5004e72161 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -4725,7 +4725,7 @@ (define-public enigma (native-inputs `(("pkg-config" ,pkg-config) ("imagemagick" ,imagemagick))) - (home-page "http://www.nongnu.org/enigma") + (home-page "https://www.nongnu.org/enigma") (synopsis "Puzzle game with a dexterity component") (description "Enigma is a puzzle game with 550 unique levels. The object of the game is to find and uncover pairs of identically colored ‘Oxyd’ stones. diff --git a/gnu/packages/gsasl.scm b/gnu/packages/gsasl.scm index 727d0f0d52..8b15a7ce09 100644 --- a/gnu/packages/gsasl.scm +++ b/gnu/packages/gsasl.scm @@ -45,7 +45,7 @@ (define-public libntlm (description "Libntlm is a library that implements NTLM authentication.") (license license:lgpl2.1+) - (home-page "http://www.nongnu.org/libntlm/"))) + (home-page "https://www.nongnu.org/libntlm/"))) (define-public gss (package diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index c66a3e5a17..86dff08e40 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -803,7 +803,7 @@ (define-public guile-cairo `(("cairo" ,cairo))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.nongnu.org/guile-cairo/") + (home-page "https://www.nongnu.org/guile-cairo/") (synopsis "Cairo bindings for GNU Guile") (description "Guile-Cairo wraps the Cairo graphics library for Guile Scheme. diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 7c03a9c86b..9005779826 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -528,7 +528,7 @@ (define-public guile-reader Guile-Reader’s approach is similar to Common Lisp’s “read table”, but hopefully more powerful and flexible (for instance, one may instantiate as many readers as needed).") - (home-page "http://www.nongnu.org/guile-reader/") + (home-page "https://www.nongnu.org/guile-reader/") (license license:gpl3+))) (define-public guile2.0-reader @@ -739,7 +739,7 @@ (define-public guile-lib #t))))) (native-inputs `(("pkg-config" ,pkg-config))) (inputs `(("guile" ,guile-2.2))) - (home-page "http://www.nongnu.org/guile-lib/") + (home-page "https://www.nongnu.org/guile-lib/") (synopsis "Collection of useful Guile Scheme modules") (description "Guile-Lib is intended as an accumulation place for pure-scheme Guile @@ -782,7 +782,7 @@ (define-public guile-json (string-append all "/@GUILE_EFFECTIVE_VERSION@"))))))) (build-system gnu-build-system) (native-inputs `(("guile" ,guile-2.2))) - (home-page "http://savannah.nongnu.org/projects/guile-json/") + (home-page "https://savannah.nongnu.org/projects/guile-json/") (synopsis "JSON module for Guile") (description "Guile-JSON supports parsing and building JSON documents according to the @@ -1290,7 +1290,7 @@ (define-public guile-redis (build-system gnu-build-system) (native-inputs `(("guile" ,guile-2.0))) - (home-page "http://savannah.nongnu.org/projects/guile-redis/") + (home-page "https://savannah.nongnu.org/projects/guile-redis/") (synopsis "Redis client library for Guile") (description "Guile-redis provides a Scheme interface to the Redis key-value cache and store.") @@ -1460,7 +1460,7 @@ (define-public g-wrap wrappers for C functions. Given a definition of the types and prototypes for a given C interface, G-Wrap will automatically generate the C code that provides access to that interface and its types from the Scheme level.") - (home-page "http://www.nongnu.org/g-wrap/index.html") + (home-page "https://www.nongnu.org/g-wrap/index.html") (license license:lgpl2.1+))) (define-public guile-dbi diff --git a/gnu/packages/libunwind.scm b/gnu/packages/libunwind.scm index e747d37787..578154f70d 100644 --- a/gnu/packages/libunwind.scm +++ b/gnu/packages/libunwind.scm @@ -41,7 +41,7 @@ (define-public libunwind ;; expected to fail). ;; Report them upstream. '(#:tests? #f)) - (home-page "http://www.nongnu.org/libunwind") + (home-page "https://www.nongnu.org/libunwind") (synopsis "Determining the call chain of a program") (description "The primary goal of this project is to define a portable and efficient C diff --git a/gnu/packages/lout.scm b/gnu/packages/lout.scm index f2c724ae07..1a1d0b3274 100644 --- a/gnu/packages/lout.scm +++ b/gnu/packages/lout.scm @@ -124,4 +124,4 @@ (define out outcome of an eight-year research project that went back to the beginning.") (license gpl3+) - (home-page "http://savannah.nongnu.org/projects/lout/")))) + (home-page "https://savannah.nongnu.org/projects/lout/")))) diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index 82681aa68a..ac1fe51f15 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -332,5 +332,5 @@ (define-public sonata (description "Sonata is an elegant graphical client for the Music Player Daemon (MPD). It supports playlists, multiple profiles (connecting to different MPD servers, search and multimedia key support.") - (home-page "http://www.nongnu.org/sonata/") + (home-page "https://www.nongnu.org/sonata/") (license license:gpl3+))) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 69da2e21ab..1e03678572 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -1427,7 +1427,7 @@ (define-public quagga Zserv API over a Unix or TCP stream to Quagga clients. It is these Zserv clients which typically implement a routing protocol and communicate routing updates to the zebra daemon.") - (home-page "http://www.nongnu.org/quagga/") + (home-page "https://www.nongnu.org/quagga/") (license license:gpl2+))) (define-public thc-ipv6 diff --git a/gnu/packages/ratpoison.scm b/gnu/packages/ratpoison.scm index e68b345b06..d630c24fd4 100644 --- a/gnu/packages/ratpoison.scm +++ b/gnu/packages/ratpoison.scm @@ -82,7 +82,7 @@ (define-public ratpoison `(("perl",perl) ("pkg-config" ,pkg-config) ("ratpoison.desktop" ,ratpoison.desktop))) - (home-page "http://www.nongnu.org/ratpoison/") + (home-page "https://www.nongnu.org/ratpoison/") (synopsis "Simple mouse-free tiling window manager") (description "Ratpoison is a simple window manager with no fat library diff --git a/gnu/packages/skribilo.scm b/gnu/packages/skribilo.scm index 87dc3558de..f10acaec70 100644 --- a/gnu/packages/skribilo.scm +++ b/gnu/packages/skribilo.scm @@ -77,7 +77,7 @@ (define-public skribilo (propagated-inputs `(("guile-reader" ,guile2.0-reader) ("guile-lib" ,guile2.0-lib))) - (home-page "http://www.nongnu.org/skribilo/") + (home-page "https://www.nongnu.org/skribilo/") (synopsis "Document production tool written in Guile Scheme") (description "Skribilo is a free document production tool that takes a structured diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index 53bc9f950b..018de0c6ce 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -162,7 +162,7 @@ (define-public exosip (license license:gpl2+) ;; (plus OpenSSL linking exception) ;; http://git.savannah.gnu.org/cgit/exosip.git/plain/LICENSE.OpenSSL - (home-page "http://savannah.nongnu.org/projects/exosip"))) + (home-page "https://savannah.nongnu.org/projects/exosip"))) (define-public sipwitch (package diff --git a/gnu/packages/texinfo.scm b/gnu/packages/texinfo.scm index 8c33023bd0..7b9121bf80 100644 --- a/gnu/packages/texinfo.scm +++ b/gnu/packages/texinfo.scm @@ -165,7 +165,7 @@ (define-public texi2html ;; texi2html.pl to avoid the warnings seems non-trivial, so we simply ;; disable the tests. '(#:tests? #f)) - (home-page "http://www.nongnu.org/texi2html/") + (home-page "https://www.nongnu.org/texi2html/") (synopsis "Convert Texinfo to HTML") (description "Texi2HTML is a Perl script which converts Texinfo source files to HTML diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index c81e5ad01f..70a987b05b 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -722,7 +722,7 @@ (define-public xbindkeys (inputs `(("libx11" ,libx11) ("guile" ,guile-2.0))) - (home-page "http://www.nongnu.org/xbindkeys/") + (home-page "https://www.nongnu.org/xbindkeys/") (synopsis "Associate a combination of keys with a shell command") (description "XBindKeys is a program that allows you to launch shell commands with -- cgit v1.2.3 From 93710d861f5987b7e87221d39e568afd86357c80 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 15 Feb 2018 23:30:03 +0100 Subject: gnu: wmbattery: Update to 2.51. * gnu/packages/gnustep.scm (wmbattery): Update to 2.51. [source]: Remove upstreamed bugfix snippet. --- gnu/packages/gnustep.scm | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnustep.scm b/gnu/packages/gnustep.scm index 0e9cf230f2..e1aa6d007a 100644 --- a/gnu/packages/gnustep.scm +++ b/gnu/packages/gnustep.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 Ludovic Courtès ;;; Copyright © 2016, 2017 Kei Kebreau +;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -154,7 +155,7 @@ (define-public windowmaker (define-public wmbattery (package (name "wmbattery") - (version "2.50") + (version "2.51") (source (origin (method url-fetch) (uri (string-append @@ -162,15 +163,7 @@ (define-public wmbattery version ".orig.tar.gz")) (sha256 (base32 - "0hi6bivv3xd2k68w08krndfl68wdx7nmc2wjzsmcd4q3qgwgyk44")) - (modules '((guix build utils))) - (snippet - ;; Fix memory leak: - ;; . - '(substitute* "upower.c" - (("up = up_client_new\\(\\);") - (string-append "if (!up)\n" - " up = up_client_new();")))))) + "084a3irxbmgms4bqaga80mlx9wgvlkx6d2w0ns939yrpfzg87laj")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no "check" target -- cgit v1.2.3 From 9a0a4a95f02f0ad2e3589af398421445f7e8a949 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 15 Feb 2018 20:29:26 +0100 Subject: gnu: wmcpuload: Update to 1.1.1. * gnu/packages/gnustep.scm (wmcpuload): Update to 1.1.1. --- gnu/packages/gnustep.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnustep.scm b/gnu/packages/gnustep.scm index e1aa6d007a..dd49386764 100644 --- a/gnu/packages/gnustep.scm +++ b/gnu/packages/gnustep.scm @@ -219,7 +219,7 @@ (define-public wmnd (define-public wmcpuload (package (name "wmcpuload") - (version "1.0.1") + (version "1.1.1") (source (origin (method url-fetch) (uri (string-append @@ -227,7 +227,7 @@ (define-public wmcpuload name "_" version ".orig.tar.gz")) (sha256 (base32 - "0irlns4cvxy2mnicx75bya166hdxq7h8bphds3ligijcl9fzgs6n")))) + "1334y0axnxydwv05d172f405iljrfakg4kcyg9kmn46v6ywv424g")))) (build-system gnu-build-system) (inputs `(("libx11" ,libx11) -- cgit v1.2.3 From bfe83d568c75434501a471dbaed273d213320470 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 15 Feb 2018 23:28:51 +0100 Subject: gnu: gnustep: Update phase style. * gnu/packages/gnustep.scm (windowmaker)[arguments]: Don't use %OUTPUT. End phases with #t. (wmbattery, wmclock)[arguments]: Substitute INVOKE for SYSTEM*. End phases with #t. --- gnu/packages/gnustep.scm | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnustep.scm b/gnu/packages/gnustep.scm index dd49386764..05ad9b745a 100644 --- a/gnu/packages/gnustep.scm +++ b/gnu/packages/gnustep.scm @@ -102,7 +102,8 @@ (define-public windowmaker ;; The path to wmsetbg in Guix requires 67 extra characters. (substitute* "src/defaults.c" (("len = strlen\\(text\\) \\+ 40;") - (string-append "len = strlen(text) + 107;")))))) + (string-append "len = strlen(text) + 107;"))) + #t))) (add-after 'install 'install-xsession (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -120,7 +121,7 @@ (define-public windowmaker (string-map (match-lambda (#\newline #\space) (chr chr)) - ,synopsis) %output)))) + ,synopsis) out)))) #t)) (add-after 'install-xsession 'wrap (lambda* (#:key outputs #:allow-other-keys) @@ -129,7 +130,8 @@ (define-public windowmaker ;; In turn, 'wmaker.inst' wants to invoke 'wmmenugen' ;; etc., so make sure everything is in $PATH. (wrap-program (string-append bin "/wmaker.inst") - `("PATH" ":" prefix (,bin))))))))) + `("PATH" ":" prefix (,bin))) + #t)))))) (inputs `(("libxmu" ,libxmu) ("libxft" ,libxft) @@ -170,7 +172,9 @@ (define-public wmbattery #:phases (modify-phases %standard-phases (add-after 'unpack 'autoconf - (lambda _ (zero? (system* "autoreconf" "-vfi"))))))) + (lambda _ + (invoke "autoreconf" "-vfi") + #t))))) (inputs `(("glib" ,glib) ("libx11" ,libx11) @@ -262,7 +266,9 @@ (define-public wmclock `(#:phases (modify-phases %standard-phases (add-after 'unpack 'autoconf - (lambda _ (zero? (system* "autoreconf" "-vfi"))))))) + (lambda _ + (invoke "autoreconf" "-vfi") + #t))))) ;; wmclock requires autoreconf to generate its configure script. (inputs `(("libx11" ,libx11) -- cgit v1.2.3 From 48bbe06edfb41700abf66419b1f0c7e21d831d96 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 15 Feb 2018 20:24:35 +0100 Subject: gnu: gnustep: Update dockapps home pages. * gnu/packages/gnustep.scm (wmbattery, wmclock, wmcpuload)[home-pages]: Use new dockapps.net domain. --- gnu/packages/gnustep.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnustep.scm b/gnu/packages/gnustep.scm index 05ad9b745a..bd28ceaa00 100644 --- a/gnu/packages/gnustep.scm +++ b/gnu/packages/gnustep.scm @@ -185,7 +185,7 @@ (define-public wmbattery `(("autoconf" ,autoconf) ("automake" ,automake) ("pkg-config" ,pkg-config))) - (home-page "http://windowmaker.org/dockapps/?name=wmbattery") + (home-page "http://www.dockapps.net/wmbattery") (synopsis "Display laptop battery info") (description "Wmbattery displays the status of your laptop's battery in a small icon. @@ -239,7 +239,7 @@ (define-public wmcpuload ("libxpm" ,libxpm))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://windowmaker.org/dockapps/?name=wmcpuload") + (home-page "http://www.dockapps.net/wmcpuload") (synopsis "Monitor CPU usage") (description "Wmcpuload displays the current CPU usage, expressed as a percentile and a @@ -278,7 +278,7 @@ (define-public wmclock `(("autoconf" ,autoconf) ("automake" ,automake) ("pkg-config" ,pkg-config))) - (home-page "http://windowmaker.org/dockapps/?name=wmclock") + (home-page "http://www.dockapps.net/wmclock") (synopsis "Display the date and time") (description "wmclock is an applet for Window Maker which displays the date and time in -- cgit v1.2.3 From ce46dfeba53c9cc0f4d7a28102ed9a662cbd8896 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 15 Feb 2018 21:19:55 +0100 Subject: gnu: gkrellm: Update to 2.3.10. * gnu/packages/gkrellm.scm (gkrellm): Update to 2.3.10. [arguments]: Remove X11_LIBS override. --- gnu/packages/gkrellm.scm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gkrellm.scm b/gnu/packages/gkrellm.scm index 6ad4fe6ff3..4eb906e40d 100644 --- a/gnu/packages/gkrellm.scm +++ b/gnu/packages/gkrellm.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013 Andreas Enge ;;; Copyright © 2016 Efraim Flashner +;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -30,7 +31,7 @@ (define-module (gnu packages gkrellm) (define-public gkrellm (package (name "gkrellm") - (version "2.3.5") + (version "2.3.10") (source (origin (method url-fetch) @@ -38,7 +39,7 @@ (define-public gkrellm version ".tar.bz2")) (sha256 (base32 - "12rc6zaa7kb60b9744lbrlfkxxfniprm6x0mispv63h4kh75navh")))) + "0rnpzjr0ys0ypm078y63q4aplcgdr5nshjzhmz330n6dmnxci7lb")))) (build-system gnu-build-system) (inputs `(("gettext" ,gettext-minimal) @@ -48,13 +49,14 @@ (define-public gkrellm (native-inputs `(("pkg-config" ,pkg-config))) (arguments - `(#:tests? #f ; there is no check target - #:phases (modify-phases %standard-phases (delete 'configure)) + `(#:tests? #f ; there is no check target + #:phases + (modify-phases %standard-phases + (delete 'configure)) ; no configure script #:make-flags (let ((out (assoc-ref %outputs "out"))) (list (string-append "INSTALLROOT=" out) - "CC=gcc" - "X11_LIBS = -lX11 -lSM -lICE -lgmodule-2.0")))) + "CC=gcc")))) (home-page "http://gkrellm.srcbox.net/") (synopsis "System monitors") (description -- cgit v1.2.3 From 629c1947ea2b007d7103612dc0d25237abb2b555 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 15 Feb 2018 22:54:11 +0100 Subject: gnu: erlang: Update to 20.2.3. * gnu/packages/erlang.scm (erlang): Update to 20.2.3. --- gnu/packages/erlang.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/erlang.scm b/gnu/packages/erlang.scm index 77f39ee630..78c6b509a1 100644 --- a/gnu/packages/erlang.scm +++ b/gnu/packages/erlang.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2016 Steve Sprang ;;; Copyright © 2016, 2017 Leo Famulari ;;; Copyright © 2016, 2017 Pjotr Prins +;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -36,7 +37,7 @@ (define-module (gnu packages erlang) (define-public erlang (package (name "erlang") - (version "20.1.7") + (version "20.2.3") (source (origin (method url-fetch) ;; The tarball from http://erlang.org/download contains many @@ -47,7 +48,7 @@ (define-public erlang (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "00pmngdyh1h088anmx6fbk085i93ajgk92rz7qsyhfc0lx0sm0a9")) + "0s9g4ijdbqq21k4cqggz074d3fiimah942qisv2kgizhlivpw2nm")) (patches (search-patches "erlang-man-path.patch")))) (build-system gnu-build-system) (native-inputs @@ -63,7 +64,7 @@ (define-public erlang (version-major+minor version) ".tar.gz")) (sha256 (base32 - "0ikvdpn4z7az6szg176l1r2yxhgs3msa3wgb3gmy45jkz0pzik05")))))) + "1pyb8wbk7znsyni8d1k4dj1m01lr191dcrrzisli1z27ks7hh3lm")))))) (inputs `(("ncurses" ,ncurses) ("openssl" ,openssl) -- cgit v1.2.3 From 1b0ce451f4ba492e72b7e1ee85534955664a6559 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 15 Feb 2018 22:56:05 +0100 Subject: gnu: erlang: Update phase style. * gnu/packages/erlang.scm (erlang)[arguments]: Substitute INVOKE for SYSTEM*, don't use %OUTPUTS, and end phases with #t. --- gnu/packages/erlang.scm | 43 +++++++++++++++++++++++++------------------ 1 file changed, 25 insertions(+), 18 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/erlang.scm b/gnu/packages/erlang.scm index 78c6b509a1..07aac3a088 100644 --- a/gnu/packages/erlang.scm +++ b/gnu/packages/erlang.scm @@ -95,9 +95,9 @@ (define-public erlang (add-after 'unpack 'remove-timestamps (lambda _ (let ((source-date-epoch - (time-utc->date - (make-time time-utc 0 (string->number - (getenv "SOURCE_DATE_EPOCH")))))) + (time-utc->date + (make-time time-utc 0 (string->number + (getenv "SOURCE_DATE_EPOCH")))))) (substitute* "lib/reltool/src/reltool_target.erl" (("Date = date\\(\\),") (string-append "Date = " @@ -116,8 +116,8 @@ (define-public erlang (substitute* "lib/dialyzer/test/small_SUITE_data/src/gs_make.erl" (("tuple_to_list\\(date\\(\\)\\),tuple_to_list\\(time\\(\\)\\)") (date->string - source-date-epoch - "tuple_to_list({~Y,~m,~d}), tuple_to_list({~H,~M,~S})"))) + source-date-epoch + "tuple_to_list({~Y,~m,~d}), tuple_to_list({~H,~M,~S})"))) (substitute* "lib/snmp/src/compile/snmpc_mib_to_hrl.erl" (("\\{Y,Mo,D\\} = date\\(\\),") (date->string source-date-epoch @@ -125,7 +125,8 @@ (define-public erlang (substitute* "lib/snmp/src/compile/snmpc_mib_to_hrl.erl" (("\\{H,Mi,S\\} = time\\(\\),") (date->string source-date-epoch - "{H,Mi,S} = {~H,~M,~S},")))))) + "{H,Mi,S} = {~H,~M,~S},"))) + #t))) (add-after 'patch-source-shebangs 'patch-source-env (lambda _ (let ((escripts @@ -141,31 +142,37 @@ (define-public erlang "make/verify_runtime_dependencies" "make/emd2exml.in")))) (substitute* escripts - (("/usr/bin/env") (which "env")))))) + (("/usr/bin/env") (which "env"))) + #t))) (add-before 'configure 'set-erl-top (lambda _ - (setenv "ERL_TOP" (getcwd)))) + (setenv "ERL_TOP" (getcwd)) + #t)) (add-after 'patch-source-env 'autoconf - (lambda _ (zero? (system* "./otp_build" "autoconf")))) + (lambda _ + (invoke "./otp_build" "autoconf") + #t)) (add-after 'install 'patch-erl ;; This only works after install. - (lambda _ - (substitute* (string-append (assoc-ref %outputs "out") "/bin/erl") - (("sed") (which "sed"))))) + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out"))) + (substitute* (string-append out "/bin/erl") + (("sed") (which "sed"))) + #t))) (add-after 'install 'install-doc (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (manpages (assoc-ref inputs "erlang-manpages")) (share (string-append out "/share/"))) - (mkdir-p share) - (mkdir-p (string-append share "/misc/erlang")) - (with-directory-excursion share - (and - (zero? (system* "tar" "xvf" manpages)) + (mkdir-p share) + (mkdir-p (string-append share "/misc/erlang")) + (with-directory-excursion share + (invoke "tar" "xvf" manpages) (rename-file "COPYRIGHT" (string-append share "/misc/erlang/COPYRIGHT")) ;; Delete superfluous file. - (delete-file "PR.template"))))))))) + (delete-file "PR.template")) + #t)))))) (home-page "http://erlang.org/") (synopsis "The Erlang programming language") (description -- cgit v1.2.3 From 2b33c4d6775cf0c0a1e0551b1c12ad555d2ba6c5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 16 Feb 2018 03:05:45 +0100 Subject: gnu: opusfile: Update to 0.10. * gnu/packages/xiph.scm (opusfile): Update to 0.10. --- gnu/packages/xiph.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xiph.scm b/gnu/packages/xiph.scm index 4097a740c4..141cf1420b 100644 --- a/gnu/packages/xiph.scm +++ b/gnu/packages/xiph.scm @@ -396,7 +396,7 @@ (define opus-tools (define opusfile (package (name "opusfile") - (version "0.9") + (version "0.10") (source (origin (method url-fetch) (uri (string-append @@ -404,7 +404,7 @@ (define opusfile ".tar.gz")) (sha256 (base32 - "0yg9whb9y6ja3d5dmscg5a29hxj7qj0asw8smisjf4hbwh0bapzp")))) + "0bs1376sd131qdh7198jp64vv5d17az5wyy4y7srrvw7p8k3bq28")))) (build-system gnu-build-system) (propagated-inputs `(("opus" ,opus))) -- cgit v1.2.3 From 2d1c7a4e8947ed1f530e0f52fa4477263fe88226 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 16 Feb 2018 03:23:14 +0100 Subject: gnu: ristretto: Update to 0.8.2. * gnu/packages/xfce.scm (ristretto): Update to 0.8.2. --- gnu/packages/xfce.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 630851ba39..035e9c5f20 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -792,7 +792,7 @@ (define-public xfce4-power-manager (define-public ristretto (package (name "ristretto") - (version "0.8.0") + (version "0.8.2") (source (origin (method url-fetch) (uri (string-append "http://archive.xfce.org/src/apps/ristretto/" @@ -800,7 +800,7 @@ (define-public ristretto name "-" version ".tar.bz2")) (sha256 (base32 - "0a7kwhx51fd2kqh7l7kp13wcn39d2fjkwnn9rfd1k9ydrqj56qki")))) + "1f01d47kd85kjd1k4bzpcck4cb40qpjm5fzirzwdsxzwlrybgwzq")))) (build-system gnu-build-system) (native-inputs `(("intltool" ,intltool) -- cgit v1.2.3 From 8c078ddec44ad97a298b2c980212dfe988620a08 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 16 Feb 2018 03:30:48 +0100 Subject: gnu: perl-dbd-pg: Update to 3.7.4. * gnu/packages/databases.scm (perl-dbd-pg): Update to 3.7.4. --- gnu/packages/databases.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index a4d7f932c1..967f7aa236 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -23,7 +23,7 @@ ;;; Copyright © 2017 Jelle Licht ;;; Copyright © 2017 Adriano Peluso ;;; Copyright © 2017 Arun Isaac -;;; Copyright © 2017 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2017 Alex Vong ;;; Copyright © 2017 Ben Woodcroft ;;; Copyright © 2017 Rutger Helling @@ -1264,7 +1264,7 @@ (define-public perl-dbix-class-schema-loader (define-public perl-dbd-pg (package (name "perl-dbd-pg") - (version "3.7.0") + (version "3.7.4") (source (origin (method url-fetch) @@ -1272,7 +1272,7 @@ (define-public perl-dbd-pg "DBD-Pg-" version ".tar.gz")) (sha256 (base32 - "0nb4wmkhq1q9f4g42sxy1m3d0xjqd3plqkxpmzni43ygr5ch8vp3")))) + "0gkqlvbmzbdm0g4k328nlkjdg3wrjm5i2n9jxj1i8sqxkm79rylz")))) (build-system perl-build-system) (native-inputs `(("perl-dbi" ,perl-dbi))) -- cgit v1.2.3 From c2957cb7ecfe4976d017120dc01d0c383fa11575 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Fri, 16 Feb 2018 13:08:13 +0100 Subject: gnu: mpv: Update to 0.28.2. * gnu/packages/video.scm (mpv): Update to 0.28.2. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index b92da90507..f5d4d3176b 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1009,7 +1009,7 @@ (define-public mplayer (define-public mpv (package (name "mpv") - (version "0.28.1") + (version "0.28.2") (source (origin (method url-fetch) (uri (string-append @@ -1017,7 +1017,7 @@ (define-public mpv ".tar.gz")) (sha256 (base32 - "1i1czric6dhbwvyxamzrnwjwsznrn9cpzp6m0m6aahiwpbfbl282")) + "15fp4sa5glqhgidd54vs6knf9dp809wszzsqiqz5nyri4ph19nma")) (file-name (string-append name "-" version ".tar.gz")))) (build-system waf-build-system) (native-inputs -- cgit v1.2.3 From 6a3cf4e6c7d77634d67902215f0017c12455c6fb Mon Sep 17 00:00:00 2001 From: David Thompson Date: Fri, 16 Feb 2018 10:15:36 -0500 Subject: gnu: tiled: Update to 1.1.2. * gnu/packages/game-development.scm (tiled): Update to 1.1.2. --- gnu/packages/game-development.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 5da40b1ae2..ffc3522919 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -386,7 +386,7 @@ (define-public python2-xsge (define-public tiled (package (name "tiled") - (version "1.1.1") + (version "1.1.2") (source (origin (method url-fetch) (uri (string-append "https://github.com/bjorn/tiled/archive/v" @@ -394,7 +394,7 @@ (define-public tiled (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "102vw13iw1kbjj6h2sm8gl1jfvmqgq0zddd6hdmqagza5b6w32k3")))) + "0l4wc10d10fi0a5spbi318kjfzlizmycpr4wwlq04sk3b5kra0w0")))) (build-system gnu-build-system) (inputs `(("qtbase" ,qtbase) -- cgit v1.2.3