mbakke pushed a commit to branch core-updates in repository guix. commit 961d2ee2695b38503b463d055e9c7edbcc0bf307 Merge: 7cf79d7 aebba13 Author: Marius Bakke <mba...@fastmail.com> AuthorDate: Sat Mar 14 13:13:40 2020 +0100
Merge branch 'master' into core-updates .dir-locals.el | 1 + .gitignore | 1 + Makefile.am | 7 +- build-aux/check-available-binaries.scm | 78 ------ configure.ac | 6 +- doc/contributing.texi | 11 +- doc/guix.texi | 36 ++- etc/guix-install.sh | 11 + etc/init.d/guix-daemon.in | 78 ++++++ etc/release-manifest.scm | 108 ++++++++ gnu/ci.scm | 3 +- gnu/local.mk | 2 +- gnu/packages/admin.scm | 30 ++- gnu/packages/algebra.scm | 9 +- gnu/packages/assembly.scm | 29 +++ gnu/packages/audio.scm | 10 +- gnu/packages/autotools.scm | 2 +- gnu/packages/backup.scm | 5 +- gnu/packages/bash.scm | 2 +- gnu/packages/bioconductor.scm | 16 +- gnu/packages/bioinformatics.scm | 41 +++- gnu/packages/boost.scm | 25 +- gnu/packages/cdrom.scm | 2 +- gnu/packages/certs.scm | 4 +- gnu/packages/check.scm | 4 +- gnu/packages/code.scm | 2 +- gnu/packages/compression.scm | 7 +- gnu/packages/cran.scm | 104 +++++--- gnu/packages/crypto.scm | 4 +- gnu/packages/cups.scm | 8 +- gnu/packages/databases.scm | 17 +- gnu/packages/digest.scm | 4 +- gnu/packages/disk.scm | 9 +- gnu/packages/docker.scm | 6 +- gnu/packages/embedded.scm | 2 +- gnu/packages/emulators.scm | 6 +- gnu/packages/engineering.scm | 2 +- gnu/packages/enlightenment.scm | 17 +- gnu/packages/finance.scm | 4 +- gnu/packages/flashing-tools.scm | 2 +- gnu/packages/fltk.scm | 2 +- gnu/packages/fontutils.scm | 2 +- gnu/packages/freedesktop.scm | 17 +- gnu/packages/ftp.scm | 2 +- gnu/packages/games.scm | 47 +++- gnu/packages/gd.scm | 2 +- gnu/packages/gdb.scm | 35 +-- gnu/packages/geo.scm | 36 ++- gnu/packages/gimp.scm | 8 +- gnu/packages/gl.scm | 24 +- gnu/packages/gnome.scm | 35 ++- gnu/packages/golang.scm | 51 +++- gnu/packages/gps.scm | 10 +- gnu/packages/graphics.scm | 9 +- gnu/packages/graphviz.scm | 5 +- gnu/packages/gtk.scm | 6 +- gnu/packages/guile-xyz.scm | 32 ++- gnu/packages/guile.scm | 9 - gnu/packages/haskell-xyz.scm | 7 +- gnu/packages/hyperledger.scm | 126 +++++++++- gnu/packages/imagemagick.scm | 8 +- gnu/packages/installers.scm | 4 +- gnu/packages/ipfs.scm | 6 +- gnu/packages/java-compression.scm | 59 +++-- gnu/packages/java.scm | 6 +- gnu/packages/libffcall.scm | 9 +- gnu/packages/libusb.scm | 41 ++++ gnu/packages/linux.scm | 92 +++++-- gnu/packages/lisp.scm | 4 +- gnu/packages/machine-learning.scm | 43 +++- gnu/packages/mail.scm | 9 +- gnu/packages/man.scm | 4 +- gnu/packages/maths.scm | 209 ++++++++-------- gnu/packages/mingw.scm | 4 +- gnu/packages/mp3.scm | 2 +- gnu/packages/mpi.scm | 8 +- gnu/packages/music.scm | 42 +--- gnu/packages/networking.scm | 64 ++--- gnu/packages/nss.scm | 24 +- gnu/packages/onc-rpc.scm | 4 +- gnu/packages/password-utils.scm | 80 +++++- gnu/packages/patches/bluez-CVE-2020-0556.patch | 180 ++++++++++++++ gnu/packages/patches/nss-freebl-stubs.patch | 20 -- gnu/packages/pdf.scm | 16 +- gnu/packages/perl-check.scm | 23 +- gnu/packages/perl.scm | 12 +- gnu/packages/plotutils.scm | 16 +- gnu/packages/python-web.scm | 2 +- gnu/packages/python-xyz.scm | 327 +++++++++++++++---------- gnu/packages/qt.scm | 18 +- gnu/packages/ruby.scm | 2 +- gnu/packages/scheme.scm | 2 +- gnu/packages/search.scm | 2 +- gnu/packages/skarnet.scm | 34 +-- gnu/packages/sphinx.scm | 2 +- gnu/packages/statistics.scm | 30 +-- gnu/packages/textutils.scm | 2 +- gnu/packages/tls.scm | 8 +- gnu/packages/version-control.scm | 72 +++++- gnu/packages/video.scm | 49 +++- gnu/packages/vim.scm | 2 +- gnu/packages/web.scm | 30 +-- gnu/packages/webkit.scm | 4 +- gnu/packages/wm.scm | 4 +- gnu/packages/wxwidgets.scm | 2 +- gnu/packages/xdisorg.scm | 128 +++++++++- gnu/packages/xfce.scm | 74 +++--- gnu/packages/xorg.scm | 44 ++-- gnu/packages/zile.scm | 21 +- gnu/services/web.scm | 14 +- guix/build/download.scm | 129 ---------- guix/gexp.scm | 59 +++++ guix/import/cpan.scm | 6 +- guix/import/pypi.scm | 121 ++++++--- guix/import/utils.scm | 10 +- guix/inferior.scm | 21 +- guix/scripts/pack.scm | 161 ++++++------ guix/scripts/weather.scm | 71 ++++-- guix/ui.scm | 27 +- nix/local.mk | 16 +- tests/gexp.scm | 38 +++ tests/inferior.scm | 13 +- tests/pypi.scm | 3 + 123 files changed, 2514 insertions(+), 1203 deletions(-) diff --cc gnu/packages/algebra.scm index f719090,50cb300..a0f31d1 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@@ -8,7 -8,7 +8,8 @@@ ;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <m...@tobias.gr> ;;; Copyright © 2017 Marius Bakke <mba...@fastmail.com> ;;; Copyright © 2017, 2019 Eric Bavier <bav...@member.fsf.org> +;;; Copyright © 2019 Mathieu Othacehe <m.othac...@gmail.com> + ;;; Copyright © 2020 Björn Höfling <bjoern.hoefl...@bjoernhoefling.de> ;;; ;;; This file is part of GNU Guix. ;;; diff --cc gnu/packages/boost.scm index 902e5ec,8bf2002..afdbdbd --- a/gnu/packages/boost.scm +++ b/gnu/packages/boost.scm @@@ -9,10 -9,8 +9,10 @@@ ;;; Copyright © 2018 Arun Isaac <arunis...@systemreboot.net> ;;; Copyright © 2018, 2019 Ricardo Wurmus <rek...@elephly.net> ;;; Copyright © 2018 Maxim Cournoyer <maxim.courno...@gmail.com> - ;;; Copyright © 2018 Efraim Flashner <efr...@flashner.co.il> + ;;; Copyright © 2018, 2020 Efraim Flashner <efr...@flashner.co.il> -;;; Copyright © 2019 Giacomo Leidi <goodoldp...@autistici.org> +;;; Copyright © 2019 Mathieu Othacehe <m.othac...@gmail.com> +;;; Copyright © 2019, 2020 Giacomo Leidi <goodoldp...@autistici.org> +;;; Copyright © 2020 Marius Bakke <mba...@fastmail.com> ;;; ;;; This file is part of GNU Guix. ;;; diff --cc gnu/packages/gd.scm index e336282,2d3ee42..444c769 --- a/gnu/packages/gd.scm +++ b/gnu/packages/gd.scm @@@ -83,8 -82,8 +83,8 @@@ ("zlib" ,zlib))) (propagated-inputs `(("fontconfig" ,fontconfig) - ("libjpeg" ,libjpeg))) + ("libjpeg" ,libjpeg-turbo))) - (home-page "http://www.libgd.org/") + (home-page "https://www.libgd.org/") (synopsis "Library for the dynamic creation of images by programmers") (description "GD is a library for the dynamic creation of images by programmers. GD diff --cc gnu/packages/gtk.scm index b01f4c7,670a943..76766a1 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@@ -765,9 -731,10 +765,9 @@@ application suites." name "-" version ".tar.xz")) (sha256 (base32 - "1a9hi7k59q0kqx0n3xhsk1ly23w9g9ncllnay1756g0yrww5qxsc")) + "120yz5gxqbv7sgdbcy4i0b6ixm8jpjzialdrqs0gv15q7bwnjk8w")) (patches (search-patches "gtk3-respect-GUIX_GTK3_PATH.patch" "gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch")))) - (outputs '("out" "bin" "doc")) (propagated-inputs `(("at-spi2-atk" ,at-spi2-atk) ("atk" ,atk) diff --cc gnu/packages/linux.scm index 977f448,688d9ee..acfee1a --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@@ -2864,13 -2829,27 +2864,28 @@@ to the in-kernel OOM killer." (for-each make-file-writable (find-files ".")) #t)) (add-before 'bootstrap 'patch-file-names - (lambda* (#:key inputs #:allow-other-keys) + (lambda* (#:key inputs native-inputs #:allow-other-keys) (substitute* "man/make.sh" (("/usr/bin/xsltproc") - (string-append (assoc-ref inputs "xsltproc") + (string-append (assoc-ref + (or native-inputs inputs) "xsltproc") "/bin/xsltproc"))) #t)) + (add-after 'install 'move-static-library + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (static (assoc-ref outputs "static")) + (source (string-append out "/lib/libudev.a")) + (target (string-append static "/lib/libudev.a"))) + (mkdir-p (dirname target)) + (link source target) + (delete-file source) + ;; Remove reference to the static library from the .la file + ;; such that Libtool looks for it in the usual places. + (substitute* (string-append out "/lib/libudev.la") + (("old_library=.*") + "old_library=''\n")) + #t))) (add-after 'install 'build-hwdb (lambda* (#:key outputs #:allow-other-keys) ;; Build OUT/etc/udev/hwdb.bin. This allows 'lsusb' and @@@ -2902,8 -2876,9 +2917,9 @@@ ;; When linked against libblkid, eudev can populate /dev/disk/by-label ;; and similar; it also installs the '60-persistent-storage.rules' file, ;; which contains the rules to do that. - `(("util-linux" ,util-linux) ;for blkid + `(("util-linux" ,util-linux "lib") ;for blkid ("kmod" ,kmod))) + (outputs '("out" "static")) (home-page "https://wiki.gentoo.org/wiki/Project:Eudev") (synopsis "Userspace device management") (description "Udev is a daemon which dynamically creates and removes @@@ -3998,17 -3967,11 +4031,17 @@@ Linux Device Mapper multipathing driver name "-" version ".tar.gz"))) (sha256 (base32 - "0ajhzbqjwsmz51gwccfyw6w9k4j4gmxcl2ph30sfn2gxv0d8gkv2")))) + "14mlqdapjqq1dhpkdgy5z83mvsaz36fcxca7a4z6hinmr7r6415b")))) (build-system gnu-build-system) (arguments - '(#:make-flags - (list "CC=gcc" (string-append "prefix=" %output)) + `(#:make-flags + (let ((target ,(%current-target-system))) + (list (string-append "prefix=" %output) + (string-append + "CC=" (if target + (string-append (assoc-ref %build-inputs "cross-gcc") + "/bin/" target "-gcc") + "gcc")))) #:test-target "partcheck" ; need root for a full 'check' #:phases (modify-phases %standard-phases (delete 'configure)))) ; no configure script diff --cc gnu/packages/machine-learning.scm index 3ff80a7,52e6397..9de8eef --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@@ -1749,10 -1786,10 +1786,10 @@@ INSTALL_RPATH " (assoc-ref outputs "out ("eigen" ,eigen-for-tensorflow) ("gemmlowp" ,gemmlowp-for-tensorflow) ("lmdb" ,lmdb) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("giflib" ,giflib) - ("grpc" ,grpc) + ("grpc:bin" ,grpc) ("jsoncpp" ,jsoncpp-for-tensorflow) ("snappy" ,snappy) ("sqlite" ,sqlite) diff --cc gnu/packages/nss.scm index 62bf09c,9112206..e423bdd --- a/gnu/packages/nss.scm +++ b/gnu/packages/nss.scm @@@ -1,8 -1,9 +1,9 @@@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <l...@gnu.org> ;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019 Mark H Weaver <m...@netris.org> -;;; Copyright © 2016, 2017, 2018 Efraim Flashner <efr...@flashner.co.il> +;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner <efr...@flashner.co.il> ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <m...@tobias.gr> + ;;; Copyright © 2020 Marius Bakke <mba...@fastmail.com> ;;; ;;; This file is part of GNU Guix. ;;; diff --cc gnu/packages/version-control.scm index a798892,5d0fa26..6451037 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@@ -549,8 -529,78 +550,77 @@@ everything from small to very large pro ("expat" ,expat) ;for 'git push' over HTTP(S) ("openssl" ,openssl) ("perl" ,perl) - ("zlib" ,zlib) - ("bash-for-tests" ,bash))))) + ("zlib" ,zlib))))) + (define-public gitless + (package + (name "gitless") + (version "0.8.8") + (source + (origin + ;; The PyPI package lacks a test suite. Build directly from git. + (method git-fetch) + (uri (git-reference + (url "https://github.com/gitless-vcs/gitless") + (commit (string-append "v" version)))) + (sha256 + (base32 "048kl27zjr68hgs70g3l98ci9765wxva6azzrhcdys7nsdd493n6")) + (file-name (git-file-name name version)))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'build 'loosen-requirements + (lambda _ + (substitute* "setup.py" + ;; Using Guix's python-pygit2 1.1.0 appears to work fine… + (("pygit2==") "pygit2>=")) + #t)) + (add-before 'check 'prepare-for-tests + (lambda _ + ;; Find the 'gl' command. + (rename-file "gl.py" "gl") + (setenv "PATH" (string-append (getcwd) ":" (getenv "PATH"))) + + ;; The tests try to run git as if it were already set up. + (setenv "HOME" (getcwd)) + (invoke "git" "config" "--global" "user.email" "g...@example.com") + (invoke "git" "config" "--global" "user.name" "Guix"))) + (replace 'wrap + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (git (assoc-ref inputs "git"))) + (wrap-program (string-append out "/bin/gl") + `("PATH" ":" prefix (,(string-append git "/bin"))) + `("PYTHONPATH" ":" = + (,(string-append out "/lib/python" + ,(version-major+minor + (package-version python)) + "/site-packages:") + ,(getenv "PYTHONPATH")))) + #t)))))) + (native-inputs + `(("git-for-tests" ,git-minimal))) + (inputs + `(("git" ,git-minimal) + ("python-clint" ,python-clint) + ("python-pygit2" ,python-pygit2) + ("python-sh" ,python-sh))) + (home-page "https://gitless.com") + (synopsis "Simple version control system built on top of Git") + (description + "Gitless is a Git-compatible version control system that aims to be easy to + learn and use. It simplifies the common workflow by committing changes to + tracked files by default and saving any uncommitted changes as part of a branch. + + The friendly @command{gl} command-line interface gives feedback and helps you + figure out what to do next. + + Gitless is implemented on top of Git and its commits and repositories are + indistinguishable from Git's. You (or other contributors) can always fall back + on @command{git}, and use any regular Git hosting service.") + (license license:expat))) + (define-public libgit2 (package (name "libgit2")