diff options
59 files changed, 2893 insertions, 721 deletions
@@ -30,6 +30,7 @@ Eric Dvorsak <eric@dvorsak.fr> <yenda1@gmail.com> George Clemmer <myglc2@gmail.com> ison <ison@airmail.cc> <ison111@protonmail.com> Ivan Vilata i Balaguer <ivan@selidor.net> +Jakob L. Kreuze <zerodaysfordays@sdf.org> <zerodaysfordays@sdf.lonestar.org> Jeff Mickey <j@codemac.net> <jm@igneous.io> John Darrington <jmd@gnu.org> <john@darrington.wattle.id.au> John J. Foerch <jjfoerch@earthlink.net> diff --git a/doc/guix.texi b/doc/guix.texi index b0bb61c9c1..42d7cfa2e8 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -72,6 +72,7 @@ Copyright @copyright{} 2019 Guillaume Le Vaillant@* Copyright @copyright{} 2020 Leo Prikler@* Copyright @copyright{} 2019, 2020 Simon Tournier@* Copyright @copyright{} 2020 Wiktor Żelazny@* +Copyright @copyright{} 2020 Damien Cassou@* Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or diff --git a/etc/news.scm b/etc/news.scm index 6b58e7742b..305d49366d 100644 --- a/etc/news.scm +++ b/etc/news.scm @@ -1,6 +1,7 @@ ;; GNU Guix news, for use by 'guix pull'. ;; ;; Copyright © 2019, 2020 Ludovic Courtès <ludo@gnu.org> +;; Copyright © 2020 Mathieu Othacehe <m.othacehe@gmail.com> ;; ;; Copying and distribution of this file, with or without modification, are ;; permitted in any medium without royalty provided the copyright notice and @@ -9,9 +10,36 @@ (channel-news (version 0) + (entry (commit "e3e1a7ba08af2d58c47264c543617e499c239444") + (title (en "@command{guix pull} now supports SSH authenticated +repositories") + (de "@command{guix pull} unterstützt nun SSH-authentifizierte +Repositorys") + (fr "@command{guix pull} prend maintenant en charge +l'authentification en SSH pour les dépôts.") + (nl "@command{guix pull} ondersteunt nu SSH-geauthenticeerde +repository's.")) + (body (en "The @command{guix pull} command now supports SSH +authenticated repositories as argument of @option{--url} and in custom +channels definitions. The authentication requires that an @command{ssh-agent} +is running.") + (de "Der Befehl @command{guix pull} unterstützt nun über SSH +authentifizierte Repositorys als Argument von @option{--url} und in +selbstgeschriebenen Kanaldefinitionen. Zur Authentisierung muss ein +@command{ssh-agent} laufen.") + (fr "La commande @command{guix pull} prend maintenant en +charge l'authentification SSH pour les dépôts dans l'argument @option{--url} +et dans le définitions de canaux personnalisés. L'authentification +nécessite qu'un @command{ssh-agent} soit lancé.") + (nl "Het @command{guix pull}-commando ondersteunt nu +SSH-geauthenticeerde opslag als argument na @option{--url} en bij het +schrijven van eigen kanaaldefinities. Hiervoor moet een @command{ssh-agent} +gestart zijn."))) + (entry (commit "8234fe653e61d0090138cbd4c48d877568355439") (title (en "Guix now runs on Guile 3.0") (de "Guix läuft jetzt auf Guile 3.0") + (fr "Guix tourne maintenant sous Guile 3.0") (nl "Guix draait nu op Guile 3.0")) (body (en "The Guix revision you just pulled runs on version 3.0 of GNU@tie{}Guile (previously it would run on version 2.2). Guile 3.0 improves @@ -25,6 +53,11 @@ erzeugt werden (JIT-Kompilierung). Der Wechsel sollte für Sie völlig transparent sein und Guix verhält sich gleich. Siehe @uref{https://gnu.org/software/guile} für weitere Informationen zu Guile 3.0.") + (fr "La révision de Guix que tu viens de récupérer tourne sous +la version 3.0 de GNU@tie{}Guile (Guix tournait avant sous la version 2.2). +Guile 3.0 améliore la performance en générant du code natif à la volée (JIT). +Le changement devrait être totalement transparent pour toi. Voir +@uref{https://gnu.org/software/guile} pour plus d'information sur Guile 3.0.") (nl "De Guix die u net heeft gepulld gebruikt versie 3.0 van GNU@tie{}Guile (voorheen was dat versie 2.2). Guile@tie{}3.0 draait dezelfde programma's doorgaans sneller door ze ‘just-in-time’ (JIT) te vertalen naar @@ -34,7 +67,8 @@ Guile@tie{}3.0."))) (entry (commit "828a39da68a9169ef1d9f9ff02a1c66b1bcbe884") (title (en "New @option{--diff} option for @command{guix challenge}") - (de "Neue @option{--diff}-Option für @command{guix challenge}")) + (de "Neue @option{--diff}-Option für @command{guix challenge}") + (fr "Nouvelle option @option{--diff} sur @command{guix challenge}")) (body (en "The @command{guix challenge} command, which compares binaries provided by different substitute servers as well as those built locally, has a new @option{--diff} option. With @option{--diff=simple} (the @@ -42,6 +76,13 @@ default), @command{guix challenge} automatically downloads binaries and reports the list of differing files; @option{--diff=diffoscope} instructs it to pass them to @command{diffoscope}, which simplifies the comparison process. Run @command{info \"(guix) Invoking guix challenge\"}, for more info.") + (fr "La commande @command{guix challenge} qui compare les binaires +fournis par différents serveurs de substituts aux contsructions locales a une +nouvelle option @option{--diff}. Avec @option{--diff=simple} (par défaut), +@command{guix challenge} télécharge automatiquement les binaires et rapporte +la liste des fichiers différents@tie{}; @option{--diff=diffoscope} lui dit +de les passer à @command{diffoscope} qui simplifie le processus de comparaison. +Lance @command{info \"(guix.fr) Invoquer guix challenge\"} pour plus d'info.") (de "Der Befehl @command{guix challenge}, mit dem Binärdateien von unterschiedlichen Substitut-Servern oder lokale Erstellungen miteinander verglichen werden können, hat eine neue Befehlszeilenoption @option{--diff} diff --git a/gnu/local.mk b/gnu/local.mk index eba3e92171..c13b6357c9 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -109,6 +109,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/check.scm \ %D%/packages/chemistry.scm \ %D%/packages/chez.scm \ + %D%/packages/chicken.scm \ %D%/packages/chromium.scm \ %D%/packages/ci.scm \ %D%/packages/cinnamon.scm \ @@ -814,10 +815,7 @@ dist_patch_DATA = \ %D%/packages/patches/docbook-xsl-nonrecursive-string-subst.patch \ %D%/packages/patches/doc++-include-directives.patch \ %D%/packages/patches/doc++-segfault-fix.patch \ - %D%/packages/patches/docker-adjust-tests-for-changes-in-go.patch \ - %D%/packages/patches/docker-engine-test-noinstall.patch \ %D%/packages/patches/docker-fix-tests.patch \ - %D%/packages/patches/docker-use-fewer-modprobes.patch \ %D%/packages/patches/dovecot-trees-support-dovecot-2.3.patch \ %D%/packages/patches/doxygen-test.patch \ %D%/packages/patches/dstat-fix-crash-when-specifying-delay.patch \ @@ -1371,6 +1369,7 @@ dist_patch_DATA = \ %D%/packages/patches/readline-link-ncurses.patch \ %D%/packages/patches/readline-6.2-CVE-2014-2524.patch \ %D%/packages/patches/reposurgeon-add-missing-docbook-files.patch \ + %D%/packages/patches/reprotest-support-guix.patch \ %D%/packages/patches/ri-li-modernize_cpp.patch \ %D%/packages/patches/ripperx-missing-file.patch \ %D%/packages/patches/rpcbind-CVE-2017-8779.patch \ @@ -1386,6 +1385,7 @@ dist_patch_DATA = \ %D%/packages/patches/rust-bootstrap-stage0-test.patch \ %D%/packages/patches/rust-coresimd-doctest.patch \ %D%/packages/patches/rust-reproducible-builds.patch \ + %D%/packages/patches/rust-openssl-sys-no-vendor.patch \ %D%/packages/patches/rxvt-unicode-escape-sequences.patch \ %D%/packages/patches/sbcl-graph-asdf-definitions.patch \ %D%/packages/patches/scalapack-blacs-mpi-deprecations.patch \ diff --git a/gnu/machine.scm b/gnu/machine.scm index bdd92d9592..434d78ab41 100644 --- a/gnu/machine.scm +++ b/gnu/machine.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019 David Thompson <davet@gnu.org> -;;; Copyright © 2019 Jakob L. Kreuze <zerodaysfordays@sdf.lonestar.org> +;;; Copyright © 2019 Jakob L. Kreuze <zerodaysfordays@sdf.org> ;;; ;;; This file is part of GNU Guix. ;;; diff --git a/gnu/machine/digital-ocean.scm b/gnu/machine/digital-ocean.scm index 6f7cf8fb30..1a91a3a49b 100644 --- a/gnu/machine/digital-ocean.scm +++ b/gnu/machine/digital-ocean.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2019 Jakob L. Kreuze <zerodaysfordays@sdf.lonestar.org> +;;; Copyright © 2019 Jakob L. Kreuze <zerodaysfordays@sdf.org> ;;; ;;; This file is part of GNU Guix. ;;; diff --git a/gnu/machine/ssh.scm b/gnu/machine/ssh.scm index d6ce1253a4..6374373e22 100644 --- a/gnu/machine/ssh.scm +++ b/gnu/machine/ssh.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2019 Jakob L. Kreuze <zerodaysfordays@sdf.lonestar.org> +;;; Copyright © 2019 Jakob L. Kreuze <zerodaysfordays@sdf.org> ;;; ;;; This file is part of GNU Guix. ;;; diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 26e2693431..ead8303f25 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -25,7 +25,7 @@ ;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz> ;;; Copyright © 2019 Brett Gilio <brettg@gnu.org> ;;; Copyright © 2019 Björn Höfling <bjoern.hoefling@bjoernhoefling.de> -;;; Copyright © 2019 Jakob L. Kreuze <zerodaysfordays@sdf.lonestar.org> +;;; Copyright © 2019 Jakob L. Kreuze <zerodaysfordays@sdf.org> ;;; Copyright © 2019 Hartmut Goebel <h.goebel@crazy-compilers.com> ;;; Copyright © 2019 Alex Griffin <a@ajgrf.com> ;;; Copyright © 2019 Guillaume Le Vaillant <glv@posteo.net> diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index f9eb350ff4..fa6575173f 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -2116,6 +2116,32 @@ JSON APIs with Behave.") (define-public python2-rednose (package-with-python2 python-rednose)) +(define-public python-nose-random + (package + (name "python-nose-random") + (version "1.0.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/fzumstein/nose-random") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1dvip61r2frjv35mv6mmfjc07402z73pjbndfp3mhxyjn2zhksw2")))) + (build-system python-build-system) + (native-inputs + `(("python-nose" ,python-nose))) + (home-page "https://github.com/fzumstein/nose-random") + (synopsis "Nose plugin to facilitate randomized unit testing with +Python") + (description "Python nose-random is designed to facilitate +Monte-Carlo style unit testing. The idea is to improve testing by +running your code against a large number of randomly generated input +scenarios.") + (license license:expat))) + (define-public python-nose-randomly (package (name "python-nose-randomly") diff --git a/gnu/packages/chicken.scm b/gnu/packages/chicken.scm new file mode 100644 index 0000000000..2034ca942a --- /dev/null +++ b/gnu/packages/chicken.scm @@ -0,0 +1,68 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2020 Ekaitz Zarraga <ekaitz@elenq.tech> +;;; +;;; 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 <http://www.gnu.org/licenses/>. + +(define-module (gnu packages chicken) + #:use-module (gnu packages) + #:use-module (guix packages) + #:use-module (guix build-system gnu) + #:use-module (guix download) + #:use-module (gnu packages commencement) + #:use-module ((guix licenses) + #:select (bsd-3))) + +(define-public chicken + (package + (name "chicken") + (version "5.1.0") + (source (origin + (method url-fetch) + (uri (string-append "https://code.call-cc.org/releases/" + version "/chicken-" version ".tar.gz")) + (sha256 + (base32 + "0jsbp3kp0134f318j3wpd1n85gf8qzh034fn198gvazsv2l024aw")))) + (build-system gnu-build-system) + (arguments + `(#:modules ((guix build gnu-build-system) + (guix build utils) + (srfi srfi-1)) + + ;; No `configure' script; run "make check" after "make install" as + ;; prescribed by README. + #:phases + (modify-phases %standard-phases + (delete 'configure) + (delete 'check) + (add-after 'install 'check + (assoc-ref %standard-phases 'check))) + + #:make-flags (let ((out (assoc-ref %outputs "out"))) + (list "PLATFORM=linux" + (string-append "PREFIX=" out) + (string-append "VARDIR=" out "/var/lib"))) + + ;; Parallel builds are not supported, as noted in README. + #:parallel-build? #f)) + (propagated-inputs `(("gcc-toolchain", gcc-toolchain))) + (home-page "http://www.call-cc.org/") + (synopsis "R5RS Scheme implementation that compiles native code via C") + (description + "CHICKEN is a compiler for the Scheme programming language. CHICKEN +produces portable and efficient C, supports almost all of the R5RS Scheme +language standard, and includes many enhancements and extensions.") + (license bsd-3))) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index bc39122c1d..77ca168369 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2019 Giacomo Leidi <goodoldpaul@autistici.org> ;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2019, 2020 John Soo <jsoo1@asu.edu> +;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -26,6 +27,7 @@ #:use-module (guix download) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) + #:use-module (gnu packages) #:use-module (gnu packages compression) #:use-module (gnu packages jemalloc) #:use-module (gnu packages pcre) @@ -136,7 +138,7 @@ Rust, using gimli.") (define-public rust-aho-corasick-0.7 (package (name "rust-aho-corasick") - (version "0.7.6") + (version "0.7.8") (source (origin (method url-fetch) @@ -145,11 +147,10 @@ Rust, using gimli.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0b8dh20fhdc59dhhnfi89n2bi80a8zbagzd5c122hf1vv2amxysq")))) + "048q5vr1qac4lf90z80lw8kcya6qmlxw857xhwxsssk832jdafkl")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs (("rust-memchr" ,rust-memchr-2.2)) + `(#:cargo-inputs (("rust-memchr" ,rust-memchr-2.2)) #:cargo-development-inputs (("rust-doc-comment" ,rust-doc-comment-0.3)))) (home-page "https://github.com/BurntSushi/aho-corasick") @@ -185,10 +186,29 @@ Rust, using gimli.") ("rust-serde" ,rust-serde-1.0) ("rust-serde-derive" ,rust-serde-derive-1.0)))))) -(define-public rust-ansi-term-0.11 +(define-public rust-android-glue-0.2 + (package + (name "rust-android-glue") + (version "0.2.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "android-glue" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "01y495x4i9vqkwmklwn2xk7sqg666az2axjcpkr4iwngdwi48100")))) + (build-system cargo-build-system) + (home-page "https://github.com/tomaka/android-rs-glue") + (synopsis "Glue for the Android JNI") + (description "This package provides the glue for the Android JNI.") + (license license:expat))) + +(define-public rust-ansi-term-0.12 (package (name "rust-ansi-term") - (version "0.11.0") + (version "0.12.1") (source (origin (method url-fetch) @@ -196,12 +216,16 @@ Rust, using gimli.") (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "16wpvrghvd0353584i1idnsgm0r3vchg8fyrm0x8ayv1rgvbljgf")))) + "1ljmkbilxgmhavxvxqa7qvm6f3fjggi7q2l3a72q9x0cxjvrnanm")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-winapi" ,rust-winapi-0.3)))) + `(#:cargo-inputs + (("rust-serde" ,rust-serde-1.0) + ("rust-winapi" ,rust-winapi-0.3)) + #:cargo-development-inputs + (("rust-doc-comment" ,rust-doc-comment-0.3) + ("rust-regex" ,rust-regex-1.3) + ("rust-serde-json" ,rust-serde-json-1.0)))) (home-page "https://github.com/ogham/rust-ansi-term") (synopsis "Library for ANSI terminal colours and styles") (description @@ -209,6 +233,24 @@ Rust, using gimli.") text or blue underlined text, on ANSI terminals.") (license license:expat))) +(define-public rust-ansi-term-0.11 + (package + (inherit rust-ansi-term-0.12) + (name "rust-ansi-term") + (version "0.11.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "ansi_term" version)) + (file-name (string-append name "-" version ".crate")) + (sha256 + (base32 + "16wpvrghvd0353584i1idnsgm0r3vchg8fyrm0x8ayv1rgvbljgf")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-winapi" ,rust-winapi-0.3)))))) + (define-public rust-antidote-1.0 (package (name "rust-antidote") @@ -257,6 +299,22 @@ text or blue underlined text, on ANSI terminals.") "Approximate floating point equality comparisons and assertions.") (license license:asl2.0))) +(define-public rust-approx-0.1 + (package + (inherit rust-approx-0.3) + (name "rust-approx") + (version "0.1.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "approx" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "153awzwywmb61xg857b80l63b1x6hifx2pha7lxf6fck9qxwraq8")))) + (arguments '()))) + (define-public rust-arc-swap-0.3 (package (name "rust-arc-swap") @@ -277,7 +335,7 @@ text or blue underlined text, on ANSI terminals.") (("rust-crossbeam" ,rust-crossbeam-0.7) ("rust-crossbeam-utils" ,rust-crossbeam-utils-0.6) ("rust-itertools" ,rust-itertools-0.8) - ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-lazy-static" ,rust-lazy-static-1) ("rust-model" ,rust-model-0.1) ("rust-num-cpus" ,rust-num-cpus-1.10) ("rust-parking-lot" ,rust-parking-lot-0.8) @@ -420,6 +478,26 @@ ArrayVec and ArrayString.") "ASCII-only equivalents to @code{char}, @code{str} and @code{String}.") (license (list license:expat license:asl2.0)))) +(define-public rust-assert-matches-1.3 + (package + (name "rust-assert-matches") + (version "1.3.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "assert_matches" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1rar61v00gz2aniid0mylxcr4q98s6l77c3hvbszmg57kj10msvx")))) + (build-system cargo-build-system) + (home-page "https://github.com/murarth/assert_matches") + (synopsis "Asserts that a value matches a pattern") + (description + "This package asserts that a value matches a pattern in Rust.") + (license (list license:expat license:asl2.0)))) + (define-public rust-atty-0.2 (package (name "rust-atty") @@ -480,6 +558,40 @@ ArrayVec and ArrayString.") "1chwgimpx5z7xbag7krr9d8asxfqbh683qhgl9kn3hxk2l0djj8x")))) (arguments '(#:skip-build? #t)))) +(define-public rust-average-0.9 + (package + (name "rust-average") + (version "0.9.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "average" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1f8ya00bv6qki9m7b4lb3bn845rj473mx02qpm7wgy5qc1yp75xs")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-conv" ,rust-conv-0.3) + ("rust-float-ord" ,rust-float-ord-0.2) + ("rust-num-integer" ,rust-num-integer-0.1) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-serde" ,rust-serde-1.0) + ("rust-serde-big-array" ,rust-serde-big-array-0.1) + ("rust-serde-derive" ,rust-serde-derive-1.0)) + #:cargo-development-inputs + (("rust-bencher" ,rust-bencher-0.1) + ("rust-quantiles" ,rust-quantiles-0.7) + ("rust-rand" ,rust-rand-0.6) + ("rust-serde-json" ,rust-serde-json-1.0) + ("rust-streaming-stats" ,rust-streaming-stats-0.2)))) + (home-page "https://github.com/vks/average") + (synopsis "Calculate statistics iteratively") + (description "This crate provides for calculating statistics iteratively +in Rust.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-backtrace-0.3 (package (name "rust-backtrace") @@ -652,6 +764,28 @@ and no more (caveat: black_box is still missing!).") that uses Serde for transforming structs into bytes and vice versa!") (license license:expat))) +(define-public rust-bresenham-0.1 + (package + (name "rust-bresenham") + (version "0.1.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "bresenham" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1mvg3zcyll0m3z79jwbg183ha4kb7bw06rd286ijwvgn4mi13hdz")))) + (build-system cargo-build-system) + (home-page "https://github.com/mbr/bresenham-rs") + (synopsis + "Iterator-based integer-only implementation of Bresenham's line algorithm") + (description + "This package provides a fast, iterator-based integer-only implementation of +Bresenham's line algorithm.") + (license license:expat))) + (define-public rust-generator-0.6 (package (name "rust-generator") @@ -704,7 +838,7 @@ that uses Serde for transforming structs into bytes and vice versa!") ("rust-clap" ,rust-clap-2) ("rust-env-logger" ,rust-env-logger-0.6) ("rust-fxhash" ,rust-fxhash-0.2) - ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-lazy-static" ,rust-lazy-static-1) ("rust-log" ,rust-log-0.4) ("rust-peeking-take-while" ,rust-peeking-take-while-0.1) ("rust-proc-macro2" ,rust-proc-macro2-0.4) @@ -997,7 +1131,7 @@ BLAKE2bp hash functions.") (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-lazy-static" ,rust-lazy-static-1.3) + (("rust-lazy-static" ,rust-lazy-static-1) ("rust-memchr" ,rust-memchr-2.2) ("rust-regex-automata" ,rust-regex-automata-0.1) ("rust-serde" ,rust-serde-1.0)) @@ -1154,7 +1288,7 @@ little-endian.") `(#:skip-build? #t #:cargo-inputs (("rust-byteorder" ,rust-byteorder-1.3) - ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-lazy-static" ,rust-lazy-static-1) ("rust-ppv-lite86" ,rust-ppv-lite86-0.2) ("rust-stream-cipher" ,rust-stream-cipher-0.3)) #:cargo-development-inputs @@ -1463,19 +1597,19 @@ depending on a large number of #[cfg] parameters. Structured like an "1nf6ld3bims1n5vfzhkvcb55pdzh04bbhzf8nil5vvw05nxzarsh")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-ansi-term" ,rust-ansi-term-0.11) ("rust-atty" ,rust-atty-0.2) ("rust-bitflags" ,rust-bitflags-1) ("rust-clippy" ,rust-clippy-0.0) ("rust-strsim" ,rust-strsim-0.8) + ("rust-term-size" ,rust-term-size-0.3) ("rust-textwrap" ,rust-textwrap-0.11) ("rust-unicode-width" ,rust-unicode-width-0.1) ("rust-vec-map" ,rust-vec-map-0.8) - ("rust-yaml-rust" ,rust-yaml-rust-0.4)) + ("rust-yaml-rust" ,rust-yaml-rust-0.3)) #:cargo-development-inputs - (("rust-lazy-static" ,rust-lazy-static-1.3) + (("rust-lazy-static" ,rust-lazy-static-1) ("rust-regex" ,rust-regex-1.1) ("rust-version-sync" ,rust-version-sync-0.8)))) (home-page "https://clap.rs/") @@ -1502,7 +1636,7 @@ Command Line Argument Parser.") `(#:skip-build? #t #:cargo-inputs (("rust-atty" ,rust-atty-0.2) - ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-lazy-static" ,rust-lazy-static-1) ("rust-libc" ,rust-libc-0.2) ("rust-winapi" ,rust-winapi-0.3)))) (home-page "https://github.com/mitsuhiko/clicolors-control") @@ -1616,6 +1750,26 @@ need compiler-rt intrinsics.") (license (list license:asl2.0 license:expat)))) +(define-public rust-compiler-error-0.1 + (package + (name "rust-compiler-error") + (version "0.1.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "compiler_error" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0irh7c0gznk2k6mj3cmqw7x4pg59lppmy1y8d6k5xc926rnmz5zg")))) + (build-system cargo-build-system) + (arguments '(#:skip-build? #t)) + (home-page "https://github.com/lu-zero/compiler_error") + (synopsis "Triggerable compiler error") + (description "This package provides a triggerable compiler error for Rust.") + (license license:expat))) + (define-public rust-compiletest-rs-0.3 (package (name "rust-compiletest-rs") @@ -1674,7 +1828,7 @@ harness.") (("rust-atty" ,rust-atty-0.2) ("rust-clicolors-control" ,rust-clicolors-control-1.0) ("rust-encode-unicode" ,rust-encode-unicode-0.3) - ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-lazy-static" ,rust-lazy-static-1) ("rust-libc" ,rust-libc-0.2) ("rust-parking-lot" ,rust-parking-lot-0.8) ("rust-regex" ,rust-regex-1.1) @@ -1735,6 +1889,34 @@ that logs panics to @code{console.error}.") It is inspired by the Linux kernel's @code{crypto_memneq}.") (license license:cc0))) +(define-public rust-conv-0.3 + (package + (name "rust-conv") + (version "0.3.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "conv" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "168j1npqrif1yqxbgbk0pdrx9shzhs5ylc5a4xw49b6hbxi11zvq")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t ; Package needs 'unicode' crate. + #:cargo-inputs + (("rust-custom-derive" ,rust-custom-derive-0.1)) + #:cargo-development-inputs + (("rust-quickcheck" ,rust-quickcheck-0.2) + ("rust-winapi" ,rust-winapi-0.2)))) + (home-page "https://github.com/DanielKeep/rust-conv") + (synopsis "Conversion traits with more specific semantics") + (description + "This crate provides a number of conversion traits with more specific +semantics than those provided by @code{as} or @code{From}/@code{Into}.") + (license license:expat))) + (define-public rust-core-arch-0.1 (package (name "rust-core-arch") @@ -1867,7 +2049,7 @@ intrinsics.") ("rust-criterion-plot" ,rust-criterion-plot-0.3) ("rust-csv" ,rust-csv-1.1) ("rust-itertools" ,rust-itertools-0.8) - ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-lazy-static" ,rust-lazy-static-1) ("rust-libc" ,rust-libc-0.2) ("rust-num-traits" ,rust-num-traits-0.2) ("rust-rand-core" ,rust-rand-core-0.5) @@ -2045,7 +2227,13 @@ intrinsics.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "04rcpgjs6ns57vag8a3dzx26190dhbvy2l0p9n22b9p1yf64pr05")))))) + "04rcpgjs6ns57vag8a3dzx26190dhbvy2l0p9n22b9p1yf64pr05")))) + (arguments + `(#:cargo-inputs + (("rust-crossbeam-epoch" ,rust-crossbeam-epoch-0.7) + ("rust-crossbeam-utils" ,rust-crossbeam-utils-0.6)) + #:cargo-development-inputs + (("rust-rand" ,rust-rand-0.6)))))) (define-public rust-crossbeam-epoch-0.8 (package @@ -2067,7 +2255,7 @@ intrinsics.") (("rust-autocfg" ,rust-autocfg-0.1) ("rust-cfg-if" ,rust-cfg-if-0.1) ("rust-crossbeam-utils" ,rust-crossbeam-utils-0.7) - ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-lazy-static" ,rust-lazy-static-1) ("rust-memoffset" ,rust-memoffset-0.5) ("rust-scopeguard" ,rust-scopeguard-1.0)) #:cargo-development-inputs @@ -2098,7 +2286,7 @@ intrinsics.") (("rust-arrayvec" ,rust-arrayvec-0.4) ("rust-cfg-if" ,rust-cfg-if-0.1) ("rust-crossbeam-utils" ,rust-crossbeam-utils-0.6) - ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-lazy-static" ,rust-lazy-static-1) ("rust-memoffset" ,rust-memoffset-0.2) ("rust-scopeguard" ,rust-scopeguard-0.3)) #:cargo-development-inputs @@ -2174,7 +2362,7 @@ intrinsics.") #:cargo-inputs (("rust-autocfg" ,rust-autocfg-0.1) ("rust-cfg-if" ,rust-cfg-if-0.1) - ("rust-lazy-static" ,rust-lazy-static-1.3)) + ("rust-lazy-static" ,rust-lazy-static-1)) #:cargo-development-inputs (("rust-rand" ,rust-rand-0.6)))) (home-page @@ -2202,7 +2390,7 @@ intrinsics.") `(#:skip-build? #t #:cargo-inputs (("rust-cfg-if" ,rust-cfg-if-0.1) - ("rust-lazy-static" ,rust-lazy-static-1.3)) + ("rust-lazy-static" ,rust-lazy-static-1)) #:cargo-development-inputs (("rust-rand" ,rust-rand-0.4)))))) @@ -2263,6 +2451,32 @@ intrinsics.") "Bare bones CSV parsing with no_std support.") (license (list license:unlicense license:expat)))) +(define-public rust-ctrlc-3.1 + (package + (name "rust-ctrlc") + (version "3.1.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "ctrlc" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0zz8ad4bk28s111af5vy1c5kii4zw0cgh87ivzgj28f8nkcd5py7")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-nix" ,rust-nix-0.14) + ("rust-winapi" ,rust-winapi-0.3)) + #:cargo-development-inputs + (("rust-winapi" ,rust-winapi-0.3)))) + (home-page "https://github.com/Detegr/rust-ctrlc") + (synopsis "Easy Ctrl-C handler for Rust projects") + (description + "This package provides an easy Ctrl-C handler for Rust projects.") + (license (list license:expat license:asl2.0)))) + (define-public rust-curl-sys-0.4 (package (name "rust-curl-sys") @@ -2298,6 +2512,31 @@ intrinsics.") (properties '((hidden? . #t))) (license license:expat))) +(define-public rust-custom-derive-0.1 + (package + (name "rust-custom-derive") + (version "0.1.7") + (source + (origin + (method url-fetch) + (uri (crate-uri "custom_derive" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1f81bavw1wnykwh21hh4yyzigs6zl6f6pkk9p3car8kq95yfb2pg")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-development-inputs + (("rust-rustc-serialize" ,rust-rustc-serialize-0.3)))) + (home-page + "https://github.com/DanielKeep/rust-custom-derive/tree/custom_derive-master") + (synopsis "Custom derivation macro for Rust") + (description + "This crate provides a macro that enables the use of custom @code{derive} +attributes.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-data-encoding-2.1 (package (name "rust-data-encoding") @@ -2319,6 +2558,40 @@ intrinsics.") hexadecimal, base32, and base64.") (license license:expat))) +(define-public rust-datetime-0.4 + (package + (name "rust-datetime") + (version "0.4.7") + (source + (origin + (method url-fetch) + (uri (crate-uri "datetime" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1fd74bq48xg8ki5yw1mr1pa5hd3j5lbk4iqc5r0kh3l62b0vci2w")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-iso8601" ,rust-iso8601-0.1) + ("rust-kernel32-sys" ,rust-kernel32-sys-0.2) + ("rust-libc" ,rust-libc-0.2) + ("rust-locale" ,rust-locale-0.2) + ("rust-num-traits" ,rust-num-traits-0.1) + ("rust-pad" ,rust-pad-0.1) + ("rust-redox-syscall" ,rust-redox-syscall-0.1) + ("rust-winapi" ,rust-winapi-0.2)) + #:cargo-development-inputs + (;("rust-regex" ,rust-regex-0.1) + ("rust-rustc-serialize" ,rust-rustc-serialize-0.3)))) + (home-page "https://github.com/rust-datetime/datetime") + (synopsis "Library for date and time formatting and arithmetic") + (description "This package provides a library for date and time formatting +and arithmetic.") + (license license:expat))) + (define-public rust-defmac-0.2 (package (name "rust-defmac") @@ -2644,7 +2917,7 @@ from macros.") (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-lazy-static" ,rust-lazy-static-1.3) + (("rust-lazy-static" ,rust-lazy-static-1) ("rust-regex" ,rust-regex-1.1) ("rust-serde" ,rust-serde-1.0) ("rust-strsim" ,rust-strsim-0.9)))) @@ -2764,7 +3037,7 @@ floating-point primitives to an @code{io::Write}.") (("rust-ascii" ,rust-ascii-0.9) ("rust-clippy" ,rust-clippy-0.0)) #:cargo-development-inputs - (("rust-lazy-static" ,rust-lazy-static-1.3)))) + (("rust-lazy-static" ,rust-lazy-static-1)))) (home-page "https://github.com/tormol/encode_unicode") (synopsis "UTF-8 and UTF-16 support for char, u8 and u16") @@ -3103,6 +3376,25 @@ is configured via an environment variable.") (("rust-log" ,rust-log-0.3) ("rust-regex" ,rust-regex-0.2)))))) +(define-public rust-env-logger-0.3 + (package + (inherit rust-env-logger-0.7) + (name "rust-env-logger") + (version "0.3.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "env_logger" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0bvcjgkw4s3k1rd7glpflgc8s9a393zjd6jfdgvs8gjvwj0dgaqm")))) + (arguments + `(#:skip-build? #t ; Cannot find dependent crates. + #:cargo-inputs + (;("rust-regex" ,rust-regex-0.1) + ("rust-log" ,rust-log-0.3)))))) + (define-public rust-envmnt-0.6 (package (name "rust-envmnt") @@ -3223,9 +3515,8 @@ is configured via an environment variable.") (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-backtrace" ,rust-backtrace-0.3)) - #:cargo-development-inputs - (("rust-version-check" ,rust-version-check-0.9)))) + (("rust-backtrace" ,rust-backtrace-0.3) + ("rust-version-check" ,rust-version-check-0.1)))) (home-page "https://github.com/rust-lang-nursery/error-chain") (synopsis "Yet another error boilerplate library") (description @@ -3378,7 +3669,7 @@ representation.") (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-lazy-static" ,rust-lazy-static-1.3) + (("rust-lazy-static" ,rust-lazy-static-1) ("rust-libc" ,rust-libc-0.2)))) (home-page "https://github.com/gimli-rs/findshlibs") (synopsis "Find the set of shared libraries loaded in the current process") @@ -3425,7 +3716,7 @@ cross platform API.") (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-lazy-static" ,rust-lazy-static-1.3) + (("rust-lazy-static" ,rust-lazy-static-1) ("rust-serde" ,rust-serde-1.0) ("rust-serde-derive" ,rust-serde-derive-1.0) ("rust-serde-json" ,rust-serde-json-1.0) @@ -3501,6 +3792,29 @@ Reader/Writer streams. Contains bindings for zlib, deflate, and gzip-based streams.") (license (list license:expat license:asl2.0)))) +(define-public rust-float-ord-0.2 + (package + (name "rust-float-ord") + (version "0.2.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "float-ord" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0kin50365sr3spnbscq43lksymybi99ai9rkqdw90m6vixhlibbv")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-development-inputs + (("rust-rand" ,rust-rand-0.3)))) + (home-page "https://github.com/notriddle/rust-float-ord") + (synopsis "Total ordering for floating-point numbers") + (description + "This package provides a total ordering for floating-point numbers.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-fnv-1.0 (package (name "rust-fnv") @@ -4090,7 +4404,7 @@ archive to be linked into Rustcode.") (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-lazy-static" ,rust-lazy-static-1.3) + (("rust-lazy-static" ,rust-lazy-static-1) ("rust-libc" ,rust-libc-0.2) ("rust-log" ,rust-log-0.4) ("rust-stdweb" ,rust-stdweb-0.4) @@ -4156,8 +4470,7 @@ DWARF debugging format.") "1i0fgsr91r97hsjbgqnymkcyiyg0057m7m04116k3vmyqpvrwlbp")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-1) ("rust-libc" ,rust-libc-0.2) ("rust-libgit2-sys" ,rust-libgit2-sys-0.10) @@ -4172,6 +4485,12 @@ DWARF debugging format.") ("rust-tempfile" ,rust-tempfile-3.1) ("rust-thread-id" ,rust-thread-id-3.3) ("rust-time" ,rust-time-0.1)))) + (native-inputs + `(("libgit2" ,libgit2) + ("libssh2" ,libssh2) + ("openssl" ,openssl) + ("pkg-config" ,pkg-config) + ("zlib" ,zlib))) (home-page "https://github.com/rust-lang/git2-rs") (synopsis "Rust bindings to libgit2") (description @@ -4195,8 +4514,7 @@ reading and writing git repositories.") (base32 "0cayf5w7wkvclvs8brbi7lyfxbdklwls9s49mpf2brl655yjwjwj")))) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-1) ("rust-libc" ,rust-libc-0.2) ("rust-libgit2-sys" ,rust-libgit2-sys-0.8) @@ -4364,7 +4682,7 @@ loading crate.") (("rust-atty" ,rust-atty-0.2) ("rust-bstr" ,rust-bstr-0.2) ("rust-globset" ,rust-globset-0.4) - ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-lazy-static" ,rust-lazy-static-1) ("rust-log" ,rust-log-0.4) ("rust-regex" ,rust-regex-1.1) ("rust-same-file" ,rust-same-file-1.0) @@ -4381,7 +4699,7 @@ loading crate.") (define-public rust-grep-matcher-0.1 (package (name "rust-grep-matcher") - (version "0.1.2") + (version "0.1.3") (source (origin (method url-fetch) @@ -4390,11 +4708,10 @@ loading crate.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "03j26zygfgwyam66bl5g922gimrvp4yyzl8qvaykyklnf247bl3r")))) + "113lafx3abrr96ahpz6yn905ian1w3qsr5hijbb909p2j0xgmhkm")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-memchr" ,rust-memchr-2.2)) #:cargo-development-inputs (("rust-regex" ,rust-regex-1.1)))) @@ -4470,7 +4787,7 @@ standard printing of search results, similar to grep itself.") (define-public rust-grep-regex-0.1 (package (name "rust-grep-regex") - (version "0.1.3") + (version "0.1.4") (source (origin (method url-fetch) @@ -4479,11 +4796,10 @@ standard printing of search results, similar to grep itself.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1lbb8837gzy25n706mnidaps4jl63ym679zraj8nfy5g02zbz549")))) + "090k1sbn4jq680dmgp1jyqs7f9dzn198k0806kc8f40jcjazd88n")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-aho-corasick" ,rust-aho-corasick-0.7) ("rust-grep-matcher" ,rust-grep-matcher-0.1) ("rust-log" ,rust-log-0.4) @@ -4615,7 +4931,7 @@ the template engine that renders the official Rust website") ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1.0) ("rust-serde" ,rust-serde-1.0)) #:cargo-development-inputs - (("rust-lazy-static" ,rust-lazy-static-1.3) + (("rust-lazy-static" ,rust-lazy-static-1) ("rust-rand" ,rust-rand-0.5) ("rust-rayon" ,rust-rayon-1.1) ("rust-rustc-hash" ,rust-rustc-hash-1.0) @@ -4717,6 +5033,33 @@ consistent, and reasonably well performing.") (license (list license:asl2.0 license:expat)))) +(define-public rust-hermit-abi-0.1 + (package + (name "rust-hermit-abi") + (version "0.1.6") + (source + (origin + (method url-fetch) + (uri (crate-uri "hermit-abi" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0wippj5nkw9q5yyyaqpdrgdhag3l3nbrwja7149cwn7ii1nnbwpg")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-compiler-builtins" ,rust-compiler-builtins-0.1) + ("rust-libc" ,rust-libc-0.2) + ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1.0)))) + (home-page "https://github.com/hermitcore/rusty-hermit") + (synopsis "Small interface to call functions from RustyHermit") + (description + "Hermit-abi is small interface to call functions from the unikernel RustyHermit. +It is used to build the target x86_64-unknown-hermit.") + (license (list license:expat license:asl2.0)))) + (define-public rust-hex-0.4 (package (name "rust-hex") @@ -5021,7 +5364,7 @@ SystemTime}}.") (define-public rust-ignore-0.4 (package (name "rust-ignore") - (version "0.4.7") + (version "0.4.11") (source (origin (method url-fetch) @@ -5030,23 +5373,19 @@ SystemTime}}.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "00mhksl41dnlsjqmka8c5a0m4spwm70ilm1qd9rngwq552hpzicd")))) + "07js5k91v870b2i5rl5shg37214yzwl0p6fjqy06y0v97gyawbaj")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-crossbeam-channel" ,rust-crossbeam-channel-0.3) + `(#:cargo-inputs + (("rust-crossbeam-channel" ,rust-crossbeam-channel-0.4) ("rust-globset" ,rust-globset-0.4) - ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-lazy-static" ,rust-lazy-static-1) ("rust-log" ,rust-log-0.4) ("rust-memchr" ,rust-memchr-2.2) ("rust-regex" ,rust-regex-1.1) ("rust-same-file" ,rust-same-file-1.0) - ("rust-thread-local" ,rust-thread-local-0.3) - ("rust-walkdir" ,rust-walkdir-2.2) - ("rust-winapi-util" ,rust-winapi-util-0.1)) - #:cargo-development-inputs - (("rust-tempfile" ,rust-tempfile-3.0)))) + ("rust-thread-local" ,rust-thread-local-1.0) + ("rust-walkdir" ,rust-walkdir-2.2)))) (home-page "https://github.com/BurntSushi/ripgrep/tree/master/ignore") (synopsis "Efficiently match ignore files such as .gitignore") (description @@ -5075,7 +5414,7 @@ ignore files such as .gitignore against file paths.") #:cargo-development-inputs (("rust-fnv" ,rust-fnv-1.0) ("rust-itertools" ,rust-itertools-0.8) - ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-lazy-static" ,rust-lazy-static-1) ("rust-quickcheck" ,rust-quickcheck-0.8) ("rust-rand" ,rust-rand-0.4) ("rust-serde-test" ,rust-serde-test-1.0)))) @@ -5118,7 +5457,7 @@ renamed to indexmap.") ("rust-console" ,rust-console-0.7) ("rust-difference" ,rust-difference-2.0) ("rust-failure" ,rust-failure-0.1) - ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-lazy-static" ,rust-lazy-static-1) ("rust-pest" ,rust-pest-2.1) ("rust-pest-derive" ,rust-pest-derive-2.1) ("rust-ron" ,rust-ron-0.4) @@ -5233,6 +5572,26 @@ immutable interval tree.") "Extra iterator adaptors, iterator methods, free functions, and macros.") (license (list license:expat license:asl2.0)))) +(define-public rust-itertools-0.7 + (package + (inherit rust-itertools-0.8) + (name "rust-itertools") + (version "0.7.11") + (source + (origin + (method url-fetch) + (uri (crate-uri "itertools" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "03cpsj26xmyamcalclqzr1i700vwx8hnbgxbpjvs354f8mnr8iqd")))) + (arguments + `(#:cargo-inputs + (("rust-either" ,rust-either-1.5)) + #:cargo-development-inputs + (("rust-permutohedron" ,rust-permutohedron-0.2) + ("rust-quickcheck" ,rust-quickcheck-0.5)))))) + (define-public rust-itertools-num-0.1 (package (name "rust-itertools-num") @@ -5276,7 +5635,6 @@ and functions.") (base32 "0zvg2d9qv3avhf3d8ggglh6fdyw8kkwqg3r4622ly5yhxnvnc4jh")))) (build-system cargo-build-system) - (arguments '(#:skip-build? #t)) (home-page "https://github.com/dtolnay/itoa") (synopsis "Fast functions for printing integer primitives") (description "This crate provides fast functions for printing integer @@ -5284,6 +5642,21 @@ primitives to an @code{io::Write}.") (license (list license:asl2.0 license:expat)))) +(define-public rust-itoa-0.3 + (package + (inherit rust-itoa-0.4) + (name "rust-itoa") + (version "0.3.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "itoa" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "136vwi6l2k1vrlvfx49lhficj813pk88xrcx1q3axqh1mwms6943")))))) + (define-public rust-itoa-0.1 (package (inherit rust-itoa-0.4) @@ -5313,8 +5686,7 @@ primitives to an @code{io::Write}.") "1q2w80v8p2pbfm8ayhjs6zi11a1hp4535z4ck8kg872z8ldnrc37")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-libc" ,rust-libc-0.2)) #:cargo-development-inputs (("rust-futures" ,rust-futures-0.1) @@ -5510,8 +5882,7 @@ language tags.") "0in6ikhw8mgl33wjv6q6xfrb5b9jr16q8ygjy803fay4zcisvaz2")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs (("rust-spin" ,rust-spin-0.5)) + `(#:cargo-inputs (("rust-spin" ,rust-spin-0.5)) #:cargo-development-inputs (("rust-doc-comment" ,rust-doc-comment-0.3)))) (home-page "https://github.com/rust-lang-nursery/lazy-static.rs") @@ -5525,6 +5896,8 @@ requires non-const function calls to be computed.") (license (list license:asl2.0 license:expat)))) +(define-public rust-lazy-static-1 rust-lazy-static-1.4) + (define-public rust-lazy-static-1.3 (package (inherit rust-lazy-static-1.4) @@ -5539,8 +5912,7 @@ requires non-const function calls to be computed.") (base32 "052ac27w189hrf1j3hz7sga46rp84zl2hqnzyihxv78mgzr2jmxw")))) (arguments - `(#:skip-build? #t - #:cargo-inputs (("rust-spin" ,rust-spin-0.5)))))) + `(#:cargo-inputs (("rust-spin" ,rust-spin-0.5)))))) (define-public rust-lazycell-1.2 (package @@ -5684,12 +6056,13 @@ values of all the exported APIs match the platform that libc is compiled for.") (origin (method url-fetch) (uri (crate-uri "libgit2-sys" version)) - (file-name (string-append name "-" version ".crate")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0y2mibmx7wy91s2kmb2gfb29mrqlqaxpy5wcwr8s1lwws7b9w5sc")))) - (arguments '()) - (properties '((hidden? . #t))))) + "0y2mibmx7wy91s2kmb2gfb29mrqlqaxpy5wcwr8s1lwws7b9w5sc")) + (modules '((guix build utils))) + (snippet + '(begin (delete-file-recursively "libgit2") #t)))))) (define-public rust-libgit2-sys-0.7 (package @@ -5792,8 +6165,7 @@ functions and static variables these libraries contain.") '(begin (delete-file-recursively "libssh2") #t)))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t ; it wants rust-openssl-src - #:cargo-inputs + `(#:cargo-inputs (("rust-libc" ,rust-libc-0.2) ("rust-libz-sys" ,rust-libz-sys-1.0) ("rust-openssl-sys" ,rust-openssl-sys-0.9) @@ -6026,6 +6398,26 @@ implementation of LZMA and xz stream encoding/decoding.") "This package provides a collection of great and ubiqutitous macros.") (license (list license:asl2.0 license:expat)))) +(define-public rust-make-cmd-0.1 + (package + (name "rust-make-cmd") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "make-cmd" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1ly0lc5p1a0qdiqnh19ly3snb9q83sjbbb1njvh8a5xgx3xqmjm8")))) + (build-system cargo-build-system) + (home-page "https://github.com/mneumann/make-cmd-rs") + (synopsis "Enable build.rs scripts to invoke gnu_make") + (description "This package enables build.rs scripts to invoke gnu_make +platform-independently.") + (license license:expat))) + (define-public rust-maplit-1.0 (package (name "rust-maplit") @@ -6388,6 +6780,26 @@ drop-in replacement for miniz.") (license (list license:asl2.0 license:expat)))) +(define-public rust-mint-0.5 + (package + (name "rust-mint") + (version "0.5.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "mint" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0c4190gr348fkfijij7vm19iagwl36mssj1irc9f6m448hbhgn68")))) + (build-system cargo-build-system) + (home-page "https://github.com/kvark/mint") + (synopsis "Math interoperability standard types") + (description + "This package provides math interoperability standard types.") + (license license:expat))) + (define-public rust-mio-0.6 (package (name "rust-mio") @@ -6577,7 +6989,26 @@ checking.") "Chaining APIs for both self -> Self and &mut self methods.") (description "Chaining APIs for both self -> Self and &mut self methods.") - (properties '((hidden? . #t))) + (license license:expat))) + +(define-public rust-natord-1.0 + (package + (name "rust-natord") + (version "1.0.9") + (source + (origin + (method url-fetch) + (uri (crate-uri "natord" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0z75spwag3ch20841pvfwhh3892i2z2sli4pzp1jgizbipdrd39h")))) + (build-system cargo-build-system) + (home-page "https://github.com/lifthrasiir/rust-natord") + (synopsis "Natural ordering for Rust") + (description + "This package provides a crate to perform natural ordering for Rust.") (license license:expat))) (define-public rust-net2-0.2 @@ -6719,6 +7150,50 @@ pairs in insertion order.") (license (list license:asl2.0 license:expat)))) +(define-public rust-linked-hash-map-0.3 + (package + (inherit rust-linked-hash-map-0.5) + (name "rust-linked-hash-map") + (version "0.3.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "linked-hash-map" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1kaf95grvfqchxn8pl0854g8ab0fzl56217hndhhhz5qqm2j09kd")))) + (arguments + `(#:cargo-inputs + (("rust-clippy" ,rust-clippy-0.0) + ("rust-serde" ,rust-serde-0.8) + ("rust-serde-test" ,rust-serde-test-0.8)))))) + +(define-public rust-lscolors-0.6 + (package + (name "rust-lscolors") + (version "0.6.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "lscolors" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0jxsgkn378kxkiqdshdjdclw5wwp2xaz45cqd3yw85fhn8a38fza")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-ansi-term" ,rust-ansi-term-0.12)) + #:cargo-development-inputs + (("rust-tempfile" ,rust-tempfile-3.1)))) + (home-page "https://github.com/sharkdp/lscolors") + (synopsis "Colorize paths using the LS_COLORS environment variable") + (description + "Colorize paths using the LS_COLORS environment variable.") + (license (list license:expat license:asl2.0)))) + (define-public rust-new-debug-unreachable-1.0 (package (name "rust-new-debug-unreachable") @@ -6768,7 +7243,7 @@ release (fork of debug_unreachable)") (("rust-bytes" ,rust-bytes-0.4) ("rust-caps" ,rust-caps-0.3) ("rust-cc" ,rust-cc-1.0) - ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-lazy-static" ,rust-lazy-static-1) ("rust-rand" ,rust-rand-0.4) ("rust-sysctl" ,rust-sysctl-0.4) ("rust-tempfile" ,rust-tempfile-3.0)))) @@ -6806,10 +7281,40 @@ release (fork of debug_unreachable)") prove a function can't ever panic.") (license (list license:expat license:asl2.0)))) +(define-public rust-nix-0.14 + (package + (inherit rust-nix-0.15) + (name "rust-nix") + (version "0.14.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "nix" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1kmxdlmvnmq8cfpmr3g6wk37rwi2ybdvp1z6z3831m1p23p2nwkc")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-cc" ,rust-cc-1.0) + ("rust-cfg-if" ,rust-cfg-if-0.1) + ("rust-libc" ,rust-libc-0.2) + ("rust-void" ,rust-void-1.0)) + #:cargo-development-inputs + (("rust-bytes" ,rust-bytes-0.4) + ("rust-caps" ,rust-caps-0.3) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-rand" ,rust-rand-0.6) + ("rust-sysctl" ,rust-sysctl-0.1) + ("rust-tempfile" ,rust-tempfile-3.0)))))) + (define-public rust-nodrop-0.1 (package (name "rust-nodrop") - (version "0.1.13") + (version "0.1.14") (source (origin (method url-fetch) @@ -6817,13 +7322,15 @@ prove a function can't ever panic.") (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "0if9ifn6rvar5jirx4b3qh4sl5kjkmcifycvzhxa9j3crkfng5ig")))) + "1fz1v9r8ijacf0hlq0pdv5l9mz8vgqg1snmhvpjmi9aci1b4mvvj")))) (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-nodrop-union" ,rust-nodrop-union-0.1)))) (home-page "https://github.com/bluss/arrayvec") (synopsis "Wrapper type to inhibit drop (destructor)") (description "This package provides a wrapper type to inhibit drop (destructor). Use @code{std::mem::ManuallyDrop} instead!") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) @@ -6868,7 +7375,7 @@ implementation (which is unstable / requires nightly).") (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-lazy-static" ,rust-lazy-static-1.3) + (("rust-lazy-static" ,rust-lazy-static-1) ("rust-lexical-core" ,rust-lexical-core-0.4) ("rust-memchr" ,rust-memchr-2.2) ("rust-regex" ,rust-regex-1.1)) @@ -6933,25 +7440,26 @@ combinators library.") "Complex numbers implementation for Rust.") (license (list license:expat license:asl2.0)))) -(define-public rust-num-cpus-1.10 +(define-public rust-num-cpus-1.11 (package (name "rust-num-cpus") - (version "1.10.1") + (version "1.11.1") (source (origin (method url-fetch) (uri (crate-uri "num_cpus" version)) - (file-name (string-append name "-" version ".crate")) + (file-name + (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0wrj3zvj6h3q26sqj9zxpd59frjb54n7jhjwf307clq31ic47vxw")))) + "0wlxs00cpg16z09fwchj1gdz1jxnf5dgg1cbidvq0sc75bnwbnkn")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-libc" ,rust-libc-0.2)) - #:cargo-development-inputs - (("rust-doc-comment" ,rust-doc-comment-0.3)))) + `(#:cargo-inputs + (("rust-hermit-abi" ,rust-hermit-abi-0.1) + ("rust-libc" ,rust-libc-0.2)) + #:cargo-development-inputs + (("rust-doc-comment" ,rust-doc-comment-0.3)))) (home-page "https://github.com/seanmonstar/num_cpus") (synopsis "Get the number of CPUs on a machine") (description @@ -6959,10 +7467,29 @@ combinators library.") (license (list license:asl2.0 license:expat)))) +(define-public rust-num-cpus-1.10 + (package + (inherit rust-num-cpus-1.11) + (name "rust-num-cpus") + (version "1.10.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "num_cpus" version)) + (file-name (string-append name "-" version ".crate")) + (sha256 + (base32 + "0wrj3zvj6h3q26sqj9zxpd59frjb54n7jhjwf307clq31ic47vxw")))) + (arguments + `(#:cargo-inputs + (("rust-libc" ,rust-libc-0.2)) + #:cargo-development-inputs + (("rust-doc-comment" ,rust-doc-comment-0.3)))))) + (define-public rust-num-integer-0.1 (package (name "rust-num-integer") - (version "0.1.41") + (version "0.1.42") (source (origin (method url-fetch) @@ -6971,12 +7498,15 @@ combinators library.") (string-append name "-" version ".crate")) (sha256 (base32 - "02dwjjpfbi16c71fq689s4sw3ih52cvfzr5z5gs6qpr5z0g58pmq")))) + "1fpw8yr9xwsf3qrh91rm7mzqaiwlc2dmnalsxv9pr9w1klpacviz")))) (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-num-traits" ,rust-num-traits-0.2) + ("rust-autocfg" ,rust-autocfg-1.0)))) (home-page "https://github.com/rust-num/num-integer") (synopsis "Integer traits and functions") (description "Integer traits and functions.") - (properties '((hidden? . #t))) ;; Dual licensed. (license (list license:asl2.0 license:expat)))) @@ -7043,6 +7573,27 @@ combinators library.") `(#:cargo-inputs (("rust-num-traits" , rust-num-traits-0.2)))))) +(define-public rust-number-prefix-0.3 + (package + (name "rust-number-prefix") + (version "0.3.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "number_prefix" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0slm4mqmpgs6hvz22ycny9lvyvl9ivs80a1lncslp7lszz02zc0p")))) + (build-system cargo-build-system) + (home-page "https://github.com/ogham/rust-number-prefix") + (synopsis "Format numeric prefixes: kilo, giga, kibi") + (description + "This package provides a library for formatting numeric prefixes: kilo, +giga, kibi.") + (license license:expat))) + (define-public rust-numtoa-0.1 (package (name "rust-numtoa") @@ -7116,7 +7667,7 @@ formats.") ("rust-unchecked-index" ,rust-unchecked-index-0.2)) #:cargo-development-inputs (("rust-itertools" ,rust-itertools-0.8) - ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-lazy-static" ,rust-lazy-static-1) ("rust-memchr" ,rust-memchr-2.2) ("rust-quickcheck" ,rust-quickcheck-0.8)))) (home-page "https://github.com/bluss/odds") @@ -7147,7 +7698,7 @@ Things in odds may move to more appropriate crates if we find them.") (("rust-parking-lot" ,rust-parking-lot-0.9)) #:cargo-development-inputs (("rust-crossbeam-utils" ,rust-crossbeam-utils-0.6) - ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-lazy-static" ,rust-lazy-static-1) ("rust-regex" ,rust-regex-1.1)))) (home-page "https://github.com/matklad/once_cell") (synopsis "Single assignment cells and lazy values") @@ -7196,7 +7747,7 @@ Things in odds may move to more appropriate crates if we find them.") (("rust-bitflags" ,rust-bitflags-1) ("rust-cfg-if" ,rust-cfg-if-0.1) ("rust-foreign-types" ,rust-foreign-types-0.3) - ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-lazy-static" ,rust-lazy-static-1) ("rust-libc" ,rust-libc-0.2) ("rust-openssl-sys" ,rust-openssl-sys-0.9)) #:cargo-development-inputs @@ -7229,27 +7780,6 @@ system for OpenSSL.") (license (list license:asl2.0 license:expat)))) -(define-public rust-openssl-src-111 - (package - (name "rust-openssl-src") - (version "111.6.0+1.1.1d") - (source - (origin - (method url-fetch) - (uri (crate-uri "openssl-src" version)) - (file-name (string-append name "-" version ".crate")) - (sha256 - (base32 - "172xh95hp7aygahah1940kg1dnx60c5m80cwj5hgi8x7x0fxmhmr")))) - (build-system cargo-build-system) - (home-page "https://github.com/alexcrichton/openssl-src-rs") - (synopsis "Source of OpenSSL for rust crates") - (description - "This package contains the source of OpenSSL and logic to build it.") - (properties '((hidden? . #t))) - (license (list license:asl2.0 - license:expat)))) - (define-public rust-openssl-sys-0.9 (package (name "rust-openssl-sys") @@ -7258,19 +7788,18 @@ system for OpenSSL.") (origin (method url-fetch) (uri (crate-uri "openssl-sys" version)) - (file-name (string-append name "-" version ".crate")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0vvk8vzrc73y8n5rf4yj3x8ygyxjaz7wxrbxiwqi7qy0gyp1cpa6")))) + (base32 "0vvk8vzrc73y8n5rf4yj3x8ygyxjaz7wxrbxiwqi7qy0gyp1cpa6")) + (patches (search-patches "rust-openssl-sys-no-vendor.patch")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t ; it wants rust-openssl-src - #:cargo-inputs + `(#:cargo-inputs (("rust-libc" ,rust-libc-0.2) ;; Build dependencies: ("rust-autocfg" ,rust-autocfg-0.1) ("rust-cc" ,rust-cc-1.0) ("rust-pkg-config" ,rust-pkg-config-0.3) - ;("rust-openssl-src" ,rust-openssl-src-111) ("rust-vcpkg" ,rust-vcpkg-0.2)) #:phases (modify-phases %standard-phases @@ -7309,7 +7838,7 @@ system for OpenSSL.") #:cargo-development-inputs (("rust-fnv" ,rust-fnv-1.0) ("rust-itertools" ,rust-itertools-0.8) - ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-lazy-static" ,rust-lazy-static-1) ("rust-quickcheck" ,rust-quickcheck-0.8) ("rust-rand" ,rust-rand-0.4) ("rust-serde-test" ,rust-serde-test-1.0)))) @@ -7444,7 +7973,7 @@ normally prevent moving a type that has been borrowed from.") ("rust-parking-lot-core" ,rust-parking-lot-core-0.6)) #:cargo-development-inputs (("rust-bincode" ,rust-bincode-1.1) - ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-lazy-static" ,rust-lazy-static-1) ("rust-rand" ,rust-rand-0.4) ("rust-rustc-version" ,rust-rustc-version-0.2)))) (home-page "https://github.com/Amanieu/parking_lot") @@ -7475,7 +8004,7 @@ synchronization primitives.") ("rust-parking-lot-core" ,rust-parking-lot-core-0.5)) #:cargo-development-inputs (("rust-bincode" ,rust-bincode-1.1) - ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-lazy-static" ,rust-lazy-static-1) ("rust-rand" ,rust-rand-0.4) ("rust-rustc-version" ,rust-rustc-version-0.2)))))) @@ -7500,7 +8029,7 @@ synchronization primitives.") ("rust-parking-lot-core" ,rust-parking-lot-core-0.4)) #:cargo-development-inputs (("rust-bincode" ,rust-bincode-1.1) - ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-lazy-static" ,rust-lazy-static-1) ("rust-rand" ,rust-rand-0.4) ("rust-rustc-version" ,rust-rustc-version-0.2)))))) @@ -8315,8 +8844,7 @@ in terms of the upstream unstable API.") (base32 "0nd71fl24sys066jrha6j7i34nfkjv44yzw8yww9742wmc8j0gfg")))) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-unicode-xid" ,rust-unicode-xid-0.1)) #:cargo-development-inputs (("rust-quote" ,rust-quote-0.6)))))) @@ -8341,7 +8869,7 @@ in terms of the upstream unstable API.") (("rust-bit-set" ,rust-bit-set-0.5) ("rust-bitflags" ,rust-bitflags-1) ("rust-byteorder" ,rust-byteorder-1.3) - ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-lazy-static" ,rust-lazy-static-1) ("rust-num-traits" ,rust-num-traits-0.2) ("rust-quick-error" ,rust-quick-error-1.2) ("rust-rand" ,rust-rand-0.4) @@ -8384,7 +8912,7 @@ in terms of the upstream unstable API.") #:cargo-development-inputs (("rust-criterion" ,rust-criterion-0.2) ("rust-html5ever" ,rust-html5ever-0.23) - ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-lazy-static" ,rust-lazy-static-1) ("rust-regex" ,rust-regex-1.1) ("rust-tendril" ,rust-tendril-0.4)))) (home-page "https://github.com/raphlinus/pulldown-cmark") @@ -8393,6 +8921,32 @@ in terms of the upstream unstable API.") "This package provides a pull parser for CommonMark.") (license license:expat))) +(define-public rust-quantiles-0.7 + (package + (name "rust-quantiles") + (version "0.7.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "quantiles" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1wjp16a3d4bmldq9w2wds0q4gjz4mnsqac3g38r6ryr6zc9sh3y1")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-serde" ,rust-serde-1.0) + ("rust-serde-derive" ,rust-serde-derive-1.0)) + #:cargo-development-inputs + (("rust-quickcheck" ,rust-quickcheck-0.5)))) + (home-page "https://github.com/postmates/quantiles") + (synopsis "Collection of approximate quantile algorithms") + (description + "This package provides a collection of approximate quantile algorithms.") + (license license:expat))) + (define-public rust-quick-error-1.2 (package (name "rust-quick-error") @@ -8508,6 +9062,26 @@ to write.") ("rust-log" ,rust-log-0.3) ("rust-rand" ,rust-rand-0.3)))))) +(define-public rust-quickcheck-0.2 + (package + (inherit rust-quickcheck-0.8) + (name "rust-quickcheck") + (version "0.2.27") + (source + (origin + (method url-fetch) + (uri (crate-uri "quickcheck" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1vb4acppaavlnchzc1jmn5wlkgir9x9gmhgp97bavyxxqxgsg1nh")))) + (arguments + `(#:cargo-inputs + (("rust-env-logger" ,rust-env-logger-0.3) + ("rust-log" ,rust-log-0.3) + ("rust-rand" ,rust-rand-0.3)) + #:skip-build? #t)))) ; Package needs 'unicode' crate. + (define-public rust-quote-1.0 (package (name "rust-quote") @@ -8531,7 +9105,7 @@ to write.") (package (inherit rust-quote-1.0) (name "rust-quote") - (version "0.6.12") + (version "0.6.13") (source (origin (method url-fetch) @@ -8539,7 +9113,26 @@ to write.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1nw0klza45hf127kfyrpxsxd5jw2l6h21qxalil3hkr7bnf7kx7s")))))) + "1qgqq48jymp5h4y082aanf25hrw6bpb678xh3zw993qfhxmkpqkc")))) + (arguments + `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-0.4)))) + (properties '()))) + +(define-public rust-quote-0.3 + (package + (inherit rust-quote-0.6) + (name "rust-quote") + (version "0.3.15") + (source + (origin + (method url-fetch) + (uri (crate-uri "quote" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0yhnnix4dzsv8y4wwz4csbnqjfh73al33j35msr10py6cl5r4vks")))) + (arguments '()))) (define-public rust-rand-0.7 (package @@ -8590,8 +9183,7 @@ useful types and distributions, and some randomness-related algorithms.") (base32 "1jl4449jcl4wgmzld6ffwqj5gwxrp8zvx8w573g1z368qg6xlwbd")))) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-libc" ,rust-libc-0.2) ("rust-log" ,rust-log-0.4) ("rust-packed-simd" ,rust-packed-simd-0.3) @@ -8606,7 +9198,8 @@ useful types and distributions, and some randomness-related algorithms.") ("rust-winapi" ,rust-winapi-0.3) ("rust-autocfg" ,rust-autocfg-0.1)) ; build-dependency #:cargo-development-inputs - (("rust-rand-xoshiro" ,rust-rand-xoshiro-0.1)))))) + (("rust-average" ,rust-average-0.9) + ("rust-rand-xoshiro" ,rust-rand-xoshiro-0.1)))))) (define-public rust-rand-0.5 (package @@ -9162,7 +9755,7 @@ accessors.") #:cargo-development-inputs (("rust-doc-comment" ,rust-doc-comment-0.3) ("rust-docopt" ,rust-docopt-1.1) - ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-lazy-static" ,rust-lazy-static-1) ("rust-rand" ,rust-rand-0.7) ("rust-rand-xorshift" ,rust-rand-xorshift-0.2) ("rust-serde" ,rust-serde-1.0)))) @@ -9195,7 +9788,7 @@ accessors.") #:cargo-development-inputs (("rust-doc-comment" ,rust-doc-comment-0.3) ("rust-docopt" ,rust-docopt-1.1) - ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-lazy-static" ,rust-lazy-static-1) ("rust-rand" ,rust-rand-0.4) ("rust-rand-xorshift" ,rust-rand-xorshift-0.2) ("rust-serde" ,rust-serde-1.0) @@ -9221,7 +9814,7 @@ accessors.") (("rust-crossbeam-deque" ,rust-crossbeam-deque-0.7) ("rust-crossbeam-queue" ,rust-crossbeam-queue-0.2) ("rust-crossbeam-utils" ,rust-crossbeam-utils-0.7) - ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-lazy-static" ,rust-lazy-static-1) ("rust-num-cpus" ,rust-num-cpus-1.10)) #:cargo-development-inputs (("rust-libc" ,rust-libc-0.2) @@ -9253,7 +9846,7 @@ accessors.") (("rust-crossbeam-deque" ,rust-crossbeam-deque-0.7) ("rust-crossbeam-queue" ,rust-crossbeam-queue-0.1) ("rust-crossbeam-utils" ,rust-crossbeam-utils-0.6) - ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-lazy-static" ,rust-lazy-static-1) ("rust-num-cpus" ,rust-num-cpus-1.10)) #:cargo-development-inputs (("rust-libc" ,rust-libc-0.2) @@ -9411,7 +10004,7 @@ functionality.") (define-public rust-regex-1.3 (package (name "rust-regex") - (version "1.3.3") + (version "1.3.4") (source (origin (method url-fetch) @@ -9420,18 +10013,17 @@ functionality.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "11syqmfvbsah805z6ih8vxf8p6jssdsz1gjsjqcwprz484cqql5m")))) + "1a1mh9mgr8jipnxdaykla6xlw4a6kjn2bzkq3cifx8xy4ivzjb1j")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-aho-corasick" ,rust-aho-corasick-0.7) ("rust-memchr" ,rust-memchr-2.2) ("rust-regex-syntax" ,rust-regex-syntax-0.6) ("rust-thread-local" ,rust-thread-local-1.0)) #:cargo-development-inputs (("rust-doc-comment" ,rust-doc-comment-0.3) - ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-lazy-static" ,rust-lazy-static-1) ("rust-quickcheck" ,rust-quickcheck-0.8) ("rust-rand" ,rust-rand-0.6)))) (home-page "https://github.com/rust-lang/regex") @@ -9445,7 +10037,7 @@ uses finite automata and guarantees linear time matching on all inputs.") (package (inherit rust-regex-1.3) (name "rust-regex") - (version "1.1.7") + (version "1.1.9") (source (origin (method url-fetch) @@ -9454,10 +10046,9 @@ uses finite automata and guarantees linear time matching on all inputs.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1pabajpp0wzb7dm2x32gy8w7k0mwykr6zsvzn0fgpr6pww40hbqb")))) + "1ba47ivq8l1yikiwikjnq5barag6iqfgcpxlz2263fqbq9y2kn6r")))) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-aho-corasick" ,rust-aho-corasick-0.7) ("rust-memchr" ,rust-memchr-2.2) ("rust-regex-syntax" ,rust-regex-syntax-0.6) @@ -9465,9 +10056,9 @@ uses finite automata and guarantees linear time matching on all inputs.") ("rust-utf8-ranges" ,rust-utf8-ranges-1.0)) #:cargo-development-inputs (("rust-doc-comment" ,rust-doc-comment-0.3) - ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-lazy-static" ,rust-lazy-static-1) ("rust-quickcheck" ,rust-quickcheck-0.8) - ("rust-rand" ,rust-rand-0.4)))))) + ("rust-rand" ,rust-rand-0.6)))))) (define-public rust-regex-0.2 (package @@ -9493,7 +10084,7 @@ uses finite automata and guarantees linear time matching on all inputs.") ("rust-thread-local" ,rust-thread-local-0.3) ("rust-utf8-ranges" ,rust-utf8-ranges-1.0)) #:cargo-development-inputs - (("rust-lazy-static" ,rust-lazy-static-1.3) + (("rust-lazy-static" ,rust-lazy-static-1) ("rust-quickcheck" ,rust-quickcheck-0.6) ("rust-rand" ,rust-rand-0.4)))))) @@ -9518,7 +10109,7 @@ uses finite automata and guarantees linear time matching on all inputs.") ("rust-regex-syntax" ,rust-regex-syntax-0.6) ("rust-utf8-ranges" ,rust-utf8-ranges-1.0)) #:cargo-development-inputs - (("rust-lazy-static" ,rust-lazy-static-1.3) + (("rust-lazy-static" ,rust-lazy-static-1) ("rust-regex" ,rust-regex-1.1) ("rust-serde" ,rust-serde-1.0) ("rust-serde-bytes" ,rust-serde-bytes-0.11) @@ -9534,7 +10125,7 @@ uses finite automata and guarantees linear time matching on all inputs.") (define-public rust-regex-syntax-0.6 (package (name "rust-regex-syntax") - (version "0.6.13") + (version "0.6.14") (source (origin (method url-fetch) @@ -9542,9 +10133,8 @@ uses finite automata and guarantees linear time matching on all inputs.") (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "141xi6yiji0bc04c4skamd4ny9vnd1jrwc7qzfga425lyn8yhd77")))) + "01myl8xqpbnird23xnsb92sjmz1cmp69r6m7y3dwbpmsx4zzx3dj")))) (build-system cargo-build-system) - (arguments '(#:skip-build? #t)) (home-page "https://github.com/rust-lang/regex") (synopsis "Regular expression parser") (description @@ -9571,6 +10161,25 @@ uses finite automata and guarantees linear time matching on all inputs.") #:cargo-inputs (("rust-ucd-util" ,rust-ucd-util-0.1)))))) +(define-public rust-regex-syntax-0.3 + (package + (inherit rust-regex-syntax-0.6) + (name "rust-regex-syntax") + (version "0.3.9") + (source + (origin + (method url-fetch) + (uri (crate-uri "regex-syntax" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0ms9hgdhhsxw9w920i7gipydvagf100bb56jbs192rz86ln01v7r")))) + (arguments + `(#:skip-build? #t + #:cargo-development-inputs + (("rust-quickcheck" ,rust-quickcheck-0.2) + ("rust-rand" ,rust-rand-0.3)))))) + (define-public rust-remove-dir-all-0.5 (package (name "rust-remove-dir-all") @@ -10019,7 +10628,7 @@ paths point to the same file.") (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-lazy-static" ,rust-lazy-static-1.3) + (("rust-lazy-static" ,rust-lazy-static-1) ("rust-winapi" ,rust-winapi-0.3)))) (home-page "https://github.com/steffengy/schannel-rs") (synopsis "Rust bindings to the Windows SChannel APIs") @@ -10044,7 +10653,7 @@ server functionality.") (arguments `(#:skip-build? #t #:cargo-development-inputs - (("rust-lazy-static" ,rust-lazy-static-1.3)))) + (("rust-lazy-static" ,rust-lazy-static-1)))) (home-page "https://github.com/Kimundi/scoped-threadpool-rs") (synopsis "Library for scoped and cached threadpools") (description @@ -10325,8 +10934,49 @@ proven statistical guarantees.") "This package provides a generic serialization/deserialization framework.") (license (list license:expat license:asl2.0)))) -;; Circular dev dependency on bincode. -;; Probably not going away: https://github.com/rust-lang/cargo/issues/4242 +(define-public rust-serde-0.8 + (package + (inherit rust-serde-1.0) + (name "rust-serde") + (version "0.8.23") + (source + (origin + (method url-fetch) + (uri (crate-uri "serde" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1j4ajipn0sf4ya0crgcb94s848qp7mfc35n6d0q2rf8rk5skzbcx")))) + (arguments + `(#:cargo-development-inputs + (("rust-clippy" ,rust-clippy-0.0)) + #:tests? #f)))) + +(define-public rust-serde-big-array-0.1 + (package + (name "rust-serde-big-array") + (version "0.1.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "serde-big-array" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0gkyqxk760mp1lfcg6lhjk95ajc89nr0qdd0vl4ic0g8pyxcy9mr")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-serde" ,rust-serde-1.0) + ("rust-serde-derive" ,rust-serde-derive-1.0)) + #:cargo-development-inputs + (("rust-serde-json" ,rust-serde-json-1.0)))) + (home-page "https://github.com/est31/serde-big-array") + (synopsis "Big array helper for serde") + (description "This package provides a big array helper for serde.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-serde-bytes-0.11 (package (name "rust-serde-bytes") @@ -10469,6 +11119,29 @@ proven statistical guarantees.") "Token De/Serializer for testing De/Serialize implementations.") (license (list license:expat license:asl2.0)))) +(define-public rust-serde-test-0.8 + (package + (inherit rust-serde-test-1.0) + (name "rust-serde-test") + (version "0.8.23") + (source + (origin + (method url-fetch) + (uri (crate-uri "serde-test" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1m939j7cgs7i58r6vxf0ffp3nbr8advr8p9dqa9w8zk0z2yks2qi")))) + (arguments + `(#:cargo-inputs (("rust-serde" ,rust-serde-0.8)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-Cargo-toml + (lambda _ + (substitute* "Cargo.toml" + ((", path = \"../serde\"") "")) + #t))))))) + (define-public rust-serde-yaml-0.8 (package (name "rust-serde-yaml") @@ -11022,10 +11695,10 @@ are met.") ("rust-stdweb-derive" ,rust-stdweb-derive-0.5) ("rust-stdweb-internal-macros" ,rust-stdweb-internal-macros-0.2) ("rust-stdweb-internal-runtime" ,rust-stdweb-internal-runtime-0.1) - ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2)) + ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2) + ("rust-rustc-version" ,rust-rustc-version-0.2)) #:cargo-development-inputs - (("rust-rustc-version" ,rust-rustc-version-0.2) - ("rust-serde-derive" ,rust-serde-derive-1.0) + (("rust-serde-derive" ,rust-serde-derive-1.0) ("rust-serde-json" ,rust-serde-json-1.0) ("rust-stdweb-internal-test-macro" ,rust-stdweb-internal-test-macro-0.1) ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.2)))) @@ -11199,7 +11872,7 @@ crate.") (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-lazy-static" ,rust-lazy-static-1.3) + (("rust-lazy-static" ,rust-lazy-static-1) ("rust-new-debug-unreachable" ,rust-new-debug-unreachable-1.0) ("rust-phf-shared" ,rust-phf-shared-0.7) @@ -11302,6 +11975,56 @@ and Jaro-Winkler.") (base32 "0sjsm7hrvjdifz661pjxq5w4hf190hx53fra8dfvamacvff139cf")))))) +(define-public rust-structopt-0.2 + (package + (name "rust-structopt") + (version "0.2.18") + (source + (origin + (method url-fetch) + (uri (crate-uri "structopt" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1mvfv1l8vp3y402fkl2wcl34hi7gmr4bqha13dfz2xf3kjzwvhhn")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f + #:cargo-inputs + (("rust-clap" ,rust-clap-2) + ("rust-structopt-derive" ,rust-structopt-derive-0.2)))) + (home-page "https://github.com/TeXitoi/structopt") + (synopsis "Parse command line arguments by defining a struct") + (description + "Parse command line arguments by defining a struct.") + (license (list license:asl2.0 license:expat)))) + +(define-public rust-structopt-derive-0.2 + (package + (name "rust-structopt-derive") + (version "0.2.18") + (source + (origin + (method url-fetch) + (uri (crate-uri "structopt-derive" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "01sis9z5kqmyhvzbnmlzpdxcry99a0b9blypksgnhdsbm1hh40ak")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-heck" ,rust-heck-0.3) + ("rust-proc-macro2" ,rust-proc-macro2-0.4) + ("rust-quote" ,rust-quote-0.6) + ("rust-syn" ,rust-syn-0.15)))) + (home-page "https://github.com/TeXitoi/structopt") + (synopsis + "Parse command line argument by defining a struct, derive crate") + (description + "Parse command line argument by defining a struct, derive crate.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-syn-1.0 (package (name "rust-syn") @@ -11336,11 +12059,11 @@ and Jaro-Winkler.") (base32 "1id5g6x6zihv3j7hwrw3m1jp636bg8dpi671r7zy3jvpkavb794w")))) (arguments - `(#:skip-build? #t + `(#:cargo-test-flags '("--release" "--all-features") #:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-0.4) - ("rust-quote" ,rust-quote-1.0) - ("rust-unicode-xid" ,rust-unicode-xid-0.2)) + ("rust-quote" ,rust-quote-0.6) + ("rust-unicode-xid" ,rust-unicode-xid-0.1)) #:cargo-development-inputs (("rust-insta" ,rust-insta-0.8) ("rust-rayon" ,rust-rayon-1.1) @@ -11427,6 +12150,27 @@ and Jaro-Winkler.") "Simplified interface to libc::sysctl.") (license license:expat))) +(define-public rust-sysctl-0.1 + (package + (inherit rust-sysctl-0.4) + (name "rust-sysctl") + (version "0.1.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "sysctl" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "10wxlk4nkzlxp4fg435jmdmfwl4hy0y4w2rcsgs634lvbp8pgksb")))) + (arguments + `(#:skip-build? #t ; Unsupported on Linux. + #:cargo-inputs + (("rust-byteorder" ,rust-byteorder-1.3) + ("rust-errno" ,rust-errno-0.2) + ("rust-libc" ,rust-libc-0.2)))))) + (define-public rust-tar-0.4 (package (name "rust-tar") @@ -11465,12 +12209,15 @@ memory all at once.") (base32 "1n5n86zxpgd85y0mswrp5cfdisizq2rv3la906g6ipyc03xvbwhm")))) (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-rand" ,rust-rand-0.4) + ("rust-remove-dir-all" ,rust-remove-dir-all-0.5)))) (home-page "https://github.com/rust-lang-deprecated/tempdir") (synopsis "Temporary directory management for Rust") (description "This package provides a library for managing a temporary directory and deleting all contents when it's dropped.") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) @@ -11603,6 +12350,29 @@ directories.") (("rust-kernel32-sys" ,rust-kernel32-sys-0.2) ("rust-winapi" ,rust-winapi-0.2)))))) +(define-public rust-term-grid-0.1 + (package + (name "rust-term-grid") + (version "0.1.7") + (source + (origin + (method url-fetch) + (uri (crate-uri "term_grid" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1kq2sy3b8329jrsrpcvijvyz4gbqjyvyy6c3n0wmmvda9y03w393")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-unicode-width" ,rust-unicode-width-0.1)))) + (home-page "https://github.com/ogham/rust-term-grid") + (synopsis "Library for formatting strings into a grid layout") + (description "This package provides a library for formatting strings into a +grid layout.") + (license license:expat))) + (define-public rust-term-size-1.0 (package (name "rust-term-size") @@ -11833,7 +12603,7 @@ different for every thread.") (build-system cargo-build-system) (arguments `(#:skip-build? #t - #:cargo-inputs (("rust-lazy-static" ,rust-lazy-static-1.4)))) + #:cargo-inputs (("rust-lazy-static" ,rust-lazy-static-1)))) (home-page "https://github.com/Amanieu/thread_local-rs") (synopsis "Per-object thread-local storage") (description "Per-object thread-local storage.") @@ -11855,7 +12625,7 @@ different for every thread.") "06rzik99p8c5js8238yhc8rk6np543ylb1dy9nrw5v80j0r3xdf6")))) (arguments `(#:skip-build? #t - #:cargo-inputs (("rust-lazy-static" ,rust-lazy-static-1.4)))))) + #:cargo-inputs (("rust-lazy-static" ,rust-lazy-static-1)))))) (define-public rust-threadpool-1.7 (package @@ -12252,7 +13022,7 @@ futures efficiently") #:cargo-inputs (("rust-crossbeam-queue" ,rust-crossbeam-queue-0.1) ("rust-futures" ,rust-futures-0.1) - ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-lazy-static" ,rust-lazy-static-1) ("rust-libc" ,rust-libc-0.2) ("rust-log" ,rust-log-0.4) ("rust-mio" ,rust-mio-0.6) @@ -12292,7 +13062,7 @@ futures.") #:cargo-inputs (("rust-crossbeam-utils" ,rust-crossbeam-utils-0.6) ("rust-futures" ,rust-futures-0.1) - ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-lazy-static" ,rust-lazy-static-1) ("rust-log" ,rust-log-0.4) ("rust-mio" ,rust-mio-0.6) ("rust-num-cpus" ,rust-num-cpus-1.10) @@ -12493,7 +13263,7 @@ pool.") (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-lazy-static" ,rust-lazy-static-1.3)))) + (("rust-lazy-static" ,rust-lazy-static-1)))) (home-page "https://tokio.rs") (synopsis "Core primitives for tokio-trace") (description "Core primitives for tokio-trace.") @@ -12695,7 +13465,7 @@ serializing Rust structures.") `(#:skip-build? #t #:cargo-inputs (("rust-glob" ,rust-glob-0.3) - ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-lazy-static" ,rust-lazy-static-1) ("rust-serde" ,rust-serde-1.0) ("rust-serde-json" ,rust-serde-json-1.0) ("rust-termcolor" ,rust-termcolor-1.0) @@ -12806,7 +13576,7 @@ implementation is incomplete.") (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-lazy-static" ,rust-lazy-static-1.3) + (("rust-lazy-static" ,rust-lazy-static-1) ("rust-regex" ,rust-regex-1.1)))) (home-page "https://github.com/BurntSushi/ucd-generate") (synopsis "Parse data files in the Unicode character database") @@ -12891,11 +13661,12 @@ with the Unicode character database.") (base32 "1xmpmkakhhblq7dzab1kwyv925kv7fqjkjsxjspg6ix9n88makm8")))) (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-version-check" ,rust-version-check-0.1)))) (home-page "https://github.com/seanmonstar/unicase") (synopsis "Case-insensitive wrapper around strings") (description "A case-insensitive wrapper around strings.") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) @@ -12955,10 +13726,10 @@ including Canonical and Compatible Decomposition and Recomposition, as described in Unicode Standard Annex #15.") (license (list license:expat license:asl2.0)))) -(define-public rust-unicode-segmentation-1.3 +(define-public rust-unicode-segmentation-1.6 (package (name "rust-unicode-segmentation") - (version "1.3.0") + (version "1.6.0") (source (origin (method url-fetch) @@ -12967,11 +13738,10 @@ described in Unicode Standard Annex #15.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1a9jqg7rb1yq6w2xc9jgxcs111yk5vxm9afjfvykfnrmzk6z8rqr")))) + "1h7d48mzpi8hwf5cvnq07warkv86pvapzzzf32hvbjsk20yiagp8")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-development-inputs + `(#:cargo-development-inputs (("rust-quickcheck" ,rust-quickcheck-0.7)))) (home-page "https://github.com/unicode-rs/unicode-segmentation") (synopsis "Grapheme Cluster, Word and Sentence boundaries") @@ -12980,6 +13750,21 @@ described in Unicode Standard Annex #15.") boundaries according to Unicode Standard Annex #29 rules.") (license (list license:expat license:asl2.0)))) +(define-public rust-unicode-segmentation-1.3 + (package + (inherit rust-unicode-segmentation-1.6) + (name "rust-unicode-segmentation") + (version "1.3.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "unicode-segmentation" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1a9jqg7rb1yq6w2xc9jgxcs111yk5vxm9afjfvykfnrmzk6z8rqr")))))) + (define-public rust-unicode-width-0.1 (package (name "rust-unicode-width") @@ -13181,6 +13966,28 @@ untrusted inputs in Rust.") ("rust-rustc-test" ,rust-rustc-test-0.3) ("rust-serde-json" ,rust-serde-json-1.0)))))) +(define-public rust-users-0.9 + (package + (name "rust-users") + (version "0.9.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "users" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1kxl3y2hcrqqip7jpqn5mz7xlpbwmmpfmaza0xnyrhx0mrkl4by7")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-libc" ,rust-libc-0.2)))) + (home-page "https://github.com/ogham/rust-users") + (synopsis "Library for getting information on Unix users and groups") + (description "This package provides a library for getting information on +Unix users and groups.") + (license license:expat))) + (define-public rust-utf-8-0.7 (package (name "rust-utf-8") @@ -13229,6 +14036,25 @@ untrusted inputs in Rust.") "Convert ranges of Unicode codepoints to UTF-8 byte ranges.") (license (list license:expat license:unlicense)))) +(define-public rust-utf8parse-0.1 + (package + (name "rust-utf8parse") + (version "0.1.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "utf8parse" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0zamsj2986shm4x9zncjf2m5qy9scaw7qnxw4f89b2afpg6a8wl7")))) + (build-system cargo-build-system) + (home-page "https://github.com/jwilm/vte") + (synopsis "Table-driven UTF-8 parser") + (description "This package provides a table-driven UTF-8 parser.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-uuid-0.7 (package (name "rust-uuid") @@ -13436,10 +14262,16 @@ specified across Unix and Windows platforms.") (base32 "07ppalpvxkf8cnqr64np422792y4z5bs9m8b4nrflh5rm17wjn4n")))) (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-same-file" ,rust-same-file-1.0) + ("rust-winapi" ,rust-winapi-0.3) + ("rust-winapi-util" ,rust-winapi-util-0.1)) + #:cargo-development-inputs + (("rust-doc-comment" ,rust-doc-comment-0.3)))) (home-page "https://github.com/BurntSushi/walkdir") (synopsis "Recursively walk a directory") (description "Recursively walk a directory.") - (properties '((hidden? . #t))) (license (list license:unlicense license:expat)))) @@ -13509,7 +14341,7 @@ in Rust.") `(#:skip-build? #t #:cargo-inputs (("rust-bumpalo" ,rust-bumpalo-2.5) - ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-lazy-static" ,rust-lazy-static-1) ("rust-log" ,rust-log-0.4) ("rust-proc-macro2" ,rust-proc-macro2-0.4) ("rust-quote" ,rust-quote-1.0) @@ -13543,7 +14375,7 @@ in Rust.") ,rust-futures-channel-preview-0.3) ("rust-futures-util-preview" ,rust-futures-util-preview-0.3) ("rust-js-sys" ,rust-js-sys-0.3) - ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-lazy-static" ,rust-lazy-static-1) ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2)) #:cargo-development-inputs (("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.2)))) @@ -13995,6 +14827,26 @@ to XDG Base Directory specification") (license (list license:asl2.0 license:expat)))) +(define-public rust-xml-rs-0.8 + (package + (name "rust-xml-rs") + (version "0.8.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "xml-rs" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1db4v716rbpgjiasaim2s17rmvsfcq1qzwg6nji6mdf5k34i46sl")))) + (build-system cargo-build-system) + (arguments `(#:skip-build? #t)) + (home-page "https://github.com/netvl/xml-rs") + (synopsis "XML library in pure Rust") + (description "An XML library in pure Rust.") + (license license:expat))) + (define-public rust-yaml-rust-0.4 (package (name "rust-yaml-rust") @@ -14020,3 +14872,45 @@ to XDG Base Directory specification") (description "The missing YAML 1.2 parser for rust.") (license (list license:asl2.0 license:expat)))) + +(define-public rust-yaml-rust-0.3 + (package + (inherit rust-yaml-rust-0.4) + (name "rust-yaml-rust") + (version "0.3.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "yaml-rust" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "14m9dzwb8fb05f4jjb4nqp49rxd9c5vcmwpv3a04d2y5iphncqz6")))) + (arguments + `(#:cargo-inputs + (("rust-clippy" ,rust-clippy-0.0) + ("rust-linked-hash-map" ,rust-linked-hash-map-0.3)))))) + +(define-public rust-zoneinfo-compiled-0.4 + (package + (name "rust-zoneinfo-compiled") + (version "0.4.8") + (source + (origin + (method url-fetch) + (uri (crate-uri "zoneinfo_compiled" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0bnm19w791q6kp79s0zl1cj9w51bw5xrifrxfy3g1p05i676y4vf")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-byteorder" ,rust-byteorder-1.3) + ("rust-datetime" ,rust-datetime-0.4)))) + (home-page "https://github.com/rust-datetime/zoneinfo-compiled/") + (synopsis "Library for parsing compiled zoneinfo files") + (description + "This package provides a library for parsing compiled zoneinfo files.") + (license license:expat))) diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm index 998a71aeab..3b3540b5b0 100644 --- a/gnu/packages/diffoscope.scm +++ b/gnu/packages/diffoscope.scm @@ -44,6 +44,7 @@ #:use-module (gnu packages java) #:use-module (gnu packages linux) #:use-module (gnu packages llvm) + #:use-module (gnu packages man) #:use-module (gnu packages mono) #:use-module (gnu packages ocaml) #:use-module (gnu packages package-management) @@ -217,9 +218,80 @@ "Diffoscope tries to get to the bottom of what makes files or directories different. It recursively unpacks archives of many kinds and transforms various binary formats into more human readable forms to compare them. It can -compare two tarballs, ISO images, or PDFs just as easily.") +compare two tarballs, ISO images, or PDFs just as easily. + +Diffoscope has many optional dependencies; @code{diffoscope +--list-missing-tools guix} will display optional packages to +install.") (license license:gpl3+)))) +(define-public reprotest + (package + (name "reprotest") + (version "0.7.13") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://salsa.debian.org/reproducible-builds/reprotest.git") + (commit version))) + (file-name (git-file-name name version)) + (patches (search-patches "reprotest-support-guix.patch")) + (sha256 + (base32 + "0jj9sqxbdpypnc0y8md352wwzh1by6nyhmx5fwqnvrbznrng332f")))) + (inputs + `(("python-debian" ,python-debian) + ("python-distro" ,python-distro) + ("python-libarchive-c", python-libarchive-c) + ("python-rstr" ,python-rstr))) + (native-inputs + `(("diffoscope" ,diffoscope) + ("help2man" ,help2man) + ("libfaketime" ,libfaketime) + ("python-coverage" ,python-coverage) + ("python-docutils" ,python-docutils) + ("python-pytest " ,python-pytest) + ("python-tlsh" ,python-tlsh) + ("python-tox" ,python-tox) + ("unzip" ,unzip) + ("xxd" ,xxd))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; Neither glibc-locales nor glibc-utf8-locales have the C.UTF-8 + ;; locale or several other locales used in reprotest. + (add-after 'unpack 'adjust-locales + (lambda _ + (substitute* "reprotest/build.py" + (("'C.UTF-8'") "'en_US.UTF-8'") + (("'ru_RU.CP1251'") "'ru_RU.KOI8-R'") + (("'kk_KZ.RK1048'") "'kk_KZ'")) + (substitute* "reprotest/lib/adt_testbed.py" + (("export LANG=C.UTF-8") "export LANG=en_US.UTF-8")) + #t)) + (add-after 'install 'install-doc + (lambda* (#:key outputs #:allow-other-keys) + (let* ((mandir1 (string-append + (assoc-ref outputs "out") "/share/man/man1")) + (docdir (string-append + (assoc-ref outputs "out") "/share/doc/" ,name "-" ,version))) + (invoke "make" "-C" "doc") + (mkdir-p mandir1) + (install-file "doc/reprotest.1" mandir1) + (mkdir-p docdir) + (install-file "./README.rst" docdir) + (install-file "./README-dev.rst" docdir)) + #t))))) + (home-page "https://salsa.debian.org/reproducible-builds/reprotest") + (synopsis "Build software and check it for reproducibility") + (description "Reprotest builds the same source code twice in different +environments, and then checks the binaries produced by each build for +differences. If any are found, then diffoscope or diff is used to display +them in detail for later analysis.") + (license (list license:gpl3+ license:gpl2+)))) + (define-public trydiffoscope (package (name "trydiffoscope") diff --git a/gnu/packages/djvu.scm b/gnu/packages/djvu.scm index 10cdbf31a8..1fb5b5267e 100644 --- a/gnu/packages/djvu.scm +++ b/gnu/packages/djvu.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org> +;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; ;;; This file is part of GNU Guix. ;;; @@ -18,9 +19,15 @@ (define-module (gnu packages djvu) #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix utils) #:use-module (guix packages) #:use-module (guix download) - #:use-module (guix build-system gnu)) + #:use-module (guix build-system gnu) + #:use-module (gnu packages glib) + #:use-module (gnu packages image) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages qt) + #:use-module (gnu packages xorg)) (define-public djvulibre (package @@ -48,3 +55,48 @@ including viewers, browser plugins, decoders, simple encoders, and utilities.") (license license:gpl2+))) + +(define-public djview + (package + (name "djview") + (version "4.10.6") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/djvu/DjView/" + (version-major+minor version) "/" + "djview-" version ".tar.gz")) + (sha256 + (base32 "08bwv8ppdzhryfcnifgzgdilb12jcnivl4ig6hd44f12d76z6il4")))) + (build-system gnu-build-system) + (native-inputs + `(("pkg-config" ,pkg-config) + ("qttools" ,qttools))) + (inputs + `(("djvulibre" ,djvulibre) + ("glib" ,glib) + ("libxt" ,libxt) + ("libtiff" ,libtiff) + ("qtbase" ,qtbase))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-desktop-file + ;; Executable is "djview", not "djview4". + (lambda _ + (substitute* "desktopfiles/djvulibre-djview4.desktop" + (("Exec=djview4 %f") "Exec=djview %f")) + #t))))) + (home-page "http://djvu.sourceforge.net/djview4.html") + (synopsis "Viewer for the DjVu image format") + (description "DjView is a standalone viewer for DjVu files. + +Its features include navigating documents, zooming and panning page images, +producing and displaying thumbnails, displaying document outlines, searching +documents for particular words in the hidden text layer, copying hidden text +to the clipboard, saving pages and documents as bundled or indirect multi-page +files, and printing page and documents. + +The viewer can simultaneously display several pages using a side-by-side or +a continuous layout.") + (license license:gpl2+))) diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index 948cc30cf6..1f832a25e5 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -46,7 +46,7 @@ #:use-module (gnu packages version-control) #:use-module (gnu packages virtualization)) -(define %docker-version "18.09.5") +(define %docker-version "19.03.5") (define-public python-docker-py (package @@ -313,12 +313,9 @@ built-in registry server of Docker.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0cirpd9l2qazp2jyanwzvrkx2m98nksjdvn43ff38p89w6133ipb")) + (base32 "1dlknwn0fh82nbzdzxdk6pfhqwph9vcw3vs3111wfr19y5hwncq9")) (patches - (search-patches "docker-engine-test-noinstall.patch" - "docker-fix-tests.patch" - "docker-use-fewer-modprobes.patch" - "docker-adjust-tests-for-changes-in-go.patch")))) + (search-patches "docker-fix-tests.patch")))) (build-system gnu-build-system) (arguments `(#:modules @@ -419,6 +416,7 @@ built-in registry server of Docker.") "/" relative-path "\"")) ...))))) (substitute-LookPath* + ("containerd" "containerd" "bin/containerd") ("ps" "procps" "bin/ps") ("mkfs.xfs" "xfsprogs" "bin/mkfs.xfs") ("lvmdiskscan" "lvm2" "sbin/lvmdiskscan") @@ -492,6 +490,14 @@ built-in registry server of Docker.") (delete-file "daemon/graphdriver/btrfs/btrfs_test.go") (delete-file "daemon/graphdriver/overlay/overlay_test.go") (delete-file "daemon/graphdriver/overlay2/overlay_test.go") + (delete-file "pkg/chrootarchive/archive_unix_test.go") + (delete-file "daemon/container_unix_test.go") + ;; This file uses cgroups and /proc. + (delete-file "pkg/sysinfo/sysinfo_linux_test.go") + ;; This file uses cgroups. + (delete-file "runconfig/config_test.go") + ;; This file uses /var. + (delete-file "daemon/oci_linux_test.go") #t)) (replace 'configure (lambda _ @@ -558,6 +564,7 @@ built-in registry server of Docker.") (native-inputs `(("eudev" ,eudev) ; TODO: Should be propagated by lvm2 (.pc -> .pc) ("go" ,go) + ("gotestsum" ,gotestsum) ("pkg-config" ,pkg-config))) (synopsis "Docker container component library, and daemon") (description "This package provides a framework to assemble specialized @@ -579,7 +586,7 @@ provisioning etc.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0mxxjzkwdny8p2dmyjich7x1gn7hdlfppzjy2skk2k5bwv7nxpmi")))) + (base32 "07ldz46y74b3la4ah65v5bzbfx09yy6kncvxrr0zfx0s1214ar3m")))) (build-system go-build-system) (arguments `(#:import-path "github.com/docker/cli" diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 2efb4c220c..faf2d7a1f1 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -163,14 +163,15 @@ (define-public emacs-geiser (package (name "emacs-geiser") - (version "0.10") + (version "0.11") (source (origin - (method url-fetch) - (uri (string-append "mirror://savannah/geiser/" version - "/geiser-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/jaor/geiser/") + (commit version))) (sha256 (base32 - "0pj3l7p8d60c9b4vfprnv6g5l61d74pls4b5dvd84cn4ky9mzwjv")))) + "0fb2h984hn7bnyiziplp7kgk29zdzc9yainsv0k1li436irlp9dd")))) (build-system gnu-build-system) (arguments '(#:phases @@ -183,7 +184,11 @@ "geiser-autoloads.el")) #t))))) (inputs `(("guile" ,guile-2.2))) - (native-inputs `(("emacs" ,emacs-minimal))) + (native-inputs + `(("emacs" ,emacs-minimal) + ("autoconf" ,autoconf) + ("automake" ,automake) + ("texinfo" ,texinfo))) (home-page "https://nongnu.org/geiser/") (synopsis "Collection of Emacs modes for Guile and Racket hacking") (description @@ -1982,6 +1987,27 @@ filters, new key bindings and faces. It can be enabled by @code{tablist-mode} or @code{tablist-minor-mode} commands.") (license license:gpl3+))) +(define-public emacs-djvu + (package + (name "emacs-djvu") + (version "1.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://elpa.gnu.org/packages/" + "djvu-" version ".el")) + (sha256 + (base32 "0njgyx09q225hliacsnjk8wallg5i6xkz6bj501pb05nwqfbvfk7")))) + (build-system emacs-build-system) + (home-page "http://elpa.gnu.org/packages/djvu.html") + (synopsis "Edit and view Djvu files via djvused") + (description + "This package is a front end for the command-line program djvused from +DjVuLibre, see @url{http://djvu.sourceforge.net/}. It assumes you have the +programs @command{djvused}, @command{djview}, @command{ddjvu}, and +@command{djvm} installed.") + (license license:gpl3+))) + (define-public emacs-pdf-tools (package (name "emacs-pdf-tools") @@ -8050,13 +8076,13 @@ passive voice.") (name "emacs-org") ;; emacs-org-contrib inherits from this package. Please update it as ;; well. - (version "9.3.2") + (version "9.3.3") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/org-" version ".tar")) (sha256 - (base32 "1275s3hzyka2wwxl6nc2sndnwyl7kbc1nnl0hrznxb3wpy2abfd6")))) + (base32 "0yafckcx5ka2rpmv24x7ns6f3s1h216x2lbgaxsf1dmklbjcfvwv")))) (build-system emacs-build-system) (home-page "https://orgmode.org/") (synopsis "Outline-based notes management and organizer") @@ -8070,14 +8096,14 @@ programming and reproducible research.") (package (inherit emacs-org) (name "emacs-org-contrib") - (version "20200126") + (version "20200206") (source (origin (method url-fetch) (uri (string-append "https://orgmode.org/elpa/" "org-plus-contrib-" version ".tar")) (sha256 - (base32 "08yik0i8ya2x5j4vsnwxdcdlcxbiq58lvy30vcbdbf0hqrd40kjv")))) + (base32 "1fdxh8zgjnb500wkcl0bc0fdzbsln6p044b4s4nz85wkfw0jkfs5")))) (arguments `(#:modules ((guix build emacs-build-system) (guix build utils) @@ -8094,11 +8120,11 @@ programming and reproducible research.") (map basename (find-files out))) (org+contrib-files (map basename (find-files org))) - (duplicates (lset-intersection - string=? contrib-files org+contrib-files))) + (duplicates (lset-intersection string=? + contrib-files + org+contrib-files))) (with-directory-excursion - (string-append - out "/share/emacs/site-lisp") + (string-append out "/share/emacs/site-lisp") (for-each delete-file duplicates)) #t)))))) (propagated-inputs @@ -21366,3 +21392,42 @@ sense on the @samp{Newsgroups} header, whereas mail alias expansion makes sense in the @samp{To} and @samp{Cc} headers). When in the message body, this executes a different function (default: @code{indent-relative}).") (license license:gpl2+)))) + +(define-public emacs-gnus-harvest + (let ((commit "feda071a87b799bd5d23cacde3ee71f0b166e75d") + (revision "0")) + (package + (name "emacs-gnus-harvest") + (version (git-version "1.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jwiegley/gnus-harvest.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "08zb7vc3v3wdxkzgi902vlc5ybfvm8fxrvm5drnwfsjj9873pbcb")))) + (build-system emacs-build-system) + (inputs + `(("sqlite" ,sqlite))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'build 'patch-exec-paths + (lambda* (#:key inputs #:allow-other-keys) + (let ((sqlite (assoc-ref inputs "sqlite")) + (file "gnus-harvest.el")) + (make-file-writable file) + (emacs-substitute-variables file + ("gnus-harvest-sqlite-program" + (string-append sqlite "/bin/sqlite3")))) + #t))))) + (home-page "https://github.com/jwiegley/gnus-harvest") + (synopsis + "Harvest email addresses from read/written Gnus articles") + (description "@code{gnus-harvest} notices email address in every message +or post you read or write, and collects them in a SQLite database, which can +be easily and quickly queried to determine the completion list. It optionally +uses BBDB and Message-X.") + (license license:gpl3+)))) diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index 3e7314bc2b..b5ca37d43e 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -249,7 +249,7 @@ from the jfsutils package. It is meant to be used in initrds.") (define-public disorderfs (package (name "disorderfs") - (version "0.5.6") + (version "0.5.8") (source (origin (method git-fetch) @@ -259,7 +259,7 @@ from the jfsutils package. It is meant to be used in initrds.") (file-name (git-file-name name version)) (sha256 (base32 - "1zn2ydap8k9fwjl3ivgrg6l32s5p4ik6ca6j1idp7c77znlv6cpp")))) + "0pk9i0dycjq0wl6dp37r2hbadgpgmzbmjk2xpbjl36x4yrm4jns8")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) @@ -274,7 +274,7 @@ from the jfsutils package. It is meant to be used in initrds.") #:test-target "test" ;; FIXME: Tests require 'run-parts' which is not in Guix yet. #:tests? #f)) - (home-page "https://github.com/ReproducibleBuilds/disorderfs") + (home-page "https://salsa.debian.org/reproducible-builds/disorderfs") (synopsis "FUSE file system that introduces non-determinism") (description "An overlay FUSE file system that introduces non-determinism diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 190e5cbbdc..990298ce3f 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -97,7 +97,7 @@ (define-public bitcoin-core (package (name "bitcoin-core") - (version "0.18.1") + (version "0.19.0.1") (source (origin (method url-fetch) (uri @@ -105,7 +105,7 @@ version "/bitcoin-" version ".tar.gz")) (sha256 (base32 - "15mz0gmm058gmq2gdpffbw25jpv7mksyhyfws6i7mqvrapqr6zaw")))) + "1172dl4b8h2a80ilk9sfgbl8yi55k6hs4b1m07nic2ls4irgkjbs")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 358c72f07a..7297c277f1 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -28,6 +28,7 @@ ;;; Copyright © 2019 Baptiste Strazzulla <bstrazzull@hotmail.fr> ;;; Copyright © 2019 Alva <alva@skogen.is> ;;; Copyright © 2019 Alexandros Theodotou <alex@zrythm.org> +;;; Copyright © 2020 Damien Cassou <damien@cassou.me> ;;; ;;; This file is part of GNU Guix. ;;; @@ -1563,3 +1564,24 @@ have been designed to be very distinguishable from each other.") displays (7SEG, 14SEG). DSEG includes the roman alphabet and symbol glyphs. This package provides the TrueType fonts.") (license license:silofl1.1))) + +(define-public font-jetbrains-mono + (package + (name "font-jetbrains-mono") + (version "1.0.2") + (source + (origin + (method url-fetch) + (uri + (string-append "https://download.jetbrains.com/fonts/" + "JetBrainsMono-" version ".zip")) + (sha256 + (base32 "0qlp4902i1v6ni04b6gdip8rxw6wpkdk9w7dir1yn9an5mvbkyar")))) + (build-system font-build-system) + (home-page "https://www.jetbrains.com/lp/mono/") + (synopsis "Mono typeface for developers") + (description + "JetBrains Mono is a font family dedicated to developers. JetBrains +Mono’s typeface forms are simple and free from unnecessary details. Rendered +in small sizes, the text looks crisper.") + (license license:asl2.0))) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index b502cd0ec4..c23f624251 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -7730,6 +7730,114 @@ the World and demonstrating that he is even more evil than his brother Vlad.") ;; Drascula uses a BSD-like license. (license (license:non-copyleft "file:///readme.txt")))) +(define (make-lure-package name language hash) + (package + (name name) + (version "1.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://sourceforge/scummvm/extras/" + "Lure%20of%20the%20Temptress/" + name "-" version ".zip")) + (sha256 + (base32 hash)))) + (build-system trivial-build-system) + (arguments + `(#:modules ((guix build utils)) + #:builder + (begin + (use-modules (guix build utils)) + (let* ((out (assoc-ref %outputs "out")) + (share (string-append out "/share")) + (data (string-append share "/" ,name "/" ,language)) + (apps (string-append share "/applications")) + (bin (string-append out "/bin")) + (executable (string-append bin "/" ,name)) + (scummvm (assoc-ref %build-inputs "scummvm"))) + (let ((unzip (string-append (assoc-ref %build-inputs "unzip") + "/bin/unzip"))) + (invoke unzip "-j" (assoc-ref %build-inputs "source"))) + (let ((doc (string-append share "/doc/" ,name "-" ,version))) + (for-each (lambda (f) (install-file f doc)) + (find-files "." "\\.(txt|PDF|pdf)$"))) + (for-each (lambda (f) (install-file f data)) + (find-files "." "\\.(vga|VGA)$")) + ;; Build the executable. + (mkdir-p bin) + (let ((bash (assoc-ref %build-inputs "bash"))) + (with-output-to-file executable + (lambda () + (format #t "#!~a/bin/bash~%" bash) + (format #t "exec ~a/bin/scummvm -q ~a -p ~a lure~%" + scummvm ,language data)))) + (chmod executable #o755) + ;; Create desktop file. There is no dedicated + ;; icon for the game, so we borrow SCUMMVM's. + (mkdir-p apps) + (with-output-to-file (string-append apps "/" ,name ".desktop") + (lambda _ + (format #t + "[Desktop Entry]~@ + Name=Lure of the Temptress~@ + GenericName=Lure~@ + Exec=~a~@ + Icon=~a/share/icons/hicolor/scalable/apps/scummvm.svg~@ + Categories=AdventureGame;Game;RolePlaying;~@ + Keywords=game;adventure;roleplaying;2D,fantasy;~@ + Comment=Classic 2D point and click adventure game~@ + Comment[de]=klassisches 2D-Abenteuerspiel in Zeigen-und-Klicken-Manier~@ + Comment[fr]=Jeu classique d'aventure pointer-et-cliquer en 2D~@ + Comment[it]=Gioco classico di avventura punta e clicca 2D~@ + Type=Application~%" + executable scummvm))) + #t)))) + (native-inputs + `(("unzip" ,unzip))) + (inputs + `(("bash" ,bash) + ("scummvm" ,scummvm))) + (home-page "https://www.scummvm.org") + (synopsis "2D point and click fantasy adventure game") + (description + "Lure of the Temptress is a classic 2D point and click adventure game. + +You are Diermot, an unwilling hero who'd prefer a quiet life, and are, to all +intents and purposes, a good man. After decades of unrest the King has united +the warring factions in his kingdom and all his lands are at peace, except +a remote region around a town called Turnvale. A revolt has recently taken +place in Turnvale, a revolt orchestrated by an apprentice sorceress called +Selena, the titular temptress. The king calls together his finest horsemen +and heads off (with you in tow) to Turnvale just to witness how hellish +mercenary monsters called Skorl are invading the town. + +The king's men are defeated, the king is killed and you fall of your horse and +bang your head heavily on the ground. You have been *unconscious for a while +when you realize that you are in a dingy cell guarded by a not so friendly +Skorl. Maybe it would be an idea to try and escape...") + (license (license:non-copyleft "file:///README")))) + +(define-public lure + (make-lure-package + "lure" "en" "0201i70qcs1m797kvxjx3ygkhg6kcl5yf49sihba2ga8l52q45zk")) + +(define-public lure-de + (make-lure-package + "lure-de" "de" "0sqq7h5llml6rv85x0bfv4bgzwhs4c82p4w4zmfcaab6cjlad0sy")) + +(define-public lure-es + (make-lure-package + "lure-es" "es" "1dvv5znvlsakw6w5r16calv9jkgw27aymgybsf4q22lcmpxbj1lk")) + +(define-public lure-fr + (make-lure-package + "lure-fr" "fr" "1y51jjb7f8023832g44vd1jsb6ni85586pi2n5hjg9qjk6gi90r9")) + +(define-public lure-it + (make-lure-package + "lure-it" "it" "1ks6n39r1cllisrrh6pcr39swsdv7ng3gx5c47vaw71zzfr70hjj")) + (define-public gnurobots (package (name "gnurobots") @@ -9666,3 +9774,137 @@ challenges.") license:bsd-3 ;src/md5sum license:lgpl2.1+ ;src/iqsort.h license:expat)))) + +(define-public eboard + (package + (name "eboard") + (version "1.1.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/fbergo/eboard.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1z4pwpqyvxhlda99h6arh2rjk90fbms9q29fqizjblrdn01dlxn1")))) + (build-system gnu-build-system) + (native-inputs + `(("perl" ,perl) + ("pkg-config" ,pkg-config))) + (inputs + `(("gtk+" ,gtk+-2) + ("libpng" ,libpng) + ("gstreamer" ,gstreamer))) + (arguments + `(#:tests? #f + #:phases + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (make-file-writable "eboard-config") + (setenv "CC" "gcc") + (invoke "./configure" + (string-append "--prefix=" (assoc-ref outputs "out"))) + #t)) + (add-before 'install 'make-required-directories + (lambda* (#:key outputs #:allow-other-keys) + (mkdir-p (string-append (assoc-ref outputs "out") + "/share/eboard")) + #t))))) + (synopsis "Graphical user interface to play chess") + (description + "Eboard is a chess board interface for ICS (Internet Chess Servers) +and chess engines.") + (home-page "https://www.bergo.eng.br/eboard/") + (license license:gpl2+))) + +(define-public chessx + (package + (name "chessx") + (version "1.5.0") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/chessx/chessx/" + version "/chessx-" version ".tgz")) + (sha256 + (base32 "09rqyra28w3z9ldw8sx07k5ap3sjlli848p737maj7c240rasc6i")))) + (build-system qt-build-system) + (native-inputs + `(("qttools" ,qttools))) + (inputs + `(("qtbase" ,qtbase) + ("qtmultimedia" ,qtmultimedia) + ("qtsvg" ,qtsvg) + ("zlib" ,zlib))) + (arguments + `(#:tests? #f + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "chessx.pro" + (("\\$\\$\\[QT_INSTALL_BINS\\]/lrelease") + (string-append (assoc-ref inputs "qttools") "/bin/lrelease"))) + #t)) + (add-after 'fix-paths 'make-qt-deterministic + (lambda _ + (setenv "QT_RCC_SOURCE_DATE_OVERRIDE" "1") + #t)) + (replace 'configure + (lambda _ + (invoke "qmake") + #t)) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (install-file "release/chessx" (string-append out "/bin")) + (install-file "unix/chessx.desktop" + (string-append out "/share/applications"))) + #t))))) + (synopsis "Chess game database") + (description + "ChessX is a chess database. With ChessX you can operate on your +collection of chess games in many ways: browse, edit, add, organize, analyze, +etc. You can also play games on FICS or against an engine.") + (home-page "http://chessx.sourceforge.net/") + (license license:gpl2+))) + +(define-public stockfish + (package + (name "stockfish") + (version "11") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/official-stockfish/Stockfish.git") + (commit (string-append "sf_" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "12mppipinymj8s1ipq9a7is453vncly49c32ym9wvyklsgyxfzlk")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f + #:make-flags (list "-C" "src" + "build" + (string-append "PREFIX=" + (assoc-ref %outputs "out")) + (string-append "ARCH=" + ,(match (%current-system) + ("x86_64-linux" "x86-64") + ("i686-linux" "x86-32") + ("aarch64-linux" "general-64") + ("armhf-linux" "armv7") + ("mips64el-linux" "general-64") + (_ "general-32")))) + #:phases (modify-phases %standard-phases + (delete 'configure)))) + (synopsis "Strong chess engine") + (description + "Stockfish is a very strong chess engines. It is much stronger than the +best human chess grandmasters. It can be used with UCI-compatible GUIs like +ChessX.") + (home-page "https://stockfishchess.org/") + (license license:gpl3+))) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 5b658c90dc..56761a0bd7 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2240,7 +2240,7 @@ from forcing GEXP-PROMISE." ("itertools" . #+(package-source rust-itertools-0.8)) ("itoa" . #+(package-source rust-itoa-0.4)) ("language-tags" . #+(package-source rust-language-tags-0.2)) - ("lazy_static" . #+(package-source rust-lazy-static-1.3)) + ("lazy_static" . #+(package-source rust-lazy-static-1)) ("libc" . #+(package-source rust-libc-0.2)) ("libm" . #+(package-source rust-libm-0.1)) ;; locale_config 0.3 diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 9102469749..c27fd6bdb4 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3077,3 +3077,150 @@ alternative to @code{reflect.DeepEqual} for comparing whether two values are semantically equal in Go (for writing tests).") (home-page "https://godoc.org/github.com/google/go-cmp/cmp") (license license:asl2.0))) + +(define-public go-golang.org-x-sync-errgroup + (let ((commit "cd5d95a43a6e21273425c7ae415d3df9ea832eeb") + (revision "0")) + (package + (name "go-golang.org-x-sync-errgroup") + (version (git-version "0.0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://go.googlesource.com/sync") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1nqkyz2y1qvqcma52ijh02s8aiqmkfb95j08f6zcjhbga3ds6hds")))) + (build-system go-build-system) + (arguments + '(#:import-path "golang.org/x/sync/errgroup" + #:unpack-path "golang.org/x/sync")) + (synopsis "Synchronization, error propagation, and Context cancelation +for groups of goroutines working on subtasks of a common task.") + (description "This package provides synchronization, error propagation, +and Context cancelation for groups of goroutines working on subtasks of a +common task.") + (home-page "https://godoc.org/golang.org/x/sync/errgroup") + (license license:bsd-3)))) + +(define (go-gotest-tools-source version sha256-base32-hash) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/gotestyourself/gotest.tools.git") + (commit (string-append "v" version)))) + (file-name (git-file-name "go-gotest-tools" version)) + (sha256 + (base32 sha256-base32-hash)))) + +;; Note that version 3.0.0 is incompatible to 2.3.0. +;; See also <https://github.com/gotestyourself/gotest.tools/issues/166>. +(define (go-gotest-tools-package suffix) + (package + (name (string-append "go-gotest-tools-" + (string-replace-substring suffix "/" "-"))) + (version "2.3.0") + (source + (go-gotest-tools-source version + "0071rjxp4xzcr3vprkaj1hdk35a3v45bx8v0ipk16wwc5hx84i2i")) + (build-system go-build-system) + (arguments + `(#:import-path ,(string-append "gotest.tools/" suffix) + #:unpack-path "gotest.tools")) + (synopsis "@code{gotest-tools} part") + (description "This package provides a part of @code{gotest-tools}.") + (home-page "https://github.com/gotestyourself/gotest.tools") + (license license:asl2.0))) + +(define-public go-gotest-tools-internal-format + (package (inherit (go-gotest-tools-package "internal/format")) + (native-inputs + `(("go-github-com-pkg-errors" ,go-github-com-pkg-errors) + ("go-github-com-google-go-cmp-cmp" + ,go-github-com-google-go-cmp-cmp))) + (synopsis "Formats messages for use with gotest-tools") + (description "This package provides a way to format messages for use +with gotest-tools."))) + +(define-public go-gotest-tools-internal-difflib + (package (inherit (go-gotest-tools-package "internal/difflib")) + (synopsis "Differences for use with gotest-tools") + (description "This package computes differences for use +with gotest-tools."))) + +(define-public go-gotest-tools-internal-source + (package (inherit (go-gotest-tools-package "internal/source")) + (native-inputs + `(("go-github-com-pkg-errors" ,go-github-com-pkg-errors) + ("go-github-com-google-go-cmp-cmp" ,go-github-com-google-go-cmp-cmp))) + (synopsis "Source code AST formatters for gotest-tools") + (description "This package provides source code AST formatters for +gotest-tools."))) + +(define-public go-gotest-tools-assert + (package (inherit (go-gotest-tools-package "assert")) + (name "go-gotest-tools-assert") + (arguments + `(#:tests? #f ; Test failure concerning message formatting (FIXME) + #:import-path "gotest.tools/assert" + #:unpack-path "gotest.tools")) + ;(propagated-inputs + ; `(("go-gotest-tools-internal-format" ,go-gotest-tools-internal-format))) + (native-inputs + `(("go-github-com-pkg-errors" ,go-github-com-pkg-errors) + ("go-github-com-google-go-cmp-cmp" + ,go-github-com-google-go-cmp-cmp))) + (synopsis "Compare values and fail a test when a comparison fails") + (description "This package provides a way to compare values and fail a +test when a comparison fails.") + (home-page "https://github.com/gotestyourself/gotest.tools") + (license license:asl2.0))) + +(define-public gotestsum + (package + (name "gotestsum") + (version "0.4.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/gotestyourself/gotestsum.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0y71qr3ss3hgc8c7nmvpwk946xy1jc5d8whsv6y77wb24ncla7n0")))) + (build-system go-build-system) + (arguments + '(#:import-path "gotest.tools/gotestsum")) + (native-inputs + `(("go-github-com-fatih-color" ,go-github-com-fatih-color) + ("go-golang.org-x-sync-errgroup" ,go-golang.org-x-sync-errgroup) + ("go-github-com-pkg-errors" ,go-github-com-pkg-errors) + ("go-github-com-sirupsen-logrus" + ,go-github-com-sirupsen-logrus) + ("go-github-com-spf13-pflag" ,go-github-com-spf13-pflag) + ("go-github-com-jonboulle-clockwork" + ,go-github-com-jonboulle-clockwork) + ("go-golang-org-x-crypto" ,go-golang-org-x-crypto) + ("go-gotest-tools-assert" ,go-gotest-tools-assert) + ("go-github-com-google-go-cmp-cmp" + ,go-github-com-google-go-cmp-cmp) + ;; TODO: This would be better as a propagated-input of + ;; go-gotest-tools-assert, but that does not work for + ;; some reason. + ("go-gotest-tools-internal-format" + ,go-gotest-tools-internal-format) + ("go-gotest-tools-internal-difflib" + ,go-gotest-tools-internal-difflib) + ("go-gotest-tools-internal-source" + ,go-gotest-tools-internal-source) + ("go-github-com-google-go-cmp-cmp" + ,go-github-com-google-go-cmp-cmp))) + (synopsis "Go test runner with output optimized for humans") + (description "This package provides a @code{go test} runner with output +optimized for humans, JUnit XML for CI integration, and a summary of the +test results.") + (home-page "https://github.com/gotestyourself/gotestsum") + (license license:asl2.0))) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index af940f02fc..7825963523 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -24,6 +24,7 @@ ;;; Copyright © 2019 Alex Griffin <a@ajgrf.com> ;;; Copyright © 2020 Brett Gilio <brettg@gnu.org> ;;; Copyright © 2020 JoJo <jo@jo.zone> +;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; ;;; This file is part of GNU Guix. ;;; @@ -8165,6 +8166,114 @@ easily work with command-line options.") command line options in Haskell.") (license license:bsd-3))) +(define-public ghc-jira-wiki-markup + (package + (name "ghc-jira-wiki-markup") + (version "1.0.0") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/jira-wiki-markup/" + "jira-wiki-markup-" version ".tar.gz")) + (sha256 + (base32 "1sl2jjcsqg61si33mxjwpf8zdn56kbbgcwqqqzbgifx2qbv4wmf8")))) + (build-system haskell-build-system) + (native-inputs + `(("ghc-tasty" ,ghc-tasty) + ("ghc-tasty-hunit" ,ghc-tasty-hunit))) + (home-page "https://github.com/tarleb/jira-wiki-markup") + (synopsis "Handle Jira wiki markup") + (description + "Parse jira wiki text into an abstract syntax tree for easy transformation +to other formats.") + (license license:expat))) + +(define-public ghc-emojis + (package + (name "ghc-emojis") + (version "0.1") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/emojis/" + "emojis-" version ".tar.gz")) + (sha256 + (base32 "1c6zkj9gmk1y90gbdrn50hyp7mw1mggzhnr2khqd728ryipw60ss")))) + (build-system haskell-build-system) + (native-inputs + `(("ghc-hunit" ,ghc-hunit))) + (home-page "https://github.com/jgm/emojis#readme") + (synopsis "Conversion between emoji characters and their names.") + (description + "This package provides functions for converting emoji names to emoji +characters and vice versa. + +How does it differ from the @code{emoji} package? +@itemize +@item It supports a fuller range of emojis, including all those supported by +GitHub +@item It supports lookup of emoji aliases from emoji +@item It uses Text rather than String +@item It has a lighter dependency footprint: in particular, it does not +require aeson +@item It does not require TemplateHaskell +@end itemize") + (license license:bsd-3))) + +(define-public ghc-text-conversions + (package + (name "ghc-text-conversions") + (version "0.3.0") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/text-conversions/" + "text-conversions-" version ".tar.gz")) + (sha256 + (base32 "089c56vdj9xysqfr1hnvbnrghlg83q6w10xk02gflpsidcpvwmhp")))) + (build-system haskell-build-system) + (inputs + `(("ghc-base16-bytestring" ,ghc-base16-bytestring) + ("ghc-base64-bytestring" ,ghc-base64-bytestring) + ("ghc-errors" ,ghc-errors))) + (native-inputs + `(("ghc-hspec" ,ghc-hspec) + ("hspec-discover" ,hspec-discover))) + (home-page "https://github.com/cjdev/text-conversions#readme") + (synopsis "Safe conversions between textual types") + (description "Safe conversions between textual types") + (license license:isc))) + +(define-public ghc-doclayout + (package + (name "ghc-doclayout") + (version "0.3") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/doclayout/" + "doclayout-" version ".tar.gz")) + (sha256 + (base32 "1wmnwq28jcyd6c80srivsnd5znmyl9sgmwwnlk2crwiiwqadbal7")))) + (build-system haskell-build-system) + (inputs + `(("ghc-safe" ,ghc-safe))) + (native-inputs + `(("ghc-tasty" ,ghc-tasty) + ("ghc-tasty-golden" ,ghc-tasty-golden) + ("ghc-tasty-hunit" ,ghc-tasty-hunit))) + (home-page "https://github.com/jgm/doclayout") + (synopsis "Pretty-printing library for laying out text documents") + (description + "doclayout is a pretty-printing library for laying out text documents, +with several features not present in pretty-printing libraries designed for +code. It was designed for use in @code{Pandoc}.") + (license license:bsd-3))) + (define-public ghc-pandoc (package (name "ghc-pandoc") diff --git a/gnu/packages/i2p.scm b/gnu/packages/i2p.scm index f8c3f3bb5c..a317cd590c 100644 --- a/gnu/packages/i2p.scm +++ b/gnu/packages/i2p.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2019 Jakob L. Kreuze <zerodaysfordays@sdf.lonestar.org> +;;; Copyright © 2019 Jakob L. Kreuze <zerodaysfordays@sdf.org> ;;; ;;; This file is part of GNU Guix. ;;; diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index c3f6502d45..61cf8db9ea 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -359,42 +359,42 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." "linux-" version ".tar.xz")) (sha256 hash))) -(define-public linux-libre-5.4-version "5.4.17") +(define-public linux-libre-5.4-version "5.4.18") (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "1fbl5knf6pini9lsx8mqkdmf3qbsydqvaxggh6nd1vk9mzv2npwl"))) + (hash (base32 "12ad4fnxag16ar2afiljv4nnv15i4f493sz6m7i9qgjld7yz3scj"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) -(define-public linux-libre-4.19-version "4.19.101") +(define-public linux-libre-4.19-version "4.19.102") (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "1i4bkwankl5q95kgqmmyzdkwmf3b8ppkb8ild9bw12mkpmm1a9my"))) + (hash (base32 "05g0gkwvlwfx1wlinnwm3ryq7fblmxjzhp12g6vx2jbvvn486bih"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -(define-public linux-libre-4.14-version "4.14.169") +(define-public linux-libre-4.14-version "4.14.170") (define-public linux-libre-4.14-pristine-source (let ((version linux-libre-4.14-version) - (hash (base32 "0jc24zvqz3vsv65xxcivzkj6nv27vsy62l50n2h1ysy5jdwsk3nq"))) + (hash (base32 "1hqp3spi4cqgkqkzx5g2nbp6isz0kdcsj56ilsp6siqiglj662ll"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.14))) -(define-public linux-libre-4.9-version "4.9.212") +(define-public linux-libre-4.9-version "4.9.213") (define-public linux-libre-4.9-pristine-source (let ((version linux-libre-4.9-version) - (hash (base32 "0c5yjilaq86j6i2hzlxbp2ia7jhnf7kv952ffv7jxdf90sk3irxd"))) + (hash (base32 "0r7bqpvbpiiniwsm338b38mv6flfgm1r09avxqsakhkh8rvgz1dg"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.9))) -(define-public linux-libre-4.4-version "4.4.212") +(define-public linux-libre-4.4-version "4.4.213") (define-public linux-libre-4.4-pristine-source (let ((version linux-libre-4.4-version) - (hash (base32 "0mx3qyj6w6h7gw7drsfsgl4iyz1695sjnf9hqh4kczci48kw5rj7"))) + (hash (base32 "1cmwn9zvz14jqjy6qkszglhs2p5h6yh82b2269cbzvibg8y3rxq0"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.4))) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index b97ad806ea..d361c7d5ab 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -4120,7 +4120,7 @@ Lisp.") `(("sbcl-cffi-grovel" ,sbcl-cffi-grovel) ("sbcl-cffi" ,sbcl-cffi))) (build-system asdf-build-system/sbcl) - (home-page "http://common-lisp.net/projects/iolib/") + (home-page "https://github.com/sionescu/static-vectors") (synopsis "Allocate SIMPLE-ARRAYs in static memory") (description "With @code{static-vectors}, you can create vectors allocated in static @@ -5965,6 +5965,42 @@ This package uses fare-quasiquote with named-readtable."))) (sbcl-package->cl-source-package sbcl-fare-quasiquote-readtable)) ;; TODO: Add support for component-less system in asdf-build-system/sbcl. +(define-public sbcl-fare-quasiquote-extras + (package + (inherit sbcl-fare-quasiquote) + (name "sbcl-fare-quasiquote-extras") + (build-system asdf-build-system/sbcl) + (inputs + `(("fare-quasiquote-optima" ,sbcl-fare-quasiquote-optima) + ("fare-quasiquote-readtable" ,sbcl-fare-quasiquote-readtable))) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'build + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (lib (string-append out "/lib/" (%lisp-type)))) + (mkdir-p lib) + (install-file "fare-quasiquote-extras.asd" lib) + #t))) + (add-after 'create-asd-file 'fix-asd-file + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (lib (string-append out "/lib/" (%lisp-type))) + (asd (string-append lib "/fare-quasiquote-extras.asd"))) + (substitute* asd + ((":class") + "") + (("asdf/bundle:prebuilt-system") + "") + ((":components") + "") + (("\\(\\(:compiled-file \"fare-quasiquote-extras--system\"\\)\\)") + ""))) + #t))))) + (description "This library combines @code{fare-quasiquote-readtable} and +@code{fare-quasiquote-optima}."))) + (define-public cl-fare-quasiquote-extras (package (inherit cl-fare-quasiquote) @@ -7157,7 +7193,7 @@ implementation specific equivalent.") ("trivial-garbage" ,sbcl-trivial-garbage) ("bordeaux-threads" ,sbcl-bordeaux-threads) ("named-readtables" ,sbcl-named-readtables) - ("fare-quasiquote-extras" ,cl-fare-quasiquote-extras) + ("fare-quasiquote-extras" ,sbcl-fare-quasiquote-extras) ("parse-declarations-1.0" ,sbcl-parse-declarations) ("global-vars" ,sbcl-global-vars) ("trivial-file-size" ,sbcl-trivial-file-size) diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index f82288a5ac..369d4fc4ec 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -797,7 +797,7 @@ enough to play the original mainframe Zork all the way through.") (define-public txr (package (name "txr") - (version "230") + (version "232") (source (origin (method git-fetch) @@ -808,7 +808,7 @@ enough to play the original mainframe Zork all the way through.") (patches (search-patches "txr-shell.patch")) (sha256 (base32 - "1ma6nbqsnl4f8ndh47zzc8n5vzcny66v0z3ndddgm3g0bqaxzjzm")))) + "1vcnask4a1rxrljp4rcbkfihrndkv25l256l125vv39gjhf315xp")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("cc=gcc") diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm index a69291ec8a..45e08e066a 100644 --- a/gnu/packages/lua.scm +++ b/gnu/packages/lua.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2016 José Miguel Sánchez García <jmi2k@openmailbox.org> ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Fis Trivial <ybbs.daans@hotmail.com> +;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; ;;; This file is part of GNU Guix. ;;; @@ -34,6 +35,7 @@ #:use-module (guix utils) #:use-module (guix build-system gnu) #:use-module (guix build-system cmake) + #:use-module (guix build-system trivial) #:use-module (gnu packages) #:use-module (gnu packages readline) #:use-module (gnu packages tls) @@ -338,40 +340,130 @@ secure session between the peers.") (define-public lua5.2-sec (make-lua-sec "lua5.2-sec" lua-5.2)) -(define-public lua-lgi +(define-public lua-penlight + (package + (name "lua-penlight") + (version "1.7.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Tieske/Penlight.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0qc2d1riyr4b5a0gnsmdw2lz5pw65s4ac60hc34w3mmk9l6yg6nl")))) + (build-system trivial-build-system) + (inputs + `(("lua" ,lua))) + (propagated-inputs + `(("lua-filesystem" ,lua-filesystem))) + (arguments + `(#:modules ((guix build utils)) + #:builder + (begin + (use-modules (guix build utils)) + (let* ((source (assoc-ref %build-inputs "source")) + (lua-version ,(version-major+minor (package-version lua))) + (destination (string-append (assoc-ref %outputs "out") + "/share/lua/" lua-version))) + (mkdir-p destination) + (with-directory-excursion source + (copy-recursively "lua/" destination))) + #t))) + (home-page "http://tieske.github.io/Penlight/") + (synopsis "Collection of general purpose libraries for the Lua language") + (description "Penlight is a set of pure Lua libraries focusing on +input data handling (such as reading configuration files), functional +programming (such as map, reduce, placeholder expressions,etc), and OS +path management. Much of the functionality is inspired by the Python +standard libraries.") + (license license:expat))) + +(define-public lua-ldoc + (package + (name "lua-ldoc") + (version "1.4.6") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/stevedonovan/LDoc.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1h0cf7bp4am54r0j8lhjs2l1c7q5vz74ba0jvw9qdbaqimls46g8")))) + (build-system gnu-build-system) + (inputs + `(("lua" ,lua))) + (propagated-inputs + `(("lua-penlight" ,lua-penlight))) + (arguments + `(#:tests? #f ;tests must run after installation. + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-installation-directory + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (lua-version ,(version-major+minor (package-version lua)))) + (substitute* "makefile" + (("LUA=.*") "#\n") + (("(LUA_PREFIX=).*" _ prefix) + (string-append prefix out "\n")) + (("(LUA_BINDIR=).*" _ prefix) + (string-append prefix out "/bin\n")) + (("(LUA_SHAREDIR=).*" _ prefix) + (string-append prefix out "/share/lua/" lua-version "\n")))) + #t)) + (delete 'configure) + (add-before 'install 'create-bin-directory + (lambda* (#:key outputs #:allow-other-keys) + (mkdir-p (string-append (assoc-ref outputs "out") "/bin")) + #t))))) + (home-page "http://stevedonovan.github.io/ldoc/") + (synopsis "Lua documentation generator") + (description + "LDoc is a LuaDoc-compatible documentation generation system for +Lua source code. It parses the declaration and documentation comments +in a set of Lua source files and produces a set of XHTML pages +describing the commented declarations and functions.") + (license license:expat))) + +(define (make-lua-lgi name lua) (package - (name "lua-lgi") + (name name) (version "0.9.2") (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/pavouk/lgi") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "03rbydnj411xpjvwsyvhwy4plm96481d7jax544mvk7apd8sd5jj")))) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/pavouk/lgi") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "03rbydnj411xpjvwsyvhwy4plm96481d7jax544mvk7apd8sd5jj")))) (build-system gnu-build-system) (arguments - '(#:make-flags (list "CC=gcc" - (string-append "PREFIX=" (assoc-ref %outputs "out"))) + `(#:make-flags + (list "CC=gcc" + (string-append "PREFIX=" (assoc-ref %outputs "out"))) #:phases (modify-phases %standard-phases - (delete 'configure) ; no configure script + (delete 'configure) ; no configure script (add-before 'build 'set-env (lambda* (#:key inputs #:allow-other-keys) - ;; we need to load cairo dynamically - (let* ((cairo (string-append - (assoc-ref inputs "cairo") "/lib" ))) + ;; We need to load cairo dynamically. + (let* ((cairo (string-append (assoc-ref inputs "cairo") "/lib"))) (setenv "LD_LIBRARY_PATH" cairo) #t))) (add-before 'build 'set-lua-version (lambda _ - ;; lua version and therefore install directories are hardcoded - ;; FIXME: This breaks when we update lua to >=5.3 + ;; Lua version and therefore install directories are hardcoded. (substitute* "./lgi/Makefile" - (("LUA_VERSION=5.1") "LUA_VERSION=5.2")) + (("LUA_VERSION=5.1") + (format #f + "LUA_VERSION=~a" + ,(version-major+minor (package-version lua))))) #t)) (add-before 'check 'skip-test-gtk (lambda _ @@ -392,26 +484,35 @@ secure session between the peers.") (assoc-ref inputs "xorg-server"))) (setenv "DISPLAY" ":1") #t))))) + (native-inputs + `(("dbus" ,dbus) ;tests use 'dbus-run-session' + ("pkg-config" ,pkg-config))) (inputs - `(("gobject-introspection" ,gobject-introspection) + `(("cairo" ,cairo) ("glib" ,glib) - ("pango" ,pango) + ("gobject-introspection" ,gobject-introspection) ("gtk" ,gtk+-2) - ("lua" ,lua) - ("cairo" ,cairo) ("libffi" ,libffi) + ("lua" ,lua) + ("pango" ,pango) ("xorg-server" ,xorg-server))) - (native-inputs - `(("pkg-config" ,pkg-config) - ("dbus" ,dbus))) ;tests use 'dbus-run-session' (home-page "https://github.com/pavouk/lgi/") (synopsis "Lua bridge to GObject based libraries") (description - "LGI is gobject-introspection based dynamic Lua binding to GObject -based libraries. It allows using GObject-based libraries directly from Lua. + "LGI is gobject-introspection based dynamic Lua binding to GObject based +libraries. It allows using GObject-based libraries directly from Lua. Notable examples are GTK+, GStreamer and Webkit.") (license license:expat))) +(define-public lua-lgi + (make-lua-lgi "lua-lgi" lua)) + +(define-public lua5.1-lgi + (make-lua-lgi "lua5.1-lgi" lua-5.1)) + +(define-public lua5.2-lgi + (make-lua-lgi "lua5.2-lgi" lua-5.2)) + (define (make-lua-lpeg name lua) (package (name name) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 3ef04d7202..ea3bbe1cca 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -21,7 +21,7 @@ ;;; Copyright © 2018 Björn Höfling <bjoern.hoefling@bjoernhoefling.de> ;;; Copyright © 2019 Gabriel Hondet <gabrielhondet@gmail.com> ;;; Copyright © 2019 Timotej Lazar <timotej.lazar@araneo.si> -;;; Copyright © 2019 Jakob L. Kreuze <zerodaysfordays@sdf.lonestar.org> +;;; Copyright © 2019 Jakob L. Kreuze <zerodaysfordays@sdf.org> ;;; Copyright © 2019 raingloom <raingloom@protonmail.com> ;;; Copyright © 2019 David Wilson <david@daviwil.com> ;;; Copyright © 2019, 2020 Alexandros Theodotou <alex@zrythm.org> diff --git a/gnu/packages/musl.scm b/gnu/packages/musl.scm index 6a6344efb5..7e4e27d00d 100644 --- a/gnu/packages/musl.scm +++ b/gnu/packages/musl.scm @@ -44,7 +44,7 @@ (synopsis "Small C standard library") (description "musl is a simple and lightweight C standard library. It strives to be correct in the sense of standards-conformance and safety.") - (home-page "https://www.musl-libc.org") + (home-page "https://musl.libc.org") ;; Musl as a whole is released under the Expat license. Parts of it are ;; derived from various third-party projects that are released under ;; non-copyleft licenses. See the COPYRIGHT file for details. diff --git a/gnu/packages/nano.scm b/gnu/packages/nano.scm index 0aceef83ea..ff7abfad73 100644 --- a/gnu/packages/nano.scm +++ b/gnu/packages/nano.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012 Nikita Karetnikov <nikita@karetnikov.org> -;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016 Rene Saavedra <rennes@openmailbox.org> ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; @@ -30,13 +30,13 @@ (define-public nano (package (name "nano") - (version "4.7") + (version "4.8") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/nano/nano-" version ".tar.xz")) (sha256 - (base32 "1x9nqy2kgaz6087p63i71gdjsqbdc9jjpx1ymlyclfakvsby3h2q")))) + (base32 "0qwf4ld0fl2bpnjh23z2pq7wcs6d14m2364360xmf7dbd0fgcj63")))) (build-system gnu-build-system) (inputs `(("gettext" ,gettext-minimal) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index ed339524c0..e8ad57e8ae 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -36,6 +36,7 @@ ;;; Copyright © 2019 Jan Wielkiewicz <tona_kosmicznego_smiecia@interia.pl> ;;; Copyright © 2019 Daniel Schaefer <git@danielschaefer.me> ;;; Copyright © 2019 Diego N. Barbato <dnbarbato@posteo.de> +;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -2824,6 +2825,43 @@ easy-to-understand binary values.") (home-page "http://jodies.de/ipcalc") (license license:gpl2+))) +(define-public tunctl + (package + (name "tunctl") + (version "1.5") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/tunctl/tunctl/" version "/" + "tunctl-" version ".tar.gz")) + (sha256 + (base32 "1zsgn7w6l2zh2q0j6qaw8wsx981qcr536qlz1lgb3b5zqr66qama")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (delete 'bootstrap) ;there is no configure.ac file + (delete 'configure) ;there is no configure script + (delete 'check) ;there are no tests + (replace 'build + (lambda _ + (setenv "CC" "gcc") + (invoke "make" "tunctl"))) + ;; TODO: Requires docbook2x to generate man page from SGML. + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin"))) + (install-file "tunctl" bin)) + #t))))) + (home-page "http://tunctl.sourceforge.net") + (synopsis "Utility to set up and maintain TUN/TAP network interfaces") + (description "Tunctl is used to set up and maintain persistent TUN/TAP +network interfaces, enabling user applications to simulate network traffic. +Such interfaces are useful for VPN software, virtualization, emulation, +simulation, and a number of other applications.") + (license license:gpl2))) + (define-public vde2 (package (name "vde2") diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm index 5bed372432..f1060bb66b 100644 --- a/gnu/packages/parallel.scm +++ b/gnu/packages/parallel.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014 Eric Bavier <bavier@member.fsf.org> +;;; Copyright © 2013, 2014, 2020 Eric Bavier <bavier@posteo.net> ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016 Pjotr Prins <pjotr.guix@thebird.nl> @@ -54,14 +54,14 @@ (define-public parallel (package (name "parallel") - (version "20191222") + (version "20200122") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/parallel/parallel-" version ".tar.bz2")) (sha256 - (base32 "0xvw578440s9cc382n7z2l8npj30nwr6wwmkyxn2pj1pcszfjagy")))) + (base32 "070cv3b1ja8lmn2a5h1ry6b5y35jpm4z5r9yv9nb5kd5im11wvqi")))) (build-system gnu-build-system) (arguments `(#:phases diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index 8d74490d23..1e93e5d9ad 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -25,6 +25,7 @@ ;;; Copyright © 2019 Jens Mølgaard <jens@zete.tk> ;;; Copyright © 2019 Tanguy Le Carrour <tanguy@bioneland.org> ;;; Copyright © 2020 Guillaume Le Vaillant <glv@posteo.net> +;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re> ;;; ;;; This file is part of GNU Guix. ;;; @@ -497,17 +498,11 @@ any X11 window.") "sed" "tree" "which" "xclip")))) (wrap-program (string-append out "/bin/pass") `("PATH" ":" prefix (,(string-join path ":")))) - #t))) - (add-after 'wrap-path 'install-shell-completions - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bashcomp (string-append out "/etc/bash_completion.d"))) - ;; TODO: install fish and zsh completions. - (mkdir-p bashcomp) - (copy-file "src/completion/pass.bash-completion" - (string-append bashcomp "/pass")) #t)))) - #:make-flags (list "CC=gcc" (string-append "PREFIX=" %output)) + #:make-flags (list "CC=gcc" (string-append "PREFIX=" %output) + "WITH_ALLCOMP=yes" + (string-append "BASHCOMPDIR=" + %output "/etc/bash_completion.d")) ;; Parallel tests may cause a race condition leading to a ;; timeout in some circumstances. #:parallel-tests? #f diff --git a/gnu/packages/patches/docker-adjust-tests-for-changes-in-go.patch b/gnu/packages/patches/docker-adjust-tests-for-changes-in-go.patch deleted file mode 100644 index 82d92cd4de..0000000000 --- a/gnu/packages/patches/docker-adjust-tests-for-changes-in-go.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 4983ef7c1693ad6dfbe4e3809b12541241d7ff56 Mon Sep 17 00:00:00 2001 -From: Sebastiaan van Stijn <github@gone.nl> -Date: Wed, 14 Aug 2019 02:51:08 +0200 -Subject: [PATCH] Adjust tests for changes in Go 1.12.8 / 1.11.13 - -``` -00:38:11 === Failed -00:38:11 === FAIL: opts TestParseDockerDaemonHost (0.00s) -00:38:11 hosts_test.go:87: tcp tcp:a.b.c.d address expected error "Invalid bind address format: tcp:a.b.c.d" return, got "parse tcp://tcp:a.b.c.d: invalid port \":a.b.c.d\" after host" and addr -00:38:11 hosts_test.go:87: tcp tcp:a.b.c.d/path address expected error "Invalid bind address format: tcp:a.b.c.d/path" return, got "parse tcp://tcp:a.b.c.d/path: invalid port \":a.b.c.d\" after host" and addr -00:38:11 -00:38:11 === FAIL: opts TestParseTCP (0.00s) -00:38:11 hosts_test.go:129: tcp tcp:a.b.c.d address expected error Invalid bind address format: tcp:a.b.c.d return, got parse tcp://tcp:a.b.c.d: invalid port ":a.b.c.d" after host and addr -00:38:11 hosts_test.go:129: tcp tcp:a.b.c.d/path address expected error Invalid bind address format: tcp:a.b.c.d/path return, got parse tcp://tcp:a.b.c.d/path: invalid port ":a.b.c.d" after host and addr -``` - -Signed-off-by: Sebastiaan van Stijn <github@gone.nl> -Upstream-commit: 683766613a8c1dca8f95b19ddb7e083bb3aef266 -Component: engine ---- - opts/hosts_test.go | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/opts/hosts_test.go b/opts/hosts_test.go -index 8c54ec0f4b..7a0a943adf 100644 ---- a/opts/hosts_test.go -+++ b/opts/hosts_test.go -@@ -53,8 +53,8 @@ func TestParseHost(t *testing.T) { - func TestParseDockerDaemonHost(t *testing.T) { - invalids := map[string]string{ - -- "tcp:a.b.c.d": "Invalid bind address format: tcp:a.b.c.d", -- "tcp:a.b.c.d/path": "Invalid bind address format: tcp:a.b.c.d/path", -+ "tcp:a.b.c.d": "", -+ "tcp:a.b.c.d/path": "", - "udp://127.0.0.1": "Invalid bind address format: udp://127.0.0.1", - "udp://127.0.0.1:2375": "Invalid bind address format: udp://127.0.0.1:2375", - "tcp://unix:///run/docker.sock": "Invalid proto, expected tcp: unix:///run/docker.sock", -@@ -83,7 +83,7 @@ func TestParseDockerDaemonHost(t *testing.T) { - "localhost:5555/path": "tcp://localhost:5555/path", - } - for invalidAddr, expectedError := range invalids { -- if addr, err := parseDaemonHost(invalidAddr); err == nil || err.Error() != expectedError { -+ if addr, err := parseDaemonHost(invalidAddr); err == nil || expectedError != "" && err.Error() != expectedError { - t.Errorf("tcp %v address expected error %q return, got %q and addr %v", invalidAddr, expectedError, err, addr) - } - } -@@ -99,8 +99,8 @@ func TestParseTCP(t *testing.T) { - defaultHTTPHost = "tcp://127.0.0.1:2376" - ) - invalids := map[string]string{ -- "tcp:a.b.c.d": "Invalid bind address format: tcp:a.b.c.d", -- "tcp:a.b.c.d/path": "Invalid bind address format: tcp:a.b.c.d/path", -+ "tcp:a.b.c.d": "", -+ "tcp:a.b.c.d/path": "", - "udp://127.0.0.1": "Invalid proto, expected tcp: udp://127.0.0.1", - "udp://127.0.0.1:2375": "Invalid proto, expected tcp: udp://127.0.0.1:2375", - } -@@ -125,7 +125,7 @@ func TestParseTCP(t *testing.T) { - "localhost:5555/path": "tcp://localhost:5555/path", - } - for invalidAddr, expectedError := range invalids { -- if addr, err := ParseTCPAddr(invalidAddr, defaultHTTPHost); err == nil || err.Error() != expectedError { -+ if addr, err := ParseTCPAddr(invalidAddr, defaultHTTPHost); err == nil || expectedError != "" && err.Error() != expectedError { - t.Errorf("tcp %v address expected error %v return, got %s and addr %v", invalidAddr, expectedError, err, addr) - } - } diff --git a/gnu/packages/patches/docker-engine-test-noinstall.patch b/gnu/packages/patches/docker-engine-test-noinstall.patch deleted file mode 100644 index 85d56a3465..0000000000 --- a/gnu/packages/patches/docker-engine-test-noinstall.patch +++ /dev/null @@ -1,23 +0,0 @@ -Last-Update: 2018-06-18 -Forwarded: not-needed -Author: Dmitry Smirnov <onlyjob@debian.org> -Description: prevents test-time installation that causes FTBFS. -~~~~ - go test net: open /usr/lib/go-1.10/pkg/linux_amd64/net.a: permission denied -~~~~ - ---- a/hack/test/unit -+++ b/hack/test/unit -@@ -18,12 +18,8 @@ - - exclude_paths="/vendor/|/integration" - pkg_list=$(go list $TESTDIRS | grep -vE "($exclude_paths)") - --# install test dependencies once before running tests for each package. This --# significantly reduces the runtime. --go test -i "${BUILDFLAGS[@]}" $pkg_list -- - for pkg in $pkg_list; do - go test "${BUILDFLAGS[@]}" \ - -cover \ - -coverprofile=profile.out \ diff --git a/gnu/packages/patches/docker-use-fewer-modprobes.patch b/gnu/packages/patches/docker-use-fewer-modprobes.patch deleted file mode 100644 index 4e4a45b6ce..0000000000 --- a/gnu/packages/patches/docker-use-fewer-modprobes.patch +++ /dev/null @@ -1,137 +0,0 @@ -This patch makes docker find out whether a filesystem type is supported -by trying to mount a filesystem of that type rather than invoking "modprobe". - -See <https://github.com/moby/moby/pull/38930>. - ---- docker-18.09.0-checkout/daemon/graphdriver/overlay/overlay.go.orig 1970-01-01 01:00:00.000000000 +0100 -+++ docker-18.09.0-checkout/daemon/graphdriver/overlay/overlay.go 2019-03-19 09:16:03.487087490 +0100 -@@ -8,7 +8,6 @@ - "io" - "io/ioutil" - "os" -- "os/exec" - "path" - "path/filepath" - "strconv" -@@ -201,9 +200,16 @@ - } - - func supportsOverlay() error { -- // We can try to modprobe overlay first before looking at -- // proc/filesystems for when overlay is supported -- exec.Command("modprobe", "overlay").Run() -+ // Access overlay filesystem so that Linux loads it (if possible). -+ mountTarget, err := ioutil.TempDir("", "supportsOverlay") -+ if err != nil { -+ logrus.WithField("storage-driver", "overlay2").Error("Could not create temporary directory, so assuming that 'overlay' is not supported.") -+ return graphdriver.ErrNotSupported -+ } else { -+ /* The mounting will fail--after the module has been loaded.*/ -+ defer os.RemoveAll(mountTarget) -+ unix.Mount("overlay", mountTarget, "overlay", 0, "") -+ } - - f, err := os.Open("/proc/filesystems") - if err != nil { ---- docker-18.09.0-checkout/daemon/graphdriver/overlay2/overlay.go.orig 2019-03-18 23:42:23.728525231 +0100 -+++ docker-18.09.0-checkout/daemon/graphdriver/overlay2/overlay.go 2019-03-19 08:54:31.411906113 +0100 -@@ -10,7 +10,6 @@ - "io" - "io/ioutil" - "os" -- "os/exec" - "path" - "path/filepath" - "strconv" -@@ -261,9 +260,16 @@ - } - - func supportsOverlay() error { -- // We can try to modprobe overlay first before looking at -- // proc/filesystems for when overlay is supported -- exec.Command("modprobe", "overlay").Run() -+ // Access overlay filesystem so that Linux loads it (if possible). -+ mountTarget, err := ioutil.TempDir("", "supportsOverlay2") -+ if err != nil { -+ logrus.WithField("storage-driver", "overlay2").Error("Could not create temporary directory, so assuming that 'overlay' is not supported.") -+ return graphdriver.ErrNotSupported -+ } else { -+ /* The mounting will fail--after the module has been loaded.*/ -+ defer os.RemoveAll(mountTarget) -+ unix.Mount("overlay", mountTarget, "overlay", 0, "") -+ } - - f, err := os.Open("/proc/filesystems") - if err != nil { ---- docker-18.09.0-checkout/daemon/graphdriver/devmapper/deviceset.go.orig 2019-03-19 09:19:16.592844887 +0100 -+++ docker-18.09.0-checkout/daemon/graphdriver/devmapper/deviceset.go 2019-03-19 09:21:18.019361761 +0100 -@@ -540,8 +539,14 @@ - return err // error text is descriptive enough - } - -- // Check if kernel supports xfs filesystem or not. -- exec.Command("modprobe", "xfs").Run() -+ mountTarget, err := ioutil.TempDir("", "supportsXFS") -+ if err != nil { -+ return errors.Wrapf(err, "error checking for xfs support") -+ } else { -+ /* The mounting will fail--after the module has been loaded.*/ -+ defer os.RemoveAll(mountTarget) -+ unix.Mount("none", mountTarget, "xfs", 0, "") -+ } - - f, err := os.Open("/proc/filesystems") - if err != nil { ---- docker-18.09.0-checkout/vendor/github.com/docker/libnetwork/iptables/iptables.go.orig 2019-03-19 09:47:19.430111170 +0100 -+++ docker-18.09.0-checkout/vendor/github.com/docker/libnetwork/iptables/iptables.go 2019-03-19 10:38:01.445136177 +0100 -@@ -72,11 +71,12 @@ - } - - func probe() { -- if out, err := exec.Command("modprobe", "-va", "nf_nat").CombinedOutput(); err != nil { -- logrus.Warnf("Running modprobe nf_nat failed with message: `%s`, error: %v", strings.TrimSpace(string(out)), err) -+ path, err := exec.LookPath("iptables") -+ if err != nil { -+ return - } -- if out, err := exec.Command("modprobe", "-va", "xt_conntrack").CombinedOutput(); err != nil { -- logrus.Warnf("Running modprobe xt_conntrack failed with message: `%s`, error: %v", strings.TrimSpace(string(out)), err) -+ if out, err := exec.Command(path, "--wait", "-t", "nat", "-L", "-n").CombinedOutput(); err != nil { -+ logrus.Warnf("Running iptables --wait -t nat -L -n failed with message: `%s`, error: %v", strings.TrimSpace(string(out)), err) - } - } - ---- docker-18.09.0-checkout/vendor/github.com/docker/libnetwork/ns/init_linux.go.orig 2019-03-19 11:23:20.738316699 +0100 -+++ docker-18.09.0-checkout/vendor/github.com/docker/libnetwork/ns/init_linux.go 2019-03-19 11:27:57.149753073 +0100 -@@ -76,12 +76,8 @@ func NlHandle() *netlink.Handle { - func getSupportedNlFamilies() []int { - fams := []int{syscall.NETLINK_ROUTE} - // NETLINK_XFRM test -- if err := loadXfrmModules(); err != nil { -- if checkXfrmSocket() != nil { -- logrus.Warnf("Could not load necessary modules for IPSEC rules: %v", err) -- } else { -- fams = append(fams, syscall.NETLINK_XFRM) -- } -+ if err := checkXfrmSocket(); err != nil { -+ logrus.Warnf("Could not load necessary modules for IPSEC rules: %v", err) - } else { - fams = append(fams, syscall.NETLINK_XFRM) - } -@@ -99,16 +95,6 @@ func getSupportedNlFamilies() []int { - return fams - } - --func loadXfrmModules() error { -- if out, err := exec.Command("modprobe", "-va", "xfrm_user").CombinedOutput(); err != nil { -- return fmt.Errorf("Running modprobe xfrm_user failed with message: `%s`, error: %v", strings.TrimSpace(string(out)), err) -- } -- if out, err := exec.Command("modprobe", "-va", "xfrm_algo").CombinedOutput(); err != nil { -- return fmt.Errorf("Running modprobe xfrm_algo failed with message: `%s`, error: %v", strings.TrimSpace(string(out)), err) -- } -- return nil --} -- - // API check on required xfrm modules (xfrm_user, xfrm_algo) - func checkXfrmSocket() error { - fd, err := syscall.Socket(syscall.AF_NETLINK, syscall.SOCK_RAW, syscall.NETLINK_XFRM) diff --git a/gnu/packages/patches/reprotest-support-guix.patch b/gnu/packages/patches/reprotest-support-guix.patch new file mode 100644 index 0000000000..621c4e3359 --- /dev/null +++ b/gnu/packages/patches/reprotest-support-guix.patch @@ -0,0 +1,79 @@ +From 31bd4fe777cbff3ebca74115e5735a8b8f584fa7 Mon Sep 17 00:00:00 2001 +From: Vagrant Cascadian <vagrant@reproducible-builds.org> +Date: Thu, 6 Feb 2020 23:17:58 -0800 +Subject: [PATCH] Add support for GNU Guix. + +--- + reprotest/lib/adt_testbed.py | 2 ++ + reprotest/lib/system_interface/guix.py | 39 ++++++++++++++++++++++++++ + 2 files changed, 41 insertions(+) + create mode 100644 reprotest/lib/system_interface/guix.py + +diff --git a/reprotest/lib/adt_testbed.py b/reprotest/lib/adt_testbed.py +index ef704d6..60bf763 100644 +--- a/reprotest/lib/adt_testbed.py ++++ b/reprotest/lib/adt_testbed.py +@@ -40,6 +40,7 @@ import urllib.parse + from reprotest.lib.system_interface.debian import DebianInterface + from reprotest.lib.system_interface.arch import ArchInterface + from reprotest.lib.system_interface.fedora import FedoraInterface ++from reprotest.lib.system_interface.guix import GuixInterface + from reprotest.lib import adtlog + from reprotest.lib import VirtSubproc + +@@ -47,6 +48,7 @@ SYSTEM_INTERFACES = { + 'debian': DebianInterface, + 'arch': ArchInterface, + 'fedora': FedoraInterface, ++ 'guix': GuixInterface, + } + + timeouts = { +diff --git a/reprotest/lib/system_interface/guix.py b/reprotest/lib/system_interface/guix.py +new file mode 100644 +index 0000000..2b06104 +--- /dev/null ++++ b/reprotest/lib/system_interface/guix.py +@@ -0,0 +1,39 @@ ++# adt_testbed.py is part of autopkgtest ++# autopkgtest is a tool for testing Debian binary packages. The ++# system_interface module is an addition for reprotest to make ++# this module distro-agnostic ++# ++# autopkgtest is Copyright (C) 2006-2015 Canonical Ltd. ++# the system_interface module is Copyright (C) 2017 Santiago Torres-Arias ++# ++# This program 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 2 of the License, or ++# (at your option) any later version. ++# ++# This program 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 this program; if not, write to the Free Software ++# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++# ++# See the file CREDITS for a full list of credits information (often ++# installed as /usr/share/doc/autopkgtest/CREDITS). ++import subprocess ++ ++from . import SystemInterface ++ ++class GuixInterface(SystemInterface): ++ """ ++ SystemInterface implementation for GNU Guix hosts. Contains commands that ++ are specific to the GNU Guix toolchain. ++ """ ++ ++ def get_arch(self): ++ return ['uname', '-m'] ++ ++ def can_query_packages(self): ++ return False +-- +2.20.1 + diff --git a/gnu/packages/patches/rust-openssl-sys-no-vendor.patch b/gnu/packages/patches/rust-openssl-sys-no-vendor.patch new file mode 100644 index 0000000000..78a6b5e3f7 --- /dev/null +++ b/gnu/packages/patches/rust-openssl-sys-no-vendor.patch @@ -0,0 +1,23 @@ +https://sources.debian.org/data/main/r/rust-openssl-sys/0.9.53-1/debian/patches/disable-vendor.patch +"MIT" licensed according to debian/copyright file +slightly modified to only change the vendored openssl-src dependency + +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -31,14 +31,11 @@ + [build-dependencies.cc] + version = "1.0" + +-[build-dependencies.openssl-src] +-version = "111.0.1" +-optional = true +- + [build-dependencies.pkg-config] + version = "0.3.9" + + [features] + vendored = ["openssl-src"] ++openssl-src = [] + [target."cfg(target_env = \"msvc\")".build-dependencies.vcpkg] + version = "0.2" + diff --git a/gnu/packages/patchutils.scm b/gnu/packages/patchutils.scm index 80c454a5c4..e32e6c7b12 100644 --- a/gnu/packages/patchutils.scm +++ b/gnu/packages/patchutils.scm @@ -322,7 +322,7 @@ you to figure out what is going on in that merge you keep avoiding.") (define-public patchwork (package (name "patchwork") - (version "2.1.4") + (version "2.1.5") (source (origin (method git-fetch) (uri (git-reference @@ -331,7 +331,7 @@ you to figure out what is going on in that merge you keep avoiding.") (file-name (git-file-name name version)) (sha256 (base32 - "0zi1hcqb0pi2diyznbv0c1631qk4rx02zl8ghyrr59g3ljlyr18y")))) + "1n4hfwlgmw6mj5kp261zfx47mgb0l7g2yzl1rf0rnm8x69lr3as6")))) (build-system python-build-system) (arguments `(;; TODO: Tests require a running database diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 368b2ce69e..13cc384204 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -17,6 +17,7 @@ ;;; Copyright © 2019 Alex Griffin <a@ajgrf.com> ;;; Copyright © 2019 Ben Sturmfels <ben@sturm.com.au> ;;; Copyright © 2019 Hartmut Goebel <h.goebel@crazy-compilers.com> +;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; ;;; This file is part of GNU Guix. ;;; @@ -45,6 +46,7 @@ #:use-module (guix build-system python) #:use-module (guix build-system trivial) #:use-module (gnu packages) + #:use-module (gnu packages audio) #:use-module (gnu packages autotools) #:use-module (gnu packages backup) #:use-module (gnu packages base) @@ -55,6 +57,7 @@ #:use-module (gnu packages djvu) #:use-module (gnu packages fontutils) #:use-module (gnu packages game-development) + #:use-module (gnu packages gcc) #:use-module (gnu packages gettext) #:use-module (gnu packages ghostscript) #:use-module (gnu packages gl) @@ -74,6 +77,7 @@ #:use-module (gnu packages perl) #:use-module (gnu packages photo) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) #:use-module (gnu packages python-check) #:use-module (gnu packages python-web) @@ -82,8 +86,10 @@ #:use-module (gnu packages sdl) #:use-module (gnu packages sphinx) #:use-module (gnu packages sqlite) + #:use-module (gnu packages tex) #:use-module (gnu packages tls) #:use-module (gnu packages xdisorg) + #:use-module (gnu packages xml) #:use-module (gnu packages xorg) #:use-module (srfi srfi-1)) @@ -752,6 +758,94 @@ program capable of converting PDF into other formats.") using a stylus.") (license license:gpl2+))) +(define-public xournalpp + (package + (name "xournalpp") + (version "1.0.17") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/xournalpp/xournalpp.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0xw2mcgnm4sa9hrhfgp669lfypw97drxjmz5w8i5whaprpvmkxzw")))) + (build-system cmake-build-system) + (arguments + `(#:configure-flags (list "-DENABLE_CPPUNIT=ON") ;enable tests + #:imported-modules ((guix build glib-or-gtk-build-system) + ,@%cmake-build-system-modules) + #:modules (((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:) + (guix build cmake-build-system) + (guix build utils)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-permissions-on-po-files + (lambda _ + ;; Always generate translations. A recent upstream patch + ;; disabled it. + (substitute* "po/CMakeLists.txt" + (("gettext_create_translations \\(\"\\$\\{potfile\\}\"\\)") + "gettext_create_translations (\"${potfile}\" ALL)")) + ;; Make sure 'msgmerge' can modify the PO files. + (for-each (lambda (po) (chmod po #o666)) + (find-files "." "\\.po$")) + #t)) + (add-after 'install 'glib-or-gtk-wrap + (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))) + (native-inputs + `(("cppunit" ,cppunit) + ("gcc" ,gcc-8) ;requires gcc 8+ + ("gettext" ,gettext-minimal) + ("pkg-config" ,pkg-config))) + (inputs + `(("alsa-lib" ,alsa-lib) + ("glib" ,glib) + ("gtk+" ,gtk+) + ("libsndfile" ,libsndfile) + ("libxml2" ,libxml2) + ("libzip" ,libzip) + ("lua" ,lua) ;FIXME: It cannot find the Lua library. + ("poppler" ,poppler) + ("portaudio" ,portaudio) + ("texlive-bin" ,texlive-bin))) + (home-page "https://github.com/xournalpp/xournalpp") + (synopsis "Handwriting notetaking software with PDF annotation support") + (description "Xournal++ is a hand note taking software written in +C++ with the target of flexibility, functionality and speed. Stroke +recognizer and other parts are based on Xournal code. + +Xournal++ features: + +@itemize +@item Support for Pen pressure, e.g., Wacom Tablet +@item Support for annotating PDFs +@item Fill shape functionality +@item PDF Export (with and without paper style) +@item PNG Export (with and without transparent background) +@item Allow to map different tools / colors etc. to stylus buttons / +mouse buttons +@item Sidebar with Page Previews with advanced page sorting, PDF +Bookmarks and Layers (can be individually hidden, editing layer can be +selected) +@item enhanced support for image insertion +@item Eraser with multiple configurations +@item LaTeX support +@item bug reporting, autosave, and auto backup tools +@item Customizeable toolbar, with multiple configurations, e.g., to +optimize toolbar for portrait / landscape +@item Page Template definitions +@item Shape drawing (line, arrow, circle, rectangle) +@item Shape resizing and rotation +@item Rotation snapping every 45 degrees +@item Rect snapping to grid +@item Audio recording and playback alongside with handwritten notes +@item Multi Language Support, Like English, German, Italian... +@item Plugins using LUA Scripting +@end itemize") + (license license:gpl2+))) + (define-public python-reportlab (package (name "python-reportlab") diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 9fc3493a5d..f513a78f76 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -23,6 +23,7 @@ ;;; Copyright © 2018 Kei Kebreau <kkebreau@posteo.net> ;;; Copyright © 2019 Alex Griffin <a@ajgrf.com> ;;; Copyright © 2019 Stephen J. Scheck <sscheck@cpan.org> +;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -1380,6 +1381,26 @@ parser in your Perl programme and allows sharing configuration files between languages.") (license bsd-3))) +(define-public perl-config-grammar + (package + (name "perl-config-grammar") + (version "1.13") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://cpan/authors/id/D/DS/DSCHWEI/" + "Config-Grammar-" version ".tar.gz")) + (sha256 + (base32 "1qynf5bk6mnk90nggm3z8rdz2535kmqg46s0vj93pi68r6ia7cx8")))) + (build-system perl-build-system) + (home-page "https://metacpan.org/release/Config-Grammar") + (synopsis "Grammar-based config parser") + (description + "Config::Grammar is a module to parse configuration files. The +configuration may consist of multiple-level sections with assignments and +tabular data.") + (license (package-license perl)))) + (define-public perl-config-any (package (name "perl-config-any") diff --git a/gnu/packages/pulseaudio.scm b/gnu/packages/pulseaudio.scm index 2bbe6c5bdd..0c09b51744 100644 --- a/gnu/packages/pulseaudio.scm +++ b/gnu/packages/pulseaudio.scm @@ -42,6 +42,7 @@ #:use-module (gnu packages check) #:use-module (gnu packages dbm) #:use-module (gnu packages glib) + #:use-module (gnu packages gnome) #:use-module (gnu packages gtk) #:use-module (gnu packages libcanberra) #:use-module (gnu packages web) @@ -402,3 +403,42 @@ install one or more of the following packages alongside pulseaudio-dlna: "pamixer is like amixer but for PulseAudio, allowing easy control of the volume levels of the sinks (get, set, decrease, increase, toggle mute, etc).") (license l:gpl3+))) + +(define-public pasystray + (package + (name "pasystray") + (version "0.7.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/christophgysin/pasystray.git") + (commit (string-append name "-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0xx1bm9kimgq11a359ikabdndqg5q54pn1d1dyyjnrj0s41168fk")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'bootstrap 'remove-bootstrap.sh + (lambda _ + ;; Interferes with the bootstrap phase. + (delete-file "bootstrap.sh") + #t))))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("pkg-config" ,pkg-config))) + (inputs + `(("avahi" ,avahi) + ("gtk+" ,gtk+) + ("libnotify" ,libnotify) + ("libx11" ,libx11) + ("pulseaudio" ,pulseaudio))) + (home-page "https://github.com/christophgysin/pasystray") + (synopsis "PulseAudio controller for the system tray") + (description "@command{pasystray} enables control of various +PulseAudio server settings from the X11 system tray. See the project +README.md for a detailed list of features.") + (license l:lgpl2.1+))) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index dcc1595446..c32b3a1a95 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1990,6 +1990,28 @@ between Julian dates and Gregorian dates.") (define-public python2-jdcal (package-with-python2 python-jdcal)) +(define-public python-jsondiff + (package + (name "python-jsondiff") + (version "1.2.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "jsondiff" version)) + (sha256 + (base32 + "00v3689175aqzdscrxpffm712ylp8jvcpqdg51ca22ni6721p51l")))) + (build-system python-build-system) + (native-inputs + `(("python-nose" ,python-nose) + ("python-nose-random" ,python-nose-random))) + (home-page + "https://github.com/fzumstein/jsondiff") + (synopsis "Compare JSON and JSON-like structures in Python") + (description "@code{jsondiff} is a Python library which lets you +compare, diff, and patch JSON and JSON-like structures in Python.") + (license license:expat))) + (define-public python-jsonschema (package (name "python-jsonschema") @@ -2922,6 +2944,27 @@ for SSH and SFTP. It has the following main usages: @end itemize") (license license:asl2.0))) +(define-public python-rstr + (package + (name "python-rstr") + (version "2.2.6") + (source + (origin + (method url-fetch) + (uri (pypi-uri "rstr" version)) + (sha256 + (base32 + "197dw8mbq0pjjz1l6h1ksi62vgn7x55d373ch74y06744qiq5sjx")))) + (build-system python-build-system) + (home-page + "http://bitbucket.org/leapfrogdevelopment/rstr/overview") + (synopsis "Generate random strings in Python") + (description "This package provides a python module for generating +random strings of various types. It could be useful for fuzz testing, +generating dummy data, or other applications. It has no dependencies +outside the standard library.") + (license license:bsd-3))) + (define-public python-scp (package (name "python-scp") diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index 90bd146442..d1d7d225a7 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019, 2020 John Soo <jsoo1@asu.edu> ;;; Copyright © 2019, 2020 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -24,14 +25,182 @@ #:use-module (guix packages) #:use-module (gnu packages compression) #:use-module (gnu packages crates-io) + #:use-module (gnu packages jemalloc) #:use-module (gnu packages pkg-config) #:use-module (gnu packages tls) #:use-module (gnu packages version-control)) +(define-public exa + (package + (name "exa") + (version "0.9.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "exa" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1s902xgplz1167k0r7x235p914lprpsqy2if0kpa1mlb0fswqqq4")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-ansi-term" ,rust-ansi-term-0.12) + ("rust-datetime" ,rust-datetime-0.4) + ("rust-env-logger" ,rust-env-logger-0.6) + ("rust-git2" ,rust-git2-0.9) + ("rust-glob" ,rust-glob-0.3) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-libc" ,rust-libc-0.2) + ("rust-locale" ,rust-locale-0.2) + ("rust-log" ,rust-log-0.4) + ("rust-natord" ,rust-natord-1.0) + ("rust-num-cpus" ,rust-num-cpus-1.11) + ("rust-number-prefix" ,rust-number-prefix-0.3) + ("rust-scoped-threadpool" ,rust-scoped-threadpool-0.1) + ("rust-term-grid" ,rust-term-grid-0.1) + ("rust-term-size" ,rust-term-size-0.3) + ("rust-unicode-width" ,rust-unicode-width-0.1) + ("rust-users" ,rust-users-0.9) + ("rust-zoneinfo-compiled" ,rust-zoneinfo-compiled-0.4)) + #:cargo-development-inputs + (("rust-datetime" ,rust-datetime-0.4)) + #:phases + (modify-phases %standard-phases + (add-after 'configure 'dont-vendor-sources + (lambda* (#:key inputs #:allow-other-keys) + (let ((openssl (assoc-ref inputs "openssl"))) + (setenv "OPENSSL_DIR" openssl)) + #t)) + ;; Ignoring failing tests. + ;; Reported in https://github.com/ogham/exa/issues/318 + (add-before 'check 'disable-failing-tests + (lambda _ + (substitute* "src/options/mod.rs" + (("^.*fn oneline_across.*" oneline-across) + (string-append "#[ignore]\n" oneline-across))) + + (substitute* "src/options/view.rs" + (("test!\\(across:.*") "") + (("test!\\(empty:.*") "") + (("test!\\(gracross:.*") "") + (("test!\\(grid:.*") "") + (("test!\\(icons:.*") "") + (("test!\\(just_binary:.*") "") + (("test!\\(just_blocks:.*") "") + (("test!\\(just_bytes:.*") "") + (("test!\\(just_git:.*") "") + (("test!\\(just_group:.*") "") + (("test!\\(just_header:.*") "") + (("test!\\(just_inode:.*") "") + (("test!\\(just_links:.*") "") + (("test!\\(leg:.*") "") + (("test!\\(lid:.*") "") + (("test!\\(original_g:.*") "")) + #t)) + (add-after 'install 'install-extras + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (share (string-append out "/share")) + (man1 (string-append share "/man/man1"))) + (install-file "contrib/man/exa.1" man1) + (mkdir-p (string-append out "/etc/bash_completion.d")) + (mkdir-p (string-append share "/fish/vendor_completions.d")) + (mkdir-p (string-append share "/zsh/site-functions")) + (copy-file "contrib/completions.bash" + (string-append out "/etc/bash_completion.d/exa")) + (copy-file "contrib/completions.fish" + (string-append share "/fish/vendor_completions.d/exa.fish")) + (copy-file "contrib/completions.zsh" + (string-append share "/zsh/site-functions/_exa")) + #t)))))) + (inputs + `(("libgit2" ,libgit2) + ("zlib" ,zlib))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (home-page "https://the.exa.website/") + (synopsis "Modern replacement for ls") + (description "@code{exa} is a modern replacement for the command-line +program @code{ls}. It uses colours to distinguish file types and metadata. It +also knows about symlinks, extended attributes, and Git.") + (license license:expat))) + +(define-public fd + (package + (name "fd") + (version "7.4.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "fd-find" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "147m872zff0srwq9vaxkkbab06g3fkklbk1g2lx90vdhgs37f5xj")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-ansi-term" ,rust-ansi-term-0.12) + ("rust-atty" ,rust-atty-0.2) + ("rust-clap" ,rust-clap-2) + ("rust-ctrlc" ,rust-ctrlc-3.1) + ("rust-globset" ,rust-globset-0.4) + ("rust-humantime" ,rust-humantime-1.3) + ("rust-ignore" ,rust-ignore-0.4) + ("rust-jemallocator" ,rust-jemallocator-0.3) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-libc" ,rust-libc-0.2) + ("rust-lscolors" ,rust-lscolors-0.6) + ("rust-num-cpus" ,rust-num-cpus-1.10) + ("rust-regex" ,rust-regex-1.3) + ("rust-regex-syntax" ,rust-regex-syntax-0.6) + ("rust-version-check" ,rust-version-check-0.9)) + #:cargo-development-inputs + (("rust-diff" ,rust-diff-0.1) + ("rust-filetime" ,rust-filetime-0.2) + ("rust-tempdir" ,rust-tempdir-0.3)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'override-jemalloc + (lambda* (#:key inputs #:allow-other-keys) + (let ((jemalloc (assoc-ref inputs "jemalloc"))) + (setenv "JEMALLOC_OVERRIDE" + (string-append jemalloc "/lib/libjemalloc.so"))) + #t)) + (add-after 'install 'install-extra + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (install-completion + (lambda (completion out-dir) + (for-each + (lambda (f) + (install-file f (string-append out out-dir))) + (find-files "target/release/build/" completion))))) + ;; Manpages + (install-file "doc/fd.1" (string-append out "/share/man/man1")) + ;; Completions + (install-completion "^fd.bash$" "/etc/bash-completion.d") + (install-completion "^fd.fish$" "/share/fish/vendor_completions.d") + (install-completion "^_fd$" "/share/zsh/site-functions") + (rename-file (string-append out "/etc/bash-completion.d/fd.bash") + (string-append out "/etc/bash-completion.d/fd")) + #t)))))) + (inputs `(("jemalloc" ,jemalloc))) + (home-page "https://github.com/sharkdp/fd") + (synopsis "Simple, fast and user-friendly alternative to find") + (description + "@code{fd} is a simple, fast and user-friendly alternative to @code{find}. +While it does not seek to mirror all of find's powerful functionality, it +provides defaults for 80% of the use cases.") + (license (list license:expat license:asl2.0)))) + (define-public ripgrep (package (name "ripgrep") - (version "11.0.1") + (version "11.0.2") (source (origin (method url-fetch) @@ -40,24 +209,23 @@ (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0bn40lz9n08llq615p4qqqbi24zbkf0appfx3zgxg34a86ga9zds")))) + "0vqjr96s2rs45715hzf0g0wjahig4zjyiqfijmzzg4jyh9ni80yr")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-bstr" ,rust-bstr-0.1) + (("rust-bstr" ,rust-bstr-0.2) ("rust-clap" ,rust-clap-2) ("rust-grep" ,rust-grep-0.2) ("rust-ignore" ,rust-ignore-0.4) - ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-jemallocator" ,rust-jemallocator-0.3) + ("rust-lazy-static" ,rust-lazy-static-1) ("rust-log" ,rust-log-0.4) ("rust-num-cpus" ,rust-num-cpus-1.10) ("rust-regex" ,rust-regex-1.1) ("rust-serde-json" ,rust-serde-json-1.0) ("rust-termcolor" ,rust-termcolor-1.0)) #:cargo-development-inputs - (("rust-clap" ,rust-clap-2) - ("rust-lazy-static" ,rust-lazy-static-1.3) - ("rust-serde" ,rust-serde-1.0) + (("rust-serde" ,rust-serde-1.0) ("rust-serde-derive" ,rust-serde-derive-1.0)))) (home-page "https://github.com/BurntSushi/ripgrep") (synopsis "Line-oriented search tool") @@ -70,7 +238,7 @@ gitignore rules.") (define-public rust-cbindgen (package (name "rust-cbindgen") - (version "0.12.2") + (version "0.13.0") (source (origin (method url-fetch) @@ -78,7 +246,7 @@ gitignore rules.") (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "13jzbmjz1bmmfr0i80hw6ar484mgabx3hbpb2ynhk0ddqi0yr58m")))) + "1kywaz62cglg8fv0p7mp1m946gwmrf62s8ffndd5zpf1mz21j472")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -134,7 +302,7 @@ gitignore rules.") (("rust-git2" ,rust-git2-0.11) ("rust-handlebars" ,rust-handlebars-2.0) ("rust-ignore" ,rust-ignore-0.4) - ("rust-lazy-static" ,rust-lazy-static-1.4) + ("rust-lazy-static" ,rust-lazy-static-1) ("rust-regex" ,rust-regex-1.3) ("rust-serde-json" ,rust-serde-json-1.0) ("rust-tempfile" ,rust-tempfile-3.0)) diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm index 1009896a70..c891a77a18 100644 --- a/gnu/packages/scheme.scm +++ b/gnu/packages/scheme.scm @@ -368,47 +368,6 @@ applications in many fields such as multimedia (web galleries, music players, mashups, office (web agendas, mail clients, ...), etc.") (license gpl2+))) -(define-public chicken - (package - (name "chicken") - (version "5.0.0") - (source (origin - (method url-fetch) - (uri (string-append "https://code.call-cc.org/releases/" - version "/chicken-" version ".tar.gz")) - (sha256 - (base32 - "15b5yrzfa8aimzba79x7v6y282f898rxqxfxrr446sjx9jwlpfd8")))) - (build-system gnu-build-system) - (arguments - `(#:modules ((guix build gnu-build-system) - (guix build utils) - (srfi srfi-1)) - - ;; No `configure' script; run "make check" after "make install" as - ;; prescribed by README. - #:phases - (modify-phases %standard-phases - (delete 'configure) - (delete 'check) - (add-after 'install 'check - (assoc-ref %standard-phases 'check))) - - #:make-flags (let ((out (assoc-ref %outputs "out"))) - (list "PLATFORM=linux" - (string-append "PREFIX=" out) - (string-append "VARDIR=" out "/var/lib"))) - - ;; Parallel builds are not supported, as noted in README. - #:parallel-build? #f)) - (home-page "http://www.call-cc.org/") - (synopsis "R5RS Scheme implementation that compiles native code via C") - (description - "CHICKEN is a compiler for the Scheme programming language. CHICKEN -produces portable and efficient C, supports almost all of the R5RS Scheme -language standard, and includes many enhancements and extensions.") - (license bsd-3))) - (define-public scheme48 (package (name "scheme48") diff --git a/gnu/packages/screen.scm b/gnu/packages/screen.scm index b9a0f6a864..51168903a9 100644 --- a/gnu/packages/screen.scm +++ b/gnu/packages/screen.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2013 Cyril Roelandt <tipecaml@gmail.com> ;;; Copyright © 2014 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015, 2017 Eric Bavier <bavier@member.fsf.org> -;;; Copyright © 2016, 2017, 2019 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2016, 2017, 2019, 2020 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016 Alex Griffin <a@ajgrf.com> ;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> @@ -38,13 +38,13 @@ (define-public screen (package (name "screen") - (version "4.7.0") + (version "4.8.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/screen/screen-" version ".tar.gz")) (sha256 - (base32 "1h90bpy2wk304xw367y1zwz0kilrpm6h28nphykx4fvqz8l56xys")))) + (base32 "18ascpjzsy70h6hk7wpg8zmzjwgdyrdr7c6z4pg5z4l9hhyv24bf")))) (build-system gnu-build-system) (native-inputs `(("makeinfo" ,texinfo))) diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index a679810e97..ec7e658972 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -12,6 +12,7 @@ ;;; Copyright © 2019 Meiyo Peng <meiyo.peng@gmail.com> ;;; Copyright © 2019 Timothy Sample <samplet@ngyro.com> ;;; Copyright © 2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> +;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re> ;;; ;;; This file is part of GNU Guix. ;;; @@ -395,7 +396,7 @@ history mechanism, job control and a C-like syntax.") (define-public zsh (package (name "zsh") - (version "5.6.2") + (version "5.7.1") (source (origin (method url-fetch) (uri (list (string-append @@ -406,9 +407,10 @@ history mechanism, job control and a C-like syntax.") ".tar.xz"))) (sha256 (base32 - "17iffliqcj4hv91g0bd2sxsyfcz51mfyh97sp2iyrs2p0mndc2x5")))) + "1s3yww0mzgvpc48kp0x868mm3gbna42sbgzya0nknj0x5hn2jq3j")))) (build-system gnu-build-system) - (arguments `(#:configure-flags '("--with-tcsetpgrp" "--enable-pcre") + (arguments `(#:configure-flags '("--with-tcsetpgrp" "--enable-pcre" + "--enable-maildir-support") #:phases (modify-phases %standard-phases (add-before 'configure 'fix-sh diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index dae14aee8f..8773f1969f 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -935,7 +935,7 @@ tmux.") (define-public kitty (package (name "kitty") - (version "0.14.6") + (version "0.16.0") (home-page "https://sw.kovidgoyal.net/kitty/") (source (origin @@ -945,7 +945,7 @@ tmux.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1rb5ys9xsdhd2qa3kz5gqzz111c6b14za98va6hlglk69wqlmb51")) + (base32 "1bszyddar0g1gdz67h8rd3gbrdhi6ahjg7j14cjiqxm1938z9ajf")) (modules '((guix build utils))) (snippet '(begin diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 20db6b4b08..2ca64e4cdc 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -26,6 +26,7 @@ ;;; Copyright © 2019 Kei Kebreau <kkebreau@posteo.net> ;;; Copyright © 2019 Alex Griffin <a@ajgrf.com> ;;; Copyright © 2020 Roel Janssen <roel@gnu.org> +;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re> ;;; ;;; This file is part of GNU Guix. ;;; @@ -594,7 +595,7 @@ write native speed custom Git applications in any language with bindings.") (define-public git-crypt (package (name "git-crypt") - (version "0.5.0") + (version "0.6.0") (source (origin (method git-fetch) @@ -603,25 +604,38 @@ write native speed custom Git applications in any language with bindings.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1x9209n3k49k998saadr2d0lmvs01smjinx7gzzyjdwj9l904sii")))) + (base32 "1ba5s0fvmd9hhnfhfsjrm40v0qpxfnwc8vmm55m0k4dryzkzx66q")))) (build-system gnu-build-system) (inputs `(("git" ,git) ("openssl" ,openssl))) + (native-inputs + `(("docbook-xsl" ,docbook-xsl) + ("libxslt" ,libxslt))) (arguments `(#:tests? #f ; No tests. #:phases (modify-phases %standard-phases (delete 'configure) + (add-after 'unpack 'patch-makefile + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "Makefile" + (("http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl") + (string-append (assoc-ref inputs "docbook-xsl") + "/xml/xsl/docbook-xsl-" + ,(package-version docbook-xsl) + "/manpages/docbook.xsl"))) + #t)) (replace 'build (lambda _ - (invoke "make"))) + (invoke "make" "ENABLE_MAN=yes"))) (replace 'install (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) (invoke "make" "install" + "ENABLE_MAN=yes" (string-append "PREFIX=" out)))))))) - (home-page "https://www.agwa.name/projects/git-crypt") + (home-page "https://www.agwa.name/projects/git-crypt/") (synopsis "Transparent encryption of files in a git repository") (description "git-crypt enables transparent encryption and decryption of files in a git repository. Files which you choose to protect are encrypted when @@ -1007,16 +1021,16 @@ will work.") (name "git-flow") ;; This version has not be officially released yet, so we build it ;; directly from the git repository. - (version "0.4.2-pre") + (version "1.12.3") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/nvie/gitflow/") - (commit "15aab26490facf285acef56cb5d61025eacb3a69"))) + (url "https://github.com/petervanderdoes/gitflow-avh/") + (commit version))) (file-name (git-file-name name version)) (sha256 (base32 - "01fs97q76fdfnvmrh2cyjhywcs3pykf1dg58sy0frflnsdzs6prx")))) + "13q4mnrxr03wz2dkhzy73j384g299m4d545cnhxcaznvdwfany4h")))) (build-system gnu-build-system) (inputs `(("shflags" ,shflags))) (arguments diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index 1610561aec..3a54f5a50e 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -511,8 +511,7 @@ features for productive professionals.") #:asd-system-name "next/hooks")) (inputs `(("alexandria" ,sbcl-alexandria) - ("serapeum" ,sbcl-serapeum) - ("fare-quasiquote-extras" ,cl-fare-quasiquote-extras))) + ("serapeum" ,sbcl-serapeum))) (native-inputs `(("trivial-features" ,sbcl-trivial-features) ("prove-asdf" ,sbcl-prove-asdf))) @@ -592,7 +591,6 @@ features for productive professionals.") ("closer-mop" ,sbcl-closer-mop) ("dbus" ,cl-dbus) ("dexador" ,sbcl-dexador) - ("fare-quasiquote-extras" ,cl-fare-quasiquote-extras) ; For serapeum. Guix bug? ("ironclad" ,sbcl-ironclad) ("local-time" ,sbcl-local-time) ("log4cl" ,sbcl-log4cl) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 54c2885a26..f60b6bd7a0 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -34,7 +34,7 @@ ;;; Copyright © 2019 Brendan Tildesley <mail@brendan.scot> ;;; Copyright © 2019 Alex Griffin <a@ajgrf.com> ;;; Copyright © 2019 Hartmut Goebel <h.goebel@crazy-compilers.com> -;;; Copyright © 2019 Jakob L. Kreuze <zerodaysfordays@sdf.lonestar.org> +;;; Copyright © 2019 Jakob L. Kreuze <zerodaysfordays@sdf.org> ;;; Copyright © 2019 Florian Pelz <pelzflorian@pelzflorian.de> ;;; Copyright © 2020 Timotej Lazar <timotej.lazar@araneo.si> ;;; diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 52d7042806..3c0d14efa8 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -31,6 +31,8 @@ ;;; Copyright © 2019 Brett Gilio <brettg@gnu.org> ;;; Copyright © 2019 Noodles! <nnoodle@chiru.no> ;;; Copyright © 2019 Alexandru-Sergiu Marton <brown121407@member.fsf.org> +;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr> +;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re> ;;; ;;; This file is part of GNU Guix. ;;; @@ -95,6 +97,7 @@ #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) #:use-module (gnu packages serialization) + #:use-module (gnu packages sphinx) #:use-module (gnu packages suckless) #:use-module (gnu packages texinfo) #:use-module (gnu packages textutils) @@ -868,89 +871,108 @@ experience.") (define-public awesome (package (name "awesome") - (version "4.2") + (version "4.3") (source - (origin (method url-fetch) - (uri (string-append - "https://github.com/awesomeWM/awesome-releases/raw/" - "master/awesome-" version ".tar.xz")) - (sha256 - (base32 - "0kwpbls9h1alxcmvxh5g9qb995fds5b2ngcr44w0ibazkyls2pdc")) - (modules '((guix build utils) - (srfi srfi-19))) - (snippet '(begin - ;; Remove non-reproducible timestamp and use the date - ;; of the source file instead. - (substitute* "common/version.c" - (("__DATE__ \" \" __TIME__") - (date->string - (time-utc->date - (make-time time-utc 0 - (stat:mtime (stat "awesome.c")))) - "\"~c\""))) - #t)) - (patches (search-patches "awesome-reproducible-png.patch")))) + (origin + (method url-fetch) + (uri (string-append + "https://github.com/awesomeWM/awesome-releases/raw/master/" + "awesome-" version ".tar.xz")) + (sha256 + (base32 "0lqpw401mkkmp9wgbvrmm45bqq2j9357l4irwdqv6l1305pls9kq")) + (modules '((guix build utils) + (srfi srfi-19))) + (snippet + '(begin + ;; Remove non-reproducible timestamp and use the date of + ;; the source file instead. + (substitute* "common/version.c" + (("__DATE__ \" \" __TIME__") + (date->string + (time-utc->date + (make-time time-utc 0 (stat:mtime (stat "awesome.c")))) + "\"~c\""))) + #t)) + (patches + (search-patches "awesome-reproducible-png.patch")))) (build-system cmake-build-system) - (native-inputs `(("asciidoc" ,asciidoc) - ("docbook-xsl" ,docbook-xsl) - ("doxygen" ,doxygen) - ("gperf" ,gperf) - ("imagemagick" ,imagemagick) - ("libxml2" ,libxml2) ;for XML_CATALOG_FILES - ("pkg-config" ,pkg-config) - ("xmlto" ,xmlto))) - (inputs `(("cairo" ,cairo) - ("dbus" ,dbus) - ("gdk-pixbuf" ,gdk-pixbuf) - ("glib" ,glib) - ("gobject-introspection" ,gobject-introspection) - ("imlib2" ,imlib2) - ("libev" ,libev) - ("libxcb" ,libxcb) - ("libxcursor" ,libxcursor) - ("libxdg-basedir" ,libxdg-basedir) - ("libxkbcommon" ,libxkbcommon) - ("lua" ,lua) - ("lua-lgi" ,lua-lgi) - ("pango" ,pango) - ("startup-notification" ,startup-notification) - ("xcb-util" ,xcb-util) - ("xcb-util-cursor" ,xcb-util-cursor) - ("xcb-util-image" ,xcb-util-image) - ("xcb-util-keysyms" ,xcb-util-keysyms) - ("xcb-util-renderutil" ,xcb-util-renderutil) - ("xcb-util-xrm" ,xcb-util-xrm) - ("xcb-util-wm" ,xcb-util-wm))) + (native-inputs + `(("asciidoc" ,asciidoc) + ("docbook-xsl" ,docbook-xsl) + ("doxygen" ,doxygen) + ("gperf" ,gperf) + ("imagemagick" ,imagemagick) + ("libxml2" ,libxml2) ;for XML_CATALOG_FILES + ("lua-ldoc" ,lua-ldoc) + ("pkg-config" ,pkg-config) + ("xmlto" ,xmlto))) + (inputs + `(("cairo" ,cairo) + ("dbus" ,dbus) + ("gdk-pixbuf" ,gdk-pixbuf) + ("glib" ,glib) + ("gobject-introspection" ,gobject-introspection) + ("imlib2" ,imlib2) + ("libev" ,libev) + ("libxcb" ,libxcb) + ("libxcursor" ,libxcursor) + ("libxdg-basedir" ,libxdg-basedir) + ("libxkbcommon" ,libxkbcommon) + ("lua" ,lua) + ("lua-lgi" ,lua-lgi) + ("pango" ,pango) + ("startup-notification" ,startup-notification) + ("xcb-util" ,xcb-util) + ("xcb-util-cursor" ,xcb-util-cursor) + ("xcb-util-image" ,xcb-util-image) + ("xcb-util-keysyms" ,xcb-util-keysyms) + ("xcb-util-renderutil" ,xcb-util-renderutil) + ("xcb-util-xrm" ,xcb-util-xrm) + ("xcb-util-wm" ,xcb-util-wm))) (arguments - `(;; Let compression happen in our 'compress-documentation' phase so that - ;; '--no-name' is used, which removes timestamps from gzip output. - #:configure-flags '("-DCOMPRESS_MANPAGES=off") - - ;; Building awesome in its source dir is no longer supported. + `(#:modules ((guix build cmake-build-system) + (guix build utils) + (ice-9 match)) + ;; Let compression happen in our 'compress-documentation' phase + ;; so that '--no-name' is used, which removes timestamps from + ;; gzip output. + #:configure-flags + '("-DCOMPRESS_MANPAGES=off") + ;; Building awesome in its source directory is no longer + ;; supported. #:out-of-source? #t - #:phases (modify-phases %standard-phases - (add-before 'build 'xmlto-skip-validation - (lambda _ - ;; We can't download the necessary schema, so so skip - ;; validation and assume they're valid. - (substitute* "../build/CMakeFiles/man.dir/build.make" - (("/xmlto") - (string-append "/xmlto --skip-validation"))) - #t)) - (add-before 'configure 'set-lua-paths + (add-before 'configure 'set-paths (lambda* (#:key inputs #:allow-other-keys) - ;; The build process needs to load cairo dynamically. - (let* ((cairo (string-append - (assoc-ref inputs "cairo") "/lib" )) - (lua-lgi (assoc-ref inputs "lua-lgi") )) - (setenv "LD_LIBRARY_PATH" cairo ) - (setenv "LUA_PATH" (string-append lua-lgi - "/share/lua/5.2/?.lua")) - (setenv "LUA_CPATH" (string-append lua-lgi - "/lib/lua/5.2/?.so")) + ;; The build process needs to load Cairo dynamically. + (let* ((cairo (string-append (assoc-ref inputs "cairo") "/lib")) + (lua-version ,(version-major+minor (package-version lua))) + (lua-dependencies + (filter (match-lambda + ((label . _) (string-prefix? "lua-" label))) + inputs)) + (lua-path + (string-join + (map (match-lambda + ((_ . dir) + (string-append + dir "/share/lua/" lua-version "/?.lua;" + dir "/share/lua/" lua-version "/?/?.lua"))) + lua-dependencies) + ";")) + (lua-cpath + (string-join + (map (match-lambda + ((_ . dir) + (string-append + dir "/lib/lua/" lua-version "/?.so;" + dir "/lib/lua/" lua-version "/?/?.so"))) + lua-dependencies) + ";"))) + (setenv "LD_LIBRARY_PATH" cairo) + (setenv "LUA_PATH" (string-append "?.lua;" lua-path)) + (setenv "LUA_CPATH" lua-cpath) #t))) (replace 'check (lambda _ @@ -967,22 +989,23 @@ experience.") (add-after 'install 'wrap (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((awesome (assoc-ref outputs "out")) - (cairo (string-append - (assoc-ref inputs "cairo") "/lib" )) - (lua-lgi (assoc-ref inputs "lua-lgi") )) + (cairo (string-append (assoc-ref inputs "cairo") "/lib")) + (lua-version ,(version-major+minor (package-version lua))) + (lua-lgi (assoc-ref inputs "lua-lgi"))) (wrap-program (string-append awesome "/bin/awesome") + `("LUA_PATH" suffix + (,(format #f "~a/share/lua/~a/?.lua" lua-lgi lua-version))) + `("LUA_CPATH" suffix + (,(format #f "~a/lib/lua/~a/?.so" lua-lgi lua-version))) `("GI_TYPELIB_PATH" ":" prefix (,(getenv "GI_TYPELIB_PATH"))) - `("LD_LIBRARY_PATH" suffix (, cairo)) - `("LUA_PATH" suffix (,(string-append lua-lgi - "/share/lua/5.2/?.lua"))) - `("LUA_CPATH" suffix (,(string-append - lua-lgi "/lib/lua/5.2/?.so")))))))))) + `("LD_LIBRARY_PATH" suffix (,cairo))) + #t)))))) + (home-page "https://awesomewm.org/") (synopsis "Highly configurable window manager") (description "Awesome has been designed as a framework window manager. It is fast, small, dynamic and extensible using the Lua programming language.") - (license license:gpl2+) - (home-page "https://awesomewm.org/"))) + (license license:gpl2+))) (define-public menumaker (package @@ -1272,6 +1295,9 @@ its size ("xcb-util-xrm" ,xcb-util-xrm))) (native-inputs `(("pkg-config" ,pkg-config) + ("python-sphinx" ,python-sphinx) ; for the manual + ;; XXX: "python" input must be located after "python-2", or the package + ;; fails to build with "missing required python module: xcbgen". ("python-2" ,python-2) ; lib/xpp depends on python 2 ("python" ,python))) ; xcb-proto depends on python 3 (home-page "https://polybar.github.io/") diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index a638ae44e2..da84f0f4b8 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -32,6 +32,7 @@ ;;; Copyright © 2020 Guillaume Le Vaillant <glv@posteo.net> ;;; Copyright © 2020 David Wilson <david@daviwil.com> ;;; Copyright © 2020 Ivan Vilata i Balaguer <ivan@selidor.net> +;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re> ;;; ;;; This file is part of GNU Guix. ;;; @@ -153,58 +154,53 @@ program.") (license license:gpl3+))) (define-public autorandr - ;; Use latest commit since 1.7 lacks many new features such as the - ;; autorandr_launcher. - (let ((commit "b484c0ea9c9a4838278bbd661a7cc384333c1df8")) - (package - (name "autorandr") - (version (git-version "1.7" "1" commit)) - (home-page "https://github.com/phillipberndt/autorandr") - (source - (origin - (method git-fetch) - (uri (git-reference - (url home-page) - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0da17kzsisjv3s993j5idkk1n2d2cvjdn7pngs2b0ic1r2h5z02h")))) - (build-system python-build-system) - (native-inputs - `(("man-db" ,man-db))) - (inputs - `(("xrandr" ,xrandr) - ("libxcb" ,libxcb))) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'build 'configure - (lambda* (#:key inputs #:allow-other-keys) + (package + (name "autorandr") + (version "1.9") + (home-page "https://github.com/phillipberndt/autorandr") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1bb0l7fcm5lcx9y02zdxv7pfdqf4v4gsc5br3v1x9gzjvqj64l7n")))) + (build-system python-build-system) + (inputs + `(("xrandr" ,xrandr) + ("libxcb" ,libxcb))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'build 'configure + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((xrandr (string-append (assoc-ref inputs "xrandr") + "/bin/xrandr"))) + (substitute* "contrib/etc/xdg/autostart/autorandr.desktop" + (("/usr") (assoc-ref outputs "out"))) (substitute* "autorandr.py" - (("popen\\(\"xrandr") (string-append "popen(\"" - (assoc-ref inputs "xrandr") - "/bin/xrandr")) - (("\\[\"xrandr") (string-append "[\"" - (assoc-ref inputs "xrandr") - "/bin/xrandr"))) - #t)) - (add-after 'install 'install-contrib - (lambda* (#:key outputs #:allow-other-keys) - (invoke "make" - (string-append "DESTDIR=" (assoc-ref outputs "out")) - "PREFIX=" - "BASH_COMPLETIONS_DIR=etc/bash_completiond.d" - "install_manpage" - "install_bash_completion" - "install_launcher")))))) - (synopsis "Auto-detect connected displays and load appropriate setup") - (description "Autorandr wraps around xrandr to help with X11 + (("popen\\(\"xrandr") (string-append "popen(\"" xrandr)) + (("\\[\"xrandr") (string-append "[\"" xrandr)))) + #t)) + (add-after 'install 'install-contrib + (lambda* (#:key outputs #:allow-other-keys) + (invoke "make" + (string-append "DESTDIR=" (assoc-ref outputs "out")) + "PREFIX=" + "BASH_COMPLETIONS_DIR=etc/bash_completiond.d" + "install_manpage" + "install_bash_completion" + "install_launcher" + "install_autostart_config")))))) + (synopsis "Auto-detect connected displays and load appropriate setup") + (description "Autorandr wraps around xrandr to help with X11 multi-screen configuration management. It allows the user to create profiles for various multi-screen setups. Autorandr automatically detects the profiles that can be activated based on the connected hardware. Hook scripts can be used to further tweak the behaviour of the different profiles.") - (license license:gpl3+)))) + (license license:gpl3+))) (define-public bemenu (package diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm index 9dcdf38be1..1294d748ac 100644 --- a/gnu/services/desktop.scm +++ b/gnu/services/desktop.scm @@ -1070,7 +1070,7 @@ as expected."))) (match-lambda (($ <inputattach-configuration> type device baud-rate log-file) (let ((args (append (if baud-rate - (list "--baud-rate" (number->string baud-rate)) + (list "--baud" (number->string baud-rate)) '()) (list (string-append "--" type) device)))) diff --git a/gnu/services/web.scm b/gnu/services/web.scm index 3ac7b7f52c..075140816a 100644 --- a/gnu/services/web.scm +++ b/gnu/services/web.scm @@ -1436,6 +1436,10 @@ ALLOWED_HOSTS = [ allowed-hosts)) "] +DEFAULT_FROM_EMAIL = '" #$default-from-email "' +SERVER_EMAIL = DEFAULT_FROM_EMAIL +NOTIFICATION_FROM_EMAIL = DEFAULT_FROM_EMAIL + ADMINS = [ " #$(string-concatenate (map (match-lambda diff --git a/gnu/tests/reconfigure.scm b/gnu/tests/reconfigure.scm index fb11e6164e..8b85920979 100644 --- a/gnu/tests/reconfigure.scm +++ b/gnu/tests/reconfigure.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2019 Jakob L. Kreuze <zerodaysfordays@sdf.lonestar.org> +;;; Copyright © 2019 Jakob L. Kreuze <zerodaysfordays@sdf.org> ;;; ;;; This file is part of GNU Guix. ;;; diff --git a/guix/git.scm b/guix/git.scm index a12f1eec8e..ca5dbfba1c 100644 --- a/guix/git.scm +++ b/guix/git.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com> +;;; Copyright © 2017, 2020 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org> ;;; ;;; This file is part of GNU Guix. @@ -108,6 +108,10 @@ the 'SSL_CERT_FILE' and 'SSL_CERT_DIR' environment variables." (string-append "R:" url) url)))))) +;; Authentication appeared in Guile-Git 0.3.0, check if it is available. +(define auth-supported? + (false-if-exception (resolve-interface '(git auth)))) + (define (clone* url directory) "Clone git repository at URL into DIRECTORY. Upon failure, make sure no empty directory is left behind." @@ -119,7 +123,13 @@ make sure no empty directory is left behind." ;; value in Guile-Git: <https://bugs.gnu.org/29238>. (if (module-defined? (resolve-interface '(git)) 'clone-init-options) - (clone url directory (clone-init-options)) + (let ((auth-method (and auth-supported? + (%make-auth-ssh-agent)))) + (clone url directory + (if auth-supported? + (make-clone-options + #:fetch-options (make-fetch-options auth-method)) + (clone-init-options)))) (clone url directory))) (lambda _ (false-if-exception (rmdir directory))))) @@ -281,7 +291,12 @@ When RECURSIVE? is true, check out submodules as well, if any." ;; Only fetch remote if it has not been cloned just before. (when (and cache-exists? (not (reference-available? repository ref))) - (remote-fetch (remote-lookup repository "origin"))) + (if auth-supported? + (let ((auth-method (and auth-supported? + (%make-auth-ssh-agent)))) + (remote-fetch (remote-lookup repository "origin") + #:fetch-options (make-fetch-options auth-method))) + (remote-fetch (remote-lookup repository "origin")))) (when recursive? (update-submodules repository #:log-port log-port)) (let ((oid (switch-to-ref repository canonical-ref))) diff --git a/guix/scripts/deploy.scm b/guix/scripts/deploy.scm index bc0ceabd3f..ad05c333dc 100644 --- a/guix/scripts/deploy.scm +++ b/guix/scripts/deploy.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019 David Thompson <davet@gnu.org> -;;; Copyright © 2019 Jakob L. Kreuze <zerodaysfordays@sdf.lonestar.org> +;;; Copyright © 2019 Jakob L. Kreuze <zerodaysfordays@sdf.org> ;;; ;;; This file is part of GNU Guix. ;;; diff --git a/guix/scripts/system/reconfigure.scm b/guix/scripts/system/reconfigure.scm index 2f9dbb2508..77a72307b4 100644 --- a/guix/scripts/system/reconfigure.scm +++ b/guix/scripts/system/reconfigure.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2019 Christopher Baines <mail@cbaines.net> -;;; Copyright © 2019 Jakob L. Kreuze <zerodaysfordays@sdf.lonestar.org> +;;; Copyright © 2019 Jakob L. Kreuze <zerodaysfordays@sdf.org> ;;; ;;; This file is part of GNU Guix. ;;; |