From c3945380d9953dd99dc444c90fdba47988ebe9a0 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 10 Mar 2020 22:01:00 +0100 Subject: [PATCH 01/78] gnu: asymptote: Update to 2.64. * gnu/packages/plotutils.scm (asymptote): Update to 2.64. --- gnu/packages/plotutils.scm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm index f71e2824f1..7a7f30e255 100644 --- a/gnu/packages/plotutils.scm +++ b/gnu/packages/plotutils.scm @@ -194,14 +194,14 @@ (define-public ploticus (define-public asymptote (package (name "asymptote") - (version "2.62") - (source (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/asymptote/" - version "/asymptote-" version ".src.tgz")) - (sha256 - (base32 - "0510vnlpfyrvshsxr5lh3klwyhmn2cf4ba1ja476mbv5dcqqbc30")))) + (version "2.64") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/asymptote/" + version "/asymptote-" version ".src.tgz")) + (sha256 + (base32 "1x4nmzklzd2xfmm03mgnpg0345dwrwr5czk9gkfl5sx7x1cgx4c0")))) (build-system gnu-build-system) ;; Note: The 'asy' binary retains a reference to docdir for use with its ;; "help" command in interactive mode, so adding a "doc" output is not From 9dd7082c48c3b3a3f90db974a36dafcac95c5be2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 10 Mar 2020 20:08:40 +0100 Subject: [PATCH 02/78] gnu: openmpi: Update to 4.0.3. * gnu/packages/mpi.scm (openmpi): Update to 4.0.3. --- gnu/packages/mpi.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm index fc4950f519..91545f5296 100644 --- a/gnu/packages/mpi.scm +++ b/gnu/packages/mpi.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2016 Andreas Enge ;;; Copyright © 2017 Dave Love ;;; Copyright © 2017 Efraim Flashner -;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018 Paul Garlick ;;; Copyright © 2019 Ricardo Wurmus ;;; @@ -169,7 +169,7 @@ (define-public hwloc (define-public openmpi (package (name "openmpi") - (version "4.0.2") + (version "4.0.3") (source (origin (method url-fetch) @@ -177,7 +177,7 @@ (define-public openmpi (version-major+minor version) "/downloads/openmpi-" version ".tar.bz2")) (sha256 - (base32 "0ms0zvyxyy3pnx9qwib6zaljyp2b3ixny64xvq3czv3jpr8zf2wh")) + (base32 "00zxcw99gr5n693cmcmn4f6a47vx1ywna895p0x7p163v37gw0hl")) (patches (search-patches "openmpi-mtl-priorities.patch")))) (build-system gnu-build-system) (inputs From f9a69e9baed0e9fd5cbf4ed34c63d655a8a530bb Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 22:14:45 +0100 Subject: [PATCH 03/78] gnu: openmpi: Use HTTPS home page. * gnu/packages/mpi.scm (openmpi)[home-page]: Use HTTPS. --- gnu/packages/mpi.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm index 91545f5296..ec0684168e 100644 --- a/gnu/packages/mpi.scm +++ b/gnu/packages/mpi.scm @@ -264,7 +264,7 @@ (define-public openmpi (let ((out (assoc-ref outputs "out"))) (for-each delete-file (find-files out "config.log")) #t)))))) - (home-page "http://www.open-mpi.org") + (home-page "https://www.open-mpi.org") (synopsis "MPI-3 implementation") (description "The Open MPI Project is an MPI-3 implementation that is developed and From 6048241f10210c79925ca40b75c8697d2b2a5848 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 10 Mar 2020 21:47:38 +0100 Subject: [PATCH 04/78] gnu: hplip: Update source hash. The tarball was modified in-place. See . * gnu/packages/cups.scm (hplip)[source]: Update tarball hash. Reported-by: Mark H Weaver --- gnu/packages/cups.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index 953b9a9577..66f7085741 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -427,7 +427,7 @@ (define-public hplip "/hplip-" version ".tar.gz")) (sha256 (base32 - "1hkiyj29vzmz14cy68g94i617ymxinzvjvcsfdd78kcbd1s9vi4h")) + "00vcbpnp478l2v61mlxb4kr6q3gzkxspm4lwfky39f6ck72pqxb7")) (modules '((guix build utils))) (patches (search-patches "hplip-remove-imageprocessor.patch")) (snippet From e4c60dcfb2cbd3988a0c31e68004a91c0d09210d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 01:39:45 +0100 Subject: [PATCH 05/78] gnu: tlp: Use HTTPS home page. * gnu/packages/linux.scm (tlp)[home-page]: Use HTTPS. --- gnu/packages/linux.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 489cd55e6e..b6048a8cfb 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -5420,7 +5420,7 @@ (define (sbin-directory input-name) "wireless-tools")))))) bin-files) #t)))))) - (home-page "http://linrunner.de/en/tlp/tlp.html") + (home-page "https://linrunner.de/en/tlp/tlp.html") (synopsis "Power management tool for Linux") (description "TLP is a power management tool for Linux. It comes with a default configuration already optimized for battery life. Nevertheless, From a8a8a3df304143b7f5f369b5ce2202649e7a80d3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 01:40:33 +0100 Subject: [PATCH 06/78] gnu: bash-tap: Use HTTPS home page. * gnu/packages/bash.scm (bash-tap)[home-page]: Use HTTPS. --- gnu/packages/bash.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/bash.scm b/gnu/packages/bash.scm index 3af13a612a..3256a356d4 100644 --- a/gnu/packages/bash.scm +++ b/gnu/packages/bash.scm @@ -341,7 +341,7 @@ (define-public bash-tap (install-file "bash-tap" bin) (install-file "bash-tap-bootstrap" bin) (install-file "bash-tap-mock" bin))))))) - (home-page "http://www.illusori.co.uk/projects/bash-tap/") + (home-page "https://www.illusori.co.uk/projects/bash-tap/") (synopsis "Bash port of a Test::More/Test::Builder-style TAP-compliant test library") (description "Bash TAP is a TAP-compliant Test::More-style testing library From 1e4ae5511a6c1a0f2af5db9ced320521c294e3f2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 01:44:30 +0100 Subject: [PATCH 07/78] gnu: java-asm: Use HTTPS home page. * gnu/packages/java.scm (java-asm)[home-page]: Use HTTPS. --- gnu/packages/java.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index ee1bbfbce4..c2ccbf80e3 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -4322,7 +4322,7 @@ (define-public java-asm (install-jars "dist"))))) (native-inputs `(("java-junit" ,java-junit))) - (home-page "http://asm.ow2.org/") + (home-page "https://asm.ow2.io/") (synopsis "Very small and fast Java bytecode manipulation framework") (description "ASM is an all purpose Java bytecode manipulation and analysis framework. It can be used to modify existing classes or dynamically From 2bc8143f6c09af2768be76d12eafc89a4b6cd142 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 01:46:20 +0100 Subject: [PATCH 08/78] gnu: python-wxpython: Use HTTPS home page. * gnu/packages/wxwidgets.scm (python-wxpython)[home-page]: Use HTTPS. --- gnu/packages/wxwidgets.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/wxwidgets.scm b/gnu/packages/wxwidgets.scm index 6d5c2b3921..5a2ea1c88e 100644 --- a/gnu/packages/wxwidgets.scm +++ b/gnu/packages/wxwidgets.scm @@ -225,7 +225,7 @@ (define-public python-wxpython `(("python-numpy" ,python-numpy) ("python-pillow" ,python-pillow) ("python-six" ,python-six))) - (home-page "http://wxPython.org/") + (home-page "https://wxpython.org/") (synopsis "Cross platform GUI toolkit for Python") (description "wxPython is a cross-platform GUI toolkit for the Python programming language. It is implemented as a set of Python extension modules From 8e486e808c3b73bddc27877fdbec13c435759666 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 01:46:44 +0100 Subject: [PATCH 09/78] gnu: ruby-minitest-rg: Use HTTPS home page. * gnu/packages/ruby.scm (ruby-minitest-rg)[home-page]: Use HTTPS. --- gnu/packages/ruby.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 7028a1b69f..5b6d79c3b7 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -3335,7 +3335,7 @@ (define-public ruby-minitest-rg (synopsis "Coloured output for Minitest") (description "@code{minitest-rg} changes the colour of the output from Minitest.") - (home-page "http://blowmage.com/minitest-rg") + (home-page "https://blowmage.com/minitest-rg/") (license license:expat))) (define-public ruby-minitest-hooks From f613a338d0a73b5d4e7e6b91561383732b22e91c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 10 Mar 2020 22:17:43 +0100 Subject: [PATCH 10/78] gnu: hplip: Update to 3.20.3. * gnu/packages/cups.scm (hplip): Update to 3.20.3. --- gnu/packages/cups.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index 66f7085741..cdedc4b592 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -420,14 +420,14 @@ (define-public cups-pk-helper (define-public hplip (package (name "hplip") - (version "3.20.2") + (version "3.20.3") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/hplip/hplip/" version "/hplip-" version ".tar.gz")) (sha256 (base32 - "00vcbpnp478l2v61mlxb4kr6q3gzkxspm4lwfky39f6ck72pqxb7")) + "0sh6cg7yjc11x1cm4477iaslj9n8ksghs85hqwgfbk7m5b2pw2a1")) (modules '((guix build utils))) (patches (search-patches "hplip-remove-imageprocessor.patch")) (snippet From 4c87770442605c8e0a342a99f49a76480582ef3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20H=C3=B6fling?= Date: Mon, 9 Mar 2020 22:23:58 +0100 Subject: [PATCH 11/78] gnu: java-jtransforms: Update source URI. * gnu/packages/algebra.scm (java-jtransforms)[source]: Update URI. --- gnu/packages/algebra.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index c0eaa72996..add29b7718 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2017 Marius Bakke ;;; Copyright © 2017, 2019 Eric Bavier +;;; Copyright © 2020 Björn Höfling ;;; ;;; This file is part of GNU Guix. ;;; @@ -884,8 +885,8 @@ (define-public java-jtransforms (version "3.1") (source (origin (method url-fetch) - (uri (string-append "http://search.maven.org/remotecontent?" - "filepath=com/github/wendykierp/JTransforms/" + (uri (string-append "https://repo1.maven.org/maven2/" + "com/github/wendykierp/JTransforms/" version "/JTransforms-" version "-sources.jar")) (sha256 (base32 From 9f5eeb879f0f8b2c8c526558263c0b19ab85906f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20H=C3=B6fling?= Date: Mon, 9 Mar 2020 22:52:27 +0100 Subject: [PATCH 12/78] gnu: java-jlargearrays: Update source URI. * gnu/packages/algebra.scm (java-jlargearrays)[source]: Update URI. --- gnu/packages/algebra.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index add29b7718..50cb3001cb 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -858,8 +858,8 @@ (define-public java-jlargearrays (version "1.6") (source (origin (method url-fetch) - (uri (string-append "http://search.maven.org/remotecontent?" - "filepath=pl/edu/icm/JLargeArrays/" + (uri (string-append "https://repo1.maven.org/maven2/" + "pl/edu/icm/JLargeArrays/" version "/JLargeArrays-" version "-sources.jar")) (file-name (string-append name "-" version ".jar")) From ec11dcfe69adbacce2a30cb55cc2948d4e637f3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20H=C3=B6fling?= Date: Mon, 9 Mar 2020 23:01:14 +0100 Subject: [PATCH 13/78] gnu: java-forester-1.005: Update source URI. * gnu/packages/bioinformatics.scm (java-forester-1.005)[source]: Update URI. [native-inputs]: Wrap long line. --- gnu/packages/bioinformatics.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 035a7bb808..54b85341a6 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -15,6 +15,7 @@ ;;; Copyright © 2019 Maxim Cournoyer ;;; Copyright © 2019 Brian Leung ;;; Copyright © 2019 Brett Gilio +;;; Copyright © 2020 Björn Höfling ;;; ;;; This file is part of GNU Guix. ;;; @@ -12140,8 +12141,8 @@ (define-public java-forester-1.005 (version "1.005") (source (origin (method url-fetch) - (uri (string-append "http://search.maven.org/remotecontent?" - "filepath=org/biojava/thirdparty/forester/" + (uri (string-append "https://repo1.maven.org/maven2/" + "org/biojava/thirdparty/forester/" version "/forester-" version "-sources.jar")) (file-name (string-append name "-" version ".jar")) (sha256 @@ -12217,7 +12218,8 @@ (define-public java-forester-1.005 (method url-fetch) (uri (string-append "https://raw.githubusercontent.com/cmzmasek/forester/" "29e04321615da6b35c1e15c60e52caf3f21d8e6a/" - "forester/java/classes/resources/synth_look_and_feel_1.xml")) + "forester/java/classes/resources/" + "synth_look_and_feel_1.xml")) (file-name (string-append name "-synth-look-and-feel-" version ".xml")) (sha256 (base32 From 60f5ab0bb64b484b48f594b5360c81eeb95ee821 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20H=C3=B6fling?= Date: Mon, 9 Mar 2020 23:24:46 +0100 Subject: [PATCH 14/78] gnu: java-osgi-namespace-contract: Update source URI. * gnu/packages/java.scm (java-osgi-namespace-contract)[source]: Update URI. --- gnu/packages/java.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index c2ccbf80e3..da0f3bfa5b 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -10,7 +10,7 @@ ;;; Copyright © 2018, 2019 Gábor Boskovits ;;; Copyright © 2018 Chris Marusich ;;; Copyright © 2018, 2019 Efraim Flashner -;;; Copyright © 2019 Björn Höfling +;;; Copyright © 2019, 2020 Björn Höfling ;;; ;;; This file is part of GNU Guix. ;;; @@ -7476,7 +7476,7 @@ (define-public java-osgi-namespace-contract (version "1.0.0") (source (origin (method url-fetch) - (uri (string-append "http://central.maven.org/maven2/org/osgi/" + (uri (string-append "https://repo1.maven.org/maven2/org/osgi/" "org.osgi.namespace.contract/" version "/org.osgi.namespace.contract-" version "-sources.jar")) From 7cfcc38f4117709e26879dfff58e902255438e5c Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 10 Mar 2020 15:42:11 -0400 Subject: [PATCH 15/78] gnu: Certbot, python-acme: Update to 1.3.0. * gnu/packages/tls.scm (certbot, python-acme): Update to 1.3.0. --- gnu/packages/tls.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index d6e4f52229..b8adf23d44 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -553,13 +553,13 @@ (define-public python-acme (package (name "python-acme") ;; Remember to update the hash of certbot when updating python-acme. - (version "1.2.0") + (version "1.3.0") (source (origin (method url-fetch) (uri (pypi-uri "acme" version)) (sha256 (base32 - "1ar6mjax7cyvq3zgh64yrg485l02dy6zqddxjxg99nlvsi0cfc06")))) + "03fjmg0fgfy7xfn3i8rzn9i0i4amajmijkash84qb8mlphgrxpn0")))) (build-system python-build-system) (arguments `(#:phases @@ -610,7 +610,7 @@ (define-public certbot (uri (pypi-uri "certbot" version)) (sha256 (base32 - "0g1p4nkaid6davjm5qz8lsln92dhjhlv3rrg8hcfpr7qhphbmp4m")))) + "1n5i0k6kwmd6wvivshfl3k4djwcpwx390c39xmr2hhrgpk5r285w")))) (build-system python-build-system) (arguments `(,@(substitute-keyword-arguments (package-arguments python-acme) From 92a4f18f07a6fc32479d7fab31b0765d31f57a50 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 10 Mar 2020 23:02:23 +0100 Subject: [PATCH 16/78] gnu: s6-dns: Update to 2.3.2.0. * gnu/packages/skarnet.scm (s6-dns): Update to 2.3.2.0. --- gnu/packages/skarnet.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/skarnet.scm b/gnu/packages/skarnet.scm index 829af9d000..4a5b54ddeb 100644 --- a/gnu/packages/skarnet.scm +++ b/gnu/packages/skarnet.scm @@ -150,14 +150,14 @@ (define-public s6 (define-public s6-dns (package (name "s6-dns") - (version "2.3.1.1") + (version "2.3.2.0") (source (origin (method url-fetch) (uri (string-append "http://skarnet.org/software/s6-dns/s6-dns-" version ".tar.gz")) (sha256 - (base32 "0clib10dk3r9rcxv1yfr6gdvqqrx0arzivjpmhz9p8xaif53wpj1")))) + (base32 "09hyb1xv9glqq0yy7wy8hiwvlr78kwv552pags8ancgamag15di7")))) (build-system gnu-build-system) (inputs `(("skalibs" ,skalibs))) (arguments From b486bf7811fc9f0f15d3136674ef3314d68b1da9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 10 Mar 2020 23:06:28 +0100 Subject: [PATCH 17/78] gnu: skalibs: Update to 2.9.2.0. * gnu/packages/skarnet.scm (skalibs): Update to 2.9.2.0. --- gnu/packages/skarnet.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/skarnet.scm b/gnu/packages/skarnet.scm index 4a5b54ddeb..167e7ae817 100644 --- a/gnu/packages/skarnet.scm +++ b/gnu/packages/skarnet.scm @@ -30,14 +30,14 @@ (define-module (gnu packages skarnet) (define-public skalibs (package (name "skalibs") - (version "2.9.1.0") + (version "2.9.2.0") (source (origin (method url-fetch) (uri (string-append "http://skarnet.org/software/skalibs/skalibs-" version ".tar.gz")) (sha256 - (base32 "19c6s3f7vxi96l2yqzjk9x9i4xkfg4fdzxhn1jg6bfb2qjph9cnk")))) + (base32 "1i9d7w031kh338aq6xdsf8vl5amxbwxbny8lnrxlzydqvn8nxhz4")))) (build-system gnu-build-system) (arguments '(#:tests? #f ; no tests exist From c9cd6d2fb2c68197439d121bf0bdea0f43809332 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 10 Mar 2020 23:08:14 +0100 Subject: [PATCH 18/78] gnu: Use HTTPS for skarnet.org sources. * gnu/packages/skarnet.scm (skalibs, execline, s6, s6-dns) (s6-networking, s6-rc, s6-portable-utils, s6-linux-init, s6-linux-utils) [source]: Use HTTPS. --- gnu/packages/skarnet.scm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/gnu/packages/skarnet.scm b/gnu/packages/skarnet.scm index 167e7ae817..938867b9f6 100644 --- a/gnu/packages/skarnet.scm +++ b/gnu/packages/skarnet.scm @@ -34,7 +34,7 @@ (define-public skalibs (source (origin (method url-fetch) - (uri (string-append "http://skarnet.org/software/skalibs/skalibs-" + (uri (string-append "https://skarnet.org/software/skalibs/skalibs-" version ".tar.gz")) (sha256 (base32 "1i9d7w031kh338aq6xdsf8vl5amxbwxbny8lnrxlzydqvn8nxhz4")))) @@ -66,7 +66,7 @@ (define-public execline (source (origin (method url-fetch) - (uri (string-append "http://skarnet.org/software/execline/execline-" + (uri (string-append "https://skarnet.org/software/execline/execline-" version ".tar.gz")) (sha256 (base32 "0xr6yb50wm6amj1wc7jmxyv7hvlx2ypbnww1vc288j275625d9xi")))) @@ -108,7 +108,7 @@ (define-public s6 (source (origin (method url-fetch) - (uri (string-append "http://skarnet.org/software/s6/s6-" + (uri (string-append "https://skarnet.org/software/s6/s6-" version ".tar.gz")) (sha256 (base32 "0mvcjrz8nlj9p2zclmcv22b4y6bqzd2iz38arhgc989vdvrbmkg0")))) @@ -154,7 +154,7 @@ (define-public s6-dns (source (origin (method url-fetch) - (uri (string-append "http://skarnet.org/software/s6-dns/s6-dns-" + (uri (string-append "https://skarnet.org/software/s6-dns/s6-dns-" version ".tar.gz")) (sha256 (base32 "09hyb1xv9glqq0yy7wy8hiwvlr78kwv552pags8ancgamag15di7")))) @@ -183,7 +183,7 @@ (define-public s6-networking (source (origin (method url-fetch) - (uri (string-append "http://skarnet.org/software/s6-networking/s6-networking-" + (uri (string-append "https://skarnet.org/software/s6-networking/s6-networking-" version ".tar.gz")) (sha256 (base32 "1029bgwfmv903y5ji93j75m7p2jgchdxya1khxzb42q2z7yxnlyr")))) @@ -226,7 +226,7 @@ (define-public s6-rc (source (origin (method url-fetch) - (uri (string-append "http://skarnet.org/software/s6-rc/s6-rc-" + (uri (string-append "https://skarnet.org/software/s6-rc/s6-rc-" version ".tar.gz")) (sha256 (base32 "18m8jsx3bkj566p6xwwnsvdckk10n8wqnhp0na2k88i295h4rnjp")))) @@ -268,7 +268,7 @@ (define-public s6-portable-utils (origin (method url-fetch) (uri (string-append - "http://skarnet.org/software/s6-portable-utils/s6-portable-utils-" + "https://skarnet.org/software/s6-portable-utils/s6-portable-utils-" version ".tar.gz")) (sha256 (base32 "1k3la37q46n93vjwk9wm9ym4w87z6lqzv43f03qd0vqj9k94mpv3")))) @@ -300,7 +300,7 @@ (define-public s6-linux-init (origin (method url-fetch) (uri (string-append - "http://skarnet.org/software/s6-linux-init/s6-linux-init-" + "https://skarnet.org/software/s6-linux-init/s6-linux-init-" version ".tar.gz")) (sha256 (base32 "176mgkqxlp6gb6my66dv73xsp7adfxbjp5hjyh35sykqkr4kfyfy")))) @@ -345,7 +345,7 @@ (define-public s6-linux-utils (origin (method url-fetch) (uri (string-append - "http://skarnet.org/software/s6-linux-utils/s6-linux-utils-" + "https://skarnet.org/software/s6-linux-utils/s6-linux-utils-" version ".tar.gz")) (sha256 (base32 "0w4jms9qyb5kx9zcyd3gzri60rrii2rbmh08s59ckg4awy27py86")))) From 19153f2915dadc1f2a5c507cb8cf42ec1b1ffe1c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 10 Mar 2020 23:10:08 +0100 Subject: [PATCH 19/78] gnu: xfce4-statusnotifier-plugin: Update to 0.2.2. * gnu/packages/xfce.scm (xfce4-statusnotifier-plugin): Update to 0.2.2. --- gnu/packages/xfce.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 0650235365..e3c01e1f0a 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -1763,7 +1763,7 @@ (define-public xfce4-smartbookmark-plugin (define-public xfce4-statusnotifier-plugin (package (name "xfce4-statusnotifier-plugin") - (version "0.2.1") + (version "0.2.2") (source (origin (method url-fetch) (uri (string-append "http://archive.xfce.org/src/panel-plugins/" @@ -1772,7 +1772,7 @@ (define-public xfce4-statusnotifier-plugin "/xfce4-statusnotifier-plugin-" version ".tar.bz2")) (sha256 (base32 - "154b0q9pmlbjh30vvx4c48msdfxp4pq8x4mbn71mk7pibk018hsj")))) + "1yic99jx7013pywpd0k31pxab8s8lv3wcq364iha99qhsm25k42c")))) (build-system gnu-build-system) (native-inputs `(("intltool" ,intltool) From d518851710abeb0e8bd4374c9836ac7ad7752186 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 10 Mar 2020 23:15:07 +0100 Subject: [PATCH 20/78] gnu: Use HTTPS for archive.xfce.org sources. * gnu/packages/xfce.scm (gtk-xfce-engine, xfce4-xkb-plugin) (xfce4-settings, thunar, ristretto, orage, xfburn, mousepad) (xfce4-screenshooter, xfce4-screensaver, xfce4-cpugraph-plugin) (xfce4-eyes-plugin, xfce4-equake-plugin, xfce4-datetime-plugin) (xfce4-calculator-plugin, xfce4-cpufreq-plugin, xfce4-diskperf-plugin) (xfce4-embed-plugin, xfce4-fsguard-plugin, xfce4-genmon-plugin) (xfce4-kbdleds-plugin, xfce4-mailwatch-plugin, xfce4-mpc-plugin) (xfce4-mount-plugin, xfce4-netload-plugin, xfce4-places-plugin) (xfce4-smartbookmark-plugin, xfce4-statusnotifier-plugin) (xfce4-stopwatch-plugin, xfce4-systemload-plugin) (xfce4-time-out-plugin, xfce4-timer-plugin, xfce4-verve-plugin) (xfce4-wavelan-plugin, xfce4-weather-plugin))[source]: Use HTTPS. --- gnu/packages/xfce.scm | 70 +++++++++++++++++++++---------------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index e3c01e1f0a..70806255d9 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -72,7 +72,7 @@ (define-public gtk-xfce-engine (version "2.10.1") (source (origin (method url-fetch) - (uri (string-append "http://archive.xfce.org/src/xfce/" + (uri (string-append "https://archive.xfce.org/src/xfce/" name "/" (version-major+minor version) "/" name "-" version ".tar.bz2")) (sha256 @@ -499,7 +499,7 @@ (define-public xfce4-xkb-plugin (version "0.8.1") (source (origin (method url-fetch) - (uri (string-append "http://archive.xfce.org/src/panel-plugins/" + (uri (string-append "https://archive.xfce.org/src/panel-plugins/" name "/" (version-major+minor version) "/" name "-" version ".tar.bz2")) (sha256 @@ -609,7 +609,7 @@ (define-public xfce4-settings (version "4.14.0") (source (origin (method url-fetch) - (uri (string-append "http://archive.xfce.org/src/xfce/" + (uri (string-append "https://archive.xfce.org/src/xfce/" name "/" (version-major+minor version) "/" name "-" version ".tar.bz2")) (sha256 @@ -648,7 +648,7 @@ (define-public thunar (version "1.8.12") (source (origin (method url-fetch) - (uri (string-append "http://archive.xfce.org/src/xfce/" + (uri (string-append "https://archive.xfce.org/src/xfce/" "thunar/" (version-major+minor version) "/" "thunar-" version ".tar.bz2")) (sha256 @@ -917,7 +917,7 @@ (define-public ristretto (version "0.10.0") (source (origin (method url-fetch) - (uri (string-append "http://archive.xfce.org/src/apps/ristretto/" + (uri (string-append "https://archive.xfce.org/src/apps/ristretto/" (version-major+minor version) "/" "ristretto-" version ".tar.bz2")) (sha256 @@ -979,7 +979,7 @@ (define-public orage (version "4.12.1") (source (origin (method url-fetch) - (uri (string-append "http://archive.xfce.org/src/apps/" + (uri (string-append "https://archive.xfce.org/src/apps/" name "/" (version-major+minor version) "/" name "-" version ".tar.bz2")) (sha256 @@ -1050,7 +1050,7 @@ (define-public xfburn (version "0.6.2") (source (origin (method url-fetch) - (uri (string-append "http://archive.xfce.org/src/apps/xfburn/" + (uri (string-append "https://archive.xfce.org/src/apps/xfburn/" (version-major+minor version) "/" "xfburn-" version ".tar.bz2")) (sha256 @@ -1086,7 +1086,7 @@ (define-public mousepad (version "0.4.2") (source (origin (method url-fetch) - (uri (string-append "http://archive.xfce.org/src/apps/mousepad/" + (uri (string-append "https://archive.xfce.org/src/apps/mousepad/" (version-major+minor version) "/mousepad-" version ".tar.bz2")) (sha256 @@ -1128,7 +1128,7 @@ (define-public xfce4-screenshooter (version "1.9.7") (source (origin (method url-fetch) - (uri (string-append "http://archive.xfce.org/src/apps/" + (uri (string-append "https://archive.xfce.org/src/apps/" "xfce4-screenshooter/" (version-major+minor version) "/xfce4-screenshooter-" @@ -1161,7 +1161,7 @@ (define-public xfce4-screensaver (version "0.1.8") (source (origin (method url-fetch) - (uri (string-append "http://archive.xfce.org/src/apps/" + (uri (string-append "https://archive.xfce.org/src/apps/" "xfce4-screensaver/" (version-major+minor version) "/xfce4-screensaver-" @@ -1237,7 +1237,7 @@ (define-public xfce4-cpugraph-plugin (version "1.1.0") (source (origin (method url-fetch) - (uri (string-append "http://archive.xfce.org/src/panel-plugins/" + (uri (string-append "https://archive.xfce.org/src/panel-plugins/" "xfce4-cpugraph-plugin/" (version-major+minor version) "/xfce4-cpugraph-plugin-" version ".tar.bz2")) @@ -1270,7 +1270,7 @@ (define-public xfce4-eyes-plugin (version "4.5.0") (source (origin (method url-fetch) - (uri (string-append "http://archive.xfce.org/src/panel-plugins/" + (uri (string-append "https://archive.xfce.org/src/panel-plugins/" "xfce4-eyes-plugin/" (version-major+minor version) "/xfce4-eyes-plugin-" version ".tar.bz2")) @@ -1297,7 +1297,7 @@ (define-public xfce4-equake-plugin (version "1.3.8") (source (origin (method url-fetch) - (uri (string-append "http://archive.xfce.org/src/panel-plugins/" + (uri (string-append "https://archive.xfce.org/src/panel-plugins/" "xfce4-equake-plugin/" (version-major+minor version) "/xfce4-equake-plugin-" version ".tar.bz2")) @@ -1326,7 +1326,7 @@ (define-public xfce4-datetime-plugin (version "0.8.0") (source (origin (method url-fetch) - (uri (string-append "http://archive.xfce.org/src/panel-plugins/" + (uri (string-append "https://archive.xfce.org/src/panel-plugins/" "xfce4-datetime-plugin/" (version-major+minor version) "/xfce4-datetime-plugin-" version ".tar.bz2")) @@ -1353,7 +1353,7 @@ (define-public xfce4-calculator-plugin (version "0.7.0") (source (origin (method url-fetch) - (uri (string-append "http://archive.xfce.org/src/panel-plugins/" + (uri (string-append "https://archive.xfce.org/src/panel-plugins/" "xfce4-calculator-plugin/" (version-major+minor version) "/xfce4-calculator-plugin-" version ".tar.bz2")) @@ -1381,7 +1381,7 @@ (define-public xfce4-cpufreq-plugin (version "1.2.1") (source (origin (method url-fetch) - (uri (string-append "http://archive.xfce.org/src/panel-plugins/" + (uri (string-append "https://archive.xfce.org/src/panel-plugins/" "xfce4-cpufreq-plugin/" (version-major+minor version) "/xfce4-cpufreq-plugin-" version ".tar.bz2")) @@ -1408,7 +1408,7 @@ (define-public xfce4-diskperf-plugin (version "2.6.2") (source (origin (method url-fetch) - (uri (string-append "http://archive.xfce.org/src/panel-plugins/" + (uri (string-append "https://archive.xfce.org/src/panel-plugins/" "xfce4-diskperf-plugin/" (version-major+minor version) "/xfce4-diskperf-plugin-" version ".tar.bz2")) @@ -1435,7 +1435,7 @@ (define-public xfce4-embed-plugin (version "1.6.0") (source (origin (method url-fetch) - (uri (string-append "http://archive.xfce.org/src/panel-plugins/" + (uri (string-append "https://archive.xfce.org/src/panel-plugins/" "xfce4-embed-plugin/" (version-major+minor version) "/xfce4-embed-plugin-" version ".tar.bz2")) @@ -1470,7 +1470,7 @@ (define-public xfce4-fsguard-plugin (version "1.1.1") (source (origin (method url-fetch) - (uri (string-append "http://archive.xfce.org/src/panel-plugins/" + (uri (string-append "https://archive.xfce.org/src/panel-plugins/" "xfce4-fsguard-plugin/" (version-major+minor version) "/xfce4-fsguard-plugin-" version ".tar.bz2")) @@ -1500,7 +1500,7 @@ (define-public xfce4-genmon-plugin (version "4.0.2") (source (origin (method url-fetch) - (uri (string-append "http://archive.xfce.org/src/panel-plugins/" + (uri (string-append "https://archive.xfce.org/src/panel-plugins/" "xfce4-genmon-plugin/" (version-major+minor version) "/xfce4-genmon-plugin-" version ".tar.bz2")) @@ -1531,7 +1531,7 @@ (define-public xfce4-kbdleds-plugin (version "0.0.6") (source (origin (method url-fetch) - (uri (string-append "http://archive.xfce.org/src/panel-plugins/" + (uri (string-append "https://archive.xfce.org/src/panel-plugins/" "xfce4-kbdleds-plugin/" (version-major+minor version) "/xfce4-kbdleds-plugin-" version ".tar.bz2")) @@ -1559,7 +1559,7 @@ (define-public xfce4-mailwatch-plugin (version "1.2.0") (source (origin (method url-fetch) - (uri (string-append "http://archive.xfce.org/src/panel-plugins/" + (uri (string-append "https://archive.xfce.org/src/panel-plugins/" "xfce4-mailwatch-plugin/" (version-major+minor version) "/xfce4-mailwatch-plugin-" version ".tar.bz2")) @@ -1597,7 +1597,7 @@ (define-public xfce4-mpc-plugin (version "0.5.2") (source (origin (method url-fetch) - (uri (string-append "http://archive.xfce.org/src/panel-plugins/" + (uri (string-append "https://archive.xfce.org/src/panel-plugins/" "xfce4-mpc-plugin/" (version-major+minor version) "/xfce4-mpc-plugin-" version ".tar.bz2")) @@ -1640,7 +1640,7 @@ (define-public xfce4-mount-plugin (version "1.1.3") (source (origin (method url-fetch) - (uri (string-append "http://archive.xfce.org/src/panel-plugins/" + (uri (string-append "https://archive.xfce.org/src/panel-plugins/" "xfce4-mount-plugin/" (version-major+minor version) "/xfce4-mount-plugin-" version ".tar.bz2")) @@ -1669,7 +1669,7 @@ (define-public xfce4-netload-plugin (version "1.3.2") (source (origin (method url-fetch) - (uri (string-append "http://archive.xfce.org/src/panel-plugins/" + (uri (string-append "https://archive.xfce.org/src/panel-plugins/" "xfce4-netload-plugin/" (version-major+minor version) "/xfce4-netload-plugin-" version ".tar.bz2")) @@ -1696,7 +1696,7 @@ (define-public xfce4-places-plugin (version "1.8.1") (source (origin (method url-fetch) - (uri (string-append "http://archive.xfce.org/src/panel-plugins/" + (uri (string-append "https://archive.xfce.org/src/panel-plugins/" "xfce4-places-plugin/" (version-major+minor version) "/xfce4-places-plugin-" version ".tar.bz2")) @@ -1738,7 +1738,7 @@ (define-public xfce4-smartbookmark-plugin (version "0.5.1") (source (origin (method url-fetch) - (uri (string-append "http://archive.xfce.org/src/panel-plugins/" + (uri (string-append "https://archive.xfce.org/src/panel-plugins/" "xfce4-smartbookmark-plugin/" (version-major+minor version) "/xfce4-smartbookmark-plugin-" version ".tar.bz2")) @@ -1766,7 +1766,7 @@ (define-public xfce4-statusnotifier-plugin (version "0.2.2") (source (origin (method url-fetch) - (uri (string-append "http://archive.xfce.org/src/panel-plugins/" + (uri (string-append "https://archive.xfce.org/src/panel-plugins/" "xfce4-statusnotifier-plugin/" (version-major+minor version) "/xfce4-statusnotifier-plugin-" version ".tar.bz2")) @@ -1798,7 +1798,7 @@ (define-public xfce4-stopwatch-plugin (version "0.3.1") (source (origin (method url-fetch) - (uri (string-append "http://archive.xfce.org/src/panel-plugins/" + (uri (string-append "https://archive.xfce.org/src/panel-plugins/" "xfce4-stopwatch-plugin/" (version-major+minor version) "/xfce4-stopwatch-plugin-" version ".tar.bz2")) @@ -1827,7 +1827,7 @@ (define-public xfce4-systemload-plugin (version "1.2.3") (source (origin (method url-fetch) - (uri (string-append "http://archive.xfce.org/src/panel-plugins/" + (uri (string-append "https://archive.xfce.org/src/panel-plugins/" "xfce4-systemload-plugin/" (version-major+minor version) "/xfce4-systemload-plugin-" version ".tar.bz2")) @@ -1855,7 +1855,7 @@ (define-public xfce4-time-out-plugin (version "1.1.0") (source (origin (method url-fetch) - (uri (string-append "http://archive.xfce.org/src/panel-plugins/" + (uri (string-append "https://archive.xfce.org/src/panel-plugins/" "xfce4-time-out-plugin/" (version-major+minor version) "/xfce4-time-out-plugin-" version ".tar.bz2")) @@ -1885,7 +1885,7 @@ (define-public xfce4-timer-plugin (version "1.7.0") (source (origin (method url-fetch) - (uri (string-append "http://archive.xfce.org/src/panel-plugins/" + (uri (string-append "https://archive.xfce.org/src/panel-plugins/" "xfce4-timer-plugin/" (version-major+minor version) "/xfce4-timer-plugin-" version ".tar.bz2")) @@ -1913,7 +1913,7 @@ (define-public xfce4-verve-plugin (version "2.0.0") (source (origin (method url-fetch) - (uri (string-append "http://archive.xfce.org/src/panel-plugins/" + (uri (string-append "https://archive.xfce.org/src/panel-plugins/" "xfce4-verve-plugin/" (version-major+minor version) "/xfce4-verve-plugin-" version ".tar.bz2")) @@ -1947,7 +1947,7 @@ (define-public xfce4-wavelan-plugin (version "0.6.1") (source (origin (method url-fetch) - (uri (string-append "http://archive.xfce.org/src/panel-plugins/" + (uri (string-append "https://archive.xfce.org/src/panel-plugins/" "xfce4-wavelan-plugin/" (version-major+minor version) "/xfce4-wavelan-plugin-" version ".tar.bz2")) @@ -1974,7 +1974,7 @@ (define-public xfce4-weather-plugin (version "0.10.1") (source (origin (method url-fetch) - (uri (string-append "http://archive.xfce.org/src/panel-plugins/" + (uri (string-append "https://archive.xfce.org/src/panel-plugins/" "xfce4-weather-plugin/" (version-major+minor version) "/xfce4-weather-plugin-" version ".tar.bz2")) From 8173e7a02ab950997a4ea641528a1a988c6bda58 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 22:10:57 +0100 Subject: [PATCH 21/78] gnu: git-flow: Use HTTPS home page. * gnu/packages/version-control.scm (git-flow)[home-page]: Use HTTPS. --- gnu/packages/version-control.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index c289e43d94..52626f8076 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1066,7 +1066,7 @@ (define-public git-flow "gitflow-shFlags"))))) (delete 'configure) (delete 'build)))) - (home-page "http://nvie.com/posts/a-successful-git-branching-model/") + (home-page "https://nvie.com/posts/a-successful-git-branching-model/") (synopsis "Git extensions for Vincent Driessen's branching model") (description "Vincent Driessen's branching model is a git branching and release From aeca60707aed05dde427a5a944cd308d7dcdf082 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 22:29:26 +0100 Subject: [PATCH 22/78] gnu: freealut: Use HTTPS home page. * gnu/packages/audio.scm (freealut)[home-page]: Use HTTPS. --- gnu/packages/audio.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 6056ded2fb..63227b89ea 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -2112,7 +2112,7 @@ (define-public freealut `(("openal" ,openal))) (synopsis "Free implementation of OpenAL's ALUT standard") (description "freealut is the OpenAL Utility Toolkit.") - (home-page "http://kcat.strangesoft.net/openal.html") + (home-page "https://kcat.strangesoft.net/openal.html") (license license:lgpl2.0))) (define-public patchage From 1fc2a81ef9a2477b8b961042b30ff94ecad6c6d0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 10 Mar 2020 23:24:21 +0100 Subject: [PATCH 23/78] gnu: execline: Update to 2.6.0.0. * gnu/packages/skarnet.scm (execline): Update to 2.6.0.0. --- gnu/packages/skarnet.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/skarnet.scm b/gnu/packages/skarnet.scm index 938867b9f6..6323169ee6 100644 --- a/gnu/packages/skarnet.scm +++ b/gnu/packages/skarnet.scm @@ -62,14 +62,14 @@ (define-public skalibs (define-public execline (package (name "execline") - (version "2.5.1.0") + (version "2.6.0.0") (source (origin (method url-fetch) (uri (string-append "https://skarnet.org/software/execline/execline-" version ".tar.gz")) (sha256 - (base32 "0xr6yb50wm6amj1wc7jmxyv7hvlx2ypbnww1vc288j275625d9xi")))) + (base32 "1m6pvawxqaqjr49456vyjyl8dnqwvr19v77sjj7dnglfijwza5al")))) (build-system gnu-build-system) (inputs `(("skalibs" ,skalibs))) (arguments From 519dc88c751b3101e824862e650087741881a327 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 10 Mar 2020 23:47:10 +0100 Subject: [PATCH 24/78] gnu: signify: Update to 29. * gnu/packages/crypto.scm (signify): Update to 29. --- gnu/packages/crypto.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index 5ca3ec5b51..b808211b2d 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -133,7 +133,7 @@ (define-public libmd (define-public signify (package (name "signify") - (version "28") + (version "29") (home-page "https://github.com/aperezdc/signify") (source (origin (method url-fetch) @@ -141,7 +141,7 @@ (define-public signify "/download/v" version "/signify-" version ".tar.xz")) (sha256 (base32 - "05v970glhpaxv0m4cnidfxsdnsjp12nf2crzrdq4ml7g5a3g6hdq")))) + "1bzcax5kb4lr0rmpmrdpq5q0iq6b2dxzpl56li8aanbkck1c7hd9")))) (build-system gnu-build-system) ;; TODO Build with libwaive (described in README.md), to implement something ;; like OpenBSD's pledge(). From 806b0c2c6e59b76f264a772b7c205822744dbb7c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 22:46:49 +0100 Subject: [PATCH 25/78] gnu: graphene: Use HTTPS home page. * gnu/packages/gtk.scm (graphene)[home-page]: Use HTTPS. --- gnu/packages/gtk.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index f28a3b04ba..7a364d4b35 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1732,7 +1732,7 @@ (define-public graphene ("python-2" ,python-2) ("glib" ,glib) ("gobject-introspection" ,gobject-introspection))) - (home-page "http://ebassi.github.io/graphene") + (home-page "https://ebassi.github.io/graphene/") (synopsis "Thin layer of graphic data types") (description "This library provides graphic types and their relative API; it does not deal with windowing system surfaces, drawing, scene graphs, or From 9d9da65f153d5a9809a13dfe113391ba5c7c3fec Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 10 Mar 2020 23:49:21 +0100 Subject: [PATCH 26/78] gnu: nethack: Update to 3.6.6. * gnu/packages/games.scm (nethack): Update to 3.6.6. --- gnu/packages/games.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index fa802c79fe..04591df818 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -1118,7 +1118,7 @@ (define-public ltris (define-public nethack (package (name "nethack") - (version "3.6.5") + (version "3.6.6") (source (origin (method url-fetch) @@ -1126,7 +1126,7 @@ (define-public nethack (string-append "https://www.nethack.org/download/" version "/nethack-" (string-join (string-split version #\.) "") "-src.tgz")) (sha256 - (base32 "0xifs8pqfffnmkbpmrcd1xf14yakcj06nl2bbhy4dyacg8myysmv")))) + (base32 "1liyckjp34j354qnxc1zn9730lh1p2dabrg1hap24z6xnqx0rpng")))) (inputs `(("ncurses" ,ncurses) ("bison" ,bison) From d64d8abb5bb50b5da5961301012f4ae8ec66b736 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 10 Mar 2020 23:56:12 +0100 Subject: [PATCH 27/78] gnu: gx: Update to 0.14.3. * gnu/packages/ipfs.scm (gx): Update to 0.14.3. --- gnu/packages/ipfs.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/ipfs.scm b/gnu/packages/ipfs.scm index 9fa3f144de..7ef7108c1f 100644 --- a/gnu/packages/ipfs.scm +++ b/gnu/packages/ipfs.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Pierre Neidhardt -;;; Copyright © 2019 Tobias Geerinckx-Rice +;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -104,7 +104,7 @@ (define-public go-github-com-ipfs-go-ipfs-api (define-public gx (package (name "gx") - (version "0.14.2") + (version "0.14.3") (source (origin (method git-fetch) @@ -113,7 +113,7 @@ (define-public gx (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "048bx6khzcwxnvz3lf7kgp6fkg8mxqcqchxh0jxm9fg2iwizsi0k")))) + (base32 "1sk20kv3rfsnizgwmcmmr69jb1b2iwzqh9wwwd6wg6x0pnqm8swc")))) (build-system go-build-system) (arguments '(#:import-path "github.com/whyrusleeping/gx")) From 06271fe3ce2866b70d792c5f389f71c92a75cec7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 11 Mar 2020 00:07:56 +0100 Subject: [PATCH 28/78] gnu: armagetronad: Update to 0.2.8.3.5. * gnu/packages/games.scm (armagetronad): Update to 0.2.8.3.5. --- gnu/packages/games.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 04591df818..340e758a95 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -301,14 +301,14 @@ (define-public alex4 (define-public armagetronad (package (name "armagetronad") - (version "0.2.8.3.4") + (version "0.2.8.3.5") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/armagetronad/stable/" version "/armagetronad-" version ".src.tar.gz")) (sha256 (base32 - "1pgy0r80z702qdv94aw3ywdn4ynnr4cdi86ml558pljfc5ygasj4")))) + "1z266haq22n5b0733h7qsg1rpzhz8lvm82f7wd06r008iiar7jdl")))) (build-system gnu-build-system) (inputs `(("libxml2" ,libxml2) From b3ca0ee1bba28a9166b78e6dfbf9bff975a2c759 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 11 Mar 2020 00:11:38 +0100 Subject: [PATCH 29/78] gnu: gegl: Update to 0.4.22. * gnu/packages/gimp.scm (gegl): Update to 0.4.22. --- gnu/packages/gimp.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm index ef256ee525..c4319d9a7c 100644 --- a/gnu/packages/gimp.scm +++ b/gnu/packages/gimp.scm @@ -89,7 +89,7 @@ (define-public babl (define-public gegl (package (name "gegl") - (version "0.4.20") + (version "0.4.22") (source (origin (method url-fetch) (uri (list (string-append "https://download.gimp.org/pub/gegl/" @@ -103,7 +103,7 @@ (define-public gegl "/gegl-" version ".tar.xz"))) (sha256 (base32 - "1zrxnxlhn0jmshg4n2m2xlgi886w059ynkiiihm7rpi05fs8pg93")))) + "0q9cckf90fb82qc5d496fjz459f1xw4j4p3rff1f57yivx0yr20q")))) (build-system meson-build-system) (arguments `(#:configure-flags From 57f85eef462d0ce33d4ebfa3faaea1ff90dad65a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 11 Mar 2020 00:11:44 +0100 Subject: [PATCH 30/78] gnu: gimp: Update to 2.10.18. * gnu/packages/gimp.scm (gimp): Update to 2.10.18. --- gnu/packages/gimp.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm index c4319d9a7c..fcf613423c 100644 --- a/gnu/packages/gimp.scm +++ b/gnu/packages/gimp.scm @@ -134,7 +134,7 @@ (define-public gegl (define-public gimp (package (name "gimp") - (version "2.10.14") + (version "2.10.18") (source (origin (method url-fetch) (uri (string-append "https://download.gimp.org/pub/gimp/v" @@ -142,7 +142,7 @@ (define-public gimp "/gimp-" version ".tar.bz2")) (sha256 (base32 - "0m6wdnfvsxyhimdd4v3351g4r1fklllnbipbwcfym3h7q88hz6yz")))) + "05np26g61fyr72s7qjfrcck8v57r0yswq5ihvqyzvgzfx08y3gv5")))) (build-system gnu-build-system) (outputs '("out" "doc")) ; 9 MiB of gtk-doc HTML From 73fbe04107d38f4561636c74d28d7a4935cbb1ef Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Tue, 28 Jan 2020 18:38:57 +0100 Subject: [PATCH 31/78] Add system start-up files for guix-daemon. * etc/init.d/guix-daemon.in: New file. * nix/local.mk (etc/init.d/guix-daemon): New rule. (nodist_sysvinitservice_DATA): Add etc/init.d/guix-daemon.in . (CLEANFILES): Add etc/init.d/guix-daemon . * .gitignore: Add etc/init.d/guix-daemon . --- .gitignore | 1 + etc/init.d/guix-daemon.in | 78 +++++++++++++++++++++++++++++++++++++++ nix/local.mk | 16 +++++++- 3 files changed, 93 insertions(+), 2 deletions(-) create mode 100644 etc/init.d/guix-daemon.in diff --git a/.gitignore b/.gitignore index df59a9176e..de058dda5e 100644 --- a/.gitignore +++ b/.gitignore @@ -71,6 +71,7 @@ /etc/guix-daemon.service /etc/guix-publish.conf /etc/guix-publish.service +/etc/init.d/guix-daemon /guix-daemon /guix/config.scm /libformat.a diff --git a/etc/init.d/guix-daemon.in b/etc/init.d/guix-daemon.in new file mode 100644 index 0000000000..1cc49fed89 --- /dev/null +++ b/etc/init.d/guix-daemon.in @@ -0,0 +1,78 @@ +#!/bin/bash +### BEGIN INIT INFO +# Provides: guix-daemon +# Required-Start: $remote_fs $syslog +# Required-Stop: $remote_fs $syslog +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Guix build daemon +# Description: Provides a daemon that does builds for Guix +### END INIT INFO + +set -e +mkdir -p "/var/run" +if [ ! -f "@localstatedir@/guix/profiles/per-user/root/current-guix/bin/guix-daemon" ] +then + exit 5 +fi + +case "$1" in +start) + if [ -f "/var/run/guix-daemon.pid" ] + then + if pgrep -F "/var/run/guix-daemon.pid" guix-daemon + then + exit 0 + else + echo "guix-daemon has a stale pid file" >&2 + exit 1 + fi + else + daemonize \ + -a \ + -e "/var/log/guix-daemon-stderr.log" \ + -o "/var/log/guix-daemon-stdout.log" \ + -E GUIX_LOCPATH=@localstatedir@/guix/profiles/per-user/root/guix-profile/lib/locale \ + -E LC_ALL=en_US.utf8 \ + -p "/var/run/guix-daemon.pid" \ + @localstatedir@/guix/profiles/per-user/root/current-guix/bin/guix-daemon \ + --build-users-group=guixbuild + fi + ;; +stop) + if [ -f "/var/run/guix-daemon.pid" ] + then + pkill -F "/var/run/guix-daemon.pid" guix-daemon || { + exit 1 + } + rm -f "/var/run/guix-daemon.pid" + exit 0 + else + exit 0 + fi + ;; +status) + if [ -f "/var/run/guix-daemon.pid" ] + then + if pgrep -F "/var/run/guix-daemon.pid" guix-daemon + then + echo "guix-daemon is running" + exit 0 + else + echo "guix-daemon has a stale pid file" + exit 1 + fi + else + echo "guix-daemon is not running" + exit 3 + fi + ;; +restart|force-reload) + "$0" stop + "$0" start + ;; +*) + echo "Usage: $0 (start|stop|status|restart|force-reload)" + exit 3 + ;; +esac diff --git a/nix/local.mk b/nix/local.mk index dc5a8398b2..a64bdd2137 100644 --- a/nix/local.mk +++ b/nix/local.mk @@ -164,6 +164,16 @@ etc/guix-%.service: etc/guix-%.service.in \ "$<" > "$@.tmp"; \ mv "$@.tmp" "$@" +sysvinitservicedir = $(sysconfdir)/init.d +nodist_sysvinitservice_DATA = etc/init.d/guix-daemon + +etc/init.d/guix-daemon: etc/init.d/guix-daemon.in \ + $(top_builddir)/config.status + $(AM_V_GEN)$(MKDIR_P) "`dirname $@`"; \ + $(SED) -e 's|@''localstatedir''@|$(localstatedir)|' < \ + "$<" > "$@.tmp"; \ + mv "$@.tmp" "$@" + # The '.conf' jobs for Upstart. upstartjobdir = $(libdir)/upstart/system nodist_upstartjob_DATA = etc/guix-daemon.conf etc/guix-publish.conf @@ -177,7 +187,8 @@ etc/guix-%.conf: etc/guix-%.conf.in \ CLEANFILES += \ $(nodist_systemdservice_DATA) \ - $(nodist_upstartjob_DATA) + $(nodist_upstartjob_DATA) \ + $(nodist_sysvinitservice_DATA) EXTRA_DIST += \ %D%/AUTHORS \ @@ -185,7 +196,8 @@ EXTRA_DIST += \ etc/guix-daemon.service.in \ etc/guix-daemon.conf.in \ etc/guix-publish.service.in \ - etc/guix-publish.conf.in + etc/guix-publish.conf.in \ + etc/init.d/guix-daemon.in if CAN_RUN_TESTS From fe60ef998f537e0e71bbb3377d5886ad297821d0 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Tue, 28 Jan 2020 18:38:58 +0100 Subject: [PATCH 32/78] guix-install.sh: Install SysV init script. * etc/guix-install.sh (sys_enable_guix_daemon): Install SysV init script. --- etc/guix-install.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/etc/guix-install.sh b/etc/guix-install.sh index bfd3842933..e7f4d2cd59 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -361,6 +361,17 @@ sys_enable_guix_daemon() systemctl enable guix-daemon; } && _msg "${PAS}enabled Guix daemon via systemd" ;; + sysv-init) + { mkdir -p /etc/init.d; + cp "${ROOT_HOME}/.config/guix/current/etc/init.d/guix-daemon" \ + /etc/init.d/guix-daemon; + chmod 775 /etc/init.d/guix-daemon; + + update-rc.d guix-daemon defaults && + update-rc.d guix-daemon enable && + service guix-daemon start; } && + _msg "${PAS}enabled Guix daemon via sysv" + ;; NA|*) _msg "${ERR}unsupported init system; run the daemon manually:" echo " ${ROOT_HOME}/.config/guix/current/bin/guix-daemon --build-users-group=guixbuild" From 49bb3a56e4caea411bef485e2474051ea134eb7e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 11 Mar 2020 02:08:28 +0100 Subject: [PATCH 33/78] gnu: batctl: Update to 2020.0. * gnu/packages/networking.scm (batctl): Update to 2020.0. --- gnu/packages/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 1840f1c0f2..7f4009df9b 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -2713,14 +2713,14 @@ (define-public iwd (define-public batctl (package (name "batctl") - (version "2019.5") + (version "2020.0") (source (origin (method url-fetch) (uri (string-append "https://downloads.open-mesh.org/batman/releases/batman-adv-" version "/batctl-" version ".tar.gz")) (sha256 - (base32 "1b9w4636dq8m38nzr8j0v0j3b0vdsw84c58c2isc33h66dx8brgz")))) + (base32 "01414ywhlb2b9ng9d5kd5rr1s7wzvi234j8hj6ra2spn92qykvv0")))) (inputs `(("libnl" ,libnl))) (native-inputs From 3437fe1fb7ba1535f5f09d8d6ccefe033152a9a9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 11 Mar 2020 02:43:41 +0100 Subject: [PATCH 34/78] gnu: gpxsee: Update to 7.25. * gnu/packages/gps.scm (gpxsee): Update to 7.25. --- gnu/packages/gps.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gps.scm b/gnu/packages/gps.scm index ac8deddad5..718ca42454 100644 --- a/gnu/packages/gps.scm +++ b/gnu/packages/gps.scm @@ -178,7 +178,7 @@ (define-public gama (define-public gpxsee (package (name "gpxsee") - (version "7.16") + (version "7.25") (source (origin (method git-fetch) (uri (git-reference @@ -187,7 +187,7 @@ (define-public gpxsee (file-name (git-file-name name version)) (sha256 (base32 - "1mkfhb2c9qafjpva600nyn6yik49l4q1k6id1xvrci37wsn6ijav")))) + "0lml3hz2zxljl9j5wnh7bn9bj8k9v3wf6bk3g77x9nnarsmw0fcx")))) (build-system gnu-build-system) (arguments '(#:phases From cebfc269863a40f3c5b0c7fc321da7c3cf338873 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 11 Mar 2020 02:44:10 +0100 Subject: [PATCH 35/78] gnu: gpxsee: Extend description. * gnu/packages/gps.scm (gpxsee)[description]: Extend. --- gnu/packages/gps.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gps.scm b/gnu/packages/gps.scm index 718ca42454..936c3aeda0 100644 --- a/gnu/packages/gps.scm +++ b/gnu/packages/gps.scm @@ -208,8 +208,10 @@ (define-public gpxsee (home-page "https://www.gpxsee.org") (synopsis "GPS log file viewer and analyzer") (description - "GPXSee is a Qt-based GPS log file viewer and analyzer that supports -all common GPS log file formats.") + "GPXSee is a Qt-based GPS log file viewer and analyzer that supports all +common GPS log file formats. It can display multiple tracks on various on- +and off-line maps. You can easily add more maps and graph other captured data +such as elevation, speed, heart rate, power, temperature, and gear shifts.") (license license:gpl3))) (define-public gpsd From f4b6ce2155a0c31aafada2c64ee940f0f5c5c607 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 11 Mar 2020 02:52:09 +0100 Subject: [PATCH 36/78] gnu: python-tomlkit: Update to 0.5.11. * gnu/packages/python-xyz.scm (python-tomlkit): Update to 0.5.11. --- gnu/packages/python-xyz.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 9b4c9a1722..711f6338c8 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10703,14 +10703,13 @@ (define-public python2-cleo (define-public python-tomlkit (package (name "python-tomlkit") - (version "0.5.8") + (version "0.5.11") (source (origin (method url-fetch) (uri (pypi-uri "tomlkit" version)) (sha256 - (base32 - "0sf2a4q61kf344hjbw8kb6za1hlccl89j9lzqw0l2zpddp0hrh9j")))) + (base32 "1kq1663iqxgwrmb883n55ypi5axnixla2hrby9g2x227asifsi7h")))) (build-system python-build-system) (native-inputs `(("python-pytest" ,python-pytest))) From 2d3da18613d91476b264ad1ff4700ca8a52a6fb3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 11 Mar 2020 02:53:13 +0100 Subject: [PATCH 37/78] gnu: python-tomlkit: Fix typos in descriptions. * gnu/packages/python-xyz.scm (python-tomlkit)[synopsis, description]: Fix typos. --- gnu/packages/python-xyz.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 711f6338c8..55a8046488 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10713,15 +10713,14 @@ (define-public python-tomlkit (build-system python-build-system) (native-inputs `(("python-pytest" ,python-pytest))) - (home-page - "https://github.com/sdispater/tomlkit") - (synopsis "Style preserving TOML library") + (home-page "https://github.com/sdispater/tomlkit") + (synopsis "Style-preserving TOML library") (description "TOML Kit is a 0.5.0-compliant TOML library. It includes a parser that preserves all comments, indentations, whitespace and internal element ordering, and makes them accessible and editable via an intuitive API. It can also create new TOML documents from scratch using the provided helpers. Part of the -implementation as been adapted, improved and fixed from Molten.") +implementation has been adapted, improved, and fixed from Molten.") (license license:expat))) (define-public python-shellingham From 44184f33562f483c32c9ec78db5cef26b3386cfd Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 01:06:55 +0100 Subject: [PATCH 38/78] gnu: gd: Use HTTPS home page. * gnu/packages/gd.scm (gd)[home-page]: Use HTTPS. --- gnu/packages/gd.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/gd.scm b/gnu/packages/gd.scm index 5b3f8509f8..2d3ee4200d 100644 --- a/gnu/packages/gd.scm +++ b/gnu/packages/gd.scm @@ -83,7 +83,7 @@ (define-public gd (propagated-inputs `(("fontconfig" ,fontconfig) ("libjpeg" ,libjpeg))) - (home-page "http://www.libgd.org/") + (home-page "https://www.libgd.org/") (synopsis "Library for the dynamic creation of images by programmers") (description "GD is a library for the dynamic creation of images by programmers. GD From e42399e80e41cec0d017b6967b949df4c3feec25 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 00:51:59 +0100 Subject: [PATCH 39/78] gnu: soundconverter: Use HTTPS home page. * gnu/packages/gnome.scm (soundconverter)[home-page]: Use HTTPS. --- gnu/packages/gnome.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 336d10c923..05d3125bd8 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -9254,7 +9254,7 @@ (define-public soundconverter ("python-pygobject" ,python-pygobject) ("gstreamer" ,gstreamer) ("gst-plugins-base" ,gst-plugins-base))) - (home-page "http://soundconverter.org/") + (home-page "https://soundconverter.org/") (synopsis "Convert between audio formats with a graphical interface") (description "SoundConverter supports converting between many audio formats including From 0087a2506fcc78b5bdd6197a841ae04826e34ebd Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 00:44:41 +0100 Subject: [PATCH 40/78] gnu: rocksdb: Use HTTPS home page. * gnu/packages/databases.scm (rocksdb)[home-page]: Use HTTPS. --- gnu/packages/databases.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index c8d12f43b5..9d42ba75fa 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1220,7 +1220,7 @@ (define-public rocksdb ("lz4" ,lz4) ("snappy" ,snappy) ("zlib" ,zlib))) - (home-page "http://rocksdb.org/") + (home-page "https://rocksdb.org/") (synopsis "Persistent key-value store for fast storage") (description "RocksDB is a library that forms the core building block for a fast From 68ad2a785e7bc11f7a9fcffbfa1b4a3c4ac7192f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 00:46:11 +0100 Subject: [PATCH 41/78] gnu: dfu-programmer: Use HTTPS home page. * gnu/packages/flashing-tools.scm (dfu-programmer)[home-page]: Use HTTPS. --- gnu/packages/flashing-tools.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/flashing-tools.scm b/gnu/packages/flashing-tools.scm index f993912838..8e36da22ed 100644 --- a/gnu/packages/flashing-tools.scm +++ b/gnu/packages/flashing-tools.scm @@ -169,7 +169,7 @@ (define-public dfu-programmer `(("pkg-config" ,pkg-config))) (inputs `(("libusb" ,libusb))) - (home-page "http://dfu-programmer.github.io/") + (home-page "https://dfu-programmer.github.io/") (synopsis "Device firmware update programmer for Atmel chips") (description "Dfu-programmer is a multi-platform command-line programmer for From 76dc85e48c582deeb885e1120c45e9f8a981b4e8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 01:24:52 +0100 Subject: [PATCH 42/78] gnu: emulation-station: Use HTTPS home page. * gnu/packages/emulators.scm (emulation-station)[home-page]: Use HTTPS. --- gnu/packages/emulators.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 7b82c91a58..7e4c98fbc7 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -308,7 +308,7 @@ (define-public emulation-station number of video game console emulators. It features an interface that is usable with any game controller that has at least 4 buttons, theming support, and a game metadata scraper.") - (home-page "http://www.emulationstation.org") + (home-page "https://emulationstation.org") (license license:expat)))) ;; Note: higan v107 has been released, but as explained by the dialog that From 6c82576e6da2e3e73a9a3a58ab11c9629cbf8cf9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 01:10:37 +0100 Subject: [PATCH 43/78] gnu: grue-hunter: Use HTTPS home page. * gnu/packages/games.scm (grue-hunter)[home-page]: Use HTTPS. --- gnu/packages/games.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 340e758a95..b9ba8829a0 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -3486,7 +3486,7 @@ (define-public grue-hunter ("tar" ,tar) ("gzip" ,gzip) ("tarball" ,source))) - (home-page "http://jxself.org/grue-hunter.shtml") + (home-page "https://jxself.org/grue-hunter.shtml") (synopsis "Text adventure game") (description "Grue Hunter is a text adventure game written in Perl. You must make From 6ef143ef6ea7a6f7009d3d33e03d49e439877cc4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 01:18:28 +0100 Subject: [PATCH 44/78] gnu: fortune-mod: Use HTTPS home page. * gnu/packages/games.scm (fortune-mod)[home-page]: Use HTTPS. --- gnu/packages/games.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index b9ba8829a0..9b4ff4df9a 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -6094,7 +6094,7 @@ (define-public fortune-mod ("perl-test-runvalgrind" ,perl-test-runvalgrind) ("cmake-rules" ,shlomif-cmake-modules) ("rinutils" ,rinutils))) - (home-page "http://www.shlomifish.org/open-source/projects/fortune-mod/") + (home-page "https://www.shlomifish.org/open-source/projects/fortune-mod/") (synopsis "The Fortune Cookie program from BSD games") (description "Fortune is a command-line utility which displays a random quotation from a collection of quotes.") From ec63b5a4c7a593986437c7677f844506f422c852 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 11 Mar 2020 03:23:50 +0100 Subject: [PATCH 45/78] gnu: you-get: Update to 0.4.1410. * gnu/packages/video.scm (you-get): Update to 0.4.1410. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index c54b5ec64c..41e6835baf 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1687,7 +1687,7 @@ (define-public youtube-dl-gui (define-public you-get (package (name "you-get") - (version "0.4.1403") + (version "0.4.1410") (source (origin (method git-fetch) (uri (git-reference @@ -1696,7 +1696,7 @@ (define-public you-get (file-name (git-file-name name version)) (sha256 (base32 - "04viy19x4g9dngml82nf9j94ys3p47bs62c2q2cn1barkybaa3as")))) + "1v4lfldcijgngg0s4q5w4ixa0k8k75dwmkhf57pgb31bqlrr8h0s")))) (build-system python-build-system) (inputs `(("ffmpeg" ,ffmpeg))) ; for multi-part and >=1080p videos From d4c09245ec4c1ecc744a38ac156e37276eabcb92 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 11 Mar 2020 03:51:34 +0100 Subject: [PATCH 46/78] gnu: desktop-file-utils: Don't use NAME in source URI. * gnu/packages/freedesktop.scm (desktop-file-utils)[source]: Hard-code NAME. --- gnu/packages/freedesktop.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 63bfdf8a97..46b6877d5f 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -1389,8 +1389,9 @@ (define-public desktop-file-utils (version "0.23") (source (origin (method url-fetch) - (uri (string-append "https://www.freedesktop.org/software/" name - "/releases/" name "-" version ".tar.xz")) + (uri (string-append "https://www.freedesktop.org/software/" + "desktop-file-utils/releases/" + "desktop-file-utils-" version ".tar.xz")) (sha256 (base32 "119kj2w0rrxkhg4f9cf5waa55jz1hj8933vh47vcjipcplql02bc")))) From 8b6d893d1783684f7516094fc87108430856ea4c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 11 Mar 2020 03:51:39 +0100 Subject: [PATCH 47/78] gnu: desktop-file-utils: Update to 0.24. * gnu/packages/freedesktop.scm (desktop-file-utils): Update to 0.24. --- gnu/packages/freedesktop.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 46b6877d5f..02adf8eedd 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -1386,7 +1386,7 @@ (define-public fprintd (define-public desktop-file-utils (package (name "desktop-file-utils") - (version "0.23") + (version "0.24") (source (origin (method url-fetch) (uri (string-append "https://www.freedesktop.org/software/" @@ -1394,7 +1394,7 @@ (define-public desktop-file-utils "desktop-file-utils-" version ".tar.xz")) (sha256 (base32 - "119kj2w0rrxkhg4f9cf5waa55jz1hj8933vh47vcjipcplql02bc")))) + "1nc3bwjdrpcrkbdmzvhckq0yngbcxspwj2n1r7jr3gmx1jk5vpm1")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) From d716a4742a3c8e3e7add8bb335fd27cd7053d971 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 01:21:49 +0100 Subject: [PATCH 48/78] gnu: t1lib: Use HTTPS home page. * gnu/packages/fontutils.scm (t1lib)[home-page]: Use HTTPS. --- gnu/packages/fontutils.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index 3daa5187b9..7455d3381a 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -383,7 +383,7 @@ (define-public t1lib metric information. But t1lib is in itself entirely independent of the X11-system or any other graphical user interface.") (license license:gpl2) - (home-page "http://www.t1lib.org/"))) + (home-page "https://www.t1lib.org/"))) (define-public teckit (package From e4b5bdf7993590fefeb7182ae71beec4a9f69e3f Mon Sep 17 00:00:00 2001 From: Roel Janssen Date: Wed, 11 Mar 2020 09:31:26 +0100 Subject: [PATCH 49/78] gnu: r-ggsignif: Fix build. * gnu/packages/cran.scm (r-ggsignif): Add knitr to native-inputs in order to build the vignette. --- gnu/packages/cran.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index f6be0d387b..8cc904612d 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5843,6 +5843,8 @@ (define-public r-ggsignif (base32 "17j9hg967k1wp9xw3x84mqss58jkb8pvlrnlchz4i1hklgykxqbg")))) (build-system r-build-system) + (native-inputs + `(("r-knitr" ,r-knitr))) (propagated-inputs `(("r-ggplot2" ,r-ggplot2))) (home-page "https://github.com/const-ae/ggsignif") From f255a193bef98ba9d41f2d83a379f5e17f72df62 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Wed, 11 Mar 2020 12:07:19 +0100 Subject: [PATCH 50/78] gnu: docker: Update to 19.03.7. * gnu/packages/docker.scm (docker): Update to 19.03.7. (docker-cli): Update to 19.03.7. --- gnu/packages/docker.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index b23e067888..7524a0dc1b 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -46,7 +46,7 @@ (define-module (gnu packages docker) #:use-module (gnu packages version-control) #:use-module (gnu packages virtualization)) -(define %docker-version "19.03.5") +(define %docker-version "19.03.7") (define-public python-docker-py (package @@ -315,7 +315,7 @@ (define-public docker (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1dlknwn0fh82nbzdzxdk6pfhqwph9vcw3vs3111wfr19y5hwncq9")) + (base32 "1sik109lxmiwgrsnvfip1nnal1xkh8z1mlvys6aknjyh29ll1iq8")) (patches (search-patches "docker-fix-tests.patch")))) (build-system gnu-build-system) @@ -588,7 +588,7 @@ (define-public docker-cli (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "07ldz46y74b3la4ah65v5bzbfx09yy6kncvxrr0zfx0s1214ar3m")))) + (base32 "164l33npy8acdbbrz8vcyiwx18vi55wwwikkasg0w43b5bdhz8sx")))) (build-system go-build-system) (arguments `(#:import-path "github.com/docker/cli" From 2bc5d5d57e47079873d2683edef9e7ce9249b83f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 11 Mar 2020 15:07:27 +0200 Subject: [PATCH 51/78] gnu: python-ipython: Declare python2 variant. * gnu/packages/python-xyz.scm (python-ipython)[properties]: Declare python2-ipython as the python2- variant. --- gnu/packages/python-xyz.scm | 127 ++++++++++++++++++------------------ 1 file changed, 64 insertions(+), 63 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 55a8046488..b50946d5fa 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5562,69 +5562,6 @@ (define-public python-backcall callback signature using a prototype function.") (license license:bsd-3))) -;; 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. -(define-public python2-ipython - (package - (name "python2-ipython") - (version "5.8.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "ipython" version ".tar.gz")) - (sha256 - (base32 "01l93i4hspf0lvhmycvc8j378bslm9rw30mwfspsl6v1ayc69b2b")))) - (build-system python-build-system) - (propagated-inputs - `(("python2-backports-shutil-get-terminal-size" - ,python2-backports-shutil-get-terminal-size) - ("python2-pathlib2" ,python2-pathlib2) - ("python2-pyzmq" ,python2-pyzmq) - ("python2-prompt-toolkit" ,python2-prompt-toolkit-1) - ("python2-terminado" ,python2-terminado) - ("python2-matplotlib" ,python2-matplotlib) - ("python2-numpy" ,python2-numpy) - ("python2-numpydoc" ,python2-numpydoc) - ("python2-jinja2" ,python2-jinja2) - ("python2-mistune" ,python2-mistune) - ("python2-pexpect" ,python2-pexpect) - ("python2-pickleshare" ,python2-pickleshare) - ("python2-simplegeneric" ,python2-simplegeneric) - ("python2-jsonschema" ,python2-jsonschema) - ("python2-traitlets" ,python2-traitlets) - ("python2-nbformat" ,python2-nbformat) - ("python2-pygments" ,python2-pygments))) - (inputs - `(("readline" ,readline) - ("which" ,which))) - (native-inputs - `(("graphviz" ,graphviz) - ("pkg-config" ,pkg-config) - ("python2-requests" ,python2-requests) ;; for tests - ("python2-testpath" ,python2-testpath) - ("python2-mock" ,python2-mock) - ("python2-nose" ,python2-nose))) - (arguments - `(#:python ,python-2 - #:phases - (modify-phases %standard-phases - (add-before 'check 'delete-broken-tests - (lambda* (#:key inputs #:allow-other-keys) - ;; These tests throw errors for unknown reasons. - (delete-file "IPython/core/tests/test_profile.py") - (delete-file "IPython/core/tests/test_interactiveshell.py") - (delete-file "IPython/core/tests/test_magic.py") - #t))))) - (home-page "https://ipython.org") - (synopsis "IPython is a tool for interactive computing in Python") - (description - "IPython provides a rich architecture for interactive computing with: -Powerful interactive shells, a browser-based notebook, support for interactive -data visualization, embeddable interpreters and tools for parallel -computing.") - (license license:bsd-3))) - (define-public python-ipython (package (name "python-ipython") @@ -5707,6 +5644,70 @@ (define-public python-ipython "IPython provides a rich architecture for interactive computing with: Powerful interactive shells, a browser-based notebook, support for interactive data visualization, embeddable interpreters and tools for parallel +computing.") + (properties `((python2-variant . ,(delay python2-ipython)))) + (license license:bsd-3))) + +;; 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. +(define-public python2-ipython + (package + (name "python2-ipython") + (version "5.8.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "ipython" version ".tar.gz")) + (sha256 + (base32 "01l93i4hspf0lvhmycvc8j378bslm9rw30mwfspsl6v1ayc69b2b")))) + (build-system python-build-system) + (propagated-inputs + `(("python2-backports-shutil-get-terminal-size" + ,python2-backports-shutil-get-terminal-size) + ("python2-pathlib2" ,python2-pathlib2) + ("python2-pyzmq" ,python2-pyzmq) + ("python2-prompt-toolkit" ,python2-prompt-toolkit-1) + ("python2-terminado" ,python2-terminado) + ("python2-matplotlib" ,python2-matplotlib) + ("python2-numpy" ,python2-numpy) + ("python2-numpydoc" ,python2-numpydoc) + ("python2-jinja2" ,python2-jinja2) + ("python2-mistune" ,python2-mistune) + ("python2-pexpect" ,python2-pexpect) + ("python2-pickleshare" ,python2-pickleshare) + ("python2-simplegeneric" ,python2-simplegeneric) + ("python2-jsonschema" ,python2-jsonschema) + ("python2-traitlets" ,python2-traitlets) + ("python2-nbformat" ,python2-nbformat) + ("python2-pygments" ,python2-pygments))) + (inputs + `(("readline" ,readline) + ("which" ,which))) + (native-inputs + `(("graphviz" ,graphviz) + ("pkg-config" ,pkg-config) + ("python2-requests" ,python2-requests) ;; for tests + ("python2-testpath" ,python2-testpath) + ("python2-mock" ,python2-mock) + ("python2-nose" ,python2-nose))) + (arguments + `(#:python ,python-2 + #:phases + (modify-phases %standard-phases + (add-before 'check 'delete-broken-tests + (lambda* (#:key inputs #:allow-other-keys) + ;; These tests throw errors for unknown reasons. + (delete-file "IPython/core/tests/test_profile.py") + (delete-file "IPython/core/tests/test_interactiveshell.py") + (delete-file "IPython/core/tests/test_magic.py") + #t))))) + (home-page "https://ipython.org") + (synopsis "IPython is a tool for interactive computing in Python") + (description + "IPython provides a rich architecture for interactive computing with: +Powerful interactive shells, a browser-based notebook, support for interactive +data visualization, embeddable interpreters and tools for parallel computing.") (license license:bsd-3))) From 578e4cf465ffc2d235c8de1e847b51ad8c65715c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 11 Mar 2020 15:19:29 +0200 Subject: [PATCH 52/78] gnu: python2-ipykernel: Downgrade to 4.10.1. This is the last version actually supported by ipykernel. * gnu/packages/python-xyz.scm (python2-ipython): Downgrade to 4.10.1. [arguments]: Remove custom 'check phase. [propagated-inputs]: Add python2-tornado, python2-traitlets. [native-inputs]: Add python2-mock, python2-pytest-cov. (python-ipykernel)[properties): Declare python2-ipykernel as the python2- variant. --- gnu/packages/python-xyz.scm | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index b50946d5fa..823e524192 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5479,36 +5479,34 @@ (define-public python-ipykernel (synopsis "IPython Kernel for Jupyter") (description "This package provides the IPython kernel for Jupyter.") + (properties `((python2-variant . ,(delay python2-ipykernel)))) (license license:bsd-3))) -;; Version 5.1.1 and above no longer support Python 2. +;; Version 5.x and above no longer support Python 2. (define-public python2-ipykernel (package (name "python2-ipykernel") - (version "5.1.0") + (version "4.10.1") (source (origin (method url-fetch) (uri (pypi-uri "ipykernel" version)) (sha256 - (base32 "0br95qhrd5k65g10djngiy27hs0642301hlf2q142i8djabvzh0g")))) + (base32 "1yzmdiy1djsszqp54jzd8ym8h4hpl67zjq83j2kxbkp0rwmlpdzf")))) (build-system python-build-system) (arguments - `(#:python ,python-2 - #:phases - (modify-phases %standard-phases - (replace 'check - (lambda _ - (setenv "HOME" "/tmp") - (invoke "pytest" "-v") - #t))))) + `(#:python ,python-2)) (propagated-inputs `(("python2-ipython" ,python2-ipython) ;; imported at runtime during connect - ("python2-jupyter-client" ,python2-jupyter-client))) + ("python2-jupyter-client" ,python2-jupyter-client) + ("python2-tornado" ,python2-tornado) + ("python2-traitlets" ,python2-traitlets))) (native-inputs - `(("python2-pytest" ,python2-pytest) - ("python2-nose" ,python2-nose))) + `(("python2-mock" ,python2-mock) + ("python2-nose" ,python2-nose) + ("python2-pytest" ,python2-pytest) + ("python2-pytest-cov" ,python2-pytest-cov))) (home-page "https://ipython.org") (synopsis "IPython Kernel for Jupyter") (description From ea2822d7d6bb7837e49dcf2a2c02396d8df4580c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 11 Mar 2020 15:43:50 +0200 Subject: [PATCH 53/78] gnu: Add python2-pyfaidx. * gnu/packages/bioinformatics.scm (python2-pyfaidx): New variable. --- gnu/packages/bioinformatics.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 54b85341a6..5c78f33005 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -13529,6 +13529,9 @@ (define-public python-pyfaidx fasta subsequences.") (license license:bsd-3))) +(define-public python2-pyfaidx + (package-with-python2 python-pyfaidx)) + (define-public python-cooler (package (name "python-cooler") From 173053790c27a7d67c712aa382620f933d0a0e60 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 11 Mar 2020 15:45:33 +0200 Subject: [PATCH 54/78] gnu: python-pyfaidx: Update to 0.5.8. * gnu/packages/bioinformatics.scm (python-pyfaidx): Update to 0.5.8. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 5c78f33005..830fd7433a 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -13511,14 +13511,14 @@ (define-public python-pypairix (define-public python-pyfaidx (package (name "python-pyfaidx") - (version "0.5.7") + (version "0.5.8") (source (origin (method url-fetch) (uri (pypi-uri "pyfaidx" version)) (sha256 (base32 - "02jvdx3ksy6w5gd29i1d0g0zsabbz7c14qg482ff7pza6sdl0b2i")))) + "038xi3a6zvrxbyyfpp64ka8pcjgsdq4fgw9cl5lpxbvmm1bzzw2q")))) (build-system python-build-system) (propagated-inputs `(("python-six" ,python-six))) From afb877847bd01edbbe0b0d7b5c4e765fc8068040 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 11 Mar 2020 16:23:52 +0200 Subject: [PATCH 55/78] gnu: Add python2-pygraphviz. * gnu/packages/graphviz.scm (python2-pygraphviz): New variable. --- gnu/packages/graphviz.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnu/packages/graphviz.scm b/gnu/packages/graphviz.scm index c4f88caa88..06216418fe 100644 --- a/gnu/packages/graphviz.scm +++ b/gnu/packages/graphviz.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2015 Ludovic Courtès -;;; Copyright © 2015 Efraim Flashner +;;; Copyright © 2015, 2020 Efraim Flashner ;;; Copyright © 2016 Theodoros Foradis ;;; Copyright © 2017, 2018, 2019 Ricardo Wurmus ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice @@ -236,6 +236,9 @@ (define-public python-pygraphviz structure and layout algorithms.") (license license:bsd-3))) +(define-public python2-pygraphviz + (package-with-python2 python-pygraphviz)) + (define-public gts (package (name "gts") From d9a2a255f9918c07f89dbe9ae62ba063fa70ffef Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 11 Mar 2020 16:31:33 +0200 Subject: [PATCH 56/78] gnu: python-pybedtools: Update to 0.8.1. * gnu/packages/bioinformatics.scm (python-pybedtools): Update to 0.8.1. [arguments]: Add another test to the 'disable-broken-tests phase. (python2-pybedtools)[native-inputs]: Add python2-pathlib. --- gnu/packages/bioinformatics.scm | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 830fd7433a..d95b58b0bb 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -785,13 +785,13 @@ (define-public bioawk (define-public python-pybedtools (package (name "python-pybedtools") - (version "0.8.0") + (version "0.8.1") (source (origin (method url-fetch) (uri (pypi-uri "pybedtools" version)) (sha256 (base32 - "1xl454ijvd4dzfvqgfahad49b49j7qy710fq9xh1rvk42z6x5ssf")))) + "14w5i40gi25clrr7h4wa2pcpnyipya8hrqi7nq77553zc5wf0df0")))) (build-system python-build-system) (arguments `(#:modules ((ice-9 ftw) @@ -818,6 +818,10 @@ (define-public python-pybedtools ;; (see: https://github.com/daler/pybedtools/issues/192). (("def test_getting_example_beds") "def _do_not_test_getting_example_beds")) + ;; This issue still occurs on python2 + (substitute* "pybedtools/test/test_issues.py" + (("def test_issue_303") + "def _test_issue_303")) #t)) ;; TODO: Remove phase after it's part of PYTHON-BUILD-SYSTEM. ;; build system. @@ -886,7 +890,12 @@ (define (cythonized? c/c++-file) (license license:gpl2+))) (define-public python2-pybedtools - (package-with-python2 python-pybedtools)) + (let ((pybedtools (package-with-python2 python-pybedtools))) + (package + (inherit pybedtools) + (native-inputs + `(("python2-pathlib" ,python2-pathlib) + ,@(package-native-inputs pybedtools)))))) (define-public python-biom-format (package From e05ce17dbc96f5cc9edecccf4587867a16b1489a Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Tue, 10 Mar 2020 21:57:35 +0000 Subject: [PATCH 57/78] gnu: Add phodav. * gnu/packages/gnome.scm (phodav): New variable. Signed-off-by: Danny Milosavljevic --- gnu/packages/gnome.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 05d3125bd8..86d0b8881c 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -246,6 +246,35 @@ (define-public brasero features to enable users to create their discs easily and quickly.") (license license:gpl2+))) +(define-public phodav + (package + (name "phodav") + (version "2.4") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1hxq8c5qfah3w7mxcyy3yhzdgswplll31a69p5mqdl04bsvw5pbx")))) + (build-system meson-build-system) + (native-inputs + `(("gettext" ,gettext-minimal) + ("glib:bin" ,glib "bin") + ("gtk-doc" ,gtk-doc) + ("pkg-config" ,pkg-config))) + (inputs + `(("avahi" ,avahi) + ("libgudev" ,libgudev) + ("libsoup" ,libsoup))) + (synopsis "WebDav server implementation using libsoup") + (description "PhoDav was initially developed as a file-sharing mechanism for Spice, +but it is generic enough to be reused in other projects, +in particular in the GNOME desktop.") + (home-page "https://wiki.gnome.org/phodav") + (license license:lgpl2.1+))) + (define-public gnome-color-manager (package (name "gnome-color-manager") From cdf00cf75d2e3ef68d016c3dc145bf9d12475023 Mon Sep 17 00:00:00 2001 From: Carl Dong Date: Wed, 11 Mar 2020 11:11:34 -0400 Subject: [PATCH 58/78] gnu: nsis: Update to 3.05. * gnu/packages/installers.scm (nsis): Update to 3.05. --- gnu/packages/installers.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/installers.scm b/gnu/packages/installers.scm index 9229359fdf..a8a5c36a18 100644 --- a/gnu/packages/installers.scm +++ b/gnu/packages/installers.scm @@ -34,14 +34,14 @@ (define (make-nsis machine target-arch nsis-target-type) (xgcc (cross-gcc triplet #:libc xlibc))) (package (name (string-append "nsis-" machine)) - (version "3.04") + (version "3.05") (source (origin (method url-fetch) (uri (string-append "http://prdownloads.sourceforge.net/nsis/nsis-" version "-src.tar.bz2")) (sha256 (base32 - "1xgllk2mk36ll2509hd31mfq6blgncmdzmwxj3ymrwshdh23d5b0")) + "1sbwx5vzpddharkb7nj4q5z3i5fbg4lan63ng738cw4hmc4v7qdn")) (patches (search-patches "nsis-env-passthru.patch")))) (build-system scons-build-system) (native-inputs `(("xgcc" ,xgcc) From e8df88003d47d50e93f5d23d250e1ec279f37525 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 11 Mar 2020 17:44:06 +0100 Subject: [PATCH 59/78] gnu: gnutls@3.6.10: Add dependency on datefudge and util-linux. * gnu/packages/tls.scm (gnutls-3.6.10)[native-inputs]: New field. --- gnu/packages/tls.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index b8adf23d44..c8eea9c928 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2016, 2017, 2018 ng0 ;;; Copyright © 2016 Hartmut Goebel ;;; Copyright © 2017 Ricardo Wurmus -;;; Copyright © 2017, 2018, 2019 Marius Bakke +;;; Copyright © 2017, 2018, 2019, 2020 Marius Bakke ;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2017 Rutger Helling ;;; Copyright © 2018 Clément Lassieur @@ -276,7 +276,14 @@ (define gnutls-3.6.10 "/gnutls-" version ".tar.xz")) (sha256 (base32 - "14r2h73yfj66cm14k9mnb3kgzq5a7qjg5b31m53bf19vcxkwmwxi")))))) + "14r2h73yfj66cm14k9mnb3kgzq5a7qjg5b31m53bf19vcxkwmwxi")))) + (native-inputs + `(,@(package-native-inputs gnutls) + + ;; Datefudge is used to fuzz time for tests, and its presence + ;; enables a test that uses 'setsid' from util-linux. + ("datefudge" ,datefudge) + ("util-linux" ,util-linux))))) (define-public guile3.0-gnutls (package From 10c2ca9e4ab1925e7a6791627dd60e843aff28ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C4=83d=C4=83lin=20Ionel=20Patra=C8=99cu?= Date: Wed, 11 Mar 2020 17:53:17 +0100 Subject: [PATCH 60/78] gnu: Add r-hrbrthemes. * gnu/packages/cran.scm (r-hrbrthemes): New variable. Signed-off-by: Ricardo Wurmus --- gnu/packages/cran.scm | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 8cc904612d..4ef2f922ec 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -10,7 +10,7 @@ ;;; Copyright © 2018 Sandeep Subramanian ;;; Copyright © 2018 Charlie Ritter ;;; Copyright © 2018 Konrad Hinsen -;;; Copyright © 2018 Mădălin Ionel Patrașcu +;;; Copyright © 2018, 2020 Mădălin Ionel Patrașcu ;;; Copyright © 2018 Laura Lazzati ;;; Copyright © 2018 Leo Famulari ;;; Copyright © 2018 Marius Bakke @@ -20752,3 +20752,34 @@ (define-public r-ppcor calculate the higher-order partial and semi-partial correlations but also with statistics and p-values of the correlation coefficients.") (license license:gpl2))) + +(define-public r-hrbrthemes + (package + (name "r-hrbrthemes") + (version "0.8.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "hrbrthemes" version)) + (sha256 + (base32 "057h60b5p53dcyjyfwlgjc1ry968s9s64dw78p443w8717zk7zpc")))) + (properties `((upstream-name . "hrbrthemes"))) + (build-system r-build-system) + (propagated-inputs + `(("r-extrafont" ,r-extrafont) + ("r-gdtools" ,r-gdtools) + ("r-ggplot2" ,r-ggplot2) + ("r-htmltools" ,r-htmltools) + ("r-knitr" ,r-knitr) + ("r-magrittr" ,r-magrittr) + ("r-rmarkdown" ,r-rmarkdown) + ("r-scales" ,r-scales))) + (native-inputs + `(("r-knitr" ,r-knitr))) + (home-page "https://github.com/hrbrmstr/hrbrthemes/") + (synopsis "Additional themes, theme components and utilities for @code{ggplot2}") + (description + "This package provides a compilation of extra @code{ggplot2} themes, +scales and utilities, including a spell check function for plot label fields +and an overall emphasis on typography.") + (license license:expat))) From 3c1ea8dcef3342dba9fb1456effb31eb106a189a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 11 Mar 2020 16:07:04 +0100 Subject: [PATCH 61/78] ui: Restore line wrapping for 'package->recutils'. Fixes a regression introduced when switching to Guile 3.0.0 whereby monkey-patching 'wrap*' wouldn't have any effects due to inlining. * guix/ui.scm (%text-width): Define in terms of the '*line-width*' fluid when it's defined. : Set (@@ (texinfo plain-text) wrap*) only when '*line-width*' is undefined. --- guix/ui.scm | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/guix/ui.scm b/guix/ui.scm index fbe2b70485..6f1ca9c0b2 100644 --- a/guix/ui.scm +++ b/guix/ui.scm @@ -1218,16 +1218,23 @@ (define (maybe-break chr result) ;;; (define %text-width - (make-parameter (terminal-columns))) + ;; '*line-width*' was introduced in Guile 2.2.7/3.0.1. On older versions of + ;; Guile, monkey-patch 'wrap*' below. + (if (defined? '*line-width*) + (let ((parameter (fluid->parameter *line-width*))) + (parameter (terminal-columns)) + parameter) + (make-parameter (terminal-columns)))) -(set! (@@ (texinfo plain-text) wrap*) - ;; XXX: Monkey patch this private procedure to let 'package->recutils' - ;; parameterize the fill of description field correctly. - (lambda strings - (let ((indent (fluid-ref (@@ (texinfo plain-text) *indent*)))) - (fill-string (string-concatenate strings) - #:line-width (%text-width) #:initial-indent indent - #:subsequent-indent indent)))) +(unless (defined? '*line-width*) ;Guile < 2.2.7 + (set! (@@ (texinfo plain-text) wrap*) + ;; XXX: Monkey patch this private procedure to let 'package->recutils' + ;; parameterize the fill of description field correctly. + (lambda strings + (let ((indent (fluid-ref (@@ (texinfo plain-text) *indent*)))) + (fill-string (string-concatenate strings) + #:line-width (%text-width) #:initial-indent indent + #:subsequent-indent indent))))) (define (texi->plain-text str) "Return a plain-text representation of texinfo fragment STR." From e688c2df3924423b67892cc9939ca099c729d1cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 11 Mar 2020 16:13:03 +0100 Subject: [PATCH 62/78] build: Require Guile 2.2.3 or later. * configure.ac: For 2.2.x, require 2.2.3 or later. --- configure.ac | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 06e86c209f..6a6a020585 100644 --- a/configure.ac +++ b/configure.ac @@ -96,7 +96,11 @@ dnl 'GUILE_EFFECTIVE_VERSION'. GUILE_PKG([3.0 2.2]) GUILE_PROGS if test "x$GUILD" = "x"; then - AC_MSG_ERROR(['guild' binary not found; please check your guile-2.x installation.]) + AC_MSG_ERROR(['guild' binary not found; please check your Guile installation.]) +fi + +if test "x$GUILE_EFFECTIVE_VERSION" = "x2.2"; then + PKG_CHECK_MODULES([GUILE], [guile-2.2 >= 2.2.3]) fi dnl Installation directories for .scm and .go files. From d8a822f4620857bb31b24d71ff80840442ec694b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 11 Mar 2020 16:19:38 +0100 Subject: [PATCH 63/78] download: Remove (web http) workarounds no longer relevant. * guix/build/download.scm : Remove workarounds for and for . --- guix/build/download.scm | 129 ---------------------------------------- 1 file changed, 129 deletions(-) diff --git a/guix/build/download.scm b/guix/build/download.scm index 0f2d5f402a..c647d00f6b 100644 --- a/guix/build/download.scm +++ b/guix/build/download.scm @@ -457,135 +457,6 @@ (define (close-connection port) ;deprecated 'set-port-encoding! (lambda (p e) #f)) -;; XXX: Work around , fixed in Guile commit -;; 16050431f29d56f80c4a8253506fc851b8441840. Guile's date validation -;; procedure rejects dates in which the hour is not padded with a zero but -;; with whitespace. -(begin - (define-syntax string-match? - (lambda (x) - (syntax-case x () - ((_ str pat) (string? (syntax->datum #'pat)) - (let ((p (syntax->datum #'pat))) - #`(let ((s str)) - (and - (= (string-length s) #,(string-length p)) - #,@(let lp ((i 0) (tests '())) - (if (< i (string-length p)) - (let ((c (string-ref p i))) - (lp (1+ i) - (case c - ((#\.) ; Whatever. - tests) - ((#\d) ; Digit. - (cons #`(char-numeric? (string-ref s #,i)) - tests)) - ((#\a) ; Alphabetic. - (cons #`(char-alphabetic? (string-ref s #,i)) - tests)) - (else ; Literal. - (cons #`(eqv? (string-ref s #,i) #,c) - tests))))) - tests))))))))) - - (define (parse-rfc-822-date str space zone-offset) - (let ((parse-non-negative-integer (@@ (web http) parse-non-negative-integer)) - (parse-month (@@ (web http) parse-month)) - (bad-header (@@ (web http) bad-header))) - ;; We could verify the day of the week but we don't. - (cond ((string-match? (substring str 0 space) "aaa, dd aaa dddd dd:dd:dd") - (let ((date (parse-non-negative-integer str 5 7)) - (month (parse-month str 8 11)) - (year (parse-non-negative-integer str 12 16)) - (hour (parse-non-negative-integer str 17 19)) - (minute (parse-non-negative-integer str 20 22)) - (second (parse-non-negative-integer str 23 25))) - (make-date 0 second minute hour date month year zone-offset))) - ((string-match? (substring str 0 space) "aaa, d aaa dddd dd:dd:dd") - (let ((date (parse-non-negative-integer str 5 6)) - (month (parse-month str 7 10)) - (year (parse-non-negative-integer str 11 15)) - (hour (parse-non-negative-integer str 16 18)) - (minute (parse-non-negative-integer str 19 21)) - (second (parse-non-negative-integer str 22 24))) - (make-date 0 second minute hour date month year zone-offset))) - - ;; The next two clauses match dates that have a space instead of - ;; a leading zero for hours, like " 8:49:37". - ((string-match? (substring str 0 space) "aaa, dd aaa dddd d:dd:dd") - (let ((date (parse-non-negative-integer str 5 7)) - (month (parse-month str 8 11)) - (year (parse-non-negative-integer str 12 16)) - (hour (parse-non-negative-integer str 18 19)) - (minute (parse-non-negative-integer str 20 22)) - (second (parse-non-negative-integer str 23 25))) - (make-date 0 second minute hour date month year zone-offset))) - ((string-match? (substring str 0 space) "aaa, d aaa dddd d:dd:dd") - (let ((date (parse-non-negative-integer str 5 6)) - (month (parse-month str 7 10)) - (year (parse-non-negative-integer str 11 15)) - (hour (parse-non-negative-integer str 17 18)) - (minute (parse-non-negative-integer str 19 21)) - (second (parse-non-negative-integer str 22 24))) - (make-date 0 second minute hour date month year zone-offset))) - - (else - (bad-header 'date str) ; prevent tail call - #f)))) - (module-set! (resolve-module '(web http)) - 'parse-rfc-822-date parse-rfc-822-date)) - -;; XXX: Work around broken proxy handling on Guile 2.2 <= 2.2.2, fixed in -;; Guile commits 7d0d9e2c25c1e872cfc7d14ab5139915f1813d56 and -;; 6ad28ae3bc6a6d9e95ab7d70510d12c97673a143. See bug report at -;; . -(cond-expand - (guile-2.2 - (when (<= (string->number (micro-version)) 2) - (let () - (define put-symbol (@@ (web http) put-symbol)) - (define put-non-negative-integer - (@@ (web http) put-non-negative-integer)) - (define write-http-version - (@@ (web http) write-http-version)) - - (define (write-request-line method uri version port) - "Write the first line of an HTTP request to PORT." - (put-symbol port method) - (put-char port #\space) - (when (http-proxy-port? port) - (let ((scheme (uri-scheme uri)) - (host (uri-host uri)) - (host-port (uri-port uri))) - (when (and scheme host) - (put-symbol port scheme) - (put-string port "://") - (cond - ((string-index host #\:) ;<---- The fix is here! - (put-char port #\[) ;<---- And here! - (put-string port host) - (put-char port #\])) - (else - (put-string port host))) - (unless ((@@ (web uri) default-port?) scheme host-port) - (put-char port #\:) - (put-non-negative-integer port host-port))))) - (let ((path (uri-path uri)) - (query (uri-query uri))) - (if (string-null? path) - (put-string port "/") - (put-string port path)) - (when query - (put-string port "?") - (put-string port query))) - (put-char port #\space) - (write-http-version version port) - (put-string port "\r\n")) - - (module-set! (resolve-module '(web http)) 'write-request-line - write-request-line)))) - (else #t)) - (define (resolve-uri-reference ref base) "Resolve the URI reference REF, interpreted relative to the BASE URI, into a target URI, according to the algorithm specified in RFC 3986 section 5.2.2. From 51f187bee54d84c4a5000feaf25452bc339b660b Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Wed, 4 Mar 2020 16:31:51 +0100 Subject: [PATCH 64/78] gnu: Add clipnotify. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/xdisorg.scm (clipnotify): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/xdisorg.scm | 48 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index f46ba6714c..5d1a259bad 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -33,6 +33,7 @@ ;;; Copyright © 2020 David Wilson ;;; Copyright © 2020 Ivan Vilata i Balaguer ;;; Copyright © 2020 Brice Waegeneire +;;; Copyright © 2020 Damien Cassou ;;; ;;; This file is part of GNU Guix. ;;; @@ -2116,3 +2117,50 @@ (define-public xsettingsd not running. With a simple @file{.xsettingsd} configuration file one can avoid configuring visual settings in different UI toolkits separately.") (license license:bsd-3))) + +(define-public clipnotify + (package + (name "clipnotify") + (version "1.0.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/cdown/clipnotify.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1v3ydm5ljy8z1savmdxrjyx7a5bm5013rzw80frp3qbbjaci0wbg")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (delete 'configure) + (replace 'install + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (doc (string-append %output "/share/doc/" ,name "-" ,version))) + (install-file "clipnotify" bin) + (install-file "README.md" doc) + #t)))) + #:make-flags (list "CC=gcc") + #:tests? #f)) + (inputs + `(("libx11" ,libx11) + ("libXfixes" ,libxfixes))) + (home-page "https://github.com/cdown/clipnotify") + (synopsis "Notify on new X clipboard events") + (description "@command{clipnotify} is a simple program that, using the +XFIXES extension to X11, waits until a new selection is available and then +exits. + +It was primarily designed for clipmenu, to avoid polling for new selections. + +@command{clipnotify} doesn't try to print anything about the contents of the +selection, it just exits when it changes. This is intentional -- X11's +selection API is verging on the insane, and there are plenty of others who +have already lost their sanity to bring us xclip/xsel/etc. Use one of those +tools to complement clipnotify.") + (license license:public-domain))) From ad2c0f5b090e5c267c826778094527b0dda707fc Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Thu, 5 Mar 2020 08:26:23 +0100 Subject: [PATCH 65/78] gnu: Add clipmenu. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/xdisorg.scm (clipmenu): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/xdisorg.scm | 65 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 5d1a259bad..bc36de565e 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -2164,3 +2164,68 @@ (define-public clipnotify have already lost their sanity to bring us xclip/xsel/etc. Use one of those tools to complement clipnotify.") (license license:public-domain))) + +(define-public clipmenu + (let ((commit "a495bcc7a4ab125182a661c5808364f66938a87c") + (revision "1")) + (package + (name "clipmenu") + (version (string-append "5.6.0-" + revision "." (string-take commit 7))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/cdown/clipnotify.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "12vvircdhl4psqi51cnfd6bqy85v2vwfcmdq1mimjgng727nwzys")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-hardcoded-paths + (lambda _ + (substitute* "clipmenud" + (("has_clipnotify=0") + "has_clipnotify=1") + (("command -v clipnotify >/dev/null 2>&1 && has_clipnotify=1") + "") + (("clipnotify \\|\\| .*") + (string-append (which "clipnotify") "\n")) + (("xsel --logfile") + (string-append (which "xsel") " --logfile"))) + (substitute* "clipmenu" + (("xsel --logfile") + (string-append (which "xsel") " --logfile"))) + #t)) + (delete 'configure) + (delete 'build) + (replace 'install + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (doc (string-append %output "/share/doc/" + ,name "-" ,version))) + (install-file "clipdel" bin) + (install-file "clipmenu" bin) + (install-file "clipmenud" bin) + (install-file "README.md" doc) + #t)))) + #:tests? #f)) + (inputs + `(("clipnotify" ,clipnotify) + ("xsel" ,xsel))) + (home-page "https://github.com/cdown/clipmenu") + (synopsis "Simple clipboard manager using dmenu or rofi and xsel") + (description "Start @command{clipmenud}, then run @command{clipmenu} to +select something to put on the clipboard. + +When @command{clipmenud} detects changes to the clipboard contents, it writes +them out to the cache directory. @command{clipmenu} reads the cache directory +to find all available clips and launches @command{dmenu} (or @command{rofi}, +depending on the value of @code{CM_LAUNCHER}) to let the user select a clip. +After selection, the clip is put onto the PRIMARY and CLIPBOARD X selections.") + (license license:public-domain)))) From 1ed3b845f7cc7ead43332b61c750b8ec0dee6960 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 11 Mar 2020 18:56:46 +0100 Subject: [PATCH 66/78] gnu: python-multidict: Update to 4.7.5. * gnu/packages/python-xyz.scm (python-multidict): Update to 4.7.5. [arguments]: New field. [native-inputs]: Remove PYTHON-PYTEST-RUNNER. Add PYTHON-PYTEST-COV. --- gnu/packages/python-xyz.scm | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 823e524192..15b5dcaa74 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -4388,18 +4388,37 @@ (define-public python2-pycodestyle (define-public python-multidict (package (name "python-multidict") - (version "4.2.0") + (version "4.7.5") (source (origin (method url-fetch) (uri (pypi-uri "multidict" version)) (sha256 (base32 - "1vf5bq8hn5a9rvhr5v4fwbmarfsp35hhr8gs74kqfijy34j2f194")))) + "07ikq2c72kd263hpldw55y0px2l3g34hjk66ml9lryh1jv287qmf")))) (build-system python-build-system) + (arguments + '(#:modules ((ice-9 ftw) + (srfi srfi-1) + (srfi srfi-26) + (guix build utils) + (guix build python-build-system)) + #:phases (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (if tests? + (begin + (let ((libdir (find (cut string-prefix? "lib." <>) + (scandir "build")))) + (setenv "PYTHONPATH" + (string-append "./build/" libdir ":" + (getenv "PYTHONPATH"))) + (invoke "pytest" "-vv"))) + (format #t "test suite not run~%")) + #t))))) (native-inputs `(("python-pytest" ,python-pytest) - ("python-pytest-runner" ,python-pytest-runner))) + ("python-pytest-cov" ,python-pytest-cov))) (home-page "https://github.com/aio-libs/multidict/") (synopsis "Multidict implementation") (description "Multidict is dict-like collection of key-value pairs From 805ac43c94da049284bdc9981a897a89770cf86b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 11 Mar 2020 18:58:48 +0100 Subject: [PATCH 67/78] gnu: zile: Fix cross-compilation. * gnu/packages/zile.scm (zile)[native-inputs]: Add THIS-PACKAGE when cross-compiling. [arguments]: Add phase when cross-compiling. --- gnu/packages/zile.scm | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/gnu/packages/zile.scm b/gnu/packages/zile.scm index eea0dba272..2718232e27 100644 --- a/gnu/packages/zile.scm +++ b/gnu/packages/zile.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2014 Eric Bavier ;;; Copyright © 2016 Efraim Flashner ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2020 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -51,7 +52,7 @@ (define-public zile "0x3byaddms8l3g7igx6njycqsq98wgapysdb5c7lhcnajlkp8y3s")))) (build-system gnu-build-system) (arguments - '(#:phases + `(#:phases (modify-phases %standard-phases (add-before 'configure 'patch-/bin/sh (lambda* (#:key inputs #:allow-other-keys) @@ -60,7 +61,18 @@ (define-public zile (substitute* '("lib/spawni.c" "src/funcs.c") (("/bin/sh") (string-append bash "/bin/sh"))) - #t)))))) + #t))) + ;; Zile generates its manual pages by calling the built Zile + ;; with the --help argument. That does not work when cross- + ;; compiling; use the native Zile added below in that case. + ,@(if (%current-target-system) + '((add-before 'build 'use-native-zile-for-documentation + (lambda _ + (substitute* "build-aux/zile-help2man-wrapper" + (("src/zile") + (which "zile"))) + #t))) + '())))) (inputs `(("boehm-gc" ,libgc) ("ncurses" ,ncurses) @@ -68,6 +80,11 @@ (define-public zile (native-inputs `(("perl" ,perl) ("help2man" ,help2man) + ;; When cross-compiling, Zile needs a native version of itself to + ;; generate the manual pages (see the related phase above). + ,@(if (%current-target-system) + `(("self" ,this-package)) + '()) ("pkg-config" ,pkg-config))) (home-page "https://www.gnu.org/software/zile/") (synopsis "Lightweight Emacs clone") From f8cbe98e65c9cabcad420f98c855aa20ac1a25a0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 11 Mar 2020 19:02:46 +0100 Subject: [PATCH 68/78] gnu: isc-dhcp: Fix cross-compilation. * gnu/packages/admin.scm (isc-dhcp)[arguments]: Set BUILD_CC in 'fix-bind-cross-compilation' phase. While at it, make the phase conditional on %CURRENT-TARGET-SYSTEM. --- gnu/packages/admin.scm | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 51a74302e4..0f27e6370b 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -18,7 +18,7 @@ ;;; Copyright © 2017 Ben Sturmfels ;;; Copyright © 2017 Ethan R. Jones ;;; Copyright © 2017 Christopher Allan Webber -;;; Copyright © 2017, 2018 Marius Bakke +;;; Copyright © 2017, 2018, 2020 Marius Bakke ;;; Copyright © 2018, 2019 Arun Isaac ;;; Copyright © 2018 Pierre-Antoine Rouby ;;; Copyright © 2018 Rutger Helling @@ -809,12 +809,17 @@ (define-public isc-dhcp (("^RELEASEVER=.*") (format #f "RELEASEVER=~a\n" ,bind-release-version))) #t)) - (add-before 'configure 'fix-bind-cross-compilation - (lambda _ - (substitute* "configure" - (("--host=\\$host") - "--host=$host_alias")) - #t)) + ,@(if (%current-target-system) + '((add-before 'configure 'fix-bind-cross-compilation + (lambda _ + (substitute* "configure" + (("--host=\\$host") + "--host=$host_alias")) + ;; BIND needs a native compiler because the DHCP + ;; build system uses the built 'gen' executable. + (setenv "BUILD_CC" "gcc") + #t))) + '()) (add-after 'configure 'post-configure (lambda* (#:key outputs #:allow-other-keys) ;; Point to the right client script, which will be From f7f67495ba0c2f08b0372e925725b4d196e037b6 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Wed, 11 Mar 2020 19:33:25 +0100 Subject: [PATCH 69/78] gnu: spatialite-gui: Fix GUI not showing up. * gnu/packages/geo.scm (spatialite-gui)[arguments]: Add 'fix-gui' phase. --- gnu/packages/geo.scm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 1346ebeb5f..05d177c3b1 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -561,6 +561,14 @@ (define-public spatialite-gui ("sqlite" ,sqlite) ("wxwidgets" ,wxwidgets-2) ("zlib" ,zlib))) + (arguments + `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'fix-gui + (lambda _ + ;; Fix for the GUI not showing up. + (substitute* "Main.cpp" + (("Hide\\(\\);") "")) + #t))))) (synopsis "Graphical user interface for SpatiaLite") (description "Spatialite-gui provides a visual interface for viewing and maintaining a spatialite database. You can easily see the structure of the From dfe15d9919ba74b28ec8adca8a88cc02ef8c43af Mon Sep 17 00:00:00 2001 From: Christopher Lemmer Webber Date: Wed, 11 Mar 2020 11:14:59 -0400 Subject: [PATCH 70/78] gnu: Add xa. * gnu/packages/assembly.scm (xa): New variable. --- gnu/packages/assembly.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/assembly.scm b/gnu/packages/assembly.scm index 0fdddc88e9..0a24220e18 100644 --- a/gnu/packages/assembly.scm +++ b/gnu/packages/assembly.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2019 Guy Fleury Iteriteka ;;; Copyright © 2019 Andy Tai ;;; Copyright © 2020 Jakub Kądziołka +;;; Copyright © 2020 Christopher Lemmer Webber ;;; ;;; This file is part of GNU Guix. ;;; @@ -342,3 +343,31 @@ (define-public wla-dx @item spc700 @end itemize") (license license:gpl2))) + +(define-public xa + (package + (name "xa") + (version "2.3.10") + (source (origin + (method url-fetch) + (uri (string-append "https://www.floodgap.com/retrotech/xa" + "/dists/xa-" version ".tar.gz")) + (sha256 + (base32 + "0y5sd247g11jfk5msxy91hz2nhpy7smj125dzfyfhjsjnqk5nyw6")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; TODO: custom test harness, not sure how it works + #:phases + (modify-phases %standard-phases + (delete 'configure)) ; no "configure" script + #:make-flags (list (string-append "DESTDIR=" (assoc-ref %outputs "out"))))) + (native-inputs `(("perl" ,perl))) + (home-page "https://www.floodgap.com/retrotech/xa/") + (synopsis "Two-pass portable cross-assembler") + (description + "xa is a high-speed, two-pass portable cross-assembler. +It understands mnemonics and generates code for NMOS 6502s (such +as 6502A, 6504, 6507, 6510, 7501, 8500, 8501, 8502 ...), + CMOS 6502s (65C02 and Rockwell R65C02) and the 65816.") + (license license:gpl2))) From c03fc422b933c97da088bbcb76236b119f29587c Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 11 Mar 2020 15:26:48 -0400 Subject: [PATCH 71/78] gnu: lpd8editor: Remove package. This package has not built successfully in several months. * gnu/packages/music.scm (lpd8editor): Remove variable. --- gnu/packages/music.scm | 36 ------------------------------------ 1 file changed, 36 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 8914db3b0e..3690af83d7 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -4615,42 +4615,6 @@ (define-public demlo @end itemize\n") (license license:expat)))) -(define-public lpd8editor - (package - (name "lpd8editor") - (version "0.0.13") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/charlesfleche/lpd8editor.git") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0lsz3v493ilq2zr016m7kvymrplxd0n3pqv1pjglpq1h7sjw9764")))) - (build-system gnu-build-system) - (arguments - '(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'setenv - (lambda _ - (setenv "INSTALL_PREFIX" - (assoc-ref %outputs "out")))) - (delete 'configure) ; no configure script - (add-before 'build 'qmake - (lambda _ (invoke "qmake")))))) - (native-inputs - `(("pkg-config" ,pkg-config))) - (inputs - `(("alsa" ,alsa-lib) - ("qtbase" ,qtbase) - ("qtsvg" ,qtsvg))) - (synopsis "Graphical editor for the Akai LPD8 MIDI controller") - (description "lpd8editor is a graphical patch editor for the Akai LPD8 MIDI -controller.") - (home-page "https://github.com/charlesfleche/lpd8editor") - (license license:expat))) - (define-public fmit (package (name "fmit") From ebd4c251780c29c6d0190e56b99462f93bf85c4b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 11 Mar 2020 21:49:00 +0100 Subject: [PATCH 72/78] gnu: python-contextlib2: Update to 0.6.0.post1. * gnu/packages/python-xyz.scm (python-contextlib2): Update to 0.6.0.post1. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 15b5dcaa74..d14d60693a 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8500,14 +8500,14 @@ (define-public python-argparse-manpage (define-public python-contextlib2 (package (name "python-contextlib2") - (version "0.5.5") + (version "0.6.0.post1") (source (origin (method url-fetch) (uri (pypi-uri "contextlib2" version)) (sha256 (base32 - "0j6ad6lwwyc9kv71skj098v5l7x5biyj2hs4lc5x1kcixqcr97sh")))) + "0bhnr2ac7wy5l85ji909gyljyk85n92w8pdvslmrvc8qih4r1x01")))) (build-system python-build-system) (home-page "https://contextlib2.readthedocs.org/") (synopsis "Tools for decorators and context managers") From 7815afc9580f8a1bcadc064d0a62db2ad176e1e9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 11 Mar 2020 21:49:38 +0100 Subject: [PATCH 73/78] gnu: python2-virtualenv: Fix build. * gnu/packages/python-xyz.scm (python-virtualenv)[properties]: New field. (python2-virtualenv)[propagated-inputs]: Add PYTHON2-CONTEXTLIB2. [arguments]: New field. --- gnu/packages/python-xyz.scm | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index d14d60693a..af2bb43169 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -2426,10 +2426,39 @@ (define-public python-virtualenv (synopsis "Virtual Python environment builder") (description "Virtualenv is a tool to create isolated Python environments.") + (properties `((python2-variant . ,(delay python2-virtualenv)))) (license license:expat))) (define-public python2-virtualenv - (package-with-python2 python-virtualenv)) + (let ((base (package-with-python2 (strip-python2-variant python-virtualenv)))) + (package + (inherit base) + (arguments + `(#:python ,python-2 + #:phases + (modify-phases %standard-phases + (add-after 'set-paths 'adjust-PYTHONPATH + (lambda* (#:key inputs #:allow-other-keys) + (let* ((python (assoc-ref inputs "python")) + (python-sitedir (string-append python "/lib/python2.7" + "/site-packages"))) + ;; XXX: 'python2' always comes first on PYTHONPATH + ;; and shadows the 'setuptools' input. Move python2 + ;; last: this should be fixed in python-build-system + ;; in a future rebuild cycle. + (setenv "PYTHONPATH" + (string-append (string-join (delete python-sitedir + (string-split + (getenv "PYTHONPATH") + #\:)) + ":") + ":" python-sitedir)) + (format #t "environment variable `PYTHONPATH' changed to `~a'~%" + (getenv "PYTHONPATH")) + #t)))))) + (propagated-inputs + `(("python-contextlib2" ,python2-contextlib2) + ,@(package-propagated-inputs base)))))) (define-public python-markupsafe (package From 6006727974c8adfe6eea198a0191c313b3089e4f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 11 Mar 2020 21:51:13 +0100 Subject: [PATCH 74/78] gnu: python-virtualenv: Update to 20.0.10. * gnu/packages/python-xyz.scm (python-virtualenv): Update to 20.0.10. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index af2bb43169..58d09ced57 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -2398,14 +2398,14 @@ (define-public python-vine (define-public python-virtualenv (package (name "python-virtualenv") - (version "20.0.8") + (version "20.0.10") (source (origin (method url-fetch) (uri (pypi-uri "virtualenv" version)) (sha256 (base32 - "096r7g5cv85vxymg9iqbn5z749613snlvd6p3rf1nxnrd386j0qz")))) + "0y6x41l3ja891993i4adylbbyly0r4m52n2d0a0y9y4h3lzyh4l5")))) (build-system python-build-system) (native-inputs `(("python-mock" ,python-mock) From 6bd7d4cb7488d345187090b9f393728c2865257e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 11 Mar 2020 22:24:38 +0100 Subject: [PATCH 75/78] gnu: python2-radon: Fix build. * gnu/packages/python-xyz.scm (python-radon)[properties]: New field. * gnu/packages/python-xyz.scm (python2-radon)[propagated-inputs]: Add PYTHON2-CONFIGPARSER and PYTHON2-FUTURE. --- gnu/packages/python-xyz.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 58d09ced57..eb40abe619 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -13459,10 +13459,17 @@ (define-public python-radon @item Halstead metrics (all of them) @item the Maintainability Index (a Visual Studio metric) @end itemize") + (properties `((python2-variant . ,(delay python2-radon)))) (license license:expat))) (define-public python2-radon - (package-with-python2 python-radon)) + (let ((base (package-with-python2 (strip-python2-variant python-radon)))) + (package + (inherit base) + (propagated-inputs + `(("python-configparser" ,python2-configparser) + ("python-future" ,python2-future) + ,@(package-propagated-inputs base)))))) (define-public python-sure (package From cb18f2bf3191dccc94af43371218acbc65da7b85 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 11 Mar 2020 22:36:02 +0100 Subject: [PATCH 76/78] gnu: python-cookies: Use the correct version of pytest. * gnu/packages/python-web.scm (python-cookies)[native-inputs]: Change PYTHON2-PYTEST to PYTHON-PYTEST. --- gnu/packages/python-web.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index d294e43d45..07c1ceb2db 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1834,7 +1834,7 @@ (define-public python-cookies `(;; test are broken: https://gitlab.com/sashahart/cookies/issues/3 #:tests? #f)) (native-inputs - `(("python-pytest" ,python2-pytest))) + `(("python-pytest" ,python-pytest))) (synopsis "HTTP cookie parser and renderer") (description "A RFC 6265-compliant HTTP cookie parser and renderer in Python.") From 0a8655e6dc956a3f1f116112d09ebcdd472e28a1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 11 Mar 2020 22:56:27 +0100 Subject: [PATCH 77/78] gnu: Remove duplicate copyright line. * gnu/packages/python-xyz.scm: Remove duplicate copyright. --- gnu/packages/python-xyz.scm | 1 - 1 file changed, 1 deletion(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index eb40abe619..3be2fd4623 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -28,7 +28,6 @@ ;;; Copyright © 2016 David Craven ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Marius Bakke ;;; Copyright © 2016, 2017 Stefan Reichör -;;; Copyright © 2016 Dylan Jeffers ;;; Copyright © 2016, 2017, 2019 Alex Vong ;;; Copyright © 2016, 2017, 2018 Arun Isaac ;;; Copyright © 2016, 2017, 2018, 2020 Julien Lepiller From 58363ee50096fd02743ff6d62ee1125fc440625f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 11 Mar 2020 22:56:51 +0100 Subject: [PATCH 78/78] gnu: Remove year range from copyright header. * gnu/packages/python-xyz.scm: List years explicitly instead of range in copyright line. --- gnu/packages/python-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 3be2fd4623..8e8790b29a 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -19,7 +19,7 @@ ;;; Copyright © 2015, 2016 Chris Marusich ;;; Copyright © 2016 Danny Milosavljevic ;;; Copyright © 2016 Lukas Gradl -;;; Copyright © 2016, 2018-2019 Hartmut Goebel +;;; Copyright © 2016, 2018, 2019 Hartmut Goebel ;;; Copyright © 2016 Daniel Pimentel ;;; Copyright © 2016 Sou Bunnbu ;;; Copyright © 2016, 2017 Troy Sankey