diff options
author | Ricardo Wurmus <rekado@elephly.net> | 2019-01-23 12:08:27 +0100 |
---|---|---|
committer | Ricardo Wurmus <rekado@elephly.net> | 2019-01-23 12:08:27 +0100 |
commit | 5aaef5c5decbf4dd43dfd1bb8d2a7d9e049a8580 (patch) | |
tree | 9f4ce853b9bc2d2b5433d8f0bec18749e93d8ba3 /gnu/packages | |
parent | 38f77be464b0b6ca76105d5f0a1b5e55fd694036 (diff) | |
parent | 6a6799b27af8646da112d51bedb8e5ff6158e425 (diff) |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages')
-rw-r--r-- | gnu/packages/base.scm | 18 | ||||
-rw-r--r-- | gnu/packages/cpp.scm | 11 | ||||
-rw-r--r-- | gnu/packages/ebook.scm | 4 | ||||
-rw-r--r-- | gnu/packages/emacs-xyz.scm | 112 | ||||
-rw-r--r-- | gnu/packages/finance.scm | 14 | ||||
-rw-r--r-- | gnu/packages/games.scm | 14 | ||||
-rw-r--r-- | gnu/packages/guile.scm | 4 | ||||
-rw-r--r-- | gnu/packages/haskell.scm | 4 | ||||
-rw-r--r-- | gnu/packages/linux.scm | 95 | ||||
-rw-r--r-- | gnu/packages/messaging.scm | 8 | ||||
-rw-r--r-- | gnu/packages/moreutils.scm | 9 | ||||
-rw-r--r-- | gnu/packages/package-management.scm | 26 | ||||
-rw-r--r-- | gnu/packages/pdf.scm | 61 | ||||
-rw-r--r-- | gnu/packages/perl-check.scm | 22 | ||||
-rw-r--r-- | gnu/packages/perl.scm | 55 | ||||
-rw-r--r-- | gnu/packages/python-web.scm | 16 | ||||
-rw-r--r-- | gnu/packages/python-xyz.scm | 47 | ||||
-rw-r--r-- | gnu/packages/video.scm | 18 | ||||
-rw-r--r-- | gnu/packages/virtualization.scm | 215 | ||||
-rw-r--r-- | gnu/packages/xml.scm | 6 | ||||
-rw-r--r-- | gnu/packages/xorg.scm | 6 |
21 files changed, 576 insertions, 189 deletions
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 9af04029ba..38d9524653 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -13,7 +13,7 @@ ;;; Copyright © 2017, 2018 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2017 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> -;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net> +;;; Copyright © 2018, 2019 Ricardo Wurmus <rekado@elephly.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -975,7 +975,7 @@ with the Linux kernel.") (("/bin/pwd") "pwd")) #t)))))))) -(define-public glibc-locales +(define-public (make-glibc-locales glibc) (package (inherit glibc) (name "glibc-locales") @@ -1010,7 +1010,7 @@ the 'share/locale' sub-directory of this package.") ,(version-major+minor (package-version glibc))))))))))) -(define-public glibc-utf8-locales +(define-public (make-glibc-utf8-locales glibc) (package (name "glibc-utf8-locales") (version (package-version glibc)) @@ -1060,6 +1060,18 @@ test environments.") (home-page (package-home-page glibc)) (license (package-license glibc)))) +(define-public glibc-locales + (make-glibc-locales glibc)) +(define-public glibc-utf8-locales + (make-glibc-utf8-locales glibc)) + +(define-public glibc-locales-2.27 + (package (inherit (make-glibc-locales glibc-2.27)) + (name "glibc-locales-2.27"))) +(define-public glibc-utf8-locales-2.27 + (package (inherit (make-glibc-utf8-locales glibc-2.27)) + (name "glibc-utf8-locales-2.27"))) + (define-public which (package (name "which") diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index d591e6a884..f5aa447a79 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -41,12 +41,15 @@ (version "0.4.37") (source (origin (method url-fetch) + ;; Warning: This source has proved unreliable 1 time at least. + ;; Consider an alternate source or report upstream if this + ;; happens again. (uri (string-append "https://mediaarea.net/download/source/" name "/" version "/" name "_" version ".tar.bz2")) (sha256 (base32 - "1hcsrmn85b0xp0mp33aazk7g071q1v3f163nnhv8b0mv9c4bgsfn")))) + "1dkqbgabzpa6bd7dkqrvd35sdxrhr6qxalb88f3dw0afk65xqb0k")))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) @@ -58,10 +61,8 @@ (modify-phases %standard-phases (add-after 'unpack 'pre-configure (lambda _ - (chdir "Project/GNU/Library"))) - (add-after 'pre-configure 'autogen - (lambda _ - (zero? (system* "sh" "autogen.sh"))))))) + (chdir "Project/GNU/Library") + #t))))) (home-page "https://github.com/MediaArea/ZenLib") (synopsis "C++ utility library") (description "ZenLib is a C++ utility library. It includes classes for handling diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index 21c2b2b6f0..99e49bc172 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -178,6 +178,10 @@ (pyqt (assoc-ref inputs "python2-pyqt"))) (substitute* "setup/build_environment.py" (("sys.prefix") (string-append "'" pyqt "'"))) + (substitute* "src/calibre/ebooks/pdf/pdftohtml.py" + (("PDFTOHTML = 'pdftohtml'") + (string-append "PDFTOHTML = \"" (assoc-ref inputs "poppler") + "/bin/pdftohtml\""))) (setenv "PODOFO_INC_DIR" (string-append podofo "/include/podofo")) (setenv "PODOFO_LIB_DIR" (string-append podofo "/lib")) #t))) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index e90c3b3e29..2a811e5315 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -31,7 +31,7 @@ ;;; Copyright © 2017 Peter Mikkelsen <petermikkelsen10@gmail.com> ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017 Mike Gerwitz <mtg@gnu.org> -;;; Copyright © 2017, 2018 Maxim Cournoyer <maxim.cournoyer@gmail.com> +;;; Copyright © 2017, 2018, 2019 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2018 Sohom Bhattacharjee <soham.bhattacharjee15@gmail.com> ;;; Copyright © 2018 Mathieu Lirzin <mthl@gnu.org> ;;; Copyright © 2018, 2019 Pierre Neidhardt <mail@ambrevar.xyz> @@ -6906,49 +6906,53 @@ Emacs.") ;; Tests for ert-runner have a circular dependency with ecukes, and therefore ;; cannot be run (define-public emacs-ert-runner - (package - (name "emacs-ert-runner") - (version "0.7.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://github.com/rejeep/ert-runner.el/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "1657nck9i96a4xgl8crfqq0s8gflzp21pkkzwg6m3z5npjxklgwp")))) - (build-system emacs-build-system) - (inputs - `(("emacs-ansi" ,emacs-ansi) - ("emacs-commander" ,emacs-commander) - ("emacs-dash" ,emacs-dash) - ("emacs-f" ,emacs-f) - ("emacs-s" ,emacs-s) - ("emacs-shut-up" ,emacs-shut-up))) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'install 'install-executable - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (substitute* "bin/ert-runner" - (("ERT_RUNNER=\"\\$\\(dirname \\$\\(dirname \\$0\\)\\)") - (string-append "ERT_RUNNER=\"" out - "/share/emacs/site-lisp/guix.d/ert-runner-" - ,version))) - (install-file "bin/ert-runner" (string-append out "/bin")) - (wrap-program (string-append out "/bin/ert-runner") - (list "EMACSLOADPATH" ":" 'prefix - (string-split (getenv "EMACSLOADPATH") #\:))) - #t)))) - #:include (cons* "^reporters/.*\\.el$" %default-include))) - (home-page "https://github.com/rejeep/ert-runner.el") - (synopsis "Opinionated Ert testing workflow") - (description "@code{ert-runner} is a tool for Emacs projects tested + (let ((version "0.7.0") + (revision "1") + (commit "90b8fdd5970ef76a4649be60003b37f82cdc1a65")) + (package + (name "emacs-ert-runner") + (version (git-version "0.7.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/rejeep/ert-runner.el.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "04nxmyzncacj2wmzd84vv9wkkr2dk9lcb10dvygqmg3p1gadnwzz")))) + (build-system emacs-build-system) + (inputs + `(("emacs-ansi" ,emacs-ansi) + ("emacs-commander" ,emacs-commander) + ("emacs-dash" ,emacs-dash) + ("emacs-f" ,emacs-f) + ("emacs-s" ,emacs-s) + ("emacs-shut-up" ,emacs-shut-up))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'install 'install-executable + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (substitute* "bin/ert-runner" + (("ERT_RUNNER=\"\\$\\(dirname \\$\\(dirname \\$0\\)\\)") + (string-append "ERT_RUNNER=\"" out + "/share/emacs/site-lisp/guix.d/ert-runner-" + ,version))) + (install-file "bin/ert-runner" (string-append out "/bin")) + (wrap-program (string-append out "/bin/ert-runner") + (list "EMACSLOADPATH" ":" 'prefix + (string-split (getenv "EMACSLOADPATH") #\:))) + #t)))) + #:include (cons* "^reporters/.*\\.el$" %default-include))) + (home-page "https://github.com/rejeep/ert-runner.el") + (synopsis "Opinionated Ert testing workflow") + (description "@code{ert-runner} is a tool for Emacs projects tested using ERT. It assumes a certain test structure setup and can therefore make running tests easier.") - (license license:gpl3+))) + (license license:gpl3+)))) (define-public ert-runner (deprecated-package "ert-runner" emacs-ert-runner)) @@ -12867,3 +12871,27 @@ DBI, and provides DB-accessing API and the simple management UI.") (description "This package is a convenience wrapper for @command{edbi} to open SQLite databases.") (license license:gpl3+)))) + +(define-public emacs-nix-mode + (package + (name "emacs-nix-mode") + (version "1.2.2") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/NixOS/nix-mode/archive/v" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "06aqz0czznsj8835jqnk794sy2p6pa8kxfqwh0nl5d5vxivria6z")))) + (build-system emacs-build-system) + (inputs + `(("emacs-company" ,emacs-company) + ("emacs-mmm-mode" ,emacs-mmm-mode))) + (home-page "https://github.com/NixOS/nix-mode") + (synopsis "Emacs major mode for editing Nix expressions") + (description "@code{nixos-mode} provides an Emacs major mode for editing +Nix expressions. It supports syntax highlighting, indenting and refilling of +comments.") + (license license:lgpl2.1+))) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 4683887979..250b1db144 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -73,15 +73,15 @@ (define-public bitcoin-core (package (name "bitcoin-core") - (version "0.16.1") + (version "0.17.1") (source (origin (method url-fetch) (uri - (string-append "https://bitcoin.org/bin/bitcoin-core-" + (string-append "https://bitcoincore.org/bin/bitcoin-core-" version "/bitcoin-" version ".tar.gz")) (sha256 (base32 - "1zkqp93yircd3pbxczxfnibkpq0sgcv5r7wg6d196b9pwgr9zd39")))) + "0am4pnaf2cisv172jqx6jdpzx770agm8777163lkjbw3ryslymiy")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) @@ -115,9 +115,15 @@ "/bin/lupdate")) #:phases (modify-phases %standard-phases + (add-before 'configure 'make-qt-deterministic + (lambda _ + ;; Make Qt deterministic. + (setenv "QT_RCC_SOURCE_DATE_OVERRIDE" "1") + #t)) (add-before 'check 'set-home (lambda _ - (setenv "HOME" (getenv "TMPDIR"))))))) ; Tests write to $HOME. + (setenv "HOME" (getenv "TMPDIR")) ; Tests write to $HOME. + #t))))) (home-page "https://bitcoin.org/en/") (synopsis "Bitcoin peer-to-peer client") (description diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 9fa2bb1795..176f56e7a2 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -1418,6 +1418,8 @@ interface or via an external visual interface such as GNU XBoard.") ("sdl-gfx" ,sdl-gfx) ("fontconfig" ,fontconfig) ("check" ,check))) + (properties '((ftp-directory . "/freedink") + (upstream-name . "freedink"))) (home-page "https://www.gnu.org/software/freedink/") (synopsis "Twisted adventures of young pig farmer Dink Smallwood") (description @@ -1430,14 +1432,14 @@ To that extent, it also includes a front-end for managing all of your D-Mods.") (define freedink-data (package (name "freedink-data") - (version "1.08.20170401") + (version "1.08.20190120") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/freedink/freedink-data-" - version ".tar.xz")) + version ".tar.gz")) (sha256 (base32 - "1zx7qywibhznj7bnz217404scr8dfh0xj24xjihnda5iapzz7lz8")))) + "17gvryadlxk172mblbsil7hina1z5wahwaxnr6g3mdq57dvl8pvi")))) (build-system gnu-build-system) (arguments `(#:phases @@ -1445,6 +1447,7 @@ To that extent, it also includes a front-end for managing all of your D-Mods.") (delete 'configure) ; no configure script (delete 'check)) ; no tests #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))))) + (properties '((ftp-directory . "/freedink"))) (home-page "https://www.gnu.org/software/freedink/") (synopsis "Game data for GNU Freedink") (description @@ -1468,6 +1471,8 @@ To that extent, it also includes a front-end for managing all of your D-Mods.") (inputs `(("bzip2" ,bzip2) ("wxwidgets" ,wxwidgets))) + (properties '((ftp-directory . "/freedink") + (upstream-name . "dfarc"))) (home-page "https://www.gnu.org/software/freedink/") (synopsis "Front-end for managing and playing Dink Modules") (description "DFArc makes it easy to play and manage the GNU FreeDink game @@ -5453,6 +5458,9 @@ Strife, Chex Quest, and fan-created games like Harmony, Hacx and Freedoom.") (string-append "fortune-mod/cmake/" (strip-store-file-name cmake-rules))) (chdir "fortune-mod") + ;; TODO: Valgrind tests fail for some reason. + ;; Similar issue: https://github.com/shlomif/fortune-mod/issues/21 (?) + (delete-file "tests/t/valgrind.t") #t))) (add-after 'install 'fix-install-directory (lambda* (#:key outputs #:allow-other-keys) diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 8d14571895..b1447a1d2e 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -1672,7 +1672,7 @@ is no support for parsing block and inline level HTML.") (define-public guile-bytestructures (package (name "guile-bytestructures") - (version "1.0.3") + (version "1.0.5") (source (origin (method url-fetch) (uri (string-append "https://github.com/TaylanUB/scheme-bytestructures" @@ -1680,7 +1680,7 @@ is no support for parsing block and inline level HTML.") "/bytestructures-" version ".tar.gz")) (sha256 (base32 - "0xf6s8gd3656j8k2ar6y7i62r68azawyzxhsagsk8nvldnrs1r18")))) + "0ibk7fjwpb450lnrva4bx45sgln3pbyb645az4ansvh1spgani43")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index a3ce2a3e4c..9433ae0570 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2015 Siniša Biđin <sinisa@bidin.eu> ;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org> ;;; Copyright © 2015 Eric Bavier <bavier@member.fsf.org> -;;; Copyright © 2016, 2018 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2016, 2018, 2019 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2016, 2017 Nils Gillmann <ng0@n0.is> ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus <rekado@elephly.net> @@ -3790,8 +3790,6 @@ writing to stdout and other handles.") (base32 "1qrpxfirsxckg7jv28f5ah2qc8lh95hp7rnqkbqs1ahcwlbnvkm7")))) (build-system haskell-build-system) - (inputs - `(("ghc-hunit" ,ghc-hunit))) ;; these inputs are necessary to use this library (inputs `(("ghc-text" ,ghc-text) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 4bd53c2ba0..1d47d2caaf 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013, 2014, 2015, 2016 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2012 Nikita Karetnikov <nikita@karetnikov.org> -;;; Copyright © 2014, 2015, 2016, 2017, 2018 Mark H Weaver <mhw@netris.org> +;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015 Federico Beffa <beffa@fbengineering.ch> ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com> ;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il> @@ -413,8 +413,8 @@ for ARCH and optionally VARIANT, or #f if there is no such configuration." It has been modified to remove all non-free binary blobs.") (license license:gpl2))) -(define %linux-libre-version "4.20.3") -(define %linux-libre-hash "0mk996fb4bd9548xnv2as4lxm3gyj1kvn6ra03xxpb0wf8cqdazz") +(define %linux-libre-version "4.20.4") +(define %linux-libre-hash "1p7ixkqvnr0mzyivyby8hfix44np7w1nvyxghz8wa1h2nhsszvzv") (define %linux-libre-4.20-patches (list %boot-logo-patch @@ -427,8 +427,8 @@ It has been modified to remove all non-free binary blobs.") #:patches %linux-libre-4.20-patches #:configuration-file kernel-config)) -(define %linux-libre-4.19-version "4.19.16") -(define %linux-libre-4.19-hash "1dpfllfzksrr6iqhvbh2905gkvycsv5zcmgq6wmwqiry1swzdfyk") +(define %linux-libre-4.19-version "4.19.17") +(define %linux-libre-4.19-hash "0friqd9wyhddjli4m41wd994ygnwng40a95ry14478rkadfv7iwh") (define %linux-libre-4.19-patches (list %boot-logo-patch @@ -5039,3 +5039,88 @@ file systems.") ;; The library "libhandle" and the headers in "xfslibs-dev" are ;; licensed under lgpl2.1. the other stuff is licensed under gpl2. (license (list license:gpl2 license:lgpl2.1)))) + +(define-public genext2fs + (package + (name "genext2fs") + (version "1.4.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jeremie-koenig/genext2fs.git") + (commit (string-append "genext2fs-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1r0n74pyypv63qfqqpvx75dwijcsvcrvqrlv8sldbhv0nwr1gk53")))) + (build-system gnu-build-system) + (home-page "https://github.com/jeremie-koenig/genext2fs") + (synopsis "Generate ext2 filesystem as a normal user") + (description "This package provides a program to general an ext2 +filesystem as a normal (non-root) user. It does not require you to mount +the image file to copy files on it, nor does it require that you become +the superuser to make device nodes.") + (license license:gpl2))) + +(define-public fakeroot + (package + (name "fakeroot") + (version "1.23") + (source (origin + (method url-fetch) + (uri (string-append "http://ftp.debian.org/debian/pool/main/f/" + "fakeroot/fakeroot_" version ".orig.tar.xz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1xpl0s2yjyjwlf832b6kbkaa5921liybaar13k7n45ckd9lxd700")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'configure 'patch-Makefile + (lambda _ + ;; Note: The root of the problem is already in "Makefile.am". + (substitute* "Makefile" + (("/bin/sh") (which "sh"))) + #t)) + (add-after 'unpack 'patch-getopt + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "scripts/fakeroot.in" + (("getopt") + (string-append (assoc-ref inputs "util-linux") + "/bin/getopt"))) + #t)) + (add-before 'check 'prepare-check + (lambda _ + (setenv "SHELL" (which "bash")) + (setenv "VERBOSE" "1") + (substitute* "test/t.touchinstall" + ;; We don't have the name of the root user, so use ID=0. + (("grep root") "grep \"\\<0\\>\"")) + (substitute* "test/tartest" + ;; We don't have the name of the root group, so use ID=0. + (("ROOTGROUP=root") "ROOTGROUP=0") + ;; We don't have the name of the daemon user, so use IDs. + (("daemon:sys") "1:3") + (("daemon:") "1:")) + ;; We don't have an /etc/passwd entry for "root" - use numeric IDs. + (substitute* "test/compare-tar" + (("tar -tvf") "tar --numeric-owner -tvf")) + #t))))) + (native-inputs + `(("sharutils" ,sharutils) ; for the tests + ("xz" ,xz))) ; for the tests + (inputs + `(("libcap" ,libcap) + ("util-linux" ,util-linux))) + (synopsis "Provides a fake root environment") + (description "@command{fakeroot} runs a command in an environment where +it appears to have root privileges for file manipulation. This is useful +for allowing users to create archives (tar, ar, .deb etc.) with files in +them with root permissions/ownership. Without fakeroot one would have to +have root privileges to create the constituent files of the archives with +the correct permissions and ownership, and then pack them up, or one would +have to construct the archives directly, without using the archiver.") + (home-page "http://freshmeat.sourceforge.net/projects/fakeroot") + (license license:gpl3+))) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 36a181446a..be39d14b53 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -553,14 +553,14 @@ simultaneously and therefore appear under the same nickname on IRC.") (define-public python-nbxmpp (package (name "python-nbxmpp") - (version "0.6.8") + (version "0.6.9") (source (origin (method url-fetch) (uri (pypi-uri "nbxmpp" version)) (sha256 (base32 - "1iip8ijxp86fx4bl1h67p2lp02p2zm1ga2p3q43nv30smj54nawc")))) + "03f8dk4kb7ya0pg7v0a0kqms4c7f2bqan5wl4ig0mcwpdmppj3b6")))) (build-system python-build-system) (arguments `(#:tests? #f)) ; no tests @@ -578,7 +578,7 @@ was initially a fork of xmpppy, but uses non-blocking sockets.") (define-public gajim (package (name "gajim") - (version "1.1.1") + (version "1.1.2") (source (origin (method url-fetch) (uri (string-append "https://gajim.org/downloads/" @@ -586,7 +586,7 @@ was initially a fork of xmpppy, but uses non-blocking sockets.") "/gajim-" version ".tar.bz2")) (sha256 (base32 - "09n4445hclqwfnk2h9cxvsxaixza4cpgb5rp4najdfc2jgg2msb3")))) + "1lx03cgi58z54xb7mhs6bc715lc00w5mpysf9n3q8zgn759fm0rj")))) (build-system python-build-system) (arguments `(#:phases diff --git a/gnu/packages/moreutils.scm b/gnu/packages/moreutils.scm index 34bce23c30..12d93079c0 100644 --- a/gnu/packages/moreutils.scm +++ b/gnu/packages/moreutils.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com> -;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2016, 2017, 2019 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; ;;; This file is part of GNU Guix. @@ -30,7 +30,7 @@ (define-public moreutils (package (name "moreutils") - (version "0.62") + (version "0.63") (source (origin (method url-fetch) @@ -43,7 +43,7 @@ name "-" version ".tar.gz"))) (sha256 (base32 - "1gc3rswr0jl0z42pbrmw2zc4gxsyp60hq8cnvrlsig1vk1s9vpwx")))) + "07c3wqf1sx3nhj4cs71a9ajcfl6arjjvvnhwqz7a0xm2m1b6vj2g")))) (build-system gnu-build-system) ;; For building the manual pages. (native-inputs @@ -63,7 +63,8 @@ (let* ((out (assoc-ref outputs "out"))) (wrap-program (string-append out "/bin/ts") - `("PERL5LIB" ":" prefix (,(getenv "PERL5LIB"))))))) + `("PERL5LIB" ":" prefix (,(getenv "PERL5LIB"))))) + #t)) (delete 'configure)) ; no configure script #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 05da8190b6..66712da08c 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -43,7 +43,6 @@ #:use-module (gnu packages curl) #:use-module (gnu packages dbm) #:use-module (gnu packages docbook) - #:use-module (gnu packages emacs-xyz) #:use-module (gnu packages file) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) @@ -76,7 +75,6 @@ #:use-module (gnu packages web) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) - #:use-module (guix build-system emacs) #:use-module (guix build-system gnu) #:use-module (guix build-system meson) #:use-module (guix build-system python) @@ -460,30 +458,6 @@ store, usually the directory /nix/store, where each package has its own unique sub-directory.") (license license:lgpl2.1+))) -(define-public emacs-nix-mode - (package - (name "emacs-nix-mode") - (version "1.2.2") - (source - (origin - (method url-fetch) - (uri (string-append "https://github.com/NixOS/nix-mode/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "06aqz0czznsj8835jqnk794sy2p6pa8kxfqwh0nl5d5vxivria6z")))) - (build-system emacs-build-system) - (inputs - `(("emacs-company" ,emacs-company) - ("emacs-mmm-mode" ,emacs-mmm-mode))) - (home-page "https://github.com/NixOS/nix-mode") - (synopsis "Emacs major mode for editing Nix expressions") - (description "@code{nixos-mode} provides an Emacs major mode for editing -Nix expressions. It supports syntax highlighting, indenting and refilling of -comments.") - (license license:lgpl2.1+))) - (define-public stow (package (name "stow") diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 2c9442db02..33bd0062ff 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -1067,26 +1067,45 @@ presentation. The input files processed by pdfpc are PDF documents.") (license license:gpl2+))) (define-public paps - (package - (name "paps") - (version "0.6.8") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/paps/paps/" version "/" - "paps-" version ".tar.gz")) - (sha256 - (base32 - "080ahnyvq918m8ahq8bg9qvgzlv4k0jgcsdqhrwjzppclx74q8fv")))) - (build-system gnu-build-system) - (inputs - `(("pango" ,pango))) - (native-inputs - `(("pkg-config" ,pkg-config))) - (home-page "http://paps.sourceforge.net/") - (synopsis "Pango to PostScript converter") - (description - "Paps reads a UTF-8 encoded file and generates a PostScript language + (let ((commit "37e6ca1cd96d751bbbff5539d795c90d657289a5") + (revision "1")) + (package + (name "paps") + ;; The last release was in 2015, but since then there have been security + ;; bug fixes. + (version (git-version "0.7.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/dov/paps.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1ilcyjqdynxsd2p8dnn8h4592dwf531x9pbkxa1w09hkcdn7hgwc")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'do-not-run-configure-script-during-bootstrap + (lambda _ + (substitute* "autogen.sh" + (("^./configure") "#")) + #t))))) + (inputs + `(("pango" ,pango))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("gettext" ,gettext-minimal) + ("glib" ,glib "bin") + ("intltool" ,intltool) + ("pkg-config" ,pkg-config))) + (home-page "https://github.com/dov/paps") + (synopsis "Pango to PostScript converter") + (description + "Paps reads a UTF-8 encoded file and generates a PostScript language rendering of the file. The rendering is done by creating outline curves through the Pango @code{ft2} backend.") - (license license:lgpl2.0+))) + (license license:lgpl2.0+)))) diff --git a/gnu/packages/perl-check.scm b/gnu/packages/perl-check.scm index ee832ccf94..c1edf48f06 100644 --- a/gnu/packages/perl-check.scm +++ b/gnu/packages/perl-check.scm @@ -788,6 +788,28 @@ set_relative_time, set_absolute_time or set_fixed_time to alter future calls to gmtime,time or localtime.") (license perl-license))) +(define-public perl-test-more-utf8 + (package + (name "perl-test-more-utf8") + (version "0.05") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://cpan/authors/id/M/MO/MONS/Test-More-UTF8-" + version ".tar.gz")) + (sha256 + (base32 + "016fs77lmw8xxrcnapvp6wq4hjwgsdfi3l9ylpxgxkcpdarw9wdr")))) + (build-system perl-build-system) + (home-page "https://metacpan.org/release/Test-More-UTF8") + (synopsis "Enhance Test::More for UTF8-based projects") + (description "@code{Test::More::UTF8} is a simple extension for the widely +used @code{Test::More} module. By default, it will do a @code{binmode ':utf8'} +on all of @code{Test::Builder}'s output handles thus enabling the easy use +flagged strings without warnings like \"Wide character in print @dots{}\"") + (license perl-license))) + (define-public perl-test-most (package (name "perl-test-most") diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index c4d9d64de3..073cdbf482 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -3431,7 +3431,7 @@ provide a quick dropin when such functionality is needed.") (define-public perl-file-homedir (package (name "perl-file-homedir") - (version "1.002") + (version "1.004") (source (origin (method url-fetch) @@ -3439,7 +3439,7 @@ provide a quick dropin when such functionality is needed.") "File-HomeDir-" version ".tar.gz")) (sha256 (base32 - "0x62hn8rc7ninf9nlp69h61yh21g4cbq2g81sh64cf2ify2hqk7b")))) + "1bciyzwv7gwsnaykqz0czj6mlbkkg4hg1s40s1q7j2p6nlmpxxj5")))) (build-system perl-build-system) (propagated-inputs `(("perl-file-which" ,perl-file-which))) @@ -3559,7 +3559,7 @@ the input record separator string on a per file basis.") (define-public perl-file-remove (package (name "perl-file-remove") - (version "1.57") + (version "1.58") (source (origin (method url-fetch) @@ -3567,14 +3567,16 @@ the input record separator string on a per file basis.") "File-Remove-" version ".tar.gz")) (sha256 (base32 - "1b814lw181kkqh6c1n4p2zlzzsq6ic5pfpr831nphf2w2rhcvgmk")))) + "1n6h5w3sp2bs4cfrifdx2z15cfpb4r536179mx1a12xbmj1yrxl1")))) (build-system perl-build-system) + (native-inputs + `(("perl-module-build" ,perl-module-build))) (home-page "https://metacpan.org/release/File-Remove") (synopsis "Remove files and directories in Perl") - (description "File::Remove::remove removes files and directories. It acts -like /bin/rm, for the most part. Although \"unlink\" can be given a list of -files, it will not remove directories; this module remedies that. It also -accepts wildcards, * and ?, as arguments for file names.") + (description "@code{File::Remove::remove} removes files and directories. +It acts like @code{/bin/rm}, for the most part. Although @code{unlink} can be +given a list of files, it will not remove directories; this module remedies +that. It also accepts wildcards, * and ?, as arguments for file names.") (license (package-license perl)))) (define-public perl-file-sharedir @@ -3648,15 +3650,15 @@ allows you to locate these files after installation.") (define-public perl-file-slurp (package (name "perl-file-slurp") - (version "9999.19") + (version "9999.25") (source (origin (method url-fetch) - (uri (string-append "mirror://cpan/authors/id/U/UR/URI/" + (uri (string-append "mirror://cpan/authors/id/C/CA/CAPOEIRAB/" "File-Slurp-" version ".tar.gz")) (sha256 (base32 - "0hrn4nipwx40d6ji8ssgr5nw986z9iqq8cn0kdpbszh9jplynaff")))) + "1hg3bhf5m78d77p4174cnldd75ppyrvr5rkc8w289ihvwsx9gsn7")))) (build-system perl-build-system) (home-page "https://metacpan.org/release/File-Slurp") (synopsis "Reading/Writing/Modifying of complete files") @@ -3732,14 +3734,14 @@ a safe way.") (define-public perl-file-which (package (name "perl-file-which") - (version "1.09") + (version "1.23") (source (origin (method url-fetch) - (uri (string-append "mirror://cpan/authors/id/A/AD/ADAMK/" + (uri (string-append "mirror://cpan/authors/id/P/PL/PLICEASE/" "File-Which-" version ".tar.gz")) (sha256 (base32 - "1hxjyh9yrv32f3g8vrnr8iylzprajsac14vjm75kf1qnj1jyqbxp")))) + "0y70qh5kn2hyrrvbsfhg0iws2qggk5vkpz37f7rbd5rd9cjc57dp")))) (build-system perl-build-system) (native-inputs `(("test-script" ,perl-test-script))) (synopsis "Portable implementation of the `which' utility") @@ -3747,7 +3749,7 @@ a safe way.") "File::Which was created to be able to get the paths to executable programs on systems under which the `which' program wasn't implemented in the shell.") - (home-page "https://metacpan.org/release/ADAMK/File-Which-1.09") + (home-page "https://metacpan.org/release/File-Which") (license (package-license perl)))) (define-public perl-file-zglob @@ -4361,15 +4363,15 @@ commands.") (define-public perl-json (package (name "perl-json") - (version "2.90") + (version "4.01") (source (origin (method url-fetch) - (uri (string-append "mirror://cpan/authors/id/M/MA/MAKAMAKA/" + (uri (string-append "mirror://cpan/authors/id/I/IS/ISHIGAKI/" "JSON-" version ".tar.gz")) (sha256 (base32 - "127yppvr17qik9pkd1vy901hs4l13kg6rhp76jdgcyask35v7nsd")))) + "1vdiw095g5rf51q8d0ipf8020jx371pma0k4sxp0wlfl76lr65b3")))) (build-system perl-build-system) (propagated-inputs `(("perl-json-xs" ,perl-json-xs))) ;recommended @@ -4436,7 +4438,7 @@ either uses the first module it finds or throws an error.") (define-public perl-json-xs (package (name "perl-json-xs") - (version "3.01") + (version "4.0") (source (origin (method url-fetch) @@ -4444,8 +4446,10 @@ either uses the first module it finds or throws an error.") "JSON-XS-" version ".tar.gz")) (sha256 (base32 - "1aviik480m61ykwvyix83grywzbk828wvfz19hqfvaasd8jz73af")))) + "0118yrzagwlcfj5yldn3h23zzqs2rx282jlm068nf7fjlvy4m7s7")))) (build-system perl-build-system) + (native-inputs + `(("perl-canary-stability" ,perl-canary-stability))) (propagated-inputs `(("perl-common-sense" ,perl-common-sense) ("perl-types-serialiser" ,perl-types-serialiser))) @@ -5299,7 +5303,7 @@ from Moose::Conflicts and moose-outdated.") (define-public perl-module-scandeps (package (name "perl-module-scandeps") - (version "1.25") + (version "1.27") (source (origin (method url-fetch) @@ -5307,7 +5311,7 @@ from Moose::Conflicts and moose-outdated.") "Module-ScanDeps-" version ".tar.gz")) (sha256 (base32 - "13280nq0d6zc58mcz3kvs2m85a741czq0fabk69ks1nr4j1w2nl4")))) + "0j6r9r99x5p0i6fv06i44wpsvjxj32amjkiqf6pmqpj80jff2k7f")))) (build-system perl-build-system) (native-inputs `(("perl-test-requires" ,perl-test-requires))) @@ -8389,7 +8393,7 @@ algorism to indicate multiplication by 1000.") (define-public perl-text-template (package (name "perl-text-template") - (version "1.47") + (version "1.54") (source (origin (method url-fetch) @@ -8399,8 +8403,11 @@ algorism to indicate multiplication by 1000.") ".tar.gz")) (sha256 (base32 - "1z781cgz7wbn80lf3kqr2ad0pg6g1wlnim0822h8liw28k3l5msh")))) + "0s56jgak9ccbbbybf5v8hvvhyplbfhzl6p6v1751inly80rlj1kv")))) (build-system perl-build-system) + (native-inputs + `(("perl-test-more-utf8" ,perl-test-more-utf8) + ("perl-test-warnings" ,perl-test-warnings))) (home-page "https://metacpan.org/release/Text-Template") (synopsis diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index af0595b36d..cee4973086 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015 Eric Dvorsak <eric@dvorsak.fr> -;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2017 Christopher Baines <mail@cbaines.net> ;;; Copyright © 2016, 2017 Danny Milosavljevic <dannym+a@scratchpost.org> ;;; Copyright © 2013, 2014, 2015, 2016 Andreas Enge <andreas@enge.fr> @@ -1218,14 +1218,14 @@ verification of the SSL peer.") (define-public python-websocket-client (package (name "python-websocket-client") - (version "0.37.0") + (version "0.54.0") (source (origin (method url-fetch) (uri (pypi-uri "websocket_client" version)) (sha256 (base32 - "0h9glp1jll3z76ly3kg08aqgxqk0a68p4zi9yn50353bh5nj92v7")))) + "0j88zmikaypf38lvpkf4aaxrjp9j07dmy5ghj7kli0fv3p4n45g5")))) (build-system python-build-system) (propagated-inputs `(("python-six" ,python-six))) @@ -1233,10 +1233,18 @@ verification of the SSL peer.") (synopsis "WebSocket client for Python") (description "The Websocket-client module provides the low level APIs for WebSocket usage in Python programs.") + (properties `((python2-variant . ,(delay python2-websocket-client)))) (license license:lgpl2.1+))) (define-public python2-websocket-client - (package-with-python2 python-websocket-client)) + (let ((base (package-with-python2 + (strip-python2-variant python-websocket-client)))) + (package + (inherit base) + (native-inputs + `(("python2-backport-ssl-match-hostname" + ,python2-backport-ssl-match-hostname) + ,@(package-native-inputs base)))))) (define-public python-requests (package diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 770f5abc63..35ac4e69f5 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org> -;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013, 2014, 2015, 2016 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014, 2017 Eric Bavier <bavier@member.fsf.org> @@ -1997,25 +1997,25 @@ e.g. filters, callbacks and errbacks can all be promises.") (define-public python-virtualenv (package (name "python-virtualenv") - (version "15.0.3") + (version "16.1.0") (source (origin (method url-fetch) (uri (pypi-uri "virtualenv" version)) (sha256 (base32 - "07cbajzk8l05k5zhlw0b9wbf2is65bl9v6zrn2a0iyn57w6pd73d")))) + "0242cg3hdq3qdvx5flyrki8lpwlgwf5k45c21ks5049fv7ygm6gq")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases - (replace 'check + (add-before 'check 'disable-failing-test (lambda _ ;; Disable failing test. See upstream bug report ;; https://github.com/pypa/virtualenv/issues/957 (substitute* "tests/test_virtualenv.py" (("skipif.*") "skipif(True, reason=\"Guix\")\n")) - (zero? (system* "py.test"))))))) + #t))))) (native-inputs `(("python-mock" ,python-mock) ("python-pytest" ,python-pytest))) @@ -3392,8 +3392,6 @@ toolkits.") ("python2-scipy" ,python2-scipy) ("python2-pandas" ,python2-pandas))) (native-inputs - `(("python2-cython" ,python2-cython))) - (native-inputs `(("unzip" ,unzip))) (home-page "http://research.microsoft.com/en-us/um/redmond/projects/mscompbio/") (synopsis "Library for reading and manipulating genetic data") @@ -6052,14 +6050,14 @@ and MAC network addresses.") (define-public python-wrapt (package (name "python-wrapt") - (version "1.10.11") + (version "1.11.1") (source (origin (method url-fetch) (uri (pypi-uri "wrapt" version)) (sha256 (base32 - "1ip3dwib39xhp79kblskgvz3fjzcwxgx3fs3ahdixhpjg7a61mfl")))) + "0cqmysny1pz01jw26q48q5zasvns6507rwhgm6wcw743f0r01sja")))) (build-system python-build-system) (arguments ;; Tests are not included in the tarball, they are only available in the @@ -8705,14 +8703,14 @@ to support both Python 2 and Python 3 with minimal overhead.") (define-public python-cysignals (package (name "python-cysignals") - (version "1.1.0") + (version "1.9.0") (source (origin (method url-fetch) - (uri (pypi-uri "cysignals" version ".tar.bz2")) + (uri (pypi-uri "cysignals" version)) (sha256 (base32 - "14cbyd9znlz6cxy1s3g6v6dv5jj45hn27pywkidd9b1zanaysqc6")))) + "15ix8crpad26cfl1skyg7qajqqfdrm8q5ahhmlfmqi1aw0jqj2g2")))) (build-system python-build-system) (native-inputs `(("python-cython" ,python-cython) @@ -11396,17 +11394,18 @@ builds partial trees by inspecting living objects.") (define-public python-isort (package (name "python-isort") - (version "4.2.5") + (version "4.3.4") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/timothycrosley/isort/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + ;; Tests pass only from the Github sources + (url "https://github.com/timothycrosley/isort") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "0zsrgkb0krn5476yncy5dd56k7dk34zqb4bnlvwy44ixgilyjmfh")))) + "1q0mlrpki5vjbgwxag5rghljjcfg7mvb0pbkwid80p0sqrxlm2p6")))) (build-system python-build-system) (native-inputs `(("python-mock" ,python-mock) @@ -11417,10 +11416,16 @@ builds partial trees by inspecting living objects.") imports alphabetically, and automatically separated into sections. It provides a command line utility, a python library and plugins for various editors.") - (license license:expat))) + (license license:expat) + (properties `((python2-variant . ,(delay python2-isort)))))) (define-public python2-isort - (package-with-python2 python-isort)) + (let ((base (package-with-python2 + (strip-python2-variant python-isort)))) + (package (inherit base) + (native-inputs + `(("python2-futures" ,python2-futures) + ,@(package-native-inputs base)))))) (define-public python2-backports-functools-lru-cache (package diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 34f10fdeb4..4121832f12 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -15,7 +15,7 @@ ;;; Copyright © 2016, 2018, 2019 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2017 Feng Shu <tumashu@163.com> -;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017 Chris Marusich <cmmarusich@gmail.com> ;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be> ;;; Copyright © 2017 Ethan R. Jones <doubleplusgood23@gmail.com> @@ -905,7 +905,7 @@ videoformats depend on the configuration flags of ffmpeg.") (define-public vlc (package (name "vlc") - (version "3.0.5") + (version "3.0.6") (source (origin (method url-fetch) (uri (string-append @@ -914,7 +914,7 @@ videoformats depend on the configuration flags of ffmpeg.") "/vlc-" version ".tar.xz")) (sha256 (base32 - "1nvj00khy08sing0mdnw6virmiq579mrk5rvpx9710nlxggqgh7m")))) + "1lvyyahv6g9zv7m5g5qinyrwmw47zdsd5ysimb862j7kw15nvh8q")))) (build-system gnu-build-system) (native-inputs `(("flex" ,flex) @@ -2667,15 +2667,18 @@ MPEG-2, MPEG-4, DVD (VOB)... (define-public mediainfo (package (name "mediainfo") - (version "0.7.95") + (version "18.12") (source (origin (method url-fetch) + ;; Warning: This source has proved unreliable 1 time at least. + ;; Consider an alternate source or report upstream if this + ;; happens again. (uri (string-append "https://mediaarea.net/download/source/" name "/" version "/" name "_" version ".tar.bz2")) (sha256 (base32 - "0dy51a3i79jppmg1gi4f6h7jx4hcgnkmfim4d7d3gmnlbkjh8anv")))) + "1ix95ilcjlawcq6phh25cgplm3riqa2ii7ql82g8yagqs4ldqp6a")))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) @@ -2693,10 +2696,7 @@ MPEG-2, MPEG-4, DVD (VOB)... (add-after 'unpack 'change-to-build-dir (lambda _ (chdir "Project/GNU/CLI") - #t)) - (add-after 'change-to-build-dir 'autogen - (lambda _ - (invoke "sh" "autogen.sh")))))) + #t))))) (home-page "https://mediaarea.net/en/MediaInfo") (synopsis "Utility for reading media metadata") (description "MediaInfo is a utility used for retrieving technical diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 82bde36222..d178a08413 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2017 Alex Vong <alexvong1995@gmail.com> ;;; Copyright © 2017 Andy Patterson <ajpatter@uwaterloo.ca> ;;; Copyright © 2017, 2018 Rutger Helling <rhelling@mykolab.com> -;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Danny Milosavljevic <dannym@scratchpost.org> ;;; Copyright © 2018 Sou Bunnbu <iyzsong@member.fsf.org> ;;; Copyright © 2018 Julien Lepiller <julien@lepiller.eu> @@ -30,17 +30,22 @@ (define-module (gnu packages virtualization) #:use-module (gnu packages) #:use-module (gnu packages admin) + #:use-module (gnu packages assembly) #:use-module (gnu packages attr) #:use-module (gnu packages autotools) #:use-module (gnu packages bison) #:use-module (gnu packages check) + #:use-module (gnu packages cmake) #:use-module (gnu packages compression) + #:use-module (gnu packages cross-base) #:use-module (gnu packages curl) #:use-module (gnu packages cyrus-sasl) #:use-module (gnu packages disk) #:use-module (gnu packages dns) #:use-module (gnu packages docbook) #:use-module (gnu packages documentation) + #:use-module (gnu packages figlet) + #:use-module (gnu packages firmware) #:use-module (gnu packages flex) #:use-module (gnu packages fontutils) #:use-module (gnu packages gettext) @@ -72,6 +77,7 @@ #:use-module (gnu packages textutils) #:use-module (gnu packages tls) #:use-module (gnu packages web) + #:use-module (gnu packages wget) #:use-module (gnu packages xdisorg) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) @@ -896,7 +902,7 @@ Open Container Initiative specification.") (define-public umoci (package (name "umoci") - (version "0.4.2") + (version "0.4.3") (source (origin (method url-fetch) (uri (string-append @@ -905,7 +911,7 @@ Open Container Initiative specification.") (file-name (string-append "umoci-" version ".tar.xz")) (sha256 (base32 - "1rq5jxcss9cmy05x9b2kh9ld57ribi8hgnx2w67jpmf343b83m4q")))) + "1hy3gcs8z25153qpw4rk2lispfaf2c90hv1q64xwyjxn22j9ayy9")))) (build-system go-build-system) (arguments '(#:import-path "github.com/openSUSE/umoci" @@ -1103,3 +1109,206 @@ x86 CPUs, from early 386 to the most recent x86-64 Intel and AMD processors. Bochs can run most Operating Systems inside the emulation including Linux, DOS or Microsoft Windows.") (license license:lgpl2.0+))) + +(define-public xen + (package + (name "xen") + (version "4.11.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "git://xenbits.xenproject.org/xen.git") + (commit (string-append "RELEASE-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1wv1hyfii14vi9lfjmnv07h2gpm3b7kvh2p55f4yy2b40simksgk")))) + (build-system gnu-build-system) + (arguments + `(#:configure-flags + (list "--enable-rpath" + "--disable-qemu-traditional" ; It tries to do "git clone" + "--disable-rombios" ; would try to "git clone" via etherboot. + ;; TODO: Re-enable stubdom (it's "more secure" to use it). + "--disable-stubdom" ; tries to "git clone" old patched newlib. + (string-append "--with-initddir=" + (assoc-ref %outputs "out") + "/etc/init.d") + (string-append "--with-system-qemu=" + (assoc-ref %build-inputs "qemu") + "/bin/qemu-system-i386") + (string-append "--with-system-seabios=" + (assoc-ref %build-inputs "seabios") + "/share/firmware/bios.bin") + (string-append "--with-system-ovmf=" + (assoc-ref %build-inputs "ovmf") + "/share/firmware/ovmf_ia32.bin")) + #:make-flags (list "-j" "1" + "XEN_BUILD_DATE=Thu Jan 1 01:00:01 CET 1970" + "XEN_BUILD_TIME=01:00:01" + "XEN_BUILD_HOST=" + "ETHERBOOT_NICS=" + "SMBIOS_REL_DATE=01/01/1970" + "VGABIOS_REL_DATE=01 Jan 1970" + ; QEMU_TRADITIONAL_LOC + ; QEMU_UPSTREAM_LOC + "SYSCONFIG_DIR=/tmp/etc/default" + (string-append "BASH_COMPLETION_DIR=" + (assoc-ref %outputs "out") + "/etc/bash_completion.d") + (string-append "BOOT_DIR=" + (assoc-ref %outputs "out") + "/boot") + (string-append "DEBUG_DIR=" + (assoc-ref %outputs "out") + "/lib/debug") + (string-append "EFI_DIR=" + (assoc-ref %outputs "out") + "/lib/efi") ; TODO lib64 ? + "MINIOS_UPSTREAM_URL=" + ;(string-append "DISTDIR=" + ; (assoc-ref %outputs "out")) +) + #:test-target "test" + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'unpack-mini-os + (lambda* (#:key inputs #:allow-other-keys) + (copy-recursively (assoc-ref inputs "mini-os") "extras/mini-os") + #t)) + (add-after 'unpack-mini-os 'patch + (lambda* (#:key inputs outputs #:allow-other-keys) + (substitute* "tools/firmware/Rules.mk" + (("override XEN_TARGET_ARCH = x86_32") + (string-append "override XEN_TARGET_ARCH = x86_32 +override CC = " (assoc-ref inputs "cross-gcc") "/bin/i686-linux-gnu-gcc")) + (("^CFLAGS =$") + (string-append "CFLAGS=-I" (assoc-ref inputs "cross-libc") + "/include\n"))) + (substitute* "config/x86_32.mk" + (("CFLAGS += -m32 -march=i686") + (string-append "CFLAGS += -march=i686 -I" + (assoc-ref inputs "cross-libc") + "/include"))) + ;; /var is not in /gnu/store , so don't try to create it. + (substitute* '("tools/Makefile" + "tools/xenstore/Makefile" + "tools/xenpaging/Makefile") + (("\\$\\(INSTALL_DIR\\) .*XEN_(DUMP|LOG|RUN|LIB|PAGING)_DIR.*") + "\n") + (("\\$\\(INSTALL_DIR\\) .*XEN_(RUN|LIB)_STORED.*") + "\n")) + ;; Prevent xen from creating /etc . + (substitute* "tools/examples/Makefile" + ((" install-readmes") "") + ((" install-configs") "")) + ;; Set rpath. + (substitute* "tools/pygrub/setup.py" + (("library_dirs =") + ; TODO: extra_link_args = ['-Wl,-rpath=/opt/foo'], + (string-append "runtime_library_dirs = ['" + (assoc-ref outputs "out") + "/lib'],\nlibrary_dirs ="))) + #t)) + (add-before 'configure 'patch-xen-script-directory + (lambda* (#:key outputs #:allow-other-keys) + (substitute* '("configure" + "tools/configure" + "docs/configure") + (("XEN_SCRIPT_DIR=.*") + (string-append "XEN_SCRIPT_DIR=" + (assoc-ref outputs "out") + "/etc/xen/scripts"))) + #t)) + (add-before 'configure 'set-environment-up + (lambda* (#:key make-flags #:allow-other-keys) + (define (cross? x) + (string-contains x "cross-i686-linux")) + (define (filter-environment! filter-predicate + environment-variable-names) + (for-each + (lambda (env-name) + (let* ((env-value (getenv env-name)) + (search-path (search-path-as-string->list env-value)) + (new-search-path (filter filter-predicate + search-path)) + (new-env-value (list->search-path-as-string + new-search-path ":"))) + (setenv env-name new-env-value))) + environment-variable-names)) + (setenv "CROSS_C_INCLUDE_PATH" (getenv "C_INCLUDE_PATH")) + (setenv "CROSS_CPLUS_INCLUDE_PATH" (getenv "CPLUS_INCLUDE_PATH")) + (setenv "CROSS_LIBRARY_PATH" (getenv "LIBRARY_PATH")) + (filter-environment! cross? + '("CROSS_C_INCLUDE_PATH" "CROSS_CPLUS_INCLUDE_PATH" + "CROSS_LIBRARY_PATH")) + (filter-environment! (lambda (e) (not (cross? e))) + '("C_INCLUDE_PATH" "CPLUS_INCLUDE_PATH" + "LIBRARY_PATH")) + ;; Guix tries to be helpful and automatically adds + ;; mini-os-git-checkout/include to the include path, + ;; but actually we don't want it to be there (yet). + (filter-environment! (lambda (e) + (not + (string-contains e + "mini-os-git-checkout"))) + '("C_INCLUDE_PATH" "CPLUS_INCLUDE_PATH" + "LIBRARY_PATH")) + (setenv "EFI_VENDOR" "guix") + #t)) + (replace 'build + (lambda* (#:key make-flags #:allow-other-keys) + (apply invoke "make" "world" make-flags)))))) + (inputs + `(("acpica" ,acpica) ; TODO: patch iasl invocation. + ("bridge-utils" ,bridge-utils) ; TODO: patch invocations. + ("glib" ,glib) + ("iproute" ,iproute) ; TODO: patch invocations. + ("libaio" ,libaio) + ("libx11" ,libx11) + ("libyajl" ,libyajl) + ("ncurses" ,ncurses) + ("openssl" ,openssl) + ("ovmf" ,ovmf) + ("pixman" ,pixman) + ("qemu" ,qemu-minimal) + ("seabios" ,seabios) + ("util-linux" ,util-linux) ; uuid + ; TODO: ocaml-findlib, ocaml-nox. + ("xz" ,xz) ; for liblzma + ("zlib" ,zlib))) + (native-inputs + `(("dev86" ,dev86) + ("bison" ,bison) + ("cmake" ,cmake) + ("figlet" ,figlet) + ("flex" ,flex) + ("gettext" ,gettext-minimal) + ("libnl" ,libnl) + ("mini-os" + ,(origin + (method git-fetch) + (uri (git-reference + (url "http://xenbits.xen.org/git-http/mini-os.git") + (commit (string-append "xen-RELEASE-" version)))) + (sha256 + (base32 + "1i8pcl19n60i2m9vlg79q3nknpj209c9ic5x10wxaicx45kc107f")) + (file-name "mini-os-git-checkout"))) + ("perl" ,perl) + ; TODO: markdown + ("pkg-config" ,pkg-config) + ("python" ,python-2) + ("wget" ,wget) + ("cross-gcc" ,(cross-gcc "i686-linux-gnu" + #:xbinutils (cross-binutils "i686-linux-gnu") + #:libc (cross-libc "i686-linux-gnu"))) + ("cross-libc" ,(cross-libc "i686-linux-gnu")) ; header files + ("cross-libc-static" ,(cross-libc "i686-linux-gnu") "static"))) + (home-page "https://xenproject.org/") + (synopsis "Xen Virtual Machine Monitor") + (description "This package provides the Xen Virtual Machine Monitor +which is a hypervisor.") + ;; TODO: Some files are licensed differently. List those. + (license license:gpl2) + (supported-systems '("i686-linux" "x86_64-linux" "armhf-linux")))) diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index fd4c3fea2c..05bc8aa13e 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -12,7 +12,7 @@ ;;; Copyright © 2016 Ben Woodcroft <donttrustben@gmail.com> ;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2016, 2017 Nils Gillmann <ng0@n0.is> -;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2016, 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2016, 2017, 2018 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2017 Adriano Peluso <catonano@gmail.com> ;;; Copyright © 2017 Gregor Giesen <giesen@zaehlwerk.net> @@ -686,14 +686,14 @@ This module provide functions which simplify writing tests for (define-public perl-xml-compile (package (name "perl-xml-compile") - (version "1.60") + (version "1.61") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/M/MA/MARKOV/" "XML-Compile-" version ".tar.gz")) (sha256 (base32 - "04vv7wy5v1l38xsfdbacvyd90qircvnrs2f3ysljm1nhq8mycmwm")))) + "13dvsaj8simivj867rkjlf7hhvvcwlahnhk70zf8cq2xbg8wmf7x")))) (build-system perl-build-system) (propagated-inputs `(("perl-carp" ,perl-carp) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 364a37e34d..7e3c1aad1c 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -14,7 +14,7 @@ ;;; Copyright © 2017, 2018 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2017, 2018, 2019 Rutger Helling <rhelling@mykolab.com> ;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net> -;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Kei Kebreau <kkebreau@posteo.net> ;;; Copyright © 2018 Oleg Pykhalov <go.wigust@gmail.com> ;;; Copyright © 2018 Benjamin Slade <slade@jnanam.net> @@ -2236,7 +2236,7 @@ X server: 'handhelds', 'redglass' and 'whiteglass'.") (define-public xcursorgen (package (name "xcursorgen") - (version "1.0.6") + (version "1.0.7") (source (origin (method url-fetch) @@ -2246,7 +2246,7 @@ X server: 'handhelds', 'redglass' and 'whiteglass'.") ".tar.bz2")) (sha256 (base32 - "0v7nncj3kaa8c0524j7ricdf4rvld5i7c3m6fj55l5zbah7r3j1i")))) + "0ggbv084cavp52hjgcz3vdj0g018axs0m23c03lpc5sgn92gidim")))) (build-system gnu-build-system) (inputs `(("libxcursor" ,libxcursor) |