aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gnu/local.mk1
-rw-r--r--gnu/packages/apr.scm4
-rw-r--r--gnu/packages/build-tools.scm4
-rw-r--r--gnu/packages/certs.scm4
-rw-r--r--gnu/packages/clojure.scm34
-rw-r--r--gnu/packages/cups.scm4
-rw-r--r--gnu/packages/databases.scm6
-rw-r--r--gnu/packages/emacs-xyz.scm7
-rw-r--r--gnu/packages/finance.scm39
-rw-r--r--gnu/packages/freedesktop.scm4
-rw-r--r--gnu/packages/gdb.scm4
-rw-r--r--gnu/packages/gnome.scm4
-rw-r--r--gnu/packages/gnuzilla.scm6
-rw-r--r--gnu/packages/groovy.scm28
-rw-r--r--gnu/packages/gtk.scm4
-rw-r--r--gnu/packages/imagemagick.scm4
-rw-r--r--gnu/packages/linux.scm4
-rw-r--r--gnu/packages/maths.scm4
-rw-r--r--gnu/packages/ninja.scm4
-rw-r--r--gnu/packages/patches/emacs-pdf-tools-poppler.patch41
-rw-r--r--gnu/packages/pdf.scm4
-rw-r--r--gnu/packages/python-web.scm46
-rw-r--r--gnu/packages/python-xyz.scm68
-rw-r--r--gnu/packages/spice.scm17
-rw-r--r--gnu/packages/video.scm4
-rw-r--r--gnu/packages/virtualization.scm4
-rw-r--r--gnu/packages/web.scm16
-rw-r--r--gnu/packages/xdisorg.scm4
-rw-r--r--gnu/packages/xml.scm127
-rw-r--r--gnu/system/install.scm2
30 files changed, 314 insertions, 188 deletions
diff --git a/gnu/local.mk b/gnu/local.mk
index d16b9e8c01..b546d74ff9 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -727,7 +727,6 @@ dist_patch_DATA = \
%D%/packages/patches/emacs-fix-scheme-indent-function.patch \
%D%/packages/patches/emacs-json-reformat-fix-tests.patch \
%D%/packages/patches/emacs-highlight-stages-add-gexp.patch \
- %D%/packages/patches/emacs-pdf-tools-poppler.patch \
%D%/packages/patches/emacs-scheme-complete-scheme-r5rs-info.patch \
%D%/packages/patches/emacs-source-date-epoch.patch \
%D%/packages/patches/emacs-realgud-fix-configure-ac.patch \
diff --git a/gnu/packages/apr.scm b/gnu/packages/apr.scm
index 8ccec08fa2..1a4a1c6304 100644
--- a/gnu/packages/apr.scm
+++ b/gnu/packages/apr.scm
@@ -30,14 +30,14 @@
(define-public apr
(package
(name "apr")
- (version "1.6.3")
+ (version "1.6.5")
(source (origin
(method url-fetch)
(uri (string-append "mirror://apache/apr/apr-"
version ".tar.bz2"))
(sha256
(base32
- "0wiik6amxn6lkc55fv9yz5i3kbxnqbp36alrzabx1avsdp8hc7qk"))
+ "01d1n1ql66bxsjx0wyzazmkqdqdmr0is6a7lwyy5kzy4z7yajz56"))
(patches
(search-patches "apr-skip-getservbyname-test.patch"))
(patch-flags '("-p0"))))
diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm
index 628b36fff5..6beeb4f542 100644
--- a/gnu/packages/build-tools.scm
+++ b/gnu/packages/build-tools.scm
@@ -158,7 +158,7 @@ files and generates build instructions for the Ninja build system.")
(define-public meson
(package
(name "meson")
- (version "0.49.0")
+ (version "0.49.2")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/mesonbuild/meson/"
@@ -166,7 +166,7 @@ files and generates build instructions for the Ninja build system.")
version ".tar.gz"))
(sha256
(base32
- "0l8m1v7cl5ybm7psfqmmdqbvmnsbb1qhb8ni3hwap3i0mk29a0zv"))))
+ "1z89f71r29laywx75bamjakybv9653wz0vd2l4xhvqy1dqr197zg"))))
(build-system python-build-system)
(arguments
`(;; FIXME: Tests require many additional inputs, a fix for the RUNPATH
diff --git a/gnu/packages/certs.scm b/gnu/packages/certs.scm
index bb66d27026..89f2ff2884 100644
--- a/gnu/packages/certs.scm
+++ b/gnu/packages/certs.scm
@@ -76,7 +76,7 @@
(define-public nss-certs
(package
(name "nss-certs")
- (version "3.41")
+ (version "3.42.1")
(source (origin
(method url-fetch)
(uri (let ((version-with-underscores
@@ -87,7 +87,7 @@
"nss-" version ".tar.gz")))
(sha256
(base32
- "0bbif42fzz5gk451sv3yphdrl7m4p6zgk5jk0307j06xs3sihbmb"))))
+ "1ihzqspvqjmysp1c15xxr7kqvj3zm9dqnanxhkaxyjgx71yv6z88"))))
(build-system gnu-build-system)
(outputs '("out"))
(native-inputs
diff --git a/gnu/packages/clojure.scm b/gnu/packages/clojure.scm
index 8112b65278..a9cabfe008 100644
--- a/gnu/packages/clojure.scm
+++ b/gnu/packages/clojure.scm
@@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com>
;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz>
+;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -147,12 +148,13 @@ designs.")
(version "0.1.3")
(source
(origin
- (method url-fetch)
- (uri
- (string-append "https://github.com/clojure/algo.generic/archive"
- "/algo.generic-" version ".tar.gz"))
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/clojure/algo.generic.git")
+ (commit (string-append "algo.generic-" version))))
+ (file-name (git-file-name name version))
(sha256
- (base32 "12w9681i545gp1af4576z1qbixwps1j13c16fmcc7zsb0bd1zr7w"))))
+ (base32 "1s6q10qp276dcpzv06bq1q3bvkvlw03qhmncqcs9cc6p9lc0w4p4"))))
(build-system clojure-build-system)
(arguments
'(#:source-dirs '("src/main/clojure/")
@@ -171,12 +173,13 @@ that can be implemented for any data type.")
(version "0.1.6")
(source
(origin
- (method url-fetch)
- (uri
- (string-append "https://github.com/clojure/algo.monads/archive"
- "/algo.monads-" version ".tar.gz"))
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/clojure/algo.monads.git")
+ (commit (string-append "algo.monads-" version))))
+ (file-name (git-file-name name version))
(sha256
- (base32 "14gbvfgmrda990h45yn7zag83vp1kdkz4f4yzmyvkr0sjihlgdmq"))))
+ (base32 "0mv3ba72hyhgasg2k3zy83ij61gak6cs4d6qgh8123z3j02mbh8p"))))
(build-system clojure-build-system)
(arguments
'(#:source-dirs '("src/main/clojure/")
@@ -277,12 +280,13 @@ tree.
(version "0.1.5")
(source
(origin
- (method url-fetch)
- (uri
- (string-append "https://github.com/clojure/tools.macro/archive"
- "/tools.macro-" version ".tar.gz"))
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/clojure/tools.macro.git")
+ (commit (string-append "tools.macro-" version))))
+ (file-name (git-file-name name version))
(sha256
- (base32 "0fs64a0g63xx6g7sj6vrsqknhl90s0isf6k053nw8vv5prfzc7v6"))))
+ (base32 "14mdxqkwja0cffmyfav5pbcli2qvw1mjdgz0n619a2z2036andx8"))))
(build-system clojure-build-system)
(arguments
'(#:source-dirs '("src/main/clojure/")
diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm
index 9c470c4bb6..6724f04ce5 100644
--- a/gnu/packages/cups.scm
+++ b/gnu/packages/cups.scm
@@ -54,7 +54,7 @@
(define-public cups-filters
(package
(name "cups-filters")
- (version "1.21.5")
+ (version "1.22.0")
(source(origin
(method url-fetch)
(uri
@@ -62,7 +62,7 @@
"cups-filters-" version ".tar.xz"))
(sha256
(base32
- "0azq9j7kqy18g6vgmvrbw8i4mcqdp3cbgh7q79x1b8p92w4si6rq"))
+ "0gdv33g7dr1i7756n07zwgsv9b1i15rp7n1z1xr3n8f59br4fds4"))
(modules '((guix build utils)))
(snippet
;; install backends, banners and filters to cups-filters output
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 33fb530509..cc4e6631f8 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -497,7 +497,7 @@ Language.")
(define-public mariadb
(package
(name "mariadb")
- (version "10.1.37")
+ (version "10.1.38")
(source (origin
(method url-fetch)
(uri (string-append "https://downloads.mariadb.org/f/"
@@ -505,7 +505,7 @@ Language.")
name "-" version ".tar.gz"))
(sha256
(base32
- "0ijdmdn9mcciwv361zfmja6b1h6qpbdqgrnnq6kkdapplyq1dmcc"))
+ "0zq77w3ff9q781fn8cv46vy1v4ggb8vjarjvk51k653x4gyg9wfa"))
(patches (search-patches "mariadb-client-test-32bit.patch"))
(modules '((guix build utils)))
(snippet
@@ -584,7 +584,7 @@ Language.")
"roles.acl_statistics"
;; This file contains a time bomb which makes it fail after
- ;; 2019-01-01. See <https://bugs.gnu.org/34351> for details.
+ ;; 2030-12-31. See <https://bugs.gnu.org/34351> for details.
"main.mysqldump"
;; XXX: Fails sporadically.
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 5d8aa0e863..339927a4f0 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -1532,7 +1532,7 @@ filters, new key bindings and faces. It can be enabled by
(define-public emacs-pdf-tools
(package
(name "emacs-pdf-tools")
- (version "0.80")
+ (version "0.90")
(home-page "https://github.com/politza/pdf-tools")
(source (origin
(method git-fetch)
@@ -1541,11 +1541,10 @@ filters, new key bindings and faces. It can be enabled by
(file-name (git-file-name name version))
(sha256
(base32
- "1i4647vax5na73basc5dz4lh9kprir00fh8ps4i0l1y3ippnjs2s"))
- (patches (search-patches "emacs-pdf-tools-poppler.patch"))))
+ "0iv2g5kd14zk3r5dzdw7b7hk4b5w7qpbilcqkja46jgxbb6xnpl9"))))
(build-system gnu-build-system)
(arguments
- `(#:tests? #f ; there are no tests
+ `(#:tests? #f ; there are no tests
#:modules ((guix build gnu-build-system)
((guix build emacs-build-system) #:prefix emacs:)
(guix build utils)
diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index ce67694cfe..e44be713f2 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -299,7 +299,7 @@ do so.")
(define-public electrum
(package
(name "electrum")
- (version "3.2.2")
+ (version "3.3.3")
(source
(origin
(method url-fetch)
@@ -308,7 +308,7 @@ do so.")
version ".tar.gz"))
(sha256
(base32
- "1fxaxlf5vm2zydj678ls3pazyriym188iwzk60kyk26cz2p3xk39"))
+ "0z2zfhyawrbzs0w1426a2w0d4wsajl34ymj77qmpm41138g2ysf2"))
(modules '((guix build utils)))
(snippet
'(begin
@@ -326,6 +326,10 @@ do so.")
("python-requests" ,python-requests)
("python-qrcode" ,python-qrcode)
("python-protobuf" ,python-protobuf)
+ ("python-aiohttp" ,python-aiohttp)
+ ("python-aiohttp-socks" ,python-aiohttp-socks)
+ ("python-aiorpcx" ,python-aiorpcx)
+ ("python-certifi" ,python-certifi)
("python-dnspython" ,python-dnspython)
("python-jsonrpclib-pelix" ,python-jsonrpclib-pelix)))
(arguments
@@ -350,18 +354,18 @@ other machines/servers. Electrum does not download the Bitcoin blockchain.")
(package
(inherit electrum)
(name "electron-cash")
- (version "3.3.4")
+ (version "3.3.5")
(source
(origin
(method url-fetch)
(uri (string-append "https://electroncash.org/downloads/"
version
- "/win-linux/ElectronCash-"
+ "/win-linux/Electron-Cash-"
version
".tar.gz"))
(sha256
(base32
- "0ipl6vf2n9a5n556sx2z57s7wdvg05xwjvz67kff9nmbx4s8vjyf"))
+ "185z3c5j9nvl31ga80hvahx7ghvkgmqgfjrrzw1fbs6p9jxy007w"))
(modules '((guix build utils)))
(snippet
'(begin
@@ -679,14 +683,14 @@ Ledger Blue/Nano S.")
(define-public python-trezor
(package
(name "python-trezor")
- (version "0.10.2")
+ (version "0.11.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "trezor" version))
(sha256
(base32
- "138k6zsqqpb46k3rcpyslm9q7yq5i6k4myvr9n425jnkadf4vfjd"))))
+ "064yds8f4px0c6grkkanpdjx022g4q87ihzhkmdv9qanv0hz6hv0"))))
(build-system python-build-system)
(arguments
`(#:phases
@@ -694,21 +698,23 @@ Ledger Blue/Nano S.")
;; Default tests run device-specific tests which fail, only run specific tests.
(replace 'check
(lambda* (#:key inputs outputs #:allow-other-keys)
- (invoke "python" "-m" "pytest" "--pyarg" "trezorlib.tests.unit_tests")
- (invoke "python" "-m" "pytest" "-m" "slow_cosi" "--pyarg" "trezorlib.tests.unit_tests")
- )))))
+ ;; Delete tests that require network access.
+ (delete-file "trezorlib/tests/unit_tests/test_tx_api.py")
+ (invoke "python" "-m" "pytest" "--pyarg" "trezorlib.tests.unit_tests"))))))
(propagated-inputs
`(("python-click" ,python-click)
+ ("python-construct" ,python-construct)
("python-ecdsa" ,python-ecdsa)
- ("python-hidapi" ,python-hidapi)
("python-libusb1" ,python-libusb1)
("python-mnemonic" ,python-mnemonic)
- ("python-protobuf" ,python-protobuf)
("python-pyblake2" ,python-pyblake2)
("python-requests" ,python-requests)
- ("python-typing" ,python-typing)))
+ ("python-typing-extensions" ,python-typing-extensions)))
(native-inputs
- `(("python-mock" ,python-mock) ; Tests
+ `(("protobuf" ,protobuf) ; Tests
+ ("python-black" ,python-black) ; Tests
+ ("python-protobuf" ,python-protobuf) ; Tests
+ ("python-isort" ,python-isort) ; Tests
("python-pyqt" ,python-pyqt) ; Tests
("python-pytest" ,python-pytest))) ; Tests
(home-page "https://github.com/trezor/python-trezor")
@@ -723,14 +729,14 @@ TREZOR Hardware Wallet.")
(define-public python-keepkey
(package
(name "python-keepkey")
- (version "4.0.2")
+ (version "6.0.2")
(source
(origin
(method url-fetch)
(uri (pypi-uri "keepkey" version))
(sha256
(base32
- "0f4iqqjlqmamw4mhyhik4qlb5bnfd10wbjw9yzgir105wh5fdpnd"))))
+ "16j8hnxj9r4b2w6kfncmny09pb1al8ppmn59qxzl3qmh1xhpy45g"))))
(build-system python-build-system)
(arguments
`(#:phases
@@ -743,6 +749,7 @@ TREZOR Hardware Wallet.")
(propagated-inputs
`(("python-ecdsa" ,python-ecdsa)
("python-hidapi" ,python-hidapi)
+ ("python-libusb1" ,python-libusb1)
("python-mnemonic" ,python-mnemonic)
("python-protobuf" ,python-protobuf)))
(home-page "https://github.com/keepkey/python-keepkey")
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 7c497ccc75..f01ea8cbb4 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -148,14 +148,14 @@ freedesktop.org project.")
(define-public libinput
(package
(name "libinput")
- (version "1.12.3")
+ (version "1.12.6")
(source (origin
(method url-fetch)
(uri (string-append "https://freedesktop.org/software/libinput/"
name "-" version ".tar.xz"))
(sha256
(base32
- "0mg2zqbjcgj0aq7d9nwawvyhx43vakilahrc83hrfyif3a3gyrpj"))))
+ "0pgla0mc6mvyr1ljy10mcqvfz8i5z6yp7dbx2bcd70y67wx05d0j"))))
(build-system meson-build-system)
(arguments
`(#:configure-flags '("-Ddocumentation=false")))
diff --git a/gnu/packages/gdb.scm b/gnu/packages/gdb.scm
index 74eb0f8994..e9df33e3fc 100644
--- a/gnu/packages/gdb.scm
+++ b/gnu/packages/gdb.scm
@@ -37,14 +37,14 @@
(define-public gdb
(package
(name "gdb")
- (version "8.2")
+ (version "8.2.1")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/gdb/gdb-"
version ".tar.xz"))
(sha256
(base32
- "0fbw6j4z7kmvywwgavn7w3knp860i5i9qnjffc5p52bwkji43963"))))
+ "00i27xqawjv282a07i73lp1l02n0a3ywzhykma75qg500wll6sha"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; FIXME "make check" fails on single-processor systems.
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 850bfcf5e9..b05b2d7879 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -1182,7 +1182,7 @@ XML/CSS rendering engine.")
(define-public libgsf
(package
(name "libgsf")
- (version "1.14.44")
+ (version "1.14.45")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
@@ -1190,7 +1190,7 @@ XML/CSS rendering engine.")
name "-" version ".tar.xz"))
(sha256
(base32
- "1ppzfk3zmmgrg9jh8vc4dacddbfngjslq2wpj94pcr3i0c8dxgk8"))))
+ "1yk91ccf7z9b8d8ac6vip3gc5c0pkwgabqy6l0pj0kf43l7jrg2w"))))
(build-system gnu-build-system)
(native-inputs
`(("intltool" ,intltool)
diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm
index 1f299a2b13..8d87b580fb 100644
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@ -442,7 +442,7 @@ in the Mozilla clients.")
(define-public nss
(package
(name "nss")
- (version "3.41")
+ (version "3.42.1")
(source (origin
(method url-fetch)
(uri (let ((version-with-underscores
@@ -453,7 +453,7 @@ in the Mozilla clients.")
"nss-" version ".tar.gz")))
(sha256
(base32
- "0bbif42fzz5gk451sv3yphdrl7m4p6zgk5jk0307j06xs3sihbmb"))
+ "1ihzqspvqjmysp1c15xxr7kqvj3zm9dqnanxhkaxyjgx71yv6z88"))
;; Create nss.pc and nss-config.
(patches (search-patches "nss-pkgconfig.patch"
"nss-increase-test-timeout.patch"))))
@@ -501,7 +501,7 @@ in the Mozilla clients.")
;; leading to test failures:
;; <https://bugzilla.mozilla.org/show_bug.cgi?id=609734>. To
;; work around that, set the time to roughly the release date.
- (invoke "faketime" "2018-12-01" "./nss/tests/all.sh")))
+ (invoke "faketime" "2019-02-01" "./nss/tests/all.sh")))
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
diff --git a/gnu/packages/groovy.scm b/gnu/packages/groovy.scm
index aaa524b1ba..f5d0416f36 100644
--- a/gnu/packages/groovy.scm
+++ b/gnu/packages/groovy.scm
@@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2018 Julien Lepiller <julien@lepiller.eu>
+;;; Copyright © 2019 Tobias Geerinck-Rice <me@tobias.gr>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -20,6 +21,7 @@
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
#:use-module (guix download)
+ #:use-module (guix git-download)
#:use-module (guix utils)
#:use-module (guix build-system ant)
#:use-module (gnu packages)
@@ -30,18 +32,20 @@
(package
(name "java-groovy-bootstrap")
(version "2.4.15")
- (source (origin
- (method url-fetch)
- (uri (string-append "https://github.com/apache/groovy/archive/GROOVY_"
- (string-map (lambda (x) (if (eq? x #\.) #\_ x)) version)
- ".tar.gz"))
- (file-name (string-append name "-" version ".tar.gz"))
- (sha256
- (base32
- "19f3yd2z6jmz1xhwi5kkg1wmgbqkfs7qvd3rzb43xr3nffz8cisv"))
- (patches
- (search-patches
- "groovy-add-exceptionutilsgenerator.patch"))))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/apache/groovy.git")
+ (commit (string-append
+ "GROOVY_"
+ (string-map (lambda (x) (if (eq? x #\.) #\_ x))
+ version)))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1q4cplimr18j93zz92kgq8b6wdv0p9svr7cdr47q8b2mbjpd0x3j"))
+ (patches
+ (search-patches "groovy-add-exceptionutilsgenerator.patch"))))
(build-system ant-build-system)
(arguments
`(#:jar-name "groovy.jar"
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index b8377ff514..93b9ba09fe 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -693,7 +693,7 @@ application suites.")
(name "gtk+")
;; NOTE: When updating the version of 'gtk+', the hash of 'mate-themes' in
;; mate.scm will also need to be updated.
- (version "3.24.2")
+ (version "3.24.5")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
@@ -701,7 +701,7 @@ application suites.")
name "-" version ".tar.xz"))
(sha256
(base32
- "14l8mimdm44r3h5pn5hzigl1z25jna8jxvb16l88v4nc4zj0afsv"))
+ "0bxhvnixc1hjxbzx063lghmix0wmv282khsqmckdxhrb606zpr8b"))
(patches (search-patches "gtk3-respect-GUIX_GTK3_PATH.patch"
"gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch"))
(modules '((guix build utils)))
diff --git a/gnu/packages/imagemagick.scm b/gnu/packages/imagemagick.scm
index dafe8c76ed..0207eb6569 100644
--- a/gnu/packages/imagemagick.scm
+++ b/gnu/packages/imagemagick.scm
@@ -48,14 +48,14 @@
;; The 7 release series has an incompatible API, while the 6 series is still
;; maintained. Don't update to 7 until we've made sure that the ImageMagick
;; users are ready for the 7-series API.
- (version "6.9.10-16")
+ (version "6.9.10-27")
(source (origin
(method url-fetch)
(uri (string-append "mirror://imagemagick/ImageMagick-"
version ".tar.xz"))
(sha256
(base32
- "1ylbv69r8l3d4za4i8q41cs6lq06mnhiq4qm03rvs3vp3gyp1m9x"))))
+ "1skngh58lkpa2scc9rhjxvhyn6f7nlwd28hbwrxzlvvb7qil9jcq"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags '("--with-frozenpaths" "--without-gcc-arch")
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index f3b5476f2d..d7c242015e 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -457,8 +457,8 @@ It has been modified to remove all non-free binary blobs.")
#:configuration-file kernel-config))
(define-public linux-libre-4.4
- (make-linux-libre "4.4.173"
- "1iy8qzjvcssf7ppb590lqzhb01ap2fjqv9iam691q1d4r8vmgcsh"
+ (make-linux-libre "4.4.174"
+ "1njd50yc180aarpd5crss3wn0n82lhxbyjrifsm647f3dfjhyvjb"
'("x86_64-linux" "i686-linux")
#:configuration-file kernel-config))
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 7d3ac773b3..34c72dadad 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -2930,7 +2930,7 @@ parts of it.")
(define-public openblas
(package
(name "openblas")
- (version "0.3.4")
+ (version "0.3.5")
(source
(origin
(method url-fetch)
@@ -2939,7 +2939,7 @@ parts of it.")
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
- "1s56lgilyyw86dzmj3jkci9zsg24n60wq4d0zri1hrxlxb6ihimj"))))
+ "062kg4ny1ywz7k5grpb4pbf0hba0w6manbajwkmv4f477a31sxpl"))))
(build-system gnu-build-system)
(arguments
`(#:test-target "test"
diff --git a/gnu/packages/ninja.scm b/gnu/packages/ninja.scm
index 5a168a6ada..0791abe764 100644
--- a/gnu/packages/ninja.scm
+++ b/gnu/packages/ninja.scm
@@ -30,7 +30,7 @@
(define-public ninja
(package
(name "ninja")
- (version "1.8.2")
+ (version "1.9.0")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/martine/ninja/"
@@ -38,7 +38,7 @@
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
- "1x66q6494ml1p1f74mxzik1giakl4zj7rxig9jsc50087l671f46"))))
+ "1ffmzj5s9h98qhl94d9i23zcv057rsqbac9g1hdgvlzq51ccfzjx"))))
(build-system gnu-build-system)
(native-inputs `(("python" ,python-2)))
(arguments
diff --git a/gnu/packages/patches/emacs-pdf-tools-poppler.patch b/gnu/packages/patches/emacs-pdf-tools-poppler.patch
deleted file mode 100644
index 0477508fa9..0000000000
--- a/gnu/packages/patches/emacs-pdf-tools-poppler.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Fix build issue with recent Poppler:
- <https://github.com/politza/pdf-tools/issues/372>.
-
-This combines upstream commits
-6cd76dec9aece2a8daa90f17ab77fbf773157a1d..50a5297b82e26cfd52f6c00645ddc1057099d6a7
-for this file.
-
-diff --git a/server/poppler-hack.cc b/server/poppler-hack.cc
-index 0c62f73..427f9df 100644
---- a/server/poppler-hack.cc
-+++ b/server/poppler-hack.cc
-@@ -51,7 +51,10 @@ GType poppler_annot_markup_get_type (void) G_GNUC_CONST;
- double y2;
- };
-
-- char *_xpoppler_goo_string_to_utf8(GooString *s)
-+ // This function does not modify its argument s, but for
-+ // compatibility reasons (e.g. getLength in GooString.h before 2015)
-+ // with older poppler code, it can't be declared as such.
-+ char *_xpoppler_goo_string_to_utf8(/* const */ GooString *s)
- {
- char *result;
-
-@@ -85,7 +88,7 @@ GType poppler_annot_markup_get_type (void) G_GNUC_CONST;
- // Set the rectangle of an annotation. It was first added in v0.26.
- void xpoppler_annot_set_rectangle (PopplerAnnot *a, PopplerRectangle *rectangle)
- {
-- GooString *state = a->annot->getAppearState ();
-+ GooString *state = (GooString*) a->annot->getAppearState ();
- char *ustate = _xpoppler_goo_string_to_utf8 (state);
-
- a->annot->setRect (rectangle->x1, rectangle->y1,
-@@ -105,7 +108,7 @@ GType poppler_annot_markup_get_type (void) G_GNUC_CONST;
- g_return_val_if_fail (POPPLER_IS_ANNOT_MARKUP (poppler_annot), NULL);
-
- annot = static_cast<AnnotMarkup *>(POPPLER_ANNOT (poppler_annot)->annot);
-- text = annot->getDate ();
-+ text = (GooString*) annot->getDate ();
-
- return text ? _xpoppler_goo_string_to_utf8 (text) : NULL;
- }
diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index 33bd0062ff..504e69c769 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -663,14 +663,14 @@ line tools for batch rendering @command{pdfdraw}, rewriting files
(define-public qpdf
(package
(name "qpdf")
- (version "8.2.1")
+ (version "8.4.0")
(source (origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/qpdf/qpdf/" version
"/qpdf-" version ".tar.gz"))
(sha256
(base32
- "1jdb0jj72fjdp6xip4m7yz31r5x13zs7h4smnxsycgw3vbmx6igl"))
+ "1864p952m8vzxk6v500a42psbqj2g2gyli3d3zj6h33hzwxqy09r"))
(modules '((guix build utils)))
(snippet
;; Replace shebang with the bi-lingual shell/Perl trick to remove
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 97b1f06611..afec5ebc30 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -27,6 +27,7 @@
;;; Copyright © 2018 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2018 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2018 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2019 Vagrant Cascadian <vagrant@debian.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -102,6 +103,26 @@ Callback Hell.
@end itemize")
(license license:asl2.0)))
+(define-public python-aiohttp-socks
+ (package
+ (name "python-aiohttp-socks")
+ (version "0.2.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "aiohttp_socks" version))
+ (sha256
+ (base32
+ "0473702jk66xrgpm28wbdgpnak4v0dh2qmdjw7ky7hf3lwwqkggf"))))
+ (build-system python-build-system)
+ (propagated-inputs
+ `(("python-aiohttp" ,python-aiohttp)))
+ (home-page "https://github.com/romis2012/aiohttp-socks")
+ (synopsis "SOCKS proxy connector for aiohttp")
+ (description "This package provides a SOCKS proxy connector for
+aiohttp. It supports SOCKS4(a) and SOCKS5.")
+ (license license:asl2.0)))
+
(define-public python-aiodns
(package
(name "python-aiodns")
@@ -125,6 +146,31 @@ asynchronous DNS resolutions with a synchronous looking interface by
using @url{https://github.com/saghul/pycares,pycares}.")
(license license:expat)))
+(define-public python-aiorpcx
+ (package
+ (name "python-aiorpcx")
+ (version "0.10.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "aiorpcX" version))
+ (sha256
+ (base32
+ "1p88k15jh0d2a18pnnbfcamsqi2bxvmmhpizmdlxfdxf8vy5ggyj"))))
+ (build-system python-build-system)
+ (propagated-inputs
+ `(("python-attrs" ,python-attrs)))
+ (home-page "https://github.com/kyuupichan/aiorpcX")
+ (synopsis "Generic asyncio RPC implementation")
+ (description
+ "aiorpcX is a generic asyncio library implementation of RPC suitable for
+an application that is a client, server or both.
+
+The package includes a module with full coverage of JSON RPC versions 1.0 and
+2.0, JSON RPC protocol auto-detection, and arbitrary message framing. It also
+comes with a SOCKS proxy client.")
+ (license (list license:expat license:bsd-2))))
+
(define-public python-falcon
(package
(name "python-falcon")
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index b4ebf46d1f..9545321461 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -138,6 +138,7 @@
#:use-module (gnu packages xdisorg)
#:use-module (gnu packages tcl)
#:use-module (gnu packages bdw-gc)
+ #:use-module (gnu packages serialization)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix git-download)
@@ -13390,6 +13391,43 @@ and other tools.")
(define-public python2-typing
(package-with-python2 python-typing))
+(define-public python-typing-extensions
+ (package
+ (name "python-typing-extensions")
+ (version "3.7.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "typing_extensions" version))
+ (sha256
+ (base32
+ "0wfsv71pvkyf2na938l579jh0v3kzl6g744ijgnahcwd4d9x0b7v"))))
+ (build-system python-build-system)
+ (home-page
+ "https://github.com/python/typing/blob/master/typing_extensions/README.rst")
+ (synopsis "Experimental type hints for Python")
+ (description
+ "The typing_extensions module contains additional @code{typing} hints not
+yet present in the of the @code{typing} standard library.
+Included are implementations of:
+@enumerate
+@item ClassVar
+@item ContextManager
+@item Counter
+@item DefaultDict
+@item Deque
+@item NewType
+@item NoReturn
+@item overload
+@item Protocol
+@item runtime
+@item Text
+@item Type
+@item TYPE_CHECKING
+@item AsyncGenerator
+@end enumerate\n")
+ (license license:psfl)))
+
(define-public bpython
(package
(name "bpython")
@@ -14725,3 +14763,33 @@ in doctests.")
(description "Simple decorator to set attributes of target function or
class in a @acronym{DRY, Don't Repeat Yourself} way.")
(license license:expat)))
+
+(define-public python-construct
+ (package
+ (name "python-construct")
+ (version "2.9.45")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "construct" version))
+ (sha256
+ (base32
+ "130iy05awzigm2xah2yvlmb08mac5bi4gzr5m3g7k1krs3ps0w92"))))
+ (build-system python-build-system)
+ (arguments
+ `(#:tests? #f)) ; No tests exist.
+ (propagated-inputs
+ `(("python-extras" ,python-extras)
+ ("python-arrow" ,python-arrow)
+ ("python-numpy" ,python-numpy)
+ ("python-ruamel.yaml" ,python-ruamel.yaml)))
+ (home-page "http://construct.readthedocs.io")
+ (synopsis "Declarative and symmetrical parser and builder for binary data")
+ (description
+ "This package provides both simple, atomic constructs (such as
+integers of various sizes), as well as composite ones which allow you
+form hierarchical and sequential structures of increasing complexity.
+It features bit and byte granularity, easy debugging and testing, an
+easy-to-extend subclass system, and lots of primitive constructs to
+make your work easier.")
+ (license license:expat)))
diff --git a/gnu/packages/spice.scm b/gnu/packages/spice.scm
index 6a580c6226..77939bc8a8 100644
--- a/gnu/packages/spice.scm
+++ b/gnu/packages/spice.scm
@@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016 David Craven <david@craven.ch>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2019 Rutger Helling <rhelling@mykolab.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -113,6 +114,22 @@ which allows users to view a desktop computing environment.")
(home-page "https://www.spice-space.org")
(license (list license:bsd-3 license:lgpl2.1+))))
+;; TODO: Package lookingglass doesn't build with spice-protocol 0.12.15. Remove
+;; below once that is fixed.
+(define-public spice-protocol-0.12.14
+ (package
+ (inherit spice-protocol)
+ (name "spice-protocol")
+ (version "0.12.14")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://www.spice-space.org/download/releases/"
+ "spice-protocol-" version ".tar.bz2"))
+ (sha256
+ (base32
+ "170ckpgazvqv7hxy209myg67pqnd6c0gvr4ysbqgsfch6320nd90"))))))
+
(define-public spice-gtk
(package
(name "spice-gtk")
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 5aab6bc396..3b3b256e92 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -627,7 +627,7 @@ libebml is a C++ library to read and write EBML files.")
(define-public libva
(package
(name "libva")
- (version "2.3.0")
+ (version "2.4.0")
(source
(origin
(method url-fetch)
@@ -639,7 +639,7 @@ libebml is a C++ library to read and write EBML files.")
(string-append "https://www.freedesktop.org/software/vaapi/releases/"
"libva/libva-" version "/libva-" version ".tar.bz2")))
(sha256
- (base32 "1r6wiw4k044cpb39rfqqdw6qmzw0268whpz124hywck9v980x130"))))
+ (base32 "14ckq67z3pcd7jrnrm3ckss440g6dzp2m0ff5rps54qmq9b309lr"))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)))
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index 04165a9b8c..f5e4540329 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -5,7 +5,7 @@
;;; Copyright © 2016, 2017 Ricardo Wurmus <rekado@elephly.net>
;;; 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, 2019 Rutger Helling <rhelling@mykolab.com>
;;; 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>
@@ -815,7 +815,7 @@ Machine Protocol.")
("openssl" ,openssl)
("sdl2" ,sdl2)
("sdl2-ttf" ,sdl2-ttf)
- ("spice-protocol" ,spice-protocol)))
+ ("spice-protocol" ,spice-protocol-0.12.14)))
(native-inputs `(("libconfig" ,libconfig)
("nettle" ,nettle)
("pkg-config" ,pkg-config)))
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 45ea77ad36..158d542d7f 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -16,7 +16,7 @@
;;; Copyright © 2016 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2016, 2017 Nils Gillmann <ng0@n0.is>
;;; Copyright © 2016, 2017, 2018, 2019 Arun Isaac <arunisaac@systemreboot.net>
-;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2016, 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2016 Bake Timmons <b3timmons@speedymail.org>
;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
;;; Copyright © 2017, 2018 Marius Bakke <mbakke@fastmail.com>
@@ -4877,15 +4877,17 @@ additional capabilities.")
(version "2.3.15")
(source
(origin
- (method url-fetch)
- (uri
- (string-append "https://github.com/xinetd-org/xinetd/archive/xinetd-"
- (string-join (string-split version #\.) "-") ".tar.gz"))
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/xinetd-org/xinetd.git")
+ (commit (string-append "xinetd-"
+ (string-join (string-split version #\.)
+ "-")))))
+ (file-name (git-file-name name version))
(patches (search-patches "xinetd-CVE-2013-4342.patch"
"xinetd-fix-fd-leak.patch"))
(sha256
- (base32
- "0k59x52cbzp5fw0n8zn0y54j1ps0x9b72y8k5grzswjdmgs2a2v2"))))
+ (base32 "0wjai6qagcgxpa1khh639ih7kswgkryc7ll1i4hxhs29sc7irdcn"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags '("--with-loadavg")
diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index 5f01c8c6a6..7613accb4f 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -164,14 +164,14 @@ avoiding password prompts when X11 forwarding has already been setup.")
(define-public libxkbcommon
(package
(name "libxkbcommon")
- (version "0.8.2")
+ (version "0.8.3")
(source (origin
(method url-fetch)
(uri (string-append "https://xkbcommon.org/download/" name "-"
version ".tar.xz"))
(sha256
(base32
- "136mdq11lrwg6rjmm44lmysxxgb9c35p4sq6k0cd129x82rw9f3s"))))
+ "0h2mh8j21xvf1h3kz81q1pvkd9j9nzb9kbd46ncap5wshhlwcmdq"))))
(build-system gnu-build-system)
(inputs
`(("libx11" ,libx11)
diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm
index 322fc4ec3e..3a4cf01c7d 100644
--- a/gnu/packages/xml.scm
+++ b/gnu/packages/xml.scm
@@ -55,6 +55,7 @@
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
#:use-module (guix download)
+ #:use-module (guix git-download)
#:use-module (guix build-system ant)
#:use-module (guix build-system cmake)
#:use-module (guix build-system gnu)
@@ -1101,16 +1102,16 @@ C++ programming language.")
(version "4.0.1")
(source
(origin
- (method url-fetch)
- (uri (string-append "https://github.com/leethomason/tinyxml2/archive/"
- version ".tar.gz"))
- (file-name (string-append name "-" version ".tar.gz"))
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/leethomason/tinyxml2.git")
+ (commit version)))
+ (file-name (git-file-name name version))
(sha256
- (base32
- "083z4r4khcndxi9k840lcr48sqxvar4gpsnf749xfdn1bkr8xcql"))))
+ (base32 "1a0skfi8rzk53qcxbv88qlvhlqzvsvg4hm20dnx4zw7vrn6anr9y"))))
(build-system cmake-build-system)
(arguments
- `(#:tests? #f)) ; no tests
+ `(#:tests? #f)) ; no tests
(synopsis "Small XML parser for C++")
(description "TinyXML2 is a small and simple XML parsing library for the
C++ programming language.")
@@ -1209,25 +1210,25 @@ elements to their parents
(define-public xlsx2csv
(package
(name "xlsx2csv")
- (version "0.7.2")
- (source (origin
- (method url-fetch)
- (uri (string-append
- "https://github.com/dilshod/"
- name "/archive/release/" version ".tar.gz"))
- (file-name (string-append name "-" version ".tar.gz"))
- (sha256
- (base32
- "1gpn6kaa7l1ai8c9zx2j3acf04bvxq79pni8jjfjrk01smjbyyql"))))
+ (version "0.7.4")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/dilshod/xlsx2csv.git")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "168dm6p7w6pvgd87yb9hcxv9y0liv6mxgril202nfva68cp8y939"))))
(build-system python-build-system)
(arguments
- `(#:python ,python-2 ; Use python-2 for the test script.
+ `(#:python ,python-2 ; use python-2 for the test script
#:phases
(modify-phases %standard-phases
(replace 'check
(lambda _
(substitute* "test/run"
- ;; Run tests with `python' only
+ ;; Run tests with `python' only.
(("^(PYTHON_VERSIONS = ).*" all m) (string-append m "['']")))
(invoke "test/run"))))))
(home-page "https://github.com/dilshod/xlsx2csv")
@@ -1656,12 +1657,14 @@ with XPath too.")
(name "java-xom")
(version "127")
(source (origin
- (method url-fetch)
- (uri (string-append "https://github.com/elharo/xom/archive/XOM_"
- version ".tar.gz"))
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/elharo/xom.git")
+ (commit (string-append "XOM_" version))))
+ (file-name (git-file-name name version))
(sha256
(base32
- "04m69db1irqja12a9rfxrac8cbn9psqa1k136wh4ls4pxfsdr5wg"))
+ "1jh6y03g5zzdhsb5jm6ms1xnamr460qmn96y3w6aw0ikfwqlg0bq"))
(modules '((guix build utils)))
(snippet
'(begin
@@ -1672,9 +1675,13 @@ with XPath too.")
(arguments
`(#:jar-name "xom.jar"
#:jdk ,icedtea-8
- #:tests? #f; no tests
+ #:tests? #f ; no tests
#:phases
(modify-phases %standard-phases
+ (add-after 'unpack 'make-git-checkout-writable
+ (lambda _
+ (for-each make-file-writable (find-files "."))
+ #t))
(add-before 'configure 'fix-tagsoup-dep
(lambda _
;; FIXME: Where is tagsoup source?
@@ -1788,13 +1795,14 @@ package is in maintenance mode.")
(name "java-dom4j")
(version "2.1.0")
(source (origin
- (method url-fetch)
- (uri (string-append "https://github.com/dom4j/dom4j/archive/"
- "version-" version ".tar.gz"))
- (file-name (string-append name "-" version ".tar.gz"))
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/dom4j/dom4j.git")
+ (commit (string-append "version-" version))))
+ (file-name (git-file-name name version))
(sha256
(base32
- "101drpnw6agmcvsi1jrfi0kn97r7liazrh5jbrip9vx26axn2fx9"))
+ "1827jljs8mps489fm7xw63cakdqwc5grilrr5n9spr2rlk76jpx3"))
(modules '((guix build utils)))
(snippet
'(begin ;; Delete bundled jar archives.
@@ -1860,13 +1868,14 @@ low memory footprint.")
(name "java-kxml2")
(version "2.4.2")
(source (origin
- (method url-fetch)
- (uri (string-append "https://github.com/stefanhaustein/kxml2/archive/v"
- version ".tar.gz"))
- (file-name (string-append name "-" version ".tar.gz"))
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/stefanhaustein/kxml2.git")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
(sha256
(base32
- "17kh04qf3vll1xx6sv06xlazw2hxa8qdmzyday9r6z2191jlj74w"))))
+ "0g6d8c9r9sh3x04sf4wdpgwvhkqvk11k3kq9skx91i60h4vn01hg"))))
(build-system ant-build-system)
(arguments
`(#:jar-name "kxml2.jar"
@@ -1877,6 +1886,10 @@ low memory footprint.")
#:tests? #f
#:phases
(modify-phases %standard-phases
+ (add-after 'unpack 'make-git-checkout-writable
+ (lambda _
+ (for-each make-file-writable (find-files "."))
+ #t))
(add-before 'build 'copy-resources
(lambda _
(copy-recursively "src/main/resources" "build/classes")
@@ -1929,12 +1942,14 @@ and from a Java application. It provides a standard pull parser interface.")
(name "java-jettison")
(version "1.3.7")
(source (origin
- (method url-fetch)
- (uri (string-append "https://github.com/codehaus/jettison/archive/"
- "jettison-" version ".tar.gz"))
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/codehaus/jettison.git")
+ (commit (string-append "jettison-" version))))
+ (file-name (git-file-name name version))
(sha256
(base32
- "0rdhfyxywvga5wiwasc04iqnxyixn3rd8wj01c9ymhvwc3h6dpqg"))))
+ "15sydmi5chdh4126qc7v8bsrp7fp4ldaya8a05iby4pq2324q0qw"))))
(build-system ant-build-system)
(arguments
`(#:jar-name "jettison.jar"
@@ -1959,16 +1974,18 @@ implements @code{XMLStreamWriter} and @code{XMLStreamReader} and supports
(name "java-jdom")
(version "2.0.6")
(source (origin
- (method url-fetch)
- (uri (string-append "https://github.com/hunterhacker/jdom/archive/JDOM-"
- version ".tar.gz"))
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/hunterhacker/jdom.git")
+ (commit (string-append "JDOM-" version))))
+ (file-name (git-file-name name version))
(sha256
(base32
- "0p8n7inqq2a25wk9ljinl3ixlx1x2la9qaman8ngd75xxjb02yc1"))))
+ "14vv1kxrsdvwi4cz3rx6r48w5y6fvk9cymil8qhvxwp56xxrgxiq"))))
(build-system ant-build-system)
(arguments
`(#:build-target "package"
- #:tests? #f; tests are run as part of the build process
+ #:tests? #f ; tests are run as part of the build process
#:phases
(modify-phases %standard-phases
(replace 'install
@@ -1983,20 +2000,22 @@ outputting XML data from Java code.")
(package
(name "java-xstream")
(version "1.4.10")
- (source (origin
- (method url-fetch)
- (uri (string-append
- "https://github.com/x-stream/xstream/archive/XSTREAM_"
- (string-map (lambda (x) (if (eq? x #\.) #\_ x)) version)
- ".tar.gz"))
- (file-name (string-append name "-" version ".tar.gz"))
- (sha256
- (base32
- "10zbkam05wirxipvgrjimdwsyqrwl4a0n7lhvxbsssqpv727469g"))))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/x-stream/xstream.git")
+ (commit (string-append
+ "XSTREAM_"
+ (string-map (lambda (x) (if (eq? x #\.) #\_ x))
+ version)))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "12m2bw8bapdc1w0pni9wl5hh2y8jfdgcvxd464jl9917dsp3ai2n"))))
(build-system ant-build-system)
(arguments
`(#:jar-name "xstream.jar"
- ;; FIXME: Tests are not in a java subdirectory as assumed by ant-build-system
+ ;; FIXME: Tests are not in a java subdirectory as assumed by ant-build-system.
#:tests? #f
#:jdk ,icedtea-8
#:source-dir "xstream/src/java"))
diff --git a/gnu/system/install.scm b/gnu/system/install.scm
index 880a8be32d..0ba2066d11 100644
--- a/gnu/system/install.scm
+++ b/gnu/system/install.scm
@@ -36,6 +36,7 @@
#:use-module (gnu packages admin)
#:use-module (gnu packages bash)
#:use-module (gnu packages bootloaders)
+ #:use-module (gnu packages certs)
#:use-module (gnu packages fonts)
#:use-module (gnu packages fontutils)
#:use-module (gnu packages guile)
@@ -409,6 +410,7 @@ You have been warned. Thanks for being so brave.\x1b[0m
;; available here, so we keep that.
bash-completion
nvi ;:wq!
+ nss-certs ; To access HTTPS, use git, etc.
%base-packages))))
(define* (os-with-u-boot os board #:key (bootloader-target "/dev/mmcblk0")