From eebaed2b7662d514fa93cae753bc14451ba6814f Mon Sep 17 00:00:00 2001 From: Björn Höfling Date: Sun, 22 Mar 2020 13:34:01 +0100 Subject: gnu: java-tomcat: Update to 8.5.53. This fixes CVE-2020-1938 ("Ghostcat"). * gnu/packages/web.scm (java-tomcat): Update to 8.5.53. [properties]: Add cpe-name. --- gnu/packages/web.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 10cbf6165b..6ce8b78c85 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -39,6 +39,7 @@ ;;; Copyright © 2020 Timotej Lazar ;;; Copyright © 2020 Alexandros Theodotou ;;; Copyright © 2020 Pierre Neidhardt +;;; Copyright © 2018, 2019, 2020 Björn Höfling ;;; ;;; This file is part of GNU Guix. ;;; @@ -6109,14 +6110,14 @@ (define-public python-py-ubjson (define-public java-tomcat (package (name "java-tomcat") - (version "8.5.46") + (version "8.5.53") (source (origin (method url-fetch) (uri (string-append "mirror://apache/tomcat/tomcat-8/v" version "/src/apache-tomcat-" version "-src.tar.gz")) (sha256 (base32 - "0fb49gsqa3r6jrwc54yynvsakq9qbzr2pbxr7a29c2zvja2v65iq")) + "15lwq3clf21hzk7mma70sffpxjqn8ww5mjq6zhmwcp4m17m22z26")) (modules '((guix build utils))) ;; Delete bundled jars. (snippet @@ -6194,6 +6195,7 @@ (define-public java-tomcat (let ((out (assoc-ref outputs "out"))) (copy-recursively "output/build" out)) #t))))) + (properties '((cpe-name . "tomcat"))) (home-page "https://tomcat.apache.org") (synopsis "Java Servlet, JavaServer Pages, Java Expression Language and Java WebSocket") -- cgit v1.2.3 From 60eee3e6de2a11b425496bbdf90bfe1f807c8f49 Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Fri, 20 Mar 2020 18:03:20 +0100 Subject: gnu: Add ROPgadget. * gnu/packages/cybersecurity.scm: New file. (ropgadget): New variable. * gnu/local.mk (GNU_SYSTEM_MODULES): Register the file. --- gnu/local.mk | 1 + gnu/packages/cybersecurity.scm | 46 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+) create mode 100644 gnu/packages/cybersecurity.scm diff --git a/gnu/local.mk b/gnu/local.mk index 07b159c4fe..0a406dffa0 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -138,6 +138,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/cups.scm \ %D%/packages/curl.scm \ %D%/packages/cvassistant.scm \ + %D%/packages/cybersecurity.scm \ %D%/packages/cyrus-sasl.scm \ %D%/packages/databases.scm \ %D%/packages/datamash.scm \ diff --git a/gnu/packages/cybersecurity.scm b/gnu/packages/cybersecurity.scm new file mode 100644 index 0000000000..aedac03b8a --- /dev/null +++ b/gnu/packages/cybersecurity.scm @@ -0,0 +1,46 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2020 Jakub Kądziołka +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages cybersecurity) + #:use-module (guix download) + #:use-module (guix packages) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix build-system python) + #:use-module (gnu packages engineering)) + +(define-public ropgadget + (package + (name "ropgadget") + (version "6.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "ROPGadget" version)) + (sha256 + (base32 + "0idiicgpijar9l9kqmfdh865c2mkfgxg0q7lpz77jc09l6q0afjh")))) + (build-system python-build-system) + (propagated-inputs + `(("python-capstone" ,python-capstone))) + (home-page "http://shell-storm.org/project/ROPgadget/") + (synopsis "Semiautomatic return oriented programming") + (description + "This tool lets you search for @acronym{ROP, Return Oriented Programming} +gadgets in binaries. Some facilities are included for automatically generating +chains of gadgets to execute system calls.") + (license license:bsd-3))) -- cgit v1.2.3 From be6520e6a58d7f6ee58f4cab76db9d1245410113 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 26 Mar 2020 23:21:11 +0100 Subject: vm: Distinguish between success and failure of the guest code. Fixes . Reported by Tobias Geerinckx-Rice . * gnu/system/vm.scm (expression->derivation-in-linux-vm)[loader]: Produce '/xchg/.exit-status' file upon success. * gnu/build/vm.scm (load-in-linux-vm): Check for 'xchg/.exit-status' once QEMU has completed and respond accordingly. --- gnu/build/vm.scm | 11 ++++++++++- gnu/system/vm.scm | 15 +++++++++------ 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/gnu/build/vm.scm b/gnu/build/vm.scm index 9a9e5bd001..79eed48c1f 100644 --- a/gnu/build/vm.scm +++ b/gnu/build/vm.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès +;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2016 Christopher Allan Webber ;;; Copyright © 2016, 2017 Leo Famulari ;;; Copyright © 2017 Mathieu Othacehe @@ -183,6 +183,15 @@ (define arch-specific-flags '()) arch-specific-flags)) + (unless (file-exists? "xchg/.exit-status") + (error "VM did not produce an exit code")) + + (match (call-with-input-file "xchg/.exit-status" read) + (0 #t) + (status (error "guest VM code exited with a non-zero status" status))) + + (delete-file "xchg/.exit-status") + ;; When MAKE-DISK-IMAGE? is true, the image is in OUTPUT already. (unless make-disk-image? (if single-file-output? diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index d1c131ecb4..c6ec25a895 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -186,12 +186,15 @@ (define loader ;; the initrd. See example at ;; . (program-file "linux-vm-loader" - ;; When USER-BUILDER succeeds, reboot (indicating a - ;; success), otherwise die, which causes a kernel panic - ;; ("Attempted to kill init!"). - #~(if (zero? (system* #$user-builder)) - (reboot) - (exit 1)))) + ;; Communicate USER-BUILDER's exit status via /xchg so that + ;; the host can distinguish between success, failure, and + ;; kernel panic. + #~(let ((status (system* #$user-builder))) + (call-with-output-file "/xchg/.exit-status" + (lambda (port) + (write status port))) + (sync) + (reboot)))) (let ((initrd (or initrd (base-initrd file-systems -- cgit v1.2.3 From aefcfecd84302ea5a3711c26d02395f8b25a354c Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Fri, 7 Feb 2020 08:38:32 +0100 Subject: gnu: Add python-pytest-check-links. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-pytest-check-links): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index f4b50abb1d..209d8563d3 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -18676,3 +18676,31 @@ (define-public python-pifpaf useful when needing these daemons to run integration testing. It originally evolved from its precursor @code{overtest}.") (license license:asl2.0))) + +(define-public python-pytest-check-links + (package + (name "python-pytest-check-links") + (version "0.3.0") + (source + (origin + (method url-fetch) + ;; URI uses underscores + (uri (pypi-uri "pytest_check_links" version)) + (sha256 + (base32 + "12x3wmrdzm6wgk0vz02hb769h68nr49q47w5q1pj95pc89hsa34v")))) + (build-system python-build-system) + (propagated-inputs + `(("python-docutils" ,python-docutils) + ("python-html5lib" ,python-html5lib) + ("python-nbconvert" ,python-nbconvert) + ("python-nbformat" ,python-nbformat) + ("python-pytest" ,python-pytest) + ("python-six" ,python-six))) + (native-inputs + `(("python-pbr-minimal" ,python-pbr-minimal))) + (home-page "https://github.com/minrk/pytest-check-links") + (synopsis "Check links in files") + (description "This package provides a pytest plugin that checks URLs for +HTML-containing files.") + (license license:bsd-3))) -- cgit v1.2.3 From 01d5f2c5cd68037666405af00d62bd677d5fd015 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Fri, 7 Feb 2020 08:39:55 +0100 Subject: gnu: Add python-json5. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-json5): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 209d8563d3..989474ae5c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -73,6 +73,7 @@ ;;; Copyright © 2020 Alexandros Theodotou ;;; Copyright © 2020 Josh Marshall ;;; Copyright © 2020 Alexandros Theodotou +;;; Copyright © 2020 Lars-Dominik Braun ;;; ;;; This file is part of GNU Guix. ;;; @@ -18704,3 +18705,27 @@ (define-public python-pytest-check-links (description "This package provides a pytest plugin that checks URLs for HTML-containing files.") (license license:bsd-3))) + +(define-public python-json5 + (package + (name "python-json5") + (version "0.8.5") + (source + (origin + ;; sample.json5 is missing from PyPi source tarball + (method git-fetch) + (uri (git-reference + (url "https://github.com/dpranke/pyjson5.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0nyngj18jlkgvm1177lc3cj47wm4yh3dqigygvcvw7xkyryafsqn")))) + (build-system python-build-system) + (home-page "https://github.com/dpranke/pyjson5") + (synopsis + "Python implementation of the JSON5 data format") + (description + "JSON5 extends the JSON data interchange format to make it slightly more +usable as a configuration language. This Python package implements parsing and +dumping of JSON5 data structures.") + (license license:asl2.0))) -- cgit v1.2.3 From 0a76a4e0733741f3140fc394e98fed4febdbebca Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Fri, 20 Mar 2020 21:11:04 +0000 Subject: gnu: guix-data-service: Update to 0.0.1-19.d1c243f. These changes support the guix-data-service-backup-database and guix-data-service-create-small-backup scripts. These are shell scripts, so require coreutils from the build environment at runtime as well as binaries from postgresql, ephemeralpg and optionally util-linux (for ionice and renice). * gnu/packages/web.scm (guix-data-service): Update to 0.0.1-19.d1c243f. [arguments]: Add (ice-9 ftw) and (ice-9 match) to #:modules, change the 'install phase to wrap all bin files with some inputs as well. [inputs]: Add util-linux, include ephemeralpg from native-inputs and switch postgresql for postgresql-11. [native-inputs]: Move ephemeralpg to inputs. --- gnu/packages/web.scm | 37 ++++++++++++++++++++++++------------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 6ce8b78c85..a553dc2150 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4382,8 +4382,8 @@ (define-public python2-feedparser (package-with-python2 python-feedparser)) (define-public guix-data-service - (let ((commit "18eb9dfdcb3174bfd4bab5b9089acffa13aa1214") - (revision "18")) + (let ((commit "d1c243f7fd8902f359ff06fb78dce663cf4297ce") + (revision "19")) (package (name "guix-data-service") (version (string-append "0.0.1-" revision "." (string-take commit 7))) @@ -4395,11 +4395,13 @@ (define-public guix-data-service (file-name (git-file-name name version)) (sha256 (base32 - "0lb78cqzqaz0r4sspg272w2a3yhzhqah30j0kxf0z182b0qpmp37")))) + "1ji8d4vwmv7j9h7z96hvzi3zvik594yngjrdal37w13fbxy2v6sw")))) (build-system gnu-build-system) (arguments '(#:modules ((guix build utils) (guix build gnu-build-system) + (ice-9 ftw) + (ice-9 match) (ice-9 rdelim) (ice-9 popen)) #:test-target "check-with-tmp-database" @@ -4427,20 +4429,28 @@ (define-public guix-data-service "/site-ccache"))) (for-each (lambda (file) + (simple-format (current-error-port) + "wrapping: ~A\n" + (string-append bin "/" file)) (wrap-program (string-append bin "/" file) `("PATH" ":" prefix - (,bin)) + ,(cons* + bin + (map (lambda (input) + (string-append + (assoc-ref inputs input) + "/bin")) + '("ephemeralpg" + "util-linux" + "postgresql")))) `("GUILE_LOAD_PATH" ":" prefix (,scm ,(getenv "GUILE_LOAD_PATH"))) `("GUILE_LOAD_COMPILED_PATH" ":" prefix (,go ,(getenv "GUILE_LOAD_COMPILED_PATH"))))) - '("guix-data-service" - "guix-data-service-process-branch-updated-email" - "guix-data-service-process-branch-updated-mbox" - "guix-data-service-process-job" - "guix-data-service-process-jobs" - "guix-data-service-manage-build-servers" - "guix-data-service-query-build-servers")) + (scandir bin + (match-lambda + ((or "." "..") #f) + (_ #t)))) #t))) (delete 'strip)))) ; As the .go files aren't compatible (inputs @@ -4449,13 +4459,14 @@ (define-public guix-data-service ("guile-json" ,guile3.0-json) ("guile-email" ,guile3.0-email) ("guile-squee" ,guile3.0-squee) - ("postgresql" ,postgresql) + ("ephemeralpg" ,ephemeralpg) + ("util-linux" ,util-linux) + ("postgresql" ,postgresql-11) ("sqitch" ,sqitch))) (native-inputs `(("guile" ,guile-3.0) ("autoconf" ,autoconf) ("automake" ,automake) - ("ephemeralpg" ,ephemeralpg) ("emacs-minimal" ,emacs-minimal) ("emacs-htmlize" ,emacs-htmlize) ("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 6232a36291b56ec1f1aaeefaa721a164566b961c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 27 Mar 2020 11:19:36 +0100 Subject: gnu: r-ggally: Update to 1.5.0. * gnu/packages/cran.scm (r-ggally): Update to 1.5.0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index c890b38749..676ee597b7 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2107,14 +2107,14 @@ (define-public r-progress (define-public r-ggally (package (name "r-ggally") - (version "1.4.0") + (version "1.5.0") (source (origin (method url-fetch) (uri (cran-uri "GGally" version)) (sha256 (base32 - "1zjmcc5bzagvy7c5cmdcl39xmx07fwi98yrj4i05w7y40kqcsiws")))) + "082s321zspg5al6acigwrhg4fsrmkkk5caabg662qbcy8v6n34h6")))) (properties `((upstream-name . "GGally"))) (build-system r-build-system) (inputs -- cgit v1.2.3 From 9c189913e9f11acdf1e0300c870fd08408f0211b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 27 Mar 2020 11:19:44 +0100 Subject: gnu: r-hdf5r: Update to 1.3.2. * gnu/packages/cran.scm (r-hdf5r): Update to 1.3.2. [native-inputs]: Add r-knitr. --- gnu/packages/cran.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 676ee597b7..f32bfacbc5 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6086,14 +6086,14 @@ (define-public r-nbclust (define-public r-hdf5r (package (name "r-hdf5r") - (version "1.3.1") + (version "1.3.2") (source (origin (method url-fetch) (uri (cran-uri "hdf5r" version)) (sha256 (base32 - "0hvi2cvyv6zlxgpawnmsihxclp2ln88slbrnmaxagmjswskxsrpx")))) + "0c2p06k9bp9rf0fyavnxw5d8jr2bbgx3gjblahz581cpvsfksj9i")))) (build-system r-build-system) (inputs `(("hdf5" ,hdf5) @@ -6101,6 +6101,8 @@ (define-public r-hdf5r (propagated-inputs `(("r-bit64" ,r-bit64) ("r-r6" ,r-r6))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://hhoeflin.github.io/hdf5r") (synopsis "Interface to the HDF5 binary data format") (description -- cgit v1.2.3 From 498c887a96d5ab4dfc5fd292b7b28f349221e2e0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 27 Mar 2020 11:19:56 +0100 Subject: gnu: r-bayestestr: Update to 0.5.3. * gnu/packages/cran.scm (r-bayestestr): Update to 0.5.3. [native-inputs]: Add r-knitr. --- gnu/packages/cran.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index f32bfacbc5..a793ed0bef 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -8514,18 +8514,20 @@ (define-public r-glmmtmb (define-public r-bayestestr (package (name "r-bayestestr") - (version "0.5.2") + (version "0.5.3") (source (origin (method url-fetch) (uri (cran-uri "bayestestR" version)) (sha256 (base32 - "1l0kqw793d8fnk0745fllmqwjwnj9srvqzv4baq5s05ls1gbi2mw")))) + "1q24qh5p6bz4nbf4546kckh7d518x5pm1yhhbc8fwcnbca4kgqjz")))) (properties `((upstream-name . "bayestestR"))) (build-system r-build-system) (propagated-inputs `(("r-insight" ,r-insight))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/easystats/bayestestR") (synopsis "Describe Bayesian models and posterior distributions") (description -- cgit v1.2.3 From 84b7c4aa17f63ab24c9e356d0235200d8bfb1dd6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 27 Mar 2020 11:20:11 +0100 Subject: gnu: r-sf: Update to 0.9-0. * gnu/packages/cran.scm (r-sf): Update to 0.9-0. [native-inputs]: Add r-knitr. --- gnu/packages/cran.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index a793ed0bef..692adcfa41 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -13182,14 +13182,14 @@ (define-public r-deldir (define-public r-sf (package (name "r-sf") - (version "0.8-1") + (version "0.9-0") (source (origin (method url-fetch) (uri (cran-uri "sf" version)) (sha256 (base32 - "17wyv74m1ppc3s5jdv60r74jj23nidxpzl46vjhfclfhnpvm7sx9")))) + "117r9l3v7nkdj9bfy6qr0yz0gd5bv0pwnkc9vk2gv3xqj0h1fpf6")))) (build-system r-build-system) (inputs `(("gdal" ,gdal) @@ -13202,7 +13202,9 @@ (define-public r-sf ("r-magrittr" ,r-magrittr) ("r-rcpp" ,r-rcpp) ("r-units" ,r-units))) - (native-inputs `(("pkg-config" ,pkg-config))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("r-knitr" ,r-knitr))) (home-page "https://github.com/r-spatial/sf/") (synopsis "Simple features for R") (description -- cgit v1.2.3 From 76d7ce4f4552c75b550edc1f1be63daeef22485f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 27 Mar 2020 11:20:22 +0100 Subject: gnu: r-rjava: Update to 0.9-12. * gnu/packages/cran.scm (r-rjava): Update to 0.9-12. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 692adcfa41..5f8bb2f126 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -13854,14 +13854,14 @@ (define-public r-r2html (define-public r-rjava (package (name "r-rjava") - (version "0.9-11") + (version "0.9-12") (source (origin (method url-fetch) (uri (cran-uri "rJava" version)) (sha256 (base32 - "0s9cjy1wh7snmbqwznh8f1r4ipylr7mgda4a979z963a8lqy32n2")))) + "03vv0pj6san03c51iyqsyb1rwh3097dfpl2s8iswzzmc7k3shj12")))) (properties `((upstream-name . "rJava"))) (build-system r-build-system) (arguments -- cgit v1.2.3 From 3345157fa670d369aa1f3ab9a537b87583b022c2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 27 Mar 2020 11:20:28 +0100 Subject: gnu: r-xgboost: Update to 1.0.0.2. * gnu/packages/cran.scm (r-xgboost): Update to 1.0.0.2. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 5f8bb2f126..573630ff69 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -15361,14 +15361,14 @@ (define-public r-citr (define-public r-xgboost (package (name "r-xgboost") - (version "1.0.0.1") + (version "1.0.0.2") (source (origin (method url-fetch) (uri (cran-uri "xgboost" version)) (sha256 (base32 - "0fx5qjpjjirzhplddqmxlysyqszp79w74x00b5shp6p2lzy6yd9a")))) + "1ld2w51c5fy3bl0kvjn1iplffc4lmin9s9zz5xx7xsm44d6j6kzd")))) (build-system r-build-system) (propagated-inputs `(("r-data-table" ,r-data-table) -- cgit v1.2.3 From c99880320d0a1526b0b681895318a08515dbb3b0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 27 Mar 2020 11:20:35 +0100 Subject: gnu: r-class: Update to 7.3-16. * gnu/packages/statistics.scm (r-class): Update to 7.3-16. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 71ebe012cf..41a7687da4 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -441,14 +441,14 @@ (define-public r-mass (define-public r-class (package (name "r-class") - (version "7.3-15") + (version "7.3-16") (source (origin (method url-fetch) (uri (cran-uri "class" version)) (sha256 (base32 - "1x1hqz8xyhbpq4krsh02glqnlzcch25agkmn4a3da9n723b37gzn")))) + "1jpdgj0lsi60q0mqbhfw809w8d66whix27y6wpdzll6775g3j3ll")))) (build-system r-build-system) (propagated-inputs `(("r-mass" ,r-mass))) -- cgit v1.2.3 From 37732212a3090d49eb19dc54436b991508487225 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 27 Mar 2020 11:20:41 +0100 Subject: gnu: r-locfit: Update to 1.5-9.4. * gnu/packages/statistics.scm (r-locfit): Update to 1.5-9.4. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 41a7687da4..be7c42617b 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1762,14 +1762,14 @@ (define-public r-formula (define-public r-locfit (package (name "r-locfit") - (version "1.5-9.2") + (version "1.5-9.4") (source (origin (method url-fetch) (uri (cran-uri "locfit" version)) (sha256 (base32 - "00l0s6cxnv95zybkgki0380fih2kr1kbm7m88x56phklln3nx27b")))) + "1vcw16qww4v4547w0gfvhqg60l051bsdlxa6zfcgcj9xbxf6dlyr")))) (build-system r-build-system) (propagated-inputs `(("r-lattice" ,r-lattice))) -- cgit v1.2.3 From 2ba5253044a4c4f9b5dbdd2ce5684e43f8d43c30 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 27 Mar 2020 11:20:49 +0100 Subject: gnu: r-multiassayexperiment: Update to 1.12.6. * gnu/packages/bioconductor.scm (r-multiassayexperiment): Update to 1.12.6. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index b62a6188d1..28522e7c13 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -7302,14 +7302,14 @@ (define-public r-experimenthub (define-public r-multiassayexperiment (package (name "r-multiassayexperiment") - (version "1.12.5") + (version "1.12.6") (source (origin (method url-fetch) (uri (bioconductor-uri "MultiAssayExperiment" version)) (sha256 (base32 - "0a7zsq3adg8rph1w2qr75bpmrq53j99rsypmxj9w5mz9q23r2qlr")))) + "174vzlxsyayb5il77cb3zzgszxl3l0wkprc9w6pgz4yv5ix13adi")))) (properties `((upstream-name . "MultiAssayExperiment"))) (build-system r-build-system) -- cgit v1.2.3 From 1a7247c629ef788a9a5b26999246efd2ff4c48da Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 27 Mar 2020 12:20:35 +0100 Subject: gnu: asymptote: Update to 2.65. * gnu/packages/plotutils.scm (asymptote): Update to 2.65. --- gnu/packages/plotutils.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm index 7a7f30e255..09fe2cb36e 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.64") + (version "2.65") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/asymptote/" version "/asymptote-" version ".src.tgz")) (sha256 - (base32 "1x4nmzklzd2xfmm03mgnpg0345dwrwr5czk9gkfl5sx7x1cgx4c0")))) + (base32 "0i4qqlvzz69mhdq6kf689sa9rxfb1cwsg1nx88hryb291hddgqqm")))) (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 -- cgit v1.2.3 From 444bc2ddf2903fb26bd941e789cdb97d78e5e282 Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Sun, 8 Mar 2020 14:09:36 +0100 Subject: gnu: rust: Add 1.38 All packages are still built with rustc 1.37, but users will see rustc 1.38 in their profiles, and packages that require newer compiler versions will be possible to add. * gnu/packages/rust.scm (rust-1.31): Factor out the patch-command-exec-tests phase to a separate procedure. (patch-command-exec-tests-phase): New procedure. (rust): Rename to rust-1.37, make rust an alias. (rust-1.38): New variable. --- gnu/packages/rust.scm | 75 ++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 53 insertions(+), 22 deletions(-) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index d0a64b134f..e0106841c8 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -909,9 +909,30 @@ (define-public rust-1.30 (replace 'disable-amd64-avx-test (lambda _ (substitute* "src/test/ui/run-pass/issues/issue-44056.rs" - (("only-x86_64") "ignore-test")) + (("only-x86_64") "ignore-test")) #t))))))))) +(define (patch-command-exec-tests-phase test-path) + "The command-exec.rs test moves around between releases. We need to apply +a Guix-specific patch to it for each release. This function generates the phase +that applies said patch, parametrized by the test-path. This is done this way +because the phase is more complex than the equivalents for other tests that +move around." + `(lambda* (#:key inputs #:allow-other-keys) + (let ((coreutils (assoc-ref inputs "coreutils"))) + (substitute* ,test-path + ;; This test suite includes some tests that the stdlib's + ;; `Command` execution properly handles situations where + ;; the environment or PATH variable are empty, but this + ;; fails since we don't have `echo` available in the usual + ;; Linux directories. + ;; NB: the leading space is so we don't fail a tidy check + ;; for trailing whitespace, and the newlines are to ensure + ;; we don't exceed the 100 chars tidy check as well + ((" Command::new\\(\"echo\"\\)") + (string-append "\nCommand::new(\"" coreutils "/bin/echo\")\n"))) + #t))) + (define-public rust-1.31 (let ((base-rust (rust-bootstrapped-package rust-1.30 "1.31.1" @@ -923,26 +944,14 @@ (define-public rust-1.31 ((#:phases phases) `(modify-phases ,phases (add-after 'patch-tests 'patch-command-exec-tests - (lambda* (#:key inputs #:allow-other-keys) - (let ((coreutils (assoc-ref inputs "coreutils"))) - (substitute* "src/test/run-pass/command-exec.rs" - ;; This test suite includes some tests that the stdlib's - ;; `Command` execution properly handles situations where - ;; the environment or PATH variable are empty, but this - ;; fails since we don't have `echo` available in the usual - ;; Linux directories. - ;; NB: the leading space is so we don't fail a tidy check - ;; for trailing whitespace, and the newlines are to ensure - ;; we don't exceed the 100 chars tidy check as well - ((" Command::new\\(\"echo\"\\)") - (string-append "\nCommand::new(\"" coreutils "/bin/echo\")\n"))) - #t))) - ;; The test has been moved elsewhere. - (replace 'disable-amd64-avx-test - (lambda _ - (substitute* "src/test/ui/issues/issue-44056.rs" - (("only-x86_64") "ignore-test")) - #t)) + ,(patch-command-exec-tests-phase + "src/test/run-pass/command-exec.rs")) + ;; The test has been moved elsewhere. + (replace 'disable-amd64-avx-test + (lambda _ + (substitute* "src/test/ui/issues/issue-44056.rs" + (("only-x86_64") "ignore-test")) + #t)) (add-after 'patch-tests 'patch-process-docs-rev-cmd (lambda* _ ;; Disable some doc tests which depend on the "rev" command @@ -1084,7 +1093,7 @@ (define-public rust-1.36 `(modify-phases ,phases (delete 'patch-process-docs-rev-cmd)))))))) -(define-public rust +(define-public rust-1.37 (let ((base-rust (rust-bootstrapped-package rust-1.36 "1.37.0" "1hrqprybhkhs6d9b5pjskfnc5z9v2l2gync7nb39qjb5s0h703hj"))) @@ -1100,3 +1109,25 @@ (define-public rust (mkdir-p cargo-home) (setenv "CARGO_HOME" cargo-home) #t)))))))))) + +(define-public rust-1.38 + (let ((base-rust + (rust-bootstrapped-package rust-1.37 "1.38.0" + "101dlpsfkq67p0hbwx4acqq6n90dj4bbprndizpgh1kigk566hk4"))) + (package + (inherit base-rust) + (arguments + (substitute-keyword-arguments (package-arguments base-rust) + ((#:phases phases) + `(modify-phases ,phases + (replace 'patch-command-exec-tests + ,(patch-command-exec-tests-phase + "src/test/ui/command-exec.rs")) + (add-after 'patch-tests 'patch-command-uid-gid-test + (lambda _ + (substitute* "src/test/ui/command-uid-gid.rs" + (("/bin/sh") (which "sh")) + (("ignore-sgx") "ignore-sgx\n// ignore-tidy-linelength")) + #t))))))))) + +(define-public rust rust-1.37) -- cgit v1.2.3 From 9483782a617c66b8e066ac7f1898e41f99eb8456 Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Sun, 8 Mar 2020 23:32:35 +0100 Subject: gnu: rust: Add 1.39 * gnu/packages/rust.scm (rust-1.39): New variable. (%cargo-reference-hash): Add a comment explaining the role of the variable. --- gnu/packages/rust.scm | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index e0106841c8..11522b933e 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -55,6 +55,32 @@ (define-module (gnu packages rust) #:use-module (ice-9 match) #:use-module (srfi srfi-26)) +;; This is the hash for the empty file, and the reason it's relevant is not +;; the most obvious. +;; +;; The root of the problem is that Cargo keeps track of a file called +;; Cargo.lock, that contains the hash of the tarball source of each dependency. +;; +;; However, tarball sources aren't handled well by Guix because of the need to +;; patch shebangs in any helper scripts. This is why we use Cargo's vendoring +;; capabilities, where instead of the tarball, a directory is provided in its +;; place. (In the case of rustc, the source code already ships with vendored +;; dependencies, but crates built with cargo-build-system undergo vendoring +;; during the build.) +;; +;; To preserve the advantages of checksumming, vendored dependencies contain +;; a file called .cargo-checksum.json, which contains the hash of the tarball, +;; as well as the list of files in it, with the hash of each file. +;; +;; The patch-cargo-checksums phase of cargo-build-system runs after +;; any Guix-specific patches to the vendored dependencies and regenerates the +;; .cargo-checksum.json files, but it's hard to know the tarball checksum that +;; should be written to the file - and taking care of any unhandled edge case +;; would require rebuilding everything that depends on rust. This is why we lie, +;; and say that the tarball has the hash of an empty file. It's not a problem +;; because cargo-build-system removes the Cargo.lock file. We can't do that +;; for rustc because of a quirk of its build system, so we modify the lock file +;; to substitute the hash. (define %cargo-reference-hash "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855") @@ -1130,4 +1156,24 @@ (define-public rust-1.38 (("ignore-sgx") "ignore-sgx\n// ignore-tidy-linelength")) #t))))))))) +(define-public rust-1.39 + (let ((base-rust + (rust-bootstrapped-package rust-1.38 "1.39.0" + "0mwkc1bnil2cfyf6nglpvbn2y0zfbv44zfhsd5qg4c9rm6vgd8dl"))) + (package + (inherit base-rust) + (arguments + (substitute-keyword-arguments (package-arguments base-rust) + ((#:phases phases) + `(modify-phases ,phases + (replace 'patch-cargo-checksums + ;; The Cargo.lock format changed. + (lambda* _ + (use-modules (guix build cargo-utils)) + (substitute* "Cargo.lock" + (("(checksum = )\".*\"" all name) + (string-append name "\"" ,%cargo-reference-hash "\""))) + (generate-all-checksums "vendor") + #t))))))))) + (define-public rust rust-1.37) -- cgit v1.2.3 From bc3fda5d2b97526cee7d1b127e95067521dfb99e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 27 Mar 2020 15:24:54 +0100 Subject: services/nfs: Replace nfs-version with nfs-versions. Instead of accepting a string for just one protocol version accept a list of supported versions. * gnu/services/nfs.scm ()[nfs-version]: Remove field and replace... [nfs-versions]: ...with this new field. (nfs-shepherd-services): Pass as many "--nfs-version" options as there are supported versions. * doc/guix.texi (Network File System): Document nfs-versions. --- doc/guix.texi | 6 +++--- gnu/services/nfs.scm | 25 +++++++++++++------------ 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index af87d76087..8cb85fe62c 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -22233,9 +22233,9 @@ It has the following parameters: @item @code{nfs-utils} (default: @code{nfs-utils}) The nfs-utils package to use. -@item @code{nfs-version} (default: @code{#f}) -If a string value is provided, the @command{rpc.nfsd} daemon will be -limited to supporting the given version of the NFS protocol. +@item @code{nfs-versions} (default: @code{'("4.2" "4.1" "4.0")}) +If a list of string values is provided, the @command{rpc.nfsd} daemon +will be limited to supporting the given versions of the NFS protocol. @item @code{exports} (default: @code{'()}) This is a list of directories the NFS server should export. Each entry diff --git a/gnu/services/nfs.scm b/gnu/services/nfs.scm index cbaa97b2fd..4e358197e2 100644 --- a/gnu/services/nfs.scm +++ b/gnu/services/nfs.scm @@ -245,8 +245,8 @@ (define-record-type* nfs-configuration? (nfs-utils nfs-configuration-nfs-utils (default nfs-utils)) - (nfs-version nfs-configuration-nfs-version - (default #f)) ; string + (nfs-versions nfs-configuration-nfs-versions + (default '("4.2" "4.1" "4.0"))) (exports nfs-configuration-exports (default '())) (rpcmountd-port nfs-configuration-rpcmountd-port @@ -270,7 +270,7 @@ (define-record-type* (define (nfs-shepherd-services config) "Return a list of for the NFS daemons with CONFIG." (match-record config - (nfs-utils nfs-version exports + (nfs-utils nfs-versions exports rpcmountd-port rpcstatd-port nfsd-port nfsd-threads pipefs-directory debug) (list (shepherd-service @@ -323,15 +323,16 @@ (define (nfs-shepherd-services config) (requirement '(/proc/fs/nfsd rpc.statd networking)) (start #~(lambda _ - (zero? (system* #$(file-append nfs-utils "/sbin/rpc.nfsd") - #$@(if (member 'nfsd debug) - '("--debug") - '()) - "--port" #$(number->string nfsd-port) - #$@(if nfs-version - '("--nfs-version" nfs-version) - '()) - #$(number->string nfsd-threads))))) + (zero? (apply system* #$(file-append nfs-utils "/sbin/rpc.nfsd") + (list + #$@(if (member 'nfsd debug) + '("--debug") + '()) + "--port" #$(number->string nfsd-port) + #$@(map (lambda (version) + (string-append "--nfs-version=" version)) + nfs-versions) + #$(number->string nfsd-threads)))))) (stop #~(lambda _ (zero? -- cgit v1.2.3 From eb5341c2353ef54ef8b227ae8e50aa5736a40ddc Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 27 Mar 2020 18:39:28 +0100 Subject: gnu: Add trivial-package-local-nicknames. * gnu/packages/lisp-xyz.scm (cl-trivial-package-local-nicknames, sbcl-trivial-package-local-nicknames): New variables. --- gnu/packages/lisp-xyz.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 043c219e5e..f39dd170a9 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -11250,3 +11250,28 @@ (define-public sbcl-sycamore (define-public cl-sycamore (sbcl-package->cl-source-package sbcl-sycamore)) + +(define-public sbcl-trivial-package-local-nicknames + (package + (name "sbcl-trivial-package-local-nicknames") + (version "0.2") + (home-page "https://github.com/phoe/trivial-package-local-nicknames") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit "16b7ad4c2b120f50da65154191f468ea5598460e"))) + (file-name (git-file-name name version)) + (sha256 + (base32 "18qc27xkjzdcqrilpk3pm7djldwq5rm3ggd5h9cr8hqcd54i2fqg")))) + (build-system asdf-build-system/sbcl) + (synopsis "Common Lisp compatibility library for package local nicknames") + (description + "This library is a portable compatibility layer around package local nicknames (PLN). +This was done so there is a portability library for the PLN API not included +in DEFPACKAGE.") + (license license:unlicense))) + +(define-public cl-trivial-package-local-nicknames + (sbcl-package->cl-source-package sbcl-trivial-package-local-nicknames)) -- cgit v1.2.3 From 313973980215a50ac0b40b44ab995254eff1dae5 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 27 Mar 2020 18:12:31 +0100 Subject: gnu: guile-next: Update to 3.0.2. * gnu/packages/guile.scm (guile-3.0): Update to 3.0.2. * gnu/packages/patches/guile-3.0-crash.patch: Remove. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/guile.scm | 7 ++----- gnu/packages/patches/guile-3.0-crash.patch | 17 ----------------- 3 files changed, 2 insertions(+), 23 deletions(-) delete mode 100644 gnu/packages/patches/guile-3.0-crash.patch diff --git a/gnu/local.mk b/gnu/local.mk index 0a406dffa0..60d6d912f5 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -991,7 +991,6 @@ dist_patch_DATA = \ %D%/packages/patches/guile-1.8-cpp-4.5.patch \ %D%/packages/patches/guile-2.2-default-utf8.patch \ %D%/packages/patches/guile-2.2-skip-oom-test.patch \ - %D%/packages/patches/guile-3.0-crash.patch \ %D%/packages/patches/guile-default-utf8.patch \ %D%/packages/patches/guile-gdbm-ffi-support-gdbm-1.14.patch \ %D%/packages/patches/guile-linux-syscalls.patch \ diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 80ac9ea706..9c707d4cde 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -292,17 +292,14 @@ (define-public guile-3.0 (package (inherit guile-2.2) (name "guile-next") ;to be renamed to "guile" - (version "3.0.1") + (version "3.0.2") (source (origin (inherit (package-source guile-2.2)) (uri (string-append "mirror://gnu/guile/guile-" version ".tar.xz")) (sha256 (base32 - "1jakps3127h8g69ixgb4zwc8v2g29dmwql1vi3pwg30kzp8fm5nn")) - (patches - (append (search-patches "guile-3.0-crash.patch") - (origin-patches (package-source guile-2.2)))))) + "12lziar4j27j9whqp2n18427q45y9ghq7gdd8lqhmj1k0lr7vi2k")))) (native-search-paths (list (search-path-specification (variable "GUILE_LOAD_PATH") diff --git a/gnu/packages/patches/guile-3.0-crash.patch b/gnu/packages/patches/guile-3.0-crash.patch deleted file mode 100644 index 510834ab57..0000000000 --- a/gnu/packages/patches/guile-3.0-crash.patch +++ /dev/null @@ -1,17 +0,0 @@ -Fix crash due to: . - -diff --git a/libguile/struct.c b/libguile/struct.c -index 3dbcc71d4..ddcbe46d2 100644 ---- a/libguile/struct.c -+++ b/libguile/struct.c -@@ -139,7 +139,9 @@ set_vtable_access_fields (SCM vtable) - nfields = len / 2; - - bitmask_size = (nfields + 31U) / 32U; -- unboxed_fields = scm_gc_malloc_pointerless (bitmask_size, "unboxed fields"); -+ unboxed_fields = -+ scm_gc_malloc_pointerless (bitmask_size * sizeof (*unboxed_fields), -+ "unboxed fields"); - memset (unboxed_fields, 0, bitmask_size * sizeof(*unboxed_fields)); - - /* Update FLAGS according to LAYOUT. */ -- cgit v1.2.3 From 2b6fe60599d52b449bbf531cfdc4dbf18a14eb2c Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 27 Mar 2020 18:36:20 +0100 Subject: packages: Use Guile 3.0 for grafts. * guix/packages.scm (guile-2.0): Rename to... (guile-for-grafts): ... this, and adjust callers. Refer to 'guile-3.0' instead of 'guile-2.0'. --- guix/packages.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/guix/packages.scm b/guix/packages.scm index 70b1478c91..2552f8bf7c 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -444,12 +444,12 @@ (define (default-guile) (let ((distro (resolve-interface '(gnu packages commencement)))) (module-ref distro 'guile-final))) -(define (guile-2.0) - "Return Guile 2.0." - ;; FIXME: This is used as a workaround for when +(define (guile-for-grafts) + "Return the Guile package used to build grafting derivations." + ;; Guile 2.2 would not work due to when ;; grafting packages. (let ((distro (resolve-interface '(gnu packages guile)))) - (module-ref distro 'guile-2.0))) + (module-ref distro 'guile-3.0))) (define* (default-guile-derivation #:optional (system (%current-system))) "Return the derivation for SYSTEM of the default Guile package used to run @@ -1269,7 +1269,7 @@ (define* (package-derivation store package (() drv) (grafts - (let ((guile (package-derivation store (guile-2.0) + (let ((guile (package-derivation store (guile-for-grafts) system #:graft? #f))) ;; TODO: As an optimization, we can simply graft the tip ;; of the derivation graph since 'graft-derivation' @@ -1295,7 +1295,7 @@ (define* (package-cross-derivation store package target (graft-derivation store drv grafts #:system system #:guile - (package-derivation store (guile-2.0) + (package-derivation store (guile-for-grafts) system #:graft? #f)))) drv)))) -- cgit v1.2.3 From 7cb77b789614fbf3cd21b6c2c086e6bbbad262b4 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 27 Mar 2020 18:53:05 +0100 Subject: gnu: mailutils: Update to 3.9. * gnu/packages/mail.scm (mailutils): Update to 3.9. [arguments]: In 'prepare-test-suite' phase, adjust name of the mda 'testsuite' files. --- gnu/packages/mail.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index e36e010c3e..1b69f32aa4 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -144,14 +144,14 @@ (define-module (gnu packages mail) (define-public mailutils (package (name "mailutils") - (version "3.8") + (version "3.9") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/mailutils/mailutils-" version ".tar.xz")) (sha256 (base32 - "1wkn9ch664477r4d8jk9153w5msljsbj99907k7zgzpmywbs6ba7")))) + "1g1xf2lal04nsnf1iym9n9n0wxjpqbcr9nysxpm98v4pniinqwsz")))) (build-system gnu-build-system) (arguments `(#:phases @@ -166,7 +166,8 @@ (define-public mailutils ;; Tests try to invoke 'mda' such that it looks up the ;; 'root' user, which does not exist in the build ;; environment. - (substitute* "mda/tests/testsuite" + (substitute* '("mda/mda/tests/testsuite" + "mda/lmtpd/tests/testsuite") (("root <") "nobody <") (("spool/root") "spool/nobody") (("root@localhost") "nobody@localhost")) -- cgit v1.2.3 From 816bce684c2fd5cc1908e27fde2891ecdf25e378 Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Fri, 27 Mar 2020 16:46:40 +0100 Subject: gnu: Neofetch: Update to 7.0.0. * gnu/packages/admin.scm (neofetch): Update to 7.0.0. Signed-off-by: Leo Famulari --- gnu/packages/admin.scm | 50 +++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 4d3425d039..b2b5111458 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -31,6 +31,7 @@ ;;; Copyright © 2019 Guillaume Le Vaillant ;;; Copyright © 2019 Mathieu Othacehe ;;; Copyright © 2020 Oleg Pykhalov +;;; Copyright © 2020 Michael Rohleder ;;; ;;; This file is part of GNU Guix. ;;; @@ -2927,35 +2928,34 @@ (define-public fabric (license license:bsd-2))) (define-public neofetch - (let ((commit "501d6b7594296d9eac8943140f8581daf555873d")) - (package - (name "neofetch") - (version (git-version "6.1.0" "1" commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/dylanaraps/neofetch") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1h5md9jimyc6z4d7w66j27hn8qghzyxgpkh5h9dclzxpp5cs8whb")))) - (build-system gnu-build-system) - (arguments - `(#:tests? #f ; there are no tests - #:make-flags - (list (string-append "PREFIX=" %output)) - #:phases - (modify-phases %standard-phases - (delete 'configure)))) ; no configure script - (home-page "https://github.com/dylanaraps/neofetch") - (synopsis "System information script") - (description "Neofetch is a command-line system information tool written in + (package + (name "neofetch") + (version "7.0.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/dylanaraps/neofetch") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0xc0fdc7n5bhqirh83agqiy8r14l14zwca07czvj8vgnsnfybslr")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; there are no tests + #:make-flags + (list (string-append "PREFIX=" %output)) + #:phases + (modify-phases %standard-phases + (delete 'configure)))) ; no configure script + (home-page "https://github.com/dylanaraps/neofetch") + (synopsis "System information script") + (description "Neofetch is a command-line system information tool written in Bash. Neofetch displays information about your system next to an image, your OS logo, or any ASCII file of your choice. The main purpose of Neofetch is to be used in screenshots to show other users what operating system or distribution you are running, what theme or icon set you are using, etc.") - (license license:expat)))) + (license license:expat))) (define-public screenfetch (package -- cgit v1.2.3 From f71bce9bb23c04a88baa0cc2f7271fe0be685f1f Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Fri, 27 Mar 2020 01:51:13 +0100 Subject: gnu: tmate: Update to 2.4.0. * gnu/packages/terminals.scm (tmate): Update to 2.4.0. Signed-off-by: Leo Famulari --- gnu/packages/terminals.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 83eed3e036..9cb004e36a 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -19,6 +19,7 @@ ;;; Copyright © 2019 Brett Gilio ;;; Copyright © 2020 Jakub Kądziołka ;;; Copyright © 2020 Valentin Ignatev +;;; Copyright © 2020 Michael Rohleder ;;; ;;; This file is part of GNU Guix. ;;; @@ -906,7 +907,7 @@ (define-public python2-curtsies (define-public tmate (package (name "tmate") - (version "2.2.1") + (version "2.4.0") (source (origin (method git-fetch) @@ -916,7 +917,7 @@ (define-public tmate (file-name (git-file-name name version)) (sha256 (base32 - "0pfl9vrswzim9ydi1n652h3rax2zrmy6sqkp0r09yy3lw83h4y1r")))) + "0x5c31yq7ansmiy20a0qf59wagba9v3pq97mlkxrqxn4n1gcc6vi")))) (build-system gnu-build-system) (inputs `(("libevent" ,libevent) -- cgit v1.2.3 From 57be2cadf83fffbbc58a1c9baedb73763298dd6b Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 27 Mar 2020 23:32:11 +0100 Subject: gnu: emacs-flycheck-grammalecte: Update to 1.0. * gnu/packages/emacs-xyz.scm (emacs-flycheck-grammalecte): Update to 1.0. --- gnu/packages/emacs-xyz.scm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 5653796731..86033fd200 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -3367,15 +3367,15 @@ (define-public emacs-flycheck-flow (define-public emacs-flycheck-grammalecte (package (name "emacs-flycheck-grammalecte") - (version "0.9") - (source (origin - (method url-fetch) - (uri (string-append "https://git.deparis.io/" - "flycheck-grammalecte/snapshot/" - "flycheck-grammalecte-" version ".tar.xz")) - (sha256 - (base32 - "0wjm9xyra870pci4bcrbnc9x66x18mi7iz08rkxa4clxv28xzryb")))) + (version "1.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://git.deparis.io/" + "flycheck-grammalecte/snapshot/" + "flycheck-grammalecte-" version ".tar.xz")) + (sha256 + (base32 "02wxaw228dia8cps0v02327hrrribfqb4601qggjpi4l4ms1lf8b")))) (build-system emacs-build-system) (arguments `(#:include '("\\.(el|py)$") @@ -3397,7 +3397,7 @@ (define-public emacs-flycheck-grammalecte (out (assoc-ref outputs "out")) (version ,(version-major+minor (package-version python)))) (with-directory-excursion - (string-append out "/share/emacs/site-lisp") + (string-append out "/share/emacs/site-lisp") (symlink (string-append grammalecte "/lib/" "python" version "/site-packages/" "grammalecte") -- cgit v1.2.3 From 734eb7d79e08a1c4d4fea42453d0a821b41ad9c7 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 27 Mar 2020 23:34:37 +0100 Subject: gnu: fet: Update to 5.44.0. * gnu/packages/education.scm (fet): Update to 5.44.0. --- gnu/packages/education.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index 7c84d832c0..836fc2b525 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -602,14 +602,14 @@ (define-public omnitux (define-public fet (package (name "fet") - (version "5.43.2") + (version "5.44.0") (source (origin (method url-fetch) (uri (string-append "https://www.lalescu.ro/liviu/fet/download/" "fet-" version ".tar.bz2")) (sha256 - (base32 "111ijwdpdnavi2jjp8jqnwkgi1b9n79svkfw68fmga0z7d3nd62g")))) + (base32 "13q3b0g1zz885g15gir8fbalvix8sy42v1p429h0751490wq5c3h")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From 9fad055023c4b6f54432d7490e6cd1f1151c16e6 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 27 Mar 2020 23:37:20 +0100 Subject: gnu: grammalecte: Update to 1.8.0. * gnu/packages/dictionaries.scm (grammalecte): Update to 1.8.0. --- gnu/packages/dictionaries.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/dictionaries.scm b/gnu/packages/dictionaries.scm index d8e30a5524..d481b139a5 100644 --- a/gnu/packages/dictionaries.scm +++ b/gnu/packages/dictionaries.scm @@ -205,14 +205,14 @@ (define-public ding (define-public grammalecte (package (name "grammalecte") - (version "1.7.0") + (version "1.8.0") (source (origin (method url-fetch/zipbomb) (uri (string-append "https://grammalecte.net/grammalecte/zip/" "Grammalecte-fr-v" version ".zip")) (sha256 - (base32 "0wb126mqnq9ns6gzmhzljc6iqywdkpzvr8xny5s3khd10ki4lxl3")))) + (base32 "06z2na1zs5q6vla45q5b8fzjwpckanmwh42r8in8vhb7a8v2fkyp")))) (build-system python-build-system) (home-page "https://grammalecte.net") (synopsis "French spelling and grammar checker") -- cgit v1.2.3 From 27c3afa940693376fd1a2a55602f4af9f53798b6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 27 Mar 2020 23:36:33 +0100 Subject: gnu: r-curl: Fix patch to respect CURL_CA_BUNDLE. Fixes . * gnu/packages/cran.scm (r-curl)[arguments]: Ensure CURLOPT_CAINFO actually gets set. --- gnu/packages/cran.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 573630ff69..759b9263f3 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -677,7 +677,11 @@ (define-public r-curl (("if \\(!grepl\\(\"mingw\".*") "if (FALSE)\n")) (substitute* "src/handle.c" - (("#ifdef _WIN32") "#if 1")) + (("/\\* Only set" m) + (string-append "\ +const char *_ca_bundle = getenv(\"CURL_CA_BUNDLE\"); +if(_ca_bundle != NULL) { curl_easy_setopt(handle, CURLOPT_CAINFO, _ca_bundle); } +" m))) #t))))) (inputs `(("libcurl" ,curl) -- cgit v1.2.3 From 24b5d8f745d383c427a729c930a1ae0c0901c360 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sat, 28 Mar 2020 09:17:59 +0000 Subject: gnu: lollypop: Update to 1.2.32. * gnu/packages/gnome.scm (lollypop): Update to 1.2.32. --- gnu/packages/gnome.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index bc78910c64..f636a0f1f8 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -8880,15 +8880,14 @@ (define-public gnome-planner (define-public lollypop (package (name "lollypop") - (version "1.2.7") + (version "1.2.32") (source (origin (method url-fetch) - (uri (string-append "https://gitlab.gnome.org/World/lollypop/uploads/" - "08f973788c7ca46d9285eec2ac818edb/" + (uri (string-append "https://adishatz.org/lollypop/" "lollypop-" version ".tar.xz")) (sha256 - (base32 "0hvq6m4i62i0m63bg4gzpfb9rv1fk6vq5jl2g3ppcgm4srmfm77j")))) + (base32 "1ng9492k8754vlqggbfsyzbmfdx4w17fzc4ad21fr92710na0w5a")))) (build-system meson-build-system) (arguments `(#:imported-modules ((guix build python-build-system) -- cgit v1.2.3 From aa7f3ec0e0d84a2d46925639f1c62b033b4339a3 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Sat, 28 Mar 2020 10:38:52 +0100 Subject: gnu: sbcl-cl-containers: Update to 20200212. * gnu/packages/lisp-xyz.scm (sbcl-cl-containers): Update to 20200212. --- gnu/packages/lisp-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index f39dd170a9..939ed153d9 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -6643,8 +6643,8 @@ (define-public ecl-metatilities-base (sbcl-package->ecl-package sbcl-metatilities-base)) (define-public sbcl-cl-containers - (let ((commit "810927e19d933bcf38ffeb7a23ce521efc432d45") - (revision "1")) + (let ((commit "b2980bac9ac87ad32b63b722ce520fa26cb36ee6") + (revision "2")) (package (name "sbcl-cl-containers") (version (git-version "0.12.1" revision commit)) @@ -6657,7 +6657,7 @@ (define-public sbcl-cl-containers (file-name (git-file-name name version)) (sha256 (base32 - "1s9faxw7svhbjpkhfrz2qxgjm3cvyjb8wpyb4m8dx4i5g7vvprkv")))) + "19hmlax19hq0xjaqr8za90vwf06ymxw1m29sj053a309k3hm84gx")))) (build-system asdf-build-system/sbcl) (native-inputs `(("lift" ,sbcl-lift))) -- cgit v1.2.3 From 27d8b9d9767ec015b965af75f6ed6b32e496c9b4 Mon Sep 17 00:00:00 2001 From: Alex Griffin Date: Sat, 28 Mar 2020 09:07:06 -0500 Subject: gnu: python-socksipychain: Update to 2.1.1-1.eb5ee87. * gnu/packages/python-xyz.scm (python-socksipychain): Update to 2.1.1-1.eb5ee87. --- gnu/packages/python-xyz.scm | 47 ++++++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 22 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 989474ae5c..d63b71c14e 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -60,7 +60,7 @@ ;;; Copyright © 2019 Sam ;;; Copyright © 2019 Jack Hill ;;; Copyright © 2019, 2020 Guillaume Le Vaillant -;;; Copyright © 2019 Alex Griffin +;;; Copyright © 2019, 2020 Alex Griffin ;;; Copyright © 2019 Pierre Langlois ;;; Copyright © 2019 Jacob MacDonald ;;; Copyright © 2019 Giacomo Leidi @@ -4642,30 +4642,33 @@ (define-public python2-socksipy-branch (package-with-python2 python-socksipy-branch)) (define-public python-socksipychain - (package - (name "python-socksipychain") - (version "2.1.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/pagekite/PySocksipyChain.git") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0idm9a050rd2kbgbz2sk9ib9589kj4xh1xdnggs6xbq2v2y8f6zn")))) - (build-system python-build-system) - (arguments - `(#:tests? #f)) ; Tests try to access the network. - (home-page "http://pagekite.net/wiki/Floss/PySocksipyChain/") - (synopsis "Python SOCKS module with chained proxies support") - (description - "SocksiPyChain is a modified version of the SocksiPy SOCKS module, which + (let ((commit "eb5ee8741ce006ac0c5c3e2e83204062c348c155") + (revision "1") + (version "2.1.1")) + (package + (name "python-socksipychain") + (version (git-version version revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/pagekite/PySocksipyChain.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0fpphn6xnpm7qk8a914s4abycsbq9w6qkci07my632v0fylnm5n7")))) + (build-system python-build-system) + (arguments + `(#:tests? #f)) ; Tests try to access the network. + (home-page "http://pagekite.net/wiki/Floss/PySocksipyChain/") + (synopsis "Python SOCKS module with chained proxies support") + (description + "SocksiPyChain is a modified version of the SocksiPy SOCKS module, which adds support for arbitrary chaining of proxy servers and various modes of TLS/SSL encryption. It was developed for use in PageKite, and also includes a simple netcat replacement with chaining support.") - (license license:bsd-3))) + (license license:bsd-3)))) (define-public python-pycodestyle (package -- cgit v1.2.3 From 54cf5e2a35dece248d6c427d69a79bce90d09a70 Mon Sep 17 00:00:00 2001 From: Alex Griffin Date: Sat, 28 Mar 2020 09:08:16 -0500 Subject: gnu: pagekite: Update to 1.5.0.200327. * gnu/packages/networking.scm (pagekite): Update to 1.5.0.200327. --- gnu/packages/networking.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 7d81b449c1..6a7b0739dd 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -32,7 +32,7 @@ ;;; Copyright © 2019 Timotej Lazar ;;; Copyright © 2019 Brice Waegeneire ;;; Copyright © 2019 Tonton -;;; Copyright © 2019 Alex Griffin +;;; Copyright © 2019, 2020 Alex Griffin ;;; Copyright © 2019 Jan Wielkiewicz ;;; Copyright © 2019 Daniel Schaefer ;;; Copyright © 2019 Diego N. Barbato @@ -2790,7 +2790,7 @@ (define-public batctl (define-public pagekite (package (name "pagekite") - (version "1.5.0.191126") + (version "1.5.0.200327") (source (origin (method git-fetch) @@ -2799,7 +2799,7 @@ (define-public pagekite (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0mncfjfrr13sm84g5z49qxg5cy791h5qxphjsl77x91zs3m36c8l")))) + (base32 "1vw7kjwxqd3qvm7kpxgjzl6797y0i1f16yfkfad84qpx2ij0gvdm")))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.2.3 From 388b432cea4ae2bb9bf4b044026b7764ab002e1e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 28 Mar 2020 15:55:13 +0100 Subject: deploy: Remove use of '~*' in format string. ...since 'msgfmt' fails to interpret it. Reported by Vagrant Cascadian in . See also . * guix/scripts/deploy.scm (show-what-to-deploy): Use ~d instead of ~* when displaying machines that will be deployed. --- guix/scripts/deploy.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guix/scripts/deploy.scm b/guix/scripts/deploy.scm index f70d41f35c..5c871cd6ed 100644 --- a/guix/scripts/deploy.scm +++ b/guix/scripts/deploy.scm @@ -102,7 +102,7 @@ (define (show-what-to-deploy machines) "Show the list of machines to deploy, MACHINES." (let ((count (length machines))) (format (current-error-port) - (N_ "The following ~*machine will be deployed:~%" + (N_ "The following ~d machine will be deployed:~%" "The following ~d machines will be deployed:~%" count) count) -- cgit v1.2.3 From e4257138fe1d924c56c9979b75319585b9251fb7 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 28 Mar 2020 11:34:54 -0400 Subject: Revert "gnu: gnupg: Use ~/.guix-profile/bin/pinentry by default." This commit didn't work: https://issues.guix.gnu.org/issue/24076#13 This reverts commit c7af9d0b5ebaa1fdb08ff5d8a56004998bcd8103. --- gnu/local.mk | 1 - gnu/packages/gnupg.scm | 5 ++--- gnu/packages/patches/gnupg-default-pinentry.patch | 15 --------------- 3 files changed, 2 insertions(+), 19 deletions(-) delete mode 100644 gnu/packages/patches/gnupg-default-pinentry.patch diff --git a/gnu/local.mk b/gnu/local.mk index 60d6d912f5..52c65f0c31 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -973,7 +973,6 @@ dist_patch_DATA = \ %D%/packages/patches/gmp-faulty-test.patch \ %D%/packages/patches/gnome-shell-theme.patch \ %D%/packages/patches/gnome-tweaks-search-paths.patch \ - %D%/packages/patches/gnupg-default-pinentry.patch \ %D%/packages/patches/gnutls-skip-trust-store-test.patch \ %D%/packages/patches/gobject-introspection-absolute-shlib-path.patch \ %D%/packages/patches/gobject-introspection-cc.patch \ diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index fc5b4fbc63..856c01a6d8 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès +;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès ;;; Copyright © 2013, 2015, 2018 Andreas Enge ;;; Copyright © 2014, 2018 Eric Bavier ;;; Copyright © 2014, 2015, 2016 Mark H Weaver @@ -254,8 +254,7 @@ (define-public gnupg ".tar.bz2")) (sha256 (base32 - "0c6a4v9p6qzhsw1pfcwc459bxpc8hma0w9z8iqb9khvligack9q4")) - (patches (search-patches "gnupg-default-pinentry.patch")))) + "0c6a4v9p6qzhsw1pfcwc459bxpc8hma0w9z8iqb9khvligack9q4")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) diff --git a/gnu/packages/patches/gnupg-default-pinentry.patch b/gnu/packages/patches/gnupg-default-pinentry.patch deleted file mode 100644 index 272f4b53dc..0000000000 --- a/gnu/packages/patches/gnupg-default-pinentry.patch +++ /dev/null @@ -1,15 +0,0 @@ -Default to the pinentry program installed in ~/.guix-profile. - -diff --git a/common/homedir.c b/common/homedir.c -index e9e75d0..74e0aaf 100644 ---- a/common/homedir.c -+++ b/common/homedir.c -@@ -968,7 +968,7 @@ get_default_pinentry_name (int reset) - } names[] = { - /* The first entry is what we return in case we found no - other pinentry. */ -- { gnupg_bindir, DIRSEP_S "pinentry" EXEEXT_S }, -+ { gnupg_homedir, "/.guix-profile/bin/pinentry" }, - #ifdef HAVE_W32_SYSTEM - /* Try Gpg4win directory (with bin and without.) */ - { w32_rootdir, "\\..\\Gpg4win\\bin\\pinentry.exe" }, -- cgit v1.2.3 From 619edce5cd3e84b7a8012955039cbac0c4e24c21 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 28 Mar 2020 21:07:08 +0300 Subject: gnu: youtube-viewer: Add missing comment. This is a follow-up to 315b98b9eb71e1a56de6a49ffbfed0af3c92be7e. * gnu/packages/video.scm (youtube-viewer)[arguments]: Add comment explaining why we don't install the gtk3 variant. --- gnu/packages/video.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 2ca8605a1a..227c11d1fa 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1860,6 +1860,8 @@ (define-public youtube-viewer `(#:modules ((guix build perl-build-system) (guix build utils) (srfi srfi-26)) + ;; gtk-2/3 variants are both installed by default but the gtk3 variant + ;; is broken without perl-gtk3. #:module-build-flags '("--gtk2") #:phases (modify-phases %standard-phases -- cgit v1.2.3 From 043c3d64994b00701ba43d4d799e2cedd88eac8a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 28 Mar 2020 20:03:50 +0100 Subject: gnu: KOrganizer: Fix typo in description. * gnu/packages/kde-pim.scm (korganizer)[description]: clanedaring -> calendaring. --- gnu/packages/kde-pim.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index bf962859b9..1b99ae1de4 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -1571,7 +1571,7 @@ (define-public korganizer Kontact. It provides management of events and tasks, alarm notification, web export, network transparent handling of data, group scheduling, import and export of calendar files and more. It is able to work together with a wide -variety of clanedaring services, including NextCloud, Kolab, Google Calendar +variety of calendaring services, including NextCloud, Kolab, Google Calendar and others. KOrganizer is fully customizable to your needs and is an integral part of the Kontact suite, which aims to be a complete solution for organizing your personal data. KOrganizer supports the two dominant standards for storing -- cgit v1.2.3 From 255fb17b25f57be01cea246f8ec8a9989a13ea5a Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 28 Mar 2020 21:27:33 +0100 Subject: gnu: armadillo: Fix typo in description. * gnu/packages/maths.scm (armadillo): Fix spaces after "eg.". --- gnu/packages/maths.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 51dcc1b1ee..bd52fbc2ed 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -3125,7 +3125,7 @@ (define-public armadillo environments. It can be used for machine learning, pattern recognition, signal processing, bioinformatics, statistics, econometrics, etc. The library provides efficient classes for vectors, matrices and cubes, as well as 150+ -associated functions (eg. contiguous and non-contiguous submatrix views).") +associated functions (e.g., contiguous and non-contiguous submatrix views).") (license license:asl2.0))) (define-public muparser -- cgit v1.2.3 From c2cf286c62933d2806ae17b8287520820bf87c7e Mon Sep 17 00:00:00 2001 From: Amin Bandali Date: Sat, 28 Mar 2020 16:23:32 -0400 Subject: Update email address and Savannah handle for Amin Bandali. * .mailmap, gnu/local.mk, gnu/packages/emacs-xyz.scm, gnu/packages/emacs.scm, gnu/packages/fonts.scm, gnu/packages/fpga.scm, gnu/packages/lean.scm, gnu/packages/maths.scm, gnu/packages/pulseaudio.scm: Update my email address. * build-aux/git-authenticate.scm: Update my Savannah handle. --- .mailmap | 2 +- build-aux/git-authenticate.scm | 6 +++--- gnu/local.mk | 2 +- gnu/packages/emacs-xyz.scm | 2 +- gnu/packages/emacs.scm | 2 +- gnu/packages/fonts.scm | 2 +- gnu/packages/fpga.scm | 2 +- gnu/packages/lean.scm | 2 +- gnu/packages/maths.scm | 2 +- gnu/packages/pulseaudio.scm | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.mailmap b/.mailmap index a1cbf02030..97018775f6 100644 --- a/.mailmap +++ b/.mailmap @@ -6,7 +6,7 @@ Al McElrath Alex Sassmannshausen Alexander I. Grafov Alírio Eyng -Amin Bandali +Amin Bandali Amirouche Boubekki Andreas Enge Andreas Enge diff --git a/build-aux/git-authenticate.scm b/build-aux/git-authenticate.scm index 514d201c80..37e0c6800c 100644 --- a/build-aux/git-authenticate.scm +++ b/build-aux/git-authenticate.scm @@ -61,6 +61,9 @@ (define %committers ("atheia" ;; primary: "3B12 9196 AE30 0C3C 0E90 A26F A715 5567 3271 9948" "9A2B 401E D001 0650 1584 BAAC 8BC4 F447 6E8A 8E00") + ("bandali" + ;; primary: "BE62 7373 8E61 6D6D 1B3A 08E8 A21A 0202 4881 6103" + "39B3 3C8D 9448 0D2D DCC2 A498 8B44 A0CD C7B9 56F2") ("bavier" ;; primary: "34FF 38BC D151 25A6 E340 A0B5 3453 2F9F AFCA 8B8E" "A0C5 E352 2EF8 EF5C 64CD B7F0 FD73 CAC7 19D3 2566") @@ -133,9 +136,6 @@ (define %committers "B051 5948 F1E7 D3C1 B980 38A0 2646 FA30 BACA 7F08") ("lsl88" "2AE3 1395 932B E642 FC0E D99C 9BED 6EDA 32E5 B0BC") - ("mab" - ;; primary: "BE62 7373 8E61 6D6D 1B3A 08E8 A21A 0202 4881 6103" - "39B3 3C8D 9448 0D2D DCC2 A498 8B44 A0CD C7B9 56F2") ("marusich" "CBF5 9755 CBE7 E7EF EF18 3FB1 DD40 9A15 D822 469D") ("mbakke" diff --git a/gnu/local.mk b/gnu/local.mk index 52c65f0c31..b8649b39b1 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -25,7 +25,7 @@ # Copyright © 2019 Jonathan Brielmaier # Copyright © 2019 Evan Straw # Copyright © 2019 Brett Gilio -# Copyright © 2019 Amin Bandali +# Copyright © 2019 Amin Bandali # Copyright © 2020 Brendan Tildesley # Copyright © 2020 Vincent Legoll # diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 86033fd200..8324ad6d71 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -51,7 +51,7 @@ ;;; Copyright © 2019 Baptiste Strazzulla ;;; Copyright © 2019 Giacomo Leidi ;;; Copyright © 2019 Jens Mølgaard -;;; Copyright © 2019, 2020 Amin Bandali +;;; Copyright © 2019, 2020 Amin Bandali ;;; Copyright © 2019 Jelle Licht ;;; Copyright © 2019 Björn Höfling ;;; Copyright © 2019 Stephen Webber diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index de19998a41..ec8de7373b 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -19,7 +19,7 @@ ;;; Copyright © 2019 Jesse John Gildersleve ;;; Copyright © 2019 Valentin Ignatev ;;; Copyright © 2019 Leo Prikler -;;; Copyright © 2019 Amin Bandali +;;; Copyright © 2019 Amin Bandali ;;; ;;; This file is part of GNU Guix. ;;; diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 5fb6bbbe18..8eb4b689d9 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -29,7 +29,7 @@ ;;; Copyright © 2019 Alva ;;; Copyright © 2019 Alexandros Theodotou ;;; Copyright © 2020 Damien Cassou -;;; Copyright © 2020 Amin Bandali +;;; Copyright © 2020 Amin Bandali ;;; ;;; This file is part of GNU Guix. ;;; diff --git a/gnu/packages/fpga.scm b/gnu/packages/fpga.scm index 8f34ef8282..f01681024f 100644 --- a/gnu/packages/fpga.scm +++ b/gnu/packages/fpga.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2016 Danny Milosavljevic ;;; Copyright © 2016, 2017 Theodoros Foradis ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice -;;; Copyright © 2019 Amin Bandali +;;; Copyright © 2019 Amin Bandali ;;; ;;; This file is part of GNU Guix. ;;; diff --git a/gnu/packages/lean.scm b/gnu/packages/lean.scm index e71b4c93ae..235113d475 100644 --- a/gnu/packages/lean.scm +++ b/gnu/packages/lean.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2019 Amin Bandali +;;; Copyright © 2019 Amin Bandali ;;; ;;; This file is part of GNU Guix. ;;; diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index bd52fbc2ed..028f0e6ef9 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -29,7 +29,7 @@ ;;; Copyright © 2018 Marius Bakke ;;; Copyright © 2018 Eric Brown ;;; Copyright © 2018 Julien Lepiller -;;; Copyright © 2018 Amin Bandali +;;; Copyright © 2018 Amin Bandali ;;; Copyright © 2019 Nicolas Goaziou ;;; Copyright © 2019 Steve Sprang ;;; Copyright © 2019 Robert Smith diff --git a/gnu/packages/pulseaudio.scm b/gnu/packages/pulseaudio.scm index 0c09b51744..c2853dcd82 100644 --- a/gnu/packages/pulseaudio.scm +++ b/gnu/packages/pulseaudio.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2017 Tobias Geerinckx-Rice ;;; Copyright © 2018 Pierre Langlois ;;; Copyright © 2019 Alex Griffin -;;; Copyright © 2020 Amin Bandali +;;; Copyright © 2020 Amin Bandali ;;; ;;; This file is part of GNU Guix. ;;; -- cgit v1.2.3 From 735a8d997a92518d7d19926e1c8a1e385a98fdce Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 28 Mar 2020 21:33:16 +0100 Subject: gnu: emacs-csv: Use proper Texinfo markup in description. * gnu/packages/emacs-xyz.scm (emacs-csv)[description]: Use proper Texinfo markup. --- gnu/packages/emacs-xyz.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 8324ad6d71..9d40b8019e 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -21652,9 +21652,11 @@ (define-public emacs-csv "1vmazjrfcsa9aa9aw8bq5sazdhqvhxyj837dyw5lmh8gk7z0xdaa")))) (build-system emacs-build-system) (synopsis "Elisp functions for reading and parsing CSV files") - (description "@code{csv.el} provides functions for reading and parsing CSV (Comma -Separated Value) files. It follows the format as defined in RFC 4180 \"Common -Format and MIME Type for CSV Files\" (@url{http://tools.ietf.org/html/rfc4180}).") + (description + "@code{csv.el} provides functions for reading and parsing @acronym{CSV, +Comma-Separated Values} files. It follows the format as defined in RFC 4180 +@emph{Common Format and MIME Type for CSV +Files} (@url{http://tools.ietf.org/html/rfc4180}).") (license license:gpl3+))) (define-public emacs-org-journal -- cgit v1.2.3 From 62b9ad19e3a6638f8e077753454fdf08ba586146 Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Tue, 17 Mar 2020 16:04:51 +0100 Subject: gnu: Add wol. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/networking.scm (wol): New public variable. Signed-off-by: Jakub Kądziołka --- gnu/packages/networking.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 6a7b0739dd..ec2f0b64bd 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -2908,6 +2908,24 @@ (define-public tunctl simulation, and a number of other applications.") (license license:gpl2))) +(define-public wol + (package + (name "wol") + (version "0.7.1") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/wake-on-lan/wol/" + version "/wol-" version ".tar.gz")) + (sha256 + (base32 "08i6l5lr14mh4n3qbmx6kyx7vjqvzdnh3j9yfvgjppqik2dnq270")))) + (build-system gnu-build-system) + (home-page "https://sourceforge.net/projects/wake-on-lan/") + (synopsis "Implements Wake On LAN functionality in a small program") + (description "Tool to send a magic packet to wake another host on the +network. This must be enabled on the target host, usually in the BIOS.") + (license license:gpl2))) + (define-public vde2 (package (name "vde2") -- cgit v1.2.3 From 75083257acf00ed9d1d51cecf0b7da02e49a96df Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 29 Mar 2020 00:36:17 +0100 Subject: gnu: acpica: Update to 20200326. * gnu/packages/admin.scm (acpica): Update to 20200326. --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index b2b5111458..c51dfad340 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1583,7 +1583,7 @@ (define-public dmidecode (define-public acpica (package (name "acpica") - (version "20200214") + (version "20200326") (source (origin (method url-fetch) (uri (string-append @@ -1591,7 +1591,7 @@ (define-public acpica version ".tar.gz")) (sha256 (base32 - "0jdasziq184l3iqyp5vhrsbi6g89n10wr0ssliiz0xi3dqwsxcqk")))) + "0y08l6djjn87jmsp5kj0myjdb48000g20xlfs0a22jzzi383h3by")))) (build-system gnu-build-system) (native-inputs `(("flex" ,flex) ("bison" ,bison))) -- cgit v1.2.3 From e3fdc0197f3997f4f67918b07033e2878b98cd63 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 29 Mar 2020 00:37:05 +0100 Subject: gnu: light: Update to 1.2.2. * gnu/packages/linux.scm (light): Update to 1.2.2. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 8fec3352f3..a52faf4455 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -5348,7 +5348,7 @@ (define-public sysstat (define-public light (package (name "light") - (version "1.2.1") + (version "1.2.2") (source (origin (method git-fetch) @@ -5356,7 +5356,7 @@ (define-public light (url "https://github.com/haikarainen/light.git") (commit (string-append "v" version)))) (sha256 - (base32 "0zrjipd392bzjvxx0rjrb0cgi0ix1d83fwgw1mcy8kc4d16cgyjg")) + (base32 "1a70zcf88ifsnwll486aicjnh48zisdf8f7vi34ihw61kdadsq9s")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From a48cf78a8e61113d1987f93fc2632afcb5291175 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 29 Mar 2020 00:37:47 +0100 Subject: gnu: thefuck: Update to 3.30. * gnu/packages/admin.scm (thefuck): Update to 3.30. [native-inputs]: Add go. --- gnu/packages/admin.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index c51dfad340..d85de15304 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -77,6 +77,7 @@ (define-module (gnu packages admin) #:use-module (gnu packages libbsd) #:use-module (gnu packages linux) #:use-module (gnu packages lua) + #:use-module (gnu packages golang) #:use-module (gnu packages guile) #:use-module (gnu packages gettext) #:use-module (gnu packages imagemagick) @@ -2474,7 +2475,7 @@ (define-public dstat (define-public thefuck (package (name "thefuck") - (version "3.29") + (version "3.30") (source (origin (method git-fetch) @@ -2483,7 +2484,7 @@ (define-public thefuck (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1qhxwjjgrzpqrqjv7l2847ywpln76lyd6j8bl9gz2r6kl0fx2fqs")) + (base32 "0fnf78956pwhb9cgv1jmgypnkma5xzflkivfrkfiadbgin848yfg")) (patches (search-patches "thefuck-test-environ.patch")))) (build-system python-build-system) (arguments @@ -2505,7 +2506,8 @@ (define-public thefuck ("python-pyte" ,python-pyte) ("python-six" ,python-six))) (native-inputs - `(("python-mock" ,python-mock) + `(("go" ,go) + ("python-mock" ,python-mock) ("python-pytest" ,python-pytest) ("python-pytest-mock" ,python-pytest-mock))) (home-page "https://github.com/nvbn/thefuck") -- cgit v1.2.3 From 1b36f758671bde77eeac34d3e3d2e846fa4723ad Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 29 Mar 2020 00:41:38 +0100 Subject: gnu: Order module imports in (gnu packages admin). * gnu/packages/admin.scm: Order module imports alphabetically. --- gnu/packages/admin.scm | 80 +++++++++++++++++++++++++------------------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index d85de15304..4211efbd58 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -49,11 +49,6 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages admin) - #:use-module ((guix licenses) #:prefix license:) - #:use-module (guix packages) - #:use-module (guix utils) - #:use-module (guix download) - #:use-module (guix git-download) #:use-module (guix build-system cmake) #:use-module (guix build-system emacs) #:use-module (guix build-system gnu) @@ -61,42 +56,58 @@ (define-module (gnu packages admin) #:use-module (guix build-system perl) #:use-module (guix build-system python) #:use-module (guix build-system trivial) + #:use-module (guix download) + #:use-module (guix git-download) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages) + #:use-module (guix utils) #:use-module (gnu packages) #:use-module (gnu packages algebra) + #:use-module (gnu packages autotools) #:use-module (gnu packages base) #:use-module (gnu packages bash) + #:use-module (gnu packages bison) + #:use-module (gnu packages boost) #:use-module (gnu packages c) #:use-module (gnu packages check) + #:use-module (gnu packages compression) + #:use-module (gnu packages cross-base) #:use-module (gnu packages crypto) #:use-module (gnu packages cryptsetup) #:use-module (gnu packages cyrus-sasl) #:use-module (gnu packages dns) + #:use-module (gnu packages elf) #:use-module (gnu packages file) - #:use-module (gnu packages ncurses) - #:use-module (gnu packages readline) - #:use-module (gnu packages libbsd) - #:use-module (gnu packages linux) - #:use-module (gnu packages lua) + #:use-module (gnu packages flex) + #:use-module (gnu packages gettext) + #:use-module (gnu packages gl) + #:use-module (gnu packages glib) + #:use-module (gnu packages gnome) + #:use-module (gnu packages gnupg) #:use-module (gnu packages golang) + #:use-module (gnu packages groff) + #:use-module (gnu packages gtk) #:use-module (gnu packages guile) - #:use-module (gnu packages gettext) + #:use-module (gnu packages image) #:use-module (gnu packages imagemagick) #:use-module (gnu packages inkscape) + #:use-module (gnu packages kerberos) + #:use-module (gnu packages libbsd) + #:use-module (gnu packages libftdi) + #:use-module (gnu packages libunwind) + #:use-module (gnu packages libusb) + #:use-module (gnu packages linux) + #:use-module (gnu packages lua) + #:use-module (gnu packages man) + #:use-module (gnu packages mcrypt) + #:use-module (gnu packages mpi) + #:use-module (gnu packages ncurses) + #:use-module (gnu packages openldap) + #:use-module (gnu packages patchutils) + #:use-module (gnu packages pciutils) #:use-module (gnu packages pcre) #:use-module (gnu packages perl) #:use-module (gnu packages perl-check) - #:use-module (gnu packages tcl) - #:use-module (gnu packages compression) - #:use-module (gnu packages cross-base) - #:use-module (gnu packages tls) - #:use-module (gnu packages gnupg) - #:use-module (gnu packages bison) - #:use-module (gnu packages flex) - #:use-module (gnu packages gl) - #:use-module (gnu packages glib) - #:use-module (gnu packages openldap) - #:use-module (gnu packages mcrypt) - #:use-module (gnu packages patchutils) #:use-module (gnu packages pkg-config) #:use-module (gnu packages popt) #:use-module (gnu packages python) @@ -104,28 +115,17 @@ (define-module (gnu packages admin) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) + #:use-module (gnu packages readline) #:use-module (gnu packages sphinx) + #:use-module (gnu packages tcl) #:use-module (gnu packages terminals) #:use-module (gnu packages texinfo) - #:use-module (gnu packages groff) - #:use-module (gnu packages pciutils) - #:use-module (gnu packages libunwind) - #:use-module (gnu packages libusb) - #:use-module (gnu packages libftdi) - #:use-module (gnu packages image) - #:use-module (gnu packages xorg) + #:use-module (gnu packages tls) + #:use-module (gnu packages version-control) + #:use-module (gnu packages web) #:use-module (gnu packages xdisorg) - #:use-module (gnu packages man) - #:use-module (gnu packages autotools) - #:use-module (gnu packages gnome) - #:use-module (gnu packages kerberos) - #:use-module (gnu packages gtk) #:use-module (gnu packages xml) - #:use-module (gnu packages boost) - #:use-module (gnu packages elf) - #:use-module (gnu packages mpi) - #:use-module (gnu packages version-control) - #:use-module (gnu packages web)) + #:use-module (gnu packages xorg)) (define-public aide (package -- cgit v1.2.3 From 8c9dcdea0a9bd793afbd9f420ea02e2d55e9fc03 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 29 Mar 2020 00:49:10 +0100 Subject: gnu: igraph: Update to 0.8.1. * gnu/packages/graph.scm (igraph): Update to 0.8.1. --- gnu/packages/graph.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/graph.scm b/gnu/packages/graph.scm index aa6ea16ab3..436c18449d 100644 --- a/gnu/packages/graph.scm +++ b/gnu/packages/graph.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017, 2018, 2019, 2020 Ricardo Wurmus ;;; Copyright © 2018 Joshua Sierles, Nextjournal -;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2019 Efraim Flashner ;;; Copyright © 2019 Andreas Enge ;;; Copyright © 2020 Alexander Krotov @@ -56,15 +56,14 @@ (define-module (gnu packages graph) (define-public igraph (package (name "igraph") - (version "0.8.0") + (version "0.8.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/igraph/igraph/releases/" "download/" version "/igraph-" version ".tar.gz")) (sha256 - (base32 - "0jcnfvahrlj08y46vnax5y5bb294v4b9n00qsy7pbx0cc0sp6qvj")))) + (base32 "0wbvrac3ip3lqmbkckhnxa2swlbc86l1h8mazdlb618kx3winvi6")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From d8006740b9c2dc0a0bd977844054dddb102ec9fe Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 29 Mar 2020 00:54:24 +0100 Subject: gnu: Remove packages deprecated for over a year. * gnu/packages/admin.scm (intel-gpu-tools): Remove variable. * gnu/packages/algebra.scm (giac-xcas): Likewise. --- gnu/packages/admin.scm | 3 --- gnu/packages/algebra.scm | 3 --- 2 files changed, 6 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 4211efbd58..703fd8914e 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2880,9 +2880,6 @@ (define-public igt-gpu-tools (supported-systems '("i686-linux" "x86_64-linux")) (license license:expat))) -(define-public intel-gpu-tools - (deprecated-package "intel-gpu-tools" igt-gpu-tools)) - (define-public fabric (package (name "fabric") diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index 8682ecd8d0..0bec53743d 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -432,9 +432,6 @@ (define-public giac or text interfaces) or as a C++ library.") (license license:gpl3+))) -(define-public giac-xcas - (deprecated-package "giac-xcas" giac)) - (define-public flint (package (name "flint") -- cgit v1.2.3 From aee7f3a30763aee5dc79276b86da97bf66db096b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 29 Mar 2020 00:56:08 +0100 Subject: gnu: youtube-dl: Update to 2020.03.24. * gnu/packages/video.scm (youtube-dl): Update to 2020.03.24. --- 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 227c11d1fa..7f21bc3e60 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1640,7 +1640,7 @@ (define-public libvpx-1.7 (define-public youtube-dl (package (name "youtube-dl") - (version "2020.03.08") + (version "2020.03.24") (source (origin (method url-fetch) (uri (string-append "https://github.com/ytdl-org/youtube-dl/" @@ -1648,7 +1648,7 @@ (define-public youtube-dl version ".tar.gz")) (sha256 (base32 - "1xbka14wnalcqkhibfcqw8f5bw1m9b1f44719yifv1jk0614q4bn")))) + "05l4asakakxn53wrvxn6c03fd80zdizdbj6r2cj8c1ja3sj9i8s5")))) (build-system python-build-system) (arguments ;; The problem here is that the directory for the man page and completion -- cgit v1.2.3 From b08c4f5fceff6064baedea3385703689b8a72e47 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 29 Mar 2020 01:19:16 +0100 Subject: gnu: zimg: Update source hash. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The old and new checkouts differ only in file metadata… * gnu/packages/image.scm (zimg)[source]: Update hash. --- gnu/packages/image.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index b665740ca2..8efd7fd29e 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -1305,7 +1305,7 @@ (define-public zimg (commit (string-append "release-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "12bs2rfmmy021087i10vxibdbbvd5vld0vk3h5hymhpz7rgszcmg")))) + (base32 "1dqyrq3p8bkgvj4ci50ac342hjnhyz6xxvhiwp7wpi3v3nbj7s02")))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) -- cgit v1.2.3 From 33abf95fe673c39c84712285055a26f87ff942ac Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 29 Mar 2020 01:20:12 +0100 Subject: gnu: vapoursynth: Update to 49. * gnu/packages/video.scm (vapoursynth): Update to 49. --- 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 7f21bc3e60..8c7d6c7b88 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2211,7 +2211,7 @@ (define-public avidemux (define-public vapoursynth (package (name "vapoursynth") - (version "48") + (version "49") (source (origin (method git-fetch) (uri (git-reference @@ -2220,7 +2220,7 @@ (define-public vapoursynth (file-name (git-file-name name version)) (sha256 (base32 - "1i6163bidlp0p9zcnxpsphr44ayfzd51fig4ri7vbrbl9lw9jaih")))) + "1d298mlb24nlc2x7pixfbkd0qbpv4c706c32idsgpi96z1spkhvl")))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) -- cgit v1.2.3 From 515b0851801078ee39d6bd6d478394058215673d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 29 Mar 2020 01:20:35 +0100 Subject: gnu: xscreensaver: Update to 5.44. * gnu/packages/xdisorg.scm (xscreensaver): Update to 5.44. --- gnu/packages/xdisorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index facd63ab53..6749f86911 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -1211,7 +1211,7 @@ (define-public redshift-wayland (define-public xscreensaver (package (name "xscreensaver") - (version "5.43") + (version "5.44") (source (origin (method url-fetch) @@ -1219,7 +1219,7 @@ (define-public xscreensaver (string-append "https://www.jwz.org/xscreensaver/xscreensaver-" version ".tar.gz")) (sha256 - (base32 "1571pj1a9998sq14y9366s2rw9wd2kq3l3dvvsk610vyd0fki3qm")))) + (base32 "15bv05vpfjwsrqbazrjmm382jd7vvw0mp6y9vasn6wvxzjf0in3k")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no check target -- cgit v1.2.3 From 07ce7ae531d58a799eec3e9113c794b717deee8f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 29 Mar 2020 01:20:57 +0100 Subject: gnu: xfce4-screensaver: Update to 0.1.9. * gnu/packages/xfce.scm (xfce4-screensaver): Update to 0.1.9. --- 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 70806255d9..e8cb215d35 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -1158,7 +1158,7 @@ (define-public xfce4-screenshooter (define-public xfce4-screensaver (package (name "xfce4-screensaver") - (version "0.1.8") + (version "0.1.9") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/apps/" @@ -1168,7 +1168,7 @@ (define-public xfce4-screensaver version ".tar.bz2")) (sha256 (base32 - "1mv0r150yb29kji2rr2462g9p574bqjax1lb6bzcqgpxlmg08mj0")))) + "11p48yyjgy6crwfbyvm16yg0rkzn90ssd2wygzmwvwrx3wkzyhsp")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From 49d41690dda0501ec9dcbbc5cc6dd212a8d12601 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 29 Mar 2020 01:31:34 +0100 Subject: gnu: igt-gpu-tools: Update home page. * gnu/packages/admin.scm (igt-gpu-tools)[home-page]: Update. --- gnu/packages/admin.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 703fd8914e..2f661f5e81 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2867,7 +2867,7 @@ (define-public igt-gpu-tools ("automake" ,automake) ("libtool" ,libtool) ("pkg-config" ,pkg-config))) - (home-page "https://cgit.freedesktop.org/xorg/app/intel-gpu-tools/") + (home-page "https://gitlab.freedesktop.org/drm/igt-gpu-tools") (synopsis "Tools for development and testing of the Intel DRM driver") (description "IGT GPU Tools is a collection of tools for development and testing of the Intel DRM driver. There are many macro-level test suites that -- cgit v1.2.3 From ff38c70e5a5a37bab341400ce3cc092361205680 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 29 Mar 2020 01:39:41 +0100 Subject: gnu: mtools: Update to 4.0.24. * gnu/packages/mtools.scm (mtools): Update to 4.0.24. --- gnu/packages/mtools.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/mtools.scm b/gnu/packages/mtools.scm index b93d5789b9..5994cd140c 100644 --- a/gnu/packages/mtools.scm +++ b/gnu/packages/mtools.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013 John Darrington ;;; Copyright © 2015, 2019 Ludovic Courtès -;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018 Efraim Flashner ;;; ;;; This file is part of GNU Guix. @@ -29,14 +29,14 @@ (define-module (gnu packages mtools) (define-public mtools (package (name "mtools") - (version "4.0.23") + (version "4.0.24") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/mtools/mtools-" version ".tar.bz2")) (sha256 (base32 - "1qwfxzr964fasxlzhllahk8mzh7c82s808wvly95dsqsflkdp27i")) + "1f9g7g8zspp8nvg1nz869il9pvxpdpchqd0vxfc89y8rjbda5x14")) (patches (search-patches "mtools-mformat-uninitialized.patch")))) (build-system gnu-build-system) -- cgit v1.2.3 From cb427e7e8499f2907aa996a5f8f9205dfe690424 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 29 Mar 2020 01:42:28 +0100 Subject: gnu: libwacom: Update to 1.3. * gnu/packages/xdisorg.scm (libwacom): Update to 1.3. --- gnu/packages/xdisorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 6749f86911..a64bacd4a4 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -1062,7 +1062,7 @@ (define-public xcape (define-public libwacom (package (name "libwacom") - (version "1.2") + (version "1.3") (source (origin (method url-fetch) (uri (string-append @@ -1070,7 +1070,7 @@ (define-public libwacom "libwacom-" version "/libwacom-" version ".tar.bz2")) (sha256 (base32 - "1hv3z2qkvycqcyv99zfpbbgrlbyppdq8kk2y9x51578mwbgcy162")))) + "0g48cdg2qpvrr2nk8ccibjg3iv7iqskdv66izxacqx70w47y1771")))) (build-system glib-or-gtk-build-system) (arguments `(#:configure-flags '("--disable-static"))) -- cgit v1.2.3 From 77ca6fb316dfbf41e38c89b200a43f92249620ca Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 29 Mar 2020 01:45:01 +0100 Subject: gnu: libostree: Update to 2020.3. * gnu/packages/package-management.scm (libostree): Update to 2020.3. --- gnu/packages/package-management.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index c321a64751..8b4f8bc15b 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -990,7 +990,7 @@ (define-public msitools (define-public libostree (package (name "libostree") - (version "2020.2") + (version "2020.3") (source (origin (method url-fetch) (uri (string-append @@ -998,7 +998,7 @@ (define-public libostree (version-major+minor version) "/libostree-" version ".tar.xz")) (sha256 (base32 - "0bbk0sg4m38g7j00hy358p2azxas87minpgz3avwma6jsylj1qjg")))) + "01cch4as23xspq6pck59al7x5jj60wl21g8p3iqbdxcjl1p3jxsq")))) (build-system gnu-build-system) (arguments '(#:phases -- cgit v1.2.3 From acb41a40246e2be295d3712ded235c07c5f02f60 Mon Sep 17 00:00:00 2001 From: Florian Pelz Date: Thu, 26 Mar 2020 15:19:21 +0100 Subject: services: gdm: Add gdm user to 'video' supplementary group. This makes it possible to use gdm with the 'uvesafb' kernel module. See . * gnu/services/xorg.scm (%gdm-accounts): Set supplementary groups. --- gnu/services/xorg.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm index 09379d40c3..d0196a299e 100644 --- a/gnu/services/xorg.scm +++ b/gnu/services/xorg.scm @@ -798,6 +798,7 @@ (define %gdm-accounts (user-account (name "gdm") (group "gdm") + (supplementary-groups '("video")) (system? #t) (comment "GNOME Display Manager user") (home-directory "/var/lib/gdm") -- cgit v1.2.3 From b93b7b2585143d28636a87a07c560d39e4e69406 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 29 Mar 2020 11:20:12 +0300 Subject: gnu: msmtp: Don't rely on netcat to send queued messages. * gnu/packages/mail.scm (msmtp)[arguments]: Adjust custom 'install phase to also patch msmtpq to not need netcat. --- gnu/packages/mail.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 1b69f32aa4..fca0ed9b78 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2015 Paul van der Walt ;;; Copyright © 2015, 2016, 2018 Eric Bavier ;;; Copyright © 2015 Andreas Enge -;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner +;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Efraim Flashner ;;; Copyright © 2016 Christopher Allan Webber ;;; Copyright © 2016 Al McElrath ;;; Copyright © 2016 Leo Famulari @@ -1263,6 +1263,10 @@ (define-public msmtp (install-file (string-append msmtpq "/msmtp-queue") bin) (install-file (string-append msmtpq "/README.msmtpq") doc) (install-file "scripts/vim/msmtp.vim" vimfiles) + ;; Don't rely on netcat being in the PATH to test for a + ;; connection, instead try tp ing debian.org. + (substitute* (string-append bin "/msmtpq") + (("EMAIL_CONN_TEST=n") "EMAIL_CONN_TEST=p")) #t)))))) (synopsis "Simple and easy to use SMTP client with decent sendmail compatibility") -- cgit v1.2.3 From e8a225268e85259043c8fd40e37203bf9bf38d7e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 29 Mar 2020 11:31:22 +0200 Subject: gnu: qtwebkit: Update to 5.212.0-alpha4. * gnu/packages/qt.scm (qtwebkit): Update to 5.212.0-alpha4. [native-inputs]: Change from PYTHON-2.7 to PYTHON. --- gnu/packages/qt.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 6ca052c31a..8696dc4bb6 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -2373,7 +2373,7 @@ (define-public qwt (define-public qtwebkit (package (name "qtwebkit") - (version "5.212.0-alpha3") + (version "5.212.0-alpha4") (source (origin (method url-fetch) @@ -2381,12 +2381,12 @@ (define-public qtwebkit "qtwebkit-" version "/qtwebkit-" version ".tar.xz")) (sha256 (base32 - "05syvwi3jw9abwsc93rmjkna0vyh6bkfrsqhwir48ms54icfwzim")) + "1rm9sjkabxna67dl7myx9d9vpdyfxfdhrk9w7b94srkkjbd2d8cw")) (patches (search-patches "qtwebkit-pbutils-include.patch")))) (build-system cmake-build-system) (native-inputs `(("perl" ,perl) - ("python" ,python-2.7) + ("python" ,python) ("ruby" ,ruby) ("bison" ,bison) ("flex" ,flex) -- cgit v1.2.3 From 05fa5a84facc80aa6d7f3fe8fe4bf106aa043c93 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 29 Mar 2020 11:53:08 +0200 Subject: gnu: libreoffice: Update to 6.4.2.2. * gnu/packages/libreoffice.scm (libreoffice): Update to 6.4.2.2. --- gnu/packages/libreoffice.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 88f31c7d1a..f9dc6099e1 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -987,7 +987,7 @@ (define-public libqxp (define-public libreoffice (package (name "libreoffice") - (version "6.4.1.2") + (version "6.4.2.2") (source (origin (method url-fetch) @@ -997,7 +997,7 @@ (define-public libreoffice (version-prefix version 3) "/libreoffice-" version ".tar.xz")) (sha256 (base32 - "02iz94flpxgkvlipk3psddzw2gdq2j4nv7z01kphs5107sfs0r0d")))) + "06acm41q9nda8r30b13cn9zafsw1gszjdphh6lx90s09d2sf7f23")))) (build-system glib-or-gtk-build-system) (native-inputs `(("bison" ,bison) -- cgit v1.2.3 From 3b1886c9dd6941d753f6f2f17a30ec3ea69fc47e Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 29 Mar 2020 15:14:13 +0200 Subject: gnu: emacs-flycheck-grammalecte: Fix location for external executables. * gnu/packages/emacs-xyz.scm (emacs-flycheck-grammalecte)[inputs]: Add curl. [arguments]: Fix path to all "python", "python3" and "curl" occurrences. --- gnu/packages/emacs-xyz.scm | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 9d40b8019e..9199e56997 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -3381,13 +3381,16 @@ (define-public emacs-flycheck-grammalecte `(#:include '("\\.(el|py)$") #:phases (modify-phases %standard-phases - (add-after 'unpack 'fix-python - ;; Hardcode python3 executable in the Emacs library. + (add-after 'unpack 'set-external-executables + ;; Hardcode python3 and curl executables in the Emacs library. (lambda* (#:key inputs #:allow-other-keys) (let ((python3 (string-append (assoc-ref inputs "python") - "/bin/python3"))) + "/bin/python3")) + (curl (string-append (assoc-ref inputs "curl") + "/bin/curl"))) (substitute* "flycheck-grammalecte.el" - (("python3") python3)) + (("\"python3?") (string-append "\"" python3)) + (("\"curl") (string-append "\"" curl))) #t))) (add-after 'install 'link-to-grammalecte ;; The package expects grammalecte to be in a sub-directory. @@ -3404,7 +3407,8 @@ (define-public emacs-flycheck-grammalecte "grammalecte")) #t)))))) (inputs - `(("grammalecte" ,grammalecte) + `(("curl" ,curl) + ("grammalecte" ,grammalecte) ("python" ,python))) (propagated-inputs `(("emacs-flycheck" ,emacs-flycheck))) -- cgit v1.2.3 From c40bf5816cb3ffb59920a61f71bd34b53cac3637 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 25 Mar 2020 12:41:18 +0100 Subject: store: Add 'map/accumulate-builds'. * guix/store.scm (): New record type. (build-accumulator, map/accumulate-builds, mapm/accumulate-builds): New procedures. * tests/store.scm ("map/accumulate-builds", "mapm/accumulate-builds"): New tests. --- guix/store.scm | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ tests/store.scm | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 92 insertions(+) diff --git a/guix/store.scm b/guix/store.scm index fdaae27914..b3641ef95d 100644 --- a/guix/store.scm +++ b/guix/store.scm @@ -105,6 +105,8 @@ (define-module (guix store) add-file-tree-to-store binary-file with-build-handler + map/accumulate-builds + mapm/accumulate-builds build-things build query-failed-paths @@ -1263,6 +1265,48 @@ (define-syntax-rule (with-build-handler handler exp ...) on the build output of a previous derivation." (call-with-build-handler handler (lambda () exp ...))) +;; Unresolved dynamic dependency. +(define-record-type + (unresolved things continuation) + unresolved? + (things unresolved-things) + (continuation unresolved-continuation)) + +(define (build-accumulator continue store things mode) + "This build handler accumulates THINGS and returns an object." + (if (= mode (build-mode normal)) + (unresolved things continue) + (continue #t))) + +(define (map/accumulate-builds store proc lst) + "Apply PROC over each element of LST, accumulating 'build-things' calls and +coalescing them into a single call." + (define result + (map (lambda (obj) + (with-build-handler build-accumulator + (proc obj))) + lst)) + + (match (append-map (lambda (obj) + (if (unresolved? obj) + (unresolved-things obj) + '())) + result) + (() + result) + (to-build + ;; We've accumulated things TO-BUILD. Actually build them and resume the + ;; corresponding continuations. + (build-things store (delete-duplicates to-build)) + (map/accumulate-builds store + (lambda (obj) + (if (unresolved? obj) + ;; Pass #f because 'build-things' is now + ;; unnecessary. + ((unresolved-continuation obj) #f) + obj)) + result)))) + (define build-things (let ((build (operation (build-things (string-list things) (integer mode)) @@ -1789,6 +1833,18 @@ (define (store-lower proc) (lambda (store . args) (run-with-store store (apply proc args))))) +(define (mapm/accumulate-builds mproc lst) + "Like 'mapm' in %STORE-MONAD, but accumulate 'build-things' calls and +coalesce them into a single call." + (lambda (store) + (values (map/accumulate-builds store + (lambda (obj) + (run-with-store store + (mproc obj))) + lst) + store))) + + ;; ;; Store monad operators. ;; diff --git a/tests/store.scm b/tests/store.scm index b61a981b28..0458a34746 100644 --- a/tests/store.scm +++ b/tests/store.scm @@ -412,6 +412,42 @@ (define (same? x y) (build-derivations %store (list d2)) 'fail))) +(test-assert "map/accumulate-builds" + (let* ((b (add-text-to-store %store "build" "echo $foo > $out" '())) + (s (add-to-store %store "bash" #t "sha256" + (search-bootstrap-binary "bash" + (%current-system)))) + (d1 (derivation %store "the-thing" + s `("-e" ,b) + #:env-vars `(("foo" . ,(random-text))) + #:sources (list b s))) + (d2 (derivation %store "the-thing" + s `("-e" ,b) + #:env-vars `(("foo" . ,(random-text)) + ("bar" . "baz")) + #:sources (list b s)))) + (with-build-handler (lambda (continue store things mode) + (equal? (map derivation-file-name (list d1 d2)) + things)) + (map/accumulate-builds %store + (lambda (drv) + (build-derivations %store (list drv)) + (add-to-store %store "content-addressed" + #t "sha256" + (derivation->output-path drv))) + (list d1 d2))))) + +(test-assert "mapm/accumulate-builds" + (let* ((d1 (run-with-store %store + (gexp->derivation "foo" #~(mkdir #$output)))) + (d2 (run-with-store %store + (gexp->derivation "bar" #~(mkdir #$output))))) + (with-build-handler (lambda (continue store things mode) + (equal? (map derivation-file-name (pk 'zz (list d1 d2))) + (pk 'XX things))) + (run-with-store %store + (mapm/accumulate-builds built-derivations `((,d1) (,d2))))))) + (test-assert "topologically-sorted, one item" (let* ((a (add-text-to-store %store "a" "a")) (b (add-text-to-store %store "b" "b" (list a))) -- cgit v1.2.3 From 1213ea9bd91c3051365637731c6baeca791e0f65 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 25 Mar 2020 12:42:54 +0100 Subject: guix build: Use 'map/accumulate-builds'. * guix/scripts/build.scm (options->derivations): Use 'map/accumulate-builds' instead of 'append-map'. --- guix/scripts/build.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/guix/scripts/build.scm b/guix/scripts/build.scm index af18d8b6f9..9f87febb56 100644 --- a/guix/scripts/build.scm +++ b/guix/scripts/build.scm @@ -920,8 +920,10 @@ (define (compute-derivation obj system) (with-unbound-variable-handling (parameterize ((%graft? graft?)) (append-map (lambda (system) - (append-map (cut compute-derivation <> system) - things-to-build)) + (concatenate + (map/accumulate-builds store + (cut compute-derivation <> system) + things-to-build))) systems)))) (define (show-build-log store file urls) -- cgit v1.2.3 From 584dfdac3795541ff020aca3f488ceaf2ddd7fc3 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 25 Mar 2020 12:43:49 +0100 Subject: gexp: 'lower-inputs' uses 'mapm/accumulate-builds'. This doesn't have an noticeable impact on the run time of 'guix system build desktop.tmp --no-grafts -d'. * guix/gexp.scm (lower-inputs): Use 'mapm/accumulate-builds' instead of 'mapm'. --- guix/gexp.scm | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/guix/gexp.scm b/guix/gexp.scm index 133e0f5679..3d21685460 100644 --- a/guix/gexp.scm +++ b/guix/gexp.scm @@ -683,22 +683,22 @@ (define (store-item? obj) (and (string? obj) (store-path? obj))) (with-monad %store-monad - (mapm %store-monad - (match-lambda - (((? struct? thing) sub-drv ...) - (mlet %store-monad ((obj (lower-object - thing system #:target target))) - (return (match obj - ((? derivation? drv) - (let ((outputs (if (null? sub-drv) - '("out") - sub-drv))) - (derivation-input drv outputs))) - ((? store-item? item) - item))))) - (((? store-item? item)) - (return item))) - inputs))) + (mapm/accumulate-builds + (match-lambda + (((? struct? thing) sub-drv ...) + (mlet %store-monad ((obj (lower-object + thing system #:target target))) + (return (match obj + ((? derivation? drv) + (let ((outputs (if (null? sub-drv) + '("out") + sub-drv))) + (derivation-input drv outputs))) + ((? store-item? item) + item))))) + (((? store-item? item)) + (return item))) + inputs))) (define* (lower-reference-graphs graphs #:key system target) "Given GRAPHS, a list of (FILE-NAME INPUT ...) lists for use as a -- cgit v1.2.3 From 25af35fa32bf6c991510406a330d4a42bd5beba8 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 25 Mar 2020 12:45:12 +0100 Subject: profiles: Use 'mapm/accumulate-builds'. * guix/profiles.scm (check-for-collisions): Use 'mapm/accumulate-builds' to lower manifest entries. Call 'foldm' over the already-lowered entries. (profile-derivation): Use 'mapm/accumulate-builds' instead of 'mapm' when calling HOOKS. --- guix/profiles.scm | 59 +++++++++++++++++++++++++++++++------------------------ 1 file changed, 33 insertions(+), 26 deletions(-) diff --git a/guix/profiles.scm b/guix/profiles.scm index 3a6498993c..ad9878f370 100644 --- a/guix/profiles.scm +++ b/guix/profiles.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès +;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2013 Nikita Karetnikov ;;; Copyright © 2014, 2016 Alex Kost ;;; Copyright © 2015 Mark H Weaver @@ -280,29 +280,37 @@ (define* (check-for-collisions manifest system #:key target) (define lookup (manifest-entry-lookup manifest)) - (with-monad %store-monad + (define candidates + (filter-map (lambda (entry) + (let ((other (lookup (manifest-entry-name entry) + (manifest-entry-output entry)))) + (and other (list entry other)))) + (manifest-transitive-entries manifest))) + + (define lower-pair + (match-lambda + ((first second) + (mlet %store-monad ((first (lower-manifest-entry first system + #:target target)) + (second (lower-manifest-entry second system + #:target target))) + (return (list first second)))))) + + ;; Start by lowering CANDIDATES "in parallel". + (mlet %store-monad ((lst (mapm/accumulate-builds lower-pair candidates))) (foldm %store-monad - (lambda (entry result) - (match (lookup (manifest-entry-name entry) - (manifest-entry-output entry)) - ((? manifest-entry? second) ;potential conflict - (mlet %store-monad ((first (lower-manifest-entry entry system - #:target - target)) - (second (lower-manifest-entry second system - #:target - target))) - (if (string=? (manifest-entry-item first) - (manifest-entry-item second)) - (return result) - (raise (condition - (&profile-collision-error - (entry first) - (conflict second))))))) - (#f ;no conflict - (return result)))) + (lambda (entries result) + (match entries + ((first second) + (if (string=? (manifest-entry-item first) + (manifest-entry-item second)) + (return result) + (raise (condition + (&profile-collision-error + (entry first) + (conflict second)))))))) #t - (manifest-transitive-entries manifest)))) + lst))) (define* (package->manifest-entry package #:optional (output "out") #:key (parent (delay #f)) @@ -1521,10 +1529,9 @@ (define* (profile-derivation manifest #:target target))) (extras (if (null? (manifest-entries manifest)) (return '()) - (mapm %store-monad - (lambda (hook) - (hook manifest)) - hooks)))) + (mapm/accumulate-builds (lambda (hook) + (hook manifest)) + hooks)))) (define inputs (append (filter-map (lambda (drv) (and (derivation? drv) -- cgit v1.2.3 From c70cf1a724fb15e108dc842413db15a0b9f4bc10 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 29 Mar 2020 01:21:32 +0100 Subject: store: Add 'references/cached'. * guix/store.scm (references/cached): New procedure. --- guix/store.scm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/guix/store.scm b/guix/store.scm index b3641ef95d..ca8c0e5ef8 100644 --- a/guix/store.scm +++ b/guix/store.scm @@ -135,6 +135,7 @@ (define-module (guix store) built-in-builders references + references/cached references/substitutes references* query-path-info* @@ -1393,6 +1394,13 @@ (define %reference-cache ;; would use a cache associated with the daemon connection instead (XXX). (make-hash-table 100)) +(define (references/cached store item) + "Like 'references', but cache results." + (or (hash-ref %reference-cache item) + (let ((references (references store item))) + (hash-set! %reference-cache item references) + references))) + (define (references/substitutes store items) "Return the list of list of references of ITEMS; the result has the same length as ITEMS. Query substitute information for any item missing from the -- cgit v1.2.3 From 710854304b1ab29332edcb76f3de532e0724c197 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 25 Mar 2020 14:46:34 +0100 Subject: grafts: Don't rely on substitute info for missing store items. Fixes . * guix/grafts.scm (references-oracle)[references*]: Remove call to 'substitution-oracle' and to 'references/substitutes'. Use 'references/cached' and 'build-derivations' right away instead. --- guix/grafts.scm | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/guix/grafts.scm b/guix/grafts.scm index adc7bfafae..5173a77e58 100644 --- a/guix/grafts.scm +++ b/guix/grafts.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès +;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -166,22 +166,14 @@ (define (non-self-references references drv outputs) (define (references-oracle store input) "Return a one-argument procedure that, when passed the output file names of INPUT, a derivation input, or their dependencies, returns the list of -references of that item. Use either local info or substitute info; build -INPUT if no information is available." +references of that item. Build INPUT if it's not available." (define (references* items) + ;; Return the references of ITEMS. (guard (c ((store-protocol-error? c) - ;; As a last resort, build DRV and query the references of the - ;; build result. - - ;; Warm up the narinfo cache, otherwise each derivation build - ;; will result in one HTTP request to get one narinfo, which is - ;; much less efficient than fetching them all upfront. - (substitution-oracle store - (list (derivation-input-derivation input))) - + ;; ITEMS are not in store so build INPUT first. (and (build-derivations store (list input)) - (map (cut references store <>) items)))) - (references/substitutes store items))) + (map (cut references/cached store <>) items)))) + (map (cut references/cached store <>) items))) (let loop ((items (derivation-input-output-paths input)) (result vlist-null)) -- cgit v1.2.3 From 131f50cdc9dbb7183023f4dae759876a9e700bef Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 25 Mar 2020 15:05:15 +0100 Subject: '--dry-run' no longer implies '--no-grafts'. * guix/scripts/archive.scm (%options): "dry-run" option no longer adds 'graft? #f to RESULT. * guix/scripts/environment.scm (%options): Likewise. * guix/scripts/pack.scm (%options): Likewise. * guix/scripts/package.scm (%options): Likewise. * guix/scripts/pull.scm (%options): Likewise. * guix/scripts/system.scm (%options): Likewise. --- guix/scripts/archive.scm | 2 +- guix/scripts/build.scm | 2 +- guix/scripts/copy.scm | 2 +- guix/scripts/environment.scm | 2 +- guix/scripts/pack.scm | 2 +- guix/scripts/package.scm | 3 +-- guix/scripts/pull.scm | 2 +- guix/scripts/system.scm | 2 +- 8 files changed, 8 insertions(+), 9 deletions(-) diff --git a/guix/scripts/archive.scm b/guix/scripts/archive.scm index 80f3b704d7..41a2a42c21 100644 --- a/guix/scripts/archive.scm +++ b/guix/scripts/archive.scm @@ -183,7 +183,7 @@ (define %options (alist-delete 'verbosity result))))) (option '(#\n "dry-run") #f #f (lambda (opt name arg result) - (alist-cons 'dry-run? #t (alist-cons 'graft? #f result)))) + (alist-cons 'dry-run? #t result))) %standard-build-options)) diff --git a/guix/scripts/build.scm b/guix/scripts/build.scm index 9f87febb56..79bd84a1a0 100644 --- a/guix/scripts/build.scm +++ b/guix/scripts/build.scm @@ -778,7 +778,7 @@ (define %options (alist-cons 'manifest arg result))) (option '(#\n "dry-run") #f #f (lambda (opt name arg result) - (alist-cons 'dry-run? #t (alist-cons 'graft? #f result)))) + (alist-cons 'dry-run? #t result))) (option '(#\r "root") #t #f (lambda (opt name arg result) (alist-cons 'gc-root arg result))) diff --git a/guix/scripts/copy.scm b/guix/scripts/copy.scm index 2fa31ecf45..f6f64d0a11 100644 --- a/guix/scripts/copy.scm +++ b/guix/scripts/copy.scm @@ -135,7 +135,7 @@ (define %options (alist-delete 'verbosity result))))) (option '(#\n "dry-run") #f #f (lambda (opt name arg result) - (alist-cons 'dry-run? #t (alist-cons 'graft? #f result)))) + (alist-cons 'dry-run? #t result))) (option '(#\h "help") #f #f (lambda args diff --git a/guix/scripts/environment.scm b/guix/scripts/environment.scm index ca12346815..bfc4039c2b 100644 --- a/guix/scripts/environment.scm +++ b/guix/scripts/environment.scm @@ -256,7 +256,7 @@ (define %options (alist-cons 'ad-hoc? #t result))) (option '(#\n "dry-run") #f #f (lambda (opt name arg result) - (alist-cons 'dry-run? #t (alist-cons 'graft? #f result)))) + (alist-cons 'dry-run? #t result))) (option '(#\s "system") #t #f (lambda (opt name arg result) (alist-cons 'system arg diff --git a/guix/scripts/pack.scm b/guix/scripts/pack.scm index b6fb73838d..f641f535b9 100644 --- a/guix/scripts/pack.scm +++ b/guix/scripts/pack.scm @@ -823,7 +823,7 @@ (define %options (option '(#\n "dry-run") #f #f (lambda (opt name arg result) - (alist-cons 'dry-run? #t (alist-cons 'graft? #f result)))) + (alist-cons 'dry-run? #t result))) (option '(#\d "derivation") #f #f (lambda (opt name arg result) (alist-cons 'derivation-only? #t result))) diff --git a/guix/scripts/package.scm b/guix/scripts/package.scm index 110d4f2977..c7908ece6c 100644 --- a/guix/scripts/package.scm +++ b/guix/scripts/package.scm @@ -489,8 +489,7 @@ (define %options #f))) (option '(#\n "dry-run") #f #f (lambda (opt name arg result arg-handler) - (values (alist-cons 'dry-run? #t - (alist-cons 'graft? #f result)) + (values (alist-cons 'dry-run? #t result) #f))) (option '(#\v "verbosity") #t #f (lambda (opt name arg result arg-handler) diff --git a/guix/scripts/pull.scm b/guix/scripts/pull.scm index b7e0a4a416..42c9956136 100644 --- a/guix/scripts/pull.scm +++ b/guix/scripts/pull.scm @@ -168,7 +168,7 @@ (define %options (alist-delete 'system result eq?)))) (option '(#\n "dry-run") #f #f (lambda (opt name arg result) - (alist-cons 'dry-run? #t (alist-cons 'graft? #f result)))) + (alist-cons 'dry-run? #t result))) (option '(#\v "verbosity") #t #f (lambda (opt name arg result) (let ((level (string->number* arg))) diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index 61a3c95dbd..a178761203 100644 --- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -1041,7 +1041,7 @@ (define %options (option '(#\n "dry-run") #f #f (lambda (opt name arg result) - (alist-cons 'dry-run? #t (alist-cons 'graft? #f result)))) + (alist-cons 'dry-run? #t result))) (option '(#\v "verbosity") #t #f (lambda (opt name arg result) (let ((level (string->number* arg))) -- cgit v1.2.3 From 0e833ac5f4ebd6c6bfc75a5f110c2c85b8be804a Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 29 Mar 2020 15:08:27 +0200 Subject: services: shepherd: Mark '.go' derivations as non-substitutable. * gnu/services/shepherd.scm (scm->go): Pass #:options to 'computed-file'. --- gnu/services/shepherd.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnu/services/shepherd.scm b/gnu/services/shepherd.scm index d483ff1a15..bad089844d 100644 --- a/gnu/services/shepherd.scm +++ b/gnu/services/shepherd.scm @@ -269,7 +269,11 @@ (define (scm->go file) (module-use! env (resolve-interface '(oop goops))) (module-use! env (resolve-interface '(shepherd service))) (compile-file #$file #:output-file #$output - #:env env)))))) + #:env env))) + + ;; It's faster to build locally than to download. + #:options '(#:local-build? #t + #:substitutable? #f)))) (define (shepherd-configuration-file services) "Return the shepherd configuration file for SERVICES." -- cgit v1.2.3 From 8ffc20efb8ca2d7421474bad84ce780466bdab4d Mon Sep 17 00:00:00 2001 From: Evan Straw Date: Fri, 27 Mar 2020 19:58:39 -0700 Subject: gnu: Add guile3.0-websocket. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/guile-xyz.scm (guile3.0-websocket): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/guile-xyz.scm | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 09427da487..0ed8419f10 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -24,6 +24,7 @@ ;;; Copyright © 2019, 2020 Amar Singh ;;; Copyright © 2019 Timothy Sample ;;; Copyright © 2019 Martin Becze +;;; Copyright © 2020 Evan Straw ;;; ;;; This file is part of GNU Guix. ;;; @@ -3241,3 +3242,45 @@ (define-public guile-irc Relay Chat} (IRC).") ;; Some file headers incorrectly say LGPLv2+. (license license:lgpl2.1+)))) + +(define-public guile3.0-websocket + (let ((commit "c854e0f84a40d972cbd532bbb89c97ca0126a7cf")) + (package + (name "guile3.0-websocket") + (version "0.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "git://dthompson.us/guile-websocket.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1hymvsfrmq9qxr5cxnsgdz7y757yp1cpsgxmdp3f5wxxxpqgsmzx")))) + (build-system gnu-build-system) + (arguments + '(#:make-flags + '("GUILE_AUTO_COMPILE=0") + #:phases + (modify-phases %standard-phases + ;; The package was developed for Guile 2.0 and has this version + ;; hardcoded in the configure.ac and Makefile.am files. Substitute + ;; 3.0 instead so it can support Guile 3.0. + (add-after 'unpack 'update-guile-version + (lambda _ + (substitute* "configure.ac" + (("2.0.9") "3.0.0")) + (substitute* "Makefile.am" + (("2.0") "3.0")) + #t))))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake))) + (inputs + `(("guile" ,guile-next))) + (synopsis "Websocket server/client for Guile") + (description "Guile-websocket provides an implementation of the +WebSocket protocol as defined by RFC 6455.") + (home-page "https://git.dthompson.us/guile-websocket.git") + (license license:lgpl3+)))) -- cgit v1.2.3 From cea91813aca4819cd95c925e335336d9324bbf72 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 29 Mar 2020 15:27:39 +0200 Subject: gnu: guile3.0-websocket: Install .go files in the right place. * gnu/packages/guile-xyz.scm (guile3.0-websocket)[arguments]: In 'update-guile-version' phase, change "/ccache" to "/site-ccache". --- gnu/packages/guile-xyz.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 0ed8419f10..e22592cd50 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -3272,7 +3272,10 @@ (define-public guile3.0-websocket (substitute* "configure.ac" (("2.0.9") "3.0.0")) (substitute* "Makefile.am" - (("2.0") "3.0")) + (("2.0") "3.0") + + ;; Install .go files where they belong. + (("/ccache") "/site-ccache")) #t))))) (native-inputs `(("autoconf" ,autoconf) -- cgit v1.2.3 From 033df23680cce1b3ccd9c83b97d8c200176cdb0a Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 29 Mar 2020 15:35:47 +0200 Subject: packages: Change 'guile-for-grafts' back to 2.0. This reverts 2b6fe60599d52b449bbf531cfdc4dbf18a14eb2c, due to reports of segfaults of Guile 3.0.2 during grafting. * guix/packages.scm (guile-for-grafts): Change back to GUILE-2.0. --- guix/packages.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/guix/packages.scm b/guix/packages.scm index 2552f8bf7c..e2578101ee 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès +;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2014, 2015, 2017, 2018 Mark H Weaver ;;; Copyright © 2015 Eric Bavier ;;; Copyright © 2016 Alex Kost @@ -449,7 +449,7 @@ (define (guile-for-grafts) ;; Guile 2.2 would not work due to when ;; grafting packages. (let ((distro (resolve-interface '(gnu packages guile)))) - (module-ref distro 'guile-3.0))) + (module-ref distro 'guile-2.0))) (define* (default-guile-derivation #:optional (system (%current-system))) "Return the derivation for SYSTEM of the default Guile package used to run -- cgit v1.2.3 From d96ad7fa1dcb12082db1acc07876f1ff219489df Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Sun, 29 Mar 2020 17:38:12 +0200 Subject: gnu: ntl: Update to 11.4.3. * gnu/packages/algebra.scm (ntl): Update to 11.4.3. [source], [home-page]: Use https URL. [source](snippet): Remove bundled libtool. [inputs]: Add gf2x. [arguments](configure): Use invoke insteam of system*. Remove the no longer supported WIZARD argument. Add a LIBTOOL parameter, since it's now required. Enable building with gf2x. Pass the paths to dependencies explicitly. (eclib)[inputs]: Remove the transitive dependency on gmp, which is now handled automatically by libtool. --- gnu/packages/algebra.scm | 39 +++++++++++++++++++++++---------------- 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index 0bec53743d..af50c2d775 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -558,42 +558,50 @@ (define-public python-flint (define-public ntl (package (name "ntl") - (version "9.7.0") + (version "11.4.3") (source (origin (method url-fetch) - (uri (string-append "http://shoup.net/ntl/ntl-" + (uri (string-append "https://shoup.net/ntl/ntl-" version ".tar.gz")) - (sha256 (base32 - "115frp5flyvw9wghz4zph1b3llmr5nbxk1skgsggckr81fh3gmxq")))) + (sha256 + (base32 + "1lisp3064rch3jaa2wrhy1s9kll7i3ka3d0y6lj6l3l4ckfcrhdp")) + (modules '((guix build utils))) + (snippet + '(begin + (delete-file-recursively "src/libtool-origin") + #t)))) (build-system gnu-build-system) (native-inputs `(("libtool" ,libtool) ("perl" ,perl))) ; for configuration - ;; FIXME: Add optional input gf2x once available; then also add - ;; configure flag "NTL_GF2X_LIB=on". (inputs - `(("gmp" ,gmp))) + `(("gmp" ,gmp) + ("gf2x" ,gf2x))) (arguments `(#:phases (modify-phases %standard-phases (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) + (lambda* (#:key inputs outputs #:allow-other-keys) (chdir "src") - (system* "./configure" + (invoke "./configure" (string-append "PREFIX=" (assoc-ref outputs "out")) + (string-append "LIBTOOL=" (assoc-ref inputs "libtool") "/bin/libtool") + ;; set the library prefixes explicitly so that they get + ;; embedded in the .la file + (string-append "GMP_PREFIX=" (assoc-ref inputs "gmp")) + (string-append "GF2X_PREFIX=" (assoc-ref inputs "gf2x")) ;; Do not build especially for the build machine. "NATIVE=off" - ;; Also do not tune to the build machine. - "WIZARD=off" - "SHARED=on") - #t))))) + "NTL_GF2X_LIB=on" + "SHARED=on")))))) (synopsis "C++ library for number theory") (description "NTL is a C++ library providing data structures and algorithms for manipulating signed, arbitrary length integers, and for vectors, matrices, and polynomials over the integers and over finite fields.") (license license:gpl2+) - (home-page "http://shoup.net/ntl/"))) + (home-page "https://shoup.net/ntl/"))) (define-public singular (package @@ -1451,8 +1459,7 @@ (define-public eclib ("automake" ,automake) ("libtool" ,libtool))) (inputs - `(("gmp" ,gmp) - ("ntl" ,ntl) + `(("ntl" ,ntl) ("pari-gp" ,pari-gp))) (synopsis "Ranks of elliptic curves and modular symbols") (description "The eclib package includes mwrank (for 2-descent on -- cgit v1.2.3 From 7cc9e1dc5a474f12ca826f0bab7b5c3ac4c0d8ab Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Sun, 29 Mar 2020 18:01:07 +0200 Subject: algebra.scm: Add a copyright line This is a follow-up to commit d96ad7fa1dcb12082db1acc07876f1ff219489df. --- gnu/packages/algebra.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index af50c2d775..081666c38f 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2017 Marius Bakke ;;; Copyright © 2017, 2019 Eric Bavier ;;; Copyright © 2020 Björn Höfling +;;; Copyright © 2020 Jakub Kądziołka ;;; ;;; This file is part of GNU Guix. ;;; -- cgit v1.2.3 From 6a89997153d964d97f601b825ddcb48f05a79336 Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Sun, 29 Mar 2020 18:21:09 +0200 Subject: gnu: rgbds: Update to 0.3.10. * gnu/packages/assembly.scm (rgbds): Update to 0.3.10. --- gnu/packages/assembly.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/assembly.scm b/gnu/packages/assembly.scm index 0a24220e18..9ebfe834bf 100644 --- a/gnu/packages/assembly.scm +++ b/gnu/packages/assembly.scm @@ -259,7 +259,7 @@ (define-public libjit (define-public rgbds (package (name "rgbds") - (version "0.3.9") + (version "0.3.10") (source (origin (method git-fetch) (uri (git-reference @@ -268,7 +268,7 @@ (define-public rgbds (file-name (git-file-name name version)) (sha256 (base32 - "0pzd9ig3ahpgq7jbj82grllxx1v01d620insr2m8h0c6jj25n5hv")))) + "0752fbffxgxyf3jw2iij88l05dqhppgcxy7dvk82hp4wdg4cflpq")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From 1a4baf51196d413e583498be7f3780a3e4f98372 Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Sun, 29 Mar 2020 18:21:40 +0200 Subject: gnu: sameboy: Add missing #t in phase. * gnu/packages/emulators.scm (sameboy)[arguments]: Add a trailing #t to the install phase. --- gnu/packages/emulators.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 3591b1740c..2fcb176ae4 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -511,7 +511,8 @@ (define-public sameboy (with-directory-excursion "build/bin/SDL" (install-file "sameboy" bin) (delete-file "sameboy") - (copy-recursively "." data)))))))) + (copy-recursively "." data)) + #t)))))) (home-page "https://sameboy.github.io/") (synopsis "Accurate Game Boy, Game Boy Color and Super Game Boy emulator") (description "SameBoy is a user friendly Game Boy, Game Boy Color -- cgit v1.2.3 From 57c3b71cbe1cd9ca6055823a029bd1238e8756bd Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Sun, 29 Mar 2020 18:35:06 +0200 Subject: gnu: Update hash-extender. * gnu/packages/crypto.scm (hash-extender): Update to newer commit. * gnu/packages/patches/hash-extender-test-suite.patch: The patch was merged upstream, no need to apply it anymore. * gnu/local.mk (dist_patch_DATA): Unregister the patch file. --- gnu/local.mk | 1 - gnu/packages/crypto.scm | 10 ++++------ gnu/packages/patches/hash-extender-test-suite.patch | 13 ------------- 3 files changed, 4 insertions(+), 20 deletions(-) delete mode 100644 gnu/packages/patches/hash-extender-test-suite.patch diff --git a/gnu/local.mk b/gnu/local.mk index b8649b39b1..cb492cba37 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1006,7 +1006,6 @@ dist_patch_DATA = \ %D%/packages/patches/gtksourceview-2-add-default-directory.patch \ %D%/packages/patches/gzdoom-search-in-installed-share.patch \ %D%/packages/patches/gzdoom-find-system-libgme.patch \ - %D%/packages/patches/hash-extender-test-suite.patch \ %D%/packages/patches/haskell-mode-unused-variables.patch \ %D%/packages/patches/haskell-mode-make-check.patch \ %D%/packages/patches/hdf4-architectures.patch \ diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index afe85ae497..f48ab50ca9 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -1075,8 +1075,8 @@ (define-public libolm (license license:asl2.0))) (define-public hash-extender - (let ((commit "9ecef26809a1ceea2a455f6f591b004298df551b") - (revision "1")) + (let ((commit "cb8aaee49f93e9c0d2f03eb3cafb429c9eed723d") + (revision "2")) (package (name "hash-extender") (version (git-version "0.0" revision commit)) @@ -1087,10 +1087,8 @@ (define-public hash-extender (commit commit))) (sha256 (base32 - "0fqy3d559zgf71w39py0931d8na0ylils45r8zs6r79wgr6qn78c")) - (file-name (git-file-name name version)) - (patches - (search-patches "hash-extender-test-suite.patch")))) + "1fj118566hr1wv03az2w0iqknazsqqkak0mvlcvwpgr6midjqi9b")) + (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments `(#:phases diff --git a/gnu/packages/patches/hash-extender-test-suite.patch b/gnu/packages/patches/hash-extender-test-suite.patch deleted file mode 100644 index 59de52dad4..0000000000 --- a/gnu/packages/patches/hash-extender-test-suite.patch +++ /dev/null @@ -1,13 +0,0 @@ -Make the test suite exit with a non-zero exit code if some tests failed. -Pull request pending upstream: https://github.com/iagox86/hash_extender/pull/13 ---- a/test.c -+++ b/test.c -@@ -79,5 +79,9 @@ void test_report(void) - printf("TESTS PASSED: %d / %d [%2.4f%%]\n", tests_passed, tests_run, 100 * (float)tests_passed / tests_run); - printf("--------------------------------------------------------------------------------\n"); - } -+ -+ if (tests_passed != tests_run) { -+ exit(1); -+ } - } -- cgit v1.2.3 From 53b9df20c12439268306a12375f7507cea9d0662 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 29 Mar 2020 15:55:33 +0200 Subject: gnu: Remove more packages deprecated for over almost a year. * gnu/packages/games.scm (armagetron-advanced) (cataclysm-dark-days-ahead, gnubackgammon, l-abbaye-des-morts) (the-battle-for-wesnoth, the-battle-for-wesnoth-server) (project-starfighter, kiki-the-nano-bot, fish-fillets-ng) (dungeon-crawl-stone-soup): Let's forget this ever happened. * gnu/packages/emacs-xyz.scm (geiser, paredit, git-modes/old-name) (magit, magit-svn, haskell-mode, emacs-emms-player-mpv, bbdb) (ert-runner, groovy-emacs-modes): Remove variable. * gnu/packages/engineering.scm (emacs-emms-player-simple-mpv) (emacs-evil-ediff, emacs-evil-mu4e, emacs-wgrep-helm, ao): Likewise. * gnu/packages/finance.scm (monero-core): Likewise. * gnu/packages/gnome.scm (dungeon-crawl-stone-soup-tiles) (tales-of-maj-eyal, battle-tanks, the-legend-of-edgar) (gnome-tweak-tool): Likewise. * gnu/packages/gnuzilla.scm (conkeror): Likewise. * gnu/packages/guile-xyz.scm (mcron2): Likewise. * gnu/packages/image.scm (pngcrunch): Likewise. * gnu/packages/linux.scm (eudev-with-hwdb): Likewise. * gnu/packages/maths.scm (qtoctave): Likewise. * gnu/packages/package-management.scm (guile2.0-guix): Likewise. * gnu/packages/php.scm (php-with-bcmath): Likewise. * gnu/packages/python-xyz.scm (python-kivy-next, python2-kivy-next): Likewise. * gnu/packages/video.scm (livestreamer): Likewise. * gnu/packages/virtualization.scm (lookingglass): Likewise. * gnu/packages/vulkan.scm (vulkan-icd-loader): Likewise. * gnu/packages/syndication.scm (newsbeuter): Likewise. (newsboat)[description]: Remove historical footnote. --- gnu/packages/emacs-xyz.scm | 47 ------------------------------------- gnu/packages/engineering.scm | 3 --- gnu/packages/finance.scm | 3 --- gnu/packages/games.scm | 42 --------------------------------- gnu/packages/gnome.scm | 4 ---- gnu/packages/gnuzilla.scm | 5 ---- gnu/packages/guile-xyz.scm | 4 ---- gnu/packages/image.scm | 4 ---- gnu/packages/linux.scm | 3 --- gnu/packages/maths.scm | 3 --- gnu/packages/package-management.scm | 3 --- gnu/packages/php.scm | 3 --- gnu/packages/python-xyz.scm | 6 ----- gnu/packages/syndication.scm | 8 +------ gnu/packages/video.scm | 3 --- gnu/packages/virtualization.scm | 3 --- gnu/packages/vulkan.scm | 3 --- 17 files changed, 1 insertion(+), 146 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 9199e56997..b2c3e7314b 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -211,9 +211,6 @@ (define-public emacs-geiser metadata.") (license license:bsd-3))) -(define-public geiser - (deprecated-package "geiser" emacs-geiser)) - (define-public emacs-paredit (package (name "emacs-paredit") @@ -239,9 +236,6 @@ (define-public emacs-paredit when typing parentheses directly or commenting out code line by line.") (license license:gpl3+))) -(define-public paredit - (deprecated-package "paredit" emacs-paredit)) - (define-public git-modes (package (name "emacs-git-modes") @@ -263,9 +257,6 @@ (define-public git-modes configuration files, such as .gitattributes, .gitignore, and .git/config.") (license license:gpl3+))) -(define-public git-modes/old-name - (deprecated-package "git-modes" git-modes)) - (define-public emacs-with-editor (package (name "emacs-with-editor") @@ -395,9 +386,6 @@ (define-public emacs-magit operations.") (license license:gpl3+)))) -(define-public magit - (deprecated-package "magit" emacs-magit)) - (define-public emacs-magit-svn (let ((commit "9e33ceee32f665db59909e1c00a667ccdd04178f")) (package @@ -424,9 +412,6 @@ (define-public emacs-magit-svn support for Git-SVN.") (license license:gpl3+)))) -(define-public magit-svn - (deprecated-package "magit-svn" emacs-magit-svn)) - (define-public emacs-magit-popup (package (name "emacs-magit-popup") @@ -768,9 +753,6 @@ (define (copy-to-dir dir files) programs.") (license license:gpl3+))) -(define-public haskell-mode - (deprecated-package "haskell-mode" emacs-haskell-mode)) - (define-public emacs-dante (let ((commit "38b589417294c7ea44bf65b73b8046d950f9531b") (revision "1")) @@ -1383,10 +1365,6 @@ (define-public emacs-emms (home-page "https://www.gnu.org/software/emms/") (license license:gpl3+))) -(define-public emacs-emms-player-mpv - ;; A new mpv backend is included in Emms from 5.0. - (deprecated-package "emacs-emms-player-mpv" emacs-emms)) - (define-public emacs-emms-mode-line-cycle (package (name "emacs-emms-mode-line-cycle") @@ -1485,9 +1463,6 @@ (define-public emacs-bbdb mode, Rmail, Gnus, MH-E, and VM). BBDB is fully customizable.") (license license:gpl3+))) -(define-public bbdb - (deprecated-package "bbdb" emacs-bbdb)) - (define-public emacs-aggressive-indent (package (name "emacs-aggressive-indent") @@ -10062,9 +10037,6 @@ (define-public emacs-ert-runner running tests easier.") (license license:gpl3+))) -(define-public ert-runner - (deprecated-package "ert-runner" emacs-ert-runner)) - (define-public emacs-xtest (package (name "emacs-xtest") @@ -11428,9 +11400,6 @@ (define-public emacs-groovy-modes navigation with the grails mode.") (license license:gpl3+))) -(define-public groovy-emacs-modes - (deprecated-package "groovy-emacs-modes" emacs-groovy-modes)) - (define-public emacs-org-tree-slide (let ((commit "036a36eec1cf712d3db155572aed325daa372eb5") (revision "2")) @@ -14047,10 +14016,6 @@ (define-public emacs-benchmark-init time is being spent during Emacs startup in order to optimize startup time.") (license license:gpl3+))) -(define-public emacs-emms-player-simple-mpv - ;; A new mpv backend is included in Emms from 5.0. - (deprecated-package "emacs-emms-player-simple-mpv" emacs-emms)) - (define-public emacs-magit-gerrit (let ((version "0.3") (revision "1") @@ -15209,10 +15174,6 @@ (define-public emacs-zotxt Org-mode file, and citations of Zotero items in Pandoc Markdown files.") (license license:gpl3+))) -(define-public emacs-evil-ediff - ;; Evil-Ediff is included in Evil Collection from 20180617. - (deprecated-package "emacs-evil-ediff" emacs-evil-collection)) - (define-public emacs-evil-magit (let ((commit "4b66a1db8285457147a5436f209391016a819ea1") (revision "3")) @@ -15249,10 +15210,6 @@ (define-public emacs-evil-magit describing the key binding changes.") (license license:gpl3+)))) -(define-public emacs-evil-mu4e - ;; Evil-mu4e is included in Evil Collection from 20180617. - (deprecated-package "emacs-evil-mu4e" emacs-evil-collection)) - (define-public emacs-evil-multiedit (package (name "emacs-evil-multiedit") @@ -15882,10 +15839,6 @@ (define-public emacs-picpocket @end itemize") (license license:gpl3+)))) -(define-public emacs-wgrep-helm - ;; `emacs-wgrep-helm' was mistakenly added. - (deprecated-package "emacs-wgrep-helm" emacs-wgrep)) - (define-public emacs-mu4e-conversation (let ((commit "98110bb9c300fc9866dee8e0023355f9f79c9b96") (revision "5")) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 28a30a6831..675312ce20 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -791,9 +791,6 @@ (define-public libfive (license (list license:mpl2.0 ;library license:gpl2+))))) ;Guile bindings and GUI -(define-public ao - (deprecated-package "ao-cad" libfive)) - ;; TODO Add doc https://gitlab.com/kicad/services/kicad-doc/-/tree/master (define-public kicad (package diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 43eda97f1a..7bf8f4fc6e 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -744,9 +744,6 @@ (define-public monero-gui the Monero GUI client.") (license license:bsd-3))) -(define-public monero-core - (deprecated-package "monero-core" monero-gui)) - (define-public python-trezor-agent (package (name "python-trezor-agent") diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 42f2230482..3284459021 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -329,9 +329,6 @@ (define-public armagetronad physics settings to tweak as well.") (license license:gpl2+))) -(define-public armagetron-advanced - (deprecated-package "armagetron-advanced" armagetronad)) - (define-public bastet (package (name "bastet") @@ -461,9 +458,6 @@ (define-public cataclysm-dda want what you have.") (license license:cc-by-sa3.0)))) -(define-public cataclysm-dark-days-ahead - (deprecated-package "cataclysm-dark-days-ahead" cataclysm-dda)) - (define-public corsix-th (package (name "corsix-th") @@ -1151,9 +1145,6 @@ (define-public gnubg also features an attractive, 3D representation of the playing board.") (license license:gpl3+))) -(define-public gnubackgammon - (deprecated-package "gnubackgammon" gnubg)) - (define-public gnubik (package (name "gnubik") @@ -1704,9 +1695,6 @@ (define-public abbaye that beneath its ruins lay buried an ancient evil.") (license license:gpl3))) -(define-public l-abbaye-des-morts - (deprecated-package "l-abbaye-des-morts" abbaye)) - (define-public angband (package (name "angband") @@ -2835,9 +2823,6 @@ (define-public wesnoth next campaign.") (license license:gpl2+))) -(define-public the-battle-for-wesnoth - (deprecated-package "the-battle-for-wesnoth" wesnoth)) - (define-public wesnoth-server (package (inherit wesnoth) @@ -2854,9 +2839,6 @@ (define-public wesnoth-server (description "This package contains a dedicated server for @emph{The Battle for Wesnoth}."))) -(define-public the-battle-for-wesnoth-server - (deprecated-package "the-battle-for-wesnoth-server" wesnoth-server)) - (define-public gamine (package (name "gamine") @@ -3790,9 +3772,6 @@ (define-public starfighter license:cc0 license:public-domain)))) -(define-public project-starfighter - (deprecated-package "project-starfighter" starfighter)) - (define-public chromium-bsu (package (name "chromium-bsu") @@ -4728,9 +4707,6 @@ (define-public kiki ;; for a statement from the author. (license license:public-domain))) -(define-public kiki-the-nano-bot - (deprecated-package "kiki-the-nano-bot" kiki)) - (define-public teeworlds (package (name "teeworlds") @@ -5000,9 +4976,6 @@ (define-public fillets-ng fish. The whole game is accompanied by quiet, comforting music.") (license license:gpl2+))) -(define-public fish-fillets-ng - (deprecated-package "fish-fillets-ng" fillets-ng)) - (define-public crawl (package (name "crawl") @@ -5082,9 +5055,6 @@ (define-public crawl license:zlib license:asl2.0)))) -(define-public dungeon-crawl-stone-soup - (deprecated-package "dungeon-crawl-stone-soup" crawl)) - ;; The linter here claims that patch file names should start with the package ;; name. But, in this case, the patches are inherited from crawl with the ;; "crawl-" prefix instead of "crawl-tiles-". @@ -5121,9 +5091,6 @@ (define-public crawl-tiles ("which" ,which))) (synopsis "Graphical roguelike dungeon crawler game"))) -(define-public dungeon-crawl-stone-soup-tiles - (deprecated-package "dungeon-crawl-stone-soup-tiles" crawl-tiles)) - (define-public lugaru (package (name "lugaru") @@ -5533,9 +5500,6 @@ (define-public tome4 Tales of Maj’Eyal offers engaging roguelike gameplay for the 21st century.") (license license:gpl3+))) -(define-public tales-of-maj-eyal - (deprecated-package "tales-of-maj-eyal" tome4)) - (define-public quakespasm (package (name "quakespasm") @@ -7001,9 +6965,6 @@ (define-public btanks ;; developers. (license (list license:gpl2+ license:lgpl2.1+)))) -(define-public battle-tanks - (deprecated-package "battle-tanks" btanks)) - (define-public slingshot (package (name "slingshot") @@ -7204,9 +7165,6 @@ (define-public edgar (home-page "https://www.parallelrealities.co.uk/games/edgar/") (license license:gpl2+))) -(define-public the-legend-of-edgar - (deprecated-package "the-legend-of-edgar" edgar)) - (define-public openclonk (package (name "openclonk") diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index f636a0f1f8..924b38dc6f 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -8156,10 +8156,6 @@ (define-public gnome-tweaks GNOME Shell appearance and extension, etc.") (license license:gpl3+))) -;; This package has been renamed by upstream. -(define-public gnome-tweak-tool - (deprecated-package "gnome-tweak-tool" gnome-tweaks)) - (define-public gnome-shell-extensions (package (name "gnome-shell-extensions") diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index c69a4e7e03..23f15906c5 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -1142,11 +1142,6 @@ (define-public icecat (cpe-name . "firefox_esr") (cpe-version . ,(first (string-split version #\-))))))) -(define-public conkeror - ;; The Conkeror web browser relied on XULRunner, which IceCat > 50 no longer - ;; provides. See for the original web page. - (deprecated-package "conkeror" icecat)) - (define-public firefox-decrypt (package (name "firefox-decrypt") diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index e22592cd50..62ebb8294f 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -2192,10 +2192,6 @@ (define-public guile3.0-mcron (name "guile3.0-mcron") (inputs `(("guile" ,guile-3.0))))) -(define-public mcron2 - ;; This was mthl's mcron development branch, and it became mcron 1.1. - (deprecated-package "mcron2" mcron)) - (define-public guile-picture-language (let ((commit "91d10c96708d732145006dd2802acc4de08b632e") (revision "1")) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 8efd7fd29e..cc9cf8cd6a 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -238,10 +238,6 @@ (define-public pngcrush images. It can further losslessly compress them by as much as 40%.") (license license:zlib))) -(define-public pngcrunch - ;; This package used to be wrongfully name "pngcrunch". - (deprecated-package "pngcrunch" pngcrush)) - (define-public pnglite (let ((commit "11695c56f7d7db806920bd9229b69f230e6ffb38") (revision "1")) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index a52faf4455..24d7391430 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2919,9 +2919,6 @@ (define-public eudev/btrfs-fix (string-append out "/bin"))) #t))))))))) -(define-public eudev-with-hwdb - (deprecated-package "eudev-with-hwdb" eudev)) - (define-public lvm2 (package (name "lvm2") diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 028f0e6ef9..a2ed073fca 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -1649,9 +1649,6 @@ (define-public octave "qscintilla2_qt5")) #t)))))))) -(define-public qtoctave - (deprecated-package "qtoctave" octave)) - (define-public opencascade-oce (package (name "opencascade-oce") diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 8b4f8bc15b..07a44e9089 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -401,9 +401,6 @@ (define-public guix-daemon (invoke "make" "install-binPROGRAMS"))) (delete 'wrap-program))))))) -(define-public guile2.0-guix - (deprecated-package "guile2.0-guix" guix)) - (define-public guile3.0-guix (package (inherit guix) diff --git a/gnu/packages/php.scm b/gnu/packages/php.scm index e58d82dab1..77063b9afc 100644 --- a/gnu/packages/php.scm +++ b/gnu/packages/php.scm @@ -341,6 +341,3 @@ (define-public php license:lgpl2.1+ ; ext/bcmath/libbcmath license:bsd-2 ; ext/fileinfo/libmagic license:expat)))) ; ext/date/lib - -(define-public php-with-bcmath - (deprecated-package "php-with-bcmath" php)) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index d63b71c14e..5308b4e7f9 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11786,12 +11786,6 @@ (define-public python-kivy (define-public python2-kivy (package-with-python2 python-kivy)) -(define-public python-kivy-next - (deprecated-package "python-kivy-next" python-kivy)) - -(define-public python2-kivy-next - (deprecated-package "python2-kivy-next" python2-kivy)) - (define-public python-binaryornot (package (name "python-binaryornot") diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm index a84281364f..6c0997da86 100644 --- a/gnu/packages/syndication.scm +++ b/gnu/packages/syndication.scm @@ -84,16 +84,10 @@ (define-public newsboat Newsboat supports OPML import/exports, HTML rendering, podcasts (with @command{podboat}), off-line reading, searching and storing articles to your -file system, and many more features. - -It started life as a fork of the currently unmaintained Newsbeuter.") +file system, and many more features.") (license (list license:gpl2+ ; filter/* license:expat)))) ; everything else -(define-public newsbeuter - ;; Newsbeuter is unmaintained with multiple CVEs, and was forked as Newsboat. - (deprecated-package "newsbeuter" newsboat)) - (define-public rtv (package (name "rtv") diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 8c7d6c7b88..032604ecf3 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2311,9 +2311,6 @@ (define-public streamlink from sites like Twitch.tv and pipes them into a video player of choice.") (license license:bsd-2))) -(define-public livestreamer - (deprecated-package "livestreamer" streamlink)) - (define-public twitchy (let ((commit "9beb36d80b16662414129693e74fa3a2fd97554e")) ; 3.4 has no tag (package diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index b7e2c415fe..5bee79cbb4 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -891,9 +891,6 @@ (define-public looking-glass-client (supported-systems '("i686-linux" "x86_64-linux")) (license license:gpl2+)))) -(define-public lookingglass - (deprecated-package "lookingglass" looking-glass-client)) - (define-public runc (package (name "runc") diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 61a01f56b8..d3b4e5cc33 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -218,9 +218,6 @@ (define-public vulkan-loader (license:x11-style "file://COPYRIGHT.txt") license:bsd-3)))) -(define-public vulkan-icd-loader - (deprecated-package "vulkan-icd-loader" vulkan-loader)) - (define-public vulkan-tools (package (name "vulkan-tools") -- cgit v1.2.3 From faf69055601e7121c235c8f8cf05e105e8e326c6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 29 Mar 2020 16:51:11 +0200 Subject: gnu: xscreensaver: Put ‘app-defaults’ in the right place. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/xdisorg.scm (xscreensaver)[arguments]: Drop /usr from AD_DIR make flag. --- gnu/packages/xdisorg.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index a64bacd4a4..22c8adc6fa 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -1235,7 +1235,7 @@ (define-public xscreensaver "--without-readdisplay") #:make-flags (list (string-append "AD_DIR=" (assoc-ref %outputs "out") - "/usr/lib/X11/app-defaults")))) + "/lib/X11/app-defaults")))) (native-inputs `(("pkg-config" ,pkg-config) ("intltool" ,intltool))) -- cgit v1.2.3 From 78bf89de5a68646b523b975562251c8490fb7030 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 29 Mar 2020 17:04:48 +0200 Subject: gnu: herbstluftwm: The ‘check’ phase already respects ‘#:tests?’. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/wm.scm (herbstluftwm)[arguments]: Don't delete the ‘check’ phase. --- gnu/packages/wm.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 25ec278e2c..e5b7ea800f 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -172,8 +172,7 @@ (define-public herbstluftwm (arguments '(#:phases (modify-phases %standard-phases - (delete 'configure) - (delete 'check) + (delete 'configure) ; no configure script (add-after 'install 'install-xsession (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) -- cgit v1.2.3 From e08df3ad70aa53397b102d982e2c0f26e9c00685 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 29 Mar 2020 17:14:24 +0200 Subject: gnu: herbstluftwm: Put completions where fish expects them. * gnu/packages/wm.scm (herbstluftwm)[arguments]: Set FISHCOMPLETIONDIR in #:make-flags. --- gnu/packages/wm.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index e5b7ea800f..5d28cac38a 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -194,6 +194,8 @@ (define-public herbstluftwm (list "CC=gcc" (string-append "PREFIX=''") (string-append "DESTDIR=" out) + (string-append "FISHCOMPLETIONDIR=" + "/share/fish/vendor_completions.d") (string-append "BASHCOMPLETIONDIR=" out "/etc/bash_completion.d"))))) (synopsis "Tiling window manager for X11") -- cgit v1.2.3 From 991a571038a15377e1449aee71a52b7487837124 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 29 Mar 2020 17:24:38 +0200 Subject: gnu: numix-theme: The ‘check’ phase already respects ‘#:tests?’. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gnome-xyz.scm (numix-theme)[arguments]: Don't delete the ‘check’ phase. --- gnu/packages/gnome-xyz.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index 24a1dc256c..1f17dfea3e 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2020 Alex Griffin ;;; Copyright © 2020 Jack Hill ;;; Copyright © 2020 Ekaitz Zarraga +;;; Copyright © 2020 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -483,10 +484,10 @@ (define-public numix-theme (build-system gnu-build-system) (arguments '(#:make-flags (list (string-append "DESTDIR=" (assoc-ref %outputs "out"))) + #:tests? #f #:phases (modify-phases %standard-phases - (delete 'configure) - (delete 'check)))) + (delete 'configure)))) ; no configure script (native-inputs `(("glib:bin" ,glib "bin") ; for glib-compile-schemas ("gnome-shell" ,gnome-shell) -- cgit v1.2.3 From ec5a3021c56b4dcc1029c37c68824adccb8e7ea2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 29 Mar 2020 17:53:51 +0200 Subject: gnu: numix-gtk-theme: Fix name. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/package/gnome-xyz.scm (numix-gtk-theme): New public variable, renamed from…… (numix-theme): …this now-deprecated one. --- gnu/packages/gnome-xyz.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index 1f17dfea3e..4ddfdada52 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -468,9 +468,9 @@ (define-public gnome-shell-extension-paperwm notebooks and tiling window managers.") (license license:gpl3))) -(define-public numix-theme +(define-public numix-gtk-theme (package - (name "numix-theme") + (name "numix-gtk-theme") (version "2.6.7") (source (origin (method git-fetch) @@ -500,6 +500,9 @@ (define-public numix-theme (home-page "https://numixproject.github.io") (license license:gpl3+))) +(define-public numix-theme + (deprecated-package "numix-theme" numix-gtk-theme)) + (define-public papirus-icon-theme (let ((version "0.0.0") ;; The package does not use semver (revision "0") -- cgit v1.2.3 From a457c55a0af6a664f7eda2357b83ef2ea0409dfb Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 29 Mar 2020 18:01:04 +0200 Subject: gnu: numix-gtk-theme: Fix installation directory. * gnu/packages/gnome-xyz.scm (numix-gtk-theme)[arguments]: Replace erroneous use of DESTDIR with INSTALL_DIR in #:make-flags. --- gnu/packages/gnome-xyz.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index 4ddfdada52..ad4593bcd5 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -483,7 +483,10 @@ (define-public numix-gtk-theme "12mw0kr0kkvg395qlbsvkvaqccr90cmxw5rrsl236zh43kj8grb7")))) (build-system gnu-build-system) (arguments - '(#:make-flags (list (string-append "DESTDIR=" (assoc-ref %outputs "out"))) + '(#:make-flags + (list (string-append "INSTALL_DIR=" + (assoc-ref %outputs "out") + "/share/themes/Numix")) #:tests? #f #:phases (modify-phases %standard-phases -- cgit v1.2.3 From f020c7cc446eb0f517d0ebe1b7f0e752730ccc0c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 29 Mar 2020 18:29:30 +0200 Subject: gnu: xtl: Update to 0.6.13. * gnu/packages/cpp.scm (xtl): Update to 0.6.13. --- gnu/packages/cpp.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index ce816a528a..84a7e68b88 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017 Ethan R. Jones -;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018 Fis Trivial ;;; Copyright © 2018 Ludovic Courtès ;;; Copyright © 2019 Mathieu Othacehe @@ -262,7 +262,7 @@ (define-public nlohmann-json-cpp (define-public xtl (package (name "xtl") - (version "0.6.8") + (version "0.6.13") (source (origin (method git-fetch) (uri @@ -271,7 +271,7 @@ (define-public xtl (commit version))) (sha256 (base32 - "13gm8vm1b9nzvlcc632f9khnjw1xdjqj6c7k51r173y1hlk0div7")) + "0py70lm2i3sxzpgca2cic8zfn6dn18q837h76a5fchl2c0kpxm91")) (file-name (git-file-name name version)))) (native-inputs `(("googletest" ,googletest) -- cgit v1.2.3 From acf900eec3772f0154d6f0b228f1d878287a10d3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 29 Mar 2020 18:35:56 +0200 Subject: gnu: cgit: Update to 1.2.3. * gnu/packages/version-control.scm (cgit): Update to 1.2.3. [inputs]: Update git to 2.25.1. --- gnu/packages/version-control.scm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 4da8e33e04..8af54c6e35 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -148,8 +148,6 @@ (define-public bazaar (define-public git (package (name "git") - ;; XXX When updating Git, check if the special 'git-source' input to cgit - ;; needs to be updated as well. (version "2.26.0") (source (origin (method url-fetch) @@ -779,7 +777,7 @@ (define-public cgit (package (name "cgit") ;; Update the ‘git-source’ input as well. - (version "1.2.2") + (version "1.2.3") (source (origin (method url-fetch) (uri (string-append @@ -787,7 +785,7 @@ (define-public cgit version ".tar.xz")) (sha256 (base32 - "0dmjsisigjz5k4gw7gm55qhm3wazzbm4cg7a5dwf0gqg9nacx5rz")))) + "193d990ym10qlslk0p8mjwp2j6rhqa7fq0y1iff65lvbyv914pss")))) (build-system gnu-build-system) (arguments '(#:tests? #f ; XXX: fail to build the in-source git. @@ -867,9 +865,9 @@ (define (quoted-file-name input path) (method url-fetch) ;; cgit is tightly bound to git. Use GIT_VER from the Makefile, ;; which may not match the current (package-version git). - (uri "mirror://kernel.org/software/scm/git/git-2.25.0.tar.xz") + (uri "mirror://kernel.org/software/scm/git/git-2.25.1.tar.xz") (sha256 - (base32 "1l58v42aazj0x9276gk8r9mwyl9pgp9w99aakz4xfhzv7wd2jq60")))) + (base32 "09lzwa183nblr6l8ib35g2xrjf9wm9yhk3szfvyzkwivdv69c9r2")))) ("openssl" ,openssl) ("groff" ,groff) ("python" ,python) -- cgit v1.2.3 From 0a54c3879002daef5d91abce91f7dc71c5cb2c8d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 29 Mar 2020 18:53:51 +0200 Subject: gnu: drumkv1: Update to 0.9.13. * gnu/packages/music.scm (drumkv1): Update to 0.9.13. --- gnu/packages/music.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 7c67fb27ab..5a23721c4c 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1441,7 +1441,7 @@ (define-public synthv1 (define-public drumkv1 (package (name "drumkv1") - (version "0.9.12") + (version "0.9.13") (source (origin (method url-fetch) (uri @@ -1449,7 +1449,7 @@ (define-public drumkv1 "/drumkv1-" version ".tar.gz")) (sha256 (base32 - "0hmnmk9vvi43wl6say0dg7j088h7mmwmfdwjhsq89c7i7cpg78da")))) + "1h88sakxs0b20k8v2sh14y05fin1zqmhnid6h9mk9c37ixxg58ia")))) (build-system gnu-build-system) (arguments `(#:tests? #f)) ; there are no tests -- cgit v1.2.3 From 1eb12d841937d54cff647a7caf4643a33e2d1c25 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 29 Mar 2020 18:54:03 +0200 Subject: gnu: samplv1: Update to 0.9.13. * gnu/packages/music.scm (samplv1): Update to 0.9.13. --- gnu/packages/music.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 5a23721c4c..b558136f38 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1474,7 +1474,7 @@ (define-public drumkv1 (define-public samplv1 (package (name "samplv1") - (version "0.9.12") + (version "0.9.13") (source (origin (method url-fetch) (uri @@ -1482,7 +1482,7 @@ (define-public samplv1 "/samplv1-" version ".tar.gz")) (sha256 (base32 - "0xzjxiqzcf1ygabrjsy0iachhnpy85rp9519fmj2f568r6ml6hzg")))) + "0clsp6s5qfnh0xaxbd35vq2ppi72q9dfayrzlgl73800a8p7gh9m")))) (build-system gnu-build-system) (arguments `(#:tests? #f)) ; there are no tests -- cgit v1.2.3 From 546948391a2b9e0839c86f5be3f1b4244e769d13 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 29 Mar 2020 18:54:10 +0200 Subject: gnu: padthv1: Update to 0.9.13. * gnu/packages/music.scm (padthv1): Update to 0.9.13. --- gnu/packages/music.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index b558136f38..bc9ceb7d6b 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1507,7 +1507,7 @@ (define-public samplv1 (define-public padthv1 (package (name "padthv1") - (version "0.9.12") + (version "0.9.13") (source (origin (method url-fetch) (uri @@ -1515,7 +1515,7 @@ (define-public padthv1 "/padthv1-" version ".tar.gz")) (sha256 (base32 - "1zz3rz990k819q0rlzllqdwvag0x9k63443lb0mp8lwlczxnza6l")))) + "1c1zllph86qswcxddz4vpsj6r9w21hbv4gkba0pyd3q7pbfqr7nz")))) (build-system gnu-build-system) (arguments `(#:tests? #f)) ; there are no tests -- cgit v1.2.3 From 881903ae561d2fd3026d962f4af25e23cfe95229 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 29 Mar 2020 18:40:06 +0200 Subject: gnu: synthv1: Update to 0.9.13. * gnu/packages/music.scm (synthv1): Update to 0.9.13. --- gnu/packages/music.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index bc9ceb7d6b..a30e6dc48c 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1409,7 +1409,7 @@ (define-public jalv-select (define-public synthv1 (package (name "synthv1") - (version "0.9.12") + (version "0.9.13") (source (origin (method url-fetch) (uri @@ -1417,7 +1417,7 @@ (define-public synthv1 "/synthv1-" version ".tar.gz")) (sha256 (base32 - "1amxrl1cqwgncw5437r572frgf6xhss3cfpbgh178i8phlq1q731")))) + "0bb48myvgvqcibwm68qhd4852pjr2g19rasf059a799d1hzgfq3l")))) (build-system gnu-build-system) (arguments `(#:tests? #f)) ; there are no tests -- cgit v1.2.3 From 0e68695e79f778fd838e300913361571e8b6e368 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 29 Mar 2020 19:47:21 +0300 Subject: gnu: nextpnr-ice40: Use a source file-name. * gnu/packages/fpga.scm (nextpnr-ice40)[source]: Add file-name field. --- gnu/packages/fpga.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/fpga.scm b/gnu/packages/fpga.scm index f01681024f..abdfc35b91 100644 --- a/gnu/packages/fpga.scm +++ b/gnu/packages/fpga.scm @@ -271,6 +271,7 @@ (define-public nextpnr-ice40 (uri (git-reference (url "git://github.com/YosysHQ/nextpnr") (commit commit))) + (file-name (git-file-name name version)) (sha256 (base32 "0g2ar1z89b31qw5vgqj2rrcv9rzncs94184dgcsrz19p866654mf")))) -- cgit v1.2.3 From a46498020b6da4c58d0b691a73eb2ad790343b9f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 29 Mar 2020 19:51:30 +0300 Subject: gnu: nextpnr-ice40: Clean-up description. * gnu/packages/fpga.scm (nextpnr-ice40)[description]: Appease guix lint. --- gnu/packages/fpga.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/fpga.scm b/gnu/packages/fpga.scm index abdfc35b91..ed5bc14e31 100644 --- a/gnu/packages/fpga.scm +++ b/gnu/packages/fpga.scm @@ -290,8 +290,8 @@ (define-public nextpnr-ice40 "/share/icebox")) #:tests? #f)) (synopsis "Place-and-Route tool for FPGAs") - (description "nextpnr aims to be a vendor neutral, timing driven, -FOSS FPGA place and route tool. ") + (description "Nextpnr aims to be a vendor neutral, timing driven, +FOSS FPGA place and route tool.") (home-page "https://github.com/YosysHQ/nextpnr") (license license:expat)))) -- cgit v1.2.3 From fcc8f2fc46d9c16e1849d4ef0da007a47d68b2d6 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 29 Mar 2020 20:00:58 +0300 Subject: gnu: txt2man: Don't use unstable tarball. * gnu/packages/man.scm (txt2man)[source]: Download using git-fetch. --- gnu/packages/man.scm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/gnu/packages/man.scm b/gnu/packages/man.scm index 9f18afabde..1c7569261b 100644 --- a/gnu/packages/man.scm +++ b/gnu/packages/man.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2014 David Thompson ;;; Copyright © 2015, 2016 Ricardo Wurmus ;;; Copyright © 2015 Alex Kost -;;; Copyright © 2015, 2016 Efraim Flashner +;;; Copyright © 2015, 2016, 2020 Efraim Flashner ;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018, 2019 Rutger Helling ;;; Copyright © 2018, 2019 Marius Bakke @@ -25,6 +25,7 @@ (define-module (gnu packages man) #:use-module (guix licenses) + #:use-module (guix git-download) #:use-module (guix download) #:use-module (guix packages) #:use-module (guix build-system gnu) @@ -269,13 +270,14 @@ (define-public txt2man (version "1.6.0") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/mvertes/txt2man/archive/txt2man-" - version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/mvertes/txt2man") + (commit (string-append "txt2man-" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "168cj96974n2z0igin6j1ic1m45zyic7nm5ark7frq8j78rrx4zn")))) + "1razjpvlcp85hqli77mwr9nmn5jnv3lm1fxbbqjpx1brv3h1lvm5")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no "check" target -- cgit v1.2.3 From a428fdd4d00849ae1575e107ac504363079e307a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 29 Mar 2020 20:04:58 +0300 Subject: gnu: unionfs-fuse: Don't use unstable tarball. * gnu/packages/linux.scm (unionfs-fuse)[source]: Download using git-fetch. --- gnu/packages/linux.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 24d7391430..701df764cd 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020 Mark H Weaver ;;; Copyright © 2015 Federico Beffa ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer -;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner +;;; Copyright © 2015, 2016, 2017, 2018, 2020 Efraim Flashner ;;; Copyright © 2016 Christopher Allan Webber ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2016, 2017 Alex Kost @@ -2397,14 +2397,14 @@ (define-public unionfs-fuse (name "unionfs-fuse") (version "2.0") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/rpodgorny/unionfs-fuse/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/rpodgorny/unionfs-fuse") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "0hsn8l1iblvx27bpd4dvnvnbh9ri3sv2f9xzpsnfz3379kb7skgj")))) + "0lb8zgdxnjy2fjr2284hvdfn7inc1in44ynzgcr66x54bxzvynj6")))) (build-system cmake-build-system) (native-inputs `(("python" ,python))) -- cgit v1.2.3 From 4eb40497b69909922a50d3dafdd90a0fbc7084b4 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 29 Mar 2020 20:21:25 +0300 Subject: gnu: vowpal-wabbit: Don't use unstable tarball. * gnu/packages/machine-learning.scm (vowpal-wabbit)[source]: Download using git-fetch. [arguments]: Add custom 'make-files-writable phase. --- gnu/packages/machine-learning.scm | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index beb13a81bf..3e32b3cfff 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -962,21 +962,26 @@ (define-public vowpal-wabbit (name "vowpal-wabbit") (version "8.5.0") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/JohnLangford/vowpal_wabbit/archive/" - version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/JohnLangford/vowpal_wabbit") + (commit version))) (sha256 (base32 - "0clp2kb7rk5sckhllxjr5a651awf4s8dgzg4659yh4hf5cqnf0gr")) - (file-name (string-append name "-" version ".tar.gz")))) + "04bwzk6ifgnz3fmzid8b7avxf9n5pnx9xcjm61nkjng1vv0bpj8x")) + (file-name (git-file-name name version)))) (inputs `(("boost" ,boost) ("zlib" ,zlib))) (arguments `(#:configure-flags (list (string-append "--with-boost=" - (assoc-ref %build-inputs "boost"))))) + (assoc-ref %build-inputs "boost"))) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'make-files-writable + (lambda _ + (for-each make-file-writable (find-files "." ".*")) #t))))) (build-system gnu-build-system) (home-page "https://github.com/JohnLangford/vowpal_wabbit") (synopsis "Fast machine learning library for online learning") -- cgit v1.2.3 From 04950d1ff6816d69723bbb176483dfbe230dcf41 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 29 Mar 2020 21:02:15 +0300 Subject: gnu: tesseract-ocr: Don't use unstable tarball. * gnu/packages/ocr.scm (tesseract-ocr)[source]: Download using git-fetch. [home-page]: Use full URL. --- gnu/packages/ocr.scm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/gnu/packages/ocr.scm b/gnu/packages/ocr.scm index 1266e7e419..dc690f3cef 100644 --- a/gnu/packages/ocr.scm +++ b/gnu/packages/ocr.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013 Ludovic Courtès -;;; Copyright © 2016 Efraim Flashner +;;; Copyright © 2016, 2020 Efraim Flashner ;;; Copyright © 2019 Tobias Geerinckx-Rice ;;; Copyright © 2019 Alex Vong ;;; @@ -57,13 +57,13 @@ (define-public tesseract-ocr (version "3.04.01") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/tesseract-ocr/tesseract/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/tesseract-ocr/tesseract") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 "0snwd8as5i8vx7zkimpd2yg898jl96zf90r65a9w615f2hdkxxjp")))) + (base32 "0h1x4z1h86n2gwknd0wck6gykkp99bmm02lg4a47a698g4az6ybv")))) (build-system gnu-build-system) (inputs `(("leptonica" ,leptonica))) @@ -71,7 +71,7 @@ (define-public tesseract-ocr '(#:configure-flags (let ((leptonica (assoc-ref %build-inputs "leptonica"))) (list (string-append "LIBLEPT_HEADERSDIR=" leptonica "/include"))))) - (home-page "https://github.com/tesseract-ocr") + (home-page "https://github.com/tesseract-ocr/tesseract") (synopsis "Optical character recognition engine") (description "Tesseract is an optical character recognition (OCR) engine with very -- cgit v1.2.3 From 8b87d095b39dee91056b88f96b374faa8c3a8891 Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Sun, 29 Mar 2020 20:34:47 +0200 Subject: gnu: z3: Fix build determinism. * gnu/packages/maths.scm (z3)[arguments]: Add a phase to set PYTHONHASHSEED=0. --- gnu/packages/maths.scm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index a2ed073fca..5e56289682 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -4210,6 +4210,10 @@ (define-public z3 (guix build utils)) #:phases (modify-phases %standard-phases + (add-after 'unpack 'enable-bytecode-determinism + (lambda _ + (setenv "PYTHONHASHSEED" "0") + #t)) (add-after 'unpack 'fix-compatability ;; Versions after 4.8.3 have immintrin.h IFDEFed for Windows only. (lambda _ -- cgit v1.2.3 From e34b06b758f6f160494ac530a6f2e96f23719c47 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Thu, 5 Mar 2020 15:37:20 +0100 Subject: gnu: Add flyer-composer. * gnu/packages/pdf.scm (flyer-composer): New variable. --- gnu/packages/pdf.scm | 47 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 46 insertions(+), 1 deletion(-) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 5a536141f5..abad204f75 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -16,7 +16,7 @@ ;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2019 Alex Griffin ;;; Copyright © 2019 Ben Sturmfels -;;; Copyright © 2019 Hartmut Goebel +;;; Copyright © 2019,2020 Hartmut Goebel ;;; Copyright © 2020 Nicolas Goaziou ;;; ;;; This file is part of GNU Guix. @@ -93,6 +93,51 @@ (define-module (gnu packages pdf) #:use-module (gnu packages xorg) #:use-module (srfi srfi-1)) +(define-public flyer-composer + (package + (name "flyer-composer") + (version "1.0rc2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "flyer-composer" version)) + (sha256 + (base32 "17igqb5dlcgcq4nimjw6cf9qgz6a728zdx1d0rr90r2z0llcchsv")))) + (build-system python-build-system) + (arguments + `(#:tests? #f ;; TODO + #:phases + (modify-phases %standard-phases + (add-after 'install 'wrap-executable + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (qtbase (assoc-ref inputs "qtbase")) + (qml "/lib/qt5/qml")) + (wrap-program (string-append out "/bin/flyer-composer-gui") + `("QT_PLUGIN_PATH" ":" = + (,(string-append qtbase "/lib/qt5/plugins"))) + `("QT_QPA_PLATFORM_PLUGIN_PATH" ":" = + (,(string-append qtbase "/lib/qt5/plugins/platforms")))) + #t)))))) + (inputs + `(("python-pypdf2" ,python-pypdf2) + ("python-pyqt" ,python-pyqt) + ("python-poppler-qt5" ,python-poppler-qt5) + ("qtbase" ,qtbase))) + (home-page "http://crazy-compilers.com/flyer-composer") + (synopsis "Rearrange PDF pages to print as flyers on one sheet") + (description "@command{flyer-composer} can be used to prepare one- or +two-sided flyers for printing on one sheet of paper. + +Imagine you have designed a flyer in A6 format and want to print it using your +A4 printer. Of course, you want to print four flyers on each sheet. This is +where Flyer Composer steps in, creating a PDF which holds your flyer four +times. If you have a second page, Flyer Composer can arrange it the same way +- even if the second page is in a separate PDF file. + +This package contains both the commnd line tool and the gui too.") + (license license:agpl3+))) + (define-public poppler (package (name "poppler") -- cgit v1.2.3 From 8f83699ba00743d258b497e0e5285989996ee559 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Thu, 5 Mar 2020 15:37:58 +0100 Subject: gnu: Add flyer-composer-cli. * gnu/packages/pdf.scm (flyer-composer-cli): New variable. --- gnu/packages/pdf.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index abad204f75..e9a9b619e7 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -138,6 +138,33 @@ (define-public flyer-composer This package contains both the commnd line tool and the gui too.") (license license:agpl3+))) +(define-public flyer-composer-cli + (package/inherit flyer-composer + (name "flyer-composer-cli") + (arguments + `(#:tests? #f ;; TODO + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'remove-gui + (lambda _ + (delete-file-recursively "flyer_composer/gui") + (substitute* "setup.cfg" + (("^\\s+flyer-composer-gui\\s*=.*") "")) + #t))))) + (inputs + `(("python-pypdf2" ,python-pypdf2))) + (description "@command{flyer-composer} can be used to prepare one- or +two-sided flyers for printing on one sheet of paper. + +Imagine you have designed a flyer in A6 format and want to print it using your +A4 printer. Of course, you want to print four flyers on each sheet. This is +where Flyer Composer steps in, creating a PDF which holds your flyer four +times. If you have a second page, Flyer Composer can arrange it the same way +- even if the second page is in a separate PDF file. + +This package contains only the commnd line tool. If you like to use the gui, +please install the @code{flyer-composer-gui} package."))) + (define-public poppler (package (name "poppler") -- cgit v1.2.3 From e5b44b06b3fb19c897fb3e430bd41941905e101f Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 27 Mar 2020 18:44:48 -0400 Subject: gnu: GnuPG: Really use ~/.guix-profile/bin/pinentry by default. Fixes . * gnu/packages/patches/gnupg-default-pinentry.patch: New file. Use $HOME to find the user's Guix profile and installed pinentry. * gnu/local.mk (dist_patch_DATA): Add the patch. * gnu/packages/gnupg.scm (gnupg)[source]: Use it. --- gnu/local.mk | 1 + gnu/packages/gnupg.scm | 3 +- gnu/packages/patches/gnupg-default-pinentry.patch | 65 +++++++++++++++++++++++ 3 files changed, 68 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/gnupg-default-pinentry.patch diff --git a/gnu/local.mk b/gnu/local.mk index cb492cba37..7d8145b10d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -973,6 +973,7 @@ dist_patch_DATA = \ %D%/packages/patches/gmp-faulty-test.patch \ %D%/packages/patches/gnome-shell-theme.patch \ %D%/packages/patches/gnome-tweaks-search-paths.patch \ + %D%/packages/patches/gnupg-default-pinentry.patch \ %D%/packages/patches/gnutls-skip-trust-store-test.patch \ %D%/packages/patches/gobject-introspection-absolute-shlib-path.patch \ %D%/packages/patches/gobject-introspection-cc.patch \ diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 856c01a6d8..04bb705712 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -11,7 +11,7 @@ ;;; Copyright © 2016 Christopher Baines ;;; Copyright © 2016 Mike Gerwitz ;;; Copyright © 2016 Troy Sankey -;;; Copyright © 2017 Leo Famulari +;;; Copyright © 2017, 2020 Leo Famulari ;;; Copyright © 2017 Petter ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018, 2019 Marius Bakke @@ -252,6 +252,7 @@ (define-public gnupg (method url-fetch) (uri (string-append "mirror://gnupg/gnupg/gnupg-" version ".tar.bz2")) + (patches (search-patches "gnupg-default-pinentry.patch")) (sha256 (base32 "0c6a4v9p6qzhsw1pfcwc459bxpc8hma0w9z8iqb9khvligack9q4")))) diff --git a/gnu/packages/patches/gnupg-default-pinentry.patch b/gnu/packages/patches/gnupg-default-pinentry.patch new file mode 100644 index 0000000000..a8ed613565 --- /dev/null +++ b/gnu/packages/patches/gnupg-default-pinentry.patch @@ -0,0 +1,65 @@ +Make GnuPG automatically find a pinentry installed by Guix. Try using +$HOME or, if that variable is not set, use the system password database, +or fall back to looking in "/". + +More information: + +https://bugs.gnu.org/24076 + +diff --git a/common/homedir.c b/common/homedir.c +index 4b6e46e88..f7ae68ba5 100644 +--- a/common/homedir.c ++++ b/common/homedir.c +@@ -33,6 +33,7 @@ + #include + #include + #include ++#include + + #ifdef HAVE_W32_SYSTEM + #include /* Due to the stupid mingw64 requirement to +@@ -67,6 +68,10 @@ + * gnupg_homedir and gnupg_set_homedir. Malloced. */ + static char *the_gnupg_homedir; + ++/* The user's home directory. Used in Guix to help GnuPG find the ++ * pinentry. */ ++static char *the_user_homedir; ++ + /* Flag indicating that home directory is not the default one. */ + static byte non_default_homedir; + +@@ -509,6 +514,25 @@ gnupg_homedir (void) + return the_gnupg_homedir; + } + ++/* Return the user's home directory */ ++const char * ++user_homedir (void) ++{ ++ const char *dir; ++ dir = getenv("HOME"); ++ if (dir == NULL) ++ { ++ struct passwd *pw = NULL; ++ pw = getpwuid (getuid ()); ++ if (pw != NULL) ++ dir = pw->pw_dir; ++ else ++ dir = "/"; ++ } ++ if (!the_user_homedir) ++ the_user_homedir = make_absfilename (dir, NULL); ++ return the_user_homedir; ++} + + /* Return whether the home dir is the default one. */ + int +@@ -971,6 +995,7 @@ get_default_pinentry_name (int reset) + } names[] = { + /* The first entry is what we return in case we found no + other pinentry. */ ++ { user_homedir, "/.guix-profile/bin/pinentry" }, + { gnupg_bindir, DIRSEP_S "pinentry" EXEEXT_S }, + #ifdef HAVE_W32_SYSTEM + /* Try Gpg4win directory (with bin and without.) */ -- cgit v1.2.3 From 337fc72228df2b01f024c1276703ea4369cee37d Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 21 Mar 2020 14:17:52 +0100 Subject: gnu: Add sphinxbase. * gnu/packages/speech.scm (sphinxbase): New variable. --- gnu/packages/speech.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/gnu/packages/speech.scm b/gnu/packages/speech.scm index 5fdf2cdbd8..41010cb1dc 100644 --- a/gnu/packages/speech.scm +++ b/gnu/packages/speech.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2016 Kei Kebreau ;;; Copyright © 2019 Ricardo Wurmus +;;; Copyright © 2020 Nicolas Goaziou ;;; ;;; This file is part of GNU Guix. ;;; @@ -32,15 +33,19 @@ (define-module (gnu packages speech) #:use-module (gnu packages audio) #:use-module (gnu packages autotools) #:use-module (gnu packages base) ;for 'which' + #:use-module (gnu packages bison) #:use-module (gnu packages compression) + #:use-module (gnu packages documentation) #:use-module (gnu packages emacs) #:use-module (gnu packages gcc) #:use-module (gnu packages glib) #:use-module (gnu packages linux) #:use-module (gnu packages ncurses) + #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) + #:use-module (gnu packages swig) #:use-module (gnu packages texinfo) #:use-module (gnu packages textutils)) @@ -471,3 +476,34 @@ (define-public festival low level architecture and has a Scheme (SIOD) based command interpreter for control.") (license (license:non-copyleft "file://COPYING")))) + +(define-public sphinxbase + (package + (name "sphinxbase") + (version "5prealpha") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/cmusphinx/" + "sphinxbase/" version "/" + "sphinxbase-" version ".tar.gz")) + (sha256 + (base32 "0vr4k8pv5a8nvq9yja7kl13b5lh0f9vha8fc8znqnm8bwmcxnazp")))) + (build-system gnu-build-system) + (arguments + `(#:parallel-tests? #f)) ;tests fail otherwise + (native-inputs + `(("bison" ,bison) + ("doxygen" ,doxygen) + ("perl" ,perl) ;for tests + ("python" ,python) + ("swig" ,swig))) + (inputs + `(("pulseaudio" ,pulseaudio))) + (home-page "https://cmusphinx.github.io/") + (synopsis "Support library required by Pocketsphinx and Sphinxtrain") + (description "This package contains the basic libraries shared by +the CMU Sphinx trainer and all the Sphinx decoders (Sphinx-II, +Sphinx-III, and PocketSphinx), as well as some common utilities for +manipulating acoustic feature and audio files.") + (license license:bsd-4))) -- cgit v1.2.3 From 9e9dd4098f7a2de658625a0e803d4955ce6ba8fd Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 21 Mar 2020 15:59:01 +0100 Subject: gnu: Add pocketsphinx. * gnu/packages/speech.scm (pocketsphinx): New variable. --- gnu/packages/speech.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/speech.scm b/gnu/packages/speech.scm index 41010cb1dc..8ee6fbfdc4 100644 --- a/gnu/packages/speech.scm +++ b/gnu/packages/speech.scm @@ -39,6 +39,7 @@ (define-module (gnu packages speech) #:use-module (gnu packages emacs) #:use-module (gnu packages gcc) #:use-module (gnu packages glib) + #:use-module (gnu packages gstreamer) #:use-module (gnu packages linux) #:use-module (gnu packages ncurses) #:use-module (gnu packages perl) @@ -507,3 +508,33 @@ (define-public sphinxbase Sphinx-III, and PocketSphinx), as well as some common utilities for manipulating acoustic feature and audio files.") (license license:bsd-4))) + +(define-public pocketsphinx + (package + (name "pocketsphinx") + (version "5prealpha") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/cmusphinx/" + "pocketsphinx/" version "/" + "pocketsphinx-" version ".tar.gz")) + (sha256 + (base32 "1n9yazzdgvpqgnfzsbl96ch9cirayh74jmpjf7svs4i7grabanzg")))) + (build-system gnu-build-system) + (native-inputs + `(("pkg-config" ,pkg-config) + ("perl" ,perl) ;for tests + ("python" ,python) + ("swig" ,swig))) + (inputs + `(("gstreamer" ,gstreamer) + ("libcap" ,libcap) + ("pulseaudio" ,pulseaudio) + ("sphinxbase" ,sphinxbase))) + (home-page "https://cmusphinx.github.io/") + (synopsis "Recognizer library written in C") + (description "PocketSphinx is one of Carnegie Mellon University's +large vocabulary, speaker-independent continuous speech recognition +engine.") + (license license:bsd-2))) -- cgit v1.2.3 From 1e19569b41c7fa756ce1afdb1dabdfe3840cd940 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 29 Mar 2020 21:15:59 +0200 Subject: gnu: Move the deprecated 'ghc-stylish-haskell' closer to its replacement. Inheritance across modules can cause unbound variable errors because of cyclic dependencies between the modules. * gnu/packages/haskell-xyz.scm (ghc-stylish-haskell): Move from here ... * gnu/packages/haskell-apps.scm (ghc-stylish-haskell): ... to here. --- gnu/packages/haskell-apps.scm | 3 +++ gnu/packages/haskell-xyz.scm | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm index 12cb857cbb..42ceb0789b 100644 --- a/gnu/packages/haskell-apps.scm +++ b/gnu/packages/haskell-apps.scm @@ -777,3 +777,6 @@ (define-public stylish-haskell default) @end itemize") (license license:bsd-3))) + +(define-public ghc-stylish-haskell + (deprecated-package "ghc-stylish-haskell" stylish-haskell)) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 0828dc93c6..f2d0222fcb 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -11118,9 +11118,6 @@ (define-public ghc-stringsearch occurrences of a substring (the first in case of overlaps) with another.") (license license:bsd-3))) -(define-public ghc-stylish-haskell - (deprecated-package "ghc-stylish-haskell" stylish-haskell)) - (define-public ghc-svg-builder (package (name "ghc-svg-builder") -- cgit v1.2.3 From 79617a0122d9fa27f193f73918859d46d6ea5cfe Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Thu, 23 Jan 2020 19:26:27 -0800 Subject: gnu: Add apply-refact. * gnu/packages/haskell-apps.scm (apply-refact): New variable. Signed-off-by: Marius Bakke --- gnu/packages/haskell-apps.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm index 42ceb0789b..6ab962100e 100644 --- a/gnu/packages/haskell-apps.scm +++ b/gnu/packages/haskell-apps.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2019 Efraim Flashner ;;; Copyright © 2019 Alex Griffin ;;; Copyright © 2020 Alexandru-Sergiu Marton +;;; Copyright © 2020 Brian Leung ;;; ;;; This file is part of GNU Guix. ;;; @@ -50,6 +51,42 @@ (define-module (gnu packages haskell-apps) #:use-module (gnu packages rsync) #:use-module (gnu packages version-control)) +(define-public apply-refact + (package + (name "apply-refact") + (version "0.6.0.0") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/apply-refact/apply-refact-" + version ".tar.gz")) + (sha256 + (base32 + "0p2mqgjcqr1zcmk8zgr0yq7g8z1agsa6l493lkj6g3ya9lyhxgig")))) + (build-system haskell-build-system) + (inputs + `(("ghc-refact" ,ghc-refact) + ("ghc-exactprint" ,ghc-exactprint) + ("ghc-syb" ,ghc-syb) + ("ghc-temporary" ,ghc-temporary) + ("ghc-filemanip" ,ghc-filemanip) + ("ghc-unix-compat" ,ghc-unix-compat) + ("ghc-optparse-applicative" + ,ghc-optparse-applicative))) + (native-inputs + `(("ghc-tasty" ,ghc-tasty) + ("ghc-tasty-golden" ,ghc-tasty-golden) + ("ghc-tasty-expected-failure" + ,ghc-tasty-expected-failure) + ("ghc-silently" ,ghc-silently))) + (home-page "https://hackage.haskell.org/package/apply-refact") + (synopsis "Perform refactorings specified by the refact library") + (description + "This package lets you perform refactorings specified by the refact +library. It is primarily used with HLint's @code{--refactor} flag.") + (license license:bsd-3))) + ;; In Stackage LTS 14, this package is at 2.4.1.0. However, that ;; version requires version 2.4.1.0 of the 'Cabal' package, which is ;; provided by GHC 8.6.5 at version 2.4.0.1. Hence, we use an older -- cgit v1.2.3 From 745879a74671baa4608b60c7723de7ba9d6d622a Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Thu, 23 Jan 2020 20:36:20 -0800 Subject: gnu: Add emacs-hlint-refactor-mode. * gnu/packages/emacs-xyz.scm (emacs-hlint-refactor-mode): New variable. Signed-off-by: Marius Bakke --- gnu/packages/emacs-xyz.scm | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index b2c3e7314b..32ed7bfb7f 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -43,7 +43,7 @@ ;;; Copyright © 2018, 2019 Pierre Langlois ;;; Copyright © 2018, 2019, 2020 Brett Gilio ;;; Copyright © 2019, 2020 Dimakakos Dimos -;;; Copyright © 2019 Brian Leung +;;; Copyright © 2019, 2020 Brian Leung ;;; Copyright © 2019 mikadoZero ;;; Copyright © 2019 Gabriel Hondet ;;; Copyright © 2019, 2020 Joseph LaFreniere @@ -108,6 +108,7 @@ (define-module (gnu packages emacs-xyz) #:use-module (gnu packages guile) #:use-module (gnu packages gtk) #:use-module (gnu packages gnome) + #:use-module (gnu packages haskell-apps) #:use-module (gnu packages ncurses) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) @@ -16031,6 +16032,32 @@ (define-public emacs-pandoc-mode Pandoc, the document-conversion tool.") (license license:bsd-3))) +(define-public emacs-hlint-refactor-mode + (let ((commit "c4307f86aad6d02e32e9b30cb6edc115584c791c") + (revision "1")) + (package + (name "emacs-hlint-refactor-mode") + (version (git-version "0.0.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mpickering/hlint-refactor-mode") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1c71w9s34n0i7mm4njchxn6s3ri1y6mh3akgbg4nq41d42h8iap3")))) + (build-system emacs-build-system) + (propagated-inputs + `(("apply-refact" ,apply-refact) + ("hlint" ,hlint))) + (home-page "https://github.com/mpickering/hlint-refactor-mode") + (synopsis "Emacs bindings for @code{hlint}'s @code{--refactor} option") + (description "This package applies refactoring suggestions from +@code{hlint}.") + (license license:expat)))) + (define-public emacs-ccls (let ((commit "aab3e31fd716daf59f9794e62d473357263e8cc0") (revision "4")) -- cgit v1.2.3 From fbe32d46e802f3542a184340af06644dceb69943 Mon Sep 17 00:00:00 2001 From: Alexandru-Sergiu Marton Date: Fri, 3 Jan 2020 13:15:04 +0200 Subject: gnu: Add ghc-project-template. * gnu/packages/haskell-xyz.scm (ghc-project-template): New variable. Signed-off-by: Marius Bakke --- gnu/packages/haskell-xyz.scm | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index f2d0222fcb..1e65581e59 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -25,6 +25,7 @@ ;;; Copyright © 2020 Brett Gilio ;;; Copyright © 2020 JoJo ;;; Copyright © 2020 Nicolas Goaziou +;;; Copyright © 2020 Alexandru-Sergiu Marton ;;; ;;; This file is part of GNU Guix. ;;; @@ -9086,6 +9087,46 @@ (define-public ghc-profunctors (description "This library provides profunctors for Haskell.") (license license:bsd-3))) +(define-public ghc-project-template + (package + (name "ghc-project-template") + (version "0.2.0.1") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/project-template/project-template-" + version ".tar.gz")) + (sha256 + (base32 + "1p69ww4rhah2qxragl615wl4a6mk4x9w09am8knmz3s4lxpljlpb")))) + (build-system haskell-build-system) + (inputs + `(("ghc-base64-bytestring" ,ghc-base64-bytestring) + ("ghc-conduit" ,ghc-conduit) + ("ghc-conduit-extra" ,ghc-conduit-extra) + ("ghc-resourcet" ,ghc-resourcet))) + (native-inputs + `(("ghc-hspec" ,ghc-hspec) + ("hspec-discover" ,hspec-discover) + ("ghc-quickcheck" ,ghc-quickcheck))) + (arguments + `(#:cabal-revision + ("1" + "0lq3sqnq0nr0gbvgzp0lqdl3j3mqdmdlf8xsw0j3pjh581xj3k0a"))) + (home-page "https://github.com/fpco/haskell-ide") + (synopsis "Specify Haskell project templates and generate files") + (description + "Haskell library for both generating and consuming project templates. + +ost IDEs provide the concept of a project template: instead of writing all +of the code for a project from scratch, you select a template, answer a few +questions, and a bunch of files are automatically generated. + +project-template tries to provide a canonical Haskell library for implementing +the ideal templating system.") + (license license:bsd-3))) + (define-public ghc-psqueues (package (name "ghc-psqueues") -- cgit v1.2.3 From ec8491b0319f417529ea6075d63e5a7782dc69f9 Mon Sep 17 00:00:00 2001 From: Alexandru-Sergiu Marton Date: Wed, 8 Jan 2020 11:33:35 +0200 Subject: gnu: Add ghc-basic-prelude. * gnu/packages/haskell-xyz.scm (ghc-basic-prelude): New variable. Signed-off-by: Marius Bakke --- gnu/packages/haskell-xyz.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 1e65581e59..4ade103671 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -907,6 +907,45 @@ (define-public ghc-base-unicode-symbols ∀ instead of @code{forall} and many others.") (license license:bsd-3))) +(define-public ghc-basic-prelude + (package + (name "ghc-basic-prelude") + (version "0.7.0") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/basic-prelude/" + "basic-prelude-" version ".tar.gz")) + (sha256 + (base32 + "0yckmnvm6i4vw0mykj4fzl4ldsf67v8d2h0vp1bakyj84n4myx8h")))) + (build-system haskell-build-system) + (inputs + `(("ghc-hashable" ,ghc-hashable) + ("ghc-unordered-containers" + ,ghc-unordered-containers) + ("ghc-vector" ,ghc-vector))) + (home-page "https://github.com/snoyberg/basic-prelude#readme") + (synopsis "Enhanced core prelude; a common foundation for alternate preludes") + (description + "The premise of basic-prelude is that there are a lot of very commonly +desired features missing from the standard Prelude, such as commonly used +operators (<$> and >=>, for instance) and imports for common datatypes +(e.g., ByteString and Vector). At the same time, there are lots of other +components which are more debatable, such as providing polymorphic versions +of common functions. + +So basic-prelude is intended to give a common foundation for a number of +alternate preludes. The package provides two modules: CorePrelude provides +the common ground for other preludes to build on top of, while BasicPrelude +exports CorePrelude together with commonly used list functions to provide a +drop-in replacement for the standard Prelude. + +Users wishing to have an improved Prelude can use BasicPrelude. Developers +wishing to create a new prelude should use CorePrelude.") + (license license:expat))) + (define-public ghc-bifunctors (package (name "ghc-bifunctors") -- cgit v1.2.3 From 49bcca847825ce8c9a29949707b52f7a57f26b43 Mon Sep 17 00:00:00 2001 From: Alexandru-Sergiu Marton Date: Wed, 8 Jan 2020 11:34:21 +0200 Subject: gnu: Add ghc-nonce. * gnu/packages/haskell-xyz.scm (ghc-nonce): New variable. Signed-off-by: Marius Bakke --- gnu/packages/haskell-xyz.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 4ade103671..27278f1d72 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -7937,6 +7937,36 @@ (define-public ghc-non-negative of Peano numbers).") (license license:gpl3+))) +(define-public ghc-nonce + (package + (name "ghc-nonce") + (version "1.0.7") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/nonce/" + "nonce-" version ".tar.gz")) + (sha256 + (base32 + "1q9ph0aq51mvdvydnriqd12sfin36pfb8f588zgac1ybn8r64ksb")))) + (build-system haskell-build-system) + (inputs + `(("ghc-base64-bytestring" ,ghc-base64-bytestring) + ("ghc-entropy" ,ghc-entropy) + ("ghc-unliftio" ,ghc-unliftio) + ("ghc-unliftio-core" ,ghc-unliftio-core))) + (home-page "https://github.com/prowdsponsor/nonce") + (synopsis "Generate cryptographic nonces in Haskell") + (description + "A nonce is an arbitrary number used only once in a cryptographic +communication. This package contain helper functions for generating nonces. +There are many kinds of nonces used in different situations. It's not +guaranteed that by using the nonces from this package you won't have any +security issues. Please make sure that the nonces generated via this +package are usable on your design.") + (license license:bsd-3))) + (define-public ghc-numeric-extras (package (name "ghc-numeric-extras") -- cgit v1.2.3 From b1dbc9f5808c5383ea18c039d3dded49138370d9 Mon Sep 17 00:00:00 2001 From: Alexandru-Sergiu Marton Date: Wed, 8 Jan 2020 11:35:08 +0200 Subject: gnu: Add ghc-pwstore-fast. * gnu/packages/haskell-xyz.scm (ghc-pwstore-fast): New variable. Signed-off-by: Marius Bakke --- gnu/packages/haskell-xyz.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 27278f1d72..da44f02d2d 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -9261,6 +9261,36 @@ (define-public ghc-psqueues @end itemize") (license license:bsd-3))) +(define-public ghc-pwstore-fast + (package + (name "ghc-pwstore-fast") + (version "2.4.4") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/pwstore-fast/" + "pwstore-fast-" version ".tar.gz")) + (sha256 + (base32 + "1cpvlwzg3qznhygrr78f75p65mnljd9v5cvnagfxjqppnrkay6bj")))) + (build-system haskell-build-system) + (inputs + `(("ghc-base64-bytestring" ,ghc-base64-bytestring) + ("ghc-cryptohash" ,ghc-cryptohash) + ("ghc-random" ,ghc-random) + ("ghc-byteable" ,ghc-byteable))) + (home-page "https://github.com/PeterScott/pwstore") + (synopsis "Secure password storage") + (description + "To store passwords securely, they should be salted, then hashed with +a slow hash function. This library uses PBKDF1-SHA256, and handles all the +details. It uses the cryptohash package for speed; if you need a pure +Haskell library, pwstore-purehaskell has the exact same API, but uses only +pure Haskell. It is about 25 times slower than this package, but still quite +usable.") + (license license:bsd-3))) + (define-public ghc-random (package (name "ghc-random") -- cgit v1.2.3 From 9989d1464f8b04dbc514d71f93630c8fe54da911 Mon Sep 17 00:00:00 2001 From: Alexandru-Sergiu Marton Date: Wed, 8 Jan 2020 11:35:37 +0200 Subject: gnu: Add ghc-html-conduit. * gnu/packages/haskell-web.scm (ghc-html-conduit): New variable. Signed-off-by: Marius Bakke --- gnu/packages/haskell-web.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index acdc1447a4..d2c7b50528 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -752,6 +752,41 @@ (define-public ghc-html documents.") (license license:bsd-3))) +(define-public ghc-html-conduit + (package + (name "ghc-html-conduit") + (version "1.3.2.1") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/html-conduit/" + "html-conduit-" version ".tar.gz")) + (sha256 + (base32 + "196c8zcnjp1pc5qvqxd8arx3xkw0a90rvg9mmiw2l4zwnx65709n")))) + (build-system haskell-build-system) + (inputs + `(("ghc-resourcet" ,ghc-resourcet) + ("ghc-conduit" ,ghc-conduit) + ("ghc-xml-conduit" ,ghc-xml-conduit) + ("ghc-xml-types" ,ghc-xml-types) + ("ghc-attoparsec" ,ghc-attoparsec) + ("ghc-conduit-extra" ,ghc-conduit-extra))) + (native-inputs + `(("ghc-hspec" ,ghc-hspec) + ("ghc-hunit" ,ghc-hunit))) + (home-page "https://github.com/snoyberg/xml") + (synopsis "Parse HTML documents using xml-conduit datatypes") + (description + "This package provides a parser for HTML documents that uses +tagstream-conduit. It automatically balances mismatched tags, so that +there shouldn't be any parse failures. It does not handle a full HTML +document rendering, such as adding missing html and head tags. Note that, +since version 1.3.1, it uses an inlined copy of tagstream-conduit with +entity decoding bugfixes applied.") + (license license:expat))) + (define-public ghc-blaze-html (package (name "ghc-blaze-html") -- cgit v1.2.3 From 8c9697a954b8f265c90dac195b6db28b90cc6f33 Mon Sep 17 00:00:00 2001 From: Alexandru-Sergiu Marton Date: Wed, 8 Jan 2020 11:46:35 +0200 Subject: gnu: ghc-persistent: Update to 2.10.4. * gnu/packages/haskell-xyz.scm (ghc-persistent): Update to 2.10.4. Signed-off-by: Marius Bakke --- gnu/packages/haskell-xyz.scm | 53 ++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 29 deletions(-) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index da44f02d2d..631140e4db 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -8754,41 +8754,36 @@ (define-public ghc-pcre-light (define-public ghc-persistent (package (name "ghc-persistent") - (version "2.9.2") + (version "2.10.4") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "persistent-" version "/" - "persistent-" version ".tar.gz")) + (uri (string-append + "https://hackage.haskell.org/package/persistent/" + "persistent-" version ".tar.gz")) (sha256 (base32 - "1wsa3kn427v88a6r0vwr6mz23snik2krbsgc8zqp18xajqn5szj9")))) + "1cxswz72sqdg2z1nbpgp1k5qr41djgk8qbf8nz7wfppsrhacyffi")))) (build-system haskell-build-system) - (inputs `(("ghc-old-locale" ,ghc-old-locale) - ("ghc-conduit" ,ghc-conduit) - ("ghc-resourcet" ,ghc-resourcet) - ("ghc-exceptions" ,ghc-exceptions) - ("ghc-monad-control" ,ghc-monad-control) - ("ghc-lifted-base" ,ghc-lifted-base) - ("ghc-resource-pool" ,ghc-resource-pool) - ("ghc-path-pieces" ,ghc-path-pieces) - ("ghc-http-api-data" ,ghc-http-api-data) - ("ghc-aeson" ,ghc-aeson) - ("ghc-monad-logger" ,ghc-monad-logger) - ("ghc-transformers-base" ,ghc-transformers-base) - ("ghc-base64-bytestring" ,ghc-base64-bytestring) - ("ghc-unordered-containers" ,ghc-unordered-containers) - ("ghc-vector" ,ghc-vector) - ("ghc-attoparsec" ,ghc-attoparsec) - ("ghc-haskell-src-meta" ,ghc-haskell-src-meta) - ("ghc-blaze-html" ,ghc-blaze-html) - ("ghc-blaze-markup" ,ghc-blaze-markup) - ("ghc-silently" ,ghc-silently) - ("ghc-fast-logger" ,ghc-fast-logger) - ("ghc-scientific" ,ghc-scientific) - ("ghc-tagged" ,ghc-tagged) - ("ghc-void" ,ghc-void))) + (inputs + `(("ghc-aeson" ,ghc-aeson) + ("ghc-attoparsec" ,ghc-attoparsec) + ("ghc-base64-bytestring" ,ghc-base64-bytestring) + ("ghc-blaze-html" ,ghc-blaze-html) + ("ghc-conduit" ,ghc-conduit) + ("ghc-fast-logger" ,ghc-fast-logger) + ("ghc-http-api-data" ,ghc-http-api-data) + ("ghc-monad-logger" ,ghc-monad-logger) + ("ghc-path-pieces" ,ghc-path-pieces) + ("ghc-resource-pool" ,ghc-resource-pool) + ("ghc-resourcet" ,ghc-resourcet) + ("ghc-scientific" ,ghc-scientific) + ("ghc-silently" ,ghc-silently) + ("ghc-unliftio-core" ,ghc-unliftio-core) + ("ghc-unliftio" ,ghc-unliftio) + ("ghc-unordered-containers" + ,ghc-unordered-containers) + ("ghc-vector" ,ghc-vector))) (native-inputs `(("ghc-hspec" ,ghc-hspec))) (home-page "https://www.yesodweb.com/book/persistent") (synopsis "Type-safe, multi-backend data serialization for Haskell") -- cgit v1.2.3 From d5378e98b45d1806074ea9398b7db15e6a86c7f8 Mon Sep 17 00:00:00 2001 From: Alexandru-Sergiu Marton Date: Wed, 8 Jan 2020 11:56:45 +0200 Subject: gnu: ghc-persistent-template: Update to 2.8.0. * gnu/packages/haskell-xyz.scm (ghc-persistent-template): Update to 2.8.0. Signed-off-by: Marius Bakke --- gnu/packages/haskell-xyz.scm | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 631140e4db..d0b226fa8a 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -8830,28 +8830,30 @@ (define-public ghc-persistent-sqlite (define-public ghc-persistent-template (package (name "ghc-persistent-template") - (version "2.6.0") + (version "2.8.0") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "persistent-template-" version "/" - "persistent-template-" version ".tar.gz")) + (uri (string-append + "https://hackage.haskell.org/package/persistent-template/" + "persistent-template-" version ".tar.gz")) (sha256 (base32 - "0wr1z2nfrl6jv1lprxb0d2jw4izqfcbcwvkdrhryzg95gjz8ryjv")))) + "16yjrl0gh4jbs4skr7iv6a55lny59bqhd6hjmvch1cl9j5d0c0g3")))) (build-system haskell-build-system) - (inputs `(("ghc-persistent" ,ghc-persistent) - ("ghc-monad-control" ,ghc-monad-control) - ("ghc-aeson" ,ghc-aeson) - ("ghc-aeson-compat" ,ghc-aeson-compat) - ("ghc-monad-logger" ,ghc-monad-logger) - ("ghc-unordered-containers" ,ghc-unordered-containers) - ("ghc-tagged" ,ghc-tagged) - ("ghc-path-pieces" ,ghc-path-pieces) - ("ghc-http-api-data" ,ghc-http-api-data))) - (native-inputs `(("ghc-hspec" ,ghc-hspec) - ("ghc-quickcheck" ,ghc-quickcheck))) + (inputs + `(("ghc-persistent" ,ghc-persistent) + ("ghc-aeson" ,ghc-aeson) + ("ghc-http-api-data" ,ghc-http-api-data) + ("ghc-monad-control" ,ghc-monad-control) + ("ghc-monad-logger" ,ghc-monad-logger) + ("ghc-path-pieces" ,ghc-path-pieces) + ("ghc-th-lift-instances" ,ghc-th-lift-instances) + ("ghc-unordered-containers" + ,ghc-unordered-containers))) + (native-inputs + `(("ghc-hspec" ,ghc-hspec) + ("ghc-quickcheck" ,ghc-quickcheck))) (home-page "https://www.yesodweb.com/book/persistent") (synopsis "Type-safe, non-relational, multi-backend persistence") (description "This Haskell package provides interfaces and helper -- cgit v1.2.3 From ce32f7c7f28e604eb147ea67da391ff2648709c5 Mon Sep 17 00:00:00 2001 From: Alexandru-Sergiu Marton Date: Wed, 8 Jan 2020 12:26:21 +0200 Subject: gnu: Add ghc-persistent-test. * gnu/packages/haskell-xyz.scm (ghc-persistent-test): New variable. Signed-off-by: Marius Bakke --- gnu/packages/haskell-xyz.scm | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index d0b226fa8a..1fca780900 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -8860,6 +8860,49 @@ (define-public ghc-persistent-template functions for the ghc-persistent package.") (license license:expat))) +(define-public ghc-persistent-test + (package + (name "ghc-persistent-test") + (version "2.0.3.1") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/persistent-test/" + "persistent-test-" version ".tar.gz")) + (sha256 + (base32 + "11aq5cy0n43jamf6mg4sr4300bc2zdbjxsczzxwjkb4hzs0ijsdv")))) + (build-system haskell-build-system) + (inputs + `(("ghc-aeson" ,ghc-aeson) + ("ghc-blaze-html" ,ghc-blaze-html) + ("ghc-conduit" ,ghc-conduit) + ("ghc-monad-control" ,ghc-monad-control) + ("ghc-monad-logger" ,ghc-monad-logger) + ("ghc-path-pieces" ,ghc-path-pieces) + ("ghc-persistent" ,ghc-persistent) + ("ghc-persistent-template" ,ghc-persistent-template) + ("ghc-random" ,ghc-random) + ("ghc-resourcet" ,ghc-resourcet) + ("ghc-transformers-base" ,ghc-transformers-base) + ("ghc-unliftio" ,ghc-unliftio) + ("ghc-unliftio-core" ,ghc-unliftio-core) + ("ghc-unordered-containers" ,ghc-unordered-containers))) + (native-inputs + `(("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-quickcheck-instances" ,ghc-quickcheck-instances) + ("ghc-hspec" ,ghc-hspec) + ("ghc-hspec-expectations" ,ghc-hspec-expectations) + ("ghc-hunit" ,ghc-hunit))) + (home-page "https://www.yesodweb.com/book/persistent") + (synopsis "Tests for the Persistent database library") + (description + "This is only for use in developing libraries that should conform to +the persistent interface, not for users of the persistent suite of database +libraries.") + (license license:expat))) + (define-public ghc-pipes (package (name "ghc-pipes") -- cgit v1.2.3 From 78858787ffdbb3312aa88259cca077ce364d42d9 Mon Sep 17 00:00:00 2001 From: Alexandru-Sergiu Marton Date: Wed, 8 Jan 2020 12:27:26 +0200 Subject: gnu: ghc-persistent-sqlite: Update to 2.10.5.2. * gnu/packages/haskell-xyz.scm (ghc-persistent-sqlite): Update to 2.10.5.2. [inputs]: Remove GHC-OLD-LOCALE. [native-inputs]: Add GHC-PERSISTENT-TEST, GHC-EXCEPTIONS, GHC-FAST-LOGGER, GHC-HUNIT, GHC-QUICKCHECK, GHC-SYSTEM-FILEIO, and GHC-SYSTEM-FILEPATH. Signed-off-by: Marius Bakke --- gnu/packages/haskell-xyz.scm | 46 +++++++++++++++++++++++++++----------------- 1 file changed, 28 insertions(+), 18 deletions(-) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 1fca780900..704d269434 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -8795,30 +8795,40 @@ (define-public ghc-persistent (define-public ghc-persistent-sqlite (package (name "ghc-persistent-sqlite") - (version "2.9.3") + (version "2.10.5.2") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "persistent-sqlite-" version "/" - "persistent-sqlite-" version ".tar.gz")) + (uri (string-append + "https://hackage.haskell.org/package/persistent-sqlite/" + "persistent-sqlite-" version ".tar.gz")) (sha256 (base32 - "13wbn88ixv4d4dfjl1gabm1q60fbcnygbmixz57pi3z84drrynwq")))) + "0agag3cgivl6mk38pqzr0qw5lxps9p2bgdwvi5658l46hs7bixxn")))) (build-system haskell-build-system) - (inputs `(("ghc-persistent" ,ghc-persistent) - ("ghc-unliftio-core" ,ghc-unliftio-core) - ("ghc-aeson" ,ghc-aeson) - ("ghc-conduit" ,ghc-conduit) - ("ghc-monad-logger" ,ghc-monad-logger) - ("ghc-microlens-th" ,ghc-microlens-th) - ("ghc-resourcet" ,ghc-resourcet) - ("ghc-old-locale" ,ghc-old-locale) - ("ghc-resource-pool" ,ghc-resource-pool) - ("ghc-unordered-containers" ,ghc-unordered-containers))) - (native-inputs `(("ghc-hspec" ,ghc-hspec) - ("ghc-persistent-template" ,ghc-persistent-template) - ("ghc-temporary" ,ghc-temporary))) + (inputs + `(("ghc-persistent" ,ghc-persistent) + ("ghc-aeson" ,ghc-aeson) + ("ghc-conduit" ,ghc-conduit) + ("ghc-microlens-th" ,ghc-microlens-th) + ("ghc-monad-logger" ,ghc-monad-logger) + ("ghc-resource-pool" ,ghc-resource-pool) + ("ghc-resourcet" ,ghc-resourcet) + ("ghc-unliftio-core" ,ghc-unliftio-core) + ("ghc-unordered-containers" + ,ghc-unordered-containers))) + (native-inputs + `(("ghc-persistent-template" + ,ghc-persistent-template) + ("ghc-persistent-test" ,ghc-persistent-test) + ("ghc-exceptions" ,ghc-exceptions) + ("ghc-fast-logger" ,ghc-fast-logger) + ("ghc-hspec" ,ghc-hspec) + ("ghc-hunit" ,ghc-hunit) + ("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-system-fileio" ,ghc-system-fileio) + ("ghc-system-filepath" ,ghc-system-filepath) + ("ghc-temporary" ,ghc-temporary))) (home-page "https://www.yesodweb.com/book/persistent") (synopsis "Backend for the persistent library using sqlite3") -- cgit v1.2.3 From 5adb2c1e8d7b771c51997805bbc10d550fd3a402 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 29 Mar 2020 21:36:26 +0200 Subject: gnu: ghc-scalpel: Fix typo in description. * gnu/packages/haskell-web.scm (ghc-scalpel)[description]: Add punctuation. --- gnu/packages/haskell-web.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index d2c7b50528..fbc20339ab 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -1690,6 +1690,6 @@ (define-public ghc-scalpel "High level web scraping library for Haskell") (description "Scalpel is a web scraping library inspired by libraries like Parsec -and Perl's @code{Web::Scraper} Scalpel builds on top of TagSoup to provide a +and Perl's @code{Web::Scraper}. Scalpel builds on top of TagSoup to provide a declarative and monadic interface.") (license license:asl2.0))) -- cgit v1.2.3 From 96c813ce4c808df2ed35aa0be47fcdf460b7a685 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 29 Mar 2020 21:43:10 +0200 Subject: gnu: ghc-yesod-persistent: Update to 1.6.0.4. * gnu/packages/haskell-web.scm (ghc-yesod-persistent): Update to 1.6.0.4. --- gnu/packages/haskell-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index fbc20339ab..05be862a85 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -1129,7 +1129,7 @@ (define-public ghc-yesod-core (define-public ghc-yesod-persistent (package (name "ghc-yesod-persistent") - (version "1.6.0.2") + (version "1.6.0.4") (source (origin (method url-fetch) @@ -1138,7 +1138,7 @@ (define-public ghc-yesod-persistent "yesod-persistent-" version ".tar.gz")) (sha256 (base32 - "17adw0aaj29ia7ii3jka301442860b5wvfrms079q973gzahz5fd")))) + "1gsiw2zx6z7za7a164h0fxfggkrdqz6fn0qyb2zn9qr7r2jbg1c0")))) (build-system haskell-build-system) (arguments `(#:tests? #f)) ; FIXME: hspec-discover not available in PATH. (inputs `(("ghc-yesod-core" ,ghc-yesod-core) -- cgit v1.2.3 From 2f6ad77b2f20ad0848ad7811b159fdd76b975777 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 29 Mar 2020 21:59:12 +0200 Subject: gnu: ghc-esqueleto: Update to 3.3.1.1. * gnu/packages/haskell-xyz.scm (ghc-esqueleto): Update to 3.3.1.1. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 704d269434..5dc9f705cc 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -3652,7 +3652,7 @@ (define-public ghc-errors (define-public ghc-esqueleto (package (name "ghc-esqueleto") - (version "3.0.0") + (version "3.3.1.1") (source (origin (method url-fetch) @@ -3660,7 +3660,7 @@ (define-public ghc-esqueleto "esqueleto/esqueleto-" version ".tar.gz")) (sha256 (base32 - "187c098h2xyf2nhifkdy2bqfl6iap7a93mzwd2kirl5yyicpc9zy")))) + "1qi28ma8j5kfygjxnixlazxsyrkdqv8ljz3icwqi5dlscsnj6v3v")))) (build-system haskell-build-system) (arguments `(#:haddock? #f ; Haddock reports an internal error. -- cgit v1.2.3 From 5b8a60ff5dc8679a76220ad0031f1c7e725a86e7 Mon Sep 17 00:00:00 2001 From: Alexey Abramov Date: Wed, 29 Jan 2020 18:05:55 +0100 Subject: gnu: emacs-next: Add harfbuzz (text shaping engine) to inputs. * gnu/packages/emacs.scm (emacs-next)[inputs]: Add harfbuzz. [arguments]: Enable harfbuzz in #:configure-flags. Signed-off-by: Marius Bakke --- gnu/packages/emacs.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index ec8de7373b..3d0368be4e 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -290,6 +290,8 @@ (define-public emacs-next #t)))) (arguments (substitute-keyword-arguments (package-arguments emacs) + ((#:configure-flags flags) + `(cons* "--with-harfbuzz" ,flags)) ((#:phases phases) `(modify-phases ,phases ;; The 'reset-gzip-timestamps phase will throw a @@ -318,6 +320,7 @@ (define-public emacs-next #t))))))) (inputs `(("jansson" ,jansson) + ("harfbuzz" ,harfbuzz) ,@(package-inputs emacs))) (native-inputs `(("autoconf" ,autoconf) ; needed when building from trunk -- cgit v1.2.3 From 99f3fdd182a696516303d26ed19de28a514269d4 Mon Sep 17 00:00:00 2001 From: Alex ter Weele Date: Sat, 29 Feb 2020 11:03:02 -0600 Subject: gnu: python-typing-extensions: Update to 3.7.4.1. * gnu/packages/python-xyz (python-typing-extensions): Update to 3.7.4.1. Signed-off-by: Marius Bakke --- 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 5308b4e7f9..daf129c3c4 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -15631,14 +15631,14 @@ (define-public python2-typing (define-public python-typing-extensions (package (name "python-typing-extensions") - (version "3.7.2") + (version "3.7.4.1") (source (origin (method url-fetch) (uri (pypi-uri "typing_extensions" version)) (sha256 (base32 - "0wfsv71pvkyf2na938l579jh0v3kzl6g744ijgnahcwd4d9x0b7v")))) + "1wj1vcgbnm20aiinmphyxfrbv3qi9xdhvw89ab3qm42y9n4wq7h9")))) (build-system python-build-system) (home-page "https://github.com/python/typing/blob/master/typing_extensions/README.rst") -- cgit v1.2.3 From cedd56f262f3fb43763e66b590f048d6be5b1925 Mon Sep 17 00:00:00 2001 From: Alexandros Theodotou Date: Tue, 25 Feb 2020 14:46:08 +0000 Subject: gnu: Add vl1-emulator. * gnu/packages/music.scm (vl1-emulator): New variable. Signed-off-by: Marius Bakke --- gnu/packages/music.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index a30e6dc48c..8989f71937 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -5293,3 +5293,42 @@ (define-public zlfo automation that comes as an LV2 plugin bundle with a custom UI.") (home-page "https://git.zrythm.org/cgit/ZLFO/") (license license:agpl3+))) + +(define-public vl1-emulator + (package + (name "vl1-emulator") + (version "1.1.0.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/linuxmao-org/VL1-emulator.git") + (commit (string-append "v" version)) + ;; bundles a specific commit of the DISTRHO plugin framework + (recursive? #t))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1npc86vqma8gk1hawa0lii0r2xmnv846plyl1ci3bdswyrdk5chm")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ;no check target + #:make-flags + (list (string-append "PREFIX=" (assoc-ref %outputs "out")) + "CC=gcc") + #:phases + (modify-phases %standard-phases + (delete 'configure)))) ;no configure target + (inputs + `(("cairo" ,cairo) + ("jack" ,jack-1) + ("mesa" ,mesa))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (home-page "https://github.com/linuxmao-org/VL1-emulator") + (synopsis "Emulator of Casio VL-Tone VL1") + (description "The VL1-Emulator is an emulator of Casio VL-Tone VL1, +based on source code by PolyValens, offered as an LV2 plugin and a +standalone JACK application.") + ;; Expat or CC0 + (license (list license:expat license:cc0)))) -- cgit v1.2.3 From bce1e728c5c3ddb43c099333ae563f2f3c0e1f72 Mon Sep 17 00:00:00 2001 From: Alexandros Theodotou Date: Tue, 25 Feb 2020 14:49:05 +0000 Subject: gnu: Add regrader. * gnu/packages/music.scm (regrader): New variable. Signed-off-by: Marius Bakke --- gnu/packages/music.scm | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 8989f71937..23fc67a2e9 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -5327,8 +5327,33 @@ (define-public vl1-emulator `(("pkg-config" ,pkg-config))) (home-page "https://github.com/linuxmao-org/VL1-emulator") (synopsis "Emulator of Casio VL-Tone VL1") - (description "The VL1-Emulator is an emulator of Casio VL-Tone VL1, -based on source code by PolyValens, offered as an LV2 plugin and a + (description "The VL1-Emulator is an emulator of Casio VL-Tone VL1, +based on source code by PolyValens, offered as an LV2 plugin and a standalone JACK application.") ;; Expat or CC0 (license (list license:expat license:cc0)))) + +(define-public regrader + (package + (inherit vl1-emulator) + (name "regrader") + (version "1.0.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/linuxmao-org/regrader.git") + (commit (string-append "v" version)) + ;; bundles a specific commit of the DISTRHO plugin framework + (recursive? #t))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0gl4d5lf2afqknz22jz7hh7029sc9v1xrz6nbz9dlv42bwc0cvl0")))) + (home-page "https://github.com/linuxmao-org/regrader") + (synopsis "Delay effect plugin") + (description + "Regrader is a delay effect where the repeats degrade in resolution. +This is an unofficial port of the Regrader plugin created by Igorski. It +is available as an LV2 plugin and a standalone JACK application.") + (license license:expat))) -- cgit v1.2.3 From 65f61dcca258515992f279b4a2a57f6e8e4a9b9b Mon Sep 17 00:00:00 2001 From: Alexandros Theodotou Date: Tue, 25 Feb 2020 14:50:16 +0000 Subject: gnu: Add fogpad. * gnu/packages/music.scm (fogpad): New variable. Signed-off-by: Marius Bakke --- gnu/packages/music.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 23fc67a2e9..5f9060f54e 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -5357,3 +5357,29 @@ (define-public regrader This is an unofficial port of the Regrader plugin created by Igorski. It is available as an LV2 plugin and a standalone JACK application.") (license license:expat))) + +(define-public fogpad + (package + (inherit vl1-emulator) + (name "fogpad") + (version "1.0.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/linuxmao-org/fogpad") + (commit (string-append "v" version)) + ;; bundles a specific commit of the DISTRHO plugin framework + (recursive? #t))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1j1hbya2dsqpf22zkpi4kwz3dram9g1ndxzmgfwpmf3i4jd3csgb")))) + (home-page "https://github.com/linuxmao-org/fogpad") + (synopsis "Reverb effect plugin") + (description + "Fogpad is a reverb effect in which the reflections can be frozen, +filtered, pitch shifted and ultimately disintegrated. This is an unofficial +port of the Regrader plugin created by Igorski. It is available as an LV2 +plugin and a standalone JACK application.") + (license license:expat))) -- cgit v1.2.3 From 4d59d9faad6e20b190bf160f73ead6616f098356 Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Thu, 26 Mar 2020 20:59:57 +0100 Subject: gnu: emacs-helm-org-contacts: Update to 20200319. * gnu/packages/emacs-xyz.scm (emacs-helm-org-contacts): update to 20200310 Signed-off-by: Marius Bakke --- gnu/packages/emacs-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 32ed7bfb7f..782d8650dd 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -16284,10 +16284,10 @@ (define-public emacs-ztree (license license:gpl3)))) (define-public emacs-helm-org-contacts - (let ((commit "0af703bd9a43032b89fdf5559673151d1ac2fffc")) + (let ((commit "e7f11615802df55bb8b679450b5a5ef82a9081f9")) (package (name "emacs-helm-org-contacts") - (version (git-version "20180707" "1" commit)) + (version (git-version "20200310" "1" commit)) (source (origin (method git-fetch) @@ -16297,7 +16297,7 @@ (define-public emacs-helm-org-contacts (file-name (git-file-name name version)) (sha256 (base32 - "1cl7cm2ic9pg4vc9cdh84vzjj1x2lpd5ymimiva8h4l17kiphk4s")))) + "06a1gbrq3qcfsn0kyv4i24x1xxfrrwqa3kgfj4xa4va88q2vqyb5")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-dash" ,emacs-dash) -- cgit v1.2.3 From 3bf45ff4e00ec8b5d0b2848b8298812402709354 Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Thu, 26 Mar 2020 22:36:01 +0100 Subject: gnu: font-jetbrains-mono: Update to 1.0.3. * gnu/packages/fonts.scm (font-jetbrains-mono): update to 1.0.3 Signed-off-by: Marius Bakke --- gnu/packages/fonts.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 8eb4b689d9..527f2cbbd6 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -30,6 +30,7 @@ ;;; Copyright © 2019 Alexandros Theodotou ;;; Copyright © 2020 Damien Cassou ;;; Copyright © 2020 Amin Bandali +;;; Copyright © 2020 Michael Rohleder ;;; ;;; This file is part of GNU Guix. ;;; @@ -1569,7 +1570,7 @@ (define-public font-dseg (define-public font-jetbrains-mono (package (name "font-jetbrains-mono") - (version "1.0.2") + (version "1.0.3") (source (origin (method url-fetch) @@ -1577,7 +1578,7 @@ (define-public font-jetbrains-mono (string-append "https://download.jetbrains.com/fonts/" "JetBrainsMono-" version ".zip")) (sha256 - (base32 "0qlp4902i1v6ni04b6gdip8rxw6wpkdk9w7dir1yn9an5mvbkyar")))) + (base32 "0zvhwmpdwpm4vywmm6i9a4najz0c7vfi411yikgkd66l5hwd1p6f")))) (build-system font-build-system) (home-page "https://www.jetbrains.com/lp/mono/") (synopsis "Mono typeface for developers") -- cgit v1.2.3 From 1a17d21b24f56a02282821fc04cca54637d84170 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 29 Mar 2020 22:40:11 +0200 Subject: gnu: Add parlatype. * gnu/packages/gnome.scm (parlatype): New variable. --- gnu/packages/gnome.scm | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 924b38dc6f..6178ee1010 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -48,6 +48,7 @@ ;;; Copyright © 2020 Oleg Pykhalov ;;; Copyright © 2020 Pierre Neidhardt ;;; Copyright © 2020 raingloom +;;; Copyright © 2020 Nicolas Goaziou ;;; ;;; This file is part of GNU Guix. ;;; @@ -9884,3 +9885,60 @@ (define-public geary license:public-domain ;; snowball license:bsd-2)))) + +(define-public parlatype + ;; This is one commit away from 2.0, because the latter introduced + ;; a regression in ASR. + (let ((commit "7d22ead13ef7578f99d24146663cc1bdb7d8c2a9") + (revision "0")) + (package + (name "parlatype") + (version (git-version "2.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/gkarsay/parlatype.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0r3k3qczbzi7bs5s1rddhpsnadyr805df40bqkx0srlxgh5mfghf")))) + (build-system meson-build-system) + (arguments + `(#:glib-or-gtk? #t + #:tests? #f ;require internet access + #:phases + (modify-phases %standard-phases + (add-after 'install 'wrap-parlatype + ;; Add gstreamer plugin provided in this package to system's + ;; plugins. + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (gst-plugin-path (string-append + out "/lib/gstreamer-1.0/" + ":" + (getenv "GST_PLUGIN_SYSTEM_PATH")))) + (wrap-program (string-append out "/bin/parlatype") + `("GST_PLUGIN_SYSTEM_PATH" ":" = (,gst-plugin-path)))) + #t))))) + (native-inputs + `(("appstream-glib" ,appstream-glib) + ("desktop-file-utils" ,desktop-file-utils) ;for desktop-file-validate + ("gettext" ,gettext-minimal) + ("glib" ,glib "bin") ;for glib-compile-resources + ("pkg-config" ,pkg-config) + ("yelp-tools" ,yelp-tools))) + (inputs + `(("gst-plugins-base" ,gst-plugins-base) + ("gst-plugins-good" ,gst-plugins-good) + ("gstreamer" ,gstreamer) + ("gtk+" ,gtk+) + ("pocketsphinx" ,pocketsphinx) + ("pulseaudio" ,pulseaudio) + ("sphinxbase" ,sphinxbase))) + (home-page "http://gkarsay.github.io/parlatype/") + (synopsis "GNOME audio player for transcription") + (description "Parlatype is an audio player for the GNOME desktop +environment. Its main purpose is the manual transcription of spoken +audio files.") + (license license:gpl3+)))) -- cgit v1.2.3 From 4c60d5325e5ea5534d57518e315c442f70745a7a Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 29 Mar 2020 16:47:38 -0400 Subject: gnu: MPD: Update to 0.21.21. * gnu/packages/mpd.scm (mpd): Update to 0.21.21. --- gnu/packages/mpd.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index fe670f6aae..c96d67d8f2 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -92,7 +92,7 @@ (define-public libmpdclient (define-public mpd (package (name "mpd") - (version "0.21.20") + (version "0.21.21") (source (origin (method url-fetch) (uri @@ -101,7 +101,7 @@ (define-public mpd "/mpd-" version ".tar.xz")) (sha256 (base32 - "1q8hwl3i0a4qzdwfh44r0nh5zd2mm3rraqw5qvmz6qfrjslz0bj2")))) + "1kk8q5z99zdzwv3angn03jwnxhqdad0pnyi5j67c2qiv1rgv3gg1")))) (build-system meson-build-system) (arguments `(#:configure-flags '("-Ddocumentation=true"))) ;the default is 'false'... -- cgit v1.2.3 From d089b233353f05440a97afc5c1e903b8c1891969 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 29 Mar 2020 15:51:08 +0200 Subject: deploy: Factorize machine deployment. * guix/scripts/deploy.scm (deploy-machine*): New procedure. (guix-deploy): Call it in 'for-each'. --- guix/scripts/deploy.scm | 42 ++++++++++++++++++++++++------------------ 1 file changed, 24 insertions(+), 18 deletions(-) diff --git a/guix/scripts/deploy.scm b/guix/scripts/deploy.scm index 5c871cd6ed..7a44b9a503 100644 --- a/guix/scripts/deploy.scm +++ b/guix/scripts/deploy.scm @@ -30,6 +30,7 @@ (define-module (guix scripts deploy) #:use-module (guix status) #:use-module (ice-9 format) #:use-module (srfi srfi-1) + #:use-module (srfi srfi-26) #:use-module (srfi srfi-34) #:use-module (srfi srfi-35) #:use-module (srfi srfi-37) @@ -114,6 +115,27 @@ (define (show-what-to-deploy machines) (current-error-port)) (display "\n\n" (current-error-port)))) +(define (deploy-machine* store machine) + "Deploy MACHINE, taking care of error handling." + (info (G_ "deploying to ~a...~%") + (machine-display-name machine)) + + (guard (c ((message-condition? c) + (report-error (G_ "failed to deploy ~a: ~a~%") + (machine-display-name machine) + (condition-message c))) + ((deploy-error? c) + (when (deploy-error-should-roll-back c) + (info (G_ "rolling back ~a...~%") + (machine-display-name machine)) + (run-with-store store (roll-back-machine machine))) + (apply throw (deploy-error-captured-args c)))) + (run-with-store store (deploy-machine machine)) + + (info (G_ "successfully deployed ~a~%") + (machine-display-name machine)))) + + (define (guix-deploy . args) (define (handle-argument arg result) (alist-cons 'file arg result)) @@ -129,21 +151,5 @@ (define (handle-argument arg result) (set-build-options-from-command-line store opts) (with-build-handler (build-notifier #:use-substitutes? (assoc-ref opts 'substitutes?)) - (for-each (lambda (machine) - (info (G_ "deploying to ~a...~%") - (machine-display-name machine)) - (parameterize ((%graft? (assq-ref opts 'graft?))) - (guard (c ((message-condition? c) - (report-error (G_ "failed to deploy ~a: ~a~%") - (machine-display-name machine) - (condition-message c))) - ((deploy-error? c) - (when (deploy-error-should-roll-back c) - (info (G_ "rolling back ~a...~%") - (machine-display-name machine)) - (run-with-store store (roll-back-machine machine))) - (apply throw (deploy-error-captured-args c)))) - (run-with-store store (deploy-machine machine)) - (info (G_ "successfully deployed ~a~%") - (machine-display-name machine))))) - machines)))))) + (parameterize ((%graft? (assq-ref opts 'graft?))) + (for-each (cut deploy-machine* store <>) machines))))))) -- cgit v1.2.3 From 18c8a4396bdb9e9c842ef386a2aecfac38943112 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 29 Mar 2020 16:05:17 +0200 Subject: deploy: Use 'map/accumulate-builds'. * guix/scripts/deploy.scm (guix-deploy): Use 'map/accumulate-builds' instead of 'for-each'. --- guix/scripts/deploy.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/guix/scripts/deploy.scm b/guix/scripts/deploy.scm index 7a44b9a503..4466a0c632 100644 --- a/guix/scripts/deploy.scm +++ b/guix/scripts/deploy.scm @@ -152,4 +152,6 @@ (define (handle-argument arg result) (with-build-handler (build-notifier #:use-substitutes? (assoc-ref opts 'substitutes?)) (parameterize ((%graft? (assq-ref opts 'graft?))) - (for-each (cut deploy-machine* store <>) machines))))))) + (map/accumulate-builds store + (cut deploy-machine* store <>) + machines))))))) -- cgit v1.2.3 From 9f7855299604c496d2d2f12041974e33baa0d63b Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 29 Mar 2020 16:14:14 +0200 Subject: packages: 'package->bag' keys cache by replacement. * guix/packages.scm (package->bag): When GRAFT? is true, use PACKAGE's replacement as the cache key. Remove GRAFT? from the list of secondary cache keys. --- guix/packages.scm | 66 +++++++++++++++++++++++++++---------------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/guix/packages.scm b/guix/packages.scm index e2578101ee..04d9b7824c 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -1029,39 +1029,39 @@ (define* (package->bag package #:optional #:key (graft? (%graft?))) "Compile PACKAGE into a bag for SYSTEM, possibly cross-compiled to TARGET, and return it." - (cached (=> %bag-cache) - package (list system target graft?) - ;; Bind %CURRENT-SYSTEM and %CURRENT-TARGET-SYSTEM so that thunked - ;; field values can refer to it. - (parameterize ((%current-system system) - (%current-target-system target)) - (match (if graft? - (or (package-replacement package) package) - package) - ((and self - ($ name version source build-system - args inputs propagated-inputs native-inputs - outputs)) - ;; Even though we prefer to use "@" to separate the package - ;; name from the package version in various user-facing parts - ;; of Guix, checkStoreName (in nix/libstore/store-api.cc) - ;; prohibits the use of "@", so use "-" instead. - (or (make-bag build-system (string-append name "-" version) - #:system system - #:target target - #:source source - #:inputs (append (inputs self) - (propagated-inputs self)) - #:outputs outputs - #:native-inputs (native-inputs self) - #:arguments (args self)) - (raise (if target - (condition - (&package-cross-build-system-error - (package package))) - (condition - (&package-error - (package package))))))))))) + (let ((package (or (and graft? (package-replacement package)) + package))) + (cached (=> %bag-cache) + package (list system target) + ;; Bind %CURRENT-SYSTEM and %CURRENT-TARGET-SYSTEM so that thunked + ;; field values can refer to it. + (parameterize ((%current-system system) + (%current-target-system target)) + (match package + ((and self + ($ name version source build-system + args inputs propagated-inputs native-inputs + outputs)) + ;; Even though we prefer to use "@" to separate the package + ;; name from the package version in various user-facing parts + ;; of Guix, checkStoreName (in nix/libstore/store-api.cc) + ;; prohibits the use of "@", so use "-" instead. + (or (make-bag build-system (string-append name "-" version) + #:system system + #:target target + #:source source + #:inputs (append (inputs self) + (propagated-inputs self)) + #:outputs outputs + #:native-inputs (native-inputs self) + #:arguments (args self)) + (raise (if target + (condition + (&package-cross-build-system-error + (package package))) + (condition + (&package-error + (package package)))))))))))) (define %graft-cache ;; 'eq?' cache mapping package objects to a graft corresponding to their -- cgit v1.2.3 From 5a17b9b673c9509ac31401fa60aa0a010656e8ac Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 29 Mar 2020 18:42:10 +0200 Subject: build-system/gnu: Optimize the package graph. With this change, the output of: guix graph -e '(@@ (gnu packages commencement) coreutils-final)' |grep 'label = ' | wc -l drops from 76 nodes to 68 nodes, and the "add-data-to-store-cache" hit rate for: guix build libreoffice -d --no-grafts drops from 3.9% to 2.6%. * guix/build-system/gnu.scm (package-with-explicit-inputs*)[cut?]: Adjust condition to exclude packages with build systems other than GNU-BUILD-SYSTEM, such as 'ld-wrapper-boot3'. --- guix/build-system/gnu.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/guix/build-system/gnu.scm b/guix/build-system/gnu.scm index 3cc89f8852..7266fa0009 100644 --- a/guix/build-system/gnu.scm +++ b/guix/build-system/gnu.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2019 Ludovic Courtès +;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2019, 2020 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -151,8 +151,8 @@ (define (add-explicit-inputs p) p)) (define (cut? p) - (and (eq? (package-build-system p) gnu-build-system) - (memq #:implicit-inputs? (package-arguments p)))) + (or (not (eq? (package-build-system p) gnu-build-system)) + (memq #:implicit-inputs? (package-arguments p)))) (package-mapping add-explicit-inputs cut?)) -- cgit v1.2.3 From 71d17a09ee133ee4232f08cd8b60ae4373eea6cf Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 29 Mar 2020 18:57:10 +0200 Subject: gnu: commencement: Micro-optimize the package graph. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This removes 2 'add-data-to-store-cache' lookups. * gnu/packages/commencement.scm (flex-boot0): Move (package (inherit …)) outside the 'propagated-inputs' field to avoid creating a new node each time the field is accessed. --- gnu/packages/commencement.scm | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 42d1132fba..9da0f77879 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès +;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2014 Andreas Enge ;;; Copyright © 2012 Nikita Karetnikov ;;; Copyright © 2014, 2015, 2017 Mark H Weaver @@ -1760,20 +1760,21 @@ (define bison-boot0 (define flex-boot0 ;; This Flex is needed to build MiG as well as Linux-Libre headers. - (package - (inherit flex) - (native-inputs `(("bison" ,bison-boot0))) - (propagated-inputs - ;; XXX: Here we use an 'm4-boot0' package that's not eq? so that it - ;; appears twice in '%build-inputs', like when we were using - ;; 'package-with-explicit-inputs'. - ;; TODO: Remove this hack on the next rebuild cycle. - `(("m4" ,(package (inherit m4-boot0*))))) - (inputs (%boot0-inputs)) - (arguments - `(#:implicit-inputs? #f - #:guile ,%bootstrap-guile - #:tests? #f)))) + (let ((m4-boot0* (package (inherit m4-boot0*)))) + (package + (inherit flex) + (native-inputs `(("bison" ,bison-boot0))) + (propagated-inputs + ;; XXX: Here we use an 'm4-boot0' package that's not eq? so that it + ;; appears twice in '%build-inputs', like when we were using + ;; 'package-with-explicit-inputs'. + ;; TODO: Remove this hack on the next rebuild cycle. + `(("m4" ,m4-boot0*))) + (inputs (%boot0-inputs)) + (arguments + `(#:implicit-inputs? #f + #:guile ,%bootstrap-guile + #:tests? #f))))) (define linux-libre-headers-boot0 (mlambda () -- cgit v1.2.3 From 3e3364fc526e1a54ea7744361ffcf6a59a6610a8 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sun, 29 Mar 2020 23:54:30 +0200 Subject: gnu: gmp: Build fix for mingw. * gnu/packages/multiprecision.scm (gmp) [arguments]: Add `setenv' phase for mingw target. --- gnu/packages/multiprecision.scm | 46 +++++++++++++++++++++++++++++------------ 1 file changed, 33 insertions(+), 13 deletions(-) diff --git a/gnu/packages/multiprecision.scm b/gnu/packages/multiprecision.scm index bc5071dad0..9a0b042dc0 100644 --- a/gnu/packages/multiprecision.scm +++ b/gnu/packages/multiprecision.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2014 Mark H Weaver ;;; Copyright © 2015, 2018 Andreas Enge ;;; Copyright © 2016 Nicolas Goaziou -;;; Copyright © 2016 Jan Nieuwenhuizen +;;; Copyright © 2016, 2020 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 Eric Bavier ;;; Copyright © 2018, 2019 Efraim Flashner @@ -50,18 +50,38 @@ (define-public gmp (build-system gnu-build-system) (native-inputs `(("m4" ,m4))) (outputs '("out" "debug")) - (arguments `(#:parallel-tests? #f ; mpz/reuse fails otherwise - #:configure-flags - '(;; Build a "fat binary", with routines for several - ;; sub-architectures. - "--enable-fat" - "--enable-cxx" - ,@(cond ((target-mingw?) - ;; Static and shared cannot be built in one go: - ;; they produce different headers. We need shared. - `("--disable-static" - "--enable-shared")) - (else '()))))) + (arguments + `(#:parallel-tests? #f ; mpz/reuse fails otherwise + #:configure-flags + '(;; Build a "fat binary", with routines for several + ;; sub-architectures. + "--enable-fat" + "--enable-cxx" + ,@(cond ((target-mingw?) + ;; Static and shared cannot be built in one go: + ;; they produce different headers. We need shared. + `("--disable-static" + "--enable-shared")) + (else '()))) + ;; Remove after core-updates merge. + ;; Workaround for gcc-7 transition breakage, -system and cross-build, + ;; Note: See for why not 'CPATH'. + ;; Note: See for why not 'C_INCLUDE_PATH' & co. + ,@(if (target-mingw?) + `(#:phases + (modify-phases %standard-phases + (add-before 'configure 'setenv + (lambda _ + (let ((gcc (assoc-ref %build-inputs "cross-gcc")) + (libc (assoc-ref %build-inputs "cross-libc"))) + (setenv "CROSS_CPLUS_INCLUDE_PATH" + (string-append gcc "/include/c++" + ":" gcc "/include" + ":" libc "/include")) + (format #t "environment variable `CROSS_CPLUS_INCLUDE_PATH' set to `~a'\n" + (getenv "CROSS_CPLUS_INCLUDE_PATH")) + #t))))) + '()))) (synopsis "Multiple-precision arithmetic library") (description "The @acronym{GMP, the GNU Multiple Precision Arithmetic} library performs -- cgit v1.2.3 From 2703d5734382e0ceac9febb1f77d654693f76417 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 29 Mar 2020 22:02:44 +0300 Subject: gnu: java-hamcrest-core: Don't use unstable tarball. * gnu/packages/java.scm (java-hamcrest-core)[source]: Download using git-fetch. --- gnu/packages/java.scm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 5154dc124e..8c97f6bba0 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018, 2019 Gábor Boskovits ;;; Copyright © 2018 Chris Marusich -;;; Copyright © 2018, 2019 Efraim Flashner +;;; Copyright © 2018, 2019, 2020 Efraim Flashner ;;; Copyright © 2019, 2020 Björn Höfling ;;; ;;; This file is part of GNU Guix. @@ -3435,12 +3435,14 @@ (define-public java-hamcrest-core (name "java-hamcrest-core") (version "1.3") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/hamcrest/JavaHamcrest/" - "archive/hamcrest-java-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/hamcrest/JavaHamcrest/") + (commit (string-append "hamcrest-java-" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "11g0s105fmwzijbv08lx8jlb521yravjmxnpgdx08fvg1kjivhva")) + "16fxxkrd31ahqvcaby30jgh3z1i0zxh51m24hxgz0z2agxj6bc63")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 42c1c59ea19ecdae04fa88858a261b4101a62709 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 29 Mar 2020 22:05:31 +0300 Subject: gnu: java-junit: Don't use unstable tarball. * gnu/packages/java.scm (java-junit)[source]: Download using git-fetch. [home-page]: Update home-page. --- gnu/packages/java.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 8c97f6bba0..db28805929 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -3542,13 +3542,14 @@ (define-public java-junit (name "java-junit") (version "4.12") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/junit-team/junit/" - "archive/r" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/junit-team/junit/") + (commit (string-append "r" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "090dn5v1vs0b3acyaqc0gjf6p8lmd2h24wfzsbq7sly6b214anws")) + "1j8avi91px1z8rjc89cfikwrvfifdmmsarwiyrcnr59ynvpz0v8h")) (modules '((guix build utils))) (snippet '(begin @@ -3561,7 +3562,7 @@ (define-public java-junit #:jar-name "junit.jar")) (inputs `(("java-hamcrest-core" ,java-hamcrest-core))) - (home-page "https://junit.org/") + (home-page "https://junit.org/junit4/") (synopsis "Test framework for Java") (description "JUnit is a simple framework to write repeatable tests for Java projects. -- cgit v1.2.3 From c53badd4520252fc19c89820af0d569a2d809af2 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 29 Mar 2020 22:12:31 +0300 Subject: gnu: java-plexus-utils: Don't use unstable tarball. * gnu/packages/java.scm (java-plexus-utils)[source]: Download using git-fetch. --- gnu/packages/java.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index db28805929..ce5aee1f20 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -3575,13 +3575,14 @@ (define-public java-plexus-utils (name "java-plexus-utils") (version "3.2.0") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/codehaus-plexus/" - "plexus-utils/archive/plexus-utils-" - version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/codehaus-plexus/plexus-utils") + (commit (string-append "plexus-utils-" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "1ihfigar20lvk4pinii7dq05i173xphhw4iyrk6gjfy04m01j2lz")))) + "1mlx7xrq7lgqjqcpg7y4hi1ghavf28vvk3har82037dqx61n0f15")))) (build-system ant-build-system) ;; FIXME: The default build.xml does not include a target to install ;; javadoc files. -- cgit v1.2.3 From c4b67ba3a804d94ea2b56a2d7c968a1e024f2ee1 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 29 Mar 2020 22:15:45 +0300 Subject: gnu: java-plexus-interpolation: Don't use unstable tarball. * gnu/packages/java.scm (java-plexus-interpolation)[source]: Download using git-fetch. --- gnu/packages/java.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index ce5aee1f20..da778518fe 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -3629,13 +3629,14 @@ (define-public java-plexus-interpolation (name "java-plexus-interpolation") (version "1.23") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/codehaus-plexus/" - "plexus-interpolation/archive/" - "plexus-interpolation-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/codehaus-plexus/plexus-interpolation") + (commit (string-append "plexus-interpolation-" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "03377yzlx5q440m6sxxgv6a5qb8fl30zzcgxgc0hxk5qgl2z1jjn")))) + "005hxxg1adv71a96lz4vp65bk3v1pi76j4c45z29xzizclib16vl")))) (build-system ant-build-system) (arguments `(#:jar-name "plexus-interpolation.jar" -- cgit v1.2.3 From 9520b2b16e242728ab9340047197389d6d2bc2fc Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 29 Mar 2020 22:18:15 +0300 Subject: gnu: java-plexus-classworlds: Don't use unstable tarball. * gnu/packages/java.scm (java-plexus-classworlds)[source]: Download using git-fetch. --- gnu/packages/java.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index da778518fe..5ee7109ab8 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -3660,13 +3660,14 @@ (define-public java-plexus-classworlds (name "java-plexus-classworlds") (version "2.5.2") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/codehaus-plexus/" - "plexus-classworlds/archive/plexus-classworlds-" - version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/codehaus-plexus/plexus-classworlds") + (commit (string-append "plexus-classworlds-" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "1qm4p0rl8d82lzhsiwnviw11jnq44s0gflg78zq152xyyr2xmh8g")))) + "1iv8x55fbni2hg4l7pdpbwfq75xmvq1f25g6nxma8rcdpihsh13r")))) (build-system ant-build-system) (arguments `(#:jar-name "plexus-classworlds.jar" -- cgit v1.2.3 From 3a26ea3a58b9f2cf52563f24473cfa72b924e838 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 29 Mar 2020 22:32:23 +0300 Subject: gnu: java-plexus-container-default-bootstrap: Don't use unstable tarball. * gnu/packages/java.scm (java-plexus-container-default-bootstrap) [source]: Download using git-fetch. --- gnu/packages/java.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 5ee7109ab8..a3ea0847cf 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -3687,12 +3687,14 @@ (define java-plexus-container-default-bootstrap (name "java-plexus-container-default-bootstrap") (version "1.7.1") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/codehaus-plexus/plexus-containers" - "/archive/plexus-containers-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/codehaus-plexus/plexus-containers") + (commit (string-append "plexus-containers-" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "0xw5g30qf4a83608rw9v2hv8pfsz7d69dkdhk6r0wia4q78hh1pc")))) + "1316hrp5vqfv0aw7miq2fp0wwy833h66h502h29vnh5sxj27x228")))) (build-system ant-build-system) (arguments `(#:jar-name "container-default.jar" -- cgit v1.2.3 From 48fe942c8578f52ed584691d3b581f789282a409 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 30 Mar 2020 09:01:18 +0300 Subject: gnu: java-plexus-io: Don't use unstable tarball. * gnu/packages/java.scm (java-plexus-io)[source]: Download using git-fetch. --- gnu/packages/java.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index a3ea0847cf..f04dfe0b9d 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -3728,12 +3728,14 @@ (define-public java-plexus-io (name "java-plexus-io") (version "3.0.0") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/codehaus-plexus/plexus-io" - "/archive/plexus-io-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/codehaus-plexus/plexus-io") + (commit (string-append "plexus-io-" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "0f2j41kihaymxkpbm55smpxjja235vad8cgz94frfy3ppcp021dw")))) + "1h4q9l2j9sfbscvxpnyy2hazi0r83h3am86y4r959wrl1b24xxwd")))) (build-system ant-build-system) (arguments `(#:jar-name "plexus-io.jar" -- cgit v1.2.3 From d0e6461370210cc35643e0a37a7cb1c6799701ac Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 30 Mar 2020 09:08:28 +0300 Subject: gnu: java-plexus-cipher: Don't use unstable tarball. * gnu/packages/java.scm (java-plexus-cipher)[source]: Download using git-fetch. --- gnu/packages/java.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index f04dfe0b9d..b4fb1e5a6e 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -3889,12 +3889,14 @@ (define-public java-plexus-cipher (name "java-plexus-cipher") (version "1.7") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/codehaus-plexus/plexus-cipher" - "/archive/plexus-cipher-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/codehaus-plexus/plexus-cipher") + (commit (string-append "plexus-cipher-" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "1j3r8xzlxlk340snkjp6lk2ilkxlkn8qavsfiq01f43xmvv8ymk3")))) + "0m638nzlxbmnbcj5cwdpgs326ab584yv0k803zlx37r6iqwvf6b0")))) (build-system ant-build-system) (arguments `(#:jar-name "plexus-cipher.jar" -- cgit v1.2.3 From 5723137a4cdc44c75de2d0a1d207fbf394db5530 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 30 Mar 2020 09:19:59 +0300 Subject: gnu: java-plexus-compiler-api: Don't use unstable tarball. * gnu/packages/java.scm (java-plexus-compiler-api)[source]: Download using git-fetch. --- gnu/packages/java.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index b4fb1e5a6e..6a6af783c7 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -3927,12 +3927,14 @@ (define-public java-plexus-compiler-api (name "java-plexus-compiler-api") (version "2.8.4") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/codehaus-plexus/plexus-compiler" - "/archive/plexus-compiler-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/codehaus-plexus/plexus-compiler") + (commit (string-append "plexus-compiler-" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "09vmxs0807wsd26nbrwwj5l8ycmzazqycj52l7w6wjvkryywi69h")))) + "1nq1gnn3s6z1j29gmi1hqbklsmm8b1lmnafb0191914f95mn18gk")))) (build-system ant-build-system) (arguments `(#:jar-name "plexus-compiler-api.jar" -- cgit v1.2.3 From d9e356a893fd57da939a068d9ca6911c79169009 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 30 Mar 2020 09:24:13 +0300 Subject: gnu: java-plexus-sec-dispatcher: Don't use unstable tarball. * gnu/packages/java.scm (java-plexus-sec-dispatcher)[source]: Download using git-fetch. --- gnu/packages/java.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 6a6af783c7..81a17c040e 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -3980,13 +3980,14 @@ (define-public java-plexus-sec-dispatcher (source (origin ;; This project doesn't tag releases or publish tarballs, so we take ;; the "prepare release plexus-sec-dispatcher-1.4" git commit. - (method url-fetch) - (uri (string-append "https://github.com/sonatype/plexus-sec-dispatcher/" - "archive/7db8f88048.tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/sonatype/plexus-sec-dispatcher/") + (commit "7db8f880486e192a1c5ea9544e01e756c3d49d0f"))) (sha256 (base32 - "1smfrk4n7xbrsxpxcp2j4i0j8q86j73w0w6xg7qz83dp6dagdjgp")) - (file-name (string-append name "-" version ".tar.gz")))) + "1ng4yliy4cqpjr4fxxjbpwyk1wkch5f8vblm1kvwf328s4gibszs")) + (file-name (git-file-name name version)))) (arguments `(#:jar-name "plexus-sec-dispatcher.jar" #:source-dir "src/main/java" -- cgit v1.2.3 From 16c62763995ccdb3165a9d5760df4097aca822fb Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 30 Mar 2020 09:26:23 +0300 Subject: gnu: java-sisu-build-api: Don't use unstable tarball. * gnu/packages/java.scm (java-sisu-build-api)[source]: Download using git-fetch. --- gnu/packages/java.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 81a17c040e..fe9a8998ba 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -4102,12 +4102,14 @@ (define-public java-sisu-build-api (name "java-sisu-build-api") (version "0.0.7") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/sonatype/sisu-build-api/" - "archive/plexus-build-api-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/sonatype/sisu-build-api") + (commit (string-append "plexus-build-api-" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "1c3rrpma3x634xp2rm2p5iskfhzdyc7qfbhjzr70agrl1jwghgy2")))) + "1d5w6c58gkx30d51v7qwv1xrhc0ly76848gihmgshj19yf6yhca0")))) (build-system ant-build-system) (arguments `(#:jar-name "sisu-build-api.jar" -- cgit v1.2.3 From df9487c5943d923751127c20ccb2e8bec726113d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 30 Mar 2020 09:39:14 +0300 Subject: gnu: java-modello-core: Don't use unstable tarball. * gnu/packages/java.scm (java-modello-core)[source]: Download using git-fetch. --- gnu/packages/java.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index fe9a8998ba..5a7a75a86b 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -4159,12 +4159,14 @@ (define-public java-modello-core (name "java-modello-core") (version "1.9.1") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/codehaus-plexus/modello" - "/archive/modello-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/codehaus-plexus/modello") + (commit (string-append "modello-" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "0l2pvns8pmlrmjm3iknp7gpg3654y1m8qhy55b19sdwdchdcyxfh")))) + "1di6ni42aqllpdvkpyfcw70352vr2i8wf6hd5nhd9kmqjb5dj5j4")))) (build-system ant-build-system) (arguments `(#:jar-name "modello-core.jar" -- cgit v1.2.3 From 654f997d98fd96c0a2eaa36e0dda1518eb40fb90 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 30 Mar 2020 09:40:52 +0300 Subject: gnu: java-asm: Download using https. * gnu/packages/java.scm (java-asm)[source]: Use https URL. --- 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 5a7a75a86b..f124eb6278 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -4333,7 +4333,7 @@ (define-public java-asm (version "6.0") (source (origin (method url-fetch) - (uri (string-append "http://download.forge.ow2.org/asm/" + (uri (string-append "https://download.forge.ow2.org/asm/" "asm-" version ".tar.gz")) (sha256 (base32 -- cgit v1.2.3 From 3dc7a8ce73943f8bd0a34e39440356b0f2a75e5b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 30 Mar 2020 09:43:17 +0300 Subject: gnu: java-objenesis: Don't use unstable tarball. * gnu/packages/java.scm (java-objenesis)[source]: Download using git-fetch. --- gnu/packages/java.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index f124eb6278..5a124b5115 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -4435,13 +4435,14 @@ (define-public java-objenesis (name "java-objenesis") (version "2.5.1") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/easymock/objenesis/" - "archive/" version ".tar.gz")) - (file-name (string-append "objenesis-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/easymock/objenesis") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "1va5qz1i2wawwavhnxfzxnfgrcaflz9p1pg03irrjh4nd3rz8wh6")))) + "054yi200wj00x6dp1sxfrwgndwywadsbn8d8ij1j0v45j9g2vdya")))) (build-system ant-build-system) (arguments `(#:jar-name "objenesis.jar" -- cgit v1.2.3 From 7cf90f641981b61f9811ef6848761fe031f03b71 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 30 Mar 2020 09:46:24 +0300 Subject: gnu: java-easymock: Don't use unstable tarball. * gnu/packages/java.scm (java-easymock)[source]: Download using git-fetch. [home-page]: Use https. --- gnu/packages/java.scm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 5a124b5115..d1cd62bf83 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -4465,12 +4465,14 @@ (define-public java-easymock (name "java-easymock") (version "3.4") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/easymock/easymock/" - "archive/easymock-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/easymock/easymock/") + (commit (string-append "easymock-" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "1yzg0kv256ndr57gpav46cyv4a1ns5sj722l50zpxk3j6sk9hnmi")))) + "02vybm8hc0i0n9sp2f2iiqn54zwqhq835f76wc6b2m7819z5a8dq")))) (build-system ant-build-system) (arguments `(#:jar-name "easymock.jar" @@ -4515,7 +4517,7 @@ (define-public java-easymock (native-inputs `(("java-junit" ,java-junit) ("java-hamcrest-core" ,java-hamcrest-core))) - (home-page "http://easymock.org") + (home-page "https://easymock.org/") (synopsis "Java library providing mock objects for unit tests") (description "EasyMock is a Java library that provides an easy way to use mock objects in unit testing.") -- cgit v1.2.3 From 7cf26f249a40b67319cf624869e37828d9e322e5 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 30 Mar 2020 09:51:25 +0300 Subject: gnu: java-jmock-1: Don't use unstable tarball. * gnu/packages/java.scm (java-jmock-1)[source]: Download using git-fetch. [home-page]: Update home-page. --- gnu/packages/java.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index d1cd62bf83..1a36268da7 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -4528,13 +4528,14 @@ (define-public java-jmock-1 (name "java-jmock") (version "1.2.0") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/jmock-developers/" - "jmock-library/archive/" version ".tar.gz")) - (file-name (string-append "jmock-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/jmock-developers/jmock-library") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "0xmrlhq0fszldkbv281k9463mv496143vvmqwpxp62yzjvdkx9w0")))) + "0lkga995xd9b9mmzxmcd301hlw83p1h78nibh7djlx7wydscr85z")))) (build-system ant-build-system) (arguments `(#:build-target "jars" @@ -4542,7 +4543,7 @@ (define-public java-jmock-1 #:phases (modify-phases %standard-phases (replace 'install (install-jars "build"))))) - (home-page "http://www.jmock.org") + (home-page "http://jmock.org/") (synopsis "Mock object library for test-driven development") (description "JMock is a library that supports test-driven development of Java code with mock objects. Mock objects help you design and test the -- cgit v1.2.3 From 242af2954e86e2b640c0cf3947514a22a812335f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 30 Mar 2020 09:53:46 +0300 Subject: gnu: java-jmock: Don't use unstable tarball. * gnu/packages/java.scm (java-jmock)[source]: Download using git-fetch. --- gnu/packages/java.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 1a36268da7..e8cab46a7c 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -4566,13 +4566,14 @@ (define-public java-jmock (name "java-jmock") (version "2.8.2") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/jmock-developers/" - "jmock-library/archive/" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/jmock-developers/jmock-library") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "18650a9g8xffcsdb6w91pbswa7f40fp2sh6s3nclkclz5dbzq8f0")))) + "12b7l22g3nrjvf2dzcw3z03fpd2chrgp0d8xkvn8w55rwb57pax6")))) (inputs `(("java-hamcrest-all" ,java-hamcrest-all) ("java-asm" ,java-asm) -- cgit v1.2.3 From 2876b23345916fdfd1468c55312aab84f46de80e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 30 Mar 2020 09:58:51 +0300 Subject: gnu: java-javaewah: Don't use unstable tarball. * gnu/packages/java.scm (java-javaewah)[source]: Download using git-fetch. --- gnu/packages/java.scm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index e8cab46a7c..e1e071573d 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -6742,12 +6742,14 @@ (define-public java-javaewah (name "java-javaewah") (version "1.1.6") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/lemire/javaewah/" - "archive/JavaEWAH-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/lemire/javaewah/") + (commit (string-append "JavaEWAH-" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "1n7j1r1h24wlhwv9zdcj6yqjrhma2ixwyzm15l5vrv6yqjs6753b")))) + "1m8qcb1py76v7avbjjrkvyy6fhr5dk2ywy73gbsxqry04gkm2nhw")))) (build-system ant-build-system) (arguments `(#:jar-name "javaewah.jar")) (inputs @@ -6760,7 +6762,7 @@ (define-public java-javaewah compression scheme. It can be used to implement bitmap indexes. The goal of word-aligned compression is not to achieve the best compression, -but rather to improve query processing time. Hence, JavaEWAH tries to save CPU +but rather to improve query processing time. Hence, JavaEWAH tries to save CPU cycles, maybe at the expense of storage. However, the EWAH scheme is always more efficient storage-wise than an uncompressed bitmap (as implemented in the @code{BitSet} class by Sun).") -- cgit v1.2.3 From 043ee597a7f82c6ea0dd6de07a69bb0bdb523a64 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 30 Mar 2020 10:05:39 +0300 Subject: gnu: antlr3: Don't use unstable tarball. * gnu/packages/java.scm (antlr3)[source]: Download using git-fetch. --- gnu/packages/java.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index e1e071573d..9c0974a602 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -7051,13 +7051,14 @@ (define-public antlr3 (name "antlr3") (version "3.5.2") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/antlr/antlr3/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/antlr/antlr3") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "0218v683081lg54z9hvjxinhxd4dqp870jx6n39gslm0bkyi4vd6")))) + "0cafavrjmzqhklghrk8c2jqxkdwxgzskm20pbrfd3r41cn00dpnf")))) (build-system ant-build-system) (arguments `(#:jar-name (string-append ,name "-" ,version ".jar") -- cgit v1.2.3 From 927f3655662b41f25225ea03baa3ded687aa7cbb Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Sun, 29 Mar 2020 17:55:58 +1100 Subject: gnu: ath9k-htc-firmware: Correct home-page url. * gnu/packages/firmware.scm (ath9k-htc-firmware)[home-page]: Correct url. Signed-off-by: Efraim Flashner --- gnu/packages/firmware.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index 8822ff35da..a7a08f3c01 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -86,7 +86,7 @@ (define-public ath9k-htc-firmware ("cross-binutils" ,(cross-binutils "xtensa-elf")) ("cmake" ,cmake-minimal) ("perl" ,perl))) - (home-page "http://wireless.kernel.org/en/users/Drivers/ath9k_htc") + (home-page "https://wireless.wiki.kernel.org/en/users/Drivers/ath9k_htc") (synopsis "Firmware for the Atheros AR7010 and AR9271 USB 802.11n NICs") (description "This is the firmware for the Qualcomm Atheros AR7010 and AR9271 USB -- cgit v1.2.3