diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-02-24 21:25:52 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-02-24 21:25:52 +0100 |
| commit | aa51eb2073f17e40d660d0beaeb7b1b78aa9e1cc (patch) | |
| tree | 5ccb7f83712c4400176a344e537b5fcbbb7047aa /gnu | |
| parent | 1b9eb93a5dd1e90291b614311cd1fb2051e72718 (diff) | |
| parent | 6eb35d4a780d37b809a6c8c1794ff227da2fa29d (diff) | |
| download | guix-aa51eb2073f17e40d660d0beaeb7b1b78aa9e1cc.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu')
48 files changed, 559 insertions, 292 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 131bbef87d..e58e0125ec 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -993,6 +993,7 @@ dist_patch_DATA = \ %D%/packages/patches/libssh2-fix-build-failure-with-gcrypt.patch \ %D%/packages/patches/libtar-CVE-2013-4420.patch \ %D%/packages/patches/libtheora-config-guess.patch \ + %D%/packages/patches/libtommath-fix-linkage.patch \ %D%/packages/patches/libtool-skip-tests2.patch \ %D%/packages/patches/libusb-0.1-disable-tests.patch \ %D%/packages/patches/libusb-for-axoloti.patch \ diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 24486cec18..97160b8f8e 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2464,7 +2464,7 @@ tool for remote execution and deployment.") (define-public neofetch (package (name "neofetch") - (version "5.0.0") + (version "6.0.0") (source (origin (method git-fetch) (uri (git-reference @@ -2472,7 +2472,7 @@ tool for remote execution and deployment.") (commit version))) (sha256 (base32 - "0yzyi2p0d8xp576lxyv5m9h60dl1d5dmrn40aad307872835b9rr")))) + "0j0r40llyry1sgc6p9wd7jrpydps2lnj4rwajjp37697g2bik89i")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; there are no tests diff --git a/gnu/packages/agda.scm b/gnu/packages/agda.scm index d2113555eb..646595705b 100644 --- a/gnu/packages/agda.scm +++ b/gnu/packages/agda.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2018 Alex ter Weele <alex.ter.weele@gmail.com> ;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com> +;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; ;;; This file is part of GNU Guix. ;;; @@ -32,7 +33,7 @@ (define-public agda (package (name "agda") - (version "2.5.4.1") + (version "2.5.4.2") (source (origin (method url-fetch) @@ -41,11 +42,10 @@ version ".tar.gz")) (sha256 (base32 - "0bxpibsk98n9xp42d92ma5vj2fam8rsnl61fbhr3askfjdvalnbp")))) + "07wvawpfjhx3gw2w53v27ncv1bl0kkx08wkm6wzxldbslkcasign")))) (build-system haskell-build-system) (inputs - `(("cpphs" ,cpphs) - ("ghc-alex" ,ghc-alex) + `(("ghc-alex" ,ghc-alex) ("ghc-async" ,ghc-async) ("ghc-blaze-html" ,ghc-blaze-html) ("ghc-boxes" ,ghc-boxes) diff --git a/gnu/packages/antivirus.scm b/gnu/packages/antivirus.scm index c3f11865e2..840b5410a6 100644 --- a/gnu/packages/antivirus.scm +++ b/gnu/packages/antivirus.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016, 2017, 2018 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2018 Christopher Baines <mail@cbaines.net> +;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; ;;; This file is part of GNU Guix. ;;; @@ -43,45 +44,43 @@ (define-public clamav (package (name "clamav") - (version "0.100.2") + (version "0.101.1") (source (origin (method url-fetch) (uri (string-append "https://www.clamav.net/downloads/production/" "clamav-" version ".tar.gz")) (sha256 (base32 - "1mkd41sxbjkfjinpx5b9kb85q529gj2s3d0klysssqhysh64ybja")) + "01mq3z04fjbq5iq8wfwfim72iv3dn04d3ishc5lkhxpmnalqydps")) (modules '((guix build utils))) (snippet '(begin (for-each delete-file-recursively - '("win32" ;unnecessary - "libclamav/c++/llvm" ;use system llvm - "libclamunrar")))) ;non-free license + '("win32" ; unnecessary + "libclamav/c++/llvm" ; use system llvm + "libclamav/tomsfastmath" ; use system tomsfastmath + "libclamunrar")))) ; non-free license (patches (search-patches "clamav-system-tomsfastmath.patch" "clamav-config-llvm-libs.patch")))) (build-system gnu-build-system) (native-inputs - `(("bison" ,bison) - ("check" ,check) ;for tests - ("flex" ,flex) - ("pkg-config" ,pkg-config) - ;; The tomsfastmath patch touches configure.ac and Makefile.am - ("autoconf" ,autoconf) + `(("autoconf" ,autoconf) ("automake" ,automake) - ("libtool" ,libtool))) + ("check" ,check) ; for tests + ("libtool" ,libtool) + ("pkg-config" ,pkg-config))) (inputs `(("bzip2" ,bzip2) ("libcurl" ,curl) ("libjson" ,json-c) ("libltdl" ,libltdl) ("libmspack" ,libmspack) - ("llvm" ,llvm-3.6) ;requires <3.7, for JIT/verifier + ("llvm" ,llvm-3.6) ; requires <3.7, for JIT/verifier ("ncurses" ,ncurses) ("openssl" ,libressl) - ("pcre" ,pcre "bin") ;for pcre-config - ("sasl" ,cyrus-sasl) ;for linking curl with libtool + ("pcre2" ,pcre2) + ("sasl" ,cyrus-sasl) ; for linking curl with libtool ("tomsfastmath" ,tomsfastmath) ("xml" ,libxml2) ("zlib" ,zlib))) @@ -99,7 +98,7 @@ (with "xml") (with "openssl") (with "libjson") - (with "pcre") + (with "pcre2") (with "zlib") (with "libcurl") ;; For sanity, specifying --enable-* flags turns diff --git a/gnu/packages/assembly.scm b/gnu/packages/assembly.scm index 0de2183b88..00ed00e1c1 100644 --- a/gnu/packages/assembly.scm +++ b/gnu/packages/assembly.scm @@ -129,15 +129,14 @@ to the clients.") (define-public fasm (package (name "fasm") - (version "1.73.08") + (version "1.73.09") (source (origin (method url-fetch) (uri (string-append "https://flatassembler.net/fasm-" version ".tgz")) (sha256 - (base32 - "1l4my3fran06h5jiygswx4fsj53dvpfgg9ksfbdzsdg20r672997")))) + (base32 "197bcj9aa5wpkvrlaafc1smxjss0fwdspq5fwhwgyy9cc7z5g0ym")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no tests exist diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index ae0dddeb66..4dbd6bac79 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -1155,7 +1155,7 @@ follower.") (define-public fluidsynth (package (name "fluidsynth") - (version "2.0.3") + (version "2.0.4") (source (origin (method git-fetch) (uri (git-reference @@ -1164,7 +1164,7 @@ follower.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "00f6bhw4ddrinb5flvg5y53rcvnf4km23a6nbvnswmpq13568v78")))) + "1v2vji02fbrjgypwb4fw2r90hnfwfbfh3d24j8vjwlbqxhxp16s0")))) (build-system cmake-build-system) (arguments '(#:tests? #f ; no check target diff --git a/gnu/packages/autogen.scm b/gnu/packages/autogen.scm index 5fc61fc70e..034db2ee96 100644 --- a/gnu/packages/autogen.scm +++ b/gnu/packages/autogen.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2014 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2015, 2016 Efraim Flashner <efraim@flashner.co.il> -;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; ;;; This file is part of GNU Guix. ;;; @@ -32,29 +32,33 @@ (define-public autogen (package (name "autogen") - (version "5.18.14") + (version "5.18.16") (source (origin - (method url-fetch) - (uri (string-append "mirror://gnu/autogen/rel" version - "/autogen-" version ".tar.xz")) - (sha256 - (base32 - "1r06gam7sicb9ssn02mhv6r0g5vr4k0l0c67shpqa5i172cspizz")))) + (method url-fetch) + (uri (string-append "mirror://gnu/autogen/rel" version + "/autogen-" version ".tar.xz")) + (sha256 + (base32 "16mlbdys8q4ckxlvxyhwkdnh1ay9f6g0cyp1kylkpalgnik398gq")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) ("which" ,which))) - (inputs `(("guile" ,guile-2.0) + (inputs `(("guile" ,guile-2.2) ("perl" ,perl))) ; for doc generator mdoc (arguments - '(#:phases + '(#:configure-flags + ;; XXX Needed to build 5.18.16. ./configure fails without it: + ;; “Something went wrong bootstrapping makefile fragments for + ;; automatic dependency tracking. Try re-running configure with […]” + (list "--disable-dependency-tracking") + #:phases (modify-phases %standard-phases (add-before 'patch-source-shebangs 'patch-test-scripts (lambda _ (let ((sh (which "sh"))) (substitute* - (append (find-files "agen5/test" "\\.test$") - (find-files "autoopts/test" "\\.(test|in)$")) + (append (find-files "agen5/test" "\\.test$") + (find-files "autoopts/test" "\\.(test|in)$")) (("/bin/sh") sh)) #t)))))) (home-page "https://www.gnu.org/software/autogen/") diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index f9f7146655..d615a417e0 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2014, 2015 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2014 Ian Denhardt <ian@zenhack.net> ;;; Copyright © 2015, 2016, 2017 Leo Famulari <leo@famulari.name> -;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be> ;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2017 Kei Kebreau <kkebreau@posteo.net> @@ -675,14 +675,14 @@ changes are stored.") (define-public wimlib (package (name "wimlib") - (version "1.12.0") + (version "1.13.0") (source (origin (method url-fetch) (uri (string-append "https://wimlib.net/downloads/" - name "-" version ".tar.gz")) + "wimlib-" version ".tar.gz")) (sha256 (base32 - "0ks6hq7vwq13ljkzxp3a490bf8dnracgl2azf57rg49ad2fzab45")))) + "02wpsxjlw9vysj6x6q7kmvbcdkpvdzw201mmj5x0q670mapjrnai")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) @@ -873,7 +873,7 @@ is like a time machine for your data. ") (define-public restic (package (name "restic") - (version "0.9.3") + (version "0.9.4") ;; TODO Try packaging the bundled / vendored dependencies in the 'vendor/' ;; directory. (source (origin @@ -884,7 +884,7 @@ is like a time machine for your data. ") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1l1ddnf61pfsrry97qwhhdzywin2mgnbrkhcc9pabsdfk602anmr")))) + "13ksprq1ia86px8x4lqrmx0l6y9rb1ppg8pnp7lcx0zxnq7skp67")))) (build-system go-build-system) (arguments `(#:import-path "github.com/restic/restic" diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm index 8f5ac33700..b83bd73a39 100644 --- a/gnu/packages/boost.scm +++ b/gnu/packages/boost.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net> -;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net> +;;; Copyright © 2018, 2019 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2018 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il> ;;; @@ -182,6 +182,34 @@ and events and other thread related facilities. Boost.Sync originated from Boost.Thread.") (license (license:x11-style "https://www.boost.org/LICENSE_1_0.txt"))))) +(define-public boost-signals2 + (package + (name "boost-signals2") + (version (package-version boost)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/boostorg/signals2.git") + (commit (string-append "boost-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1nayaqshhzr1n6jj43bpvvay36d5gn075h0b95psii5x8ingszdk")))) + (build-system trivial-build-system) + (arguments + `(#:modules ((guix build utils)) + #:builder + (begin + (use-modules (guix build utils)) + (let ((source (assoc-ref %build-inputs "source"))) + (copy-recursively (string-append source "/include") + (string-append %output "/include")))))) + (home-page "https://github.com/boostorg/signals2") + (synopsis "Boost.Signals2 library") + (description "The Boost.Signals2 library is an implementation of a managed +signals and slots system.") + (license (license:x11-style "https://www.boost.org/LICENSE_1_0.txt")))) + (define-public mdds (package (name "mdds") diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index 6beeb4f542..7031ed8ea3 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2018 Tomáš Čech <sleep_walker@gnu.org> ;;; Copyright © 2018 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com> +;;; Copyright © 2019 Brett Gilio <brettg@posteo.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -77,7 +78,7 @@ makes a few sacrifices to acquire fast full and incremental build times.") (define-public bear (package (name "bear") - (version "2.3.12") + (version "2.3.13") (source (origin (method git-fetch) (uri (git-reference @@ -86,7 +87,7 @@ makes a few sacrifices to acquire fast full and incremental build times.") (file-name (git-file-name name version)) (sha256 (base32 - "1zzz2yiiny9pm4h6ayb82xzxc2j5djcpf8va2wagcw92m7w6miqw")))) + "0imvvs22gyr1v6ydgp5yn2nq8fb8llmz0ra1m733ikjaczl3jm7z")))) (build-system cmake-build-system) (inputs `(("python" ,python-wrapper))) @@ -99,8 +100,8 @@ generate such a compilation database.") (license license:gpl3+))) (define-public gn - (let ((commit "f73698ebb33e26a0bf120e2b55d12528fd1dbe7d") - (revision "1481")) ;as returned by `git describe`, used below + (let ((commit "1ab6fa2cab7ec64840db720a56018ca8939329f9") + (revision "1530")) ;as returned by `git describe`, used below (package (name "gn") (version (git-version "0.0" revision commit)) @@ -110,7 +111,7 @@ generate such a compilation database.") (uri (git-reference (url home-page) (commit commit))) (sha256 (base32 - "078ydwak4424bkqh3hd7q955zxp2c3qlw44lsb29i8jqap140f9d")) + "06h974d1lag3wwsz6s5asmpv0njmf671ag4la2fpnbh494m97lfk")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments @@ -120,10 +121,11 @@ generate such a compilation database.") (lambda _ (setenv "CC" "gcc") (setenv "CXX" "g++") (setenv "AR" "ar") + (setenv "LDFLAGS" "-pthread") #t)) (replace 'configure (lambda _ - (invoke "python" "build/gen.py" "--no-sysroot" + (invoke "python" "build/gen.py" "--no-last-commit-position"))) (add-after 'configure 'create-last-commit-position (lambda _ diff --git a/gnu/packages/calendar.scm b/gnu/packages/calendar.scm index f1949c14c0..226d8f57e2 100644 --- a/gnu/packages/calendar.scm +++ b/gnu/packages/calendar.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016 Troy Sankey <sankeytms@gmail.com> ;;; Copyright © 2016 Stefan Reichoer <stefan@xsteve.at> -;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; ;;; This file is part of GNU Guix. ;;; @@ -160,23 +160,22 @@ able to synchronize with CalDAV servers through vdirsyncer.") (define-public remind (package (name "remind") - (version "3.1.15") + (version "3.1.16") (source (origin (method url-fetch) - (uri (string-append "https://www.roaringpenguin.com/files/download/" + (uri (string-append "https://dianne.skoll.ca/projects/remind/download/" "remind-" (string-join (map (cut string-pad <> 2 #\0) (string-split version #\.)) ".") ".tar.gz")) (sha256 - (base32 - "1hcfcxz5fjzl7606prlb7dgls5kr8z3wb51h48s6qm8ang0b9nla")))) + (base32 "14yavwqmimba8rdpwx3wlav9sfb0v5rcd1iyzqrs08wx07a9pdzf")))) (build-system gnu-build-system) (arguments - '(#:tests? #f)) ;no "check" target - (home-page "http://www.roaringpenguin.com/products/remind/") + '(#:tests? #f)) ; no "check" target + (home-page "https://dianne.skoll.ca/projects/remind/") (synopsis "Sophisticated calendar and alarm program") (description "Remind allows you to remind yourself of upcoming events and appointments. diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm index 546e1a20d0..cdbe25fe44 100644 --- a/gnu/packages/cdrom.scm +++ b/gnu/packages/cdrom.scm @@ -251,6 +251,9 @@ reconstruction capability.") "CONFIG_SHELL=sh" "CCOM=gcc" (string-append "INS_BASE=" (assoc-ref %outputs "out")) (string-append "INS_RBASE=" (assoc-ref %outputs "out"))) + ;; Parallel builds appear to be unsafe, see + ;; https://hydra.gnu.org/build/3346840/log/raw + #:parallel-build? #f #:phases (modify-phases %standard-phases (delete 'configure) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 13a4280a40..43f3892cde 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -22,7 +22,7 @@ ;;; Copyright © 2017, 2018 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2017 Frederick M. Muriithi <fredmanglis@gmail.com> ;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com> -;;; Copyright © 2017 Kei Kebreau <kkebreau@posteo.net> +;;; Copyright © 2017, 2019 Kei Kebreau <kkebreau@posteo.net> ;;; Copyright © 2017 Nils Gillmann <ng0@n0.is> ;;; Copyright © 2015, 2017, 2018 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2016, 2017, 2018 Marius Bakke <mbakke@fastmail.com> @@ -279,7 +279,7 @@ problem, and shows the differences.") (define-public cmocka (package (name "cmocka") - (version "1.1.2") + (version "1.1.3") (source (origin (method url-fetch) (uri (string-append "https://cmocka.org/files/" @@ -287,7 +287,7 @@ problem, and shows the differences.") version ".tar.xz")) (sha256 (base32 - "1p9b6ccv939wjsgapn7wx24xw278awsw9h81lm0g4zw257hx276i")))) + "1bxzzafjlwzgldcb07hjnlnqvh88wh21r2kw7z8f704w5bvvrsj3")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) ; no test target @@ -324,6 +324,51 @@ normally do not detect. The goal is to detect only real errors in the code (i.e. have zero false positives).") (license license:gpl3+))) +(define-public cxxtest + (package + (name "cxxtest") + (version "4.4") + (source (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/cxxtest/cxxtest/" + version "/cxxtest-" version ".tar.gz")) + (sha256 + (base32 + "1n7pbj4z9ivx005hqvivj9ddhq8awynzg6jishfbypf6j7ply58w")))) + (build-system python-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'chdir-to-source + (lambda _ + (chdir "python") + #t)) + (add-after 'install 'install-headers + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (include-dir (string-append out "/include/cxxtest"))) + (for-each (lambda (header-file) + (install-file header-file include-dir)) + (find-files "../cxxtest")) + #t))) + (add-after 'install 'install-doc + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (doc-dir (string-append out "/share/doc/cxxtest"))) + (install-file "../README" doc-dir) + (install-file "../doc/guide.txt" doc-dir) + (copy-recursively "../sample" (string-append doc-dir "/sample")) + #t)))))) + (propagated-inputs + `(("python-ply" ,python-ply))) + (home-page "https://cxxtest.com/") + (synopsis "Unit testing framework for C++") + (description "CxxTest is a unit testing framework for C++ that is similar +in spirit to JUnit, CppUnit, and xUnit. CxxTest does not require precompiling +a CxxTest testing library, it employs no advanced features of C++ (e.g. RTTI) +and it supports a very flexible form of test discovery.") + (license license:lgpl3+))) + (define-public go-gopkg.in-check.v1 (let ((commit "20d25e2804050c1cd24a7eea1e7a6447dd0e74ec") (revision "0")) @@ -1572,7 +1617,7 @@ failures.") (define-public python2-coverage-test-runner (package (name "python2-coverage-test-runner") - (version "1.11") + (version "1.15") (source (origin (method url-fetch) @@ -1582,7 +1627,7 @@ failures.") version ".tar.gz")) (sha256 (base32 - "0y1m7z3dl63kmhcmydl1mwg0hacnf6ghrx9dah17j9iasssfa3g7")))) + "1kjjb9llckycnfxag8zcvqsn4z1s3dwyw6b1n0avxydihgf30rny")))) (build-system python-build-system) (arguments `(#:python ,python-2 diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm index 1594bfeb60..c80a51dedc 100644 --- a/gnu/packages/chromium.scm +++ b/gnu/packages/chromium.scm @@ -220,11 +220,17 @@ from forcing GEXP-PROMISE." (mlet %store-monad ((guile (package->derivation guile system))) (gexp->derivation (or name "computed-origin") (force gexp-promise) + #:graft? #f ;nothing to graft #:system system #:guile-for-build guile))) -(define %chromium-version "72.0.3626.109") -(define %ungoogled-revision "a58db880c15e5077e881cad7b07d1a277ecd463a") +(define %chromium-version "72.0.3626.119") +(define %ungoogled-revision "a80839c418de8843dfcd6c13a557f12d26a0a17a") +(define package-revision "0") + +(define %package-version (string-append %chromium-version "-" + package-revision "." + (string-take %ungoogled-revision 7))) ;; This is a "computed" origin that does the following: ;; 1) Runs the Ungoogled scripts on a pristine Chromium tarball. @@ -239,7 +245,7 @@ from forcing GEXP-PROMISE." %chromium-version ".tar.xz")) (sha256 (base32 - "0bcc0iksk2v30drwd5zbw7v6sfbw16jqllc12ks2nifrvh058jjp")))) + "0ylig933xzn6c0018nxq95xhl0wkxcm95fdiy2c7s4a4h3hkr5dk")))) (ungoogled-source (origin (method git-fetch) @@ -249,11 +255,11 @@ from forcing GEXP-PROMISE." (string-take %ungoogled-revision 7))) (sha256 (base32 - "19w60b71rcccp32b7rcpw75kfg4sw2xfr32rfk0hcyaj5rq0mm69"))))) + "0rgirbxbgjdm3s2kzgj101rjq0clr7x2a7b37kfx2q629z4qlrpc"))))) (origin (method computed-origin-method) - (file-name (string-append "ungoogled-chromium-" %chromium-version ".tar.xz")) + (file-name (string-append "ungoogled-chromium-" %package-version ".tar.xz")) (sha256 #f) (uri (delay @@ -347,7 +353,7 @@ depends = linux_rooted\n"))) (define-public ungoogled-chromium (package (name "ungoogled-chromium") - (version %chromium-version) + (version %package-version) (synopsis "Graphical web browser") (source ungoogled-chromium-source) (build-system gnu-build-system) @@ -390,6 +396,7 @@ depends = linux_rooted\n"))) "enable_reporting=false" "enable_service_discovery=false" "enable_swiftshader=false" + "enable_widevine=false" ;; Disable type-checking for the Web UI to avoid a Java dependency. "closure_compile=false" diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index b71906a8f5..54031fa87a 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -13,7 +13,7 @@ ;;; Copyright © 2018 Laura Lazzati <laura.lazzati.15@gmail.com> ;;; Copyright © 2018 Leo Famulari <leo@famulari.name> ;;; Copyright © 2018 Marius Bakke <mbakke@fastmail.com> -;;; Copyright © 2018 Brett Gilio <brettg@posteo.net> +;;; Copyright © 2018, 2019 Brett Gilio <brettg@posteo.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -341,14 +341,14 @@ the embedded @code{RapidXML} C++ library.") (define-public r-modelr (package (name "r-modelr") - (version "0.1.2") + (version "0.1.4") (source (origin (method url-fetch) (uri (cran-uri "modelr" version)) (sha256 (base32 - "09whg3q5xq6csbqwgwfwav09vda8vgady5j70sk52xcn232k363a")))) + "1ngxphbjkv7yl1rg30sj36mfwhc76g452drjrq9abgab4k0pgnml")))) (build-system r-build-system) (propagated-inputs `(("r-broom" ,r-broom) @@ -2447,16 +2447,20 @@ to access PostgreSQL database systems.") (define-public r-geometry (package (name "r-geometry") - (version "0.3-6") + (version "0.4.0") (source (origin (method url-fetch) (uri (cran-uri "geometry" version)) (sha256 (base32 - "0s09vi0rr0smys3an83mz6fk41bplxyz4myrbiinf4qpk6n33qib")))) + "0lpih1a93jz021krdv78zf6fq95g8i0xw4r9aj5gq36a0vzc3i0y")))) (build-system r-build-system) - (propagated-inputs `(("r-magic" ,r-magic))) + (propagated-inputs + `(("r-magic" ,r-magic) + ("r-lpsolve" ,r-lpsolve) + ("r-rcpp" ,r-rcpp) + ("r-cppprogress" ,r-rcppprogress))) (home-page "http://geometry.r-forge.r-project.org/") (synopsis "Mesh generation and surface tesselation") (description @@ -10651,3 +10655,29 @@ analysis (@code{rrpca}), randomized interpolative decomposition (@code{rid}), and the randomized CUR decomposition (@code{rcur}). In addition several plot functions are provided.") (license license:gpl3+))) + +(define-public r-sloop + (package + (name "r-sloop") + (version "1.0.1") + (source + (origin + (method url-fetch) + (uri (cran-uri "sloop" version)) + (sha256 + (base32 + "00fk5fr5zsk2qxc1kfhmshhjxgnamm3401089sx8m2l529zd6r8j")))) + (build-system r-build-system) + (propagated-inputs + `(("r-codetools" ,r-codetools) + ("r-crayon" ,r-crayon) + ("r-purrr" ,r-purrr) + ("r-rlang" ,r-rlang) + ("r-tibble" ,r-tibble))) + (home-page "https://github.com/r-lib/sloop") + (synopsis "Helpers for object-oriented programming in R") + (description + "This package provides a collection of helper functions designed to +help you to better understand object oriented programming in R, particularly +using @code{S3}.") + (license license:gpl3))) diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index 1a6b29746a..656c1f9d70 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -106,19 +106,19 @@ and BOOTP/TFTP for network booting of diskless machines.") (define-public isc-bind (package (name "bind") - (version "9.12.3-P1") + (version "9.12.3-P4") (source (origin (method url-fetch) (uri (string-append - "https://ftp.isc.org/isc/bind9/" version "/" name "-" - version ".tar.gz")) + "https://ftp.isc.org/isc/bind9/" version + "/bind-" version ".tar.gz")) (sha256 (base32 - "0wzdbn6ig851354cjdys5q3gvqcvl2gmmih1gzr8ldl7sy4r7dvc")))) + "01pj47z5582rd538dmbzf1msw4jc8j4zr0zx4ciy88r6qr9l80fi")))) (build-system gnu-build-system) (outputs `("out" "utils")) (inputs - ;; it would be nice to add GeoIP and gssapi once there is package + ;; It would be nice to add GeoIP and gssapi once there are packages. `(("libcap" ,libcap) ("libxml2" ,libxml2) ("openssl" ,openssl) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index cedc1efbc8..871721af3a 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -4366,14 +4366,14 @@ indentation and filling of comments and C preprocessor fontification.") (define-public emacs-tide (package (name "emacs-tide") - (version "2.8.3.1") + (version "3.2.3") (source (origin (method url-fetch) (uri (string-append "https://github.com/ananthakumaran/tide" "/archive/v" version ".tar.gz")) (sha256 (base32 - "1k0kzqiv1hfs0kqm37947snzhrsmand3i9chvm6a2r5lb8v9q47y")) + "1c600myr2yqbkmy9lify38lz0zzjdqk1733db5n7vsay16vn6fzi")) (file-name (string-append name "-" version ".tar.gz")))) (build-system emacs-build-system) (propagated-inputs @@ -4591,7 +4591,7 @@ functions to assist in reviewing changes on files.") (define-public emacs-pyvenv (package (name "emacs-pyvenv") - (version "1.11") + (version "1.20") (source (origin (method git-fetch) (uri (git-reference @@ -4600,7 +4600,7 @@ functions to assist in reviewing changes on files.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "1a346qdimr1dvj53q033aqnahwd2dhyn9jadrs019nm0bzgw7g63")))) + "1x052fsavb94x3scpqd6n9spqgzaahzbdxhg4qa5sy6hqsabn6zh")))) (build-system emacs-build-system) (arguments `(#:phases @@ -4614,7 +4614,7 @@ functions to assist in reviewing changes on files.") `(("ert-runner" ,emacs-ert-runner) ("emacs-mocker" ,emacs-mocker))) (home-page "https://github.com/jorgenschaefer/pyvenv") - (synopsis "Virtualenv minor mode for Emacs") + (synopsis "Python virtual environment interface for Emacs") (description "pyvenv.el is a minor mode to support using Python virtual environments (virtualenv) inside Emacs.") (license license:gpl3+))) @@ -5600,7 +5600,7 @@ procedures for emacs-lisp-mode.") (define-public emacs-ht (package (name "emacs-ht") - (version "2.1") + (version "2.2") (source (origin (method url-fetch) @@ -5610,7 +5610,7 @@ procedures for emacs-lisp-mode.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1lpba36kzxcc966fvsbrfpy8ah9gnvay0yk26gbyjil0rggrbqzj")))) + "0fsi27gdrh2dgwdbq43vnw5sz25war6shlxaclr60fl7krpxjkzf")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-dash" ,emacs-dash))) (home-page "https://github.com/Wilfred/ht.el") @@ -7214,7 +7214,7 @@ or @code{treemacs}, but leveraging @code{Dired} to do the job of display.") (define-public emacs-which-key (package (name "emacs-which-key") - (version "3.3.0") + (version "3.3.1") (source (origin (method url-fetch) @@ -7223,7 +7223,7 @@ or @code{treemacs}, but leveraging @code{Dired} to do the job of display.") version ".tar.gz")) (sha256 (base32 - "1lsj314111cp2hjjwnv3f46ws1za6bm39rgy3l19044xf6a68j5w")) + "1g8k0js21bc8mlw6hvmg93zgfjhil77c30cv1hf85y4qb9ldvika")) (file-name (string-append name "-" version ".tar.gz")))) (build-system emacs-build-system) (arguments diff --git a/gnu/packages/flashing-tools.scm b/gnu/packages/flashing-tools.scm index aeef2f340c..20e14417e4 100644 --- a/gnu/packages/flashing-tools.scm +++ b/gnu/packages/flashing-tools.scm @@ -97,25 +97,28 @@ programmer devices.") (define-public 0xffff (package (name "0xffff") - (version "0.7") + (version "0.8") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/pali/0xffff/archive/" - version ".tar.gz")) - (file-name (string-append "0xFFFF" version ".tar.gz" )) - (sha256 - (base32 - "1g4032c81wkk37wvbg1dxcqq6mnd76y9x7f2crmzqi6z4q9jcxmj")))) + (method git-fetch) + (uri (git-reference + (url "https://github.com/pali/0xffff.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1a5b7k96vzirb0m8lqp7ldn77ppz4ngf56wslhsj2c6flcyvns4v")))) (build-system gnu-build-system) (inputs - `(("libusb" ,libusb-0.1))) ; doesn't work with libusb-compat + `(("libusb" ,libusb-0.1))) ; doesn't work with libusb-compat (arguments '(#:phases (modify-phases %standard-phases - (delete 'configure)) ; no configure - #:make-flags (list (string-append "PREFIX=" %output)) - #:tests? #f)) ; no 'check' target + (delete 'configure)) ; no configure + #:make-flags + (list "CC=gcc" + "BUILD_DATE=GNU Guix" + (string-append "PREFIX=" %output)) + #:tests? #f)) ; no 'check' target (home-page "https://github.com/pali/0xFFFF") (synopsis "Flash FIASCO images on Maemo devices") (description diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 9d49c02cf6..b38816f664 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -14,7 +14,7 @@ ;;; Copyright © 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2016 Toni Reina <areina@riseup.net> -;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017 José Miguel Sánchez García <jmi2k@openmailbox.com> ;;; Copyright © 2017 Alex Griffin <a@ajgrf.com> ;;; Copyright © 2017 Clément Lassieur <clement@lassieur.org> @@ -810,7 +810,7 @@ glyph designs, not just an added slant.") (define-public font-hack (package (name "font-hack") - (version "3.002") + (version "3.003") (source (origin (method url-fetch/zipbomb) (uri (string-append @@ -818,7 +818,7 @@ glyph designs, not just an added slant.") version "/Hack-v" version "-ttf.zip")) (sha256 (base32 - "18fpaczj2rxfwgnrqpkxq0qn01parhmngglc4i1n3gchyzdsrh0x")))) + "1b4hh8zkrx92m2v2vfkja1napb0192p0j3laqr0m018z3dih89hc")))) (build-system font-build-system) (home-page "https://sourcefoundry.org/hack/") (synopsis "Typeface designed for source code") @@ -971,16 +971,17 @@ correct spacing.") (define-public font-awesome (package (name "font-awesome") - (version "4.7.0") + (version "5.7.2") (source (origin (method url-fetch) - (uri (string-append "http://fontawesome.io/assets/" - name "-" version ".zip")) + (uri (string-append + "https://use.fontawesome.com/releases/v" version "/" + "fontawesome-free-" version "-desktop.zip")) (sha256 (base32 - "1m1rfwm4sjkv10j3xd2dhwk286a5912b2zgvc692cmxi5gxs68jf")))) + "0v8nfyjkzgi33i5arpjqzs16mgh2hx02sf906b8a9k1k7yfqpbgs")))) (build-system font-build-system) - (home-page "http://fontawesome.io") + (home-page "https://fontawesome.com") (synopsis "Font that contains a rich iconset") (description "Font Awesome is a full suite of pictographic icons for easy scalable diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index ac01cb3f2f..7f00f7080b 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1005,28 +1005,21 @@ painted with a mouse.") (define-public ois (package (name "ois") - (version "1.3") + (version "1.5") (source (origin - ;; Development has moved to github and there are no recent tarball - ;; releases. (method git-fetch) (uri (git-reference (url "https://github.com/wgois/OIS.git") - (commit "bb75ccc1aabc1c547195579963601ff6080ca2f2"))) - (file-name (string-append name "-" version)) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 - "0w0pamjc3vj0jr718hysrw8x076fq6n9rd6wcb36sn2jd0lqvi98")))) - (build-system gnu-build-system) - (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("libtool" ,libtool) - ("m4" ,m4) - ("pkg-config" ,pkg-config))) + (base32 "0g8krgq5bdx2rw7ig0xva4kqv4x815672i7z6lljp3n8847wmypa")))) + (build-system cmake-build-system) + (arguments + `(#:tests? #f)) ; no test suite (inputs - `(("libxaw" ,libxaw))) + `(("libx11" ,libx11))) (synopsis "Object Oriented Input System") (description "Cross Platform Object Oriented Input Lib System is a cross platform, diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 0832b1ef63..ac53979af4 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -112,6 +112,8 @@ #:use-module (gnu packages linux) #:use-module (gnu packages lua) #:use-module (gnu packages haskell) + #:use-module (gnu packages man) + #:use-module (gnu packages maths) #:use-module (gnu packages mp3) #:use-module (gnu packages music) #:use-module (gnu packages multiprecision) @@ -1401,25 +1403,35 @@ interface or via an external visual interface such as GNU XBoard.") (define freedink-engine (package (name "freedink-engine") - (version "108.4") + (version "109.4") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/freedink/freedink-" version ".tar.gz")) (sha256 (base32 - "08c51imfjfcydm7h0va09z8qfw5nc837bi2x754ni2z737hb5kw2")))) + "0iaagwnyfgm3mqzkj550q60hrsjr13gykg5vfn2nz2ia520bb52g")))) (build-system gnu-build-system) - (arguments `(#:configure-flags '("--disable-embedded-resources"))) - (native-inputs `(("gettext" ,gettext-minimal) + (arguments + `(#:configure-flags '("--disable-embedded-resources") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'disable-graphical-tests + (lambda _ + ;; These tests require a graphical interface. + (substitute* "src/Makefile.am" + (("test_gfx_fonts TestIOGfxDisplay") "")) + #t))))) + (native-inputs `(("autoconf" ,autoconf) + ("automake" ,automake) + ("cxxtest" ,cxxtest) + ("gettext" ,gettext-minimal) + ("help2man" ,help2man) ("pkg-config" ,pkg-config))) - (inputs `(("sdl" ,sdl) - ("sdl-image" ,sdl-image) - ("sdl-mixer" ,sdl-mixer) - ("sdl-ttf" ,sdl-ttf) - ("sdl-gfx" ,sdl-gfx) + (inputs `(("sdl-union" ,(sdl-union (list sdl2 sdl2-image sdl2-mixer + sdl2-ttf sdl2-gfx))) ("fontconfig" ,fontconfig) - ("check" ,check))) + ("glm" ,glm))) (properties '((ftp-directory . "/freedink") (upstream-name . "freedink"))) (home-page "https://www.gnu.org/software/freedink/") diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index ac421c8d07..fdb05090e8 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3435,9 +3435,9 @@ without stepping on each others toes.") ;; same way the cogl tests fail, since clutter is based on cogl. #:tests? #f)) (home-page "http://www.clutter-project.org") - (synopsis "Open GL based interactive canvas library") + (synopsis "OpenGL-based interactive canvas library") (description - "Clutter is an Open GL based interactive canvas library, designed for + "Clutter is an OpenGL-based interactive canvas library, designed for creating fast, mainly 2D single window applications such as media box UIs, presentations, kiosk style applications and so on.") (license license:lgpl2.0+))) @@ -3464,9 +3464,9 @@ presentations, kiosk style applications and so on.") `(("clutter" ,clutter) ("gtk+" ,gtk+))) (home-page "http://www.clutter-project.org") - (synopsis "Open GL based interactive canvas library GTK+ widget") + (synopsis "OpenGL-based interactive canvas library GTK+ widget") (description - "Clutter is an Open GL based interactive canvas library, designed for + "Clutter is an OpenGL-based interactive canvas library, designed for creating fast, mainly 2D single window applications such as media box UIs, presentations, kiosk style applications and so on.") (license license:lgpl2.0+))) @@ -3474,19 +3474,18 @@ presentations, kiosk style applications and so on.") (define-public clutter-gst (package (name "clutter-gst") - (version "3.0.26") + (version "3.0.27") (source (origin (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" + (uri (string-append "mirror://gnome/sources/clutter-gst/" (version-major+minor version) "/" - name "-" version ".tar.xz")) + "clutter-gst-" version ".tar.xz")) (sha256 - (base32 - "0fnblqm4igdx4rn3681bp1gm1y2i00if3iblhlm0zv6ck9nqlqfq")))) + (base32 "17czmpl92dzi4h3rn5rishk015yi3jwiw29zv8qan94xcmnbssgy")))) (build-system gnu-build-system) (native-inputs - `(("glib:bin" ,glib "bin") ; for glib-mkenums + `(("glib:bin" ,glib "bin") ; for glib-mkenums ("pkg-config" ,pkg-config) ("gobject-introspection" ,gobject-introspection))) (inputs @@ -3498,8 +3497,8 @@ presentations, kiosk style applications and so on.") (description "Clutter-Gst is an integration library for using GStreamer with Clutter. It provides a GStreamer sink to upload frames to GL and an actor that -implements the ClutterGstPlayer interface using playbin. Clutter is an Open -GL based interactive canvas library.") +implements the ClutterGstPlayer interface using playbin. Clutter is an +OpenGL-based interactive canvas library.") (license license:lgpl2.0+))) (define-public libchamplain diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 7c761ff3ae..f60f8070ea 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -573,6 +573,7 @@ from forcing GEXP-PROMISE." (mlet %store-monad ((guile (package->derivation guile system))) (gexp->derivation (or name "computed-origin") (force gexp-promise) + #:graft? #f ;nothing to graft #:system system #:guile-for-build guile))) diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 21a5177927..cd0fdd22fc 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -937,7 +937,7 @@ efficient memo functions using tries.") (home-page "https://github.com/phadej/tree-diff") (synopsis "Compute difference between (expression) trees") (description "This Haskell library provides a function for computing -the difference bewteen (expression) trees. It also provides a way to +the difference between (expression) trees. It also provides a way to compute the difference between arbitrary abstract datatypes (ADTs) using @code{Generics}-derivable helpers.") (license license:bsd-3))) diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm index d2aa90b26d..c1731d459a 100644 --- a/gnu/packages/kde-plasma.scm +++ b/gnu/packages/kde-plasma.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2018 Meiyo Peng <meiyo.peng@gmail.com> ;;; Copyright © 2019 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2017 Hartmut Goebel <h.goebel@crazy-compilers.com> +;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; ;;; This file is part of GNU Guix. ;;; @@ -36,14 +37,14 @@ (define-public kdecoration (package (name "kdecoration") - (version "5.15.0") + (version "5.15.1") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/kdecoration-" version ".tar.xz")) (sha256 (base32 - "1pcyw6rrz0q7i2jnfvmjz2pixiw2aay19q3pxa1g3qvqydh3id5q")))) + "03lxnjbhlnyiw2znflp0f2w77a5pzv5yvsbngvwgp89ig9mansi1")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -65,14 +66,14 @@ manager which re-parents a Client window to a window decoration frame.") (define-public kscreenlocker (package (name "kscreenlocker") - (version "5.15.0") + (version "5.15.1") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/kscreenlocker-" version ".tar.xz")) (sha256 (base32 - "1hgj2mzbbiqn52j3px2mzz6xzzpzr78q3bcai8ddc4gcl1xgs6yi")))) + "1jp2z1wjsd99is31igkfnscs55h755cmp86ppkj596fcxv1krymq")))) (build-system cmake-build-system) (arguments `(#:phases @@ -128,14 +129,14 @@ manager which re-parents a Client window to a window decoration frame.") (define-public libkscreen (package (name "libkscreen") - (version "5.15.0") + (version "5.15.1") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "1clw8966fmwih1fsjasvpgvfq7w728hlabl3i0zjz53r87hdw3mb")))) + (base32 "1zpzqafrb576al10f5873nl1z135gscjza6gd3ickfzlvd9qmr18")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -167,7 +168,7 @@ basic needs and easy to configure for those who want special setups.") (define-public libksysguard (package (name "libksysguard") - (version "5.15.0") + (version "5.15.1") (source (origin (method url-fetch) @@ -175,7 +176,7 @@ basic needs and easy to configure for those who want special setups.") "/libksysguard-" version ".tar.xz")) (sha256 (base32 - "1aqkzbng2qq09rpb21r6drnn866b9y8yba3klhvhi0q5vg3p605d")))) + "0ml106yq4q9qagkrcaafgcky18wk76px5a1r6j36wfjqdd6wpzvs")))) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) ("pkg-config" ,pkg-config))) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index fa3faa2fb5..9158ad0bb8 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -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.10") -(define %linux-libre-hash "0d386gb1s9ag80iqzms9gdsfzirq7nlkpkkx2d6ky01rv0g4vgqn") +(define %linux-libre-version "4.20.12") +(define %linux-libre-hash "16w52g5s7qhvmmz3srai1myl8949nxv6cqybiw3wx3mwcvp95mlh") (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.23") -(define %linux-libre-4.19-hash "0s207vqq2vcrgydjjwb5n2j7di0rjahnrbn3xv4xxlp5scjp59xq") +(define %linux-libre-4.19-version "4.19.25") +(define %linux-libre-4.19-hash "0kg8gibmyihh4lr7ksp8szrs0jx5sr2g56szm69lff1zmsywpqc6") (define %linux-libre-4.19-patches (list %boot-logo-patch @@ -441,8 +441,8 @@ It has been modified to remove all non-free binary blobs.") #:patches %linux-libre-4.19-patches #:configuration-file kernel-config)) -(define %linux-libre-4.14-version "4.14.101") -(define %linux-libre-4.14-hash "02j240x30zkhpazdimlfi0xq6zjdw6fidgdfrdnvfryvhf6j097j") +(define %linux-libre-4.14-version "4.14.103") +(define %linux-libre-4.14-hash "05zcb7kaj6cni4v0s0qdywwrqzlr63mkqbhxkbmrjz4blxxxdszg") (define-public linux-libre-4.14 (make-linux-libre %linux-libre-4.14-version @@ -451,14 +451,14 @@ It has been modified to remove all non-free binary blobs.") #:configuration-file kernel-config)) (define-public linux-libre-4.9 - (make-linux-libre "4.9.158" - "11v56dzp87wyxrymf2s1cmk7jr440z11m3yan73rnnnqlfq460ig" + (make-linux-libre "4.9.160" + "1j3z3kn4n9vm7fkzb63ddmxba9r2pm623kar1jn7i5xsd1vz4qr9" '("x86_64-linux" "i686-linux") #:configuration-file kernel-config)) (define-public linux-libre-4.4 - (make-linux-libre "4.4.174" - "1njd50yc180aarpd5crss3wn0n82lhxbyjrifsm647f3dfjhyvjb" + (make-linux-libre "4.4.176" + "0c300zqmsadahs2fpzxh6cn7q3h7jxq69msd17rh8v3wnvql8vzx" '("x86_64-linux" "i686-linux") #:configuration-file kernel-config)) @@ -2787,14 +2787,14 @@ about ACPI devices.") (define-public acpid (package (name "acpid") - (version "2.0.30") + (version "2.0.31") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/acpid2/acpid-" version ".tar.xz")) (sha256 (base32 - "1jzl7hiaspr5xkmsrbl69bib8cs3dp6bq5ix58fbskpnsdi7pdr8")))) + "1hrc0xm6q12knbgzhq0i8g2rfrkwcvh1asd7k9rs3nc5xmlwd7gw")))) (build-system gnu-build-system) (home-page "https://sourceforge.net/projects/acpid2/") (synopsis "Daemon for delivering ACPI events to user-space programs") @@ -5103,6 +5103,10 @@ the superuser to make device nodes.") (string-append (assoc-ref inputs "util-linux") "/bin/getopt"))) #t)) + (add-before 'configure 'setenv + (lambda _ + (setenv "LIBS" "-lacl") + #t)) (add-before 'check 'prepare-check (lambda _ (setenv "SHELL" (which "bash")) @@ -5121,7 +5125,8 @@ the superuser to make device nodes.") (("tar -tvf") "tar --numeric-owner -tvf")) #t))))) (native-inputs - `(("sharutils" ,sharutils) ; for the tests + `(("acl" ,acl) + ("sharutils" ,sharutils) ; for the tests ("xz" ,xz))) ; for the tests (inputs `(("libcap" ,libcap) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 78cf899466..a9c8b9f4e6 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -261,14 +261,14 @@ aliasing facilities to work just as they would on normal mail.") (define-public mutt (package (name "mutt") - (version "1.11.2") + (version "1.11.3") (source (origin (method url-fetch) (uri (string-append "https://bitbucket.org/mutt/mutt/downloads/" "mutt-" version ".tar.gz")) (sha256 (base32 - "08w7lbhj5ba2zkjcd0cxkgfiy9y82yhg731xjg9i9292kz1x8p6s")) + "0h8rmcc62n1pagm7mjjccd5fxyhhi4vbvp8m88digkdf5z0g8hm5")) (patches (search-patches "mutt-store-references.patch")))) (build-system gnu-build-system) (inputs diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index c3587007df..de0308bb0a 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -428,15 +428,17 @@ LP/MIP solver is included in the package.") (define-public 4ti2 (package (name "4ti2") - (version "1.6.7") + (version "1.6.9") (source (origin - (method url-fetch) - (uri (string-append "http://www.4ti2.de/version_" version - "/4ti2-" version ".tar.gz")) - (sha256 - (base32 - "1frix3rnm9ffr93alqzw4cavxbfpf524l8rfbmcpyhwd3n1km0yl")))) + (method url-fetch) + (uri (string-append "https://github.com/4ti2/4ti2/releases/download/" + "Release_" + (string-map (lambda (c) (if (char=? c #\.) #\_ c)) + version) + "/4ti2-" version ".tar.gz")) + (sha256 + (base32 "0rj92x6p9m3la5gasjbj7sa569im527ffmka5y2sv1amgd3fflrh")))) (build-system gnu-build-system) (native-inputs `(("which" ,(@ (gnu packages base) which)))) ; for the tests diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 1991528a53..674a02937b 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -12,7 +12,7 @@ ;;; Copyright © 2017, 2018 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017 Theodoros Foradis <theodoros@foradis.org> -;;; Copyright © 2017, 2018 Rutger Helling <rhelling@mykolab.com> +;;; Copyright © 2017, 2018, 2019 Rutger Helling <rhelling@mykolab.com> ;;; Copyright © 2018 Leo Famulari <leo@famulari.name> ;;; Copyright © 2018 Pierre-Antoine Rouby <contact@parouby.fr> ;;; @@ -975,7 +975,7 @@ and prevent message loss.") (define-public c-toxcore (package (name "c-toxcore") - (version "0.2.8") + (version "0.2.9") (source (origin (method git-fetch) @@ -985,7 +985,7 @@ and prevent message loss.") (file-name (git-file-name name version)) (sha256 (base32 - "0xgnraysz25fbws5zwjk92mwnl8k1yih701qam8kgm3rxh50kyhm")))) + "0aljr9hqybla6p61af6fdkv0x8gph7c2wacqqa9hq2z9w0p4fs5j")))) (arguments `(#:tests? #f)) ; FIXME: Testsuite seems to stay stuck on test 3. Disable ; for now. diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm index 35d3c9e303..10de6dee5b 100644 --- a/gnu/packages/mpi.scm +++ b/gnu/packages/mpi.scm @@ -196,8 +196,6 @@ bind processes, and much more.") `(#:configure-flags `("--enable-mpi-ext=affinity" ;cr doesn't work "--enable-memchecker" "--with-sge" - "--with-psm" - "--with-psm2" "--with-valgrind" "--with-hwloc=external" "--with-libevent" diff --git a/gnu/packages/multiprecision.scm b/gnu/packages/multiprecision.scm index 7ae3886166..069fae62b4 100644 --- a/gnu/packages/multiprecision.scm +++ b/gnu/packages/multiprecision.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Eric Bavier <bavier@member.fsf.org> -;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2018, 2019 Efraim Flashner <efraim@flashner.co.il> ;;; ;;; This file is part of GNU Guix. ;;; @@ -192,14 +192,14 @@ error. Additionally, iRRAM uses the concept of multi-valued functions.") (define-public qd (package (name "qd") - (version "2.3.18") + (version "2.3.22") (source (origin (method url-fetch) (uri (string-append "http://crd.lbl.gov/~dhbailey/mpdist/qd-" version ".tar.gz")) (sha256 (base32 - "0vkihcj9fyv2cycq8515713gbs3yskhmivy8bznvx72i6ddnn2c1")))) + "0wpgdzjcbanwd0c9mk90n04nas0q5fwc5zkrlbxyn6yjd2n8k3i6")))) (build-system gnu-build-system) (native-inputs `(("gfortran" ,gfortran))) @@ -290,3 +290,59 @@ Libs: -L~a/lib -ltfm~%" ISO C. It is a port of LibTomMath with optional support for inline assembler multiplies.") (license public-domain))) + +(define-public libtommath + (package + (name "libtommath") + (version "1.1.0") + (outputs '("out" "static")) + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/libtom/libtommath/releases/" + "download/v" version "/ltm-" version ".tar.xz")) + (sha256 + (base32 + "1bbyagqzfdbg37k1n08nsqzdf44z8zsnjjinqbsyj7rxg246qilh")) + (patches (search-patches "libtommath-fix-linkage.patch")))) + (build-system gnu-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (delete 'configure) ; no configure + (add-after 'unpack 'prepare-build + (lambda _ + ;; Don't pull in coreutils. + (substitute* "makefile_include.mk" + (("arch") "uname -m")) + + ;; We want the shared library by default so force it to be the + ;; default makefile target. + (delete-file "makefile") + (symlink "makefile.shared" "makefile") + #t)) + (add-after 'install 'remove-static-library + (lambda* (#:key outputs #:allow-other-keys) + (delete-file (string-append (assoc-ref outputs "out") + "/lib/libtommath.a")) + #t)) + (replace 'check + (lambda* (#:key make-flags #:allow-other-keys) + (apply invoke "make" "test_standalone" make-flags) + (invoke "sh" "test"))) + (add-after 'install 'install-static-library + (lambda* (#:key outputs #:allow-other-keys) + (invoke "make" "-f" "makefile.unix" "install" + (string-append "PREFIX=" (assoc-ref outputs "static")) + (string-append "CC=" (which "gcc")))))) + #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")) + "CC=gcc"))) + (native-inputs + `(("libtool" ,libtool))) + (home-page "https://www.libtom.net/LibTomMath/") + (synopsis "Portable number theoretic multiple-precision integer library") + (description "LibTomMath is a portable number theoretic multiple-precision +integer library written entirely in C. It's designed to provide an API that is +simple to work with that provides fairly efficient routines that build out of +the box without configuration.") + (license unlicense))) diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm index c024c5ceae..ad9ce23718 100644 --- a/gnu/packages/parallel.scm +++ b/gnu/packages/parallel.scm @@ -48,7 +48,7 @@ (define-public parallel (package (name "parallel") - (version "20190122") + (version "20190222") (source (origin (method url-fetch) @@ -56,7 +56,7 @@ version ".tar.bz2")) (sha256 (base32 - "030rjhis8s47gkm05k4vc9p886cxvadpgzs8rqmgzvlc38h5ywxf")))) + "073bj0ji9liq07j6a7y9i4kxfkv06kvavhh7654f2bgfavfbmcc6")))) (build-system gnu-build-system) (arguments `(#:phases diff --git a/gnu/packages/patches/ath9k-htc-firmware-gcc.patch b/gnu/packages/patches/ath9k-htc-firmware-gcc.patch index 79924ca8cb..5e912f6f5c 100644 --- a/gnu/packages/patches/ath9k-htc-firmware-gcc.patch +++ b/gnu/packages/patches/ath9k-htc-firmware-gcc.patch @@ -16,16 +16,6 @@ diff --git a/include/xtensa-config.h b/include/xtensa-config.h index 30f4f41..fe9b051 100644 --- a/include/xtensa-config.h +++ b/include/xtensa-config.h -@@ -1,7 +1,7 @@ - /* Xtensa configuration settings. -- Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2010 -+ Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007 - Free Software Foundation, Inc. -- Contributed by Bob Wilson (bob.wilson@acm.org) at Tensilica. -+ Contributed by Bob Wilson (bwilson@tensilica.com) at Tensilica. - - 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 @@ -44,10 +44,7 @@ #define XCHAL_HAVE_L32R 1 diff --git a/gnu/packages/patches/clamav-system-tomsfastmath.patch b/gnu/packages/patches/clamav-system-tomsfastmath.patch index 07ab79f3f7..2153723a76 100644 --- a/gnu/packages/patches/clamav-system-tomsfastmath.patch +++ b/gnu/packages/patches/clamav-system-tomsfastmath.patch @@ -1,3 +1,9 @@ +From: Tobias Geerinckx-Rice <me@tobias.gr> +Date: Sun, 24 Feb 2019 15:50:37 +0100 +Subject: gnu: clamav: Add support for system tomsfastmath. + +Adjusted from the original for clamav 0.101.1: + From 756ff89526b5ffaa7a4f49b1bbecf2ecbd6f85f9 Mon Sep 17 00:00:00 2001 From: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Date: Wed, 11 Mar 2015 20:03:15 +0100 @@ -13,17 +19,17 @@ Patch-Name: add-support-for-system-tomsfastmath.patch 5 files changed, 28 insertions(+), 4 deletions(-) create mode 100644 m4/reorganization/libs/tomsfastmath.m4 ---- a/configure.ac -+++ b/configure.ac -@@ -82,6 +82,7 @@ m4_include([m4/reorganization/libs/xml.m - m4_include([m4/reorganization/libs/openssl.m4]) +--- a/configure.ac 1970-01-01 01:00:00.000000000 +0100 ++++ b/configure.ac 2019-02-24 15:47:14.076992864 +0100 +@@ -89,6 +89,7 @@ m4_include([m4/reorganization/libs/json.m4]) m4_include([m4/reorganization/libs/pcre.m4]) + m4_include([m4/reorganization/libs/libmspack.m4]) +m4_include([m4/reorganization/libs/tomsfastmath.m4]) - AM_MAINTAINER_MODE - m4_include([m4/reorganization/libs/libz.m4]) -@@ -285,6 +286,7 @@ else + if test "x$use_internal_mspack" = "xno"; then + mspack_msg="External, $LIBMSPACK_CFLAGS $LIBMSPACK_LIBS" +@@ -297,6 +298,7 @@ fi CL_MSG_STATUS([yara ],[$enable_yara],[$enable_yara]) CL_MSG_STATUS([fts ],[yes],[$lfs_fts_msg]) @@ -31,9 +37,28 @@ Patch-Name: add-support-for-system-tomsfastmath.patch # Yep, downgrading the compiler avoids the bug too: ---- a/libclamav/Makefile.am -+++ b/libclamav/Makefile.am -@@ -496,8 +496,10 @@ libclamav_la_SOURCES += yara_arena.c \ +diff -Naur clamav-0.101.1/libclamav/bignum.h clamav-0.101.1b/libclamav/bignum.h +--- a/libclamav/bignum.h 1970-01-01 01:00:00.000000000 +0100 ++++ b/libclamav/bignum.h 2019-02-24 15:46:36.216998323 +0100 +@@ -1,9 +1,13 @@ + #ifndef BIGNUM_H_ + #define BIGNUM_H_ + ++#if HAVE_SYSTEM_TOMSFASTMATH ++#include <tfm.h> ++#else + #define TFM_CHECK +- + #include "bignum_fast.h" ++#endif ++ + typedef fp_int mp_int; + #define mp_cmp fp_cmp + #define mp_toradix_n(a,b,c,d) fp_toradix_n(a,b,c,d) +diff -Naur clamav-0.101.1/libclamav/Makefile.am clamav-0.101.1b/libclamav/Makefile.am +--- a/libclamav/Makefile.am 1970-01-01 01:00:00.000000000 +0100 ++++ b/libclamav/Makefile.am 2019-02-24 15:46:36.216998323 +0100 +@@ -597,8 +597,10 @@ yara_clam.h endif @@ -46,7 +71,7 @@ Patch-Name: add-support-for-system-tomsfastmath.patch tomsfastmath/addsub/fp_add.c\ tomsfastmath/addsub/fp_add_d.c\ tomsfastmath/addsub/fp_addmod.c\ -@@ -579,6 +581,10 @@ libclamav_la_SOURCES += bignum.h\ +@@ -680,6 +682,10 @@ tomsfastmath/sqr/fp_sqr_comba_generic.c\ tomsfastmath/sqr/fp_sqr_comba_small_set.c\ tomsfastmath/sqr/fp_sqrmod.c @@ -57,26 +82,10 @@ Patch-Name: add-support-for-system-tomsfastmath.patch .PHONY: version.h.tmp version.c: version.h ---- a/libclamav/bignum.h -+++ b/libclamav/bignum.h -@@ -1,9 +1,13 @@ - #ifndef BIGNUM_H_ - #define BIGNUM_H_ - -+#if HAVE_SYSTEM_TOMSFASTMATH -+#include <tfm.h> -+#else - #define TFM_CHECK -- - #include "bignum_fast.h" -+#endif -+ - typedef fp_int mp_int; - #define mp_cmp fp_cmp - #define mp_toradix_n(a,b,c,d) fp_toradix_n(a,b,c,d) ---- a/libclamav/xdp.c -+++ b/libclamav/xdp.c -@@ -57,7 +57,7 @@ +diff -Naur clamav-0.101.1/libclamav/xdp.c clamav-0.101.1b/libclamav/xdp.c +--- a/libclamav/xdp.c 1970-01-01 01:00:00.000000000 +0100 ++++ b/libclamav/xdp.c 2019-02-24 15:46:36.216998323 +0100 +@@ -52,7 +52,7 @@ #include "scanners.h" #include "conv.h" #include "xdp.h" @@ -85,8 +94,9 @@ Patch-Name: add-support-for-system-tomsfastmath.patch #include "filetypes.h" static char *dump_xdp(cli_ctx *ctx, const char *start, size_t sz); ---- /dev/null -+++ b/m4/reorganization/libs/tomsfastmath.m4 +diff -Naur clamav-0.101.1/m4/reorganization/libs/tomsfastmath.m4 clamav-0.101.1b/m4/reorganization/libs/tomsfastmath.m4 +--- a/m4/reorganization/libs/tomsfastmath.m4 1970-01-01 01:00:00.000000000 +0100 ++++ b/m4/reorganization/libs/tomsfastmath.m4 2019-02-24 15:46:36.216998323 +0100 @@ -0,0 +1,12 @@ +dnl Check for system tomsfastmath +PKG_CHECK_MODULES([TOMSFASTMATH], [tomsfastmath], [have_system_tomsfastmath=yes], [have_system_tomsfastmath=no]) diff --git a/gnu/packages/patches/libtommath-fix-linkage.patch b/gnu/packages/patches/libtommath-fix-linkage.patch new file mode 100644 index 0000000000..1a9d46eb7c --- /dev/null +++ b/gnu/packages/patches/libtommath-fix-linkage.patch @@ -0,0 +1,55 @@ +https://github.com/libtom/libtommath/commit/93dea3a4162527346cd8856bfda6f17ffe98ab04.patch + +From 93dea3a4162527346cd8856bfda6f17ffe98ab04 Mon Sep 17 00:00:00 2001 +From: Steffen Jaeckel <s@jaeckel.eu> +Date: Thu, 31 Jan 2019 14:12:03 +0100 +Subject: [PATCH] makefile.shared: fix compilation and linkage + +--- + makefile.shared | 15 ++++++++------- + 1 file changed, 8 insertions(+), 7 deletions(-) + +diff --git a/makefile.shared b/makefile.shared +index 3955f830..870b18d1 100644 +--- a/makefile.shared ++++ b/makefile.shared +@@ -18,6 +18,7 @@ ifndef LIBTOOL + endif + endif + LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) ++LTLINK = $(LIBTOOL) --mode=link --tag=CC $(CC) + + LCOV_ARGS=--directory .libs --directory . + +@@ -59,7 +60,7 @@ objs: $(OBJECTS) + LOBJECTS = $(OBJECTS:.o=.lo) + + $(LIBNAME): $(OBJECTS) +- $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) $(LOBJECTS) -o $(LIBNAME) -rpath $(LIBPATH) -version-info $(VERSION_SO) $(LIBTOOLFLAGS) ++ $(LTLINK) $(LDFLAGS) $(LOBJECTS) -o $(LIBNAME) -rpath $(LIBPATH) -version-info $(VERSION_SO) $(LIBTOOLFLAGS) + + install: $(LIBNAME) + install -d $(DESTDIR)$(LIBPATH) +@@ -76,16 +77,16 @@ uninstall: + rm $(DESTDIR)$(LIBPATH)/pkgconfig/libtommath.pc + + test: $(LIBNAME) demo/demo.o +- $(CC) $(CFLAGS) -c demo/demo.c -o demo/demo.o +- $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o test demo/demo.o $(LIBNAME) ++ $(LTCOMPILE) $(CFLAGS) -c demo/demo.c -o demo/demo.o ++ $(LTLINK) $(LDFLAGS) -o test demo/demo.o $(LIBNAME) + + test_standalone: $(LIBNAME) demo/demo.o +- $(CC) $(CFLAGS) -c demo/demo.c -o demo/demo.o +- $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o test demo/demo.o $(LIBNAME) ++ $(LTCOMPILE) $(CFLAGS) -c demo/demo.c -o demo/demo.o ++ $(LTLINK) $(LDFLAGS) -o test demo/demo.o $(LIBNAME) + + .PHONY: mtest + mtest: +- cd mtest ; $(CC) $(CFLAGS) $(LDFLAGS) mtest.c -o mtest ++ cd mtest ; $(CC) $(CFLAGS) -O0 mtest.c $(LDFLAGS) -o mtest + + timing: $(LIBNAME) demo/timing.c +- $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -DTIMER demo/timing.c $(LIBNAME) -o timing ++ $(LTLINK) $(CFLAGS) $(LDFLAGS) -DTIMER demo/timing.c $(LIBNAME) -o timing diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index b735b64c22..7a2bcfc960 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -6411,25 +6411,20 @@ system threads instead of Perl threads.") (define-public perl-net-idn-encode (package (name "perl-net-idn-encode") - (version "2.400") + (version "2.500") (source (origin (method url-fetch) - (uri (string-append - "mirror://cpan/authors/id/C/CF/CFAERBER/Net-IDN-Encode-" - version - ".tar.gz")) + (uri (string-append "mirror://cpan/authors/id/C/CF/CFAERBER/" + "Net-IDN-Encode-" version ".tar.gz")) (sha256 - (base32 - "0a9knav5f9kjldrkxx1k47ivd3p23zkmi8aqgyhnxidhgasz1dlq")))) + (base32 "1aiy7adirk3wpwlczd8sldi9k1dray0jrg1lbcrcw97zwcrkciam")))) (build-system perl-build-system) (native-inputs `(("perl-module-build" ,perl-module-build) ("perl-test-nowarnings" ,perl-test-nowarnings))) - (home-page - "https://metacpan.org/release/Net-IDN-Encode") - (synopsis - "Internationalizing Domain Names in Applications (IDNA)") + (home-page "https://metacpan.org/release/Net-IDN-Encode") + (synopsis "Internationalizing Domain Names in Applications (IDNA)") (description "Internationalized Domain Names (IDNs) use characters drawn from a large repertoire (Unicode), but IDNA allows the non-ASCII characters to be diff --git a/gnu/packages/popt.scm b/gnu/packages/popt.scm index 5da2bb1d3f..e3f5fa1895 100644 --- a/gnu/packages/popt.scm +++ b/gnu/packages/popt.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2014, 2016 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2015, 2016 Ricardo Wurmus <rekado@elephly.net> -;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; ;;; This file is part of GNU Guix. ;;; @@ -21,6 +21,7 @@ (define-module (gnu packages popt) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix git-download) #:use-module (guix build-system gnu) #:use-module (guix build-system cmake) #:use-module (guix licenses)) @@ -96,15 +97,16 @@ similar to getopt(3), it contains a number of enhancements, including: (define-public gflags (package (name "gflags") - (version "2.2.1") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/gflags/gflags" - "/archive/v" version ".tar.gz")) - (sha256 - (base32 - "03lxc2ah8i392kh1naq99iip34k4fpv22kwflyx3byd2ssycs9xf")) - (file-name (string-append name "-" version ".tar.gz")))) + (version "2.2.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/gflags/gflags.git") + (commit (string-append "v" version)))) + (sha256 + (base32 "147i3md3nxkjlrccqg4mq1kyzc7yrhvqv5902iibc7znkvzdvlp0")) + (file-name (git-file-name name version)))) (build-system cmake-build-system) (arguments '(#:configure-flags '("-DBUILD_SHARED_LIBS=ON" diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm index 2a5dbaeb30..2686425b51 100644 --- a/gnu/packages/python-check.scm +++ b/gnu/packages/python-check.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019 Ricardo Wurmus <rekado@elephly.net> +;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; ;;; This file is part of GNU Guix. ;;; @@ -30,14 +31,14 @@ (define-public python-coveralls (package (name "python-coveralls") - (version "1.5.1") + (version "1.6.0") (source (origin (method url-fetch) (uri (pypi-uri "coveralls" version)) (sha256 (base32 - "0vfdny96gcq05qk5wxdbfxfaaprdk7c9q2pqvg7ac5l9sf48wqxb")))) + "1dswhd2q2412wrldi97hdwlsymj9pm79v7pvjx53z5wh2d33w8bg")))) (build-system python-build-system) (propagated-inputs `(("python-coverage" ,python-coverage) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 557a41bf28..dc5a020b11 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1138,17 +1138,17 @@ other Python program.") (define-public python-empy (package (name "python-empy") - (version "3.3") + (version "3.3.3") (source (origin (method url-fetch) (uri (string-append "http://www.alcyone.com/software/empy/empy-" version ".tar.gz")) (sha256 (base32 - "01g8mmkfnvjdmlhsihwyx56lrg7r5m5d2fg6mnxsvy6g0dnl69f6")))) + "1mxfy5mgp473ga1pgz2nvm8ds6z4g3hdky8523z6jzvcs9ny6hcq")))) (build-system python-build-system) (arguments - `(#:tests? #f)) ;python2 only + `(#:tests? #f)) ; python2 only (home-page "http://www.alcyone.com/software/empy/") (synopsis "Templating system for Python") (description @@ -1166,7 +1166,11 @@ commands.") (license license:lgpl2.1+))) (define-public python2-empy - (package-with-python2 python-empy)) + (let ((base (package-with-python2 (strip-python2-variant python-empy)))) + (package + (inherit base) + (arguments `(,@(package-arguments base) + #:tests? #t))))) (define-public python2-element-tree (package @@ -2762,13 +2766,13 @@ and is very extensible.") (define-public python-scikit-image (package (name "python-scikit-image") - (version "0.14.1") + (version "0.14.2") (source (origin (method url-fetch) (uri (pypi-uri "scikit-image" version)) (sha256 - (base32 "0l1c3rl4s1jyv80i5hns4pgih09zrxfj7lygdc51w8sgyysb7ac6")))) + (base32 "07qchljkyxvg5nrm12fvszi7pmjk4m01qp0w0z8syxzxxs20pz8s")))) (build-system python-build-system) (arguments ;; TODO: Some tests require running X11 server. Disable them? @@ -11289,7 +11293,7 @@ protocols.") (define-public python2-cliapp (package (name "python2-cliapp") - (version "1.20170823") + (version "1.20180812.1") (source (origin (method url-fetch) @@ -11298,7 +11302,7 @@ protocols.") version ".tar.gz")) (sha256 (base32 - "1i9gik0xrj6jmi95s5w988jl1y265baz5xm5pbqdyvsh8h9ln6yq")))) + "1c1jlblbns8qhiaqjpg4xi6lip8xwfc5w643p43rg543havaj45x")))) (build-system python-build-system) (arguments `(#:python ,python-2 @@ -11330,7 +11334,7 @@ iterating over input files.") (define-public python2-ttystatus (package (name "python2-ttystatus") - (version "0.35") + (version "0.36") (source (origin (method url-fetch) @@ -11339,7 +11343,7 @@ iterating over input files.") version ".tar.gz")) (sha256 (base32 - "0vivqbw7ddhsq1zj3g9cvvv4f0phl0pis2smsnwcr2szz2fk3hl6")))) + "06mdk4d19zw2j3is54gndhzl396g3xc8k52m7i86z69s9hcz71by")))) (build-system python-build-system) (native-inputs `(("python2-coverage-test-runner" ,python2-coverage-test-runner) @@ -12100,14 +12104,14 @@ terminal such as coloured output in the shell, overwriting output, indentation, (define-public python-misaka (package (name "python-misaka") - (version "2.1.0") + (version "2.1.1") (source (origin (method url-fetch) (uri (pypi-uri "misaka" version)) (sha256 (base32 - "1yqrq3a5rracirmvk52n28nn6ckdaz897gnigv89a9gmyn87sqw7")))) + "1mzc29wwyhyardclj1vg2xsfdibg2lzb7f1azjcxi580ama55wv2")))) (build-system python-build-system) (arguments `(;; Line 37 of setup.py calls self.run_command('develop') @@ -13483,16 +13487,16 @@ functions by partial application of operators.") (define-public python-funcy (package (name "python-funcy") - (version "1.10") + (version "1.11") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/Suor/funcy/archive/" version - ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/Suor/funcy.git") + (commit version))) (sha256 - (base32 - "1fanxivsip29vgarw6dn39xym3q4pbxcpa11plpp548lvxajpahz")) - (file-name (string-append name "-" version ".tar.gz")))) + (base32 "1s98vkjnq3zq71737hn8xa15kssvmy1sfzsll3vrlv53902418mw")) + (file-name (git-file-name name version)))) (build-system python-build-system) (arguments `(#:phases @@ -13957,14 +13961,14 @@ Parso is also able to list multiple syntax errors in your Python file.") (define-public python-async-generator (package (name "python-async-generator") - (version "1.9") + (version "1.10") (source (origin (method url-fetch) (uri (pypi-uri "async_generator" version)) (sha256 (base32 - "0wc3hidz1q85cja93k5pzybn0fprfnqyrv4qlkdqdzklc5f4dmdp")))) + "0i11f6z6lix8ixi3vsk6s76zvvpmgrw6zjrcwjm0m4hjdh83vfvf")))) (build-system python-build-system) (native-inputs `(("python-pytest" ,python-pytest))) diff --git a/gnu/packages/ragel.scm b/gnu/packages/ragel.scm index 6201482c9f..1d9b67a6e0 100644 --- a/gnu/packages/ragel.scm +++ b/gnu/packages/ragel.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net> +;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; ;;; This file is part of GNU Guix. ;;; @@ -26,16 +27,16 @@ (define-public ragel (package (name "ragel") - (version "6.9") + (version "6.10") (source (origin (method url-fetch) - (uri (string-append "http://www.colm.net/files/ragel/ragel-" + (uri (string-append "https://www.colm.net/files/ragel/ragel-" version ".tar.gz")) (sha256 (base32 - "02k6rwh8cr95f1p5sjjr3wa6dilg06572xz1v71dk8awmc7vw1vf")))) + "0gvcsl62gh6sg73nwaxav4a5ja23zcnyxncdcdnqa2yjcpdnw5az")))) (build-system gnu-build-system) - (home-page "http://www.colm.net/open-source/ragel/") + (home-page "https://www.colm.net/open-source/ragel/") (synopsis "State machine compiler") (description "Ragel compiles executable finite state machines from regular languages. diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 6b95e20134..5afdf13f43 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -764,7 +764,7 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" (inherit base-rust) (inputs ;; Use LLVM 6.0 - (alist-replace "llvm" (list llvm) + (alist-replace "llvm" (list llvm-6) (package-inputs base-rust))) (arguments (substitute-keyword-arguments (package-arguments base-rust) diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index 74b0625325..7c7b7e7350 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2017, 2018 Rutger Helling <rhelling@mykolab.com> ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net> +;;; Copyright © 2019 Kei Kebreau <kkebreau@posteo.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -350,6 +351,21 @@ directory.") (other other)) (package-propagated-inputs package))) +(define-public sdl2-gfx + (package (inherit sdl-gfx) + (name "sdl2-gfx") + (version "1.0.4") + (source (origin + (method url-fetch) + (uri + (string-append "https://www.ferzkopp.net/Software/SDL2_gfx/SDL2_gfx-" + version ".tar.gz")) + (sha256 + (base32 + "0qk2ax7f7grlxb13ba0ll3zlm8780s7j8fmrhlpxzjgdvldf1q33")))) + (propagated-inputs + (propagated-inputs-with-sdl2 sdl-gfx)))) + (define-public sdl2-image (package (inherit sdl-image) (name "sdl2-image") diff --git a/gnu/packages/simulation.scm b/gnu/packages/simulation.scm index 20b62f33d1..3637cc383b 100644 --- a/gnu/packages/simulation.scm +++ b/gnu/packages/simulation.scm @@ -268,6 +268,11 @@ problems for efficient solution on parallel systems.") (setenv "PYTHONPATH" (string-append (getcwd) ":" (getenv "PYTHONPATH"))) (with-directory-excursion "test" + ;; Disable parallel tests to avoid race condition. See + ;; https://github.com/pytest-dev/pytest-cov/issues/237. + (substitute* "runtests.sh" + (("for p in 1 4 8 16; do") + "for p in 1; do")) (invoke "./runtests.sh")) #t))))) (home-page "https://bitbucket.org/fenics-project/dijitso/") diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index a9c19cdf82..59cbe7cec7 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -309,13 +309,13 @@ multi-seat support, a replacement for @command{mingetty}, and more.") (define-public libtermkey (package (name "libtermkey") - (version "0.21") + (version "0.21.1") (source (origin (method url-fetch) (uri (string-append "http://www.leonerd.org.uk/code/libtermkey/" "libtermkey-" version ".tar.gz")) (sha256 - (base32 "0fzb5pvj139di02saffhy3ajchmksn1rs41kplkv2zjyjv7xbsvr")))) + (base32 "0psd0kf10q5ixfima0mxz10syy7qq1ilz1npr0rz862xycvzgjyf")))) (build-system gnu-build-system) (arguments '(#:make-flags (list diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm index c5346e04a2..a0b16db3a7 100644 --- a/gnu/packages/tor.scm +++ b/gnu/packages/tor.scm @@ -49,14 +49,14 @@ (define-public tor (package (name "tor") - (version "0.3.4.10") + (version "0.3.4.11") (source (origin (method url-fetch) (uri (string-append "https://dist.torproject.org/tor-" version ".tar.gz")) (sha256 (base32 - "12i51i6swkdpnbcpa6f1csc00q177sbjnw2x31j53glxshmwpv5d")))) + "04l42k86y5saab4ijnkd8vjvd0lvrkrg359ddkir5gwgfb3mvijq")))) (build-system gnu-build-system) (arguments `(#:configure-flags (list "--enable-gcc-hardening" diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 5ca9471a43..c18a035c31 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -147,14 +147,14 @@ as well as the classic centralized workflow.") (name "git") ;; XXX When updating Git, check if the special 'git-source' input to cgit ;; needs to be updated as well. - (version "2.20.1") + (version "2.21.0") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/software/scm/git/git-" version ".tar.xz")) (sha256 (base32 - "1sf3h6ms43k15h01ln8lcf24vx9n7c11s83h1ax63sm2zbi92blx")))) + "0a0d0b07rmvs985zpndxxy0vzr0vq53kq5kyd68iv6gf8gkirjwc")))) (build-system gnu-build-system) (native-inputs `(("native-perl" ,perl) @@ -167,7 +167,7 @@ as well as the classic centralized workflow.") version ".tar.xz")) (sha256 (base32 - "1fkn134y7an850l7p487v39y5zciaa65gryzqz815dyg8ziwq2h6")))) + "0lgcynqbjmfsvhfk14jvqyvb1xiyqgkgznb707vha38wjcjdqs1g")))) ;; For subtree documentation. ("asciidoc" ,asciidoc) ("docbook-xsl" ,docbook-xsl) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 8eb755b135..6524fb6bd3 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2015 Andy Patterson <ajpatter@uwaterloo.ca> ;;; Copyright © 2015, 2018 Ricardo Wurmus <rekado@elephly.net> -;;; Copyright © 2015, 2016, 2017, 2018 Alex Vong <alexvong1995@gmail.com> +;;; Copyright © 2015, 2016, 2017, 2018, 2019 Alex Vong <alexvong1995@gmail.com> ;;; Copyright © 2016, 2017 Alex Griffin <a@ajgrf.com> ;;; Copyright © 2016 Kei Kebreau <kkebreau@posteo.net> ;;; Copyright © 2016 Dmitry Nikolaev <cameltheman@gmail.com> @@ -1359,7 +1359,7 @@ access to mpv's powerful playback capabilities.") (define-public youtube-dl (package (name "youtube-dl") - (version "2019.01.30.1") + (version "2019.02.18") (source (origin (method url-fetch) (uri (string-append "https://github.com/rg3/youtube-dl/releases/" @@ -1367,7 +1367,7 @@ access to mpv's powerful playback capabilities.") version ".tar.gz")) (sha256 (base32 - "0wamv1fs4w8jjx67p60rgrgdi6k04yy0h4p3cwscza5pzhpmvnlf")))) + "1sr0f6ixpaqyp3cf29zswx84y3nfabwnk3sljcgvgnmjp73zzfv1")))) (build-system python-build-system) (arguments ;; The problem here is that the directory for the man page and completion diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index 0c1410c4ad..e135fdef17 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -274,7 +274,7 @@ and probably others.") (define-public openvpn (package (name "openvpn") - (version "2.4.6") + (version "2.4.7") (source (origin (method url-fetch) (uri (string-append @@ -282,7 +282,7 @@ and probably others.") version ".tar.xz")) (sha256 (base32 - "09lck4wmkas3iyrzaspin9gn3wiclqb1m9sf8diy7j8wakx38r2g")))) + "0j7na936isk9j8nsdrrbw7wmy09inmjqvsb8mw8az7k61xbm6bx4")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--enable-iproute2=yes"))) |