aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2020-03-04 12:04:42 +0100
committerMarius Bakke <mbakke@fastmail.com>2020-03-04 12:04:42 +0100
commite32aea5472007507e62933b27a4db9a50810e5dc (patch)
tree55ccbe4ed5baf1fd2689b16d7108da8f7be857a9
parentfb98351621a6b311d4ff9593d6c22d40a3b3fe8f (diff)
parentd46f9f833b190aac04f7f4683b84a06a291a3f8f (diff)
downloadguix-e32aea5472007507e62933b27a4db9a50810e5dc.tar
guix-e32aea5472007507e62933b27a4db9a50810e5dc.tar.gz
Merge branch 'master' into staging
-rw-r--r--gnu/build/file-systems.scm2
-rw-r--r--gnu/build/linux-boot.scm4
-rw-r--r--gnu/local.mk3
-rw-r--r--gnu/packages/admin.scm4
-rw-r--r--gnu/packages/audio.scm4
-rw-r--r--gnu/packages/bioinformatics.scm7
-rw-r--r--gnu/packages/chicken.scm7
-rw-r--r--gnu/packages/chromium.scm13
-rw-r--r--gnu/packages/compression.scm8
-rw-r--r--gnu/packages/cran.scm4
-rw-r--r--gnu/packages/crates-io.scm140
-rw-r--r--gnu/packages/databases.scm2
-rw-r--r--gnu/packages/disk.scm19
-rw-r--r--gnu/packages/django.scm4
-rw-r--r--gnu/packages/dns.scm2
-rw-r--r--gnu/packages/documentation.scm25
-rw-r--r--gnu/packages/elixir.scm4
-rw-r--r--gnu/packages/emacs-xyz.scm84
-rw-r--r--gnu/packages/erlang.scm6
-rw-r--r--gnu/packages/fontutils.scm62
-rw-r--r--gnu/packages/games.scm5
-rw-r--r--gnu/packages/geo.scm8
-rw-r--r--gnu/packages/gnome.scm41
-rw-r--r--gnu/packages/golang.scm4
-rw-r--r--gnu/packages/java.scm16
-rw-r--r--gnu/packages/linux.scm46
-rw-r--r--gnu/packages/lisp.scm4
-rw-r--r--gnu/packages/mail.scm10
-rw-r--r--gnu/packages/patches/zziplib-CVE-2018-16548.patch49
-rw-r--r--gnu/packages/perl.scm24
-rw-r--r--gnu/packages/python-web.scm2
-rw-r--r--gnu/packages/python-xyz.scm10
-rw-r--r--gnu/packages/rdf.scm6
-rw-r--r--gnu/packages/shells.scm8
-rw-r--r--gnu/packages/unicode.scm26
-rw-r--r--gnu/packages/version-control.scm8
-rw-r--r--gnu/packages/vim.scm303
-rw-r--r--gnu/packages/vpn.scm36
-rw-r--r--gnu/packages/wine.scm38
-rw-r--r--gnu/services/herd.scm9
-rw-r--r--gnu/system.scm15
-rw-r--r--gnu/system/file-systems.scm15
-rw-r--r--gnu/system/vm.scm8
-rw-r--r--guix/scripts/system.scm7
44 files changed, 690 insertions, 412 deletions
diff --git a/gnu/build/file-systems.scm b/gnu/build/file-systems.scm
index ee6375515f..902563b219 100644
--- a/gnu/build/file-systems.scm
+++ b/gnu/build/file-systems.scm
@@ -5,6 +5,7 @@
;;; Copyright © 2019 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 David C. Trudgian <dave@trudgian.net>
+;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -581,6 +582,7 @@ were found."
((string-prefix? "btrfs" type) check-btrfs-file-system)
((string-suffix? "fat" type) check-fat-file-system)
((string-prefix? "jfs" type) check-jfs-file-system)
+ ((string-prefix? "nfs" type) (const 'pass))
(else #f)))
(if check-procedure
diff --git a/gnu/build/linux-boot.scm b/gnu/build/linux-boot.scm
index 3d40a7d05d..4fb711b8f2 100644
--- a/gnu/build/linux-boot.scm
+++ b/gnu/build/linux-boot.scm
@@ -362,12 +362,12 @@ the last argument of `mknod'."
"Mount the root file system of type TYPE at device ROOT. If VOLATILE-ROOT? is
true, mount ROOT read-only and make it an overlay with a writable tmpfs using
the kernel built-in overlayfs. FLAGS and OPTIONS indicates the options to use
-to mount ROOT."
+to mount ROOT, and behave the same as for the `mount' procedure."
(if volatile-root?
(begin
(mkdir-p "/real-root")
- (mount root "/real-root" type MS_RDONLY options)
+ (mount root "/real-root" type (logior MS_RDONLY flags) options)
(mkdir-p "/rw-root")
(mount "none" "/rw-root" "tmpfs")
diff --git a/gnu/local.mk b/gnu/local.mk
index cdf1c8b85b..68ed1d4813 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1512,7 +1512,8 @@ dist_patch_DATA = \
%D%/packages/patches/xsane-fix-pdf-floats.patch \
%D%/packages/patches/xsane-fix-snprintf-buffer-length.patch \
%D%/packages/patches/xsane-support-ipv6.patch \
- %D%/packages/patches/xsane-tighten-default-umask.patch
+ %D%/packages/patches/xsane-tighten-default-umask.patch \
+ %D%/packages/patches/zziplib-CVE-2018-16548.patch
MISC_DISTRO_FILES = \
%D%/packages/ld-wrapper.in \
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index fdbd971880..3079114492 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -3358,14 +3358,14 @@ support forum. It runs with the @code{/exec} command in most IRC clients.")
(define-public python-pyudev
(package
(name "python-pyudev")
- (version "0.21.0")
+ (version "0.22.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "pyudev" version))
(sha256
(base32
- "0arz0dqp75sszsmgm6vhg92n1lsx91ihddx3m944f4ah0487ljq9"))))
+ "0xmj6l08iih2js9skjqpv4w7y0dhxyg91zmrs6v5aa65gbmipfv9"))))
(build-system python-build-system)
(arguments
`(#:tests? #f ; Tests require /sys
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 3d6ad82e99..cbddb8c407 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -1812,14 +1812,14 @@ essential distortions.")
(define-public liblo
(package
(name "liblo")
- (version "0.30")
+ (version "0.31")
(source (origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/liblo/liblo/" version
"/liblo-" version ".tar.gz"))
(sha256
(base32
- "06wdjzxjdshr6hyl4c94yvg3jixiylap8yjs8brdfpm297gck9rh"))))
+ "0l67rkdhfa8cffa0nynql3lh2xlbn1454h6qxhjddp1029p48krb"))))
(build-system gnu-build-system)
(arguments
`(;; liblo test FAILED
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 74646cc4a8..0c12e7c874 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -11089,8 +11089,8 @@ import matplotlib
matplotlib.use('Agg')
" line)))
;; Make sure GESS has all modules in its path
- (wrap-program (string-append target "GESS.py")
- `("PYTHONPATH" ":" prefix (,target ,(getenv "PYTHONPATH"))))
+ (wrap-script (string-append target "GESS.py")
+ `("PYTHONPATH" ":" = (,target ,(getenv "PYTHONPATH"))))
(mkdir-p bin)
(symlink (string-append target "GESS.py")
(string-append bin "GESS.py"))
@@ -11101,7 +11101,8 @@ matplotlib.use('Agg')
("python2-scipy" ,python2-scipy)
("python2-numpy" ,python2-numpy)
("python2-networkx" ,python2-networkx)
- ("python2-biopython" ,python2-biopython)))
+ ("python2-biopython" ,python2-biopython)
+ ("guile" ,guile-3.0))) ; for the script wrapper
(home-page "https://compbio.uthscsa.edu/GESS_Web/")
(synopsis "Detect exon-skipping events from raw RNA-seq data")
(description
diff --git a/gnu/packages/chicken.scm b/gnu/packages/chicken.scm
index 2034ca942a..7b86a58012 100644
--- a/gnu/packages/chicken.scm
+++ b/gnu/packages/chicken.scm
@@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2020 Ekaitz Zarraga <ekaitz@elenq.tech>
+;;; Copyright © 2020 Evan Hanson <evhan@foldling.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -28,14 +29,14 @@
(define-public chicken
(package
(name "chicken")
- (version "5.1.0")
+ (version "5.2.0")
(source (origin
(method url-fetch)
(uri (string-append "https://code.call-cc.org/releases/"
version "/chicken-" version ".tar.gz"))
(sha256
(base32
- "0jsbp3kp0134f318j3wpd1n85gf8qzh034fn198gvazsv2l024aw"))))
+ "1yl0hxm9cirgcp8jgxp6vv29lpswfvaw3zfkh6rsj0vkrv44k4c1"))))
(build-system gnu-build-system)
(arguments
`(#:modules ((guix build gnu-build-system)
@@ -59,7 +60,7 @@
;; Parallel builds are not supported, as noted in README.
#:parallel-build? #f))
(propagated-inputs `(("gcc-toolchain", gcc-toolchain)))
- (home-page "http://www.call-cc.org/")
+ (home-page "https://www.call-cc.org/")
(synopsis "R5RS Scheme implementation that compiles native code via C")
(description
"CHICKEN is a compiler for the Scheme programming language. CHICKEN
diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm
index be33e5b363..0b3d19a428 100644
--- a/gnu/packages/chromium.scm
+++ b/gnu/packages/chromium.scm
@@ -247,8 +247,8 @@ from forcing GEXP-PROMISE."
#:system system
#:guile-for-build guile)))
-(define %chromium-version "80.0.3987.122")
-(define %ungoogled-revision "6056988937ebc32f14293809487dbaaa65939834")
+(define %chromium-version "80.0.3987.132")
+(define %ungoogled-revision "7e68f18f1d16a132fe7d913a176daf79897eaa58")
(define %debian-revision "debian/80.0.3987.116-1")
(define package-revision "0")
(define %package-version (string-append %chromium-version "-"
@@ -263,21 +263,18 @@ from forcing GEXP-PROMISE."
%chromium-version ".tar.xz"))
(sha256
(base32
- "0wr487drgd030d7p84rdz1cys0c87wbgh2qg3d7qd98gqbfcpss8"))))
+ "00f2hpi2d0n15yw29dv3dli566cgi7qh55bfpziag9a6j02i401c"))))
(define %ungoogled-origin
(origin
(method git-fetch)
- ;; XXX: Temporarily download from a third party because the main
- ;; ungoogled-chromium repo is stale. Code taken from this pull
- ;; request: https://github.com/Eloston/ungoogled-chromium/pull/942
- (uri (git-reference (url "https://github.com/Zoraver/ungoogled-chromium")
+ (uri (git-reference (url "https://github.com/Eloston/ungoogled-chromium")
(commit %ungoogled-revision)))
(file-name (git-file-name "ungoogled-chromium"
(string-take %ungoogled-revision 7)))
(sha256
(base32
- "0s4bfj5lr49hknb6d7vp3zah70w9sq5cdhhlyihnl7f9jlrrnwsi"))))
+ "196rr3nly42pzl2bap22vzw4d8x87yl3zy1wq2fla5z8iy4x8ym1"))))
(define %debian-origin
(origin
diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index 2f938f8de2..b7438a323f 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -1589,6 +1589,7 @@ recreates the stored directory structure by default.")
(package
(name "zziplib")
(version "0.13.69")
+ (replacement zziplib/fixed)
(home-page "https://github.com/gdraheim/zziplib")
(source (origin
(method git-fetch)
@@ -1626,6 +1627,13 @@ recreates the stored directory structure by default.")
;; files carry the Zlib license; see "docs/copying.html" for details.
(license (list license:lgpl2.0+ license:mpl1.1))))
+(define zziplib/fixed
+ (package
+ (inherit zziplib)
+ (source (origin
+ (inherit (package-source zziplib))
+ (patches (search-patches "zziplib-CVE-2018-16548.patch"))))))
+
(define-public libzip
(package
(name "libzip")
diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 9d154c030a..9e834415da 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -554,13 +554,13 @@ in systems and applications.")
(define-public r-servr
(package
(name "r-servr")
- (version "0.15")
+ (version "0.16")
(source (origin
(method url-fetch)
(uri (cran-uri "servr" version))
(sha256
(base32
- "199k9aghwk9rf1rm8pjg60xacqww25cza259h5dfj1ixil0m6dxi"))))
+ "106skz04iq4dkblr17idxsxfcfqic6rcaz8mahydkwjjppnhp5fc"))))
(build-system r-build-system)
(propagated-inputs
`(("r-httpuv" ,r-httpuv)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 1d4bc8ffcd..a5272156ab 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -31,6 +31,7 @@
#:use-module (gnu packages compression)
#:use-module (gnu packages fontutils)
#:use-module (gnu packages freedesktop)
+ #:use-module (gnu packages glib)
#:use-module (gnu packages jemalloc)
#:use-module (gnu packages llvm)
#:use-module (gnu packages pcre)
@@ -6201,6 +6202,37 @@ retrieving random data from system source.")
DWARF debugging format.")
(license (list license:asl2.0 license:expat))))
+(define-public rust-gio-sys-0.9
+ (package
+ (name "rust-gio-sys")
+ (version "0.9.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "gio-sys" version))
+ (file-name
+ (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "049rafihxp3maxg3fwj6062ni9dcfilvhfq6ibnfgsmr89925bag"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:tests? #f ; Some test libraries not included in release.
+ #:cargo-inputs
+ (("rust-glib-sys" ,rust-glib-sys-0.9)
+ ("rust-gobject-sys" ,rust-gobject-sys-0.9)
+ ("rust-libc" ,rust-libc-0.2)
+ ("rust-pkg-config" ,rust-pkg-config-0.3))
+ #:cargo-development-inputs
+ (("rust-shell-words" ,rust-shell-words-0.1)
+ ("rust-tempfile" ,rust-tempfile-3.1))))
+ (inputs
+ `(("glib" ,glib)))
+ (home-page "http://gtk-rs.org/")
+ (synopsis "FFI bindings to libgio-2.0")
+ (description "This package provides FFI bindings to libgio-2.0.")
+ (license license:expat)))
+
(define-public rust-git2-0.11
(package
(name "rust-git2")
@@ -6354,6 +6386,35 @@ reading and writing git repositories.")
"Generated OpenGL bindings and wrapper for Servo.")
(license (list license:asl2.0 license:expat))))
+(define-public rust-glib-sys-0.9
+ (package
+ (name "rust-glib-sys")
+ (version "0.9.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "glib-sys" version))
+ (file-name
+ (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1qhnwfqqcp63mx4q9744rfkq78g6ky2j8ppsxxgw0ipl08w6z1cm"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:tests? #f ; Some test libraries not included in release.
+ #:cargo-inputs
+ (("rust-libc" ,rust-libc-0.2)
+ ("rust-pkg-config" ,rust-pkg-config-0.3))
+ #:cargo-development-inputs
+ (("rust-shell-words" ,rust-shell-words-0.1)
+ ("rust-tempfile" ,rust-tempfile-3.1))))
+ (inputs
+ `(("glib" ,glib)))
+ (home-page "http://gtk-rs.org/")
+ (synopsis "FFI bindings to libglib-2.0")
+ (description "This package provides FFI bindings to libglib-2.0.")
+ (license license:expat)))
+
(define-public rust-glium-0.25
(package
(name "rust-glium")
@@ -6652,6 +6713,36 @@ path simultaneously, and returning all of the globs that matched.")
(description "The wgl bindings for glutin.")
(license license:asl2.0)))
+(define-public rust-gobject-sys-0.9
+ (package
+ (name "rust-gobject-sys")
+ (version "0.9.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "gobject-sys" version))
+ (file-name
+ (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1nakflbp3gjaas4fw7sn3p1p32khyfpcq1h06z7yqd10yq2ail9i"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:tests? #f ; Some test libraries not included in release.
+ #:cargo-inputs
+ (("rust-glib-sys" ,rust-glib-sys-0.9)
+ ("rust-libc" ,rust-libc-0.2)
+ ("rust-pkg-config" ,rust-pkg-config-0.3))
+ #:cargo-development-inputs
+ (("rust-shell-words" ,rust-shell-words-0.1)
+ ("rust-tempfile" ,rust-tempfile-3.1))))
+ (inputs
+ `(("glib" ,glib)))
+ (home-page "http://gtk-rs.org/")
+ (synopsis "FFI bindings to libgobject-2.0")
+ (description "This package provides FFI bindings to libgobject-2.0.")
+ (license license:expat)))
+
(define-public rust-goblin-0.0
(package
(name "rust-goblin")
@@ -8863,6 +8954,34 @@ pairs in insertion order.")
"This package provides a library for basic localisation.")
(license license:expat)))
+(define-public rust-locale-config-0.3
+ (package
+ (name "rust-locale-config")
+ (version "0.3.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "locale_config" version))
+ (file-name
+ (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "0d399alr1i7h7yji4vydbdbzd8hp0xaykr7h4rn3yj7l2rdw7lh8"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-lazy-static" ,rust-lazy-static-1)
+ ("rust-objc" ,rust-objc-0.2)
+ ("rust-objc-foundation" ,rust-objc-foundation-0.1)
+ ("rust-regex" ,rust-regex-1.3)
+ ("rust-winapi" ,rust-winapi-0.3))))
+ (home-page "https://github.com/rust-locale/locale_config/")
+ (synopsis "Maintains locale preferences for processes and threads")
+ (description
+ "Maintains locale preferences for process and thread and initialises them
+by inspecting the system for user preference.")
+ (license license:expat)))
+
(define-public rust-lock-api-0.3
(package
(name "rust-lock-api")
@@ -15747,6 +15866,27 @@ for the serde framework.")
"This package allows easy binding to, and loading of, shared libraries.")
(license (list license:asl2.0 license:expat))))
+(define-public rust-shell-words-0.1
+ (package
+ (name "rust-shell-words")
+ (version "0.1.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "shell-words" version))
+ (file-name
+ (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "0jnrw3f174974fsi2hg48l0klpy24767ib28w0xcvi2ll5axxb1r"))))
+ (build-system cargo-build-system)
+ (home-page "https://github.com/tmiasko/shell-words")
+ (synopsis
+ "Process command line according to parsing rules of UNIX shell")
+ (description
+ "Process command line according to parsing rules of UNIX shell.")
+ (license (list license:expat license:asl2.0))))
+
(define-public rust-shlex-0.1
(package
(name "rust-shlex")
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 2ea751eb66..1788e0d6df 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -2757,7 +2757,7 @@ being idiomatic to Python.")
(build-system python-build-system)
(arguments
`(#:python ,python-2))
- (home-page "http://py2neo.org")
+ (home-page "https://py2neo.org")
(synopsis "Library and toolkit for working with Neo4j in Python")
(description "This package provides a client library and toolkit for
working with Neo4j from within Python applications and from the command
diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm
index 7684e57a7b..0628017b9a 100644
--- a/gnu/packages/disk.scm
+++ b/gnu/packages/disk.scm
@@ -161,29 +161,32 @@ tables, and it understands a variety of different formats.")
(define-public gptfdisk
(package
(name "gptfdisk")
- (version "1.0.4")
+ (version "1.0.5")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/gptfdisk/gptfdisk/"
- version "/" name "-" version ".tar.gz"))
+ version "/gptfdisk-" version ".tar.gz"))
(sha256
- (base32
- "13d7gff4prl1nsdknjigmb7bbqhn79165n01v4y9mwbnd0d3jqxn"))))
+ (base32 "0bybgp30pqxb6x5krxazkq4drca0gz4inxj89fpyr204rn3kjz8f"))))
(build-system gnu-build-system)
(inputs
`(("gettext" ,gettext-minimal)
("ncurses" ,ncurses)
("popt" ,popt)
- ("util-linux" ,util-linux))) ; libuuid
+ ("util-linux" ,util-linux))) ; libuuid
(arguments
`(#:test-target "test"
#:phases
(modify-phases %standard-phases
- ;; no configure script
- (delete 'configure)
- ;; no install target
+ (add-after 'unpack 'fix-include-directory
+ (lambda _
+ (substitute* "gptcurses.cc"
+ (("ncursesw/ncurses.h") "ncurses.h"))
+ #t))
+ (delete 'configure) ; no configure script
(replace 'install
+ ;; There's no ‘make install’ target.
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin"))
diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 1c4f00ac77..3e63847a87 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -42,13 +42,13 @@
(define-public python-django
(package
(name "python-django")
- (version "1.11.25")
+ (version "1.11.28")
(source (origin
(method url-fetch)
(uri (pypi-uri "Django" version))
(sha256
(base32
- "0rpgx212n8gh61nwizkyldvskna808xpcvawmavk5mc5c9cfh52k"))))
+ "1ss1jyip7mlbfjn27m0j6wx80s8h4ksg6g5annkgwigp8xgy6g5k"))))
(build-system python-build-system)
(arguments
'(#:modules ((srfi srfi-1)
diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm
index 192761b42e..987275edf2 100644
--- a/gnu/packages/dns.scm
+++ b/gnu/packages/dns.scm
@@ -578,7 +578,7 @@ served by AS112. Stub and forward zones are supported.")
"--enable-nsec"
"--enable-nsec3"
"--enable-tsig")))
- (home-page "http://www.yadifa.eu/")
+ (home-page "https://www.yadifa.eu/")
(synopsis "Authoritative DNS name server")
(description "YADIFA is an authoritative name server for the @dfn{Domain
Name System} (DNS). It aims for both higher performance and a smaller memory
diff --git a/gnu/packages/documentation.scm b/gnu/packages/documentation.scm
index 19c42b00eb..50e0f25cfb 100644
--- a/gnu/packages/documentation.scm
+++ b/gnu/packages/documentation.scm
@@ -7,6 +7,7 @@
;;; Copyright © 2017 Kei Kebreau <kkebreau@posteo.net>
;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2020 Ricardo Wurmus <rekado@elephly.net>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -27,6 +28,7 @@
#:use-module (guix licenses)
#: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 (gnu packages)
@@ -120,6 +122,29 @@ the backend output markups (which can be almost any type of SGML/XML
markup) can be customized and extended by the user.")
(license gpl2+)))
+(define-public asciidoc-py3
+ (package (inherit asciidoc)
+ (name "asciidoc-py3")
+ (version "9.0.0rc1")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/asciidoc/asciidoc-py3/")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1v815dgab62970m9cr2crwbh4kvlzk6pv3hk4bzv6gfa4lbwfkfl"))))
+ (build-system gnu-build-system)
+ (native-inputs
+ `(("autoconf" ,autoconf)))
+ (inputs
+ `(("python" ,python)
+ ("docbook-xml" ,docbook-xml)
+ ("docbook-xsl" ,docbook-xsl)
+ ("libxml2" ,libxml2)
+ ("libxslt" ,libxslt)))))
+
(define-public doxygen
(package
(name "doxygen")
diff --git a/gnu/packages/elixir.scm b/gnu/packages/elixir.scm
index 9aa693ff3a..a52b31f22d 100644
--- a/gnu/packages/elixir.scm
+++ b/gnu/packages/elixir.scm
@@ -33,7 +33,7 @@
(define-public elixir
(package
(name "elixir")
- (version "1.10.0")
+ (version "1.10.2")
(source
(origin
(method git-fetch)
@@ -42,7 +42,7 @@
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "1fz22c2jqqm2jvzxar11bh1djg3kqdn5rbxdddlz0cv6mfz7hvgv"))
+ (base32 "04yi1hljq7ii9flh6pmb5411z7q1bdq9f9sq8323k9hm1f5jwkx6"))
(patches (search-patches "elixir-path-length.patch"))))
(build-system gnu-build-system)
(arguments
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 1fae2423f9..6f31a30747 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -1663,9 +1663,24 @@ as a library for other Emacs packages.")
(arguments
`(#:emacs ,emacs
#:include '("\\.el$" "^images/" "^latex/" "\\.info$")
- #:exclude '("^tests/" "^latex/README")))
+ #:exclude '("^tests/" "^latex/README")
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'install 'install-doc
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (etc-dir (string-append out "/share/" ,name "/"
+ ,version "/etc")))
+ (with-directory-excursion "doc"
+ (setenv "HOME" (getenv "TMPDIR")) ; for mktextfm
+ (invoke "pdftex" "tex-ref")
+ (install-file "tex-ref.pdf" (string-append etc-dir
+ "/refcards")))
+ #t))))))
(native-inputs
`(("perl" ,perl)))
+ (inputs
+ `(("texlive" ,(texlive-union (list texlive-amsfonts)))))
(home-page "https://www.gnu.org/software/auctex/")
(synopsis "Integrated environment for TeX")
(description
@@ -4982,16 +4997,16 @@ variants.")
(define-public emacs-solarized-theme
(package
(name "emacs-solarized-theme")
- (version "1.2.2")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/bbatsov/solarized-emacs/")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0zcj9jf8nlsj9vms888z2vs76q54n8g8r9sh381xad3x8d6lrlb3"))))
+ (version "1.3.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/bbatsov/solarized-emacs/")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "15ql8xcixgm7mbs7rsbybwszanqibq057j5b5ds89a31dw7zxf1g"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-dash" ,emacs-dash)))
@@ -20399,6 +20414,31 @@ displayed against a dark background (Modus Vivendi).")
color. Designed for 256-color terminals. Comes in light and dark!")
(license license:gpl3+))))
+(define-public emacs-spacemacs-theme
+ (let ((commit "e088bff4f190495615c29de93079aaa823e2300c")
+ (revision "0"))
+ (package
+ (name "emacs-spacemacs-theme")
+ (version (git-version "0" revision commit)) ;no release yet
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/nashamri/spacemacs-theme.git")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "09p5pzy3ibrl8dxmg10v8j16wxdn1fkdqpbi8l9pgfib2azmnvnc"))))
+ (build-system emacs-build-system)
+ (home-page "https://github.com/nashamri/spacemacs-theme")
+ (synopsis
+ "Light and dark theme for spacemacs that supports GUI and terminal")
+ (description
+ "Spacemacs theme is an Emacs color theme that started as
+a theme for Spacemacs. The theme comes with dark and light variants
+and it should work well with 256 color terminals.")
+ (license license:gpl3+))))
+
(define-public emacs-elixir-mode
(package
(name "emacs-elixir-mode")
@@ -21667,3 +21707,25 @@ EXIF, XMP and IPTC.")
generate random passwords and insert them into the current buffer. It also
supports generation of phonetic and numeric passwords.")
(license license:artistic2.0)))
+
+(define-public emacs-csv
+ (package
+ (name "emacs-csv")
+ (version "2.1")
+ (home-page "https://gitlab.com/u11/csv.el")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url home-page)
+ (commit (string-append "V" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1vmazjrfcsa9aa9aw8bq5sazdhqvhxyj837dyw5lmh8gk7z0xdaa"))))
+ (build-system emacs-build-system)
+ (synopsis "Elisp functions for reading and parsing CSV files")
+ (description "@code{csv.el} provides functions for reading and parsing CSV (Comma
+Separated Value) files. It follows the format as defined in RFC 4180 \"Common
+Format and MIME Type for CSV Files\" (@url{http://tools.ietf.org/html/rfc4180}).")
+ (license license:gpl3+)))
diff --git a/gnu/packages/erlang.scm b/gnu/packages/erlang.scm
index 4e12bb4813..865895da78 100644
--- a/gnu/packages/erlang.scm
+++ b/gnu/packages/erlang.scm
@@ -40,7 +40,7 @@
(define-public erlang
(package
(name "erlang")
- (version "21.0.5")
+ (version "21.3.8.13")
(source (origin
(method git-fetch)
;; The tarball from http://erlang.org/download contains many
@@ -52,7 +52,7 @@
(file-name (git-file-name name version))
(sha256
(base32
- "0gv83i5ybj1z3ykbbldjzf7dbfjszp84c0yzrpshj611b9wp0176"))
+ "1dj37vk712dx76y25g13na24wbpn7a5ddmlpf4n51gm10sib54wj"))
(patches (search-patches "erlang-man-path.patch"))))
(build-system gnu-build-system)
(native-inputs
@@ -68,7 +68,7 @@
(version-major+minor version) ".tar.gz"))
(sha256
(base32
- "0cgv23q0215f6lvmhj4w9skx5m29khjs9mb890635s3yp520xgqh"))))))
+ "0wm1dg1psv1n3gpiwyms06yhsryrnr28p455fp0l1ak8hdf4nipm"))))))
(inputs
`(("ncurses" ,ncurses)
("openssl" ,openssl)
diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm
index 42d12fb143..8d39730a7b 100644
--- a/gnu/packages/fontutils.scm
+++ b/gnu/packages/fontutils.scm
@@ -10,6 +10,7 @@
;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2018, 2019 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2019 Marius Bakke <mbakke@fastmail.com>
+;;; Copyright © 2020 Roel Janssen <roel@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -774,3 +775,64 @@ tools or editing configuration files by hand.
While designed primarily with the GNOME Desktop Environment in mind, it should
work well with other GTK+ desktop environments.")
(license license:gpl3+)))
+
+(define-public fntsample
+ (package
+ (name "fntsample")
+ (version "5.3")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://github.com/eugmes/fntsample/archive/release/"
+ version ".tar.gz"))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "0awp4dh1g40ivzvm5xqlvcpcdw1vplrx3drjmbylr62y185vbs74"))))
+ (build-system cmake-build-system)
+ (arguments
+ `(#:tests? #f ; There are no tests.
+ #:configure-flags
+ (list (string-append
+ "-DUNICODE_BLOCKS=" (assoc-ref %build-inputs "unicode-blocks")))
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'install 'set-library-path
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (pdf-api2 (assoc-ref inputs "perl-pdf-api2"))
+ (intl (assoc-ref inputs "perl-libintl-perl"))
+ (perllib (string-append pdf-api2
+ "/lib/perl5/site_perl/"
+ ,(package-version perl)
+ ":" intl
+ "/lib/perl5/site_perl/"
+ ,(package-version perl))))
+ (wrap-program (string-append out "/bin/pdfoutline")
+ `("PERL5LIB" ":" prefix (,perllib)))
+ #t))))))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)
+ ("gettext" ,gettext-minimal)))
+ (inputs
+ `(("cairo" ,cairo)
+ ("fontconfig" ,fontconfig)
+ ("freetype" ,freetype)
+ ("glib" ,glib)
+ ("pango" ,pango)
+ ("perl-pdf-api2" ,perl-pdf-api2)
+ ("perl-libintl-perl" ,perl-libintl-perl)
+ ("unicode-blocks"
+ ,(origin
+ (method url-fetch)
+ (uri "https://unicode.org/Public/UNIDATA/Blocks.txt")
+ (file-name "unicode-blocks.txt")
+ (sha256
+ (base32
+ "1xs8fnhh48gs41wg004r7m4r2azh9khmyjjlnvyzy9c6zrd212x2"))))))
+ (home-page "https://github.com/eugmes/fntsample")
+ (synopsis "PDF and PostScript font samples generator")
+ (description "This package provides a tool that can be used to make font
+samples that show coverage of the font and are similar in appearance to
+Unicode Charts. It was developed for use with DejaVu Fonts project.")
+ (license license:gpl3+)))
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index e66a1a817e..d6f8abebdd 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -5278,7 +5278,7 @@ Crowther & Woods, its original authors, in 1995. It has been known as
(define-public tome4
(package
(name "tome4")
- (version "1.6.6")
+ (version "1.6.7")
(synopsis "Single-player, RPG roguelike game set in the world of Eyal")
(source
(origin
@@ -5286,8 +5286,7 @@ Crowther & Woods, its original authors, in 1995. It has been known as
(uri (string-append "https://te4.org/dl/t-engine/t-engine4-src-"
version ".tar.bz2"))
(sha256
- (base32
- "1amx0y49scy9hq71wjvkdzvgclwa2g54vkv4bf40mxyp4pl0bq7m"))
+ (base32 "0283hvms5hr29zr0grd6gq059k0hg8hcz3fsmwjmysiih8790i68"))
(modules '((guix build utils)))
(snippet
'(begin
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index 7f60f9b7ea..d458c7bc92 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -1092,7 +1092,7 @@ persisted.
(define-public java-jmapviewer
(package
(name "java-jmapviewer")
- (version "2.12")
+ (version "2.13")
(source (origin
(method url-fetch)
(uri (string-append "https://svn.openstreetmap.org/applications/"
@@ -1100,7 +1100,7 @@ persisted.
"/JMapViewer-" version "-Source.zip"))
(sha256
(base32
- "08hbqsbs859v4m5d90560fdifavd1apnpz9v9iry1v31dsvy5707"))))
+ "0sy6r5fkbb9bclw0is6gwnbzz627m7pjfnsqydxz58pbndakkhrv"))))
(build-system ant-build-system)
(native-inputs
`(("unzip" ,unzip)))
@@ -1127,7 +1127,7 @@ an independent project by the JOSM team.")
(define-public josm
(package
(name "josm")
- (version "15553")
+ (version "15937")
(source (origin
(method svn-fetch)
(uri (svn-reference
@@ -1136,7 +1136,7 @@ an independent project by the JOSM team.")
(recursive? #f)))
(sha256
(base32
- "091pbcn4fnmk42fmxplhis3nw5dbljf6ws8acyhx5dflyn49xzmx"))
+ "00b8sw0wgkcf7xknmdpn5s521ax8x2660figidcrry37sgq3x946"))
(file-name (string-append name "-" version "-checkout"))
(modules '((guix build utils)))
(snippet
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 1c4bf7558a..0cd39f9104 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -2074,6 +2074,7 @@ dealing with different structured file formats.")
(define-public librsvg
(package
+ (replacement librsvg/fixed)
(name "librsvg")
(version "2.40.20")
(source (origin
@@ -2138,6 +2139,20 @@ dealing with different structured file formats.")
library.")
(license license:lgpl2.0+)))
+(define librsvg/fixed
+ (package
+ (inherit librsvg)
+ (name "librsvg")
+ (version "2.40.21")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://gnome/sources/" name "/"
+ (version-major+minor version) "/"
+ name "-" version ".tar.xz"))
+ (sha256
+ (base32
+ "1fljkag2gr7c4k5mn798lgf9903xslz8h51bgvl89nnay42qjqpp"))))))
+
(define* (computed-origin-method gexp-promise hash-algo hash
#:optional (name "source")
#:key (system (%current-system))
@@ -2152,7 +2167,7 @@ from forcing GEXP-PROMISE."
#:guile-for-build guile)))
(define librsvg-next-source
- (let* ((version "2.46.3")
+ (let* ((version "2.46.4")
(upstream-source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/librsvg/"
@@ -2160,7 +2175,7 @@ from forcing GEXP-PROMISE."
"librsvg-" version ".tar.xz"))
(sha256
(base32
- "1s3a96i7f4pynjwxxvhysp4b6r7kyi8nasdxfyi62hc7gm34d3kn")))))
+ "0afc82nsxc6kw136xid4vcq9kmq4rmgzzk8bh2pvln2cnvirwnxl")))))
(origin
(method computed-origin-method)
(file-name (string-append "librsvg-" version ".tar.xz"))
@@ -2180,8 +2195,6 @@ from forcing GEXP-PROMISE."
(with-directory-excursion (string-append "librsvg-" #$version)
;; The following crate(s) are needed in addition to the ones replaced:
(begin
- (substitute* "rsvg_internals/Cargo.toml"
- (("\"=") "\""))
(invoke
"tar" "xvf" #+(package-source rust-autocfg-0.1) "-C" "vendor")
(invoke
@@ -2242,10 +2255,10 @@ from forcing GEXP-PROMISE."
;; gdk-pixbuf-sys 0.9
("generic-array" . #+(package-source rust-generic-array-0.12))
;; gio 0.7
-;; gio-sys 0.9
+ ("gio-sys" . #+(package-source rust-gio-sys-0.9))
;; glib 0.8
-;; glib-sys 0.9
-;; gobject-sys 0.9
+ ("glib-sys" . #+(package-source rust-glib-sys-0.9))
+ ("gobject-sys" . #+(package-source rust-gobject-sys-0.9))
("idna" . #+(package-source rust-idna-0.2))
("itertools" . #+(package-source rust-itertools-0.8))
("itoa" . #+(package-source rust-itoa-0.4))
@@ -2253,7 +2266,7 @@ from forcing GEXP-PROMISE."
("lazy_static" . #+(package-source rust-lazy-static-1))
("libc" . #+(package-source rust-libc-0.2))
("libm" . #+(package-source rust-libm-0.1))
-;; locale_config 0.3
+ ("locale_config" . #+(package-source rust-locale-config-0.3))
("log" . #+(package-source rust-log-0.4))
("mac" . #+(package-source rust-mac-0.1))
("malloc_buf" . #+(package-source rust-malloc-buf-0.0))
@@ -2356,7 +2369,7 @@ from forcing GEXP-PROMISE."
(define-public librsvg-next
(package
(name "librsvg")
- (version "2.46.3")
+ (version "2.46.4")
(source librsvg-next-source)
(build-system gnu-build-system)
(arguments
@@ -2372,6 +2385,8 @@ from forcing GEXP-PROMISE."
(use-modules (guix build cargo-utils))
(substitute* "librsvg/Cargo.toml"
(("bitflags .*") "bitflags = \"1\"\n")) ; 1.2 is vendored
+ (substitute* "rsvg_internals/Cargo.toml"
+ (("\"=") "\""))
(generate-all-checksums "vendor")
(delete-file "Cargo.lock")
(invoke "cargo" "generate-lockfile")))
@@ -4412,7 +4427,7 @@ which are easy to play with the aid of a mouse.")
(define-public amtk
(package
(name "amtk")
- (version "5.0.1")
+ (version "5.0.2")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/amtk/"
@@ -4420,7 +4435,7 @@ which are easy to play with the aid of a mouse.")
"amtk-" version ".tar.xz"))
(sha256
(base32
- "09yy95w1s83c43mh9vha1jbb780yighf5pd2j0ygjmc68sjg871d"))))
+ "11jgz2i9wjzv4alrxl1qyxiapb52w7vs5ygfgsw0qgdap8gqkk3i"))))
(build-system gnu-build-system)
(arguments
'(#:configure-flags '("--enable-gtk-doc")))
@@ -5742,7 +5757,7 @@ metadata in photo and video files of various formats.")
(define-public shotwell
(package
(name "shotwell")
- (version "0.30.7")
+ (version "0.30.8")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/shotwell/"
@@ -5750,7 +5765,7 @@ metadata in photo and video files of various formats.")
"shotwell-" version ".tar.xz"))
(sha256
(base32
- "1m9i8r4gyd2hzlxjjwfyck4kz7gdg2vz2k6l6d0ga9hdfq2l4p9l"))))
+ "1f7m007g6w1sz8s60w6x81ghp2rrjmik8phd958b2hy8zz92wbbj"))))
(build-system meson-build-system)
(arguments
'(#:glib-or-gtk? #t
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index d165ccf065..630984d3c1 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -221,7 +221,7 @@ in the style of communicating sequential processes (@dfn{CSP}).")
(package
(inherit go-1.4)
(name "go")
- (version "1.13.7")
+ (version "1.13.8")
(source
(origin
(method url-fetch)
@@ -229,7 +229,7 @@ in the style of communicating sequential processes (@dfn{CSP}).")
name version ".src.tar.gz"))
(sha256
(base32
- "1x21kfpzfkvmqd42pan6nl862m7jjl4niqxxpcgm46awbz645bg4"))))
+ "0d7cxffk72568h46srzswrxd0bsdip7amgkf499wzn6l6d3g0fxi"))))
(arguments
(substitute-keyword-arguments (package-arguments go-1.4)
((#:phases phases)
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 57f1ebc6be..a0b5776807 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -11549,16 +11549,16 @@ the application using Java to Lisp integration APIs.")
(define-public java-jsonp-api
(package
(name "java-jsonp-api")
- (version "1.1.5")
+ (version "1.1.6")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/eclipse-ee4j/jsonp")
- (commit (string-append version "-RELEASE"))))
+ (commit (string-append "1.1-" version "-RELEASE"))))
(file-name (git-file-name name version))
(sha256
(base32
- "0nxq16lrx7i87hgyj5rzcwilvr67h0i299gygfn8f5vs4n7n59vy"))))
+ "0zrj03hkr3jdmqlb4ipjr37cqpp2q2814qpmxi7srlwpdqs0ibgc"))))
(build-system ant-build-system)
(arguments
`(#:jar-name "jsonp-api.jar"
@@ -11584,7 +11584,15 @@ and allows to build a Java object model for JSON text using API classes
`(#:jar-name "jsonp-impl.jar"
#:tests? #f
#:source-dir "impl/src/main/java"
- #:test-dir "impl/src/test"))
+ #:test-dir "impl/src/test"
+ #:phases
+ (modify-phases %standard-phases
+ (add-before 'build 'copy-resources
+ (lambda _
+ (copy-recursively
+ "impl/src/main/resources/"
+ "build/classes")
+ #t)))))
(propagated-inputs
`(("java-jsonp-api" ,java-jsonp-api)))
(description "JSON Processing (JSON-P) is a Java API to process (e.g.
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 7747bdc778..7d8dd8db0c 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -40,6 +40,8 @@
;;; Copyright © 2019 Kei Kebreau <kkebreau@posteo.net>
;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2020 Pierre Neidhardt <mail@ambrevar.xyz>
+;;; Copyright © 2020 Chris Marusich <cmmarusich@gmail.com>
+;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -1841,6 +1843,27 @@ IPv6 packet filter.
Both commands are targeted at system administrators.")
(license license:gpl2+)))
+(define-public lsscsi
+ (package
+ (name "lsscsi")
+ (version "0.31")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append
+ "http://sg.danny.cz/scsi/lsscsi-" version ".tar.xz"))
+ (sha256
+ (base32
+ "1ry2y34xmpgxdbfbyvs8cjmbx0fn222yjdab87wj21q60nab5p75"))))
+ (build-system gnu-build-system)
+ (synopsis "Lists information about SCSI or NVMe devices in Linux")
+ (home-page "http://sg.danny.cz/scsi/lsscsi.html")
+ (description
+ "@command{lsscsi} lists SCSI logical units or SCSI targets. It can
+also list NVMe namespaces or controllers and show the relationship between a
+device's primary node name, its SCSI generic (sg) node name and its kernel
+name.")
+ (license license:gpl2)))
+
(define-public ebtables
(package
(name "ebtables")
@@ -6423,3 +6446,26 @@ user space tracer. It receives commands from a session daemon, for example to
enable and disable specific instrumentation points, and writes event records
to ring buffers shared with a consumer daemon.")
(license license:lgpl2.1+)))
+
+(define-public kexec-tools
+ (package
+ (name "kexec-tools")
+ (version "2.0.20")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://kernel.org/linux/utils/kernel"
+ "/kexec/kexec-tools-" version ".tar.xz"))
+ (sha256
+ (base32
+ "1j7qlhxk1rbv9jbj8wd6hb7zl8p2mp29ymrmccgmsi0m0dzhgn6s"))))
+ (build-system gnu-build-system)
+ (arguments
+ ;; There are no automated tests.
+ '(#:tests? #f))
+ (home-page "https://projects.horms.net/projects/kexec/")
+ (synopsis "Tools for booting directly into different kernels")
+ (description "This package provides the @code{kexec} program and ancillary
+utilities. Using @code{kexec}, it is possible to boot directly into a new
+kernel from the context of an already-running kernel, bypassing the normal
+system boot process.")
+ (license license:gpl2)))
diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm
index 369d4fc4ec..b5d8fd30f3 100644
--- a/gnu/packages/lisp.scm
+++ b/gnu/packages/lisp.scm
@@ -365,14 +365,14 @@ an interpreter, a compiler, a debugger, and much more.")
(define-public sbcl
(package
(name "sbcl")
- (version "2.0.0")
+ (version "2.0.2")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/sbcl/sbcl/" version "/sbcl-"
version "-source.tar.bz2"))
(sha256
- (base32 "1krgd69cirp4ili2pfsh1a0mfvq722jbknlvmf17qhsxh1b94dlh"))))
+ (base32 "07pyzdjnhcpqwvr3rrk4i18maqdywbq1qj93fnpx1h4b7dp08r28"))))
(build-system gnu-build-system)
(outputs '("out" "doc"))
(native-inputs
diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 271fe85b3a..600c921d48 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -521,7 +521,7 @@ It adds a large amount of new and improved features to mutt.")
(define-public gmime
(package
(name "gmime")
- (version "3.2.5")
+ (version "3.2.6")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/gmime/"
@@ -529,7 +529,7 @@ It adds a large amount of new and improved features to mutt.")
"/gmime-" version ".tar.xz"))
(sha256
(base32
- "0ndsg1z1kq4w4caascydvialpyn4rfbjdn7xclzbzhw53x85cxgv"))))
+ "05s7qjrxbj010q016pmdqdq73gz8vl4hv29kwaign0j8gi61kzxb"))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)
@@ -781,7 +781,7 @@ security functionality including PGP, S/MIME, SSH, and SSL.")
(string-append (assoc-ref outputs "out")
"/share/emacs/site-lisp"))
#t)))))
- (home-page "http://www.djcbsoftware.nl/code/mu/")
+ (home-page "https://www.djcbsoftware.nl/code/mu/")
(synopsis "Quickly find emails")
(description
"Mu is a tool for dealing with e-mail messages stored in the
@@ -941,7 +941,9 @@ invoking @command{notifymuch} from the post-new hook.")
#:imported-modules (,@%gnu-build-system-modules
(guix build emacs-build-system)
(guix build emacs-utils))
- #:make-flags (list "V=1") ; verbose test output
+ #:make-flags
+ (list "V=1" ; verbose test output
+ "NOTMUCH_TEST_TIMEOUT=1h") ; don't fail on slow machines
#:phases (modify-phases %standard-phases
(add-after 'unpack 'patch-notmuch-lib.el
(lambda _
diff --git a/gnu/packages/patches/zziplib-CVE-2018-16548.patch b/gnu/packages/patches/zziplib-CVE-2018-16548.patch
new file mode 100644
index 0000000000..a17c6a9768
--- /dev/null
+++ b/gnu/packages/patches/zziplib-CVE-2018-16548.patch
@@ -0,0 +1,49 @@
+The following 3 patches applied to 0.13.69 in this order, combined:
+https://github.com/gdraheim/zziplib/commit/9411bde3e4a70a81ff3ffd256b71927b2d90dcbb.patch
+https://github.com/gdraheim/zziplib/commit/d2e5d5c53212e54a97ad64b793a4389193fec687.patch
+https://github.com/gdraheim/zziplib/commit/0e1dadb05c1473b9df2d7b8f298dab801778ef99.patch
+
+diff --git a/test/test.zip b/test/test.zip
+index 2c992ea..952d475 100644
+Binary files a/test/test.zip and b/test/test.zip differ
+diff --git a/zzip/zip.c b/zzip/zip.c
+index 14e2e06..f97a40a 100644
+--- a/zzip/zip.c
++++ b/zzip/zip.c
+@@ -472,9 +472,15 @@ __zzip_parse_root_directory(int fd,
+ } else
+ {
+ if (io->fd.seeks(fd, zz_rootseek + zz_offset, SEEK_SET) < 0)
++ {
++ free(hdr0);
+ return ZZIP_DIR_SEEK;
++ }
+ if (io->fd.read(fd, &dirent, sizeof(dirent)) < __sizeof(dirent))
++ {
++ free(hdr0);
+ return ZZIP_DIR_READ;
++ }
+ d = &dirent;
+ }
+
+@@ -574,11 +580,18 @@ __zzip_parse_root_directory(int fd,
+
+ if (hdr_return)
+ *hdr_return = hdr0;
++ else
++ {
++ /* If it is not assigned to *hdr_return, it will never be free()'d */
++ free(hdr0);
++ }
+ } /* else zero (sane) entries */
++ else
++ free(hdr0);
+ # ifndef ZZIP_ALLOW_MODULO_ENTRIES
+- return (entries != zz_entries ? ZZIP_CORRUPTED : 0);
++ return (entries != zz_entries) ? ZZIP_CORRUPTED : 0;
+ # else
+- return ((entries & (unsigned)0xFFFF) != zz_entries ? ZZIP_CORRUPTED : 0);
++ return ((entries & (unsigned)0xFFFF) != zz_entries) ? ZZIP_CORRUPTED : 0;
+ # endif
+ }
+
diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm
index 7459bd1802..a296d7af0b 100644
--- a/gnu/packages/perl.scm
+++ b/gnu/packages/perl.scm
@@ -7247,6 +7247,30 @@ file names.")
with file paths.")
(license asl2.0)))
+(define-public perl-pdf-api2
+ (package
+ (name "perl-pdf-api2")
+ (version "2.036")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append
+ "mirror://cpan/authors/id/S/SS/SSIMMS/PDF-API2-"
+ version ".tar.gz"))
+ (sha256
+ (base32
+ "0x0pa75wpb87pcshl92y5nh8pzikjp46ljlr2pqvdgpqzvll8107"))))
+ (build-system perl-build-system)
+ (native-inputs
+ `(("perl-test-exception" ,perl-test-exception)
+ ("perl-test-memory-cycle" ,perl-test-memory-cycle)))
+ (propagated-inputs
+ `(("perl-font-ttf" ,perl-font-ttf)))
+ (home-page "https://metacpan.org/release/PDF-API2")
+ (synopsis "Facilitates the creation and modification of PDF files")
+ (description "This Perl module facilitates the creation and modification
+of PDF files.")
+ (license lgpl2.1)))
+
(define-public perl-perlio-utf8_strict
(package
(name "perl-perlio-utf8-strict")
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 310fec4edf..ac75616657 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -2672,7 +2672,7 @@ textual content for output generation on the web.")
(native-inputs
`(("python-flask" ,python-flask)
("python-nose" ,python-nose)))
- (home-page "http://packages.python.org/Flask-Principal/")
+ (home-page "https://pythonhosted.org/Flask-Principal/")
(synopsis "Identity management for Flask")
(description "@code{flask_principal} is a identity management library for
Flask. It supports managing both authentication and authorization data in a
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 6c23d12338..ed599cd5d5 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -6130,7 +6130,7 @@ SVG, EPS, PNG and terminal output.")
(native-inputs
`(("python-pytest" ,python-pytest)
("xorg-server" ,xorg-server-for-tests)))
- (home-page "http://stanford.edu/~mwaskom/software/seaborn/")
+ (home-page "https://seaborn.pydata.org/")
(synopsis "Statistical data visualization")
(description
"Seaborn is a library for making attractive and informative statistical
@@ -8314,7 +8314,7 @@ be set via config files and/or environment variables.")
(base32
"0j6ad6lwwyc9kv71skj098v5l7x5biyj2hs4lc5x1kcixqcr97sh"))))
(build-system python-build-system)
- (home-page "http://contextlib2.readthedocs.org/")
+ (home-page "https://contextlib2.readthedocs.org/")
(synopsis "Tools for decorators and context managers")
(description "This module is primarily a backport of the Python
3.2 contextlib to earlier Python versions. Like contextlib, it
@@ -9420,7 +9420,7 @@ parsing and generating vCard and vCalendar files. Currently, iCalendar files
are supported and well tested. vCard 3.0 files are supported, and all data
should be imported, but only a few components are understood in a sophisticated
way.")
- (home-page "http://eventable.github.io/vobject/")
+ (home-page "https://eventable.github.io/vobject/")
(license license:asl2.0)))
(define-public python2-vobject
@@ -14380,7 +14380,7 @@ particularly convenient for use in tests.")
("python-nose" ,python-nose)))
(propagated-inputs
`(("python-h5py" ,python-h5py)))
- (home-page "http://www.activepapers.org/")
+ (home-page "https://www.activepapers.org/")
(synopsis "Executable papers for scientific computing")
(description
"ActivePapers is a tool for working with executable papers, which
@@ -15333,7 +15333,7 @@ Glob2 currently based on the glob code from Python 3.3.1.")
`(("unzip" ,unzip)))
(propagated-inputs
`(("python-gevent" ,python-gevent)))
- (home-page "http://gehrcke.de/gipc")
+ (home-page "https://gehrcke.de/gipc/")
(synopsis "Child process management in the context of gevent")
(description "Usage of Python's multiprocessing package in a
gevent-powered application may raise problems. With @code{gipc},
diff --git a/gnu/packages/rdf.scm b/gnu/packages/rdf.scm
index b086d2f00f..b9abd37e40 100644
--- a/gnu/packages/rdf.scm
+++ b/gnu/packages/rdf.scm
@@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014, 2015 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2015, 2016, 2018 Ricardo Wurmus <rekado@elephly.net>
-;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Julien Lepiller <julien@lepiller.eu>
;;;
;;; This file is part of GNU Guix.
@@ -265,14 +265,14 @@ and triple stores.")
(define-public serd
(package
(name "serd")
- (version "0.30.0")
+ (version "0.30.2")
(source (origin
(method url-fetch)
(uri (string-append "https://download.drobilla.net/serd-"
version ".tar.bz2"))
(sha256
(base32
- "1yyfyvc6kwagi5w43ljp1bbjdvdpmgpds74lmjxycm91bkx0xyvf"))))
+ "00kjjgs5a8r72khgpya14scvl3n58wqwl5927y14z03j25q04ccx"))))
(build-system waf-build-system)
(arguments
`(#:tests? #f ; no check target
diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm
index 1300175dd4..8fb941bdcd 100644
--- a/gnu/packages/shells.scm
+++ b/gnu/packages/shells.scm
@@ -3,7 +3,7 @@
;;; Copyright © 2014, 2015 David Thompson <davet@gnu.org>
;;; Copyright © 2014 Kevin Lemonnier <lemonnierk@ulrar.net>
;;; Copyright © 2015 Jeff Mickey <j@codemac.net>
-;;; Copyright © 2016, 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2016, 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2016 Stefan Reichör <stefan@xsteve.at>
;;; Copyright © 2017, 2018 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2017, 2018 ng0 <ng0@n0.is>
@@ -101,7 +101,7 @@ direct descendant of NetBSD's Almquist Shell (@command{ash}).")
(method url-fetch)
(uri (string-append "https://github.com/fish-shell/fish-shell/"
"releases/download/" version "/"
- name "-" version ".tar.gz"))
+ "fish-" version ".tar.gz"))
(sha256
(base32 "03j3jl9jzlnhq4p86zj8wqsh5sx45j1d1fvfa80ks1cfdg68qwhl"))))
(build-system gnu-build-system)
@@ -751,14 +751,14 @@ Shell (pdksh).")
(define-public oil-shell
(package
(name "oil-shell")
- (version "0.6.0")
+ (version "0.7.0")
(source (origin
(method url-fetch)
(uri (string-append "https://www.oilshell.org/download/oil-"
version ".tar.xz"))
(sha256
(base32
- "1dw4mgnlmaxlfygasfihgvbj32d3m9w6k5j7azb9d9lp35f3l7hl"))))
+ "12c9s462879adb6mwd3fqafk0dnqsm16s18rhym6cmzfzy8v8zm3"))))
(build-system gnu-build-system)
(arguments
'(#:tests? #f ; the tests are not distributed in the tarballs
diff --git a/gnu/packages/unicode.scm b/gnu/packages/unicode.scm
index 3b34096fe5..d6fe93c2e0 100644
--- a/gnu/packages/unicode.scm
+++ b/gnu/packages/unicode.scm
@@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2020 Leo Prikler <leo.prikler@student.tugraz.at>
+;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -21,6 +22,7 @@
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix utils)
+ #:use-module (guix build-system copy)
#:use-module (guix build-system trivial))
(define-public ucd
@@ -35,15 +37,10 @@
(sha256
(base32
"1ighy39cjkmqnv1797wrxjz76mv1fdw7zp5j04q55bkwxsdkvrmh"))))
- (build-system trivial-build-system)
+ (build-system copy-build-system)
(arguments
- `(#:modules ((guix build utils))
- #:builder
- (let ((out (string-append %output "/share/ucd")))
- (use-modules (guix build utils))
- (mkdir-p out)
- (copy-recursively (assoc-ref %build-inputs "source") out)
- #t)))
+ '(#:install-plan
+ '(("." "share/ucd/"))))
(home-page "https://www.unicode.org")
(synopsis "Unicode Character Database")
(description
@@ -123,17 +120,10 @@ Unicode Technological Standard #51.")
(sha256
(base32
"0hxsc3j5zb32hmiaj0r3ajchmklx6zng6zlh1ca6s9plq5b9w9q7"))))
- (build-system trivial-build-system)
+ (build-system copy-build-system)
(arguments
- `(#:modules ((guix build utils))
- #:builder
- (let ((out (string-append %output "/share/unicode/cldr/common")))
- (use-modules (guix build utils))
- (mkdir-p out)
- (copy-recursively (string-append (assoc-ref %build-inputs "source")
- "/common")
- out)
- #t)))
+ '(#:install-plan
+ '(("common" "share/unicode/cldr/"))))
(home-page "https://www.unicode.org")
(synopsis "Locale data repository")
(description
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 6597844a9b..a8cb4cc347 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -8,7 +8,7 @@
;;; Copyright © 2014, 2016, 2019 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2015, 2018 Kyle Meyer <kyle@kyleam.com>
-;;; Copyright © 2015, 2017, 2018 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2015, 2017, 2018, 2020 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016, 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2016, 2017, 2018 ng0 <ng0@n0.is>
;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
@@ -171,7 +171,7 @@ as well as the classic centralized workflow.")
(base32
"15pfm7j4wq8ryp9n9d81h8v0arl15yq9i6cigw45walnq5r6721h"))))
;; For subtree documentation.
- ("asciidoc" ,asciidoc)
+ ("asciidoc" ,asciidoc-py3)
("docbook-xsl" ,docbook-xsl)
("xmlto" ,xmlto)))
(inputs
@@ -179,7 +179,7 @@ as well as the classic centralized workflow.")
("expat" ,expat)
("openssl" ,openssl)
("perl" ,perl)
- ("python" ,python-2) ; CAVEAT: incompatible with python-3 according to INSTALL
+ ("python" ,python) ; for git-p4
("zlib" ,zlib)
;; Note: we keep this in inputs rather than native-inputs to work around
@@ -262,7 +262,7 @@ as well as the classic centralized workflow.")
(lambda _
(substitute* "Makefile"
(("/usr/bin/perl") (which "perl"))
- (("/usr/bin/python") (which "python")))
+ (("/usr/bin/python") (which "python3")))
#t))
(add-after 'configure 'add-PM.stamp
(lambda _
diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm
index d130072272..b468347380 100644
--- a/gnu/packages/vim.scm
+++ b/gnu/packages/vim.scm
@@ -32,6 +32,7 @@
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix build-system cmake)
+ #:use-module (guix build-system copy)
#:use-module (guix build-system gnu)
#:use-module (guix build-system python)
#:use-module (gnu packages)
@@ -287,24 +288,12 @@ written in the Python 3, Perl, Ruby, Tcl, and Lua programming languages.")))
(sha256
(base32
"1h6sci5mhdfg6sjsjpi8l5li02hg858zcayiwl60y9j2gqnd18lv"))))
- (build-system gnu-build-system)
+ (build-system copy-build-system)
(arguments
- `(#:tests? #f
- #:phases
- (modify-phases %standard-phases
- (delete 'configure)
- (delete 'build)
- (replace 'install
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (vimfiles (string-append out "/share/vim/vimfiles"))
- (autoload (string-append vimfiles "/autoload"))
- (doc (string-append vimfiles "/doc"))
- (plugin (string-append vimfiles "/plugin")))
- (copy-recursively "autoload" autoload)
- (copy-recursively "doc" doc)
- (copy-recursively "plugin" plugin)
- #t))))))
+ '(#:install-plan
+ '(("autoload" "share/vim/vimfiles/")
+ ("doc" "share/vim/vimfiles/")
+ ("plugin" "share/vim/vimfiles/"))))
(synopsis "Next generation completion framework for Vim")
(description
"@code{neocomplete}, an abbreviation of 'neo-completion with cache',
@@ -332,20 +321,10 @@ features than Vim's built-in completion.")
(sha256
(base32
"151wpvbj6jb9jdkbhj3b77f5sq7y328spvwfbqyj1y32rg4ifmc6"))))
- (build-system gnu-build-system)
+ (build-system copy-build-system)
(arguments
- `(#:tests? #f
- #:phases
- (modify-phases %standard-phases
- (delete 'configure)
- (delete 'build)
- (replace 'install
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (vimfiles (string-append out "/share/vim/vimfiles")))
- (copy-recursively "neosnippets"
- (string-append vimfiles "/neosnippets"))
- #t))))))
+ '(#:install-plan
+ '(("neosnippets" "share/vim/vimfiles/"))))
(synopsis "Snippets for neosnippet")
(description
"@code{neosnippet-snippets} provides standard snippets for the Vim plugin
@@ -371,34 +350,17 @@ you can fill in on the fly.")
(sha256
(base32
"0k80syscmpnj38ks1fq02ds59g0r4jlg9ll7z4qc048mgi35alw5"))))
- (build-system gnu-build-system)
+ (build-system copy-build-system)
(arguments
- `(#:tests? #f
- #:phases
- (modify-phases %standard-phases
- (delete 'configure)
- (delete 'build)
- (replace 'install
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (vimfiles (string-append out "/share/vim/vimfiles"))
- (autoload (string-append vimfiles "/autoload"))
- (doc (string-append vimfiles "/doc"))
- (ftdetect (string-append vimfiles "/ftdetect"))
- (ftplugin (string-append vimfiles "/ftplugin"))
- (indent (string-append vimfiles "/indent"))
- (plugin (string-append vimfiles "/plugin"))
- (rplugin (string-append vimfiles "/rplugin"))
- (syntax (string-append vimfiles "/syntax")))
- (copy-recursively "autoload" autoload)
- (copy-recursively "doc" doc)
- (copy-recursively "ftdetect" ftdetect)
- (copy-recursively "ftplugin" ftplugin)
- (copy-recursively "indent" indent)
- (copy-recursively "plugin" plugin)
- (copy-recursively "rplugin" rplugin)
- (copy-recursively "syntax" syntax)
- #t))))))
+ '(#:install-plan
+ '(("autoload" "share/vim/vimfiles/")
+ ("doc" "share/vim/vimfiles/")
+ ("ftdetect" "share/vim/vimfiles/")
+ ("ftplugin" "share/vim/vimfiles/")
+ ("indent" "share/vim/vimfiles/")
+ ("plugin" "share/vim/vimfiles/")
+ ("rplugin" "share/vim/vimfiles/")
+ ("syntax" "share/vim/vimfiles/"))))
(synopsis "Snippet support for Vim")
(description
"@code{neosnippet}, is a plugin for Vim which adds snippet support to Vim.
@@ -427,24 +389,12 @@ trouble using them, because you do not have to remember each snippet name.")
(sha256
(base32
"1ynjr1109dxgj0lz261gmzz3wf5ap1m6j6hnvl3lcyv66a4y8pjv"))))
- (build-system gnu-build-system)
+ (build-system copy-build-system)
(arguments
- `(#:tests? #f
- #:phases
- (modify-phases %standard-phases
- (delete 'configure)
- (delete 'build)
- (replace 'install
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (vimfiles (string-append out "/share/vim/vimfiles"))
- (after (string-append vimfiles "/after"))
- (syntax (string-append vimfiles "/syntax"))
- (ftplugin (string-append vimfiles "/ftplugin")))
- (copy-recursively "after" after)
- (copy-recursively "ftplugin" ftplugin)
- (copy-recursively "syntax" syntax)
- #t))))))
+ '(#:install-plan
+ '(("after" "share/vim/vimfiles/")
+ ("ftplugin" "share/vim/vimfiles/")
+ ("syntax" "share/vim/vimfiles/"))))
(synopsis "Scheme syntax for Vim")
(description
"@code{vim-scheme} provides Scheme support for Vim (R7RS and CHICKEN).")
@@ -467,20 +417,10 @@ trouble using them, because you do not have to remember each snippet name.")
(sha256
(base32
"0ka3qbhsh8lix1vyj4678j7dnchkd8khhirrnn3aylxxf8fpqyg8"))))
- (build-system gnu-build-system)
+ (build-system copy-build-system)
(arguments
- `(#:tests? #f
- #:phases
- (modify-phases %standard-phases
- (delete 'configure)
- (delete 'build)
- (replace 'install
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (vimfiles (string-append out "/share/vim/vimfiles"))
- (colors (string-append vimfiles "/colors")))
- (copy-recursively "colors" colors)
- #t))))))
+ '(#:install-plan
+ '(("colors" "share/vim/vimfiles/"))))
(synopsis "Dark color theme for Vim")
(description
"@code{vim-luna} is a dark color theme for Vim.")
@@ -504,22 +444,11 @@ trouble using them, because you do not have to remember each snippet name.")
(sha256
(base32
"0alvrfhmd91zkd9h83s8wvgyq4iakcf6rybsyjd369qbgpcqky89"))))
- (build-system gnu-build-system)
+ (build-system copy-build-system)
(arguments
- `(#:tests? #f
- #:phases
- (modify-phases %standard-phases
- (delete 'configure)
- (delete 'build)
- (replace 'install
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (vimfiles (string-append out "/share/vim/vimfiles"))
- (doc (string-append vimfiles "/doc"))
- (autoload (string-append vimfiles "/autoload")))
- (copy-recursively "doc" doc)
- (copy-recursively "autoload" autoload)
- #t))))))
+ '(#:install-plan
+ '(("doc" "share/vim/vimfiles/")
+ ("autoload" "share/vim/vimfiles/"))))
(synopsis "Context filetype library for Vim")
(description
"@code{vim-context-filetype} is context filetype library for Vim script.")
@@ -540,28 +469,14 @@ trouble using them, because you do not have to remember each snippet name.")
(sha256
(base32
"1jbn5jxadccmcz01j94d0i1bp74cixr0fpxxf1h0aqdf1ljk3d7n"))))
- (build-system gnu-build-system)
+ (build-system copy-build-system)
(arguments
- '(#:tests? #f
- #:phases
- (modify-phases %standard-phases
- (delete 'configure)
- (delete 'build)
- (replace 'install
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (vimfiles (string-append out "/share/vim/vimfiles"))
- (autoload (string-append vimfiles "/autoload"))
- (doc (string-append vimfiles "/doc"))
- (ftdetect (string-append vimfiles "/ftdetect"))
- (plugin (string-append vimfiles "/plugin"))
- (syntax (string-append vimfiles "/syntax")))
- (copy-recursively "autoload" autoload)
- (copy-recursively "doc" doc)
- (copy-recursively "ftdetect" ftdetect)
- (copy-recursively "plugin" plugin)
- (copy-recursively "syntax" syntax)
- #t))))))
+ '(#:install-plan
+ '(("autoload" "share/vim/vimfiles/")
+ ("doc" "share/vim/vimfiles/")
+ ("ftdetect" "share/vim/vimfiles/")
+ ("plugin" "share/vim/vimfiles/")
+ ("syntax" "share/vim/vimfiles/"))))
(home-page "https://github.com/tpope/vim-fugitive")
(synopsis "Vim plugin to work with Git")
(description "Vim-fugitive is a wrapper for Vim that complements the
@@ -583,26 +498,13 @@ commit or run any Git arbitrary command.")
(sha256
(base32
"1aksmr73648pvyc75pfdz28k2d4ky52rn7xiwcv7lz87q3vqld7k"))))
- (build-system gnu-build-system)
+ (build-system copy-build-system)
(arguments
- `(#:tests? #f
- #:phases
- (modify-phases %standard-phases
- (delete 'configure)
- (delete 'build)
- (replace 'install
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (vimfiles (string-append out "/share/vim/vimfiles"))
- (autoload (string-append vimfiles "/autoload"))
- (doc (string-append vimfiles "/doc"))
- (t (string-append vimfiles "/t"))
- (plugin (string-append vimfiles "/plugin")))
- (copy-recursively "autoload" autoload)
- (copy-recursively "doc" doc)
- (copy-recursively "plugin" plugin)
- (copy-recursively "t" t)
- #t))))))
+ '(#:install-plan
+ '(("autoload" "share/vim/vimfiles/")
+ ("doc" "share/vim/vimfiles/")
+ ("plugin" "share/vim/vimfiles/")
+ ("t" "share/vim/vimfiles/"))))
(synopsis "Statusline for Vim")
(description
"@code{vim-airline} is an extensible statusline for Vim.
@@ -628,24 +530,12 @@ and powerline symbols, etc.")
(sha256
(base32
"1sb7nb7j7bz0pv1c9bgdy0smhr0jk2b1vbdv9yzghg5lrknpsbr6"))))
- (build-system gnu-build-system)
+ (build-system copy-build-system)
(arguments
- `(#:tests? #f
- #:phases
- (modify-phases %standard-phases
- (delete 'configure)
- (delete 'build)
- (replace 'install
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (vimfiles (string-append out "/share/vim/vimfiles"))
- (doc (string-append vimfiles "/doc"))
- (plugin (string-append vimfiles "/plugin"))
- (autoload (string-append vimfiles "/autoload")))
- (copy-recursively "doc" doc)
- (copy-recursively "autoload" autoload)
- (copy-recursively "plugin" plugin)
- #t))))))
+ '(#:install-plan
+ '(("autoload" "share/vim/vimfiles/")
+ ("doc" "share/vim/vimfiles/")
+ ("plugin" "share/vim/vimfiles/"))))
(synopsis "Collection of themes for Vim-airline")
(description
"@code{vim-airline-themes} is a collection of themes for @code{vim-airline}.")
@@ -665,26 +555,13 @@ and powerline symbols, etc.")
(file-name (git-file-name name version))
(sha256
(base32 "0j91f72jaz1s6aw1hpjiz30vk2ds2aqd9gisk91grsldy6nz6hhz"))))
- (build-system gnu-build-system)
+ (build-system copy-build-system)
(arguments
- `(#:tests? #f
- #:phases
- (modify-phases %standard-phases
- (delete 'configure)
- (delete 'build)
- (replace 'install
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (vimfiles (string-append out "/share/vim/vimfiles"))
- (doc (string-append vimfiles "/doc"))
- (plugin (string-append vimfiles "/plugin"))
- (autoload (string-append vimfiles "/autoload"))
- (syntax-checkers (string-append vimfiles "/syntax_checkers")))
- (copy-recursively "doc" doc)
- (copy-recursively "autoload" autoload)
- (copy-recursively "plugin" plugin)
- (copy-recursively "syntax_checkers" syntax-checkers)
- #t))))))
+ '(#:install-plan
+ '(("autoload" "share/vim/vimfiles/")
+ ("doc" "share/vim/vimfiles/")
+ ("plugin" "share/vim/vimfiles/")
+ ("syntax_checkers" "share/vim/vimfiles/"))))
(synopsis "Syntax checking plugin for Vim")
(description
"Vim-syntastic is a syntax checking plugin for Vim. It runs files through
@@ -712,30 +589,20 @@ are detected, the user is notified.")
(snippet
'(begin
(delete-file-recursively "plugin/editorconfig-core-py") #t))))
- (build-system gnu-build-system)
+ (build-system copy-build-system)
(arguments
- '(#:tests? #f ; tests require ruby and plugin-test repository
- #:phases
+ '(#:phases
(modify-phases %standard-phases
- (delete 'configure)
- (delete 'build)
(add-after 'unpack 'patch-editorconfig-path
(lambda* (#:key inputs #:allow-other-keys)
(let ((editorconfig (assoc-ref inputs "editorconfig-core")))
(substitute* "plugin/editorconfig.vim"
(("/opt") editorconfig))
- #t)))
- (replace 'install
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (vimfiles (string-append out "/share/vim/vimfiles"))
- (doc (string-append vimfiles "/doc"))
- (plugin (string-append vimfiles "/plugin"))
- (autoload (string-append vimfiles "/autoload")))
- (copy-recursively "doc" doc)
- (copy-recursively "autoload" autoload)
- (copy-recursively "plugin" plugin)
- #t))))))
+ #t))))
+ #:install-plan
+ '(("autoload" "share/vim/vimfiles/")
+ ("doc" "share/vim/vimfiles/")
+ ("plugin" "share/vim/vimfiles/"))))
(inputs
`(("editorconfig-core" ,editorconfig-core-c)))
(home-page "https://editorconfig.org/")
@@ -752,24 +619,11 @@ editors.")
(inherit vim-syntastic)
(name "neovim-syntastic")
(arguments
- `(#:tests? #f
- #:phases
- (modify-phases %standard-phases
- (delete 'configure)
- (delete 'build)
- (replace 'install
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (vimfiles (string-append out "/share/nvim/site"))
- (doc (string-append vimfiles "/doc"))
- (plugin (string-append vimfiles "/plugin"))
- (autoload (string-append vimfiles "/autoload"))
- (syntax-checkers (string-append vimfiles "/syntax_checkers")))
- (copy-recursively "doc" doc)
- (copy-recursively "autoload" autoload)
- (copy-recursively "plugin" plugin)
- (copy-recursively "syntax_checkers" syntax-checkers)
- #t))))))
+ '(#:install-plan
+ '(("autoload" "share/nvim/site/")
+ ("doc" "share/nvim/site/")
+ ("plugin" "share/nvim/site/")
+ ("syntax_checkers" "share/nvim/site/"))))
(synopsis "Syntax checking plugin for Neovim")
(description
"Vim-syntastic is a syntax checking plugin for Neovim. It runs files through
@@ -980,22 +834,15 @@ through its msgpack-rpc API.")
(sha256
(base32
"1f8h8m96fqh3f9hy87spgh9kdqzyxl11n9s3rywvyq5xhn489bnk"))))
- (build-system gnu-build-system)
+ (build-system copy-build-system)
(arguments
- '(#:tests? #f
- #:phases
- (modify-phases %standard-phases
- (delete 'configure)
- (delete 'build)
- (replace 'install
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (vimfiles (string-append out "/share/vim/vimfiles")))
- (for-each
- (lambda (dir)
- (copy-recursively dir (string-append vimfiles "/" dir)))
- '("compiler" "doc" "indent" "ftdetect" "ftplugin" "syntax"))
- #t))))))
+ '(#:install-plan
+ '(("compiler" "share/vim/vimfiles/")
+ ("doc" "share/vim/vimfiles/")
+ ("indent" "share/vim/vimfiles/")
+ ("ftdetect" "share/vim/vimfiles/")
+ ("ftplugin" "share/vim/vimfiles/")
+ ("syntax" "share/vim/vimfiles/"))))
(home-page "https://gitlab.com/Efraim/guix.vim")
(synopsis "Guix integration in Vim")
(description "This package provides support for GNU Guix in Vim.")
diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm
index 78a2c322af..becc505b34 100644
--- a/gnu/packages/vpn.scm
+++ b/gnu/packages/vpn.scm
@@ -8,7 +8,7 @@
;;; Copyright © 2017 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2018 Pierre Langlois <pierre.langlois@gmx.com>
;;; Copyright © 2018 Meiyo Peng <meiyo.peng@gmail.com>
-;;; Copyright © 2019 Leo Famulari <leo@famulari.name>
+;;; Copyright © 2019, 2020 Leo Famulari <leo@famulari.name>
;;; Copyright © 2019 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2019 Ricardo Wurmus <rekado@elephly.net>
;;;
@@ -471,6 +471,7 @@ The peer-to-peer VPN implements a Layer 2 (Ethernet) network between the peers
`(#:tests? #f ; No tests available.
#:make-flags
(list "CC=gcc"
+ "--directory=src/tools"
"WITH_BASHCOMPLETION=yes"
;; Build and install the helper script wg-quick(8).
"WITH_WGQUICK=yes"
@@ -498,17 +499,7 @@ The peer-to-peer VPN implements a Layer 2 (Ethernet) network between the peers
(call-with-output-file output
(lambda (port)
(format port "~a" str))))
- #t))
- (add-after 'make-patch 'chdir
- (lambda _
- (chdir "src/tools")
- #t))
- ;; Otherwise the 'install-license-file' phase installs nothing.
- ;; <https://bugs.gnu.org/34703>
- (add-after 'install 'reset-cwd
- (lambda _
- (chdir "../..")
- #t)))))
+ #t)))))
(inputs
`(("libmnl" ,libmnl)))
(home-page "https://www.wireguard.com/")
@@ -534,28 +525,23 @@ WireGuard support.")
(base32 "0ivc08lds5w39a6f2xdfih9wlk5g724hl3kpdvxvh5yff4l84qb7"))))
(build-system gnu-build-system)
(arguments
- `(#:tests? #f ; no test suite
- #:make-flags
+ `(#:make-flags
(list "CC=gcc"
+ "--directory=src"
"WITH_BASHCOMPLETION=yes"
;; Install the ‘simple and dirty’ helper script wg-quick(8).
"WITH_WGQUICK=yes"
(string-append "PREFIX=" (assoc-ref %outputs "out"))
;; Currently used only to create an empty /etc/wireguard directory.
(string-append "SYSCONFDIR=no-thanks"))
+ ;; The test suite is meant to be run interactively. It runs Clang's
+ ;; scan-build static analyzer and then starts a web server to display the
+ ;; results.
+ #:tests? #f
#:phases
(modify-phases %standard-phases
- (add-after 'unpack 'enter-source-directory
- (lambda _
- (chdir "src")
- #t))
- (delete 'configure) ; no configure script
- (add-after 'install 'reset-cwd
- ;; Otherwise the 'install-license-file' phase installs nothing.
- ;; <https://bugs.gnu.org/34703>
- (lambda _
- (chdir "..")
- #t)))))
+ ;; No configure script
+ (delete 'configure))))
(home-page "https://www.wireguard.com/")
(synopsis "Tools for configuring WireGuard tunnels")
(description
diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm
index 35defc326b..541ef3cd7a 100644
--- a/gnu/packages/wine.scm
+++ b/gnu/packages/wine.scm
@@ -76,21 +76,26 @@
(define-public wine
(package
(name "wine")
- (version "5.0")
+ (version "5.3")
(source
(origin
(method url-fetch)
- (uri (string-append "https://dl.winehq.org/wine/source/"
- (version-major+minor version)
- "/wine-" version ".tar.xz"))
+ (uri (let ((dir (string-append
+ (version-major version)
+ (if (string-suffix? ".0" (version-major+minor version))
+ ".0/"
+ ".x/"))))
+ (string-append "https://dl.winehq.org/wine/source/" dir
+ "wine-" version ".tar.xz")))
(sha256
- (base32 "1d0kcy338radq07hrnzcpc9lc9j2fvzjh37q673002x8d6x5058q"))))
+ (base32 "1pkzj3656ad0vmc7ciwfzn45lb2kxwbyymfwnqaa105dicicf6wv"))))
(build-system gnu-build-system)
- (native-inputs `(("pkg-config" ,pkg-config)
- ("gettext" ,gettext-minimal)
- ("flex" ,flex)
- ("bison" ,bison)
- ("perl" ,perl)))
+ (native-inputs
+ `(("bison" ,bison)
+ ("flex" ,flex)
+ ("gettext" ,gettext-minimal)
+ ("perl" ,perl)
+ ("pkg-config" ,pkg-config)))
(inputs
`(("alsa-lib" ,alsa-lib)
("dbus" ,dbus)
@@ -323,7 +328,7 @@ integrate Windows applications into your desktop.")
(define-public wine-staging-patchset-data
(package
(name "wine-staging-patchset-data")
- (version "5.0")
+ (version "5.3")
(source
(origin
(method git-fetch)
@@ -332,7 +337,7 @@ integrate Windows applications into your desktop.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "054m2glvav29qnlgr3p36kahyv3kbxzba82djzqpc7cmsrin0d3f"))))
+ (base32 "1mvhrvshyrj7lgjgka735z6j8idwd6j58bpg5nz1slgmlh1llrs6"))))
(build-system trivial-build-system)
(native-inputs
`(("bash" ,bash)
@@ -382,7 +387,7 @@ integrate Windows applications into your desktop.")
"/wine-" version ".tar.xz")))
(file-name (string-append name "-" version ".tar.xz"))
(sha256
- (base32 "1d0kcy338radq07hrnzcpc9lc9j2fvzjh37q673002x8d6x5058q"))))
+ (base32 "1pkzj3656ad0vmc7ciwfzn45lb2kxwbyymfwnqaa105dicicf6wv"))))
(inputs `(("autoconf" ,autoconf) ; for autoreconf
("ffmpeg" ,ffmpeg)
("gtk+" ,gtk+)
@@ -554,7 +559,7 @@ version)")
;; This package provides 32-bit dxvk libraries on 64-bit systems.
(package
(name "dxvk32")
- (version "1.5.4")
+ (version "1.5.5")
(home-page "https://github.com/doitsujin/dxvk/")
(source (origin
(method git-fetch)
@@ -564,7 +569,7 @@ version)")
(file-name (git-file-name name version))
(sha256
(base32
- "0yhxd5rnn5mcvcb2n062z9wqqwxjq5c0rzfbjz1z9ppznj8gn37i"))))
+ "1inl0qswgvbp0fs76md86ilqf9mbshkpjm8ga81khn9zd6v3fvan"))))
(build-system meson-build-system)
(arguments
`(#:system "i686-linux"
@@ -607,7 +612,8 @@ Use @command{setup_dxvk} to install the required libraries to a Wine prefix.")
(dxvk32 (assoc-ref inputs "dxvk32")))
(mkdir-p (string-append out "/lib32"))
(copy-recursively (string-append dxvk32 "/lib")
- (string-append out "/lib32"))))))
+ (string-append out "/lib32"))
+ #t))))
'())
(add-after 'install 'install-setup
(lambda* (#:key inputs outputs #:allow-other-keys)
diff --git a/gnu/services/herd.scm b/gnu/services/herd.scm
index 112a7dc104..35d69376d0 100644
--- a/gnu/services/herd.scm
+++ b/gnu/services/herd.scm
@@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
-;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
+;;; Copyright © 2017, 2020 Mathieu Othacehe <m.othacehe@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -55,7 +55,8 @@
load-services
load-services/safe
start-service
- stop-service))
+ stop-service
+ restart-service))
;;; Commentary:
;;;
@@ -272,6 +273,10 @@ when passed a service with an already-registered name."
(with-shepherd-action name ('stop) result
result))
+(define (restart-service name)
+ (with-shepherd-action name ('restart) result
+ result))
+
;; Local Variables:
;; eval: (put 'alist-let* 'scheme-indent-function 2)
;; eval: (put 'with-shepherd 'scheme-indent-function 1)
diff --git a/gnu/system.scm b/gnu/system.scm
index 01baa248a2..2e6d03272d 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -142,16 +142,11 @@
(define (bootable-kernel-arguments system root-device)
"Return a list of kernel arguments (gexps) to boot SYSTEM from ROOT-DEVICE."
(list (string-append "--root="
- (cond ((uuid? root-device)
-
- ;; Note: Always use the DCE format because that's
- ;; what (gnu build linux-boot) expects for the
- ;; '--root' kernel command-line option.
- (uuid->string (uuid-bytevector root-device)
- 'dce))
- ((file-system-label? root-device)
- (file-system-label->string root-device))
- (else root-device)))
+ ;; Note: Always use the DCE format because that's what
+ ;; (gnu build linux-boot) expects for the '--root'
+ ;; kernel command-line option.
+ (file-system-device->string root-device
+ #:uuid-type 'dce))
#~(string-append "--system=" #$system)
#~(string-append "--load=" #$system "/boot")))
diff --git a/gnu/system/file-systems.scm b/gnu/system/file-systems.scm
index d47a514b66..3b599efa8e 100644
--- a/gnu/system/file-systems.scm
+++ b/gnu/system/file-systems.scm
@@ -30,6 +30,7 @@
#:export (file-system
file-system?
file-system-device
+ file-system-device->string
file-system-title ;deprecated
file-system-mount-point
file-system-type
@@ -235,6 +236,20 @@ where both FILE1 and FILE2 are absolute file name. For example:
(()
#f)))))))
+(define* (file-system-device->string device #:key uuid-type)
+ "Return the string representations of the DEVICE field of a <file-system>
+record. When the device is a UUID, its representation is chosen depending on
+UUID-TYPE, a symbol such as 'dce or 'iso9660."
+ (match device
+ ((? file-system-label?)
+ (file-system-label->string device))
+ ((? uuid?)
+ (if uuid-type
+ (uuid->string (uuid-bytevector device) uuid-type)
+ (uuid->string device)))
+ ((? string?)
+ device)))
+
(define (file-system-needed-for-boot? fs)
"Return true if FS has the 'needed-for-boot?' flag set, or if it holds the
store--e.g., if FS is the root file system."
diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm
index 81b2e06ba2..03a511cdde 100644
--- a/gnu/system/vm.scm
+++ b/gnu/system/vm.scm
@@ -609,13 +609,7 @@ TYPE (one of 'iso9660 or 'dce). Return a UUID object."
(let ((device (file-system-device fs)))
(list (file-system-mount-point fs)
(file-system-type fs)
- (cond ((file-system-label? device)
- (file-system-label->string device))
- ((uuid? device)
- (uuid->string device))
- ((string? device)
- device)
- (else #f))
+ (file-system-device->string device)
(file-system-options fs))))
(if (eq? type 'iso9660)
diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm
index b5e3a5630e..ac2475c551 100644
--- a/guix/scripts/system.scm
+++ b/guix/scripts/system.scm
@@ -517,12 +517,7 @@ list of services."
(cond ((uuid? root-device) 0)
((file-system-label? root-device) 1)
(else 2))
- (cond ((uuid? root-device)
- (uuid->string root-device))
- ((file-system-label? root-device)
- (file-system-label->string root-device))
- (else
- root-device)))
+ (file-system-device->string root-device))
(format #t (G_ " kernel: ~a~%") kernel)