From 8b7e6d005e9f709bece4bba05186a4abda3e4deb Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Thu, 3 Jan 2019 22:03:34 +0000 Subject: gnu: postgresql: Build with openssl support. * gnu/packages/databases.scm (postgresql)[arguments]: Add --with-openssl to [inputs]: Add openssl. --- gnu/packages/databases.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index cc4e6631f8..dd93747ed6 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -698,7 +698,7 @@ as a drop-in replacement of MySQL.") (patches (search-patches "postgresql-disable-resolve_symlinks.patch")))) (build-system gnu-build-system) (arguments - `(#:configure-flags '("--with-uuid=e2fs") + `(#:configure-flags '("--with-uuid=e2fs" "--with-openssl") #:phases (modify-phases %standard-phases (add-before 'configure 'patch-/bin/sh @@ -717,6 +717,7 @@ as a drop-in replacement of MySQL.") (inputs `(("readline" ,readline) ("libuuid" ,util-linux) + ("openssl" ,openssl) ("zlib" ,zlib))) (home-page "https://www.postgresql.org/") (synopsis "Powerful object-relational database system") -- cgit v1.2.3 From fa8ffaa0df18f743b4afd5db30ce6157d00d5fb8 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Mon, 11 Feb 2019 21:19:33 +0100 Subject: gnu: python-cython: Update to 0.29.5. * gnu/packages/python-xyz.scm (python-cython): Update to 0.29.5. --- gnu/packages/python-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 183ac56372..6c97e5989a 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013 Nikita Karetnikov ;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès -;;; Copyright © 2013, 2014, 2015, 2016 Andreas Enge +;;; Copyright © 2013, 2014, 2015, 2016, 2019 Andreas Enge ;;; Copyright © 2014, 2015 Mark H Weaver ;;; Copyright © 2014, 2017 Eric Bavier ;;; Copyright © 2014, 2015 Federico Beffa @@ -2720,14 +2720,14 @@ and is very extensible.") (define-public python-cython (package (name "python-cython") - (version "0.28.4") + (version "0.29.5") (source (origin (method url-fetch) (uri (pypi-uri "Cython" version)) (sha256 (base32 - "0imw9s2rbrh32clbl10csnwmig9p3nzkrd2baxxxfmnrsc42pb3n")))) + "1wfb68g115gmf3mv23w0hh972b0ll85gpb92ci28x6h997br0llx")))) (build-system python-build-system) ;; we need the full python package and not just the python-wrapper ;; because we need libpython3.3m.so -- cgit v1.2.3 From 295de8cc1af9afc2683cee332793bff1730bf1b3 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Mon, 11 Feb 2019 10:35:52 -0800 Subject: gnu: diffoscope: Update to 111. * gnu/packages/package-management (diffoscope): Update to 111. Signed-off-by: Leo Famulari --- gnu/packages/package-management.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 2e69cd151e..9714fe2305 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -541,13 +541,13 @@ transactions from C or Python.") (define-public diffoscope (package (name "diffoscope") - (version "106") + (version "111") (source (origin (method url-fetch) (uri (pypi-uri name version)) (sha256 (base32 - "0qrfp7nha2n2s9h5ibcf7rqji1amh4cqbcf80m6anim6p3ik26da")))) + "0sgqx3n0ny75bvcw10pfx61z67mdk5hx3mblw4gqnn2h9vc74qz1")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From 75d12c40f7edd7f3abaada916d1c2018bd3b0d46 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Mon, 11 Feb 2019 11:46:47 -0800 Subject: gnu: disorderfs: Update to 0.5.6. * gnu/packages/file-systems (disorderfs): Update to 0.5.6. Signed-off-by: Leo Famulari --- gnu/packages/file-systems.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index 066d6d843b..c778ebd21e 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -109,7 +109,7 @@ single file can be mounted.") (define-public disorderfs (package (name "disorderfs") - (version "0.5.5") + (version "0.5.6") (source (origin (method git-fetch) @@ -119,7 +119,7 @@ single file can be mounted.") (file-name (git-file-name name version)) (sha256 (base32 - "18c32qcdzbxrzg7srnqnw1ls9yqqxyk9b996yxr6w2znw6x6n8v4")))) + "1zn2ydap8k9fwjl3ivgrg6l32s5p4ik6ca6j1idp7c77znlv6cpp")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 8d11b6ddb8f59404acd3c87e9efdcf1082df3b68 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 10 Feb 2019 17:39:44 +0100 Subject: gnu: guile-picture-language: Update to 0-2.1ea8b78. * gnu/packages/guile-xyz.scm (guile-picture-language): Update to 0-2.1ea8b78. --- gnu/packages/guile-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index ae05197e16..a48954e7f2 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -1963,8 +1963,8 @@ format is also supported.") (deprecated-package "mcron2" mcron)) (define-public guile-picture-language - (let ((commit "1531116036d1b5e0d2482ff2c8d77ad21f1d2bef") - (revision "1")) + (let ((commit "1ea8b78a8bceb4f7e5eaeb3e76987072267f99bb") + (revision "2")) (package (name "guile-picture-language") (version (git-version "0" revision commit)) @@ -1975,7 +1975,7 @@ format is also supported.") (commit commit))) (sha256 (base32 - "04salmqf5x84vb3qkkxx47b64jyl290zsf3ik81l9hg6fwvvlmq3")))) + "1rvq6q2zq21x7dx0qq1hn568wglsl4bkd8gacbarcx1fs0rrxcqw")))) (build-system guile-build-system) (inputs `(("guile" ,guile-2.2))) -- cgit v1.2.3 From 95c910f499813ccc642e76119abd2e9c6ab9c32f Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 11 Feb 2019 15:06:07 -0500 Subject: gnu: Guix: Update snapshot to 0.16.0-10.2637cfd. Fixes . * gnu/packages/package-management.scm (guix): Update to 0.16.0-10.2637cfd. --- gnu/packages/package-management.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 9714fe2305..587d028d92 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -107,8 +107,8 @@ ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "0.16.0") - (commit "4bddd12ad540d45a33a5f9f129b896843dca603f") - (revision 9)) + (commit "2637cfd7a4894ef2a2a7da3bb46d8815c43d7e75") + (revision 10)) (package (name "guix") @@ -124,7 +124,7 @@ (commit commit))) (sha256 (base32 - "1abn4ghb25kn0cmr9dbb3q3fxdcc0g2fnnmbrykxv111s6ahdmlw")) + "1m734gm45x9czqspsagdfxfgw5wiiinyq1s6zc9gfv7d3b2w472k")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From bff44abb14fa8e411fa1fdc54e9115dda0e02fb6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 10 Feb 2019 18:08:59 +0100 Subject: gnu: mod-wsgi: Don't use unstable tarball. * gnu/packages/web.scm (mod-wsgi)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/web.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 158d542d7f..7238987f5b 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -164,17 +164,17 @@ and its related documentation.") (name "mod-wsgi") (version "4.5.22") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/GrahamDumpleton/mod_wsgi/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/GrahamDumpleton/mod_wsgi.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "0n1yhmrfp8mjbsngmyjl937c6rc0069p6wdi1lknrbn1q42hzw6q")))) + "1q90xw2cbhka5gcd6yc69iir73x4gm7fm75qpkins2ryfl6w1q3f")))) (build-system gnu-build-system) (arguments - '(#:tests? #f ;; TODO: Can't figure out if there are tests + '(#:tests? #f ; TODO: can't figure out if there are tests #:make-flags (list (string-append "DESTDIR=" (assoc-ref %outputs "out")) -- cgit v1.2.3 From 20ab34c16f612df6ca02d25e2e357c37443cfd83 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 10 Feb 2019 18:14:54 +0100 Subject: gnu: fcgiwrap: Don't use unstable tarball. * gnu/packages/web.scm (fcgiwrap)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/web.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 7238987f5b..6578ce5137 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -413,16 +413,16 @@ APIs.") (version "1.1.0") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/gnosek/fcgiwrap/" - "archive/" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/gnosek/fcgiwrap.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 - "07y6s4mm86cv7p1ljz94sxnqa89y9amn3vzwsnbq5hrl4vdy0zac")))) + (base32 "1ryw66h9aazi83amk8l7ha8k5g0c7qvk5g6jv376a1ws9xk2qw6f")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; no tests included + `(#:tests? #f ; no tests included #:make-flags (list "CC=gcc"))) (native-inputs `(("autoconf" ,autoconf) -- cgit v1.2.3 From 082504addf2e285d061cc02c5c4ba9c69cd2c153 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 10 Feb 2019 18:31:11 +0100 Subject: gnu: qjson: Don't use unstable tarball. * gnu/packages/web.scm (qjson)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/web.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 6578ce5137..84949ab0f9 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -620,17 +620,17 @@ project) (name "qjson") (version "0.9.0") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/flavio/qjson/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/flavio/qjson.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "1m0h4rajj99hv9w4i381a8x81lxiv167lxk10ncvphpkfxs624p8")))) + "1f4wnxzx0qdmxzc7hqk28m0sva7z9p9xmxm6aifvjlp0ha6pmfxs")))) (build-system cmake-build-system) (arguments - ;; The tests require a X server + ;; The tests require a running X server. `(#:configure-flags '("-DQJSON_BUILD_TESTS=ON" "-DCMAKE_CXX_FLAGS=-std=gnu++11 -fPIC") #:phases -- cgit v1.2.3 From 3e3414efd45d95bbc6320fed75057cb2c82cc3af Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 10 Feb 2019 18:58:23 +0100 Subject: gnu: rapidjson: Don't use unstable tarball. * gnu/packages/web.scm (rapidjson)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/web.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 84949ab0f9..7629353b72 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -747,14 +747,14 @@ current version of any major web browser.") (name "rapidjson") (version "1.1.0") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/miloyip/rapidjson/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/miloyip/rapidjson.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "13nrpvw8f1wx0ga7svbzld7pgrv8l172nangpipnj7jaf0lysz5z")) + "1jixgb8w97l9gdh3inihz7avz7i770gy2j2irvvlyrq3wi41f5ab")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 2772debc747387744287eed9199fcdbd0345f895 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 10 Feb 2019 19:37:42 +0100 Subject: gnu: libyajl: Don't use unstable tarball. * gnu/packages/web.scm (libyajl)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/web.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 7629353b72..c591ea058a 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -786,13 +786,14 @@ style API.") (name "libyajl") (version "2.1.0") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/lloyd/yajl/" - "archive/" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/lloyd/yajl.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "0nmcqpaiq4pv7dymyg3n3jsd57yhp5npxl26a1hzw3m3lmj37drz")))) + "00yj06drb6izcxfxfqlhimlrb089kka0w0x8k27pyzyiq7qzcvml")))) (build-system cmake-build-system) (arguments '(#:phases -- cgit v1.2.3 From 34920d2adf3b55179b959401f76f7fe093b60377 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 10 Feb 2019 21:36:23 +0100 Subject: gnu: websockify: Don't use unstable tarball. * gnu/packages/web.scm (websockify)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/web.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index c591ea058a..5f95fa3a23 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -993,13 +993,14 @@ of people.") (name "websockify") (version "0.8.0") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/novnc/websockify/archive/v" - version "/archive.tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/novnc/websockify.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "1kjq6gibsvbb6zx5gi8hgh7110x62pbwcqkwapf3k7s27w5y907h")))) + "0pcic8qs0gdwrfjgfaf893jyddaw97wcjm2mmvwn0xyhmy8mbmw1")))) (build-system python-build-system) (arguments `(#:tests? #f)) ; FIXME: 2 out of 6 tests fail with "ImportError: No module -- cgit v1.2.3 From 57e3f06bbdbd3aeeb3d663d65ca9f4be2d47cd3c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 10 Feb 2019 21:42:37 +0100 Subject: gnu: multipath-tools: Update to 0.7.9. * gnu/packages/linux.scm (multipath-tools): Update to 0.7.9. --- gnu/packages/linux.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index d7c242015e..c4080f9285 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer ;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner ;;; Copyright © 2016 Christopher Allan Webber -;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice +;;; Copyright © 2016, 2017, 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2016, 2017 Alex Kost ;;; Copyright © 2016 Raymond Nicholson ;;; Copyright © 2016 Mathieu Lirzin @@ -3031,7 +3031,7 @@ arrays when needed.") (define-public multipath-tools (package (name "multipath-tools") - (version "0.7.7") + (version "0.7.9") (source (origin (method url-fetch) (uri (string-append "https://git.opensvc.com/?p=multipath-tools/" @@ -3039,7 +3039,7 @@ arrays when needed.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1lirhjjv37jnf42r1ylrhi8kbzx9j9xnyfzvxpp6bzcp0fawigig")) + "1jhi6bhl4ih75rfmyyjxd35ghgch5ls1gw40cjxwy9d6bd41z6q1")) (modules '((guix build utils))) (snippet '(begin @@ -3077,7 +3077,7 @@ arrays when needed.") (("/usr/include/libudev.h") (string-append udev "/include/libudev.h"))) #t))) - (delete 'configure)))) + (delete 'configure)))) ; no configure script (native-inputs `(("perl" ,perl) ("pkg-config" ,pkg-config) @@ -3102,7 +3102,7 @@ Linux Device Mapper multipathing driver: @code{dm} multipath devices. @item @command{kpartx} - Create device maps from partition tables. @end enumerate") - (license (list license:gpl2+ ; Main distribution. + (license (list license:gpl2+ ; main distribution license:lgpl2.0+)))) ; libmpathcmd/mpath_cmd.h (define-public libaio -- cgit v1.2.3 From a661af5c9a48cf10e236a27bd69b776c462e525b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 10 Feb 2019 21:50:27 +0100 Subject: gnu: maven-resolver-api: Don't use unstable tarball. * gnu/packages/maven.scm (maven-resolver-api)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/maven.scm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index 5379eb9166..2d7d54dd9d 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Julien Lepiller +;;; Copyright © 2019 Tobias Geerinckx-Rite ;;; ;;; This file is part of GNU Guix. ;;; @@ -20,6 +21,7 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix git-download) #:use-module (guix utils) #:use-module (guix build-system ant) #:use-module (gnu packages) @@ -79,12 +81,14 @@ provides the Maven plugin generating the component metadata."))) (name "maven-resolver-api") (version "1.3.1") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/apache/maven-resolver/" - "archive/maven-resolver-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/apache/maven-resolver.git") + (commit (string-append "maven-resolver-" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "0gfkf8g5zbjh6ciq3dnby9m5irhrbyc7d2jzic9l8xx6hl61q6mm")))) + "1x1gll8nkfl6zgnab78fxxvvhg42b2grxgdh1wp2h4qxsjkxg93d")))) (build-system ant-build-system) (arguments `(#:jar-name "maven-resolver-api.jar" -- cgit v1.2.3 From d4c95a237ce4af1fc0278f8b2af2ebfb07e86275 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 11 Feb 2019 19:44:30 +0100 Subject: gnu: parallel: Update to 20190122. * gnu/packages/parallel.scm (parallel): Update to 20190122. --- gnu/packages/parallel.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm index 25d3c0737c..c024c5ceae 100644 --- a/gnu/packages/parallel.scm +++ b/gnu/packages/parallel.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2016 Ricardo Wurmus ;;; Copyright © 2016 Ben Woodcroft ;;; Copyright © 2017, 2018 Rutger Helling -;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 Clément Lassieur ;;; ;;; This file is part of GNU Guix. @@ -48,7 +48,7 @@ (define-public parallel (package (name "parallel") - (version "20181222") + (version "20190122") (source (origin (method url-fetch) @@ -56,7 +56,7 @@ version ".tar.bz2")) (sha256 (base32 - "0sd39nzgff3rpyzfwkffb5yxbdm5r6amrkslbgpjlrcrymy9z305")))) + "030rjhis8s47gkm05k4vc9p886cxvadpgzs8rqmgzvlc38h5ywxf")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From c86b5f1b9bdfdd478ba15804f9343feb8d9c019b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 11 Feb 2019 22:40:10 +0200 Subject: gnu: glibc@2.27: fix CVE-2018-11236, CVE-2018-11237. * gnu/packages/base.scm (glibc@2.27)[sources]: Add patches. [properties]: New field, mark CVE-2017-18269 fixed. * gnu/packages/patches/glibc-CVE-2018-11236.patch, gnu/packages/patches/glibc-CVE-2018-11237.patch: New files. * gnu/local.mk (dist_patch_DATA): Register them. --- gnu/packages/base.scm | 5 +- gnu/packages/patches/glibc-CVE-2018-11236.patch | 149 ++++++++++++++++++++++++ gnu/packages/patches/glibc-CVE-2018-11237.patch | 55 +++++++++ 3 files changed, 208 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/glibc-CVE-2018-11236.patch create mode 100644 gnu/packages/patches/glibc-CVE-2018-11237.patch (limited to 'gnu/packages') diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 67fab7c114..db9cca6faf 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -892,7 +892,10 @@ with the Linux kernel.") "glibc-hidden-visibility-ldconfig.patch" "glibc-versioned-locpath.patch" "glibc-allow-kernel-2.6.32.patch" - "glibc-reinstate-prlimit64-fallback.patch")))))) + "glibc-reinstate-prlimit64-fallback.patch" + "glibc-CVE-2018-11236.patch" + "glibc-CVE-2018-11237.patch")))) + (properties `((lint-hidden-cve . ("CVE-2017-18269")))))) ; glibc-2.27-git-fixes (define-public glibc-2.26 (package diff --git a/gnu/packages/patches/glibc-CVE-2018-11236.patch b/gnu/packages/patches/glibc-CVE-2018-11236.patch new file mode 100644 index 0000000000..4f8a72943c --- /dev/null +++ b/gnu/packages/patches/glibc-CVE-2018-11236.patch @@ -0,0 +1,149 @@ +https://sourceware.org/git/gitweb.cgi?p=glibc.git;a=patch;h=5460617d1567657621107d895ee2dd83bc1f88f2 +with ChangeLog removed + +From 5460617d1567657621107d895ee2dd83bc1f88f2 Mon Sep 17 00:00:00 2001 +From: Paul Pluzhnikov +Date: Tue, 8 May 2018 18:12:41 -0700 +Subject: [PATCH] Fix BZ 22786: integer addition overflow may cause stack + buffer overflow when realpath() input length is close to SSIZE_MAX. + +2018-05-09 Paul Pluzhnikov + + [BZ #22786] + * stdlib/canonicalize.c (__realpath): Fix overflow in path length + computation. + * stdlib/Makefile (test-bz22786): New test. + * stdlib/test-bz22786.c: New test. +--- + ChangeLog | 8 +++++ + stdlib/Makefile | 2 +- + stdlib/canonicalize.c | 2 +- + stdlib/test-bz22786.c | 90 +++++++++++++++++++++++++++++++++++++++++++++++++++ + 4 files changed, 100 insertions(+), 2 deletions(-) + create mode 100644 stdlib/test-bz22786.c + +diff --git a/stdlib/Makefile b/stdlib/Makefile +index af1643c..1ddb1f9 100644 +--- a/stdlib/Makefile ++++ b/stdlib/Makefile +@@ -84,7 +84,7 @@ tests := tst-strtol tst-strtod testmb testrand testsort testdiv \ + tst-cxa_atexit tst-on_exit test-atexit-race \ + test-at_quick_exit-race test-cxa_atexit-race \ + test-on_exit-race test-dlclose-exit-race \ +- tst-makecontext-align ++ tst-makecontext-align test-bz22786 + + tests-internal := tst-strtod1i tst-strtod3 tst-strtod4 tst-strtod5i \ + tst-tls-atexit tst-tls-atexit-nodelete +diff --git a/stdlib/canonicalize.c b/stdlib/canonicalize.c +index 4135f3f..390fb43 100644 +--- a/stdlib/canonicalize.c ++++ b/stdlib/canonicalize.c +@@ -181,7 +181,7 @@ __realpath (const char *name, char *resolved) + extra_buf = __alloca (path_max); + + len = strlen (end); +- if ((long int) (n + len) >= path_max) ++ if (path_max - n <= len) + { + __set_errno (ENAMETOOLONG); + goto error; +diff --git a/stdlib/test-bz22786.c b/stdlib/test-bz22786.c +new file mode 100644 +index 0000000..e7837f9 +--- /dev/null ++++ b/stdlib/test-bz22786.c +@@ -0,0 +1,90 @@ ++/* Bug 22786: test for buffer overflow in realpath. ++ Copyright (C) 2018 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++/* This file must be run from within a directory called "stdlib". */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++static int ++do_test (void) ++{ ++ const char dir[] = "bz22786"; ++ const char lnk[] = "bz22786/symlink"; ++ ++ rmdir (dir); ++ if (mkdir (dir, 0755) != 0 && errno != EEXIST) ++ { ++ printf ("mkdir %s: %m\n", dir); ++ return EXIT_FAILURE; ++ } ++ if (symlink (".", lnk) != 0 && errno != EEXIST) ++ { ++ printf ("symlink (%s, %s): %m\n", dir, lnk); ++ return EXIT_FAILURE; ++ } ++ ++ const size_t path_len = (size_t) INT_MAX + 1; ++ ++ DIAG_PUSH_NEEDS_COMMENT; ++#if __GNUC_PREREQ (7, 0) ++ /* GCC 7 warns about too-large allocations; here we need such ++ allocation to succeed for the test to work. */ ++ DIAG_IGNORE_NEEDS_COMMENT (7, "-Walloc-size-larger-than="); ++#endif ++ char *path = malloc (path_len); ++ DIAG_POP_NEEDS_COMMENT; ++ ++ if (path == NULL) ++ { ++ printf ("malloc (%zu): %m\n", path_len); ++ return EXIT_UNSUPPORTED; ++ } ++ ++ /* Construct very long path = "bz22786/symlink/aaaa....." */ ++ char *p = mempcpy (path, lnk, sizeof (lnk) - 1); ++ *(p++) = '/'; ++ memset (p, 'a', path_len - (path - p) - 2); ++ p[path_len - (path - p) - 1] = '\0'; ++ ++ /* This call crashes before the fix for bz22786 on 32-bit platforms. */ ++ p = realpath (path, NULL); ++ ++ if (p != NULL || errno != ENAMETOOLONG) ++ { ++ printf ("realpath: %s (%m)", p); ++ return EXIT_FAILURE; ++ } ++ ++ /* Cleanup. */ ++ unlink (lnk); ++ rmdir (dir); ++ ++ return 0; ++} ++ ++#define TEST_FUNCTION do_test ++#include +-- +2.9.3 + diff --git a/gnu/packages/patches/glibc-CVE-2018-11237.patch b/gnu/packages/patches/glibc-CVE-2018-11237.patch new file mode 100644 index 0000000000..8a7c604ecd --- /dev/null +++ b/gnu/packages/patches/glibc-CVE-2018-11237.patch @@ -0,0 +1,55 @@ +https://sourceware.org/git/gitweb.cgi?p=glibc.git;a=patch;h=9aaaab7c6e4176e61c59b0a63c6ba906d875dc0e +with the ChangeLog removed + +From 9aaaab7c6e4176e61c59b0a63c6ba906d875dc0e Mon Sep 17 00:00:00 2001 +From: Andreas Schwab +Date: Tue, 22 May 2018 10:37:59 +0200 +Subject: [PATCH] Don't write beyond destination in + __mempcpy_avx512_no_vzeroupper (bug 23196) + +When compiled as mempcpy, the return value is the end of the destination +buffer, thus it cannot be used to refer to the start of it. +--- + ChangeLog | 9 +++++++++ + string/test-mempcpy.c | 1 + + sysdeps/x86_64/multiarch/memmove-avx512-no-vzeroupper.S | 5 +++-- + 3 files changed, 13 insertions(+), 2 deletions(-) + +diff --git a/string/test-mempcpy.c b/string/test-mempcpy.c +index c08fba8..d98ecdd 100644 +--- a/string/test-mempcpy.c ++++ b/string/test-mempcpy.c +@@ -18,6 +18,7 @@ + . */ + + #define MEMCPY_RESULT(dst, len) (dst) + (len) ++#define MIN_PAGE_SIZE 131072 + #define TEST_MAIN + #define TEST_NAME "mempcpy" + #include "test-string.h" +diff --git a/sysdeps/x86_64/multiarch/memmove-avx512-no-vzeroupper.S b/sysdeps/x86_64/multiarch/memmove-avx512-no-vzeroupper.S +index 23c0f7a..effc3ac 100644 +--- a/sysdeps/x86_64/multiarch/memmove-avx512-no-vzeroupper.S ++++ b/sysdeps/x86_64/multiarch/memmove-avx512-no-vzeroupper.S +@@ -336,6 +336,7 @@ L(preloop_large): + vmovups (%rsi), %zmm4 + vmovups 0x40(%rsi), %zmm5 + ++ mov %rdi, %r11 + /* Align destination for access with non-temporal stores in the loop. */ + mov %rdi, %r8 + and $-0x80, %rdi +@@ -366,8 +367,8 @@ L(gobble_256bytes_nt_loop): + cmp $256, %rdx + ja L(gobble_256bytes_nt_loop) + sfence +- vmovups %zmm4, (%rax) +- vmovups %zmm5, 0x40(%rax) ++ vmovups %zmm4, (%r11) ++ vmovups %zmm5, 0x40(%r11) + jmp L(check) + + L(preloop_large_bkw): +-- +2.9.3 + -- cgit v1.2.3 From ab61ce3730a4ce9b6c5386bb8db2612180551252 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 7 Feb 2019 15:29:11 +0100 Subject: gnu: python-reportlab: Update to 3.5.13. * gnu/packages/pdf.scm (python-reportlab): Update to 3.5.13. [inputs]: Add freetype. --- gnu/packages/pdf.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 33bd0062ff..8e69ab5c83 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -748,18 +748,20 @@ using a stylus.") (define-public python-reportlab (package (name "python-reportlab") - (version "3.4.0") + (version "3.5.13") (source (origin (method url-fetch) (uri (pypi-uri "reportlab" version)) (sha256 (base32 - "0hy304pzsz9lblmk7mrbk2682bi911lxgvzx2kcfpmfzb5gg7sjv")))) + "1wxgcj46rm83qz97i8ygvd59bks60kr6vvnz12ygw640z58ff5k1")))) (build-system python-build-system) (arguments '(;; FIXME: There is one test failure, but it does not cause the ;; build to fail. No time to investigate right now. #:test-target "tests")) + (inputs + `(("freetype" ,freetype))) (propagated-inputs `(("python-pillow" ,python-pillow))) (home-page "https://www.reportlab.com") -- cgit v1.2.3 From c18dccffa20bf09826758210d457d1df477f959c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 12 Feb 2019 13:07:15 +0100 Subject: gnu: Add r-dnacopy. * gnu/packages/bioconductor.scm (r-dnacopy): New variable. --- gnu/packages/bioconductor.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 20aabb0be4..9057158cde 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -27,6 +27,7 @@ #:use-module (gnu packages bioinformatics) #:use-module (gnu packages cran) #:use-module (gnu packages compression) + #:use-module (gnu packages gcc) #:use-module (gnu packages graph) #:use-module (gnu packages maths) #:use-module (gnu packages statistics) @@ -1176,3 +1177,25 @@ Viewer (SAV) files, access data, and generate QC plots.") "This package provides a quality control pipeline for ChIP-exo/nexus sequencing data.") (license license:gpl2+))) + +(define-public r-dnacopy + (package + (name "r-dnacopy") + (version "1.56.0") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "DNAcopy" version)) + (sha256 + (base32 + "04cqdqxhva66xwh1s2vffi56b9fcrqd4slcrvqasj5lp2rkjli82")))) + (properties `((upstream-name . "DNAcopy"))) + (build-system r-build-system) + (native-inputs `(("gfortran" ,gfortran))) + (home-page "https://bioconductor.org/packages/DNAcopy") + (synopsis "DNA copy number data analysis") + (description + "This package implements the @dfn{circular binary segmentation} (CBS) +algorithm to segment DNA copy number data and identify genomic regions with +abnormal copy number.") + (license license:gpl2+))) -- cgit v1.2.3 From 385d7546e1e8fa3488cc2da07ad5d00a33e8d6c8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 12 Feb 2019 13:10:26 +0100 Subject: gnu: Add cnvkit. * gnu/packages/bioinformatics.scm (cnvkit): New variable. --- gnu/packages/bioinformatics.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 02cafb2358..279d52ae98 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -14441,3 +14441,39 @@ Nanopolish can calculate an improved consensus sequence for a draft genome assembly, detect base modifications, call SNPs (Single nucleotide polymorphisms) and indels with respect to a reference genome and more.") (license license:expat)))) + +(define-public cnvkit + (package + (name "cnvkit") + (version "0.9.5") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/etal/cnvkit.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0g2f78k68yglmj4fsfmgs8idqv3di9aj53fg0ld0hqljg8chhh82")))) + (build-system python-build-system) + (propagated-inputs + `(("python-biopython" ,python-biopython) + ("python-future" ,python-future) + ("python-matplotlib" ,python-matplotlib) + ("python-numpy" ,python-numpy) + ("python-reportlab" ,python-reportlab) + ("python-pandas" ,python-pandas) + ("python-pysam" ,python-pysam) + ("python-pyfaidx" ,python-pyfaidx) + ("python-scipy" ,python-scipy) + ;; R packages + ("r-dnacopy" ,r-dnacopy))) + (home-page "https://cnvkit.readthedocs.org/") + (synopsis "Copy number variant detection from targeted DNA sequencing") + (description + "CNVkit is a Python library and command-line software toolkit to infer +and visualize copy number from high-throughput DNA sequencing data. It is +designed for use with hybrid capture, including both whole-exome and custom +target panels, and short-read sequencing platforms such as Illumina and Ion +Torrent.") + (license license:asl2.0))) -- cgit v1.2.3 From b856a78c949543da2cb829b36cb96e74309e8d35 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 12 Feb 2019 18:08:06 +0200 Subject: gnu: efilinux: Set ARCH variable on some architectures. Even with this patch efilinux does not build for arm*. * gnu/packages/efi.scm (efilinux)[arguments]: On armhf-linux and aarch64-linux set the ARCH variable apropriately. --- gnu/packages/efi.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/efi.scm b/gnu/packages/efi.scm index 43e660743a..49ca740088 100644 --- a/gnu/packages/efi.scm +++ b/gnu/packages/efi.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019 Danny Milosavljevic +;;; Copyright © 2019 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -29,7 +30,8 @@ #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix packages) - #:use-module (guix utils)) + #:use-module (guix utils) + #:use-module (ice-9 match)) (define-public gnu-efi (package @@ -195,6 +197,12 @@ and EFI variable management.") (arguments `(#:make-flags (list "CC=gcc" + ,@(match (%current-system) + ("aarch64-linux" + '("ARCH=aarch64")) + ("armhf-linux" + '("ARCH=arm")) + (_ '())) (string-append "INCDIR=" (assoc-ref %build-inputs "gnu-efi") "/include") (string-append "LIBDIR=" (assoc-ref %build-inputs "gnu-efi") -- cgit v1.2.3 From 155194d97d5ee2499dff063e674e548b8177daea Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 12 Feb 2019 10:32:03 -0500 Subject: gnu: python-pybedtools: Update to 0.8.0 and fix build. From 40db2b4eae5ca61a3134cdaf7b156ed1ae9f7415 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 10 Feb 2019 23:39:25 -0500 Subject: [PATCH] gnu: python-pybedtools: Update to 0.8.0 and fix build. * gnu/packages/bioinformatics.scm (python-pybedtools): Update to 0.8.0. [phases]{disable-broken-tests}: Do not disable "test_issue_157" and "test_to_dataframe" tests. Disable the "test_getting_example_beds". {remove-cython-generated-files}: Add phase. {generate-cython-extensions}: Add phase. {check}: Move from python2-pybedtools to here. Add a scripts subdirectory of the build directory to the PATH, so that the tests can call them. Invoke pytest rather than nosetests. [modules]: Move from python2-pybedtools to here. [propagated-inputs]: Depend on the current BEDTOOLS rather than version 1.26. [native-inputs]: Replace python-nose by python-pytest and add python-psutil. --- gnu/packages/bioinformatics.scm | 114 +++++++++++++++++++++++----------------- 1 file changed, 67 insertions(+), 47 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 279d52ae98..d6db02188f 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -12,6 +12,7 @@ ;;; Copyright © 2018 Joshua Sierles, Nextjournal ;;; Copyright © 2018 Gábor Boskovits ;;; Copyright © 2018 Mădălin Ionel Patrașcu +;;; Copyright © 2019 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -612,16 +613,22 @@ intended to behave exactly the same as the original BWK awk.") (define-public python-pybedtools (package (name "python-pybedtools") - (version "0.7.10") + (version "0.8.0") (source (origin (method url-fetch) (uri (pypi-uri "pybedtools" version)) (sha256 (base32 - "0l2b2wrnj85azfqgr0zwr60f7j58vlla1hcgxvr9rwikpl8j72ji")))) + "1xl454ijvd4dzfvqgfahad49b49j7qy710fq9xh1rvk42z6x5ssf")))) (build-system python-build-system) (arguments - `(#:phases + `(#:modules ((ice-9 ftw) + (srfi srfi-1) + (srfi srfi-26) + (guix build utils) + (guix build python-build-system)) + ;; See https://github.com/daler/pybedtools/issues/192 + #:phases (modify-phases %standard-phases ;; See https://github.com/daler/pybedtools/issues/261 (add-after 'unpack 'disable-broken-tests @@ -631,21 +638,59 @@ intended to behave exactly the same as the original BWK awk.") (substitute* "pybedtools/test/test_scripts.py" (("def test_venn_mpl") "def _do_not_test_venn_mpl")) - ;; Requires internet access. (substitute* "pybedtools/test/test_helpers.py" + ;; Requires internet access. (("def test_chromsizes") - "def _do_not_test_chromsizes")) - ;; FIXME: these two fail for no good reason. - (substitute* "pybedtools/test/test1.py" - (("def test_issue_157") - "def _do_not_test_issue_157") - (("def test_to_dataframe") - "def _do_not_test_to_dataframe")) - #t))))) - (propagated-inputs - ;; Tests don't pass with Bedtools 2.27.1. - ;; See https://github.com/daler/pybedtools/issues/260 - `(("bedtools" ,bedtools-2.26) + "def _do_not_test_chromsizes") + ;; Broken as a result of the workaround used in the check phase + ;; (see: https://github.com/daler/pybedtools/issues/192). + (("def test_getting_example_beds") + "def _do_not_test_getting_example_beds")) + #t)) + ;; TODO: Remove phase after it's part of PYTHON-BUILD-SYSTEM. + ;; build system. + ;; Force the Cythonization of C++ files to guard against compilation + ;; problems. + (add-after 'unpack 'remove-cython-generated-files + (lambda _ + (let ((cython-sources (map (cut string-drop-right <> 4) + (find-files "." "\\.pyx$"))) + (c/c++-files (find-files "." "\\.(c|cpp|cxx)$"))) + (define (strip-extension filename) + (string-take filename (string-index-right filename #\.))) + (define (cythonized? c/c++-file) + (member (strip-extension c/c++-file) cython-sources)) + (for-each delete-file (filter cythonized? c/c++-files)) + #t))) + (add-after 'remove-cython-generated-files 'generate-cython-extensions + (lambda _ + (invoke "python" "setup.py" "cythonize"))) + (replace 'check + (lambda _ + (let* ((cwd (getcwd)) + (build-root-directory (string-append cwd "/build/")) + (build (string-append + build-root-directory + (find (cut string-prefix? "lib" <>) + (scandir (string-append + build-root-directory))))) + (scripts (string-append + build-root-directory + (find (cut string-prefix? "scripts" <>) + (scandir build-root-directory))))) + (setenv "PYTHONPATH" + (string-append build ":" (getenv "PYTHONPATH"))) + ;; Executable scripts such as 'intron_exon_reads.py' must be + ;; available in the PATH. + (setenv "PATH" + (string-append scripts ":" (getenv "PATH")))) + ;; The tests need to be run from elsewhere... + (mkdir-p "/tmp/test") + (copy-recursively "pybedtools/test" "/tmp/test") + (with-directory-excursion "/tmp/test" + (invoke "pytest"))))))) + (propagated-inputs + `(("bedtools" ,bedtools) ("samtools" ,samtools) ("python-matplotlib" ,python-matplotlib) ("python-pysam" ,python-pysam) @@ -654,9 +699,11 @@ intended to behave exactly the same as the original BWK awk.") `(("python-numpy" ,python-numpy) ("python-pandas" ,python-pandas) ("python-cython" ,python-cython) - ("python-nose" ,python-nose) - ("kentutils" ,kentutils) ; for bedGraphToBigWig - ("python-six" ,python-six))) + ("kentutils" ,kentutils) ; for bedGraphToBigWig + ("python-six" ,python-six) + ;; For the test suite. + ("python-pytest" ,python-pytest) + ("python-psutil" ,python-psutil))) (home-page "https://pythonhosted.org/pybedtools/") (synopsis "Python wrapper for BEDtools programs") (description @@ -667,34 +714,7 @@ Python.") (license license:gpl2+))) (define-public python2-pybedtools - (let ((pkg (package-with-python2 python-pybedtools))) - (package (inherit pkg) - (arguments - `(#:modules ((ice-9 ftw) - (srfi srfi-1) - (srfi srfi-26) - (guix build utils) - (guix build python-build-system)) - ;; See https://github.com/daler/pybedtools/issues/192 - ,@(substitute-keyword-arguments (package-arguments pkg) - ((#:phases phases) - `(modify-phases ,phases - (replace 'check - (lambda _ - (let ((cwd (getcwd))) - (setenv "PYTHONPATH" - (string-append cwd "/build/" - (find (cut string-prefix? "lib" <>) - (scandir (string-append cwd "/build"))) - ":" (getenv "PYTHONPATH")))) - ;; The tests need to be run from elsewhere... - (mkdir-p "/tmp/test") - (copy-recursively "pybedtools/test" "/tmp/test") - (with-directory-excursion "/tmp/test" - (invoke "nosetests" - ;; This test fails for unknown reasons - "--exclude=.*test_getting_example_beds")) - #t)))))))))) + (package-with-python2 python-pybedtools)) (define-public python-biom-format (package -- cgit v1.2.3 From 51a8fc8b421a39696f7bfa49037a309d34faa3eb Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 12 Feb 2019 13:07:39 +0100 Subject: gnu: feh: Update to 3.1.2. * gnu/packages/image-viewers.scm (feh): Update to 3.1.2. --- gnu/packages/image-viewers.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index 895802cc94..417989050c 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2017 Nils Gillmann ;;; Copyright © 2017 Mathieu Othacehe ;;; Copyright © 2017 nee -;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018, 2019 Ricardo Wurmus ;;; ;;; This file is part of GNU Guix. @@ -62,7 +62,7 @@ (define-public feh (package (name "feh") - (version "3.1.1") + (version "3.1.2") (home-page "https://feh.finalrewind.org/") (source (origin (method url-fetch) @@ -70,7 +70,7 @@ name "-" version ".tar.bz2")) (sha256 (base32 - "1sy8z6rv5sy1bhk3846hgfdy96wdi874yr2fnxfprks46qp29l31")))) + "0qjhlrgr606gc9h96w9piyd13mx63jqfbxxnan41nrh76m8d0dka")))) (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases (delete 'configure)) -- cgit v1.2.3 From e9bdef5fb4578341a938c69cfd7f6b22a0967869 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 12 Feb 2019 13:20:35 +0100 Subject: gnu: os-prober: Update to 1.77. * gnu/packages/bootloaders.scm (os-prober): Update to 1.77. --- gnu/packages/bootloaders.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index a566001b07..b0617f452a 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2016, 2017 Danny Milosavljevic ;;; Copyright © 2016, 2017 David Craven ;;; Copyright © 2017, 2018 Efraim Flashner -;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2019 nee ;;; ;;; This file is part of GNU Guix. @@ -773,7 +773,7 @@ tools, and more.") (define-public os-prober (package (name "os-prober") - (version "1.76") + (version "1.77") (source (origin (method url-fetch) @@ -781,15 +781,15 @@ tools, and more.") version ".tar.xz")) (sha256 (base32 - "1vb45i76bqivlghrq7m3n07qfmmq4wxrkplqx8gywj011rhq19fk")))) + "0pvhrw4h05n21zw7ig3a3bi8aqdh6zxs0x1znz4g7vhspsps93ld")))) (build-system gnu-build-system) (arguments `(#:modules ((guix build gnu-build-system) (guix build utils) - (ice-9 regex) ; for string-match - (srfi srfi-26)) ; for cut + (ice-9 regex) ; for string-match + (srfi srfi-26)) ; for cut #:make-flags (list "CC=gcc") - #:tests? #f ; no tests + #:tests? #f ; no tests #:phases (modify-phases %standard-phases (replace 'configure -- cgit v1.2.3 From 245e7a68e7dca03661bef06f142ce5d7e247daf8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 12 Feb 2019 13:28:21 +0100 Subject: gnu: kyotocabinet: Update to 1.2.77. * gnu/packages/databases.scm (kyotocabinet): Update to 1.2.77. --- 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 33fb530509..3b1d07c499 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, 2018 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2017, 2018 Alex Vong ;;; Copyright © 2017, 2018 Ben Woodcroft ;;; Copyright © 2017 Rutger Helling @@ -1490,14 +1490,14 @@ sets, bitmaps and hyperloglogs.") (define-public kyotocabinet (package (name "kyotocabinet") - (version "1.2.76") + (version "1.2.77") (source (origin (method url-fetch) (uri (string-append "http://fallabs.com/kyotocabinet/pkg/" name "-" version ".tar.gz")) (sha256 (base32 - "0g6js20x7vnpq4p8ghbw3mh9wpqksya9vwhzdx6dnlf354zjsal1")))) + "1rlx4307adbzd842b4npq6cwlw8h010ingxaz3qz1ijc70lr72an")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From da93d4241327b127a076f0b50be80653ba9b8948 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 12 Feb 2019 13:48:23 +0100 Subject: gnu: perl-dbi: Update to 1.642. * gnu/packages/databases.scm (perl-dbi): Update to 1.642. --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 3b1d07c499..4cd111e061 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1069,7 +1069,7 @@ extremely small.") (define-public perl-dbi (package (name "perl-dbi") - (version "1.641") + (version "1.642") (source (origin (method url-fetch) (uri (string-append @@ -1077,7 +1077,7 @@ extremely small.") version ".tar.gz")) (sha256 (base32 - "1hf2x29bnqf2x1v4bdhji802z7n2mbg7h1amv8gdkqyhrlrfa2am")))) + "0pbzqazrx7pnw4nbyaf27in4b6yddkirbd2ws7mnqa2n7812a81z")))) (build-system perl-build-system) (synopsis "Database independent interface for Perl") (description "This package provides an database interface for Perl.") -- cgit v1.2.3 From f6145bb652a890478f5b756f7350ba401dbfddff Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 12 Feb 2019 13:58:44 +0100 Subject: gnu: lziprecover: Don't use NAME in source URI. * gnu/packages/compression.scm (lziprecover)[source]: Hard-code NAME. --- gnu/packages/compression.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index b6f07dfa9a..734ea3288f 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -10,7 +10,7 @@ ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner ;;; Copyright © 2016 Ben Woodcroft ;;; Copyright © 2016 Danny Milosavljevic -;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice +;;; Copyright © 2016, 2017, 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2016 David Craven ;;; Copyright © 2016, 2019 Kei Kebreau ;;; Copyright © 2016, 2018 Marius Bakke @@ -543,8 +543,8 @@ archiving. Lzip is a clean implementation of the LZMA algorithm.") (version "1.20") (source (origin (method url-fetch) - (uri (string-append "mirror://savannah/lzip/" name "/" - name "-" version ".tar.gz")) + (uri (string-append "mirror://savannah/lzip/lziprecover/" + "lziprecover-" version ".tar.gz")) (sha256 (base32 "0fpnmdxayvd1ff0rk9606dvr431ji6b1v71km4ww244rih1rmmzz")))) -- cgit v1.2.3 From b099b4a75a2b96dafd31745c3b942a5431f02497 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 12 Feb 2019 13:59:02 +0100 Subject: gnu: lziprecover: Update to 1.21. * gnu/packages/compression.scm (lziprecover): Update to 1.21. --- 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 734ea3288f..c841122db5 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -540,14 +540,14 @@ archiving. Lzip is a clean implementation of the LZMA algorithm.") (define-public lziprecover (package (name "lziprecover") - (version "1.20") + (version "1.21") (source (origin (method url-fetch) (uri (string-append "mirror://savannah/lzip/lziprecover/" "lziprecover-" version ".tar.gz")) (sha256 (base32 - "0fpnmdxayvd1ff0rk9606dvr431ji6b1v71km4ww244rih1rmmzz")))) + "094w2z8fz41yaq0gkyr61cl7pb1d7kchpl5dka7rvm3qvbb7ncd2")))) (build-system gnu-build-system) (home-page "https://www.nongnu.org/lzip/lziprecover.html") (synopsis "Recover and decompress data from damaged lzip files") -- cgit v1.2.3 From 894669a787b47e00722f6915d01652414e66188b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 12 Feb 2019 14:05:13 +0100 Subject: gnu: plzip: Don't use NAME in source URI. * gnu/packages/compression.scm (plzip)[source]: Hard-code NAME. --- 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 c841122db5..f2676e8673 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1691,8 +1691,8 @@ corrupted input.") (source (origin (method url-fetch) - (uri (string-append "mirror://savannah/lzip/" - name "/" name "-" version ".tar.gz")) + (uri (string-append "mirror://savannah/lzip/plzip/" + "plzip-" version ".tar.gz")) (sha256 (base32 "1dzjp9r7krwpsn224bhcqbzd5aj5b4556sdi9yzl2bzbk3fjrqlm")))) (build-system gnu-build-system) -- cgit v1.2.3 From ff0e1eed327e1266b3fd0942d4073e6351ac9f02 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 12 Feb 2019 14:05:25 +0100 Subject: gnu: plzip: Update to 1.8. * gnu/packages/compression.scm (plzip): Update to 1.8. --- 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 f2676e8673..aa95944538 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1687,14 +1687,14 @@ corrupted input.") (define-public plzip (package (name "plzip") - (version "1.7") + (version "1.8") (source (origin (method url-fetch) (uri (string-append "mirror://savannah/lzip/plzip/" "plzip-" version ".tar.gz")) (sha256 - (base32 "1dzjp9r7krwpsn224bhcqbzd5aj5b4556sdi9yzl2bzbk3fjrqlm")))) + (base32 "04indil809qgfmz776imb3dnhkysh7zk28jcv3mw0ahl2lyaxbzd")))) (build-system gnu-build-system) (inputs `(("lzlib" ,lzlib))) -- cgit v1.2.3 From a28cd4770295e945787a9891eb0411bb6225aaa4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 12 Feb 2019 14:13:12 +0100 Subject: gnu: lunzip: Don't use NAME in source URI. * gnu/packages/compression.scm (lunzip)[source]: Hard-code NAME. --- 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 aa95944538..0544cf2c64 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1610,8 +1610,8 @@ of archives.") (source (origin (method url-fetch) - (uri (string-append "mirror://savannah/lzip/" - name "/" name "-" version ".tar.gz")) + (uri (string-append "mirror://savannah/lzip/lunzip/" + "lunzip-" version ".tar.gz")) (sha256 (base32 "1iw59br6nsxs7l1p875h8w3vxwr04xfhg5zyal64crvamhxkj5kl")))) (build-system gnu-build-system) -- cgit v1.2.3 From 9f4f085f9b1a87cb0e233a31d66e90d53c2b109b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 12 Feb 2019 14:13:21 +0100 Subject: gnu: lunzip: Update to 1.11. * gnu/packages/compression.scm (lunzip): Update to 1.11. --- 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 0544cf2c64..3eec91f895 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1606,14 +1606,14 @@ of archives.") (define-public lunzip (package (name "lunzip") - (version "1.10") + (version "1.11") (source (origin (method url-fetch) (uri (string-append "mirror://savannah/lzip/lunzip/" "lunzip-" version ".tar.gz")) (sha256 - (base32 "1iw59br6nsxs7l1p875h8w3vxwr04xfhg5zyal64crvamhxkj5kl")))) + (base32 "19zq3gmlbia2krq4k4zs1j0xjdv7nsdzqvfb0pyca5n53h2mzb91")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From 39e5d3b68d57ec752bd79507119adc3f7fe6ca2a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 12 Feb 2019 14:23:07 +0100 Subject: gnu: clzip: Don't use NAME in source URI. * gnu/packages/compression.scm (clzip)[source]: Hard-code NAME. --- 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 3eec91f895..8112784b80 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1637,8 +1637,8 @@ Lunzip is intended to be fully compatible with the regular lzip package.") (source (origin (method url-fetch) - (uri (string-append "mirror://savannah/lzip/" - name "/" name "-" version ".tar.gz")) + (uri (string-append "mirror://savannah/lzip/clzip/" + "clzip-" version ".tar.gz")) (sha256 (base32 "03xcmhl3dya4jrwmsqh09ikimpb36fr3vkh2bwfzz1sbcns0cdg3")))) (build-system gnu-build-system) -- cgit v1.2.3 From 11b1c71d2e30fe71cba5e7bf99a07dd6603fee48 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 12 Feb 2019 14:23:19 +0100 Subject: gnu: clzip: Update to 1.11. * gnu/packages/compression.scm (clzip): Update to 1.11. --- 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 8112784b80..2a403c9545 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1633,14 +1633,14 @@ Lunzip is intended to be fully compatible with the regular lzip package.") (define-public clzip (package (name "clzip") - (version "1.10") + (version "1.11") (source (origin (method url-fetch) (uri (string-append "mirror://savannah/lzip/clzip/" "clzip-" version ".tar.gz")) (sha256 - (base32 "03xcmhl3dya4jrwmsqh09ikimpb36fr3vkh2bwfzz1sbcns0cdg3")))) + (base32 "1h14dmc9fi10gcdpdpbgq1bwvcxvivppilj64pf720x8mw915mfr")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From 76b2f08468cf513d364dd614d3d817a63d8dc1a6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 12 Feb 2019 14:30:30 +0100 Subject: gnu: lzlib: Don't use NAME in source URI. * gnu/packages/compression.scm (lzlib)[source]: Hard-code NAME. --- 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 2a403c9545..af5c311982 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1663,8 +1663,8 @@ Clzip is intended to be fully compatible with the regular lzip package.") (source (origin (method url-fetch) - (uri (string-append "mirror://savannah/lzip/" - name "/" name "-" version ".tar.gz")) + (uri (string-append "mirror://savannah/lzip/lzlib/" + "lzlib-" version ".tar.gz")) (sha256 (base32 "0hqhnj2lzqacdbmmnpy91lsm1rd9zlngs1q6s9pyahsv1a0bfshx")))) (build-system gnu-build-system) -- cgit v1.2.3 From 2990422377f4ae09d000d68d22699e3ac65a57af Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 12 Feb 2019 14:30:37 +0100 Subject: gnu: lzlib: Update to 1.11. * gnu/packages/compression.scm (lzlib): Update to 1.11. --- 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 af5c311982..e5b5d9f3ce 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1659,14 +1659,14 @@ Clzip is intended to be fully compatible with the regular lzip package.") (define-public lzlib (package (name "lzlib") - (version "1.10") + (version "1.11") (source (origin (method url-fetch) (uri (string-append "mirror://savannah/lzip/lzlib/" "lzlib-" version ".tar.gz")) (sha256 - (base32 "0hqhnj2lzqacdbmmnpy91lsm1rd9zlngs1q6s9pyahsv1a0bfshx")))) + (base32 "0djdj4sg33rzi4k84cygvnp09bfsv6i8wy2k7i67rayib63myp3c")))) (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 571a01d8faded5098916d8d35544b323846d4080 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 12 Feb 2019 14:45:25 +0100 Subject: gnu: lzlib: Remove minilzip comment. It lacks lzip's dependency on libstdc++.so and libm.so and may have its uses. * gnu/packages/compression.scm (lzlib): Don't judge. --- gnu/packages/compression.scm | 2 -- 1 file changed, 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index e5b5d9f3ce..0c57f1c27b 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1668,8 +1668,6 @@ Clzip is intended to be fully compatible with the regular lzip package.") (sha256 (base32 "0djdj4sg33rzi4k84cygvnp09bfsv6i8wy2k7i67rayib63myp3c")))) (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. (arguments `(#:configure-flags (list "CC=gcc" -- cgit v1.2.3 From ce4593ec4c5ee14efad5eca84694c0f796403446 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 11 Feb 2019 15:07:29 -0500 Subject: gnu: runc: Update to 1.0.0-rc6 [fixes CVE-2019-5736]. * gnu/packages/virtualization.scm (runc): Update to 1.0.0-rc6. [source]: Use a descriptive file-name. Add 'runc-CVE-2019-5736.patch' * gnu/packages/patches/runc-CVE-2019-5736.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/packages/patches/runc-CVE-2019-5736.patch | 343 ++++++++++++++++++++++++++ gnu/packages/virtualization.scm | 6 +- 2 files changed, 347 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/runc-CVE-2019-5736.patch (limited to 'gnu/packages') diff --git a/gnu/packages/patches/runc-CVE-2019-5736.patch b/gnu/packages/patches/runc-CVE-2019-5736.patch new file mode 100644 index 0000000000..f629fcbfb4 --- /dev/null +++ b/gnu/packages/patches/runc-CVE-2019-5736.patch @@ -0,0 +1,343 @@ +Fix CVE-2019-5736: + +https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-5736 +https://seclists.org/oss-sec/2019/q1/119 + +Patch copied from upstream source repository: + +https://github.com/opencontainers/runc/commit/0a8e4117e7f715d5fbeef398405813ce8e88558b + +From 0a8e4117e7f715d5fbeef398405813ce8e88558b Mon Sep 17 00:00:00 2001 +From: Aleksa Sarai +Date: Wed, 9 Jan 2019 13:40:01 +1100 +Subject: [PATCH] nsenter: clone /proc/self/exe to avoid exposing host binary + to container + +There are quite a few circumstances where /proc/self/exe pointing to a +pretty important container binary is a _bad_ thing, so to avoid this we +have to make a copy (preferably doing self-clean-up and not being +writeable). + +We require memfd_create(2) -- though there is an O_TMPFILE fallback -- +but we can always extend this to use a scratch MNT_DETACH overlayfs or +tmpfs. The main downside to this approach is no page-cache sharing for +the runc binary (which overlayfs would give us) but this is far less +complicated. + +This is only done during nsenter so that it happens transparently to the +Go code, and any libcontainer users benefit from it. This also makes +ExtraFiles and --preserve-fds handling trivial (because we don't need to +worry about it). + +Fixes: CVE-2019-5736 +Co-developed-by: Christian Brauner +Signed-off-by: Aleksa Sarai +--- + libcontainer/nsenter/cloned_binary.c | 268 +++++++++++++++++++++++++++ + libcontainer/nsenter/nsexec.c | 11 ++ + 2 files changed, 279 insertions(+) + create mode 100644 libcontainer/nsenter/cloned_binary.c + +diff --git a/libcontainer/nsenter/cloned_binary.c b/libcontainer/nsenter/cloned_binary.c +new file mode 100644 +index 000000000..c8a42c23f +--- /dev/null ++++ b/libcontainer/nsenter/cloned_binary.c +@@ -0,0 +1,268 @@ ++/* ++ * Copyright (C) 2019 Aleksa Sarai ++ * Copyright (C) 2019 SUSE LLC ++ * ++ * Licensed under the Apache License, Version 2.0 (the "License"); ++ * you may not use this file except in compliance with the License. ++ * You may obtain a copy of the License at ++ * ++ * http://www.apache.org/licenses/LICENSE-2.0 ++ * ++ * Unless required by applicable law or agreed to in writing, software ++ * distributed under the License is distributed on an "AS IS" BASIS, ++ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ++ * See the License for the specific language governing permissions and ++ * limitations under the License. ++ */ ++ ++#define _GNU_SOURCE ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include ++#include ++#include ++#include ++#include ++#include ++ ++/* Use our own wrapper for memfd_create. */ ++#if !defined(SYS_memfd_create) && defined(__NR_memfd_create) ++# define SYS_memfd_create __NR_memfd_create ++#endif ++#ifdef SYS_memfd_create ++# define HAVE_MEMFD_CREATE ++/* memfd_create(2) flags -- copied from . */ ++# ifndef MFD_CLOEXEC ++# define MFD_CLOEXEC 0x0001U ++# define MFD_ALLOW_SEALING 0x0002U ++# endif ++int memfd_create(const char *name, unsigned int flags) ++{ ++ return syscall(SYS_memfd_create, name, flags); ++} ++#endif ++ ++/* This comes directly from . */ ++#ifndef F_LINUX_SPECIFIC_BASE ++# define F_LINUX_SPECIFIC_BASE 1024 ++#endif ++#ifndef F_ADD_SEALS ++# define F_ADD_SEALS (F_LINUX_SPECIFIC_BASE + 9) ++# define F_GET_SEALS (F_LINUX_SPECIFIC_BASE + 10) ++#endif ++#ifndef F_SEAL_SEAL ++# define F_SEAL_SEAL 0x0001 /* prevent further seals from being set */ ++# define F_SEAL_SHRINK 0x0002 /* prevent file from shrinking */ ++# define F_SEAL_GROW 0x0004 /* prevent file from growing */ ++# define F_SEAL_WRITE 0x0008 /* prevent writes */ ++#endif ++ ++#define RUNC_SENDFILE_MAX 0x7FFFF000 /* sendfile(2) is limited to 2GB. */ ++#ifdef HAVE_MEMFD_CREATE ++# define RUNC_MEMFD_COMMENT "runc_cloned:/proc/self/exe" ++# define RUNC_MEMFD_SEALS \ ++ (F_SEAL_SEAL | F_SEAL_SHRINK | F_SEAL_GROW | F_SEAL_WRITE) ++#endif ++ ++static void *must_realloc(void *ptr, size_t size) ++{ ++ void *old = ptr; ++ do { ++ ptr = realloc(old, size); ++ } while(!ptr); ++ return ptr; ++} ++ ++/* ++ * Verify whether we are currently in a self-cloned program (namely, is ++ * /proc/self/exe a memfd). F_GET_SEALS will only succeed for memfds (or rather ++ * for shmem files), and we want to be sure it's actually sealed. ++ */ ++static int is_self_cloned(void) ++{ ++ int fd, ret, is_cloned = 0; ++ ++ fd = open("/proc/self/exe", O_RDONLY|O_CLOEXEC); ++ if (fd < 0) ++ return -ENOTRECOVERABLE; ++ ++#ifdef HAVE_MEMFD_CREATE ++ ret = fcntl(fd, F_GET_SEALS); ++ is_cloned = (ret == RUNC_MEMFD_SEALS); ++#else ++ struct stat statbuf = {0}; ++ ret = fstat(fd, &statbuf); ++ if (ret >= 0) ++ is_cloned = (statbuf.st_nlink == 0); ++#endif ++ close(fd); ++ return is_cloned; ++} ++ ++/* ++ * Basic wrapper around mmap(2) that gives you the file length so you can ++ * safely treat it as an ordinary buffer. Only gives you read access. ++ */ ++static char *read_file(char *path, size_t *length) ++{ ++ int fd; ++ char buf[4096], *copy = NULL; ++ ++ if (!length) ++ return NULL; ++ ++ fd = open(path, O_RDONLY | O_CLOEXEC); ++ if (fd < 0) ++ return NULL; ++ ++ *length = 0; ++ for (;;) { ++ int n; ++ ++ n = read(fd, buf, sizeof(buf)); ++ if (n < 0) ++ goto error; ++ if (!n) ++ break; ++ ++ copy = must_realloc(copy, (*length + n) * sizeof(*copy)); ++ memcpy(copy + *length, buf, n); ++ *length += n; ++ } ++ close(fd); ++ return copy; ++ ++error: ++ close(fd); ++ free(copy); ++ return NULL; ++} ++ ++/* ++ * A poor-man's version of "xargs -0". Basically parses a given block of ++ * NUL-delimited data, within the given length and adds a pointer to each entry ++ * to the array of pointers. ++ */ ++static int parse_xargs(char *data, int data_length, char ***output) ++{ ++ int num = 0; ++ char *cur = data; ++ ++ if (!data || *output != NULL) ++ return -1; ++ ++ while (cur < data + data_length) { ++ num++; ++ *output = must_realloc(*output, (num + 1) * sizeof(**output)); ++ (*output)[num - 1] = cur; ++ cur += strlen(cur) + 1; ++ } ++ (*output)[num] = NULL; ++ return num; ++} ++ ++/* ++ * "Parse" out argv and envp from /proc/self/cmdline and /proc/self/environ. ++ * This is necessary because we are running in a context where we don't have a ++ * main() that we can just get the arguments from. ++ */ ++static int fetchve(char ***argv, char ***envp) ++{ ++ char *cmdline = NULL, *environ = NULL; ++ size_t cmdline_size, environ_size; ++ ++ cmdline = read_file("/proc/self/cmdline", &cmdline_size); ++ if (!cmdline) ++ goto error; ++ environ = read_file("/proc/self/environ", &environ_size); ++ if (!environ) ++ goto error; ++ ++ if (parse_xargs(cmdline, cmdline_size, argv) <= 0) ++ goto error; ++ if (parse_xargs(environ, environ_size, envp) <= 0) ++ goto error; ++ ++ return 0; ++ ++error: ++ free(environ); ++ free(cmdline); ++ return -EINVAL; ++} ++ ++static int clone_binary(void) ++{ ++ int binfd, memfd; ++ ssize_t sent = 0; ++ ++#ifdef HAVE_MEMFD_CREATE ++ memfd = memfd_create(RUNC_MEMFD_COMMENT, MFD_CLOEXEC | MFD_ALLOW_SEALING); ++#else ++ memfd = open("/tmp", O_TMPFILE | O_EXCL | O_RDWR | O_CLOEXEC, 0711); ++#endif ++ if (memfd < 0) ++ return -ENOTRECOVERABLE; ++ ++ binfd = open("/proc/self/exe", O_RDONLY | O_CLOEXEC); ++ if (binfd < 0) ++ goto error; ++ ++ sent = sendfile(memfd, binfd, NULL, RUNC_SENDFILE_MAX); ++ close(binfd); ++ if (sent < 0) ++ goto error; ++ ++#ifdef HAVE_MEMFD_CREATE ++ int err = fcntl(memfd, F_ADD_SEALS, RUNC_MEMFD_SEALS); ++ if (err < 0) ++ goto error; ++#else ++ /* Need to re-open "memfd" as read-only to avoid execve(2) giving -EXTBUSY. */ ++ int newfd; ++ char *fdpath = NULL; ++ ++ if (asprintf(&fdpath, "/proc/self/fd/%d", memfd) < 0) ++ goto error; ++ newfd = open(fdpath, O_RDONLY | O_CLOEXEC); ++ free(fdpath); ++ if (newfd < 0) ++ goto error; ++ ++ close(memfd); ++ memfd = newfd; ++#endif ++ return memfd; ++ ++error: ++ close(memfd); ++ return -EIO; ++} ++ ++int ensure_cloned_binary(void) ++{ ++ int execfd; ++ char **argv = NULL, **envp = NULL; ++ ++ /* Check that we're not self-cloned, and if we are then bail. */ ++ int cloned = is_self_cloned(); ++ if (cloned > 0 || cloned == -ENOTRECOVERABLE) ++ return cloned; ++ ++ if (fetchve(&argv, &envp) < 0) ++ return -EINVAL; ++ ++ execfd = clone_binary(); ++ if (execfd < 0) ++ return -EIO; ++ ++ fexecve(execfd, argv, envp); ++ return -ENOEXEC; ++} +diff --git a/libcontainer/nsenter/nsexec.c b/libcontainer/nsenter/nsexec.c +index 28269dfc0..7750af35e 100644 +--- a/libcontainer/nsenter/nsexec.c ++++ b/libcontainer/nsenter/nsexec.c +@@ -534,6 +534,9 @@ void join_namespaces(char *nslist) + free(namespaces); + } + ++/* Defined in cloned_binary.c. */ ++extern int ensure_cloned_binary(void); ++ + void nsexec(void) + { + int pipenum; +@@ -549,6 +552,14 @@ void nsexec(void) + if (pipenum == -1) + return; + ++ /* ++ * We need to re-exec if we are not in a cloned binary. This is necessary ++ * to ensure that containers won't be able to access the host binary ++ * through /proc/self/exe. See CVE-2019-5736. ++ */ ++ if (ensure_cloned_binary() < 0) ++ bail("could not ensure we are a cloned binary"); ++ + /* Parse all of the netlink configuration. */ + nl_parse(pipenum, &config); + diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index f5e4540329..8a5af2e8ea 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -847,15 +847,17 @@ monitor/GPU.") (define-public runc (package (name "runc") - (version "1.0.0-rc5") + (version "1.0.0-rc6") (source (origin (method url-fetch) (uri (string-append "https://github.com/opencontainers/runc/releases/" "download/v" version "/runc.tar.xz")) + (file-name (string-append name "-" version ".tar.xz")) + (patches (search-patches "runc-CVE-2019-5736.patch")) (sha256 (base32 - "081avdzwnqpk368wbaihlzsypaxpj42d7699h7jgp0fks14x4103")))) + "1c7832dq70slkjh8qp2civ1wxhhdd2hrx84pq7db1mmqc9fdr3cc")))) (build-system go-build-system) (arguments '(#:import-path "github.com/opencontainers/runc" -- cgit v1.2.3 From ea7cddaac782b2cdc789a354e172356ed5c183e7 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 11 Feb 2019 16:27:35 -0500 Subject: gnu: Docker: Update to 18.09.2. * gnu/packages/docker.scm (%docker-version, docker, docker-cli): Update to 18.09.2. (docker)[arguments]: Adjust to the Debian-specific 'iptables-legacy' lookup in the 'patch-paths' phase. --- gnu/packages/docker.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index 992eb0dcc1..b340f8d4a0 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -43,7 +43,7 @@ #:use-module (gnu packages version-control) #:use-module (gnu packages virtualization)) -(define %docker-version "18.09.0") +(define %docker-version "18.09.2") (define-public python-docker-py (package @@ -241,7 +241,7 @@ network attachments.") (file-name (git-file-name name version)) (sha256 (base32 - "1liqbx58grqih6m8hz9y20y5waflv19pv15l3wl64skap2bsn21c")) + "1zfpk2n8j6gnwbrxrh6d6pj24y60dhbanpf55shrm2yxz54ka36c")) (patches (search-patches "docker-engine-test-noinstall.patch" "docker-fix-tests.patch")))) @@ -337,6 +337,7 @@ network attachments.") (substitute-LookPath "blkid" "util-linux" "/sbin/blkid") (substitute-LookPath "unpigz" "pigz" "/bin/unpigz") (substitute-LookPath "iptables" "iptables" "/sbin/iptables") + (substitute-LookPath "iptables-legacy" "iptables" "/sbin/iptables") (substitute-LookPath "ip" "iproute2" "/sbin/ip") (substitute-Command "modprobe" "kmod" "/bin/modprobe") (substitute-Command "pvcreate" "lvm2" "/sbin/pvcreate") @@ -483,7 +484,7 @@ provisioning etc.") (file-name (git-file-name name version)) (sha256 (base32 - "1ivisys20kphvbqlazc3bsg7pk0ykj9gjx5d4yg439x4n13jxwvb")))) + "0jzcqh1kqbfyj6ax7z67gihaqgjiz6ddz6rq6k458l68v7zn77r8")))) (build-system go-build-system) (arguments `(#:import-path "github.com/docker/cli" -- cgit v1.2.3 From dbf87ecb5205828b93d58802881e48b88cbc0137 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor=20Boskovits?= Date: Tue, 12 Feb 2019 17:39:50 +0100 Subject: gnu: Add frrouting. * gnu/packages/networking.scm (frrouting): New variable. --- gnu/packages/networking.scm | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index c71ae4a24d..afd83dcfdb 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -16,7 +16,7 @@ ;;; Copyright © 2017 Leo Famulari ;;; Copyright © 2017, 2018, 2019 Efraim Flashner ;;; Copyright © 2017, 2018, 2019 Rutger Helling -;;; Copyright © 2017 Gábor Boskovits +;;; Copyright © 2017, 2019 Gábor Boskovits ;;; Copyright © 2017 Thomas Danckaert ;;; Copyright © 2018 Adam Van Ymeren ;;; Copyright © 2018 Fis Trivial @@ -98,6 +98,7 @@ #:use-module (gnu packages textutils) #:use-module (gnu packages tls) #:use-module (gnu packages valgrind) + #:use-module (gnu packages web) #:use-module (gnu packages wm) #:use-module (gnu packages wxwidgets) #:use-module (gnu packages xml) @@ -2367,3 +2368,31 @@ communication over HTTP.") be used to manage peer-to-peer network connections as needed for real time communication.") (license license:gpl3+))) + +(define-public frrouting + (package + (name "frrouting") + (version "6.0.2") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/FRRouting/frr/releases/" + "download/frr-" version "/frr-" version + ".tar.xz")) + (sha256 + (base32 + "0xfrvi62w8qlh46f504ka0skb7pm0g0p8vmdng4w90gsbirlzpdd")))) + (build-system gnu-build-system) + (inputs + `(("c-ares" ,c-ares) + ("json-c" ,json-c) + ("readline" ,readline))) + (native-inputs + `(("perl" ,perl) + ("pkg-config" ,pkg-config) + ("python" ,python-wrapper) + ("python-pytest" ,python-pytest))) + (home-page "https://frrouting.org/") + (synopsis "IP routing protocol suite") + (description "FRRouting (FRR) is an IP routing protocol suite which includes +protocol daemons for BGP, IS-IS, LDP, OSPF, PIM, and RIP. ") + (license license:gpl2+))) -- cgit v1.2.3 From e2760d1a8b7308eb284f5bf04b133cee7f58bbe0 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 12 Feb 2019 17:12:18 -0500 Subject: gnu: Flatpak: Update to 1.2.3 [security fixes]. From 'NEWS' in the source distribution: The CVE-2019-5736 runc vulnerability is about using /proc/self/exe to modify the host side binary from the sandbox. This mostly does not affect flatpak since the flatpak sandbox is not run with root permissions. However, there is one case (running the apply_extra script for system installs) where this happens, so this release contains a fix for that. * Don't expose /proc in apply_extra script sandbox. * gnu/packages/package-management.scm (flatpak): Update to 1.2.3. --- gnu/packages/package-management.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 587d028d92..af9667cd91 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -952,7 +952,7 @@ the bootloader configuration.") (define-public flatpak (package (name "flatpak") - (version "1.2.0") + (version "1.2.3") (source (origin (method url-fetch) @@ -960,7 +960,7 @@ the bootloader configuration.") version "/flatpak-" version ".tar.xz")) (sha256 (base32 - "1bdk6qmsvy4d80245x1si9qvrga2f2yalj9qfmf1lqj5ljxxxifv")))) + "0i0dn3w3545lvmjlzqj3j70lk8yrq64r9frp1rk6a161gwq20ixv")))) (build-system gnu-build-system) (arguments '(#:tests? #f ;; Tests fail due to trying to create files where it can't. -- cgit v1.2.3 From afb2971506d2342d27d4876d8a75f4ffa7e57462 Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Thu, 7 Feb 2019 21:58:27 -0600 Subject: gnu: python2-rope: Change comment to reflect partial python3 support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python2-rope): Change comment to reflect partial python 3 support Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 6c97e5989a..ac22a69d80 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8846,8 +8846,7 @@ Python. It generates C++ code and a Makefile.")) (base32 "1cppm0pa9aqgsbkq130lskrzmrvjs5vpiavjjbhpz2fdw52w8251")))) (arguments - ;; Rope is currently python-2 only. - ;; https://github.com/python-rope/rope/issues/57 + ;; Rope has only partial python3 support, see `python-rope' `(#:python ,python-2)) (build-system python-build-system) (native-inputs -- cgit v1.2.3 From 2c880ef4e542c0d6aead79f740e140e45f47a855 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 7 Feb 2019 22:05:19 -0600 Subject: gnu: Add python-rope. * gnu/packages/python-xyz.scm (python-rope): New variable. Co-authored-by: Brett Gilio --- gnu/packages/python-xyz.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index ac22a69d80..0ba9f5266d 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8859,6 +8859,16 @@ and parameters in Python 2 source code. These refactorings can also be applied to occurrences in strings and comments.") (license license:gpl2))) +(define-public python-rope + (package + (inherit python2-rope) + (name "python-rope") + (arguments `(#:python ,python-wrapper + ;; XXX: Only partial python3 support, results in some failing + ;; tests: . + #:tests? #f)) + (properties `((python2-variant . ,(delay python2-rope)))))) + (define-public python-py3status (package (name "python-py3status") -- cgit v1.2.3 From 346c87522ee5cc10c80bea0b5609c7a7f212537d Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Thu, 7 Feb 2019 22:04:16 -0600 Subject: gnu: Add python-jsonrpc-server. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-jsonrpc-server): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 0ba9f5266d..959b4647cf 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -2578,6 +2578,29 @@ which can produce feeds in RSS 2.0, RSS 0.91, and Atom formats.") Language (TOML) configuration files.") (license license:expat))) +(define-public python-jsonrpc-server + (package + (name "python-jsonrpc-server") + (version "0.1.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "python-jsonrpc-server" version)) + (sha256 + (base32 + "0m4ykpcdy52x37n1ikysp07j7p8ialcdvvvsrjp3545sn7iiid09")))) + (build-system python-build-system) + (propagated-inputs + `(("python-future" ,python-future) + ("python-mock" ,python-mock) + ("python-pytest" ,python-pytest))) + (home-page + "https://github.com/palantir/python-jsonrpc-server") + (synopsis "JSON RPC 2.0 server library") + (description + "This packages provides a JSON RPC 2.0 server library for Python.") + (license license:expat))) + (define-public python-black (package (name "python-black") -- cgit v1.2.3 From 56f4ad47bde0f416b31433a8274e301ceda4bf42 Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Thu, 7 Feb 2019 22:04:52 -0600 Subject: gnu: Add python-docstyle. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-docstyle): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 959b4647cf..55d2c26d45 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -2601,6 +2601,29 @@ Language (TOML) configuration files.") "This packages provides a JSON RPC 2.0 server library for Python.") (license license:expat))) +(define-public python-pydocstyle + (package + (name "python-pydocstyle") + (version "3.0.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pydocstyle" version)) + (sha256 + (base32 + "1m1xv9clkg9lgzyza6dnj359z04vh5g0h49nhzghv7lg81gchhap")))) + (build-system python-build-system) + (propagated-inputs + `(("python-six" ,python-six) + ("python-snowballstemmer" ,python-snowballstemmer))) + (home-page + "https://github.com/PyCQA/pydocstyle/") + (synopsis "Python docstring style checker") + (description + "This package provides a style checker for the Python Language +Server (PLS).") + (license license:expat))) + (define-public python-black (package (name "python-black") -- cgit v1.2.3 From be4d840cca92bc40a7fcadd69b5017597554683d Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Thu, 7 Feb 2019 22:03:42 -0600 Subject: gnu: Add python-language-server. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-language-server): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 55d2c26d45..55ac37ffb0 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -2624,6 +2624,38 @@ Language (TOML) configuration files.") Server (PLS).") (license license:expat))) +(define-public python-language-server + (package + (name "python-language-server") + (version "0.22.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "python-language-server" version)) + (sha256 + (base32 + "04pbxl06hg0ddm2xx99jn9jh40yv0mmzdjw8pqd2rbcdg42hhia6")))) + (build-system python-build-system) + (propagated-inputs + `(("python-pluggy" ,python-pluggy) + ("python-jsonrpc-server" ,python-jsonrpc-server) + ("python-jedi" ,python-jedi) + ("python-yapf" ,python-yapf) + ("python-pyflakes" ,python-pyflakes) + ("python-pydocstyle" ,python-pydocstyle) + ("python-pycodestyle" ,python-pycodestyle) + ("python-mccabe" ,python-mccabe) + ("python-rope" ,python-rope) + ("python-autopep8" ,python-autopep8))) + (home-page "https://github.com/palantir/python-language-server") + (synopsis "Python implementation of the Language Server Protocol") + (description + "The Python Language Server (pyls) is an implementation of the Python 3 +language specification for the Language Server Protocol (LSP). This tool is +used in text editing environments to provide a complete and integrated +feature-set for programming Python effectively.") + (license license:expat))) + (define-public python-black (package (name "python-black") -- cgit v1.2.3 From 60562ec26bb512dbf9ea44de0df8b48f1f6e1880 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 12 Feb 2019 17:28:18 +0100 Subject: gnu: libjpeg: Use HTTPS URLs. * gnu/packages/image.scm (libjpeg, libjpeg-8)[source, home-page]: Use HTTPS. --- gnu/packages/image.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 6457127520..f217c3611a 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -321,7 +321,7 @@ Currently all documentation resides in @file{pnglite.h}.") (version "9c") (source (origin (method url-fetch) - (uri (string-append "http://www.ijg.org/files/jpegsrc.v" + (uri (string-append "https://www.ijg.org/files/jpegsrc.v" version ".tar.gz")) (sha256 (base32 "08kixcf3a7s9x91174abjnk1xbvj4v8crdc73zi4k9h3jfbm00k5")))) @@ -342,14 +342,14 @@ lossless JPEG manipulations such as rotation, scaling or cropping: @item wrjpgcom @end enumerate") (license license:ijg) - (home-page "http://www.ijg.org/"))) + (home-page "https://www.ijg.org/"))) (define-public libjpeg-8 (package (inherit libjpeg) (version "8d") (source (origin (method url-fetch) - (uri (string-append "http://www.ijg.org/files/jpegsrc.v" + (uri (string-append "https://www.ijg.org/files/jpegsrc.v" version ".tar.gz")) (sha256 (base32 "1cz0dy05mgxqdgjf52p54yxpyy95rgl30cnazdrfmw7hfca9n0h0")))))) -- cgit v1.2.3 From bec2a2e10e199d6ee671ec5713bd103242e91b62 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 12 Feb 2019 23:17:00 +0100 Subject: gnu: Move KDE Plasma components to separate module. * gnu/packages/kde.scm (libkscreen, libksysguard): Move from here ... * gnu/packages/kde-plasma.scm: ... to here. New file. * gnu/local.mk (GNU_SYSTEM_MODULES): Adjust accordingly. --- gnu/packages/kde-plasma.scm | 129 ++++++++++++++++++++++++++++++++++++++++++++ gnu/packages/kde.scm | 103 +---------------------------------- 2 files changed, 131 insertions(+), 101 deletions(-) create mode 100644 gnu/packages/kde-plasma.scm (limited to 'gnu/packages') diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm new file mode 100644 index 0000000000..ab35eab87a --- /dev/null +++ b/gnu/packages/kde-plasma.scm @@ -0,0 +1,129 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2016 Thomas Danckaert +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages kde-plasma) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix build-system cmake) + #:use-module (gnu packages compression) + #:use-module (gnu packages glib) + #:use-module (gnu packages kde-frameworks) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages qt) + #:use-module (gnu packages xorg)) + +(define-public libkscreen + (package + (name "libkscreen") + (version "5.13.5") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/plasma/" version "/" + name "-" version ".tar.xz")) + (sha256 + (base32 "04719va15i66qn1xqx318v6risxhp8bfcnhxh9mqm5h9qx5c6c4k")))) + (build-system cmake-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules) + ;; For testing. + ("dbus" ,dbus))) + (inputs + `(("kwayland" ,kwayland) + ("libxrandr" ,libxrandr) + ("qtbase" ,qtbase) + ("qtx11extras" ,qtx11extras))) + (arguments + '(#:tests? #f ; FIXME: 55% tests passed, 5 tests failed out of 11 + #:phases + (modify-phases %standard-phases + (add-before 'check 'pre-check + (lambda _ + ;; For the missing '/etc/machine-id'. + (setenv "DBUS_FATAL_WARNINGS" "0") + ;; Run the tests offscreen. + (setenv "QT_QPA_PLATFORM" "offscreen") + #t))))) + (home-page "https://community.kde.org/Solid/Projects/ScreenManagement") + (synopsis "KDE's screen management software") + (description "KScreen is the new screen management software for KDE Plasma +Workspaces which tries to be as magic and automatic as possible for users with +basic needs and easy to configure for those who want special setups.") + (license license:gpl2+))) + +(define-public libksysguard + (package + (name "libksysguard") + (version "5.13.4") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://kde//stable/plasma/" version + "/libksysguard-" version ".tar.xz")) + (sha256 + (base32 + "0k8q5bxk9zyv7c3nny1c399v8acqs618nw39q20pj2qdijl9ibvh")))) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules) + ("pkg-config" ,pkg-config))) + (inputs + `(("kconfigwidgets" ,kconfigwidgets) + ("kiconthemes" ,kiconthemes) + ("kwindowsystem" ,kwindowsystem) + ("ki18n" ,ki18n) + ("kauth" ,kauth) + ("kcompletion" ,kcompletion) + ("kconfig" ,kconfig) + ("kcoreaddons" ,kcoreaddons) + ("kwidgetsaddons" ,kwidgetsaddons) + ("kservice" ,kservice) + ("qtbase" ,qtbase) + ("qtscript" ,qtscript) + ("qtwebkit" ,qtwebkit) + ("qtx11extras" ,qtx11extras) + ("plasma" ,plasma-framework) + ("zlib" ,zlib))) + (build-system cmake-build-system) + (arguments + `(#:configure-flags + `(,(string-append "-DKDE_INSTALL_DATADIR=" + (assoc-ref %outputs "out") "/share")) + #:phases + (modify-phases %standard-phases + (add-before 'configure 'patch-cmakelists + (lambda _ + ;; TODO: Verify: This should no longer be necessary, since + ;; KF5AuthConfig.cmake.in contains this already. + (substitute* "processcore/CMakeLists.txt" + (("KAUTH_HELPER_INSTALL_DIR") "KDE_INSTALL_LIBEXECDIR")))) + (add-before 'check 'check-setup + (lambda _ + ;; make Qt render "offscreen", required for tests + (setenv "QT_QPA_PLATFORM" "offscreen"))) + (replace 'check + (lambda _ + ;; TODO: Fix this failing test-case + (invoke "ctest" "-E" "processtest")))))) + (home-page "https://www.kde.org/info/plasma-5.13.4.php") + (synopsis "Network enabled task and system monitoring") + (description "KSysGuard can obtain information on system load and +manage running processes. It obtains this information by interacting +with a ksysguardd daemon, which may also run on a remote system.") + (license license:gpl3+))) + diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 5946ba0b52..ff26b0ea83 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016, 2017 Efraim Flashner -;;; Copyright © 2016, 2017 Thomas Danckaert +;;; Copyright © 2017 Thomas Danckaert ;;; Copyright © 2017, 2018 Mark Meyer ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Gábor Boskovits @@ -36,11 +36,11 @@ #:use-module (gnu packages gettext) #:use-module (gnu packages ghostscript) #:use-module (gnu packages gl) - #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages graphics) #:use-module (gnu packages image) #:use-module (gnu packages kde-frameworks) + #:use-module (gnu packages kde-plasma) #:use-module (gnu packages llvm) #:use-module (gnu packages maths) #:use-module (gnu packages pdf) @@ -480,105 +480,6 @@ used in KDE development tools Kompare and KDevelop.") ;; source archive (license (list license:gpl2+ license:lgpl2.0+ license:bsd-3)))) -(define-public libkscreen - (package - (name "libkscreen") - (version "5.13.5") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/plasma/" version "/" - name "-" version ".tar.xz")) - (sha256 - (base32 "04719va15i66qn1xqx318v6risxhp8bfcnhxh9mqm5h9qx5c6c4k")))) - (build-system cmake-build-system) - (native-inputs - `(("extra-cmake-modules" ,extra-cmake-modules) - ;; For testing. - ("dbus" ,dbus))) - (inputs - `(("kwayland" ,kwayland) - ("libxrandr" ,libxrandr) - ("qtbase" ,qtbase) - ("qtx11extras" ,qtx11extras))) - (arguments - '(#:tests? #f ; FIXME: 55% tests passed, 5 tests failed out of 11 - #:phases - (modify-phases %standard-phases - (add-before 'check 'pre-check - (lambda _ - ;; For the missing '/etc/machine-id'. - (setenv "DBUS_FATAL_WARNINGS" "0") - ;; Run the tests offscreen. - (setenv "QT_QPA_PLATFORM" "offscreen") - #t))))) - (home-page "https://community.kde.org/Solid/Projects/ScreenManagement") - (synopsis "KDE's screen management software") - (description "KScreen is the new screen management software for KDE Plasma -Workspaces which tries to be as magic and automatic as possible for users with -basic needs and easy to configure for those who want special setups.") - (license license:gpl2+))) - -(define-public libksysguard - (package - (name "libksysguard") - (version "5.13.4") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://kde//stable/plasma/" version - "/libksysguard-" version ".tar.xz")) - (sha256 - (base32 - "0k8q5bxk9zyv7c3nny1c399v8acqs618nw39q20pj2qdijl9ibvh")))) - (native-inputs - `(("extra-cmake-modules" ,extra-cmake-modules) - ("pkg-config" ,pkg-config))) - (inputs - `(("kconfigwidgets" ,kconfigwidgets) - ("kiconthemes" ,kiconthemes) - ("kwindowsystem" ,kwindowsystem) - ("ki18n" ,ki18n) - ("kauth" ,kauth) - ("kcompletion" ,kcompletion) - ("kconfig" ,kconfig) - ("kcoreaddons" ,kcoreaddons) - ("kwidgetsaddons" ,kwidgetsaddons) - ("kservice" ,kservice) - ("qtbase" ,qtbase) - ("qtscript" ,qtscript) - ("qtwebkit" ,qtwebkit) - ("qtx11extras" ,qtx11extras) - ("plasma" ,plasma-framework) - ("zlib" ,zlib))) - (build-system cmake-build-system) - (arguments - `(#:configure-flags - `(,(string-append "-DKDE_INSTALL_DATADIR=" - (assoc-ref %outputs "out") "/share")) - #:phases - (modify-phases %standard-phases - (add-before 'configure 'patch-cmakelists - (lambda _ - ;; TODO: Verify: This should no longer be necessary, since - ;; KF5AuthConfig.cmake.in contains this already. - (substitute* "processcore/CMakeLists.txt" - (("KAUTH_HELPER_INSTALL_DIR") "KDE_INSTALL_LIBEXECDIR")))) - (add-before 'check 'check-setup - (lambda _ - ;; make Qt render "offscreen", required for tests - (setenv "QT_QPA_PLATFORM" "offscreen"))) - (replace 'check - (lambda _ - ;; TODO: Fix this failing test-case - (invoke "ctest" "-E" "processtest")))))) - (home-page "https://www.kde.org/info/plasma-5.13.4.php") - (synopsis "Network enabled task and system monitoring") - (description "KSysGuard can obtain information on system load and -manage running processes. It obtains this information by interacting -with a ksysguardd daemon, which may also run on a remote system.") - (license license:gpl3+))) - (define-public qca (package (name "qca") -- cgit v1.2.3 From cdf7fea183b7159043d17348b5c66325184c7978 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 12 Feb 2019 23:21:01 +0100 Subject: gnu: Add copyright line for commit c1144c78ad853dc1bfbd6f32a6. * gnu/packages/kde-plasma.scm: Add copyright header. --- gnu/packages/kde-plasma.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages') diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm index ab35eab87a..bed9cc09bc 100644 --- a/gnu/packages/kde-plasma.scm +++ b/gnu/packages/kde-plasma.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 Thomas Danckaert +;;; Copyright © 2018 Meiyo Peng ;;; ;;; This file is part of GNU Guix. ;;; -- cgit v1.2.3 From fd11c0fd3df2988831a3aedf136eda211aa69150 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 3 Feb 2019 19:33:47 +0100 Subject: gnu: KDE Frameworks: Update to 5.54.0. * gnu/packages/patches/kio-search-smbd-on-PATH.patch: Adjust context. * gnu/packages/kde-frameworks.scm (kconfig): Update to 5.54.0. [native-inputs]: Add DBUS. [arguments]: Run tests with "dbus-launch". (kio): Update to 5.54.1. [inputs]: Add KCRASH. (breeze-icons): Update to 5.54.0. [arguments]: Remove. (extra-cmake-modules, attica, bluez-qt, kapidox, karchive, kcodecs, kcoreaddons, kdbusaddons, kdnssd, kguiaddons, ki18n, kidletime, kirigami, kitemmodels, kitemviews, kplotting, ksyntaxhighlighting, kwayland, kwidgetsaddons, kwindowsystem, modemmanager-qt, networkmanager-qt, oxygen-icons, prison, qqc2-desktop-style, solid, sonnet, threadweaver, kactivities, kauth, kcompletion, kcrash, kdoctools, kfilemetadata, kimageformats, kjobwidgets, knotifications, kpackage, kpty, kunitconversion, baloo, kactivities-stats, kbookmarks, kcmutils, kconfigwidgets, kdeclarative, kded, kdesignerplugin, kdesu, kdewebkit, kemoticons, kglobalaccel, kiconthemes, kinit, knewstuff, knotifyconfig, kparts, kpeople, krunner, kservice, ktexteditor, ktextwidgets, kwallet, kxmlgui, kxmlrpcclient, plasma-framework, kde-frameworkintegration, kdelibs4support, khtml, kjs, kjsembed, kmediaplayer, kross): Update to 5.54.0. --- gnu/packages/kde-frameworks.scm | 337 ++++++++++----------- gnu/packages/patches/kio-search-smbd-on-PATH.patch | 2 +- 2 files changed, 161 insertions(+), 178 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 5068de22bb..c9b464c2c5 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -78,7 +78,7 @@ (define-public extra-cmake-modules (package (name "extra-cmake-modules") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -87,7 +87,7 @@ name "-" version ".tar.xz")) (sha256 (base32 - "07pdgjyrxniacqcfvrzw8ij3kasx5pkbq38k6491qbhzfm8vi7y0")))) + "0i3iqwvdqf2wpg8lsbna4vgmb18pnbv2772sg9k6zzhvkwsskdwi")))) (build-system cmake-build-system) (native-inputs `(("qtbase" ,qtbase))) ; For tests (needs qmake) @@ -253,7 +253,7 @@ Phonon-GStreamer is a backend based on the GStreamer multimedia library.") (define-public attica (package (name "attica") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -262,7 +262,7 @@ Phonon-GStreamer is a backend based on the GStreamer multimedia library.") name "-" version ".tar.xz")) (sha256 (base32 - "1iqclahs9yzyjnkzbzr8hl9j6q8m2djdm6mix92xwrakgirnl3gn")))) + "1gr7w0mf3aq5xyl9il3483m9aqgb981vxn02g2khm6dfsr6z2aln")))) (build-system cmake-build-system) (arguments `(#:phases @@ -293,7 +293,7 @@ http://freedesktop.org/wiki/Specifications/open-collaboration-services/") (define-public bluez-qt (package (name "bluez-qt") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -302,7 +302,7 @@ http://freedesktop.org/wiki/Specifications/open-collaboration-services/") name "-" version ".tar.xz")) (sha256 (base32 - "0mgnq7w52ksr8b7ys2f1m3irnviy011bsaggh489fjy0xlzk5ard")))) + "1br9496lahzqmzmvdic5835ig18w3g211l1w4qfzpgr50yin9n5v")))) (build-system cmake-build-system) (native-inputs `(("dbus" ,dbus) @@ -326,7 +326,7 @@ Bluetooth stack. It is used by the KDE Bluetooth stack, BlueDevil.") (define-public breeze-icons (package (name "breeze-icons") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -335,23 +335,8 @@ Bluetooth stack. It is used by the KDE Bluetooth stack, BlueDevil.") name "-" version ".tar.xz")) (sha256 (base32 - "178620hhqlv6dl8qal2bmiw55s8b3p4h16q8cgkmq5q5i59nzcph")))) + "1g5dppg2iq5bd3r3s8bi8jqnvnh1rm7s3sv51shmaamq5qf0n5jy")))) (build-system cmake-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'add-symlinks - ;; Fix "ScalableTest" - FIXME: Remove for > 5.49.0 - (lambda _ - (symlink "../22/plasma-browser-integration.svg" - "icons-dark/apps/48/plasma-browser-integration.svg") - (symlink "../22/plasma-browser-integration.svg" - "icons-dark/apps/64/plasma-browser-integration.svg") - (symlink "../22/plasma-browser-integration.svg" - "icons/apps/48/plasma-browser-integration.svg") - (symlink "../22/plasma-browser-integration.svg" - "icons/apps/64/plasma-browser-integration.svg") - #t))))) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) ("fdupes" ,fdupes) @@ -370,7 +355,7 @@ It is the default icon theme for the KDE Plasma 5 desktop.") (define-public kapidox (package (name "kapidox") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -379,7 +364,7 @@ It is the default icon theme for the KDE Plasma 5 desktop.") name "-" version ".tar.xz")) (sha256 (base32 - "09jph3hvasqx1ia0l7is9brc08nxvh9qmg8564nh5cmqaxdwj559")))) + "0zwjychzcamsky9l67xnw820b9m8r8pi56gsccg023l1rcigz46c")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) ; has no test target @@ -412,7 +397,7 @@ documentation.") (define-public karchive (package (name "karchive") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -421,7 +406,7 @@ documentation.") name "-" version ".tar.xz")) (sha256 (base32 - "1p1gwqda2bsjdysp4ggwdsldbasyfl075xn3wchqyakdv2bdzmn0")))) + "141xqgdk7g3ky0amblrqr4pab1xvvdim5wvckrgawdkjiy5ana4g")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -446,7 +431,7 @@ GZip format, via a subclass of QIODevice.") (define-public kcodecs (package (name "kcodecs") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -455,7 +440,7 @@ GZip format, via a subclass of QIODevice.") name "-" version ".tar.xz")) (sha256 (base32 - "07va63gsfjrc5ha9rdli923cwyzxpb3v8xgf1zfhw75cfkgda3nz")))) + "1s0ky187fbi34wabpfvdwb1zbblzvk8g83h37ckj9j4rd69mjksc")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -482,7 +467,7 @@ Internet).") (define-public kconfig (package (name "kconfig") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -491,10 +476,11 @@ Internet).") name "-" version ".tar.xz")) (sha256 (base32 - "0cb3crnlr8hr5npq3ykfxqd4yckmkykzrrizfs89ryhmznc2ngsf")))) + "14p4w0m04c8msdwb3mjfzx6w0lcmln65j3rfvqp58nv5n4yh5dp7")))) (build-system cmake-build-system) (native-inputs - `(("extra-cmake-modules" ,extra-cmake-modules) + `(("dbus" ,dbus) + ("extra-cmake-modules" ,extra-cmake-modules) ("inetutils" ,inetutils) ("qttools" ,qttools) ("xorg-server" ,xorg-server))) @@ -508,13 +494,10 @@ Internet).") (setenv "HOME" (getcwd)) (setenv "TMPDIR" (getcwd)) #t)) - (add-before 'check 'start-xorg-server - (lambda* (#:key inputs #:allow-other-keys) - ;; The test suite requires a running X server. - (system (string-append (assoc-ref inputs "xorg-server") - "/bin/Xvfb :1 &")) - (setenv "DISPLAY" ":1") - #t))))) + (replace 'check + (lambda _ + (setenv "QT_QPA_PLATFORM" "offscreen") + (invoke "dbus-launch" "ctest" ".")))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Kconfiguration settings framework for Qt") (description "KConfig provides an advanced configuration system. @@ -549,7 +532,7 @@ propagate their changes to their respective configuration files.") (define-public kcoreaddons (package (name "kcoreaddons") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -558,7 +541,7 @@ propagate their changes to their respective configuration files.") name "-" version ".tar.xz")) (sha256 (base32 - "00s22jvbwav20cidnp8v9fgc6pqbp4wnqkb2spv18mjhg4pv3bqj")))) + "1n27786js8j8na7kgxirhmswxcz3qkfiqzfabqmmsd0jp4rx1s79")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -606,7 +589,7 @@ many more.") (define-public kdbusaddons (package (name "kdbusaddons") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -615,7 +598,7 @@ many more.") name "-" version ".tar.xz")) (sha256 (base32 - "1fnmrrffp3kfwyjfzqkzlizflpyqgzbjljb51ppmdypcq8wy9ibh")) + "1fvlspqc3w3y4p04gnqz6vrfvl93iwckfk16p608fz7yfgdmlzbf")) (patches (search-patches "kdbusaddons-kinit-file-name.patch")))) (build-system cmake-build-system) (native-inputs @@ -651,7 +634,7 @@ as well as an API to create KDED modules.") (define-public kdnssd (package (name "kdnssd") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -660,7 +643,7 @@ as well as an API to create KDED modules.") name "-" version ".tar.xz")) (sha256 (base32 - "1n61id2x1iianshg8g6fw389mqihz4h8sj9hnng7cdg4csh72ffr")))) + "00sqx2hyqd9yw4nwdl8kmbzm0v0szgqv4nz0q6bchv3hfbax6zk7")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -679,7 +662,7 @@ infrastructure.") (define-public kguiaddons (package (name "kguiaddons") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -688,7 +671,7 @@ infrastructure.") name "-" version ".tar.xz")) (sha256 (base32 - "1zkjd3l5pyvvilcc9lbdgqaxnpvh586yf0cndl90h3x89hy1d4xk")))) + "0lkqxsqdjmc7060pxi5j8gx15kmrb8450cpinzn89nzpdl7rj935")))) (build-system cmake-build-system) ;; TODO: Build packages for the Python bindings. Ideally this will be ;; done for all versions of python guix supports. Requires python, @@ -717,7 +700,7 @@ interfaces in the areas of colors, fonts, text, images, keyboard input.") (define-public ki18n (package (name "ki18n") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -726,7 +709,7 @@ interfaces in the areas of colors, fonts, text, images, keyboard input.") name "-" version ".tar.xz")) (sha256 (base32 - "1i4rdrxann45zl6fkmfd1b96q52g0mpc5x19fx9h80crapkm8jjz")))) + "0drbyr2y44h1d88nbgxvp4ix46lin51r8vzhhnjhq2ydqy5za3p3")))) (build-system cmake-build-system) (propagated-inputs `(("gettext" ,gettext-minimal) @@ -760,7 +743,7 @@ translation scripting.") (define-public kidletime (package (name "kidletime") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -769,7 +752,7 @@ translation scripting.") name "-" version ".tar.xz")) (sha256 (base32 - "1fd02anlmaa0hnnp5q1s9973m3asy56qppwq1va1g6ga3csv3wrv")))) + "1x0z0ipdizgv6jkklxp6maclx8f6ya2bv1q39hvxxnnmly8q3vjm")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -791,7 +774,7 @@ or user activity.") ;; plasma-framework which is tier 3. (package (name "kirigami") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -800,7 +783,7 @@ or user activity.") "kirigami2-" version ".tar.xz")) (sha256 (base32 - "1wan9h7kvjzvyzfjfjd512lxiac5prhs493xjqwxgags6kxwglaz")))) + "0iny9br3vpakvv0bmgy0mmw2y10d4kqbahjpfa3726qai4gligp2")))) (properties `((upstream-name . "kirigami2"))) (build-system cmake-build-system) (native-inputs @@ -827,7 +810,7 @@ of applications that follow the Kirigami Human Interface Guidelines.") (define-public kitemmodels (package (name "kitemmodels") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -836,7 +819,7 @@ of applications that follow the Kirigami Human Interface Guidelines.") name "-" version ".tar.xz")) (sha256 (base32 - "1frha301540js45mrxiw034m9b2rwsa56xphkqn6cm4jmn48qdjg")))) + "1s3wv75sbb4kpgz02cbm7smp8h6rk1ixv0gafbvz9514i9g4d760")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -886,7 +869,7 @@ model to observers (define-public kitemviews (package (name "kitemviews") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -895,7 +878,7 @@ model to observers name "-" version ".tar.xz")) (sha256 (base32 - "1aj605q2p72w4rb9i0f2xb93bn5xfjq9sl5i4h6rqflcvvy7qpdp")))) + "1cw9i8xik287rvb12alpqsph902nhfmbn4cfjx5gj7k888n8k3mk")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -921,7 +904,7 @@ to flat and hierarchical lists.") (define-public kplotting (package (name "kplotting") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -930,7 +913,7 @@ to flat and hierarchical lists.") name "-" version ".tar.xz")) (sha256 (base32 - "13fzqqkyxs4ja6n5yb9lc5jx4qpsmrbsiihnwrgj3lhpzhlr91n0")))) + "02mab80jyfgdj8xwbwkm181cc5vpsmbn561242q7ayjgxdiszzw9")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -956,7 +939,7 @@ pixel units.") (define-public ksyntaxhighlighting (package (name "ksyntaxhighlighting") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -965,7 +948,7 @@ pixel units.") "syntax-highlighting-" version ".tar.xz")) (sha256 (base32 - "17rkgzkfiz5dv0xr67na7ikqszgwjnf2gc11b2h47qdsr7pgx95v")))) + "022mpkbgc458qcn25pn3a3m2dzy6lq23r7fqbgp22jr6xalfi5hl")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1005,7 +988,7 @@ integration with a custom editor as well as a ready-to-use (define-public kwayland (package (name "kwayland") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -1014,7 +997,7 @@ integration with a custom editor as well as a ready-to-use name "-" version ".tar.xz")) (sha256 (base32 - "0d95l2i3j1xxkc15n57w4rhf3di02zna4zzn4gap9qdhfxlfbqi6")))) + "0y1710l68qlf37zy26nyn25r50a00mrm5cnwgfs9f40s749amigf")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1044,7 +1027,7 @@ represented by a QPoint or a QSize.") (define-public kwidgetsaddons (package (name "kwidgetsaddons") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -1053,7 +1036,7 @@ represented by a QPoint or a QSize.") name "-" version ".tar.xz")) (sha256 (base32 - "1frgqz9njbc81pfy6gl6p0hyh1977lg31ynrx5wy7lg7fwaxwl92")))) + "01qxklhigfazhma0f6m1fkcbh9waxpvzpz6y2jlflvgbw2db82gh")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1091,7 +1074,7 @@ configuration pages, message boxes, and password requests.") (define-public kwindowsystem (package (name "kwindowsystem") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -1100,7 +1083,7 @@ configuration pages, message boxes, and password requests.") name "-" version ".tar.xz")) (sha256 (base32 - "175rzwrjndhawyy4x11lbihdr1r9gwxmxjpbz4x06hlz4g50wffp")))) + "1n9h4gg5ih29avvcpplqfy7nq58xx6jv6a04m1wkjr1rzn4dyfnb")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1152,7 +1135,7 @@ lower level classes for interaction with the X Windowing System.") (define-public modemmanager-qt (package (name "modemmanager-qt") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -1161,7 +1144,7 @@ lower level classes for interaction with the X Windowing System.") name "-" version ".tar.xz")) (sha256 (base32 - "1wf3v552vbr4kh2d770zn3yn0q3bqjqbfrvnf813mnld7961m7p2")))) + "0n54gh83b6d42azv40km7j223qb2f4f9ng23xvvawzc7l2ksm350")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1190,7 +1173,7 @@ messages.") (define-public networkmanager-qt (package (name "networkmanager-qt") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -1199,7 +1182,7 @@ messages.") name "-" version ".tar.xz")) (sha256 (base32 - "16pnd52m9srcb2ml3vc3kd9k1yak5rq09yci39qp7z5jbdy7jk2z")))) + "0bh5li6r7r3nws5zj0hp4iy4xhiyh7rszzwpp6ag93vz5g5fsl9y")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1229,7 +1212,7 @@ which are used in DBus communication.") (define-public oxygen-icons (package (name "oxygen-icons") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -1238,7 +1221,7 @@ which are used in DBus communication.") name "5" "-" version ".tar.xz")) (sha256 (base32 - "0llx06sr36cd6vgkgm3jw6k4cv1cfx3r6x6lmb477wpahis0n75g")))) + "1sdd8ygkyl4d1mwrachcf0ahpikkby3xhdyz212xj9qmhmsgwa46")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1254,7 +1237,7 @@ which are used in DBus communication.") (define-public prison (package (name "prison") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) @@ -1262,7 +1245,7 @@ which are used in DBus communication.") (version-major+minor version) "/" name "-" version ".tar.xz")) (sha256 - (base32 "0dppz9x6k84sl0aiyjlh3xigqgda64r8mij3bzxcdkv2wbc4ld9d")))) + (base32 "1z7gymk4hkwaa0ni1454ndvpm2lwqyyfbih38h0lfb8lrswnv3kb")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -1279,7 +1262,7 @@ provides uniform access to generation of barcodes with data.") (define-public qqc2-desktop-style (package (name "qqc2-desktop-style") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -1288,7 +1271,7 @@ provides uniform access to generation of barcodes with data.") name "-" version ".tar.xz")) (sha256 (base32 - "1vbms7b8x1y7yh8im8dv1q3wwl3j2x4r47yqg86f28grw2r2n2zj")))) + "1shw3c6cr5xanzyl5zv3isyhvzi20zn3xf7m963z1qn8ypaz1by8")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1313,7 +1296,7 @@ feel.") (define-public solid (package (name "solid") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -1322,7 +1305,7 @@ feel.") name "-" version ".tar.xz")) (sha256 (base32 - "1p7rdmf2f8520xc7zp7wxlcizyyjfxwq5mf95qsfpwc4dl0c43gp")))) + "0hmh9hndfs1ikaja07ddag7jr8804q4g6p74rhqsrfk2sjz0pmr9")))) (build-system cmake-build-system) (arguments `(#:phases @@ -1352,7 +1335,7 @@ system.") (define-public sonnet (package (name "sonnet") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -1361,7 +1344,7 @@ system.") name "-" version ".tar.xz")) (sha256 (base32 - "0m5pmka1hwjsg3c3qvx087z3fjrfw0ayk7ylgjls5iwd39kkl1b3")))) + "0ccz0gbypzdndaxrfkjhry90jjdh5a56pm4j41z835q96w6piclz")))) (build-system cmake-build-system) (arguments `(#:phases @@ -1389,7 +1372,7 @@ ASpell and HUNSPELL.") (define-public threadweaver (package (name "threadweaver") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -1398,7 +1381,7 @@ ASpell and HUNSPELL.") name "-" version ".tar.xz")) (sha256 (base32 - "099bs429p71dzrqy25z61rvn48w3b73p7yag4q69jnxcpj0qcyz7")))) + "011k2pm0wr60sxnydicnchnarx4r6qja0w6iih3jfkw733qm6bxp")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -1419,7 +1402,7 @@ uses a job-based interface to queue tasks and execute them in an efficient way." (define-public kactivities (package (name "kactivities") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -1428,7 +1411,7 @@ uses a job-based interface to queue tasks and execute them in an efficient way." name "-" version ".tar.xz")) (sha256 (base32 - "117f3zrdbs0pa10wn7vy691n02m01h6x4pm8m1q3f4pjm0k4kqim")))) + "0ipq71g6g7q6yncvbiabwn5kg2280k8ssibbbf6jyh2lg09dmjil")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -1464,7 +1447,7 @@ with other frameworks.") (define-public kauth (package (name "kauth") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -1473,7 +1456,7 @@ with other frameworks.") name "-" version ".tar.xz")) (sha256 (base32 - "0qg3zwg3kfx2snmvsw4ixr0qds7bd7992dxggvi9dcny7dm9q0n8")))) + "1ciabazig77rpfksvdlmixj2sa2qnasq13nwvjn3xksnajfm4p2h")))) (build-system cmake-build-system) (native-inputs `(("dbus" ,dbus) @@ -1511,7 +1494,7 @@ utilities.") (define-public kcompletion (package (name "kcompletion") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -1520,7 +1503,7 @@ utilities.") name "-" version ".tar.xz")) (sha256 (base32 - "16br6wnqzndk8v41im23h2ww4hypi2i1qfg6m9c49mpxflgmspbi")))) + "0sgg09l97amnng0ddxyjpk535097f87bmn60hjqrmpsqb0n3a460")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1547,7 +1530,7 @@ integrated it into your application's other widgets.") (define-public kcrash (package (name "kcrash") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -1556,7 +1539,7 @@ integrated it into your application's other widgets.") name "-" version ".tar.xz")) (sha256 (base32 - "0xmr9rrl0xahpnq1rw4bbar1nbr21x2bk4hhv79la6dsg9ha25b3")))) + "0wlrlzwdi9dpxkky9sadmbgw0rjisxhym9hr8gzydd2y8q4cr8a7")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -1582,7 +1565,7 @@ application crashes.") (define-public kdoctools (package (name "kdoctools") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -1591,7 +1574,7 @@ application crashes.") name "-" version ".tar.xz")) (sha256 (base32 - "1dmpk453s71ls0q8hgpqqd5dcr7zlimf5wykizcy2wn7p77gzsgl")))) + "0xbmdqlvyw9s2g8kwn1wmvz09pn4vs386ibm1p92wdnpspp5did6")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -1639,7 +1622,7 @@ from DocBook files.") (define-public kfilemetadata (package (name "kfilemetadata") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -1648,7 +1631,7 @@ from DocBook files.") name "-" version ".tar.xz")) (sha256 (base32 - "045k1mgn8kg0qfsr5sl1499nzhzmbcvrqc205pmq6sh4r14nvk80")))) + "1hl61y15nqr5h5k4jqfz9bjj4gw6wdaiacxaslcwzn0sg4xyavab")))) (build-system cmake-build-system) (arguments `(#:phases @@ -1691,7 +1674,7 @@ by applications to write metadata.") (define-public kimageformats (package (name "kimageformats") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -1700,7 +1683,7 @@ by applications to write metadata.") name "-" version ".tar.xz")) (sha256 (base32 - "1q7019gbk59fwampna1ayjvw016c0q79hmldpaqh3xa9sh082wy4")))) + "0xfzpzaqgdncwxvg27qb0ryqi78nbsi0xcsg9cjmgspfx5mlgi15")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1745,7 +1728,7 @@ formats.") (define-public kjobwidgets (package (name "kjobwidgets") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -1754,7 +1737,7 @@ formats.") name "-" version ".tar.xz")) (sha256 (base32 - "04i5cvbxii7n0jr3ai1dh44miqbdkxb6an5w8s7qvkv0xmkml35g")))) + "0d3jxabjlf2s4p34pzrpfsg4xp9s8qd7dmg50yxl59dijd42xgxq")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1773,7 +1756,7 @@ asynchronous jobs.") (define-public knotifications (package (name "knotifications") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -1782,7 +1765,7 @@ asynchronous jobs.") name "-" version ".tar.xz")) (sha256 (base32 - "10481j2irlqhqd16xi412xbglnyjl0ndanlv9s0d3fxirs95zdd9")))) + "1agglvwaf0wh3fcs0ww3jxn900ych4dsvbaylrx4qip6girfmiyn")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1819,7 +1802,7 @@ covers feedback and persistent events.") (define-public kpackage (package (name "kpackage") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -1828,7 +1811,7 @@ covers feedback and persistent events.") name "-" version ".tar.xz")) (sha256 (base32 - "1xbfjwxb4gff8gg0hs5m9s0jcnzqk27rs2jr71g5ckhvs5psnkcd")) + "1s1n7r3j7l4kvd85dgssaaz70dd2w8vp34kwg49ak58cdai01vzb")) ;; Default to: external paths/symlinks can be followed by a ;; package (patches (search-patches "kpackage-allow-external-paths.patch")))) @@ -1880,7 +1863,7 @@ were traditional plugins.") (define-public kpty (package (name "kpty") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -1889,7 +1872,7 @@ were traditional plugins.") name "-" version ".tar.xz")) (sha256 (base32 - "1pnj07079l6gkz6171fcvljh0dcdy9s77p1q0l9nnkknjbr102pg")))) + "04sj612x15311yk2jmr3ak430syp5p59w559670sd18ih99mf8m3")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -1917,7 +1900,7 @@ and communicating with them using a pty.") (define-public kunitconversion (package (name "kunitconversion") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -1926,7 +1909,7 @@ and communicating with them using a pty.") name "-" version ".tar.xz")) (sha256 (base32 - "11jnqz218rga3f4ppf1d927c7qhh2qpghwjpsrnrxdkz5nrvnf79")))) + "0lxrydnjlilfm92aqrpd76dk8yfprgnb7nr66dwmbdmqz7znbl8h")))) (build-system cmake-build-system) (arguments `(#:phases @@ -1960,7 +1943,7 @@ gallons).") (define-public baloo (package (name "baloo") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -1969,7 +1952,7 @@ gallons).") name "-" version ".tar.xz")) (sha256 (base32 - "0xj12v0k58sr3snxyj4vx7dqhinrvk6qm0ikymscqgbmw9ijwxph")))) + "0wv8zi03plr279v9p923rwkx2kwhbpd6xlzyqi4v14vhcrmapg1c")))) (build-system cmake-build-system) (propagated-inputs `(("kcoreaddons" ,kcoreaddons) @@ -2025,7 +2008,7 @@ maintaining an index of the contents of your files.") (define-public kactivities-stats (package (name "kactivities-stats") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -2034,7 +2017,7 @@ maintaining an index of the contents of your files.") name "-" version ".tar.xz")) (sha256 (base32 - "129z2m5330j0l1nw8g3qjib60xmx54c6d2g9vnp4w8z0agnihs5f")))) + "1ns7f110a5vwabb33b1lnpa85kk5radf87bxm1gw4gzglsv7747d")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -2055,7 +2038,7 @@ by which applications, and what documents have been linked to which activity.") (define-public kbookmarks (package (name "kbookmarks") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -2064,7 +2047,7 @@ by which applications, and what documents have been linked to which activity.") name "-" version ".tar.xz")) (sha256 (base32 - "0clmfdcc1fc98q3vbfjf8x140a6df88ixhz0mny3dpv1wcr5cz53")))) + "1w4rqnzyars1pxam3nym1qily3ihd2j8cpkq8aha70nbj0dj3ckw")))) (build-system cmake-build-system) (propagated-inputs `(("kwidgetsaddons" ,kwidgetsaddons))) @@ -2098,7 +2081,7 @@ using the XBEL format.") (define-public kcmutils (package (name "kcmutils") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -2107,7 +2090,7 @@ using the XBEL format.") name "-" version ".tar.xz")) (sha256 (base32 - "0xv899p9f0hj6hd089mhn910qn66bihzpaa11ikrhbimckw8g19q")))) + "0a5jz9m27nyl1vchp68170j9v5z4csyv43vpnfs09l6wk9ggdcwh")))) (build-system cmake-build-system) (propagated-inputs `(("kconfigwidgets" ,kconfigwidgets) @@ -2151,7 +2134,7 @@ KCModules can be created with the KConfigWidgets framework.") (define-public kconfigwidgets (package (name "kconfigwidgets") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -2160,7 +2143,7 @@ KCModules can be created with the KConfigWidgets framework.") name "-" version ".tar.xz")) (sha256 (base32 - "1nqcrqr67m3kvq2r83x45zcdghk12bas9fp0s43s68imrhy5xikz")))) + "1l3hh7qgnz7mnn55abv03pq7zal9dgcw5gnhfr747wknd4h90w31")))) (build-system cmake-build-system) (propagated-inputs `(("kauth" ,kauth) @@ -2201,7 +2184,7 @@ their settings.") (define-public kdeclarative (package (name "kdeclarative") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -2210,7 +2193,7 @@ their settings.") name "-" version ".tar.xz")) (sha256 (base32 - "0kgawb8wfx4snk2ckwxj0hmpgcvq3k1zpsxqdawi4cmsy4bxzfs9")))) + "0ankjqrlpnj3c9sjnv5p8w279zizkl5ps3i5zw16hg44v6hdmcj0")))) (build-system cmake-build-system) (propagated-inputs `(("kconfig" ,kconfig) @@ -2264,7 +2247,7 @@ that offer bindings to some of the Frameworks.") (define-public kded (package (name "kded") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -2273,7 +2256,7 @@ that offer bindings to some of the Frameworks.") name "-" version ".tar.xz")) (sha256 (base32 - "1l6hs3spbs3618jwg3n7r3hrrkqxmmd43f0km8849x4641p72zyc")))) + "131hvxpqvkyh1sfb1j19jjzy7fyy6xisvpmx12lw1pvks0cnrqgn")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -2297,7 +2280,7 @@ started on demand.") (define-public kdesignerplugin (package (name "kdesignerplugin") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -2306,7 +2289,7 @@ started on demand.") name "-" version ".tar.xz")) (sha256 (base32 - "0hj4ng0i22rvw4kl0irhqhww3kvn4c0pncn38w1j5vim4gxv0xcd")))) + "0hlywnzd3d6bvhib1xqiqx39m7k8g16wsj102f7awd5gw3xrz8ga")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -2348,7 +2331,7 @@ ini-style description files.") (define-public kdesu (package (name "kdesu") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -2357,7 +2340,7 @@ ini-style description files.") name "-" version ".tar.xz")) (sha256 (base32 - "1gwvby51qqbkrs2vjpnplxr6m6xa5ddfdjs1iygh8kpqsh8a765k")))) + "1qhw1hmq2b6rkyibidmg532llv31vkhmp0a7j2myzi40ydbx1lar")))) (build-system cmake-build-system) (propagated-inputs `(("kpty" ,kpty))) @@ -2379,7 +2362,7 @@ with su and ssh respectively.") (define-public kdewebkit (package (name "kdewebkit") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -2388,7 +2371,7 @@ with su and ssh respectively.") name "-" version ".tar.xz")) (sha256 (base32 - "05idyw94ayjh7qdia9pnjmx29r5lsch421kv8h5ivr7ixcbrgk6n")))) + "0prl9751a8nv7qhg7fv8qygq0llh71w2p25sldl3zif44340jnhf")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -2411,7 +2394,7 @@ engine WebKit via QtWebKit.") (define-public kemoticons (package (name "kemoticons") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -2420,7 +2403,7 @@ engine WebKit via QtWebKit.") name "-" version ".tar.xz")) (sha256 (base32 - "0mz9hkhnprjbrfq54mqcvj8w87h025785m1bas80brsqzvni5krn")))) + "0ypcffpp0m75qwam386q6pyfbsij16y2vgpkn38li6ypxlxsvx2v")))) (build-system cmake-build-system) (propagated-inputs `(("kservice" ,kservice))) @@ -2451,7 +2434,7 @@ emoticons coming from different providers.") (define-public kglobalaccel (package (name "kglobalaccel") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -2460,7 +2443,7 @@ emoticons coming from different providers.") name "-" version ".tar.xz")) (sha256 (base32 - "1fk7wazfwr7smqiym3phm5yvw6cmiczag52y1vad8fgb3izd6zhl")))) + "10gl8prc1n0si52cmiglkz8dx79dylmxrh5mjpmyy5yy16chs1s1")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -2495,7 +2478,7 @@ window does not need focus for them to be activated.") (define-public kiconthemes (package (name "kiconthemes") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -2504,7 +2487,7 @@ window does not need focus for them to be activated.") name "-" version ".tar.xz")) (sha256 (base32 - "1f7pk6smi2f0mm7jkrw5ymmkhd9gi8vnmppyblp1v3pvmy571c2m")))) + "0hc3a6ax3yizpbvklxw3pm0r6j0r5jqx2ffbz1980g21lcgshd7g")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -2542,7 +2525,7 @@ in applications using the KDE Frameworks.") (define-public kinit (package (name "kinit") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -2551,7 +2534,7 @@ in applications using the KDE Frameworks.") name "-" version ".tar.xz")) (sha256 (base32 - "1rq9b59gdgcpvwd694l8h55sqahpdaky0n7ag5psjlfn5myf1d95")) + "0pmr6ckysdqpni49i9jgapsk88jfbrnlfybpcp3v51kl2nkwm0i9")) ;; Use the store paths for other packages and dynamically loaded ;; libs (patches (search-patches "kinit-kdeinit-extra_libs.patch" @@ -2610,7 +2593,7 @@ makes starting KDE applications faster and reduces memory consumption.") (define-public kio (package (name "kio") - (version "5.49.0") + (version "5.54.1") (source (origin (method url-fetch) (uri (string-append @@ -2619,7 +2602,7 @@ makes starting KDE applications faster and reduces memory consumption.") name "-" version ".tar.xz")) (sha256 (base32 - "0rrsg3g1b204cdp58vxd5dig1ggwyvk1382p1c86vn6w8qbrq27k")) + "11wdsq87w1ddkrm0mpik2qf0c0k897f1rflszfrrwkplfb0z63xp")) (patches (search-patches "kio-search-smbd-on-PATH.patch")))) (build-system cmake-build-system) (propagated-inputs @@ -2642,6 +2625,7 @@ makes starting KDE applications faster and reduces memory consumption.") ("kauth" ,kauth) ("kcodecs" ,kcodecs) ("kconfigwidgets" ,kconfigwidgets) + ("kcrash" ,kcrash) ("kdbusaddons" ,kdbusaddons) ("kdoctools" ,kdoctools) ("kiconthemes" ,kiconthemes) @@ -2702,7 +2686,7 @@ KIO enabled infrastructure.") (define-public knewstuff (package (name "knewstuff") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -2711,7 +2695,7 @@ KIO enabled infrastructure.") name "-" version ".tar.xz")) (sha256 (base32 - "1vhcl2z9rcqg8390l1cwn3yyi1n17pn6mn8fsplp25qhzimb8bmk")))) + "1l3ibadjvaqqjsb1lhkf6jkzy80dk15fgid125bqk4amwsyygnd3")))) (build-system cmake-build-system) (propagated-inputs `(("attica" ,attica) @@ -2758,7 +2742,7 @@ specification.") (define-public knotifyconfig (package (name "knotifyconfig") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -2767,7 +2751,7 @@ specification.") name "-" version ".tar.xz")) (sha256 (base32 - "09v4aq5x98sqg2awhw0n0y0rnjkr77kbf51xij0fiykd4llp9lfa")))) + "1ibxqi0y43qgjj4nikxwfppmda9xjmz63c5fml8c4w5d9mdag3if")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -2800,7 +2784,7 @@ notifications which can be embedded in your application.") (define-public kparts (package (name "kparts") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -2809,7 +2793,7 @@ notifications which can be embedded in your application.") name "-" version ".tar.xz")) (sha256 (base32 - "0zdz0byj0gsbgb007y8x37w8yf1gkw6dsp2s9bbdc4w6h9ipdj2k")))) + "0y2dr286hb2w4r7ifq39vd7ajsalqyh9d91dm19b2rpgdmvgxai6")))) (build-system cmake-build-system) (propagated-inputs `(("kio" ,kio) @@ -2817,8 +2801,7 @@ notifications which can be embedded in your application.") ("kxmlgui" ,kxmlgui))) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) - ("shared-mime-info" ,shared-mime-info) - )) + ("shared-mime-info" ,shared-mime-info))) (inputs `(("kauth" ,kauth) ("kbookmarks" ,kbookmarks) @@ -2853,7 +2836,7 @@ widgets with a user-interface defined in terms of actions.") (define-public kpeople (package (name "kpeople") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -2862,7 +2845,7 @@ widgets with a user-interface defined in terms of actions.") name "-" version ".tar.xz")) (sha256 (base32 - "0i5pd1d2jphsvpc3dpdw28dsdal1qrnnrx3k6qx4wax3f8ph5khv")))) + "0sl8wcj7w9vgczcv8mfvjlnghidyadbh1qsiv0pj63ywl7xgr1hx")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -2896,7 +2879,7 @@ to easily extend the contacts collection.") (define-public krunner (package (name "krunner") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -2905,7 +2888,7 @@ to easily extend the contacts collection.") name "-" version ".tar.xz")) (sha256 (base32 - "02l5gch9hpag1q5ixnb541g7m9lx25pbggldpa8zykp63apyca19")))) + "06y592v32926wq9iaypryj0173ca05vv0p5rrs4n77kwhkl0zq0v")))) (build-system cmake-build-system) (propagated-inputs `(("plasma-framework" ,plasma-framework))) @@ -2966,7 +2949,7 @@ typed.") (define-public kservice (package (name "kservice") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -2975,7 +2958,7 @@ typed.") name "-" version ".tar.xz")) (sha256 (base32 - "1wwb6c6m8f3b16p47adkc05rrlszvvym7ckks5xp08s58pk1dm8z")))) + "10qmrqyfjhf5nzjailgmb86nq62ffrmiddk3880mh49fwxs4l3qx")))) (build-system cmake-build-system) (propagated-inputs `(("kconfig" ,kconfig) @@ -3025,7 +3008,7 @@ types or handled by application specific code.") (define-public ktexteditor (package (name "ktexteditor") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -3034,7 +3017,7 @@ types or handled by application specific code.") name "-" version ".tar.xz")) (sha256 (base32 - "14iss8svx49vav0h2kg8vhv8g5hg4ky30s7049csfwz7xhp7jmcj")))) + "12yywvv82lmqmx89j1qxj45an49vx34brifxs9rpy3nxyh9c3vzy")))) (build-system cmake-build-system) (propagated-inputs `(("kparts" ,kparts))) @@ -3105,7 +3088,7 @@ library.") (define-public ktextwidgets (package (name "ktextwidgets") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -3114,7 +3097,7 @@ library.") name "-" version ".tar.xz")) (sha256 (base32 - "14gclshmpwmfwkp2hzlnf823pjjmknd9q0gdclsh3yy268c2rsw1")))) + "154j3an7x787l44hw1fmksm3h6kziyaw4l61zw9mas24z3d86hl5")))) (build-system cmake-build-system) (propagated-inputs `(("ki18n" ,ki18n) @@ -3152,7 +3135,7 @@ It supports rich text as well as plain text.") (define-public kwallet (package (name "kwallet") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -3161,7 +3144,7 @@ It supports rich text as well as plain text.") name "-" version ".tar.xz")) (sha256 (base32 - "13bmks9jb3yhp6clv25qkqkrvbhfyk9z16laxsv79jdd82lxgn1z")))) + "0hyipka97g2djk43x8pqbjvrgswsp8kph6za0s5dl4napfikq8k2")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -3194,7 +3177,7 @@ the passwords on KDE work spaces.") (define-public kxmlgui (package (name "kxmlgui") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -3203,7 +3186,7 @@ the passwords on KDE work spaces.") name "-" version ".tar.xz")) (sha256 (base32 - "0wsgs5ya3wnc5cryi1r9i30sq8dnnhh15p02skdjlhwjfvdhxmfa")))) + "01napbq81mcp9ngyl26an52l6ndsgrhzhy2mfd8jrbil2sbrcxq7")))) (build-system cmake-build-system) (propagated-inputs `(("kconfig" ,kconfig) @@ -3246,7 +3229,7 @@ descriptions for integrating actions from plugins.") (define-public kxmlrpcclient (package (name "kxmlrpcclient") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -3255,7 +3238,7 @@ descriptions for integrating actions from plugins.") name "-" version ".tar.xz")) (sha256 (base32 - "0l4jnvn7s77jkvd2z44mz24mfzcw499plms79j21pjryc88drh06")))) + "199syc5wl8myc4vcvbnw4a8mlfkb2gcmgs57p8w7akp7mz6l75y6")))) (build-system cmake-build-system) (propagated-inputs `(("kio" ,kio))) @@ -3289,7 +3272,7 @@ setUrl, setUserAgent and call.") (define-public plasma-framework (package (name "plasma-framework") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -3298,7 +3281,7 @@ setUrl, setUserAgent and call.") name "-" version ".tar.xz")) (sha256 (base32 - "1yrccbkdpnfbgn7fzpmzzxm5c7fhkv1vqygq1f96r30fia0cj5jv")))) + "1933i8irn76ilz3nychbnhy1bsc39iscn3qrab0lwmshfmw8c4zj")))) (build-system cmake-build-system) (propagated-inputs `(("kpackage" ,kpackage) @@ -3386,7 +3369,7 @@ script engines.") (define-public kde-frameworkintegration (package (name "kde-frameworkintegration") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) (uri (string-append @@ -3395,7 +3378,7 @@ script engines.") "frameworkintegration-" version ".tar.xz")) (sha256 (base32 - "1ni4jrny630zf3zwmqbm8z7dqgiar58992lylfv7kspdg5crcgfx")))) + "1rzi3ydw7hjhg4vbsfan7zgaa2a2bmp7mph95h2kidf8x816qv2d")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -3443,7 +3426,7 @@ workspace.") (define-public kdelibs4support (package (name "kdelibs4support") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) @@ -3452,7 +3435,7 @@ workspace.") (version-major+minor version) "/portingAids/" name "-" version ".tar.xz")) (sha256 - (base32 "1cz70c77l66lbw4fbgmfbq1fldybqxsiay2pg9risgqp3ra8wahi")))) + (base32 "02kklfcjsll4pf4rfll7jrr7jpcwd57954ypjjhn3xgr6p0w0hdm")))) (build-system cmake-build-system) (native-inputs `(("dbus" ,dbus) @@ -3559,7 +3542,7 @@ http://community.kde.org/Frameworks/Porting_Notes should help with this.") (define-public khtml (package (name "khtml") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) @@ -3568,7 +3551,7 @@ http://community.kde.org/Frameworks/Porting_Notes should help with this.") (version-major+minor version) "/portingAids/" name "-" version ".tar.xz")) (sha256 - (base32 "0k9m2pgq64grmgc6ywpzfnn65h8wfkkiwjbmz2mwbf2yi9c1ky64")))) + (base32 "17d8cim4ph7nxc5gkidhxc659yn9a7dqvnrihx9sj1cy01qnc7da")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -3618,7 +3601,7 @@ technology and using KJS for JavaScript support.") (define-public kjs (package (name "kjs") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) @@ -3627,7 +3610,7 @@ technology and using KJS for JavaScript support.") (version-major+minor version) "/portingAids/" name "-" version ".tar.xz")) (sha256 - (base32 "057ikyi4wffjvxdyk08hmj7h8vmbwbcxv98apmjzgsd611zvx5p0")))) + (base32 "0bidbvbwbrbwwm0drw6l43vgmsp50c946jjq7pgnq1gf7mhscwcy")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -3651,7 +3634,7 @@ support.") (define-public kjsembed (package (name "kjsembed") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) @@ -3660,7 +3643,7 @@ support.") (version-major+minor version) "/portingAids/" name "-" version ".tar.xz")) (sha256 - (base32 "0qddjkfm6f0f5dynqvi3l23mgyfdbk4xzg967sj3a2qlq423ah0m")))) + (base32 "1pjpk8ysrnh78infq99i0wrf78h8h7hbfnr1m7agzffhbqa671z8")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -3680,7 +3663,7 @@ QObjects, so you can script your applications.") (define-public kmediaplayer (package (name "kmediaplayer") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) @@ -3689,7 +3672,7 @@ QObjects, so you can script your applications.") (version-major+minor version) "/portingAids/" name "-" version ".tar.xz")) (sha256 - (base32 "0hbx48ivj4i96yagd9n9vd22ycsljrvijm6nfms4x7z7jr49flrx")))) + (base32 "0qalqqkn2yvxgr45l7zm36bcpxwbgn8ngxsvyb5cxfaalwr0mkyf")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -3726,7 +3709,7 @@ KParts instead.") (define-public kross (package (name "kross") - (version "5.49.0") + (version "5.54.0") (source (origin (method url-fetch) @@ -3735,7 +3718,7 @@ KParts instead.") (version-major+minor version) "/portingAids/" name "-" version ".tar.xz")) (sha256 - (base32 "194zcf499fkwk3wcs3kc3l0fi9h8gn5yqh6gxrgiyn6iyy9a4qdz")))) + (base32 "18ij9339khskla4r0afl0n6x4pd157y1l5bk2ldb9anpck3p71kd")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) diff --git a/gnu/packages/patches/kio-search-smbd-on-PATH.patch b/gnu/packages/patches/kio-search-smbd-on-PATH.patch index 47e20cfc0b..55535ffa11 100644 --- a/gnu/packages/patches/kio-search-smbd-on-PATH.patch +++ b/gnu/packages/patches/kio-search-smbd-on-PATH.patch @@ -16,7 +16,7 @@ pkgs/development/libraries/kde-frameworks/kio/samba-search-path.patch + QLatin1Char pathSep(':'); + QStringList paths = QFile::decodeName(pathEnv).split(pathSep, QString::SkipEmptyParts); + for (QStringList::iterator it = paths.begin(); it != paths.end(); ++it) { -+ it->append("/smbd"); ++ it->append(QStringLiteral("/smbd")); + if (QFile::exists(*it)) { + return true; + } -- cgit v1.2.3 From 856e3f9cb4dc3bc9c13a06f20d84df70e11213a3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 3 Feb 2019 19:33:47 +0100 Subject: gnu: KDE Plasma: Update to 5.14.5. * gnu/packages/kde-plasma.scm (libkscreen): Update to 5.14.5. (libksysguard): Likewise. [inputs]: Add KGLOBALACCEL and KIO. --- gnu/packages/kde-plasma.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm index bed9cc09bc..ff6fa64a17 100644 --- a/gnu/packages/kde-plasma.scm +++ b/gnu/packages/kde-plasma.scm @@ -32,14 +32,14 @@ (define-public libkscreen (package (name "libkscreen") - (version "5.13.5") + (version "5.14.5") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "04719va15i66qn1xqx318v6risxhp8bfcnhxh9mqm5h9qx5c6c4k")))) + (base32 "1vyaml5ap9siw9idiny92li2bykd0nwjsmwmg0c7ad912j4g1s7y")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -71,7 +71,7 @@ basic needs and easy to configure for those who want special setups.") (define-public libksysguard (package (name "libksysguard") - (version "5.13.4") + (version "5.14.5") (source (origin (method url-fetch) @@ -79,7 +79,7 @@ basic needs and easy to configure for those who want special setups.") "/libksysguard-" version ".tar.xz")) (sha256 (base32 - "0k8q5bxk9zyv7c3nny1c399v8acqs618nw39q20pj2qdijl9ibvh")))) + "11nz0g7dqvpvgsv0a7sai445vgfsfi25plj7jb1i46n7zf8i8mya")))) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) ("pkg-config" ,pkg-config))) @@ -92,6 +92,8 @@ basic needs and easy to configure for those who want special setups.") ("kcompletion" ,kcompletion) ("kconfig" ,kconfig) ("kcoreaddons" ,kcoreaddons) + ("kglobalaccel" ,kglobalaccel) + ("kio" ,kio) ("kwidgetsaddons" ,kwidgetsaddons) ("kservice" ,kservice) ("qtbase" ,qtbase) -- cgit v1.2.3 From 6a97dfff19cce5cee2c779efcb9c3ff93076f81c Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Fri, 9 Jun 2017 13:12:08 +0200 Subject: gnu: Add kdecoration. * gnu/packages/kde-plasma.scm (kdecoration): New public variable. Co-authored-by: Marius Bakke --- gnu/packages/kde-plasma.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm index ff6fa64a17..c8e1f610bb 100644 --- a/gnu/packages/kde-plasma.scm +++ b/gnu/packages/kde-plasma.scm @@ -1,6 +1,8 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 Thomas Danckaert ;;; Copyright © 2018 Meiyo Peng +;;; Copyright © 2019 Marius Bakke +;;; Copyright © 2017 Hartmut Goebel ;;; ;;; This file is part of GNU Guix. ;;; @@ -29,6 +31,36 @@ #:use-module (gnu packages qt) #:use-module (gnu packages xorg)) +(define-public kdecoration + (package + (name "kdecoration") + (version "5.14.5") + (source (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/plasma/" version + "/kdecoration-" version ".tar.xz")) + (sha256 + (base32 + "115pli0qpa8lx0jasg1886fcg7gb2kk8v6k8r8l8c820l97sq7in")))) + (properties `((tags . '("Desktop" "KDE" "Plasma")))) + (build-system cmake-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules))) + (inputs + `(("ki18n" ,ki18n) + ("qtbase" ,qtbase))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'check 'check-setup + (lambda _ (setenv "QT_QPA_PLATFORM" "offscreen") #t))))) + (home-page "https://cgit.kde.org/kdecoration.git") + (synopsis "Plugin based library to create window decorations") + (description "KDecoration is a library to create window decorations. +These window decorations can be used by for example an X11 based window +manager which re-parents a Client window to a window decoration frame.") + (license license:lgpl3+))) + (define-public libkscreen (package (name "libkscreen") -- cgit v1.2.3 From fd56c4be535223968e1ef553c884ab55f32d71ac Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Fri, 9 Jun 2017 13:20:42 +0200 Subject: gnu: Add kscreenlocker. * gnu/packages/kde-plasma.scm (kscreenlocker): New public variable. Co-authored-by: Marius Bakke --- gnu/packages/kde-plasma.scm | 66 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm index c8e1f610bb..2b84902225 100644 --- a/gnu/packages/kde-plasma.scm +++ b/gnu/packages/kde-plasma.scm @@ -25,8 +25,10 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix build-system cmake) #:use-module (gnu packages compression) + #:use-module (gnu packages freedesktop) #:use-module (gnu packages glib) #:use-module (gnu packages kde-frameworks) + #:use-module (gnu packages linux) #:use-module (gnu packages pkg-config) #:use-module (gnu packages qt) #:use-module (gnu packages xorg)) @@ -61,6 +63,70 @@ These window decorations can be used by for example an X11 based window manager which re-parents a Client window to a window decoration frame.") (license license:lgpl3+))) +(define-public kscreenlocker + (package + (name "kscreenlocker") + (version "5.14.5") + (source (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/plasma/" version + "/kscreenlocker-" version ".tar.xz")) + (sha256 + (base32 + "16amr7pz0k6w5vkk1dwn2qi3s1mln0jypwmjazqq2lbwimn8k56m")))) + (properties `((tags . '("Desktop" "KDE" "Plasma")))) + (build-system cmake-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'check 'check-setup + (lambda* (#:key inputs outputs #:allow-other-keys) + (system (string-append (assoc-ref inputs "xorg-server") + "/bin/Xvfb :1 -screen 0 640x480x24 &")) + (setenv "DISPLAY" ":1") + #t)) + (delete 'check) + ;; Tests use the installed library and require a DBus session. + (add-after 'install 'check + (lambda _ + (setenv "CTEST_OUTPUT_ON_FAILURE" "1") + (invoke "dbus-launch" "ctest" ".")))))) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules) + ("pkg-config" ,pkg-config) + + ;; For tests. + ("dbus" ,dbus) + ("xorg-server" ,xorg-server))) + (inputs + `(("kcmutils" ,kcmutils) + ("kcrash" ,kcrash) + ("kdeclarative" ,kdeclarative) + ("kglobalaccel" ,kglobalaccel) + ("ki18n" ,ki18n) + ("kidletime" ,kidletime) + ("knotifications" ,knotifications) + ("ktextwidgets" ,ktextwidgets) + ("kwayland" ,kwayland) + ("kwindowsystem" ,kwindowsystem) + ("kxmlgui" ,kxmlgui) + ("libseccomp" ,libseccomp) ;for sandboxing the look'n'feel package + ("libxcursor" ,libxcursor) ;missing in CMakeList.txt + ("libxi" ,libxi) ;XInput, required for grabbing XInput2 devices + ("linux-pam" ,linux-pam) + ("logind" ,elogind) ;optional loginctl support + ("qtbase" ,qtbase) + ("qtdeclarative" ,qtdeclarative) + ("qtx11extras" ,qtx11extras) + ("solid" ,solid) + ("wayland" ,wayland) + ("xcb-util-keysyms" ,xcb-util-keysyms))) + (home-page "https://cgit.kde.org/kscreenlocker.git") + (synopsis "Screen locking library") + (description + "@code{kscreenlocker} is a library for creating secure lock screens.") + (license license:gpl2+))) + (define-public libkscreen (package (name "libkscreen") -- cgit v1.2.3 From df724c9cfcd5007a1f2d7daaea3f661150548bfc Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Thu, 7 Feb 2019 00:07:15 +0000 Subject: gnu: python-trezor-agent: Update to 0.13.0. * gnu/packages/finance.scm (python-trezor-agent): Update to 0.13.0. [propagated-inputs]: Add python-configargparse, python-daemon, python-docutils, python-mnemonic, python-pymsgbox, python-wheel. [native-inputs]: Add gnupg. [synopsis]: Generalize description to hardware wallets. [arguments]<#:phases>[remove-requires-backports-shutil-which]: New phase. --- gnu/packages/finance.scm | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index e44be713f2..27f74ec79e 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -45,6 +45,7 @@ #:use-module (gnu packages dns) #:use-module (gnu packages emacs) #:use-module (gnu packages dbm) + #:use-module (gnu packages gnupg) #:use-module (gnu packages graphviz) #:use-module (gnu packages groff) #:use-module (gnu packages libedit) @@ -591,7 +592,7 @@ Monero GUI client.") (define-public python-trezor-agent (package (name "python-trezor-agent") - (version "0.9.4") + (version "0.13.0") (source (origin (method git-fetch) @@ -600,11 +601,18 @@ Monero GUI client.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "15aaqk79d9y9nbsfznf2iscz12z5ispcj8kr8v5bc0sqqj2brs12")))) + (base32 "0i4igkxi8fwdlbhg6nx27lhnc9v9nmrw4j5fvpnc202n6yjlc7x7")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'remove-requires-backports-shutil-which + ;; Remove requires on backport of shutil_which, as python 3.4+ has + ;; a built-in implementation supported in python-trezor-agent. + (lambda _ + (substitute* "setup.py" + (("'backports.shutil_which>=3.5.1',") "")) + #t)) (delete 'check) (add-after 'install 'check (lambda* (#:key outputs inputs #:allow-other-keys) @@ -612,15 +620,22 @@ Monero GUI client.") (add-installed-pythonpath inputs outputs) (invoke "py.test")))))) (propagated-inputs - `(("python-ecdsa" ,python-ecdsa) + `(("python-configargparse" ,python-configargparse) + ("python-daemon" ,python-daemon) + ("python-docutils" ,python-docutils) + ("python-ecdsa" ,python-ecdsa) ("python-ed25519" ,python-ed25519) + ("python-mnemonic" ,python-mnemonic) + ("python-pymsgbox" ,python-pymsgbox) ("python-semver" ,python-semver) - ("python-unidecode" ,python-unidecode))) + ("python-unidecode" ,python-unidecode) + ("python-wheel" ,python-wheel))) (native-inputs - `(("python-mock" ,python-mock) + `(("gnupg" ,gnupg) + ("python-mock" ,python-mock) ("python-pytest" ,python-pytest))) (home-page "https://github.com/romanz/trezor-agent") - (synopsis "TREZOR SSH and GPG host support") + (synopsis "Use hardware wallets as SSH and GPG agent") (description "@code{libagent} is a library that allows using TREZOR, Keepkey and Ledger Nano as a hardware SSH/GPG agent.") -- cgit v1.2.3 From 7fafdadd4267b1b9c3e2898415a91d7b2ff6fdc7 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Thu, 7 Feb 2019 00:07:49 +0000 Subject: gnu: trezor-agent: Update 0.10.0. Fixes . * gnu/packages/finance.scm (trezor-agent): Update to 0.10.0. [arguments]<#:phases>[fixup-agent-py]: New phase. [native-inputs]: Add python-hidapi. [home-page]: Use https url. --- gnu/packages/finance.scm | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 27f74ec79e..36cb508564 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -804,19 +804,32 @@ Then set the environment variable GNUPGHOME to (define-public trezor-agent (package (name "trezor-agent") - (version "0.9.0") + (version "0.10.0") (source (origin (method url-fetch) (uri (pypi-uri "trezor_agent" version)) (sha256 (base32 - "1i5cdamlf3c0ym600pjklij74p8ifj9cv7xrpnrfl1b8nkadswbz")))) + "144657c7bn0a667dq5fv5r6j7iilxf3h9agj29v1m2qpq40g0az8")))) + (arguments + ;; Tests fail with "AttributeError: module 'attr' has no attribute 's'". + `(#:phases + (modify-phases %standard-phases + (add-after 'wrap 'fixup-agent-py + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out"))) + ;; overwrite the wrapper with the real thing. + (install-file "./trezor_agent.py" + (string-append out "/bin")) + #t)))))) (build-system python-build-system) (inputs `(("python-trezor" ,python-trezor) ("python-trezor-agent" ,python-trezor-agent))) - (home-page "http://github.com/romanz/trezor-agent") + (native-inputs + `(("python-hidapi" ,python-hidapi))) + (home-page "https://github.com/romanz/trezor-agent") (synopsis "Using Trezor as hardware SSH/GPG agent") (description "This package allows using Trezor as a hardware SSH/GPG agent.") -- cgit v1.2.3 From 27e65afc10df2e6a7a20272b22a12404247f2585 Mon Sep 17 00:00:00 2001 From: Jens M Date: Thu, 8 Nov 2018 21:03:56 +1300 Subject: gnu: Add font-adobe-source-sans-pro. * gnu/packages/fonts.scm (font-adobe-source-sans-pro): New variable. Signed-off-by: Leo Famulari --- gnu/packages/fonts.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index f77f9da163..7dae798438 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -23,6 +23,7 @@ ;;; Copyright © 2017 Mohammed Sadiq ;;; Copyright © 2018 Charlie Ritter ;;; Copyright © 2018 Gabriel Hondet +;;; Copyright © 2019 Jens Mølgaard ;;; ;;; This file is part of GNU Guix. ;;; @@ -857,6 +858,31 @@ Powerline support.") designed to work well in user interface environments.") (license license:silofl1.1))) +(define-public font-adobe-source-sans-pro + (package + (name "font-adobe-source-sans-pro") + (version "2.040R-ro-1.090R-it") + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/adobe-fonts/source-sans-pro/archive/" + (regexp-substitute/global + ;; The upstream tag uses "/" between the roman and italic + ;; versions, so substitute our "-" separator here. + #f "R-ro-" version 'pre "R-ro/" 'post) ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1wpbhd2idps53ph8rg1mhr3vz4lsgbpjprcq10nliwcxdz9d8lv0")))) + (build-system font-build-system) + (home-page "https://github.com/adobe-fonts/source-sans-pro") + (synopsis + "Sans serif font family for user interface environments") + (description + "Source Sans Pro is a set of OpenType fonts that have been designed to +work well in user interface (UI) environments.") + (license license:silofl1.1))) + (define-public font-fira-mono (package (name "font-fira-mono") -- cgit v1.2.3 From 3cdd2e95e923c8df23ee5be604c4fd05a2db29f3 Mon Sep 17 00:00:00 2001 From: Jens M Date: Thu, 8 Nov 2018 21:09:00 +1300 Subject: gnu: Add font-adobe-source-serif-pro. * gnu/packages/fonts.scm (font-adobe-source-serif-pro): New variable. Signed-off-by: Leo Famulari --- gnu/packages/fonts.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 7dae798438..9d49c02cf6 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -883,6 +883,31 @@ designed to work well in user interface environments.") work well in user interface (UI) environments.") (license license:silofl1.1))) +(define-public font-adobe-source-serif-pro + (package + (name "font-adobe-source-serif-pro") + (version "2.007R-ro-1.007R-it") + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/adobe-fonts/source-serif-pro/archive/" + (regexp-substitute/global + ;; The upstream tag uses "/" between the roman and italic + ;; versions, so substitute our "-" separator here. + #f "R-ro-" version 'pre "R-ro/" 'post) ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1sws9k26ldqk375qsigk1zv8cq1xlvadjwvv3dqrcc3qzm1c7hwc")))) + (build-system font-build-system) + (home-page "https://github.com/adobe-fonts/source-serif-pro") + (synopsis + "Serif typeface to complement Source Sans Pro for setting text") + (description + "Source Serif Pro is a set of OpenType fonts to complement the Source +Sans Pro family.") + (license license:silofl1.1))) + (define-public font-fira-mono (package (name "font-fira-mono") -- cgit v1.2.3 From df4b9dd1a6ccaaa73bed7fd77b34c5c913230dcd Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 13 Feb 2019 00:41:22 +0100 Subject: gnu: LXQt: Adjust imports for KDE move. This is a follow-up to commit bec2a2e10e199d6ee671ec5713bd103242e91b62. * gnu/packages/lxqt.scm: Import (gnu packages kde-plasma). --- gnu/packages/lxqt.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index b3d32c284f..a37d2a1dd5 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -43,8 +43,8 @@ #:use-module (gnu packages gnome) #:use-module (gnu packages gtk) #:use-module (gnu packages image) - #:use-module (gnu packages kde) #:use-module (gnu packages kde-frameworks) + #:use-module (gnu packages kde-plasma) #:use-module (gnu packages linux) #:use-module (gnu packages perl) #:use-module (gnu packages lxde) -- cgit v1.2.3 From c7cf43ddec9be5389d3a2623d6414d9b55354f64 Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Tue, 12 Feb 2019 23:05:01 +0000 Subject: gnu: emacs-biblio: Update to 0.2. * gnu/packages/emacs-xyz.scm (emacs-biblio): Update to 0.2. Signed-off-by: Leo Famulari --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 339927a4f0..957c9ea613 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -8918,7 +8918,7 @@ outline-mode), so there is no such thing like an outshine mode, only (define-public emacs-biblio (package (name "emacs-biblio") - (version "0.1") + (version "0.2") (source (origin (method url-fetch) @@ -8927,7 +8927,7 @@ outline-mode), so there is no such thing like an outshine mode, only (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "109fvivsb4r0rbqljngqrmxqvbnbkqlivczx6brrvlr7ci625lhf")))) + "0vwrljmab8m1z83048gxx5mryml9f5pb3h0jpwkvqcl0ra152lzx")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-seq" ,emacs-seq) -- cgit v1.2.3 From 344e0f56218f6b2680e0ab00446eed372216d420 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 12 Feb 2019 23:21:19 -0500 Subject: gnu: netpbm: Fix a hard-coded path. Fixes . * gnu/packages/netpbm.scm (netpbm)[arguments]: Patch a path in the 'configure' phase. --- gnu/packages/netpbm.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/netpbm.scm b/gnu/packages/netpbm.scm index e5246660a2..9c0e970257 100644 --- a/gnu/packages/netpbm.scm +++ b/gnu/packages/netpbm.scm @@ -135,7 +135,9 @@ ;; 'gsc', so look for that instead. (substitute* "converter/other/pstopnm.c" (("\"%s/gs\"") - "\"%s/gsc\""))) + "\"%s/gsc\"") + (("/usr/bin/gs") + (string-append (assoc-ref inputs "ghostscript") "/bin/gsc")))) #t)) (add-before 'check 'setup-check (lambda _ -- cgit v1.2.3 From 3d2386563dea801a8e7ead37d0f60fc38bd5b7a7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 12 Feb 2019 15:03:05 +0100 Subject: gnu: duperemove: Update to 0.11.1. * gnu/packages/disk.scm (duperemove): Update to 0.11.1. --- gnu/packages/disk.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index ceacd98a43..354f00dfa1 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2012, 2013 Nikita Karetnikov ;;; Copyright © 2015 Mathieu Lirzin ;;; Copyright © 2015 Mark H Weaver -;;; Copyright © 2016, 2018 Tobias Geerinckx-Rice +;;; Copyright © 2016, 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2016 Efraim Flashner ;;; Copyright © 2016 Jan Nieuwenhuizen ;;; Copyright © 2016 Roel Janssen @@ -478,7 +478,7 @@ a card with a smaller capacity than stated.") (define-public duperemove (package (name "duperemove") - (version "0.11") + (version "0.11.1") (source (origin (method url-fetch) (uri (string-append @@ -486,7 +486,7 @@ a card with a smaller capacity than stated.") version ".tar.gz")) (sha256 (base32 - "0rjmmh42yqw9a5j6sp31cqwxk3s97dsi4xz0wpxpllj7bsp3aiw5")) + "1j1alh3blbj1wg1zmkpwrf40nggwg8xbgsk2mnn9albymwdwkhvm")) (file-name (string-append name "-" version ".tar.gz")))) (build-system gnu-build-system) (native-inputs -- cgit v1.2.3 From acc6eb89c81678706c5bc2b3fd1baa0cd604e6b1 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 12 Feb 2019 15:15:45 +0100 Subject: gnu: duperemove: Don't use unstable tarball. * gnu/packages/disk.scm (duperemove)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/disk.scm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index 354f00dfa1..55756445af 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -479,15 +479,15 @@ a card with a smaller capacity than stated.") (package (name "duperemove") (version "0.11.1") - (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/markfasheh/duperemove/archive/v" - version ".tar.gz")) - (sha256 - (base32 - "1j1alh3blbj1wg1zmkpwrf40nggwg8xbgsk2mnn9albymwdwkhvm")) - (file-name (string-append name "-" version ".tar.gz")))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/markfasheh/duperemove.git") + (commit (string-append "v" version)))) + (sha256 + (base32 "1scz76pvpljvrpfn176125xwaqwyy4pirlm11sc9spb2hyzknw2z")) + (file-name (git-file-name name version)))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 4b7686818826bde2d6f0fa51ba439fe285a275e6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 12 Feb 2019 16:07:34 +0100 Subject: gnu: gparted: Update to 0.33.0. * gnu/packages/disk.scm (gparted): Update to 0.33.0. --- gnu/packages/disk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index 55756445af..dd424461d5 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -340,14 +340,14 @@ and can dramatically shorten the lifespan of the drive if left unchecked.") (define-public gparted (package (name "gparted") - (version "0.32.0") + (version "0.33.0") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/gparted/gparted/gparted-" version "/gparted-" version ".tar.gz")) (sha256 - (base32 "1fjp4c8jc0kjbbih1x1vs9v40d9lncma642kflnmy0bixxnvh7df")))) + (base32 "1ml1ky3s75lbxr91p608q3prsdh9x899mw7nbgk252pqhg4vh8sh")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; tests require a network connection -- cgit v1.2.3 From fe99b7f77e8a67b71ab9db8dee371f42871ea13d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 12 Feb 2019 16:08:16 +0100 Subject: gnu: yadifa: Don't use NAME in source URI. * gnu/packages/dns.scm (yadifa)[source]: Hard-code NAME. --- gnu/packages/dns.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index 09f0194bf7..223dc0e814 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2016, 2017 Efraim Flashner ;;; Copyright © 2016 John Darrington ;;; Copyright © 2016 Nils Gillmann -;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice +;;; Copyright © 2016, 2017, 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2016 Marius Bakke ;;; Copyright © 2017 Vasile Dumitrascu ;;; Copyright © 2017 Gregor Giesen @@ -531,7 +531,7 @@ served by AS112. Stub and forward zones are supported.") (method url-fetch) (uri (string-append "http://cdn.yadifa.eu/sites/default/files/releases/" - name "-" version "-" build ".tar.gz")) + "yadifa-" version "-" build ".tar.gz")) (sha256 (base32 "15xhzg4crjcxascwpz6y8qpqcgypzv2p9bspdskp4nx1x1y4316c"))))) (build-system gnu-build-system) -- cgit v1.2.3 From 92a3336205fd42028ab5ad15849373f5e2a9dc34 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 12 Feb 2019 16:08:42 +0100 Subject: gnu: yadifa: Update to 2.3.9. * gnu/packages/dns.scm (yadifa): Update to 2.3.9. --- 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 223dc0e814..2259c8c860 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -524,16 +524,16 @@ served by AS112. Stub and forward zones are supported.") (define-public yadifa (package (name "yadifa") - (version "2.3.8") + (version "2.3.9") (source - (let ((build "7713")) + (let ((build "8497")) (origin (method url-fetch) (uri (string-append "http://cdn.yadifa.eu/sites/default/files/releases/" "yadifa-" version "-" build ".tar.gz")) (sha256 - (base32 "15xhzg4crjcxascwpz6y8qpqcgypzv2p9bspdskp4nx1x1y4316c"))))) + (base32 "0xvyr91sfgzkpw6g3h893ldbwnki3w2472n56rr18w67qghs1sa5"))))) (build-system gnu-build-system) (native-inputs `(("which" ,which))) -- cgit v1.2.3 From 0a87bc9c2bd3d5eaef5b5d026d4e75755f33d3c2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 12 Feb 2019 16:09:16 +0100 Subject: gnu: nsd: Update to 4.1.26. * gnu/packages/dns.scm (nsd): Update to 4.1.26. --- gnu/packages/dns.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index 2259c8c860..4f3a11c276 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -294,15 +294,14 @@ asynchronous fashion.") (define-public nsd (package (name "nsd") - (version "4.1.25") + (version "4.1.26") (source (origin (method url-fetch) (uri (string-append "https://www.nlnetlabs.nl/downloads/nsd/nsd-" version ".tar.gz")) (sha256 - (base32 - "0zyzjd3wmq258jiry62ci1z23qfd0rc5ggnpmybc60xvpddgynwg")))) + (base32 "1x0mvj4872dzj1rr9adnchdm4dhn41xmc459p5j4s0r13m1l32lz")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From db3f5226ac16ff10a630bea96b1f4c53b252c310 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 12 Feb 2019 16:11:38 +0100 Subject: gnu: knot: Don't use NAME in source URI. * gnu/packages/dns.scm (knot)[source]: Hard-code NAME. --- gnu/packages/dns.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index 4f3a11c276..060002c7aa 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -574,7 +574,7 @@ Extensions} (DNSSEC).") (source (origin (method url-fetch) (uri (string-append "https://secure.nic.cz/files/knot-dns/" - name "-" version ".tar.xz")) + "knot-" version ".tar.xz")) (sha256 (base32 "1pwjcv7hzhqawisibybma160k77a6f1v94xw6ay9c7j49vrw05w7")) -- cgit v1.2.3 From ffbaa2564effa53663003c493b93683ceedafc94 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 12 Feb 2019 16:11:48 +0100 Subject: gnu: knot: Update to 2.7.6. * gnu/packages/dns.scm (knot): Update to 2.7.6. --- gnu/packages/dns.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index 060002c7aa..dbd00271b1 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -570,14 +570,14 @@ Extensions} (DNSSEC).") (define-public knot (package (name "knot") - (version "2.7.3") + (version "2.7.6") (source (origin (method url-fetch) (uri (string-append "https://secure.nic.cz/files/knot-dns/" "knot-" version ".tar.xz")) (sha256 (base32 - "1pwjcv7hzhqawisibybma160k77a6f1v94xw6ay9c7j49vrw05w7")) + "18lpyq3vgr2ainmfiy14x7hcf1zxza66bhkpr54jaz2gy1viijx1")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 90325cf7e205b7e3fbd8df978abbde095053c1e6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 12 Feb 2019 20:20:54 +0100 Subject: gnu: console-setup: Update to 1.189. * gnu/packages/xorg.scm (console-setup): Update to 1.189. --- gnu/packages/xorg.scm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index bf7a4050a3..de8d784e64 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -6366,16 +6366,16 @@ output.") (define-public console-setup (package (name "console-setup") - (version "1.188") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://salsa.debian.org/installer-team/console-setup.git") - (commit version))) - (sha256 - (base32 - "1741mg2wc5wa63clkijmv04zd6jxhc7c6aq7mkhqw1r4dhfhih19")) - (file-name (git-file-name name version)))) + (version "1.189") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://salsa.debian.org/installer-team/console-setup.git") + (commit version))) + (sha256 + (base32 "09rfnnhwjm98im711v6jrgl49iy5n1b26x12zzk5rw6g1667mz86")) + (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments '(#:make-flags -- cgit v1.2.3 From 8b9b2210dc1a7e1ac63bd85df9e8d0c39c59a3f0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 23 Dec 2018 11:06:13 +0100 Subject: gnu: coq: Don't use unstable tarball. * gnu/packages/coq.scm (coq)[source]: Use GIT-FETCH and GIT-FILE-NAME. [arguments]: Add 'make-git-checkout-writable' phase. --- gnu/packages/coq.scm | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm index e42f8af1ab..6cedb8363f 100644 --- a/gnu/packages/coq.scm +++ b/gnu/packages/coq.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Julien Lepiller +;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2019 Dan Frumin ;;; ;;; This file is part of GNU Guix. @@ -42,14 +43,15 @@ (package (name "coq") (version "8.8.2") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/coq/coq/archive/V" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "0i2hs0i6rp27cy8zd0mx7jscqw5cx2y0diw0pxgij66s3yr47y7r")))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/coq/coq.git") + (commit (string-append "V" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "03v8b57mz3ivsijwxy51avzwiyhla5ijaf98a5a2q29yabdq8dkp")))) (native-search-paths (list (search-path-specification (variable "COQPATH") @@ -63,6 +65,10 @@ (arguments `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'make-git-checkout-writable + (lambda _ + (for-each make-file-writable (find-files ".")) + #t)) (replace 'configure (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) -- cgit v1.2.3 From aaa2add87111051b01159aa2e46dd7f55b28edb6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 23 Dec 2018 11:11:33 +0100 Subject: gnu: coq-mathcomp: Don't use unstable tarball. * gnu/packages/coq.scm (coq-mathcomp)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/coq.scm | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm index 6cedb8363f..fa02f85cdf 100644 --- a/gnu/packages/coq.scm +++ b/gnu/packages/coq.scm @@ -285,20 +285,22 @@ assistant.") (package (name "coq-mathcomp") (version "1.7.0") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/math-comp/math-comp/archive/mathcomp-" - version ".tar.gz")) - (sha256 - (base32 - "05zgyi4wmasi1rcyn5jq42w0bi9713q9m8dl1fdgl66nmacixh39")))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/math-comp/math-comp.git") + (commit (string-append "mathcomp-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1cdzi67jj440xkdpxm10aly80zpn56vjzj2ygb67iq3xpljlv95h")))) (build-system gnu-build-system) (native-inputs `(("ocaml" ,ocaml) ("which" ,which) ("coq" ,coq))) (arguments - `(#:tests? #f; No need to test formally-verified programs :) + `(#:tests? #f ; no need to test formally-verified programs :) #:phases (modify-phases %standard-phases (delete 'configure) -- cgit v1.2.3 From d2c8a891ee840af5599a640d53dd9698453b22ab Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 13 Feb 2019 01:08:10 +0100 Subject: gnu: dwm: Update to 6.2. * gnu/packages/suckless.scm (dwm): Update to 6.2. --- gnu/packages/suckless.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm index 1b5e21845c..d15fdbaddd 100644 --- a/gnu/packages/suckless.scm +++ b/gnu/packages/suckless.scm @@ -78,13 +78,13 @@ a custom raw video format with a simple container.") (define-public dwm (package (name "dwm") - (version "6.1") + (version "6.2") (source (origin (method url-fetch) (uri (string-append "https://dl.suckless.org/dwm/dwm-" version ".tar.gz")) (sha256 - (base32 "1zkmwb6df6m254shx06ly90c0q4jl70skk1pvkixpb7hcxhwbxn2")))) + (base32 "03hirnj8saxnsfqiszwl2ds7p0avg20izv9vdqyambks00p2x44p")))) (build-system gnu-build-system) (arguments `(#:tests? #f -- cgit v1.2.3 From de8022ec3d5e6ae1384ae229bb90cf1da4cbf51c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 13 Feb 2019 01:13:40 +0100 Subject: gnu: s6: Update to 2.7.2.2. * gnu/packages/skarnet.scm (s6): Update to 2.7.2.2. --- gnu/packages/skarnet.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/skarnet.scm b/gnu/packages/skarnet.scm index 6546d40597..9ba37b0f19 100644 --- a/gnu/packages/skarnet.scm +++ b/gnu/packages/skarnet.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2015 Claes Wallin ;;; Copyright © 2016 Eric Le Bihan ;;; Copyright © 2017 Z. Ren -;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -105,7 +105,7 @@ complexity."))) (define-public s6 (package (name "s6") - (version "2.7.2.1") + (version "2.7.2.2") (source (origin (method url-fetch) @@ -113,7 +113,7 @@ complexity."))) version ".tar.gz")) (sha256 (base32 - "0vyl4wr2l4mp9ams0dyg224qxhl8ksxsv2shs6606lhhp9g1rb6b")))) + "0psjmfidjdciswakw9agzzniqfmhrr21765m0q77kwxg7iisgpsq")))) (build-system gnu-build-system) (inputs `(("skalibs" ,skalibs) ("execline" ,execline))) -- cgit v1.2.3 From b9a807b7b8262fec8a00c8bf99445bf1db71828a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 13 Feb 2019 01:15:05 +0100 Subject: gnu: libdmtx: Update to 0.7.5. * gnu/packages/aidc.scm (libdmtx): Update to 0.7.5. [source]: Update. Use GIT-FETCH and GIT-FILE-NAME. [arguments]: Disable broken test suite. [native-inputs]: Add autoconf, automake, and libtool. [home-page]: Update. --- gnu/packages/aidc.scm | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/aidc.scm b/gnu/packages/aidc.scm index 64d26548c4..4c9f0989f4 100644 --- a/gnu/packages/aidc.scm +++ b/gnu/packages/aidc.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2014 John Darringon ;;; Copyright © 2016 Efraim Flashner ;;; Copyright © 2017 Hartmut Goebel -;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -24,6 +24,8 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix git-download) + #:use-module (gnu packages autotools) #:use-module (gnu packages pkg-config) #:use-module (gnu packages image) #:use-module (guix build-system gnu)) @@ -75,19 +77,26 @@ characters, and is highly robust.") (define-public libdmtx (package (name "libdmtx") - (version "0.7.4") + (version "0.7.5") (source (origin - (method url-fetch) - (uri (string-append - "mirror://sourceforge/libdmtx/" name "/" version "/" - name "-" version ".tar.bz2")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/dmtx/libdmtx.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 "0xnxx075ycy58n92yfda2z9zgd41h3d4ik5d9l197lzsqim5hb5n")))) + (base32 "0wk3fkxzf9ip75v8ia54v6ywx72ajp5s6777j4ay8barpbv869rj")))) (build-system gnu-build-system) + (arguments + ;; XXX Test suite is broken: https://github.com/dmtx/libdmtx/issues/22 + `(#:tests? #f)) (native-inputs - `(("pkg-config" ,pkg-config))) - (home-page "http://libdmtx.sourceforge.net/") + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool) + ("pkg-config" ,pkg-config))) + (home-page "https://github.com/dmtx") (synopsis "Library for reading and writing Data Matrix 2D barcodes") (description "libdmtx is software for reading and writing Data Matrix 2D barcodes on Linux and Unix. At its core libdmtx is a shared library, allowing -- cgit v1.2.3 From 0e249bdecf7fbd3d1e8ee9598538f72f87dba854 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 13 Feb 2019 02:48:17 +0100 Subject: gnu: libdmtx: Edit description. * gnu/package/aidc.scm (libdmtx)[description]: Replace redundant OS information with fascinating barcode facts. --- gnu/packages/aidc.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/aidc.scm b/gnu/packages/aidc.scm index 4c9f0989f4..afcb33ad6d 100644 --- a/gnu/packages/aidc.scm +++ b/gnu/packages/aidc.scm @@ -99,6 +99,6 @@ characters, and is highly robust.") (home-page "https://github.com/dmtx") (synopsis "Library for reading and writing Data Matrix 2D barcodes") (description "libdmtx is software for reading and writing Data Matrix 2D -barcodes on Linux and Unix. At its core libdmtx is a shared library, allowing +barcodes of the modern ECC200 variety. libdmtx is a shared library, allowing C/C++ programs to use its capabilities without restrictions or overhead.") (license license:bsd-3))) -- cgit v1.2.3 From cf0913f64ec9ca5952db368990acba032bc8eb9f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 13 Feb 2019 03:03:31 +0100 Subject: gnu: bs1770gain: Update to 0.5.2. * gnu/packages/audio.scm (bs1770gain): Update to 0.5.2. --- gnu/packages/audio.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 12755dd7a7..8a0bb70871 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -3207,7 +3207,7 @@ with support for HD extensions.") (define-public bs1770gain (package (name "bs1770gain") - (version "0.5.1") + (version "0.5.2") (source (origin (method url-fetch) @@ -3215,7 +3215,7 @@ with support for HD extensions.") version "/bs1770gain-" version ".tar.gz")) (sha256 (base32 - "0r4fbajgfmnwgl63hcm56f1j8m5f135q6j5jkzdvrrhpcj39yx06")))) + "1p6yz5q7czyf9ard65sp4kawdlkg40cfscr3b24znymmhs3p7rbk")))) (build-system gnu-build-system) (inputs `(("ffmpeg" ,ffmpeg) ("sox" ,sox))) -- cgit v1.2.3 From e7e259a50335269cddd004482a655f59d5c7a237 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Mon, 11 Feb 2019 09:28:49 +0000 Subject: gnu: red-eclipse: Fix build. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add a patch from the upstream repository [1] that resolves some errors that prevent the package from building [2]. 1: https://github.com/red-eclipse/base/commit/b16b4963c1ad81bb9ef784bc49 2: error: ‘____gammal_r_finite’ was not declared in this scope * gnu/packages/games.scm (red-eclipse)[source] Add patch. * gnu/packages/patches/red-eclipse-remove-gamma-name-hack.patch: New file * gnu/local.mk (dist_patch_DATA): Add new patch. --- gnu/packages/games.scm | 4 +- .../red-eclipse-remove-gamma-name-hack.patch | 52 ++++++++++++++++++++++ 2 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/red-eclipse-remove-gamma-name-hack.patch (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 5d7c89a880..de53ac798d 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -2843,7 +2843,9 @@ http://lavachat.symlynx.com/unix/") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1vs9k6f5fgsiy1n72imlqm8khjwm8cryc08zwd4gr7yxlxv45bs0")))) + "1vs9k6f5fgsiy1n72imlqm8khjwm8cryc08zwd4gr7yxlxv45bs0")) + (patches + (search-patches "red-eclipse-remove-gamma-name-hack.patch")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no check target diff --git a/gnu/packages/patches/red-eclipse-remove-gamma-name-hack.patch b/gnu/packages/patches/red-eclipse-remove-gamma-name-hack.patch new file mode 100644 index 0000000000..573920cb99 --- /dev/null +++ b/gnu/packages/patches/red-eclipse-remove-gamma-name-hack.patch @@ -0,0 +1,52 @@ +From b16b4963c1ad81bb9ef784bc4913a4c8ab5f1bb4 Mon Sep 17 00:00:00 2001 +From: Lee Salzman +Date: Tue, 12 Sep 2017 14:45:10 -0400 +Subject: [PATCH] remove gamma name hack + +--- + src/engine/main.cpp | 6 +++--- + src/shared/cube.h | 8 -------- + 2 files changed, 3 insertions(+), 11 deletions(-) + +diff --git a/src/engine/main.cpp b/src/engine/main.cpp +index 1032004d..77c9233a 100644 +--- a/src/engine/main.cpp ++++ b/src/engine/main.cpp +@@ -278,10 +278,10 @@ static void setgamma(int val) + } + + static int curgamma = 100; +-VARF(IDF_PERSIST, gamma, 30, 100, 300, ++VARFN(IDF_PERSIST, gamma, reqgamma, 30, 100, 300, + { +- if(initing || gamma == curgamma) return; +- curgamma = gamma; ++ if(initing || reqgamma == curgamma) return; ++ curgamma = reqgamma; + setgamma(curgamma); + }); + +diff --git a/src/shared/cube.h b/src/shared/cube.h +index 3864c492..7ff5e267 100644 +--- a/src/shared/cube.h ++++ b/src/shared/cube.h +@@ -3,19 +3,11 @@ + + #define _FILE_OFFSET_BITS 64 + +-#ifdef __GNUC__ +-#define gamma __gamma +-#endif +- + #ifdef WIN32 + #define _USE_MATH_DEFINES + #endif + #include + +-#ifdef __GNUC__ +-#undef gamma +-#endif +- + #include + #include + #include -- cgit v1.2.3 From 12255b3dceec29f9d022386507bbc157af7ef840 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Tue, 29 Jan 2019 10:02:21 +0000 Subject: gnu: Add cups-pk-helper. * gnu/packages/cups.scm (cups-pk-helper): New variable. --- gnu/packages/cups.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index 9c470c4bb6..367f45aa99 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -38,6 +38,7 @@ #:use-module (gnu packages pdf) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages polkit) #:use-module (gnu packages pretty-print) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) @@ -380,6 +381,32 @@ device-specific programs to convert and print many types of files.") ("cups-filters" ,cups-filters) ("zlib" ,zlib))))) +(define-public cups-pk-helper + (package + (name "cups-pk-helper") + (version "0.2.6") + (source (origin + (method url-fetch) + (uri (string-append "https://freedesktop.org/software/" + name "/releases/" name "-" version ".tar.xz")) + (sha256 + (base32 + "0a52jw6rm7lr5nbyksiia0rn7sasyb5cjqcb95z1wxm2yprgi6lm")))) + (build-system gnu-build-system) + (native-inputs + `(("intltool" ,intltool) + ("pkg-config" ,pkg-config) + ("glib" ,glib) + ("polkit" ,polkit) + ("cups" ,cups))) + (home-page "https://www.freedesktop.org/wiki/Software/cups-pk-helper/") + (synopsis "PolicyKit helper to configure CUPS with fine-grained privileges") + (description + "This package provides the org.opensuse.CupsPkHelper.Mechanism DBus +system service which uses @file{cups-pk-helper-mechanism}. This package +should only be used as part of the Guix cups-pk-helper service.") + (license license:gpl2+))) + (define-public hplip (package (name "hplip") -- cgit v1.2.3 From dd6f309dedd915ec5ac1e512c2e6cb5fb415be7f Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Tue, 29 Jan 2019 10:11:29 +0000 Subject: gnu: Add python-pycups. * gnu/packages/cups.scm (python-pycups): New variable. --- gnu/packages/cups.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index 367f45aa99..9f23b8e9ae 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -46,6 +46,7 @@ #:use-module (gnu packages scanner) #:use-module (gnu packages tls) #:use-module (guix build-system gnu) + #:use-module (guix build-system python) #:use-module (guix download) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) @@ -708,3 +709,27 @@ printers. It can only be used with printers that support the Epson ESC/P-R language.") (home-page "http://download.ebz.epson.net/dsc/search/01/search") (license license:gpl2+))) + +(define-public python-pycups + (package + (name "python-pycups") + (version "1.9.74") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pycups" version ".tar.bz2")) + (sha256 + (base32 + "1ffp7sswhdsfpy88zg0cc8kl04wygkjs01rlm9f0spbwk8jhy2c6")))) + (build-system python-build-system) + (arguments + '(;; Tests require CUPS to be running + #:tests? #f)) + (inputs + `(("cups" ,cups))) + (home-page "https://github.com/zdohnal/pycups") + (synopsis "Python bindings for libcups") + (description + "This package provides Python bindings for libcups, wrapping the CUPS +API.") + (license license:gpl2+))) -- cgit v1.2.3 From dd1fcddcb8277fb7c4f8413d20c8f316ebd4a503 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Tue, 29 Jan 2019 11:04:39 +0000 Subject: gnu: Add system-config-printer. * gnu/packages/gnome.scm (system-config-printer): New variable. --- gnu/packages/gnome.scm | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 367d5de16c..76b3a2083d 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -975,6 +975,88 @@ for translations, though this is only a dependency for the maintainers. This database is translated at Transifex.") (license license:gpl2+))) +(define-public system-config-printer + (package + (name "system-config-printer") + (version "1.5.11") + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/zdohnal/system-config-printer/releases/" + "download/" version + "/system-config-printer-" version ".tar.xz")) + (sha256 + (base32 + "1lq0q51bhanirpjjvvh4xiafi8hgpk8r32h0dj6dn3f32z8pib9q")))) + (build-system glib-or-gtk-build-system) + (arguments + `(#:imported-modules ((guix build python-build-system) + ,@%glib-or-gtk-build-system-modules) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-Makefile.am + (lambda _ + ;; The Makefile generates some scripts, so set a valid shebang + (substitute* "Makefile.am" + (("/bin/bash") (which "bash"))) + (delete-file "configure") + #t)) + (add-after 'unpack 'patch-docbook-xml + (lambda* (#:key inputs #:allow-other-keys) + ;; Modify the man XML otherwise xmlto tries to access the network + (substitute* "man/system-config-printer.xml" + (("http://www.oasis-open.org/docbook/xml/4.1.2/") + (string-append (assoc-ref inputs "docbook-xml") + "/xml/dtd/docbook/"))) + #t)) + (add-after 'install 'wrap-for-python + (@@ (guix build python-build-system) wrap)) + (add-after 'install 'wrap + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (gi-typelib-path (getenv "GI_TYPELIB_PATH"))) + (for-each + (lambda (program) + (wrap-program program + `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path)))) + (map (lambda (name) + (string-append out "/bin/" name)) + '("system-config-printer" + "system-config-printer-applet" + "install-printerdriver" + "scp-dbus-service")))) + #t))))) + (inputs + `(("gsettings-desktop-schemas" ,gsettings-desktop-schemas) + ("gobject-introspection" ,gobject-introspection) + ("python" ,python) + ("cups" ,cups) + ("python-dbus" ,python-dbus) + ("python-pygobject" ,python-pygobject) + ("python-pycups" ,python-pycups) + ("python-requests" ,python-requests) + ("python-pycairo" ,python-pycairo) + ("libnotify" ,libnotify) + ("packagekit" ,packagekit))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("desktop-file-utils" ,desktop-file-utils) + ("glib" ,glib) + ("autoconf" ,autoconf) + ("automake" ,automake) + ("intltool" ,intltool) + ("xmlto" ,xmlto) + ("docbook-xml" ,docbook-xml-4.1.2) + ("docbook-xsl" ,docbook-xsl) + ("libxml2" ,libxml2))) + (home-page "https://github.com/zdohnal/system-config-printer") + (synopsis "CUPS administration tool") + (description + "system-config-printer is a CUPS administration tool. It's written in +Python using GTK+, and uses the @acronym{IPP, Internet Printing Protocol} when +configuring CUPS.") + (license license:gpl2+))) + (define-public hicolor-icon-theme (package (name "hicolor-icon-theme") -- cgit v1.2.3 From f6f4370feeee27f26f151d47d2568ea144d52d3f Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Tue, 29 Jan 2019 11:30:46 +0000 Subject: gnu: gnome: Include system-config-printer. This package enables some functionality for printers within the gnome-control-center as well as providing a standalone configuration tool. At the moment, due to the lack of PackageKit support within Guix, the gnome-control-center can't help users through the process of installing this, so make it a default package. * gnu/packages/gnome.scm (gnome)[propagated-inputs]: Add system-config-printer. --- gnu/packages/gnome.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 76b3a2083d..2f99755933 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6150,6 +6150,7 @@ associations for GNOME.") ("pinentry-gnome3" ,pinentry-gnome3) ("pulseaudio" ,pulseaudio) ("shared-mime-info" ,shared-mime-info) + ("system-config-printer" ,system-config-printer) ("totem" ,totem) ("xdg-user-dirs" ,xdg-user-dirs) ("yelp" ,yelp) -- cgit v1.2.3 From f6974e15cfce8128d9a3fb425671b1f6fc05e49b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20H=C3=B6fling?= Date: Mon, 11 Feb 2019 12:53:05 +0100 Subject: gnu: Fix aegisub. * gnu/packages/video.scm (aegisub)[arguments]: Add phase to fix boost headers. --- gnu/packages/video.scm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 871d3e15d6..aa7930aad7 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2877,7 +2877,17 @@ programmers to access a standard API to open and decompress media files.") (add-before 'configure 'fix-ldflags (lambda _ (setenv "LDFLAGS" "-pthread") - #t))))) + #t)) + (add-after 'unpack 'fix-boost-headers + (lambda _ + (substitute* + '("src/subtitles_provider_libass.cpp" + "src/colour_button.cpp" + "src/video_provider_dummy.cpp" + "./src/video_frame.cpp") + (("#include ") + "#include ")) + #t))))) (inputs `(("boost" ,boost) ("desktop-file-utils" ,desktop-file-utils) -- cgit v1.2.3 From f90ed0284ad531633576392660bb6bf80d1c4388 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 13 Feb 2019 09:51:49 +0100 Subject: gnu: ledger: Update to 3.1.2 [security fixes]. * gnu/packages/finance.scm (ledger): Update to 3.1.2. [arguments]: Remove #:modules; remove obsolete configure flags; remove make flags; remove phase "boost-compat"; remove custom check phase; remove "relocate-elisp" phase; disable broken test in "check-setup" phase. [native-inputs]: Remove emacs-minimal. [license]: Remove gpl2+. * gnu/packages/patches/ledger-revert-boost-python-fix.patch: Remove patch. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/packages/finance.scm | 55 +++++----------------- .../patches/ledger-revert-boost-python-fix.patch | 39 --------------- 2 files changed, 12 insertions(+), 82 deletions(-) delete mode 100644 gnu/packages/patches/ledger-revert-boost-python-fix.patch (limited to 'gnu/packages') diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 36cb508564..340c5b27dc 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -139,7 +139,7 @@ line client and a client based on Qt.") (define-public ledger (package (name "ledger") - (version "3.1.1") + (version "3.1.2") (source (origin (method git-fetch) @@ -148,39 +148,17 @@ line client and a client based on Qt.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1j4p7djkmdmd858hylrsc3inamh9z0vkfl98s9wiqfmrzw51pmxp")) - (patches (search-patches "ledger-revert-boost-python-fix.patch" - "ledger-fix-uninitialized.patch")))) + (base32 "0hwnipj2m9p95hhyv6kyq54m27g14r58gnsy2my883kxhpcyb2vc")) + (patches (search-patches "ledger-fix-uninitialized.patch")))) (build-system cmake-build-system) (arguments - `(#:modules ((guix build cmake-build-system) - ((guix build gnu-build-system) #:prefix gnu:) - (guix build utils) - (guix build emacs-utils)) - #:imported-modules (,@%cmake-build-system-modules - (guix build emacs-utils)) - #:configure-flags + `(#:configure-flags `("-DBUILD_DOCS:BOOL=ON" "-DBUILD_WEB_DOCS:BOOL=ON" - "-DBUILD_EMACSLISP:BOOL=ON" "-DUSE_PYTHON:BOOL=ON" - "-DCMAKE_INSTALL_LIBDIR:PATH=lib" - ,(string-append "-DUTFCPP_INCLUDE_DIR:PATH=" - (assoc-ref %build-inputs "utfcpp") - "/include")) - ;; Skip failing test BaselineTest_cmd-org during the check phase. - ;; This is a known upstream issue. See - ;; https://github.com/ledger/ledger/issues/550 - #:make-flags (list "ARGS=-E BaselineTest_cmd-org") + "-DCMAKE_INSTALL_LIBDIR:PATH=lib") #:phases (modify-phases %standard-phases - (add-after 'unpack 'boost-compat - (lambda _ - (substitute* "src/utils.h" - ;; This library moved in Boost 1.66. Remove for Ledger - ;; versions > 3.1.1. - (("boost/uuid/sha1.hpp") "boost/uuid/detail/sha1.hpp")) - #t)) (add-before 'configure 'install-examples (lambda* (#:key outputs #:allow-other-keys) (let ((examples (string-append (assoc-ref outputs "out") @@ -196,18 +174,11 @@ line client and a client based on Qt.") (setenv "TZDIR" (string-append (assoc-ref inputs "tzdata") "/share/zoneinfo")) - #t)) - (replace 'check (assoc-ref gnu:%standard-phases 'check)) - (add-after 'install 'relocate-elisp - (lambda* (#:key outputs #:allow-other-keys) - (let* ((site-dir (string-append (assoc-ref outputs "out") - "/share/emacs/site-lisp")) - (guix-dir (string-append site-dir "/guix.d")) - (orig-dir (string-append site-dir "/ledger-mode")) - (dest-dir (string-append guix-dir "/ledger-mode"))) - (mkdir-p guix-dir) - (rename-file orig-dir dest-dir) - (emacs-generate-autoloads ,name dest-dir))))))) + ;; Skip failing test BaselineTest_cmd-org. + ;; This is a known upstream issue. See + ;; https://github.com/ledger/ledger/issues/550 + (setenv "ARGS" "-E BaselineTest_cmd-org") + #t))))) (inputs `(("boost" ,boost) ("gmp" ,gmp) @@ -217,8 +188,7 @@ line client and a client based on Qt.") ("tzdata" ,tzdata) ("utfcpp" ,utfcpp))) (native-inputs - `(("emacs" ,emacs-minimal) - ("groff" ,groff) + `(("groff" ,groff) ("texinfo" ,texinfo))) (home-page "https://ledger-cli.org/") (synopsis "Command-line double-entry accounting program") @@ -244,8 +214,7 @@ in ability, and easy to use.") license:asl2.0 ; src/strptime.cc (license:non-copyleft "file://src/wcwidth.cc" - "See src/wcwidth.cc in the distribution.") - license:gpl2+)))) ; lisp/* + "See src/wcwidth.cc in the distribution."))))) (define-public geierlein (package diff --git a/gnu/packages/patches/ledger-revert-boost-python-fix.patch b/gnu/packages/patches/ledger-revert-boost-python-fix.patch deleted file mode 100644 index 99f48f6e46..0000000000 --- a/gnu/packages/patches/ledger-revert-boost-python-fix.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 01220484f428a447e9b00e071a0d85185f30e1de Mon Sep 17 00:00:00 2001 -From: Alexis Hildebrandt -Date: Wed, 22 Jun 2016 15:43:37 +0200 -Subject: [PATCH] Revert "[python] Add fix for Boost.Python compile errors" - -This reverts commit 11590e134eafa768ccc4a171cc7fb216e906095f. ---- - src/py_commodity.cc | 3 --- - src/py_journal.cc | 3 --- - 2 files changed, 6 deletions(-) - -diff --git a/src/py_commodity.cc b/src/py_commodity.cc -index 5aafa6c..c457e64 100644 ---- a/src/py_commodity.cc -+++ b/src/py_commodity.cc -@@ -243,9 +243,6 @@ namespace { - - void export_commodity() - { --#if BOOST_VERSION >= 106000 -- python::register_ptr_to_python< shared_ptr >(); --#endif - class_< commodity_pool_t, shared_ptr, - boost::noncopyable > ("CommodityPool", no_init) - .add_property("null_commodity", -diff --git a/src/py_journal.cc b/src/py_journal.cc -index c1c38a9..879f954 100644 ---- a/src/py_journal.cc -+++ b/src/py_journal.cc -@@ -232,9 +232,6 @@ void export_journal() - boost::noncopyable >("PostHandler") - ; - --#if BOOST_VERSION >= 106000 -- python::register_ptr_to_python< shared_ptr >(); --#endif - class_< collector_wrapper, shared_ptr, - boost::noncopyable >("PostCollectorWrapper", no_init) - .def("__len__", &collector_wrapper::length) -- cgit v1.2.3 From 0df201c05f5db7a6524db1fd47bb9ac30cfaa067 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 13 Feb 2019 10:52:43 +0100 Subject: gnu: Add emacs-ledger-mode. * gnu/packages/finance.scm (emacs-ledger-mode): New variable. --- gnu/packages/finance.scm | 67 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 340c5b27dc..112a6eba97 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -216,6 +216,73 @@ in ability, and easy to use.") "file://src/wcwidth.cc" "See src/wcwidth.cc in the distribution."))))) +(define-public emacs-ledger-mode + ;; There have been no new releases since 2016. + (let ((commit "253a20dc62e137ed0ed8e1dd8614ecba116610ea") + (revision "1")) + (package + (name "emacs-ledger-mode") + (version (git-version "3.1.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ledger/ledger-mode.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "06wrgkqpgvk17vibrk2qikdlqn8y63jg86marp1wgmram92mb3jk")))) + (build-system cmake-build-system) + (arguments + `(#:modules ((guix build cmake-build-system) + (guix build utils) + (guix build emacs-utils)) + #:imported-modules (,@%cmake-build-system-modules + (guix build emacs-utils)) + #:tests? #f ; there are none + #:phases + (modify-phases %standard-phases + (add-after 'build 'build-doc + (lambda* (#:key outputs #:allow-other-keys) + (let ((target (string-append (assoc-ref outputs "out") + "/share/info"))) + (mkdir-p target) + (invoke "makeinfo" "-o" target + "../source/doc/ledger-mode.texi")) + #t)) + (add-after 'install 'relocate-elisp + (lambda* (#:key outputs #:allow-other-keys) + (let* ((site-dir (string-append (assoc-ref outputs "out") + "/share/emacs/site-lisp")) + (guix-dir (string-append site-dir "/guix.d")) + (orig-dir (string-append site-dir "/ledger-mode")) + (dest-dir (string-append guix-dir "/ledger-mode"))) + (mkdir-p guix-dir) + (rename-file orig-dir dest-dir) + (emacs-generate-autoloads ,name dest-dir) + #t)))))) + (native-inputs + `(("emacs-minimal" ,emacs-minimal) + ("texinfo" ,texinfo))) + (home-page "https://ledger-cli.org/") + (synopsis "Command-line double-entry accounting program") + (description + "Ledger is a powerful, double-entry accounting system that is +accessed from the UNIX command-line. This may put off some users, since +there is no flashy UI, but for those who want unparalleled reporting +access to their data there are few alternatives. + +Ledger uses text files for input. It reads the files and generates +reports; there is no other database or stored state. To use Ledger, +you create a file of your account names and transactions, run from the +command line with some options to specify input and requested reports, and +get output. The output is generally plain text, though you could generate +a graph or html instead. Ledger is simple in concept, surprisingly rich +in ability, and easy to use. + +This package provides the Emacs mode.") + (license license:gpl2+)))) + (define-public geierlein (package (name "geierlein") -- cgit v1.2.3 From baf766a7ff9db45c707b4539176f2143fbd90efd Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Fri, 1 Feb 2019 17:06:25 +0100 Subject: gnu: mrustc: Fix deserialization bug in communication with the procedural macro compiler plugin. * gnu/packages/patches/mrustc-0.8.0-fix-variable-length-integer-receiving.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/rust.scm (mrustc)[source]: Use it. Co-authored-by: Chris Marusich --- ...ustc-0.8.0-fix-variable-length-integer-receiving.patch | 15 +++++++++++++++ gnu/packages/rust.scm | 4 +++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/mrustc-0.8.0-fix-variable-length-integer-receiving.patch (limited to 'gnu/packages') diff --git a/gnu/packages/patches/mrustc-0.8.0-fix-variable-length-integer-receiving.patch b/gnu/packages/patches/mrustc-0.8.0-fix-variable-length-integer-receiving.patch new file mode 100644 index 0000000000..9e76653a07 --- /dev/null +++ b/gnu/packages/patches/mrustc-0.8.0-fix-variable-length-integer-receiving.patch @@ -0,0 +1,15 @@ +https://github.com/thepowersgang/mrustc/issues/109 +From: Danny Milosavljevic +Date: Fri, 3 Jan 2019 13:00:00 +0100 + +--- mrustc/src/expand/proc_macro.cpp.orig 2019-02-01 14:16:54.208486062 +0100 ++++ mrustc/src/expand/proc_macro.cpp 2019-02-01 14:17:14.350925705 +0100 +@@ -977,7 +977,7 @@ + for(;;) + { + auto b = recv_u8(); +- v |= static_cast(b) << ofs; ++ v |= static_cast(b & 0x7F) << ofs; + if( (b & 0x80) == 0 ) + break; + ofs += 7; diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 501736d898..ca4d0a8a8d 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -105,7 +105,9 @@ (file-name (git-file-name name version)) (sha256 (base32 - "0a7v8ccyzp1sdkwni8h1698hxpfz2sxhcpx42n6l2pbm0rbjp08i")))) + "0a7v8ccyzp1sdkwni8h1698hxpfz2sxhcpx42n6l2pbm0rbjp08i")) + (patches + (search-patches "mrustc-0.8.0-fix-variable-length-integer-receiving.patch")))) (outputs '("out" "cargo")) (build-system gnu-build-system) (inputs -- cgit v1.2.3 From 7b9b203a52fd31558d0d5c424da0dfb5f7dceef6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 13 Feb 2019 15:22:59 +0100 Subject: gnu: Add burp. * gnu/packages/backup.scm (burp): New variable. --- gnu/packages/backup.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index c312f23c1a..970d0adb06 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -46,6 +46,7 @@ #:use-module (gnu packages compression) #:use-module (gnu packages crypto) #:use-module (gnu packages databases) + #:use-module (gnu packages datastructures) #:use-module (gnu packages dbm) #:use-module (gnu packages dejagnu) #:use-module (gnu packages ftp) @@ -1001,3 +1002,30 @@ de-duplicated before it is actually written to the storage back end to save precious backup space. @end itemize") (license license:bsd-2))) + +(define-public burp + (package + (name "burp") + (version "2.3.0") + (source (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/burp/burp-" version + "/burp-" version ".tar.bz2")) + (sha256 + (base32 + "0in49c0ir7lb7jli0fcphdq1nh5rclhans4ngm7z7hzyxa4jrgri")))) + (build-system gnu-build-system) + (inputs + `(("librsync" ,librsync) + ("openssl" ,openssl) + ("uthash" ,uthash) + ("zlib" ,zlib))) + (native-inputs + `(("check" ,check) + ("pkg-config" ,pkg-config))) + (home-page "https://burp.grke.org") + (synopsis "Differential backup and restore") + (description "Burp is a network backup and restore program. It attempts +to reduce network traffic and the amount of space that is used by each +backup.") + (license license:agpl3))) -- cgit v1.2.3 From b76374fbf70a815609ecf329c3a9daeacb4af83f Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 13 Feb 2019 13:25:42 -0500 Subject: gnu: linux-libre@4.9: Update to 4.9.156. * gnu/packages/linux.scm (linux-libre-4.9): Update to 4.9.156. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index c4080f9285..25040b303f 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -451,8 +451,8 @@ It has been modified to remove all non-free binary blobs.") #:configuration-file kernel-config)) (define-public linux-libre-4.9 - (make-linux-libre "4.9.155" - "0fyj8dqhpqi3jh6i58avyvmg4mp9bplnpiffpp3fdka4v85lx152" + (make-linux-libre "4.9.156" + "1ipmn5axlhfsfzqvwwyv7scrvfja39w7v68cnvbqiaq8fkjgffxg" '("x86_64-linux" "i686-linux") #:configuration-file kernel-config)) -- cgit v1.2.3 From 570ef8aec5c3602cff8d32493461bd157663bcd3 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 13 Feb 2019 13:26:25 -0500 Subject: gnu: linux-libre@4.14: Update to 4.14.99. * gnu/packages/linux.scm (%linux-libre-4.14-version): Update to 4.14.99. (%linux-libre-4.14-hash): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 25040b303f..f9e6870bf6 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -441,8 +441,8 @@ It has been modified to remove all non-free binary blobs.") #:patches %linux-libre-4.19-patches #:configuration-file kernel-config)) -(define %linux-libre-4.14-version "4.14.98") -(define %linux-libre-4.14-hash "165wlqqpb16zhrwihsb75y153xyz8q5dbi14xim7jsnvwlbh5i79") +(define %linux-libre-4.14-version "4.14.99") +(define %linux-libre-4.14-hash "1d9h4l22j3jy1bkq8i4g6axwpq04jbsys4bg6bx8sbl590c9lrwx") (define-public linux-libre-4.14 (make-linux-libre %linux-libre-4.14-version -- cgit v1.2.3 From 782a18dd9d01bd15c6bce5fe7e152c1e4c057534 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 13 Feb 2019 13:27:21 -0500 Subject: gnu: linux-libre@4.19: Update to 4.19.21. * gnu/packages/linux.scm (%linux-libre-4.19-version): Update to 4.19.21. (%linux-libre-4.19-hash): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index f9e6870bf6..947638cade 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -427,8 +427,8 @@ It has been modified to remove all non-free binary blobs.") #:patches %linux-libre-4.20-patches #:configuration-file kernel-config)) -(define %linux-libre-4.19-version "4.19.20") -(define %linux-libre-4.19-hash "1rs4jvp88n23n9a6f037sn498fzl1fn96zsjjmjngb8nmjr1y9vp") +(define %linux-libre-4.19-version "4.19.21") +(define %linux-libre-4.19-hash "064vwfkcmc8ad37m1ziqc14vhvx3mba12rc9220xng3a48gwpi2m") (define %linux-libre-4.19-patches (list %boot-logo-patch -- cgit v1.2.3 From 0a62b62ba07abd24b836a1cd7afc552448d2000d Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 13 Feb 2019 13:28:38 -0500 Subject: gnu: linux-libre: Update to 4.20.8. * gnu/packages/linux.scm (%linux-libre-version): Update to 4.20.8. (%linux-libre-hash): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 947638cade..47b07340b8 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -413,8 +413,8 @@ for ARCH and optionally VARIANT, or #f if there is no such configuration." It has been modified to remove all non-free binary blobs.") (license license:gpl2))) -(define %linux-libre-version "4.20.7") -(define %linux-libre-hash "05jbpg4ivcbr8xi5ki03f4n57hnhc52nfjk1ik8czag7f4ph9v0b") +(define %linux-libre-version "4.20.8") +(define %linux-libre-hash "0qhwavylmkqqd84dym87ajzwnxc6rjpdijw7kbriqjmgjfsmf8sw") (define %linux-libre-4.20-patches (list %boot-logo-patch -- cgit v1.2.3 From 91b36318216a55ecbcf092c52a2b882d4bb5d6eb Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 13 Feb 2019 21:02:30 +0200 Subject: gnu: urlscan: Update to 0.9.2. * gnu/packages/mail.scm (urlscan): Update to 0.9.2. --- gnu/packages/mail.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 301298082a..c6e05f9b6b 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2015 Paul van der Walt ;;; Copyright © 2015, 2016, 2018 Eric Bavier ;;; Copyright © 2015 Andreas Enge -;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner +;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner ;;; Copyright © 2016 Christopher Allan Webber ;;; Copyright © 2016 Al McElrath ;;; Copyright © 2016 Leo Famulari @@ -2597,14 +2597,14 @@ servers. The 4rev1 and 4 versions of IMAP are supported.") (define-public urlscan (package (name "urlscan") - (version "0.9.1") + (version "0.9.2") (source (origin (method url-fetch) (uri (pypi-uri "urlscan" version)) (sha256 (base32 - "0vpdyrx51sg9a8kswa7ibbcgcpvc7r03aq8x4n4c7v2xg0v3c7wb")))) + "1zldck7vnp7z04aacbx3cprf5kzha4gfhjmss4iv2lh5nccxjfzx")))) (build-system python-build-system) (propagated-inputs `(("python-urwid" ,python-urwid))) -- cgit v1.2.3 From 28388ac8f8dedd1984379119e480ecbd10c6fc30 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 13 Feb 2019 21:06:17 +0200 Subject: gnu: vim-airline: Update to 0.10. * gnu/packages/vim.scm (vim-airline): Update to 0.10. --- gnu/packages/vim.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index 53d028681d..8da08c41b0 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013 Cyril Roelandt -;;; Copyright © 2016, 2017, 2018 Efraim Flashner +;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner ;;; Copyright © 2016, 2017 Nils Gillmann ;;; Copyright © 2017 Ricardo Wurmus ;;; Copyright © 2017 Marius Bakke @@ -519,7 +519,7 @@ commit or run any Git arbitrary command.") (define-public vim-airline (package (name "vim-airline") - (version "0.9") + (version "0.10") (source (origin (method git-fetch) @@ -529,7 +529,7 @@ commit or run any Git arbitrary command.") (file-name (git-file-name name version)) (sha256 (base32 - "0hq3304rhakx7x1v7wll7gxinmfz6561bq97qpj8jrk19rhcab75")))) + "0k3c6p3xy6514n1n347ci4q9xjm9wwqirpdysam6f7r39crgmfhd")))) (build-system gnu-build-system) (arguments `(#:tests? #f -- cgit v1.2.3 From 37f7853e1359ae0a46b6fcb223145b690fdd051f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 13 Feb 2019 21:17:19 +0200 Subject: gnu: fluxbox: Install vim helper files. * gnu/packages/wm.scm (fluxbox)[arguments]: Add custom phase to install vim files. --- gnu/packages/wm.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index fd89df0c16..6a6a94b7ce 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2015 xd1le ;;; Copyright © 2015 Paul van der Walt ;;; Copyright © 2016 Danny Milosavljevic -;;; Copyright © 2016 Efraim Flashner +;;; Copyright © 2016, 2019 Efraim Flashner ;;; Copyright © 2016 Al McElrath ;;; Copyright © 2016 Carlo Zancanaro ;;; Copyright © 2016, 2017, 2018 Ludovic Courtès @@ -675,6 +675,12 @@ drags, snap-to-border support, and virtual desktops.") `(#:make-flags '("CPPFLAGS=-U__TIME__") ;ugly, but for reproducibility #:phases (modify-phases %standard-phases + (add-after 'install 'install-vim-files + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (syntax (string-append out "/share/vim/vimfiles/syntax"))) + (copy-recursively "3rd/vim/vim/syntax" syntax) + #t))) (add-after 'install 'install-xsession (lambda _ -- cgit v1.2.3 From 4ee3b309450d849a55161bfc88951385a93f2b7c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 13 Feb 2019 21:25:14 +0200 Subject: gnu: fluxbox: All phases return #t. * gnu/packages/wm.scm (fluxbox)[arguments]: All phases return #t. --- gnu/packages/wm.scm | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 6a6a94b7ce..f1f3c25391 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -681,20 +681,21 @@ drags, snap-to-border support, and virtual desktops.") (syntax (string-append out "/share/vim/vimfiles/syntax"))) (copy-recursively "3rd/vim/vim/syntax" syntax) #t))) - (add-after - 'install 'install-xsession - (lambda _ - (let ((xsessions (string-append %output "/share/xsessions"))) - (mkdir-p xsessions) - (call-with-output-file - (string-append xsessions "/fluxbox.desktop") - (lambda (port) - (format port "~ - [Desktop Entry]~@ - Name=~a~@ - Comment=~a~@ - Exec=~a/bin/startfluxbox~@ - Type=Application~%" ,name ,synopsis %output))))))))) + (add-after 'install 'install-xsession + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (xsessions (string-append out "/share/xsessions"))) + (mkdir-p xsessions) + (call-with-output-file + (string-append xsessions "/fluxbox.desktop") + (lambda (port) + (format port "~ + [Desktop Entry]~@ + Name=~a~@ + Comment=~a~@ + Exec=~a/bin/startfluxbox~@ + Type=Application~%" ,name ,synopsis out))) + #t)))))) (native-inputs `(("pkg-config" ,pkg-config))) (inputs -- cgit v1.2.3 From 2de52d0cbb1812ff05e9939bc2fec61946ec41a0 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 13 Feb 2019 21:33:14 +0200 Subject: gnu: khard: Update to 0.13.0. * gnu/packages/mail.scm (khard): Update to 0.13.0. --- gnu/packages/mail.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index c6e05f9b6b..4b91f0230f 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1730,13 +1730,13 @@ maintained.") (define-public khard (package (name "khard") - (version "0.12.2") + (version "0.13.0") (source (origin (method url-fetch) (uri (pypi-uri name version)) (sha256 (base32 - "01y52qmab4cw9wmx87aahnxbyaxrxw8j2wx06mpcqsfvgk8d54wi")))) + "1lyjiskc6ckjjylzr04dnm66p3cnn7vlysw9c27qls3y3ywx14zw")))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.2.3 From 2385012b894a07701e167e0d7347b40e8383c1d2 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 13 Feb 2019 21:33:57 +0200 Subject: gnu: khard: Enable tests. * gnu/packages/mail.scm (khard)[arguments]: Enable test suite. --- gnu/packages/mail.scm | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 4b91f0230f..982a75c7e2 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1739,18 +1739,14 @@ maintained.") "1lyjiskc6ckjjylzr04dnm66p3cnn7vlysw9c27qls3y3ywx14zw")))) (build-system python-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'install 'install-doc - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (doc (string-append out "/share/doc/khard"))) - (copy-recursively "misc/khard" doc) - #t)))) - ;; Tests are currently only runnable without preexisting data on - ;; the development branch: - ;; https://github.com/scheibler/khard/issues/176 - #:tests? #f)) + `(#:phases + (modify-phases %standard-phases + (add-after 'install 'install-doc + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (doc (string-append out "/share/doc/khard"))) + (copy-recursively "misc/khard" doc) + #t)))))) (propagated-inputs `(("python-atomicwrites" ,python-atomicwrites) ("python-configobj" ,python-configobj) -- cgit v1.2.3 From f73750e6f45959864921bb3ef29b5ff545dc30f8 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Wed, 13 Feb 2019 12:46:09 -0600 Subject: gnu: scalapack: Remove use of deprecated MPI1 symbols. * gnu/packages/patches/scalapack-blacs-mpi-deprecations.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/maths.scm (scalapack)[source]: Use it. --- gnu/packages/maths.scm | 3 +- .../patches/scalapack-blacs-mpi-deprecations.patch | 170 +++++++++++++++++++++ 2 files changed, 172 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/scalapack-blacs-mpi-deprecations.patch (limited to 'gnu/packages') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 7d3ac773b3..9fc87860c8 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -584,7 +584,8 @@ problems in numerical linear algebra.") version ".tgz")) (sha256 (base32 - "0p1r61ss1fq0bs8ynnx7xq4wwsdvs32ljvwjnx6yxr8gd6pawx0c")))) + "0p1r61ss1fq0bs8ynnx7xq4wwsdvs32ljvwjnx6yxr8gd6pawx0c")) + (patches (search-patches "scalapack-blacs-mpi-deprecations.patch")))) (build-system cmake-build-system) (inputs `(("mpi" ,openmpi) diff --git a/gnu/packages/patches/scalapack-blacs-mpi-deprecations.patch b/gnu/packages/patches/scalapack-blacs-mpi-deprecations.patch new file mode 100644 index 0000000000..6ec1b8f21f --- /dev/null +++ b/gnu/packages/patches/scalapack-blacs-mpi-deprecations.patch @@ -0,0 +1,170 @@ +From f11c3f094ed5ca727ec819983425b6641db8227c Mon Sep 17 00:00:00 2001 +From: Eric Bavier +Date: Wed, 13 Feb 2019 09:32:11 -0600 +Subject: [PATCH] BLACS: Remove use of long-deprecated MPI1 functions. + +* BLACS/SRC/blacs_get_.c: 'MPI_Attr_get' -> 'MPI_Comm_get_attr'. +* BLACS/SRC/cgamn2d_.c, BLACS/SRC/cgamx2d_.c, BLACS/SRC/dgamn2d_.c, +BLACS/SRC/dgamx2d_.c, BLACS/SRC/igamn2d_.c, BLACS/SRC/igamx2d_.c, +BLACS/SRC/sgamn2d_.c, BLACS/SRC/sgamx2d_.c, BLACS/SRC/zgamn2d_.c, +BLACS/SRC/zgamx2d_.c: 'MPI_Type_struct' -> 'MPI_Type_create_struct'. +--- + BLACS/SRC/blacs_get_.c | 2 +- + BLACS/SRC/cgamn2d_.c | 2 +- + BLACS/SRC/cgamx2d_.c | 2 +- + BLACS/SRC/dgamn2d_.c | 2 +- + BLACS/SRC/dgamx2d_.c | 2 +- + BLACS/SRC/igamn2d_.c | 2 +- + BLACS/SRC/igamx2d_.c | 2 +- + BLACS/SRC/sgamn2d_.c | 2 +- + BLACS/SRC/sgamx2d_.c | 2 +- + BLACS/SRC/zgamn2d_.c | 2 +- + BLACS/SRC/zgamx2d_.c | 2 +- + 11 files changed, 11 insertions(+), 11 deletions(-) + +diff --git a/BLACS/SRC/blacs_get_.c b/BLACS/SRC/blacs_get_.c +index e979767..d4b04cf 100644 +--- a/BLACS/SRC/blacs_get_.c ++++ b/BLACS/SRC/blacs_get_.c +@@ -23,7 +23,7 @@ F_VOID_FUNC blacs_get_(int *ConTxt, int *what, int *val) + case SGET_MSGIDS: + if (BI_COMM_WORLD == NULL) Cblacs_pinfo(val, &val[1]); + iptr = &val[1]; +- ierr=MPI_Attr_get(MPI_COMM_WORLD, MPI_TAG_UB, (BVOID **) &iptr,val); ++ ierr=MPI_Comm_get_attr(MPI_COMM_WORLD, MPI_TAG_UB, (BVOID **) &iptr,val); + val[0] = 0; + val[1] = *iptr; + break; +diff --git a/BLACS/SRC/cgamn2d_.c b/BLACS/SRC/cgamn2d_.c +index 2db6ccb..6958f32 100644 +--- a/BLACS/SRC/cgamn2d_.c ++++ b/BLACS/SRC/cgamn2d_.c +@@ -221,7 +221,7 @@ F_VOID_FUNC cgamn2d_(int *ConTxt, F_CHAR scope, F_CHAR top, int *m, int *n, + { + #endif + i = 2; +- ierr=MPI_Type_struct(i, len, disp, dtypes, &MyType); ++ ierr=MPI_Type_create_struct(i, len, disp, dtypes, &MyType); + ierr=MPI_Type_commit(&MyType); + bp->N = bp2->N = 1; + bp->dtype = bp2->dtype = MyType; +diff --git a/BLACS/SRC/cgamx2d_.c b/BLACS/SRC/cgamx2d_.c +index 707c0b6..f802d01 100644 +--- a/BLACS/SRC/cgamx2d_.c ++++ b/BLACS/SRC/cgamx2d_.c +@@ -221,7 +221,7 @@ F_VOID_FUNC cgamx2d_(int *ConTxt, F_CHAR scope, F_CHAR top, int *m, int *n, + { + #endif + i = 2; +- ierr=MPI_Type_struct(i, len, disp, dtypes, &MyType); ++ ierr=MPI_Type_create_struct(i, len, disp, dtypes, &MyType); + ierr=MPI_Type_commit(&MyType); + bp->N = bp2->N = 1; + bp->dtype = bp2->dtype = MyType; +diff --git a/BLACS/SRC/dgamn2d_.c b/BLACS/SRC/dgamn2d_.c +index dff23b4..a2627ac 100644 +--- a/BLACS/SRC/dgamn2d_.c ++++ b/BLACS/SRC/dgamn2d_.c +@@ -221,7 +221,7 @@ F_VOID_FUNC dgamn2d_(int *ConTxt, F_CHAR scope, F_CHAR top, int *m, int *n, + { + #endif + i = 2; +- ierr=MPI_Type_struct(i, len, disp, dtypes, &MyType); ++ ierr=MPI_Type_create_struct(i, len, disp, dtypes, &MyType); + ierr=MPI_Type_commit(&MyType); + bp->N = bp2->N = 1; + bp->dtype = bp2->dtype = MyType; +diff --git a/BLACS/SRC/dgamx2d_.c b/BLACS/SRC/dgamx2d_.c +index a51f731..2a644d0 100644 +--- a/BLACS/SRC/dgamx2d_.c ++++ b/BLACS/SRC/dgamx2d_.c +@@ -221,7 +221,7 @@ F_VOID_FUNC dgamx2d_(int *ConTxt, F_CHAR scope, F_CHAR top, int *m, int *n, + { + #endif + i = 2; +- ierr=MPI_Type_struct(i, len, disp, dtypes, &MyType); ++ ierr=MPI_Type_create_struct(i, len, disp, dtypes, &MyType); + ierr=MPI_Type_commit(&MyType); + bp->N = bp2->N = 1; + bp->dtype = bp2->dtype = MyType; +diff --git a/BLACS/SRC/igamn2d_.c b/BLACS/SRC/igamn2d_.c +index 16bc003..f6a7859 100644 +--- a/BLACS/SRC/igamn2d_.c ++++ b/BLACS/SRC/igamn2d_.c +@@ -218,7 +218,7 @@ F_VOID_FUNC igamn2d_(int *ConTxt, F_CHAR scope, F_CHAR top, int *m, int *n, + { + #endif + i = 2; +- ierr=MPI_Type_struct(i, len, disp, dtypes, &MyType); ++ ierr=MPI_Type_create_struct(i, len, disp, dtypes, &MyType); + ierr=MPI_Type_commit(&MyType); + bp->N = bp2->N = 1; + bp->dtype = bp2->dtype = MyType; +diff --git a/BLACS/SRC/igamx2d_.c b/BLACS/SRC/igamx2d_.c +index 8165cbe..a7cfcc6 100644 +--- a/BLACS/SRC/igamx2d_.c ++++ b/BLACS/SRC/igamx2d_.c +@@ -218,7 +218,7 @@ F_VOID_FUNC igamx2d_(int *ConTxt, F_CHAR scope, F_CHAR top, int *m, int *n, + { + #endif + i = 2; +- ierr=MPI_Type_struct(i, len, disp, dtypes, &MyType); ++ ierr=MPI_Type_create_struct(i, len, disp, dtypes, &MyType); + ierr=MPI_Type_commit(&MyType); + bp->N = bp2->N = 1; + bp->dtype = bp2->dtype = MyType; +diff --git a/BLACS/SRC/sgamn2d_.c b/BLACS/SRC/sgamn2d_.c +index d6c95e5..569c797 100644 +--- a/BLACS/SRC/sgamn2d_.c ++++ b/BLACS/SRC/sgamn2d_.c +@@ -221,7 +221,7 @@ F_VOID_FUNC sgamn2d_(int *ConTxt, F_CHAR scope, F_CHAR top, int *m, int *n, + { + #endif + i = 2; +- ierr=MPI_Type_struct(i, len, disp, dtypes, &MyType); ++ ierr=MPI_Type_create_struct(i, len, disp, dtypes, &MyType); + ierr=MPI_Type_commit(&MyType); + bp->N = bp2->N = 1; + bp->dtype = bp2->dtype = MyType; +diff --git a/BLACS/SRC/sgamx2d_.c b/BLACS/SRC/sgamx2d_.c +index 4b0af6f..8897ece 100644 +--- a/BLACS/SRC/sgamx2d_.c ++++ b/BLACS/SRC/sgamx2d_.c +@@ -221,7 +221,7 @@ F_VOID_FUNC sgamx2d_(int *ConTxt, F_CHAR scope, F_CHAR top, int *m, int *n, + { + #endif + i = 2; +- ierr=MPI_Type_struct(i, len, disp, dtypes, &MyType); ++ ierr=MPI_Type_create_struct(i, len, disp, dtypes, &MyType); + ierr=MPI_Type_commit(&MyType); + bp->N = bp2->N = 1; + bp->dtype = bp2->dtype = MyType; +diff --git a/BLACS/SRC/zgamn2d_.c b/BLACS/SRC/zgamn2d_.c +index 9de2b23..37897df 100644 +--- a/BLACS/SRC/zgamn2d_.c ++++ b/BLACS/SRC/zgamn2d_.c +@@ -221,7 +221,7 @@ F_VOID_FUNC zgamn2d_(int *ConTxt, F_CHAR scope, F_CHAR top, int *m, int *n, + { + #endif + i = 2; +- ierr=MPI_Type_struct(i, len, disp, dtypes, &MyType); ++ ierr=MPI_Type_create_struct(i, len, disp, dtypes, &MyType); + ierr=MPI_Type_commit(&MyType); + bp->N = bp2->N = 1; + bp->dtype = bp2->dtype = MyType; +diff --git a/BLACS/SRC/zgamx2d_.c b/BLACS/SRC/zgamx2d_.c +index 414c381..0e9d474 100644 +--- a/BLACS/SRC/zgamx2d_.c ++++ b/BLACS/SRC/zgamx2d_.c +@@ -221,7 +221,7 @@ F_VOID_FUNC zgamx2d_(int *ConTxt, F_CHAR scope, F_CHAR top, int *m, int *n, + { + #endif + i = 2; +- ierr=MPI_Type_struct(i, len, disp, dtypes, &MyType); ++ ierr=MPI_Type_create_struct(i, len, disp, dtypes, &MyType); + ierr=MPI_Type_commit(&MyType); + bp->N = bp2->N = 1; + bp->dtype = bp2->dtype = MyType; +-- +2.20.1 + -- cgit v1.2.3 From aa94524052cad34300666753546725592a4340b8 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Wed, 13 Feb 2019 12:47:30 -0600 Subject: gnu: petsc: Upgrade to 3.10.3. * gnu/packages/maths.scm (petsc): Upgrade to 3.10.3. --- gnu/packages/maths.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 9fc87860c8..0a9166433e 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -1636,7 +1636,7 @@ September 2004}") (define-public petsc (package (name "petsc") - (version "3.10.2") + (version "3.10.3") (source (origin (method url-fetch) @@ -1644,7 +1644,7 @@ September 2004}") (uri (string-append "http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/" "petsc-lite-" version ".tar.gz")) (sha256 - (base32 "0bl64pydak3rblnjffi482r8bin4xim9sb37ksl2jkcxf0i0irsi")))) + (base32 "10p9ap1rp6k8k2g8zdc505kdlsc3976fjymyp393sccjapm50dph")))) (outputs '("out" ;libraries and headers "examples")) ;~30MiB of examples (build-system gnu-build-system) -- cgit v1.2.3 From 6d433d6ef7c33b8599199481e1c1faff6584d1ac Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Fri, 14 Sep 2018 11:53:50 -0500 Subject: gnu: Add ELPA. * gnu/packages/maths.scm (elpa, elpa-openmpi): New variables. --- gnu/packages/maths.scm | 92 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 91 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 0a9166433e..180737001e 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2013, 2014, 2015, 2016 Andreas Enge ;;; Copyright © 2013 Nikita Karetnikov ;;; Copyright © 2014, 2016, 2017 John Darrington -;;; Copyright © 2014, 2015, 2016, 2017, 2018 Eric Bavier +;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019 Eric Bavier ;;; Copyright © 2014 Federico Beffa ;;; Copyright © 2014 Mathieu Lirzin ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus @@ -3974,6 +3974,96 @@ as equations, scalars, vectors, and matrices.") theories} (SMT) solver. It provides a C/C++ API, as well as Python bindings.") (license license:expat))) +(define-public elpa + (package + (name "elpa") + (version "2018.11.001") + (source (origin + (method url-fetch) + (uri (string-append "http://elpa.mpcdf.mpg.de/html/Releases/" + version "/elpa-" version ".tar.gz")) + (sha256 + (base32 + "05hv3v5i6xmziaizw350ff72y1c3k662r85fm3xfdrkclj5zw9yc")))) + (build-system gnu-build-system) + (native-inputs + `(("fortran" ,gfortran) + ("perl" ,perl))) ;for configure and deps + (inputs + `(("blas" ,openblas))) + (arguments + `(#:configure-flags + `("--enable-openmp" + "--with-mpi=no" + ;; ELPA unfortunately does not support runtime dispatch, so we can + ;; only enable the "generic" kernels. See the "Cross compilation" + ;; section of INSTALL.md. + "--enable-generic" + "--disable-sse" "--disable-sse-assembly" ;Require SSE3 + "--disable-avx" "--disable-avx2" "--disable-avx512" + ,(string-append "CFLAGS=-O3 " + "-funsafe-loop-optimizations -funsafe-math-optimizations " + "-ftree-vect-loop-version -ftree-vectorize " + ,(let ((system (or (%current-target-system) + (%current-system)))) + (cond + ((or (string-prefix? "x86_64" system) + (string-prefix? "i686" system)) + "-msse2") + (else ""))))) + #:parallel-tests? #f ;tests are multi-threaded, via BLAS + #:phases + (modify-phases %standard-phases + (add-before 'configure 'patch-header-generation + (lambda _ + (substitute* "configure" + (("^ *make.*top_srcdir=\"\\$srcdir\"" &) + (string-append & " CPP=\"$CPP\""))) + #t)) + (add-before 'check 'setup-tests + (lambda _ + ;; Decrease test time and RAM use by computing fewer eigenvalues. + ;; The flags are (MATRIX-SIZE, EIGENVALUES, BLOCK-SIZE), where + ;; the default is (500, 250, 16) for C tests and (5000, 150, 16) + ;; for Fortran. This also causes several tests to pass that + ;; otherwise would otherwise fail with matrix size 5000; possibly + ;; due to floating point tolerances that are too tight. + (setenv "TEST_FLAGS" "1500 50 16") ;from elpa.spec + (setenv "OMP_NUM_THREADS" (number->string (parallel-job-count))) + (substitute* "Makefile" + ;; Test scripts are generated, patch the shebang + (("#!/bin/bash") (string-append "#!" (which "sh")))) + #t))))) + (home-page "http://elpa.mpcdf.mpg.de") + (synopsis "Eigenvalue solvers for symmetric matrices") + (description + "The ELPA library provides efficient and scalable direct eigensolvers for +symmetric matrices.") + (license license:lgpl3))) + +(define-public elpa-openmpi + (package (inherit elpa) + (name "elpa-openmpi") + (inputs + `(("mpi" ,openmpi) + ("scalapack" ,scalapack) + ,@(package-inputs elpa))) + (arguments + (substitute-keyword-arguments (package-arguments elpa) + ((#:configure-flags cf '()) + `(cons "--with-mpi=yes" (delete "--with-mpi=no" ,cf))) + ((#:phases phases '%standard-phases) + `(modify-phases ,phases + (add-before 'check 'mpi-setup + (lambda _ + ;; Tests use 2 mpi tasks by default, use our remaining build + ;; cores as OpenMP threads. + (setenv "OMP_NUM_THREADS" (number->string + (max (quotient (parallel-job-count) 2) + 1))) + (,%openmpi-setup))))))) + (synopsis "Eigenvalue solvers for symmetric matrices (with MPI support)"))) + (define-public elemental (package (name "elemental") -- cgit v1.2.3 From ec23bae682ab144179fad8d5ed6c2545d85384ad Mon Sep 17 00:00:00 2001 From: Dan Frumin Date: Wed, 13 Feb 2019 12:34:40 +0100 Subject: gnu: Add coq-equations. * gnu/packages/coq.scm (coq-equations): New variable. Signed-off-by: Julien Lepiller --- gnu/packages/coq.scm | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm index fa02f85cdf..3cd8c4cb69 100644 --- a/gnu/packages/coq.scm +++ b/gnu/packages/coq.scm @@ -500,3 +500,44 @@ work on a decision procedure for the equational theory of an extension of the sigma-calculus by Abadi et al. The library is completely written in Coq and uses Ltac to synthesize the substitution operation.") (license license:bsd-3)))) + +(define-public coq-equations + (package + (name "coq-equations") + (version "1.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mattam82/Coq-Equations.git") + (commit (string-append "v" version "-8.8")))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "129rxsdsf88vjcw0xhm74yax1hmnk6f8n9ksg0hcyyjq1ijddiwa")))) + (build-system gnu-build-system) + (native-inputs + `(("ocaml" ,ocaml) + ("coq" ,coq) + ("camlp5" ,camlp5))) + (arguments + `(#:test-target "test-suite" + #:phases + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (invoke "coq_makefile" "-f" "_CoqProject" "-o" "Makefile"))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (setenv "COQLIB" (string-append (assoc-ref outputs "out") "/lib/coq/")) + (invoke "make" + (string-append "COQLIB=" (assoc-ref outputs "out") + "/lib/coq/") + "install")))))) + (home-page "https://mattam82.github.io/Coq-Equations/") + (synopsis "Function definition plugin for Coq") + (description "Equations provides a notation for writing programs +by dependent pattern-matching and (well-founded) recursion in Coq. It +compiles everything down to eliminators for inductive types, equality +and accessibility, providing a definitional extension to the Coq +kernel.") + (license license:lgpl2.1))) -- cgit v1.2.3 From 70c7d02590a93d3950747a9538e3882cb34bcd49 Mon Sep 17 00:00:00 2001 From: Gabriel Hondet Date: Fri, 1 Feb 2019 20:20:54 +0100 Subject: gnu: Add ocaml-earley. * gnu/packages/ocaml.scm (ocaml-earley): New variable. Signed-off-by: Julien Lepiller --- gnu/packages/ocaml.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 07fcf92aea..0098806bcb 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -4683,6 +4683,31 @@ in-line tests in ocaml code. It is part of Jane Street's PPX rewriters collection.") (license license:expat))) +(define-public ocaml-earley + (package + (name "ocaml-earley") + (version "2.0.0") + (home-page "https://github.com/rlepigre/ocaml-earley") + (source + (origin + (method git-fetch) + (uri (git-reference + (url (string-append home-page ".git")) + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "18k7bi7krc4bvqnhijz1q0pfr0nfahghfjifci8rh1q4i5zd0xz5")))) + (build-system dune-build-system) + (arguments + `(#:test-target ".")) + (synopsis "Parsing library based on Earley Algorithm") + (description "Earley is a parser combinator library base on Earley's +algorithm. It is intended to be used in conjunction with an OCaml syntax +extension which allows the definition of parsers inside the language. There +is also support for writing OCaml syntax extensions in a camlp4 style.") + (license license:cecill-b))) + (define-public ocaml-biniou (package (name "ocaml-biniou") -- cgit v1.2.3 From 7195c4f2ae1c6da6c02fbf70a94d32aa35dd613a Mon Sep 17 00:00:00 2001 From: Gabriel Hondet Date: Fri, 1 Feb 2019 20:31:34 +0100 Subject: gnu: Add ocaml-bindlib. * gnu/packages/ocaml.scm (ocaml-bindlib): New variable. Signed-off-by: Julien Lepiller --- gnu/packages/ocaml.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 0098806bcb..6bc3def90f 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -4683,6 +4683,44 @@ in-line tests in ocaml code. It is part of Jane Street's PPX rewriters collection.") (license license:expat))) +(define-public ocaml-bindlib + (package + (name "ocaml-bindlib") + (version "5.0.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/rlepigre/ocaml-bindlib.git") + (commit (string-append "ocaml-bindlib_" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1f8kr81w8vsi4gv61xn1qbc6zrzkjp8l9ix0942vjh4gjxc74v75")))) + (build-system ocaml-build-system) + (arguments + `(#:tests? #f ;no tests + #:use-make? #t + #:phases + (modify-phases %standard-phases + (delete 'configure) + (replace 'build + (lambda _ + (invoke "make"))) + (replace 'install + (lambda _ + (invoke "make" "install")))))) + (native-inputs + `(("ocamlbuild" ,ocamlbuild) + ("ocaml-findlib" ,ocaml-findlib))) + (home-page "https://rlepigre.github.io/ocaml-bindlib/") + (synopsis "OCaml Bindlib library for bound variables") + (description "Bindlib is a library allowing the manipulation of data +structures with bound variables. It is particularly useful when writing ASTs +for programming languages, but also for manipulating terms of the λ-calculus +or quantified formulas.") + (license license:gpl3+))) + (define-public ocaml-earley (package (name "ocaml-earley") -- cgit v1.2.3 From 8213db7c951ea84597f8ac859d3ae588481ec5a2 Mon Sep 17 00:00:00 2001 From: Gabriel Hondet Date: Fri, 1 Feb 2019 20:50:25 +0100 Subject: gnu: Add ocaml-timed. * gnu/packages/ocaml.scm (ocaml-timed): New variable. Signed-off-by: Julien Lepiller --- gnu/packages/ocaml.scm | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 6bc3def90f..5101cc6b0a 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -4746,6 +4746,47 @@ extension which allows the definition of parsers inside the language. There is also support for writing OCaml syntax extensions in a camlp4 style.") (license license:cecill-b))) +(define-public ocaml-timed + (package + (name "ocaml-timed") + (version "1.0") + (home-page "https://github.com/rlepigre/ocaml-timed") + (source (origin + (method git-fetch) + (uri (git-reference + (url (string-append home-page ".git")) + (commit (string-append name "_" version)))) + (sha256 + (base32 + "0hfxz710faxy5yk97bkfnw87r732jcxxhmjppwrbfdb6pd0wks96")) + (file-name (git-file-name name version)))) + (build-system ocaml-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (delete 'configure) + (replace 'build + (lambda _ + (invoke "make"))) + (replace 'install + (lambda _ + (invoke "make" "install"))) + (replace 'check + (lambda _ + (invoke "make" "tests")))))) + (synopsis "Timed references for imperative state") + (description "Timed references for imperative state. This module provides +an alternative type for references (or mutable cells) supporting undo/redo +operations. In particular, an abstract notion of time is used to capture the +state of the references at any given point, so that it can be restored. Note +that usual reference operations only have a constant time / memory overhead +(compared to those of the standard library). + +Moreover, we provide an alternative implementation based on the references +of the standard library (Pervasives module). However, it is less efficient +than the first one.") + (license license:expat))) + (define-public ocaml-biniou (package (name "ocaml-biniou") -- cgit v1.2.3 From ed362d165271ea2de8a9a8b52d84764ac65d3f4f Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 13 Feb 2019 17:03:02 -0500 Subject: gnu: certbot, python-acme: Update to 0.31.0. * gnu/packages/tls.scm (certbot, python-acme): Update to 0.31.0. --- gnu/packages/tls.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index fab0e72278..e9ee79e508 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -531,13 +531,13 @@ netcat implementation that supports TLS.") (package (name "python-acme") ;; Remember to update the hash of certbot when updating python-acme. - (version "0.30.2") + (version "0.31.0") (source (origin (method url-fetch) (uri (pypi-uri "acme" version)) (sha256 (base32 - "1wmqxrl4w9w79jd16bmxp8g3xbrx3az4137zbip8x44zrrzmnni9")))) + "1gxjv09c695lj8swspa390nch117i60qkrgy135383vfk00jsp3y")))) (build-system python-build-system) (arguments `(#:phases @@ -588,7 +588,7 @@ netcat implementation that supports TLS.") (uri (pypi-uri name version)) (sha256 (base32 - "0vkpqwps1c8ja140kiiz2cws9hqjrbkx58wbji3qxv9cap5qfi2k")))) + "0wq4jgyzli684h154w26xplp0fzyks2vlrnmhafhyb0h1bw9cc8c")))) (build-system python-build-system) (arguments `(,@(substitute-keyword-arguments (package-arguments python-acme) -- cgit v1.2.3 From d3065c87854a102d5435d41aa0a0976d59719fdf Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 13 Feb 2019 17:33:47 +0100 Subject: gnu: Restore copyright header. This was mistakenly removed in bec2a2e10e199d6ee671ec5713bd103242e91b62. * gnu/packages/kde.scm: Restore copyright header. --- gnu/packages/kde.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index ff26b0ea83..23078d00a0 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016, 2017 Efraim Flashner -;;; Copyright © 2017 Thomas Danckaert +;;; Copyright © 2016, 2017 Thomas Danckaert ;;; Copyright © 2017, 2018 Mark Meyer ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Gábor Boskovits -- cgit v1.2.3 From 9047603c2ee51bc77e3db9b24f016e65bb1761b3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 13 Feb 2019 17:35:50 +0100 Subject: gnu: KDE Plasma: Remove unused properties. * gnu/packages/kde-plasma.scm (kdecoration, kscreenlocker)[properties]: Remove. --- gnu/packages/kde-plasma.scm | 2 -- 1 file changed, 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm index 2b84902225..8d9d0b7660 100644 --- a/gnu/packages/kde-plasma.scm +++ b/gnu/packages/kde-plasma.scm @@ -44,7 +44,6 @@ (sha256 (base32 "115pli0qpa8lx0jasg1886fcg7gb2kk8v6k8r8l8c820l97sq7in")))) - (properties `((tags . '("Desktop" "KDE" "Plasma")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -74,7 +73,6 @@ manager which re-parents a Client window to a window decoration frame.") (sha256 (base32 "16amr7pz0k6w5vkk1dwn2qi3s1mln0jypwmjazqq2lbwimn8k56m")))) - (properties `((tags . '("Desktop" "KDE" "Plasma")))) (build-system cmake-build-system) (arguments `(#:phases -- cgit v1.2.3 From 95991e4517de2b04ddb9f0cc27087d578e15b4e8 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 13 Feb 2019 17:37:00 +0100 Subject: gnu: Open vSwitch: Update to 2.10.1. * gnu/packages/networking.scm (openvswitch): Update to 2.10.1. --- 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 afd83dcfdb..d73b6f1108 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -1402,7 +1402,7 @@ procedure calls (RPCs).") (define-public openvswitch (package (name "openvswitch") - (version "2.8.1") + (version "2.10.1") (source (origin (method url-fetch) (uri (string-append @@ -1410,7 +1410,7 @@ procedure calls (RPCs).") version ".tar.gz")) (sha256 (base32 - "14rqqhfyv49irz8ag0qbv9jn8z0bn3qzxir3r074y16p4sg4674d")))) + "103wi6k8xal0z1pyy680gms56skagh6jawa2ja588ljr55jcg4sg")))) (build-system gnu-build-system) (arguments '(;; FIXME: many tests fail with: -- cgit v1.2.3 From cb94d5e161a3ba80a2ca1f62590e16ac07289a25 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 13 Feb 2019 17:39:36 +0100 Subject: gnu: Varnish: Update to 6.1.1. * gnu/packages/web.scm (varnish): Update to 6.1.1. [native-inputs]: Add PYTHON-SPHINX. [arguments]: Add "--disable-pcre-jit" to #:configure-flags. --- gnu/packages/web.scm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 5f95fa3a23..f7f8e157e5 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4781,13 +4781,13 @@ deployments.") (package (name "varnish") (home-page "https://varnish-cache.org/") - (version "6.0.0") + (version "6.1.1") (source (origin (method url-fetch) (uri (string-append home-page "_downloads/varnish-" version ".tgz")) (sha256 (base32 - "1vhbdch33m6ig4ijy57zvrramhs9n7cba85wd8rizgxjjnf87cn7")))) + "0gf9hzzrr1lndbbqi8cwlfasi7l517cy3nbgna88i78lm247rvp0")))) (build-system gnu-build-system) (arguments `(#:configure-flags (list (string-append "LDFLAGS=-Wl,-rpath=" %output "/lib") @@ -4795,6 +4795,10 @@ deployments.") (string-append "PTHREAD_CC=" (assoc-ref %build-inputs "gcc") "/bin/gcc") + ;; XXX: Disable PCRE-JIT to work around a segmentation + ;; fault when using jemalloc 5.x: + ;; + "--disable-pcre-jit" "--localstatedir=/var") #:phases (modify-phases %standard-phases @@ -4829,6 +4833,7 @@ deployments.") #t)))))) (native-inputs `(("pkg-config" ,pkg-config) + ("python-sphinx" ,python-sphinx) ("rst2man" ,python-docutils))) (inputs `(("jemalloc" ,jemalloc) -- cgit v1.2.3 From 0988191f332f7a1db2464f7ac87ed9cc52ed0acc Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 13 Feb 2019 18:13:30 +0100 Subject: gnu: libassuan: Update to 2.5.3. * gnu/packages/gnupg.scm (libassuan): Update to 2.5.3. --- gnu/packages/gnupg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 2b3ee89d35..2462292658 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -138,7 +138,7 @@ generation.") (define-public libassuan (package (name "libassuan") - (version "2.5.2") + (version "2.5.3") (source (origin (method url-fetch) @@ -146,7 +146,7 @@ generation.") version ".tar.bz2")) (sha256 (base32 - "1rw8nw6fx6ppxga6m4cqcp898lnlzf7vn3s5c2lzfxg3fzr1nswq")))) + "00p7cpvzf0q3qwcgg51r9d0vbab4qga2xi8wpk2fgd36710b1g4i")))) (build-system gnu-build-system) (propagated-inputs `(("libgpg-error" ,libgpg-error) -- cgit v1.2.3 From 5bd0813a0f8243f6e7f07ad590c9f620943ed417 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 13 Feb 2019 18:13:49 +0100 Subject: gnu: GnuPG: Update to 2.2.13. * gnu/packages/gnupg.scm (gnupg): Update to 2.2.13. --- gnu/packages/gnupg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 2462292658..7a7ff966bb 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -224,14 +224,14 @@ compatible to GNU Pth.") (define-public gnupg (package (name "gnupg") - (version "2.2.12") + (version "2.2.13") (source (origin (method url-fetch) (uri (string-append "mirror://gnupg/gnupg/gnupg-" version ".tar.bz2")) (sha256 (base32 - "1jw282iy27j1qygym52aa44zxy7ly4bdadhd628hwr4q9j5hy0yv")))) + "1n0igfn9nwdajzkcgdx7apwm9m5rpw0fg6vwskmf1rpranlqgivn")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From ce53048fb82d4d8fefa846aef989408aa1d98055 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 13 Feb 2019 18:14:09 +0100 Subject: gnu: msmtp: Update to 1.8.3. * gnu/packages/mail.scm (msmtp): Update to 1.8.3. --- gnu/packages/mail.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 982a75c7e2..2c06519e1f 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1066,7 +1066,7 @@ which can add many functionalities to the base client.") (define-public msmtp (package (name "msmtp") - (version "1.8.2") + (version "1.8.3") (source (origin (method url-fetch) @@ -1074,7 +1074,7 @@ which can add many functionalities to the base client.") "/msmtp-" version ".tar.xz")) (sha256 (base32 - "14w7lmw1jxlganfk089b0ib23y5917mxbg3xqpid007dd4cmq66i")))) + "1d4jdgrx4czp66nnwdsy938lzr4llhwyy0715pwg0j6h6gyyxciw")))) (build-system gnu-build-system) (inputs `(("libsecret" ,libsecret) -- cgit v1.2.3 From fe04988953eab1cb25270d000c636bc44f68aa43 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 13 Feb 2019 18:16:22 +0100 Subject: gnu: xapian: Update to 1.4.10. * gnu/packages/search.scm (xapian, python-xapian-bindings): Update to 1.4.10. --- gnu/packages/search.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/search.scm b/gnu/packages/search.scm index ed616e739f..8ee6b4d32f 100644 --- a/gnu/packages/search.scm +++ b/gnu/packages/search.scm @@ -47,14 +47,14 @@ (define-public xapian (package (name "xapian") - (version "1.4.9") + (version "1.4.10") ;; Note: When updating Xapian, remember to update xapian-bindings below. (source (origin (method url-fetch) (uri (string-append "https://oligarchy.co.uk/xapian/" version "/xapian-core-" version ".tar.xz")) (sha256 - (base32 "1k7m7m9jld96k16ansfw2w3c354pvd8ibhnrb6dw012g06fw7sfd")))) + (base32 "1f4vf1w1yvsn9mn462q6snc8wkmfpifp8wrlzs4aqi45w0kr6rk8")))) (build-system gnu-build-system) (inputs `(("zlib" ,zlib) ("util-linux" ,util-linux))) @@ -92,7 +92,7 @@ rich set of boolean query operators.") "/xapian-bindings-" version ".tar.xz")) (sha256 (base32 - "0ll3z3418r7bzxs4kyini2cbci5xl8i5scl3wyx88s2v4ak56bcz")))) + "0zqx5gcwm2mhx41fnfx30z9c31x96g5pskyrmx3c556mnklfpask")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--with-python3") -- cgit v1.2.3 From 58c6a93d9d60660d8425d8c52d4b73a42d4a5b55 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 13 Feb 2019 20:24:06 +0100 Subject: gnu: doxygen: Update home page and source URI. * gnu/packages/documentation.scm (doxygen)[home-page]: Change to . [source](uri): Likewise. Add sourceforge mirror. --- gnu/packages/documentation.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/documentation.scm b/gnu/packages/documentation.scm index 9425df707c..9d4d5916fb 100644 --- a/gnu/packages/documentation.scm +++ b/gnu/packages/documentation.scm @@ -124,10 +124,14 @@ markup) can be customized and extended by the user.") (package (name "doxygen") (version "1.8.14") + (home-page "http://www.doxygen.nl/") (source (origin (method url-fetch) - (uri (string-append "http://ftp.stack.nl/pub/users/dimitri/" - name "-" version ".src.tar.gz")) + (uri (list (string-append home-page "files/doxygen-" + version ".src.tar.gz") + (string-append "mirror://sourceforge/doxygen/rel-" + version "/doxygen-" version + ".src.tar.gz"))) (sha256 (base32 "0kcxymbam9jwiyjwyvwdjj0h74lbb6c467szsipzbxjyfl17wxfi")) @@ -150,7 +154,6 @@ markup) can be customized and extended by the user.") (string-append (assoc-ref inputs "bash") "/bin/sh"))) #t))))) - (home-page "http://www.stack.nl/~dimitri/doxygen/") (synopsis "Generate documentation from annotated sources") (description "Doxygen is the de facto standard tool for generating documentation from annotated C++ sources, but it also supports other popular -- cgit v1.2.3 From 3a7fbd3ae5ae9942277b0f4bebcd7db980e3c9cd Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 10 Feb 2019 21:35:59 +0100 Subject: gnu: xkeyboard-config: Update to 2.26. * gnu/packages/xorg.scm (xkeyboard-config): Update to 2.26. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index de8d784e64..e99d1850cc 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -3856,7 +3856,7 @@ extension to the X11 protocol. It includes: (define-public xkeyboard-config (package (name "xkeyboard-config") - (version "2.24") + (version "2.26") (source (origin (method url-fetch) @@ -3866,7 +3866,7 @@ extension to the X11 protocol. It includes: ".tar.bz2")) (sha256 (base32 - "1my4786pd7iv5x392r9skj3qclmbd26nqzvh2fllwkkbyj08bcci")))) + "13h3381pfp4pv32189zkfsj2x0alr91xj6dqii76rl0c8v3ihdrr")))) (build-system gnu-build-system) (inputs `(("gettext" ,gettext-minimal) -- cgit v1.2.3 From 0add9c52637659eb5e09797f2c9e9be7bf7e9989 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 13 Feb 2019 20:54:59 +0100 Subject: gnu: doxygen: Update to 1.8.15. * gnu/packages/documentation.scm (doxygen): Update to 1.8.15. * gnu/packages/patches/doxygen-test.patch: Update for upstream changes. --- gnu/packages/documentation.scm | 4 ++-- gnu/packages/patches/doxygen-test.patch | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/documentation.scm b/gnu/packages/documentation.scm index 9d4d5916fb..6ce7827391 100644 --- a/gnu/packages/documentation.scm +++ b/gnu/packages/documentation.scm @@ -123,7 +123,7 @@ markup) can be customized and extended by the user.") (define-public doxygen (package (name "doxygen") - (version "1.8.14") + (version "1.8.15") (home-page "http://www.doxygen.nl/") (source (origin (method url-fetch) @@ -134,7 +134,7 @@ markup) can be customized and extended by the user.") ".src.tar.gz"))) (sha256 (base32 - "0kcxymbam9jwiyjwyvwdjj0h74lbb6c467szsipzbxjyfl17wxfi")) + "0p94b4yb6bk2dxzs5kyl82xxgq2qakgbx5yy3ssbbadncb20x75x")) (patches (search-patches "doxygen-test.patch")))) (build-system cmake-build-system) (native-inputs diff --git a/gnu/packages/patches/doxygen-test.patch b/gnu/packages/patches/doxygen-test.patch index 5ac063adbf..8ccb9ec3c4 100644 --- a/gnu/packages/patches/doxygen-test.patch +++ b/gnu/packages/patches/doxygen-test.patch @@ -5,14 +5,14 @@ test. diff -u -r doxygen-1.8.7.orig/testing/012/citelist.xml doxygen-1.8.7/testing/012/citelist.xml --- doxygen-1.8.7.orig/testing/012/citelist.xml 2014-04-24 23:43:34.000000000 +0200 +++ doxygen-1.8.7/testing/012/citelist.xml 2014-04-24 23:49:43.000000000 +0200 -@@ -4,17 +4,6 @@ - citelist - Bibliography +@@ -6,17 +6,6 @@ + + - - - -- [1] +- [1] - - - DonaldE. Knuth. Tex and Metafont, New Directions in Typesetting. American Mathematical Society and Digital Press, Stanford, 1979. -- cgit v1.2.3 From 69c15ad8a46c8e5f319a73ee5891bcd1bf0600c5 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Thu, 14 Feb 2019 00:10:01 +0100 Subject: gnu: qtbase: Restore compilation on linux kernels < 4.11. Fixes . * gnu/packages/patches/qtbase-old-kernel.patch: New file. * gnu/local.mk (dist_patch_DATA): Register patch. * gnu/packages/qt.scm (qtbase): Add patch. --- gnu/packages/patches/qtbase-old-kernel.patch | 25 +++++++++++++++++++++++++ gnu/packages/qt.scm | 3 ++- 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/qtbase-old-kernel.patch (limited to 'gnu/packages') diff --git a/gnu/packages/patches/qtbase-old-kernel.patch b/gnu/packages/patches/qtbase-old-kernel.patch new file mode 100644 index 0000000000..aa26fb6c4f --- /dev/null +++ b/gnu/packages/patches/qtbase-old-kernel.patch @@ -0,0 +1,25 @@ +https://672856.bugs.gentoo.org/attachment.cgi?id=557978 +https://bugs.gentoo.org/672856 + +The patch fixes building qtbase with linux kernels < 4.11. +See bug #34431. + +diff -Naurp a/src/corelib/global/minimum-linux_p.h b/src/corelib/global/minimum-linux_p.h +--- a/src/corelib/global/minimum-linux_p.h 2018-11-25 15:51:11.000000000 +0300 ++++ b/src/corelib/global/minimum-linux_p.h 2018-12-17 13:25:38.176823753 +0300 +@@ -75,14 +75,9 @@ QT_BEGIN_NAMESPACE + * - accept4 2.6.28 + * - renameat2 3.16 QT_CONFIG(renameat2) + * - getrandom 3.17 QT_CONFIG(getentropy) +- * - statx 4.11 QT_CONFIG(statx) + */ + +-#if QT_CONFIG(statx) +-# define MINLINUX_MAJOR 4 +-# define MINLINUX_MINOR 11 +-# define MINLINUX_PATCH 0 +-#elif QT_CONFIG(getentropy) ++#if QT_CONFIG(getentropy) + # define MINLINUX_MAJOR 3 + # define MINLINUX_MINOR 17 + # define MINLINUX_PATCH 0 diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 6775a991b9..664309cb52 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -512,7 +512,8 @@ system, and the core design of Django is reused in Grantlee.") (base32 "071yc9iz14qs4s8yvrwllyfdzp5yjxsdpvbjxdrf0g5q69vqigy6")) ;; Use TZDIR to avoid depending on package "tzdata". - (patches (search-patches "qtbase-use-TZDIR.patch")) + (patches (search-patches "qtbase-use-TZDIR.patch" + "qtbase-old-kernel.patch")) (modules '((guix build utils))) (snippet ;; corelib uses bundled harfbuzz, md4, md5, sha3 -- cgit v1.2.3 From 706460a35754a47bf832a40de4f22271e7088226 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Mon, 11 Feb 2019 20:21:39 +0000 Subject: gnu: Add trydiffoscope. * gnu/packages/package-management (trydiffoscope): New variable. Signed-off-by: Leo Famulari --- gnu/packages/package-management.scm | 50 +++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index af9667cd91..eff8d5c3fd 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2018 Sou Bunnbu ;;; Copyright © 2018 Eric Bavier ;;; Copyright © 2019 Efraim Flashner +;;; Copyright © 2019 Vagrant Cascadian ;;; ;;; This file is part of GNU Guix. ;;; @@ -606,6 +607,55 @@ various binary formats into more human readable forms to compare them. It can compare two tarballs, ISO images, or PDFs just as easily.") (license license:gpl3+))) +(define-public trydiffoscope + (package + (name "trydiffoscope") + (version "67.0.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://salsa.debian.org/reproducible-builds/trydiffoscope.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "03b66cjii7l2yiwffj6ym6mycd5drx7prfp4j2550281pias6mjh")))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'install 'install-doc + (lambda* (#:key outputs #:allow-other-keys) + (let* ((share (string-append (assoc-ref outputs "out") "/share/"))) + (mkdir-p (string-append share "/man/man1/" )) + (invoke "rst2man.py" + "trydiffoscope.1.rst" + (string-append share "/man/man1/trydiffoscope.1")) + (mkdir-p (string-append share "/doc/" ,name "-" ,version)) + (install-file "./README.rst" + (string-append share "/doc/" ,name "-" ,version))) + #t))))) + (propagated-inputs + `(("python-requests" ,python-requests))) + (native-inputs + `(("gzip" ,gzip) + ("python-docutils" ,python-docutils))) + (build-system python-build-system) + (home-page "https://try.diffoscope.org") + (synopsis "Client for remote diffoscope service") + (description "This is a client for the @url{https://try.diffoscope.org, +remote diffoscope service}. + +Diffoscope tries to get to the bottom of what makes files or directories +different. It recursively unpacks archives of many kinds and transforms +various binary formats into more human readable forms to compare them. It can +compare two tarballs, ISO images, or PDFs just as easily. + +Results are displayed by default, stored as local text or html files, or made +available via a URL on @url{https://try.diffoscope.org}. Results stored on the +server are purged after 30 days.") + (license license:gpl3+))) + (define-public python-anaconda-client (package (name "python-anaconda-client") -- cgit v1.2.3 From d71184f8a5c33c970ba0f50e9ca16b271da301b8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 14 Feb 2019 03:25:44 +0100 Subject: gnu: perl-xml-libxml: Update to 2.0134. * gnu/packages/xml.scm (perl-xml-libxml): Update to 2.0134. --- gnu/packages/xml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 52f1533699..51f3871218 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -404,7 +404,7 @@ combination with @code{XML::Parser}, PerlSAX, @code{XML::DOM}, (define-public perl-xml-libxml (package (name "perl-xml-libxml") - (version "2.0132") + (version "2.0134") (source (origin (method url-fetch) @@ -412,7 +412,7 @@ combination with @code{XML::Parser}, PerlSAX, @code{XML::DOM}, "XML-LibXML-" version ".tar.gz")) (sha256 (base32 - "0xnl281hb590i287fxpl947f1s4zl9dnvc4ajvsqi89w23im453j")))) + "1ks69xymv6zkj7hvaymjvb78ch81abri7kg4zrwxhdfsqb8a9g7h")))) (build-system perl-build-system) (propagated-inputs `(("perl-xml-namespacesupport" ,perl-xml-namespacesupport) -- cgit v1.2.3 From d100b9bd97f27cf3257b1b14bb0f9b27a966c27e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 14 Feb 2019 03:45:11 +0100 Subject: gnu: rrdtool: Update to 1.7.1. * gnu/packages/rrdtool.scm (rrdtool): Update to 1.7.1. --- gnu/packages/rrdtool.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/rrdtool.scm b/gnu/packages/rrdtool.scm index eb9be7a4bc..fb2afe616f 100644 --- a/gnu/packages/rrdtool.scm +++ b/gnu/packages/rrdtool.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 Mark H Weaver -;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -37,14 +37,14 @@ (define-public rrdtool (package (name "rrdtool") - (version "1.7.0") + (version "1.7.1") (source (origin (method url-fetch) (uri (string-append "http://oss.oetiker.ch/rrdtool/pub/rrdtool-" version ".tar.gz")) (sha256 (base32 - "0ssjqpa0dwwzbylc0drmlbq922qcw8crffc0rpr805xr6n4k8zgr")))) + "1bhsg119j94xwykp2sbp01hhxcg78gzblfn7j98slrv9va77g6wq")))) (build-system gnu-build-system) (inputs `(("cairo" ,cairo) -- cgit v1.2.3 From 811b907da7bad99b7d7493623a0d7d61c388451b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 14 Feb 2019 03:45:50 +0100 Subject: gnu: rclone: Update to 1.46. * gnu/packages/sync.scm (rclone): Update to 1.46. [arguments]: Remove 'set-home-directory' phase. --- gnu/packages/sync.scm | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm index 421e362cde..d8789de2ce 100644 --- a/gnu/packages/sync.scm +++ b/gnu/packages/sync.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner ;;; Copyright © 2017 Ricardo Wurmus -;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 Ludovic Courtès ;;; Copyright © 2018 Nicolas Goaziou ;;; @@ -249,7 +249,7 @@ over the Internet in an HTTP and CDN friendly way; (define-public rclone (package (name "rclone") - (version "1.45") + (version "1.46") (source (origin (method git-fetch) (uri (git-reference @@ -258,19 +258,13 @@ over the Internet in an HTTP and CDN friendly way; (file-name (git-file-name name version)) (sha256 (base32 - "06xg0ibv9pnrnmabh1kblvxx1pk8h5rmkr9mjbymv497sx3zgz26")))) + "1fl52dl41n76r678nzkxa2kgk9khn1fxraxgk8jd3ayc787qs9ia")))) ;; FIXME: Rclone bundles some libraries Guix already provides. Need to ;; un-bundle them. (build-system go-build-system) (arguments '(#:import-path "github.com/ncw/rclone" - #:install-source? #f - #:phases - (modify-phases %standard-phases - ;; Fix failure during "check" phase: "mkdir /homeless-shelter: - ;; permission denied". - (add-after 'unpack 'set-home-directory - (lambda _ (setenv "HOME" "/tmp") #t))))) + #:install-source? #f)) (synopsis "@code{rsync} for cloud storage") (description "@code{Rclone} is a command line program to sync files and directories to and from different cloud storage providers. -- cgit v1.2.3 From 11bf3b2f0391225b159ae26eca4871a19ad947e0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 14 Feb 2019 03:46:06 +0100 Subject: gnu: hiawatha: Update to 10.8.4. * gnu/packages/web.scm (hiawatha): Update to 10.8.4. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index f7f8e157e5..d8bab34e51 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4959,7 +4959,7 @@ functions of Tidy.") (define-public hiawatha (package (name "hiawatha") - (version "10.8.3") + (version "10.8.4") (source (origin (method url-fetch) @@ -4973,7 +4973,7 @@ functions of Tidy.") #t)) (sha256 (base32 - "0w7047pwijhsbvvv1qjynp7gvn0nil56w82f7ax0gabrg7ddzk6s")))) + "054bcn1rsa064kak5lm961k2l38bz3329ik7j68fxlqs0zlj5cvw")))) (build-system cmake-build-system) (arguments `(#:tests? #f ; no tests included -- cgit v1.2.3 From 767b44270d28cd30896adfecda390676b6fe3f5a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 14 Feb 2019 03:47:04 +0100 Subject: gnu: libdvdread: Don't use NAME in source URI. * gnu/packages/video.scm (libdvdread)[source]: Hard-code NAME. --- 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 aa7930aad7..9c27272f18 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1638,8 +1638,8 @@ players, like VLC or MPlayer.") (source (origin (method url-fetch) (uri (string-append "https://download.videolan.org/videolan/" - name "/" version "/" - name "-" version ".tar.bz2")) + "libdvdread/" version "/" + "libdvdread-" version ".tar.bz2")) (sha256 (base32 "0dgr23fzcjhb7ck54xkr9zmf4jcq3ph0dz3fbyvla1c6ni9ijfxk")))) -- cgit v1.2.3 From ff7559d65ca4dae655bc4d4e62a91381e5afd085 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 14 Feb 2019 03:47:27 +0100 Subject: gnu: libdvdread: Update to 6.0.1. * gnu/packages/video.scm (libdvdread): Update to 6.0.1. --- 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 9c27272f18..b7f79aa483 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1634,7 +1634,7 @@ players, like VLC or MPlayer.") (define-public libdvdread (package (name "libdvdread") - (version "6.0.0") + (version "6.0.1") (source (origin (method url-fetch) (uri (string-append "https://download.videolan.org/videolan/" @@ -1642,7 +1642,7 @@ players, like VLC or MPlayer.") "libdvdread-" version ".tar.bz2")) (sha256 (base32 - "0dgr23fzcjhb7ck54xkr9zmf4jcq3ph0dz3fbyvla1c6ni9ijfxk")))) + "1gfmh8ii3s2fw1c8vn57piwxc0smd3va4h7xgp9s8g48cc04zki8")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--with-libdvdcss=yes"))) -- cgit v1.2.3 From 40b114c0bb3da70a209f204e50505c8e4b987257 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Wed, 13 Feb 2019 19:04:38 -0600 Subject: gnu: dealii: Upgrade to 9.0.1. * gnu/packages/patches/dealii-mpi-deprecations.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/maths.scm (dealii)[source]: Upgrade to 9.0.1. Use patch. [arguments]: Use new MPI configuration flags. --- gnu/packages/maths.scm | 11 ++++----- gnu/packages/patches/dealii-mpi-deprecations.patch | 28 ++++++++++++++++++++++ 2 files changed, 33 insertions(+), 6 deletions(-) create mode 100644 gnu/packages/patches/dealii-mpi-deprecations.patch (limited to 'gnu/packages') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 180737001e..bf03571c45 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -3447,7 +3447,7 @@ revised simplex and the branch-and-bound methods.") (define-public dealii (package (name "dealii") - (version "8.5.1") + (version "9.0.1") (source (origin (method url-fetch) @@ -3455,7 +3455,8 @@ revised simplex and the branch-and-bound methods.") "download/v" version "/dealii-" version ".tar.gz")) (sha256 (base32 - "1bh9rsmkrg0zi70n27b11djmac9lximghsiy7mg7w7x544n82gnk")) + "0r7f8rhl3xr94imd372plizdcbqk0a70w73lwc3vw912dxk0sbyz")) + (patches (search-patches "dealii-mpi-deprecations.patch")) (modules '((guix build utils))) (snippet ;; Remove bundled sources: UMFPACK, TBB, muParser, and boost @@ -3508,10 +3509,8 @@ in finite element programs.") (arguments (substitute-keyword-arguments (package-arguments dealii) ((#:configure-flags cf) - ``("-DMPI_C_COMPILER=mpicc" - "-DMPI_CXX_COMPILER=mpicxx" - "-DMPI_Fortran_COMPILER=mpifort" - ,@,cf)) + `(cons "-DDEAL_II_WITH_MPI:BOOL=ON" + ,cf)) ((#:phases phases '%standard-phases) `(modify-phases ,phases (add-before 'check 'mpi-setup diff --git a/gnu/packages/patches/dealii-mpi-deprecations.patch b/gnu/packages/patches/dealii-mpi-deprecations.patch new file mode 100644 index 0000000000..816d54140a --- /dev/null +++ b/gnu/packages/patches/dealii-mpi-deprecations.patch @@ -0,0 +1,28 @@ +From 40538ad31a71495649d174b0f7be5f7135d0a905 Mon Sep 17 00:00:00 2001 +From: David Wells +Date: Sat, 2 Feb 2019 10:00:38 -0500 +Subject: [PATCH] Avoid calling a deprecated MPI function. + +This was deprecated a long time ago (1996) and is not present in the +latest version of openMPI (4.0): see + +https://www.open-mpi.org/faq/?category=mpi-removed + +Credit goes to Pratik Nayak for finding this issue. +--- + source/base/mpi.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/source/base/mpi.cc b/source/base/mpi.cc +index bd1f7f9846a..b8cd45e7c26 100644 +--- a/source/base/mpi.cc ++++ b/source/base/mpi.cc +@@ -448,7 +448,7 @@ namespace Utilities + MPI_Aint displacements[] = {0, offsetof(MinMaxAvg, min_index)}; + MPI_Datatype types[] = {MPI_DOUBLE, MPI_INT}; + +- ierr = MPI_Type_struct(2, lengths, displacements, types, &type); ++ ierr = MPI_Type_create_struct(2, lengths, displacements, types, &type); + AssertThrowMPI(ierr); + + ierr = MPI_Type_commit(&type); -- cgit v1.2.3 From b5c2e7205177742f33b308a1590f279ce132d5b4 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 14 Feb 2019 10:43:48 +0200 Subject: gnu: python-requests: Update to 2.21.0. * gnu/packages/python-web.scm (python-requests): Update to 2.21.0. --- 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 afec5ebc30..8fb546b42a 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1277,13 +1277,13 @@ WebSocket usage in Python programs.") (define-public python-requests (package (name "python-requests") - (version "2.13.0") + (version "2.21.0") (source (origin (method url-fetch) (uri (pypi-uri "requests" version)) (sha256 (base32 - "1s0wg4any4dsv5l3hqjxqk2zgb7pdbqhy9rhc8kh3aigfq4ws8jp")))) + "13jr0wkj9c2j8c0c8iaal9iivi0bpxghnsdn6lxcpnmc657q4ajh")))) ;; TODO: unbundle urllib3 and chardet. (build-system python-build-system) (arguments -- cgit v1.2.3 From a49bbaa6cd9401fd29f2ff4e41742fdfa951e521 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 14 Feb 2019 14:04:39 +0200 Subject: gnu: inxi-minimal: Update inputs. * gnu/packages/admin.scm (inxi-minimal)[inputs]: Replace bash with bash-minimal, add procps. (inxi)[inputs]: Inherit procps from inxi-minimal. --- gnu/packages/admin.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index f4c34e10fe..c0c991c137 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2016, 2017 Leo Famulari ;;; Copyright © 2016 Pjotr Prins ;;; Copyright © 2016, 2017 Ricardo Wurmus -;;; Copyright © 2016, 2017, 2018 Efraim Flashner +;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner ;;; Copyright © 2016 Peter Feigl ;;; Copyright © 2016 John J. Foerch ;;; Copyright © 2016, 2017 Nils Gillmann @@ -2715,8 +2715,9 @@ Python loading in HPC environments.") "1k9148xnfznch1443niaa3w1kmsw4vp0xpwna6npgmi7zqg06ymy")))) (build-system trivial-build-system) (inputs - `(("bash" ,bash) - ("perl" ,perl))) + `(("bash" ,bash-minimal) + ("perl" ,perl) + ("procps" ,procps))) (native-inputs `(("gzip" ,gzip))) (arguments @@ -2789,7 +2790,6 @@ support forum. It runs with the @code{/exec} command in most IRC clients.") ("lm-sensors" ,lm-sensors) ("mesa-utils" ,mesa-utils) ("pciutils" ,pciutils) - ("procps" ,procps) ("tar" ,tar) ("tree" ,tree) ("util-linux" ,util-linux) ; lsblk -- cgit v1.2.3 From 03d373202347617056ef103d356575d068123db8 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Thu, 14 Feb 2019 17:00:58 +0100 Subject: gnu: conkey: Update to 1.11.2. * gnu/packages/conky.scm (conkey): Update to 1.11.2. --- gnu/packages/conky.scm | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/conky.scm b/gnu/packages/conky.scm index 0da9f8438b..c3b72ea063 100644 --- a/gnu/packages/conky.scm +++ b/gnu/packages/conky.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015 Siniša Biđin ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2019 Pierre Neidhardt ;;; ;;; This file is part of GNU Guix. ;;; @@ -24,6 +25,7 @@ #:use-module (guix git-download) #:use-module (guix build-system cmake) #:use-module ((guix licenses) #:prefix license:) + #:use-module (gnu packages curl) #:use-module (gnu packages fontutils) #:use-module (gnu packages image) #:use-module (gnu packages lua) @@ -34,15 +36,17 @@ (define-public conky (package (name "conky") - (version "1.10.8") + (home-page "https://github.com/brndnmtthws/conky") + (version "1.11.2") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/brndnmtthws/conky/archive/v" - version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url home-page) + (commit (string-append "v" version)))) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0mw8xbnxr0a7yq2smzi2nln2b5n0q571vdrq6mhvs5n84xd6bg9f")))) + (base32 "0yalcpwx85smh6nnvxxsgqi344nk7jzlkkam7yjghm87df4v7xmx")))) (build-system cmake-build-system) (arguments `(#:tests? #f ; there are no tests @@ -73,10 +77,10 @@ ("libxft" ,libxft) ("libxinerama" ,libxinerama) ("lua" ,lua) - ("ncurses" ,ncurses))) + ("ncurses" ,ncurses) + ("curl" ,curl))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "https://github.com/brndnmtthws/conky") (synopsis "Lightweight system monitor for X") (description "Conky is a lightweight system monitor for X that displays operating -- cgit v1.2.3 From 0e9811f4a3a30c3496b17be78635b32bb0318835 Mon Sep 17 00:00:00 2001 From: Ivan Petkov Date: Sun, 27 Jan 2019 22:50:46 -0800 Subject: gnu: rust: Update to 1.29.2. * gnu/packages/rust.scm (rust): Rename to... (rust-1.28): ...this. (rust): New variable. --- gnu/packages/rust.scm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 501736d898..1796899730 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -749,7 +749,7 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" (("fn thin_lto_works") "#[ignore]\nfn thin_lto_works")) #t))))))))) -(define-public rust +(define-public rust-1.28 (let ((base-rust (rust-bootstrapped-package rust-1.27 "1.28.0" "11k4rn77bca2rikykkk9fmprrgjswd4x4kaq7fia08vgkir82nhx" @@ -782,3 +782,13 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" #t)) ;; The thinlto test should pass with llvm 6. (delete 'disable-thinlto-test)))))))) + +(define-public rust + (let ((base-rust + (rust-bootstrapped-package rust-1.28 "1.29.2" + "1jb787080z754caa2w3w1amsygs4qlzj9rs1vy64firfmabfg22h" + #:patches + '("rust-1.25-accept-more-detailed-gdb-lines.patch" + "rust-reproducible-builds.patch")))) + (package + (inherit base-rust)))) -- cgit v1.2.3 From ceb5b11bd1003dd3de6b95947b849743af39a05e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 14 Feb 2019 16:01:51 +0100 Subject: gnu: python-base58: Update to 1.0.3. * gnu/packages/python-crypto.scm (python-base58): Update to 1.0.3. --- gnu/packages/python-crypto.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index 2e08243178..bbbe8bce6b 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2015 Cyril Roelandt ;;; Copyright © 2014, 2017 Eric Bavier ;;; Copyright © 2015, 2016 David Thompson -;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice +;;; Copyright © 2016, 2017, 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2016, 2017 Nils Gillmann ;;; Copyright © 2014, 2015 Mark H Weaver ;;; Copyright © 2015, 2016, 2017, 2019 Ricardo Wurmus @@ -57,14 +57,14 @@ (define-public python-base58 (package (name "python-base58") - (version "1.0.0") + (version "1.0.3") (source (origin (method url-fetch) (uri (pypi-uri "base58" version)) (sha256 (base32 - "0lgnk7ycdxwhk2bkygl30nsks56bvrdj79ix76iv965pz808pzn5")))) + "0q1yr0n5jaf17xq98m7dma6z4rh8p19ch55l1s09gi3rk5ckqycs")))) (build-system python-build-system) (native-inputs `(("python-pyhamcrest" ,python-pyhamcrest))) -- cgit v1.2.3 From cc314e9027d0d72522b3a788352fd622d845a453 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 14 Feb 2019 16:02:00 +0100 Subject: gnu: python-scrypt: Update to 0.8.7. * gnu/packages/python-crypto.scm (python-scrypt): Update to 0.8.7. --- gnu/packages/python-crypto.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index bbbe8bce6b..bcafd154e7 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -950,14 +950,14 @@ been constructed to maintain extensive documentation on how to use (define-public python-scrypt (package (name "python-scrypt") - (version "0.8.6") + (version "0.8.7") (source (origin (method url-fetch) (uri (pypi-uri "scrypt" version)) (sha256 (base32 - "0b9nw10hfdl0jflm3b62q485ssc3f3f33lpg4yy407gs8wnrn8zq")))) + "0hjk71k3mgnl8siikm9lii9im8kv0rb7inkjzx78rnancra48xxr")))) (build-system python-build-system) (inputs `(("openssl" ,openssl))) -- cgit v1.2.3 From c381d4bb155e626aaea2f77c5125f776e3fd27ec Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 14 Feb 2019 17:26:05 +0100 Subject: gnu: python-sockjs-tornado: Update to 1.0.6. * gnu/packages/python-web.scm (python-sockjs-tornado) (python2-sockjs-tornado): Update to 1.0.6. --- gnu/packages/python-web.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index afec5ebc30..90116c76aa 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -14,7 +14,7 @@ ;;; Copyright © 2015 Cyril Roelandt ;;; Copyright © 2015, 2016, 2017 Leo Famulari ;;; Copyright © 2016 Hartmut Goebel -;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice +;;; Copyright © 2016, 2017, 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2015, 2017 Ben Woodcroft ;;; Copyright © 2015, 2016 Christopher Allan Webber ;;; Copyright © 2017 Adriano Peluso @@ -338,14 +338,14 @@ follow links and submit forms. It doesn’t do JavaScript.") (define-public python-sockjs-tornado (package (name "python-sockjs-tornado") - (version "1.0.5") + (version "1.0.6") (source (origin (method url-fetch) (uri (pypi-uri "sockjs-tornado" version)) (sha256 (base32 - "0zhq8wnnhkfbvdnsggqrc3pp97pqpilsf7fh6ymvnf52r0rwyjsc")))) + "15dgv6hw6c7h3m310alw1h6p5443lrm9pyqhcv2smc13fz1v04pc")))) (build-system python-build-system) (arguments `(;; There are no tests, and running the test phase requires missing -- cgit v1.2.3 From 0596a7af5f21035134b32db33658c3014c321a7e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 14 Feb 2019 17:30:46 +0100 Subject: gnu: python-webtest: Update to 2.0.33. * gnu/packages/python-web.scm (python-webtest, python2-webtest): Update to 2.0.33. Remove outdated comments. --- gnu/packages/python-web.scm | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 90116c76aa..fc0ac5a58d 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1566,34 +1566,18 @@ file.") (define-public python-webtest (package (name "python-webtest") - (version "2.0.30") + (version "2.0.33") (source (origin (method url-fetch) (uri (pypi-uri "WebTest" version)) (sha256 (base32 - "1mb7m4ndklv84mh0pdkhv73yrflcnra61yczj5g3bvwbqlygfsaw")))) + "1l3z0cwqslsf4rcrhi2gr8kdfh74wn2dw76376i4g9i38gz8wd21")))) (build-system python-build-system) (arguments - `(;; Unfortunately we have to disable tests! - ;; This release of WebTest is pinned to python-nose < 1.3, - ;; but older versions of python-nose are plagued with the following - ;; bug(s), which rears its ugly head during test execution: - ;; https://github.com/nose-devs/nose/issues/759 - ;; https://github.com/nose-devs/nose/pull/811 - #:tests? #f)) - ;; Commented out code is no good, but in this case, once tests - ;; are ready to be enabled again, we should put the following - ;; in place: - ;; (native-inputs - ;; `(("python-nose" ,python-nose) ; technially < 1.3, - ;; ; but see above comment - ;; ("python-coverage" ,python-coverage) - ;; ("python-mock" ,python-mock) - ;; ("python-pastedeploy" ,python-pastedeploy) - ;; ("python-wsgiproxy2" ,python-wsgiproxy2) - ;; ("python-pyquery" ,python-pyquery))) + ;; Tests require python-pyquery, which creates a circular dependency. + `(#:tests? #f)) (propagated-inputs `(("python-waitress" ,python-waitress) ("python-webob" ,python-webob) -- cgit v1.2.3 From ce50403fc2e5b349645563008f29403179a73b23 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 14 Feb 2019 17:32:18 +0100 Subject: gnu: python-paste: Update to 3.0.6. * gnu/packages/python-web.scm (python-paste): Update to 3.0.6. --- 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 fc0ac5a58d..dce8dd2ae9 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -2717,14 +2717,14 @@ available in Django, but is a standalone package.") (define-public python-paste (package (name "python-paste") - (version "3.0.4") + (version "3.0.6") (source (origin (method url-fetch) (uri (pypi-uri "Paste" version)) (sha256 (base32 - "01w26w9jyfkh0mfydhfz3dwy3pj3fw7mzvj0lna3vs8hyx1hwl0n")) + "14lbi9asn5agsdf7r97prkjpz7amgmp529lbvfhf0nv881xczah6")) (patches (search-patches "python-paste-remove-timing-test.patch")) (modules '((guix build utils))) (snippet -- cgit v1.2.3 From 6d1f47082d8c049bcdcf8e2a594aafa0da9167cc Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 14 Feb 2019 17:33:56 +0100 Subject: gnu: Remove python2-pyquery. * gnu/packages/python-xyz.scm (python2-pyquery): Remove broken package. --- gnu/packages/python-xyz.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 55ac37ffb0..0c231b6274 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8041,9 +8041,6 @@ The API is as much as possible the similar to jQuery. pyquery uses lxml for fast xml and html manipulation.") (license license:bsd-3))) -(define-public python2-pyquery - (package-with-python2 python-pyquery)) - (define-public python-anyjson (package (name "python-anyjson") -- cgit v1.2.3 From 7bef8fd5cf849ca3732e03632f40fa253599ae0a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 14 Feb 2019 15:46:19 +0100 Subject: gnu: tmux-themepack: Use GIT-* helpers, not NAME. * gnu/packages/tmux.scm (tmux-themepack)[version]: Use GIT-VERSION. [source]: Hard-code NAME. Use GIT-FILE-NAME. --- gnu/packages/tmux.scm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/tmux.scm b/gnu/packages/tmux.scm index d8af54ce57..fc2871e0f3 100644 --- a/gnu/packages/tmux.scm +++ b/gnu/packages/tmux.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2016 Matthew Jordan ;;; Copyright © 2017 Vasile Dumitrascu ;;; Copyright © 2017 Stefan Reichör +;;; Copyright © 2019 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -61,21 +62,19 @@ continue running in the background, then later reattached.") (revision "1")) (package (name "tmux-themepack") - (version - (string-append "0.0.0-" revision "." (string-take commit 7))) ;; No version tags + (version (git-version "0.0.0" revision commit)) ; no version tags (source (origin (method git-fetch) (uri (git-reference - (url - (string-append "https://github.com/jimeh/" name ".git")) + (url "https://github.com/jimeh/tmux-themepack.git") (commit commit))) (sha256 (base32 "1d3k87mq5lca042jbap5kxskjy3kg79wjhhpnm6jacbn3anc67zl")) - (file-name (string-append name "-" version "-checkout")))) + (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; No test suite. + `(#:tests? #f ; no test suite #:phases (modify-phases %standard-phases (delete 'configure) (delete 'build) -- cgit v1.2.3 From 66377fdced522d2798ce6846f1b035a7f20ab574 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 14 Feb 2019 15:47:52 +0100 Subject: gnu: tmuxifier: Don't use unstable tarball. * gnu/packages/tmux.scm (tmuxifier)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/tmux.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/tmux.scm b/gnu/packages/tmux.scm index fc2871e0f3..e09e6c1fbe 100644 --- a/gnu/packages/tmux.scm +++ b/gnu/packages/tmux.scm @@ -95,14 +95,14 @@ continue running in the background, then later reattached.") (name "tmuxifier") (version "0.13.0") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/jimeh/tmuxifier/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/jimeh/tmuxifier.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "1j9fj6zg0j3sdn7svpybzsqh7876rv81zi437976kj7hxnyjkcz7")))) + "1b6a1cw2mnml84k5vhbcp58kvp94xlnlpp4kwdhqw4jrzfgcjfzd")))) (build-system gnu-build-system) (arguments `(#:tests? #f -- cgit v1.2.3 From 5e98d759024f00feeccc775ccab7b325f96d2f4f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 14 Feb 2019 18:10:24 +0100 Subject: gnu: perl-datetime-locale: Update to 1.23. * gnu/packages/perl.scm (perl-datetime-locale): Update to 1.23. [native-inputs]: Add perl-ipc-system-simple. --- gnu/packages/perl.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 073cdbf482..765d80f6ec 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -15,7 +15,7 @@ ;;; Copyright © 2017 Raoul J.P. Bonnal ;;; Copyright © 2017, 2018 Marius Bakke ;;; Copyright © 2017 Adriano Peluso -;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2017 Leo Famulari ;;; Copyright © 2017 Christopher Allan Webber ;;; Copyright © 2018 Oleg Pykhalov @@ -2414,7 +2414,7 @@ takes a string and a pattern and returns the `DateTime` object associated.") (define-public perl-datetime-locale (package (name "perl-datetime-locale") - (version "1.17") + (version "1.23") (source (origin (method url-fetch) @@ -2422,10 +2422,11 @@ takes a string and a pattern and returns the `DateTime` object associated.") "DateTime-Locale-" version ".tar.gz")) (sha256 (base32 - "1jawnci23kik5x4gln6ixvv9bxznd5f6ira024yjxsc97y5mk9hc")))) + "05f0jchminv5g2nrvsx5v1ihc5919fzzhh4f82dxi5ns8bkq2nis")))) (build-system perl-build-system) (native-inputs `(("perl-file-sharedir" ,perl-file-sharedir) + ("perl-ipc-system-simple" ,perl-ipc-system-simple) ("perl-test-file-sharedir-dist" ,perl-test-file-sharedir-dist) ("perl-test-warnings" ,perl-test-warnings) ("perl-test-requires" ,perl-test-requires) -- cgit v1.2.3 From fafbeb38d4e928ea8fbb1c1f37e19292fce675fd Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 14 Feb 2019 18:10:36 +0100 Subject: gnu: perl-datetime-format-strptime: Update to 1.76. * gnu/packages/perl.scm (perl-datetime-format-strptime): Update to 1.76. --- gnu/packages/perl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 765d80f6ec..6ffec96cf4 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -2385,7 +2385,7 @@ parsing logic.") (define-public perl-datetime-format-strptime (package (name "perl-datetime-format-strptime") - (version "1.75") + (version "1.76") (source (origin (method url-fetch) @@ -2393,7 +2393,7 @@ parsing logic.") "DateTime-Format-Strptime-" version ".tar.gz")) (sha256 (base32 - "069wmgbchydgx3nm9klqw0g6ksnja28g61d4allgzmvr9ynb5ksg")))) + "03dmzi9n6jmnfjmf0ld5sdmi3ib6jrhz25cjzv7d58ypdr32cg2r")))) (build-system perl-build-system) (propagated-inputs `(("perl-datetime" ,perl-datetime) -- cgit v1.2.3 From 2950d33c6c52236561fa0ce5d4f0c0f6a58c9109 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 14 Feb 2019 14:32:56 -0500 Subject: gnu: PostgreSQL: Update to 10.7. * gnu/packages/databases.scm (postgresql): Update to 10.7. --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 4cd111e061..2d9f890e31 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -687,14 +687,14 @@ as a drop-in replacement of MySQL.") (define-public postgresql (package (name "postgresql") - (version "10.6") + (version "10.7") (source (origin (method url-fetch) (uri (string-append "https://ftp.postgresql.org/pub/source/v" version "/postgresql-" version ".tar.bz2")) (sha256 (base32 - "0jv26y3f10svrjxzsgqxg956c86b664azyk2wppzpa5x11pjga38")) + "1piyfcrcqscjhnnwn91kdvr764s7d0qz4lgygf9bl6qc71ji1vdz")) (patches (search-patches "postgresql-disable-resolve_symlinks.patch")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From 42ce9187fb75a9b2bb79cd505d8c25c86981cdcd Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 14 Feb 2019 14:33:17 -0500 Subject: gnu: PostgreSQL 9.6: Update to 9.6.12. * gnu/packages/databases.scm (postgresql-9.6): Update to 9.6.12. --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 2d9f890e31..6129e3c0cb 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -733,14 +733,14 @@ pictures, sounds, or video.") (package (inherit postgresql) (name "postgresql") - (version "9.6.11") + (version "9.6.12") (source (origin (method url-fetch) (uri (string-append "https://ftp.postgresql.org/pub/source/v" version "/postgresql-" version ".tar.bz2")) (sha256 (base32 - "0c55akrkzqd6p6a8hr0338wk246hl76r9j16p4zn3s51d7f0l99q")))))) + "114xay230xia2fagisxahs5fc2mza8hmmkr6ibd7nxllp938931f")))))) (define-public python-pymysql (package -- cgit v1.2.3 From 17098a493be9c0201d3a9f7453f03deb009276f6 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 14 Feb 2019 14:32:26 -0500 Subject: gnu: bs1770gain: Adjust the usage text and home-page. * gnu/packages/audio.scm (bs1770gain)[source]: Add snippet. [home-page]: Update. --- gnu/packages/audio.scm | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 8a0bb70871..9d301e421e 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -19,6 +19,7 @@ ;;; Copyright © 2018 Eric Bavier ;;; Copyright © 2018 Brendan Tildesley ;;; Copyright © 2019 Pierre Langlois +;;; Copyright © 2019 Leo Famulari ;;; ;;; This file is part of GNU Guix. ;;; @@ -3215,11 +3216,20 @@ with support for HD extensions.") version "/bs1770gain-" version ".tar.gz")) (sha256 (base32 - "1p6yz5q7czyf9ard65sp4kawdlkg40cfscr3b24znymmhs3p7rbk")))) + "1p6yz5q7czyf9ard65sp4kawdlkg40cfscr3b24znymmhs3p7rbk")) + (modules '((guix build utils))) + (snippet + '(begin + ;; XXX + (substitute* "bs1770gain/bs1770gain.c" + (("\"N.*\"") "\"\"")) + (substitute* "configure" + (("URL=.*$") + "https://manpages.debian.org/sid/bs1770gain/bs1770gain.1.en.html\n")))))) (build-system gnu-build-system) (inputs `(("ffmpeg" ,ffmpeg) ("sox" ,sox))) - (home-page "http://bs1770gain.sourceforge.net/") + (home-page "https://manpages.debian.org/sid/bs1770gain/bs1770gain.1.en.html") (synopsis "Tool to adjust loudness of media files") (description "BS1770GAIN is a loudness scanner compliant with ITU-R BS.1770 and its -- cgit v1.2.3 From 28cf8dab3e91fb9d7f951f43cd43fb78d0594b82 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Thu, 14 Feb 2019 20:13:05 +0000 Subject: gnu: ruby-safe-yaml: Add missing require 'time'. Patch ruby-safe-yaml to fix an issue that would lead to an error like this: uninitialized constant SafeYAML::Parse::Date::DateTime It's been reported upstream [1], and this patch was taken from the upstream Git repository. 1: https://github.com/dtao/safe_yaml/issues/80 * gnu/packages/ruby.scm (ruby-safe-yaml)[source]: Switch to the Git repository so that applying patches works and add a patch. [arguments]: Enable tests and add a phase to set the TZ environment variable, as one of the tests depends on a certian timezone. * gnu/packages/patches/ruby-safe-yaml-add-require-time.patch: New file. * gnu/local.mk (dist_patch_DATA): Add new patch file. --- .../patches/ruby-safe-yaml-add-require-time.patch | 19 +++++++++++++ gnu/packages/ruby.scm | 33 ++++++++++++++++------ 2 files changed, 44 insertions(+), 8 deletions(-) create mode 100644 gnu/packages/patches/ruby-safe-yaml-add-require-time.patch (limited to 'gnu/packages') diff --git a/gnu/packages/patches/ruby-safe-yaml-add-require-time.patch b/gnu/packages/patches/ruby-safe-yaml-add-require-time.patch new file mode 100644 index 0000000000..92e5505985 --- /dev/null +++ b/gnu/packages/patches/ruby-safe-yaml-add-require-time.patch @@ -0,0 +1,19 @@ +From 9dd1e8d9ad0396a8c9092c2e9f17d498c58e0208 Mon Sep 17 00:00:00 2001 +From: elifoster +Date: Tue, 5 Dec 2017 14:30:13 -0800 +Subject: [PATCH] Fix uninitialized constant DateTime Close #80 + +--- + lib/safe_yaml/parse/date.rb | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/lib/safe_yaml/parse/date.rb b/lib/safe_yaml/parse/date.rb +index cd3c62a..3a30a8b 100644 +--- a/lib/safe_yaml/parse/date.rb ++++ b/lib/safe_yaml/parse/date.rb +@@ -1,3 +1,5 @@ ++require 'time' ++ + module SafeYAML + class Parse + class Date diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 18c6335911..ca610b6471 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5849,19 +5849,36 @@ indentation will probably be an issue and hence this gem.") (package (name "ruby-safe-yaml") (version "1.0.4") - (source (origin - (method url-fetch) - (uri (rubygems-uri "safe_yaml" version)) - (sha256 - (base32 - "1hly915584hyi9q9vgd968x2nsi5yag9jyf5kq60lwzi5scr7094")))) + (source + (origin + ;; TODO Fetch from the git repository so a patch can be applied + (method git-fetch) + (uri (git-reference + (url "https://github.com/dtao/safe_yaml.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1wnln8xdy8g6kwdj4amm8773xwffqxpf2sxslk6jjh2wxsy1lrig")) + (patches + (search-patches "ruby-safe-yaml-add-require-time.patch")))) (build-system ruby-build-system) (native-inputs `(("ruby-rspec" ,ruby-rspec) ("ruby-hashie" ,ruby-hashie) ("ruby-heredoc-unindent" ,ruby-heredoc-unindent))) - (arguments `(#:test-target "spec" - #:tests? #f));; FIXME: one failure + (arguments + '(#:test-target "spec" + #:phases + (modify-phases %standard-phases + (add-before 'check 'set-TZ + (lambda _ + ;; This test is dependent on the timezone + ;; spec/transform/to_date_spec.rb:35 + ;; # SafeYAML::Transform::ToDate converts times to the local + ;; timezone + (setenv "TZ" "UTC-11") + #t))))) (home-page "https://github.com/dtao/safe_yaml") (synopsis "YAML parser") (description "The SafeYAML gem provides an alternative implementation of -- cgit v1.2.3 From ce872770f6c6fb1d12380259fc17ff8da3285bee Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 27 Jan 2019 08:29:03 +0000 Subject: gnu: Add ruby-cucumber-wire. Package version 0.0.1 initially, as this is what's needed by Cucumber 3, and Cucumber 4 hasn't been released yet. * gnu/packages/ruby.scm (ruby-cucumber-wire): New variable. --- gnu/packages/ruby.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index ca610b6471..c9ca5b05d3 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -3669,6 +3669,41 @@ and trust on your team.") (home-page "https://cucumber.io/") (license license:expat))) +(define-public ruby-cucumber-wire + (package + (name "ruby-cucumber-wire") + ;; Package version 0.0.1 initially, as this is what's needed by Cucumber + ;; 3, and Cucumber 4 hasn't been released yet. + (version "0.0.1") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "cucumber-wire" version)) + (sha256 + (base32 + "09ymvqb0sbw2if1nxg8rcj33sf0va88ancq5nmp8g01dfwzwma2f")))) + (build-system ruby-build-system) + (arguments + '(;; TODO: Currently, the tests can't be run as cucumber is required, + ;; which would lead to a circular dependency. + #:tests? #f + #:test-target "default" + #:phases + (modify-phases %standard-phases + (add-before 'check 'set-CUCUMBER_USE_RELEASED_GEMS + (lambda _ + (setenv "CUCUMBER_USE_RELEASED_GEMS" "true") + #t))))) + (native-inputs + `(("bundler" ,bundler) + ("ruby-rspec" ,ruby-rspec))) + (synopsis "Cucumber wire protocol plugin") + (description + "Cucumber's wire protocol allows step definitions to be implemented and +invoked on any platform.") + (home-page "https://github.com/cucumber/cucumber-ruby-wire") + (license license:expat))) + (define-public ruby-bio-logger (package (name "ruby-bio-logger") -- cgit v1.2.3 From 2ed201c11296ae79b4a252934e219dfeb6e91d5e Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 27 Jan 2019 08:45:21 +0000 Subject: gnu: Add ruby-contracts. * gnu/packages/ruby.scm (ruby-contracts): New variable. --- gnu/packages/ruby.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index c9ca5b05d3..e02eac6419 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -740,6 +740,40 @@ format.") (home-page "https://github.com/nicksieger/ci_reporter") (license license:expat))) +(define-public ruby-contracts + (package + (name "ruby-contracts") + (version "0.16.0") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "contracts" version)) + (sha256 + (base32 + "119f5p1n6r5svbx8h09za6a4vrsnj5i1pzr9cqdn9hj3wrxvyl3a")))) + (build-system ruby-build-system) + (arguments + '(#:test-target "spec" + #:phases + (modify-phases %standard-phases + ;; Don't run or require rubocop, the code linting tool, as this is a + ;; bit unnecessary. + (add-after 'unpack 'dont-run-rubocop + (lambda _ + (substitute* "Rakefile" + ((".*rubocop.*") "") + ((".*RuboCop.*") "")) + #t))))) + (native-inputs + `(("ruby-rspec" ,ruby-rspec))) + (synopsis "Method contracts for Ruby") + (description + "This library provides contracts for Ruby. A contract describes the +correct inputs and output for a method, and will raise an error if a incorrect +value is found.") + (home-page "https://github.com/egonSchiele/contracts.ruby") + (license license:bsd-2))) + (define-public ruby-czmq-ffi-gen (package (name "ruby-czmq-ffi-gen") -- cgit v1.2.3 From 158a9253da855558f397b45fc7378664876d0f59 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 27 Jan 2019 08:58:51 +0000 Subject: gnu: Add ruby-progressbar. * gnu/packages/ruby.scm (ruby-progressbar): New variable. --- gnu/packages/ruby.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index e02eac6419..32a4981bb0 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -2526,6 +2526,28 @@ rate.") (home-page "https://github.com/paul/progress_bar") (license license:wtfpl2))) +(define-public ruby-progressbar + (package + (name "ruby-progressbar") + (version "1.10.0") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "ruby-progressbar" version)) + (sha256 + (base32 + "1cv2ym3rl09svw8940ny67bav7b2db4ms39i4raaqzkf59jmhglk")))) + (build-system ruby-build-system) + (arguments + '(;; TODO: There looks to be a circular dependency with ruby-fuubar. + #:tests? #f)) + (synopsis "Text progress bar library for Ruby") + (description + "Ruby/ProgressBar is an flexible text progress bar library for Ruby. +The output can be customized with a formatting system.") + (home-page "https://github.com/jfelchner/ruby-progressbar") + (license license:expat))) + (define-public ruby-pry (package (name "ruby-pry") -- cgit v1.2.3 From 5437c7416cc0a72fb17f4ff029e3ba829af47394 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 27 Jan 2019 09:12:46 +0000 Subject: gnu: Add ruby-fuubar. * gnu/packages/ruby.scm (ruby-fuubar): New variable. --- gnu/packages/ruby.scm | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 32a4981bb0..72562a2d22 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -1166,6 +1166,54 @@ standard output stream.") (home-page "https://github.com/geemus/formatador") (license license:expat))) +(define-public ruby-fuubar + (package + (name "ruby-fuubar") + (version "2.3.2") + (source + (origin + ;; Fetch from the git repository, as the gem package doesn't include + ;; the tests. + (method git-fetch) + (uri (git-reference + (url "https://github.com/thekompanee/fuubar.git") + (commit (string-append "releases/v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0jm1x2xp13csbnadixaikj7mlkp5yk4byx51npm56zi13izp7259")))) + (build-system ruby-build-system) + (arguments + '(;; TODO: Some tests fail, unsure why. + ;; 21 examples, 7 failures + #:tests? #f + #:phases + (modify-phases %standard-phases + (add-before 'build 'delete-certificate + (lambda _ + ;; Remove 's.cert_chain' as we do not build with a private key + (substitute* "fuubar.gemspec" + ((".*cert_chain.*") "") + ((".*signing_key.*") "")) + #t)) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "rspec")) + #t))))) + (native-inputs + `(("bundler" ,bundler))) + (propagated-inputs + `(("ruby-rspec-core" ,ruby-rspec-core) + ("ruby-progressbar" ,ruby-progressbar))) + (synopsis "Fuubar is an RSpec formatter that uses a progress bar") + (description + "Fuubar is an RSpec formatter that uses a progress bar instead of a +string of letters and dots as feedback. It also stops on the first test +failure.") + (home-page "https://github.com/thekompanee/fuubar") + (license license:expat))) + (define-public ruby-shindo (package (name "ruby-shindo") -- cgit v1.2.3 From fb1a8954af4770311966bf3e4c455463be969e81 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 27 Jan 2019 09:18:26 +0000 Subject: gnu: Add ruby-cucumber-expressions. * gnu/packages/ruby.scm (ruby-cucumber-expressions): New variable. --- gnu/packages/ruby.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 72562a2d22..0dd191c509 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -3773,6 +3773,31 @@ and trust on your team.") (home-page "https://cucumber.io/") (license license:expat))) +(define-public ruby-cucumber-expressions + (package + (name "ruby-cucumber-expressions") + (version "6.0.1") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "cucumber-expressions" version)) + (sha256 + (base32 + "0zwmv6hznyz9vk81f5dhwcr9jhxx2vmbk8yyazayvllvhy0fkpdw")))) + (build-system ruby-build-system) + (arguments + '(#:test-target "spec")) + (native-inputs + `(("bundler" ,bundler) + ("ruby-rspec" ,ruby-rspec) + ("ruby-simplecov" ,ruby-simplecov))) + (synopsis "Simpler alternative to Regular Expressions") + (description "Cucumber Expressions offer similar functionality to Regular +Expressions, with a syntax that is easier to read and write. Cucumber +Expressions are extensible with parameter types.") + (home-page "https://github.com/cucumber/cucumber-expressions-ruby") + (license license:expat))) + (define-public ruby-cucumber-wire (package (name "ruby-cucumber-wire") -- cgit v1.2.3 From 1d1d20b02b3e01c01e41796d4329ab53afbad98e Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 27 Jan 2019 09:21:07 +0000 Subject: gnu: Add ruby-mspec. * gnu/packages/ruby.scm (ruby-mspec): New variable. --- gnu/packages/ruby.scm | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 0dd191c509..5ba68fee2f 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -1625,6 +1625,49 @@ objects.") (home-page "https://github.com/floehopper/metaclass") (license license:expat))) +(define-public ruby-mspec + (package + (name "ruby-mspec") + (version "1.9.1") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "mspec" version)) + (sha256 + (base32 + "0wmyh2n40m4srwdx9z6h6g6p46k02pzyhcsja3hqcw5h5b0hfmhd")))) + (build-system ruby-build-system) + (arguments + '(;; TODO: 3 test failures + ;; ./spec/mocks/mock_spec.rb:82 + ;; ./spec/utils/name_map_spec.rb:151 + ;; ./spec/utils/name_map_spec.rb:155 + #:tests? #f + #:phases + (modify-phases %standard-phases + (add-after 'extract-gemspec 'change-dependency-constraints + (lambda _ + (substitute* "mspec.gemspec" + (("rake.*") "rake>)\n") + (("rspec.*") "rspec>)\n")) + #t)) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "rspec" "spec")) + #t))))) + (native-inputs + `(("bundler" ,bundler) + ("ruby-rake" ,ruby-rake) + ("ruby-rspec" ,ruby-rspec))) + (synopsis "MSpec is a specialized framework for RubySpec") + (description + "MSpec is a specialized framework that is syntax-compatible with RSpec 2 +for basic features. MSpec contains additional features that assist in writing +specs for Ruby implementations in ruby/spec.") + (home-page "http://rubyspec.org") + (license license:expat))) + (define-public ruby-blankslate (package (name "ruby-blankslate") -- cgit v1.2.3 From f7e9b2f37541e6863dc72c924148fa6ed28b39c1 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 27 Jan 2019 09:27:35 +0000 Subject: gnu: Add ruby-backports. * gnu/packages/ruby.scm (ruby-backports): New variable. --- gnu/packages/ruby.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 5ba68fee2f..43e640405f 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -1369,6 +1369,31 @@ User Agents.") (home-page "https://github.com/gshutler/useragent") (license license:expat))) +(define-public ruby-backports + (package + (name "ruby-backports") + (version "3.11.4") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "backports" version)) + (sha256 + (base32 + "1hshjxww2h7s0dk57njrygq4zpp0nlqrjfya7zwm27iq3rhc3y8g")))) + (build-system ruby-build-system) + (arguments + '(;; TODO: This should be default, but there is one test failure + #:test-target "all_spec")) + (native-inputs + `(("ruby-mspec" ,ruby-mspec) + ("ruby-activesupport" ,ruby-activesupport))) + (synopsis "Backports of the features in newer Ruby versions") + (description + "Backports enables more compatibility across Ruby versions by providing +backports of some features.") + (home-page "https://github.com/marcandre/backports") + (license license:expat))) + (define-public ruby-bacon (package (name "ruby-bacon") -- cgit v1.2.3 From 0ce8f3445d32db59c8c9224cd48fa70dc7677e35 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 27 Jan 2019 09:44:40 +0000 Subject: gnu: Add ruby-cucumber-tag-expressions. * gnu/packages/ruby.scm (ruby-cucumber-tag-expressions): New variable. --- gnu/packages/ruby.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 43e640405f..9bcf8da587 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -3901,6 +3901,34 @@ invoked on any platform.") (home-page "https://github.com/cucumber/cucumber-ruby-wire") (license license:expat))) +(define-public ruby-cucumber-tag-expressions + (package + (name "ruby-cucumber-tag-expressions") + (version "1.1.1") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "cucumber-tag_expressions" version)) + (sha256 + (base32 + "0cvmbljybws0qzjs1l67fvr9gqr005l8jk1ni5gcsis9pfmqh3vc")))) + (build-system ruby-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda _ + (invoke "rspec") + #t))))) + (native-inputs + `(("ruby-rspec" ,ruby-rspec))) + (synopsis "Cucumber tag expressions for Ruby") + (description + "Cucumber tag expression parser for Ruby. A tag expression is an infix +boolean expression used by Cucumber.") + (home-page "https://github.com/cucumber/tag-expressions-ruby") + (license license:expat))) + (define-public ruby-bio-logger (package (name "ruby-bio-logger") -- cgit v1.2.3 From 5cd047e807641b2cca3b8d99cecdaa8084a0de50 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 27 Jan 2019 09:45:26 +0000 Subject: gnu: ruby-cucumber-core: Update to 3.2.1. Just update to major version 3, as version 4 of Cucumber hasn't been released yet. * gnu/packages/ruby.scm (ruby-cucumber-core): Update to 3.2.1. [propagated-inputs]: Add ruby-backports, ruby-gherkin and ruby-cucumber-tag-expressions. --- gnu/packages/ruby.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 9bcf8da587..c659d7ccf8 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -3817,17 +3817,20 @@ files.") (define-public ruby-cucumber-core (package (name "ruby-cucumber-core") - (version "2.0.0") + ;; Stick to major version 3, until version 4 of Cucumber is released. + (version "3.2.1") (source (origin (method url-fetch) (uri (rubygems-uri "cucumber-core" version)) (sha256 (base32 - "136hnvqv444qyxzcgy1k60y4i6cn3sn9lbqr4wan9dzz1yzllqbm")))) + "1iavlh8hqj9lwljbpkw06259gdicbr1bdb6pbj5yy3n8szgr8k3c")))) (build-system ruby-build-system) (propagated-inputs - `(("ruby-gherkin" ,ruby-gherkin))) + `(("ruby-backports" ,ruby-backports) + ("ruby-gherkin" ,ruby-gherkin) + ("ruby-cucumber-tag-expressions" ,ruby-cucumber-tag-expressions))) (native-inputs `(("bundler" ,bundler))) (arguments -- cgit v1.2.3 From aada5f6f3b128a0b97c0ca8be110d897f900c7bd Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 27 Jan 2019 09:46:41 +0000 Subject: gnu: ruby-gherkin: Update to 5.1.0. Don't upgrade all the way to version 6, as version 5 is needed for Cucumber 3. * gnu/packages/ruby.scm (ruby-gherkin): Update to 5.1.0. [description]: Use @file{ }. --- gnu/packages/ruby.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index c659d7ccf8..df08f302e2 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -3794,14 +3794,14 @@ Ruby classes.") (define-public ruby-gherkin (package (name "ruby-gherkin") - (version "4.1.3") + (version "5.1.0") (source (origin (method url-fetch) (uri (rubygems-uri "gherkin" version)) (sha256 (base32 - "1d18r8mf2qyd9jbq9xxvca8adyysdzvwdy8v9c2s5hrd6p02kg79")))) + "1cgcdchwwdm10rsk44frjwqd4ihprhxjbm799nscqy2q1raqfj5s")))) (build-system ruby-build-system) (native-inputs `(("bundler" ,bundler))) @@ -3809,9 +3809,9 @@ Ruby classes.") '(#:tests? #f)) ; needs simplecov, among others (synopsis "Gherkin parser for Ruby") (description "Gherkin is a parser and compiler for the Gherkin language. -It is intended be used by all Cucumber implementations to parse '.feature' -files.") - (home-page "https://github.com/cucumber/gherkin3") +It is intended be used by all Cucumber implementations to parse +@file{.feature} files.") + (home-page "https://github.com/cucumber-attic/gherkin") (license license:expat))) (define-public ruby-cucumber-core -- cgit v1.2.3 From 15b16c2c46fa9f319fede5f3b77dde04c4587038 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 27 Jan 2019 10:26:08 +0000 Subject: gnu: Add ruby-cucumber and ruby-aruba. These packages are mutually dependant, so I've put them in one commit. * gnu/packages/ruby.scm (ruby-aruba, ruby-aruba-without-tests, ruby-cucumber, ruby-cucumber-without-tests): New variables. --- gnu/packages/ruby.scm | 148 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 147 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index df08f302e2..9b3856f080 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -32,6 +32,7 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (gnu packages) #:use-module (gnu packages base) + #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages databases) #:use-module (gnu packages dbm) @@ -55,7 +56,8 @@ #:use-module (guix build-system gnu) #:use-module (gnu packages xml) #:use-module (gnu packages web) - #:use-module (guix build-system ruby)) + #:use-module (guix build-system ruby) + #:use-module ((srfi srfi-1) #:select (alist-delete))) (define-public ruby (package @@ -3814,6 +3816,150 @@ It is intended be used by all Cucumber implementations to parse (home-page "https://github.com/cucumber-attic/gherkin") (license license:expat))) +(define-public ruby-aruba + (package + (name "ruby-aruba") + (version "0.14.8") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "aruba" version)) + (sha256 + (base32 + "0zdd81l1lp0x78sxa6kkfqclpj5il3xl70nz05wqv2sfzzhqydxh")))) + (build-system ruby-build-system) + (arguments + '(#:test-target "spec" + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch + (lambda _ + (substitute* "spec/aruba/api_spec.rb" + ;; This resolves some errors in the specs + ;; + ;; undefined method `parse' for Time:Class + (("require 'spec_helper'") + "require 'spec_helper'\nrequire 'time'")) + ;; Avoid shebang issues in this spec file + (substitute* "spec/aruba/matchers/command_spec.rb" + (("/usr/bin/env bash") + (which "bash"))) + #t)) + (add-before 'check 'remove-unnecessary-dependencies + (lambda _ + (substitute* "Gemfile" + ((".*byebug.*") "\n") + ((".*pry.*") "\n") + ((".*yaml.*") "\n") + ((".*bcat.*") "\n") + ((".*kramdown.*") "\n") + ((".*rubocop.*") "\n") + ((".*cucumber-pro.*") "\n") + ((".*cucumber.*") "\n") + ((".*license_finder.*") "\n") + ((".*rake.*") "gem 'rake'\n") + ((".*simplecov.*") "\n") + ((".*relish.*") "\n")) + (substitute* "spec/spec_helper.rb" + ((".*simplecov.*") "") + (("^SimpleCov.*") "")) + (substitute* "aruba.gemspec" + (("spec\\.add\\_runtime\\_dependency 'cucumber'.*") + "spec.add_runtime_dependency 'cucumber'")) + #t)) + (add-before 'check 'set-home + (lambda _ (setenv "HOME" "/tmp") #t))))) + (native-inputs + `(("bundler" ,bundler) + ("ruby-rspec" ,ruby-rspec) + ("ruby-fuubar" ,ruby-fuubar))) + (propagated-inputs + `(("ruby-childprocess" ,ruby-childprocess) + ("ruby-contracts" ,ruby-contracts) + ("ruby-cucumber" ,ruby-cucumber) + ("ruby-ffi" ,ruby-ffi) + ("ruby-rspec-expectations" ,ruby-rspec-expectations) + ("ruby-thor" ,ruby-thor) + ("ruby-yard" ,ruby-yard))) + (synopsis "Test command-line applications with Cucumber, RSpec or Minitest") + (description + "Aruba is an extension for Cucumber, RSpec and Minitest for testing +command-line applications. It supports applications written in any +language.") + (home-page "https://github.com/cucumber/aruba") + (license license:expat))) + +;; A version of ruby-aruba without tests run so that circular dependencies can +;; be avoided. +(define ruby-aruba-without-tests + (package + (inherit ruby-aruba) + (arguments '(#:tests? #f)) + (propagated-inputs + `(("ruby-cucumber" ,ruby-cucumber-without-tests) + ,@(alist-delete "ruby-cucumber" + (package-propagated-inputs ruby-aruba)))) + (native-inputs '()))) + +(define-public ruby-cucumber + (package + (name "ruby-cucumber") + (version "3.1.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/cucumber/cucumber-ruby.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0764wp2cjg60qa3l69q1dxda5g06a01n5w92szqbf89d2hgl47n3")))) + (build-system ruby-build-system) + (arguments + '(#:test-target "spec" + #:phases + (modify-phases %standard-phases + ;; Don't run or require rubocop, the code linting tool, as this is a + ;; bit unnecessary. + (add-after 'unpack 'dont-run-rubocop + (lambda _ + (substitute* "Rakefile" + ((".*rubocop/rake\\_task.*") "") + ((".*RuboCop.*") "")) + #t))))) + (propagated-inputs + `(("ruby-builder" ,ruby-builder) + ("ruby-cucumber-core" ,ruby-cucumber-core) + ("ruby-cucumber-wire" ,ruby-cucumber-wire) + ("ruby-cucumber-expressions" ,ruby-cucumber-expressions) + ("ruby-diff-lcs" ,ruby-diff-lcs) + ("ruby-gherkin" ,ruby-gherkin) + ("ruby-multi-json" ,ruby-multi-json) + ("ruby-multi-test" ,ruby-multi-test))) + (native-inputs + `(("bundler" ,bundler) + ;; Use a untested version of aruba, to avoid a circular dependency, as + ;; ruby-aruba depends on ruby-cucumber. + ("ruby-aruba", ruby-aruba-without-tests) + ("ruby-rspec" ,ruby-rspec) + ("ruby-pry" ,ruby-pry) + ("ruby-nokogiri" ,ruby-nokogiri))) + (synopsis "Describe automated tests in plain language") + (description + "Cucumber is a tool for running automated tests written in plain +language. It's designed to support a Behaviour Driven Development (BDD) +software development workflow.") + (home-page "https://cucumber.io/") + (license license:expat))) + +(define ruby-cucumber-without-tests + (package (inherit ruby-cucumber) + (arguments + '(#:tests? #f)) + (native-inputs + '()))) + (define-public ruby-cucumber-core (package (name "ruby-cucumber-core") -- cgit v1.2.3 From 3306f02a74c0c3cb57f39701a04de4878c7d3777 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 27 Jan 2019 12:14:26 +0000 Subject: gnu: ruby-rspec-its: Enable tests. Enable the tests, and also tweak the synopsis and description to hopefully be more descriptive. * gnu/packages/ruby.scm (ruby-rspec-its)[source]: Change to GitHub, and add patch. [arguments]: Enabled tests, set the #:test-target to "spec", and add the phases to tweak the Gemfile and rspec-its.gemspec. [native-inputs]: Add bundler, ruby-cucumber and ruby-aruba. [synopsis,description]: Make more explicit and descriptive. --- gnu/packages/ruby.scm | 49 ++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 42 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 9b3856f080..906d9ffd54 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -412,20 +412,55 @@ outcomes of a code example.") (version "1.2.0") (source (origin - (method url-fetch) - (uri (rubygems-uri "rspec-its" version)) + (method git-fetch) + (uri (git-reference + (url "https://github.com/rspec/rspec-its.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "1pwphny5jawcm1hda3vs9pjv1cybaxy17dc1s75qd7drrvx697p3")))) + "190rz7v4q4wk80fzhr5hknvxx4vb2pywmqr8wc41w2blj9ylzi0f")) + (patches + (list + (origin (method url-fetch) + (uri (string-append + "https://github.com/rspec/rspec-its/commit/" + "bfaab439c7c879f5ef25552f41827891f6308373.patch")) + (file-name "ruby-rspec-its-fix-specs-for-ruby-2.4.patch") + (sha256 + (base32 + "0lnik0kvrpgkakvdb2fmzg22pdlraf6kiidr9sv6rnfyviiqwxgh"))))))) (build-system ruby-build-system) (arguments - `(#:tests? #f)) ; needs cucumber. + `(#:test-target "spec" + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'dont-install-gems-from-gemfile + (lambda _ + (substitute* "Gemfile" + (("rspec rspec-core rspec-expectations rspec-mocks rspec-support") + "")) + #t)) + (add-before 'build 'remove-unnecessary-dependency-versions-from-gemfile + (lambda _ + (substitute* "rspec-its.gemspec" + (("rake.*") "rake'\n") + (("cucumber.*") "cucumber'\n") + (("bundler.*") "bundler'\n") + (("aruba.*") "aruba'\n")) + #t))))) (propagated-inputs `(("ruby-rspec-core" ,ruby-rspec-core) ("ruby-rspec-expectations" ,ruby-rspec-expectations))) - (synopsis "RSpec extension gem for attribute matching") - (description "@code{rspec-its} is an RSpec extension gem for attribute -matching.") + (native-inputs + `(("bundler" ,bundler) + ("ruby-cucumber" ,ruby-cucumber) + ("ruby-aruba" ,ruby-aruba))) + (synopsis "RSpec extension that provides the @code{its} method") + (description + "RSpec::Its provides the its method as a short-hand to specify the expected +value of an attribute. For example, one can use @code{its(:size)\\{should +eq(1)\\}}.") (home-page "https://github.com/rspec/rspec-its") (license license:expat))) -- cgit v1.2.3 From e42e3bfa47343f69e8801717b9b13e6034e331ea Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 27 Jan 2019 12:55:48 +0000 Subject: gnu: Add ruby-powerpack. Required for ruby-rubocop. * gnu/packages/ruby.scm (ruby-powerpack): New variable. --- gnu/packages/ruby.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 906d9ffd54..d126f3bc41 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -1530,6 +1530,32 @@ assertion messages for tests.") (home-page "https://github.com/k-tsj/power_assert") (license (list license:bsd-2 license:ruby)))) +(define-public ruby-powerpack + (package + (name "ruby-powerpack") + (version "0.1.2") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "powerpack" version)) + (sha256 + (base32 + "1r51d67wd467rpdfl6x43y84vwm8f5ql9l9m85ak1s2sp3nc5hyv")))) + (build-system ruby-build-system) + (arguments + '(#:test-target "spec")) + (native-inputs + `(("bundler" ,bundler) + ("ruby-rspec" ,ruby-rspec) + ("ruby-yard" ,ruby-yard))) + (synopsis "Useful extensions to core Ruby classes") + (description + "This package provides a few useful extensions to core Ruby classes, +including @code{Array}, @code{Enumerable}, @code{Hash}, @code{Numeric}, and +@code{String}.") + (home-page "https://github.com/bbatsov/powerpack") + (license license:expat))) + (define-public ruby-locale (package (name "ruby-locale") -- cgit v1.2.3 From 6edabcb20ce7df0133cc5ff77a27f4635dfc7573 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 27 Jan 2019 13:01:01 +0000 Subject: gnu: Add ruby-rainbow. Required for ruby-rubocop. * gnu/packages/ruby.scm (ruby-rainbow): New variable. --- gnu/packages/ruby.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index d126f3bc41..22aaf29428 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -3793,6 +3793,38 @@ clickjacking, directory traversal, session hijacking and IP spoofing.") (home-page "https://github.com/sinatra/sinatra/tree/master/rack-protection") (license license:expat))) +(define-public ruby-rainbow + (package + (name "ruby-rainbow") + (version "3.0.0") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "rainbow" version)) + (sha256 + (base32 + "0bb2fpjspydr6x0s8pn1pqkzmxszvkfapv0p4627mywl7ky4zkhk")))) + (build-system ruby-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + ;; Run rspec directly, to avoid requiring Rubocop which is used from + ;; the Rakefile. + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "rspec")) + #t))))) + (native-inputs + `(("bundler" ,bundler) + ("ruby-rspec" ,ruby-rspec))) + (synopsis "Colorize printed text on ANSI terminals") + (description + "@code{rainbow} provides a string presenter object to colorize strings by +wrapping them in ANSI escape codes.") + (home-page "https://github.com/sickill/rainbow") + (license license:expat))) + (define-public ruby-contest (package (name "ruby-contest") -- cgit v1.2.3 From 6dc21310762a350779e5d183cf5c7494bca201e1 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 27 Jan 2019 13:30:23 +0000 Subject: gnu: Add ruby-racc. Required for ruby-ast and ruby-parser. * gnu/packages/ruby.scm (ruby-racc): New variable. --- gnu/packages/ruby.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 22aaf29428..d9e2282575 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -3677,6 +3677,32 @@ differences (added or removed nodes) between two XML/HTML documents.") (home-page "https://github.com/postmodern/nokogiri-diff") (license license:expat)))) +(define-public ruby-racc + (package + (name "ruby-racc") + (version "1.4.14") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "racc" version)) + (sha256 + (base32 + "00yhs2ag7yy5v83mqvkbnhk9bvsh6mx3808k53n61ddzx446v1zl")))) + (build-system ruby-build-system) + (native-inputs + `(("ruby-hoe" ,ruby-hoe) + ("ruby-rake-compiler" ,ruby-rake-compiler))) + (synopsis "LALR(1) parser generator for Ruby") + (description + "Racc is a LALR(1) parser generator. It is written in Ruby itself, and +generates Ruby program.") + (home-page "http://i.loveruby.net/en/projects/racc/") + (license (list + ;; Generally licensed under the LGPL2.1, and some files also + ;; available under the same license as Ruby. + license:lgpl2.1 + license:ruby)))) + (define-public ruby-rack (package (name "ruby-rack") -- cgit v1.2.3 From 21781436515d1b0241d9c85017dd83634b0c8070 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 27 Jan 2019 16:41:10 +0000 Subject: gnu: Add ruby-hashdiff. Required for ruby-webmock. * gnu/packages/ruby.scm (ruby-hashdiff): New variable. --- gnu/packages/ruby.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index d9e2282575..4b20ead9b4 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -1251,6 +1251,38 @@ failure.") (home-page "https://github.com/thekompanee/fuubar") (license license:expat))) +(define-public ruby-hashdiff + (package + (name "ruby-hashdiff") + (version "0.3.8") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "hashdiff" version)) + (sha256 + (base32 + "19ykg5pax8798nh1yv71adkx0zzs7gn2rxjj86v7nsw0jba5lask")))) + (build-system ruby-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + ;; Run tests directly via rspec to avoid Rake issue: + ;; NoMethodError: undefined method `last_comment' + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "rspec")) + #t))))) + (native-inputs + `(("bundler" ,bundler) + ("ruby-rspec" ,ruby-rspec-2))) + (synopsis "HashDiff computes the smallest difference between two hashes") + (description + "HashDiff is a Ruby library to compute the smallest difference between +two hashes.") + (home-page "https://github.com/liufengyun/hashdiff") + (license license:expat))) + (define-public ruby-shindo (package (name "ruby-shindo") -- cgit v1.2.3 From 6f8bf0ebe3043dc604403ade71ad30a59efbdfc6 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 27 Jan 2019 16:41:38 +0000 Subject: gnu: Add ruby-crack. Required for ruby-webmock. * gnu/packages/ruby.scm (ruby-crack): New variable. --- gnu/packages/ruby.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 4b20ead9b4..a0c0706f0c 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -811,6 +811,38 @@ value is found.") (home-page "https://github.com/egonSchiele/contracts.ruby") (license license:bsd-2))) +(define-public ruby-crack + (package + (name "ruby-crack") + (version "0.4.3") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "crack" version)) + (sha256 + (base32 + "0abb0fvgw00akyik1zxnq7yv391va148151qxdghnzngv66bl62k")))) + (build-system ruby-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (for-each (lambda (file) + (display file)(display "\n") + (invoke "ruby" "-Ilib" "-Itest" "-rrubygems" file)) + (find-files "test" ".*rb$"))) + #t))))) + (propagated-inputs + `(("ruby-safe-yaml" ,ruby-safe-yaml))) + (synopsis "Simple JSON and XML parsing for Ruby") + (description + "@code{crack} provides really simple JSON and XML parsing, extracted from +code in Merb and Rails.") + (home-page "https://github.com/jnunemaker/crack") + (license license:expat))) + (define-public ruby-czmq-ffi-gen (package (name "ruby-czmq-ffi-gen") -- cgit v1.2.3 From 8c7ae3840260c5ec00c423505482991165fc44d4 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 27 Jan 2019 16:41:55 +0000 Subject: gnu: Add ruby-webmock. Required by ruby-rest-client. Also at version ~> 2, so don't package 3 just yet. * gnu/packages/ruby.scm (ruby-webmock): New variable. --- gnu/packages/ruby.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index a0c0706f0c..d5e2034389 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -4820,6 +4820,32 @@ support to both Ruby and JRuby. It uses @code{unf_ext} on CRuby and (home-page "https://github.com/knu/ruby-unf") (license license:bsd-2))) +(define-public ruby-webmock-2 + (package + (name "ruby-webmock") + (version "2.3.2") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "webmock" version)) + (sha256 + (base32 + "04hkcqsmbfnp8g237pisnc834vpgildklicbjbyikqg0bg1rwcy5")))) + (build-system ruby-build-system) + (native-inputs + `(("bundler" ,bundler) + ("ruby-rspec" ,ruby-rspec))) + (propagated-inputs + `(("ruby-addressable" ,ruby-addressable) + ("ruby-crack" ,ruby-crack) + ("ruby-hashdiff" ,ruby-hashdiff))) + (synopsis "Allows stubbing and setting expectations on HTTP requests") + (description + "WebMock allows stubbing HTTP requests and setting expectations on HTTP +requests. This is useful when testing software.") + (home-page "https://github.com/bblimke/webmock") + (license license:expat))) + (define-public ruby-domain-name (package (name "ruby-domain-name") -- cgit v1.2.3 From 79193b2097fe6643c3597d778bca3850e90a0ac1 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 27 Jan 2019 16:42:04 +0000 Subject: gnu: Add ruby-rest-client. Required for ruby-ast. * gnu/packages/ruby.scm (ruby-rest-client): New variable. --- gnu/packages/ruby.scm | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index d5e2034389..1eb52811e9 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -3915,6 +3915,54 @@ wrapping them in ANSI escape codes.") (home-page "https://github.com/sickill/rainbow") (license license:expat))) +(define-public ruby-rest-client + (package + (name "ruby-rest-client") + (version "2.0.2") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "rest-client" version)) + (sha256 + (base32 + "1hzcs2r7b5bjkf2x2z3n8z6082maz0j8vqjiciwgg3hzb63f958j")))) + (build-system ruby-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-before 'check 'remove-unnecessary-development-dependencies + (lambda _ + (substitute* "rest-client.gemspec" + ;; Remove rubocop as it's unused. Rubocop also indirectly + ;; depends on this package through ruby-parser and ruby-ast so + ;; this avoids a dependency loop. + ((".*rubocop.*") "\n") + ;; Remove pry as it's unused, it's a debugging tool + ((".*pry.*") "\n") + ;; Remove an unnecessarily strict rdoc dependency + ((".*rdoc.*") "\n")) + #t)) + (add-before 'check 'delete-network-dependent-tests + (lambda _ + (delete-file "spec/integration/request_spec.rb") + (delete-file "spec/integration/httpbin_spec.rb") + #t))))) + (propagated-inputs + `(("ruby-http-cookie" ,ruby-http-cookie) + ("ruby-mime-types" ,ruby-mime-types) + ("ruby-netrc" ,ruby-netrc))) + (native-inputs + `(("bundler" ,bundler) + ("ruby-webmock", ruby-webmock-2) + ("ruby-rspec", ruby-rspec))) + (synopsis "Simple HTTP and REST client for Ruby") + (description + "@code{rest-client} provides a simple HTTP and REST client for Ruby, +inspired by the Sinatra microframework style of specifying actions: +@code{get}, @code{put}, @code{post}, @code{delete}.") + (home-page "https://github.com/rest-client/rest-client") + (license license:expat))) + (define-public ruby-contest (package (name "ruby-contest") -- cgit v1.2.3 From 65f6588904368e126a5b14985df7045588c2f668 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 27 Jan 2019 16:42:21 +0000 Subject: gnu: Add ruby-bacon-colored-output. This is a requirement of ruby-ast. * gnu/packages/ruby.scm (ruby-bacon-colored-output): New variable. --- gnu/packages/ruby.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 1eb52811e9..e4ac6cc861 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -1536,6 +1536,30 @@ disable tests, have before and after blocks that run once and more.") (home-page "https://github.com/cldwalker/bacon-bits") (license license:expat))) +(define-public ruby-bacon-colored-output + (package + (name "ruby-bacon-colored-output") + (version "1.1.1") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "bacon-colored_output" version)) + (sha256 + (base32 + "1znyh3vkfdlmf19p3k4zip88ibym41dn5g4p4n5hmks2iznb7qpx")))) + (build-system ruby-build-system) + (arguments + '(;; No included tests + #:tests? #f)) + (propagated-inputs + `(("ruby-bacon" ,ruby-bacon))) + (synopsis "Colored output for Bacon test framework") + (description + "This package adds color through ANSI escape codes to Bacon test +output.") + (home-page "https://github.com/whitequark/bacon-colored_output") + (license license:expat))) + (define-public ruby-connection-pool (package (name "ruby-connection-pool") -- cgit v1.2.3 From d5840f77252d662da403a423f8f2cf947d1c712d Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 27 Jan 2019 16:42:37 +0000 Subject: gnu: Add ruby-ast. Required for ruby-parser. * gnu/packages/ruby.scm (ruby-ast): New variable. --- gnu/packages/ruby.scm | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index e4ac6cc861..d55daaa310 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -719,6 +719,53 @@ AsciiDoc content to HTML5, DocBook 5 (or 4.5), PDF, and other formats.") (home-page "https://asciidoctor.org") (license license:expat))) +(define-public ruby-ast + (package + (name "ruby-ast") + (version "2.4.0") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "ast" version)) + (sha256 + (base32 + "184ssy3w93nkajlz2c70ifm79jp3j737294kbc5fjw69v1w0n9x7")))) + (build-system ruby-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'remove-coveralls-requirement + (lambda _ + (substitute* "test/helper.rb" + (("require 'coveralls'") "") + (("Coveralls::SimpleCov::Formatter") "")) + #t)) + (add-after 'extract-gemspec 'remove-unnecessary-requirements + (lambda _ + (substitute* "ast.gemspec" + ((".*coveralls.*") "\n") + (("%q.*") "%q.freeze, [\">= 0\"])\n") + (("%q.*") "%q.freeze, [\">= 0\"])\n") + (("%q.*") "%q.freeze, [\">= 0\"])\n")) + #t))))) + (native-inputs + `(("bundler" ,bundler) + ("ruby-simplecov" ,ruby-simplecov) + ("ruby-json-pure" ,ruby-json-pure) + ("ruby-mime-times" ,ruby-mime-types) + ("ruby-yard" ,ruby-yard) + ("ruby-kramdown" ,ruby-kramdown) + ("ruby-rest-client" ,ruby-rest-client) + ("ruby-bacon" ,ruby-bacon) + ("ruby-bacon-colored-output" ,ruby-bacon-colored-output) + ("ruby-racc" ,ruby-racc))) + (synopsis "Library for working with Abstract Syntax Trees") + (description + "@code{ast} is a Ruby library for working with Abstract Syntax Trees. +It does this through immutable data structures.") + (home-page "https://whitequark.github.io/ast/") + (license license:expat))) + (define-public ruby-sporkmonger-rack-mount ;; Testing the addressable gem requires a newer commit than that released, so ;; use an up to date version. -- cgit v1.2.3 From bef3506eb8cb04df812c9d36f2dc51efe95dd7b5 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 27 Jan 2019 16:42:45 +0000 Subject: gnu: Add ruby-cliver. Requirement of ruby-parser. * gnu/packages/ruby.scm (ruby-cliver): New variable. --- gnu/packages/ruby.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index d55daaa310..d3d1c5268c 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -890,6 +890,40 @@ code in Merb and Rails.") (home-page "https://github.com/jnunemaker/crack") (license license:expat))) +(define-public ruby-cliver + (package + (name "ruby-cliver") + (version "0.3.2") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "cliver" version)) + (sha256 + (base32 + "096f4rj7virwvqxhkavy0v55rax10r4jqf8cymbvn4n631948xc7")))) + (build-system ruby-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + ;; Avoid a incompatibility between rspec@2 and rake. Using rspec@3 + ;; would be nice, but the tests look to be incompatible: + ;; + ;; NoMethodError: undefined method `last_comment' + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "rspec")) + #t))))) + (native-inputs + `(("bundler" ,bundler) + ("ruby-rspec" ,ruby-rspec-2))) + (synopsis "Assertions for command-line dependencies in Ruby") + (description + "@code{cliver} provides a way to detect missing command-line +dependencies, including versions.") + (home-page "https://github.com/yaauie/cliver") + (license license:expat))) + (define-public ruby-czmq-ffi-gen (package (name "ruby-czmq-ffi-gen") -- cgit v1.2.3 From 5499345749a4ce1275773b9353446b2fca63bdba Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 27 Jan 2019 16:42:55 +0000 Subject: gnu: Add ruby-parser. Required for ruby-rubocop. * gnu/packages/ruby.scm (ruby-parser): New variable. --- gnu/packages/ruby.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index d3d1c5268c..3f4d902740 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -2843,6 +2843,33 @@ for select languages.") (home-page "http://coderay.rubychan.de") (license license:expat))) +(define-public ruby-parser + (package + (name "ruby-parser") + (version "2.6.0.0") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "parser" version)) + (sha256 + (base32 + "1hhz2k5417vr2k1llwqgjdnmyrhlpqicy0y2arr6r1gp04fg9wlm")))) + (build-system ruby-build-system) + (native-inputs + `(("bundler" ,bundler) + ("ruby-cliver" ,ruby-cliver) + ("ruby-simplecov" ,ruby-simplecov) + ("ruby-racc" ,ruby-racc))) + (inputs + `(("ragel" ,ragel))) + (propagated-inputs + `(("ruby-ast" ,ruby-ast))) + (synopsis "Ruby parser written in pure Ruby") + (description + "This package provides a Ruby parser written in pure Ruby.") + (home-page "https://github.com/whitequark/parser") + (license license:expat))) + (define-public ruby-progress_bar (package (name "ruby-progress_bar") -- cgit v1.2.3 From d8c189ed56d20c2eeb52710b197f52b3472103c8 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 27 Jan 2019 16:43:13 +0000 Subject: gnu: Add ruby-unicode-display-width. Required for ruby-rubocop. * gnu/packages/ruby.scm (ruby-unicode-display-width): New variable. --- gnu/packages/ruby.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 3f4d902740..06f6fffbf3 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5026,6 +5026,28 @@ requests. This is useful when testing software.") (home-page "https://github.com/bblimke/webmock") (license license:expat))) +(define-public ruby-unicode-display-width + (package + (name "ruby-unicode-display-width") + (version "1.4.1") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "unicode-display_width" version)) + (sha256 + (base32 + "0bq528fibi8s0jmxz0xzlgzggdq0x4fx46wfqz49478pv8gb2diq")))) + (build-system ruby-build-system) + (arguments + '(;; Test data not included. + #:tests? #f)) + (synopsis "Determine the monospace display width of Ruby strings") + (description + "@code{Unicode::DisplayWidth} is a Ruby library which can determine the +display width of strings in Ruby.") + (home-page "https://github.com/janlelis/unicode-display_width") + (license license:expat))) + (define-public ruby-domain-name (package (name "ruby-domain-name") -- cgit v1.2.3 From 433f10b5d2d7714440e92b7f563fb51dea7779f4 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 27 Jan 2019 16:43:32 +0000 Subject: gnu: Add ruby-jaro-winkler. Required for ruby-rubocop. * gnu/packages/ruby.scm (ruby-jaro-winkler): New variable. --- gnu/packages/ruby.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 06f6fffbf3..73147983ff 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -3352,6 +3352,29 @@ when working with Ruby code.") ;; There is no mention of the "or later" clause. (license license:gpl2))) +(define-public ruby-jaro-winkler + (package + (name "ruby-jaro-winkler") + (version "1.5.2") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "jaro_winkler" version)) + (sha256 + (base32 + "1zz27z88qznix4r65gd9h56gl177snlfpgv10b0s69vi8qpl909l")))) + (build-system ruby-build-system) + (arguments + '(;; No included tests + #:tests? #f)) + (synopsis "Ruby implementation of Jaro-Winkler distance algorithm") + (description + "@code{jaro_winkler} is an implementation of Jaro-Winkler distance +algorithm. It is written as a C extension and will fallback to a pure Ruby +implementation on platforms where this is unsupported.") + (home-page "https://github.com/tonytonyjan/jaro_winkler") + (license license:expat))) + (define-public ruby-json (package (name "ruby-json") -- cgit v1.2.3 From 5d8fe6de26949ac0c732fb527e58dcd059fbdd60 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 27 Jan 2019 16:43:52 +0000 Subject: gnu: Add ruby-rubocop. * gnu/packages/ruby.scm (ruby-rubocop): New variable. --- gnu/packages/ruby.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 73147983ff..d27edeffb5 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -4118,6 +4118,36 @@ inspired by the Sinatra microframework style of specifying actions: (home-page "https://github.com/rest-client/rest-client") (license license:expat))) +(define-public ruby-rubocop + (package + (name "ruby-rubocop") + (version "0.64.0") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "rubocop" version)) + (sha256 + (base32 + "07shi6kncwhkvlh9ci9rgccrjsq4448hbic3yrakh2w65ppynvbj")))) + (build-system ruby-build-system) + (arguments + '(;; No included tests + #:tests? #f)) + (propagated-inputs + `(("ruby-parser" ,ruby-parser) + ("ruby-powerpack" ,ruby-powerpack) + ("ruby-rainbow" ,ruby-rainbow) + ("ruby-progressbar" ,ruby-progressbar) + ("ruby-parallel" ,ruby-parallel) + ("ruby-jaro-winkler" ,ruby-jaro-winkler) + ("ruby-unicode-display-width" ,ruby-unicode-display-width))) + (synopsis "Ruby code style checking tool") + (description + "@code{rubocop} is a Ruby code style checking tool. It aims to enforce +the community-driven Ruby Style Guide.") + (home-page "https://github.com/rubocop-hq/rubocop") + (license license:expat))) + (define-public ruby-contest (package (name "ruby-contest") -- cgit v1.2.3 From b9511aa93b5c5979ee67a0108483a63f15f166f4 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 27 Jan 2019 19:13:17 +0000 Subject: gnu: Add ruby-maruku. Required for ruby-minitest-reporters. * gnu/packages/ruby.scm (ruby-maruku): New variable. --- gnu/packages/ruby.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index d27edeffb5..5cafbe8960 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -1847,6 +1847,39 @@ It allows writing tests, checking results and automated testing in Ruby.") (home-page "https://test-unit.github.io/") (license (list license:psfl license:ruby)))) +(define-public ruby-maruku + (package + (name "ruby-maruku") + (version "0.7.3") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "maruku" version)) + (sha256 + (base32 + "1r7bxpgnx2hp3g12bjrmdrpv663dfqxsdp0af69kjhxmaxpia56x")))) + (build-system ruby-build-system) + (arguments + '(;; TODO: 3 tests seem to fail due to HTML encoding issues + #:tests? #f + #:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "rspec")) + #t))))) + (native-inputs + `(("ruby-rspec" ,ruby-rspec) + ("ruby-simplecov" ,ruby-simplecov) + ("ruby-nokogiri-diff" ,ruby-nokogiri-diff))) + (synopsis "Markdown interpreter in Ruby") + (description + "Maruku is a Markdown interpreter in Ruby. It can export Markdown to +HTML, and PDF through LaTeX.") + (home-page "https://github.com/bhollis/maruku") + (license license:expat))) + (define-public ruby-metaclass (package (name "ruby-metaclass") -- cgit v1.2.3 From 88a105c10762fb5454f96a7f19274bfc96222fb5 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 27 Jan 2019 19:13:43 +0000 Subject: gnu: ruby-minitest: Update to 5.11.3. As the previous version breaks the tests for the ruby-minitest-reporters package I'd like to add. * gnu/packages/ruby.scm (ruby-minitest): Update to 5.11.3. --- gnu/packages/ruby.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 5cafbe8960..50131d8c7a 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -2254,13 +2254,13 @@ client protocol.") (define-public ruby-minitest (package (name "ruby-minitest") - (version "5.10.3") + (version "5.11.3") (source (origin (method url-fetch) (uri (rubygems-uri "minitest" version)) (sha256 (base32 - "05521clw19lrksqgvg2kmm025pvdhdaniix52vmbychrn2jm7kz2")))) + "0icglrhghgwdlnzzp4jf76b0mbc71s80njn5afyfjn4wqji8mqbq")))) (build-system ruby-build-system) (native-inputs `(("ruby-hoe" ,ruby-hoe))) -- cgit v1.2.3 From e2c9a9ccb747c051246cdf4af0bde277ff655fc6 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 27 Jan 2019 19:28:55 +0000 Subject: gnu: Add ruby-minitest-reporters. Required for ruby-public-suffix tests. * gnu/packages/ruby.scm (ruby-minitest-reporters): New variable. --- gnu/packages/ruby.scm | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 50131d8c7a..53f08e1d07 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -2466,6 +2466,51 @@ instance, it provides @code{assert_true}, @code{assert_false} and (home-page "https://github.com/halostatue/minitest-bonus-assertions") (license license:expat))) +(define-public ruby-minitest-reporters + (package + (name "ruby-minitest-reporters") + (version "1.3.6") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "minitest-reporters" version)) + (sha256 + (base32 + "1a3das80rwgys5rj48i5ly144nvszyqyi748bk9bss74jblcf5ay")))) + (build-system ruby-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + ;; Remove the requirement on Rubocop, as it isn't useful to run, and + ;; including it as an input can lead to circular dependencies. + (add-after 'unpack 'remove-rubocop-from-Rakefile + (lambda _ + (substitute* "Rakefile" + (("require 'rubocop/rake\\_task'") "") + (("RuboCop::RakeTask\\.new\\(:rubocop\\)") "[].each")) + #t)) + (add-after 'extract-gemspec 'remove-rubocop-from-gemspec + (lambda _ + (substitute* "minitest-reporters.gemspec" + ((".*%q.*") "\n")) + #t))))) + (propagated-inputs + `(("ruby-ansi" ,ruby-ansi) + ("ruby-builder" ,ruby-builder) + ("ruby-minitest" ,ruby-minitest) + ("ruby-progressbar" ,ruby-progressbar))) + (native-inputs + `(("bundler" ,bundler) + ("ruby-maruku" ,ruby-maruku))) + (synopsis "Enhanced reporting for Minitest tests") + (description + "@code{minitest/reporters} provides a custom Minitest runner to improve +how the test state is reported. A number of different reporters are +available, including a spec reporter, progress bar reporter, a HTML +reporter.") + (home-page "https://github.com/kern/minitest-reporters") + (license license:expat))) + (define-public ruby-minitest-rg (package (name "ruby-minitest-rg") -- cgit v1.2.3 From 1f4fc12568cad3e72a947997d4e0e20296b40ac9 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 27 Jan 2019 19:34:13 +0000 Subject: gnu: ruby-public-suffix: Enable tests. * gnu/packages/ruby.scm (ruby-public-suffix)[arguments]: Enable the tests, add a phase to remove the Rubocop dependency. [native-inputs]: Add bundler, ruby-yard, ruby-mocha and ruby-minitest-reporters. --- gnu/packages/ruby.scm | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 53f08e1d07..9c229db26c 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -6164,8 +6164,21 @@ programs running in the background, in Ruby.") "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l")))) (build-system ruby-build-system) (arguments - ;; Tests require network - `(#:tests? #f)) + '(#:phases + (modify-phases %standard-phases + ;; Remove the requirement on Rubocop, as it isn't useful to run, and + ;; including it as an input can lead to circular dependencies. + (add-after 'unpack 'remove-rubocop-from-Rakefile + (lambda _ + (substitute* "Rakefile" + (("require \"rubocop/rake\\_task\"") "") + (("RuboCop::RakeTask\\.new") "")) + #t))))) + (native-inputs + `(("bundler" ,bundler) + ("ruby-yard" ,ruby-yard) + ("ruby-mocha" ,ruby-mocha) + ("ruby-minitest-reporters" ,ruby-minitest-reporters))) (home-page "https://simonecarletti.com/code/publicsuffix-ruby/") (synopsis "Domain name parser") (description "The gem @code{public_suffix} is a domain name parser, -- cgit v1.2.3 From f3d7bb9323582d142e6f8d6f6371d58fc55516e1 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 27 Jan 2019 19:41:26 +0000 Subject: gnu: Add ruby-idn-ruby. Required for the ruby-addressable tests. * gnu/packages/ruby.scm (ruby-idn-ruby): New variable. --- gnu/packages/ruby.scm | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 9c229db26c..d01297c9bc 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -40,6 +40,7 @@ #:use-module (gnu packages autotools) #:use-module (gnu packages java) #:use-module (gnu packages libffi) + #:use-module (gnu packages libidn) #:use-module (gnu packages maths) #:use-module (gnu packages ncurses) #:use-module (gnu packages networking) @@ -2014,6 +2015,52 @@ irb's last-word approach.") (home-page "http://tagaholic.me/bond/") (license license:expat))) +(define-public ruby-idn-ruby + (package + (name "ruby-idn-ruby") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "idn-ruby" version)) + (sha256 + (base32 + "07vblcyk3g72sbq12xz7xj28snpxnh3sbcnxy8bglqbfqqhvmawr")))) + (build-system ruby-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (delete 'check) + (add-after 'install 'check + (lambda* (#:key tests? outputs #:allow-other-keys) + (when tests? + (let* ((gem-file (cadr (find-files "." "\\.gem"))) + (name-and-version (basename gem-file ".gem"))) + (apply invoke + "ruby" "--verbose" + (string-append "-I" + (assoc-ref outputs "out") + "/lib/ruby/vendor_ruby/gems/" + name-and-version + "/lib") + (find-files "./test" ".*\\.rb")))) + #t))))) + (inputs + `(("libidn" ,libidn))) + (synopsis "Ruby Bindings for the GNU LibIDN library") + (description + "Ruby Bindings for the GNU LibIDN library, an implementation of the +Stringprep, Punycode and IDNA specifications. These are used to encode and +decode internationalized domain + names according to the IDNA2003 +specifications. + +Included are the most important parts of the Stringprep, Punycode and IDNA +APIs like performing Stringprep processings, encoding to and decoding from +Punycode strings and converting entire domain names to and from the ACE +encoded form.") + (home-page "https://github.com/deepfryed/idn-ruby") + (license license:asl2.0))) + (define-public ruby-instantiator (package (name "ruby-instantiator") -- cgit v1.2.3 From 0a794b3075490dd61e34027af4d8d78b3db13b1f Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 27 Jan 2019 19:44:26 +0000 Subject: gnu: ruby-addressable: Enable tests and update. * gnu/packages/ruby.scm (ruby-addressable): Update to 2.6.0. [arguments]: Enable running the tests. [native-inputs]: Add inputs required for running the tests. --- gnu/packages/ruby.scm | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index d01297c9bc..030e720ce5 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -6239,19 +6239,40 @@ all known public suffixes.") (define-public ruby-addressable (package (name "ruby-addressable") - (version "2.5.2") + (version "2.6.0") (source (origin (method url-fetch) (uri (rubygems-uri "addressable" version)) (sha256 (base32 - "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk")))) + "0bcm2hchn897xjhqj9zzsxf3n9xhddymj4lsclz508f4vw3av46l")))) (build-system ruby-build-system) + (arguments + '(#:test-target "spec" + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'remove-unnecessary-dependencies-from-Gemfile + (lambda _ + (substitute* "Gemfile" + (("git: 'https://github.com/sporkmonger/rack-mount.git',") "") + ((".*launchy.*") "") + ((".*rake.*") "gem 'rake'\n") + ((".*redcarpet.*") "")) + #t)) + (add-before 'check 'delete-network-dependent-test + (lambda _ + (delete-file "spec/addressable/net_http_compat_spec.rb") + #t))))) + (native-inputs + `(("ruby-rspec" ,ruby-rspec) + ("bundler" ,bundler) + ("ruby-idn-ruby" ,ruby-idn-ruby) + ("ruby-sporkmonger-rack-mount" ,ruby-sporkmonger-rack-mount) + ("ruby-rspec-its", ruby-rspec-its) + ("ruby-yard" ,ruby-yard) + ("ruby-simplecov" ,ruby-simplecov))) (propagated-inputs `(("ruby-public-suffix" ,ruby-public-suffix))) - (arguments - ;; No test target - `(#:tests? #f)) (home-page "https://github.com/sporkmonger/addressable") (synopsis "Alternative URI implementation") (description "Addressable is a replacement for the URI implementation that -- cgit v1.2.3 From 6120589f55cb79a2c880fd5b2e5798c97bf3e9cc Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 27 Jan 2019 20:15:27 +0000 Subject: gnu: Add ruby_version. Required for ruby-rspec-pending-for. * gnu/packages/ruby.scm (ruby_version): New variable. --- gnu/packages/ruby.scm | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 030e720ce5..d8aa27daec 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5226,6 +5226,53 @@ display width of strings in Ruby.") (home-page "https://github.com/janlelis/unicode-display_width") (license license:expat))) +;; There is another gem called 'ruby-version' so we use an underscore in this +;; name +(define-public ruby_version + (package + (name "ruby_version") + (version "1.0.1") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "ruby_version" version)) + (sha256 + (base32 + "0854i1bjy56176anr05l5m0vc81nl53c7fyfg7sljj62m1d64dgj")))) + (build-system ruby-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-before 'check 'fix-dependencies + (lambda _ + ;; Remove the Gemfile.lock, as we want to use Guix packages at + ;; whatever versions. + (delete-file "Gemfile.lock") + ;; Remove the incldued gem file as it's unnecessary. + (delete-file "pkg/ruby_version-1.0.0.gem") + (substitute* "ruby_version.gemspec" + ;; Don't require rdoc and rubygems-tasks as they're unnecessary + ((".*rdoc.*") "\n") + ((".*rubygems-tasks.*") "\n") + ;; Accept any version of rake and rspec + (("%q)\n") + (("%q)\n")) + ;; Remove the use of rubygems-tasks from the Rakefile, as it's + ;; unnecessary. + (substitute* "Rakefile" + (("^require 'rubygems/tasks'") "") + (("Gem::Tasks.new") "")) + #t))))) + (native-inputs + `(("bundler" ,bundler) + ("ruby-rspec" ,ruby-rspec))) + (synopsis "Ruby library to help check the Ruby version") + (description + "@code{ruby_version} provides a @code{RubyVersion} module to simplify +checking for the right Ruby version in software.") + (home-page "https://github.com/janlelis/ruby_version") + (license license:expat))) + (define-public ruby-domain-name (package (name "ruby-domain-name") -- cgit v1.2.3 From b8aecc31b4f3cdad7a3d5b44af3e541ad1ad9d03 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Mon, 28 Jan 2019 14:51:47 +0000 Subject: gnu: Add ruby-mysql2. Required for ruby-parallel. * gnu/packages/ruby.scm (ruby-mysql2): New variable. --- gnu/packages/ruby.scm | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index d8aa27daec..df0969eb2d 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -1959,6 +1959,64 @@ specs for Ruby implementations in ruby/spec.") (home-page "http://rubyspec.org") (license license:expat))) +(define-public ruby-mysql2 + (package + (name "ruby-mysql2") + (version "0.5.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/brianmario/mysql2.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "11lvfgc2rmvkm52jp0nbi6pvhk06klznghr7llldfw8basl9n5wv")))) + (build-system ruby-build-system) + (arguments + '(;; TODO: Tests require a running MySQL/MariaDB service + #:tests? #f + #:phases + (modify-phases %standard-phases + (replace 'replace-git-ls-files + (lambda _ + (substitute* "mysql2.gemspec" + (("git ls-files .*`") "find . -type f |sort`")) + #t)) + (add-before 'install 'set-MAKEFLAGS + (lambda* (#:key outputs #:allow-other-keys) + (setenv "MAKEFLAGS" + (string-append + "V=1 " + "prefix=" (assoc-ref outputs "out"))) + #t)) + ;; Move the 'check phase to after 'install, as then you can test + ;; using the installed mysql2 gem in the store. + (delete 'check) + (add-after 'install 'check + (lambda* (#:key outputs tests? #:allow-other-keys) + (setenv "GEM_PATH" + (string-append + (getenv "GEM_PATH") + ":" + (assoc-ref outputs "out") "/lib/ruby/vendor_ruby")) + (when tests? + (invoke "rspec")) + #t))))) + (inputs + `(("mariadb" ,mariadb) + ("zlib" ,zlib))) + (native-inputs + `(("ruby-rspec" ,ruby-rspec) + ("ruby-rake-compiler" ,ruby-rake-compiler))) + (synopsis "MySQL library for Ruby, binding to libmysql") + (description + "This package provides a simple, fast MySQL library for Ruby, binding to +libmysql.") + (home-page "https://github.com/brianmario/mysql2") + (license license:expat))) + (define-public ruby-blankslate (package (name "ruby-blankslate") -- cgit v1.2.3 From 566f71f8b82d132e32acafd2b73a14a6680cac5c Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Mon, 28 Jan 2019 14:53:58 +0000 Subject: gnu: Add ruby-bump. Required for ruby-parallel. * gnu/packages/ruby.scm (ruby-bump): New variable. --- gnu/packages/ruby.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index df0969eb2d..854b5c2cdc 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -584,6 +584,28 @@ supported: XML Markup and XML Events.") (home-page "https://github.com/jimweirich/builder") (license license:expat))) +(define-public ruby-bump + (package + (name "ruby-bump") + (version "0.7.0") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "bump" version)) + (sha256 + (base32 + "1xinbr9rzh6cj75x24niwgqcnbhdxc68a8bc41lk8xv6fd906fym")))) + (build-system ruby-build-system) + (arguments + '(;; No included tests + #:tests? #f)) + (synopsis "Tool for working with Rubygems") + (description + "Bump provides commands to manage Rubygem versioning, updating to the +next patch version for example.") + (home-page "https://github.com/gregorym/bump") + (license license:expat))) + (define-public ruby-rjb (package (name "ruby-rjb") -- cgit v1.2.3 From fb394a296bcc6054035f8b561de239a6708dd944 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Mon, 28 Jan 2019 15:17:16 +0000 Subject: gnu: ruby-activesupport: Update to 5.2.2. * gnu/packages/ruby.scm (ruby-activesupport): Update to 5.2.2. --- gnu/packages/ruby.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 854b5c2cdc..20d7e9af45 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -3703,14 +3703,14 @@ you about the changes.") (define-public ruby-activesupport (package (name "ruby-activesupport") - (version "5.2.1") + (version "5.2.2") (source (origin (method url-fetch) (uri (rubygems-uri "activesupport" version)) (sha256 (base32 - "0ziy6xk31k4fs115cdkba1ys4i8nzcyri7a2jig7nx7k5h7li6l2")))) + "1iya7vxqwxysr74s7b4z1x19gmnx5advimzip3cbmsd5bd43wfgz")))) (build-system ruby-build-system) (arguments `(#:phases -- cgit v1.2.3 From 29fa6d8411d87fcde8b55cc13fbd545f1d3e6cd3 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Mon, 28 Jan 2019 15:19:10 +0000 Subject: gnu: Add ruby-activemodel. Required for ruby-activerecord. * gnu/packages/rails.scm (ruby-activemodel): New variable. --- gnu/packages/rails.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/rails.scm b/gnu/packages/rails.scm index 5348d914cf..80329a3c5b 100644 --- a/gnu/packages/rails.scm +++ b/gnu/packages/rails.scm @@ -93,3 +93,28 @@ API.") (home-page "https://github.com/banister/debug_inspector") (license license:expat))) + +(define-public ruby-activemodel + (package + (name "ruby-activemodel") + (version "5.2.2") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "activemodel" version)) + (sha256 + (base32 + "1xmwi3mw8g4shbjvkhk72ra3r5jccbdsd4piphqka2y1h8s7sxvi")))) + (build-system ruby-build-system) + (arguments + '(;; No included tests + #:tests? #f)) + (propagated-inputs + `(("ruby-activesupport" ,ruby-activesupport))) + (synopsis "Toolkit for building modeling frameworks like Active Record") + (description + "This package provides a toolkit for building modeling frameworks like +Active Record. ActiveSupport handles attributes, callbacks, validations, +serialization, internationalization, and testing.") + (home-page "https://rubyonrails.org/") + (license license:expat))) -- cgit v1.2.3 From aecd533d5a6624bcfbcdd31d5c67e0feeb9107ae Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Mon, 28 Jan 2019 15:19:55 +0000 Subject: gnu: ruby-arel: Update to 9.0.0. * gnu/packages/ruby.scm (ruby-arel): Update to 9.0.0. --- gnu/packages/ruby.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 20d7e9af45..d597e1729f 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -2881,13 +2881,13 @@ rogue test/unit/autorun requires.") (define-public ruby-arel (package (name "ruby-arel") - (version "8.0.0") + (version "9.0.0") (source (origin (method url-fetch) (uri (rubygems-uri "arel" version)) (sha256 (base32 - "0nw0qbc6ph625p6n3maqq9f527vz3nbl0hk72fbyka8jzsmplxzl")))) + "1jk7wlmkr61f6g36w9s2sn46nmdg6wn2jfssrhbhirv5x9n95nk0")))) (build-system ruby-build-system) (arguments '(#:tests? #f)) ; no tests (home-page "https://github.com/rails/arel") -- cgit v1.2.3 From 13cf6aee1bfbb7541a57536205432462dcd21978 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Mon, 28 Jan 2019 15:22:52 +0000 Subject: gnu: Add ruby-activerecord. * gnu/packages/rails.scm (ruby-activerecord): New variable. --- gnu/packages/rails.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/rails.scm b/gnu/packages/rails.scm index 80329a3c5b..a9dae594a5 100644 --- a/gnu/packages/rails.scm +++ b/gnu/packages/rails.scm @@ -118,3 +118,29 @@ Active Record. ActiveSupport handles attributes, callbacks, validations, serialization, internationalization, and testing.") (home-page "https://rubyonrails.org/") (license license:expat))) + +(define-public ruby-activerecord + (package + (name "ruby-activerecord") + (version "5.2.2") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "activerecord" version)) + (sha256 + (base32 + "19a0sns6a5wz2wym25lb1dv4lbrrl5sd1n15s5ky2636znmhz30y")))) + (build-system ruby-build-system) + (arguments + '(;; No included tests + #:tests? #f)) + (propagated-inputs + `(("ruby-activemodel" ,ruby-activemodel) + ("ruby-activesupport" ,ruby-activesupport) + ("ruby-arel" ,ruby-arel))) + (synopsis "Ruby library to connect to relational databases") + (description + "Active Record connects classes to relational database table to establish +an almost zero-configuration persistence layer for applications.") + (home-page "https://rubyonrails.org") + (license license:expat))) -- cgit v1.2.3 From 198bc648559c2488611fe0d9c337491fbf13bd5b Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Mon, 28 Jan 2019 15:37:30 +0000 Subject: gnu: Add ruby-rspec-rerun. Required for ruby-parallel tests. * gnu/packages/ruby.scm (ruby-rspec-rerun): New variable. --- gnu/packages/ruby.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index d597e1729f..b06cdcc023 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -499,6 +499,29 @@ support for stubbing and mocking.") (propagated-inputs `(("ruby-diff-lcs" ,ruby-diff-lcs))))) +(define-public ruby-rspec-rerun + (package + (name "ruby-rspec-rerun") + (version "1.1.0") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "rspec-rerun" version)) + (sha256 + (base32 + "1gy7znkcaqhpccfnk2nvaqbsvgxy3q57cmjwkl9fi1zabaq5lbkj")))) + (build-system ruby-build-system) + (arguments + '(;; No included tests + #:tests? #f)) + (propagated-inputs `(("ruby-rspec" ,ruby-rspec))) + (synopsis "Track failed RSpec tests to re-run them") + (description + "This package provides an automated way to track, and then re-run failed +RSpec tests.") + (home-page "https://github.com/dblock/rspec-rerun") + (license license:expat))) + (define-public ruby-rspec (package (name "ruby-rspec") -- cgit v1.2.3 From c41fba01d3abfc1ef18dafea76f22aa05147089f Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Mon, 28 Jan 2019 15:39:03 +0000 Subject: gnu: ruby-parallel: Begin to enable tests and update version. * gnu/packages/ruby.scm (ruby-parallel): Update to 1.13.0. [source]: Switch to the Git repository. [arguments]: Change the #:test-target, and modify some phases. [native-inputs]: Add packages required for running the tests. --- gnu/packages/ruby.scm | 62 ++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 54 insertions(+), 8 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index b06cdcc023..e491fe473a 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -36,11 +36,14 @@ #:use-module (gnu packages compression) #:use-module (gnu packages databases) #:use-module (gnu packages dbm) + #:use-module (gnu packages rails) #:use-module (gnu packages readline) #:use-module (gnu packages autotools) #:use-module (gnu packages java) #:use-module (gnu packages libffi) #:use-module (gnu packages libidn) + #:use-module (gnu packages linux) + #:use-module (gnu packages lsof) #:use-module (gnu packages maths) #:use-module (gnu packages ncurses) #:use-module (gnu packages networking) @@ -6691,15 +6694,58 @@ interface. It allows Jekyll to rebuild your site when a file changes.") (define-public ruby-parallel (package (name "ruby-parallel") - (version "1.12.1") - (source (origin - (method url-fetch) - (uri (rubygems-uri "parallel" version)) - (sha256 - (base32 - "01hj8v1qnyl5ndrs33g8ld8ibk0rbcqdpkpznr04gkbxd11pqn67")))) + (version "1.13.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/grosser/parallel.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1isqzbqxz2ndad4i5z3lb9ldrhaijfncj8bmffv04sq44sv87ikv")))) (build-system ruby-build-system) - (arguments `(#:tests? #f)); No rakefile + (arguments + `(;; TODO 3 test failures + ;; rspec ./spec/parallel_spec.rb:190 # Parallel.in_processes does not + ;; open unnecessary pipes + ;; rspec './spec/parallel_spec.rb[1:9:7]' # Parallel.each works with + ;; SQLite in processes + ;; rspec './spec/parallel_spec.rb[1:9:16]' # Parallel.each works with + ;; SQLite in threads + #:tests? #f + #:test-target "rspec-rerun:spec" + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-Gemfile + (lambda _ + (substitute* "Gemfile" + (("gem 'rspec-legacy_formatters'") "") + (("gem 'activerecord.*$") "gem 'activerecord'\n")))) + (add-before 'check 'delete-Gemfile.lock + (lambda _ + ;; Bundler isn't being used for fetching dependendencies, so + ;; delete the Gemfile.lock + (delete-file "Gemfile.lock") + #t)) + (add-before 'build 'patch-gemspec + (lambda _ + (substitute* "parallel.gemspec" + (("git ls-files") "find")) + #t))))) + (native-inputs + `(("ruby-rspec" ,ruby-rspec) + ("ruby-rspec-rerun" ,ruby-rspec-rerun) + ("bundler" ,bundler) + ("ruby-activerecord" ,ruby-activerecord) + ("ruby-progressbar" ,ruby-progressbar) + ("ruby-bump" ,ruby-bump) + ("procps" ,procps) + ("lsof" ,lsof) + ("ruby-mysql2" ,ruby-mysql2) + ("ruby-sqlite3" ,ruby-sqlite3) + ("ruby-i18n" ,ruby-i18n))) (home-page "https://github.com/grosser/parallel") (synopsis "Parallel processing in Ruby") (description "Parallel allows you to run any code in parallel Processes -- cgit v1.2.3 From 16f423cbd99ba20434e62d678f85edebcf97cf23 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Mon, 28 Jan 2019 15:43:48 +0000 Subject: gnu: Add ruby-prawn-manual-builder. Required for the ruby-prawn-table tests. * gnu/packages/ruby.scm (ruby-prawn-manual-builder): New variable. --- gnu/packages/ruby.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index e491fe473a..aa73fdabd1 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -3101,6 +3101,40 @@ for select languages.") (home-page "https://github.com/whitequark/parser") (license license:expat))) +(define-public ruby-prawn-manual-builder + (package + (name "ruby-prawn-manual-builder") + (version "0.3.0") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "prawn-manual_builder" version)) + (sha256 + (base32 + "0wbjnkqp55p5wmz85ldypcray223glckd209hmdxhnzk8s5pb3za")))) + (build-system ruby-build-system) + (arguments + '(;; No included tests + #:tests? #f + #:phases + (modify-phases %standard-phases + (add-after 'extract-gemspec 'patch-gemspec + (lambda _ + (substitute* ".gemspec" + ;; Loosen the requirement for pdf-inspector + (("~> 1\\.0\\.7") ">= 0"))))))) + (propagated-inputs + `(("ruby-coderay" ,ruby-coderay))) + (synopsis "Tool for writing manuals for Prawn and Prawn accessories") + (description + "This package provides a tool for writing manuals for Prawn and Prawn +accessories") + (home-page "https://github.com/prawnpdf/prawn-manual_builder") + (license (list + ;; GPLv2 or GPLv3 or custom license described in LICENSE file + license:gpl2 + license:gpl3)))) + (define-public ruby-progress_bar (package (name "ruby-progress_bar") -- cgit v1.2.3 From 0927b0394f6fcbdf14f2a98c2d27118197c789a8 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Mon, 28 Jan 2019 15:44:39 +0000 Subject: gnu: ruby-prawn-table: Begin to enable tests. * gnu/packages/ruby.scm (ruby-prawn-table)[propagated-inputs]: Add ruby-pdf-inspector. [native-inputs]: Add packages for tests. [arguments]: Modify the build phases to get closer to enabling the tests. --- gnu/packages/ruby.scm | 35 +++++++++++++++++++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index aa73fdabd1..edd3ce536c 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -6945,9 +6945,40 @@ functionality from Prawn.") (base32 "1nxd6qmxqwl850icp18wjh5k0s3amxcajdrkjyzpfgq0kvilcv9k")))) (build-system ruby-build-system) - (arguments `(#:tests? #f)); No rakefile (propagated-inputs - `(("ruby-prawn" ,ruby-prawn))) + `(("ruby-prawn" ,ruby-prawn) + ("ruby-pdf-inspector" ,ruby-pdf-inspector))) + (native-inputs + `(("bundler" ,bundler) + ("ruby-yard" ,ruby-yard) + ("ruby-mocha" ,ruby-mocha) + ("ruby-coderay" ,ruby-coderay) + ("ruby-prawn-manual-builder" ,ruby-prawn-manual-builder) + ("ruby-simplecov" ,ruby-simplecov) + ("ruby-rspec-2" ,ruby-rspec-2))) + (arguments + '(;; TODO: 1 test fails + ;; Failure/Error: pdf.page_count.should == 1 + ;; expected: 1 + ;; got: 2 (using ==) + ;; # ./spec/table_spec.rb:1308 + ;; + ;; 225 examples, 1 failure + #:tests? #f + #:phases + (modify-phases %standard-phases + (add-before 'check 'patch-gemspec + (lambda _ + (substitute* "prawn-table.gemspec" + ;; Loosen the requirement for pdf-inspector + (("~> 1\\.1\\.0") ">= 0") + ;; Loosen the requirement for pdf-reader + (("~> 1\\.2") ">= 0")))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "rspec")) + #t))))) (home-page "https://github.com/prawnpdf/prawn-table") (synopsis "Tables support for Prawn") (description "This gem provides tables support for Prawn.") -- cgit v1.2.3 From 909eae21f3e90b1001a3fd0f1856e43a128caeaf Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Mon, 28 Jan 2019 15:49:34 +0000 Subject: gnu: Add ruby-faraday. * gnu/packages/ruby.scm (ruby-faraday): New variable. --- gnu/packages/ruby.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index edd3ce536c..d48d93387e 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -7316,3 +7316,26 @@ Pathname.") (description "The Pagination Generator forms the core of the pagination logic in Jekyll. It calculates and generates the pagination pages.") (license license:expat))) + +(define-public ruby-faraday + (package + (name "ruby-faraday") + (version "0.15.4") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "faraday" version)) + (sha256 + (base32 + "0s72m05jvzc1pd6cw1i289chas399q0a14xrwg4rvkdwy7bgzrh0")))) + (build-system ruby-build-system) + (arguments + '(#:tests? #f)) + (propagated-inputs + `(("ruby-multipart-post" ,ruby-multipart-post))) + (synopsis "Ruby HTTP/REST API client library") + (description + "Faraday is a HTTP/REST API client library which provides a common +interface over different adapters.") + (home-page "https://github.com/lostisland/faraday") + (license license:expat))) -- cgit v1.2.3 From 6188d6430d66152c612905ab88f1eec8b29b9891 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Mon, 28 Jan 2019 15:51:08 +0000 Subject: gnu: Add ruby-rr. * gnu/packages/ruby.scm (ruby-rr): New variable. --- gnu/packages/ruby.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index d48d93387e..1b170f2afe 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -4335,6 +4335,30 @@ wrapping them in ANSI escape codes.") (home-page "https://github.com/sickill/rainbow") (license license:expat))) +(define-public ruby-rr + (package + (name "ruby-rr") + (version "1.2.1") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "rr" version)) + (sha256 + (base32 + "1n9g78ba4c2zzmz8cdb97c38h1xm0clircag00vbcxwqs4dq0ymp")))) + (build-system ruby-build-system) + (arguments + '(#:tests? #f)) ; test files not included + (native-inputs + `(("bundler" ,bundler) + ("ruby-rspec" ,ruby-rspec))) + (synopsis "Ruby test double framework") + (description + "RR is a test double framework that features a rich selection of double +techniques and a terse syntax.") + (home-page "https://rr.github.io/rr/") + (license license:expat))) + (define-public ruby-rest-client (package (name "ruby-rest-client") -- cgit v1.2.3 From d7f9f8874856ae55f3c265c993a53ab090d5f317 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Mon, 28 Jan 2019 15:52:38 +0000 Subject: gnu: Add ruby-crass. Required for upgrading ruby-loofah. * gnu/packages/ruby.scm (ruby-crass): New variable. --- gnu/packages/ruby.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 1b170f2afe..7a7f413f8d 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -939,6 +939,24 @@ code in Merb and Rails.") (home-page "https://github.com/jnunemaker/crack") (license license:expat))) +(define-public ruby-crass + (package + (name "ruby-crass") + (version "1.0.4") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "crass" version)) + (sha256 + (base32 + "0bpxzy6gjw9ggjynlxschbfsgmx8lv3zw1azkjvnb8b9i895dqfi")))) + (build-system ruby-build-system) + (synopsis "Pure Ruby CSS parser based on CSS Syntax Level 3") + (description + "Crass is a pure Ruby CSS parser based on the CSS Syntax Level 3 spec.") + (home-page "https://github.com/rgrove/crass/") + (license license:expat))) + (define-public ruby-cliver (package (name "ruby-cliver") -- cgit v1.2.3 From 8d3c5ff68b53ed06c182a17c051abdb6551e8761 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Mon, 28 Jan 2019 15:54:37 +0000 Subject: gnu: Add ruby-loofah. * gnu/packages/ruby.scm (ruby-loofah): New variable. --- gnu/packages/ruby.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 7a7f413f8d..69e61a7f2f 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -3778,6 +3778,44 @@ you about the changes.") (base32 "1l0y7hbyfiwpvk172r28hsdqsifq1ls39hsfmzi1vy4ll0smd14i")))))) +(define-public ruby-loofah + (package + (name "ruby-loofah") + (version "2.2.3") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "loofah" version)) + (sha256 + (base32 + "1ccsid33xjajd0im2xv941aywi58z7ihwkvaf1w2bv89vn5bhsjg")))) + (build-system ruby-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'remove-unnecessary-dependencies + (lambda _ + ;; concourse is a development tool which is unused, so remove it + ;; so it's not required. + (substitute* "Gemfile" + ((".*\"concourse\".*") "\n")) + (substitute* "Rakefile" + (("require 'concourse'") "") + (("Concourse\\.new.*") "\n")) + #t))))) + (native-inputs + `(("ruby-hoe" ,ruby-hoe) + ("ruby-rr" ,ruby-rr))) + (propagated-inputs + `(("ruby-nokogiri" ,ruby-nokogiri) + ("ruby-crass" ,ruby-crass))) + (synopsis "Ruby library for manipulating and transforming HTML/XML") + (description + "Loofah is a general library for manipulating and transforming HTML/XML +documents and fragments. It's built on top of Nokogiri and libxml2.") + (home-page "https://github.com/flavorjones/loofah") + (license license:expat))) + (define-public ruby-activesupport (package (name "ruby-activesupport") -- cgit v1.2.3 From ab654da5438dea1252b0bdf0cdff36d8d695f978 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Mon, 28 Jan 2019 15:57:33 +0000 Subject: gnu: Add ruby-rails-html-sanitizer. * gnu/packages/rails.scm (ruby-rails-html-sanitizer): New variable. --- gnu/packages/rails.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/rails.scm b/gnu/packages/rails.scm index a9dae594a5..c0c6e5ae2f 100644 --- a/gnu/packages/rails.scm +++ b/gnu/packages/rails.scm @@ -144,3 +144,28 @@ serialization, internationalization, and testing.") an almost zero-configuration persistence layer for applications.") (home-page "https://rubyonrails.org") (license license:expat))) + +(define-public ruby-rails-html-sanitizer + (package + (name "ruby-rails-html-sanitizer") + (version "1.0.4") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "rails-html-sanitizer" version)) + (sha256 + (base32 + "1gv7vr5d9g2xmgpjfq4nxsqr70r9pr042r9ycqqnfvw5cz9c7jwr")))) + (build-system ruby-build-system) + (arguments + '(;; No included tests + #:tests? #f)) + (propagated-inputs + `(("ruby-loofah" ,ruby-loofah))) + (synopsis "HTML sanitization for Rails applications") + (description + "This gem is used to handle HTML sanitization in Rails applications. If +you need similar functionality in non Rails apps consider using Loofah +directly.") + (home-page "https://github.com/rails/rails-html-sanitizer") + (license license:expat))) -- cgit v1.2.3 From 24412de48d06ab6ae6122082601e95d9f8bd9f5e Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Mon, 28 Jan 2019 16:00:13 +0000 Subject: gnu: Add ruby-rails-dom-testing. * gnu/packages/rails.scm (ruby-rails-dom-testing): New variable. --- gnu/packages/rails.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/rails.scm b/gnu/packages/rails.scm index c0c6e5ae2f..7e0e3ddf73 100644 --- a/gnu/packages/rails.scm +++ b/gnu/packages/rails.scm @@ -20,6 +20,7 @@ (define-module (gnu packages rails) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix download) + #:use-module (guix git-download) #:use-module (guix packages) #:use-module (gnu packages ruby) #:use-module (guix build-system ruby)) @@ -169,3 +170,30 @@ you need similar functionality in non Rails apps consider using Loofah directly.") (home-page "https://github.com/rails/rails-html-sanitizer") (license license:expat))) + +(define-public ruby-rails-dom-testing + (package + (name "ruby-rails-dom-testing") + (version "2.0.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/rails/rails-dom-testing.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0zrg6x1w3wjgklbhcphjmggl11jx5s8cl21qjqij7wknm412i5wl")))) + (build-system ruby-build-system) + (native-inputs + `(("bundler" ,bundler))) + (propagated-inputs + `(("ruby-activesupport" ,ruby-activesupport) + ("ruby-nokogiri" ,ruby-nokogiri))) + (synopsis "Compare HTML DOMs and assert certain elements exists") + (description + "This gem can compare HTML and assert certain elements exists. This is +useful when writing tests.") + (home-page "https://github.com/rails/rails-dom-testing") + (license license:expat))) -- cgit v1.2.3 From d15dbe83f573d042c16a811ddaaee93eb13478c3 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Mon, 28 Jan 2019 16:01:24 +0000 Subject: gnu: Add ruby-erubi. Required for ruby-actionview. * gnu/packages/ruby.scm (ruby-erubi): New variable. --- gnu/packages/ruby.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 69e61a7f2f..82750bedc5 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -1124,6 +1124,25 @@ functions.") (home-page "https://github.com/ahoward/options") (license license:ruby))) +(define-public ruby-erubi + (package + (name "ruby-erubi") + (version "1.8.0") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "erubi" version)) + (sha256 + (base32 + "1kagnf6ziahj0d781s6ryy6fwqwa3ad4xbzzj84p9m4nv4c2jir1")))) + (build-system ruby-build-system) + (synopsis "ERB template engine for Ruby") + (description + "Erubi is a ERB template engine for Ruby. It is a simplified fork of +Erubis") + (home-page "https://github.com/jeremyevans/erubi") + (license license:expat))) + (define-public ruby-erubis (package (name "ruby-erubis") -- cgit v1.2.3 From 1c48c539ee56ed98722e5c5e62a3738db554dfcc Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Mon, 28 Jan 2019 16:02:31 +0000 Subject: gnu: Add ruby-actionview. * gnu/packages/rails.scm (ruby-actionview): New variable. --- gnu/packages/rails.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/rails.scm b/gnu/packages/rails.scm index 7e0e3ddf73..bb89a8ddec 100644 --- a/gnu/packages/rails.scm +++ b/gnu/packages/rails.scm @@ -197,3 +197,31 @@ directly.") useful when writing tests.") (home-page "https://github.com/rails/rails-dom-testing") (license license:expat))) + +(define-public ruby-actionview + (package + (name "ruby-actionview") + (version "5.2.2") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "actionview" version)) + (sha256 + (base32 + "1lz04drbi1z0xhvb8jnr14pbf505lilr02arahxq7y3mxiz0rs8z")))) + (build-system ruby-build-system) + (arguments + '(;; No included tests + #:tests? #f)) + (propagated-inputs + `(("ruby-activesupport" ,ruby-activesupport) + ("ruby-builder" ,ruby-builder) + ("ruby-erubi" ,ruby-erubi) + ("ruby-rails-dom-testing" ,ruby-rails-dom-testing) + ("ruby-rails-html-sanitizer" ,ruby-rails-html-sanitizer))) + (synopsis "Conventions and helpers for building web pages") + (description + "ActionView provides conventions and helpers for building web pages in +Ruby.") + (home-page "https://rubyonrails.org/") + (license license:expat))) -- cgit v1.2.3 From 7b062e98b855f2cc0e5c06eedbb080f06ccceb50 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Mon, 28 Jan 2019 16:04:16 +0000 Subject: gnu: Add ruby-actionpack. * gnu/packages/rails.scm (ruby-actionpack): New variable. --- gnu/packages/rails.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/rails.scm b/gnu/packages/rails.scm index bb89a8ddec..ac36cda8bb 100644 --- a/gnu/packages/rails.scm +++ b/gnu/packages/rails.scm @@ -225,3 +225,32 @@ useful when writing tests.") Ruby.") (home-page "https://rubyonrails.org/") (license license:expat))) + +(define-public ruby-actionpack + (package + (name "ruby-actionpack") + (version "5.2.2") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "actionpack" version)) + (sha256 + (base32 + "0iwhbqqn0cm39dq040iwq8cfyclqk3kyzwlp5k3j5cz8k2668wws")))) + (build-system ruby-build-system) + (arguments + '(;; No included tests + #:tests? #f)) + (propagated-inputs + `(("ruby-actionview" ,ruby-actionview) + ("ruby-activesupport" ,ruby-activesupport) + ("ruby-rack" ,ruby-rack) + ("ruby-rack-test" ,ruby-rack-test) + ("ruby-rails-dom-testing" ,ruby-rails-dom-testing) + ("ruby-rails-html-sanitizer" ,ruby-rails-html-sanitizer))) + (synopsis "Conventions for building and testing MVC web applications") + (description + "ActionPack provides conventions for building and testing MVC web +applications. These work with any Rack-compatible server.") + (home-page "https://rubyonrails.org/") + (license license:expat))) -- cgit v1.2.3 From 52b015a93c0e312333fe8c5000a3f8c199118dd1 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Mon, 28 Jan 2019 16:06:30 +0000 Subject: gnu: Add ruby-websocket-extensions. * gnu/packages/ruby.scm (ruby-websocket-extensions): New variable. --- gnu/packages/ruby.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 82750bedc5..0634c6ddf6 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5512,6 +5512,28 @@ checking for the right Ruby version in software.") (home-page "https://github.com/janlelis/ruby_version") (license license:expat))) +(define-public ruby-websocket-extensions + (package + (name "ruby-websocket-extensions") + (version "0.1.3") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "websocket-extensions" version)) + (sha256 + (base32 + "034sdr7fd34yag5l6y156rkbhiqgmy395m231dwhlpcswhs6d270")))) + (build-system ruby-build-system) + (arguments + '(;; No included tests + #:tests? #f)) + (synopsis "Generic extension manager for WebSocket connections") + (description + "@code{websocket-extensions} provides a container for registering +extension plugins.") + (home-page "https://github.com/faye/websocket-extensions-ruby") + (license license:expat))) + (define-public ruby-domain-name (package (name "ruby-domain-name") -- cgit v1.2.3 From a229acffb7a68da87a8a4bb1cfc53328ce3187a2 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Mon, 28 Jan 2019 16:08:07 +0000 Subject: gnu: Add ruby-websocket-driver. * gnu/packages/ruby.scm (ruby-websocket-driver): New variable. --- gnu/packages/ruby.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 0634c6ddf6..e9c0187639 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5512,6 +5512,30 @@ checking for the right Ruby version in software.") (home-page "https://github.com/janlelis/ruby_version") (license license:expat))) +(define-public ruby-websocket-driver + (package + (name "ruby-websocket-driver") + (version "0.7.0") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "websocket-driver" version)) + (sha256 + (base32 + "1551k3fs3kkb3ghqfj3n5lps0ikb9pyrdnzmvgfdxy8574n4g1dn")))) + (build-system ruby-build-system) + (arguments + '(;; No included tests + #:tests? #f)) + (propagated-inputs + `(("ruby-websocket-extensions" ,ruby-websocket-extensions))) + (synopsis "WebSocket protocol handler with pluggable I/O") + (description + "@code{websocket-driver} provides a complete implementation of the +WebSocket protocols that can be hooked up to any TCP library") + (home-page "https://github.com/faye/websocket-driver-ruby") + (license license:expat))) + (define-public ruby-websocket-extensions (package (name "ruby-websocket-extensions") -- cgit v1.2.3 From a058cbfd570a1a41bae0a50c2bf1d414512bd9e4 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Mon, 28 Jan 2019 16:13:55 +0000 Subject: gnu: Add ruby-nio4r. Required for ruby-actioncable. * gnu/packages/ruby.scm (ruby-nio4r): New variable. --- gnu/packages/ruby.scm | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index e9c0187639..1071460efc 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -7484,3 +7484,52 @@ logic in Jekyll. It calculates and generates the pagination pages.") interface over different adapters.") (home-page "https://github.com/lostisland/faraday") (license license:expat))) + +(define-public ruby-nio4r + (package + (name "ruby-nio4r") + (version "2.3.1") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "nio4r" version)) + (sha256 + (base32 + "1a41ca1kpdmrypjp9xbgvckpy8g26zxphkja9vk7j5wl4n8yvlyr")))) + (build-system ruby-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'remove-unnecessary-dependencies + (lambda _ + (substitute* "spec/spec_helper.rb" + ;; Coveralls is for uploading test coverage information to an + ;; online service, and thus unnecessary for building the Guix + ;; package + (("require \"coveralls\"") "") + (("Coveralls\\.wear!") "") + ;; Remove rspec/retry as we are not retrying the tests + (("require \"rspec/retry\"") "") + (("config\\.display_try_failure_messages = true") "") + (("config\\.verbose_retry = true") "")) + #t)) + (add-before 'check 'compile + (lambda _ + (invoke "rake" "compile") + #t)) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "rspec")) + #t))))) + (native-inputs + `(("bundler" ,bundler) + ("ruby-rake-compiler" ,ruby-rake-compiler) + ("ruby-rspec" ,ruby-rspec) + ("ruby-rubocop" ,ruby-rubocop))) + (synopsis "New I/O for Ruby") + (description + "@code{nio} provides cross-platform asynchronous I/O primitives in Ruby +for scalable network clients and servers.") + (home-page "https://github.com/socketry/nio4r") + (license license:expat))) -- cgit v1.2.3 From 937c8862f493aea2ae167851ecc22b03fd0d1d04 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Mon, 28 Jan 2019 16:16:27 +0000 Subject: gnu: Add ruby-actioncable. * gnu/packages/rails.scm (ruby-actioncable): New variable. --- gnu/packages/rails.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/rails.scm b/gnu/packages/rails.scm index ac36cda8bb..e793a2e8e2 100644 --- a/gnu/packages/rails.scm +++ b/gnu/packages/rails.scm @@ -254,3 +254,29 @@ Ruby.") applications. These work with any Rack-compatible server.") (home-page "https://rubyonrails.org/") (license license:expat))) + +(define-public ruby-actioncable + (package + (name "ruby-actioncable") + (version "5.2.2") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "actioncable" version)) + (sha256 + (base32 + "0826k5ch0l03f9yrkxy69aiv039z4qi00lnahw2rzywd2iz6r68x")))) + (build-system ruby-build-system) + (arguments + '(;; No included tests + #:tests? #f)) + (propagated-inputs + `(("ruby-actionpack" ,ruby-actionpack) + ("ruby-nio4r" ,ruby-nio4r) + ("ruby-websocket-driver" ,ruby-websocket-driver))) + (synopsis "Integrate integrates WebSockets with Rails applications") + (description + "Action Cable integrates WebSockets with Rails applications. Through +WebSockets it allows for real-time features in web applications.") + (home-page "https://rubyonrails.org/") + (license license:expat))) -- cgit v1.2.3 From f9da1ada2308718a64deb44f0ebda0cbe2a31fa5 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Mon, 28 Jan 2019 16:23:09 +0000 Subject: gnu: Add ruby-globalid. Required for ruby-activejob. * gnu/packages/ruby.scm (ruby-globalid): New variable. --- gnu/packages/ruby.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 1071460efc..38d462eeda 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -7533,3 +7533,27 @@ interface over different adapters.") for scalable network clients and servers.") (home-page "https://github.com/socketry/nio4r") (license license:expat))) + +(define-public ruby-globalid + (package + (name "ruby-globalid") + (version "0.4.2") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "globalid" version)) + (sha256 + (base32 + "1zkxndvck72bfw235bd9nl2ii0lvs5z88q14706cmn702ww2mxv1")))) + (build-system ruby-build-system) + (arguments + '(;; No included tests + #:tests? #f)) + (propagated-inputs + `(("ruby-activesupport" ,ruby-activesupport))) + (synopsis "Generate URIs idenfitying model instances in Ruby") + (description + "@code{GlobalID} provides a way to generate URIs from a model in Ruby that +uniquely identify it.") + (home-page "https://rubyonrails.org/") + (license license:expat))) -- cgit v1.2.3 From ca09c4b5f25b47cc9aa9159e83dd37b75a2f7cff Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Mon, 28 Jan 2019 16:25:11 +0000 Subject: gnu: Add ruby-activejob. * gnu/packages/rails.scm (ruby-activejob): New variable. --- gnu/packages/rails.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/rails.scm b/gnu/packages/rails.scm index e793a2e8e2..625d19a570 100644 --- a/gnu/packages/rails.scm +++ b/gnu/packages/rails.scm @@ -280,3 +280,28 @@ applications. These work with any Rack-compatible server.") WebSockets it allows for real-time features in web applications.") (home-page "https://rubyonrails.org/") (license license:expat))) + +(define-public ruby-activejob + (package + (name "ruby-activejob") + (version "5.2.2") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "activejob" version)) + (sha256 + (base32 + "1jjkl62x2aprg55x9rpm0h2c82vr2qr989hg3l9r21l01q4822ir")))) + (build-system ruby-build-system) + (arguments + '(;; No included tests + #:tests? #f)) + (propagated-inputs + `(("ruby-activesupport" ,ruby-activesupport) + ("ruby-globalid" ,ruby-globalid))) + (synopsis "Declare job classes for multiple backends") + (description + "ActiveJob allows declaring job classes in a common way across Rails +applications.") + (home-page "https://rubyonrails.org/") + (license license:expat))) -- cgit v1.2.3 From 0fc308997f24c65a64b0fb84b034a067ef752f17 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Mon, 28 Jan 2019 16:28:02 +0000 Subject: gnu: Add ruby-actionmailer. * gnu/packages/rails.scm (ruby-actionmailer): New variable. --- gnu/packages/rails.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/rails.scm b/gnu/packages/rails.scm index 625d19a570..bf972512f4 100644 --- a/gnu/packages/rails.scm +++ b/gnu/packages/rails.scm @@ -305,3 +305,31 @@ WebSockets it allows for real-time features in web applications.") applications.") (home-page "https://rubyonrails.org/") (license license:expat))) + +(define-public ruby-actionmailer + (package + (name "ruby-actionmailer") + (version "5.2.2") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "actionmailer" version)) + (sha256 + (base32 + "0sfpb8s95cmkpp9ybyp2c88r55r5llscmmnkfwcwgasz9ncjiq5n")))) + (build-system ruby-build-system) + (arguments + '(;; No included tests + #:tests? #f)) + (propagated-inputs + `(("ruby-actionpack" ,ruby-actionpack) + ("ruby-actionview" ,ruby-actionview) + ("ruby-activejob" ,ruby-activejob) + ("ruby-mail" ,ruby-mail) + ("ruby-rails-dom-testing" ,ruby-rails-dom-testing))) + (synopsis "Work with emails using the controller/view pattern") + (description + "Compose, deliver, receive, and test emails using the controller/view +pattern. Including support for multipart email and attachments.") + (home-page "https://rubyonrails.org/") + (license license:expat))) -- cgit v1.2.3 From c8f079ca16f2c632d1e35a260957b50c9242dfd3 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Mon, 28 Jan 2019 16:33:40 +0000 Subject: gnu: Add ruby-railties. * gnu/packages/rails.scm (ruby-railties): New variable. --- gnu/packages/rails.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/rails.scm b/gnu/packages/rails.scm index bf972512f4..e5f19a4742 100644 --- a/gnu/packages/rails.scm +++ b/gnu/packages/rails.scm @@ -333,3 +333,30 @@ applications.") pattern. Including support for multipart email and attachments.") (home-page "https://rubyonrails.org/") (license license:expat))) + +(define-public ruby-railties + (package + (name "ruby-railties") + (version "5.2.2") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "railties" version)) + (sha256 + (base32 + "00pnylmbz4c46mxw5lhxi8h39lndfg6fs1hpd0qd6swnjhkqsr1l")))) + (build-system ruby-build-system) + (arguments + '(;; No included tests + #:tests? #f)) + (propagated-inputs + `(("ruby-actionpack" ,ruby-actionpack) + ("ruby-activesupport" ,ruby-activesupport) + ("ruby-method-source" ,ruby-method-source) + ("ruby-thor" ,ruby-thor))) + (synopsis "Rails internals, including application bootup and generators") + (description + "@code{railties} provides the core Rails internals including handling +application bootup, plugins, generators, and Rake tasks.") + (home-page "https://rubyonrails.org/") + (license license:expat))) -- cgit v1.2.3 From 15606d989669fda245c622a71254e3b09b07b5ac Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Mon, 28 Jan 2019 16:34:56 +0000 Subject: gnu: Add ruby-sprockets. * gnu/packages/ruby.scm (ruby-sprockets): New variable. --- gnu/packages/ruby.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 38d462eeda..4e993be8e6 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -7557,3 +7557,28 @@ for scalable network clients and servers.") uniquely identify it.") (home-page "https://rubyonrails.org/") (license license:expat))) + +(define-public ruby-sprockets + (package + (name "ruby-sprockets") + (version "3.7.2") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "sprockets" version)) + (sha256 + (base32 + "182jw5a0fbqah5w9jancvfmjbk88h8bxdbwnl4d3q809rpxdg8ay")))) + (build-system ruby-build-system) + (arguments + '(;; No included tests + #:tests? #f)) + (propagated-inputs + `(("ruby-concurrent" ,ruby-concurrent) + ("ruby-rack" ,ruby-rack))) + (synopsis "Sprockets is a Rack-based asset packaging system") + (description + "Sprockets is a Rack-based asset packaging system that concatenates and +serves JavaScript, CoffeeScript, CSS, LESS, Sass, and SCSS.") + (home-page "https://github.com/rails/sprockets") + (license license:expat))) -- cgit v1.2.3 From 80c4bfa6402a1d1a080167701df4189266fb857a Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Mon, 28 Jan 2019 16:36:46 +0000 Subject: gnu: Add ruby-sprockets-rails. * gnu/packages/rails.scm (ruby-sprockets-rails): New variable. --- gnu/packages/rails.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/rails.scm b/gnu/packages/rails.scm index e5f19a4742..6bcfe2667d 100644 --- a/gnu/packages/rails.scm +++ b/gnu/packages/rails.scm @@ -360,3 +360,29 @@ pattern. Including support for multipart email and attachments.") application bootup, plugins, generators, and Rake tasks.") (home-page "https://rubyonrails.org/") (license license:expat))) + +(define-public ruby-sprockets-rails + (package + (name "ruby-sprockets-rails") + (version "3.2.1") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "sprockets-rails" version)) + (sha256 + (base32 + "0ab42pm8p5zxpv3sfraq45b9lj39cz9mrpdirm30vywzrwwkm5p1")))) + (build-system ruby-build-system) + (arguments + '(;; No included tests + #:tests? #f)) + (propagated-inputs + `(("ruby-actionpack" ,ruby-actionpack) + ("ruby-activesupport" ,ruby-activesupport) + ("ruby-sprockets" ,ruby-sprockets))) + (synopsis "Sprockets Rails integration") + (description + "Provides Sprockets implementation for the Rails Asset Pipeline.") + (home-page + "https://github.com/rails/sprockets-rails") + (license license:expat))) -- cgit v1.2.3 From 554bf4f6062713901af01878bce23530fdebed17 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Mon, 28 Jan 2019 16:38:34 +0000 Subject: gnu: Add ruby-marcel. Required for ruby-activestorage. * gnu/packages/ruby.scm (ruby-marcel): New variable. --- gnu/packages/ruby.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 4e993be8e6..5ab7f958b0 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -2960,6 +2960,30 @@ Ruby. It simplifies the generation of complex SQL queries and adapts to various relational database implementations.") (license license:expat))) +(define-public ruby-marcel + (package + (name "ruby-marcel") + (version "0.3.3") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "marcel" version)) + (sha256 + (base32 + "1nxbjmcyg8vlw6zwagf17l9y2mwkagmmkg95xybpn4bmf3rfnksx")))) + (build-system ruby-build-system) + (arguments + '(;; No included tests + #:tests? #f)) + (propagated-inputs + `(("ruby-mimemagic" ,ruby-mimemagic))) + (synopsis "MIME type detection using magic numbers, filenames and extensions") + (description + "@code{marcel} provides @acronym{MIME, Multipurpose Internet Mail +Extensions} type detection using magic numbers, filenames, and extensions") + (home-page "https://github.com/basecamp/marcel") + (license license:expat))) + (define-public ruby-minitar ;; We package from the GitHub source to fix the security issue reported at ;; https://github.com/halostatue/minitar/issues/16. -- cgit v1.2.3 From 078849455edf086cc5f17aca1d5fc9a5aeb5dce5 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Mon, 28 Jan 2019 16:40:46 +0000 Subject: gnu: Add ruby-activestorage. * gnu/packages/rails.scm (ruby-activestorage): New variable. --- gnu/packages/rails.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/rails.scm b/gnu/packages/rails.scm index 6bcfe2667d..a45dca65d1 100644 --- a/gnu/packages/rails.scm +++ b/gnu/packages/rails.scm @@ -306,6 +306,32 @@ applications.") (home-page "https://rubyonrails.org/") (license license:expat))) +(define-public ruby-activestorage + (package + (name "ruby-activestorage") + (version "5.2.2") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "activestorage" version)) + (sha256 + (base32 + "0c72837098sw384vk6dmrb2p7q3wx4swnibk6sw9dp4hn1vc4p31")))) + (build-system ruby-build-system) + (arguments + '(;; No included tests + #:tests? #f)) + (propagated-inputs + `(("ruby-actionpack" ,ruby-actionpack) + ("ruby-activerecord" ,ruby-activerecord) + ("ruby-marcel" ,ruby-marcel))) + (synopsis "Integrate file storage services in to Rails applications") + (description + "ActiveStorage integrates file storage services with Rails applications, +allowing files to be attached to ActiveRecord models..") + (home-page "https://rubyonrails.org/") + (license license:expat))) + (define-public ruby-actionmailer (package (name "ruby-actionmailer") -- cgit v1.2.3 From a3dbfbbd0444f7eef23494c1110eecb5784a53b4 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Mon, 28 Jan 2019 16:41:37 +0000 Subject: gnu: Add ruby-rails. * gnu/packages/rails.scm (ruby-rails): New variable. --- gnu/packages/rails.scm | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/rails.scm b/gnu/packages/rails.scm index a45dca65d1..2d7ccceff7 100644 --- a/gnu/packages/rails.scm +++ b/gnu/packages/rails.scm @@ -412,3 +412,56 @@ application bootup, plugins, generators, and Rake tasks.") (home-page "https://github.com/rails/sprockets-rails") (license license:expat))) + +(define-public ruby-rails + (package + (name "ruby-rails") + (version "5.2.2") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "rails" version)) + (sha256 + (base32 + "1m9cszds68dsiycciiayd3c9g90s2yzn1izkr3gpgqkfw6dmvzyr")))) + (build-system ruby-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + ;; This gem acts as glue between the gems that actually make up + ;; Rails. The important thing to check is that the gemspec matches up + ;; with the Guix packages and Rubygems can successfully activate the + ;; Rails gem. + ;; + ;; The following check phase tests this. + (delete 'check) + (add-after 'install 'check + (lambda* (#:key tests? outputs #:allow-other-keys) + (setenv "GEM_PATH" + (string-append + (getenv "GEM_PATH") + ":" + (assoc-ref outputs "out") "/lib/ruby/vendor_ruby")) + (when tests? + (invoke "ruby" "-e" "gem 'rails'")) + #t))))) + (propagated-inputs + `(("ruby-activesupport" ,ruby-activesupport) + ("ruby-actionpack" ,ruby-actionpack) + ("ruby-actionview" ,ruby-actionview) + ("ruby-activemodel" ,ruby-activemodel) + ("ruby-activerecord" ,ruby-activerecord) + ("ruby-actionmailer" ,ruby-actionmailer) + ("ruby-activejob" ,ruby-activejob) + ("ruby-actioncable" ,ruby-actioncable) + ("ruby-activestorage" ,ruby-activestorage) + ("ruby-railties" ,ruby-railties) + ("bundler" ,bundler) + ("ruby-sprockets-rails" ,ruby-sprockets-rails))) + (synopsis "Full-stack web framework optimized for programmer happiness") + (description + "Ruby on Rails is a full-stack web framework optimized for programmer +happiness and sustainable productivity. It encourages beautiful code by +favoring convention over configuration.") + (home-page "https://rubyonrails.org/") + (license license:expat))) -- cgit v1.2.3 From ebd2ae1858427d82a3f0ac90ad4c9951455757e4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 14 Feb 2019 23:28:40 +0100 Subject: gnu: i3-wm: Remove obsolete code. * gnu/packages/wm.scm (i3-wm)[arguments]: Remove #:make-flags. Update reason for disabled #:tests?. --- gnu/packages/wm.scm | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index f1f3c25391..c577c4021c 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -15,7 +15,7 @@ ;;; Copyright © 2017 Mekeor Melire ;;; Copyright © 2017 Marius Bakke ;;; Copyright © 2017 Oleg Pykhalov -;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 Pierre-Antoine Rouby ;;; Copyright © 2018 Meiyo Peng ;;; @@ -190,17 +190,12 @@ commands would.") "0xl56y196vxv001gvx35xwfr25zah8m3xwizp9ycdgdc0rfc4rdb")))) (build-system gnu-build-system) (arguments - `(#:make-flags - (list "CC=gcc" - (string-append "PREFIX=" %output) - ;; This works around the following error: - ;; 'error: ‘for’ loop initial declarations are only allowed in C99 - ;; or C11 mode' - "CFLAGS=-std=c11") + `(#:configure-flags ;; The build system tries to build in a separate directory, but that ;; seems to be unnecessary. - #:configure-flags '("--disable-builddir") - ;; The test suite appears to require the unpackaged Perl module AnyEvent. + (list "--disable-builddir") + + ;; The test suite requires the unpackaged Xephyr X server. #:tests? #f)) (inputs `(("libxcb" ,libxcb) -- cgit v1.2.3 From ad237c8bb8f054cc5fe6a0060e13d7384ca8d73f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 14 Feb 2019 23:38:10 +0100 Subject: gnu: sdl2-image: Update to 2.0.4. * gnu/packages/sdl.scm (sdl2-image): Update to 2.0.4. --- gnu/packages/sdl.scm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index ee143497e5..feb6879c2b 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2015 Alex Kost ;;; Copyright © 2016, 2017 Efraim Flashner ;;; Copyright © 2017, 2018 Rutger Helling -;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 Ricardo Wurmus ;;; ;;; This file is part of GNU Guix. @@ -351,15 +351,15 @@ directory.") (define-public sdl2-image (package (inherit sdl-image) (name "sdl2-image") - (version "2.0.3") - (source (origin - (method url-fetch) - (uri - (string-append "https://www.libsdl.org/projects/SDL_image/release/SDL2_image-" - version ".tar.gz")) - (sha256 - (base32 - "0s13dmakn21q6yw8avl67d4zkxzl1wap6l5nwf6cvzrmlxfw441m")))) + (version "2.0.4") + (source + (origin + (method url-fetch) + (uri + (string-append "https://www.libsdl.org/projects/SDL_image/release/" + "SDL2_image-" version ".tar.gz")) + (sha256 + (base32 "1b6f7002bm007y3zpyxb5r6ag0lml51jyvx1pwpj9sq24jfc8kp7")))) (propagated-inputs (propagated-inputs-with-sdl2 sdl-image)))) -- cgit v1.2.3 From 863ab122fcbd16b994b35c71d2e124c0f3aeb915 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 14 Feb 2019 23:38:26 +0100 Subject: gnu: sdl2-mixer: Update to 2.0.4. * gnu/packages/sdl.scm (sdl2-mixer): Update to 2.0.4. --- gnu/packages/sdl.scm | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index feb6879c2b..a1522792a7 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -366,20 +366,20 @@ directory.") (define-public sdl2-mixer (package (inherit sdl-mixer) (name "sdl2-mixer") - (version "2.0.2") - (source (origin - (method url-fetch) - (uri - (string-append "http://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-" - version ".tar.gz")) - (modules '((guix build utils))) - (snippet '(begin - ;; Remove bundled libraries. - (delete-file-recursively "external") - #t)) - (sha256 - (base32 - "1fw3kkqi5346ai5if4pxrcbhs5c4vv3a4smgz6fl6kyaxwkmwqaf")))) + (version "2.0.4") + (source + (origin + (method url-fetch) + (uri + (string-append "http://www.libsdl.org/projects/SDL_mixer/release/" + "SDL2_mixer-" version ".tar.gz")) + (modules '((guix build utils))) + (snippet '(begin + ;; Remove bundled libraries. + (delete-file-recursively "external") + #t)) + (sha256 + (base32 "0694vsz5bjkcdgfdra6x9fq8vpzrl8m6q96gh58df7065hw5mkxl")))) (propagated-inputs (propagated-inputs-with-sdl2 sdl-mixer)))) -- cgit v1.2.3 From f8be928760b390409293b49d276c0de95730f17c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 Feb 2019 02:22:45 +0100 Subject: gnu: libxls: Expand synopsis & description. * gnu/packages/xml.scm (libxls)[synopsis, description]: Expand. --- gnu/packages/xml.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 51f3871218..30b5a25661 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -1280,10 +1280,12 @@ files. It is designed to be fast and to handle large input files.") ("automake" ,automake) ("libtool" ,libtool))) (home-page "http://libxls.sourceforge.net/") - (synopsis "Read Excel files") + (synopsis "Read binary (.xls) Excel spreadsheet files") (description - "libxls is a C library which can read Excel (xls) files since Excel 97 (the BIFF8 format). -libxls cannot write Excel files.") + "libxls is a C library to read .xls spreadsheet files in the binary OLE +BIFF8 format as created by Excel 97 and later versions. It cannot write them. + +This package also provides @command{xls2csv} to export Excel files to CSV.") (license license:bsd-2))) (define-public freexl -- cgit v1.2.3 From 9b069c15e07145b9c23f1f8e56b3f107ee579c53 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 Feb 2019 02:25:45 +0100 Subject: gnu: libxls: Update to 1.5.0 [security fixes]. * gnu/packages/xml.scm (libxls): Update to 1.5.0. [source, home-page]: Update home page. [arguments, native-inputs]: Remove all of them. --- gnu/packages/xml.scm | 31 +++++++++---------------------- 1 file changed, 9 insertions(+), 22 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 30b5a25661..9803193bf9 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -1257,29 +1257,16 @@ files. It is designed to be fast and to handle large input files.") (define-public libxls (package (name "libxls") - (version "1.4.0") - (source (origin - (method url-fetch) - (uri (string-append "https://sourceforge.net/projects/" - name "/files/" name "-" - version ".zip")) - (sha256 - (base32 - "1g8ds7wbhsa4hdcn77xc2c0l3vvz5bx2hx9ng9c9n7aii92ymfnk")))) + (version "1.5.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/libxls/libxls/releases/download/" + "v" version "/libxls-" version ".tar.gz")) + (sha256 + (base32 "00j2lrcvvhclmh3z9vy7myqq1br1jnnqkz2wzgk4a1gbg8c5afn5")))) (build-system gnu-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - ;; Bootstrapping is required in order to fix the test driver script. - (replace 'bootstrap - (lambda _ - (invoke "bash" "bootstrap")))))) - (native-inputs - `(("unzip" ,unzip) - ("autoconf" ,autoconf) - ("automake" ,automake) - ("libtool" ,libtool))) - (home-page "http://libxls.sourceforge.net/") + (home-page "https://github.com/libxls/libxls") (synopsis "Read binary (.xls) Excel spreadsheet files") (description "libxls is a C library to read .xls spreadsheet files in the binary OLE -- cgit v1.2.3 From cd4b2e78c59223ddcd0fd8c561b4ff42f87570dc Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 Feb 2019 02:32:22 +0100 Subject: gnu: libxls: Move to (gnu packages statistics). MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It has nothing to do with XML. * gnu/packages/xml.scm (libxls): Move from here… * gnu/packages/statistics.scm (libxls): …to here. --- gnu/packages/statistics.scm | 23 ++++++++++++++++++++++- gnu/packages/xml.scm | 21 --------------------- 2 files changed, 22 insertions(+), 22 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 04b49def54..e1f48db22d 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2016 Ben Woodcroft ;;; Copyright © 2016, 2017 Raoul Bonnal ;;; Copyright © 2017 Kyle Meyer -;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2017 Alex Kost ;;; Copyright © 2018 Alex Branham ;;; @@ -150,6 +150,27 @@ simulation not wholly unlike BUGS. JAGS was written with three aims in mind: @end enumerate\n") (license license:gpl2))) +(define-public libxls + (package + (name "libxls") + (version "1.5.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/libxls/libxls/releases/download/" + "v" version "/libxls-" version ".tar.gz")) + (sha256 + (base32 "00j2lrcvvhclmh3z9vy7myqq1br1jnnqkz2wzgk4a1gbg8c5afn5")))) + (build-system gnu-build-system) + (home-page "https://github.com/libxls/libxls") + (synopsis "Read binary (.xls) Excel spreadsheet files") + (description + "libxls is a C library to read .xls spreadsheet files in the binary OLE +BIFF8 format as created by Excel 97 and later versions. It cannot write them. + +This package also provides @command{xls2csv} to export Excel files to CSV.") + (license license:bsd-2))) + ;; Update this package together with the set of recommended packages: r-boot, ;; r-class, r-cluster, r-codetools, r-foreign, r-kernsmooth, r-lattice, ;; r-mass, r-matrix, r-mgcv, r-nlme, r-nnet, r-rpart, r-spatial, r-survival. diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 9803193bf9..c80dfb1eac 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -1254,27 +1254,6 @@ files. It is designed to be fast and to handle large input files.") (define-public python2-defusedxml (package-with-python2 python-defusedxml)) -(define-public libxls - (package - (name "libxls") - (version "1.5.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://github.com/libxls/libxls/releases/download/" - "v" version "/libxls-" version ".tar.gz")) - (sha256 - (base32 "00j2lrcvvhclmh3z9vy7myqq1br1jnnqkz2wzgk4a1gbg8c5afn5")))) - (build-system gnu-build-system) - (home-page "https://github.com/libxls/libxls") - (synopsis "Read binary (.xls) Excel spreadsheet files") - (description - "libxls is a C library to read .xls spreadsheet files in the binary OLE -BIFF8 format as created by Excel 97 and later versions. It cannot write them. - -This package also provides @command{xls2csv} to export Excel files to CSV.") - (license license:bsd-2))) - (define-public freexl (package (name "freexl") -- cgit v1.2.3 From af7014a14059ded4425e8f7f147d08fb8ba2b5c7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 Feb 2019 03:43:29 +0100 Subject: gnu: virt-manager: Update to 2.1.0. * gnu/packages/virtualization.scm (virt-manager): Update to 2.1.0. --- gnu/packages/virtualization.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 8a5af2e8ea..e0fd217730 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -571,7 +571,7 @@ virtualization library.") (define-public virt-manager (package (name "virt-manager") - (version "2.0.0") + (version "2.1.0") (source (origin (method url-fetch) (uri (string-append "https://virt-manager.org/download/sources" @@ -579,10 +579,10 @@ virtualization library.") version ".tar.gz")) (sha256 (base32 - "1b48xbrx99mfiv80c60k3ydzkpcpbq57c8h8dl0gnffmnzbs8vzb")))) + "1m038kyngmxlgz91c7z8g73lb2wy0ajyah871a3g3wb5cnd0dsil")))) (build-system python-build-system) (arguments - `(#:use-setuptools? #f ; Uses custom distutils 'install' command. + `(#:use-setuptools? #f ; uses custom distutils 'install' command ;; Some of the tests seem to require network access to install virtual ;; machines. #:tests? #f @@ -602,7 +602,7 @@ virtualization library.") #t)) (add-after 'unpack 'fix-default-uri (lambda* (#:key inputs #:allow-other-keys) - ;; xen is not available for now - so only patch qemu + ;; Xen is not available for now - so only patch qemu. (substitute* "virtManager/connect.py" (("/usr(/bin/qemu-system)" _ suffix) (string-append (assoc-ref inputs "qemu") suffix))) @@ -650,7 +650,7 @@ virtualization library.") (propagated-inputs `(("qemu" ,qemu))) (native-inputs - `(("glib" ,glib "bin") ; glib-compile-schemas. + `(("glib" ,glib "bin") ; glib-compile-schemas ("gtk+" ,gtk+ "bin") ; gtk-update-icon-cache ("perl" ,perl) ; pod2man ("intltool" ,intltool))) -- cgit v1.2.3 From bf38c19280d2c92b4e4c71fcfc2fde51f539e796 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 Feb 2019 04:19:46 +0100 Subject: gnu: fasm: Update to 1.73.08. * gnu/packages/assembly.scm (fasm): Update to 1.73.08. --- gnu/packages/assembly.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/assembly.scm b/gnu/packages/assembly.scm index 9b8ef562d3..0de2183b88 100644 --- a/gnu/packages/assembly.scm +++ b/gnu/packages/assembly.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2013, 2015 Ludovic Courtès ;;; Copyright © 2013 Andreas Enge ;;; Copyright © 2016 Efraim Flashner -;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2019 Guy Fleury Iteriteka ;;; ;;; This file is part of GNU Guix. @@ -129,7 +129,7 @@ to the clients.") (define-public fasm (package (name "fasm") - (version "1.73.06") + (version "1.73.08") (source (origin (method url-fetch) @@ -137,14 +137,14 @@ to the clients.") version ".tgz")) (sha256 (base32 - "02wqkqxpn3p0iwcagsm92qd9cdfcnbx8a09qg03b3pjppp30hmp6")))) + "1l4my3fran06h5jiygswx4fsj53dvpfgg9ksfbdzsdg20r672997")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; No tests exist - #:strip-binaries? #f ; fasm has no sections + `(#:tests? #f ; no tests exist + #:strip-binaries? #f ; fasm has no sections #:phases (modify-phases %standard-phases - (delete 'configure) ; no "configure" script exists + (delete 'configure) ; no "configure" script (replace 'build (lambda _ (chdir "source/Linux/") -- cgit v1.2.3 From c6a2dd86c54c84e2410dd61fbae3264ca876f1ea Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 Feb 2019 04:24:42 +0100 Subject: gnu: cppcheck: Update to 1.87. * gnu/packages/check.scm (cppcheck): Update to 1.87. --- gnu/packages/check.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 7550586c1f..d689c96648 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -16,7 +16,7 @@ ;;; Copyright © 2016 Troy Sankey ;;; Copyright © 2016 Lukas Gradl ;;; Copyright © 2016 Hartmut Goebel -;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice +;;; Copyright © 2016, 2017, 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2017 Julien Lepiller ;;; Copyright © 2017 Thomas Danckaert ;;; Copyright © 2017, 2018 Arun Isaac @@ -303,7 +303,7 @@ format.") (define-public cppcheck (package (name "cppcheck") - (version "1.86") + (version "1.87") (source (origin (method git-fetch) (uri (git-reference @@ -311,7 +311,7 @@ format.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0jr4aah72c7wy94a8vlj3k050rx6pmc7m9nvmll1jwbscxj5f7ff")))) + (base32 "1xiy54rz99nzbpwj35jiyssd2nc6k5k0lw5ml6nh2qnmbfkl8swl")))) (build-system cmake-build-system) (arguments '(#:configure-flags '("-DBUILD_TESTS=ON"))) -- cgit v1.2.3 From f95114e5dd9ae56581c730b73149de28d2765ce7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 Feb 2019 04:54:53 +0100 Subject: gnu: ndctl: Update to 64.1. * gnu/packages/disk.scm (ndctl): Update to 64.1. [inputs]: Add keyutils. --- gnu/packages/disk.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index dd424461d5..16fb2014b0 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -37,6 +37,7 @@ #:use-module (gnu packages c) #:use-module (gnu packages check) #:use-module (gnu packages compression) + #:use-module (gnu packages crypto) #:use-module (gnu packages cryptsetup) #:use-module (gnu packages docbook) #:use-module (gnu packages documentation) @@ -609,7 +610,7 @@ passphrases.") (define-public ndctl (package (name "ndctl") - (version "63") + (version "64.1") (source (origin (method git-fetch) (uri (git-reference @@ -618,7 +619,7 @@ passphrases.") (file-name (git-file-name name version)) (sha256 (base32 - "060nsza8xic769bxj3pvl70a9885bwrc0myw16l095i3z6w7yzwq")))) + "1la82fqbdwjkw6il498nkdfgqc4aszv481xf2p9p07jfvankx24v")))) (build-system gnu-build-system) (native-inputs `(("asciidoc" ,asciidoc) @@ -635,6 +636,7 @@ passphrases.") (inputs `(("eudev" ,eudev) ("json-c" ,json-c) + ("keyutils" ,keyutils) ("kmod" ,kmod) ("util-linux" ,util-linux))) (arguments -- cgit v1.2.3 From 7d4cbd993d44d477d0fd6d7f308efe7f41fc0d97 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 Feb 2019 04:57:28 +0100 Subject: gnu: ifdtool: Update to 4.9. * gnu/packages/flashing-tools.scm (ifdtool): Update to 4.9. [source]: Update source URI. --- gnu/packages/flashing-tools.scm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/flashing-tools.scm b/gnu/packages/flashing-tools.scm index bc4bbd876a..aeef2f340c 100644 --- a/gnu/packages/flashing-tools.scm +++ b/gnu/packages/flashing-tools.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2016 Efraim Flashner ;;; Copyright © 2017 Jonathan Brielmaier ;;; Copyright © 2017 Julien Lepiller -;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -341,16 +341,16 @@ referred to as the \"Odin 3 protocol\".") (define-public ifdtool (package (name "ifdtool") - (version "4.7") + (version "4.9") (source (origin (method git-fetch) (uri (git-reference - (url "https://review.coreboot.org/p/coreboot") + (url "https://github.com/coreboot/coreboot.git") (commit version))) (file-name (git-file-name name version)) (sha256 (base32 - "0nw555i0fm5kljha9h47bk70ykbwv8ddfk6qhz6kfqb79vzhy4h2")))) + "0jidj29jh6p65d17k304wlzhxvp4p3c2namgcdwg2sxq8jfr0zlm")))) (build-system gnu-build-system) (arguments `(#:make-flags @@ -359,12 +359,12 @@ referred to as the \"Odin 3 protocol\".") (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)))) + (add-after 'unpack 'chdir + (lambda _ + (chdir "util/ifdtool") + #t)) + (delete 'configure)) ; no configure script + #:tests? #f)) ; no test suite (home-page "https://github.com/corna/me_cleaner/") (synopsis "Intel Firmware Descriptor dumper") (description "This package provides @command{ifdtool}, a program to -- cgit v1.2.3 From 786e0073c1a7f7ce585c2e4ced88e8072802bbf2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 Feb 2019 04:59:00 +0100 Subject: gnu: libfilezilla: Don't use NAME in source URI. * gnu/packages/ftp.scm (libfilezilla)[source]: Hard-code NAME. --- gnu/packages/ftp.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ftp.scm b/gnu/packages/ftp.scm index bc44d7537a..8cc5af66c4 100644 --- a/gnu/packages/ftp.scm +++ b/gnu/packages/ftp.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2014, 2015, 2018 Ludovic Courtès ;;; Copyright © 2015 Andreas Enge ;;; Copyright © 2015 Mark H Weaver -;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice +;;; Copyright © 2016, 2017, 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2017 Rene Saavedra ;;; ;;; This file is part of GNU Guix. @@ -175,7 +175,7 @@ as required.") (origin (method url-fetch) (uri (string-append "https://download.filezilla-project.org/" - name "/" name "-" version ".tar.bz2")) + "libfilezilla/libfilezilla-" version ".tar.bz2")) (sha256 (base32 "17zlhw5b1a7jzh50cbpy2is3sps5lnzch5yf9qm7mwrviw9c8j10")))) -- cgit v1.2.3 From 76f01c5102e173be5b2cec0fb15acf7df07458ff Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 Feb 2019 04:59:26 +0100 Subject: gnu: filezilla: Update to 3.40.0. * gnu/packages/ftp.scm (filezilla): Update to 3.40.0. --- gnu/packages/ftp.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ftp.scm b/gnu/packages/ftp.scm index 8cc5af66c4..916f8f6b0e 100644 --- a/gnu/packages/ftp.scm +++ b/gnu/packages/ftp.scm @@ -209,14 +209,14 @@ output. (define-public filezilla (package (name "filezilla") - (version "3.39.0") + (version "3.40.0") (source (origin (method url-fetch) (uri (string-append "https://download.filezilla-project.org/client/" "FileZilla_" version "_src.tar.bz2")) (sha256 - (base32 "0ks42q6mi3qx85zpa98izkyficv2bdh3jnvmy97xjnjyfy9mwlgv")))) + (base32 "11b0410fcwrahq5dd7ph10bc09m62sxra4bjp0kj5gph822s0v63")))) (build-system gnu-build-system) (arguments ;; Don't let filezilla phone home to check for updates. -- cgit v1.2.3 From 3e7b376e08ced847795d6434189d0b78c89a4173 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 Feb 2019 05:03:04 +0100 Subject: gnu: vkquake: Update to 1.01.0. * gnu/packages/games.scm (vkquake): Update to 1.01.0. --- gnu/packages/games.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index de53ac798d..4636e228b6 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -24,7 +24,7 @@ ;;; Copyright © 2016 Steve Webber ;;; Copyright © 2017 Adonay "adfeno" Felipe Nogueira ;;; Copyright © 2017, 2018 Arun Isaac -;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2017 nee ;;; Copyright © 2017 Clément Lassieur ;;; Copyright © 2017 Marius Bakke @@ -4954,7 +4954,7 @@ some graphical niceities, and numerous bug-fixes and other improvements.") (package (inherit quakespasm) (name "vkquake") - (version "1.00.0") + (version "1.01.0") (source (origin (method url-fetch) @@ -4963,7 +4963,7 @@ some graphical niceities, and numerous bug-fixes and other improvements.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0bviv18jvp41jvrabgl7l5kq4n1p6p3rywij481yswawdw6l5idh")))) + "0j8lh5by3pvjh6qr9piqlnq8mb5vv7sh0h3b9bqxlqm2ys0ap8hi")))) (arguments `(#:make-flags (let ((vulkanlib (string-append (assoc-ref %build-inputs -- cgit v1.2.3 From f5e1a0e5767bc1e7baa9a116144fdded2f0c5648 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 Feb 2019 05:05:38 +0100 Subject: gnu: vkquake: Don't use unstable tarball. * gnu/packages/games.scm (vkquake)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/games.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 4636e228b6..8702dad302 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -4957,13 +4957,13 @@ some graphical niceities, and numerous bug-fixes and other improvements.") (version "1.01.0") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/Novum/vkQuake/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/Novum/vkQuake.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 - "0j8lh5by3pvjh6qr9piqlnq8mb5vv7sh0h3b9bqxlqm2ys0ap8hi")))) + (base32 "1iwin8j5kbyrknbkhjgpy8nmm7pxqzr0daa9gn7p38qhg2mh0a39")))) (arguments `(#:make-flags (let ((vulkanlib (string-append (assoc-ref %build-inputs -- cgit v1.2.3 From 87683add41afcd6b8a0f9cd862b77dd3a79dcbc0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 Feb 2019 05:08:24 +0100 Subject: gnu: gamine: Update to 1.6. * gnu/packages/games.scm (gamine): Update to 1.6. --- gnu/packages/games.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 8702dad302..de8ee02f8b 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -2143,22 +2143,22 @@ Battle for Wesnoth}."))) (define-public gamine (package (name "gamine") - (version "1.5") + (version "1.6") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/gamine-game/" "gamine-" version ".tar.gz")) (sha256 (base32 - "08wnk7w84c2413hwny89j2cn89cvfdf67bfc6wl0bf475if0mf4h")))) + "1sc6f4445ciigd6yw0ri92746k4hk6ps0bvj9fm1gbp3c3fslk5n")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) ("intltool" ,intltool))) (inputs `(("gstreamer" ,gstreamer) - ("gst-plugins-base" ,gst-plugins-base) ;playbin plugin - ("gst-plugins-good" ,gst-plugins-good) ;for wav playback + ("gst-plugins-base" ,gst-plugins-base) ; playbin plugin + ("gst-plugins-good" ,gst-plugins-good) ; for wav playback ("gtk+" ,gtk+))) (arguments `(#:tests? #f -- cgit v1.2.3 From 5479dbf929e4d857bd2e04a6231a8761ad79374b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 Feb 2019 05:10:32 +0100 Subject: gnu: chroma: Update to 1.16. * gnu/packages/games.scm (chroma): Update to 1.16. --- gnu/packages/games.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index de8ee02f8b..ac6ac775f9 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -4299,17 +4299,17 @@ with the mouse isn’t always trivial.") (define-public chroma (package (name "chroma") - (version "1.15") + (version "1.16") (source (origin (method url-fetch) (uri (string-append "http://level7.org.uk/chroma/download/chroma-" version ".tar.bz2")) (sha256 (base32 - "0nzm3j5wjazr1d6pkydqlc48sjf72hggq0hmx8mhq03114mmiir5")))) + "1gfaw1kf7cxf5ibr61n6dxjihi49gmysn4cvawx1pqvy52ljpk0p")))) (build-system gnu-build-system) (arguments - `(#:tests? #f)) ; no tests included + `(#:tests? #f)) ; no tests included (inputs `(("sdl-union" ,(sdl-union (list sdl sdl-image sdl-mixer sdl-ttf))) ("freetype" ,freetype) -- cgit v1.2.3 From 81e6ece61cd913012eb17674238f8839c343f3b4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 Feb 2019 05:13:12 +0100 Subject: gnu: fortune-mod: Update to 2.6.2. * gnu/packages/games.scm (fortune-mod): Update to 2.6.2. --- gnu/packages/games.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index ac6ac775f9..8622079d67 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -5382,7 +5382,7 @@ Strife, Chex Quest, and fan-created games like Harmony, Hacx and Freedoom.") (define-public fortune-mod (package (name "fortune-mod") - (version "2.6.1") + (version "2.6.2") (source (origin (method git-fetch) @@ -5392,7 +5392,7 @@ Strife, Chex Quest, and fan-created games like Harmony, Hacx and Freedoom.") (file-name (git-file-name name version)) (sha256 (base32 - "17183z8ls6hrngh8a3374csagqa2acs8jl21dqm7gwj4lk0ghkba")))) + "11xff87s8ifw2dqs90n0rjq0psv4i7ykybygmibsqjj7id3xxw4c")))) (build-system cmake-build-system) (arguments `(#:test-target "check" -- cgit v1.2.3 From d5ddb48424e9cd25762942c673ea6d7147b67812 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 Feb 2019 05:18:04 +0100 Subject: gnu: gnubg: Update to 1.06.002. * gnu/packages/games.scm (gnubg): Update to 1.06.002. --- gnu/packages/games.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 8622079d67..28382be30c 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -656,7 +656,7 @@ destroying an ancient book using a special wand.") (define-public gnubg (package (name "gnubg") - (version "1.06.001") + (version "1.06.002") (source (origin (method url-fetch) @@ -664,7 +664,7 @@ destroying an ancient book using a special wand.") version "-sources." "tar.gz")) (sha256 (base32 - "0snz3j1bvr25ji7lg82bl2gm2s2x9lrpc7viw0hclgz0ql74cw7b")))) + "11xwhcli1h12k6rnhhyq4jphzrhfik7i8ah3k32pqw803460n6yf")))) (build-system gnu-build-system) (inputs `(("glib" ,glib) ("readline" ,readline) -- cgit v1.2.3 From 7aed8b8a7aa7394bb2b682854998df7b86623c71 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 Feb 2019 05:21:19 +0100 Subject: gnu: teeworlds: Update to 0.7.2. * gnu/packages/games.scm (teeworlds): Update to 0.7.2. --- gnu/packages/games.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 28382be30c..6d9e63c4e9 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -4110,9 +4110,8 @@ small robot living in the nano world, repair its maker.") (define-public teeworlds (package (name "teeworlds") - (version "0.7.0") + (version "0.7.2") (source (origin - ;; do not use auto-generated tarballs (method git-fetch) (uri (git-reference (url "https://github.com/teeworlds/teeworlds.git") @@ -4120,7 +4119,7 @@ small robot living in the nano world, repair its maker.") (file-name (git-file-name name version)) (sha256 (base32 - "0jigg2yikihbivzs7hpljr0mghx1l9v4f1cdr8fbmqv2wb51ah8q")) + "15l988qcsqgb6rjais0qd5sd2rjanm2708jmzvkariqzz0d6pb93")) (modules '((guix build utils) (ice-9 ftw) (ice-9 regex) @@ -4137,7 +4136,7 @@ small robot living in the nano world, repair its maker.") (search-patches "teeworlds-use-latest-wavpack.patch")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; no tests included + `(#:tests? #f ; no tests included #:modules ((guix build gnu-build-system) (guix build utils) (srfi srfi-26)) -- cgit v1.2.3 From b2cf559772499ca96f9a678e12a50b34305b4626 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 Feb 2019 05:34:09 +0100 Subject: gnu: allegro@4: Update to 4.4.3. * gnu/packages/game-development.scm (allegro-4): Update to 4.4.3. [source]: Remove upstreamed patch. * gnu/packages/patches/allegro4-mesa-18.2.5-and-later.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/packages/game-development.scm | 8 ++--- .../patches/allegro4-mesa-18.2.5-and-later.patch | 41 ---------------------- 2 files changed, 3 insertions(+), 46 deletions(-) delete mode 100644 gnu/packages/patches/allegro4-mesa-18.2.5-and-later.patch (limited to 'gnu/packages') diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 6b641be0ef..c2732cac81 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2016, 2017 Kei Kebreau ;;; Copyright © 2016, 2018 Ricardo Wurmus ;;; Copyright © 2016, 2017, 2018 Julian Graham -;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2017 Manolis Fragkiskos Ragkousis ;;; Copyright © 2017 Peter Mikkelsen ;;; Copyright © 2017 Arun Isaac @@ -641,17 +641,15 @@ programming language.") (define-public allegro-4 (package (name "allegro") - (version "4.4.2") + (version "4.4.3") (source (origin (method url-fetch) (uri (string-append "https://github.com/liballeg/allegro5/" "releases/download/" version "/allegro-" version ".tar.gz")) - (patches (search-patches - "allegro4-mesa-18.2.5-and-later.patch")) (sha256 (base32 - "1p0ghkmpc4kwij1z9rzxfv7adnpy4ayi0ifahlns1bdzgmbyf88v")))) + "1d5ws3ihvpa6f4qc6a6drq31pajw6bblxifr4kcxzqj9br1nw28y")))) (build-system cmake-build-system) (arguments '(#:phases diff --git a/gnu/packages/patches/allegro4-mesa-18.2.5-and-later.patch b/gnu/packages/patches/allegro4-mesa-18.2.5-and-later.patch deleted file mode 100644 index a4944821db..0000000000 --- a/gnu/packages/patches/allegro4-mesa-18.2.5-and-later.patch +++ /dev/null @@ -1,41 +0,0 @@ -Fixes compilation with Mesa >= 18.2.5. - -Modified from upstream to work on allegro4: - -https://github.com/liballeg/allegro5/commit/a40d30e21802ecf5c9382cf34af9b01bd3781e47 - -diff --git a/addons/allegrogl/include/alleggl.h b/addons/allegrogl/include/alleggl.h -index 0f86a6768..652dd024e 100644 ---- a/addons/allegrogl/include/alleggl.h -+++ b/addons/allegrogl/include/alleggl.h -@@ -103,10 +103,14 @@ - - /* HACK: Prevent both Mesa and SGI's broken headers from screwing us */ - #define __glext_h_ -+#define __gl_glext_h_ - #define __glxext_h_ -+#define __glx_glxext_h_ - #include - #undef __glext_h_ -+#undef __gl_glext_h_ - #undef __glxext_h_ -+#undef __glx_glxext_h_ - - #endif /* ALLEGRO_MACOSX */ - -diff --git a/addons/allegrogl/include/allegrogl/GLext/glx_ext_defs.h b/addons/allegrogl/include/allegrogl/GLext/glx_ext_defs.h -index 49c502091..fba8aea5d 100644 ---- a/addons/allegrogl/include/allegrogl/GLext/glx_ext_defs.h -+++ b/addons/allegrogl/include/allegrogl/GLext/glx_ext_defs.h -@@ -1,7 +1,9 @@ - /* HACK: Prevent both Mesa and SGI's broken headers from screwing us */ - #define __glxext_h_ -+#define __glx_glxext_h_ - #include - #undef __glxext_h_ -+#undef __glx_glxext_h_ - - #ifndef GLX_VERSION_1_3 - #define _ALLEGRO_GLX_VERSION_1_3 --- -2.20.0 -- cgit v1.2.3 From a37bdf4289e9bb533907a6ee5c4c84e68e12c5b1 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 Feb 2019 05:37:42 +0100 Subject: gnu: tiled: Update to 1.2.2. * gnu/packages/game-development.scm (tiled): Update to 1.2.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 c2732cac81..ac01cb3f2f 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -431,7 +431,7 @@ support.") (define-public tiled (package (name "tiled") - (version "1.2.1") + (version "1.2.2") (source (origin (method git-fetch) (uri (git-reference @@ -440,7 +440,7 @@ support.") (file-name (git-file-name name version)) (sha256 (base32 - "1dl06k2p0r7l20ghxcq5sn7j0jl2l8q4m27vmfs2qfgvldjll2h3")))) + "0ay4x1b6h5xfax1cqry2fklcmqi6a16klgmci4gkhga7as66lnnn")))) (build-system gnu-build-system) (inputs `(("qtbase" ,qtbase) -- cgit v1.2.3 From 9846ec0beabdc9113a37448178d62324ee4be46d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 15 Feb 2019 11:02:41 +0100 Subject: gnu: Add python-pyfit-sne. * gnu/packages/bioinformatics.scm (python-pyfit-sne): New variable. --- gnu/packages/bioinformatics.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index d6db02188f..933b8b9adf 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -14497,3 +14497,33 @@ designed for use with hybrid capture, including both whole-exome and custom target panels, and short-read sequencing platforms such as Illumina and Ion Torrent.") (license license:asl2.0))) + +(define-public python-pyfit-sne + (package + (name "python-pyfit-sne") + (version "1.0.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/KlugerLab/pyFIt-SNE.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "13wh3qkzs56azmmgnxib6xfr29g7xh09sxylzjpni5j0pp0rc5qw")))) + (build-system python-build-system) + (propagated-inputs + `(("python-numpy" ,python-numpy))) + (inputs + `(("fftw" ,fftw))) + (native-inputs + `(("python-cython" ,python-cython))) + (home-page "https://github.com/KlugerLab/pyFIt-SNE") + (synopsis "FFT-accelerated Interpolation-based t-SNE") + (description + "t-Stochastic Neighborhood Embedding (t-SNE) is a highly successful +method for dimensionality reduction and visualization of high dimensional +datasets. A popular implementation of t-SNE uses the Barnes-Hut algorithm to +approximate the gradient at each iteration of gradient descent. This package +is a Cython wrapper for FIt-SNE.") + (license license:bsd-4))) -- cgit v1.2.3 From 3bdcc668ee94264798de0e8a8633335528e80e19 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 15 Feb 2019 11:16:31 +0100 Subject: gnu: LLVM: Use HTTPS URLs. * gnu/packages/llvm.scm (llvm, clang-runtime-from-llvm, clang-from-llvm, llvm-3.9.1, llvm-3.7, llvm-3.6, llvm-3.5)[source](uri): Use HTTPS. (emacs-clang-format)[description]: Likewise. --- gnu/packages/llvm.scm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 13223fbb66..bea52ea480 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -51,7 +51,7 @@ (source (origin (method url-fetch) - (uri (string-append "http://llvm.org/releases/" + (uri (string-append "https://llvm.org/releases/" version "/llvm-" version ".src.tar.xz")) (sha256 (base32 @@ -118,7 +118,7 @@ of programming tools as well as libraries with equivalent functionality.") (source (origin (method url-fetch) - (uri (string-append "http://llvm.org/releases/" + (uri (string-append "https://llvm.org/releases/" version "/compiler-rt-" version ".src.tar.xz")) (sha256 (base32 hash)) (patches (map search-patch patches)))) @@ -150,7 +150,7 @@ compiler. In LLVM this library is called \"compiler-rt\".") (source (origin (method url-fetch) - (uri (string-append "http://llvm.org/releases/" + (uri (string-append "https://llvm.org/releases/" version "/cfe-" version ".src.tar.xz")) (sha256 (base32 hash)) (patches (map search-patch patches)))) @@ -291,7 +291,7 @@ code analysis tools.") (source (origin (method url-fetch) - (uri (string-append "http://llvm.org/releases/" + (uri (string-append "https://llvm.org/releases/" version "/llvm-" version ".src.tar.xz")) (sha256 (base32 @@ -341,7 +341,7 @@ code analysis tools.") (source (origin (method url-fetch) - (uri (string-append "http://llvm.org/releases/" + (uri (string-append "https://llvm.org/releases/" version "/llvm-" version ".src.tar.xz")) (sha256 (base32 @@ -365,7 +365,7 @@ code analysis tools.") (source (origin (method url-fetch) - (uri (string-append "http://llvm.org/releases/" + (uri (string-append "https://llvm.org/releases/" version "/llvm-" version ".src.tar.xz")) (sha256 (base32 @@ -388,7 +388,7 @@ code analysis tools.") (source (origin (method url-fetch) - (uri (string-append "http://llvm.org/releases/" + (uri (string-append "https://llvm.org/releases/" version "/llvm-" version ".src.tar.xz")) (patches (search-patches "llvm-3.5-fix-clang-build-with-gcc5.patch")) @@ -511,7 +511,7 @@ SOURCE-FILES found in SOURCE-PACKAGE." (description "This package allows to filter code through @code{clang-format} to fix its formatting. @code{clang-format} is a tool that formats C/C++/Obj-C code according to a set of style options, see -@url{http://clang.llvm.org/docs/ClangFormatStyleOptions.html}."))) +@url{https://clang.llvm.org/docs/ClangFormatStyleOptions.html}."))) (define-public emacs-clang-rename (package -- cgit v1.2.3 From d199a4c7b4c4d3320ed59e96a382f4c577630360 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 15 Feb 2019 11:28:14 +0100 Subject: gnu: LLVM, Clang: Update to 7.0.1. * gnu/packages/patches/clang-7.0-libc-search-path.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/llvm.scm (llvm, clang-runtime, clang): Update to 7.0.1. (llvm-7.0.1): Remove variable. (clang-from-llvm)[arguments]: Adjust phase to match Clang 7. (llvm-6, clang-runtime-6, clang-6): New public variables. * gnu/packages/dlang.scm (ldc)[native-inputs]: Change LLVM and CLANG to LLVM-6.0 and CLANG-6.0. * gnu/packages/gl.scm (mesa)[inputs]: Change from LLVM to LLVM-6. --- gnu/packages/dlang.scm | 4 +- gnu/packages/gl.scm | 2 +- gnu/packages/llvm.scm | 47 +++++++------ .../patches/clang-7.0-libc-search-path.patch | 82 ++++++++++++++++++++++ 4 files changed, 112 insertions(+), 23 deletions(-) create mode 100644 gnu/packages/patches/clang-7.0-libc-search-path.patch (limited to 'gnu/packages') diff --git a/gnu/packages/dlang.scm b/gnu/packages/dlang.scm index c03c24d9e2..2530b8a3c7 100644 --- a/gnu/packages/dlang.scm +++ b/gnu/packages/dlang.scm @@ -249,8 +249,8 @@ bootstrapping more recent compilers written in D.") (setenv "CC" (string-append (assoc-ref inputs "gcc") "/bin/gcc")) (invoke "make" "test" "-j" (number->string (parallel-job-count)))))))) (native-inputs - `(("llvm" ,llvm) - ("clang" ,clang) + `(("llvm" ,llvm-6) + ("clang" ,clang-6) ("ldc" ,ldc-bootstrap) ("python-lit" ,python-lit) ("python-wrapper" ,python-wrapper) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index b673cbffe6..37b8fce7cb 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -257,7 +257,7 @@ also known as DXTn or DXTC) for Mesa.") ("libxvmc" ,libxvmc) ,@(match (%current-system) ((or "x86_64-linux" "i686-linux") - `(("llvm" ,llvm))) + `(("llvm" ,llvm-6))) ;TODO: Change to LLVM in the next rebuild cycle. (_ `())) ("makedepend" ,makedepend) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index bea52ea480..9a4cca35d0 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2016 Dennis Mungai ;;; Copyright © 2016, 2018 Ricardo Wurmus ;;; Copyright © 2017 Roel Janssen -;;; Copyright © 2018 Marius Bakke +;;; Copyright © 2018, 2019 Marius Bakke ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Efraim Flashner ;;; Copyright © 2018 Tim Gesthuizen @@ -47,7 +47,7 @@ (define-public llvm (package (name "llvm") - (version "6.0.1") + (version "7.0.1") (source (origin (method url-fetch) @@ -55,7 +55,7 @@ version "/llvm-" version ".src.tar.xz")) (sha256 (base32 - "1qpls3vk85lydi5b4axl0809fv932qgsqgdgrk098567z4jc7mmn")))) + "16s196wqzdw4pmri15hadzqgdi926zln3an2viwyq0kini6zr3d3")))) (build-system cmake-build-system) (native-inputs `(("python" ,python-2) ;bytes->str conversion in clang>=3.7 needs python-2 @@ -95,21 +95,6 @@ languages is in development. The compiler infrastructure includes mirror sets of programming tools as well as libraries with equivalent functionality.") (license license:ncsa))) -;; TODO: Build Mesa with LLVM 7 in the next staging cycle. -;; TODO: Make LLVM 7 the default LLVM once Clang is also upgraded. -(define-public llvm-7.0.1 - (package (inherit llvm) - (name "llvm") - (version "7.0.1") - (source - (origin - (method url-fetch) - (uri (string-append "http://llvm.org/releases/" - version "/llvm-" version ".src.tar.xz")) - (sha256 - (base32 - "16s196wqzdw4pmri15hadzqgdi926zln3an2viwyq0kini6zr3d3")))))) - (define* (clang-runtime-from-llvm llvm hash #:optional (patches '())) (package @@ -190,7 +175,7 @@ compiler. In LLVM this library is called \"compiler-rt\".") (compiler-rt (assoc-ref inputs "clang-runtime"))) (case (string->number ,(version-major (package-version clang-runtime))) - ((6) + ((or 6 7) ;; Link to libclang_rt files from clang-runtime. (substitute* "lib/Driver/ToolChain.cpp" (("getDriver\\(\\)\\.ResourceDir") @@ -277,10 +262,32 @@ code analysis tools.") (define-public clang-runtime (clang-runtime-from-llvm llvm - "1fcr3jn24yr8lh36nc0c4ikli4744i2q9m1ik67p1jymwwaixkgl")) + "065ybd8fsc4h2hikbdyricj6pyv4r7r7kpcikhb2y5zf370xybkq")) (define-public clang (clang-from-llvm llvm clang-runtime + "067lwggnbg0w1dfrps790r5l6k8n5zwhlsw7zb6zvmfpwpfn4nx4" + #:patches '("clang-7.0-libc-search-path.patch"))) + +(define-public llvm-6 + (package + (inherit llvm) + (version "6.0.1") + (source (origin + (method url-fetch) + (uri (string-append "https://llvm.org/releases/" + version "/llvm-" version ".src.tar.xz")) + (sha256 + (base32 + "1qpls3vk85lydi5b4axl0809fv932qgsqgdgrk098567z4jc7mmn")))))) + +(define-public clang-runtime-6 + (clang-runtime-from-llvm + llvm-6 + "1fcr3jn24yr8lh36nc0c4ikli4744i2q9m1ik67p1jymwwaixkgl")) + +(define-public clang-6 + (clang-from-llvm llvm-6 clang-runtime "0rxn4rh7rrnsqbdgp4gzc8ishbkryhpl1kd3mpnxzpxxhla3y93w" #:patches '("clang-6.0-libc-search-path.patch"))) diff --git a/gnu/packages/patches/clang-7.0-libc-search-path.patch b/gnu/packages/patches/clang-7.0-libc-search-path.patch new file mode 100644 index 0000000000..07ff8c90bd --- /dev/null +++ b/gnu/packages/patches/clang-7.0-libc-search-path.patch @@ -0,0 +1,82 @@ +Clang attempts to guess file names based on the OS and distro (yes!), +but unfortunately, that doesn't work for us. + +This patch makes it easy to insert libc's $libdir so that Clang passes the +correct absolute file name of crt1.o etc. to 'ld'. It also disables all +the distro-specific stuff and removes the hard-coded FHS directory names +to make sure Clang also works on non-GuixSD systems. + +--- a/lib/Driver/ToolChains/Linux.cpp ++++ b/lib/Driver/ToolChains/Linux.cpp +@@ -225,7 +225,9 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args) + PPaths.push_back(Twine(GCCInstallation.getParentLibPath() + "/../" + + GCCInstallation.getTriple().str() + "/bin") + .str()); +- ++ // Comment out the distro-specific tweaks so that they don't bite when ++ // using Guix on a foreign distro. ++#if 0 + Distro Distro(D.getVFS()); + + if (Distro.IsAlpineLinux()) { +@@ -284,6 +286,7 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args) + + if (IsAndroid || Distro.IsOpenSUSE()) + ExtraOpts.push_back("--enable-new-dtags"); ++#endif + + // The selection of paths to try here is designed to match the patterns which + // the GCC driver itself uses, as this is part of the GCC-compatible driver. +@@ -342,7 +345,7 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args) + // the cross. Note that GCC does include some of these directories in some + // configurations but this seems somewhere between questionable and simply + // a bug. +- if (StringRef(LibPath).startswith(SysRoot)) { ++ if (0) { + addPathIfExists(D, LibPath + "/" + MultiarchTriple, Paths); + addPathIfExists(D, LibPath + "/../" + OSLibDir, Paths); + } +@@ -361,6 +364,8 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args) + addPathIfExists(D, SysRoot + "/lib/" + MultiarchTriple, Paths); + addPathIfExists(D, SysRoot + "/lib/../" + OSLibDir, Paths); + ++ // This requires the commented distro tweaks above. ++#if 0 + if (IsAndroid) { + // Android sysroots contain a library directory for each supported OS + // version as well as some unversioned libraries in the usual multiarch +@@ -389,10 +394,14 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args) + addPathIfExists(D, SysRoot + "/" + OSLibDir + "/" + ABIName, Paths); + addPathIfExists(D, SysRoot + "/usr/" + OSLibDir + "/" + ABIName, Paths); + } ++#endif + + // Try walking via the GCC triple path in case of biarch or multiarch GCC + // installations with strange symlinks. + if (GCCInstallation.isValid()) { ++ // The following code would end up adding things like ++ // "/usr/lib/x86_64-unknown-linux-gnu/../../lib64" to the search path. ++#if 0 + addPathIfExists(D, + SysRoot + "/usr/lib/" + GCCInstallation.getTriple().str() + + "/../../" + OSLibDir, +@@ -405,6 +414,7 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args) + BiarchSibling.gccSuffix(), + Paths); + } ++#endif + + // See comments above on the multilib variant for details of why this is + // included even from outside the sysroot. +@@ -429,8 +439,9 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args) + if (StringRef(D.Dir).startswith(SysRoot)) + addPathIfExists(D, D.Dir + "/../lib", Paths); + +- addPathIfExists(D, SysRoot + "/lib", Paths); +- addPathIfExists(D, SysRoot + "/usr/lib", Paths); ++ // Add libc's lib/ directory to the search path, so that crt1.o, crti.o, ++ // and friends can be found. ++ addPathIfExists(D, "@GLIBC_LIBDIR@", Paths); + } + + bool Linux::HasNativeLLVMSupport() const { return true; } -- cgit v1.2.3 From a72d928b6bebc452066c292ec5165cb58065fe86 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 15 Feb 2019 11:19:14 +0100 Subject: gnu: KDE Frameworks: Update to 5.55.0. * gnu/packages/kde-frameworks.scm (extra-cmake-modules, attica, bluez-qt, breeze-icons kapidox, karchive, kcodecs, kconfig, kcoreaddons, kdbusaddons, kdnssd, kguiaddons, ki18n, kidletime, kirigami, kitemmodels, kitemviews, kplotting, ksyntaxhighlighting, kwayland, kwidgetsaddons, kwindowsystem, modemmanager-qt, networkmanager-qt, oxygen-icons, prison, qqc2-desktop-style, solid, sonnet, threadweaver, kactivities, kauth, kcompletion, kcrash, kdoctools, kfilemetadata, kimageformats, kjobwidgets, knotifications, kpackage, kpty, kunitconversion, baloo, kactivities-stats, kbookmarks, kcmutils, kconfigwidgets, kdeclarative, kded, kdesignerplugin, kdesu, kdewebkit, kemoticons, kglobalaccel, kiconthemes, kinit, kio, knewstuff, knotifyconfig, kparts, kpeople, krunner, kservice, ktexteditor, ktextwidgets, kwallet, kxmlgui, kxmlrpcclient, plasma-framework, kde-frameworkintegration, kdelibs4support, khtml, kjs, kjsembed, kmediaplayer, kross): Update to 5.55.0. --- gnu/packages/kde-frameworks.scm | 304 ++++++++++++++++++++-------------------- 1 file changed, 152 insertions(+), 152 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index c9b464c2c5..6a8d27f34e 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -78,7 +78,7 @@ (define-public extra-cmake-modules (package (name "extra-cmake-modules") - (version "5.54.0") + (version "5.55.0") (source (origin (method url-fetch) (uri (string-append @@ -87,7 +87,7 @@ name "-" version ".tar.xz")) (sha256 (base32 - "0i3iqwvdqf2wpg8lsbna4vgmb18pnbv2772sg9k6zzhvkwsskdwi")))) + "1x868hs9jiqzkqx7gld4mdm5dzfxc5kann22y15a4f7g5a957534")))) (build-system cmake-build-system) (native-inputs `(("qtbase" ,qtbase))) ; For tests (needs qmake) @@ -253,7 +253,7 @@ Phonon-GStreamer is a backend based on the GStreamer multimedia library.") (define-public attica (package (name "attica") - (version "5.54.0") + (version "5.55.0") (source (origin (method url-fetch) (uri (string-append @@ -262,7 +262,7 @@ Phonon-GStreamer is a backend based on the GStreamer multimedia library.") name "-" version ".tar.xz")) (sha256 (base32 - "1gr7w0mf3aq5xyl9il3483m9aqgb981vxn02g2khm6dfsr6z2aln")))) + "0bsn9mi3nj23k2r3mfgjm9i1mp8qnwf08xn9x757wk3xas0cx98v")))) (build-system cmake-build-system) (arguments `(#:phases @@ -293,7 +293,7 @@ http://freedesktop.org/wiki/Specifications/open-collaboration-services/") (define-public bluez-qt (package (name "bluez-qt") - (version "5.54.0") + (version "5.55.0") (source (origin (method url-fetch) (uri (string-append @@ -302,7 +302,7 @@ http://freedesktop.org/wiki/Specifications/open-collaboration-services/") name "-" version ".tar.xz")) (sha256 (base32 - "1br9496lahzqmzmvdic5835ig18w3g211l1w4qfzpgr50yin9n5v")))) + "1ixad1ya3c339c675w8nwmbga8ydq16db9fk2az3gjm68z3dch8a")))) (build-system cmake-build-system) (native-inputs `(("dbus" ,dbus) @@ -326,7 +326,7 @@ Bluetooth stack. It is used by the KDE Bluetooth stack, BlueDevil.") (define-public breeze-icons (package (name "breeze-icons") - (version "5.54.0") + (version "5.55.0") (source (origin (method url-fetch) (uri (string-append @@ -335,7 +335,7 @@ Bluetooth stack. It is used by the KDE Bluetooth stack, BlueDevil.") name "-" version ".tar.xz")) (sha256 (base32 - "1g5dppg2iq5bd3r3s8bi8jqnvnh1rm7s3sv51shmaamq5qf0n5jy")))) + "03mb7x8mc2h6cjb4mrifrbkbpj3lv9c0mg4m619rqiydg0p1yf49")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -355,7 +355,7 @@ It is the default icon theme for the KDE Plasma 5 desktop.") (define-public kapidox (package (name "kapidox") - (version "5.54.0") + (version "5.55.0") (source (origin (method url-fetch) (uri (string-append @@ -364,7 +364,7 @@ It is the default icon theme for the KDE Plasma 5 desktop.") name "-" version ".tar.xz")) (sha256 (base32 - "0zwjychzcamsky9l67xnw820b9m8r8pi56gsccg023l1rcigz46c")))) + "0x41adp3rnvr6njc57ffdyh6d5i5aw13xcjdr4p6kacw9pk63ajf")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) ; has no test target @@ -397,7 +397,7 @@ documentation.") (define-public karchive (package (name "karchive") - (version "5.54.0") + (version "5.55.0") (source (origin (method url-fetch) (uri (string-append @@ -406,7 +406,7 @@ documentation.") name "-" version ".tar.xz")) (sha256 (base32 - "141xqgdk7g3ky0amblrqr4pab1xvvdim5wvckrgawdkjiy5ana4g")))) + "1llznxc5wjjnmbjx8iwi3a93gc2z0z344viknsgls1fwdjjfyxc4")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -431,7 +431,7 @@ GZip format, via a subclass of QIODevice.") (define-public kcodecs (package (name "kcodecs") - (version "5.54.0") + (version "5.55.0") (source (origin (method url-fetch) (uri (string-append @@ -440,7 +440,7 @@ GZip format, via a subclass of QIODevice.") name "-" version ".tar.xz")) (sha256 (base32 - "1s0ky187fbi34wabpfvdwb1zbblzvk8g83h37ckj9j4rd69mjksc")))) + "0491j6l28jwfpgaqs2816qpyggnra2df33iw3fgvb0wd4r4gvmjb")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -467,7 +467,7 @@ Internet).") (define-public kconfig (package (name "kconfig") - (version "5.54.0") + (version "5.55.0") (source (origin (method url-fetch) (uri (string-append @@ -476,7 +476,7 @@ Internet).") name "-" version ".tar.xz")) (sha256 (base32 - "14p4w0m04c8msdwb3mjfzx6w0lcmln65j3rfvqp58nv5n4yh5dp7")))) + "06gscipc3914gwiswhp1xx4sy74bpy645ykq2i6r1sb6sm16hmja")))) (build-system cmake-build-system) (native-inputs `(("dbus" ,dbus) @@ -532,7 +532,7 @@ propagate their changes to their respective configuration files.") (define-public kcoreaddons (package (name "kcoreaddons") - (version "5.54.0") + (version "5.55.0") (source (origin (method url-fetch) (uri (string-append @@ -541,7 +541,7 @@ propagate their changes to their respective configuration files.") name "-" version ".tar.xz")) (sha256 (base32 - "1n27786js8j8na7kgxirhmswxcz3qkfiqzfabqmmsd0jp4rx1s79")))) + "1j7bc5fhak8db3vdfslbjdffbdclakhfwsni2a855d08yfrl1n1w")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -589,7 +589,7 @@ many more.") (define-public kdbusaddons (package (name "kdbusaddons") - (version "5.54.0") + (version "5.55.0") (source (origin (method url-fetch) (uri (string-append @@ -598,7 +598,7 @@ many more.") name "-" version ".tar.xz")) (sha256 (base32 - "1fvlspqc3w3y4p04gnqz6vrfvl93iwckfk16p608fz7yfgdmlzbf")) + "1sj3cycgci3ih65bkh7bsvbzyp7r654ppcryj4azpcsxqhy5gc7l")) (patches (search-patches "kdbusaddons-kinit-file-name.patch")))) (build-system cmake-build-system) (native-inputs @@ -634,7 +634,7 @@ as well as an API to create KDED modules.") (define-public kdnssd (package (name "kdnssd") - (version "5.54.0") + (version "5.55.0") (source (origin (method url-fetch) (uri (string-append @@ -643,7 +643,7 @@ as well as an API to create KDED modules.") name "-" version ".tar.xz")) (sha256 (base32 - "00sqx2hyqd9yw4nwdl8kmbzm0v0szgqv4nz0q6bchv3hfbax6zk7")))) + "0lljj7mxmqm60kfzr37zb7z58mfyfh7zgykf7a5is1k0lxpgk6zc")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -662,7 +662,7 @@ infrastructure.") (define-public kguiaddons (package (name "kguiaddons") - (version "5.54.0") + (version "5.55.0") (source (origin (method url-fetch) (uri (string-append @@ -671,7 +671,7 @@ infrastructure.") name "-" version ".tar.xz")) (sha256 (base32 - "0lkqxsqdjmc7060pxi5j8gx15kmrb8450cpinzn89nzpdl7rj935")))) + "190jwhvq2fi8g03saszlaslzxmcbqrbwli9f9vm6h5j9nnc0z6h3")))) (build-system cmake-build-system) ;; TODO: Build packages for the Python bindings. Ideally this will be ;; done for all versions of python guix supports. Requires python, @@ -700,7 +700,7 @@ interfaces in the areas of colors, fonts, text, images, keyboard input.") (define-public ki18n (package (name "ki18n") - (version "5.54.0") + (version "5.55.0") (source (origin (method url-fetch) (uri (string-append @@ -709,7 +709,7 @@ interfaces in the areas of colors, fonts, text, images, keyboard input.") name "-" version ".tar.xz")) (sha256 (base32 - "0drbyr2y44h1d88nbgxvp4ix46lin51r8vzhhnjhq2ydqy5za3p3")))) + "0kvwjzqibby9fawyfb8bd81abjhsjlyi8xy9mcapnih5x2gx3z92")))) (build-system cmake-build-system) (propagated-inputs `(("gettext" ,gettext-minimal) @@ -743,7 +743,7 @@ translation scripting.") (define-public kidletime (package (name "kidletime") - (version "5.54.0") + (version "5.55.0") (source (origin (method url-fetch) (uri (string-append @@ -752,7 +752,7 @@ translation scripting.") name "-" version ".tar.xz")) (sha256 (base32 - "1x0z0ipdizgv6jkklxp6maclx8f6ya2bv1q39hvxxnnmly8q3vjm")))) + "1kq6zh6cjhzffjhxnc7l1pw6g38swxyspp8xl8c860zdhc9xfd1g")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -774,7 +774,7 @@ or user activity.") ;; plasma-framework which is tier 3. (package (name "kirigami") - (version "5.54.0") + (version "5.55.0") (source (origin (method url-fetch) (uri (string-append @@ -783,7 +783,7 @@ or user activity.") "kirigami2-" version ".tar.xz")) (sha256 (base32 - "0iny9br3vpakvv0bmgy0mmw2y10d4kqbahjpfa3726qai4gligp2")))) + "11djxli5cq7pn19lmjz2y7z39mhlr98jskasfzyax546j47v973k")))) (properties `((upstream-name . "kirigami2"))) (build-system cmake-build-system) (native-inputs @@ -810,7 +810,7 @@ of applications that follow the Kirigami Human Interface Guidelines.") (define-public kitemmodels (package (name "kitemmodels") - (version "5.54.0") + (version "5.55.0") (source (origin (method url-fetch) (uri (string-append @@ -819,7 +819,7 @@ of applications that follow the Kirigami Human Interface Guidelines.") name "-" version ".tar.xz")) (sha256 (base32 - "1s3wv75sbb4kpgz02cbm7smp8h6rk1ixv0gafbvz9514i9g4d760")))) + "13609avkqrfi79zyr737662nr8bwcfdya9dxc6gzyqx5i0l2nbw6")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -869,7 +869,7 @@ model to observers (define-public kitemviews (package (name "kitemviews") - (version "5.54.0") + (version "5.55.0") (source (origin (method url-fetch) (uri (string-append @@ -878,7 +878,7 @@ model to observers name "-" version ".tar.xz")) (sha256 (base32 - "1cw9i8xik287rvb12alpqsph902nhfmbn4cfjx5gj7k888n8k3mk")))) + "1mgh7z5xcbhc7a2qq8mqfp7j4amk93hypkpy2zc3rdhc60ps94ad")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -904,7 +904,7 @@ to flat and hierarchical lists.") (define-public kplotting (package (name "kplotting") - (version "5.54.0") + (version "5.55.0") (source (origin (method url-fetch) (uri (string-append @@ -913,7 +913,7 @@ to flat and hierarchical lists.") name "-" version ".tar.xz")) (sha256 (base32 - "02mab80jyfgdj8xwbwkm181cc5vpsmbn561242q7ayjgxdiszzw9")))) + "0nn2v1yvvpzpi1y1pm47zvmwsa942c7d9n8iqymqihnp0fqjr8y7")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -939,7 +939,7 @@ pixel units.") (define-public ksyntaxhighlighting (package (name "ksyntaxhighlighting") - (version "5.54.0") + (version "5.55.0") (source (origin (method url-fetch) (uri (string-append @@ -948,7 +948,7 @@ pixel units.") "syntax-highlighting-" version ".tar.xz")) (sha256 (base32 - "022mpkbgc458qcn25pn3a3m2dzy6lq23r7fqbgp22jr6xalfi5hl")))) + "00w5nmz9l70znv8q7q1zw3f7gngwfgf41iwbs53zqcv1z7wmrz6m")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -988,7 +988,7 @@ integration with a custom editor as well as a ready-to-use (define-public kwayland (package (name "kwayland") - (version "5.54.0") + (version "5.55.0") (source (origin (method url-fetch) (uri (string-append @@ -997,7 +997,7 @@ integration with a custom editor as well as a ready-to-use name "-" version ".tar.xz")) (sha256 (base32 - "0y1710l68qlf37zy26nyn25r50a00mrm5cnwgfs9f40s749amigf")))) + "0m9q13qzgvp03jrsyc59l6pp7jf0dvhx768p21drs46qxw6wla7l")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1027,7 +1027,7 @@ represented by a QPoint or a QSize.") (define-public kwidgetsaddons (package (name "kwidgetsaddons") - (version "5.54.0") + (version "5.55.0") (source (origin (method url-fetch) (uri (string-append @@ -1036,7 +1036,7 @@ represented by a QPoint or a QSize.") name "-" version ".tar.xz")) (sha256 (base32 - "01qxklhigfazhma0f6m1fkcbh9waxpvzpz6y2jlflvgbw2db82gh")))) + "0kpbvvmjrhxxjqc0cb63zlq06a3xspq43xv3wdingcn28zypynzc")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1074,7 +1074,7 @@ configuration pages, message boxes, and password requests.") (define-public kwindowsystem (package (name "kwindowsystem") - (version "5.54.0") + (version "5.55.0") (source (origin (method url-fetch) (uri (string-append @@ -1083,7 +1083,7 @@ configuration pages, message boxes, and password requests.") name "-" version ".tar.xz")) (sha256 (base32 - "1n9h4gg5ih29avvcpplqfy7nq58xx6jv6a04m1wkjr1rzn4dyfnb")))) + "10zdxm08d758zbwlrbsn0ghxjpf39ids2s5pnca072gbrbrxv656")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1135,7 +1135,7 @@ lower level classes for interaction with the X Windowing System.") (define-public modemmanager-qt (package (name "modemmanager-qt") - (version "5.54.0") + (version "5.55.0") (source (origin (method url-fetch) (uri (string-append @@ -1144,7 +1144,7 @@ lower level classes for interaction with the X Windowing System.") name "-" version ".tar.xz")) (sha256 (base32 - "0n54gh83b6d42azv40km7j223qb2f4f9ng23xvvawzc7l2ksm350")))) + "10pkgm4dzsrfnjsf78pssd1wp0y27d1y834chd267hx9vgrv8axm")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1173,7 +1173,7 @@ messages.") (define-public networkmanager-qt (package (name "networkmanager-qt") - (version "5.54.0") + (version "5.55.0") (source (origin (method url-fetch) (uri (string-append @@ -1182,7 +1182,7 @@ messages.") name "-" version ".tar.xz")) (sha256 (base32 - "0bh5li6r7r3nws5zj0hp4iy4xhiyh7rszzwpp6ag93vz5g5fsl9y")))) + "0j8l4k13vsqh0a8mw8dw5bc78xvxhz2rh7bb870as04i32bvw772")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1212,7 +1212,7 @@ which are used in DBus communication.") (define-public oxygen-icons (package (name "oxygen-icons") - (version "5.54.0") + (version "5.55.0") (source (origin (method url-fetch) (uri (string-append @@ -1221,7 +1221,7 @@ which are used in DBus communication.") name "5" "-" version ".tar.xz")) (sha256 (base32 - "1sdd8ygkyl4d1mwrachcf0ahpikkby3xhdyz212xj9qmhmsgwa46")))) + "0fvm9bq1573xkha4a577s1iik8nwzks8xhrli5mm6rbh53s12wp4")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1237,7 +1237,7 @@ which are used in DBus communication.") (define-public prison (package (name "prison") - (version "5.54.0") + (version "5.55.0") (source (origin (method url-fetch) @@ -1245,7 +1245,7 @@ which are used in DBus communication.") (version-major+minor version) "/" name "-" version ".tar.xz")) (sha256 - (base32 "1z7gymk4hkwaa0ni1454ndvpm2lwqyyfbih38h0lfb8lrswnv3kb")))) + (base32 "1xadc2fq6csml78czg5p572cwvmqmn334a5dxjnd7k1pdx50gi07")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -1262,7 +1262,7 @@ provides uniform access to generation of barcodes with data.") (define-public qqc2-desktop-style (package (name "qqc2-desktop-style") - (version "5.54.0") + (version "5.55.0") (source (origin (method url-fetch) (uri (string-append @@ -1271,7 +1271,7 @@ provides uniform access to generation of barcodes with data.") name "-" version ".tar.xz")) (sha256 (base32 - "1shw3c6cr5xanzyl5zv3isyhvzi20zn3xf7m963z1qn8ypaz1by8")))) + "0aj37ldc3ywqap3sz73j54kbzycn529imr15jgl252k04rqpjya5")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1296,7 +1296,7 @@ feel.") (define-public solid (package (name "solid") - (version "5.54.0") + (version "5.55.0") (source (origin (method url-fetch) (uri (string-append @@ -1305,7 +1305,7 @@ feel.") name "-" version ".tar.xz")) (sha256 (base32 - "0hmh9hndfs1ikaja07ddag7jr8804q4g6p74rhqsrfk2sjz0pmr9")))) + "18dw55g41q34m2qzvybvpsas1dnyryqxnlf2md0xc4r36ib9p2pn")))) (build-system cmake-build-system) (arguments `(#:phases @@ -1335,7 +1335,7 @@ system.") (define-public sonnet (package (name "sonnet") - (version "5.54.0") + (version "5.55.0") (source (origin (method url-fetch) (uri (string-append @@ -1344,7 +1344,7 @@ system.") name "-" version ".tar.xz")) (sha256 (base32 - "0ccz0gbypzdndaxrfkjhry90jjdh5a56pm4j41z835q96w6piclz")))) + "13bb1s2f4kfaikcga297j2fqlyr4qxdcq4v1b3zs1gas4z1wpcg6")))) (build-system cmake-build-system) (arguments `(#:phases @@ -1372,7 +1372,7 @@ ASpell and HUNSPELL.") (define-public threadweaver (package (name "threadweaver") - (version "5.54.0") + (version "5.55.0") (source (origin (method url-fetch) (uri (string-append @@ -1381,7 +1381,7 @@ ASpell and HUNSPELL.") name "-" version ".tar.xz")) (sha256 (base32 - "011k2pm0wr60sxnydicnchnarx4r6qja0w6iih3jfkw733qm6bxp")))) + "0r0ml5pz7h0vmydcg4gqqkl21lp6c5gqdwyfsnyad02dcjkh4hql")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -1402,7 +1402,7 @@ uses a job-based interface to queue tasks and execute them in an efficient way." (define-public kactivities (package (name "kactivities") - (version "5.54.0") + (version "5.55.0") (source (origin (method url-fetch) (uri (string-append @@ -1411,7 +1411,7 @@ uses a job-based interface to queue tasks and execute them in an efficient way." name "-" version ".tar.xz")) (sha256 (base32 - "0ipq71g6g7q6yncvbiabwn5kg2280k8ssibbbf6jyh2lg09dmjil")))) + "0dp9vx2nl9fnawzcz04fqa731s3bk2izxrqbvn71aqyrs7fymabg")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -1447,7 +1447,7 @@ with other frameworks.") (define-public kauth (package (name "kauth") - (version "5.54.0") + (version "5.55.0") (source (origin (method url-fetch) (uri (string-append @@ -1456,7 +1456,7 @@ with other frameworks.") name "-" version ".tar.xz")) (sha256 (base32 - "1ciabazig77rpfksvdlmixj2sa2qnasq13nwvjn3xksnajfm4p2h")))) + "1w6bp2kbp1sn4cl76fgl2pqrg660ix99qq4h65g090kc934np3zc")))) (build-system cmake-build-system) (native-inputs `(("dbus" ,dbus) @@ -1494,7 +1494,7 @@ utilities.") (define-public kcompletion (package (name "kcompletion") - (version "5.54.0") + (version "5.55.0") (source (origin (method url-fetch) (uri (string-append @@ -1503,7 +1503,7 @@ utilities.") name "-" version ".tar.xz")) (sha256 (base32 - "0sgg09l97amnng0ddxyjpk535097f87bmn60hjqrmpsqb0n3a460")))) + "08ym79fqk7vshsf3jk37d6jvg7ys63kwflcn5dff5ci18jan2ir2")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1530,7 +1530,7 @@ integrated it into your application's other widgets.") (define-public kcrash (package (name "kcrash") - (version "5.54.0") + (version "5.55.0") (source (origin (method url-fetch) (uri (string-append @@ -1539,7 +1539,7 @@ integrated it into your application's other widgets.") name "-" version ".tar.xz")) (sha256 (base32 - "0wlrlzwdi9dpxkky9sadmbgw0rjisxhym9hr8gzydd2y8q4cr8a7")))) + "08a8c5mbj6ll0d1ivhcjx5ga1jfbnwxsk618wcfpwwi6mkxrc3f9")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -1565,7 +1565,7 @@ application crashes.") (define-public kdoctools (package (name "kdoctools") - (version "5.54.0") + (version "5.55.0") (source (origin (method url-fetch) (uri (string-append @@ -1574,7 +1574,7 @@ application crashes.") name "-" version ".tar.xz")) (sha256 (base32 - "0xbmdqlvyw9s2g8kwn1wmvz09pn4vs386ibm1p92wdnpspp5did6")))) + "0dlal0vkxf5yh1hbfhrcrxqqi1w43q7bvv8ws8pb18jjgimzr46l")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -1622,7 +1622,7 @@ from DocBook files.") (define-public kfilemetadata (package (name "kfilemetadata") - (version "5.54.0") + (version "5.55.0") (source (origin (method url-fetch) (uri (string-append @@ -1631,7 +1631,7 @@ from DocBook files.") name "-" version ".tar.xz")) (sha256 (base32 - "1hl61y15nqr5h5k4jqfz9bjj4gw6wdaiacxaslcwzn0sg4xyavab")))) + "0fqj266f9f66rfjzg0rl35fac5rn5n3npyfb4gsla3mdc8fjz9mi")))) (build-system cmake-build-system) (arguments `(#:phases @@ -1674,7 +1674,7 @@ by applications to write metadata.") (define-public kimageformats (package (name "kimageformats") - (version "5.54.0") + (version "5.55.0") (source (origin (method url-fetch) (uri (string-append @@ -1683,7 +1683,7 @@ by applications to write metadata.") name "-" version ".tar.xz")) (sha256 (base32 - "0xfzpzaqgdncwxvg27qb0ryqi78nbsi0xcsg9cjmgspfx5mlgi15")))) + "0hhxv8m5993vlpi5yf7w3fadzckficn16flshdkby7bwq8agrbz1")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1728,7 +1728,7 @@ formats.") (define-public kjobwidgets (package (name "kjobwidgets") - (version "5.54.0") + (version "5.55.0") (source (origin (method url-fetch) (uri (string-append @@ -1737,7 +1737,7 @@ formats.") name "-" version ".tar.xz")) (sha256 (base32 - "0d3jxabjlf2s4p34pzrpfsg4xp9s8qd7dmg50yxl59dijd42xgxq")))) + "1pbx974jpn8n2080gblmbh8q0yb5wxb9xblpm100rbhpg20sc2by")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1756,7 +1756,7 @@ asynchronous jobs.") (define-public knotifications (package (name "knotifications") - (version "5.54.0") + (version "5.55.0") (source (origin (method url-fetch) (uri (string-append @@ -1765,7 +1765,7 @@ asynchronous jobs.") name "-" version ".tar.xz")) (sha256 (base32 - "1agglvwaf0wh3fcs0ww3jxn900ych4dsvbaylrx4qip6girfmiyn")))) + "1dbrk9r3w8pmg15bhrb8qdk4fiqvc9qggb67zvk1n7ddlfkyarz6")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1802,7 +1802,7 @@ covers feedback and persistent events.") (define-public kpackage (package (name "kpackage") - (version "5.54.0") + (version "5.55.0") (source (origin (method url-fetch) (uri (string-append @@ -1811,7 +1811,7 @@ covers feedback and persistent events.") name "-" version ".tar.xz")) (sha256 (base32 - "1s1n7r3j7l4kvd85dgssaaz70dd2w8vp34kwg49ak58cdai01vzb")) + "175b0lj4qybddjpc25b1p60lr8f9220i9ymk3wk3y3vf4893v833")) ;; Default to: external paths/symlinks can be followed by a ;; package (patches (search-patches "kpackage-allow-external-paths.patch")))) @@ -1863,7 +1863,7 @@ were traditional plugins.") (define-public kpty (package (name "kpty") - (version "5.54.0") + (version "5.55.0") (source (origin (method url-fetch) (uri (string-append @@ -1872,7 +1872,7 @@ were traditional plugins.") name "-" version ".tar.xz")) (sha256 (base32 - "04sj612x15311yk2jmr3ak430syp5p59w559670sd18ih99mf8m3")))) + "0r5080xl7x13qmjnjssb0d1pk626anaa4xahb7fi869fndr4xhzn")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -1900,7 +1900,7 @@ and communicating with them using a pty.") (define-public kunitconversion (package (name "kunitconversion") - (version "5.54.0") + (version "5.55.0") (source (origin (method url-fetch) (uri (string-append @@ -1909,7 +1909,7 @@ and communicating with them using a pty.") name "-" version ".tar.xz")) (sha256 (base32 - "0lxrydnjlilfm92aqrpd76dk8yfprgnb7nr66dwmbdmqz7znbl8h")))) + "1v5cfxk5v76w1f1qvrpilrs111wvp8bn2p3bswhqp4lg0qxync0q")))) (build-system cmake-build-system) (arguments `(#:phases @@ -1943,7 +1943,7 @@ gallons).") (define-public baloo (package (name "baloo") - (version "5.54.0") + (version "5.55.0") (source (origin (method url-fetch) (uri (string-append @@ -1952,7 +1952,7 @@ gallons).") name "-" version ".tar.xz")) (sha256 (base32 - "0wv8zi03plr279v9p923rwkx2kwhbpd6xlzyqi4v14vhcrmapg1c")))) + "068ms071639pskhjz37cszylvfzzqhp7x1rmwdfn5nlvzrv6lrxh")))) (build-system cmake-build-system) (propagated-inputs `(("kcoreaddons" ,kcoreaddons) @@ -2008,7 +2008,7 @@ maintaining an index of the contents of your files.") (define-public kactivities-stats (package (name "kactivities-stats") - (version "5.54.0") + (version "5.55.0") (source (origin (method url-fetch) (uri (string-append @@ -2017,7 +2017,7 @@ maintaining an index of the contents of your files.") name "-" version ".tar.xz")) (sha256 (base32 - "1ns7f110a5vwabb33b1lnpa85kk5radf87bxm1gw4gzglsv7747d")))) + "12n178244ysfak0x9qm9a2k814qi56w8xpkg03na7hlsz2l4y9v6")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -2038,7 +2038,7 @@ by which applications, and what documents have been linked to which activity.") (define-public kbookmarks (package (name "kbookmarks") - (version "5.54.0") + (version "5.55.0") (source (origin (method url-fetch) (uri (string-append @@ -2047,7 +2047,7 @@ by which applications, and what documents have been linked to which activity.") name "-" version ".tar.xz")) (sha256 (base32 - "1w4rqnzyars1pxam3nym1qily3ihd2j8cpkq8aha70nbj0dj3ckw")))) + "0vsn98znzdbiy8clbl9p3kiag3zvxgc9701gwg2ig8mpv3ci9lkg")))) (build-system cmake-build-system) (propagated-inputs `(("kwidgetsaddons" ,kwidgetsaddons))) @@ -2081,7 +2081,7 @@ using the XBEL format.") (define-public kcmutils (package (name "kcmutils") - (version "5.54.0") + (version "5.55.0") (source (origin (method url-fetch) (uri (string-append @@ -2090,7 +2090,7 @@ using the XBEL format.") name "-" version ".tar.xz")) (sha256 (base32 - "0a5jz9m27nyl1vchp68170j9v5z4csyv43vpnfs09l6wk9ggdcwh")))) + "1f49864xpxrbj77n7l474wkn3rw4zy8vkl3psdya7ccdk7ac2s0k")))) (build-system cmake-build-system) (propagated-inputs `(("kconfigwidgets" ,kconfigwidgets) @@ -2134,7 +2134,7 @@ KCModules can be created with the KConfigWidgets framework.") (define-public kconfigwidgets (package (name "kconfigwidgets") - (version "5.54.0") + (version "5.55.0") (source (origin (method url-fetch) (uri (string-append @@ -2143,7 +2143,7 @@ KCModules can be created with the KConfigWidgets framework.") name "-" version ".tar.xz")) (sha256 (base32 - "1l3hh7qgnz7mnn55abv03pq7zal9dgcw5gnhfr747wknd4h90w31")))) + "0npfp6z5lc2h8y6slmz3sbymyyv9k2w73rpsjzl5zswqhzlvrb5k")))) (build-system cmake-build-system) (propagated-inputs `(("kauth" ,kauth) @@ -2184,7 +2184,7 @@ their settings.") (define-public kdeclarative (package (name "kdeclarative") - (version "5.54.0") + (version "5.55.0") (source (origin (method url-fetch) (uri (string-append @@ -2193,7 +2193,7 @@ their settings.") name "-" version ".tar.xz")) (sha256 (base32 - "0ankjqrlpnj3c9sjnv5p8w279zizkl5ps3i5zw16hg44v6hdmcj0")))) + "043jl7rn9yawh04fwgaxb8iwksn3z8qb4yfc4s6v1znwcs7ajlda")))) (build-system cmake-build-system) (propagated-inputs `(("kconfig" ,kconfig) @@ -2247,7 +2247,7 @@ that offer bindings to some of the Frameworks.") (define-public kded (package (name "kded") - (version "5.54.0") + (version "5.55.0") (source (origin (method url-fetch) (uri (string-append @@ -2256,7 +2256,7 @@ that offer bindings to some of the Frameworks.") name "-" version ".tar.xz")) (sha256 (base32 - "131hvxpqvkyh1sfb1j19jjzy7fyy6xisvpmx12lw1pvks0cnrqgn")))) + "0kn9kzzji257mppd12jzwiibha8127ajxvng2ls765lylv9nad7q")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -2280,7 +2280,7 @@ started on demand.") (define-public kdesignerplugin (package (name "kdesignerplugin") - (version "5.54.0") + (version "5.55.0") (source (origin (method url-fetch) (uri (string-append @@ -2289,7 +2289,7 @@ started on demand.") name "-" version ".tar.xz")) (sha256 (base32 - "0hlywnzd3d6bvhib1xqiqx39m7k8g16wsj102f7awd5gw3xrz8ga")))) + "114035wil0p5z6h0li8wjzivsdxhqbih54kn4nvhn43b71xnzs3y")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -2331,7 +2331,7 @@ ini-style description files.") (define-public kdesu (package (name "kdesu") - (version "5.54.0") + (version "5.55.0") (source (origin (method url-fetch) (uri (string-append @@ -2340,7 +2340,7 @@ ini-style description files.") name "-" version ".tar.xz")) (sha256 (base32 - "1qhw1hmq2b6rkyibidmg532llv31vkhmp0a7j2myzi40ydbx1lar")))) + "1x2gjnmgpcaxvfav2pm92zfgxbn60awpvmn9ycs68rq47p6h9x0f")))) (build-system cmake-build-system) (propagated-inputs `(("kpty" ,kpty))) @@ -2362,7 +2362,7 @@ with su and ssh respectively.") (define-public kdewebkit (package (name "kdewebkit") - (version "5.54.0") + (version "5.55.0") (source (origin (method url-fetch) (uri (string-append @@ -2371,7 +2371,7 @@ with su and ssh respectively.") name "-" version ".tar.xz")) (sha256 (base32 - "0prl9751a8nv7qhg7fv8qygq0llh71w2p25sldl3zif44340jnhf")))) + "1mnbdsiih94hlwwff9fs9gnzl3y7ayf1pskmz1rajgjmqd6rm7mm")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -2394,7 +2394,7 @@ engine WebKit via QtWebKit.") (define-public kemoticons (package (name "kemoticons") - (version "5.54.0") + (version "5.55.0") (source (origin (method url-fetch) (uri (string-append @@ -2403,7 +2403,7 @@ engine WebKit via QtWebKit.") name "-" version ".tar.xz")) (sha256 (base32 - "0ypcffpp0m75qwam386q6pyfbsij16y2vgpkn38li6ypxlxsvx2v")))) + "03vx22f9mjd10qm61f6ihr283w2sarrhg0rssxp7g7wahvshcvmh")))) (build-system cmake-build-system) (propagated-inputs `(("kservice" ,kservice))) @@ -2434,7 +2434,7 @@ emoticons coming from different providers.") (define-public kglobalaccel (package (name "kglobalaccel") - (version "5.54.0") + (version "5.55.0") (source (origin (method url-fetch) (uri (string-append @@ -2443,7 +2443,7 @@ emoticons coming from different providers.") name "-" version ".tar.xz")) (sha256 (base32 - "10gl8prc1n0si52cmiglkz8dx79dylmxrh5mjpmyy5yy16chs1s1")))) + "1c6dxp6jvbw8l74n1mv0v62yr34b9447szhvd61y4sxmmfjimhz4")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -2478,7 +2478,7 @@ window does not need focus for them to be activated.") (define-public kiconthemes (package (name "kiconthemes") - (version "5.54.0") + (version "5.55.0") (source (origin (method url-fetch) (uri (string-append @@ -2487,7 +2487,7 @@ window does not need focus for them to be activated.") name "-" version ".tar.xz")) (sha256 (base32 - "0hc3a6ax3yizpbvklxw3pm0r6j0r5jqx2ffbz1980g21lcgshd7g")))) + "1rgbfklb7xxg7z2zyrsmaxf883ixgfbkqilps3npwk3xac2f66rw")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -2525,7 +2525,7 @@ in applications using the KDE Frameworks.") (define-public kinit (package (name "kinit") - (version "5.54.0") + (version "5.55.0") (source (origin (method url-fetch) (uri (string-append @@ -2534,7 +2534,7 @@ in applications using the KDE Frameworks.") name "-" version ".tar.xz")) (sha256 (base32 - "0pmr6ckysdqpni49i9jgapsk88jfbrnlfybpcp3v51kl2nkwm0i9")) + "11xwiny5sfqbdls249vnq6ssp5pzw1w9wg4ql9nkwwygl4ml8b9y")) ;; Use the store paths for other packages and dynamically loaded ;; libs (patches (search-patches "kinit-kdeinit-extra_libs.patch" @@ -2593,7 +2593,7 @@ makes starting KDE applications faster and reduces memory consumption.") (define-public kio (package (name "kio") - (version "5.54.1") + (version "5.55.0") (source (origin (method url-fetch) (uri (string-append @@ -2602,7 +2602,7 @@ makes starting KDE applications faster and reduces memory consumption.") name "-" version ".tar.xz")) (sha256 (base32 - "11wdsq87w1ddkrm0mpik2qf0c0k897f1rflszfrrwkplfb0z63xp")) + "1k3cn7hvp5z9nirss29v164hahrlvlqivxlk64c8w9ynjx699ira")) (patches (search-patches "kio-search-smbd-on-PATH.patch")))) (build-system cmake-build-system) (propagated-inputs @@ -2686,7 +2686,7 @@ KIO enabled infrastructure.") (define-public knewstuff (package (name "knewstuff") - (version "5.54.0") + (version "5.55.0") (source (origin (method url-fetch) (uri (string-append @@ -2695,7 +2695,7 @@ KIO enabled infrastructure.") name "-" version ".tar.xz")) (sha256 (base32 - "1l3ibadjvaqqjsb1lhkf6jkzy80dk15fgid125bqk4amwsyygnd3")))) + "0a2d9wrhjsjl0klsrn501sp9681v7qmq6hmalw061arjv165dzw2")))) (build-system cmake-build-system) (propagated-inputs `(("attica" ,attica) @@ -2742,7 +2742,7 @@ specification.") (define-public knotifyconfig (package (name "knotifyconfig") - (version "5.54.0") + (version "5.55.0") (source (origin (method url-fetch) (uri (string-append @@ -2751,7 +2751,7 @@ specification.") name "-" version ".tar.xz")) (sha256 (base32 - "1ibxqi0y43qgjj4nikxwfppmda9xjmz63c5fml8c4w5d9mdag3if")))) + "01hxj6s2sq5k5j6j1y4c5gxyl1886j7ghh0hdc95b7n4gdjwwbci")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -2784,7 +2784,7 @@ notifications which can be embedded in your application.") (define-public kparts (package (name "kparts") - (version "5.54.0") + (version "5.55.0") (source (origin (method url-fetch) (uri (string-append @@ -2793,7 +2793,7 @@ notifications which can be embedded in your application.") name "-" version ".tar.xz")) (sha256 (base32 - "0y2dr286hb2w4r7ifq39vd7ajsalqyh9d91dm19b2rpgdmvgxai6")))) + "0gqkgnvkdai8hbg1n32jq4a3yzlkarmw8a7hxlfr0ykgysanjh65")))) (build-system cmake-build-system) (propagated-inputs `(("kio" ,kio) @@ -2836,7 +2836,7 @@ widgets with a user-interface defined in terms of actions.") (define-public kpeople (package (name "kpeople") - (version "5.54.0") + (version "5.55.0") (source (origin (method url-fetch) (uri (string-append @@ -2845,7 +2845,7 @@ widgets with a user-interface defined in terms of actions.") name "-" version ".tar.xz")) (sha256 (base32 - "0sl8wcj7w9vgczcv8mfvjlnghidyadbh1qsiv0pj63ywl7xgr1hx")))) + "0vbgi4l14g4f0klbxqbkjcag6yi0ghhpxn5nik5sssmcx8qyk885")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -2879,7 +2879,7 @@ to easily extend the contacts collection.") (define-public krunner (package (name "krunner") - (version "5.54.0") + (version "5.55.0") (source (origin (method url-fetch) (uri (string-append @@ -2888,7 +2888,7 @@ to easily extend the contacts collection.") name "-" version ".tar.xz")) (sha256 (base32 - "06y592v32926wq9iaypryj0173ca05vv0p5rrs4n77kwhkl0zq0v")))) + "0yw2jh9dailhcwkkjl2qggg5k90bwbfsn88a3hzwyj2ng2haypis")))) (build-system cmake-build-system) (propagated-inputs `(("plasma-framework" ,plasma-framework))) @@ -2949,7 +2949,7 @@ typed.") (define-public kservice (package (name "kservice") - (version "5.54.0") + (version "5.55.0") (source (origin (method url-fetch) (uri (string-append @@ -2958,7 +2958,7 @@ typed.") name "-" version ".tar.xz")) (sha256 (base32 - "10qmrqyfjhf5nzjailgmb86nq62ffrmiddk3880mh49fwxs4l3qx")))) + "0k8xksmw2ai7m0js7l98rv5v6ykifmnqiyy2yc1xhgn40lf1r89j")))) (build-system cmake-build-system) (propagated-inputs `(("kconfig" ,kconfig) @@ -3008,7 +3008,7 @@ types or handled by application specific code.") (define-public ktexteditor (package (name "ktexteditor") - (version "5.54.0") + (version "5.55.0") (source (origin (method url-fetch) (uri (string-append @@ -3017,7 +3017,7 @@ types or handled by application specific code.") name "-" version ".tar.xz")) (sha256 (base32 - "12yywvv82lmqmx89j1qxj45an49vx34brifxs9rpy3nxyh9c3vzy")))) + "0b5zqhm5aw7jj7dj600xa674ik11gwyzamhyz5962xhvsg5pyjwx")))) (build-system cmake-build-system) (propagated-inputs `(("kparts" ,kparts))) @@ -3088,7 +3088,7 @@ library.") (define-public ktextwidgets (package (name "ktextwidgets") - (version "5.54.0") + (version "5.55.0") (source (origin (method url-fetch) (uri (string-append @@ -3097,7 +3097,7 @@ library.") name "-" version ".tar.xz")) (sha256 (base32 - "154j3an7x787l44hw1fmksm3h6kziyaw4l61zw9mas24z3d86hl5")))) + "1ymqmb5z4flzrns3wdjagxbzbpighbincwbhy29a0mqg4zcm82xk")))) (build-system cmake-build-system) (propagated-inputs `(("ki18n" ,ki18n) @@ -3135,7 +3135,7 @@ It supports rich text as well as plain text.") (define-public kwallet (package (name "kwallet") - (version "5.54.0") + (version "5.55.0") (source (origin (method url-fetch) (uri (string-append @@ -3144,7 +3144,7 @@ It supports rich text as well as plain text.") name "-" version ".tar.xz")) (sha256 (base32 - "0hyipka97g2djk43x8pqbjvrgswsp8kph6za0s5dl4napfikq8k2")))) + "1dp072h5r6yd81i69759pj8klfsikrg25za44sry2kh6fxvwmngm")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -3177,7 +3177,7 @@ the passwords on KDE work spaces.") (define-public kxmlgui (package (name "kxmlgui") - (version "5.54.0") + (version "5.55.0") (source (origin (method url-fetch) (uri (string-append @@ -3186,7 +3186,7 @@ the passwords on KDE work spaces.") name "-" version ".tar.xz")) (sha256 (base32 - "01napbq81mcp9ngyl26an52l6ndsgrhzhy2mfd8jrbil2sbrcxq7")))) + "0ph67zarf1sccvp7882brrihv4dsmxq0nggan0rnk54qg0zdhgcn")))) (build-system cmake-build-system) (propagated-inputs `(("kconfig" ,kconfig) @@ -3229,7 +3229,7 @@ descriptions for integrating actions from plugins.") (define-public kxmlrpcclient (package (name "kxmlrpcclient") - (version "5.54.0") + (version "5.55.0") (source (origin (method url-fetch) (uri (string-append @@ -3238,7 +3238,7 @@ descriptions for integrating actions from plugins.") name "-" version ".tar.xz")) (sha256 (base32 - "199syc5wl8myc4vcvbnw4a8mlfkb2gcmgs57p8w7akp7mz6l75y6")))) + "1573wnv2fbjjzgx3f1qm7y8wlj22bz45mny0rxci90i76nnh4538")))) (build-system cmake-build-system) (propagated-inputs `(("kio" ,kio))) @@ -3272,7 +3272,7 @@ setUrl, setUserAgent and call.") (define-public plasma-framework (package (name "plasma-framework") - (version "5.54.0") + (version "5.55.0") (source (origin (method url-fetch) (uri (string-append @@ -3281,7 +3281,7 @@ setUrl, setUserAgent and call.") name "-" version ".tar.xz")) (sha256 (base32 - "1933i8irn76ilz3nychbnhy1bsc39iscn3qrab0lwmshfmw8c4zj")))) + "1pvxxw52s03i11p5byd2sh8sbvlk6h8q6briq9d4qvjy6c0pmbq4")))) (build-system cmake-build-system) (propagated-inputs `(("kpackage" ,kpackage) @@ -3369,7 +3369,7 @@ script engines.") (define-public kde-frameworkintegration (package (name "kde-frameworkintegration") - (version "5.54.0") + (version "5.55.0") (source (origin (method url-fetch) (uri (string-append @@ -3378,7 +3378,7 @@ script engines.") "frameworkintegration-" version ".tar.xz")) (sha256 (base32 - "1rzi3ydw7hjhg4vbsfan7zgaa2a2bmp7mph95h2kidf8x816qv2d")))) + "0pfpk268x06pjwciv4jr5v259kjck0sf4xzsgn29ifkmsk74wwmi")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -3426,7 +3426,7 @@ workspace.") (define-public kdelibs4support (package (name "kdelibs4support") - (version "5.54.0") + (version "5.55.0") (source (origin (method url-fetch) @@ -3435,7 +3435,7 @@ workspace.") (version-major+minor version) "/portingAids/" name "-" version ".tar.xz")) (sha256 - (base32 "02kklfcjsll4pf4rfll7jrr7jpcwd57954ypjjhn3xgr6p0w0hdm")))) + (base32 "1l1gjv06yp9jdiapiypwscbb6y0rfgrnw9rdsl7kkxh9ps8b8j39")))) (build-system cmake-build-system) (native-inputs `(("dbus" ,dbus) @@ -3542,7 +3542,7 @@ http://community.kde.org/Frameworks/Porting_Notes should help with this.") (define-public khtml (package (name "khtml") - (version "5.54.0") + (version "5.55.0") (source (origin (method url-fetch) @@ -3551,7 +3551,7 @@ http://community.kde.org/Frameworks/Porting_Notes should help with this.") (version-major+minor version) "/portingAids/" name "-" version ".tar.xz")) (sha256 - (base32 "17d8cim4ph7nxc5gkidhxc659yn9a7dqvnrihx9sj1cy01qnc7da")))) + (base32 "0wh9z5xm0gaf1c2s7cq7763jfyv83d58x80nwsvb0ayd6y8id1bq")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -3601,7 +3601,7 @@ technology and using KJS for JavaScript support.") (define-public kjs (package (name "kjs") - (version "5.54.0") + (version "5.55.0") (source (origin (method url-fetch) @@ -3610,7 +3610,7 @@ technology and using KJS for JavaScript support.") (version-major+minor version) "/portingAids/" name "-" version ".tar.xz")) (sha256 - (base32 "0bidbvbwbrbwwm0drw6l43vgmsp50c946jjq7pgnq1gf7mhscwcy")))) + (base32 "0c1wyxsgn70jvw7zcjjpw12w9sg9xxvyslgnqlnnyh8sx7rrp70c")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -3634,7 +3634,7 @@ support.") (define-public kjsembed (package (name "kjsembed") - (version "5.54.0") + (version "5.55.0") (source (origin (method url-fetch) @@ -3643,7 +3643,7 @@ support.") (version-major+minor version) "/portingAids/" name "-" version ".tar.xz")) (sha256 - (base32 "1pjpk8ysrnh78infq99i0wrf78h8h7hbfnr1m7agzffhbqa671z8")))) + (base32 "0dh9012y9bqj48jp50lrsmd28bbvf4jd93l34vfzmza252yvyw3l")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -3663,7 +3663,7 @@ QObjects, so you can script your applications.") (define-public kmediaplayer (package (name "kmediaplayer") - (version "5.54.0") + (version "5.55.0") (source (origin (method url-fetch) @@ -3672,7 +3672,7 @@ QObjects, so you can script your applications.") (version-major+minor version) "/portingAids/" name "-" version ".tar.xz")) (sha256 - (base32 "0qalqqkn2yvxgr45l7zm36bcpxwbgn8ngxsvyb5cxfaalwr0mkyf")))) + (base32 "0gpfrhgk2l63lyz0bz93cg7mc5g7mjvrkfvpyndmi1v7vhndp5zq")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -3709,7 +3709,7 @@ KParts instead.") (define-public kross (package (name "kross") - (version "5.54.0") + (version "5.55.0") (source (origin (method url-fetch) @@ -3718,7 +3718,7 @@ KParts instead.") (version-major+minor version) "/portingAids/" name "-" version ".tar.xz")) (sha256 - (base32 "18ij9339khskla4r0afl0n6x4pd157y1l5bk2ldb9anpck3p71kd")))) + (base32 "0p3q36gka6m62nryc3l11d30mlhiqjpghvfcyq6wikiqlv2kqvjs")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) -- cgit v1.2.3 From 76435771ebaa0ebbd37bc2d30c11610b0c0e777f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 15 Feb 2019 11:22:49 +0100 Subject: gnu: KDE Plasma: Update to 5.15.0. * gnu/packages/kde-plasma.scm (kdecoration, kscreenlocker, libkscreen, libksysguard): Update to 5.15.0. --- gnu/packages/kde-plasma.scm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm index 8d9d0b7660..d7a3ffaafd 100644 --- a/gnu/packages/kde-plasma.scm +++ b/gnu/packages/kde-plasma.scm @@ -36,14 +36,14 @@ (define-public kdecoration (package (name "kdecoration") - (version "5.14.5") + (version "5.15.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/kdecoration-" version ".tar.xz")) (sha256 (base32 - "115pli0qpa8lx0jasg1886fcg7gb2kk8v6k8r8l8c820l97sq7in")))) + "1pcyw6rrz0q7i2jnfvmjz2pixiw2aay19q3pxa1g3qvqydh3id5q")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -65,14 +65,14 @@ manager which re-parents a Client window to a window decoration frame.") (define-public kscreenlocker (package (name "kscreenlocker") - (version "5.14.5") + (version "5.15.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/kscreenlocker-" version ".tar.xz")) (sha256 (base32 - "16amr7pz0k6w5vkk1dwn2qi3s1mln0jypwmjazqq2lbwimn8k56m")))) + "1hgj2mzbbiqn52j3px2mzz6xzzpzr78q3bcai8ddc4gcl1xgs6yi")))) (build-system cmake-build-system) (arguments `(#:phases @@ -128,14 +128,14 @@ manager which re-parents a Client window to a window decoration frame.") (define-public libkscreen (package (name "libkscreen") - (version "5.14.5") + (version "5.15.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "1vyaml5ap9siw9idiny92li2bykd0nwjsmwmg0c7ad912j4g1s7y")))) + (base32 "1clw8966fmwih1fsjasvpgvfq7w728hlabl3i0zjz53r87hdw3mb")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -167,7 +167,7 @@ basic needs and easy to configure for those who want special setups.") (define-public libksysguard (package (name "libksysguard") - (version "5.14.5") + (version "5.15.0") (source (origin (method url-fetch) @@ -175,7 +175,7 @@ basic needs and easy to configure for those who want special setups.") "/libksysguard-" version ".tar.xz")) (sha256 (base32 - "11nz0g7dqvpvgsv0a7sai445vgfsfi25plj7jb1i46n7zf8i8mya")))) + "1aqkzbng2qq09rpb21r6drnn866b9y8yba3klhvhi0q5vg3p605d")))) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) ("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 284fb66a054dedab7d301fefb74a9c236a5d9e22 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 15 Feb 2019 11:24:49 +0100 Subject: gnu: KSysguard: Update home page. * gnu/packages/kde-plasma.scm (libksysguard)[home-page]: Set to . --- gnu/packages/kde-plasma.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm index d7a3ffaafd..d2aa90b26d 100644 --- a/gnu/packages/kde-plasma.scm +++ b/gnu/packages/kde-plasma.scm @@ -219,7 +219,7 @@ basic needs and easy to configure for those who want special setups.") (lambda _ ;; TODO: Fix this failing test-case (invoke "ctest" "-E" "processtest")))))) - (home-page "https://www.kde.org/info/plasma-5.13.4.php") + (home-page "https://userbase.kde.org/KSysGuard") (synopsis "Network enabled task and system monitoring") (description "KSysGuard can obtain information on system load and manage running processes. It obtains this information by interacting -- cgit v1.2.3 From 867fd0da496fc05c9b8d26233de3b5529f956859 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 15 Feb 2019 12:19:23 +0100 Subject: gnu: libdrm: Update to 2.4.97. * gnu/packages/xdisorg.scm (libdrm): Update to 2.4.97. --- gnu/packages/xdisorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 5359c4c9d9..ce8f6b522e 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -324,7 +324,7 @@ rasterisation.") (define-public libdrm (package (name "libdrm") - (version "2.4.96") + (version "2.4.97") (source (origin (method url-fetch) @@ -334,7 +334,7 @@ rasterisation.") ".tar.bz2")) (sha256 (base32 - "14xkip83qgljjaahzq40qgl60j54q7k00la1hbf5kk5lgg7ilmhd")) + "08yimlp6jir1rs5ajgdx74xa5qdzcqahpdzdk0rmkmhh7vdcrl3p")) (patches (search-patches "libdrm-symbol-check.patch")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From cf4cd8bcdf859897c694b0819b83ebdc6705add0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 15 Feb 2019 15:42:07 +0100 Subject: gnu: Add r-listenv. * gnu/packages/cran.scm (r-listenv): New variable. --- gnu/packages/cran.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 975884e881..a4a45dccac 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -10511,3 +10511,26 @@ tempering (function @code{temper}), and morphometric random walk Metropolis (function @code{morph.metrop}), which achieves geometric ergodicity by change of variable.") (license license:expat))) + +(define-public r-listenv + (package + (name "r-listenv") + (version "0.7.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "listenv" version)) + (sha256 + (base32 + "0ma5jsri2zqkrlsm9nqpikl7imbwfy1glsmk13mblw0q245h49k1")))) + (build-system r-build-system) + (native-inputs + `(("r-r-rsp" ,r-r-rsp))) ; vignette builder + (home-page "https://github.com/HenrikBengtsson/listenv") + (synopsis "Environments behaving (almost) as lists") + (description + "This package implements list environments. List environments are +environments that have list-like properties. For instance, the elements of a +list environment are ordered and can be accessed and iterated over using index +subsetting.") + (license license:lgpl2.1+))) -- cgit v1.2.3 From 226294a4ade8b287bd6582cf594cc9cb62a6bfde Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 15 Feb 2019 15:42:19 +0100 Subject: gnu: Add r-globals. * gnu/packages/cran.scm (r-globals): New variable. --- gnu/packages/cran.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index a4a45dccac..fbde319857 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -10534,3 +10534,27 @@ environments that have list-like properties. For instance, the elements of a list environment are ordered and can be accessed and iterated over using index subsetting.") (license license:lgpl2.1+))) + +(define-public r-globals + (package + (name "r-globals") + (version "0.12.4") + (source + (origin + (method url-fetch) + (uri (cran-uri "globals" version)) + (sha256 + (base32 + "0szyv1ayyk31bh3xqlkj43020w44xq6s4rw2bxwizyjssxm3b1br")))) + (build-system r-build-system) + (propagated-inputs + `(("r-codetools" ,r-codetools))) + (home-page "https://github.com/HenrikBengtsson/globals") + (synopsis "Identify global objects in R expressions") + (description + "This package provides tools to identify global (\"unknown\" or \"free\") +objects in R expressions by code inspection using various strategies, e.g. +conservative or liberal. The objective of this package is to make it as +simple as possible to identify global objects for the purpose of exporting +them in distributed compute environments.") + (license license:lgpl2.1+))) -- cgit v1.2.3 From b3080cddadf268bbcef845af07c6b8e0357afae8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 15 Feb 2019 15:42:29 +0100 Subject: gnu: Add r-future. * gnu/packages/cran.scm (r-future): New variable. --- gnu/packages/cran.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index fbde319857..6c99e13a7a 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -10558,3 +10558,35 @@ conservative or liberal. The objective of this package is to make it as simple as possible to identify global objects for the purpose of exporting them in distributed compute environments.") (license license:lgpl2.1+))) + +(define-public r-future + (package + (name "r-future") + (version "1.11.1.1") + (source + (origin + (method url-fetch) + (uri (cran-uri "future" version)) + (sha256 + (base32 + "1s4lyqg4mm1drzc6czaalmhmxfjgp4nznb14ql5xzny9rprgz43i")))) + (build-system r-build-system) + (propagated-inputs + `(("r-digest" ,r-digest) + ("r-globals" ,r-globals) + ("r-listenv" ,r-listenv))) + (native-inputs + `(("r-r-rsp" ,r-r-rsp))) ; vignette builder + (home-page "https://github.com/HenrikBengtsson/future") + (synopsis "Unified parallel and distributed processing in R") + (description + "The purpose of this package is to provide a lightweight and unified +Future API for sequential and parallel processing of R expression via futures. +This package implements sequential, multicore, multisession, and cluster +futures. With these, R expressions can be evaluated on the local machine, in +parallel a set of local machines, or distributed on a mix of local and remote +machines. Extensions to this package implement additional backends for +processing futures via compute cluster schedulers etc. Because of its unified +API, there is no need to modify any code in order to switch from sequential on +the local machine to, say, distributed processing on a remote compute cluster.") + (license license:lgpl2.1+))) -- cgit v1.2.3 From 9680047cda24a21e6823dfa49a3c7fbaf092a569 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 15 Feb 2019 15:42:38 +0100 Subject: gnu: Add r-future-apply. * gnu/packages/cran.scm (r-future-apply): New variable. --- gnu/packages/cran.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 6c99e13a7a..7e2539da81 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -10590,3 +10590,31 @@ processing futures via compute cluster schedulers etc. Because of its unified API, there is no need to modify any code in order to switch from sequential on the local machine to, say, distributed processing on a remote compute cluster.") (license license:lgpl2.1+))) + +(define-public r-future-apply + (package + (name "r-future-apply") + (version "1.1.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "future.apply" version)) + (sha256 + (base32 + "0b6v9rxvnnz13sydbgkapw71hx98fwdczjchgqnspjmq2340kdc0")))) + (properties `((upstream-name . "future.apply"))) + (build-system r-build-system) + (propagated-inputs + `(("r-future" ,r-future) + ("r-globals" ,r-globals))) + (native-inputs + `(("r-r-rsp" ,r-r-rsp))) ; vignette builder + (home-page "https://github.com/HenrikBengtsson/future.apply") + (synopsis "Apply function to elements in parallel using futures") + (description + "This package provides implementations of @code{apply()}, +@code{eapply()}, @code{lapply()}, @code{Map()}, @code{mapply()}, +@code{replicate()}, @code{sapply()}, @code{tapply()}, and @code{vapply()} that +can be resolved using any future-supported backend, e.g. parallel on the local +machine or distributed on a compute cluster.") + (license license:gpl2+))) -- cgit v1.2.3 From 867e2b1bb32cef651200cdd65042557f5c808909 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 15 Feb 2019 15:42:48 +0100 Subject: gnu: Add r-rsvd. * gnu/packages/cran.scm (r-rsvd): New variable. --- gnu/packages/cran.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 7e2539da81..82fd465d79 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -10618,3 +10618,35 @@ the local machine to, say, distributed processing on a remote compute cluster.") can be resolved using any future-supported backend, e.g. parallel on the local machine or distributed on a compute cluster.") (license license:gpl2+))) + +(define-public r-rsvd + (package + (name "r-rsvd") + (version "1.0.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "rsvd" version)) + (sha256 + (base32 + "0vjhrvnkl9rmvl8sv2kac5sd10z3fgxymb676ynxzc2pmhydy3an")))) + (build-system r-build-system) + (propagated-inputs + `(("r-matrix" ,r-matrix))) + (home-page "https://github.com/erichson/rSVD") + (synopsis "Randomized singular value decomposition") + (description + "Low-rank matrix decompositions are fundamental tools and widely used for +data analysis, dimension reduction, and data compression. Classically, highly +accurate deterministic matrix algorithms are used for this task. However, the +emergence of large-scale data has severely challenged our computational +ability to analyze big data. The concept of randomness has been demonstrated +as an effective strategy to quickly produce approximate answers to familiar +problems such as the @dfn{singular value decomposition} (SVD). This package +provides several randomized matrix algorithms such as the randomized singular +value decomposition (@code{rsvd}), randomized principal component +analysis (@code{rpca}), randomized robust principal component +analysis (@code{rrpca}), randomized interpolative decomposition (@code{rid}), +and the randomized CUR decomposition (@code{rcur}). In addition several plot +functions are provided.") + (license license:gpl3+))) -- cgit v1.2.3 From e191e8485950477b2da37f23fd0d611e1e3f92e0 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 11 Feb 2019 11:00:18 -0500 Subject: gnu: Borg: Update to 1.1.9. * gnu/packages/backup.scm (borg): Update to 1.1.9. [arguments]: Remove the 'remove-documentation-timestamps' phase and adjust the 'install-doc' phase to ensure the manual pages are not a source of non-determinism. --- gnu/packages/backup.scm | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 970d0adb06..4881ca62da 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -512,14 +512,14 @@ detection, and lossless compression.") (define-public borg (package (name "borg") - (version "1.1.8") + (version "1.1.9") (source (origin (method url-fetch) (uri (pypi-uri "borgbackup" version)) (sha256 (base32 - "0qqvcscn1l4y83x4sh3izdpmr8zq38j8chjkpfq4q4d01i470hqb")) + "0x95nhv4h34m8cxycbwc4xdz350saaxlgh727b23bgn4ci7gh3vx")) (modules '((guix build utils))) (snippet '(begin @@ -565,11 +565,6 @@ detection, and lossless compression.") ;; HOME=/homeless-shelter. (setenv "HOME" "/tmp") #t))) - (add-after 'unpack 'remove-documentation-timestamps ; reproducibility - (lambda _ - (substitute* "setup.py" - (("write\\(':Date:'.*") "\n")) - #t)) ;; The tests need to be run after Borg is installed. (delete 'check) (add-after 'install 'check @@ -606,8 +601,6 @@ detection, and lossless compression.") '("docs/misc/create_chunker-params.txt" "docs/misc/internals-picture.txt" "docs/misc/prune-example.txt")) - (add-installed-pythonpath inputs outputs) - (invoke "python3" "setup.py" "build_man") (copy-recursively "docs/man" man) #t)))))) (native-inputs -- cgit v1.2.3 From 63bf0afdf6a27702879c12d7d591c46246c7ad36 Mon Sep 17 00:00:00 2001 From: Alex Sassmannshausen Date: Fri, 15 Feb 2019 16:55:42 +0100 Subject: gnu: guile-hall: Update to 0.2. * gnu/packages/guile-xyz.scm (guile-hall): Update to 0.2. --- gnu/packages/guile-xyz.scm | 115 +++++++++++++++++++++++++-------------------- 1 file changed, 64 insertions(+), 51 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index a48954e7f2..590ceba192 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -1251,65 +1251,78 @@ above command-line parameters.") (define-public guile-hall (package (name "guile-hall") - (version "0.1.1") + (version "0.2") (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://gitlab.com/a-sassmannshausen/guile-hall") - (commit "7d1094a12fe917209ce5b76c681cc8c862d4c65b"))) - (file-name "guile-hall-0.1.1-checkout") - (sha256 - (base32 - "03kb09cjca98hlbx9mj12mqinzsnnvp6ci6i975n88pjhaxigyp1")))) + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/a-sassmannshausen/guile-hall") + (commit "54aeeb088ea2f1168090b7cdb95e3e70884f52f3"))) + (file-name "guile-hall-0.2-checkout") + (sha256 (base32 + "1bkbqgj24xh5b65sw2m98iggpi67b72szx1dsiq3cpzlcxplmgaz")))) (build-system gnu-build-system) (arguments - `(#:modules - ((ice-9 match) - (ice-9 ftw) - ,@%gnu-build-system-modules) - #:phases - (modify-phases %standard-phases - (add-after 'install 'hall-wrap-binaries - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin/")) - (site (string-append out "/share/guile/site")) - (config (assoc-ref inputs "guile-config"))) - (match (scandir site) - (("." ".." version) - (let ((modules (string-append site "/" version)) - (compiled-modules (string-append - out "/lib/guile/" version - "/site-ccache"))) - (wrap-program (string-append bin "hall") - `("GUILE_LOAD_PATH" ":" prefix - (,modules - ,(string-append config - "/share/guile/site/" - version))) - `("GUILE_LOAD_COMPILED_PATH" ":" prefix - (,compiled-modules - ,(string-append config "/lib/guile/" - version - "/site-ccache")))) - #t))))))))) + `(#:modules + ((ice-9 match) + (ice-9 ftw) + ,@%gnu-build-system-modules) + #:phases + (modify-phases + %standard-phases + (add-after 'install 'hall-wrap-binaries + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((compiled-dir + (lambda (out version) + (string-append + out "/lib/guile/" version "/site-ccache"))) + (uncompiled-dir + (lambda (out version) + (string-append + out "/share/guile/site" + (if (string-null? version) "" "/") version))) + (dep-path + (lambda (env modules path) + (list env ":" 'prefix + (cons modules + (map (lambda (input) + (string-append + (assoc-ref inputs input) + path)) + ,''("guile-config")))))) + (out (assoc-ref outputs "out")) + (bin (string-append out "/bin/")) + (site (uncompiled-dir out ""))) + (match (scandir site) + (("." ".." version) + (for-each + (lambda (file) + (wrap-program + (string-append bin file) + (dep-path + "GUILE_LOAD_PATH" + (uncompiled-dir out version) + (uncompiled-dir "" version)) + (dep-path + "GUILE_LOAD_COMPILED_PATH" + (compiled-dir out version) + (compiled-dir "" version)))) + ,''("hall")) + #t)))))))) (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("pkg-config" ,pkg-config) - ("texinfo" ,texinfo))) + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("pkg-config" ,pkg-config) + ("texinfo" ,texinfo))) (inputs `(("guile" ,guile-2.2))) (propagated-inputs - `(("guile-config" ,guile-config))) + `(("guile-config" ,guile-config "out"))) (synopsis "Guile project tooling") (description - "Hall is a command-line application and a set of Guile libraries that -allow you to quickly create and publish Guile projects. It allows you to -transparently support the GNU build system, manage a project hierarchy & -provides tight coupling to Guix.") - (home-page "https://gitlab.com/a-sassmannshausen/guile-hall") - (license license:gpl3+))) + "Hall is a command-line application and a set of Guile libraries that allow you to quickly create and publish Guile projects. It allows you to transparently support the GNU build system, manage a project hierarchy & provides tight coupling to Guix.") + (home-page + "https://gitlab.com/a-sassmannshausen/guile-hall") + (license gpl3+))) (define-public guile-ics (package -- cgit v1.2.3 From 06085facd5252797f69e16e00c682b26aaee5202 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 15 Feb 2019 17:34:48 +0100 Subject: gnu: guile-hall: Use license: prefix. * gnu/packages/guile-xyz.scm (guile-hall)[license]: Use license: prefix. --- gnu/packages/guile-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 590ceba192..1ae24efe17 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -1322,7 +1322,7 @@ above command-line parameters.") "Hall is a command-line application and a set of Guile libraries that allow you to quickly create and publish Guile projects. It allows you to transparently support the GNU build system, manage a project hierarchy & provides tight coupling to Guix.") (home-page "https://gitlab.com/a-sassmannshausen/guile-hall") - (license gpl3+))) + (license license:gpl3+))) (define-public guile-ics (package -- cgit v1.2.3 From feb11b08724f1101719decd669a68ae8581b5576 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 15 Feb 2019 17:37:28 +0100 Subject: gnu: guile-hall: Use git tag. * gnu/packages/guile-xyz.scm (guile-hall)[source]: Use tag and git-file-name. --- gnu/packages/guile-xyz.scm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 1ae24efe17..2dd9160c97 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -1253,14 +1253,14 @@ above command-line parameters.") (name "guile-hall") (version "0.2") (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://gitlab.com/a-sassmannshausen/guile-hall") - (commit "54aeeb088ea2f1168090b7cdb95e3e70884f52f3"))) - (file-name "guile-hall-0.2-checkout") - (sha256 (base32 - "1bkbqgj24xh5b65sw2m98iggpi67b72szx1dsiq3cpzlcxplmgaz")))) + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/a-sassmannshausen/guile-hall") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 (base32 + "1bkbqgj24xh5b65sw2m98iggpi67b72szx1dsiq3cpzlcxplmgaz")))) (build-system gnu-build-system) (arguments `(#:modules -- cgit v1.2.3 From 3c3e6620aebb6e0d82b268d82864212b5f432043 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 15 Feb 2019 17:43:49 +0100 Subject: gnu: guile-hall: Clean up. * gnu/packages/guile-xyz.scm (guile-hall)[description]: Break long line. [home-page]: Merge lines. [propagated-inputs]: Remove reference to default "out" output. --- gnu/packages/guile-xyz.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 2dd9160c97..8febe605a7 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -1316,12 +1316,14 @@ above command-line parameters.") ("texinfo" ,texinfo))) (inputs `(("guile" ,guile-2.2))) (propagated-inputs - `(("guile-config" ,guile-config "out"))) + `(("guile-config" ,guile-config))) (synopsis "Guile project tooling") (description - "Hall is a command-line application and a set of Guile libraries that allow you to quickly create and publish Guile projects. It allows you to transparently support the GNU build system, manage a project hierarchy & provides tight coupling to Guix.") - (home-page - "https://gitlab.com/a-sassmannshausen/guile-hall") + "Hall is a command-line application and a set of Guile libraries that +allow you to quickly create and publish Guile projects. It allows you to +transparently support the GNU build system, manage a project hierarchy & +provides tight coupling to Guix.") + (home-page "https://gitlab.com/a-sassmannshausen/guile-hall") (license license:gpl3+))) (define-public guile-ics -- cgit v1.2.3 From f7c4853a6b615f49ed7eb9e7cf9b7d8a1b46f30e Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Tue, 12 Feb 2019 04:09:28 +0100 Subject: gnu: Add genimage. * gnu/packages/genimage.scm: New file. * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. --- gnu/packages/genimage.scm | 194 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 194 insertions(+) create mode 100644 gnu/packages/genimage.scm (limited to 'gnu/packages') diff --git a/gnu/packages/genimage.scm b/gnu/packages/genimage.scm new file mode 100644 index 0000000000..792bddf5a5 --- /dev/null +++ b/gnu/packages/genimage.scm @@ -0,0 +1,194 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2018 Danny Milosavljevic +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages genimage) + #:use-module (guix utils) + #:use-module (guix packages) + #:use-module (guix git-download) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix build-system gnu) + #:use-module (guix build utils) + #:use-module (gnu packages) + #:use-module (gnu packages autotools) + #:use-module (gnu packages base) + #:use-module (gnu packages bash) + #:use-module (gnu packages bootloaders) + #:use-module (gnu packages cdrom) + #:use-module (gnu packages compression) + #:use-module (gnu packages cpio) + #:use-module (gnu packages disk) + #:use-module (gnu packages linux) + #:use-module (gnu packages mtools) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages virtualization) + #:use-module (gnu packages wm)) + +(define-public genimage + (package + (name "genimage") + (version "10") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/pengutronix/genimage.git") + (commit (string-append "v" version)))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "0had00p2why2l1fl14mq7nbhmmfbd3na4qnnpg36akdy05g67jbn")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'guixify + (lambda* (#:key inputs #:allow-other-keys) + ;; Note to maintainers: Check ".def =" lines in source. + (substitute* "config.c" + (("\\.def = \"cpio\"") + (string-append ".def = \"" + (assoc-ref inputs "cpio") + "/bin/cpio\"")) + (("\\.def = \"dd\"") + (string-append ".def = \"" + (assoc-ref inputs "coreutils") + "/bin/dd\"")) + (("\\.def = \"debugfs\"") + (string-append ".def = \"" + (assoc-ref inputs "e2fsprogs") + "/sbin/debugfs\"")) + (("\\.def = \"e2fsck\"") + (string-append ".def = \"" + (assoc-ref inputs "e2fsprogs") + "/sbin/e2fsck\"")) + (("\\.def = \"genext2fs\"") + (string-append ".def = \"" + (assoc-ref inputs "genext2fs") + "/bin/genext2fs\"")) + (("\\.def = \"genisoimage\"") + (string-append ".def = \"" + (assoc-ref inputs "cdrkit-libre") + "/bin/genisoimage\"")) + (("\\.def = \"mcopy\"") + (string-append ".def = \"" + (assoc-ref inputs "mtools") + "/bin/mcopy\"")) + (("\\.def = \"mmd\"") + (string-append ".def = \"" + (assoc-ref inputs "mtools") + "/bin/mmd\"")) + ;;; Note: mkcramfs is obsolete. + (("\\.def = \"mkdosfs\"") + (string-append ".def = \"" + (assoc-ref inputs "dosfstools") + "/sbin/mkfs.fat\"")) + (("\\.def = \"mke2fs\"") + (string-append ".def = \"" + (assoc-ref inputs "e2fsprogs") + "/sbin/mke2fs\"")) + (("\\.def = \"mkfs\\.jffs2\"") + (string-append ".def = \"" + (assoc-ref inputs "mtd-utils") + "/sbin/mkfs.jffs2\"")) + (("\\.def = \"mkfs\\.ubifs\"") + (string-append ".def = \"" + (assoc-ref inputs "mtd-utils") + "/sbin/mkfs.ubifs\"")) + (("\\.def = \"mksquashfs\"") + (string-append ".def = \"" + (assoc-ref inputs "squashfs-tools") + "/bin/mksquashfs\"")) + (("\\.def = \"qemu-img\"") + (string-append ".def = \"" + (assoc-ref inputs "qemu") + "/bin/qemu-img\"")) + (("\\.def = \"tar\"") + (string-append ".def = \"" + (assoc-ref inputs "tar") + "/bin/tar\"")) + (("\\.def = \"tune2fs\"") + (string-append ".def = \"" + (assoc-ref inputs "e2fsprogs") + "/sbin/tune2fs\"")) + (("\\.def = \"ubinize\"") + (string-append ".def = \"" + (assoc-ref inputs "mtd-utils") + "/sbin/ubinize\"")) + (("\\.def = \"mkimage\"") + (string-append ".def = \"" + (assoc-ref inputs "u-boot-tools") + "/bin/mkimage\""))) + (substitute* "test/basic-images.test" + ;; Work around bug in sharness.sh. + (("mkdosfs") + "mkfs.fat") + ;; Work around bug in sharness.sh. + (("dd,mkfs\\.fat,mcopy") + "dd,mkfs_fat,mcopy") + ;; Should be in the next upstream release. + (("qemu_img") "qemu-img")) + (substitute* "util.c" + (("\"/bin/sh\"") + (string-append "\"" (assoc-ref inputs "bash") "/bin/sh\""))) + ;; We don't have /etc/passwd so uid 0 is not known as "root". + ;; Thus patch it out. + (substitute* '("test/ext2test.dump" + "test/ext3test.dump" + "test/ext4test.dump" + "test/mke2fs.dump") + (("root") "unknown")) + #t)) + (add-before 'check 'setenv-check + (lambda _ + ;; Our container doesn't provide access to /etc/mtab + (setenv "EXT2FS_NO_MTAB_OK" "1") + ;; Make test reproducible + (setenv "GENIMAGE_MKFJFFS2" "mkfs.jffs2 -U") + (setenv "GENIMAGE_MKE2FS" "mke2fs -E no_copy_xattrs") + #t)) + (replace 'check + (lambda _ + (invoke "make" "TEST_LOG_COMPILER=" "check")))))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ;;; Note: cramfs is obsolete. + ("dtc" ,dtc) ; for the tests + ("fdisk" ,fdisk) ; for the tests + ("pkg-config" ,pkg-config) + ("util-linux" ,util-linux))) ; for the tests + (inputs + `(("bash" ,bash) + ("cdrkit-libre" ,cdrkit-libre) + ("cpio" ,cpio) + ;; Note: invoked by final executable. + ("coreutils" ,coreutils) ; chmod, dd + ("dosfstools" ,dosfstools) + ("e2fsprogs" ,e2fsprogs) + ("genext2fs" ,genext2fs) + ("libconfuse" ,libconfuse) + ("mtd-utils" ,mtd-utils) + ("mtools" ,mtools) + ("qemu" ,qemu-minimal) + ("squashfs-tools" ,squashfs-tools) + ("tar" ,tar) + ("u-boot-tools" ,u-boot-tools))) + (synopsis "Create Flash images according to specification") + (description "@command{genimage} creates Flash images according to a +specification file.") + (home-page "https://github.com/pengutronix/genimage") + (license license:gpl2))) -- cgit v1.2.3 From e83d46f02e360e713616b14e613209224a9493a4 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 15 Feb 2019 21:25:31 +0100 Subject: gnu: emacs-pulseaudio-control: Update to 20190105. * gnu/packages/emacs-xyz.scm (emacs-pulseaudio-control): Update to 20190105. --- gnu/packages/emacs-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 957c9ea613..63b0fc8402 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -9205,8 +9205,8 @@ navigate and display hierarchy structures.") (license license:gpl3+)))) (define-public emacs-pulseaudio-control - (let ((commit "1da372ec79f5d2fb901d1f9f0679fee8848fd011") - (revision "2")) + (let ((commit "7e1a87068379075a5e9ce36c64c686c03d20d379") + (revision "3")) (package (name "emacs-pulseaudio-control") (version (git-version "0.0.1" revision commit)) @@ -9219,7 +9219,7 @@ navigate and display hierarchy structures.") (file-name (git-file-name name version)) (sha256 (base32 - "02xrsms2pjqdk6327midi61i5vg2h9cq5jwaxv43ldm68wl7hi6k")))) + "0wcaqyh15x56255rrj350089z15pnwixa2vf0ly6dv0hjmzmh3mr")))) (build-system emacs-build-system) (arguments '(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From 3a34c9e62e5b4336f6dacaf24e0e7466b2fa241b Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 15 Feb 2019 21:26:08 +0100 Subject: gnu: emacs-helm-slime: Update to 20190214. * gnu/packages/emacs-xyz.scm (emacs-helm-slime): Update to 20190214. --- gnu/packages/emacs-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 63b0fc8402..aab9dc5d6e 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -12457,10 +12457,10 @@ correctly.") (license license:gpl2+)))) (define-public emacs-helm-slime - (let ((commit "9980925f3e5f6ac5a30369d2a544e82006a79c76")) + (let ((commit "bc4af154f2c18c8d9af968840f599d4c9974b668")) (package (name "emacs-helm-slime") - (version (git-version "0.0.0" "1" commit)) + (version (git-version "0.0.1" "1" commit)) (source (origin (method git-fetch) (uri (git-reference @@ -12469,7 +12469,7 @@ correctly.") (file-name (git-file-name name version)) (sha256 (base32 - "0xa07gpfkzwn522x9573mq5mfxvbawdgd0m93gqj6w5a14wk8zzh")))) + "0abfbzw1yaj9gscdxvvd3nf4h6krg6kyl5gpwgiyrq39x16pa9q2")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-helm" ,emacs-helm) -- cgit v1.2.3 From 8a973abc6f7eebfcd8a904bfbb99cb9f86f66ef0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 14 Feb 2019 23:07:42 +0100 Subject: gnu: guix: Embed 'glibc-utf8-locales'. This will ensure people who download the binary installation tarball do not get locale-related warnings, provided they use one of the selected UTF-8 locales. * gnu/packages/package-management.scm (guix)[arguments]: In 'wrap-program' phase, set GUIX_LOCPATH. [inputs]: Add GLIBC-UTF8-LOCALES. --- gnu/packages/package-management.scm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index eff8d5c3fd..44c6c1c21d 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -34,6 +34,7 @@ #:use-module (gnu packages avahi) #:use-module (gnu packages autotools) #:use-module (gnu packages backup) + #:use-module (gnu packages base) #:use-module (gnu packages bdw-gc) #:use-module (gnu packages bison) #:use-module (gnu packages bootstrap) ;for 'bootstrap-guile-origin' @@ -228,6 +229,7 @@ "guile-bytestructures")) (ssh (assoc-ref inputs "guile-ssh")) (gnutls (assoc-ref inputs "gnutls")) + (locales (assoc-ref inputs "glibc-utf8-locales")) (deps (list gcrypt json sqlite gnutls git bs ssh)) (effective @@ -246,11 +248,13 @@ "/lib/guile/" effective "/site-ccache") (delete #f deps)) - ":"))) + ":")) + (locpath (string-append locales "/lib/locale"))) (wrap-program (string-append out "/bin/guix") `("GUILE_LOAD_PATH" ":" prefix (,path)) - `("GUILE_LOAD_COMPILED_PATH" ":" prefix (,gopath))) + `("GUILE_LOAD_COMPILED_PATH" ":" prefix (,gopath)) + `("GUIX_LOCPATH" ":" suffix (,locpath))) #t)))))) (native-inputs `(("pkg-config" ,pkg-config) @@ -283,7 +287,9 @@ ,@(if (and (not (%current-target-system)) (string=? (%current-system) "x86_64-linux")) `(("boot-guile/i686" ,(bootstrap-guile-origin "i686-linux"))) - '()))) + '()) + + ("glibc-utf8-locales" ,glibc-utf8-locales))) (propagated-inputs `(("gnutls" ,gnutls) ("guile-gcrypt" ,guile-gcrypt) -- cgit v1.2.3 From 6072d51193b33ed109bb4eb3cdbd997b69a2b1a2 Mon Sep 17 00:00:00 2001 From: Meiyo Peng Date: Sat, 2 Feb 2019 13:16:43 +0800 Subject: gnu: librime: Update to 1.4.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/ibus.scm (librime): Update to 1.4.0. Signed-off-by: Ludovic Courtès --- gnu/packages/ibus.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index 60ba8a2721..05809f8f6c 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2016 Chris Marusich ;;; Copyright © 2017, 2018 Efraim Flashner ;;; Copyright © 2018 Tobias Geerinckx-Rice -;;; Copyright © 2018 Meiyo Peng +;;; Copyright © 2018, 2019 Meiyo Peng ;;; ;;; This file is part of GNU Guix. ;;; @@ -298,7 +298,7 @@ Japanese language input in most graphical applications.") (define-public librime (package (name "librime") - (version "1.3.2") + (version "1.4.0") (source (origin (method git-fetch) @@ -308,7 +308,7 @@ Japanese language input in most graphical applications.") (file-name (git-file-name name version)) (sha256 (base32 - "06q10cv7a3i6d8l3sq79nasw3p1njvmjgh4jq2hqw9abcx351m1r")) + "1zkx1wfbd94v55gfycyd2b94jxclfyk2zl7yw35pyjx63qdlb6sd")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 775e81b5a5d040347adabeea9ed48236cd2dbcdb Mon Sep 17 00:00:00 2001 From: Meiyo Peng Date: Sat, 2 Feb 2019 13:16:44 +0800 Subject: gnu: rime-data: Update to 0.38.20190131. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/ibus.scm (rime-data): Update to 0.38.20190131. Signed-off-by: Ludovic Courtès --- gnu/packages/ibus.scm | 135 +++++++++++++++++++++++++------------------------- 1 file changed, 68 insertions(+), 67 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index 05809f8f6c..2396beb874 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -349,16 +349,16 @@ traditional Chinese output.") (define-public rime-data (package (name "rime-data") - (version "0.38.20181029") + (version "0.38.20190131") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/rime/plum.git") - (commit "fb4f829da2007f2dbb37d60a79bc67c25ea16568"))) + (commit "8b48688cd4610d0c9223eb68831a31b6134e4cc8"))) (file-name "plum-checkout") (sha256 - (base32 "1m1wiv9j5bay4saga58c7dj4h8gqivsbyp16y245ifvxvp9czj67")))) + (base32 "0fv3hv4av9y7afxijh1n8idnyf82v9rxxi2ypmxd7lkj4naa22qh")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no tests @@ -380,7 +380,8 @@ traditional Chinese output.") (let* ((dest-dir "package/rime")) (mkdir-p dest-dir) (for-each (lambda (pkg) - (symlink (assoc-ref inputs pkg) + (symlink (assoc-ref inputs + (string-append "rime-" pkg)) (string-append dest-dir "/" pkg))) '("array" "bopomofo" @@ -406,216 +407,216 @@ traditional Chinese output.") #t)) (delete 'configure)))) (native-inputs - `(("array" + `(("rime-array" ,(origin (method git-fetch) (uri (git-reference (url "https://github.com/rime/rime-array.git") - (commit "906e923902147584b0b0247028a782abbfbfd8a0"))) + (commit "93cc99238f120606a076220ec4ddcad164f6396a"))) (file-name "rime-array-checkout") (sha256 (base32 - "1alk6ghn4ji4kvp7lfm57bwm2gjh99i79r0w9naz6wkdim8idvb1")))) - ("bopomofo" + "06yxrv3x702751jvx46rfw3ix34jk7jh183rz6bllznzi7lxz7sz")))) + ("rime-bopomofo" ,(origin (method git-fetch) (uri (git-reference (url "https://github.com/rime/rime-bopomofo.git") - (commit "8dc44ca1b6ef4e45b452e070b9da737f5da165e3"))) + (commit "ed25098386f5efd3d70b08650f0d1b70c41c11a3"))) (file-name "rime-bopomofo-checkout") (sha256 (base32 - "16k6wfhcrw3a77rmbrp21ca0gmsmb3f68s193c1cfwr8i68k46nf")))) - ("cangjie" + "1ip1pbfb1hadf2mcymr5939iagf25ywfl67d9198jahzyr6rdyvc")))) + ("rime-cangjie" ,(origin (method git-fetch) (uri (git-reference (url "https://github.com/rime/rime-cangjie.git") - (commit "ab085e90856b3399b374dc3c8b4cb40d11f307a8"))) + (commit "5fd8ce6f64039e505ca02655a621f2e830b97c19"))) (file-name "rime-cangjie-checkout") (sha256 (base32 - "11fgj0rbv9nyzfijwm2l8pm8fznhif4h27ndrrcaaylkp7p5zsx2")))) - ("combo-pinyin" + "1gf6r0q593ixar6v0jyvs56cik2gjp7pf9v799rfd2yydyia3bfg")))) + ("rime-combo-pinyin" ,(origin (method git-fetch) (uri (git-reference (url "https://github.com/rime/rime-combo-pinyin.git") - (commit "f1bae63f20504f2b8113c5cbdf2700e858aa91eb"))) + (commit "9bd952b964e9744e5d18e9e31625b50f3585a2cb"))) (file-name "rime-combo-pinyin-checkout") (sha256 (base32 - "1l1079akwm1hw4kkn0q6x9fpylnl2ka6z2fn7lmdpfpsr0xgn0n7")))) - ("double-pinyin" + "0crafjs39x4j221gb34mxxh3cdpxfhhx3nfw6b6bgkzlrp35a02b")))) + ("rime-double-pinyin" ,(origin (method git-fetch) (uri (git-reference (url "https://github.com/rime/rime-double-pinyin.git") - (commit "2101a5cd40e511ec38835769aa66d2dddf059c2e"))) + (commit "69bf85d4dfe8bac139c36abbd68d530b8b6622ea"))) (file-name "rime-double-pinyin-checkout") (sha256 (base32 - "19hh2qm0njbfk2js678hfm2hw9b796s43vs11yy3m1v9m0gk2vi7")))) - ("emoji" + "093wif5avvvw45fqbwj5wkbxrychy4pagl4mwsmbrayc8jkp69ak")))) + ("rime-emoji" ,(origin (method git-fetch) (uri (git-reference (url "https://github.com/rime/rime-emoji.git") - (commit "6e6611b315f03ee4c33f958f9dbe960b13a0ed19"))) + (commit "c8d67f9b50bf89a10c57da646d2e6db8799aef38"))) (file-name "rime-emoji-checkout") (sha256 (base32 - "1brfs3214w36j3345di9ygp468hbvbqdqpkjxxs1dbp437rayhyy")))) - ("essay" + "0ngcm088iyyp3llxvv0m80i7n5928d6cgh256ikhn3ixallxxdxv")))) + ("rime-essay" ,(origin (method git-fetch) (uri (git-reference (url "https://github.com/rime/rime-essay.git") - (commit "5e5c7a0ef41c9b030abdad81a9df07b56b1661e9"))) + (commit "71d0b1f3d4f3bfe61ae07581edf07579740c4421"))) (file-name "rime-essay-checkout") (sha256 (base32 - "0ana9is0zhh79m4gjshvmaxbrg3jiqysydx5bpm151i7i6vw5y1i")))) - ("ipa" + "1iwz104k7zfk7lpa257kvpqdr6jhbg3p76n3644ywiz4l7kc678i")))) + ("rime-ipa" ,(origin (method git-fetch) (uri (git-reference (url "https://github.com/rime/rime-ipa.git") - (commit "02a9e2c181921a2e95e1a81f88188c41132755c3"))) + (commit "e420c7bfb07153a2d2484eb2bdccdd719811abbb"))) (file-name "rime-ipa-checkout") (sha256 (base32 - "1szrxgvqlgmxapj2aflw2cvbv0p6pl0sw0gyxa13dvdhhf7s9rvr")))) - ("jyutping" + "1wfv7lb4y61b3qic5mhw92rn46cckldd9wrkcq03mg5512mbw63z")))) + ("rime-jyutping" ,(origin (method git-fetch) (uri (git-reference (url "https://github.com/rime/rime-jyutping.git") - (commit "1402ec3d6cc0973f952fe3f9ef531294e4ffe9e0"))) + (commit "04891a298319888e8c6b1a20e0fa81cfaea01264"))) (file-name "rime-jyutping-checkout") (sha256 (base32 - "17g03dy4gw6vyc9da1wjn3iy9hx64dfnwiwsfc7bkzan22x2m4dv")))) - ("luna-pinyin" + "0wsj965khglz36cnvfm4fkv386xvxhmsxgcw88p5qi0b3wlbzzx6")))) + ("rime-luna-pinyin" ,(origin (method git-fetch) (uri (git-reference (url "https://github.com/rime/rime-luna-pinyin.git") - (commit "3b05132576f5c347ff8a70857d2dae080936ac3b"))) + (commit "c9c405566177cb3898bdb82d7f4157587f2d9c01"))) (file-name "rime-luna-pinyin-checkout") (sha256 (base32 - "0kgnpxjn10dm2d9718r12rdjlwqd2s2h84jvkhxhh5v0dkv1anl2")))) - ("middle-chinese" + "0i7f2675lvj9pzwlm8550ifnr3xqi77xlyyvml1wpxpkfqhjr475")))) + ("rime-middle-chinese" ,(origin (method git-fetch) (uri (git-reference (url "https://github.com/rime/rime-middle-chinese.git") - (commit "9ba8d70330654b9a730f882d35cfad7dbeddfd75"))) + (commit "ed6d44f8d0bedf6e0c1c3183a270f8f01a211a40"))) (file-name "rime-middle-chinese-checkout") (sha256 (base32 - "0hwg5zby5kphh0bcfay8mfxwr5bwqhamiw3cmmmf7kp9fbns5s23")))) - ("pinyin-simp" + "09mql88lsrxa99pyllby5z22kaiwwa037ha8gwaxjnnlsjgvz7zx")))) + ("rime-pinyin-simp" ,(origin (method git-fetch) (uri (git-reference (url "https://github.com/rime/rime-pinyin-simp.git") - (commit "74357ffd62c05fb60edf6eab5b86bc8c8c1907d0"))) + (commit "bb5a6dfa871669d2f451b477bfff6d131df6f6c6"))) (file-name "rime-pinyin-simp-checkout") (sha256 (base32 - "1paw3c7pv5bl54abnp9pidfxrkchdacyxy5m9zb311p5sgm7fhxh")))) - ("prelude" + "0ss82042k833w5q72h72ghcfchkx00nx6l4z4fb861s2rxr0bkjd")))) + ("rime-prelude" ,(origin (method git-fetch) (uri (git-reference (url "https://github.com/rime/rime-prelude.git") - (commit "33040568c3ddb2ee6340c9b669494317db21b77c"))) + (commit "8a52b4f86a59f3eb602f9a4cf6a680a67c15df8c"))) (file-name "rime-prelude-checkout") (sha256 (base32 - "1gwcasyyg6f0ib6s4qsrrjcqr1lcs7j3xqxl65rznsw44nhnbwwq")))) - ("quick" + "039fr3996vfxzn2milaq1f5fw08f6zgjsxsql6cfhsc5b55fidm7")))) + ("rime-quick" ,(origin (method git-fetch) (uri (git-reference (url "https://github.com/rime/rime-quick.git") - (commit "910a97d403ad8e72f322488da146da79c19d623f"))) + (commit "3fe5911ba608cb2df1b6301b76ad1573bd482a76"))) (file-name "rime-quick-checkout") (sha256 (base32 - "0yrq3gbfmm29xlr52rmxc41mqfrb0295q7sdhbc3ax71677mpr0y")))) - ("scj" + "08bh87ym5qvw55lyw20l3m7jd4c2z5rvil8h5q8790r7z6j6ijy9")))) + ("rime-scj" ,(origin (method git-fetch) (uri (git-reference (url "https://github.com/rime/rime-scj.git") - (commit "e0eae889f4376d2a434ac3b38523e0da7400db68"))) + (commit "cab5a0858765eff0553dd685a2d61d5536e9149c"))) (file-name "rime-scj-checkout") (sha256 (base32 - "1whnv9zs349kvy0zi7dnmpqwil8i6gqwrzvhy3qdrjzy58y6gwxn")))) - ("soutzoe" + "0ard2bjp4896a8dimmcwyjwgmp9kl4rz92yc92jnd3y4rgwl6fvk")))) + ("rime-soutzoe" ,(origin (method git-fetch) (uri (git-reference (url "https://github.com/rime/rime-soutzoe.git") - (commit "e47841a8ad6341731c41cdb814b7a25c837603c4"))) + (commit "beeaeca72d8e17dfd1e9af58680439e9012987dc"))) (file-name "rime-soutzoe-checkout") (sha256 (base32 - "1rgpmkxa72jy6gyy44fn8azpk3amk9s9lrdf7za03nv95d0fvm0p")))) - ("stenotype" + "0jyqx0q9s0qxn168l5n8zav8jcl2g5ppr7pa8jm1vwrllf20slcc")))) + ("rime-stenotype" ,(origin (method git-fetch) (uri (git-reference (url "https://github.com/rime/rime-stenotype.git") - (commit "d4ff379314fd95283853d1734854979cf3cbd287"))) + (commit "1d472097c32d943d1096644f4c31f28799a17bd8"))) (file-name "rime-stenotype-checkout") (sha256 (base32 - "1kckpi4l4884hvydr3d6vid3v7rsc1app29kmk7v8jf8vn16afhl")))) - ("stroke" + "1dy9qlbyhnshq2k1vcvkqn2624r96iaixhyrx1z7v0vz84fjf6y4")))) + ("rime-stroke" ,(origin (method git-fetch) (uri (git-reference (url "https://github.com/rime/rime-stroke.git") - (commit "cfd29c675c46cf70b7a7f0a3836a913059316a0a"))) + (commit "f802735392b378fb2a56a9b7b53b8ec96a30ccaf"))) (file-name "rime-stroke-checkout") (sha256 (base32 - "135is9c1p4lm98fd9l1gxyflkm69cv5an129ka7sk614bq84m08d")))) - ("terra-pinyin" + "1wlrsskxhldh8369n771gk7sxflzdx0c9qhq1mqm5hhkwc5ig1j0")))) + ("rime-terra-pinyin" ,(origin (method git-fetch) (uri (git-reference (url "https://github.com/rime/rime-terra-pinyin.git") - (commit "15b5c73a796571cd6f9ef6c89f96656cb9df86f9"))) + (commit "b9e0edd3182e74b26b03a278c038e669ca538a35"))) (file-name "rime-terra-pinyin-checkout") (sha256 (base32 - "1xsd84h1zw417h5hr4dbgyk5009zi7q2p9774w3ccr5sxgc3i3cm")))) - ("wubi" + "1vzrv2k178bii4ld9rvpdi8zmcwybd8bks0qzjx2v4kbjgwj28zk")))) + ("rime-wubi" ,(origin (method git-fetch) (uri (git-reference (url "https://github.com/rime/rime-wubi.git") - (commit "d44403728a0b1cd8b47cb1f81b83f58e5f790b74"))) + (commit "dd052ee158a38cb791755318b1aef9b4a3ed0316"))) (file-name "rime-wubi-checkout") (sha256 (base32 - "0ld31bdn94lncxd1ka44w4sbl03skh08mc927dhdmwq5bpvrgn36")))) - ("wugniu" + "00xzv3sbwqh2jz4i7s315h7rw17qa2dgj7kflyy3blxk0s2cqiqa")))) + ("rime-wugniu" ,(origin (method git-fetch) (uri (git-reference (url "https://github.com/rime/rime-wugniu.git") - (commit "65bcc354ada3839591d7546a64c71dbdd0592b02"))) + (commit "abd1ee98efbf170258fcf43875c21a4259e00b61"))) (file-name "rime-wugniu-checkout") (sha256 (base32 - "0g31awp40s778sp5c290x40s8np86n8aw011s17sslxrqhhb0bkx")))))) + "0qn54d3cclny106ixdw08r5n6wn52ffs1hgrma3k0j4pv0kr9nlq")))))) (home-page "https://rime.im/") (synopsis "Schema data of Rime Input Method Engine") (description "@dfn{rime-data} provides the schema data of Rime Input -- cgit v1.2.3 From f7a25b50eb136c2e7d1cfee40caebc76916ad6fa Mon Sep 17 00:00:00 2001 From: Meiyo Peng Date: Sat, 2 Feb 2019 13:16:45 +0800 Subject: gnu: ibus-rime: Update to 1.4.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/ibus.scm (ibus-rime): Update to 1.4.0. Signed-off-by: Ludovic Courtès --- gnu/packages/ibus.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index 2396beb874..7dc3bd89a1 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -626,7 +626,7 @@ Method Engine.") (define-public ibus-rime (package (name "ibus-rime") - (version "1.3.0") + (version "1.4.0") (source (origin (method git-fetch) @@ -635,7 +635,7 @@ Method Engine.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1nqi7ymv34a9kx24say3xj98lkrs9nkpv1n2ijb91wdz3cr012ly")))) + (base32 "12y6jdz1amhgrnqa7zjim63dfsz6zyxyahbirfan37wmcfp6gp1d")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no tests -- cgit v1.2.3 From 37956778c9be61910ba1cdf3cd6b56cd785b22b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20M=C3=A9lotte?= Date: Fri, 1 Feb 2019 12:28:06 +0100 Subject: gnu: luakit: Update to 2.1. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/web-browsers.scm (luakit): Update to 2.1. Signed-off-by: Ludovic Courtès --- gnu/packages/web-browsers.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index c9038ed8c7..a19a0dc7c3 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -144,14 +144,14 @@ features including, tables, builtin image display, bookmarks, SSL and more.") (define-public luakit (package (name "luakit") - (version "2017.08.10") + (version "2.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/luakit/luakit/archive/" version ".tar.gz")) (sha256 (base32 - "0dwxhnq90whakgdg21lzcf03n2g1c7hqgliwhav8av5na5mqpn93")) + "09kgsm2w2xa4xwylsi0bwjvdl9k6hkyjyyrq2i3l8bvi2qrs5gzc")) (file-name (string-append name "-" version ".tar.gz")))) (inputs `(("lua-5.1" ,lua-5.1) -- cgit v1.2.3 From de8abc96cb23bf68c6efff69c224c7825d5e4a7d Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Sun, 3 Feb 2019 23:46:04 -0600 Subject: gnu: emacs-cider: Update to 0.20.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/emacs-xyz.scm (emacs-cider): Update to 0.20.0 Signed-off-by: Ludovic Courtès --- gnu/packages/emacs-xyz.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index aab9dc5d6e..b7b8989c27 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -41,6 +41,7 @@ ;;; Copyright © 2018 Alex Branham ;;; Copyright © 2018 Thorsten Wilms ;;; Copyright © 2018 Pierre Langlois +;;; Copyright © 2018 Brett Gilio ;;; ;;; This file is part of GNU Guix. ;;; @@ -5052,7 +5053,7 @@ target will call @code{compile} on it.") (define-public emacs-cider (package (name "emacs-cider") - (version "0.18.0") + (version "0.20.0") (source (origin (method git-fetch) @@ -5062,7 +5063,7 @@ target will call @code{compile} on it.") (file-name (git-file-name name version)) (sha256 (base32 - "1m9kc88vga3q5d731qnpngnsa0n57pf21k3hll20rw8rggrx4vdn")))) + "0lfhzg9c931jbx27hpshk3l76gwbp6ggf668sqa77xrvymwdlsnw")))) (build-system emacs-build-system) (arguments '(#:exclude ; Don't exclude 'cider-test.el'. -- cgit v1.2.3 From aa71b690aab4df70f1692eeca1c88f1acd659ddc Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Tue, 5 Feb 2019 23:15:34 -0800 Subject: gnu: pelican: Update to 4.0.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python.scm (pelican): Update to 4.0.1. Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 0c231b6274..3741e4b98d 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -2716,14 +2716,14 @@ interested parties to subscribe to events, or \"signals\".") (define-public pelican (package (name "pelican") - (version "3.7.1") + (version "4.0.1") (source (origin (method url-fetch) (uri (pypi-uri "pelican" version)) (sha256 (base32 - "12spygavv9b6xpb5pgp7f0p3z0mms60nx6zrpx1yfkj68zz4flra")))) + "05yda7n6r0ll18fpdjzkzyr0ls8hbb86fnjyb33k9jvv5avah2lr")))) (build-system python-build-system) (propagated-inputs `(("python-feedgenerator" ,python-feedgenerator) -- cgit v1.2.3 From 54bee9ea2eee1bd93657f6817bf7cc7aed3b18a6 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 15 Feb 2019 14:32:49 -0500 Subject: gnu: icecat: Update to 60.5.1-guix1 [security-fixes]. Includes fixes for CVE-2018-18335, CVE-2018-18356, and CVE-2019-5785. * gnu/packages/gnuzilla.scm (%icecat-version): Update to 60.5.1-guix1. (icecat-source)[upstream-firefox-source]: Update hash. --- gnu/packages/gnuzilla.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 1f299a2b13..0bb3df0f73 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -576,7 +576,7 @@ from forcing GEXP-PROMISE." #:system system #:guile-for-build guile))) -(define %icecat-version "60.5.0-guix1") +(define %icecat-version "60.5.1-guix1") ;; 'icecat-source' is a "computed" origin that generates an IceCat tarball ;; from the corresponding upstream Firefox ESR tarball, using the 'makeicecat' @@ -598,7 +598,7 @@ from forcing GEXP-PROMISE." "firefox-" upstream-firefox-version ".source.tar.xz")) (sha256 (base32 - "09a0kk250r03984n1hdwr2rg1vmhi2jkyzzgbbvkf9h9hzp6j7qs")))) + "1xbi1gvrrvqby04vx6klxff7h5r87dqgi1fx6i4mbg3ll59gy09z")))) (upstream-icecat-base-version "60.3.0") ; maybe older than base-version (upstream-icecat-gnu-version "1") -- cgit v1.2.3 From f218ff0acbaedb36947fd6f127b284f05390bb3c Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 15 Feb 2019 18:23:07 -0500 Subject: gnu: linux-libre@4.9: Update to 4.9.158. * gnu/packages/linux.scm (linux-libre-4.9): Update to 4.9.158. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 47b07340b8..503a94ff43 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -451,8 +451,8 @@ It has been modified to remove all non-free binary blobs.") #:configuration-file kernel-config)) (define-public linux-libre-4.9 - (make-linux-libre "4.9.156" - "1ipmn5axlhfsfzqvwwyv7scrvfja39w7v68cnvbqiaq8fkjgffxg" + (make-linux-libre "4.9.158" + "11v56dzp87wyxrymf2s1cmk7jr440z11m3yan73rnnnqlfq460ig" '("x86_64-linux" "i686-linux") #:configuration-file kernel-config)) -- cgit v1.2.3 From c5d3e7c5ac1eb5a4cf83f55d9ce66570cbda769d Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 15 Feb 2019 18:23:49 -0500 Subject: gnu: linux-libre@4.14: Update to 4.14.101. * gnu/packages/linux.scm (%linux-libre-4.14-version): Update to 4.14.101. (%linux-libre-4.14-hash): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 503a94ff43..525986e3af 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -441,8 +441,8 @@ It has been modified to remove all non-free binary blobs.") #:patches %linux-libre-4.19-patches #:configuration-file kernel-config)) -(define %linux-libre-4.14-version "4.14.99") -(define %linux-libre-4.14-hash "1d9h4l22j3jy1bkq8i4g6axwpq04jbsys4bg6bx8sbl590c9lrwx") +(define %linux-libre-4.14-version "4.14.101") +(define %linux-libre-4.14-hash "02j240x30zkhpazdimlfi0xq6zjdw6fidgdfrdnvfryvhf6j097j") (define-public linux-libre-4.14 (make-linux-libre %linux-libre-4.14-version -- cgit v1.2.3 From 82da87cf4c12a35bd81ecc3990926c65448ee775 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 15 Feb 2019 18:25:24 -0500 Subject: gnu: linux-libre@4.19: Update to 4.19.23. * gnu/packages/linux.scm (%linux-libre-4.19-version): Update to 4.19.23. (%linux-libre-4.19-hash): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 525986e3af..89cbc68ac4 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -427,8 +427,8 @@ It has been modified to remove all non-free binary blobs.") #:patches %linux-libre-4.20-patches #:configuration-file kernel-config)) -(define %linux-libre-4.19-version "4.19.21") -(define %linux-libre-4.19-hash "064vwfkcmc8ad37m1ziqc14vhvx3mba12rc9220xng3a48gwpi2m") +(define %linux-libre-4.19-version "4.19.23") +(define %linux-libre-4.19-hash "0s207vqq2vcrgydjjwb5n2j7di0rjahnrbn3xv4xxlp5scjp59xq") (define %linux-libre-4.19-patches (list %boot-logo-patch -- cgit v1.2.3 From 9adb66dd11ba36b05d090fdc754e1cde0ff1c72f Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 15 Feb 2019 18:26:14 -0500 Subject: gnu: linux-libre: Update to 4.20.10. * gnu/packages/linux.scm (%linux-libre-version): Update to 4.20.10. (%linux-libre-hash): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 89cbc68ac4..33ab24ad9c 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -413,8 +413,8 @@ for ARCH and optionally VARIANT, or #f if there is no such configuration." It has been modified to remove all non-free binary blobs.") (license license:gpl2))) -(define %linux-libre-version "4.20.8") -(define %linux-libre-hash "0qhwavylmkqqd84dym87ajzwnxc6rjpdijw7kbriqjmgjfsmf8sw") +(define %linux-libre-version "4.20.10") +(define %linux-libre-hash "0d386gb1s9ag80iqzms9gdsfzirq7nlkpkkx2d6ky01rv0g4vgqn") (define %linux-libre-4.20-patches (list %boot-logo-patch -- cgit v1.2.3 From 46c1c5537b3c140b1e597a020f38c77fb97f26ec Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 16 Feb 2019 18:18:21 +0100 Subject: gnu: stumpwm: Build and install the manual. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/lisp.scm (stumpwm)[native-inputs]: Add texinfo. [argument]: Add new ‘install-manual’ phase. --- gnu/packages/lisp.scm | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 93dc1aaf80..5aad298399 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2016, 2017 Andy Patterson ;;; Copyright © 2017, 2019 Ricardo Wurmus ;;; Copyright © 2017, 2018 Efraim Flashner -;;; Copyright © 2017 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 Benjamin Slade ;;; Copyright © 2018 Alex Vong ;;; Copyright © 2018 Pierre Neidhardt @@ -984,7 +984,8 @@ from other CLXes around the net.") ;; and can be removed when we move to the next release. (search-patches "stumpwm-fix-broken-read-one-line.patch")))) (build-system asdf-build-system/sbcl) - (native-inputs `(("fiasco" ,sbcl-fiasco))) + (native-inputs `(("fiasco" ,sbcl-fiasco) + ("texinfo" ,texinfo))) (inputs `(("cl-ppcre" ,sbcl-cl-ppcre) ("clx" ,sbcl-clx) ("alexandria" ,sbcl-alexandria))) @@ -1016,6 +1017,16 @@ from other CLXes around the net.") Icon=~@ Type=Application~%" out))) + #t))) + (add-after 'install 'install-manual + (lambda* (#:key outputs #:allow-other-keys) + ;; The proper way to the manual is bootstrapping a full autotools + ;; build system and running ‘./configure && make stumpwm.info’ to + ;; do some macro substitution. We can get away with much less. + (let* ((out (assoc-ref outputs "out")) + (info (string-append out "/share/info"))) + (invoke "makeinfo" "stumpwm.texi.in") + (install-file "stumpwm.info" info) #t)))))) (synopsis "Window manager written in Common Lisp") (description "Stumpwm is a window manager written entirely in Common Lisp. -- cgit v1.2.3 From 6cf48e8c201cc161cc2196502167ab23ad20c16a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 Feb 2019 16:24:30 +0100 Subject: gnu: unshield: Update to 1.4.3. * gnu/packages/compression.scm (unshield): Update to 1.4.3. [inputs]: Add unshield-baldurs_gate_patch_v1_1_4315_international.zip. [arguments]: Use it. --- gnu/packages/compression.scm | 33 +++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 0c57f1c27b..4f4d71e469 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1261,7 +1261,7 @@ or junctions, and always follows hard links.") (define-public unshield (package (name "unshield") - (version "1.4.2") + (version "1.4.3") (source (origin (method url-fetch) (uri (string-append "http://github.com/twogood/unshield/archive/" @@ -1269,25 +1269,36 @@ or junctions, and always follows hard links.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0x7ps644yp5dka2zhb8w0ifqmw3d255jafpzfwv8xbcpgq6fmm2x")))) + "1avv5c11jbmzwizq10pwvlh1dmyna8ccvpgacv95h4gbq26rg35a")))) (build-system cmake-build-system) (inputs `(("zlib" ,zlib) ("openssl" ,openssl) - ;; test data that is otherwise downloaded with curl + ;; Test data that is otherwise downloaded with curl. ("unshield-avigomanager11b22.zip" ,(origin (method url-fetch) - (uri (string-append "https://www.dropbox.com/s/8r4b6752swe3nhu/" - "unshield-avigomanager11b22.zip?dl=1")) + (uri (string-append + "https://www.dropbox.com/s/8r4b6752swe3nhu/" + "unshield-avigomanager11b22.zip?dl=1")) (sha256 (base32 "0fwq7lih04if68wpwpsk5wjqyvh32db76a41sq6gbx4dn1lc3ddn")) (file-name "unshield-avigomanager11b22.zip"))) + ("unshield-baldurs_gate_patch_v1_1_4315_international.zip" + ,(origin + (method url-fetch) + (uri (string-append + "https://www.dropbox.com/s/9ruil8oi6amjbbk/" + "unshield-baldurs_gate_patch_v1_1_4315_international.zip?dl=1")) + (sha256 + (base32 "0spaxf6dardlhqxz3ys09fzamj007q3nfyw4xng6gh3qp9780maj")) + (file-name "unshield-baldurs_gate_patch_v1_1_4315_international.zip"))) ("unshield-the-feeble-files-spanish.zip" ,(origin (method url-fetch) - (uri (string-append "https://www.dropbox.com/s/1ng0z9kfxc7eb1e/" - "unshield-the-feeble-files-spanish.zip?dl=1")) + (uri (string-append + "https://www.dropbox.com/s/1ng0z9kfxc7eb1e/" + "unshield-the-feeble-files-spanish.zip?dl=1")) (sha256 (base32 "1k5cw6vnpja8yjlnhx5124xrw9i8s1l539hfdqqrqz3l5gn0bnyd")) (file-name "unshield-the-feeble-files-spanish.zip"))))) @@ -1303,6 +1314,7 @@ or junctions, and always follows hard links.") (copy-file (assoc-ref inputs i) (string-append "test/v0/" i))) '("unshield-avigomanager11b22.zip" + "unshield-baldurs_gate_patch_v1_1_4315_international.zip" "unshield-the-feeble-files-spanish.zip")) (substitute* (find-files "test/" "/*\\.sh") ;; Tests expect the unshield binary in a specific @@ -1315,7 +1327,12 @@ or junctions, and always follows hard links.") (substitute* "test/v0/avigomanager.sh" (("test.zip") (string-append (getcwd) - "/test/v0/unshield-avigomanager11b22.zip"))) + "/test/v0/unshield-avigomanager11b22.zip"))) + (substitute* "test/v0/baldurs_gate_patch_v1_1_4315_international.sh" + (("test.zip") + (string-append + (getcwd) + "/test/v0/unshield-baldurs_gate_patch_v1_1_4315_international.zip"))) (substitute* "test/v0/the-feeble-files-spanish.sh" (("test.zip") (string-append (getcwd) -- cgit v1.2.3 From a0bdbf8b4129899b5f00335e3412a6752a26f816 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 Feb 2019 15:32:51 +0100 Subject: gnu: chez-web: Return #t from all phases. * gnu/packages/chez.scm (chez-web)[arguments]: Always return #t from phases. --- gnu/packages/chez.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/chez.scm b/gnu/packages/chez.scm index 10601f0bfa..c99f8a8bab 100644 --- a/gnu/packages/chez.scm +++ b/gnu/packages/chez.scm @@ -318,7 +318,8 @@ and 32-bit PowerPC architectures.") (("\\./chezweave" all) (string-append "chez-scheme --program " all))) (substitute* "installit" - (("-g \\$GROUP -o \\$OWNER") ""))))))) + (("-g \\$GROUP -o \\$OWNER") "")) + #t))))) (home-page "https://github.com/arcfide/ChezWEB") (synopsis "Hygienic Literate Programming for Chez Scheme") (description "ChezWEB is a system for doing Knuthian style WEB -- cgit v1.2.3 From bd86f7dbdf366c52214cda824246b2e642d32a96 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 Feb 2019 17:15:07 +0100 Subject: gnu: chez-fmt: Return #t from all phases. * gnu/packages/chez.scm (chez-fmt)[arguments]: Always return #t from phases. Substitute INVOKE for SYSTEM*. --- gnu/packages/chez.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/chez.scm b/gnu/packages/chez.scm index c99f8a8bab..cbbca34c1a 100644 --- a/gnu/packages/chez.scm +++ b/gnu/packages/chez.scm @@ -515,10 +515,10 @@ syntax, with various aliases for commonly used patterns.") (replace 'configure ,chez-configure) (replace 'build (lambda* (#:key (make-flags '()) #:allow-other-keys) - (zero? (apply system* "make" "chez-build" make-flags)))) + (apply invoke "make" "chez-build" make-flags))) (replace 'install (lambda* (#:key (make-flags '()) #:allow-other-keys) - (zero? (apply system* "make" "chez-install" make-flags))))))) + (apply invoke "make" "chez-install" make-flags)))))) (home-page "http://synthcode.com/scheme/fmt") (synopsis "Combinator formatting library for Chez Scheme") (description "This package provides a library of procedures for -- cgit v1.2.3 From f9cd13c95d580c5154201dd21d1610e12feba830 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 Feb 2019 17:26:17 +0100 Subject: gnu: chez-srfi: Don't use unstable tarball. * gnu/packages/chez.scm (chez-srfi)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/chez.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/chez.scm b/gnu/packages/chez.scm index cbbca34c1a..0145651b70 100644 --- a/gnu/packages/chez.scm +++ b/gnu/packages/chez.scm @@ -237,13 +237,13 @@ and 32-bit PowerPC architectures.") (version "1.0") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/fedeinthemix/chez-srfi/archive" - "/v" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/fedeinthemix/chez-srfi.git") + (commit (string-append "v" version)))) (sha256 - (base32 "17i4wly7bcr5kb5hf04ljpbvv4r5hsr9xsmw650fj43z9jr303gs")) - (file-name (string-append name "-" version ".tar.gz")))) + (base32 "1vgn984mj2q4w6r2q66h7qklp2hrh85wwh4k9yisga5fi0ps7myf")) + (file-name (git-file-name name version)))) (build-system gnu-build-system) (native-inputs `(("chez-scheme" ,chez-scheme))) -- cgit v1.2.3 From f01b17b374b0354b14babe2d323191c729e87804 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 Feb 2019 17:27:38 +0100 Subject: gnu: chez-web: Use GIT- helpers. * gnu/packages/chez.scm (chez-web)[version]: Use GIT-VERSION. [source]: Use GIT-FILE-NAME. --- gnu/packages/chez.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/chez.scm b/gnu/packages/chez.scm index 0145651b70..fcf2a09bdc 100644 --- a/gnu/packages/chez.scm +++ b/gnu/packages/chez.scm @@ -264,16 +264,15 @@ and 32-bit PowerPC architectures.") (revision "1")) (package (name "chez-web") - ;; release 2.0 is different and doesn't work. - (version (string-append "2.0-" revision "." - (string-take commit 7))) + ;; Release 2.0 is different and doesn't work. + (version (git-version "2.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/arcfide/ChezWEB.git") (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "1dq25qygyncbfq4kwwqqgyyakfqjwhp5q23vrf3bff1p66nyfl3b")))) (build-system gnu-build-system) -- cgit v1.2.3 From 88c85a940335f6cd5472f9dff7ade29753ea5353 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 Feb 2019 17:28:53 +0100 Subject: gnu: chez-matchable: Don't use unstable tarball. * gnu/packages/chez.scm (chez-matchable)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/chez.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/chez.scm b/gnu/packages/chez.scm index fcf2a09bdc..04371c7413 100644 --- a/gnu/packages/chez.scm +++ b/gnu/packages/chez.scm @@ -435,11 +435,13 @@ Chez Scheme.") (home-page "https://github.com/fedeinthemix/chez-matchable") (source (origin - (method url-fetch) - (uri (string-append home-page "/archive" "/v" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url home-page) + (commit (string-append "v" version)))) (sha256 - (base32 "0cl4vc6487pikjq159pj4n5ghyaax31nywb5n4yn1682h3ir1hs0")) - (file-name (string-append name "-" version ".tar.gz")))) + (base32 "02qn7x348p23z1x5lwhkyj7i8z6mgwpzpnwr8dyina0yzsdkr71s")) + (file-name (git-file-name name version)))) (build-system gnu-build-system) (inputs `(("chez-srfi" ,chez-srfi))) ; for tests -- cgit v1.2.3 From 24a43551d0767dac9659f3e9233a688d1cde2225 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 Feb 2019 17:29:17 +0100 Subject: gnu: chez-irregex: Don't use unstable tarball. * gnu/packages/chez.scm (chez-irregex)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/chez.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/chez.scm b/gnu/packages/chez.scm index 04371c7413..4a7fe0bfca 100644 --- a/gnu/packages/chez.scm +++ b/gnu/packages/chez.scm @@ -464,13 +464,13 @@ Chez Scheme.") (version "0.9.4") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/fedeinthemix/chez-irregex/archive" - "/v" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/fedeinthemix/chez-irregex.git") + (commit (string-append "v" version)))) (sha256 - (base32 "0ywy5syaw549a58viz68dmgnv756ic705rcnlqxgjq27lnaim53b")) - (file-name (string-append name "-" version ".tar.gz")))) + (base32 "0jh6piylw545j81llay9wfivgpv6lcnwd81gm4w17lkasslir50q")) + (file-name (git-file-name name version)))) (build-system gnu-build-system) (inputs `(("chez-matchable" ,chez-matchable))) ; for tests -- cgit v1.2.3 From 95b4f7ca7aa6391af10fef637c95f42c4a01debb Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 16 Feb 2019 15:25:32 +0100 Subject: =?UTF-8?q?gnu:=20chez-scheme:=20Fix=20=E2=80=98install-doc?= =?UTF-8?q?=E2=80=99=20phase.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/chez.scm (chez-cheme)[arguments]: Find ‘installsh’. Remove some unnecessary code. --- gnu/packages/chez.scm | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/chez.scm b/gnu/packages/chez.scm index 4a7fe0bfca..8476eefe12 100644 --- a/gnu/packages/chez.scm +++ b/gnu/packages/chez.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 Federico Beffa ;;; Copyright © 2016 Efraim Flashner -;;; Copyright © 2017 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -179,17 +179,18 @@ ;; Installation of the documentation requires a running "chez". (add-after 'install 'install-doc (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((bin (string-append (assoc-ref outputs "out") "/bin")) - (doc (string-append (assoc-ref outputs "doc") + (let ((doc (string-append (assoc-ref outputs "doc") "/share/doc/" ,name "-" ,version))) - (setenv "HOME" (getcwd)) - (setenv "PATH" (string-append (getenv "PATH") ":" bin)) - (with-directory-excursion "stex" - (system* "make" (string-append "BIN=" bin))) (system* "make" "docs") (with-directory-excursion "csug" (substitute* "Makefile" - (("/tmp/csug9") doc)) + ;; The ‘installdir=’ can't be overruled on the command line. + (("/tmp/csug9") doc) + ;; $m is the ‘machine type’, e.g. ‘ta6le’ on x86_64, but is + ;; set incorrectly for some reason, e.g. to ‘a6le’ on x86_64. + ;; Avoid the whole mess by running the (machine-independent) + ;; ‘installsh’ script at its original location. + (("\\$m/installsh") "makefiles/installsh")) (system* "make" "install") (install-file "csug.pdf" doc)) (with-directory-excursion "release_notes" -- cgit v1.2.3 From 55623cf08adb2be38b5b4789c18f2b9ede970719 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 16 Feb 2019 15:30:10 +0100 Subject: gnu: chez-scheme: Return #t from all phases. * gnu/packages/chez.scm (chez-scheme)[arguments]: Always return #t from phases. Substitute INVOKE for SYSTEM*. --- gnu/packages/chez.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/chez.scm b/gnu/packages/chez.scm index 8476eefe12..863a32ce8a 100644 --- a/gnu/packages/chez.scm +++ b/gnu/packages/chez.scm @@ -122,7 +122,8 @@ ;; next one; see . (substitute* "csug/copyright.stex" (("\\\\INSERTREVISIONMONTHSPACEYEAR" ) - "October 2017")))) ; tarball release date + "October 2017")) ; tarball release date + #t)) ;; Adapt the custom 'configure' script. (replace 'configure (lambda* (#:key inputs outputs #:allow-other-keys) @@ -140,7 +141,7 @@ (apply unpack (list #:source src)) (apply patch-source-shebangs (list #:source src))) (delete-file-recursively new-name) - (system* "mv" orig-name new-name))) + (invoke "mv" orig-name new-name))) `((,nanopass "nanopass-framework-scheme-1.9" "nanopass") (,stex "stex-1.2.1" "stex"))) ;; The Makefile wants to download and compile "zlib". We patch @@ -174,14 +175,14 @@ (("/bin/true") (which "true"))) (substitute* "stex/Makefile" (("PREFIX=/usr") (string-append "PREFIX=" out))) - (zero? (system* "./configure" "--threads" - (string-append "--installprefix=" out)))))) + (invoke "./configure" "--threads" + (string-append "--installprefix=" out))))) ;; Installation of the documentation requires a running "chez". (add-after 'install 'install-doc (lambda* (#:key inputs outputs #:allow-other-keys) (let ((doc (string-append (assoc-ref outputs "doc") "/share/doc/" ,name "-" ,version))) - (system* "make" "docs") + (invoke "make" "docs") (with-directory-excursion "csug" (substitute* "Makefile" ;; The ‘installdir=’ can't be overruled on the command line. @@ -191,7 +192,7 @@ ;; Avoid the whole mess by running the (machine-independent) ;; ‘installsh’ script at its original location. (("\\$m/installsh") "makefiles/installsh")) - (system* "make" "install") + (invoke "make" "install") (install-file "csug.pdf" doc)) (with-directory-excursion "release_notes" (install-file "release_notes.pdf" doc)) -- cgit v1.2.3 From 2f1ab477729497beb5897f0e2a59e9dbb57470b1 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 16 Feb 2019 15:43:24 +0100 Subject: gnu: nanopass: Don't use unstable tarball. * gnu/packages/chez.scm (nanopass)[source]: Use GIT-FETCH and GIT-FILE-NAME. (chez-scheme)[arguments]: Adjust expected source directory name. --- gnu/packages/chez.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/chez.scm b/gnu/packages/chez.scm index 863a32ce8a..5cf3231f30 100644 --- a/gnu/packages/chez.scm +++ b/gnu/packages/chez.scm @@ -42,12 +42,12 @@ (define nanopass (let ((version "1.9")) (origin - (method url-fetch) - (uri (string-append - "https://github.com/nanopass/nanopass-framework-scheme/archive" - "/v" version ".tar.gz")) - (sha256 (base32 "11pwyy4jiwhcl2am3a4ciczacjbjkyvdizqzdglb3l1hj2gj6nv2")) - (file-name (string-append "nanopass-" version ".tar.gz"))))) + (method git-fetch) + (uri (git-reference + (url "https://github.com/nanopass/nanopass-framework-scheme.git") + (commit (string-append "v" version)))) + (sha256 (base32 "0lrngdna6w7v9vlp1a873hgwrwsz2p0pgkccswa4smzvdyhgfsri")) + (file-name (git-file-name "nanopass" version))))) (define stex (let ((version "1.2.1")) @@ -142,7 +142,7 @@ (apply patch-source-shebangs (list #:source src))) (delete-file-recursively new-name) (invoke "mv" orig-name new-name))) - `((,nanopass "nanopass-framework-scheme-1.9" "nanopass") + `((,nanopass "source" "nanopass") (,stex "stex-1.2.1" "stex"))) ;; The Makefile wants to download and compile "zlib". We patch ;; it to use the one from our 'zlib' package. -- cgit v1.2.3 From fbf41223604a5c29ff08cbe9738bc8c51286cf30 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 16 Feb 2019 16:41:57 +0100 Subject: gnu: stex: Don't use unstable tarball. * gnu/packages/chez.scm (stex)[source]: Use GIT-FETCH and GIT-FILE-NAME. (chez-scheme)[arguments]: Adjust expected source directory name. --- gnu/packages/chez.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/chez.scm b/gnu/packages/chez.scm index 5cf3231f30..d8c914804e 100644 --- a/gnu/packages/chez.scm +++ b/gnu/packages/chez.scm @@ -52,12 +52,12 @@ (define stex (let ((version "1.2.1")) (origin - (method url-fetch) - (uri (string-append - "https://github.com/dybvig/stex/archive" - "/v" version ".tar.gz")) - (sha256 (base32 "03pl3f668h24dn51vccr1sj5lsba9zq3j37bnxjvdadcdaj4qy5z")) - (file-name (string-append "stex-" version ".tar.gz"))))) + (method git-fetch) + (uri (git-reference + (url "https://github.com/dybvig/stex.git") + (commit (string-append "v" version)))) + (sha256 (base32 "1jiawhhqnsj42hzmlbq5xby3iarhf8vhiqs0kg1a0zg5jsn6cf8n")) + (file-name (git-file-name "stex" version))))) (define-public chez-scheme (package @@ -143,7 +143,7 @@ (delete-file-recursively new-name) (invoke "mv" orig-name new-name))) `((,nanopass "source" "nanopass") - (,stex "stex-1.2.1" "stex"))) + (,stex "source" "stex"))) ;; The Makefile wants to download and compile "zlib". We patch ;; it to use the one from our 'zlib' package. (substitute* "configure" -- cgit v1.2.3 From 602fbad1e72dc13985335b7070e777cc08511984 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 16 Feb 2019 16:49:27 +0100 Subject: gnu: chez-scheme: Don't use unstable tarball. * gnu/packages/chez.scm (chez-scheme)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/chez.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/chez.scm b/gnu/packages/chez.scm index d8c914804e..1e3c4d652c 100644 --- a/gnu/packages/chez.scm +++ b/gnu/packages/chez.scm @@ -65,12 +65,13 @@ (version "9.5") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/cisco/ChezScheme/archive/" - "v" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/cisco/ChezScheme.git") + (commit (string-append "v" version)))) (sha256 - (base32 "135991hspq0grf26pvl2lkwhp92yz204h6rgiwyym0x6v0xzknd1")) - (file-name (string-append "chez-scheme-" version ".tar.gz")) + (base32 "132fal5hwiq0bqzvfhjsqr4d11cfdh1670f6286ks29xxj1c04zq")) + (file-name (git-file-name name version)) (modules '((guix build utils))) (snippet ;; Fix compilation with glibc >= 2.26, which removed xlocale.h. -- cgit v1.2.3 From c83bf1c65905ee294338107dce0d93480e14c2c2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 16 Feb 2019 16:49:36 +0100 Subject: gnu: chez-mit: Don't use unstable tarball. * gnu/packages/chez.scm (chez-mit)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/chez.scm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/chez.scm b/gnu/packages/chez.scm index 1e3c4d652c..f77581393f 100644 --- a/gnu/packages/chez.scm +++ b/gnu/packages/chez.scm @@ -539,14 +539,16 @@ strings.") (home-page "https://github.com/fedeinthemix/chez-mit") (source (origin - (method url-fetch) - (uri (string-append home-page "/archive/v" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url home-page) + (commit (string-append "v" version)))) (sha256 - (base32 "1p11q061znwxzxrxg3vw4dbsnpv1dav12hjhnkrjnzyyjvvdm2kn")) - (file-name (string-append name "-" version ".tar.gz")))) + (base32 "0c7i3b6i90xk96nmxn1pc9272a4yal4v40dm1a4ybdi87x53zkk0")) + (file-name (git-file-name name version)))) (build-system gnu-build-system) (inputs - `(("chez-srfi" ,chez-srfi))) ; for tests + `(("chez-srfi" ,chez-srfi))) ; for tests (native-inputs `(("chez-scheme" ,chez-scheme))) (arguments -- cgit v1.2.3 From 9b469e2e3a5597f97faf7e56bf0186c4ae781d06 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 16 Feb 2019 16:49:44 +0100 Subject: gnu: chez-scmutils: Don't use unstable tarball. * gnu/packages/chez.scm (chez-scmutils)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/chez.scm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/chez.scm b/gnu/packages/chez.scm index f77581393f..c45085b68c 100644 --- a/gnu/packages/chez.scm +++ b/gnu/packages/chez.scm @@ -569,14 +569,16 @@ required to port the program 'Scmutils' to Chez Scheme.") (home-page "https://github.com/fedeinthemix/chez-scmutils") (source (origin - (method url-fetch) - (uri (string-append home-page "/archive/v" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url home-page) + (commit (string-append "v" version)))) (sha256 - (base32 "1a5j61pggaiwl1gl6m038rcy5n8r2sj5nyjmz86jydx97mm5i8hj")) - (file-name (string-append name "-" version ".tar.gz")))) + (base32 "0lb05wlf8qpgg8y0gdsyaxg1nbfx1qbaqdjvygrp64ndn8fnhq7l")) + (file-name (git-file-name name version)))) (build-system gnu-build-system) (inputs - `(("chez-srfi" ,chez-srfi))) ; for tests + `(("chez-srfi" ,chez-srfi))) ; for tests (native-inputs `(("chez-scheme" ,chez-scheme))) (propagated-inputs @@ -584,7 +586,7 @@ required to port the program 'Scmutils' to Chez Scheme.") ("chez-srfi" ,chez-srfi))) (arguments `(#:make-flags ,(chez-make-flags name version) - #:tests? #f ; no test suite + #:tests? #f ; no test suite #:phases (modify-phases %standard-phases (replace 'configure ,chez-configure) -- cgit v1.2.3 From 2245f210ea5ef729408aba3f9795cf69b2805e67 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 16 Feb 2019 18:50:44 +0100 Subject: gnu: chez-scmutils: Return #t from all phases. * gnu/packages/chez.scm (chez-scmutils)[arguments]: Always return #t from phases. Substitute INVOKE for SYSTEM*. --- gnu/packages/chez.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/chez.scm b/gnu/packages/chez.scm index c45085b68c..98742eede4 100644 --- a/gnu/packages/chez.scm +++ b/gnu/packages/chez.scm @@ -598,7 +598,7 @@ required to port the program 'Scmutils' to Chez Scheme.") (delete 'build) (add-after 'install 'install-src (lambda* (#:key (make-flags '()) #:allow-other-keys) - (zero? (apply system* "make" "install-src" make-flags)))) + (apply invoke "make" "install-src" make-flags))) (add-after 'install-src 'absolute-path-in-scm-files (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) @@ -618,12 +618,13 @@ required to port the program 'Scmutils' to Chez Scheme.") (let* ((out (assoc-ref outputs "out")) (mk-file (car (find-files out "Makefile")))) (with-directory-excursion (dirname mk-file) - (zero? (apply system* "make" "build" make-flags)))))) + (apply invoke "make" "build" make-flags))))) (add-after 'build 'clean-up (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out"))) (for-each delete-file - (find-files out "Makefile|compile-all\\.ss")))))))) + (find-files out "Makefile|compile-all\\.ss")) + #t)))))) (synopsis "Port of MIT/GNU Scheme Scmutils to Chez Scheme") (description "This package provides a port of the MIT/GNU Scheme Scmutils program to Chez Scheme. The port consists of a set of -- cgit v1.2.3 From dcc262672c5a80302c98ea4b54e6d97ed77a3986 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 Feb 2019 17:28:28 +0100 Subject: gnu: chez-sockets: Use GIT- helpers. * gnu/packages/chez.scm (chez-sockets)[version]: Use GIT-VERSION. [source]: Use GIT-FILE-NAME. --- gnu/packages/chez.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/chez.scm b/gnu/packages/chez.scm index 98742eede4..7d0042872e 100644 --- a/gnu/packages/chez.scm +++ b/gnu/packages/chez.scm @@ -333,15 +333,14 @@ programming in Scheme.") (revision "1")) (package (name "chez-sockets") - (version (string-append "0.0-" revision "." - (string-take commit 7))) + (version (git-version "0.0.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/arcfide/chez-sockets.git") (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "1n5fbwwz51fdzvjackgmnsgh363g9inyxv7kmzi0469cwavwcx5m")))) (build-system gnu-build-system) -- cgit v1.2.3 From e57c2adb2a7ed94610f4c35e8710bc1346199de6 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 13 Feb 2019 14:22:14 -0500 Subject: services: gdm: Remove etc service. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gnome.scm (gdm)[arguments]: Update pre-configure phase to make GDM get the configuration file path from an environment variable. * gnu/services/xorg.scm (gdm-etc-service): Remove function. (gdm-configuration-file): New function. (gdm-shepherd-service): Set GDM_CUSTOM_CONF before invoking GDM. (gdm-service-type)[extensions]: Remove etc-service-type extension. Signed-off-by: Ludovic Courtès --- gnu/packages/gnome.scm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 2f99755933..21c61473c5 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -32,7 +32,7 @@ ;;; Copyright © 2018 Jovany Leandro G.C ;;; Copyright © 2018 Vasile Dumitrascu ;;; Copyright © 2018 Björn Höfling -;;; Copyright © 2018 Timothy Sample +;;; Copyright © 2018, 2019 Timothy Sample ;;; ;;; This file is part of GNU Guix. ;;; @@ -5462,6 +5462,9 @@ libxml2.") ;; processes. "gdm_session_set_environment_variable (self, \"GDM_X_SERVER\",\n" " g_getenv (\"GDM_X_SERVER\"));\n" + ;; Propagate the GDM_CUSTOM_CONF environment variable. + "gdm_session_set_environment_variable (self, \"GDM_CUSTOM_CONF\",\n" + " g_getenv (\"GDM_CUSTOM_CONF\"));\n" ;; FIXME: Really glib should be declaring XDG_CONFIG_DIRS as a ;; variable, but it doesn't do that right now. Anyway ;; /run/current-system/profile/share/gnome-session/sessions/gnome.desktop @@ -5481,7 +5484,9 @@ libxml2.") ;; Look for custom GDM conf in /run/current-system. (substitute* '("common/gdm-settings-desktop-backend.c") (("GDM_CUSTOM_CONF") - "\"/run/current-system/etc/gdm/custom.conf\"")) + (string-append "(g_getenv(\"GDM_CUSTOM_CONF\") != NULL" + " ? g_getenv(\"GDM_CUSTOM_CONF\")" + " : GDM_CUSTOM_CONF)"))) ;; Use service-supplied path to X. (substitute* '("daemon/gdm-server.c") (("\\(X_SERVER X_SERVER_ARG_FORMAT") -- cgit v1.2.3 From 1d7bff4b4bdd60dfb3fb8150418e1a82c0ff2679 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 13 Feb 2019 14:22:15 -0500 Subject: gnu: gnome-session: Use absolute paths in .desktop files. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This makes the gnome-session .desktop files usable even if gnome-session is not available from the PATH variable. * gnu/packages/gnome.scm (gnome-session)[arguments]: Add a phase that adds the absolute path of gnome-session in its .desktop files. Signed-off-by: Ludovic Courtès --- gnu/packages/gnome.scm | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 21c61473c5..fb6645715e 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4657,6 +4657,14 @@ such as gzip tarballs.") (out (assoc-ref outputs "out"))) (wrap-program (string-append out "/bin/gnome-session") `("PATH" ":" prefix (,(string-append glib "/bin")))) + #t))) + (add-after 'install 'add-absolute-paths-to-desktop-files + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out"))) + (substitute* (map (lambda (x) + (string-append out "/share/xsessions/" x)) + '("gnome.desktop" "gnome-xorg.desktop")) + (("gnome-session") (string-append out "/bin/gnome-session"))) #t)))) #:configure-flags -- cgit v1.2.3 From 69544798ea9cc3b6d06c4b40e3560fd7a17215b2 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 13 Feb 2019 14:22:16 -0500 Subject: gnu: gdm: Add links to required login-session files. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gnome.scm (gdm)[arguments]: Add a phase that creates symbolic links to required files from gnome-settings-daemon; do not set XDG_CONFIG_DIRS in the session environment. [inputs]: Add gnome-settings-daemon. Signed-off-by: Ludovic Courtès --- gnu/packages/gnome.scm | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index fb6645715e..ec6d3fb8c6 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5473,16 +5473,6 @@ libxml2.") ;; Propagate the GDM_CUSTOM_CONF environment variable. "gdm_session_set_environment_variable (self, \"GDM_CUSTOM_CONF\",\n" " g_getenv (\"GDM_CUSTOM_CONF\"));\n" - ;; FIXME: Really glib should be declaring XDG_CONFIG_DIRS as a - ;; variable, but it doesn't do that right now. Anyway - ;; /run/current-system/profile/share/gnome-session/sessions/gnome.desktop - ;; requires that a number of .desktop files be present, and - ;; these special .desktop files are in $XDG_CONFIG_DIRS (which - ;; defaults to /etc/xdg if it's not set). Here we need to - ;; provide a value such that the GNOME session's requirements - ;; are met (provided GNOME is installed of course). - "gdm_session_set_environment_variable (self, \"XDG_CONFIG_DIRS\",\n" - " \"/run/current-system/profile/etc/xdg\");\n" ;; The session bus (which GDM will initialize from the this ;; session environment) needs to know where to find the system ;; service files. @@ -5502,7 +5492,25 @@ libxml2.") (substitute* '("daemon/gdm-x-session.c") (("X_SERVER") "g_getenv (\"GDM_X_SERVER\")")) - #t))))) + #t)) + ;; GDM needs GNOME Session to run these applications. We link + ;; their autostart files in `share/gdm/greeter/autostart' + ;; because GDM explicitly tells GNOME Session to look there. + ;; + ;; XXX: GNOME Shell should be linked here too, but currently + ;; GNOME Shell depends on GDM. + (add-after 'install 'link-autostart-files + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (autostart (string-append out "/share/gdm/" + "greeter/autostart")) + (settings (assoc-ref inputs "gnome-settings-daemon"))) + (mkdir-p autostart) + (with-directory-excursion autostart + (for-each (lambda (desktop) + (symlink desktop (basename desktop))) + (find-files (string-append settings "/etc/xdg")))) + #t)))))) (native-inputs `(("dconf" ,dconf) ("glib:bin" ,glib "bin") ; for glib-compile-schemas, etc. @@ -5515,6 +5523,7 @@ libxml2.") `(("accountsservice" ,accountsservice) ("check" ,check) ; for testing ("elogind" ,elogind) + ("gnome-settings-daemon" ,gnome-settings-daemon) ("gtk+" ,gtk+) ("iso-codes" ,iso-codes) ("libcanberra" ,libcanberra) -- cgit v1.2.3 From def6d6b61685f69421df80cb524ba94da5dadd42 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 13 Feb 2019 14:22:17 -0500 Subject: gnu: gdm: Use absolute path for gnome-session. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gnome.scm (gdm)[arguments]: Modify the pre-configure phase to substitute in the absolute path of gnome-session. [inputs]: Add gnome-session. Signed-off-by: Ludovic Courtès --- gnu/packages/gnome.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index ec6d3fb8c6..386203356c 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5431,7 +5431,7 @@ libxml2.") (modify-phases %standard-phases (add-before 'configure 'pre-configure - (lambda _ + (lambda* (#:key inputs #:allow-other-keys) ;; We don't have . (substitute* '("common/gdm-log.c" "daemon/gdm-server.c" @@ -5492,6 +5492,11 @@ libxml2.") (substitute* '("daemon/gdm-x-session.c") (("X_SERVER") "g_getenv (\"GDM_X_SERVER\")")) + ;; Use an absolute path for GNOME Session. + (substitute* "daemon/gdm-launch-environment.c" + (("\"gnome-session\"") + (string-append "\"" (assoc-ref inputs "gnome-session") + "/bin/gnome-session\""))) #t)) ;; GDM needs GNOME Session to run these applications. We link ;; their autostart files in `share/gdm/greeter/autostart' @@ -5523,6 +5528,7 @@ libxml2.") `(("accountsservice" ,accountsservice) ("check" ,check) ; for testing ("elogind" ,elogind) + ("gnome-session" ,gnome-session) ("gnome-settings-daemon" ,gnome-settings-daemon) ("gtk+" ,gtk+) ("iso-codes" ,iso-codes) -- cgit v1.2.3 From c9ff92b550f4cb27f07ff093d59fc201ffea7e80 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 13 Feb 2019 14:22:18 -0500 Subject: gnu: gdm: Simplify pre-configure phase. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gnome.scm (gdm)[arguments]: Simplify the pre-configure phase. Signed-off-by: Ludovic Courtès --- gnu/packages/gnome.scm | 34 +++++++++++++++------------------- 1 file changed, 15 insertions(+), 19 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 386203356c..dec567a0e0 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5460,25 +5460,21 @@ libxml2.") "\"/run/current-system/profile/share/wayland") (("DATADIR \"/gnome") "\"/run/current-system/profile/share/gnome")) - (substitute* '("daemon/gdm-session.c") - (("set_up_session_environment \\(self\\);") - (string-append - "set_up_session_environment (self);\n" - ;; Propagate GDM_X_SERVER environment variable (which is set - ;; by the GDM service, as it's a function of what X modules - ;; the user decides to have available) down to worker - ;; processes. - "gdm_session_set_environment_variable (self, \"GDM_X_SERVER\",\n" - " g_getenv (\"GDM_X_SERVER\"));\n" - ;; Propagate the GDM_CUSTOM_CONF environment variable. - "gdm_session_set_environment_variable (self, \"GDM_CUSTOM_CONF\",\n" - " g_getenv (\"GDM_CUSTOM_CONF\"));\n" - ;; The session bus (which GDM will initialize from the this - ;; session environment) needs to know where to find the system - ;; service files. - "gdm_session_set_environment_variable (self, \"XDG_DATA_DIRS\",\n" - " \"/run/current-system/profile/share\");\n" - ))) + (let ((propagate '("GDM_CUSTOM_CONF" + "GDM_X_SERVER" + ;; XXX: Remove this once GNOME Shell is + ;; a dependency of GDM. + "XDG_DATA_DIRS"))) + (substitute* "daemon/gdm-session.c" + (("set_up_session_environment \\(self\\);") + (apply string-append + "set_up_session_environment (self);\n" + (map (lambda (name) + (string-append + "gdm_session_set_environment_variable " + "(self, \"" name "\"," + "g_getenv (\"" name "\"));\n")) + propagate))))) ;; Look for custom GDM conf in /run/current-system. (substitute* '("common/gdm-settings-desktop-backend.c") (("GDM_CUSTOM_CONF") -- cgit v1.2.3 From 1f564c1573f2d120a55e3b321a0c558a51720bce Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 13 Feb 2019 14:22:19 -0500 Subject: gnu: gdm: Run dbus-daemon via a wrapper script. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gnome.scm (gdm)[arguments]: Modify the pre-configure phase so that GDM propagates the GDM_DBUS_DAEMON variable into the session environment and uses its value to invoke dbus-daemon. * gnu/services/xorg.scm (dbus-daemon-wrapper): New variable. (): Add 'dbus-daemon' field. (gdm-shepherd-service): Set GDM_DBUS_DAEMON before invoking gdm. Signed-off-by: Ludovic Courtès --- gnu/packages/gnome.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index dec567a0e0..794f3a8843 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5461,6 +5461,7 @@ libxml2.") (("DATADIR \"/gnome") "\"/run/current-system/profile/share/gnome")) (let ((propagate '("GDM_CUSTOM_CONF" + "GDM_DBUS_DAEMON" "GDM_X_SERVER" ;; XXX: Remove this once GNOME Shell is ;; a dependency of GDM. @@ -5486,6 +5487,8 @@ libxml2.") (("\\(X_SERVER X_SERVER_ARG_FORMAT") "(\"%s\" X_SERVER_ARG_FORMAT, g_getenv (\"GDM_X_SERVER\")")) (substitute* '("daemon/gdm-x-session.c") + (("\"dbus-daemon\"") + "g_getenv (\"GDM_DBUS_DAEMON\")") (("X_SERVER") "g_getenv (\"GDM_X_SERVER\")")) ;; Use an absolute path for GNOME Session. -- cgit v1.2.3 From 41fa9f1815685ede0d3fdc1c561d2a9cf0ffb158 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 13 Feb 2019 14:22:21 -0500 Subject: services: gdm: Allow for custom X session scripts. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gnome.scm (gdm)[arguments]: Update pre-configure phase so that GDM runs an X session script specified by the variable GDM_X_SESSION; remove the '--enable-gdm-xsession' configuration option. * gnu/services/xorg.scm (): Add 'x-session' field. (gdm-shepherd-service): Set the GDM_X_SESSION variable. Signed-off-by: Ludovic Courtès --- gnu/packages/gnome.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 794f3a8843..7001a12b19 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5410,10 +5410,6 @@ libxml2.") ;; service for TTY 1 before starting GDM). "--with-initial-vt=7" - ;; By default, GDM expects distributions to install a custom Xsession - ;; script. It provides a generic one if --enable-gdm-xsession is set. - "--enable-gdm-xsession" - ;; Use '/etc/environment' for locale settings instead of the ;; systemd-specific '/etc/locale.conf'. "--with-lang-file=/etc/environment" @@ -5463,6 +5459,7 @@ libxml2.") (let ((propagate '("GDM_CUSTOM_CONF" "GDM_DBUS_DAEMON" "GDM_X_SERVER" + "GDM_X_SESSION" ;; XXX: Remove this once GNOME Shell is ;; a dependency of GDM. "XDG_DATA_DIRS"))) @@ -5490,7 +5487,9 @@ libxml2.") (("\"dbus-daemon\"") "g_getenv (\"GDM_DBUS_DAEMON\")") (("X_SERVER") - "g_getenv (\"GDM_X_SERVER\")")) + "g_getenv (\"GDM_X_SERVER\")") + (("GDMCONFDIR \"/Xsession\"") + "g_getenv (\"GDM_X_SESSION\")")) ;; Use an absolute path for GNOME Session. (substitute* "daemon/gdm-launch-environment.c" (("\"gnome-session\"") -- cgit v1.2.3 From 46a1a602f4121e3425c5b3a40ad825615490c7f1 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 16 Feb 2019 21:26:57 +0100 Subject: gnu: yad: Update to 0.41.0. * gnu/packages/gtk.scm (yad): Update to 0.41.0. --- gnu/packages/gtk.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index b8377ff514..9d9750cde1 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -15,7 +15,7 @@ ;;; Copyright © 2016 Patrick Hetu ;;; Copyright © 2016 Nils Gillmann ;;; Copyright © 2017 Roel Janssen -;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2017 Marius Bakke ;;; Copyright © 2018 Alex Vong ;;; Copyright © 2018 Arun Isaac @@ -1677,7 +1677,7 @@ popular spread sheet programs.") (define-public yad (package (name "yad") - (version "0.40.3") + (version "0.41.0") (source (origin (method git-fetch) @@ -1686,7 +1686,7 @@ popular spread sheet programs.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1vpgbjbkkbk5plicyklzpf65j1vlig4n4bi3qpvrz5bb09ic5alw")))) + (base32 "1hkxiich898sbacpg3jflf6i8l4hkfnc0zh10rr376v0mnzbn6jn")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From ec756fa58cc9b8379b84bc048fcc143798971a57 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 16 Feb 2019 21:34:27 +0100 Subject: gnu: ddcutil: Update to 0.9.4. * gnu/packages/hardware.scm (ddcutil): Update to 0.9.4. --- gnu/packages/hardware.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm index 0a2a7dbb7b..738af1909b 100644 --- a/gnu/packages/hardware.scm +++ b/gnu/packages/hardware.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -38,14 +38,14 @@ (define-public ddcutil (package (name "ddcutil") - (version "0.9.2") + (version "0.9.4") (source (origin (method url-fetch) (uri (string-append "https://www.ddcutil.com/tarballs/" - name "-" version ".tar.gz")) + "ddcutil-" version ".tar.gz")) (sha256 - (base32 "0nhi261vf2n3jpi0a0n6659911kxi3lj7a4h7cmv0ip6sbb8rk88")))) + (base32 "1jqfip43sx3dnx86znmpy8dj4ikkfpgf8npgq66s7hqwwa99i7zc")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From a11c7a0b22ac0ec24618a69340648bc510daa00e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 16 Feb 2019 21:36:48 +0100 Subject: gnu: wavemon: Update to 0.9.0. * gnu/packages/hardware.scm (wavemon): Update to 0.9.0. --- gnu/packages/hardware.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm index 738af1909b..006a61c086 100644 --- a/gnu/packages/hardware.scm +++ b/gnu/packages/hardware.scm @@ -238,7 +238,7 @@ be dangerous and may void your CPU or system board's warranty.") (define-public wavemon (package (name "wavemon") - (version "0.8.2") + (version "0.9.0") (source (origin (method git-fetch) @@ -247,7 +247,7 @@ be dangerous and may void your CPU or system board's warranty.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0rqpp7rhl9rlwnihsapaiy62v33h45fm3d0ia2nhdjw7fwkwcqvs")))) + (base32 "07cid0h3mcyr74nnrzzf8k5n1p9a4y3wij43jbiaqmkpxilcc1i6")))) (build-system gnu-build-system) (arguments `(#:make-flags -- cgit v1.2.3 From 4f4b37dfdf99531458df79b558b453defe9b4f17 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 16 Feb 2019 21:39:06 +0100 Subject: gnu: pius: Update to 2.2.7. * gnu/packages/gnupg.scm (pius): Update to 2.2.7. [source]: Remove upstreamed patch. * gnu/packages/patches/pius.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/packages/gnupg.scm | 11 +++++------ gnu/packages/patches/pius.patch | 38 -------------------------------------- 2 files changed, 5 insertions(+), 44 deletions(-) delete mode 100644 gnu/packages/patches/pius.patch (limited to 'gnu/packages') diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 7a7ff966bb..c5c99bfeb6 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -13,7 +13,7 @@ ;;; Copyright © 2016 Troy Sankey ;;; Copyright © 2017 Leo Famulari ;;; Copyright © 2017 Petter -;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 Marius Bakke ;;; ;;; This file is part of GNU Guix. @@ -628,7 +628,7 @@ signing, decryption, verification, and key-listing parsing.") (define-public pius (package (name "pius") - (version "2.2.6") + (version "2.2.7") (source (origin (method url-fetch) (uri (string-append @@ -636,15 +636,14 @@ signing, decryption, verification, and key-listing parsing.") version "/pius-" version ".tar.bz2")) (sha256 (base32 - "1893hzpx3zv724drqv48csrn0cm98xw4ymb1zmhs2jvjj1778zfj")) - (patches (search-patches "pius.patch")))) + "1nsl7czicv95j0gfz4s82ys3g3h2mwr6cq3ilid8bpz3iy7z4ipy")))) (build-system python-build-system) - (inputs `(("perl" ,perl) ;for 'pius-party-worksheet' + (inputs `(("perl" ,perl) ; for 'pius-party-worksheet' ("gpg" ,gnupg) ("python-six" ,python2-six))) (arguments `(#:tests? #f - #:python ,python-2 ;uses the Python 2 'print' syntax + #:python ,python-2 ; uses the Python 2 'print' syntax #:phases (modify-phases %standard-phases (add-before diff --git a/gnu/packages/patches/pius.patch b/gnu/packages/patches/pius.patch deleted file mode 100644 index da39731d4d..0000000000 --- a/gnu/packages/patches/pius.patch +++ /dev/null @@ -1,38 +0,0 @@ -See https://github.com/jaymzh/pius/pull/96 - -commit 4dba0bf75ab351969622f7b9c38484657411a528 -Author: Martin Kletzander -Date: Thu May 17 17:55:27 2018 +0200 - - Don't fail on ENCRYPTION_COMPLIANCE_MODE line from too new GnuPG (#96) - - GnuPG started printing information about encryption compliance in [commit - f31dc2540acf](https://dev.gnupg.org/rGf31dc2540acf7cd7f09fd94658e815822222bfcb) - and since then signing with pius fails. - - Closes #95 - - Signed-off-by: Martin Kletzander - -diff --git a/libpius/signer.py b/libpius/signer.py -index 3c7262f..13013bb 100644 ---- a/libpius/signer.py -+++ b/libpius/signer.py -@@ -45,6 +45,7 @@ class PiusSigner(object): - GPG_PINENTRY_LAUNCHED = '[GNUPG:] PINENTRY_LAUNCHED' - GPG_KEY_CONSIDERED = '[GNUPG:] KEY_CONSIDERED' - GPG_WARN_VERSION = '[GNUPG:] WARNING server_version_mismatch' -+ GPG_ENC_COMPLIANT_MODE = '[GNUPG:] ENCRYPTION_COMPLIANCE_MODE' - - def __init__(self, signer, force_signer, mode, keyring, gpg_path, tmpdir, - outdir, encrypt_outfiles, mail, mailer, verbose, sort_keyring, -@@ -431,6 +432,9 @@ class PiusSigner(object): - if PiusSigner.GPG_ENC_BEG in line: - debug('Got GPG_ENC_BEG') - continue -+ elif PiusSigner.GPG_ENC_COMPLIANT_MODE in line: -+ debug('Got ENCRYPTION_COMPLIANCE_MODE') -+ continue - elif PiusSigner.GPG_ENC_END in line: - debug('Got GPG_ENC_END') - break -- cgit v1.2.3 From 853556831b40ae95f67fd411a19bb9a88bd4977c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 16 Feb 2019 21:45:19 +0100 Subject: gnu: clipit: Update to 1.4.4. * gnu/packages/gtk.scm (clipit): Update to 1.4.4. [source]: Use GIT-FETCH and GIT-FILE-NAME. [native-inputs]: Add autoconf and automake. --- gnu/packages/gtk.scm | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 9d9750cde1..fb5c178d53 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1591,18 +1591,21 @@ misspelled words in a GtkTextView widget.") (define-public clipit (package (name "clipit") - (version "1.4.2") - (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/downloads/ClipIt/clipit-" - version ".tar.gz")) - (sha256 - (base32 - "0jrwn8qfgb15rwspdp1p8hb1nc0ngmpvgr87d4k3lhlvqg2cfqva")))) + (version "1.4.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/CristianHenzel/ClipIt.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "05xi29v2y0rvb33fmvrz7r9j4l858qj7ngwd7dp4pzpkkaybjln0")))) (build-system gnu-build-system) (native-inputs - `(("intltool" ,intltool) + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("intltool" ,intltool) ("pkg-config" ,pkg-config))) (inputs `(("gtk+" ,gtk+-2))) -- cgit v1.2.3 From 93fee74acfd430afd5959b62311ead0743e05d00 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 16 Feb 2019 19:25:30 +0100 Subject: gnu: xcursor-themes: Update to 1.0.6. * gnu/packages/xorg.scm (xcursor-themes): Update to 1.0.6. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index de8d784e64..2ef82eadec 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -2204,7 +2204,7 @@ X11 Inter-Client Communication Conventions Manual (ICCCM).") (define-public xcursor-themes (package (name "xcursor-themes") - (version "1.0.5") + (version "1.0.6") (source (origin (method url-fetch) @@ -2214,7 +2214,7 @@ X11 Inter-Client Communication Conventions Manual (ICCCM).") ".tar.bz2")) (sha256 (base32 - "0whjiq6d5z4z75zh37pji6llfcyrg6q3mg9zx5zqyncnj39q30xf")))) + "16a96li0s0ggg60v7f6ywxmsrmxdfizcw55ccv7sp4qjfisca7pf")))) (build-system gnu-build-system) (inputs `(("libxcursor" ,libxcursor) -- cgit v1.2.3 From fffe48701aad4d4bc8080c1f3106c4b258a844a4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 16 Feb 2019 19:34:42 +0100 Subject: gnu: tintin++: Update to 2.01.7. * gnu/packages/games.scm (tintin++): Update to 2.01.7. --- gnu/packages/games.scm | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 6d9e63c4e9..f82af0e8c3 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -3428,22 +3428,23 @@ the GNU GPL.") (define-public tintin++ (package (name "tintin++") - (version "2.01.5") - (source (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/tintin" - "/TinTin++ Source Code/" version - "/tintin" "-" version ".tar.gz")) - (sha256 - (base32 - "0pnnbcm96xbj69358568rpvp164rjmcvhnnzs7nvj062pi2hqcxx")))) + (version "2.01.7") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/tintin/TinTin++ Source Code/" + (version-major+minor version) + "/tintin-" version ".tar.gz")) + (sha256 + (base32 + "033n84pyxml3n3gd4dq0497n9w331bnrr1gppwipz9ashmq8jz7v")))) (inputs `(("gnutls" ,gnutls) ("pcre" ,pcre) ("readline" ,readline) ("zlib" ,zlib))) (arguments - '(#:tests? #f ; no test suite + '(#:tests? #f ; no test suite #:phases (modify-phases %standard-phases ;; The source is in tt/src. -- cgit v1.2.3 From 51e31aa865e5d1b272673ae94e13ffdc9f4db536 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 16 Feb 2019 19:59:52 +0100 Subject: gnu: toybox: Update to 0.8.0. * gnu/packages/busybox.scm (toybox): Update to 0.8.0. --- gnu/packages/busybox.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/busybox.scm b/gnu/packages/busybox.scm index 09812d4a49..20a2e5aabf 100644 --- a/gnu/packages/busybox.scm +++ b/gnu/packages/busybox.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 John Darrington ;;; Copyright © 2016, 2017, 2018 Efraim Flashner -;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 Efraim Flashner ;;; ;;; This file is part of GNU Guix. @@ -108,7 +108,7 @@ any small or embedded system.") (define-public toybox (package (name "toybox") - (version "0.7.8") + (version "0.8.0") (source (origin (method url-fetch) (uri (string-append @@ -116,7 +116,7 @@ any small or embedded system.") version ".tar.gz")) (sha256 (base32 - "1mlqv5hsvy8ii6m698hq6rc316klwv44jlr034knwg6bk1lf2qj9")))) + "0mirj977zxsxnfaiqndwgsn9calgg312d817fi1hkfbd8kcyrk73")))) (build-system gnu-build-system) (arguments '(#:phases -- cgit v1.2.3 From 0db873dd0189ff16eb1788d295cf1e1e7ca7ca4b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 16 Feb 2019 20:20:46 +0100 Subject: gnu: rename: Update to 1.10. * gnu/packages/admin.scm (rename): Update to 1.10. --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index c0c991c137..3243459a04 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -880,7 +880,7 @@ over ssh connections.") (define-public rename (package (name "rename") - (version "1.00") + (version "1.10") (source (origin (method url-fetch) (uri (string-append @@ -888,7 +888,7 @@ over ssh connections.") version ".tar.gz")) (sha256 (base32 - "03yhf8nmqsb0zyliv501fdvwlp589jqfn44yqkrflmpzrbik3zxl")))) + "137m8s06r4n038ivlr5r1d9a7q9l7shmwpvnyx053r9ndhvbnkh5")))) (build-system perl-build-system) (arguments `(#:phases -- cgit v1.2.3 From 35ea6e3c097ffe80c2eab25dff4bee6f8593ecc1 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 16 Feb 2019 20:27:46 +0100 Subject: gnu: suil: Update to 0.10.2. * gnu/packages/audio.scm (suil): Update to 0.10.2. [arguments]: Use default Python (3). --- gnu/packages/audio.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 9d301e421e..8471d03aa1 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -2447,18 +2447,17 @@ the Turtle syntax.") (define-public suil (package (name "suil") - (version "0.10.0") + (version "0.10.2") (source (origin (method url-fetch) (uri (string-append "https://download.drobilla.net/suil-" version ".tar.bz2")) (sha256 (base32 - "0j489gm3fhnmwmbgw30bvd4byw1vsy4yazdlnji8jzhcz0qwb5cq")))) + "00d43m0nai63ajb7rkm9v084jcih206y17ib3160zcvzc885ji4z")))) (build-system waf-build-system) (arguments - `(#:tests? #f ; no check target - #:python ,python-2 ;XXX: The bundled waf does not work with Python 3.7.0. + `(#:tests? #f ; no check target #:configure-flags '("CXXFLAGS=-std=gnu++11"))) (inputs -- cgit v1.2.3 From 3aeac37e61e44f63dd3fd29eb8f19b3b4993614c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 17 Feb 2019 08:29:02 +0200 Subject: gnu: quassel: Update to 0.13.1. * gnu/packages/irc.scm (quassel): Update to 0.13.1. [source]: Use https. --- gnu/packages/irc.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm index 98d0e8d5d8..e6f23d14d7 100644 --- a/gnu/packages/irc.scm +++ b/gnu/packages/irc.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2013 Cyril Roelandt ;;; Copyright © 2014 Kevin Lemonnier ;;; Copyright © 2015, 2017 Ludovic Courtès -;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner +;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner ;;; Copyright © 2016 Nils Gillmann ;;; Copyright © 2017 Marius Bakke ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice @@ -67,15 +67,15 @@ (define-public quassel (package (name "quassel") - (version "0.13.0") + (version "0.13.1") (source (origin (method url-fetch) - (uri (string-append "http://quassel-irc.org/pub/quassel-" + (uri (string-append "https://quassel-irc.org/pub/quassel-" version ".tar.bz2")) (sha256 (base32 - "0xp9mppxl63qzgsdyprmblvfrj0bb9z57kfc088gvcavvq1210nr")) + "0mg8jydc70vlylppzich26q4s40kr78r3ysfyjwisfvlg2byxvs8")) (modules '((guix build utils))) ;; We don't want to install the bundled scripts. (snippet -- cgit v1.2.3 From f30d5f7f2dac5b02d5d71486a501bb0381ae034b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 17 Feb 2019 09:58:09 +0100 Subject: gnu: guile-curl: Update to 0.6. * gnu/packages/curl.scm (guile-curl): Update to 0.6. --- gnu/packages/curl.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index 12a82d1bb7..822fe17036 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2017 Efraim Flashner ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Roel Janssen +;;; Copyright © 2019 Ricardo Wurmus ;;; ;;; This file is part of GNU Guix. ;;; @@ -202,15 +203,14 @@ not offer a replacement for libcurl.") (define-public guile-curl (package (name "guile-curl") - (version "0.5") + (version "0.6") (source (origin (method url-fetch) - (uri (string-append - "http://www.lonelycactus.com/tarball/guile-curl-" - version ".tar.gz")) + (uri (string-append "http://www.lonelycactus.com/tarball/" + "guile_curl-" version ".tar.gz")) (sha256 (base32 - "1846rxgc0ylh8768lr79irc7nwjichzb7qb7lzs2k42m0i53sc46")))) + "1pxdhnk288ky6gkpad8i60m0p6404rdvls43lr1b5d3csrklyc70")))) (build-system gnu-build-system) (arguments `(#:configure-flags (list (string-append -- cgit v1.2.3 From e9823f9ca347b396b6eae0f61b1ab84cec800684 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 17 Feb 2019 09:58:42 +0100 Subject: gnu: openmpi: Add InfiniBand support. * gnu/packages/mpi.scm (openmpi)[inputs]: Add opensm. [arguments]: Add openib configure flags; add build phase "find-opensm-headers". --- gnu/packages/mpi.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm index 0a43c55b7a..e4c17d41c2 100644 --- a/gnu/packages/mpi.scm +++ b/gnu/packages/mpi.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2017 Efraim Flashner ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Paul Garlick +;;; Copyright © 2019 Ricardo Wurmus ;;; ;;; This file is part of GNU Guix. ;;; @@ -32,6 +33,7 @@ #:use-module (guix build-system gnu) #:use-module (guix build-system python) #:use-module (gnu packages) + #:use-module (gnu packages fabric-management) #:use-module (gnu packages gcc) #:use-module (gnu packages libevent) #:use-module (gnu packages linux) @@ -174,6 +176,7 @@ bind processes, and much more.") ("gfortran" ,gfortran) ("libfabric" ,libfabric) ("libevent" ,libevent) + ("opensm" ,opensm) ,@(if (and (not (%current-target-system)) (member (%current-system) (package-supported-systems psm))) `(("psm" ,psm)) @@ -198,11 +201,31 @@ bind processes, and much more.") "--with-valgrind" "--with-hwloc=external" "--with-libevent" + + ;; InfiniBand support + "--enable-openib-control-hdr-padding" + "--enable-openib-dynamic-sl" + "--enable-openib-udcm" + "--enable-openib-rdmacm" + "--enable-openib-rdmacm-ibaddr" + ;; Enable support for SLURM's Process Manager ;; Interface (PMI). ,(string-append "--with-pmi=" (assoc-ref %build-inputs "slurm"))) #:phases (modify-phases %standard-phases + ;; opensm is needed for InfiniBand support. + (add-after 'unpack 'find-opensm-headers + (lambda* (#:key inputs #:allow-other-keys) + (setenv "C_INCLUDE_PATH" + (string-append (assoc-ref inputs "opensm") + "/include/infiniband/:" + (getenv "C_INCLUDE_PATH"))) + (setenv "CPLUS_INCLUDE_PATH" + (string-append (assoc-ref inputs "opensm") + "/include/infiniband/:" + (getenv "CPLUS_INCLUDE_PATH"))) + #t)) (add-before 'build 'remove-absolute (lambda _ ;; Remove compiler absolute file names (OPAL_FC_ABSOLUTE -- cgit v1.2.3 From 9f0ce5ec4af373e3a7980de99c58b9926c83cf06 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 17 Feb 2019 10:02:06 +0100 Subject: gnu: Add libcxx. * gnu/packages/llvm.scm (libcxx): New variable. --- gnu/packages/llvm.scm | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 9a4cca35d0..bb5a4a141c 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2015 Mark H Weaver ;;; Copyright © 2015, 2017, 2018, 2019 Ludovic Courtès ;;; Copyright © 2016 Dennis Mungai -;;; Copyright © 2016, 2018 Ricardo Wurmus +;;; Copyright © 2016, 2018, 2019 Ricardo Wurmus ;;; Copyright © 2017 Roel Janssen ;;; Copyright © 2018, 2019 Marius Bakke ;;; Copyright © 2018 Tobias Geerinckx-Rice @@ -259,6 +259,29 @@ project includes the Clang front end, the Clang static analyzer, and several code analysis tools.") (license license:ncsa))) +(define-public libcxx + (package + (name "libcxx") + (version (package-version llvm)) + (source + (origin + (method url-fetch) + (uri (string-append "http://llvm.org/releases/" + version "/libcxx-" version ".src.tar.xz")) + (sha256 + (base32 + "0rzw4qvxp6qx4l4h9amrq02gp7hbg8lw4m0sy3k60f50234gnm3n")))) + (build-system cmake-build-system) + (native-inputs + `(("clang" ,clang) + ("llvm" ,llvm))) + (home-page "https://libcxx.llvm.org") + (synopsis "C++ standard library") + (description + "This package provides an implementation of the C++ standard library for +use with Clang, targeting C++11, C++14 and above.") + (license license:expat))) + (define-public clang-runtime (clang-runtime-from-llvm llvm -- cgit v1.2.3 From 52bc70e42d4da8901d6093b276822e783a76853a Mon Sep 17 00:00:00 2001 From: Danny O'Brien Date: Tue, 12 Feb 2019 22:12:00 -0800 Subject: gnu: neovim: Update to 0.3.4. * gnu/packages/vim.scm (neovim): Update to 0.3.4. [home-page]: Use HTTPS. Signed-off-by: Ricardo Wurmus --- gnu/packages/vim.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index 8da08c41b0..5e1e9b852c 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -675,7 +675,7 @@ are detected, the user is notified."))) (define-public neovim (package (name "neovim") - (version "0.3.1") + (version "0.3.4") (source (origin (method url-fetch) @@ -684,7 +684,7 @@ are detected, the user is notified."))) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "08mdffcw4k503bccm1plq8r7hjx4w61w5jyfdj80fr079hnkjpmw")))) + "03mwfhr9rq86p8lypbdfyl7c7xyn6nzv2ipd8jc33bxzvs5i0hd6")))) (build-system cmake-build-system) (arguments `(#:modules ((srfi srfi-26) @@ -730,7 +730,7 @@ are detected, the user is notified."))) `(("pkg-config" ,pkg-config) ("gettext" ,gettext-minimal) ("gperf" ,gperf))) - (home-page "http://neovim.io") + (home-page "https://neovim.io") (synopsis "Fork of vim focused on extensibility and agility") (description "Neovim is a project that seeks to aggressively refactor Vim in order to: -- cgit v1.2.3 From 4e51d73596e22cb5fea9a86a6fa97d8636a7253a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 17 Feb 2019 11:48:47 +0100 Subject: gnu: guitarix: Fix build. Fixes . * gnu/packages/audio.scm (guitarix)[arguments]: Add phase "fix-boost-includes". --- gnu/packages/audio.scm | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 8471d03aa1..ae0dddeb66 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -1375,7 +1375,20 @@ patches that can be used with softsynths such as Timidity and WildMidi.") (list ;; Add the output lib directory to the RUNPATH. (string-append "--ldflags=-Wl,-rpath=" %output "/lib") - "--cxxflags=-std=c++11"))) + "--cxxflags=-std=c++11") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-boost-includes + (lambda _ + (substitute* "src/headers/gx_internal_plugins.h" + (("namespace gx_jack" m) + (string-append "#include \n" m))) + (substitute* '("src/headers/gx_system.h" + "src/headers/gx_parameter.h" + "src/headers/gx_json.h") + (("namespace gx_system" m) + (string-append "#include \n" m))) + #t))))) (inputs `(("libsndfile" ,libsndfile) ("boost" ,boost) -- cgit v1.2.3 From e3da630bfd627bab3a2c26a0ff0c9756206d716a Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Sun, 17 Feb 2019 00:54:57 -0600 Subject: gnu: emacs-xelb: Update to 0.17. * gnu/packages/emacs-xyz.scm (emacs-xelb): Update to 0.17. Signed-off-by: Ricardo Wurmus --- gnu/packages/emacs-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index b7b8989c27..9325625cd4 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -41,7 +41,7 @@ ;;; Copyright © 2018 Alex Branham ;;; Copyright © 2018 Thorsten Wilms ;;; Copyright © 2018 Pierre Langlois -;;; Copyright © 2018 Brett Gilio +;;; Copyright © 2018, 2019 Brett Gilio ;;; ;;; This file is part of GNU Guix. ;;; @@ -6548,14 +6548,14 @@ which code derived from Kelvin H's org-page.") (define-public emacs-xelb (package (name "emacs-xelb") - (version "0.16") + (version "0.17") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/xelb-" version ".tar")) (sha256 (base32 - "03wsr1jr7f7zfd80h864rd4makwh4widdnj1kjv2xyjwdgap9rl8")))) + "0k98580vq253fjdgklgqlwl450saninfw39fbq8lv3xsnp3dcgml")))) (build-system emacs-build-system) ;; The following functions and variables needed by emacs-xelb are ;; not included in emacs-minimal: -- cgit v1.2.3 From 451a5ae9ba124834e5397593b606ea548cfe5f88 Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Sun, 17 Feb 2019 00:55:45 -0600 Subject: gnu: emacs-exwm: Update to 0.22. * gnu/packages/emacs-xyz.scm (emacs-exwm): Update to 0.22. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 9325625cd4..bd3c51b087 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -6587,7 +6587,7 @@ It should enable you to implement low-level X11 applications.") (define-public emacs-exwm (package (name "emacs-exwm") - (version "0.21") + (version "0.22") (synopsis "Emacs X window manager") (source (origin (method url-fetch) @@ -6595,7 +6595,7 @@ It should enable you to implement low-level X11 applications.") version ".tar")) (sha256 (base32 - "07ng1pgsnc3isfsyzh2gfc7391p9il8lb5xqf1z6yqn20w7k6xzj")))) + "0lppm8ng37i5s4x7xdrxhjbdcnpl6pyvn4g7w52zbckjsn8qnqh0")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-xelb" ,emacs-xelb))) -- cgit v1.2.3 From b16640ac03ecab228d63f2f887435a04cd6557db Mon Sep 17 00:00:00 2001 From: Pkill -9 Date: Sun, 17 Feb 2019 09:42:28 +0000 Subject: gnu: Add qtcolorwidgets. * gnu/packages/qt.scm (qtcolorwidgets): New variable. Signed-off-by: Ricardo Wurmus --- gnu/packages/qt.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 664309cb52..8179911539 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -2232,3 +2232,33 @@ a binding language: @item Creating from Singleton QML QObject defined in the binded language @end itemize\n") (license license:lgpl3))) ;version 3 only (+ exception) + +;; There have been no public releases yet. +(define-public qtcolorwidgets + (let ((commit "a95f72e935fe9e046061a1d1c3930cbfbcb533e0") + (revision "1")) + (package + (name "qtcolorwidgets") + (version (git-version "0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/mattia.basaglia/Qt-Color-Widgets") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0dkiwlqh2gwhlp78c1fmchj3shl4p9inspcl96ya5aa8mn6kydy8")))) + (build-system cmake-build-system) + (arguments `(#:tests? #f)) ; There are no tests + (native-inputs + `(("qttools" ,qttools))) + (inputs + `(("qtbase" ,qtbase))) + (home-page "https://gitlab.com/mattia.basaglia/Qt-Color-Widgets") + (synopsis "Color management widgets") + (description "QtColorWidgets provides a Qt color dialog that is more +user-friendly than the default @code{QColorDialog} and several other +color-related widgets.") + ;; Includes a license exception for combining with GPL2 code. + (license license:lgpl3+)))) -- cgit v1.2.3 From a778f27003dc1450a57f76454b791de239110bf1 Mon Sep 17 00:00:00 2001 From: Pkill -9 Date: Sun, 17 Feb 2019 10:09:52 +0000 Subject: gnu: Add scanmem. * gnu/packages/debug.scm (scanmem): New variable. Signed-off-by: Ricardo Wurmus --- gnu/packages/debug.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/debug.scm b/gnu/packages/debug.scm index 0f4a654e62..ef4ddc9cbb 100644 --- a/gnu/packages/debug.scm +++ b/gnu/packages/debug.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2016, 2017, 2018 Efraim Flashner ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Rutger Helling +;;; Copyright © 2019 Pkill -9 ;;; ;;; This file is part of GNU Guix. ;;; @@ -30,11 +31,13 @@ #:use-module (gnu packages base) #:use-module (gnu packages bash) #:use-module (gnu packages flex) + #:use-module (gnu packages glib) #:use-module (gnu packages golang) #:use-module (gnu packages code) #:use-module (gnu packages llvm) #:use-module (gnu packages perl) #:use-module (gnu packages pretty-print) + #:use-module (gnu packages readline) #:use-module (gnu packages virtualization) #:use-module (ice-9 match) #:use-module (srfi srfi-1)) @@ -336,3 +339,36 @@ conditions.") intercepting file operations and changing random bits in the program's input. Zzuf's behaviour is deterministic, making it easy to reproduce bugs.") (license (non-copyleft "http://www.wtfpl.net/txt/copying/")))) + +(define-public scanmem + (package + (name "scanmem") + (version "0.17") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/scanmem/scanmem") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "17p8sh0rj8yqz36ria5bp48c8523zzw3y9g8sbm2jwq7sc27i7s9")))) + (build-system gnu-build-system) + (native-inputs + `(("libtool" ,libtool) + ("intltool" ,intltool) + ("automake" ,automake) + ("autoconf" ,autoconf))) + (inputs + `(("readline" ,readline))) + (home-page "https://github.com/scanmem/scanmem") + (synopsis "Memory scanner") + (description "Scanmem is a debugging utility designed to isolate the +address of an arbitrary variable in an executing process. Scanmem simply +needs to be told the pid of the process and the value of the variable at +several different times. After several scans of the process, scanmem isolates +the position of the variable and allows you to modify its value.") + ;; The library is covered by LGPLv3 or later; the application is covered + ;; by GPLv3 or later. + (license (list lgpl3+ gpl3+)))) -- cgit v1.2.3 From 966aa714c8d43ba00192ac0273f286b82a290b9a Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Sun, 17 Feb 2019 15:38:29 +0100 Subject: gnu: Add python-pari-jupyter. * gnu/packages/python-xyz.scm (python-pari-jupyter): New variable. --- gnu/packages/python-xyz.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 3741e4b98d..811cbaf03e 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -4682,6 +4682,31 @@ installing @code{kernelspec}s for use with Jupyter frontends.") (define-public python2-ipykernel (package-with-python2 python-ipykernel)) +(define-public python-pari-jupyter + (package + (name "python-pari-jupyter") + (version "1.3.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pari_jupyter" version)) + (sha256 + (base32 + "1yash0p422nnin7z58b99d0p23nx79f5m0mainc9hsjg72jhdhr6")))) + (build-system python-build-system) + (propagated-inputs + `(("python-ipykernel" ,python-ipykernel))) + (inputs + `(("pari-gp" ,pari-gp) + ("readline" ,readline))) + (arguments + `(#:tests? #f)) ; no test suite + (home-page + "https://github.com/jdemeyer/pari_jupyter") + (synopsis "A Jupyter kernel for PARI/GP") + (description "The package provides a PARI/GP kernel for Jupyter.") + (license license:gpl3+))) + ;; This is the latest release of the LTS version of ipython with support for ;; Python 2.7 and Python 3.x. Later non-LTS versions starting from 6.0 have ;; dropped support for Python 2.7. We may want to rename this package. -- cgit v1.2.3 From 3f074a21f0bf339491d993d61e9512d84984896b Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Sun, 17 Feb 2019 17:46:10 +0100 Subject: gnu: Add gap. * gnu/packages/algebra.scm (gap): New variable. --- gnu/packages/algebra.scm | 146 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 145 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index 52eb6ee366..f9ae22b3f3 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Andreas Enge +;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Andreas Enge ;;; Copyright © 2013, 2015, 2017, 2018 Ludovic Courtès ;;; Copyright © 2016, 2017, 2018, 2019 Nicolas Goaziou ;;; Copyright © 2014, 2018 Mark H Weaver @@ -856,3 +856,147 @@ xtensor provides: @item tools to manipulate array expressions and build upon xtensor. @end itemize") (license license:bsd-3))) + +(define-public gap + (package + (name "gap") + (version "4.10.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://www.gap-system.org/pub/gap/gap-" + (version-major+minor version) + "/tar.bz2/gap-" + version + ".tar.bz2")) + (sha256 + (base32 + "1dmb8v4p7j1nnf7sx8sg54b49yln36bi9acwp7w1d3a1nxj17ird")) + (modules '((guix build utils) (ice-9 ftw) (srfi srfi-1))) + (snippet + '(begin + ;; Delete the external gmp and zlib libraries + ;; and a subdirectory not needed for our build. + (for-each delete-file-recursively + '("extern" "hpcgap")) + ;; Delete a failing test. + ;; FIXME: This might be fixed in the next release, see + ;; https://github.com/gap-system/gap/issues/3292 + (delete-file "tst/testinstall/dir.tst") + ;; Delete all packages except for a fixed list. + (with-directory-excursion "pkg" + (for-each delete-file-recursively + (lset-difference string=? (scandir ".") + '("." ".." + ;; Necessary packages. + "GAPDoc-1.6.2" + "primgrp-3.3.2" + "SmallGrp-1.3" ; artistic2.0 + "transgrp" ; artistic2.0 for data, + ; gpl2 or gpl3 for code + ;; Recommanded package. + "io-4.5.4" ; gpl3+ + ;; Optional packages, searched for at start, + ;; and their depedencies. + "alnuth-3.1.0" + "AutoDoc-2018.09.20" + "autpgrp-1.10" + "crisp-1.4.4" ; bsd-2 + ; "ctbllib" ; no explicit license, drop + "FactInt-1.6.2" + "fga" + "irredsol-1.4" ; bsd-2 + "laguna-3.9.0" + "polenta-1.3.8" + "polycyclic-2.14" + "radiroot-2.8" + "resclasses-4.7.1" + "sophus-1.24" + ; "tomlib-1.2.7" ; no explicit license, drop + "utils-0.59")))) + #t)))) + (build-system gnu-build-system) + (inputs + `(("gmp" ,gmp) + ("zlib" ,zlib))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'build 'build-packages + ;; Compile all packages that have not been deleted by the + ;; code snippet above. + (lambda _ + (setenv "CONFIG_SHELL" (which "bash")) + (with-directory-excursion "pkg" + (invoke "../bin/BuildPackages.sh") + #t))) + (add-after 'build-packages 'build-doc + ;; The documentation is bundled, but we create it from source. + (lambda _ + (with-directory-excursion "doc" + (invoke "./make_doc")) + #t)) + (replace 'check + (lambda _ + ;; "make check" is expected to appear in gap-4.10.1 + (invoke "./gap" "tst/testinstall.g") + #t)) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (prog (string-append bin "/gap")) + (prog-real (string-append bin "/.gap-real")) + (share (string-append out "/share/gap")) + (include (string-append out "/include/gap"))) + ;; Install only the gap binary; the gac compiler is left + ;; for maybe later. "Wrap" it in a shell script that calls + ;; the binary with the correct parameter. + (mkdir-p bin) + (copy-file "gap" prog-real) + (call-with-output-file prog + (lambda (port) + (format port + "#!~a~%exec ~a -l ~a \"$@\"~%" + (which "bash") + prog-real + share))) + (chmod prog #o755) + ;; Install the headers and the library, which are needed by + ;; Sage. The Makefile targets are available in gap-4.10.0, + ;; but planned to be removed in gap-4.10.1. + (invoke "make" "install-headers") + (invoke "make" "install-libgap") + (install-file "gen/config.h" include) + ;; Install a certain number of files and directories to + ;; SHARE, where the wrapped shell script expects them. + ;; Remove information on the build directory from sysinfo.gap. + (substitute* "sysinfo.gap" + (("GAP_BIN_DIR=\".*\"") "GAP_BIN_DIR=\"\"") + (("GAP_LIB_DIR=\".*\"") "GAP_LIB_DIR=\"\"") + (("GAP_CPPFLAGS=\".*\"") "GAP_CPPFLAGS=\"\"")) + (install-file "sysinfo.gap" share) + (copy-recursively "grp" (string-append share "/grp")) + (copy-recursively "pkg" (string-append share "/pkg")) + ;; The following is not the C library libgap.so, but a + ;; library of GAP code. + (copy-recursively "lib" (string-append share "/lib")) + ;; The gap binary looks for documentation inside SHARE. + (copy-recursively "doc" (string-append share "/doc"))) + #t))))) + (home-page "https://www.gap-system.org/") + (synopsis + "System for computational group theory") + (description + "GAP is a system for computational discrete algebra, with particular +emphasis on computational group theory. It provides a programming language, +a library of thousands of functions implementing algebraic algorithms +written in the GAP language as well as large data libraries of algebraic +objects.") + ;; Some packages have different licenses (effectively forcing the + ;; combined work to be licensed as gpl3+); if this is the case, this + ;; is mentioned above next to their name. + ;; Some packages have no license mentioned explicitly; supposedly this + ;; means that the gpl2+ licence of GAP itself applies, but to be on the + ;; safe side, we drop them for now. + (license license:gpl2+))) -- cgit v1.2.3 From 5e388a6ebb3c287e2d54e03a3f37560beb0d75e9 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Sun, 17 Feb 2019 17:55:42 +0100 Subject: gnu: Add python-gmpy2 and python2-gmpy2. * gnu/packages/sagemath.scm (python-gmpy2, python2-gmpy2): New variables. --- gnu/packages/sagemath.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/sagemath.scm b/gnu/packages/sagemath.scm index dd8c062d31..06c4c0a17d 100644 --- a/gnu/packages/sagemath.scm +++ b/gnu/packages/sagemath.scm @@ -22,6 +22,7 @@ #:use-module (guix download) #:use-module (guix build-system python) #:use-module (gnu packages algebra) + #:use-module (gnu packages compression) #:use-module (gnu packages multiprecision) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz)) @@ -58,3 +59,33 @@ but it can be used independently.") (define-public python2-cypari2 (package-with-python2 python-cypari2)) +;; The stable version of the following package is not young enough to be +;; used with Sage, since it does not support cython. One would need to +;; use an alpha release. On the other hand, Sage can be built without it. +(define-public python-gmpy2 + (package + (name "python-gmpy2") + (version "2.0.8") + (source + (origin + (method url-fetch) + (uri (pypi-uri "gmpy2" version ".zip")) + (sha256 + (base32 + "0grx6zmi99iaslm07w6c2aqpnmbkgrxcqjrqpfq223xri0r3w8yx")))) + (build-system python-build-system) + (native-inputs + `(("unzip" ,unzip))) + (inputs + `(("gmp" ,gmp) + ("mpfr" ,mpfr) + ("mpc" ,mpc))) + (home-page "https://github.com/aleaxit/gmpy") + (synopsis + "GMP/MPIR, MPFR, and MPC interface to Python 2.6+ and 3.x") + (description + "GMP/MPIR, MPFR, and MPC interface to Python 2.6+ and 3.x") + (license #f))) + +(define-public python2-gmpy2 + (package-with-python2 python-gmpy2)) -- cgit v1.2.3 From e001783f4cdfe949381d6b53a45cff45c95ff4ba Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 17 Feb 2019 03:47:20 +0100 Subject: gnu: umockdev: Update to 0.12.1. * gnu/packages/check.scm (umockdev): Update to 0.12.1. --- gnu/packages/check.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index d689c96648..075908bc50 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -2158,7 +2158,7 @@ provides a simple way to achieve this.") (define-public umockdev (package (name "umockdev") - (version "0.11.3") + (version "0.12.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/martinpitt/umockdev/" @@ -2166,7 +2166,7 @@ provides a simple way to achieve this.") "umockdev-" version ".tar.xz")) (sha256 (base32 - "1in2hdan1g62wpvgjlj8mci85551ipr1964j2b9j06gm3blpihcx")))) + "1hx5jm9afng6hw9wyp524z8nwdp6w053pca0w2c0gqpgrmvjxvd2")))) (build-system gnu-build-system) (arguments `(#:phases @@ -2179,8 +2179,8 @@ provides a simple way to achieve this.") #t))))) (native-inputs `(("vala" ,vala) - ("python" ,python) ; for tests - ("which" ,which) ; for tests + ("python" ,python) ; for tests + ("which" ,which) ; for tests ("gtk-doc" ,gtk-doc) ("pkg-config" ,pkg-config))) (inputs -- cgit v1.2.3 From cdda263be1205b7786726e331a67584ac26a81b3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 17 Feb 2019 04:21:14 +0100 Subject: gnu: qbittorrent: Update to 4.1.5. * gnu/packages/bittorrent.scm (qbittorrent): Update to 4.1.5. --- gnu/packages/bittorrent.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index 00b115cb9c..edb3e51d11 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2016, 2017, 2018 Leo Famulari ;;; Copyright © 2016, 2017, 2018 Efraim Flashner ;;; Copyright © 2016 Tomáš Čech -;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice +;;; Copyright © 2016, 2017, 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2017 Jelle Licht ;;; Copyright © 2018 Fis Trivial ;;; Copyright © 2018 Nam Nguyen @@ -426,7 +426,7 @@ desktops.") (define-public qbittorrent (package (name "qbittorrent") - (version "4.1.3") + (version "4.1.5") (source (origin (method url-fetch) (uri (string-append @@ -435,7 +435,7 @@ desktops.") (file-name (string-append name "-release-" version ".tar.gz")) (sha256 (base32 - "00zrpnwanq9f7maky2z4wnzw08xy902s77scm2gcvxxxankr4j92")))) + "0b0xy48szhbdljvy1c92rj31kdh0jpc4v4sni5gz9nd7430dkivn")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From 71fb3263ae274a663240627901ce6cbedbbd81d4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 17 Feb 2019 04:24:32 +0100 Subject: gnu: python-pytest-mock: Update to 1.10.1. * gnu/packages/check.scm (python-pytest-mock): Update to 1.10.1. --- gnu/packages/check.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 075908bc50..f8c58eabeb 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -772,14 +772,14 @@ supports coverage of subprocesses.") (define-public python-pytest-mock (package (name "python-pytest-mock") - (version "1.10.0") + (version "1.10.1") (source (origin (method url-fetch) (uri (pypi-uri "pytest-mock" version)) (sha256 (base32 - "1h6lgpmsvs9s8j2s80v06f9f3iaw1n1rc51mbrxk1f12sw4q56nq")))) + "1i5mg3ff1qk0wqfcxfz60hwy3q5dskdp36i10ckigkzffg8hc3ad")))) (build-system python-build-system) (native-inputs `(("python-setuptools-scm" ,python-setuptools-scm))) -- cgit v1.2.3 From 0748a7b2d758c7ce1437389a1d89e1a3b443ab74 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 17 Feb 2019 04:28:24 +0100 Subject: gnu: qbittorrent: Don't use unstable tarball. * gnu/packages/bittorrent.scm (qbittorrent)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/bittorrent.scm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index edb3e51d11..d96610a791 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -427,15 +427,15 @@ desktops.") (package (name "qbittorrent") (version "4.1.5") - (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/qbittorrent/qBittorrent/archive/release-" - version ".tar.gz")) - (file-name (string-append name "-release-" version ".tar.gz")) - (sha256 - (base32 - "0b0xy48szhbdljvy1c92rj31kdh0jpc4v4sni5gz9nd7430dkivn")))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/qbittorrent/qBittorrent.git") + (commit (string-append "release-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "09zcygaxfv9g6av0vsvlyzv4v65wvj766xyfx31yz5ig3xan6ak1")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From 9a0765aad8881d6f4fd5fec23f6bc054577511aa Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 17 Feb 2019 04:34:49 +0100 Subject: gnu: python-nose-randomly: Update to 1.2.6. * gnu/packages/check.scm (python-nose-randomly): Update to 1.2.6. --- gnu/packages/check.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index f8c58eabeb..7d995892b3 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1923,14 +1923,13 @@ JSON APIs with Behave.") (define-public python-nose-randomly (package (name "python-nose-randomly") - (version "1.2.5") + (version "1.2.6") (source (origin (method url-fetch) (uri (pypi-uri "nose-randomly" version)) (sha256 - (base32 - "1cw9dlr1zh3w4i438kin7z0rm8092ki52hayisyc43h9pcplq7rn")))) + (base32 "0z662rqhfk4bjmg806mn4frb8nz4gbh7mrddsrhfffp1g4yklj3y")))) (build-system python-build-system) (native-inputs `(("python-nose" ,python-nose) -- cgit v1.2.3 From 123d92eaf366cea36de218acc7fc052e13207921 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 17 Feb 2019 14:04:30 +0100 Subject: gnu: python-pytest-cov: Update to 2.6.1. * gnu/packages/check.scm (python-pytest-cov): Update to 2.6.1. --- gnu/packages/check.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 7d995892b3..13a4280a40 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -711,23 +711,22 @@ and many external plugins.") (define-public python-pytest-cov (package (name "python-pytest-cov") - (version "2.6.0") + (version "2.6.1") (source (origin (method url-fetch) (uri (pypi-uri "pytest-cov" version)) (sha256 - (base32 - "0qnpp9y3ygx4jk4pf5ad71fh2skbvnr6gl54m7rg5qysnx4g0q73")))) + (base32 "0cyxbbghx2l4p60w10k00j1j74q1ngfiffr0pxn73ababjr69dha")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases (replace 'check (lambda _ - ;; options taken from tox.ini + ;; Options taken from tox.ini. ;; TODO: make "--restructuredtext" tests pass. They currently fail - ;; with "Duplicate implicit target name" + ;; with "Duplicate implicit target name". (invoke "python" "./setup.py" "check" "--strict" "--metadata")))))) (propagated-inputs -- cgit v1.2.3 From 61506fe551ed2237754dcaef569fff4645cd1a9d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 15 Feb 2019 14:30:57 +0100 Subject: gnu: Remove unneeded uses of python{,2}-minimal. The "python-minimal" package exists mostly to resolve a dependency cycle. To reduce duplication, packages should prefer the regular Python variants. * gnu/packages/admin.scm (htop)[native-inputs]: Change PYTHON-MINIMAL-WRAPPER to PYTHON-WRAPPER. * gnu/packages/crypto.scm (botan)[native-inputs]: Likewise. * gnu/packages/bioinformatics.scm (sambamba)[native-inputs]: Change PYTHON-MINIMAL to PYTHON. * gnu/packages/dictionaries.scm (apertium)[native-inputs]: Likewise. * gnu/packages/databases.scm (mongodb)[native-inputs]: Change PYTHON2-MINIMAL to PYTHON2. * gnu/packages/games.scm (openttd-opensfx, openttd-openmsx)[native-inputs]: Likewise. * gnu/packages/gnome.scm (deja-dup)[native-inputs]: Likewise. --- gnu/packages/admin.scm | 2 +- gnu/packages/bioinformatics.scm | 2 +- gnu/packages/crypto.scm | 2 +- gnu/packages/databases.scm | 2 +- gnu/packages/dictionaries.scm | 2 +- gnu/packages/games.scm | 4 ++-- gnu/packages/gnome.scm | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 3243459a04..4241490d48 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -298,7 +298,7 @@ graphs and can export its output to different formats.") (inputs `(("ncurses" ,ncurses))) (native-inputs - `(("python" ,python-minimal-wrapper))) ; for scripts/MakeHeader.py + `(("python" ,python-wrapper))) ; for scripts/MakeHeader.py (home-page "https://hisham.hm/htop/") (synopsis "Interactive process viewer") (description diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 933b8b9adf..69c85563e1 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -11192,7 +11192,7 @@ droplet sequencing. It has been particularly tailored for Drop-seq.") (native-inputs `(("ldc" ,ldc) ("rdmd" ,rdmd) - ("python" ,python-minimal) + ("python" ,python) ("biod" ,(let ((commit "4f1a7d2fb7ef3dfe962aa357d672f354ebfbe42e")) (origin diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index ffef4ff8e4..0345a59285 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -751,7 +751,7 @@ SHA256, SHA512, SHA3, AICH, ED2K, Tiger, DC++ TTH, BitTorrent BTIH, GOST R (replace 'check (lambda _ (invoke "./botan-test")))))) (native-inputs - `(("python" ,python-minimal-wrapper) + `(("python" ,python-wrapper) ("python-docutils" ,python-docutils))) (inputs `(("sqlite" ,sqlite) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 6129e3c0cb..e62e889f8c 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -335,7 +335,7 @@ applications.") (native-inputs `(("valgrind" ,valgrind) ("perl" ,perl) - ("python" ,python2-minimal) + ("python" ,python-2) ("python2-pymongo" ,python2-pymongo) ("python2-pyyaml" ,python2-pyyaml) ("tzdata" ,tzdata))) diff --git a/gnu/packages/dictionaries.scm b/gnu/packages/dictionaries.scm index 8c39453650..e0cd7604b6 100644 --- a/gnu/packages/dictionaries.scm +++ b/gnu/packages/dictionaries.scm @@ -372,7 +372,7 @@ word (e.g. cats) into its lemma \"cat\" and the grammatical information ("flex" ,flex) ("pkg-config" ,pkg-config) ;; python is only required for running the test suite - ("python-minimal" ,python-minimal))) + ("python" ,python))) (arguments `(#:phases (modify-phases %standard-phases diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index f82af0e8c3..0832b1ef63 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -2413,7 +2413,7 @@ OpenGFX provides you with... (build-system gnu-build-system) (native-inputs `(("catcodec" ,catcodec) - ("python" ,python2-minimal))) + ("python" ,python-2))) (arguments `(#:make-flags (list (string-append "INSTALL_DIR=" %output @@ -2450,7 +2450,7 @@ the original Transport Tycoon Deluxe.") "0nskq97a6fsv1v6d62zf3yb8whzhqnlh3lap3va3nzvj7csjgf7c")))) (build-system gnu-build-system) (native-inputs - `(("python" ,python2-minimal))) + `(("python" ,python-2))) (arguments `(#:make-flags (list (string-append "INSTALL_DIR=" %output diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 7001a12b19..e371a60131 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -277,7 +277,7 @@ features to enable users to create their discs easily and quickly.") `(("gsettings-desktop-schemas" ,gsettings-desktop-schemas) ("gobject-introspection" ,gobject-introspection) ("duplicity" ,duplicity) - ("python" ,python2-minimal) + ("python" ,python-2) ("python-pygobject" ,python2-pygobject) ("gtk+" ,gtk+) ("libnotify" ,libnotify) -- cgit v1.2.3 From 611ee0c9281c333a0ce05aa256f91479b97b1907 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 15 Feb 2019 14:40:03 +0100 Subject: gnu: htop: Fix indentation. * gnu/packages/admin.scm (htop): Reindent. --- gnu/packages/admin.scm | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 4241490d48..982aad0f4d 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -285,26 +285,26 @@ graphs and can export its output to different formats.") (define-public htop (package - (name "htop") - (version "2.2.0") - (source (origin - (method url-fetch) - (uri (string-append "http://hisham.hm/htop/releases/" - version "/htop-" version ".tar.gz")) - (sha256 - (base32 - "0mrwpb3cpn3ai7ar33m31yklj64c3pp576vh1naqff6f21pq5mnr")))) - (build-system gnu-build-system) - (inputs - `(("ncurses" ,ncurses))) - (native-inputs - `(("python" ,python-wrapper))) ; for scripts/MakeHeader.py - (home-page "https://hisham.hm/htop/") - (synopsis "Interactive process viewer") - (description - "This is htop, an interactive process viewer. It is a text-mode + (name "htop") + (version "2.2.0") + (source (origin + (method url-fetch) + (uri (string-append "http://hisham.hm/htop/releases/" + version "/htop-" version ".tar.gz")) + (sha256 + (base32 + "0mrwpb3cpn3ai7ar33m31yklj64c3pp576vh1naqff6f21pq5mnr")))) + (build-system gnu-build-system) + (inputs + `(("ncurses" ,ncurses))) + (native-inputs + `(("python" ,python-wrapper))) ;for scripts/MakeHeader.py + (home-page "https://hisham.hm/htop/") + (synopsis "Interactive process viewer") + (description + "This is htop, an interactive process viewer. It is a text-mode application (for console or X terminals) and requires ncurses.") - (license license:gpl2))) + (license license:gpl2))) (define-public pies (package -- cgit v1.2.3 From 1cb0c7a32c33cf575bdfa37536213ad0751f1b40 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 15 Feb 2019 20:11:17 +0100 Subject: gnu: keyutils: Update to 1.6. * gnu/packages/crypto.scm (keyutils): Update to 1.6. --- gnu/packages/crypto.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index 0345a59285..92333753be 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -228,7 +228,7 @@ the wrong hands.") (define-public keyutils (package (name "keyutils") - (version "1.5.11") + (version "1.6") (source (origin (method url-fetch) @@ -237,7 +237,7 @@ the wrong hands.") version ".tar.bz2")) (sha256 (base32 - "1ddig6j5xjyk6g9l2wlqc7k1cgvryxdqbsv3c9rk1p3f42448n0i")) + "05bi5ja6f3h3kdi7p9dihlqlfrsmi1wh1r2bdgxc0180xh6g5bnk")) (modules '((guix build utils))) ;; Create relative symbolic links instead of absolute ones to /lib/*. (snippet '(begin -- cgit v1.2.3 From ec92d786be1987e38b588a1c2a623676ab9eeed1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 16 Feb 2019 19:54:34 +0100 Subject: gnu: libjpeg-turbo: Don't use NAME in source URI. * gnu/packages/image.scm (libjpeg-turbo)[source](uri): Hard-code NAME. --- gnu/packages/image.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index f217c3611a..a4418d43b1 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -1301,8 +1301,8 @@ PNG, and performs PNG integrity checks and corrections.") (version "2.0.1") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/" name "/" version "/" - name "-" version ".tar.gz")) + (uri (string-append "mirror://sourceforge/libjpeg-turbo/" + version "/libjpeg-turbo-" version ".tar.gz")) (sha256 (base32 "1zv6z093l3x3jzygvni7b819j7xhn6d63jhcdrckj7fz67n6ry75")))) -- cgit v1.2.3 From 0296142087ce22a17ed1cad4ad28661ea02d08fa Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 16 Feb 2019 19:55:10 +0100 Subject: gnu: libjpeg-turbo: Replace with 2.0.2 [security fixes]. This fixes CVE-2018-20330 and CVE-2018-19664. * gnu/packages/image.scm (libjpeg-turbo)[replacement]: New field. (libjpeg-turbo-2.0.2): New public variable. --- gnu/packages/image.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index a4418d43b1..545fe334d5 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -1299,6 +1299,7 @@ PNG, and performs PNG integrity checks and corrections.") (package (name "libjpeg-turbo") (version "2.0.1") + (replacement libjpeg-turbo-2.0.2) (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/libjpeg-turbo/" @@ -1328,6 +1329,18 @@ and decompress to 32-bit and big-endian pixel buffers (RGBX, XBGR, etc.).") license:ijg ;the libjpeg library and associated tools license:zlib)))) ;the libjpeg-turbo SIMD extensions +(define-public libjpeg-turbo-2.0.2 + (package + (inherit libjpeg-turbo) + (version "2.0.2") + (source (origin + (inherit (package-source libjpeg-turbo)) + (uri (string-append "mirror://sourceforge/libjpeg-turbo/" + version "/libjpeg-turbo-" version ".tar.gz")) + (sha256 + (base32 + "1v9gx1gdzgxf51nd55ncq7rghmj4x9x91rby50ag36irwngmkf5c")))))) + (define-public niftilib (package (name "niftilib") -- cgit v1.2.3 From fa212dec64e970e556e0b78917aa12cab12b0ef7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 17 Feb 2019 15:46:18 +0100 Subject: gnu: feh: Update to 3.1.3. * gnu/packages/image-viewers.scm (feh): Update to 3.1.3. --- gnu/packages/image-viewers.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index 417989050c..7da0b0dab9 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -62,7 +62,7 @@ (define-public feh (package (name "feh") - (version "3.1.2") + (version "3.1.3") (home-page "https://feh.finalrewind.org/") (source (origin (method url-fetch) @@ -70,7 +70,7 @@ name "-" version ".tar.bz2")) (sha256 (base32 - "0qjhlrgr606gc9h96w9piyd13mx63jqfbxxnan41nrh76m8d0dka")))) + "1vsnxf4as3vyzjfhd8frzb1a8i7wnq7ck5ljx7qxqrnfqvxl1s4z")))) (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases (delete 'configure)) -- cgit v1.2.3 From 888f2137807a983a449f6818fc39b7f70a8f4034 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 17 Feb 2019 15:48:16 +0100 Subject: gnu: offlineimap: Update to 7.2.3. * gnu/packages/mail.scm (offlineimap): Update to 7.2.3. --- gnu/packages/mail.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 2c06519e1f..3dba4c4d70 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -491,7 +491,7 @@ and corrections. It is based on a Bayesian filter.") (define-public offlineimap (package (name "offlineimap") - (version "7.2.2") + (version "7.2.3") (source (origin (method git-fetch) (uri (git-reference @@ -500,7 +500,7 @@ and corrections. It is based on a Bayesian filter.") (file-name (git-file-name name version)) (sha256 (base32 - "11nj7y9fa7v6vcxk3wr8smfgm3mxxnmq3l8q69rrjxlfzcv7dl8m")))) + "18sdnhjldn8zs03bgqy1qa3ikmlfvyxcvwp3nbnv1a74biccqbpa")))) (build-system python-build-system) (native-inputs `(("asciidoc" ,asciidoc))) -- cgit v1.2.3 From 67d6df5cfa738021f94463f7437a458d69022f5b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 17 Feb 2019 15:54:52 +0100 Subject: gnu: xf86-input-libinput: Update to 0.28.2. * gnu/packages/xorg.scm (xf86-input-libinput): Update to 0.28.2. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 2ef82eadec..201e3bf2b2 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -2452,7 +2452,7 @@ including most mice, keyboards, tablets and touchscreens.") (define-public xf86-input-libinput (package (name "xf86-input-libinput") - (version "0.28.1") + (version "0.28.2") (source (origin (method url-fetch) (uri (string-append @@ -2460,7 +2460,7 @@ including most mice, keyboards, tablets and touchscreens.") name "-" version ".tar.bz2")) (sha256 (base32 - "12yr0yki94j2416bfhmkz5jpacffm27jkra89fl7h03c0y749nls")))) + "0818vr0yhk9j1y1wcbxzcd458vrvp06rrhi8k43bhqkb5jb4dcxq")))) (build-system gnu-build-system) (arguments '(#:configure-flags -- cgit v1.2.3 From 0e525a89c10198411b9f03b62eccc78857cae465 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 17 Feb 2019 15:57:52 +0100 Subject: gnu: notmuch: Update to 0.28.2. * gnu/packages/mail.scm (notmuch): Update to 0.28.2. --- gnu/packages/mail.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 3dba4c4d70..78cf899466 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -757,14 +757,14 @@ invoking @command{notifymuch} from the post-new hook.") (define-public notmuch (package (name "notmuch") - (version "0.28.1") + (version "0.28.2") (source (origin (method url-fetch) (uri (string-append "https://notmuchmail.org/releases/notmuch-" version ".tar.gz")) (sha256 (base32 - "0mcsfkrp6mpy374m5rwwgm9md8qzvwa3s4rbzid4cnkx2cwfj4fi")))) + "0cg9ff7h7mklgbqqknxigxxx1j3p3s2a9cxvrs5ih7j56f04k9l5")))) (build-system gnu-build-system) (arguments `(#:modules ((guix build gnu-build-system) -- cgit v1.2.3 From 33d7c5b0ead1be303be55749171890baac17bc7c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 17 Feb 2019 15:59:39 +0100 Subject: gnu: xf86-video-neomagic: Update to 1.3.0. * gnu/packages/xorg.scm (xf86-video-neomagic): Update to 1.3.0. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 201e3bf2b2..b0e5bcf224 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -3040,7 +3040,7 @@ the same level of support for generic VGA or 8514/A adapters.") (define-public xf86-video-neomagic (package (name "xf86-video-neomagic") - (version "1.2.9") + (version "1.3.0") (source (origin (method url-fetch) @@ -3050,7 +3050,7 @@ the same level of support for generic VGA or 8514/A adapters.") ".tar.bz2")) (sha256 (base32 - "1whb2kgyqaxdjim27ya404acz50izgmafwnb6y9m89q5n6b97y3j")))) + "0r4h673kw8fl7afc30anwbjlbhp82mg15fvaxf470xg7z983k0wk")))) (build-system gnu-build-system) (inputs `(("xorgproto" ,xorgproto) ("xorg-server" ,xorg-server))) -- cgit v1.2.3 From 3752d53d40f819cc81d985d6fc9dc647febb39f7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 17 Feb 2019 16:01:34 +0100 Subject: gnu: xf86-video-nouveau: Update to 1.0.16. * gnu/packages/xorg.scm (xf86-video-nouveau): Update to 1.0.16. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index b0e5bcf224..c24df32fe0 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -3119,7 +3119,7 @@ supported, and the RENDER extension is not accelerated by this driver.") (define-public xf86-video-nouveau (package (name "xf86-video-nouveau") - (version "1.0.15") + (version "1.0.16") (source (origin (method url-fetch) @@ -3129,7 +3129,7 @@ supported, and the RENDER extension is not accelerated by this driver.") ".tar.bz2")) (sha256 (base32 - "0k0xah72ryjwak4dc4crszxrlkmi9x1s7p3sd4la642n77yi1pmf")))) + "01mz8gnq7j6bvrqb2ljm3d1wpjhi9p2z2w8zbkdrqmqmcj060h1h")))) (build-system gnu-build-system) (inputs `(("xorg-server" ,xorg-server))) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 7741bdb658cd2c848b0758a513e4be213d7a69a5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 17 Feb 2019 16:02:09 +0100 Subject: gnu: xf86-video-tdfx: Update to 1.5.0. * gnu/packages/xorg.scm (xf86-video-tdfx): Update to 1.5.0. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index c24df32fe0..2c8ebccfb9 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -3355,7 +3355,7 @@ This driver supports SiS chipsets of 300/315/330/340 series.") (define-public xf86-video-tdfx (package (name "xf86-video-tdfx") - (version "1.4.7") + (version "1.5.0") (source (origin (method url-fetch) @@ -3365,7 +3365,7 @@ This driver supports SiS chipsets of 300/315/330/340 series.") ".tar.bz2")) (sha256 (base32 - "0hia45z4jc472fxp00803nznizcn4h1ybp63jcsb4lmd9vhqxx2c")))) + "0qc5wzwf1n65si9rc37bh224pzahh7gp67vfimbxs0b9yvhq0i9g")))) (build-system gnu-build-system) (inputs `(("mesa" ,mesa) ("xorgproto" ,xorgproto) -- cgit v1.2.3 From c69fafde3f2b57c1157d07781c48dcdbbf0a76a0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 17 Feb 2019 16:03:28 +0100 Subject: gnu: xf86-video-mga: Update to 2.0.0. * gnu/packages/xorg.scm (xf86-video-mga): Update to 2.0.0. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 2c8ebccfb9..7f356c6210 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -3015,7 +3015,7 @@ the same level of support for generic VGA or 8514/A adapters.") (define-public xf86-video-mga (package (name "xf86-video-mga") - (version "1.6.5") + (version "2.0.0") (source (origin (method url-fetch) @@ -3025,7 +3025,7 @@ the same level of support for generic VGA or 8514/A adapters.") ".tar.bz2")) (sha256 (base32 - "08ll52hlar9z446v0wwca5qkj3hxhswwm7vvcgic9xv4cf7csqxn")))) + "0yaxpgyyj9398nzzr5vnsfxcis76z46p9814yzj8179yl7hld296")))) (build-system gnu-build-system) (inputs `(("mesa" ,mesa) ("xorgproto" ,xorgproto) -- cgit v1.2.3 From 9fd6f2a713ef7b6f0ed0873e9520dc726c8d03b9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 17 Feb 2019 16:05:57 +0100 Subject: gnu: xf86-video-i128: Update to 1.4.0. * gnu/packages/patches/xf86-video-i128-remove-mibstore.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/xorg.scm (xf86-video-i128): Update to 1.4.0. [source](patches): Remove. --- .../patches/xf86-video-i128-remove-mibstore.patch | 23 ---------------------- gnu/packages/xorg.scm | 5 ++--- 2 files changed, 2 insertions(+), 26 deletions(-) delete mode 100644 gnu/packages/patches/xf86-video-i128-remove-mibstore.patch (limited to 'gnu/packages') diff --git a/gnu/packages/patches/xf86-video-i128-remove-mibstore.patch b/gnu/packages/patches/xf86-video-i128-remove-mibstore.patch deleted file mode 100644 index b269d63473..0000000000 --- a/gnu/packages/patches/xf86-video-i128-remove-mibstore.patch +++ /dev/null @@ -1,23 +0,0 @@ -Removes references to mibstore.h and miInitializeBackingStore, which -have been removed from xorg-server. Zack Rusin -wrote: "It was a noop for at least 5 years and it has been removed." -See: http://patches.openembedded.org/patch/46133/ - ---- xf86-video-i128-1.3.6/src/i128_driver.c.~1~ 2012-07-17 01:21:15.000000000 -0400 -+++ xf86-video-i128-1.3.6/src/i128_driver.c 2014-12-19 00:47:16.140087736 -0500 -@@ -51,7 +51,6 @@ - #include "mipointer.h" - - /* All drivers implementing backing store need this */ --#include "mibstore.h" - #include "micmap.h" - - #include "xf86DDC.h" -@@ -1557,7 +1556,6 @@ - return FALSE; - } - -- miInitializeBackingStore(pScreen); - xf86SetBackingStore(pScreen); - xf86SetSilkenMouse(pScreen); - diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 7f356c6210..12a6d3b660 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -2908,7 +2908,7 @@ X server.") (define-public xf86-video-i128 (package (name "xf86-video-i128") - (version "1.3.6") + (version "1.4.0") (source (origin (method url-fetch) @@ -2918,8 +2918,7 @@ X server.") ".tar.bz2")) (sha256 (base32 - "171b8lbxr56w3isph947dnw7x87hc46v6m3mcxdcz44gk167x0pq")) - (patches (search-patches "xf86-video-i128-remove-mibstore.patch")))) + "1snhpv1igrhifcls3r498kjd14ml6x2xvih7zk9xlsd1ymmhlb4g")))) (build-system gnu-build-system) (inputs `(("xorg-server" ,xorg-server))) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 409260003612f1eb884754a435e919e6a027666e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 17 Feb 2019 17:14:59 +0100 Subject: gnu: xf86-video-intel: Update to commit 33ee0c3b21ea279e08d0863f. * gnu/packages/xorg.scm (xf86-video-intel): Update to 2.99.917-12.33ee0c3. --- gnu/packages/xorg.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 12a6d3b660..b4d681eff9 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -2931,8 +2931,8 @@ X server.") (define-public xf86-video-intel - (let ((commit "0932a6b37ba6d5c9e916a1cb6ab89c3205b81a0c") - (revision "11")) + (let ((commit "33ee0c3b21ea279e08d0863fcb2e874f0974b00e") + (revision "12")) (package (name "xf86-video-intel") (version (git-version "2.99.917" revision commit)) @@ -2945,7 +2945,7 @@ X server.") (commit commit))) (sha256 (base32 - "10pqxp7n53ddiypd3l1i9gkbgzdpi6rz9vksbd16biq7pbijc2xf")) + "1ryjaj52nd2fbrjf1id5fr5vndzvv287rggbj3lzhbwzxv52r0gj")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (inputs `(("mesa" ,mesa) -- cgit v1.2.3 From d4c0053e5546fc5caae27e7a12c520c8b3a8d13e Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 17 Feb 2019 12:56:26 -0500 Subject: gnu: Borg: Remove unused dependencies. This is a followup to commit e191e8485950477b2da37f23fd0d611e1e3f92e0. * gnu/packages/backup.scm (borg)[native-inputs]: Remove python-sphinx and python-guzzle-sphinx-theme. --- gnu/packages/backup.scm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 4881ca62da..f9f7146655 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -606,10 +606,7 @@ detection, and lossless compression.") (native-inputs `(("python-cython" ,python-cython) ("python-setuptools-scm" ,python-setuptools-scm) - ("python-pytest" ,python-pytest) - ;; For generating the documentation. - ("python-sphinx" ,python-sphinx) - ("python-guzzle-sphinx-theme" ,python-guzzle-sphinx-theme))) + ("python-pytest" ,python-pytest))) (inputs `(("acl" ,acl) ("libb2" ,libb2) -- cgit v1.2.3 From a44699367468bf8fe6d82cffb97fef8df07d1705 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 17 Feb 2019 19:22:39 +0100 Subject: gnu: msitools: Don't use NAME in source URI. * gnu/packages/package-management.scm (msitools)[source]: Hard-code NAME. --- gnu/packages/package-management.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 44c6c1c21d..7745e2ee4f 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -929,8 +929,8 @@ Microsoft cabinet (.@dfn{CAB}) files.") (version "0.98") (source (origin (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - version "/" name "-" version ".tar.xz")) + (uri (string-append "mirror://gnome/sources/msitools/" + version "/msitools-" version ".tar.xz")) (sha256 (base32 "19wb3n3nwkpc6bjr0q3f1znaxsfaqgjbdxxnbx8ic8bb5b49hwac")))) -- cgit v1.2.3 From 9e4da9f2aab57150ce1b85b657a9f478f6156a96 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 17 Feb 2019 19:22:28 +0100 Subject: gnu: msitools: Update to 0.99. * gnu/packages/package-management.scm (msitools): Update to 0.99. [native-inputs]: Add bison. --- gnu/packages/package-management.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 7745e2ee4f..477e977bb2 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -926,17 +926,18 @@ Microsoft cabinet (.@dfn{CAB}) files.") (define-public msitools (package (name "msitools") - (version "0.98") + (version "0.99") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/msitools/" version "/msitools-" version ".tar.xz")) (sha256 (base32 - "19wb3n3nwkpc6bjr0q3f1znaxsfaqgjbdxxnbx8ic8bb5b49hwac")))) + "0d9nidn5zc81bc30w119933rn2g87mrsqyqkndg20srkbsd96xfl")))) (build-system gnu-build-system) (native-inputs - `(("pkg-config" ,pkg-config))) + `(("bison" ,bison) + ("pkg-config" ,pkg-config))) (inputs `(("gcab" ,gcab) ("glib" ,glib) -- cgit v1.2.3 From 91d42be7ef410bb3943481c352dfa0a3cc28882f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 17 Feb 2019 19:28:24 +0100 Subject: gnu: fbida: Don't use NAME in source URI. * gnu/packages/pdf.scm (fbida)[source]: Hard-code NAME. --- gnu/packages/pdf.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 8e69ab5c83..38a4516707 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -13,7 +13,7 @@ ;;; Copyright © 2017, 2018 Leo Famulari ;;; Copyright © 2017 Alex Vong ;;; Copyright © 2017, 2018 Rene Saavedra -;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -835,7 +835,7 @@ the PDF pages.") (source (origin (method url-fetch) (uri (string-append "https://www.kraxel.org/releases/fbida/" - name "-" version ".tar.gz")) + "fbida-" version ".tar.gz")) (sha256 (base32 "0bw224vb7jh0lrqaf4jgxk48xglvxs674qcpj5y0axyfbh896cfk")))) -- cgit v1.2.3 From b3e5cb4c7b7cd303ed8219cd93939be24e27cae1 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 17 Feb 2019 19:30:46 +0100 Subject: gnu: fbida: Update to 2.14. * gnu/packages/pdf.scm (fbida): Update to 2.14. [arguments]: Trust in /home/nckx/.local/bin:/run/setuid-programs:/home/nckx/.config/guix/current/bin:/home/nckx/.guix-profile/bin:/home/nckx/.guix-profile/sbin:/run/current-system/profile/bin:/run/current-system/profile/sbin. --- gnu/packages/pdf.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 38a4516707..29f2381e6d 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -830,7 +830,7 @@ the PDF pages.") (define-public fbida (package (name "fbida") - (version "2.12") + (version "2.14") (home-page "https://www.kraxel.org/blog/linux/fbida/") (source (origin (method url-fetch) @@ -838,14 +838,15 @@ the PDF pages.") "fbida-" version ".tar.gz")) (sha256 (base32 - "0bw224vb7jh0lrqaf4jgxk48xglvxs674qcpj5y0axyfbh896cfk")))) + "0f242mix20rgsqz1llibhsz4r2pbvx6k32rmky0zjvnbaqaw1dwm")))) (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases - (add-after 'unpack 'patch-ldconfig + (add-after 'unpack 'patch-FHS-file-names (lambda _ (substitute* "mk/Autoconf.mk" + (("/bin/echo") "echo") (("/sbin/ldconfig -p") "echo lib")) #t)) (delete 'configure)) #:tests? #f -- cgit v1.2.3 From b4d5a789b6ca3819d75834bf73685b0fdb121a0a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 17 Feb 2019 19:27:50 +0100 Subject: gnu: perl-inline: Update to 0.81. * gnu/packages/perl.scm (perl-inline): Update to 0.81. --- gnu/packages/perl.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 6ffec96cf4..b735b64c22 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -4061,16 +4061,16 @@ inc directory within a distribution and are used by Makefile.PL or Build.PL.") (define-public perl-inline (package (name "perl-inline") - (version "0.80") + (version "0.81") (source (origin (method url-fetch) (uri (string-append - "mirror://cpan/authors/id/I/IN/INGY/Inline-" + "mirror://cpan/authors/id/T/TI/TINITA/Inline-" version ".tar.gz")) (sha256 (base32 - "1xnf5hykcr54271x5jsnr61bcv1c7x39cy4kdcrkxm7bn62djavy")))) + "1qxi0xvn8rqj4sca9gwb1xkm6bdz33x57li5kfls6mnavil3i5qz")))) (build-system perl-build-system) (native-inputs `(("perl-test-warn" ,perl-test-warn))) -- cgit v1.2.3 From 4c23e261d1ac26d0fd8cca21f139d0249f17c11e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 17 Feb 2019 19:48:28 +0100 Subject: gnu: simh: Don't use unstable tarball. * gnu/packages/simh.scm (simh)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/simh.scm | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/simh.scm b/gnu/packages/simh.scm index 8547b705e0..bbca246bc1 100644 --- a/gnu/packages/simh.scm +++ b/gnu/packages/simh.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017 José Miguel Sánchez García +;;; Copyright © 2019 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -20,6 +21,7 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix git-download) #:use-module (guix build-system gnu) #:use-module (gnu packages admin)) @@ -27,14 +29,15 @@ (package (name "simh") (version "3.9-0") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/" name "/" name - "/archive/v" version ".tar.gz")) - (sha256 - (base32 - "1ymfy8j15d1aa4ai5xv9w7mk6lk4zx3zhfv0mfn66pdhrc8jlh0g")) - (file-name (string-append name "-" version ".tar.gz")))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/simh/simh.git") + (commit (string-append "v" version)))) + (sha256 + (base32 "1jiq6shj6a9xvzacvmyhxxd6xdyica8q4006qqjh5mh96rxrp15c")) + (file-name (git-file-name name version)))) (build-system gnu-build-system) (inputs `(("libpcap" ,libpcap))) -- cgit v1.2.3 From 0b475e73e8c500bcf44797f97042e91a28457ea3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 17 Feb 2019 20:38:52 +0100 Subject: gnu: python-gmpy2: Add license. This is a follow-up to commit 5e388a6ebb3c287e2d54e03a3f37560beb0d75e9. * gnu/packages/sagemath.scm (python-gmpy2)[license]: Set to LGPL3+. --- gnu/packages/sagemath.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/sagemath.scm b/gnu/packages/sagemath.scm index 06c4c0a17d..a400695b69 100644 --- a/gnu/packages/sagemath.scm +++ b/gnu/packages/sagemath.scm @@ -85,7 +85,7 @@ but it can be used independently.") "GMP/MPIR, MPFR, and MPC interface to Python 2.6+ and 3.x") (description "GMP/MPIR, MPFR, and MPC interface to Python 2.6+ and 3.x") - (license #f))) + (license license:lgpl3+))) (define-public python2-gmpy2 (package-with-python2 python-gmpy2)) -- cgit v1.2.3 From af5ead8b346f11105c964726101618116af13426 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 17 Feb 2019 20:39:51 +0100 Subject: gnu: python-gmpy2: Adjust indentation. * gnu/packages/sagemath.scm (python-gmpy2): Reindent. --- gnu/packages/sagemath.scm | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/sagemath.scm b/gnu/packages/sagemath.scm index a400695b69..3b5a8be293 100644 --- a/gnu/packages/sagemath.scm +++ b/gnu/packages/sagemath.scm @@ -64,28 +64,27 @@ but it can be used independently.") ;; use an alpha release. On the other hand, Sage can be built without it. (define-public python-gmpy2 (package - (name "python-gmpy2") - (version "2.0.8") - (source - (origin - (method url-fetch) - (uri (pypi-uri "gmpy2" version ".zip")) - (sha256 - (base32 - "0grx6zmi99iaslm07w6c2aqpnmbkgrxcqjrqpfq223xri0r3w8yx")))) - (build-system python-build-system) - (native-inputs - `(("unzip" ,unzip))) - (inputs - `(("gmp" ,gmp) - ("mpfr" ,mpfr) - ("mpc" ,mpc))) - (home-page "https://github.com/aleaxit/gmpy") - (synopsis + (name "python-gmpy2") + (version "2.0.8") + (source (origin + (method url-fetch) + (uri (pypi-uri "gmpy2" version ".zip")) + (sha256 + (base32 + "0grx6zmi99iaslm07w6c2aqpnmbkgrxcqjrqpfq223xri0r3w8yx")))) + (build-system python-build-system) + (native-inputs + `(("unzip" ,unzip))) + (inputs + `(("gmp" ,gmp) + ("mpfr" ,mpfr) + ("mpc" ,mpc))) + (home-page "https://github.com/aleaxit/gmpy") + (synopsis "GMP/MPIR, MPFR, and MPC interface to Python 2.6+ and 3.x") - (description + (description "GMP/MPIR, MPFR, and MPC interface to Python 2.6+ and 3.x") - (license license:lgpl3+))) + (license license:lgpl3+))) (define-public python2-gmpy2 (package-with-python2 python-gmpy2)) -- cgit v1.2.3 From ec6f1a0eb96ff84dc01c72d7e9ef168b36a8f1a4 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Sun, 17 Feb 2019 22:14:08 +0100 Subject: gnu: python-gmpy2: Extend description. * gnu/packages/sagemath.scm (python-gmpy2): Provide a full sentence for the description. This is a follow-up to commit 5e388a6ebb3c287e2d54e03a3f37560beb0d75e9. --- gnu/packages/sagemath.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/sagemath.scm b/gnu/packages/sagemath.scm index 3b5a8be293..eb1f71cef0 100644 --- a/gnu/packages/sagemath.scm +++ b/gnu/packages/sagemath.scm @@ -83,7 +83,8 @@ but it can be used independently.") (synopsis "GMP/MPIR, MPFR, and MPC interface to Python 2.6+ and 3.x") (description - "GMP/MPIR, MPFR, and MPC interface to Python 2.6+ and 3.x") + "This package provides a Python interface to the GNU multiprecision +libraries GMO, MPFR and MPC.") (license license:lgpl3+))) (define-public python2-gmpy2 -- cgit v1.2.3 From ff33c38cded203b02b2e1dccd2dd4d8c8493aa9b Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Sun, 17 Feb 2019 22:15:51 +0100 Subject: gnu: python-cypari2: Adjust indentation. * gnu/packages/sagemath.scm (python-cypari2): Reindent. --- gnu/packages/sagemath.scm | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/sagemath.scm b/gnu/packages/sagemath.scm index eb1f71cef0..baa79ab1c0 100644 --- a/gnu/packages/sagemath.scm +++ b/gnu/packages/sagemath.scm @@ -29,32 +29,32 @@ (define-public python-cypari2 - (package - (name "python-cypari2") - (version "2.0.3") - (source + (package + (name "python-cypari2") + (version "2.0.3") + (source (origin (method url-fetch) (uri (pypi-uri "cypari2" version)) (sha256 - (base32 - "0mghbmilmy34xp1d50xdx76sijqxmpkm2bcgx2v1mdji2ff7n0yc")))) - (build-system python-build-system) - (native-inputs + (base32 + "0mghbmilmy34xp1d50xdx76sijqxmpkm2bcgx2v1mdji2ff7n0yc")))) + (build-system python-build-system) + (native-inputs `(("python-cython" ,python-cython))) - (propagated-inputs + (propagated-inputs `(("python-cysignals" ,python-cysignals))) - (inputs + (inputs `(("gmp" ,gmp) ("pari-gp", pari-gp))) - (home-page "https://cypari2.readthedocs.io/") - (synopsis + (home-page "https://cypari2.readthedocs.io/") + (synopsis "Python interface to the number theory library libpari") - (description + (description "Cypari2 provides a Python interface to the number theory library PARI/GP. It has been spun off from the SageMath mathematics software system, but it can be used independently.") - (license license:gpl2+))) + (license license:gpl2+))) (define-public python2-cypari2 (package-with-python2 python-cypari2)) -- cgit v1.2.3 From 2f49edaa79e8ed617d7f4c818363675a2e590f33 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 17 Feb 2019 21:41:28 +0100 Subject: gnu: beep: Don't use NAME in source URI. * gnu/packages/terminals.scm (beep)[source]: Hard-code NAME. --- gnu/packages/terminals.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 1c38cb3834..4154c2d9af 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2016 David Craven ;;; Copyright © 2016, 2017, 2019 Ludovic Courtès ;;; Copyright © 2016, 2017 José Miguel Sánchez García -;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2017 Kei Kebreau ;;; Copyright © 2017, 2018 Ricardo Wurmus ;;; Copyright © 2017 Petter @@ -375,14 +375,14 @@ types of devices that provide serial consoles.") (version "1.3") (source (origin (method url-fetch) - (uri (string-append "http://www.johnath.com/" name "/" - name "-" version ".tar.gz")) + (uri (string-append "http://www.johnath.com/beep/" + "beep-" version ".tar.gz")) (sha256 (base32 "0bgch6jq5cahakk3kbr9549iysf2dik09afixxy5brbxk1xfzb2r")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; no tests. + `(#:tests? #f ; no tests #:phases (modify-phases %standard-phases (delete 'configure) -- cgit v1.2.3 From 231908d9adc1e1edc22940faf10a0aaf9610db14 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 17 Feb 2019 23:26:07 +0100 Subject: gnu: beep: Update to 1.4.3. * gnu/packages/terminals.scm (beep): Update to 1.4.3. [source, home-page]: Switch to maintained fork. [arguments]: Use #:make-flags instead of SUBSTITUTE*. --- gnu/packages/terminals.scm | 41 ++++++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 19 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 4154c2d9af..0a3d616ac3 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -47,6 +47,7 @@ #:use-module (gnu packages docbook) #:use-module (gnu packages fontutils) #:use-module (gnu packages freedesktop) + #:use-module (gnu packages gcc) #:use-module (gnu packages gettext) #:use-module (gnu packages gl) #:use-module (gnu packages glib) @@ -372,36 +373,38 @@ types of devices that provide serial consoles.") (define-public beep (package (name "beep") - (version "1.3") - (source (origin - (method url-fetch) - (uri (string-append "http://www.johnath.com/beep/" - "beep-" version ".tar.gz")) - (sha256 - (base32 - "0bgch6jq5cahakk3kbr9549iysf2dik09afixxy5brbxk1xfzb2r")))) + (version "1.4.3") + (source + (origin + (method git-fetch) + (uri (git-reference + ;; The original beep 1.3 at has been + ;; unmaintained for some time, and vulnerable to at least two CVEs: + ;; https://github.com/johnath/beep/issues/11#issuecomment-454056858 + ;; Use this maintained fork instead. + (url "https://github.com/spkr-beep/beep.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1gramwa2zm59kqjhv96fi8vg7l6lyffv02h0310vb90naschi99g")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no tests + #:make-flags + (list (string-append "prefix=" (assoc-ref %outputs "out")) + (string-append "pkgdocdir=$(docdir)/" ,name "-" ,version)) #:phases (modify-phases %standard-phases - (delete 'configure) - (add-after 'unpack 'patch-makefile - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "Makefile" (("/usr") (assoc-ref outputs "out"))) - #t)) - (add-before 'install 'create-output-directories - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref %outputs "out"))) - (mkdir-p (string-append out "/bin")) - (mkdir-p (string-append out "/man/man1")))))))) + (delete 'configure)))) ; no configure script + (native-inputs + `(("gcc" ,gcc-8))) ; for ‘-fstack-clash-protection’ (synopsis "Linux command-line utility to control the PC speaker") (description "beep allows the user to control the PC speaker with precision, allowing different sounds to indicate different events. While it can be run quite happily on the command line, its intended place of residence is within scripts, notifying the user when something interesting occurs. Of course, it has no notion of what's interesing, but it's very good at that notifying part.") - (home-page "http://www.johnath.com/beep") + (home-page "https://github.com/spkr-beep/beep") (license license:gpl2+))) (define-public unibilium -- cgit v1.2.3 From 71a5da8e116fab0610e6797acfc6eb84e1eefcf5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 Feb 2019 00:04:03 +0100 Subject: gnu: i3-wm: Epand description. * gnu/packages/wm.scm (i3-wm)[description]: Describe more. --- gnu/packages/wm.scm | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index c577c4021c..554a14154c 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -223,10 +223,16 @@ commands would.") ("libxml2" ,libxml2) ("docbook-xsl" ,docbook-xsl))) (home-page "https://i3wm.org/") - (synopsis "Improved tiling window manager") - (description "A tiling window manager, completely written -from scratch. i3 is primarily targeted at advanced users and -developers.") + (synopsis "Tiling window manager") + (description "i3 is a tiling X11 window manager that dynamically manages +tiled, stacked, and tabbed window layouts. + +i3 primarily targets advanced users. Windows are managed manually and organised +inside containers, which can be split vertically or horizontally, and optionally +resized. + +i3 uses a plain-text configuration file, and can be extended and controlled from +many programming languages.") (license license:bsd-3))) (define-public i3blocks -- cgit v1.2.3 From 249deec95fbf291c50e8fda74cf83f8e0109bd0b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 17 Feb 2019 23:41:36 +0100 Subject: gnu: eid-mw: Update to 4.4.13. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/security-token.scm (eid-mw): Update to 4.4.13. [arguments]: Avoid spurious ‘git: command not found’ during build. --- gnu/packages/security-token.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm index fb2526c04a..ba5bb5b4c6 100644 --- a/gnu/packages/security-token.scm +++ b/gnu/packages/security-token.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2016 Mike Gerwitz ;;; Copyright © 2016 Marius Bakke ;;; Copyright © 2017 Thomas Danckaert -;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2017 Ricardo Wurmus ;;; Copyright © 2018 Chris Marusich ;;; Copyright © 2018 Arun Isaac @@ -95,7 +95,7 @@ readers and is needed to communicate with such devices through the (define-public eid-mw (package (name "eid-mw") - (version "4.4.3") + (version "4.4.13") (source (origin (method git-fetch) @@ -103,7 +103,7 @@ readers and is needed to communicate with such devices through the (url "https://github.com/Fedict/eid-mw") (commit (string-append "v" version)))) (sha256 - (base32 "1h90iz4l85drchpkmhlsvg7f9abhw6890fdr9x5n5ir3kxikwcdm")))) + (base32 "14bgn2k0xbd6241qdghg787pgxy7k9rvcspaf74zwwyibaqknzyx")))) (build-system glib-or-gtk-build-system) (native-inputs `(("autoconf" ,autoconf) @@ -130,7 +130,7 @@ readers and is needed to communicate with such devices through the ;; Patch it to just return the real version number directly. (substitute* "scripts/build-aux/genver.sh" (("/bin/sh") (which "sh")) - (("\\$GITDESC") ,version)) + (("^(GITDESC=).*" match) (string-append match ,version "\n"))) (invoke "sh" "./bootstrap.sh")))))) (synopsis "Belgian eID Middleware") (description "The Belgian eID Middleware is required to authenticate with -- cgit v1.2.3 From 217ea1a1be0e451f8229809913ade15bbaef651c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 17 Feb 2019 23:58:19 +0100 Subject: gnu: python-qrcode: Update to 6.1. * gnu/packages/python-xyz.scm (python-qrcode): Update to 6.1. [inputs]: Remove python-setuptools. --- gnu/packages/python-xyz.scm | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 811cbaf03e..835b5c8a8a 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -32,7 +32,7 @@ ;;; Copyright © 2016, 2017 Alex Vong ;;; Copyright © 2016, 2017, 2018 Arun Isaac ;;; Copyright © 2016, 2017, 2018 Julien Lepiller -;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice +;;; Copyright © 2016, 2017, 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2016, 2017 Thomas Danckaert ;;; Copyright © 2017 Carlo Zancanaro ;;; Copyright © 2017 Frederick M. Muriithi @@ -10873,14 +10873,13 @@ a file-like object from which an arbitrarly-sized key can be read.") (define-public python-qrcode (package (name "python-qrcode") - (version "6.0") + (version "6.1") (source (origin (method url-fetch) (uri (pypi-uri "qrcode" version)) (sha256 - (base32 - "1gz1g2n9kqwqkak78aavr354z1v3yyiksk7q6xp5hi1zr6s0syq3")))) + (base32 "0sa3n298b9jpz6zn0birnjii3mg9sihjq28n9nzjlzv09y2m6ljh")))) (build-system python-build-system) (arguments ;; FIXME: Tests require packaging 'pymaging'. @@ -10889,10 +10888,6 @@ a file-like object from which an arbitrarly-sized key can be read.") `(("python-lxml" ,python-lxml) ; for SVG output ("python-pillow" ,python-pillow) ; for PNG output ("python-six" ,python-six))) - (inputs - `(;; The setup.cfg file needs to be used, and support for this requires - ;; at least version 30.3.0 of setuptools - ("python-setuptools" ,python-setuptools))) (home-page "https://github.com/lincolnloop/python-qrcode") (synopsis "QR Code image generator") (description "This package provides a pure Python QR Code generator -- cgit v1.2.3 From 836931a5a7036279310ecc955fbdebca3574ab47 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 17 Feb 2019 21:39:14 +0100 Subject: gnu: lsyncd: Don't use unstable tarball. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/sync.scm (lsyncd)[source]: Use GIT-FETCH and GIT-FILE-NAME. [arguments]: Adjust ‘install’ phase to new source directory. --- gnu/packages/sync.scm | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm index d8789de2ce..df9f3b0e16 100644 --- a/gnu/packages/sync.scm +++ b/gnu/packages/sync.scm @@ -162,13 +162,13 @@ their folder. (version "2.2.2") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/axkibe/lsyncd/archive/release-" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/axkibe/lsyncd.git") + (commit (string-append "release-" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 - "02g054qv8rnbxywd4f0gnd13lrlns9175d3ciqnyslhs1zs15nqb")))) + (base32 "1q2ixp52r96ckghgmxdbms6xrq8dbziimp8gmgzqfq4lk1v1w80y")))) (build-system cmake-build-system) (arguments `(;; The "tests" target is broken and assumes that tests are run in the @@ -184,10 +184,7 @@ their folder. (bin (string-append out "/bin")) (man (string-append out "/share/man/man1"))) (install-file "lsyncd" bin) - (install-file (string-append "../lsyncd-release-" - ,version - "/doc/manpage/lsyncd.1") - man) + (install-file "../source/doc/manpage/lsyncd.1" man) #t)))))) (native-inputs `(("lua" ,lua-5.2))) -- cgit v1.2.3 From 7acc52f98bf471e7bd3858ac821f6080613d87be Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 17 Feb 2019 21:23:17 +0100 Subject: gnu: mlt: Update to 6.12.0. * gnu/packages/video.scm (mlt): Update to 6.12.0. [arguments]: Re-indent. --- gnu/packages/video.scm | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index b7f79aa483..12eb933966 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2039,7 +2039,7 @@ from sites like Twitch.tv and pipes them into a video player of choice.") (define-public mlt (package (name "mlt") - (version "6.10.0") + (version "6.12.0") (source (origin (method git-fetch) (uri (git-reference @@ -2048,16 +2048,10 @@ from sites like Twitch.tv and pipes them into a video player of choice.") (file-name (git-file-name name version)) (sha256 (base32 - "0ki86yslr5ywa6sz8pjrgd9a4rn2rr4mss2zkmqi7pq8prgsm1fr")) - (modules '((guix build utils))) - (snippet '(begin - ;; As of glibc 2.26, no longer is. - (substitute* "src/framework/mlt_property.h" - (("xlocale\\.h") "locale.h")) - #t)))) + "0pzm3mjbbdl2rkbswgyfkx552xlxh2qrwzsi2a4dicfr92rfgq6w")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; no tests + `(#:tests? #f ; no tests #:make-flags '("CC=gcc" "CXX=g++ -std=gnu++11") #:configure-flags (list "--enable-gpl3" @@ -2065,14 +2059,14 @@ from sites like Twitch.tv and pipes them into a video player of choice.") #:phases (modify-phases %standard-phases (add-after - 'configure 'override-LDFLAGS - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "config.mak" - (("LDFLAGS\\+=") - (string-append "LDFLAGS+=-Wl,-rpath=" - (assoc-ref outputs "out") - "/lib "))) - #t))))) + 'configure 'override-LDFLAGS + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "config.mak" + (("LDFLAGS\\+=") + (string-append "LDFLAGS+=-Wl,-rpath=" + (assoc-ref outputs "out") + "/lib "))) + #t))))) (inputs `(("alsa-lib" ,alsa-lib) ("ffmpeg" ,ffmpeg-3.4) -- cgit v1.2.3 From 26057c361d9b99527a5bf45c793575e96ca532cb Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 17 Feb 2019 20:49:12 +0100 Subject: gnu: youtube-viewer: Update to 3.5.2. * gnu/packages/video.scm (youtube-viewer): Update to 3.5.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 12eb933966..70b4d28a10 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1517,7 +1517,7 @@ audio, images) from the Web. It can use either mpv or vlc for playback.") (define-public youtube-viewer (package (name "youtube-viewer") - (version "3.5.0") + (version "3.5.2") (source (origin (method git-fetch) (uri (git-reference @@ -1526,7 +1526,7 @@ audio, images) from the Web. It can use either mpv or vlc for playback.") (file-name (git-file-name name version)) (sha256 (base32 - "1s7hv2a46cx2nbdykrijqfh8hdkf3zqn6q8sg3ajnnc5agaspyrg")))) + "0sx0f7jgc41a4anflw02zqk5yivydn02nn78kxkn3fik6xdmv3yd")))) (build-system perl-build-system) (native-inputs `(("perl-module-build" ,perl-module-build))) -- cgit v1.2.3 From b71c0645dfbf78bf3f3a5ee85f24d30ad0c65da6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 17 Feb 2019 20:47:21 +0100 Subject: gnu: you-get: Update to 0.4.1210. * gnu/packages/video.scm (you-get): Update to 0.4.1210. --- 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 70b4d28a10..b538323151 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1478,7 +1478,7 @@ other site that youtube-dl supports.") (define-public you-get (package (name "you-get") - (version "0.4.1077") + (version "0.4.1210") (source (origin (method git-fetch) (uri (git-reference @@ -1487,7 +1487,7 @@ other site that youtube-dl supports.") (file-name (git-file-name name version)) (sha256 (base32 - "1rwkn3wb3r70b8cqj40qdknkg9kqbgzkvi901hbpy2a8s1b7858n")))) + "1plw518hzpzzcr38phlnsbpq7aqnps8iwrgr68f6d41rppl1qb25")))) (build-system python-build-system) (inputs `(("ffmpeg" ,ffmpeg))) ; for multi-part and >=1080p videos -- cgit v1.2.3 From a9e9c738dcdeff1fbbf6f365f47c44983e63bb9d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 17 Feb 2019 20:45:26 +0100 Subject: gnu: motion: Update to 4.2.2. * gnu/packages/video.scm (motion): Update to 4.2.2. --- gnu/packages/video.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index b538323151..cc1de00dce 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -3026,7 +3026,7 @@ It counts more than 100 plugins.") (define-public motion (package (name "motion") - (version "4.2") + (version "4.2.2") (home-page "https://motion-project.github.io/") (source (origin (method git-fetch) @@ -3035,7 +3035,7 @@ It counts more than 100 plugins.") (commit (string-append "release-" version)))) (sha256 (base32 - "0c0q6dl4v561m5y8bp0c0h4p3s52fjgcdnsrrf5ygdi288d3rfxv")) + "05c1gx75xy2hw49x6vkydvwxbr80kipsc3nr906k3hq8735svx6f")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (native-inputs @@ -3059,7 +3059,7 @@ It counts more than 100 plugins.") (assoc-ref %outputs "out") "/etc")) - #:tests? #f)) ;no 'check' target + #:tests? #f)) ; no 'check' target (synopsis "Detect motion from video signals") (description "Motion is a program that monitors the video signal from one or more -- cgit v1.2.3 From b6dc6aca7dc0fa8e22bea04e70c85016152edf0e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 17 Feb 2019 20:39:49 +0100 Subject: gnu: onionshare: Update to 1.3.2. * gnu/packages/tor.scm (onionshare): Update to 1.3.2. --- gnu/packages/tor.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm index ec86d7d241..c5346e04a2 100644 --- a/gnu/packages/tor.scm +++ b/gnu/packages/tor.scm @@ -160,7 +160,7 @@ networks.") (define-public onionshare (package (name "onionshare") - (version "1.3.1") + (version "1.3.2") (source (origin (method git-fetch) @@ -169,8 +169,7 @@ networks.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 - "02zic4cxwrcfdg22dq9c2rzni3l18wynjxd38scc59s37vlw7w2r")))) + (base32 "19zrz9kh7k4pdk4lh3cm0kv02ngdqkrggwma1xdskrrmp2rjkgz7")))) (build-system python-build-system) (arguments `(#:phases @@ -182,7 +181,7 @@ networks.") (substitute* '("setup.py" "onionshare/common.py") (("sys.prefix,") (string-append "'" out "',"))) (substitute* "setup.py" - ;; for the nautilus plugin + ;; For the nautilus plugin. (("/usr/share/nautilus") "share/nautilus")) (substitute* "install/onionshare.desktop" (("/usr") out)) -- cgit v1.2.3 From 538bd2ebbf5b3368a95216365e2ae11520807c94 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Mon, 18 Feb 2019 10:51:50 +0100 Subject: gnu: wine-staging: Update to 4.2. * gnu/packages/wine.scm (wine-staging-patchset-data): Update to 4.2. * gnu/packages/wine.scm (wine-staging): Update to 4.2. --- gnu/packages/wine.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index 9881386583..67da5b455e 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -310,7 +310,7 @@ integrate Windows applications into your desktop.") (define-public wine-staging-patchset-data (package (name "wine-staging-patchset-data") - (version "4.1") + (version "4.2") (source (origin (method git-fetch) @@ -320,7 +320,7 @@ integrate Windows applications into your desktop.") (file-name (git-file-name name version)) (sha256 (base32 - "1jp5s4k3cwiw6jy8lih25n0c7nyrddr6dm7vlyfdfrl2gkah94z0")))) + "1dhv6y60g64bj3kgfknbfzxfzmy686dh7svxlvi4lfis2faikxmk")))) (build-system trivial-build-system) (native-inputs `(("bash" ,bash) @@ -366,7 +366,7 @@ integrate Windows applications into your desktop.") (file-name (string-append name "-" version ".tar.xz")) (sha256 (base32 - "1b8vwid8wsy1ss2q27bqkd9sdl67qqh0kmazi87vspi40nz7bxyf")))) + "1ysvq2jyvh7r27iwpsrlrwzj672jnrihry91bx3m3fysz3sl3ld1")))) (inputs `(("autoconf" ,autoconf) ; for autoreconf ("ffmpeg" ,ffmpeg) ("gtk+" ,gtk+) -- cgit v1.2.3 From a12d21630f4742c300e26a2eb30dc6cfda4c118a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 18 Feb 2019 16:09:31 +0100 Subject: gnu: xcalc: Update to 1.0.7. * gnu/packages/xorg.scm (xcalc): Update to 1.0.7. --- gnu/packages/xorg.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index b4d681eff9..b18e846a6c 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -2083,7 +2083,7 @@ legacy X clients.") (define-public xcalc (package (name "xcalc") - (version "1.0.6") + (version "1.0.7") (source (origin (method url-fetch) @@ -2092,8 +2092,7 @@ legacy X clients.") version ".tar.gz")) (sha256 - (base32 - "1lg8xwj0nr8anbd77n3cs87s57sr4gmb3pxs3k22a28n6ndcvmbz")))) + (base32 "1xgih1iq9498m7vk22qrdsck1rb905sn395azjn4a6pmhfai401b")))) (build-system gnu-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From e28f3cd9f0b71421b7ef895b6d5a6638943fa15b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 18 Feb 2019 16:09:38 +0100 Subject: gnu: xcalc: Don't use NAME in source URI. * gnu/packages/xorg.scm (xcalc)[source]: Hard-code NAME. --- gnu/packages/xorg.scm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index b18e846a6c..88598b2c35 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -2087,10 +2087,8 @@ legacy X clients.") (source (origin (method url-fetch) - (uri (string-append - "mirror://xorg/individual/app/" name "-" - version - ".tar.gz")) + (uri (string-append "mirror://xorg/individual/app/" + "xcalc-" version ".tar.gz")) (sha256 (base32 "1xgih1iq9498m7vk22qrdsck1rb905sn395azjn4a6pmhfai401b")))) (build-system gnu-build-system) -- cgit v1.2.3 From 7953675fc018ff8bc67a2266a9515f054769de0c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 18 Feb 2019 16:28:54 +0100 Subject: gnu: scrot: Update to 0.9. * gnu/packages/xdisorg.scm (scrot): Update to 0.9. [source, home-page]: Switch to new (git) upstream. [arguments]: Remove them. [native-inputs]: Add autoconf and automake. --- gnu/packages/xdisorg.scm | 49 +++++++++++++++++------------------------------- 1 file changed, 17 insertions(+), 32 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 52e7edf6e1..df7833bcb3 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -18,7 +18,7 @@ ;;; Copyright © 2016 Petter ;;; Copyright © 2017 Mekeor Melire ;;; Copyright © 2017 Nils Gillmann -;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2017 Marek Benc ;;; Copyright © 2017 Mike Gerwitz ;;; Copyright © 2018 Thomas Sigurdsen @@ -455,39 +455,24 @@ move windows, switch between desktops, etc.).") (define-public scrot (package (name "scrot") - (version "0.8") - (source (origin - (method url-fetch) - (uri (list (string-append - "http://linuxbrit.co.uk/downloads/scrot-" - version ".tar.gz") - (string-append - "https://fossies.org/linux/privat/old/scrot-" - version ".tar.gz"))) - (sha256 - (base32 - "1wll744rhb49lvr2zs6m93rdmiq59zm344jzqvijrdn24ksiqgb1")))) + (version "0.9") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/resurrecting-open-source-projects/scrot.git") + (commit version))) + (sha256 + (base32 "1dg0pnmk09p7zlbyxv7d40vf54amrv73y976ds5p7096x6lmlndy")))) (build-system gnu-build-system) - (arguments - ;; By default, man and doc are put in PREFIX/{man,doc} instead of - ;; PREFIX/share/{man,doc}. - '(#:configure-flags - (list (string-append "--mandir=" - (assoc-ref %outputs "out") - "/share/man")) - #:phases - (modify-phases %standard-phases - (replace 'install - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (doc (string-append out "/share/doc/scrot"))) - (mkdir-p doc) - (invoke "make" "install" - (string-append "docsdir=" doc)))))))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake))) (inputs - `(("libx11" ,libx11) - ("giblib" ,giblib))) - (home-page "http://linuxbrit.co.uk/software/") + `(("giblib" ,giblib) + ("libx11" ,libx11))) + (home-page "https://github.com/resurrecting-open-source-projects/scrot") (synopsis "Command-line screen capture utility for X Window System") (description "Scrot allows to save a screenshot of a full screen, a window or a part -- cgit v1.2.3 From 4fa37ce28c92b6d1e44fe7952bbe3e330cb113d7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 18 Feb 2019 17:20:08 +0100 Subject: gnu: qtractor: Update to 0.9.5. * gnu/packages/music.scm (qtractor): Update to 0.9.5. --- gnu/packages/music.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index f1733b7ae1..7b3f61ef3d 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -13,7 +13,7 @@ ;;; Copyright © 2017, 2018, 2019 Nicolas Goaziou ;;; Copyright © 2017, 2018 Pierre Langlois ;;; Copyright © 2017 Arun Isaac -;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 nee ;;; Copyright © 2018 Stefan Reichör ;;; Copyright © 2018 Pierre Neidhardt @@ -2249,14 +2249,14 @@ from the command line.") (define-public qtractor (package (name "qtractor") - (version "0.9.3") + (version "0.9.5") (source (origin (method url-fetch) (uri (string-append "http://downloads.sourceforge.net/qtractor/" "qtractor-" version ".tar.gz")) (sha256 (base32 - "1010gvkzdzdk39g1g6wx2j19ls0kdl6l9q51xzk2qik7h2fwxl71")))) + "1zsikhqj5xzhw2x3b6pqlmcwz3hxx07lbbif8v3m3j41snzjic22")))) (build-system gnu-build-system) (arguments `(#:tests? #f)) ; no "check" target -- cgit v1.2.3 From 8fdd072bcae7a5cd8bba1c938e831b81c4b59ca1 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 18 Feb 2019 17:25:21 +0100 Subject: gnu: musl: Update to 1.1.21. * gnu/packages/musl.scm (musl): Update to 1.1.21. --- gnu/packages/musl.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/musl.scm b/gnu/packages/musl.scm index 357372becd..0d8ec11e90 100644 --- a/gnu/packages/musl.scm +++ b/gnu/packages/musl.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 Vincent Legoll ;;; Copyright © 2016 Ricardo Wurmus -;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -28,17 +28,17 @@ (define-public musl (package (name "musl") - (version "1.1.20") + (version "1.1.21") (source (origin (method url-fetch) (uri (string-append "http://www.musl-libc.org/releases/" name "-" version ".tar.gz")) (sha256 (base32 - "0q8dsjxl41dccscv9a0r78bs7jap57mn4mni5pwbbip6s1qqggj4")))) + "0i2z52zgc86af1n1gjiz43hgd85mxjgvgn345zsybja9dxpvchn7")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; Musl has no tests + `(#:tests? #f ; musl has no tests #:configure-flags (list "--disable-gcc-wrapper"))) (synopsis "Small C standard library") -- cgit v1.2.3 From 1bbdcb265a333f03657993eb6602508d95028d2b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 18 Feb 2019 17:25:38 +0100 Subject: gnu: musl: Don't use NAME in source URI. * gnu/packages/musl.scm (musl)[source]: Hard-code NAME. --- gnu/packages/musl.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/musl.scm b/gnu/packages/musl.scm index 0d8ec11e90..d50337d699 100644 --- a/gnu/packages/musl.scm +++ b/gnu/packages/musl.scm @@ -32,7 +32,7 @@ (source (origin (method url-fetch) (uri (string-append "http://www.musl-libc.org/releases/" - name "-" version ".tar.gz")) + "musl-" version ".tar.gz")) (sha256 (base32 "0i2z52zgc86af1n1gjiz43hgd85mxjgvgn345zsybja9dxpvchn7")))) -- cgit v1.2.3 From 28a6eca368b7c5d14d60ef8575698d42ea978c2b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 18 Feb 2019 17:26:46 +0100 Subject: gnu: musl: Download sources over HTTPS. * gnu/packages/musl.scm (musl)[source]: Use HTTPS. --- gnu/packages/musl.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/musl.scm b/gnu/packages/musl.scm index d50337d699..8592db1373 100644 --- a/gnu/packages/musl.scm +++ b/gnu/packages/musl.scm @@ -31,7 +31,7 @@ (version "1.1.21") (source (origin (method url-fetch) - (uri (string-append "http://www.musl-libc.org/releases/" + (uri (string-append "https://www.musl-libc.org/releases/" "musl-" version ".tar.gz")) (sha256 (base32 -- cgit v1.2.3 From da71a77c8e17c8d264a0923e493e9570af908107 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 18 Feb 2019 17:31:13 +0100 Subject: gnu: dialog: Update to 1.3-20190211. * gnu/packages/ncurses.scm (dialog): Update to 1.3-20190211. --- gnu/packages/ncurses.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ncurses.scm b/gnu/packages/ncurses.scm index 2051f1dd9d..e314ab22fb 100644 --- a/gnu/packages/ncurses.scm +++ b/gnu/packages/ncurses.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2016 Efraim Flashner ;;; Copyright © 2016 Jan Nieuwenhuizen ;;; Copyright © 2017 Marius Bakke -;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -229,7 +229,7 @@ ncursesw library provides wide character support.") (define-public dialog (package (name "dialog") - (version "1.3-20180621") + (version "1.3-20190211") (source (origin (method url-fetch) (uri (string-append @@ -237,7 +237,7 @@ ncursesw library provides wide character support.") version ".tgz")) (sha256 (base32 - "0yjqczlf64yppgvk4i6s0jm06mdr0mb5m6sj39nf891dnbi5jj2a")))) + "1lx0bvradzx1zl7znlrsnyljcs596r7wamkhyq37ikbxsy4y5h29")))) (build-system gnu-build-system) (arguments `(#:tests? #f)) ; no test suite -- cgit v1.2.3 From 89e1b270d24c048cd97c93729be16650eea11651 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 18 Feb 2019 17:31:35 +0100 Subject: gnu: dialog: Download sources over HTTPS. * gnu/packages/ncurses.scm (dialog)[source]: Use HTTPS. --- gnu/packages/ncurses.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ncurses.scm b/gnu/packages/ncurses.scm index e314ab22fb..ae3fb887e8 100644 --- a/gnu/packages/ncurses.scm +++ b/gnu/packages/ncurses.scm @@ -233,7 +233,7 @@ ncursesw library provides wide character support.") (source (origin (method url-fetch) (uri (string-append - "http://invisible-mirror.net/archives/dialog/dialog-" + "https://invisible-mirror.net/archives/dialog/dialog-" version ".tgz")) (sha256 (base32 -- cgit v1.2.3 From 7f56f1070608d9ff0f2c81839abe8a209214da95 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 18 Feb 2019 17:34:36 +0100 Subject: gnu: clyrics: Update to 0.11. * gnu/packages/music.scm (clyrics): Update to 0.11. Re-indent. --- gnu/packages/music.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 7b3f61ef3d..35958eee96 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -4227,7 +4227,7 @@ at @code{musicbrainz.org}.") (define-public clyrics (package (name "clyrics") - (version "0.10") + (version "0.11") (source (origin (method git-fetch) @@ -4237,10 +4237,10 @@ at @code{musicbrainz.org}.") (file-name (git-file-name name version)) (sha256 (base32 - "1qvj4dyipkkdccx5hci4z0q23i54ldk6hh7x5m35a7f70rrj6fbk")))) + "0vfjy555achgi5zwa34x4q7r692nc6bq4jx518a5w4m7k5fvm71j")))) (build-system trivial-build-system) (inputs - `(("bash" ,bash) ;for the wrapped program + `(("bash" ,bash) ; for the wrapped program ("perl" ,perl) ("perl-www-mechanize" ,perl-www-mechanize) ("perl-lwp-protocol-https" ,perl-lwp-protocol-https) @@ -4270,9 +4270,9 @@ at @code{musicbrainz.org}.") ,(delete "" (map (match-lambda - (((? (cut string-prefix? "perl-" <>) name) . dir) - (string-append dir "/lib/perl5/site_perl")) - (_ "")) + (((? (cut string-prefix? "perl-" <>) name) . dir) + (string-append dir "/lib/perl5/site_perl")) + (_ "")) %build-inputs)))) (copy-recursively "plugins" (string-append output "/clyrics")) #t)))) -- cgit v1.2.3 From 3b990922c76bbf70202e2cada5795ec4c0010cdb Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 18 Feb 2019 17:38:28 +0100 Subject: gnu: enet: Update to 1.3.14. * gnu/packages/networking.scm (enet): Update to 1.3.14. --- gnu/packages/networking.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index d73b6f1108..c87867a8bf 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2015 Mark H Weaver ;;; Copyright © 2015, 2016, 2017 Stefan Reichör ;;; Copyright © 2016 Raimon Grau -;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice +;;; Copyright © 2016, 2017, 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2016 John Darrington ;;; Copyright © 2016, 2017, 2018, 2019 Nicolas Goaziou ;;; Copyright © 2016 Eric Bavier @@ -1204,19 +1204,18 @@ HTTP proxies.") (define-public enet (package (name "enet") - (version "1.3.13") + (version "1.3.14") (source (origin (method url-fetch) (uri (string-append "http://enet.bespin.org/download/" name "-" version ".tar.gz")) (sha256 (base32 - "0p53mnmjbm56wizwraznynx13fcibcxiqny110dp6a5a3w174q73")))) + "0w780zc6cy8yq4cskpphx0f91lzh51vh9lwyc5ll8hhamdxgbxlq")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) - (synopsis - "Network communication layer on top of UDP") + (synopsis "Network communication layer on top of UDP") (description "ENet's purpose is to provide a relatively thin, simple and robust network communication layer on top of UDP. The primary feature it provides is optional -- cgit v1.2.3 From 9aed8a1e23d5f4c60a8c5bb671a1173068de394e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 18 Feb 2019 17:38:34 +0100 Subject: gnu: enet: Don't use NAME in source URI. * gnu/packages/networking.scm (enet)[source]: Hard-code NAME. --- gnu/packages/networking.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index c87867a8bf..ab253013bf 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -1208,7 +1208,7 @@ HTTP proxies.") (source (origin (method url-fetch) (uri (string-append "http://enet.bespin.org/download/" - name "-" version ".tar.gz")) + "enet-" version ".tar.gz")) (sha256 (base32 "0w780zc6cy8yq4cskpphx0f91lzh51vh9lwyc5ll8hhamdxgbxlq")))) -- cgit v1.2.3 From 7dbe462334fbf63423e09c3cf1dd98caf309819a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 18 Feb 2019 17:41:06 +0100 Subject: gnu: ncdu: Update to 1.14. * gnu/packages/ncdu.scm (ncdu): Update to 1.14. --- gnu/packages/ncdu.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ncdu.scm b/gnu/packages/ncdu.scm index 5008a6a521..36d4738d90 100644 --- a/gnu/packages/ncdu.scm +++ b/gnu/packages/ncdu.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 John Darrington -;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -28,14 +28,14 @@ (define-public ncdu (package (name "ncdu") - (version "1.13") + (version "1.14") (source (origin (method url-fetch) (uri (string-append "https://dev.yorhel.nl/download/ncdu-" version ".tar.gz")) (sha256 (base32 - "0ni56ymlii577src4dzfbrq1mznbf6i0nka4bvh2sb1971f2ingl")))) + "0i4cap2z3037xx2rdzhrlazl2igk3xy4ncddp9j7xqi1mcx7i566")))) (build-system gnu-build-system) (inputs `(("ncurses" ,ncurses))) (synopsis "Ncurses based disk usage analyzer") -- cgit v1.2.3 From af4ce1f21542525b2eacfba7e846149b1fb003e2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 18 Feb 2019 17:44:53 +0100 Subject: gnu: oniguruma: Update to 6.9.1. * gnu/packages/textutils.scm (oniguruma): Update to 6.9.1. --- gnu/packages/textutils.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index d2f84420c6..b0a4462227 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -341,7 +341,7 @@ as existing hashing techniques, with provably negligible risk of collisions.") (define-public oniguruma (package (name "oniguruma") - (version "6.9.0") + (version "6.9.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/kkos/" @@ -349,7 +349,7 @@ as existing hashing techniques, with provably negligible risk of collisions.") "/onig-" version ".tar.gz")) (sha256 (base32 - "1jg76i2ksf3s4bz4h3g2f9ac19q31lzxs11j900w7qqc0mgb5gwi")))) + "04pa6dk946xbzy8wz6d2zrpjwhks6559n8zc5ngwr9a5psvzxhy7")))) (build-system gnu-build-system) (home-page "https://github.com/kkos/oniguruma") (synopsis "Regular expression library") -- cgit v1.2.3 From abd402e3a1f3856243d2956f073901fc1a4485a0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 18 Feb 2019 17:45:49 +0100 Subject: gnu: tomsfastmath: Update home page. gnu/packages/multiprecision.scm (tomsfastmath)[home-page]: Update. --- gnu/packages/multiprecision.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/multiprecision.scm b/gnu/packages/multiprecision.scm index c17321a9b3..969f0659a8 100644 --- a/gnu/packages/multiprecision.scm +++ b/gnu/packages/multiprecision.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2015, 2018 Andreas Enge ;;; Copyright © 2016 Nicolas Goaziou ;;; Copyright © 2016 Jan Nieuwenhuizen -;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 Eric Bavier ;;; Copyright © 2018 Efraim Flashner ;;; @@ -286,7 +286,7 @@ Libs: -L~a/lib -ltfm~%" ,synopsis ,version out))) (install-file "tomsfastmath.pc" pc-dir) #t)))))) - (home-page "http://www.libtom.org/TomsFastMath/") + (home-page "https://www.libtom.net/TomsFastMath/") (description "TomsFastMath is a large integer library written in portable ISO C. It is a port of LibTomMath with optional support for inline assembler multiplies.") -- cgit v1.2.3 From d0d207cdca1abb97db95260c804f5b8ba963f098 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 18 Feb 2019 17:50:42 +0100 Subject: gnu: tomsfastmath: Update to 0.13.1. * gnu/packages/multiprecision.scm (tomsfastmath): Update to 0.13.1. [source]: Remove patch. * gnu/packages/patches/tomsfastmath-constness.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/packages/multiprecision.scm | 11 ++-- gnu/packages/patches/tomsfastmath-constness.patch | 76 ----------------------- 2 files changed, 5 insertions(+), 82 deletions(-) delete mode 100644 gnu/packages/patches/tomsfastmath-constness.patch (limited to 'gnu/packages') diff --git a/gnu/packages/multiprecision.scm b/gnu/packages/multiprecision.scm index 969f0659a8..7ae3886166 100644 --- a/gnu/packages/multiprecision.scm +++ b/gnu/packages/multiprecision.scm @@ -230,17 +230,16 @@ and numerical quadrature programs are included.") (define-public tomsfastmath (package (name "tomsfastmath") - (version "0.13.0") + (version "0.13.1") (synopsis "Large integer arithmetic library") (source (origin (method url-fetch) (uri (string-append "https://github.com/libtom/tomsfastmath/" "releases/download/v" version "/" - "tfm-" (version-major+minor version) ".tar.bz2")) + "tfm-" version ".tar.xz")) (sha256 (base32 - "01rlsvp6lskk2a0gfdi24ak5h8vdwi6kqbvbwjnmb92r0zrfdvwd")) - (patches (search-patches "tomsfastmath-constness.patch")))) + "0f0pmiaskh89sp0q933pafxb914shpaj5ad8sb5rzk1wv8d7mja7")))) (build-system gnu-build-system) (native-inputs `(("libtool" ,libtool))) @@ -252,7 +251,7 @@ and numerical quadrature programs are included.") "CC=gcc") #:phases (modify-phases %standard-phases - (delete 'configure) ;no configuration + (delete 'configure) ; no configuration (replace 'check (lambda* (#:key make-flags #:allow-other-keys) (apply invoke "make" @@ -262,7 +261,7 @@ and numerical quadrature programs are included.") (invoke "./test"))) (add-before 'install 'install-nogroup (lambda _ - ;; Let permissions inherit from the current process + ;; Let permissions inherit from the current process. (substitute* "makefile.shared" (("-g \\$\\(GROUP\\) -o \\$\\(USER\\)") "")) #t)) diff --git a/gnu/packages/patches/tomsfastmath-constness.patch b/gnu/packages/patches/tomsfastmath-constness.patch deleted file mode 100644 index 7c6ab5bbec..0000000000 --- a/gnu/packages/patches/tomsfastmath-constness.patch +++ /dev/null @@ -1,76 +0,0 @@ -From dac089515901d6bf315cd15a6e744b8d2c02c1cb Mon Sep 17 00:00:00 2001 -From: Sebastian Andrzej Siewior -Date: Sat, 31 Oct 2015 22:48:07 +0100 -Subject: [PATCH] tfm: make a few functions static - -clamav expects them to be static and it does not seem bad to do so. - -Signed-off-by: Sebastian Andrzej Siewior ---- - src/bin/fp_read_radix.c | 2 +- - src/bin/fp_read_signed_bin.c | 2 +- - src/bin/fp_read_unsigned_bin.c | 2 +- - src/headers/tfm.h | 6 +++--- - 4 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/src/bin/fp_read_radix.c b/src/bin/fp_read_radix.c -index 0b5e826..431afa0 100644 ---- a/src/bin/fp_read_radix.c -+++ b/src/bin/fp_read_radix.c -@@ -9,7 +9,7 @@ - */ - #include - --int fp_read_radix(fp_int *a, char *str, int radix) -+int fp_read_radix(fp_int *a, const char *str, int radix) - { - int y, neg; - char ch; -diff --git a/src/bin/fp_read_signed_bin.c b/src/bin/fp_read_signed_bin.c -index e2b8003..6467d19 100644 ---- a/src/bin/fp_read_signed_bin.c -+++ b/src/bin/fp_read_signed_bin.c -@@ -9,7 +9,7 @@ - */ - #include - --void fp_read_signed_bin(fp_int *a, unsigned char *b, int c) -+void fp_read_signed_bin(fp_int *a, const unsigned char *b, int c) - { - /* read magnitude */ - fp_read_unsigned_bin (a, b + 1, c - 1); -diff --git a/src/bin/fp_read_unsigned_bin.c b/src/bin/fp_read_unsigned_bin.c -index 3ee64c0..2ee89cb 100644 ---- a/src/bin/fp_read_unsigned_bin.c -+++ b/src/bin/fp_read_unsigned_bin.c -@@ -9,7 +9,7 @@ - */ - #include - --void fp_read_unsigned_bin(fp_int *a, unsigned char *b, int c) -+void fp_read_unsigned_bin(fp_int *a, const unsigned char *b, int c) - { - /* zero the int */ - fp_zero (a); -diff --git a/src/headers/tfm.h b/src/headers/tfm.h -index af87b56..f406388 100644 ---- a/src/headers/tfm.h -+++ b/src/headers/tfm.h -@@ -467,14 +467,14 @@ int fp_prime_random_ex(fp_int *a, int t, int size, int flags, tfm_prime_callback - int fp_count_bits(fp_int *a); - - int fp_unsigned_bin_size(fp_int *a); --void fp_read_unsigned_bin(fp_int *a, unsigned char *b, int c); -+void fp_read_unsigned_bin(fp_int *a, const unsigned char *b, int c); - void fp_to_unsigned_bin(fp_int *a, unsigned char *b); - - int fp_signed_bin_size(fp_int *a); --void fp_read_signed_bin(fp_int *a, unsigned char *b, int c); -+void fp_read_signed_bin(fp_int *a, const unsigned char *b, int c); - void fp_to_signed_bin(fp_int *a, unsigned char *b); - --int fp_read_radix(fp_int *a, char *str, int radix); -+int fp_read_radix(fp_int *a, const char *str, int radix); - - int fp_radix_size(fp_int *a, int radix, int *size); - int fp_toradix(fp_int *a, char *str, int radix); -- cgit v1.2.3 From 6742c6f6fb3be9b676ec4195dfd6e6396000d70f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 18 Feb 2019 21:17:42 +0100 Subject: gnu: ruby-highline: Update to 2.0.1. * gnu/packages/ruby.scm (ruby-highline): Update to 2.0.1. --- gnu/packages/ruby.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 5ab7f958b0..00f3b2ff03 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2014, 2015, 2016, 2017 Ludovic Courtès ;;; Copyright © 2014, 2015 Mark H Weaver ;;; Copyright © 2014, 2015 David Thompson -;;; Copyright © 2015 Ricardo Wurmus +;;; Copyright © 2015, 2019 Ricardo Wurmus ;;; Copyright © 2015, 2016, 2017 Ben Woodcroft ;;; Copyright © 2017 Nils Gillmann ;;; Copyright © 2017 Marius Bakke @@ -159,14 +159,14 @@ a focus on simplicity and productivity.") (define-public ruby-highline (package (name "ruby-highline") - (version "1.7.10") + (version "2.0.1") (source (origin (method url-fetch) (uri (rubygems-uri "highline" version)) (sha256 (base32 - "01ib7jp85xjc4gh4jg0wyzllm46hwv8p0w1m4c75pbgi41fps50y")))) + "0gr6pckj2jayxw1gdgh9193j5jag5zrrqqlrnl4jvcwpyd3sn2zc")))) (build-system ruby-build-system) (arguments `(#:tests? #f)) ;; TODO: NameError: uninitialized constant SPEC -- cgit v1.2.3 From 34372d3905e17c880180f811e5b5f83e423e9025 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 18 Feb 2019 21:17:58 +0100 Subject: gnu: Add ruby-commander. * gnu/packages/ruby.scm (ruby-commander): New variable. --- gnu/packages/ruby.scm | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 00f3b2ff03..50bf56d87b 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -156,6 +156,47 @@ a focus on simplicity and productivity.") (delete-file-recursively "ext/fiddle/libffi-3.2.1") #t)))))) +(define-public ruby-commander + (package + (name "ruby-commander") + (version "4.4.7") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "commander" version)) + (sha256 + (base32 + "1pxakz596fjqak3cdbha6iva1dlqis86i3kjrgg6lf3sp8i5vhwg")))) + (build-system ruby-build-system) + (arguments + `(#:test-target "spec" + #:phases + (modify-phases %standard-phases + ;; Don't run or require rubocop, the code linting tool, as this is a + ;; bit unnecessary. + (add-after 'unpack 'dont-run-rubocop + (lambda _ + (substitute* "Rakefile" + ((".*rubocop.*") "") + ((".*RuboCop.*") "")) + #t))))) + (propagated-inputs + `(("ruby-highline" ,ruby-highline))) + (native-inputs + `(("bundler" ,bundler) + ("ruby-rspec-core" ,ruby-rspec-core) + ("ruby-rspec-expectations" ,ruby-rspec-expectations) + ("ruby-rspec-mocks" ,ruby-rspec-mocks) + ("ruby-simplecov" ,ruby-simplecov))) + (home-page "https://github.com/commander-rb/commander") + (synopsis "Library for building Ruby command-line executables") + (description + "Commander aims to be a complete solution for Ruby command-line +executables. Commander bridges the gap between other terminal related +libraries (OptionParser, HighLine), while providing many new features, and an +elegant API.") + (license license:expat))) + (define-public ruby-highline (package (name "ruby-highline") -- cgit v1.2.3 From 30f08487261f332cb03e4b2e06c12fc41e508c52 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 18 Feb 2019 21:39:54 +0100 Subject: gnu: Add ruby-rsync. * gnu/packages/ruby.scm (ruby-rsync): New variable. --- gnu/packages/ruby.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 50bf56d87b..6da7109d14 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -50,6 +50,7 @@ #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) #:use-module (gnu packages ragel) + #:use-module (gnu packages rsync) #:use-module (gnu packages sqlite) #:use-module (gnu packages tls) #:use-module (gnu packages version-control) @@ -263,6 +264,41 @@ packaging native C and Java extensions in Ruby.") (home-page "https://github.com/rake-compiler/rake-compiler") (license license:expat))) +(define-public ruby-rsync + (package + (name "ruby-rsync") + (version "1.0.9") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "rsync" version)) + (sha256 + (base32 + "0p8b27q1gvxilqfq2528xpwglzcm2myikkjxpqk7mwbwg9r6knxv")))) + (build-system ruby-build-system) + (arguments + '(#:test-target "spec" + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'remove-coveralls-requirement + (lambda _ + (substitute* "spec/spec_helper.rb" + (("require 'coveralls'") "") + (("Coveralls.wear!") "")) + #t))))) + (native-inputs + `(("bundler" ,bundler) + ("rsync" ,rsync) + ("ruby-rspec-core" ,ruby-rspec-core) + ("ruby-rspec-expectations" ,ruby-rspec-expectations) + ("ruby-rspec-mocks" ,ruby-rspec-mocks))) + (home-page "https://github.com/jbussdieker/ruby-rsync") + (synopsis "Ruby wrapper around rsync") + (description + "Ruby Rsync is a Ruby library that can synchronize files between remote +hosts by wrapping the @file{rsync} binary.") + (license license:expat))) + (define-public ruby-i18n (package (name "ruby-i18n") -- cgit v1.2.3 From b49c8b9ef8a11f74f86db00a6d1360ab5068da12 Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Mon, 18 Feb 2019 18:51:27 +0000 Subject: gnu: python-mpi4py: Update to 3.0.1. * gnu/packages/mpi.scm (python-mpi4py): Update to 3.0.1. Signed-off-by: Ricardo Wurmus --- gnu/packages/mpi.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm index e4c17d41c2..35d3c9e303 100644 --- a/gnu/packages/mpi.scm +++ b/gnu/packages/mpi.scm @@ -296,14 +296,14 @@ only provides @code{MPI_THREAD_FUNNELED}."))) (define-public python-mpi4py (package (name "python-mpi4py") - (version "3.0.0") + (version "3.0.1") (source (origin (method url-fetch) (uri (pypi-uri "mpi4py" version)) (sha256 (base32 - "1mzgd26dfv4vwbci8gq77ss9f0x26i9aqzq9b9vs9ndxhlnv0mxl")))) + "0ld8rjmsjr0dklvj2g1gr3ax32sdq0xjxyh0cspknc1i36waajb5")))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.2.3 From 48211de6dc9210718e69ba63a60c155cba043539 Mon Sep 17 00:00:00 2001 From: leungbk Date: Mon, 18 Feb 2019 03:32:08 +0100 Subject: gnu: Add emacs-isearch-prop. * gnu/packages/emacs-xyz.scm (emacs-isearch-prop): New variable. Signed-off-by: Ricardo Wurmus --- gnu/packages/emacs-xyz.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index bd3c51b087..0b586738f4 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -9626,6 +9626,32 @@ until the top-level form is no longer a macro call.") (description "Execute menu items as commands, with completion.") (license license:gpl3))) +(define-public emacs-isearch-prop + (let ((commit "5e9dc44cf582d998aaa73ccd4d07cbda01248156") + (revision "1")) + (package + (name "emacs-isearch-prop") + (version (git-version "0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/emacsmirror/isearch-prop.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1xawppy705ybsgx566zvj8zk2aajq0sqvhvfs7nijqq32lx0a2zl")))) + (build-system emacs-build-system) + (home-page "https://www.emacswiki.org/emacs/isearch-prop.el") + (synopsis "Extensions to @code{isearch.el}") + (description "The Emacs library @code{isearch-prop.el} lets you search within + contexts. You can limit incremental search to a set of zones of + buffer text, search contexts that in effect constitute a multi-region. + These zones can be defined in various ways, including some ways + provided specially by this library.") + (license license:gpl3+)))) + (define-public emacs-company-lua (let ((commit "0be8122f3adf57ad27953bf4b03545d6298d3da4")) (package -- cgit v1.2.3 From d47e99e039fa23999ac9fa2146b33a2283a9cbb1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 18 Feb 2019 23:17:27 +0100 Subject: gnu: ruby-ffi: Update to 1.10.0. * gnu/packages/libffi.scm (ruby-ffi): Update to 1.10.0. --- gnu/packages/libffi.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/libffi.scm b/gnu/packages/libffi.scm index 3f7bb4f289..1df6b7b6df 100644 --- a/gnu/packages/libffi.scm +++ b/gnu/packages/libffi.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012, 2013, 2014 Ludovic Courtès ;;; Copyright © 2014 Federico Beffa -;;; Copyright © 2015 Ricardo Wurmus +;;; Copyright © 2015, 2019 Ricardo Wurmus ;;; Copyright © 2016, 2017 Efraim Flashner ;;; Copyright © 2016, 2017 Ben Woodcroft ;;; Copyright © 2017 Marius Bakke @@ -157,13 +157,13 @@ conversions for values passed between the two languages.") (define-public ruby-ffi (package (name "ruby-ffi") - (version "1.9.23") + (version "1.10.0") (source (origin (method url-fetch) (uri (rubygems-uri "ffi" version)) (sha256 (base32 - "0zw6pbyvmj8wafdc7l5h7w20zkp1vbr2805ql5d941g2b20pk4zr")))) + "0j8pzj8raxbir5w5k6s7a042sb5k02pg0f8s4na1r5lan901j00p")))) (build-system ruby-build-system) ;; FIXME: Before running tests the build system attempts to build libffi ;; from sources. -- cgit v1.2.3 From 298d878d20a92d1c0b3e908adda70a9f2daf8199 Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Mon, 18 Feb 2019 15:46:22 -0600 Subject: gnu: python-language-server: Update to 0.23.2. * gnu/packages/python-xyz.scm (python-language-server): Update to 0.23.2. Signed-off-by: Ricardo Wurmus --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 835b5c8a8a..8a8ae5f284 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -2627,14 +2627,14 @@ Server (PLS).") (define-public python-language-server (package (name "python-language-server") - (version "0.22.0") + (version "0.23.2") (source (origin (method url-fetch) (uri (pypi-uri "python-language-server" version)) (sha256 (base32 - "04pbxl06hg0ddm2xx99jn9jh40yv0mmzdjw8pqd2rbcdg42hhia6")))) + "1h83x5widj9p630ha9yv39cpp3djxppll3iww9nc8i3hdmyrbnnh")))) (build-system python-build-system) (propagated-inputs `(("python-pluggy" ,python-pluggy) -- cgit v1.2.3 From f1e9de4d3aefae420db633a56ba9cd93f7750df3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 18 Feb 2019 23:41:56 +0100 Subject: gnu: Add ungoogled-chromium. * gnu/packages/aux-files/chromium/master-preferences.json, gnu/packages/chromium.scm: New files. * gnu/local.mk (GNU_SYSTEM_MODULES): Adjust accordingly. --- .../aux-files/chromium/master-preferences.json | 26 + gnu/packages/chromium.scm | 705 +++++++++++++++++++++ 2 files changed, 731 insertions(+) create mode 100644 gnu/packages/aux-files/chromium/master-preferences.json create mode 100644 gnu/packages/chromium.scm (limited to 'gnu/packages') diff --git a/gnu/packages/aux-files/chromium/master-preferences.json b/gnu/packages/aux-files/chromium/master-preferences.json new file mode 100644 index 0000000000..5a2049fa72 --- /dev/null +++ b/gnu/packages/aux-files/chromium/master-preferences.json @@ -0,0 +1,26 @@ +{ + "distribution": { + "import_bookmarks": false, + "make_chrome_default": false, + "make_chrome_default_for_user": false, + "verbose_logging": true, + "skip_first_run_ui": true, + "suppress_first_run_default_browser_prompt": true + }, + "browser": { + "has_seen_welcome_page" : true, + "check_default_browser" : false + }, + "dns_prefetching": { + "enabled": false + }, + "alternate_error_pages": { + "enabled": false + }, + "hardware": { + "audio_capture_enabled": false + }, + "default_apps": "noinstall", + "hide_web_store_icon": true, + "homepage": "https://www.gnu.org/software/guix/" +} diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm new file mode 100644 index 0000000000..1594bfeb60 --- /dev/null +++ b/gnu/packages/chromium.scm @@ -0,0 +1,705 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2019 Marius Bakke +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages chromium) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages) + #:use-module (guix gexp) + #:use-module (guix store) + #:use-module (guix monads) + #:use-module (guix download) + #:use-module (guix git-download) + #:use-module (guix utils) + #:use-module (guix build-system gnu) + #:use-module (gnu packages) + #:use-module (gnu packages assembly) + #:use-module (gnu packages base) + #:use-module (gnu packages bison) + #:use-module (gnu packages build-tools) + #:use-module (gnu packages compression) + #:use-module (gnu packages cups) + #:use-module (gnu packages curl) + #:use-module (gnu packages fontutils) + #:use-module (gnu packages gcc) + #:use-module (gnu packages ghostscript) + #:use-module (gnu packages gl) + #:use-module (gnu packages glib) + #:use-module (gnu packages gnome) + #:use-module (gnu packages gnuzilla) + #:use-module (gnu packages gperf) + #:use-module (gnu packages gtk) + #:use-module (gnu packages icu4c) + #:use-module (gnu packages image) + #:use-module (gnu packages libevent) + #:use-module (gnu packages libffi) + #:use-module (gnu packages linux) + #:use-module (gnu packages kerberos) + #:use-module (gnu packages ninja) + #:use-module (gnu packages node) + #:use-module (gnu packages pciutils) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages pulseaudio) + #:use-module (gnu packages python) + #:use-module (gnu packages python-web) + #:use-module (gnu packages python-xyz) + #:use-module (gnu packages regex) + #:use-module (gnu packages serialization) + #:use-module (gnu packages speech) + #:use-module (gnu packages tls) + #:use-module (gnu packages valgrind) + #:use-module (gnu packages vulkan) + #:use-module (gnu packages video) + #:use-module (gnu packages xiph) + #:use-module (gnu packages xml) + #:use-module (gnu packages xdisorg) + #:use-module (gnu packages xorg)) + +(define %preserved-third-party-files + '("base/third_party/dmg_fp" ;X11-style + "base/third_party/dynamic_annotations" ;BSD-2 + "base/third_party/icu" ;Unicode, X11-style + "base/third_party/superfasthash" ;BSD-3 + "base/third_party/symbolize" ;BSD-3 + "base/third_party/xdg_mime" ;LGPL2.0+ or Academic 2.0 + "base/third_party/xdg_user_dirs" ;Expat + "chrome/third_party/mozilla_security_manager" ;MPL-1.1/GPL2+/LGPL2.1+ + "courgette/third_party/bsdiff" ;BSD-2, BSD protection license + "courgette/third_party/divsufsort" ;Expat + "net/third_party/http2" ;BSD-3 + "net/third_party/mozilla_security_manager" ;MPL-1.1/GPL2+/LGPL2.1+ + "net/third_party/nss" ;MPL-2.0 + "net/third_party/quic" ;BSD-3 + "net/third_party/spdy" ;BSD-3 + "net/third_party/uri_template" ;ASL2.0 + "third_party/abseil-cpp" ;ASL2.0 + "third_party/adobe/flash/flapper_version.h" ;no license, trivial + "third_party/angle" ;BSD-3 + "third_party/angle/src/common/third_party/base" ;BSD-3 + "third_party/angle/src/common/third_party/smhasher" ;Public domain + "third_party/angle/src/common/third_party/xxhash" ;BSD-2 + "third_party/angle/src/third_party/compiler" ;BSD-2 + "third_party/angle/src/third_party/libXNVCtrl" ;Expat + "third_party/angle/src/third_party/trace_event" ;BSD-3 + "third_party/angle/third_party/glslang" ;BSD-3 + "third_party/angle/third_party/spirv-headers" ;Expat + "third_party/angle/third_party/spirv-tools" ;Expat + "third_party/angle/third_party/vulkan-headers" ;ASL2.0 + "third_party/angle/third_party/vulkan-loader" ;ASL2.0 + "third_party/angle/third_party/vulkan-tools" ;ASL2.0 + "third_party/angle/third_party/vulkan-validation-layers" ;ASL2.0 + "third_party/apple_apsl" ;APSL2.0 + "third_party/blink" ;BSD-3, LGPL2+ + "third_party/boringssl" ;OpenSSL/ISC (Google additions are ISC) + "third_party/boringssl/src/third_party/fiat" ;Expat + "third_party/breakpad" ;BSD-3 + "third_party/brotli" ;Expat + "third_party/cacheinvalidation" ;ASL2.0 + "third_party/catapult" ;BSD-3 + "third_party/catapult/common/py_vulcanize/third_party/rcssmin" ;ASL2.0 + "third_party/catapult/common/py_vulcanize/third_party/rjsmin" ;ASL2.0 + "third_party/catapult/third_party/polymer" ;BSD-3 + "third_party/catapult/tracing/third_party/d3" ;BSD-3 + "third_party/catapult/tracing/third_party/gl-matrix" ;Expat + "third_party/catapult/tracing/third_party/jszip" ;Expat or GPL3 + "third_party/catapult/tracing/third_party/mannwhitneyu" ;Expat + "third_party/catapult/tracing/third_party/oboe" ;BSD-2 + "third_party/catapult/tracing/third_party/pako" ;Expat + "third_party/ced" ;BSD-3 + "third_party/cld_3" ;ASL2.0 + "third_party/crashpad" ;ASL2.0 + "third_party/crashpad/crashpad/third_party/zlib/zlib_crashpad.h" ;Zlib + "third_party/crc32c" ;BSD-3 + "third_party/cros_system_api" ;BSD-3 + "third_party/dom_distiller_js" ;BSD-3 + "third_party/fips181" ;BSD-3 + "third_party/flatbuffers" ;ASL2.0 + "third_party/google_input_tools" ;ASL2.0 + "third_party/google_input_tools/third_party/closure_library" ;ASL2.0 + "third_party/google_input_tools/third_party/closure_library/third_party/closure" ;Expat + "third_party/googletest" ;BSD-3 + "third_party/hunspell" ;MPL1.1/GPL2+/LGPL2.1+ + "third_party/iccjpeg" ;IJG + "third_party/inspector_protocol" ;BSD-3 + "third_party/jinja2" ;BSD-3 + "third_party/jstemplate" ;ASL2.0 + "third_party/khronos" ;Expat, SGI + "third_party/leveldatabase" ;BSD-3 + "third_party/libXNVCtrl" ;Expat + "third_party/libaddressinput" ;ASL2.0 + "third_party/libaom" ;BSD-2 or "Alliance for Open Media Patent License 1.0" + "third_party/libaom/source/libaom/third_party/vector" ;Expat + "third_party/libaom/source/libaom/third_party/x86inc" ;ISC + "third_party/libjingle_xmpp" ;BSD-3 + "third_party/libphonenumber" ;ASL2.0 + "third_party/libsecret" ;LGPL2.1+ + "third_party/libsrtp" ;BSD-3 + "third_party/libsync" ;ASL2.0 + "third_party/libudev" ;LGPL2.1+ + "third_party/libwebm" ;BSD-3 + "third_party/libxml/chromium" ;BSD-3 + "third_party/libyuv" ;BSD-3 + "third_party/lss" ;BSD-3 + "third_party/markupsafe" ;BSD-3 + "third_party/mesa_headers" ;Expat, SGI + "third_party/metrics_proto" ;BSD-3 + "third_party/modp_b64" ;BSD-3 + "third_party/nasm" ;BSD-2 + "third_party/node" ;Expat + "third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2" ;BSD-2 + "third_party/ots" ;BSD-3 + "third_party/pdfium" ;BSD-3 + "third_party/pdfium/third_party/agg23" ;Expat + "third_party/pdfium/third_party/base" ;BSD-3 + "third_party/pdfium/third_party/bigint" ;Public domain, BSD-3 + "third_party/pdfium/third_party/skia_shared" ;BSD-3 + "third_party/pdfium/third_party/freetype/include/pstables.h" ;FreeType + "third_party/ply" ;BSD-3 + "third_party/polymer" ;BSD-3 + "third_party/protobuf" ;BSD-3 + "third_party/protobuf/third_party/six" ;Expat + "third_party/pyjson5" ;ASL2.0 + "third_party/qcms" ;Expat + "third_party/rnnoise" ;BSD-3 + "third_party/s2cellid" ;ASL2.0 + "third_party/sfntly" ;ASL2.0 + "third_party/skia" ;BSD-3 + "third_party/skia/third_party/gif" ;MPL1.1/GPL2+/LGPL2.1+ + "third_party/skia/third_party/skcms" ;BSD-3 + "third_party/skia/third_party/vulkan" ;BSD-3 + "third_party/smhasher" ;Expat, public domain + "third_party/speech-dispatcher" ;GPL2+ + "third_party/spirv-headers" ;ASL2.0 + "third_party/SPIRV-Tools" ;ASL2.0 + "third_party/sqlite" ;Public domain + "third_party/ungoogled" ;BSD-3 + "third_party/usb_ids" ;BSD-3 + "third_party/usrsctp" ;BSD-2 + "third_party/web-animations-js" ;ASL2.0 + "third_party/webdriver" ;ASL2.0 + "third_party/webrtc" ;BSD-3 + "third_party/webrtc/common_audio/third_party/fft4g" ;Non-copyleft + "third_party/webrtc/common_audio/third_party/spl_sqrt_floor" ;Public domain + "third_party/webrtc/modules/third_party/fft" ;Non-copyleft + "third_party/webrtc/modules/third_party/g711" ;Public domain + "third_party/webrtc/modules/third_party/g722" ;Public domain + "third_party/webrtc/rtc_base/third_party/base64" ;Non-copyleft + "third_party/webrtc/rtc_base/third_party/sigslot" ;Public domain + "third_party/widevine/cdm/widevine_cdm_version.h" ;BSD-3 + "third_party/widevine/cdm/widevine_cdm_common.h" ;BSD-3 + "third_party/woff2" ;ASL2.0 + "third_party/xdg-utils" ;Expat + "third_party/yasm/run_yasm.py" ;BSD-2 or BSD-3 + "third_party/zlib/google" ;BSD-3 + "url/third_party/mozilla" ;BSD-3, MPL1.1/GPL2+/LGPL2.1+ + "v8/src/third_party/utf8-decoder" ;Expat + "v8/src/third_party/valgrind" ;BSD-4 + "v8/third_party/inspector_protocol" ;BSD-3 + "v8/third_party/v8/builtins")) ;PSFL + +(define* (computed-origin-method gexp-promise hash-algo hash + #:optional (name "source") + #:key (system (%current-system)) + (guile (default-guile))) + "Return a derivation that executes the G-expression that results +from forcing GEXP-PROMISE." + (mlet %store-monad ((guile (package->derivation guile system))) + (gexp->derivation (or name "computed-origin") + (force gexp-promise) + #:system system + #:guile-for-build guile))) + +(define %chromium-version "72.0.3626.109") +(define %ungoogled-revision "a58db880c15e5077e881cad7b07d1a277ecd463a") + +;; This is a "computed" origin that does the following: +;; 1) Runs the Ungoogled scripts on a pristine Chromium tarball. +;; 2) Prunes all third_party folders that are not explicitly preserved. +;; 3) Adjusts "GN" build files such that system libraries are preferred. +(define ungoogled-chromium-source + (let* ((chromium-source + (origin + (method url-fetch) + (uri (string-append "https://commondatastorage.googleapis.com" + "/chromium-browser-official/chromium-" + %chromium-version ".tar.xz")) + (sha256 + (base32 + "0bcc0iksk2v30drwd5zbw7v6sfbw16jqllc12ks2nifrvh058jjp")))) + (ungoogled-source + (origin + (method git-fetch) + (uri (git-reference (url "https://github.com/Eloston/ungoogled-chromium") + (commit %ungoogled-revision))) + (file-name (git-file-name "ungoogled-chromium" + (string-take %ungoogled-revision 7))) + (sha256 + (base32 + "19w60b71rcccp32b7rcpw75kfg4sw2xfr32rfk0hcyaj5rq0mm69"))))) + + (origin + (method computed-origin-method) + (file-name (string-append "ungoogled-chromium-" %chromium-version ".tar.xz")) + (sha256 #f) + (uri + (delay + (with-imported-modules '((guix build utils)) + #~(begin + (use-modules (guix build utils)) + (let ((chromium-dir (string-append "chromium-" #$%chromium-version)) + (preserved-files (list #$@%preserved-third-party-files))) + + (set-path-environment-variable + "PATH" '("bin") + (list #+(canonical-package patch) + #+(canonical-package xz) + #+(canonical-package tar) + #+python-2 + #+python)) + + (copy-recursively #+ungoogled-source "/tmp/ungoogled") + + (with-directory-excursion "/tmp/ungoogled" + + ;; Create a custom "bundle" that inherits from linux_rooted + ;; and adds an additional patch. + (format #t "Creating Guix config bundle...~%") + (force-output) + (mkdir-p "config_bundles/guix") + (call-with-output-file "config_bundles/guix/bundlemeta.ini" + (lambda (port) + (format port + "[bundle] +display_name = GNU Guix +depends = linux_rooted\n"))) + (call-with-output-file "config_bundles/guix/patch_order.list" + (lambda (port) + (format port "debian_buster/system/openjpeg.patch\n"))) + + (format #t "Unpacking chromium tarball...~%") + (force-output) + (invoke "tar" "xf" #+chromium-source) + + (format #t "Ungooglifying...~%") + (force-output) + (invoke "python3" "run_buildkit_cli.py" "prune" + "-b" "config_bundles/guix" chromium-dir) + (invoke "python3" "run_buildkit_cli.py" "patches" "apply" + "-b" "config_bundles/guix" chromium-dir) + (invoke "python3" "run_buildkit_cli.py" "domains" "apply" + "-b" "config_bundles/linux_rooted" + "-c" "/tmp/domainscache.tar.gz" chromium-dir) + + (with-directory-excursion chromium-dir + (format #t "Pruning third party files...~%") + (force-output) + (apply invoke "python" + "build/linux/unbundle/remove_bundled_libraries.py" + "--do-remove" preserved-files) + + (format #t "Replacing GN files...~%") + (force-output) + (invoke "python3" "build/linux/unbundle/replace_gn_files.py" + "--system-libraries" "ffmpeg" "flac" "fontconfig" + "freetype" "harfbuzz-ng" "icu" "libdrm" "libevent" + "libjpeg" "libpng" "libvpx" "libwebp" "libxml" + "libxslt" "openh264" "opus" "re2" "snappy" "yasm" + "zlib")) + + (format #t (string-append "Packing new ungoogled tarball ...~%")) + (force-output) + (invoke "tar" "cvfa" #$output + ;; Avoid non-determinism in the archive. + "--mtime=@0" + "--owner=root:0" + "--group=root:0" + "--sort=name" + chromium-dir) + + #t))))))))) + +(define opus+custom + (package/inherit opus + (name "opus+custom") + (arguments + (substitute-keyword-arguments (package-arguments opus) + ((#:configure-flags flags ''()) + ;; Opus Custom is an optional extension of the Opus + ;; specification that allows for unsupported frame + ;; sizes. Chromium requires that this is enabled. + `(cons "--enable-custom-modes" + ,flags)))))) + +(define-public ungoogled-chromium + (package + (name "ungoogled-chromium") + (version %chromium-version) + (synopsis "Graphical web browser") + (source ungoogled-chromium-source) + (build-system gnu-build-system) + (arguments + `(#:tests? #f + ;; FIXME: Chromiums RUNPATH lacks entries for some libraries, so + ;; we have to disable validation and add a wrapper below. + #:validate-runpath? #f + #:modules ((guix build gnu-build-system) + (guix build utils) + (ice-9 ftw) + (ice-9 regex) + (srfi srfi-26)) + #:configure-flags + ;; See tools/gn/docs/cookbook.md and + ;; https://www.chromium.org/developers/gn-build-configuration + ;; for usage. Run "./gn args . --list" in the Release + ;; directory for an exhaustive list of supported flags. + ;; (Note: The 'configure' phase will do that for you.) + (list "is_debug=false" + "use_gold=false" + "use_lld=false" + "linux_use_bundled_binutils=false" + "use_custom_libcxx=false" + "use_sysroot=false" + "enable_precompiled_headers=false" + "goma_dir=\"\"" + "enable_nacl=false" + "enable_nacl_nonsfi=false" + "use_allocator=\"none\"" + "use_unofficial_version_number=false" + "treat_warnings_as_errors=false" + "use_official_google_api_keys=false" + "fieldtrial_testing_like_official_build=true" + "safe_browsing_mode=0" + "enable_mdns=false" + "enable_one_click_signin=false" + "enable_reading_list=false" + "enable_remoting=false" + "enable_reporting=false" + "enable_service_discovery=false" + "enable_swiftshader=false" + ;; Disable type-checking for the Web UI to avoid a Java dependency. + "closure_compile=false" + + ;; Define a custom toolchain that simply looks up CC, AR and + ;; friends from the environment. + "custom_toolchain=\"//build/toolchain/linux/unbundle:default\"" + "host_toolchain=\"//build/toolchain/linux/unbundle:default\"" + ;; Don't assume it's clang. + "is_clang=false" + ;; Disable debugging features to save space. These are normally + ;; pulled in by "is_official_build", but that requires "is_clang". + "blink_symbol_level=0" + "enable_iterator_debugging=false" + "exclude_unwind_tables=true" + ;; Optimize for building everything at once, as opposed to + ;; incrementally for development. See "docs/jumbo.md". + "use_jumbo_build=true" + + ;; Prefer system libraries. + "use_system_freetype=true" + "use_system_harfbuzz=true" + "use_system_lcms2=true" + "use_system_libdrm=true" + "use_system_libjpeg=true" + "use_system_libpng=true" + "use_system_zlib=true" + "use_gnome_keyring=false" ;deprecated by libsecret + "use_openh264=true" + "use_pulseaudio=true" + "link_pulseaudio=true" + "use_vaapi=true" + + ;; Don't arbitrarily restrict formats supported by system ffmpeg. + "proprietary_codecs=true" + "ffmpeg_branding=\"Chrome\"" + + ;; WebRTC stuff. + "rtc_use_h264=true" + ;; Don't use bundled sources. + "rtc_build_json=false" + "rtc_build_libevent=false" + "rtc_build_libvpx=false" + "rtc_build_opus=false" + "rtc_build_ssl=false" + "rtc_build_libsrtp=true" ;FIXME: fails to find headers + "rtc_build_usrsctp=true" ;TODO: package this + (string-append "rtc_jsoncpp_root=\"" + (assoc-ref %build-inputs "jsoncpp") + "/include/jsoncpp/json\"") + (string-append "rtc_ssl_root=\"" + (assoc-ref %build-inputs "openssl") + "/include/openssl\"")) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-stuff + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "printing/cups_config_helper.py" + (("cups_config =.*") + (string-append "cups_config = '" (assoc-ref inputs "cups") + "/bin/cups-config'\n"))) + + (substitute* + '("base/process/launch_posix.cc" + "base/third_party/dynamic_annotations/dynamic_annotations.c" + "sandbox/linux/seccomp-bpf/sandbox_bpf.cc" + "sandbox/linux/services/credentials.cc" + "sandbox/linux/services/namespace_utils.cc" + "sandbox/linux/services/syscall_wrappers.cc" + "sandbox/linux/syscall_broker/broker_host.cc") + (("include \"base/third_party/valgrind/") "include \"valgrind/")) + + (for-each (lambda (file) + (substitute* file + ;; Fix opus include path. + ;; Do not substitute opus_private.h. + (("#include \"opus\\.h\"") + "#include \"opus/opus.h\"") + (("#include \"opus_custom\\.h\"") + "#include \"opus/opus_custom.h\"") + (("#include \"opus_defines\\.h\"") + "#include \"opus/opus_defines.h\"") + (("#include \"opus_multistream\\.h\"") + "#include \"opus/opus_multistream.h\"") + (("#include \"opus_types\\.h\"") + "#include \"opus/opus_types.h\""))) + (find-files (string-append "third_party/webrtc/modules" + "/audio_coding/codecs/opus"))) + + (substitute* "chrome/common/chrome_paths.cc" + (("/usr/share/chromium/extensions") + ;; TODO: Add ~/.guix-profile. + "/run/current-system/profile/share/chromium/extensions")) + + ;; XXX: Should be unnecessary when use_system_lcms2=true. + (substitute* "third_party/pdfium/core/fxcodec/codec/ccodec_iccmodule.h" + (("include \"third_party/lcms/include/lcms2\\.h\"") + "include \"lcms2.h\"")) + + (substitute* + "third_party/breakpad/breakpad/src/common/linux/libcurl_wrapper.h" + (("include \"third_party/curl") "include \"curl")) + + (substitute* "third_party/webrtc/rtc_base/strings/json.h" + (("#include \"third_party/jsoncpp/") "#include \"json/")) + + (substitute* "media/base/decode_capabilities.cc" + (("third_party/libvpx/source/libvpx/") "")) + + (substitute* "ui/gfx/skia_util.h" + (("third_party/vulkan/include/") "")) + + ;; Building chromedriver embeds some files using the ZIP + ;; format which doesn't support timestamps before + ;; 1980. Therefore, advance the timestamps of the files + ;; which are included so that building chromedriver + ;; works. + (let ((circa-1980 (* 10 366 24 60 60))) + (for-each (lambda (file) + (utime file circa-1980 circa-1980)) + '("chrome/test/chromedriver/extension/background.js" + "chrome/test/chromedriver/extension/manifest.json"))) + + #t)) + (add-before 'configure 'prepare-build-environment + (lambda* (#:key inputs #:allow-other-keys) + + ;; Make sure the right build tools are used. + (setenv "AR" "ar") (setenv "NM" "nm") + (setenv "CC" "gcc") (setenv "CXX" "g++") + + ;; Work around . + (unsetenv "C_INCLUDE_PATH") + (unsetenv "CPLUS_INCLUDE_PATH") + + ;; TODO: pre-compile instead. Avoids a race condition. + (setenv "PYTHONDONTWRITEBYTECODE" "1") + + ;; XXX: How portable is this. + (mkdir-p "third_party/node/linux/node-linux-x64") + (symlink (string-append (assoc-ref inputs "node") "/bin") + "third_party/node/linux/node-linux-x64/bin") + + #t)) + (replace 'configure + (lambda* (#:key configure-flags #:allow-other-keys) + (let ((args (string-join configure-flags " "))) + ;; Generate ninja build files. + (invoke "gn" "gen" "out/Release" + (string-append "--args=" args)) + + ;; Print the full list of supported arguments as well as + ;; their current status for convenience. + (format #t "Dumping configure flags...\n") + (invoke "gn" "args" "out/Release" "--list")))) + (replace 'build + (lambda* (#:key outputs #:allow-other-keys) + (invoke "ninja" "-C" "out/Release" + "-j" (number->string (parallel-job-count)) + "chrome" + "chromedriver"))) + (replace 'install + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (exe (string-append bin "/chromium")) + (lib (string-append out "/lib")) + (man (string-append out "/share/man/man1")) + (applications (string-append out "/share/applications")) + (install-regexp (make-regexp "\\.(bin|pak)$")) + (locales (string-append lib "/locales")) + (resources (string-append lib "/resources")) + (preferences (assoc-ref inputs "master-preferences")) + (gtk+ (assoc-ref inputs "gtk+")) + (mesa (assoc-ref inputs "mesa")) + (nss (assoc-ref inputs "nss")) + (udev (assoc-ref inputs "udev")) + (sh (which "sh"))) + + (substitute* '("chrome/app/resources/manpage.1.in" + "chrome/installer/linux/common/desktop.template") + (("@@MENUNAME@@") "Chromium") + (("@@PACKAGE@@") "chromium") + (("/usr/bin/@@USR_BIN_SYMLINK_NAME@@") exe)) + + (mkdir-p man) + (copy-file "chrome/app/resources/manpage.1.in" + (string-append man "/chromium.1")) + + (mkdir-p applications) + (copy-file "chrome/installer/linux/common/desktop.template" + (string-append applications "/chromium.desktop")) + + (mkdir-p lib) + (copy-file preferences (string-append lib "/master_preferences")) + + (with-directory-excursion "out/Release" + (for-each (lambda (file) + (install-file file lib)) + (scandir "." (cut regexp-exec install-regexp <>))) + (copy-file "chrome" (string-append lib "/chromium")) + + ;; TODO: Install icons from "../../chrome/app/themes" into + ;; "out/share/icons/hicolor/$size". + (install-file + "product_logo_48.png" + (string-append out "/share/icons/48x48/chromium.png")) + + (copy-recursively "locales" locales) + (copy-recursively "resources" resources) + + (mkdir-p bin) + (symlink "../lib/chromium" exe) + (install-file "chromedriver" bin) + + (wrap-program exe + ;; TODO: Get these in RUNPATH. + `("LD_LIBRARY_PATH" ":" prefix + (,(string-append lib ":" nss "/lib/nss:" mesa "/lib:" + udev "/lib"))) + ;; Avoid file manager crash. See . + `("XDG_DATA_DIRS" ":" prefix (,(string-append gtk+ "/share")))) + #t))))))) + (native-inputs + `(("bison" ,bison) + ("gcc" ,gcc-8) + ("gn" ,gn) + ("gperf" ,gperf) + ("ninja" ,ninja) + ("node" ,node) + ("pkg-config" ,pkg-config) + ("which" ,which) + ("yasm" ,yasm) + + ;; This file contains defaults for new user profiles. + ("master-preferences" ,(local-file "aux-files/chromium/master-preferences.json")) + + ("python-beautifulsoup4" ,python2-beautifulsoup4) + ("python-html5lib" ,python2-html5lib) + ("python" ,python-2))) + (inputs + `(("alsa-lib" ,alsa-lib) + ("atk" ,atk) + ("cups" ,cups) + ("curl" ,curl) + ("dbus" ,dbus) + ("dbus-glib" ,dbus-glib) + ("expat" ,expat) + ("flac" ,flac) + ("ffmpeg" ,ffmpeg) + ("fontconfig" ,fontconfig) + ("freetype" ,freetype) + ("gdk-pixbuf" ,gdk-pixbuf) + ("glib" ,glib) + ("gtk+" ,gtk+) + ("harfbuzz" ,harfbuzz) + ("icu4c" ,icu4c) + ("jsoncpp" ,jsoncpp) + ("lcms" ,lcms) + ("libevent" ,libevent) + ("libffi" ,libffi) + ("libjpeg-turbo" ,libjpeg-turbo) + ("libpng" ,libpng) + ("libva" ,libva) + ("libvpx" ,libvpx) + ("libwebp" ,libwebp) + ("libx11" ,libx11) + ("libxcb" ,libxcb) + ("libxcomposite" ,libxcomposite) + ("libxcursor" ,libxcursor) + ("libxdamage" ,libxdamage) + ("libxext" ,libxext) + ("libxfixes" ,libxfixes) + ("libxi" ,libxi) + ("libxml2" ,libxml2) + ("libxrandr" ,libxrandr) + ("libxrender" ,libxrender) + ("libxscrnsaver" ,libxscrnsaver) + ("libxslt" ,libxslt) + ("libxtst" ,libxtst) + ("mesa" ,mesa) + ("minizip" ,minizip) + ("mit-krb5" ,mit-krb5) + ("nss" ,nss) + ("openh264" ,openh264) + ("openjpeg" ,openjpeg) ;PDFium only + ("openssl" ,openssl) + ("opus" ,opus+custom) + ("pango" ,pango) + ("pciutils" ,pciutils) + ("pulseaudio" ,pulseaudio) + ("re2" ,re2) + ("snappy" ,snappy) + ("speech-dispatcher" ,speech-dispatcher) + ("udev" ,eudev) + ("valgrind" ,valgrind) + ("vulkan-headers" ,vulkan-headers))) + (home-page "https://github.com/Eloston/ungoogled-chromium") + (description + "Ungoogled-Chromium is the Chromium web browser, with some functionality +disabled in order to protect the users privacy.") + ;; Chromium is developed as BSD-3, but bundles a large number of third-party + ;; components with other licenses. For full information, see chrome://credits. + (license (list license:bsd-3 + license:bsd-2 + license:expat + license:asl2.0 + license:mpl1.1 + license:mpl2.0 + license:public-domain + license:isc + (license:non-copyleft "chrome://credits" + "See chrome://credits for more information.") + license:lgpl2.1+)))) -- cgit v1.2.3 From 84e58064611f987ff0abf525204d7aaee17c5ed1 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 19 Feb 2019 00:08:08 -0500 Subject: gnu: rdesktop: Update to 1.8.4 [security fixes]. Fixes CVE-2018-{8791,8792,8793,8794,8795,8796,8797,8798,8799,8800,20174,20175, 20176,20177,20178,20179,20180,20181,20182}. * gnu/packages/rdesktop.scm (rdesktop): Update to 1.8.4. [source]: Update URL. [home-page]: Use HTTPS URL. [arguments]: Add phase 'delete-extraneous-files'. --- gnu/packages/rdesktop.scm | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/rdesktop.scm b/gnu/packages/rdesktop.scm index 777606d77f..2febb1b5f4 100644 --- a/gnu/packages/rdesktop.scm +++ b/gnu/packages/rdesktop.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2017 Thomas Danckaert ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Efraim Flashner +;;; Copyright © 2019 Leo Famulari ;;; ;;; This file is part of GNU Guix. ;;; @@ -45,18 +46,18 @@ (define-public rdesktop (package (name "rdesktop") - (version "1.8.3") + (version "1.8.4") (source (origin (method url-fetch) - (uri (string-append - "mirror://sourceforge/rdesktop/rdesktop/" version "/" - "rdesktop-" version ".tar.gz")) + (uri (string-append "https://github.com/rdesktop/rdesktop/" + "releases/download/v" version "/rdesktop-" + version ".tar.gz")) (sha256 (base32 - "1r7c1rjmw2xzq8fw0scyb453gy9z19774z1z8ldmzzsfndb03cl8")))) + "0bfd9nl2dfr1931fv6bpnrj5yf88ikijrs4s3nm96gm87bkvi64v")))) (build-system gnu-build-system) (arguments - '(#:configure-flags (list (string-append "--with-openssl=" + `(#:configure-flags (list (string-append "--with-openssl=" (assoc-ref %build-inputs "openssl")) @@ -64,11 +65,22 @@ "--disable-credssp" "--disable-smartcard") + #:phases + (modify-phases %standard-phases + (add-after 'install-license-files 'delete-extraneous-files + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (license-dir (string-append out "/share/doc/" + ,name "-" ,version))) + ;; XXX These files are installed erroneously. + (delete-file (string-append license-dir "/licence.c")) + (delete-file (string-append license-dir "/licence.o"))) + #t))) #:tests? #f)) ;no 'check' target (inputs `(("libx11" ,libx11) ("openssl" ,openssl))) - (home-page "http://www.rdesktop.org/") + (home-page "https://www.rdesktop.org/") (synopsis "Client for Windows Terminal Services") (description "rdesktop is a client for Microsoft's Windows Remote Desktop Services, -- cgit v1.2.3 From 33756922bbe1d54c34ecaa77509e34746b779ac9 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Tue, 19 Feb 2019 09:45:08 +0100 Subject: gnu: Add emacs-disk-usage. * gnu/packages/emacs-xyz.scm (emacs-disk-usage): New variable. --- gnu/packages/emacs-xyz.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 0b586738f4..75fc974712 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -13137,3 +13137,24 @@ mostly geared towards Common Lisp, but some are useful for other Lisp dialects, too. Redshank's code transformations aim to be expression-based (as opposed to character-based).") (license license:gpl1+)))) + +(define-public emacs-disk-usage + (package + (name "emacs-disk-usage") + (version "1.1.0") + (home-page "https://gitlab.com/ambrevar/emacs-disk-usage.git") + (source (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1c9jmjn8vf0v4776v79pc5w0labfs4v9aysbv2w9423rg4mangbg")))) + (build-system emacs-build-system) + (synopsis "Sort and browse disk usage listings with Emacs") + (description "Disk Usage is a file system analyzer: it offers a tabulated +view of file listings sorted by size. Directory sizes are computed +recursively. The results are cached for speed.") + (license license:gpl3+))) -- cgit v1.2.3 From 2fc569a0fc0684880a471b49d4a09e1a78de5ebe Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 18 Feb 2019 21:57:44 +0100 Subject: gnu: perl-db-file: Update to 1.843. * gnu/packages/databases.scm (perl-db-file): Update to 1.843. --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index e62e889f8c..144ef5df67 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1637,7 +1637,7 @@ database.") (define-public perl-db-file (package (name "perl-db-file") - (version "1.842") + (version "1.843") (source (origin (method url-fetch) @@ -1647,7 +1647,7 @@ database.") ".tar.gz")) (sha256 (base32 - "0w2d99vs9qarng2f9fpg3gchfdzy6an13507jhclcl8wv183h5hg")))) + "0sildz1i3fmh949w1scpjsyjx0cbmfw0yna3y70mc6vbwp8y696y")))) (build-system perl-build-system) (inputs `(("bdb" ,bdb))) (native-inputs `(("perl-test-pod" ,perl-test-pod))) -- cgit v1.2.3 From 4cb2f29e3e41535a2ed2becdfdfc8dc9799ca604 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 18 Feb 2019 22:01:55 +0100 Subject: gnu: python-pymysql: Update to 0.9.3. * gnu/packages/databases.scm (python-pymysql): Update to 0.9.3. --- gnu/packages/databases.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 144ef5df67..5fc135f4e4 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -745,14 +745,13 @@ pictures, sounds, or video.") (define-public python-pymysql (package (name "python-pymysql") - (version "0.9.2") + (version "0.9.3") (source (origin (method url-fetch) (uri (pypi-uri "PyMySQL" version)) (sha256 - (base32 - "0gvi63f1zq1bbd30x28kqyx351hal1yc323ckp0mihainb5n1iwy")))) + (base32 "1ry8lxgdc1p3k7gbw20r405jqi5lvhi5wk83kxdbiv8xv3f5kh6q")))) (build-system python-build-system) (native-inputs `(("python-unittest2" ,python-unittest2))) -- cgit v1.2.3 From 74bf1b5da5dfd1e52be971c09203d5c514873fc1 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 19 Feb 2019 09:52:40 +0100 Subject: gnu: docker: Fix build on btrfs. * gnu/packages/docker.scm (docker)[arguments]: Skip another test that requires root privileges. --- gnu/packages/docker.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages') diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index b340f8d4a0..8c2582a86e 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -397,6 +397,7 @@ network attachments.") ;; Timeouts after 5 min. (delete-file "plugin/manager_linux_test.go") ;; Operation not permitted. + (delete-file "daemon/graphdriver/btrfs/btrfs_test.go") (delete-file "daemon/graphdriver/overlay/overlay_test.go") (delete-file "daemon/graphdriver/overlay2/overlay_test.go") #t)) -- cgit v1.2.3 From 6c77b5a9f7856d44e7405ff3fd6458629004d555 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 18 Feb 2019 22:12:19 +0100 Subject: gnu: containerd: Update to 1.2.4. * gnu/packages/docker.scm (containerd): Update to 1.2.4. --- gnu/packages/docker.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index 8c2582a86e..7cb8f96258 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -162,7 +162,7 @@ Python without keeping their credentials in a Docker configuration file.") (define-public containerd (package (name "containerd") - (version "1.2.2") + (version "1.2.4") (source (origin (method git-fetch) @@ -171,8 +171,7 @@ Python without keeping their credentials in a Docker configuration file.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 - "065snv0s3v3z0ghadlii4w78qnhchcbx2kfdrvm8fk8gb4pkx1ya")))) + (base32 "1rw7f0y3iv0mapxid1rgpns80dcy8nhgmxmw27x8qzrzic5viivy")))) (build-system go-build-system) (arguments `(#:import-path "github.com/containerd/containerd" -- cgit v1.2.3 From 0b2db013a7915cf9b44401f6bc571f56e4eb0389 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 18 Feb 2019 22:40:40 +0100 Subject: gnu: gerbv: Update to 2.7.0. * gnu/packages/engineering.scm (gerbv): Update to 2.7.0. --- gnu/packages/engineering.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index ad7ae18781..9dab778de2 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2016, 2017, 2018 Ludovic Courtès ;;; Copyright © 2016, 2017, 2018 Theodoros Foradis ;;; Copyright © 2017 Julien Lepiller -;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 Clément Lassieur ;;; Copyright © 2018 Jonathan Brielmaier ;;; Copyright © 2018 Arun Isaac @@ -606,17 +606,18 @@ ready for production.") (define-public gerbv (package (name "gerbv") - (version "2.6.2") + (version "2.7.0") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/gerbv/gerbv/gerbv-" version "/gerbv-" version ".tar.gz")) (sha256 (base32 - "1cw8k6ni0q8kswad03kha86fk7n06vq8p0wzsfhcnalsdshrn17i")))) + "1d2k43k7i4yvbpi4sw1263a8d0q98z2n7aqhmpinpkih8a681vn5")))) (build-system gnu-build-system) (native-inputs - `(("pkg-config" ,pkg-config))) + `(("glib:bin" ,glib "bin") ; for glib-compile-schemas, etc. + ("pkg-config" ,pkg-config))) (inputs `(("cairo" ,cairo) ("gtk" ,gtk+-2) -- cgit v1.2.3 From d84a20fb6bd6f1f93eaeb32b4d57c790879e5873 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 18 Feb 2019 23:01:28 +0100 Subject: gnu: memcached: Update to 1.5.12. * gnu/packages/databases.scm (memcached): Update to 1.5.12. --- gnu/packages/databases.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 5fc135f4e4..3d13433398 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -277,15 +277,14 @@ mapping from string keys to string values.") (define-public memcached (package (name "memcached") - (version "1.5.10") + (version "1.5.12") (source (origin (method url-fetch) (uri (string-append "https://memcached.org/files/memcached-" version ".tar.gz")) (sha256 - (base32 - "0jqw3z0408yx0lzc6ykn4d29n02dk31kqnmq9b3ldmcnpl6hck29")))) + (base32 "0aav15f0lh8k4i62aza2bdv4s8vv65j38pz2zc4v45snd3arfby0")))) (build-system gnu-build-system) (inputs `(("libevent" ,libevent) -- cgit v1.2.3 From 257c826c918f9897a4219afe86e6558f03350d5f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 18 Feb 2019 23:21:52 +0100 Subject: gnu: protozero: Update to 1.6.5. * gnu/packages/geo.scm (protozero): Update to 1.6.5. Re-indent. --- gnu/packages/geo.scm | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 6ea89dc92a..8a8d220779 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2016 Leo Famulari ;;; Copyright © 2016 Alex Griffin ;;; Copyright © 2017, 2018 Björn Höfling -;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 Ricardo Wurmus ;;; Copyright © 2018 Arun Isaac ;;; Copyright © 2018 Joshua Sierles, Nextjournal @@ -743,16 +743,15 @@ to create databases that are optimized for rendering/tile/map-services.") (define-public protozero (package (name "protozero") - (version "1.6.3") + (version "1.6.5") (source - (origin - (method url-fetch) - (uri (string-append "https://github.com/mapbox/protozero/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "1xaj4phz1r7xn0vgdfvfkz8b0bizgb6mavjky1zqcvdmbwgwgly5")))) + (origin + (method url-fetch) + (uri (string-append "https://github.com/mapbox/protozero/archive/v" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0y12wz9v5w2gjfipyrw7v1gchnhivzlkkfax37i69l3yp9npimly")))) (build-system cmake-build-system) (home-page "https://github.com/mapbox/protozero") (synopsis "Minimalistic protocol buffer decoder and encoder in C++") @@ -760,8 +759,8 @@ to create databases that are optimized for rendering/tile/map-services.") encoder in C++. The developer using protozero has to manually translate the @file{.proto} description into code.") (license (list - license:asl2.0; for folly - license:bsd-2)))) + license:asl2.0 ; for folly + license:bsd-2)))) (define-public libosmium (package -- cgit v1.2.3 From d56af1ff62a3759c323fec8760abf2a3e13c7dad Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 18 Feb 2019 23:32:54 +0100 Subject: gnu: protozero: Don't use unstable tarball. * gnu/packages/geo.scm (protozero)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/geo.scm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 8a8d220779..d95547763e 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -32,6 +32,7 @@ #:use-module (guix build-system scons) #:use-module (guix build-system r) #:use-module (guix download) + #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix utils) @@ -746,12 +747,13 @@ to create databases that are optimized for rendering/tile/map-services.") (version "1.6.5") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/mapbox/protozero/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/mapbox/protozero.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 "0y12wz9v5w2gjfipyrw7v1gchnhivzlkkfax37i69l3yp9npimly")))) + (base32 "10ldzni46cplmkgx1f73yn95qcb71xh9nxpcfdmi107y3kvicv3c")))) (build-system cmake-build-system) (home-page "https://github.com/mapbox/protozero") (synopsis "Minimalistic protocol buffer decoder and encoder in C++") -- cgit v1.2.3 From b23c95fe396d4de64084169b304b7e562672a4e3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 18 Feb 2019 23:33:32 +0100 Subject: gnu: protozero: Fix typo in description. * gnu/packages/geo.scm (protozero)[description]: Fix typo. --- gnu/packages/geo.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index d95547763e..884f57eabd 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -757,7 +757,7 @@ to create databases that are optimized for rendering/tile/map-services.") (build-system cmake-build-system) (home-page "https://github.com/mapbox/protozero") (synopsis "Minimalistic protocol buffer decoder and encoder in C++") - (description "Protozero is a minimalistic protocol buffer decored and + (description "Protozero is a minimalistic protocol buffer decoder and encoder in C++. The developer using protozero has to manually translate the @file{.proto} description into code.") (license (list -- cgit v1.2.3 From 731799157087dad923caf9bd383a507c8abd9594 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 19 Feb 2019 09:02:15 +0100 Subject: gnu: hiawatha: Update to 10.9. * gnu/packages/web.scm (hiawatha): Update to 10.9. [source]: Adjust location of bundled nghttp2. --- gnu/packages/web.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index d8bab34e51..5b8543fac6 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4959,7 +4959,7 @@ functions of Tidy.") (define-public hiawatha (package (name "hiawatha") - (version "10.8.4") + (version "10.9") (source (origin (method url-fetch) @@ -4969,11 +4969,10 @@ functions of Tidy.") (snippet '(begin ;; We use packaged libraries, so delete the bundled copies. (for-each delete-file-recursively - (list "nghttp2" "mbedtls")) + (list "extra/nghttp2.tgz" "mbedtls")) #t)) (sha256 - (base32 - "054bcn1rsa064kak5lm961k2l38bz3329ik7j68fxlqs0zlj5cvw")))) + (base32 "1f2j2x1ziawz8ijg3s3izqpyzpiwfyhlsvbv0szxvhvj4a0l7pbl")))) (build-system cmake-build-system) (arguments `(#:tests? #f ; no tests included -- cgit v1.2.3 From fb2d54ecd18f17d62e8f34a534804224f5d1260d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 19 Feb 2019 06:46:44 +0100 Subject: gnu: babl: Update to 0.1.62. * gnu/packages/gimp.scm (babl): Update to 0.1.62. --- gnu/packages/gimp.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm index cd0deac158..697aabf1d3 100644 --- a/gnu/packages/gimp.scm +++ b/gnu/packages/gimp.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2014, 2015 Ludovic Courtès ;;; Copyright © 2016, 2018 Ricardo Wurmus ;;; Copyright © 2016, 2017, 2018 Efraim Flashner -;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 Leo Famulari ;;; Copyright © 2018 Thorsten Wilms ;;; @@ -49,7 +49,7 @@ (define-public babl (package (name "babl") - (version "0.1.56") + (version "0.1.62") (source (origin (method url-fetch) (uri (list (string-append "https://download.gimp.org/pub/babl/" @@ -63,7 +63,7 @@ "/babl-" version ".tar.bz2"))) (sha256 (base32 - "0a2dvihah1j7qi5dp1qzzlwklcqnndmxsm7lc7i78g7c2yknrlla")))) + "047msfzj8v4sfl61a2xhd69r9rh2pjq4lzpk3j10ijyv9qbry9yw")))) (build-system gnu-build-system) (home-page "http://gegl.org/babl/") (synopsis "Image pixel format conversion library") -- cgit v1.2.3 From 2ed93b78203f35451197fff3b2d47941bbc912a2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 19 Feb 2019 06:52:14 +0100 Subject: gnu: gegl: Update to 0.4.12. * gnu/packages/gimp.scm (gegl): Update to 0.4.12. --- gnu/packages/gimp.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm index 697aabf1d3..42b9c758db 100644 --- a/gnu/packages/gimp.scm +++ b/gnu/packages/gimp.scm @@ -80,7 +80,7 @@ provided, as well as a framework to add new color models and data types.") (define-public gegl (package (name "gegl") - (version "0.4.8") + (version "0.4.12") (source (origin (method url-fetch) (uri (list (string-append "https://download.gimp.org/pub/gegl/" @@ -88,7 +88,7 @@ provided, as well as a framework to add new color models and data types.") "/" name "-" version ".tar.bz2"))) (sha256 (base32 - "0jdfhf8wikba4h68k505x0br3gisiwivc33aca8v3ibaqpp6i53i")))) + "0ljqxc4iyy2hrj31pxcy1xp4xm5zbx1nigqisphmg4p8mcz2jrz9")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("LDFLAGS=-lm"))) -- cgit v1.2.3 From 00bfe5eda0367e7ef999fea6e9daaa3876cdd3a9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 19 Feb 2019 06:52:20 +0100 Subject: gnu: gegl: Don't use NAME in source URI. * gnu/packages/gimp.scm (gegl)[source]: Hard-code NAME. --- gnu/packages/gimp.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm index 42b9c758db..f3cb23a564 100644 --- a/gnu/packages/gimp.scm +++ b/gnu/packages/gimp.scm @@ -85,7 +85,7 @@ provided, as well as a framework to add new color models and data types.") (method url-fetch) (uri (list (string-append "https://download.gimp.org/pub/gegl/" (string-take version 3) - "/" name "-" version ".tar.bz2"))) + "/gegl-" version ".tar.bz2"))) (sha256 (base32 "0ljqxc4iyy2hrj31pxcy1xp4xm5zbx1nigqisphmg4p8mcz2jrz9")))) -- cgit v1.2.3 From 81d6dd20d0398c4643c961a90512246ae9de6971 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 19 Feb 2019 07:13:48 +0100 Subject: gnu: gimp: Update to 2.10.8. * gnu/packages/gimp.scm (gimp): Update to 2.10.8. --- gnu/packages/gimp.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm index f3cb23a564..9f0a87a40a 100644 --- a/gnu/packages/gimp.scm +++ b/gnu/packages/gimp.scm @@ -118,7 +118,7 @@ buffers.") (define-public gimp (package (name "gimp") - (version "2.10.6") + (version "2.10.8") (source (origin (method url-fetch) (uri (string-append "https://download.gimp.org/pub/gimp/v" @@ -126,7 +126,7 @@ buffers.") "/gimp-" version ".tar.bz2")) (sha256 (base32 - "07qh2ljbza2mph1gh8sicn27qihhj8hx3ivvry2874cfh8ghgj2f")))) + "16sb4kslwin2jbgdb4nhks78pd0af8mvj8g5hap3hj946p7w2jfq")))) (build-system gnu-build-system) (outputs '("out" "doc")) ; 9 MiB of gtk-doc HTML -- cgit v1.2.3 From fa75a21363d6dd07c1dbc990b88cd75f19454324 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 19 Feb 2019 07:19:53 +0100 Subject: gnu: soundconverter: Update to 3.0.1. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gnome.scm (soundconverter): Update to 3.0.1. [arguments]: Remove ‘fix-POTFILES.in’ phase. * gnu/packages/patches/soundconverter-remove-gconf-dependency.patch: Update. --- gnu/packages/gnome.scm | 13 +-- .../soundconverter-remove-gconf-dependency.patch | 104 +++++---------------- 2 files changed, 28 insertions(+), 89 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index e371a60131..a5ca245fe6 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -21,7 +21,7 @@ ;;; Copyright © 2016 Alex Griffin ;;; Copyright © 2016, 2017 Nils Gillmann ;;; Copyright © 2016 David Craven -;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice +;;; Copyright © 2016, 2017, 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2017 Thomas Danckaert ;;; Copyright © 2017 Hartmut Goebel ;;; Copyright © 2017, 2018 nee @@ -7371,7 +7371,7 @@ mp3, Ogg Vorbis and FLAC") (define-public soundconverter (package (name "soundconverter") - (version "3.0.0") + (version "3.0.1") (source (origin (method url-fetch) @@ -7380,8 +7380,7 @@ mp3, Ogg Vorbis and FLAC") "soundconverter-" version ".tar.xz")) (sha256 - (base32 - "1wrxf5py54xplrf97qp24pzbis0cvax5c6k0c7vr3z3ry8r7gd7c")) + (base32 "1d6x1yf8psqbd9zbybxivfqg55khcnngp2mn92l161dfdk9512c5")) (patches (search-patches "soundconverter-remove-gconf-dependency.patch")))) @@ -7398,12 +7397,6 @@ mp3, Ogg Vorbis and FLAC") #:phases (modify-phases %standard-phases - (add-after 'unpack 'fix-POTFILES.in - (lambda _ - (substitute* "po/POTFILES.in" - ;; This file doesn't exist, so without removing it, the 'check - ;; phase fails for the po directory - (("soundconverter/gconfstore\\.py") "")))) (add-after 'install 'wrap-soundconverter-for-python (assoc-ref python:%standard-phases 'wrap)) (add-after 'install 'wrap-soundconverter diff --git a/gnu/packages/patches/soundconverter-remove-gconf-dependency.patch b/gnu/packages/patches/soundconverter-remove-gconf-dependency.patch index f065b9a3d4..29cdeb6e8d 100644 --- a/gnu/packages/patches/soundconverter-remove-gconf-dependency.patch +++ b/gnu/packages/patches/soundconverter-remove-gconf-dependency.patch @@ -1,83 +1,29 @@ -From: Sebastian Ramacher -Date: Fri, 6 Apr 2018 13:25:35 +0200 -Subject: Only fetch profiles if GConf is still available +From: Tobias Geerinckx-Rice +Date: Tue, 19 Feb 2019 07:46:28 +0100 +Subject: [PATCH] gnu: soundconverter: Catch (and ignore) the right error. ---- - bin/soundconverter.py | 1 - - soundconverter/gstreamer.py | 44 ++++++++++++++++++++++++-------------------- - 2 files changed, 24 insertions(+), 21 deletions(-) +Without this patch and GConf: -diff --git a/bin/soundconverter.py b/bin/soundconverter.py -index 39055ce..5198443 100644 ---- a/bin/soundconverter.py -+++ b/bin/soundconverter.py -@@ -66,7 +66,6 @@ def _check_libs(): - import gi - gi.require_version('Gst', '1.0') - gi.require_version('Gtk', '3.0') -- gi.require_version('GConf', '2.0') - from gi.repository import GObject - # force GIL creation - see https://bugzilla.gnome.org/show_bug.cgi?id=710447 - import threading -diff --git a/soundconverter/gstreamer.py b/soundconverter/gstreamer.py -index 23aaa9b..211b052 100644 ---- a/soundconverter/gstreamer.py -+++ b/soundconverter/gstreamer.py -@@ -25,7 +25,7 @@ from urllib.parse import urlparse - from gettext import gettext as _ - - import gi --from gi.repository import Gst, Gtk, GObject, GConf, Gio -+from gi.repository import Gst, Gtk, GObject, Gio - - from soundconverter.fileoperations import vfs_encode_filename, file_encode_filename - from soundconverter.fileoperations import unquote_filename, vfs_makedirs, vfs_unlink -@@ -66,25 +66,29 @@ _GCONF_PROFILE_LIST_PATH = "/system/gstreamer/1.0/audio/global/profile_list" - audio_profiles_list = [] - audio_profiles_dict = {} - --_GCONF = GConf.Client.get_default() --profiles = _GCONF.all_dirs(_GCONF_PROFILE_LIST_PATH) --for name in profiles: -- if _GCONF.get_bool(_GCONF_PROFILE_PATH + name + "/active"): -- # get profile -- description = _GCONF.get_string(_GCONF_PROFILE_PATH + name + "/name") -- extension = _GCONF.get_string(_GCONF_PROFILE_PATH + name + "/extension") -- pipeline = _GCONF.get_string(_GCONF_PROFILE_PATH + name + "/pipeline") -- # check profile validity -- if not extension or not pipeline: -- continue -- if not description: -- description = extension -- if description in audio_profiles_dict: -- continue -- # store -- profile = description, extension, pipeline -- audio_profiles_list.append(profile) -- audio_profiles_dict[description] = profile -+try: -+ from gi.repository import GConf -+ _GCONF = GConf.Client.get_default() -+ profiles = _GCONF.all_dirs(_GCONF_PROFILE_LIST_PATH) -+ for name in profiles: -+ if _GCONF.get_bool(_GCONF_PROFILE_PATH + name + "/active"): -+ # get profile -+ description = _GCONF.get_string(_GCONF_PROFILE_PATH + name + "/name") -+ extension = _GCONF.get_string(_GCONF_PROFILE_PATH + name + "/extension") -+ pipeline = _GCONF.get_string(_GCONF_PROFILE_PATH + name + "/pipeline") -+ # check profile validity -+ if not extension or not pipeline: -+ continue -+ if not description: -+ description = extension -+ if description in audio_profiles_dict: -+ continue -+ # store -+ profile = description, extension, pipeline -+ audio_profiles_list.append(profile) -+ audio_profiles_dict[description] = profile -+except ImportError: -+ pass + Traceback (most recent call last): + File "/gnu/…/bin/...soundconverter-real-real-real", line 164, in + from soundconverter.batch import cli_convert_main + File "/gnu/…/lib/soundconverter/python/soundconverter/batch.py", line 31, in + from soundconverter.gstreamer import TagReader + File "/gnu/…/lib/soundconverter/python/soundconverter/gstreamer.py", line 70, in + gi.require_version('GConf', '2.0') + File "/gnu/…/lib/python3.7/site-packages/gi/__init__.py", line 130, in require_version + raise ValueError('Namespace %s not available' % namespace) + ValueError: Namespace GConf not available +--- +diff -Naur soundconverter-3.0.1/soundconverter/gstreamer.py soundconverter-3.0.1/soundconverter/gstreamer.py +--- soundconverter-3.0.1/soundconverter/gstreamer.py 2018-11-23 20:38:46.000000000 +0100 ++++ soundconverter-3.0.1/soundconverter/gstreamer.py 2019-02-19 07:42:15.767684388 +0100 +@@ -88,7 +88,7 @@ + profile = description, extension, pipeline + audio_profiles_list.append(profile) + audio_profiles_dict[description] = profile +-except ImportError: ++except ValueError: + pass required_elements = ('decodebin', 'fakesink', 'audioconvert', 'typefind', 'audiorate') - for element in required_elements: -- cgit v1.2.3 From 89f2d7360b5ab62c07667b602c8bcac94c8a0aee Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 19 Feb 2019 07:33:54 +0100 Subject: gnu: workrave: Compute source COMMIT from VERSION. * gnu/packages/gnome.scm (workrave)[version, source]: Conventionally generate COMMIT from VERSION, instead of the other way 'round. --- gnu/packages/gnome.scm | 85 ++++++++++++++++++++++++-------------------------- 1 file changed, 41 insertions(+), 44 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index a5ca245fe6..65f19c3ebc 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7427,52 +7427,49 @@ configurable file renaming. ") (license license:gpl3))) (define-public workrave - (let ((commit "v1_10_21")) - (package - (name "workrave") - (version (string-map (match-lambda - (#\_ #\.) - (chr chr)) - (string-drop commit 1))) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/rcaelers/workrave.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "150qca8c552fakjlzkgarsxgp87l1xcwn19svqsa9d0cygqxjgia")))) - (build-system glib-or-gtk-build-system) - (propagated-inputs `(("glib" ,glib) - ("gtk+" ,gtk+) - ("gdk-pixbuf" ,gdk-pixbuf) - ("gtkmm" ,gtkmm) - ("glibmm" ,glibmm) - ("libx11" ,libx11) - ("libxtst" ,libxtst) - ("dconf" ,dconf) - ("libice" ,libice))) - (inputs `(("libsm" ,libsm) - ("python-cheetah" ,python2-cheetah))) - (native-inputs `(("glib" ,glib "bin") - ("pkg-config" ,pkg-config) - ("gettext" ,gnu-gettext) - ("autoconf" ,autoconf) - ("autoconf-archive" , autoconf-archive) - ("automake" ,automake) - ("libtool" ,libtool) - ("intltool" ,intltool) - ("libxscrnsaver" ,libxscrnsaver) - ("gobject-introspection" ,gobject-introspection) - ("python2" ,python-2))) - (synopsis "Tool to help prevent repetitive strain injury (RSI)") - (description - "Workrave is a program that assists in the recovery and prevention of + (package + (name "workrave") + (version "1.10.21") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/rcaelers/workrave.git") + (commit (string-map (match-lambda (#\_ #\.) (chr chr)) version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "150qca8c552fakjlzkgarsxgp87l1xcwn19svqsa9d0cygqxjgia")))) + (build-system glib-or-gtk-build-system) + (propagated-inputs `(("glib" ,glib) + ("gtk+" ,gtk+) + ("gdk-pixbuf" ,gdk-pixbuf) + ("gtkmm" ,gtkmm) + ("glibmm" ,glibmm) + ("libx11" ,libx11) + ("libxtst" ,libxtst) + ("dconf" ,dconf) + ("libice" ,libice))) + (inputs `(("libsm" ,libsm) + ("python-cheetah" ,python2-cheetah))) + (native-inputs `(("glib" ,glib "bin") + ("pkg-config" ,pkg-config) + ("gettext" ,gnu-gettext) + ("autoconf" ,autoconf) + ("autoconf-archive" , autoconf-archive) + ("automake" ,automake) + ("libtool" ,libtool) + ("intltool" ,intltool) + ("libxscrnsaver" ,libxscrnsaver) + ("gobject-introspection" ,gobject-introspection) + ("python2" ,python-2))) + (synopsis "Tool to help prevent repetitive strain injury (RSI)") + (description + "Workrave is a program that assists in the recovery and prevention of repetitive strain injury (@dfn{RSI}). The program frequently alerts you to take micro-pauses and rest breaks, and restricts you to your daily limit.") - (home-page "http://www.workrave.org") - (license license:gpl3+)))) + (home-page "http://www.workrave.org") + (license license:gpl3+))) (define-public ghex (package -- cgit v1.2.3 From 2fbab84878c32ea3aefa592c91dedd40bc97412f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 19 Feb 2019 07:36:08 +0100 Subject: gnu: ghex: Don't use NAME in source URI. * gnu/packages/gnome.scm (ghex)[source]: Hard-code NAME. --- gnu/packages/gnome.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 65f19c3ebc..efbb2afc9e 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7477,9 +7477,9 @@ micro-pauses and rest breaks, and restricts you to your daily limit.") (version "3.18.3") (source (origin (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" + (uri (string-append "mirror://gnome/sources/ghex/" (version-major+minor version) "/" - name "-" version ".tar.xz")) + "ghex-" version ".tar.xz")) (sha256 (base32 "1lq8920ad2chi9ibmyq0x9hg9yk63b0kdbzid03w42cwdzw50x66")))) @@ -7490,7 +7490,7 @@ micro-pauses and rest breaks, and restricts you to your daily limit.") ("which" ,which) ("intltool" ,intltool) ("yelp-tools" ,yelp-tools) - ("desktop-file-utils" ,desktop-file-utils))) ;for 'desktop-file-validate' + ("desktop-file-utils" ,desktop-file-utils))) ; for 'desktop-file-validate' (inputs `(("atk" ,atk) ("gtk" ,gtk+))) -- cgit v1.2.3 From 687b4909c93c3aa10698fd4d0bb30052527ebf00 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 19 Feb 2019 07:37:10 +0100 Subject: gnu: libdazzle: Don't use NAME in source URI. * gnu/packages/gnome.scm (libdazzle)[source]: Hard-code NAME. --- gnu/packages/gnome.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index efbb2afc9e..3dce24d716 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7506,9 +7506,9 @@ hexadecimal or ASCII. It is useful for editing binary files in general.") (version "3.28.5") (source (origin (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" + (uri (string-append "mirror://gnome/sources/libdazzle/" (version-major+minor version) "/" - name "-" version ".tar.xz")) + "libdazzle-" version ".tar.xz")) (sha256 (base32 "08qdwv2flywnh6kibkyv0pnm67pk8xlmjh4yqx6hf13hyhkxkqgg")))) @@ -7529,9 +7529,9 @@ hexadecimal or ASCII. It is useful for editing binary files in general.") (setenv "DISPLAY" ":1") #t))))) (native-inputs - `(("glib" ,glib "bin") ; glib-compile-resources + `(("glib" ,glib "bin") ; glib-compile-resources ("pkg-config" ,pkg-config) - ;; For tests + ;; For tests. ("xorg-server" ,xorg-server))) (inputs `(("glib" ,glib) -- cgit v1.2.3 From 37040b85d168ab7c0debee9c710b7d6920dba4da Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 19 Feb 2019 07:52:47 +0100 Subject: gnu: unbound: Update to 1.9.0. * gnu/packages/dns.scm (unbound): Update to 1.9.0. --- gnu/packages/dns.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index dbd00271b1..1a6b29746a 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -364,15 +364,14 @@ to result in system-wide compromise.") (define-public unbound (package (name "unbound") - (version "1.8.1") + (version "1.9.0") (source (origin (method url-fetch) (uri (string-append "https://www.unbound.net/downloads/unbound-" version ".tar.gz")) (sha256 - (base32 - "0p9w6spar5dfi7fplxjcq4394wldabaws0ns30cqq6sxqfwv6qn3")))) + (base32 "05xrb8havr2vgjsdy7n85kgnvk1mg7qwhjp4a8n6pg4jhd5zjnj1")))) (build-system gnu-build-system) (outputs '("out" "python")) (native-inputs @@ -387,7 +386,7 @@ to result in system-wide compromise.") ("openssl" ,openssl))) (arguments `(#:configure-flags - (list "--disable-static" ;save space and non-determinism in libunbound.a + (list "--disable-static" ; save space and non-determinism in libunbound.a (string-append "--with-ssl=" (assoc-ref %build-inputs "openssl")) (string-append -- cgit v1.2.3 From 3154ac32880753e80d03d8b7214213a145f6359f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 17 Feb 2019 19:45:42 +0100 Subject: gnu: stgit: Don't use unstable tarball. * gnu/packages/version-control.scm (stgit)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/version-control.scm | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index b8e967bf69..5ca9471a43 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -995,14 +995,15 @@ lot easier.") (package (name "stgit") (version "0.18") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/ctmarinas/stgit/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "19fk6vw3pgp2a98wpd4j3kyiyll5dy9bi4921wq1mrky0l53mj00")))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ctmarinas/stgit.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0ydgg744m671nkhg7h4q2z3b9vpbc9914rbc0wcgimqfqsxkxx2y")))) (build-system python-build-system) (inputs `(("git" ,git))) @@ -1012,7 +1013,7 @@ lot easier.") (modify-phases %standard-phases (replace 'check (lambda _ - ;; two tests will fail -> disable them. TODO: fix the failing tests + ;; Two tests will fail -> disable them. TODO: fix the failing tests (delete-file "t/t3300-edit.sh") (delete-file "t/t7504-commit-msg-hook.sh") (invoke "make" "test")))))) -- cgit v1.2.3 From be92b4b000dbe84a525de7857296fede318048d9 Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Mon, 18 Feb 2019 16:14:19 -0600 Subject: gnu: ansible: Update to 2.7.7. * gnu/packages/admin.scm (ansible): Update to 2.7.7. Signed-off-by: Arun Isaac --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 982aad0f4d..24486cec18 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1602,14 +1602,14 @@ of supported upstream metrics systems simultaneously.") (define-public ansible (package (name "ansible") - (version "2.7.6") + (version "2.7.7") (source (origin (method url-fetch) (uri (pypi-uri "ansible" version)) (sha256 (base32 - "0f7b2ghm34ql8yv90wr0ngd6w7wyvnlcxpc3snkj86kcjsnmx1bd")))) + "0l4id24jqi578xmybvwrz10sm2jhs90gk9gs1y04gfarz4vcj304")))) (build-system python-build-system) (native-inputs `(("python-bcrypt" ,python-bcrypt) -- cgit v1.2.3 From aff13de3236bac03bf72b922c7f5e6e165205dd6 Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Mon, 18 Feb 2019 21:45:47 -0600 Subject: gnu: r-raster: Update to 2.8-19. * gnu/packages/cran.scm (r-raster): Update to 2.8-19. [home-page]: Use HTTPS. Signed-off-by: Ricardo Wurmus --- gnu/packages/cran.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 82fd465d79..0d5717d98e 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -13,6 +13,7 @@ ;;; Copyright © 2018 Laura Lazzati ;;; Copyright © 2018 Leo Famulari ;;; Copyright © 2018 Marius Bakke +;;; Copyright © 2018 Brett Gilio ;;; ;;; This file is part of GNU Guix. ;;; @@ -6589,19 +6590,19 @@ used to teach mathematics, statistics, computation and modeling.") (define-public r-raster (package (name "r-raster") - (version "2.8-4") + (version "2.8-19") (source (origin (method url-fetch) (uri (cran-uri "raster" version)) (sha256 (base32 - "14pcfznxm5kdwd908axkr9v1l0hzxlrwd8kwrz0liqnfh9cx5rsa")))) + "1lmhf7p7is8ai7lv7zsj2rdzf83j7ccl4x7a9vwxxa824zy4bkf4")))) (build-system r-build-system) (propagated-inputs `(("r-rcpp" ,r-rcpp) ("r-sp" ,r-sp))) - (home-page "http://www.rspatial.org/") + (home-page "https://www.rspatial.org/") (synopsis "Geographic data analysis and modeling") (description "The package implements basic and high-level functions for reading, -- cgit v1.2.3 From 10db67781f0f39b12996c4af461076b3d76eb2e3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 19 Feb 2019 15:01:19 +0100 Subject: gnu: slurp: Update to 1.0.1. * gnu/packages/image.scm (slurp): Update to 1.0.1. --- gnu/packages/image.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 545fe334d5..772baef674 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2014, 2017 John Darrington ;;; Copyright © 2016, 2017, 2018 Leo Famulari ;;; Copyright © 2016, 2017, 2018 Efraim Flashner -;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice +;;; Copyright © 2016, 2017, 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2016 Eric Bavier ;;; Copyright © 2016, 2017 Arun Isaac ;;; Copyright © 2016, 2017 Kei Kebreau @@ -1613,7 +1613,7 @@ identical visual appearance.") (define-public slurp (package (name "slurp") - (version "1.0") + (version "1.0.1") (source (origin (method git-fetch) @@ -1622,7 +1622,7 @@ identical visual appearance.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "03igv8r8n772xb0y7whhs1pa298l3d94jbnknaxpwp2n4fi04syb")))) + (base32 "072lkwhpvr753wfqzmd994bnhbrgfavxcgqcyml7abab28sdhs1y")))) (build-system meson-build-system) (native-inputs `(("pkg-config" ,pkg-config))) (inputs `(("cairo" ,cairo) -- cgit v1.2.3 From 3d4c4fc2a01dce41f3eade34a26e6cc14ca515a5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 19 Feb 2019 15:03:12 +0100 Subject: gnu: grim: Update to 1.1. * gnu/packages/image.scm (grim): Update to 1.1. --- gnu/packages/image.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 772baef674..1c1411ff77 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -1588,7 +1588,7 @@ identical visual appearance.") (define-public grim (package (name "grim") - (version "1.0") + (version "1.1") (source (origin (method url-fetch) @@ -1596,7 +1596,7 @@ identical visual appearance.") ".tar.gz")) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0xkk5nqyp1px0sxz4asmchznc0q39wdx1b67ql741k8aj815km0f")))) + (base32 "1zxj1p5rgrhcq88frq2ccc38b7v0hk22mvqwjs4ykrpyhgkxwir1")))) (build-system meson-build-system) (native-inputs `(("pkg-config" ,pkg-config))) (inputs `(("cairo" ,cairo) -- cgit v1.2.3 From 90c7ea44cc82f6748957eeed88a22f6f11223ee0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 19 Feb 2019 15:12:18 +0100 Subject: gnu: grim: Don't use unstable tarball. * gnu/packages/image.scm (grim)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/image.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 1c1411ff77..9f25578050 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -1591,12 +1591,13 @@ identical visual appearance.") (version "1.1") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/emersion/grim/archive/v" version - ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/emersion/grim.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 "1zxj1p5rgrhcq88frq2ccc38b7v0hk22mvqwjs4ykrpyhgkxwir1")))) + (base32 "1bcvkggqszcwy6hg8g4mch3yr25ic0baafbd90af5s5mrhrjxxxz")))) (build-system meson-build-system) (native-inputs `(("pkg-config" ,pkg-config))) (inputs `(("cairo" ,cairo) -- cgit v1.2.3 From f2d3d7422b604d56b5f70dc7b69e37328ee4b35e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 19 Feb 2019 15:12:50 +0100 Subject: gnu: nip2: Update to 8.7.1. * gnu/packages/image-processing.scm (nip2): Update to 8.7.1. --- gnu/packages/image-processing.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index 233fea85af..a8968acba2 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -457,19 +457,19 @@ vision algorithms. It can be used to do things like: (define-public nip2 (package (name "nip2") - (version "8.7.0") + (version "8.7.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/libvips/nip2/releases/download/v" version "/nip2-" version ".tar.gz" )) (sha256 - (base32 "08dxfds4n1vxdilxcw01741a2r6fxyhawi656b7f0hy6znnkbsbc")))) + (base32 "0l7n427njif53npqn02gfjjly8y3khbrkzqxp10j5vp9h97psgiw")))) (build-system gnu-build-system) (arguments `(#:phases (modify-phases %standard-phases - ;; test_conv.ws keep failing so disabling for now + ;; test_conv.ws keep failing so disabling for now. (add-after 'unpack 'disable-test-conv (lambda _ (delete-file "test/workspaces/test_conv.ws") @@ -484,7 +484,7 @@ vision algorithms. It can be used to do things like: ("gtk+-2" ,gtk+-2) ("libxml2" ,libxml2) ("libexif" ,libexif) - ("libjpeg" ,libjpeg) ;required by vips.pc + ("libjpeg" ,libjpeg) ; required by vips.pc ("librsvg" ,librsvg) ("fftw" ,fftw) ("libgsf" ,libgsf) -- cgit v1.2.3 From 1c8ba10a0b39613907a21ef208e7d36b274325a4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 19 Feb 2019 15:31:58 +0100 Subject: gnu: java-jsch: Update to 0.1.55. * gnu/packages/java.scm (java-jsch): Update to 0.1.55. --- gnu/packages/java.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index a314dc9953..f1aab42be8 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2017, 2018 Julien Lepiller ;;; Copyright © 2017 Thomas Danckaert ;;; Copyright © 2016, 2017, 2018 Alex Vong -;;; Copyright © 2017 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 Gábor Boskovits ;;; Copyright © 2018 Chris Marusich ;;; Copyright © 2018 Efraim Flashner @@ -5236,18 +5236,18 @@ fundamental protocol access, not higher-level abstractions.") (define-public java-jsch (package (name "java-jsch") - (version "0.1.54") + (version "0.1.55") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/jsch/jsch/" version "/jsch-" version ".zip")) (sha256 (base32 - "029rdddyq1mh3ghryh3ki99kba1xkf1d1swjv2vi6lk6zzjy2wdb")))) + "1lxyjwvmwa723wcf3bqn816hkvc03vz4xhbsi7bvfhrz2rpgcfq6")))) (build-system ant-build-system) (arguments `(#:build-target "dist" - #:tests? #f ; no tests included + #:tests? #f ; no tests included #:phases (modify-phases %standard-phases (replace 'install (install-jars "dist"))))) -- cgit v1.2.3 From 853687cf8f5cabc3e21d87dc3a72450b313320fb Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 19 Feb 2019 11:03:19 +0100 Subject: gnu: uwsgi: Update to 2.0.18. * gnu/packages/web.scm (uwsgi): Update to 2.0.18. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 5b8543fac6..46dd31926b 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -3884,14 +3884,14 @@ a pure C99 library.") (define-public uwsgi (package (name "uwsgi") - (version "2.0.17.1") + (version "2.0.18") (source (origin (method url-fetch) (uri (string-append "https://projects.unbit.it/downloads/uwsgi-" version ".tar.gz")) (sha256 (base32 - "0xxjb9dyivq5531birvxq2gnyxf2x5q7gz54440acra6qwsq4cfj")))) + "10zmk4npknigmbqcq1wmhd461dk93159px172112vyq0i19sqwj9")))) (build-system gnu-build-system) (outputs '("out" "python")) (arguments -- cgit v1.2.3 From 5cfb647c524ce1afb5d45c25d7bdc9434ae997bf Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 19 Feb 2019 11:49:39 +0100 Subject: gnu: perl-test-www-mechanize-catalyst: Update to 0.62. * gnu/packages/web.scm (perl-test-www-mechanize-catalyst): Update to 0.62. --- gnu/packages/web.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 46dd31926b..d58eed5786 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -3517,15 +3517,14 @@ WWW::Mechanize that incorporates features for web application testing.") (define-public perl-test-www-mechanize-catalyst (package (name "perl-test-www-mechanize-catalyst") - (version "0.60") + (version "0.62") (source (origin (method url-fetch) - (uri (string-append "mirror://cpan/authors/id/J/JJ/JJNAPIORK/" + (uri (string-append "mirror://cpan/authors/id/M/MS/MSTROUT/" "Test-WWW-Mechanize-Catalyst-" version ".tar.gz")) (sha256 - (base32 - "0nhhfrrai3ndziz873vpa1j0vljjnib4wqafd6yyvkf58ad7v0lv")))) + (base32 "1cdc2q16vs6fb335pzaislz2rx1ph9acaxyp7v5hv9xbwwddwfqq")))) (build-system perl-build-system) (native-inputs `(("perl-catalyst-plugin-session" ,perl-catalyst-plugin-session) -- cgit v1.2.3 From a4fc80254a53b46b33f138d1009ddd044b8cb6be Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 10 Feb 2019 22:35:28 -0500 Subject: gnu: LibreOffice: Update to 6.1.5.2. * gnu/packages/libreoffice.scm (libreoffice): Update to 6.1.5.2. [source]: Remove obsolete Poppler patches. --- gnu/packages/libreoffice.scm | 36 +++--------------------------------- 1 file changed, 3 insertions(+), 33 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index b047c34a0b..cb18ded5c6 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -930,7 +930,7 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.") (define-public libreoffice (package (name "libreoffice") - (version "6.1.3.2") + (version "6.1.5.2") (source (origin (method url-fetch) @@ -940,7 +940,7 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.") (version-prefix version 3) "/libreoffice-" version ".tar.xz")) (sha256 (base32 - "0i4gf3qi16fg7dxq2l4vhkwh4f5lx7xd1ilpzcw26vccqkv3hvyl")) + "1wh8qhqkmb89nmfcb0w6iwpdzxwqr7c5kzxgpk4gy60xin6gwjgb")) (patches (append (list (origin ;; Support newer versions of Orcus and MDDS. These patches @@ -966,37 +966,7 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.") (file-name "libreoffice-mdds.patch") (sha256 (base32 - "0apbmammmp4pk473xiv5vk50r4c5gjvqzf9jkficksvz58q6114f"))) - ;; The Poppler API changed rapidly in the versions leading 0.72. - ;; Thus, we need several patches from upstream, each adapting to - ;; different Poppler changes since version 0.68. - (origin - (method url-fetch) - (uri (string-append "https://github.com/LibreOffice/core/commit/" - "1688a395d05125b83eac6cd5c43f0e3f2f66c491" - ".patch")) - (file-name "libreoffice-poppler-compat.patch") - (sha256 - (base32 - "0ia5avmj772mrgs6m4qqf01hs8hzpy3nafidj7w7gqx2zz2s5ih9"))) - (origin - (method url-fetch) - (uri (string-append "https://github.com/LibreOffice/core/commit/" - "5e8bdd9203dd642111c62a6668ee665a20d4ba19" - ".patch")) - (file-name "libreoffice-poppler-gbool.patch") - (sha256 - (base32 - "19kc74h5vnk48l2vny8zmm2lkxpwc7g8n9d3wwpg99748dvbmikd"))) - (origin - (method url-fetch) - (uri (string-append "https://github.com/LibreOffice/core/commit/" - "8ff41a26caf51544699863c89598d37d93dc1b21" - ".patch")) - (file-name "libreoffice-poppler-0.71.patch") - (sha256 - (base32 - "1dsd0gynjf7d6412dd2sx70xa2s8kld7ibyjdkwg5w9hhi2zxw2f")))) + "0apbmammmp4pk473xiv5vk50r4c5gjvqzf9jkficksvz58q6114f")))) (search-patches "libreoffice-boost.patch" "libreoffice-icu.patch" "libreoffice-glm.patch"))) -- cgit v1.2.3 From b742c0065645837f9675ca16b1ad21da89544477 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 17 Feb 2019 13:18:41 -0500 Subject: gnu: Add python-humanize. * gnu/packages/python-xyz.scm (python-humanize): New variable. --- gnu/packages/python-xyz.scm | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 8a8ae5f284..c18b1e954b 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11,7 +11,7 @@ ;;; Copyright © 2015, 2016 Christopher Allan Webber ;;; Copyright © 2015 Eric Dvorsak ;;; Copyright © 2015, 2016 David Thompson -;;; Copyright © 2015, 2016, 2017 Leo Famulari +;;; Copyright © 2015, 2016, 2017, 2019 Leo Famulari ;;; Copyright © 2015, 2017 Ben Woodcroft ;;; Copyright © 2015, 2016 Erik Edrosa ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner @@ -15039,3 +15039,24 @@ It features bit and byte granularity, easy debugging and testing, an easy-to-extend subclass system, and lots of primitive constructs to make your work easier.") (license license:expat))) + +(define-public python-humanize + (package + (name "python-humanize") + (version "0.5.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "humanize" version)) + (sha256 + (base32 + "06dvhm3k8lf2rayn1gxbd46y0fy1db26m3h9vrq7rb1ib08mfgx4")))) + (arguments + '(#:tests? #f)) ; tests not in pypi archive + (build-system python-build-system) + (home-page "https://github.com/jmoiron/humanize") + (synopsis "Print numerical information in a human-readable form") + (description "This package provides a Python module that displays numbers +and dates in \"human readable\" forms. For example, it would display +\"12345591313\" as \"12.3 billion\".") + (license license:expat))) -- cgit v1.2.3 From d5bbf66d71322fc9bc32adfeb41ab733ec47502b Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 17 Feb 2019 13:23:00 -0500 Subject: gnu: Add python-txaio. * gnu/packages/python-xyz.scm (python-txaio): New variable. --- gnu/packages/python-xyz.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index c18b1e954b..269090c764 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -15060,3 +15060,24 @@ make your work easier.") and dates in \"human readable\" forms. For example, it would display \"12345591313\" as \"12.3 billion\".") (license license:expat))) + +(define-public python-txaio + (package + (name "python-txaio") + (version "18.8.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "txaio" version)) + (sha256 + (base32 + "1zmpdph6zddgrnkkcykh6qk5s46l7s5mzfqrh82m4b5iffn61qv7")))) + (build-system python-build-system) + (propagated-inputs + `(("python-twisted" ,python-twisted) + ("python-six" ,python-six))) + (home-page "https://github.com/crossbario/txaio") + (synopsis "Compatibility layer between Python asyncio and Twisted") + (description "Txaio provides a compatibility layer between the Python +@code{asyncio} module and @code{Twisted}.") + (license license:expat))) -- cgit v1.2.3 From 68460fbb9dccf175c65a1be47f79ecaf763e9c00 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 17 Feb 2019 13:55:24 -0500 Subject: gnu: Add python-hyperlink. * gnu/packages/python-web.scm (python-hyperlink): New variable. --- gnu/packages/python-web.scm | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index dce8dd2ae9..052331cc44 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -12,7 +12,7 @@ ;;; Copyright © 2014, 2017 Eric Bavier ;;; Copyright © 2014, 2015 Mark H Weaver ;;; Copyright © 2015 Cyril Roelandt -;;; Copyright © 2015, 2016, 2017 Leo Famulari +;;; Copyright © 2015, 2016, 2017, 2019 Leo Famulari ;;; Copyright © 2016 Hartmut Goebel ;;; Copyright © 2016, 2017, 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2015, 2017 Ben Woodcroft @@ -2953,3 +2953,23 @@ underlies Mozilla Persona.") "This is a Python library for interacting with the Firefox Accounts ecosystem.") (license license:mpl2.0))) + +(define-public python-hyperlink + (package + (name "python-hyperlink") + (version "18.0.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "hyperlink" version)) + (sha256 + (base32 + "01m3y19arfqljksngy8grc966zdb4larysralb8cajzi8kvly6zh")))) + (build-system python-build-system) + (propagated-inputs + `(("python-idna" ,python-idna))) + (home-page "https://github.com/python-hyper/hyperlink") + (synopsis "Python module to create immutable URLs according to spec") + (description "This package provides a Python module to create immutable, and +correct URLs for Python according to RFCs 3986 and 3987.") + (license license:expat))) -- cgit v1.2.3 From e5ba2fe30abe7ed213caa34580ac66b7fc080939 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 17 Feb 2019 13:28:34 -0500 Subject: gnu: python-twisted: Update to 17.5.0 * gnu/packages/python-xyz.scm (python-twisted, python2-twisted): Update to 17.5.0. [propagated-inputs]: Add python-hyperlink. --- gnu/packages/python-xyz.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 269090c764..557a41bf28 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -9232,13 +9232,13 @@ format.") (define-public python-twisted (package (name "python-twisted") - (version "17.1.0") + (version "17.5.0") (source (origin (method url-fetch) (uri (pypi-uri "Twisted" version ".tar.bz2")) (sha256 (base32 - "1p245mg15hkxp7hy5cyq2fgvlgjkb4cg0gwkwd148nzy1bbi3wnv")))) + "1sh2h23nnizcdyrl2rn7zxijglikxwz7z7grqpvq496zy2aa967i")))) (build-system python-build-system) (arguments '(#:tests? #f)) ; FIXME: Some tests are failing. @@ -9250,6 +9250,7 @@ format.") (propagated-inputs `(("python-zope-interface" ,python-zope-interface) ("python-incremental" ,python-incremental) + ("python-hyperlink" ,python-hyperlink) ("python-constantly" ,python-constantly) ("python-automat" ,python-automat))) (home-page "https://twistedmatrix.com/") -- cgit v1.2.3 From 00adbac6d2b56fb3f61879292f5391aece80d749 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 17 Feb 2019 14:13:46 -0500 Subject: gnu: Add python-treq. * gnu/packages/python-web.scm (python-treq): New variable. --- gnu/packages/python-web.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 052331cc44..ec7f43945e 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -2973,3 +2973,29 @@ ecosystem.") (description "This package provides a Python module to create immutable, and correct URLs for Python according to RFCs 3986 and 3987.") (license license:expat))) + +(define-public python-treq + (package + (name "python-treq") + (version "18.6.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "treq" version)) + (sha256 + (base32 + "0j4zwq9p1c9piv1vc66nxcv9s6hdinf90jwkbsm91k14npv9zq4i")))) + (build-system python-build-system) + (propagated-inputs + `(("python-attrs" ,python-attrs) + ("python-idna" ,python-idna) + ("python-incremental" ,python-incremental) + ("python-requests" ,python-requests) + ("python-service-identity" ,python-service-identity) + ("python-twisted" ,python-twisted))) + (home-page "https://github.com/twisted/treq") + (synopsis "Requests-like API built on top of twisted.web's Agent") + (description "This package provides an HTTP library inspired by +@code{requests}} but written on top of Twisted's @code{Agents}. It offers a +high level API for making HTTP requests when using Twisted.") + (license license:expat))) -- cgit v1.2.3 From 0a90c7892646a121de02310501e4bbe439794efd Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 17 Feb 2019 14:16:24 -0500 Subject: gnu: Add python-hkdf. * gnu/packages/python-crypto.scm (python-hkdf): New variable. --- gnu/packages/python-crypto.scm | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index bcafd154e7..29e0ee5951 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015 Eric Dvorsak ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner -;;; Copyright © 2015, 2016, 2017 Leo Famulari +;;; Copyright © 2015, 2016, 2017, 2019 Leo Famulari ;;; Copyright © 2016, 2017 Marius Bakke ;;; Copyright © 2017 Ben Sturmfels ;;; Copyright © 2016 Sou Bunnbu @@ -996,3 +996,23 @@ relevant RFCs too.") (define-public python2-service-identity (package-with-python2 python-service-identity)) + +(define-public python-hkdf + (package + (name "python-hkdf") + (version "0.0.3") + (source + (origin + (method url-fetch) + (uri (pypi-uri "hkdf" version)) + (sha256 + (base32 + "1jhxk5vhxmxxjp3zj526ry521v9inzzl8jqaaf0ma65w6k332ak2")))) + (build-system python-build-system) + (native-inputs + `(("python-nose" ,python-nose))) + (home-page "https://github.com/casebeer/python-hkdf") + (synopsis "HMAC-based Extract-and-Expand Key Derivation Function (HKDF)") + (description "This package provides a Python implementation of the HMAC Key +Derivation function (HKDF) defined in RFC 5869.") + (license license:bsd-2))) -- cgit v1.2.3 From fc681a18f52635e4bd1dbc9e962e57930f0c7ad3 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 17 Feb 2019 14:16:39 -0500 Subject: gnu: Add python-spake2. * gnu/packages/python-crypto.scm (python-spake2): New variable. --- gnu/packages/python-crypto.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index 29e0ee5951..6ca82cb061 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -1016,3 +1016,23 @@ relevant RFCs too.") (description "This package provides a Python implementation of the HMAC Key Derivation function (HKDF) defined in RFC 5869.") (license license:bsd-2))) + +(define-public python-spake2 + (package + (name "python-spake2") + (version "0.8") + (source + (origin + (method url-fetch) + (uri (pypi-uri "spake2" version)) + (sha256 + (base32 + "1x16r7lrbklvfzbacb66qv9iiih6liq1y612dqh2chgf555n2yn1")))) + (build-system python-build-system) + (propagated-inputs + `(("python-hkdf" ,python-hkdf))) + (home-page "https://github.com/warner/python-spake2") + (synopsis "SPAKE2 password-authenticated key exchange in Python") + (description "This package provides a Python implementation of the SPAKE2 +Password-Authenticated Key Exchange algorithm.") + (license license:expat))) -- cgit v1.2.3 From 215f3db0e3c91bbe13db5a73b50e998c03cfbe7c Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 17 Feb 2019 14:29:30 -0500 Subject: gnu: Add python-txtorcon. * gnu/packages/python-crypto.scm (python-txtorcon): New variable. --- gnu/packages/python-crypto.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index 6ca82cb061..4338854574 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -1036,3 +1036,33 @@ Derivation function (HKDF) defined in RFC 5869.") (description "This package provides a Python implementation of the SPAKE2 Password-Authenticated Key Exchange algorithm.") (license license:expat))) + +(define-public python-txtorcon + (package + (name "python-txtorcon") + (version "19.0.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "txtorcon" version)) + (sha256 + (base32 + "0fxzhsc62bhmr730vj9pzallmw56gz6iykvl28a5agrycm0bfc9p")))) + (build-system python-build-system) + (arguments + ;; The tests fail immediately due to a missing file. Reported upstream: + ;; + `(#:tests? #f)) + (propagated-inputs + `(("python-automat" ,python-automat) + ("python-idna" ,python-idna) + ("python-incremental" ,python-incremental) + ("python-ipaddress" ,python-ipaddress) + ("python-service-identity" ,python-service-identity) + ("python-twisted" ,python-twisted) + ("python-zope-interface" ,python-zope-interface))) + (home-page "https://github.com/meejah/txtorcon") + (synopsis "Twisted-based Tor controller client") + (description "This package provides a Twisted-based Tor controller client, +with state-tracking and configuration abstractions.") + (license license:expat))) -- cgit v1.2.3 From 951c7093a1b7907eea891f0454da53262375037d Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 17 Feb 2019 14:59:59 -0500 Subject: gnu: Add python-autobahn. * gnu/packages/python-web.scm (python-autobahn): New variable. --- gnu/packages/python-web.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index ec7f43945e..839f48ce4f 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -56,6 +56,7 @@ #:use-module (gnu packages curl) #:use-module (gnu packages databases) #:use-module (gnu packages django) + #:use-module (gnu packages libffi) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages python-crypto) @@ -2999,3 +3000,32 @@ correct URLs for Python according to RFCs 3986 and 3987.") @code{requests}} but written on top of Twisted's @code{Agents}. It offers a high level API for making HTTP requests when using Twisted.") (license license:expat))) + +(define-public python-autobahn + (package + (name "python-autobahn") + (version "19.2.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "autobahn" version)) + (sha256 + (base32 + "1mm7j24ls01c7jb1ad5p5cpyxvzgydiyf8b04ihykh2v8g98j0x7")))) + (build-system python-build-system) + (arguments + ;; The tests fail to run: + ;; https://github.com/crossbario/autobahn-python/issues/1117 + `(#:tests? #f)) + (propagated-inputs + `(("python-cffi" ,python-cffi) + ("python-twisted" ,python-twisted) + ("python-txaio" ,python-txaio))) + (home-page "https://crossbar.io/autobahn/") + (synopsis "Web Application Messaging Protocol implementation") + (description "This package provides an implementation of the @dfn{Web Application +Messaging Protocol} (WAMP). WAMP connects components in distributed +applications using Publish and Subscribe (PubSub) and routed Remote Procedure +Calls (rRPC). It is ideal for distributed, multi-client and server applications +such as IoT applications or multi-user database-driven business applications.") + (license license:expat))) -- cgit v1.2.3 From c9b36f450b1c598174b03af19c35efc4bf1ee9e5 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 17 Feb 2019 15:44:56 -0500 Subject: gnu: Add magic-wormhole-mailbox-server. * gnu/packages/magic-wormhole.scm: New file. * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. --- gnu/packages/magic-wormhole.scm | 65 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 gnu/packages/magic-wormhole.scm (limited to 'gnu/packages') diff --git a/gnu/packages/magic-wormhole.scm b/gnu/packages/magic-wormhole.scm new file mode 100644 index 0000000000..b99ee7b113 --- /dev/null +++ b/gnu/packages/magic-wormhole.scm @@ -0,0 +1,65 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2019 Leo Famulari +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages magic-wormhole) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix licenses) + #:use-module (guix build-system python) + #:use-module (gnu packages python-crypto) + #:use-module (gnu packages python-web) + #:use-module (gnu packages python-xyz)) + +(define-public magic-wormhole-mailbox-server + (package + (name "magic-wormhole-mailbox-server") + (version "0.3.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "magic-wormhole-mailbox-server" version)) + (sha256 + (base32 + "1q6zhbx8fcpk7rchclm7yqcxdsc1x97hki2ji61sa544r5xvxv55")))) + (build-system python-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-tests + (lambda _ + ;; This test requires network access. + (substitute* "src/wormhole_mailbox_server/test/test_web.py" + (("test_log_http") "disabled_test_log_http")) + #t))))) + (native-inputs + `(("python-mock" ,python-mock))) + (propagated-inputs + `(("python-attrs" ,python-attrs) + ("python-autobahn" ,python-autobahn) + ("python-idna" ,python-idna) + ("python-service-identity" ,python-service-identity) + ("python-six" ,python-six) + ("python-treq" ,python-treq) + ("python-twisted" ,python-twisted))) + (home-page "https://github.com/warner/magic-wormhole-mailbox-server") + (synopsis "Magic-Wormhole central mailbox server") + (description "This package provides the main server that Magic-Wormhole +clients connect to. The server performs store-and-forward delivery for small +key-exchange and control messages. Bulk data is sent over a direct TCP +connection, or through a transit-relay.") + (license expat))) -- cgit v1.2.3 From 6924a2bdc59648b672944992bef02f411803eeb8 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 18 Feb 2019 23:57:09 -0500 Subject: gnu: Add magic-wormhole-transit-relay. * gnu/packages/magic-wormhole.scm (magic-wormhole-transit-relay): New variable. --- gnu/packages/magic-wormhole.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/magic-wormhole.scm b/gnu/packages/magic-wormhole.scm index b99ee7b113..0ff214a397 100644 --- a/gnu/packages/magic-wormhole.scm +++ b/gnu/packages/magic-wormhole.scm @@ -21,6 +21,7 @@ #:use-module (guix download) #:use-module (guix licenses) #:use-module (guix build-system python) + #:use-module (gnu packages check) #:use-module (gnu packages python-crypto) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz)) @@ -63,3 +64,42 @@ clients connect to. The server performs store-and-forward delivery for small key-exchange and control messages. Bulk data is sent over a direct TCP connection, or through a transit-relay.") (license expat))) + +(define-public magic-wormhole-transit-relay + (package + (name "magic-wormhole-transit-relay") + (version "0.1.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "magic-wormhole-transit-relay" version)) + (sha256 + (base32 + "11w5gdc6am2ph5rns60x0694sx4zrlzxj540jljhn5cmnbx1ngxi")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'install 'install-docs + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (docs (string-append out "/share/doc/magic-wormhole-transit-relay"))) + (for-each (lambda (file) + (install-file file docs)) + (find-files "docs/")) + #t)))))) + (native-inputs + `(("python-mock" ,python-mock) + ("python-pyflakes" ,python-pyflakes) + ("python-tox" ,python-tox))) + (propagated-inputs + `(("python-twisted" ,python-twisted))) + (home-page + "https://github.com/warner/magic-wormhole-transit-relay") + (synopsis "Magic-Wormhole relay server") + (description "This package provides the Magic-Wormhole Transit Relay +server, which helps clients establish bulk-data transit connections even when +both are behind NAT boxes. Each side makes a TCP connection to this server and +presents a handshake. Two connections with identical handshakes are glued +together, allowing them to pretend they have a direct connection.") + (license expat))) -- cgit v1.2.3 From a7db61a55dc4e369574e206a86f9e5721f4a890b Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 18 Feb 2019 23:58:21 -0500 Subject: gnu: Add Magic-Wormhole. * gnu/packages/magic-wormhole.scm (magic-wormhole): New variable. --- gnu/packages/magic-wormhole.scm | 55 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/magic-wormhole.scm b/gnu/packages/magic-wormhole.scm index 0ff214a397..bdfc1162b6 100644 --- a/gnu/packages/magic-wormhole.scm +++ b/gnu/packages/magic-wormhole.scm @@ -103,3 +103,58 @@ both are behind NAT boxes. Each side makes a TCP connection to this server and presents a handshake. Two connections with identical handshakes are glued together, allowing them to pretend they have a direct connection.") (license expat))) + +(define-public magic-wormhole + (package + (name "magic-wormhole") + (version "0.11.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "magic-wormhole" version)) + (sha256 + (base32 + "01fr4bi6kc6fz9n3c4qq892inrc3nf6p2djy65yvm7xkvdxncydf")))) + (build-system python-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + ;; XXX I can't figure out how to build the docs properly. + ;; https://debbugs.gnu.org/cgi/bugreport.cgi?bug=34515#101 + (add-after 'install 'install-docs + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (man (string-append out "/share/man/man1"))) + (install-file "docs/wormhole.1" man)) + #t))))) + (native-inputs + `(("python-mock" ,python-mock) + ;; XXX These are required for the test suite but end up being referenced + ;; by the built package. + ;; https://bugs.gnu.org/25235 + ("magic-wormhole-mailbox-server" ,magic-wormhole-mailbox-server) + ("magic-wormhole-transit-relay" ,magic-wormhole-transit-relay))) + (propagated-inputs + `(("python-autobahn" ,python-autobahn) + ("python-click" ,python-click) + ("python-hkdf" ,python-hkdf) + ("python-humanize" ,python-humanize) + ("python-pynacl" ,python-pynacl) + ("python-spake2" ,python-spake2) + ("python-tqdm" ,python-tqdm) + ("python-twisted" ,python-twisted) + ("python-txtorcon" ,python-txtorcon))) + (home-page "https://github.com/warner/magic-wormhole") + (synopsis "Securely transfer data between computers") + (description "Magic-Wormhole is a library and a command-line tool named +wormhole, which makes it possible to securely transfer arbitrary-sized files and +directories (or short pieces of text) from one computer to another. The two +endpoints are identified by using identical \"wormhole codes\": in general, the +sending machine generates and displays the code, which must then be typed into +the receiving machine. + +The codes are short and human-pronounceable, using a phonetically-distinct +wordlist. The receiving side offers tab-completion on the codewords, so usually +only a few characters must be typed. Wormhole codes are single-use and do not +need to be memorized.") + (license expat))) -- cgit v1.2.3 From c12b23469576fb1c3920120ef06b696daa30b855 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 15 Feb 2019 12:22:10 -0500 Subject: gnu: libgd: Fix CVE-2019-{6977,6978}. * gnu/packages/gd.scm (gd)[replacement]: New field. (gd/fixed): New variable. * gnu/packages/patches/gd-CVE-2019-6977.patch, gnu/packages/patches/gd-CVE-2019-6978.patch: New files. * gnu/local.mk (dist_patch_DATA): Add them. --- gnu/packages/gd.scm | 11 + gnu/packages/patches/gd-CVE-2019-6977.patch | 36 ++++ gnu/packages/patches/gd-CVE-2019-6978.patch | 301 ++++++++++++++++++++++++++++ 3 files changed, 348 insertions(+) create mode 100644 gnu/packages/patches/gd-CVE-2019-6977.patch create mode 100644 gnu/packages/patches/gd-CVE-2019-6978.patch (limited to 'gnu/packages') diff --git a/gnu/packages/gd.scm b/gnu/packages/gd.scm index a53a4f2c2f..c08c1f6758 100644 --- a/gnu/packages/gd.scm +++ b/gnu/packages/gd.scm @@ -39,6 +39,7 @@ (define-public gd (package (name "gd") + (replacement gd/fixed) ;; Note: With libgd.org now pointing to github.com, genuine old ;; tarballs are no longer available. Notably, versions 2.0.x are ;; missing. @@ -94,6 +95,16 @@ most common applications of GD involve website development.") "See COPYING file in the distribution.")) (properties '((cpe-name . "libgd"))))) +(define-public gd/fixed + (hidden-package + (package + (inherit gd) + (source (origin + (inherit (package-source gd)) + (patches (append (origin-patches (package-source gd)) + (search-patches "gd-CVE-2019-6977.patch" + "gd-CVE-2019-6978.patch")))))))) + (define-public perl-gd (package (name "perl-gd") diff --git a/gnu/packages/patches/gd-CVE-2019-6977.patch b/gnu/packages/patches/gd-CVE-2019-6977.patch new file mode 100644 index 0000000000..b21a8ac619 --- /dev/null +++ b/gnu/packages/patches/gd-CVE-2019-6977.patch @@ -0,0 +1,36 @@ +Fix CVE-2019-6977: + +https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-6977 + +Patch copied from Debian: + +https://salsa.debian.org/debian/libgd2/commit/2d7d3b68bb79843e5271a05543e996fd5a3a8cd1 + +Description: Heap-based buffer overflow in gdImageColorMatch +Origin: other, https://gist.github.com/cmb69/1f36d285eb297ed326f5c821d7aafced +Bug-PHP: https://bugs.php.net/bug.php?id=77270 +Bug-Debian: https://bugs.debian.org/920645 +Bug-Debian-Security: https://security-tracker.debian.org/tracker/CVE-2019-6977 +Forwarded: no +Author: "Christoph M. Becker" +Last-Update: 2019-02-01 + +At least some of the image reading functions may return images which +use color indexes greater than or equal to im->colorsTotal. We cater +to this by always using a buffer size which is sufficient for +`gdMaxColors` in `gdImageColorMatch()`. +--- + +--- a/src/gd_color_match.c ++++ b/src/gd_color_match.c +@@ -31,8 +31,8 @@ BGD_DECLARE(int) gdImageColorMatch (gdIm + return -4; /* At least 1 color must be allocated */ + } + +- buf = (unsigned long *)gdMalloc(sizeof(unsigned long) * 5 * im2->colorsTotal); +- memset (buf, 0, sizeof(unsigned long) * 5 * im2->colorsTotal ); ++ buf = (unsigned long *)gdMalloc(sizeof(unsigned long) * 5 * gdMaxColors); ++ memset (buf, 0, sizeof(unsigned long) * 5 * gdMaxColors ); + + for (x=0; x < im1->sx; x++) { + for( y=0; ysy; y++ ) { diff --git a/gnu/packages/patches/gd-CVE-2019-6978.patch b/gnu/packages/patches/gd-CVE-2019-6978.patch new file mode 100644 index 0000000000..69fc5056fc --- /dev/null +++ b/gnu/packages/patches/gd-CVE-2019-6978.patch @@ -0,0 +1,301 @@ +Fix CVE-2019-6978: + +https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-6978 + +Patch copied from upstream source repository: + +https://github.com/libgd/libgd/commit/553702980ae89c83f2d6e254d62cf82e204956d0 + +From 553702980ae89c83f2d6e254d62cf82e204956d0 Mon Sep 17 00:00:00 2001 +From: "Christoph M. Becker" +Date: Thu, 17 Jan 2019 11:54:55 +0100 +Subject: [PATCH] Fix #492: Potential double-free in gdImage*Ptr() + +Whenever `gdImage*Ptr()` calls `gdImage*Ctx()` and the latter fails, we +must not call `gdDPExtractData()`; otherwise a double-free would +happen. Since `gdImage*Ctx()` are void functions, and we can't change +that for BC reasons, we're introducing static helpers which are used +internally. + +We're adding a regression test for `gdImageJpegPtr()`, but not for +`gdImageGifPtr()` and `gdImageWbmpPtr()` since we don't know how to +trigger failure of the respective `gdImage*Ctx()` calls. + +This potential security issue has been reported by Solmaz Salimi (aka. +Rooney). +--- + src/gd_gif_out.c | 18 +++++++++++++++--- + src/gd_jpeg.c | 20 ++++++++++++++++---- + src/gd_wbmp.c | 21 ++++++++++++++++++--- + tests/jpeg/.gitignore | 1 + + tests/jpeg/CMakeLists.txt | 1 + + tests/jpeg/Makemodule.am | 3 ++- + tests/jpeg/jpeg_ptr_double_free.c | 31 +++++++++++++++++++++++++++++++ + 7 files changed, 84 insertions(+), 11 deletions(-) + create mode 100644 tests/jpeg/jpeg_ptr_double_free.c + +diff --git a/src/gd_gif_out.c b/src/gd_gif_out.c +index 298a581..d5a9534 100644 +--- a/src/gd_gif_out.c ++++ b/src/gd_gif_out.c +@@ -99,6 +99,7 @@ static void char_init(GifCtx *ctx); + static void char_out(int c, GifCtx *ctx); + static void flush_char(GifCtx *ctx); + ++static int _gdImageGifCtx(gdImagePtr im, gdIOCtxPtr out); + + + +@@ -131,8 +132,11 @@ BGD_DECLARE(void *) gdImageGifPtr(gdImagePtr im, int *size) + void *rv; + gdIOCtx *out = gdNewDynamicCtx(2048, NULL); + if (out == NULL) return NULL; +- gdImageGifCtx(im, out); +- rv = gdDPExtractData(out, size); ++ if (!_gdImageGifCtx(im, out)) { ++ rv = gdDPExtractData(out, size); ++ } else { ++ rv = NULL; ++ } + out->gd_free(out); + return rv; + } +@@ -220,6 +224,12 @@ BGD_DECLARE(void) gdImageGif(gdImagePtr im, FILE *outFile) + + */ + BGD_DECLARE(void) gdImageGifCtx(gdImagePtr im, gdIOCtxPtr out) ++{ ++ _gdImageGifCtx(im, out); ++} ++ ++/* returns 0 on success, 1 on failure */ ++static int _gdImageGifCtx(gdImagePtr im, gdIOCtxPtr out) + { + gdImagePtr pim = 0, tim = im; + int interlace, BitsPerPixel; +@@ -231,7 +241,7 @@ BGD_DECLARE(void) gdImageGifCtx(gdImagePtr im, gdIOCtxPtr out) + based temporary image. */ + pim = gdImageCreatePaletteFromTrueColor(im, 1, 256); + if(!pim) { +- return; ++ return 1; + } + tim = pim; + } +@@ -247,6 +257,8 @@ BGD_DECLARE(void) gdImageGifCtx(gdImagePtr im, gdIOCtxPtr out) + /* Destroy palette based temporary image. */ + gdImageDestroy( pim); + } ++ ++ return 0; + } + + +diff --git a/src/gd_jpeg.c b/src/gd_jpeg.c +index fc05842..96ef430 100644 +--- a/src/gd_jpeg.c ++++ b/src/gd_jpeg.c +@@ -117,6 +117,8 @@ static void fatal_jpeg_error(j_common_ptr cinfo) + exit(99); + } + ++static int _gdImageJpegCtx(gdImagePtr im, gdIOCtx *outfile, int quality); ++ + /* + * Write IM to OUTFILE as a JFIF-formatted JPEG image, using quality + * QUALITY. If QUALITY is in the range 0-100, increasing values +@@ -231,8 +233,11 @@ BGD_DECLARE(void *) gdImageJpegPtr(gdImagePtr im, int *size, int quality) + void *rv; + gdIOCtx *out = gdNewDynamicCtx(2048, NULL); + if (out == NULL) return NULL; +- gdImageJpegCtx(im, out, quality); +- rv = gdDPExtractData(out, size); ++ if (!_gdImageJpegCtx(im, out, quality)) { ++ rv = gdDPExtractData(out, size); ++ } else { ++ rv = NULL; ++ } + out->gd_free(out); + return rv; + } +@@ -253,6 +258,12 @@ void jpeg_gdIOCtx_dest(j_compress_ptr cinfo, gdIOCtx *outfile); + + */ + BGD_DECLARE(void) gdImageJpegCtx(gdImagePtr im, gdIOCtx *outfile, int quality) ++{ ++ _gdImageJpegCtx(im, outfile, quality); ++} ++ ++/* returns 0 on success, 1 on failure */ ++static int _gdImageJpegCtx(gdImagePtr im, gdIOCtx *outfile, int quality) + { + struct jpeg_compress_struct cinfo; + struct jpeg_error_mgr jerr; +@@ -287,7 +298,7 @@ BGD_DECLARE(void) gdImageJpegCtx(gdImagePtr im, gdIOCtx *outfile, int quality) + if(row) { + gdFree(row); + } +- return; ++ return 1; + } + + cinfo.err->emit_message = jpeg_emit_message; +@@ -328,7 +339,7 @@ BGD_DECLARE(void) gdImageJpegCtx(gdImagePtr im, gdIOCtx *outfile, int quality) + if(row == 0) { + gd_error("gd-jpeg: error: unable to allocate JPEG row structure: gdCalloc returns NULL\n"); + jpeg_destroy_compress(&cinfo); +- return; ++ return 1; + } + + rowptr[0] = row; +@@ -405,6 +416,7 @@ BGD_DECLARE(void) gdImageJpegCtx(gdImagePtr im, gdIOCtx *outfile, int quality) + jpeg_finish_compress(&cinfo); + jpeg_destroy_compress(&cinfo); + gdFree(row); ++ return 0; + } + + +diff --git a/src/gd_wbmp.c b/src/gd_wbmp.c +index f19a1c9..a49bdbe 100644 +--- a/src/gd_wbmp.c ++++ b/src/gd_wbmp.c +@@ -88,6 +88,8 @@ int gd_getin(void *in) + return (gdGetC((gdIOCtx *)in)); + } + ++static int _gdImageWBMPCtx(gdImagePtr image, int fg, gdIOCtx *out); ++ + /* + Function: gdImageWBMPCtx + +@@ -100,6 +102,12 @@ int gd_getin(void *in) + out - the stream where to write + */ + BGD_DECLARE(void) gdImageWBMPCtx(gdImagePtr image, int fg, gdIOCtx *out) ++{ ++ _gdImageWBMPCtx(image, fg, out); ++} ++ ++/* returns 0 on success, 1 on failure */ ++static int _gdImageWBMPCtx(gdImagePtr image, int fg, gdIOCtx *out) + { + int x, y, pos; + Wbmp *wbmp; +@@ -107,7 +115,7 @@ BGD_DECLARE(void) gdImageWBMPCtx(gdImagePtr image, int fg, gdIOCtx *out) + /* create the WBMP */ + if((wbmp = createwbmp(gdImageSX(image), gdImageSY(image), WBMP_WHITE)) == NULL) { + gd_error("Could not create WBMP\n"); +- return; ++ return 1; + } + + /* fill up the WBMP structure */ +@@ -123,11 +131,15 @@ BGD_DECLARE(void) gdImageWBMPCtx(gdImagePtr image, int fg, gdIOCtx *out) + + /* write the WBMP to a gd file descriptor */ + if(writewbmp(wbmp, &gd_putout, out)) { ++ freewbmp(wbmp); + gd_error("Could not save WBMP\n"); ++ return 1; + } + + /* des submitted this bugfix: gdFree the memory. */ + freewbmp(wbmp); ++ ++ return 0; + } + + /* +@@ -271,8 +283,11 @@ BGD_DECLARE(void *) gdImageWBMPPtr(gdImagePtr im, int *size, int fg) + void *rv; + gdIOCtx *out = gdNewDynamicCtx(2048, NULL); + if (out == NULL) return NULL; +- gdImageWBMPCtx(im, fg, out); +- rv = gdDPExtractData(out, size); ++ if (!_gdImageWBMPCtx(im, fg, out)) { ++ rv = gdDPExtractData(out, size); ++ } else { ++ rv = NULL; ++ } + out->gd_free(out); + return rv; + } +#diff --git a/tests/jpeg/.gitignore b/tests/jpeg/.gitignore +#index c28aa87..13bcf04 100644 +#--- a/tests/jpeg/.gitignore +#+++ b/tests/jpeg/.gitignore +#@@ -3,5 +3,6 @@ +# /jpeg_empty_file +# /jpeg_im2im +# /jpeg_null +#+/jpeg_ptr_double_free +# /jpeg_read +# /jpeg_resolution +diff --git a/tests/jpeg/CMakeLists.txt b/tests/jpeg/CMakeLists.txt +index 19964b0..a8d8162 100644 +--- a/tests/jpeg/CMakeLists.txt ++++ b/tests/jpeg/CMakeLists.txt +@@ -2,6 +2,7 @@ IF(JPEG_FOUND) + LIST(APPEND TESTS_FILES + jpeg_empty_file + jpeg_im2im ++ jpeg_ptr_double_free + jpeg_null + ) + +diff --git a/tests/jpeg/Makemodule.am b/tests/jpeg/Makemodule.am +index 7e5d317..b89e169 100644 +--- a/tests/jpeg/Makemodule.am ++++ b/tests/jpeg/Makemodule.am +@@ -2,7 +2,8 @@ if HAVE_LIBJPEG + libgd_test_programs += \ + jpeg/jpeg_empty_file \ + jpeg/jpeg_im2im \ +- jpeg/jpeg_null ++ jpeg/jpeg_null \ ++ jpeg/jpeg_ptr_double_free + + if HAVE_LIBPNG + libgd_test_programs += \ +diff --git a/tests/jpeg/jpeg_ptr_double_free.c b/tests/jpeg/jpeg_ptr_double_free.c +new file mode 100644 +index 0000000..df5a510 +--- /dev/null ++++ b/tests/jpeg/jpeg_ptr_double_free.c +@@ -0,0 +1,31 @@ ++/** ++ * Test that failure to convert to JPEG returns NULL ++ * ++ * We are creating an image, set its width to zero, and pass this image to ++ * `gdImageJpegPtr()` which is supposed to fail, and as such should return NULL. ++ * ++ * See also ++ */ ++ ++ ++#include "gd.h" ++#include "gdtest.h" ++ ++ ++int main() ++{ ++ gdImagePtr src, dst; ++ int size; ++ ++ src = gdImageCreateTrueColor(1, 10); ++ gdTestAssert(src != NULL); ++ ++ src->sx = 0; /* this hack forces gdImageJpegPtr() to fail */ ++ ++ dst = gdImageJpegPtr(src, &size, 0); ++ gdTestAssert(dst == NULL); ++ ++ gdImageDestroy(src); ++ ++ return gdNumFailures(); ++} +-- +2.20.1 + -- cgit v1.2.3 From 2e125ece093ef842ca017ffb146cbc5fa33f2f75 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Tue, 19 Feb 2019 22:37:02 +0100 Subject: gnu: pplacer: Remove the package, which is affected by a CVE on ocaml@4.01. This makes progress towards fixing . * gnu/packages/bioinformatics.scm (pplacer, pplacer-scripts): Remove variables. --- gnu/packages/bioinformatics.scm | 124 ---------------------------------------- 1 file changed, 124 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 69c85563e1..5dc3945035 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -4365,130 +4365,6 @@ interrupted by stop codons. OrfM finds and prints these ORFs.") (home-page "https://github.com/wwood/OrfM") (license license:lgpl3+))) -(define-public pplacer - (let ((commit "807f6f3")) - (package - (name "pplacer") - ;; The commit should be updated with each version change. - (version "1.1.alpha19") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/matsen/pplacer.git") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "11ppbbbx20p2g9wj3ff64dhnarb12q79v7qh4rk0gj6lkbz4n7cn")))) - (build-system ocaml-build-system) - (arguments - `(#:ocaml ,ocaml-4.01 - #:findlib ,ocaml4.01-findlib - #:modules ((guix build ocaml-build-system) - (guix build utils) - (ice-9 ftw)) - #:phases - (modify-phases %standard-phases - (delete 'configure) - (add-after 'unpack 'replace-bundled-cddlib - (lambda* (#:key inputs #:allow-other-keys) - (let* ((cddlib-src (assoc-ref inputs "cddlib-src")) - (local-dir "cddlib_guix")) - (mkdir local-dir) - (with-directory-excursion local-dir - (invoke "tar" "xvf" cddlib-src)) - (let ((cddlib-src-folder - (string-append local-dir "/" - (list-ref (scandir local-dir) 2) - "/lib-src"))) - (for-each make-file-writable (find-files "cdd_src" ".*")) - (for-each - (lambda (file) - (copy-file file - (string-append "cdd_src/" (basename file)))) - (find-files cddlib-src-folder ".*[ch]$"))) - #t))) - (add-after 'unpack 'fix-makefile - (lambda _ - ;; Remove system calls to 'git'. - (substitute* "Makefile" - (("^DESCRIPT:=pplacer-.*") - (string-append - "DESCRIPT:=pplacer-$(shell uname)-v" ,version "\n"))) - (substitute* "myocamlbuild.ml" - (("git describe --tags --long .*\\\" with") - (string-append - "echo -n v" ,version "-" ,commit "\" with"))) - #t)) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin"))) - (copy-recursively "bin" bin)) - #t))))) - (native-inputs - `(("zlib" ,zlib) - ("gsl" ,gsl) - ("ocaml-ounit" ,ocaml4.01-ounit) - ("ocaml-batteries" ,ocaml4.01-batteries) - ("ocaml-camlzip" ,ocaml4.01-camlzip) - ("ocaml-csv" ,ocaml4.01-csv) - ("ocaml-sqlite3" ,ocaml4.01-sqlite3) - ("ocaml-xmlm" ,ocaml4.01-xmlm) - ("ocaml-mcl" ,ocaml4.01-mcl) - ("ocaml-gsl" ,ocaml4.01-gsl) - ("cddlib-src" ,(package-source cddlib)))) - (propagated-inputs - `(("pplacer-scripts" ,pplacer-scripts))) - (synopsis "Phylogenetic placement of biological sequences") - (description - "Pplacer places query sequences on a fixed reference phylogenetic tree -to maximize phylogenetic likelihood or posterior probability according to a -reference alignment. Pplacer is designed to be fast, to give useful -information about uncertainty, and to offer advanced visualization and -downstream analysis.") - (home-page "http://matsen.fhcrc.org/pplacer") - (license license:gpl3)))) - -;; This package is installed alongside 'pplacer'. It is a separate package so -;; that it can use the python-build-system for the scripts that are -;; distributed alongside the main OCaml binaries. -(define pplacer-scripts - (package - (inherit pplacer) - (name "pplacer-scripts") - (build-system python-build-system) - (arguments - `(#:python ,python-2 - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'enter-scripts-dir - (lambda _ (chdir "scripts") #t)) - (replace 'check - (lambda _ (invoke "python" "-m" "unittest" "discover" "-v") #t)) - (add-after 'install 'wrap-executables - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin"))) - (let ((path (string-append - (assoc-ref inputs "hmmer") "/bin:" - (assoc-ref inputs "infernal") "/bin"))) - (display path) - (wrap-program (string-append bin "/refpkg_align.py") - `("PATH" ":" prefix (,path)))) - (let ((path (string-append - (assoc-ref inputs "hmmer") "/bin"))) - (wrap-program (string-append bin "/hrefpkg_query.py") - `("PATH" ":" prefix (,path))))) - #t))))) - (inputs - `(("infernal" ,infernal) - ("hmmer" ,hmmer))) - (propagated-inputs - `(("python-biopython" ,python2-biopython) - ("taxtastic" ,taxtastic))) - (synopsis "Pplacer Python scripts"))) - (define-public python2-pbcore (package (name "python2-pbcore") -- cgit v1.2.3 From 4982c0c98deecea0d4f69f14ea28cab53b5f2123 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Tue, 19 Feb 2019 22:59:06 +0100 Subject: gnu: ocaml@4.01: Remove the package, affected by a CVE, and its dependent packages. This makes progress towards fixing . * gnu/packages/ocaml.scm (ocaml-4.01, ocaml4.01-findlib, ocaml4.01-ounit, ocaml4.01-camlzip, ocaml4.01-qtest, ocaml4.01-bisect, ocaml4.01-sqlite3, ocaml4.01-csv, ocaml4.01-xmlm, ocaml4.01-batteries, ocaml4.01-gsl): Remove variables. (ocaml-batteries, ocaml-bisect)[properties]: Remove ocaml4.01-variant. * gnu/packages/machine-learning.scm (ocaml4.01-mcl): Remove variable. --- gnu/packages/machine-learning.scm | 3 - gnu/packages/ocaml.scm | 124 +------------------------------------- 2 files changed, 2 insertions(+), 125 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index b56468f8c1..34bcd82ad7 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -322,9 +322,6 @@ networks) based on simulation of (stochastic) flow in graphs.") algorithm.") (license license:gpl3))) -(define-public ocaml4.01-mcl - (package-with-ocaml4.01 ocaml-mcl)) - (define-public randomjungle (package (name "randomjungle") diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 5101cc6b0a..9a807a4cb6 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -234,45 +234,6 @@ functional, imperative and object-oriented styles of programming.") ;; distributed under lgpl2.0. (license (list license:qpl license:lgpl2.0)))) -(define-public ocaml-4.01 - (package - (inherit ocaml-4.02) - (version "4.01.0") - (source (origin - (method url-fetch) - (uri (string-append - "http://caml.inria.fr/pub/distrib/ocaml-" - (version-major+minor version) - "/ocaml-" version ".tar.xz")) - (sha256 - (base32 - "03d7ida94s1gpr3gadf4jyhmh5rrszd5s4m4z59daaib25rvfyv7")))) - (arguments - (substitute-keyword-arguments (package-arguments ocaml-4.02) - ((#:phases phases) - `(modify-phases ,phases - (replace 'build - (lambda _ - ;; Specifying '-j' at all causes the build to fail. - (invoke "make" "world.opt"))) - ,@(if (string=? "aarch64-linux" (%current-system)) - ;; Custom configure script doesn't recongnize aarch64. - '((replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (mandir (string-append out "/share/man"))) - (invoke "./configure" - "--prefix" out - "--mandir" mandir - "-host" "armv8l-unknown-linux-gnu"))))) - '()) - (replace 'check - (lambda _ - (with-directory-excursion "testsuite" - (invoke "make" "all" - (string-append - "TOPDIR=" (getcwd) "/.."))))))))))) - (define-public ocaml-4.07 (package (inherit ocaml-4.02) @@ -957,14 +918,6 @@ compilers that can directly deal with packages.") ("m4" ,m4) ("ocaml" ,ocaml-4.02))))) -(define-public ocaml4.01-findlib - (package - (inherit ocaml-findlib) - (name "ocaml4.01-findlib") - (native-inputs - `(("m4" ,m4) - ("ocaml" ,ocaml-4.01))))) - ;; note that some tests may hang for no obvious reason. (define-public ocaml-ounit (package @@ -990,9 +943,6 @@ compilers that can directly deal with packages.") other XUnit testing frameworks.") (license license:expat))) -(define-public ocaml4.01-ounit - (package-with-ocaml4.01 ocaml-ounit)) - (define-public ocaml4.02-ounit (package-with-ocaml4.02 ocaml-ounit)) @@ -1038,24 +988,6 @@ JAR format. It provides functions for reading from and writing to compressed files in these formats.") (license license:lgpl2.1+))) -(define-public ocaml4.01-camlzip - (let ((base (package-with-ocaml4.01 camlzip))) - (package - (inherit base) - (name "ocaml4.01-camlzip") - ;; Version 1.05 is the last version to support OCaml 4.01.0. - (version "1.05") - (source - (origin - (method url-fetch) - (uri - (string-append - "http://forge.ocamlcore.org/frs/download.php/1037/camlzip-" - version ".tar.gz")) - (sha256 - (base32 - "0syh72jk9s0qwjmmfrkqchaj98m020ii082jn38pwnmb6v3p02wk"))))))) - (define-public ocaml4.02-camlzip (package-with-ocaml4.02 camlzip)) @@ -1222,9 +1154,6 @@ qcheck library. The possibilities range from trivial tests -- extremely simple to use -- to sophisticated random generation of test cases.") (license license:lgpl3+))) -(define-public ocaml4.01-qtest - (package-with-ocaml4.01 ocaml-qtest)) - (define-public ocaml4.02-qtest (package-with-ocaml4.02 ocaml-qtest)) @@ -1301,39 +1230,9 @@ tests. After application execution, it is possible to generate a report in HTML format that is the replica of the application source code annotated with code coverage information.") (properties - `((ocaml4.01-variant . ,(delay ocaml4.01-bisect)) - (ocaml4.02-variant . ,(delay ocaml4.02-bisect)))) + `((ocaml4.02-variant . ,(delay ocaml4.02-bisect)))) (license license:gpl3+))) -(define-public ocaml4.01-bisect - (let ((base (package-with-ocaml4.01 (strip-ocaml4.01-variant ocaml-bisect)))) - (package - (inherit base) - (version "1.3") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/gasche/bisect/archive/" - version ".tar.gz")) - (file-name (string-append "ocaml-bisect-" version ".tar.gz")) - (sha256 - (base32 - "1ip49jqf0kkbrqf8qspmfjbg9ap9fhvjkg718myzix88dg5rv8d4")))) - (arguments - `(#:ocaml ,ocaml-4.01 - ,@(substitute-keyword-arguments (package-arguments ocaml-bisect) - ((#:make-flags flags) - `(list "all")) - ((#:phases phases) - `(modify-phases ,phases - (replace 'configure - (lambda* (#:key inputs outputs #:allow-other-keys) - (invoke "./configure" - "-ocaml-prefix" (assoc-ref inputs "ocaml")) - #t))))))) - (native-inputs `(,@(alist-delete "camlp4" (package-native-inputs base)))) - (propagated-inputs - `(,@(alist-delete "camlp4" (package-propagated-inputs base))))))) - (define-public ocaml4.02-bisect (let ((base (package-with-ocaml4.02 (strip-ocaml4.02-variant ocaml-bisect)))) (package @@ -1648,9 +1547,6 @@ coexistence with the old (version 2) SQLite and its OCaml wrapper @code{ocaml-sqlite}.") (license license:expat))) -(define-public ocaml4.01-sqlite3 - (package-with-ocaml4.01 ocaml-sqlite3)) - (define-public ocaml4.02-sqlite3 (package-with-ocaml4.02 ocaml-sqlite3)) @@ -1680,9 +1576,6 @@ read and write files in this format as well as some convenience functions to manipulate such data.") (license (package-license camlp4)))) -(define-public ocaml4.01-csv - (package-with-ocaml4.01 ocaml-csv)) - (define-public ocaml4.02-csv (package-with-ocaml4.02 ocaml-csv)) @@ -2191,9 +2084,6 @@ format. It can process XML documents without a complete in-memory representation of the data.") (license license:isc))) -(define-public ocaml4.01-xmlm - (package-with-ocaml4.01 ocaml-xmlm)) - (define-public ocaml4.02-xmlm (package-with-ocaml4.02 ocaml-xmlm)) @@ -2530,8 +2420,7 @@ many additional enhancements, including: (invoke "make" "all") #t))))) (properties - `((ocaml4.01-variant . ,(delay ocaml4.01-batteries)) - (ocaml4.02-variant . ,(delay ocaml4.02-batteries)))) + `((ocaml4.02-variant . ,(delay ocaml4.02-batteries)))) (home-page "http://batteries.forge.ocamlcore.org/") (synopsis "Development platform for the OCaml programming language") (description "Define a standard set of libraries which may be expected on @@ -2552,12 +2441,6 @@ hierarchy of modules.") "1a97w3x2l1jr5x9kj5gqm1x6b0q9fjqdcsvls7arnl3bvzgsia0n")))) (propagated-inputs '())))) -(define-public ocaml4.01-batteries - (let ((base (package-with-ocaml4.01 (strip-ocaml4.01-variant ocaml4.02-batteries)))) - (package - (inherit base) - (name "ocaml4.01-batteries")))) - (define-public ocaml-pcre (package (name "ocaml-pcre") @@ -4932,9 +4815,6 @@ Atom.") the OCaml language.") (license license:gpl3+))) -(define-public ocaml4.01-gsl - (package-with-ocaml4.01 ocaml-gsl)) - (define-public cubicle (package (name "cubicle") -- cgit v1.2.3 From 6b66e47052e859e3b36899e5b0a19e2adebde32f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 19 Feb 2019 15:52:10 +0100 Subject: gnu: javacc: Update to 7.0.4. * gnu/packages/java.scm (javacc): Update to 7.0.4. --- gnu/packages/java.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index f1aab42be8..8a695102e1 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2267,7 +2267,7 @@ debugging, etc.") (define-public javacc (package (inherit javacc-4) - (version "7.0.3") + (version "7.0.4") (source (origin (method url-fetch) (uri (string-append "https://github.com/javacc/javacc/" @@ -2275,14 +2275,14 @@ debugging, etc.") (file-name (string-append "javacc-" version ".tar.gz")) (sha256 (base32 - "111xc9mnmc5a6qz6x3xbhqc07y1lg2b996ggzw0hrblg42zya9xf")) + "0z7p9irwarc3avlcdyv9bd3zz57m1aawj8dr95wgxzg5z8fki8m6")) (modules '((guix build utils))) - ;; delete bundled jars + ;; Delete bundled jars. (snippet '(begin (for-each delete-file-recursively '("bootstrap" "lib")) #t)))) (arguments - `(#:make-flags ; bootstrap from javacc-4 + `(#:make-flags ; bootstrap from javacc-4 (list (string-append "-Dbootstrap-jar=" (assoc-ref %build-inputs "javacc") "/share/java/javacc.jar")) -- cgit v1.2.3 From ebf8048d1493b734e188cf5a1557002c961de319 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 19 Feb 2019 15:56:20 +0100 Subject: gnu: javacc: Don't use unstable tarball. * gnu/packages/java.scm (javacc)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/java.scm | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 8a695102e1..9747569009 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2268,19 +2268,20 @@ debugging, etc.") (package (inherit javacc-4) (version "7.0.4") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/javacc/javacc/" - "archive/" version ".tar.gz")) - (file-name (string-append "javacc-" version ".tar.gz")) - (sha256 - (base32 - "0z7p9irwarc3avlcdyv9bd3zz57m1aawj8dr95wgxzg5z8fki8m6")) - (modules '((guix build utils))) - ;; Delete bundled jars. - (snippet '(begin (for-each delete-file-recursively - '("bootstrap" "lib")) - #t)))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/javacc/javacc.git") + (commit version))) + (file-name (git-file-name "javacc" version)) + (sha256 + (base32 "18kkak3gda93gr25jrgy6q00g0jr8i24ri2wk4kybz1v234fxx9i")) + (modules '((guix build utils))) + ;; Delete bundled jars. + (snippet '(begin (for-each delete-file-recursively + '("bootstrap" "lib")) + #t)))) (arguments `(#:make-flags ; bootstrap from javacc-4 (list (string-append "-Dbootstrap-jar=" -- cgit v1.2.3 From 49093d759ce5b2b37b3410ed6128ea48c71e2c79 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 19 Feb 2019 16:22:35 +0100 Subject: gnu: libtermkey: Don't use NAME in source URI. * gnu/packages/terminals.scm (libtermkey)[source]: Hard-code NAME. --- gnu/packages/terminals.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 0a3d616ac3..c761a2dae3 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -312,8 +312,8 @@ multi-seat support, a replacement for @command{mingetty}, and more.") (version "0.20") (source (origin (method url-fetch) - (uri (string-append "http://www.leonerd.org.uk/code/" - name "/" name "-" version ".tar.gz")) + (uri (string-append "http://www.leonerd.org.uk/code/libtermkey/" + "libtermkey-" version ".tar.gz")) (sha256 (base32 "1xfj6lchhfljmbcl6dz8dpakppyy13nbl4ykxiv5x4dr9b4qf3bc")))) (build-system gnu-build-system) -- cgit v1.2.3 From 3351f42acfa1c3e0ebdf5538a8b873304bf20ade Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 19 Feb 2019 16:24:30 +0100 Subject: gnu: libtermkey: Update to 0.21. * gnu/packages/terminals.scm (libtermkey): Update to 0.21. --- gnu/packages/terminals.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index c761a2dae3..a9c19cdf82 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -309,20 +309,20 @@ multi-seat support, a replacement for @command{mingetty}, and more.") (define-public libtermkey (package (name "libtermkey") - (version "0.20") + (version "0.21") (source (origin (method url-fetch) (uri (string-append "http://www.leonerd.org.uk/code/libtermkey/" "libtermkey-" version ".tar.gz")) (sha256 - (base32 "1xfj6lchhfljmbcl6dz8dpakppyy13nbl4ykxiv5x4dr9b4qf3bc")))) + (base32 "0fzb5pvj139di02saffhy3ajchmksn1rs41kplkv2zjyjv7xbsvr")))) (build-system gnu-build-system) (arguments '(#:make-flags (list "CC=gcc" (string-append "PREFIX=" (assoc-ref %outputs "out"))) #:phases (modify-phases %standard-phases - (delete 'configure)) + (delete 'configure)) ; no configure script #:test-target "test")) (inputs `(("ncurses" ,ncurses))) (native-inputs `(("libtool" ,libtool) -- cgit v1.2.3 From ae67d70daa72f628cb06ccb2af5616f1876736d3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 19 Feb 2019 17:05:45 +0100 Subject: gnu: rng-tools: Update to 6.7. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/linux.scm (rng-tools): Update to 6.7. [arguments]: Add ‘--without-pkcs11’ to #:configure-flags to avoid a new dependeny on libp11. --- gnu/packages/linux.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 33ab24ad9c..c32f95b08e 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3699,7 +3699,7 @@ The collection contains a set of bandwidth and latency benchmark such as: (package (name "rng-tools") (home-page "https://github.com/nhorman/rng-tools") - (version "6.6") + (version "6.7") (source (origin (method git-fetch) (uri (git-reference (url home-page) @@ -3707,11 +3707,12 @@ The collection contains a set of bandwidth and latency benchmark such as: (file-name (git-file-name name version)) (sha256 (base32 - "0c32sxfvngdjzfmxn5ngc5yxwi8ij3yl216nhzyz9r31qi3m14v7")))) + "19f75m6mzg8h7b4snzg7d6ypvkz6nq32lrpi9ja95gqz4wsd18a5")))) (build-system gnu-build-system) (arguments `(;; Avoid using OpenSSL, curl, and libxml2, reducing the closure by 166 MiB. - #:configure-flags '("--without-nistbeacon"))) + #:configure-flags '("--without-nistbeacon" + "--without-pkcs11"))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) -- cgit v1.2.3 From cf0ea81579d7b95d09bf8033501dbb912ad7099d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 19 Feb 2019 17:11:06 +0100 Subject: gnu: kodi: Update to 18.1. * gnu/packages/kodi.scm (kodi): Update to 18.1. --- gnu/packages/kodi.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/kodi.scm b/gnu/packages/kodi.scm index 508ffaabca..776f9c970e 100644 --- a/gnu/packages/kodi.scm +++ b/gnu/packages/kodi.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2015 David Thompson ;;; Copyright © 2017 Marius Bakke ;;; Copyright © 2017 Oleg Pykhalov -;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 Efraim Flashner ;;; ;;; This file is part of GNU Guix. @@ -270,7 +270,7 @@ alternatives. In compilers, this can reduce the cascade of secondary errors.") (define-public kodi (package (name "kodi") - (version "18.0rc3") + (version "18.1") (source (origin (method git-fetch) (uri (git-reference @@ -279,7 +279,7 @@ alternatives. In compilers, this can reduce the cascade of secondary errors.") (file-name (git-file-name name version)) (sha256 (base32 - "0bwi4gwmwppjw6bf0zihyg42zwnd0imq0aw4xxsgnacqakhxzii0")) + "1w26aqvzxv4c70gcd1vw1pldapsc2xcacwq9b7dqx5m44j0zx1dc")) (patches (search-patches "kodi-skip-test-449.patch")) (snippet '(begin -- cgit v1.2.3 From 903deeea53a5fbe814357e71b65717873b166f9d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 19 Feb 2019 17:18:26 +0100 Subject: gnu: archivemount: Update to 0.8.12. * gnu/packages/linux.scm (archivemount): Update to 0.8.12. --- gnu/packages/linux.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index c32f95b08e..f7114e0925 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1839,15 +1839,14 @@ file system is as easy as logging into the server with an SSH client.") (define-public archivemount (package (name "archivemount") - (version "0.8.9") + (version "0.8.12") (source (origin (method url-fetch) (uri (string-append "http://www.cybernoia.de/software/archivemount/" "archivemount-" version ".tar.gz")) (sha256 - (base32 - "0v4si1ri6lhnq9q87gkx7fsh6lv6xz4bynknwndqncpvfp5cy1jg")))) + (base32 "12fb8fcmd1zwvfgzx4pay47md5cr2kgxcgq82cm6skmq75alfzi4")))) (build-system gnu-build-system) (inputs `(("fuse" ,fuse) ("libarchive" ,libarchive))) -- cgit v1.2.3 From c6d8817ec4f7ef7333d7bf7c9db93e4085cf43e9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 19 Feb 2019 17:19:25 +0100 Subject: gnu: archivemount: Use HTTPS home page. * * gnu/packages/linux.scm (archivemount)[source, home-page]: Use HTTPS. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index f7114e0925..8b86531196 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1843,7 +1843,7 @@ file system is as easy as logging into the server with an SSH client.") (source (origin (method url-fetch) - (uri (string-append "http://www.cybernoia.de/software/archivemount/" + (uri (string-append "https://www.cybernoia.de/software/archivemount/" "archivemount-" version ".tar.gz")) (sha256 (base32 "12fb8fcmd1zwvfgzx4pay47md5cr2kgxcgq82cm6skmq75alfzi4")))) @@ -1851,7 +1851,7 @@ file system is as easy as logging into the server with an SSH client.") (inputs `(("fuse" ,fuse) ("libarchive" ,libarchive))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.cybernoia.de/software/archivemount") + (home-page "https://www.cybernoia.de/software/archivemount.html") (synopsis "Tool for mounting archive files with FUSE") (description "archivemount is a FUSE-based file system for Unix variants, including Linux. Its purpose is to mount archives (i.e. tar, tar.gz, etc.) to a -- cgit v1.2.3 From 2b371f4dd5ddafa0786240b40408ef5c30d7a526 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 20 Feb 2019 09:05:30 +0200 Subject: gnu: Don't use the store path in the .desktop file. This fixes bug#30228. * gnu/packages/sync.scm (owncloud-client)[arguments]: Add a custom phase to substitute the executable name for the full path to the binary. Remove the 'patch-dot-desktop-files phase. --- gnu/packages/sync.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm index df9f3b0e16..450e7b767a 100644 --- a/gnu/packages/sync.scm +++ b/gnu/packages/sync.scm @@ -79,7 +79,13 @@ (substitute* "test/CMakeLists.txt" (("owncloud_add_test\\(Utility \"\"\\)" test) (string-append "#" test))) - #t))) + #t)) + (add-after 'unpack 'dont-embed-store-path + (lambda _ + (substitute* "src/common/utility_unix.cpp" + (("QCoreApplication::applicationFilePath\\()") "\"owncloud\"")) + #t)) + (delete 'patch-dot-desktop-files)) #:configure-flags '("-DUNIT_TESTING=ON" ;; build without qtwebkit, which causes the ;; package to FTBFS while looking for QWebView. -- cgit v1.2.3 From b6f69340bbbfe30c28488904c1d3bb9aceedf804 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 20 Feb 2019 09:06:09 +0200 Subject: gnu: owncloud-client: Update to 2.5.3.11470. * gnu/packages/sync.scm (owncloud-client): Update to 2.5.3.11470. --- gnu/packages/sync.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm index 450e7b767a..1aae3a8ed6 100644 --- a/gnu/packages/sync.scm +++ b/gnu/packages/sync.scm @@ -48,14 +48,14 @@ (define-public owncloud-client (package (name "owncloud-client") - (version "2.5.1.10973") + (version "2.5.3.11470") (source (origin (method url-fetch) (uri (string-append "https://download.owncloud.com/desktop/stable/" "owncloudclient-" version ".tar.xz")) (sha256 - (base32 "19x4rbnqg7f7hspz1xy86b1q51q1n5y7yvq8kqc1m64n2r2s3srk")) + (base32 "0cznis8qadsnlgm046lxn8vmbxli6zp4b8nk93n53mkfxlcw355n")) (patches (search-patches "owncloud-disable-updatecheck.patch")) (modules '((guix build utils))) (snippet -- cgit v1.2.3 From 20801f9da8cd8669837c4cf6dc633792be53a9f0 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 19 Feb 2019 11:20:02 +0200 Subject: gnu: Add micropython. * gnu/packages/python.scm (micropython): New variable. --- gnu/packages/python.scm | 62 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 1c4ea720f1..25f2ffa73c 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -459,3 +459,65 @@ instead of @command{python3}."))) (define-public python-wrapper (wrap-python3 python)) (define-public python-minimal-wrapper (wrap-python3 python-minimal)) + +(define-public micropython + (package + (name "micropython") + (version "1.10") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/micropython/micropython/" + "releases/download/v" version + "/micropython-" version ".tar.gz")) + (sha256 + (base32 + "1g1zjip3rkx6bp16qi1bag72wivnbh56fcsl3nffanrx4j5f4z90")) + (modules '((guix build utils))) + (snippet + '(begin + (delete-file-recursively "ports/cc3200/FreeRTOS") + (with-directory-excursion "lib" + ;; TODO: Unbundle axtls and berkley-db-1.xx + (for-each delete-file-recursively + '("libffi" "lwip" "stm32lib" "nrfx"))) + #t)))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'build 'preprare-build + (lambda _ + (chdir "ports/unix") + ;; see: https://github.com/micropython/micropython/pull/4246 + (substitute* "Makefile" + (("-Os") "-Os -ffp-contract=off")) + #t)) + (replace 'install-license-files + ;; We don't build in the root directory so the file isn't found. + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (dest (string-append out "/share/doc/" ,name "-" ,version "/"))) + (install-file "../../LICENSE" dest)) + #t)) + (delete 'configure)) ; no configure + #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")) + "V=1") + #:test-target "test")) + (native-inputs + `(("pkg-config" ,pkg-config) + ("python" ,python-wrapper))) + (inputs + `(("libffi" ,libffi))) + (home-page "https://micropython.org/") + (synopsis "Python implementation for microcontrollers and constrained systems") + (description "MicroPython is a lean and efficient implementation of the +Python 3 programming language that includes a small subset of the Python +standard library and is optimised to run on microcontrollers and in constrained +environments. MicroPython is packed full of advanced features such as an +interactive prompt, arbitrary precision integers, closures, list comprehension, +generators, exception handling and more. Still it is compact enough to fit and +run within just 256k of code space and 16k of RAM. MicroPython aims to be as +compatible with normal Python as possible to allow you to transfer code with +ease from the desktop to a microcontroller or embedded system.") + (license license:expat))) -- cgit v1.2.3 From e6a668ec7303a71f87e4c9354b1458e555058c63 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Wed, 20 Feb 2019 08:24:33 +0100 Subject: gnu: mesa: Update to 18.3.4. * gnu/packages/gl.scm (mesa): Update to 18.3.4. --- gnu/packages/gl.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index b673cbffe6..8a336a50f4 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2016 David Thompson ;;; Copyright © 2017, 2018 Efraim Flashner ;;; Copyright © 2017 Arun Isaac -;;; Copyright © 2017, 2018 Rutger Helling +;;; Copyright © 2017, 2018, 2019 Rutger Helling ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. @@ -221,7 +221,7 @@ also known as DXTn or DXTC) for Mesa.") (define-public mesa (package (name "mesa") - (version "18.3.1") + (version "18.3.4") (source (origin (method url-fetch) @@ -233,7 +233,7 @@ also known as DXTn or DXTC) for Mesa.") version "/mesa-" version ".tar.xz"))) (sha256 (base32 - "0qyw9dj2p9n91qzc4ylck2an7ibssjvzi2bjcpv2ajk851yq47sv")) + "01xv03ah4l5lcfx015n3fg1620dh4nbbv6gmhh6zhdsx6sj4sc9j")) (patches (search-patches "mesa-skip-disk-cache-test.patch")))) (build-system gnu-build-system) -- cgit v1.2.3 From bf6c8960c6094f8347c34ddbc7487877b35a5d25 Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Mon, 18 Feb 2019 21:45:42 -0600 Subject: gnu: r-lava: Update to 1.6.5. * gnu/packages/cran.scm (r-lava): Update to 1.6.5. Signed-off-by: Ricardo Wurmus --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 0d5717d98e..b71906a8f5 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2252,14 +2252,14 @@ available in a vignette.") (define-public r-lava (package (name "r-lava") - (version "1.6.4") + (version "1.6.5") (source (origin (method url-fetch) (uri (cran-uri "lava" version)) (sha256 (base32 - "0627cjlg55kzbzcy82w6wykmw2i57qhgfcabn2zy3ydfdswyxij1")))) + "13rlqdg42ylnz4hc932bl50xismrcr4d9ykcd9zs19cw5mckjx0f")))) (build-system r-build-system) (propagated-inputs `(("r-numderiv" ,r-numderiv) -- cgit v1.2.3 From e77c7210f002c27a6a05c65cbf4a918dbceaf237 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 20 Feb 2019 11:08:13 +0100 Subject: gnu: Add emacs-orgit. * gnu/packages/emacs-xyz.scm (emacs-orgit): New variable. --- gnu/packages/emacs-xyz.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 75fc974712..3afbcd6a95 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -13158,3 +13158,30 @@ opposed to character-based).") view of file listings sorted by size. Directory sizes are computed recursively. The results are cached for speed.") (license license:gpl3+))) + +(define-public emacs-orgit + (let ((commit "ddb830c38cb71e5cf86db7fa62d6ee88ab3962d5")) + (package + (name "emacs-orgit") + (version (git-version "1.5.1" "1" commit)) + (home-page "https://github.com/magit/orgit") + (source (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0fy4n71yskfkjl6w9mzrw3pfd5lp8f48g2c9bxiwg7mwzsmsb9nb")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-dash" ,emacs-dash) + ("emacs-magit" ,emacs-magit))) + (synopsis "Support for Org links to Magit buffers") + (description "This package defines several Org link types, which can be +used to link to certain Magit buffers. Use the command +@command{org-store-link} while such a buffer is current to store a link. +Later you can insert it into an Org buffer using the command +@code{org-insert-link}.") + (license license:gpl3+)))) -- cgit v1.2.3 From f81efdcbdb6cff0bd54b680df4c9e33f0df667e8 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 20 Feb 2019 16:12:58 +0100 Subject: gnu: emacs-helm-slime: Update to 0.2.0. * gnu/packages/emacs-xyz.scm (emacs-helm-slime): Update to 0.2.0. --- gnu/packages/emacs-xyz.scm | 41 ++++++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 21 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 3afbcd6a95..63e34d9921 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -12484,26 +12484,25 @@ correctly.") (license license:gpl2+)))) (define-public emacs-helm-slime - (let ((commit "bc4af154f2c18c8d9af968840f599d4c9974b668")) - (package - (name "emacs-helm-slime") - (version (git-version "0.0.1" "1" commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/emacs-helm/helm-slime") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0abfbzw1yaj9gscdxvvd3nf4h6krg6kyl5gpwgiyrq39x16pa9q2")))) - (build-system emacs-build-system) - (propagated-inputs - `(("emacs-helm" ,emacs-helm) - ("emacs-slime" ,emacs-slime))) - (home-page "https://github.com/emacs-helm/helm-slime") - (synopsis "Helm for SLIME, the Superior Lisp Interaction Mode for Emacs") - (description "Helm-SLIME defines a few new commands: + (package + (name "emacs-helm-slime") + (version "0.2.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/emacs-helm/helm-slime") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0vn93vv2wclnwq6f480z14jn9wfp0ylhp5dd48ycc9jicfsnxqfj")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-helm" ,emacs-helm) + ("emacs-slime" ,emacs-slime))) + (home-page "https://github.com/emacs-helm/helm-slime") + (synopsis "Helm for SLIME, the Superior Lisp Interaction Mode for Emacs") + (description "Helm-SLIME defines a few new commands: @itemize @item helm-slime-complete: Select a symbol from the SLIME completion systems. @@ -12511,7 +12510,7 @@ correctly.") @item: helm-slime-apropos: Yet another slime-apropos with Helm. @item helm-slime-repl-history: Select an input from the SLIME REPL history and insert it. @end itemize\n") - (license license:gpl3+)))) + (license license:gpl3+))) (define-public emacs-gtk-look (package -- cgit v1.2.3 From 266c97cb6d2e407ef284cca65fb40313de1de42c Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 20 Feb 2019 16:14:47 +0100 Subject: gnu: emacs-helm-eww: Update to 1.1. * gnu/packages/emacs-xyz.scm (emacs-helm-eww): Update to 1.1. --- gnu/packages/emacs-xyz.scm | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 63e34d9921..3dc75b6935 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -10672,27 +10672,26 @@ keep Parens and Indentation inline with one another.") (license license:gpl3+))) (define-public emacs-helm-eww - (let ((commit "9d36acc433bcf689598b1b4d7d47c9aeb84d6b44")) - (package - (name "emacs-helm-eww") - (version (git-version "0.1" "3" commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/emacs-helm/helm-eww.git") - (commit commit))) - (file-name (string-append name "-" version "-checkout")) - (sha256 - (base32 - "06gnf84gx6qbhcw1h5jhjnvcdxkdpv0npm53x3pgqybbll5rn5dy")))) - (propagated-inputs - `(("emacs-helm" ,emacs-helm))) - (build-system emacs-build-system) - (home-page "https://github.com/emacs-helm/helm-eww/") - (synopsis "Helm interface to EWW") - (description "This package provides a Helm interface for EWW buffers, + (package + (name "emacs-helm-eww") + (version "1.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/emacs-helm/helm-eww.git") + (commit version))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "0dvlp7y6kqc4azg5b7jx5lz2rwd0ia7y0y3hcj9y23zd88r73lg7")))) + (propagated-inputs + `(("emacs-helm" ,emacs-helm))) + (build-system emacs-build-system) + (home-page "https://github.com/emacs-helm/helm-eww/") + (synopsis "Helm interface to EWW") + (description "This package provides a Helm interface for EWW buffers, bookmarks and history.") - (license license:gpl3+)))) + (license license:gpl3+))) (define-public emacs-stumpwm-mode (let ((commit "8fbe071d2c6c040794060a354eb377218dc10b35") -- cgit v1.2.3 From 4727e69aa0672abcd328576becde77085f483522 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 20 Feb 2019 16:18:39 +0100 Subject: gnu: emacs-evil-collection: Update to 20190220. * gnu/packages/emacs-xyz.scm (emacs-evil-collection): Update to 20190220. --- gnu/packages/emacs-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 3dc75b6935..cedc1efbc8 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -5208,8 +5208,8 @@ extensions.") (license license:gpl3+))) (define-public emacs-evil-collection - (let ((commit "0cfdf4ecf0420aac2a9dd29ff7b54067c3433d71") - (revision "6")) + (let ((commit "e7b57aae0131634d0da5e599717a86c4b3ca6092") + (revision "7")) (package (name "emacs-evil-collection") (version (git-version "0.0.1" revision commit)) @@ -5221,7 +5221,7 @@ extensions.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "1igsvgxvij918myc397cjhfybmm11znc7961vnbcd5xlviq2p01y")))) + "1g7bxvgnsikpxxdimy0lymn3xz53fari048l827sjyw5kxi59d20")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-evil" ,emacs-evil))) -- cgit v1.2.3 From 799de4687f5bcd3bce3aa8a489ad8285cfe5b7bb Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 18 Feb 2019 18:39:18 +0100 Subject: gnu: OpenSSL: Remove obsolete code. * gnu/packages/tls.scm (openssl-next)[arguments]: Remove GCC4 workaround. --- gnu/packages/tls.scm | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index e9ee79e508..dc74cc738d 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -448,15 +448,7 @@ required structures.") "/share/openssl-" ,version) (string-append "--prefix=" out) - (string-append "-Wl,-rpath," lib) - - ;; XXX FIXME: Work around a code generation bug in GCC - ;; 4.9.3 on ARM when compiled with -mfpu=neon. See: - ;; - ,@(if (and (not (%current-target-system)) - (string-prefix? "armhf" (%current-system))) - '("-mfpu=vfpv3") - '()))))) + (string-append "-Wl,-rpath," lib))))) (delete 'move-man3-pages) (add-after 'install 'move-extra-documentation -- cgit v1.2.3 From c7f5c3ea20bfb5833ca0582674a266d0ff24956f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 18 Feb 2019 18:43:23 +0100 Subject: gnu: OpenSSL: Don't use NAME in source URI. --- gnu/packages/tls.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index dc74cc738d..c10b1a5320 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -277,10 +277,10 @@ required structures.") (uri (list (string-append "https://www.openssl.org/source/openssl-" version ".tar.gz") (string-append "ftp://ftp.openssl.org/source/" - name "-" version ".tar.gz") + "openssl-" version ".tar.gz") (string-append "ftp://ftp.openssl.org/source/old/" (string-trim-right version char-set:letter) - "/" name "-" version ".tar.gz"))) + "/openssl-" version ".tar.gz"))) (sha256 (base32 "003xh9f898i56344vpvpxxxzmikivxig4xwlm7vbi7m8n43qxaah")) @@ -409,10 +409,10 @@ required structures.") (uri (list (string-append "https://www.openssl.org/source/openssl-" version ".tar.gz") (string-append "ftp://ftp.openssl.org/source/" - name "-" version ".tar.gz") + "openssl-" version ".tar.gz") (string-append "ftp://ftp.openssl.org/source/old/" (string-trim-right version char-set:letter) - "/" name "-" version ".tar.gz"))) + "/openssl-" version ".tar.gz"))) (patches (search-patches "openssl-1.1-c-rehash-in.patch")) (sha256 (base32 -- cgit v1.2.3 From 2bf50977844f02e7c888a3a4222f0c900e1fbe01 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 20 Feb 2019 16:18:21 +0100 Subject: gnu: xmodmap: Update to 1.0.10. * gnu/packages/patches/xmodmap-asprintf.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/xorg.scm (xmodmap): Update to 1.0.10. [source](patches): Remove. [home-page]: Set to source repository. --- gnu/packages/patches/xmodmap-asprintf.patch | 14 -------------- gnu/packages/xorg.scm | 7 +++---- 2 files changed, 3 insertions(+), 18 deletions(-) delete mode 100644 gnu/packages/patches/xmodmap-asprintf.patch (limited to 'gnu/packages') diff --git a/gnu/packages/patches/xmodmap-asprintf.patch b/gnu/packages/patches/xmodmap-asprintf.patch deleted file mode 100644 index 6dfe8514e5..0000000000 --- a/gnu/packages/patches/xmodmap-asprintf.patch +++ /dev/null @@ -1,14 +0,0 @@ -This patch allows the 'asprintf' declaration to be visible, by -including , which defines _GNU_SOURCE. - - ---- xmodmap-1.0.7/xmodmap.c 2013-11-25 23:25:25.000000000 +0100 -+++ xmodmap-1.0.7/xmodmap.c 2013-11-25 23:25:27.000000000 +0100 -@@ -26,6 +26,7 @@ from The Open Group. - - */ - -+#include - #include - #include - #include diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 88598b2c35..5d3bbe3459 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -4061,7 +4061,7 @@ containing one glyph per cell.") (define-public xmodmap (package (name "xmodmap") - (version "1.0.9") + (version "1.0.10") (source (origin (method url-fetch) @@ -4071,15 +4071,14 @@ containing one glyph per cell.") ".tar.bz2")) (sha256 (base32 - "0y649an3jqfq9klkp9y5gj20xb78fw6g193f5mnzpl0hbz6fbc5p")) - (patches (search-patches "xmodmap-asprintf.patch")))) + "0z28331i2pm16x671fa9qwsfqdmr6a43bzwmp0dm17a3sx0hjgs7")))) (build-system gnu-build-system) (inputs `(("xorgproto" ,xorgproto) ("libx11" ,libx11))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "https://www.x.org/wiki/") + (home-page "https://gitlab.freedesktop.org/xorg/app/xmodmap") (synopsis "Modify keymaps and button mappings on X server") (description "Xmodmap is used to display and edit the keyboard modifier map and -- cgit v1.2.3 From bcc39dad9df9a794d0755da17705fc91bc62002a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 20 Feb 2019 16:19:38 +0100 Subject: gnu: xev: Update to 1.2.3. * gnu/packages/xorg.scm (xev): Update to 1.2.3. [home-page]: Set to source repository. --- gnu/packages/xorg.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 5d3bbe3459..5beb79809e 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -2328,7 +2328,7 @@ DRI (Direct Rendering Infrastructure) drivers.") (define-public xev (package (name "xev") - (version "1.2.2") + (version "1.2.3") (source (origin (method url-fetch) @@ -2338,7 +2338,7 @@ DRI (Direct Rendering Infrastructure) drivers.") ".tar.bz2")) (sha256 (base32 - "0krivhrxpq6719103r541xpi3i3a0y15f7ypc4lnrx8sdhmfcjnr")))) + "02ddsdx138g7szhwklpbzi0cxr34871iay3k28kdcihrz8f4zg36")))) (build-system gnu-build-system) (inputs `(("libxrender" ,libxrender) @@ -2347,7 +2347,7 @@ DRI (Direct Rendering Infrastructure) drivers.") ("libx11" ,libx11))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "https://www.x.org/wiki/") + (home-page "https://gitlab.freedesktop.org/xorg/app/xev") (synopsis "Print contents of X events") (description "XEv creates a window and then asks the X server to send it X11 -- cgit v1.2.3 From afee35bcfd4585161561588a065cf080093749f8 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 20 Feb 2019 16:20:10 +0100 Subject: gnu: xhost: Update to 1.0.8. * gnu/packages/xorg.scm (xhost): Update to 1.0.8. [home-page]: Set to source repository. --- gnu/packages/xorg.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 5beb79809e..7b4125d8c8 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -3648,7 +3648,7 @@ monitor via the X video mode extension.") (define-public xhost (package (name "xhost") - (version "1.0.7") + (version "1.0.8") (source (origin (method url-fetch) @@ -3658,7 +3658,7 @@ monitor via the X video mode extension.") ".tar.bz2")) (sha256 (base32 - "16n26xw6l01zq31d4qvsaz50misvizhn7iihzdn5f7s72pp1krlk")))) + "15n3mnd4i5kh4z32qv11580qjgvnng0wry2y753ljrqkkrbkrp52")))) (build-system gnu-build-system) (inputs `(("libxmu" ,libxmu) @@ -3666,7 +3666,7 @@ monitor via the X video mode extension.") ("libx11" ,libx11))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "https://www.x.org/wiki/") + (home-page "https://gitlab.freedesktop.org/xorg/app/xhost") (synopsis "Xorg server access control utility") (description "XHost is used to manage the list of host names or user names -- cgit v1.2.3 From f73fb79c806ae4f6ac06371751c0fb646b77b1e3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 20 Feb 2019 16:20:53 +0100 Subject: gnu: xlsatoms: Update to 1.1.3. * gnu/packages/xorg.scm (xlsatoms): Update to 1.1.3. [home-page]: Set to source repository. --- gnu/packages/xorg.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 7b4125d8c8..61c4c94593 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -3913,7 +3913,7 @@ programs that have displayed undesired windows on a user's screen.") (define-public xlsatoms (package (name "xlsatoms") - (version "1.1.2") + (version "1.1.3") (source (origin (method url-fetch) @@ -3923,13 +3923,13 @@ programs that have displayed undesired windows on a user's screen.") ".tar.bz2")) (sha256 (base32 - "196yjik910xsr7dwy8daa0amr0r22ynfs360z0ndp9mx7mydrra7")))) + "10m3a046jvaw5ywx4y65kl84lsxqan70gww1g1r7cf96ijaqz1jp")))) (build-system gnu-build-system) (inputs `(("libxcb" ,libxcb))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "https://www.x.org/wiki/") + (home-page "https://gitlab.freedesktop.org/xorg/app/xlsatoms") (synopsis "List interned X server atoms") (description "XLsAtoms is used to list the interned atoms defined on X server.") -- cgit v1.2.3 From ca1d735c54b6eb3c09a0ebe7ece207f0dd653402 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 20 Feb 2019 16:21:20 +0100 Subject: gnu: xrdb: Update to 1.2.0. * gnu/packages/xorg.scm (xrdb): Update to 1.2.0. [home-page]: Set to source repository. --- gnu/packages/xorg.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 61c4c94593..044f4d715e 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -4210,7 +4210,7 @@ and Reflect (RandR) extension.") (define-public xrdb (package (name "xrdb") - (version "1.1.1") + (version "1.2.0") (source (origin (method url-fetch) @@ -4220,14 +4220,14 @@ and Reflect (RandR) extension.") ".tar.bz2")) (sha256 (base32 - "1dqp486nd5sagbg572kl0k839nwvpqnb7jvppyb7jj5vrpkss8rd")))) + "0ik9gh6363c47pr0dp7q22nfs8vmavjg2v4bsr0604ppl77nafpj")))) (build-system gnu-build-system) (inputs `(("libxmu" ,libxmu) ("libx11" ,libx11))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "https://www.x.org/wiki/") + (home-page "https://gitlab.freedesktop.org/xorg/app/xrdb") (synopsis "X server resource database utility") (description "XRDB is used to get or set the contents of the RESOURCE_MANAGER -- cgit v1.2.3 From 7bc7eda4b955f63ad22502015d07ec8a275cd958 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 20 Feb 2019 16:21:47 +0100 Subject: gnu: xvinfo: Update to 1.1.4. * gnu/packages/xorg.scm (xvinfo): Update to 1.1.4. [home-page]: Set to source repository. --- gnu/packages/xorg.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 044f4d715e..02586baa2c 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -4353,7 +4353,7 @@ libICE, the X font server, and related components.") (define-public xvinfo (package (name "xvinfo") - (version "1.1.3") + (version "1.1.4") (source (origin (method url-fetch) @@ -4363,7 +4363,7 @@ libICE, the X font server, and related components.") ".tar.bz2")) (sha256 (base32 - "1sz5wqhxd1fqsfi1w5advdlwzkizf2fgl12hdpk66f7mv9l8pflz")))) + "0gz7fvxavqlrqynpfbrm2nc9yx8h0ksnbnv34fj7n1q6cq6j4lq3")))) (build-system gnu-build-system) (inputs `(("libxext" ,libxext) @@ -4371,7 +4371,7 @@ libICE, the X font server, and related components.") ("libx11" ,libx11))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "https://www.x.org/wiki/") + (home-page "https://gitlab.freedesktop.org/xorg/app/xvinfo") (synopsis "Print out X-Video extension adaptor information") (description "XVInfo is used to print out the capabilities of any video adaptors -- cgit v1.2.3 From 78b2eb1ad3dcf05c25e0ee4980c97aa52de03a2d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 20 Feb 2019 16:22:14 +0100 Subject: gnu: xclock: Update to 1.0.8. * gnu/packages/xorg.scm (xclock): Update to 1.0.8. [home-page]: Set to source repository. --- gnu/packages/xorg.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 02586baa2c..fcfb500854 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -5723,14 +5723,14 @@ Intrinsics (Xt) Library.") (define-public xclock (package (name "xclock") - (version "1.0.7") + (version "1.0.8") (source (origin (method url-fetch) (uri (string-append "https://www.x.org/releases/individual/app/" name "-" version ".tar.bz2")) (sha256 - (base32 "1l3xv4bsca6bwxx73jyjz0blav86i7vwffkhdb1ac81y9slyrki3")))) + (base32 "0m92zhamh15my9f2rqa14q41d6k2cn468azm3g7g3w9n7942024k")))) (build-system gnu-build-system) (arguments `(#:configure-flags @@ -5745,7 +5745,7 @@ Intrinsics (Xt) Library.") ("libxkbfile" ,libxkbfile))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "https://www.x.org/") + (home-page "https://gitlab.freedesktop.org/xorg/app/xclock") (synopsis "Analog / digital clock for X") (description "The xclock program displays the time in analog or digital form.") -- cgit v1.2.3 From 636fb7cb1e22e46b71e0b1ceb3b59d1db225fe62 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 15 Feb 2019 14:35:54 +0100 Subject: gnu: xorg-server: Use the regular Python for building. * gnu/packages/xorg.scm (xorg-server)[native-inputs]: Change PYTHON-MINIMAL-WRAPPER to PYTHON-WRAPPER. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index b286048b10..c194ff3972 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -5145,8 +5145,8 @@ over Xlib, including: ("xcb-util-renderutil" ,xcb-util-renderutil) ("xcb-util-wm" ,xcb-util-wm))) (native-inputs - `(("python" ,python-minimal-wrapper) - ("pkg-config" ,pkg-config))) + `(("python" ,python-wrapper) + ("pkg-config" ,pkg-config))) (arguments `(#:parallel-tests? #f #:configure-flags -- cgit v1.2.3 From ec47c07d0690653be35a75b346f3c3548a3e71d4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 24 Oct 2018 15:26:10 +0200 Subject: gnu: librsvg: Update to 2.44.12. * gnu/packages/gnome.scm (librsvg): Update to 2.44.12. [arguments]: Replace patching phases with custom variants. Delete five new tests. [native-inputs]: Add RUST-1.27 and RUST-1.27:CARGO. --- gnu/packages/gnome.scm | 41 ++++++++++++++++++++++++++++++++--------- 1 file changed, 32 insertions(+), 9 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 45fdf1ecf9..ac421c8d07 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -33,6 +33,7 @@ ;;; Copyright © 2018 Vasile Dumitrascu ;;; Copyright © 2018 Björn Höfling ;;; Copyright © 2018, 2019 Timothy Sample +;;; Copyright © 2019 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -127,6 +128,7 @@ #:use-module (gnu packages rdesktop) #:use-module (gnu packages readline) #:use-module (gnu packages ruby) + #:use-module (gnu packages rust) #:use-module (gnu packages samba) #:use-module (gnu packages scanner) #:use-module (gnu packages selinux) @@ -1300,7 +1302,7 @@ dealing with different structured file formats.") (define-public librsvg (package (name "librsvg") - (version "2.40.20") + (version "2.44.12") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -1308,11 +1310,22 @@ dealing with different structured file formats.") name "-" version ".tar.xz")) (sha256 (base32 - "0ay9himvw1l1swcf3h1312d2iqzfl65kpbfgiyfykgvq7cydvx6g")))) + "1h3qnqhr0l7pd2bxg69ki6ckl4srdwgr471dpp4jq9i4784hp0v6")))) (build-system gnu-build-system) (arguments - `(#:phases + `(#:make-flags '("CC=gcc") + #:phases (modify-phases %standard-phases + ;; Don't patch anything in vendor/ to avoid having to recompute + ;; checksums for the bundled Cargo "crates". TODO: Unbundle those. + (delete 'patch-source-shebangs) + (delete 'patch-generated-file-shebangs) + (delete 'patch-usr-bin-file) + (add-before 'configure 'patch-all-the-things + (lambda _ + (for-each patch-shebang '("tap-driver.sh" "tap-test")) + (patch-/usr/bin/file "configure") + #t)) (add-before 'configure 'pre-configure (lambda* (#:key inputs #:allow-other-keys) (substitute* "gdk-pixbuf-loader/Makefile.in" @@ -1326,22 +1339,32 @@ dealing with different structured file formats.") (("gdk_pixbuf_cache_file = .*$") "gdk_pixbuf_cache_file = $(TMPDIR)/loaders.cache\n")) #t)) - (add-after 'unpack 'remove-failing-tests + (add-before 'check 'remove-failing-tests (lambda _ (with-directory-excursion "tests/fixtures/reftests" (for-each delete-file - '(;; This test fails on i686: + '(;; The images produced by these tests differ slightly + ;; from their reference counterparts due to differences + ;; in the build environment (missing fonts, etc). See + ;; for details. + ;; These fail on x86_64. + "svg1.1/coords-viewattr-02-b.svg" + "svg1.1/filters-composite-04-f.svg" + "svg1.1/filters-image-01-b.svg" + "svg1.1/filters-conv-02-f.svg" + "svg1.1/filters-conv-04-f.svg" + ;; This test fails on i686: "svg1.1/masking-path-04-b.svg" - "svg1.1/masking-path-04-b-ref.png" ;; This test fails on armhf: "svg1.1/masking-mask-01-b.svg" - "svg1.1/masking-mask-01-b-ref.png" ;; This test fails on aarch64: - "bugs/777834-empty-text-children.svg" - "bugs/777834-empty-text-children-ref.png"))) + "bugs/777834-empty-text-children.svg"))) #t))))) (native-inputs `(("pkg-config" ,pkg-config) + ;; This is the minimum supported Rust version in Librsvg 2.44. + ("rust" ,rust-1.27) + ("cargo" ,rust-1.27 "cargo") ("glib" ,glib "bin") ; glib-mkenums, etc. ("gobject-introspection" ,gobject-introspection))) ; g-ir-compiler, etc. (inputs -- cgit v1.2.3 From ce325754c5fac0d93ebee09a34c7e488e1413608 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 20 Feb 2019 16:24:08 +0100 Subject: gnu: libfontenc: Update to 1.1.4. * gnu/packages/xorg.scm (libfontenc): Update to 1.1.4. [home-page]: Set to source repository. --- gnu/packages/xorg.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index c194ff3972..8808c4bd2a 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -1084,7 +1084,7 @@ synchronization between the X server and direct-rendering clients.") (define-public libfontenc (package (name "libfontenc") - (version "1.1.3") + (version "1.1.4") (source (origin (method url-fetch) @@ -1094,14 +1094,14 @@ synchronization between the X server and direct-rendering clients.") ".tar.bz2")) (sha256 (base32 - "08gxmrhgw97mv0pvkfmd46zzxrn6zdw4g27073zl55gwwqq8jn3h")))) + "0y90170dp8wsidr1dzza0grxr1lfh30ji3b5vkjz4j6x1n0wxz1c")))) (build-system gnu-build-system) (inputs `(("zlib" ,zlib) ("xorgproto" ,xorgproto))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "https://www.x.org/wiki/") + (home-page "https://gitlab.freedesktop.org/xorg/lib/libfontenc") (synopsis "Xorg font encoding library") (description "Xorg font encoding library.") (license license:x11))) -- cgit v1.2.3 From 64766d5cafd5cf19189ed274eb7e29ef784f90de Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 20 Feb 2019 17:04:39 +0100 Subject: gnu: mesa: Build against LLVM 7. * gnu/packages/gl.scm (mesa)[inputs]: Change LLVM-6 to LLVM. --- gnu/packages/gl.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index f04fbcf73b..8a336a50f4 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -257,7 +257,7 @@ also known as DXTn or DXTC) for Mesa.") ("libxvmc" ,libxvmc) ,@(match (%current-system) ((or "x86_64-linux" "i686-linux") - `(("llvm" ,llvm-6))) ;TODO: Change to LLVM in the next rebuild cycle. + `(("llvm" ,llvm))) (_ `())) ("makedepend" ,makedepend) -- cgit v1.2.3