summaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2019-04-23 19:43:59 +0200
committerMarius Bakke <mbakke@fastmail.com>2019-04-23 19:43:59 +0200
commit37da4fbe1562583589eeddb4be8e11bece80fd35 (patch)
tree4d8a454b27e62f9b8d7b0fe641a9f6aa6de2402c /gnu
parent73326e742d82b6706333885eca770f7518636b1f (diff)
parente01bd1a67447c1f2a2b5b03e8ea8fbbccd2cd5bd (diff)
Merge branch 'master' into staging
Diffstat (limited to 'gnu')
-rw-r--r--gnu/build/vm.scm24
-rw-r--r--gnu/installer.scm14
-rw-r--r--gnu/installer/final.scm8
-rw-r--r--gnu/installer/keymap.scm8
-rw-r--r--gnu/installer/newt/final.scm9
-rw-r--r--gnu/installer/newt/keymap.scm32
-rw-r--r--gnu/installer/newt/locale.scm30
-rw-r--r--gnu/installer/newt/page.scm7
-rw-r--r--gnu/installer/newt/timezone.scm5
-rw-r--r--gnu/installer/services.scm51
-rw-r--r--gnu/installer/steps.scm26
-rw-r--r--gnu/installer/utils.scm14
-rw-r--r--gnu/local.mk7
-rw-r--r--gnu/packages/admin.scm17
-rw-r--r--gnu/packages/astronomy.scm10
-rw-r--r--gnu/packages/audio.scm40
-rw-r--r--gnu/packages/bioinformatics.scm25
-rw-r--r--gnu/packages/bootloaders.scm3
-rw-r--r--gnu/packages/cpp.scm9
-rw-r--r--gnu/packages/cran.scm86
-rw-r--r--gnu/packages/cups.scm4
-rw-r--r--gnu/packages/databases.scm18
-rw-r--r--gnu/packages/dictionaries.scm15
-rw-r--r--gnu/packages/dns.scm4
-rw-r--r--gnu/packages/elf.scm8
-rw-r--r--gnu/packages/emacs-xyz.scm6
-rw-r--r--gnu/packages/fpga.scm6
-rw-r--r--gnu/packages/game-development.scm4
-rw-r--r--gnu/packages/games.scm139
-rw-r--r--gnu/packages/gnupg.scm13
-rw-r--r--gnu/packages/guile-xyz.scm124
-rw-r--r--gnu/packages/haskell.scm7
-rw-r--r--gnu/packages/ibus.scm37
-rw-r--r--gnu/packages/image.scm45
-rw-r--r--gnu/packages/libedit.scm9
-rw-r--r--gnu/packages/libreoffice.scm20
-rw-r--r--gnu/packages/linux.scm20
-rw-r--r--gnu/packages/mail.scm80
-rw-r--r--gnu/packages/maths.scm14
-rw-r--r--gnu/packages/mtools.scm22
-rw-r--r--gnu/packages/music.scm59
-rw-r--r--gnu/packages/nano.scm6
-rw-r--r--gnu/packages/ocaml.scm4
-rw-r--r--gnu/packages/package-management.scm9
-rw-r--r--gnu/packages/parallel.scm4
-rw-r--r--gnu/packages/password-utils.scm70
-rw-r--r--gnu/packages/patches/grub-efi-fat-serial-number.patch27
-rw-r--r--gnu/packages/patches/linkchecker-tests-require-network.patch (renamed from gnu/packages/patches/linkchecker-mark-more-tests-that-require-the-network.patch)0
-rw-r--r--gnu/packages/patches/mtools-mformat-uninitialized.patch20
-rw-r--r--gnu/packages/patches/ocaml-dose3-add-unix-dependency.patch (renamed from gnu/packages/patches/ocaml-dose3-Add-unix-as-dependency-to-dose3.common-in-META.in.patch)0
-rw-r--r--gnu/packages/patches/openssh-CVE-2018-20685.patch44
-rw-r--r--gnu/packages/perl.scm15
-rw-r--r--gnu/packages/python-crypto.scm4
-rw-r--r--gnu/packages/python-web.scm8
-rw-r--r--gnu/packages/python-xyz.scm117
-rw-r--r--gnu/packages/security-token.scm4
-rw-r--r--gnu/packages/shellutils.scm11
-rw-r--r--gnu/packages/ssh.scm5
-rw-r--r--gnu/packages/statistics.scm4
-rw-r--r--gnu/packages/sync.scm4
-rw-r--r--gnu/packages/textutils.scm2
-rw-r--r--gnu/packages/valgrind.scm15
-rw-r--r--gnu/packages/version-control.scm26
-rw-r--r--gnu/packages/video.scm10
-rw-r--r--gnu/packages/vulkan.scm68
-rw-r--r--gnu/packages/web.scm3
-rw-r--r--gnu/packages/wm.scm4
-rw-r--r--gnu/packages/xdisorg.scm4
-rw-r--r--gnu/packages/xml.scm4
-rw-r--r--gnu/packages/xorg.scm14
-rw-r--r--gnu/services/authentication.scm14
-rw-r--r--gnu/services/shepherd.scm26
-rw-r--r--gnu/system.scm2
-rw-r--r--gnu/system/install.scm6
-rw-r--r--gnu/system/linux-container.scm3
-rw-r--r--gnu/system/shadow.scm5
76 files changed, 1031 insertions, 610 deletions
diff --git a/gnu/build/vm.scm b/gnu/build/vm.scm
index e15ca4d5fb1..f2953621ec5 100644
--- a/gnu/build/vm.scm
+++ b/gnu/build/vm.scm
@@ -37,6 +37,7 @@
37 #:use-module (ice-9 popen) 37 #:use-module (ice-9 popen)
38 #:use-module (srfi srfi-1) 38 #:use-module (srfi srfi-1)
39 #:use-module (srfi srfi-9) 39 #:use-module (srfi srfi-9)
40 #:use-module (srfi srfi-19)
40 #:use-module (srfi srfi-26) 41 #:use-module (srfi srfi-26)
41 #:export (qemu-command 42 #:export (qemu-command
42 load-in-linux-vm 43 load-in-linux-vm
@@ -458,6 +459,25 @@ GRUB configuration and OS-DRV as the stuff in it."
458 closures) 459 closures)
459 (register-bootcfg-root "/tmp/root" config-file)) 460 (register-bootcfg-root "/tmp/root" config-file))
460 461
462 ;; 'grub-mkrescue' calls out to mtools programs to create 'efi.img', a FAT
463 ;; file system image, and mtools honors SOURCE_DATE_EPOCH for the mtime of
464 ;; those files. The epoch for FAT is Jan. 1st 1980, not 1970, so choose
465 ;; that.
466 (setenv "SOURCE_DATE_EPOCH"
467 (number->string
468 (time-second
469 (date->time-utc (make-date 0 0 0 0 1 1 1980 0)))))
470
471 ;; Our patched 'grub-mkrescue' honors this environment variable and passes
472 ;; it to 'mformat', which makes it the serial number of 'efi.img'. This
473 ;; allows for deterministic builds.
474 (setenv "GRUB_FAT_SERIAL_NUMBER"
475 (number->string (if volume-uuid
476 (string-hash (iso9660-uuid->string volume-uuid)
477 (expt 2 32))
478 #x77777777)
479 16))
480
461 (let ((pipe 481 (let ((pipe
462 (apply open-pipe* OPEN_WRITE 482 (apply open-pipe* OPEN_WRITE
463 grub-mkrescue "-o" target 483 grub-mkrescue "-o" target
@@ -471,6 +491,10 @@ GRUB configuration and OS-DRV as the stuff in it."
471 "mnt=/tmp/root/mnt" 491 "mnt=/tmp/root/mnt"
472 "-path-list" "-" 492 "-path-list" "-"
473 "--" 493 "--"
494
495 ;; Set all timestamps to 1.
496 "-volume_date" "all_file_dates" "=1"
497
474 "-volid" (string-upcase volume-id) 498 "-volid" (string-upcase volume-id)
475 (if volume-uuid 499 (if volume-uuid
476 `("-volume_date" "uuid" 500 `("-volume_date" "uuid"
diff --git a/gnu/installer.scm b/gnu/installer.scm
index 6a7a5562717..881c40ee9b6 100644
--- a/gnu/installer.scm
+++ b/gnu/installer.scm
@@ -343,6 +343,20 @@ selected keymap."
343 ;; Add some binaries used by the installers to PATH. 343 ;; Add some binaries used by the installers to PATH.
344 #$set-installer-path 344 #$set-installer-path
345 345
346 ;; Arrange for language and territory name translations to be
347 ;; available. We need them at run time, not just compile time,
348 ;; because some territories have several corresponding languages
349 ;; (e.g., "French" is always displayed as "français", but
350 ;; "Belgium" could be translated to Dutch, French, or German.)
351 (bindtextdomain "iso_639-3" ;languages
352 #+(file-append iso-codes "/share/locale"))
353 (bindtextdomain "iso_3166-1" ;territories
354 #+(file-append iso-codes "/share/locale"))
355
356 ;; Likewise for XKB keyboard layout names.
357 (bindtextdomain "xkeyboard-config"
358 #+(file-append xkeyboard-config "/share/locale"))
359
346 (let* ((current-installer newt-installer) 360 (let* ((current-installer newt-installer)
347 (steps (#$steps current-installer))) 361 (steps (#$steps current-installer)))
348 ((installer-init current-installer)) 362 ((installer-init current-installer))
diff --git a/gnu/installer/final.scm b/gnu/installer/final.scm
index e1c62f5ce01..07946f72c34 100644
--- a/gnu/installer/final.scm
+++ b/gnu/installer/final.scm
@@ -24,13 +24,15 @@
24 #:use-module (guix build utils) 24 #:use-module (guix build utils)
25 #:export (install-system)) 25 #:export (install-system))
26 26
27(define (install-system) 27(define (install-system locale)
28 "Start COW-STORE service on target directory and launch guix install command 28 "Start COW-STORE service on target directory and launch guix install command
29in a subshell." 29in a subshell. LOCALE must be the locale name under which that command will
30run, or #f."
30 (let ((install-command 31 (let ((install-command
31 (format #f "guix system init ~a ~a" 32 (format #f "guix system init ~a ~a"
32 (%installer-configuration-file) 33 (%installer-configuration-file)
33 (%installer-target-dir)))) 34 (%installer-target-dir))))
34 (mkdir-p (%installer-target-dir)) 35 (mkdir-p (%installer-target-dir))
35 (start-service 'cow-store (list (%installer-target-dir))) 36 (start-service 'cow-store (list (%installer-target-dir)))
36 (false-if-exception (run-shell-command install-command)))) 37 (false-if-exception (run-shell-command install-command
38 #:locale locale))))
diff --git a/gnu/installer/keymap.scm b/gnu/installer/keymap.scm
index d66b376d9ca..df9fc5e441e 100644
--- a/gnu/installer/keymap.scm
+++ b/gnu/installer/keymap.scm
@@ -36,6 +36,7 @@
36 make-x11-keymap-layout 36 make-x11-keymap-layout
37 x11-keymap-layout? 37 x11-keymap-layout?
38 x11-keymap-layout-name 38 x11-keymap-layout-name
39 x11-keymap-layout-synopsis
39 x11-keymap-layout-description 40 x11-keymap-layout-description
40 x11-keymap-layout-variants 41 x11-keymap-layout-variants
41 42
@@ -60,7 +61,8 @@
60 x11-keymap-layout make-x11-keymap-layout 61 x11-keymap-layout make-x11-keymap-layout
61 x11-keymap-layout? 62 x11-keymap-layout?
62 (name x11-keymap-layout-name) ;string 63 (name x11-keymap-layout-name) ;string
63 (description x11-keymap-layout-description) ;string 64 (synopsis x11-keymap-layout-synopsis) ;string (e.g., "en")
65 (description x11-keymap-layout-description) ;string (a whole phrase)
64 (variants x11-keymap-layout-variants)) ;list of <x11-keymap-variant> 66 (variants x11-keymap-layout-variants)) ;list of <x11-keymap-variant>
65 67
66(define-record-type* <x11-keymap-variant> 68(define-record-type* <x11-keymap-variant>
@@ -117,6 +119,8 @@ Configuration Database, describing possible XKB configurations."
117 (variantList ,[variant -> v] ...)) 119 (variantList ,[variant -> v] ...))
118 (x11-keymap-layout 120 (x11-keymap-layout
119 (name name) 121 (name name)
122 (synopsis (car
123 (assoc-ref rest-layout 'shortDescription)))
120 (description (car 124 (description (car
121 (assoc-ref rest-layout 'description))) 125 (assoc-ref rest-layout 'description)))
122 (variants (list v ...)))] 126 (variants (list v ...)))]
@@ -126,6 +130,8 @@ Configuration Database, describing possible XKB configurations."
126 . ,rest-layout)) 130 . ,rest-layout))
127 (x11-keymap-layout 131 (x11-keymap-layout
128 (name name) 132 (name name)
133 (synopsis (car
134 (assoc-ref rest-layout 'shortDescription)))
129 (description (car 135 (description (car
130 (assoc-ref rest-layout 'description))) 136 (assoc-ref rest-layout 'description)))
131 (variants '()))])) 137 (variants '()))]))
diff --git a/gnu/installer/newt/final.scm b/gnu/installer/newt/final.scm
index 645c1e8689e..f492c5dbb71 100644
--- a/gnu/installer/newt/final.scm
+++ b/gnu/installer/newt/final.scm
@@ -65,22 +65,23 @@ press the button to reboot.")))
65 (G_ "The final system installation step failed. You can retry the \ 65 (G_ "The final system installation step failed. You can retry the \
66last step, or restart the installer."))) 66last step, or restart the installer.")))
67 67
68(define (run-install-shell) 68(define (run-install-shell locale)
69 (clear-screen) 69 (clear-screen)
70 (newt-suspend) 70 (newt-suspend)
71 (let ((install-ok? (install-system))) 71 (let ((install-ok? (install-system locale)))
72 (newt-resume) 72 (newt-resume)
73 install-ok?)) 73 install-ok?))
74 74
75(define (run-final-page result prev-steps) 75(define (run-final-page result prev-steps)
76 (let* ((configuration (format-configuration prev-steps result)) 76 (let* ((configuration (format-configuration prev-steps result))
77 (user-partitions (result-step result 'partition)) 77 (user-partitions (result-step result 'partition))
78 (locale (result-step result 'locale))
78 (install-ok? 79 (install-ok?
79 (with-mounted-partitions 80 (with-mounted-partitions
80 user-partitions 81 user-partitions
81 (configuration->file configuration) 82 (configuration->file configuration)
82 (run-config-display-page) 83 (run-config-display-page)
83 (run-install-shell)))) 84 (run-install-shell locale))))
84 (if install-ok? 85 (if install-ok?
85 (run-install-success-page) 86 (run-install-success-page)
86 (run-install-failed-page)))) 87 (run-install-failed-page))))
diff --git a/gnu/installer/newt/keymap.scm b/gnu/installer/newt/keymap.scm
index 948b54783c0..2908ba7f0e9 100644
--- a/gnu/installer/newt/keymap.scm
+++ b/gnu/installer/newt/keymap.scm
@@ -28,6 +28,7 @@
28 #:use-module (srfi srfi-26) 28 #:use-module (srfi srfi-26)
29 #:use-module (srfi srfi-34) 29 #:use-module (srfi srfi-34)
30 #:use-module (srfi srfi-35) 30 #:use-module (srfi srfi-35)
31 #:use-module (ice-9 i18n)
31 #:use-module (ice-9 match) 32 #:use-module (ice-9 match)
32 #:export (run-keymap-page 33 #:export (run-keymap-page
33 keyboard-layout->configuration)) 34 keyboard-layout->configuration))
@@ -64,14 +65,29 @@
64 65
65(define (sort-layouts layouts) 66(define (sort-layouts layouts)
66 "Sort LAYOUTS list by putting the US layout ahead and return it." 67 "Sort LAYOUTS list by putting the US layout ahead and return it."
68 (define (layout<? layout1 layout2)
69 (let ((text1 (x11-keymap-layout-description layout1))
70 (text2 (x11-keymap-layout-description layout2)))
71 ;; XXX: We're calling 'gettext' more than once per item.
72 (string-locale<? (gettext text1 "xkeyboard-config")
73 (gettext text2 "xkeyboard-config"))))
74
75 (define preferred
76 ;; Two-letter language tag for the preferred keyboard layout.
77 (or (getenv "LANGUAGE") "us"))
78
67 (call-with-values 79 (call-with-values
68 (lambda () 80 (lambda ()
69 (partition 81 (partition
70 (lambda (layout) 82 (lambda (layout)
71 (let ((name (x11-keymap-layout-name layout))) 83 ;; The 'synopsis' field is usually a language code (e.g., "en")
72 (string=? name "us"))) 84 ;; while the 'name' field is a country code (e.g., "us").
85 (or (string=? (x11-keymap-layout-name layout) preferred)
86 (string=? (x11-keymap-layout-synopsis layout) preferred)))
73 layouts)) 87 layouts))
74 (cut append <> <>))) 88 (lambda (main others)
89 (append (sort main layout<?)
90 (sort others layout<?)))))
75 91
76(define (sort-variants variants) 92(define (sort-variants variants)
77 "Sort VARIANTS list by putting the international variant ahead and return it." 93 "Sort VARIANTS list by putting the international variant ahead and return it."
@@ -97,7 +113,8 @@ names of the selected keyboard layout and variant."
97 (run-layout-page 113 (run-layout-page
98 (sort-layouts layouts) 114 (sort-layouts layouts)
99 (lambda (layout) 115 (lambda (layout)
100 (x11-keymap-layout-description layout)))))) 116 (gettext (x11-keymap-layout-description layout)
117 "xkeyboard-config"))))))
101 ;; Propose the user to select a variant among those supported by the 118 ;; Propose the user to select a variant among those supported by the
102 ;; previously selected layout. 119 ;; previously selected layout.
103 (installer-step 120 (installer-step
@@ -111,15 +128,16 @@ names of the selected keyboard layout and variant."
111 (run-variant-page 128 (run-variant-page
112 (sort-variants variants) 129 (sort-variants variants)
113 (lambda (variant) 130 (lambda (variant)
114 (x11-keymap-variant-description 131 (gettext (x11-keymap-variant-description variant)
115 variant)))))))))) 132 "xkeyboard-config"))))))))))
116 133
117 (define (format-result result) 134 (define (format-result result)
118 (let ((layout (x11-keymap-layout-name 135 (let ((layout (x11-keymap-layout-name
119 (result-step result 'layout))) 136 (result-step result 'layout)))
120 (variant (and=> (result-step result 'variant) 137 (variant (and=> (result-step result 'variant)
121 (lambda (variant) 138 (lambda (variant)
122 (x11-keymap-variant-name variant))))) 139 (gettext (x11-keymap-variant-name variant)
140 "xkeyboard-config")))))
123 (list layout (or variant "")))) 141 (list layout (or variant ""))))
124 (format-result 142 (format-result
125 (run-installer-steps #:steps keymap-steps))) 143 (run-installer-steps #:steps keymap-steps)))
diff --git a/gnu/installer/newt/locale.scm b/gnu/installer/newt/locale.scm
index b819d06691f..7108e2960b6 100644
--- a/gnu/installer/newt/locale.scm
+++ b/gnu/installer/newt/locale.scm
@@ -1,5 +1,6 @@
1;;; GNU Guix --- Functional package management for GNU 1;;; GNU Guix --- Functional package management for GNU
2;;; Copyright © 2018 Mathieu Othacehe <m.othacehe@gmail.com> 2;;; Copyright © 2018 Mathieu Othacehe <m.othacehe@gmail.com>
3;;; Copyright © 2019 Ludovic Courtès <ludo@gnu.org>
3;;; 4;;;
4;;; This file is part of GNU Guix. 5;;; This file is part of GNU Guix.
5;;; 6;;;
@@ -30,9 +31,9 @@
30 #:export (run-locale-page)) 31 #:export (run-locale-page))
31 32
32(define (run-language-page languages language->text) 33(define (run-language-page languages language->text)
33 (let ((title (G_ "Locale language"))) 34 (define result
34 (run-listbox-selection-page 35 (run-listbox-selection-page
35 #:title title 36 #:title (G_ "Locale language")
36 #:info-text (G_ "Choose the language to use for the \ 37 #:info-text (G_ "Choose the language to use for the \
37installation process and for the installed system.") 38installation process and for the installed system.")
38 #:info-textbox-width 70 39 #:info-textbox-width 70
@@ -44,7 +45,13 @@ installation process and for the installed system.")
44 (lambda _ 45 (lambda _
45 (raise 46 (raise
46 (condition 47 (condition
47 (&installer-step-abort))))))) 48 (&installer-step-abort))))))
49
50 ;; Immediately install the chosen language so that the territory page that
51 ;; comes after (optionally) is displayed in the chosen language.
52 (setenv "LANGUAGE" result)
53
54 result)
48 55
49(define (run-territory-page territories territory->text) 56(define (run-territory-page territories territory->text)
50 (let ((title (G_ "Locale location"))) 57 (let ((title (G_ "Locale location")))
@@ -155,7 +162,13 @@ glibc locale string and return it."
155 (run-language-page 162 (run-language-page
156 (sort-languages 163 (sort-languages
157 (delete-duplicates (map locale-language supported-locales))) 164 (delete-duplicates (map locale-language supported-locales)))
158 (cut language-code->language-name iso639-languages <>))))) 165 (lambda (language)
166 (let ((english (language-code->language-name iso639-languages
167 language)))
168 (setenv "LANGUAGE" language)
169 (let ((native (gettext english "iso_639-3")))
170 (unsetenv "LANGUAGE")
171 native)))))))
159 (installer-step 172 (installer-step
160 (id 'territory) 173 (id 'territory)
161 (compute 174 (compute
@@ -169,10 +182,11 @@ glibc locale string and return it."
169 ;; supported by the previously selected language. 182 ;; supported by the previously selected language.
170 (run-territory-page 183 (run-territory-page
171 (delete-duplicates (map locale-territory locales)) 184 (delete-duplicates (map locale-territory locales))
172 (lambda (territory-code) 185 (lambda (territory)
173 (if territory-code 186 (if territory
174 (territory-code->territory-name iso3166-territories 187 (let ((english (territory-code->territory-name
175 territory-code) 188 iso3166-territories territory)))
189 (gettext english "iso_3166-1"))
176 (G_ "No location")))))))) 190 (G_ "No location"))))))))
177 (installer-step 191 (installer-step
178 (id 'codeset) 192 (id 'codeset)
diff --git a/gnu/installer/newt/page.scm b/gnu/installer/newt/page.scm
index 8b3fd488e93..5c650652bdc 100644
--- a/gnu/installer/newt/page.scm
+++ b/gnu/installer/newt/page.scm
@@ -21,6 +21,7 @@
21 #:use-module (gnu installer utils) 21 #:use-module (gnu installer utils)
22 #:use-module (gnu installer newt utils) 22 #:use-module (gnu installer newt utils)
23 #:use-module (guix i18n) 23 #:use-module (guix i18n)
24 #:use-module (ice-9 i18n)
24 #:use-module (ice-9 match) 25 #:use-module (ice-9 match)
25 #:use-module (ice-9 receive) 26 #:use-module (ice-9 receive)
26 #:use-module (srfi srfi-1) 27 #:use-module (srfi srfi-1)
@@ -223,7 +224,7 @@ be selected (using the <SPACE> key). It that case, a list containing the
223selected items will be returned. 224selected items will be returned.
224 225
225If SORT-LISTBOX-ITEMS? is set to #t, the listbox items are sorted using 226If SORT-LISTBOX-ITEMS? is set to #t, the listbox items are sorted using
226'string<=' procedure (after being converted to text). 227'string-locale<?' procedure (after being converted to text).
227 228
228If ALLOW-DELETE? is #t, the form will return if the <DELETE> key is pressed, 229If ALLOW-DELETE? is #t, the form will return if the <DELETE> key is pressed,
229otherwise nothing will happen. 230otherwise nothing will happen.
@@ -249,7 +250,7 @@ ITEM was inserted into LISTBOX."
249 items)) 250 items))
250 251
251 (define (sort-listbox-items listbox-items) 252 (define (sort-listbox-items listbox-items)
252 "Return LISTBOX-ITEMS sorted using the 'string<=' procedure on the text 253 "Return LISTBOX-ITEMS sorted using the 'string-locale<?' procedure on the text
253corresponding to each item in the list." 254corresponding to each item in the list."
254 (let* ((items (map (lambda (item) 255 (let* ((items (map (lambda (item)
255 (cons item (listbox-item->text item))) 256 (cons item (listbox-item->text item)))
@@ -258,7 +259,7 @@ corresponding to each item in the list."
258 (sort items (lambda (a b) 259 (sort items (lambda (a b)
259 (let ((text-a (cdr a)) 260 (let ((text-a (cdr a))
260 (text-b (cdr b))) 261 (text-b (cdr b)))
261 (string<= text-a text-b)))))) 262 (string-locale<? text-a text-b))))))
262 (map car sorted-items))) 263 (map car sorted-items)))
263 264
264 ;; Store the last selected listbox item's key. 265 ;; Store the last selected listbox item's key.
diff --git a/gnu/installer/newt/timezone.scm b/gnu/installer/newt/timezone.scm
index 63b44af7293..67bf41ff84d 100644
--- a/gnu/installer/newt/timezone.scm
+++ b/gnu/installer/newt/timezone.scm
@@ -50,12 +50,15 @@ returned."
50 50
51 (define (run-page timezone-tree) 51 (define (run-page timezone-tree)
52 (define (loop path) 52 (define (loop path)
53 ;; XXX: Translation of time zones isn't perfect here because the
54 ;; "iso_3166-1" domain contains translation for "territories" (like
55 ;; "Antarctic") but not for continents (like "Africa").
53 (let ((timezones (locate-children timezone-tree path))) 56 (let ((timezones (locate-children timezone-tree path)))
54 (run-listbox-selection-page 57 (run-listbox-selection-page
55 #:title (G_ "Timezone") 58 #:title (G_ "Timezone")
56 #:info-text (G_ "Please select a timezone.") 59 #:info-text (G_ "Please select a timezone.")
57 #:listbox-items timezones 60 #:listbox-items timezones
58 #:listbox-item->text identity 61 #:listbox-item->text (cut gettext <> "iso_3166-1")
59 #:button-text (if (null? path) 62 #:button-text (if (null? path)
60 (G_ "Exit") 63 (G_ "Exit")
61 (G_ "Back")) 64 (G_ "Back"))
diff --git a/gnu/installer/services.scm b/gnu/installer/services.scm
index 4dbfe74bf99..6d9d65e8c56 100644
--- a/gnu/installer/services.scm
+++ b/gnu/installer/services.scm
@@ -20,7 +20,6 @@
20(define-module (gnu installer services) 20(define-module (gnu installer services)
21 #:use-module (guix records) 21 #:use-module (guix records)
22 #:use-module (srfi srfi-1) 22 #:use-module (srfi srfi-1)
23 #:use-module (ice-9 match)
24 #:export (system-service? 23 #:export (system-service?
25 system-service-name 24 system-service-name
26 system-service-type 25 system-service-type
@@ -37,7 +36,10 @@
37 system-service? 36 system-service?
38 (name system-service-name) ;string 37 (name system-service-name) ;string
39 (type system-service-type) ;'desktop | 'networking 38 (type system-service-type) ;'desktop | 'networking
40 (snippet system-service-snippet)) ;sexp 39 (snippet system-service-snippet ;list of sexps
40 (default '()))
41 (packages system-service-packages ;list of sexps
42 (default '())))
41 43
42;; This is the list of desktop environments supported as services. 44;; This is the list of desktop environments supported as services.
43(define %system-services 45(define %system-services
@@ -51,26 +53,38 @@
51 (list 53 (list
52 (desktop-environment 54 (desktop-environment
53 (name "GNOME") 55 (name "GNOME")
54 (snippet '(service gnome-desktop-service-type))) 56 (snippet '((service gnome-desktop-service-type))))
55 (desktop-environment 57 (desktop-environment
56 (name "Xfce") 58 (name "Xfce")
57 (snippet '(service xfce-desktop-service-type))) 59 (snippet '((service xfce-desktop-service-type))))
58 (desktop-environment 60 (desktop-environment
59 (name "MATE") 61 (name "MATE")
60 (snippet '(service mate-desktop-service-type))) 62 (snippet '((service mate-desktop-service-type))))
61 (desktop-environment 63 (desktop-environment
62 (name "Enlightenment") 64 (name "Enlightenment")
63 (snippet '(service enlightenment-desktop-service-type))) 65 (snippet '((service enlightenment-desktop-service-type))))
66 (desktop-environment
67 (name "Openbox")
68 (packages '((specification->package "openbox"))))
69 (desktop-environment
70 (name "awesome")
71 (packages '((specification->package "awesome"))))
72 (desktop-environment
73 (name "i3")
74 (packages '((specification->package "i3-wm"))))
75 (desktop-environment
76 (name "ratpoison")
77 (packages '((specification->package "ratpoison"))))
64 78
65 ;; Networking. 79 ;; Networking.
66 (system-service 80 (system-service
67 (name (G_ "OpenSSH secure shell daemon (sshd)")) 81 (name (G_ "OpenSSH secure shell daemon (sshd)"))
68 (type 'networking) 82 (type 'networking)
69 (snippet '(service openssh-service-type))) 83 (snippet '((service openssh-service-type))))
70 (system-service 84 (system-service
71 (name (G_ "Tor anonymous network router")) 85 (name (G_ "Tor anonymous network router"))
72 (type 'networking) 86 (type 'networking)
73 (snippet '(service tor-service-type))) 87 (snippet '((service tor-service-type))))
74 88
75 ;; Network connectivity management. 89 ;; Network connectivity management.
76 (system-service 90 (system-service
@@ -86,7 +100,7 @@
86 (system-service 100 (system-service
87 (name (G_ "DHCP client (dynamic IP address assignment)")) 101 (name (G_ "DHCP client (dynamic IP address assignment)"))
88 (type 'network-management) 102 (type 'network-management)
89 (snippet '(service dhcp-client-service-type)))))) 103 (snippet '((service dhcp-client-service-type)))))))
90 104
91(define (desktop-system-service? service) 105(define (desktop-system-service? service)
92 "Return true if SERVICE is a desktop environment service." 106 "Return true if SERVICE is a desktop environment service."
@@ -98,20 +112,21 @@
98 112
99(define (system-services->configuration services) 113(define (system-services->configuration services)
100 "Return the configuration field for SERVICES." 114 "Return the configuration field for SERVICES."
101 (let* ((snippets (append-map (lambda (service) 115 (let* ((snippets (append-map system-service-snippet services))
102 (match (system-service-snippet service) 116 (packages (append-map system-service-packages services))
103 ((and lst (('service _ ...) ...))
104 lst)
105 (sexp
106 (list sexp))))
107 services))
108 (desktop? (find desktop-system-service? services)) 117 (desktop? (find desktop-system-service? services))
109 (base (if desktop? 118 (base (if desktop?
110 '%desktop-services 119 '%desktop-services
111 '%base-services))) 120 '%base-services)))
112 (if (null? snippets) 121 (if (null? snippets)
113 `((services ,base)) 122 `(,@(if (null? packages)
114 `((services (append (list ,@snippets 123 '()
124 `((packages (list ,@packages))))
125 (services ,base))
126 `(,@(if (null? packages)
127 '()
128 `((packages (list ,@packages))))
129 (services (append (list ,@snippets
115 130
116 ,@(if desktop? 131 ,@(if desktop?
117 ;; XXX: Assume 'keyboard-layout' is in 132 ;; XXX: Assume 'keyboard-layout' is in
diff --git a/gnu/installer/steps.scm b/gnu/installer/steps.scm
index 1483cdc3dbb..039dd0ca10a 100644
--- a/gnu/installer/steps.scm
+++ b/gnu/installer/steps.scm
@@ -1,5 +1,5 @@
1;;; GNU Guix --- Functional package management for GNU 1;;; GNU Guix --- Functional package management for GNU
2;;; Copyright © 2018 Mathieu Othacehe <m.othacehe@gmail.com> 2;;; Copyright © 2018, 2019 Mathieu Othacehe <m.othacehe@gmail.com>
3;;; 3;;;
4;;; This file is part of GNU Guix. 4;;; This file is part of GNU Guix.
5;;; 5;;;
@@ -113,16 +113,24 @@ return the accumalated result so far."
113 113
114 (define* (skip-to-step step result 114 (define* (skip-to-step step result
115 #:key todo-steps done-steps) 115 #:key todo-steps done-steps)
116 (match (list todo-steps done-steps) 116 (match todo-steps
117 (((todo . rest-todo) (prev-done ... last-done)) 117 ((todo . rest-todo)
118 (if (eq? (installer-step-id todo) 118 (let ((found? (eq? (installer-step-id todo)
119 (installer-step-id step)) 119 (installer-step-id step))))
120 (cond
121 (found?
120 (run result 122 (run result
121 #:todo-steps todo-steps 123 #:todo-steps todo-steps
122 #:done-steps done-steps) 124 #:done-steps done-steps))
123 (skip-to-step step (pop-result result) 125 ((and (not found?)
124 #:todo-steps (cons last-done todo-steps) 126 (null? done-steps))
125 #:done-steps prev-done))))) 127 (error (format #f "Step ~a not found" (installer-step-id step))))
128 (else
129 (match done-steps
130 ((prev-done ... last-done)
131 (skip-to-step step (pop-result result)
132 #:todo-steps (cons last-done todo-steps)
133 #:done-steps prev-done)))))))))
126 134
127 (define* (run result #:key todo-steps done-steps) 135 (define* (run result #:key todo-steps done-steps)
128 (match todo-steps 136 (match todo-steps
diff --git a/gnu/installer/utils.scm b/gnu/installer/utils.scm
index e91f90a84d6..256722729cb 100644
--- a/gnu/installer/utils.scm
+++ b/gnu/installer/utils.scm
@@ -54,9 +54,21 @@ number. If no percentage is found, return #f"
54 (and result 54 (and result
55 (string->number (match:substring result 1))))) 55 (string->number (match:substring result 1)))))
56 56
57(define (run-shell-command command) 57(define* (run-shell-command command #:key locale)
58 "Run COMMAND, a string, with Bash, and in the given LOCALE."
58 (call-with-temporary-output-file 59 (call-with-temporary-output-file
59 (lambda (file port) 60 (lambda (file port)
61 (when locale
62 (let ((supported? (false-if-exception
63 (setlocale LC_ALL locale))))
64 ;; If LOCALE is not supported, then set LANGUAGE, which might at
65 ;; least give us translated messages.
66 (if supported?
67 (format port "export LC_ALL=\"~a\"~%" locale)
68 (format port "export LANGUAGE=\"~a\"~%"
69 (string-take locale
70 (string-index locale #\_))))))
71
60 (format port "~a~%" command) 72 (format port "~a~%" command)
61 ;; (format port "exit~%") 73 ;; (format port "exit~%")
62 (close port) 74 (close port)
diff --git a/gnu/local.mk b/gnu/local.mk
index 5c030668530..43175b24652 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -871,6 +871,7 @@ dist_patch_DATA = \
871 %D%/packages/patches/groovy-add-exceptionutilsgenerator.patch \ 871 %D%/packages/patches/groovy-add-exceptionutilsgenerator.patch \
872 %D%/packages/patches/grub-binutils-compat.patch \ 872 %D%/packages/patches/grub-binutils-compat.patch \
873 %D%/packages/patches/grub-check-error-efibootmgr.patch \ 873 %D%/packages/patches/grub-check-error-efibootmgr.patch \
874 %D%/packages/patches/grub-efi-fat-serial-number.patch \
874 %D%/packages/patches/gsl-test-i686.patch \ 875 %D%/packages/patches/gsl-test-i686.patch \
875 %D%/packages/patches/gspell-dash-test.patch \ 876 %D%/packages/patches/gspell-dash-test.patch \
876 %D%/packages/patches/gst-plugins-good-libvpx-compat.patch \ 877 %D%/packages/patches/gst-plugins-good-libvpx-compat.patch \
@@ -1028,7 +1029,7 @@ dist_patch_DATA = \
1028 %D%/packages/patches/lierolibre-newer-libconfig.patch \ 1029 %D%/packages/patches/lierolibre-newer-libconfig.patch \
1029 %D%/packages/patches/lierolibre-remove-arch-warning.patch \ 1030 %D%/packages/patches/lierolibre-remove-arch-warning.patch \
1030 %D%/packages/patches/lierolibre-try-building-other-arch.patch \ 1031 %D%/packages/patches/lierolibre-try-building-other-arch.patch \
1031 %D%/packages/patches/linkchecker-mark-more-tests-that-require-the-network.patch \ 1032 %D%/packages/patches/linkchecker-tests-require-network.patch \
1032 %D%/packages/patches/linux-pam-no-setfsuid.patch \ 1033 %D%/packages/patches/linux-pam-no-setfsuid.patch \
1033 %D%/packages/patches/lirc-localstatedir.patch \ 1034 %D%/packages/patches/lirc-localstatedir.patch \
1034 %D%/packages/patches/lirc-reproducible-build.patch \ 1035 %D%/packages/patches/lirc-reproducible-build.patch \
@@ -1075,6 +1076,7 @@ dist_patch_DATA = \
1075 %D%/packages/patches/mozjs38-version-detection.patch \ 1076 %D%/packages/patches/mozjs38-version-detection.patch \
1076 %D%/packages/patches/mrrescue-support-love-11.patch \ 1077 %D%/packages/patches/mrrescue-support-love-11.patch \
1077 %D%/packages/patches/mrustc-0.8.0-fix-variable-length-integer-receiving.patch \ 1078 %D%/packages/patches/mrustc-0.8.0-fix-variable-length-integer-receiving.patch \
1079 %D%/packages/patches/mtools-mformat-uninitialized.patch \
1078 %D%/packages/patches/mumble-1.2.19-abs.patch \ 1080 %D%/packages/patches/mumble-1.2.19-abs.patch \
1079 %D%/packages/patches/mumps-build-parallelism.patch \ 1081 %D%/packages/patches/mumps-build-parallelism.patch \
1080 %D%/packages/patches/mupen64plus-ui-console-notice.patch \ 1082 %D%/packages/patches/mupen64plus-ui-console-notice.patch \
@@ -1104,7 +1106,7 @@ dist_patch_DATA = \
1104 %D%/packages/patches/ocaml-CVE-2015-8869.patch \ 1106 %D%/packages/patches/ocaml-CVE-2015-8869.patch \
1105 %D%/packages/patches/ocaml-Add-a-.file-directive.patch \ 1107 %D%/packages/patches/ocaml-Add-a-.file-directive.patch \
1106 %D%/packages/patches/ocaml-enable-ocamldoc-reproducibility.patch \ 1108 %D%/packages/patches/ocaml-enable-ocamldoc-reproducibility.patch \
1107 %D%/packages/patches/ocaml-dose3-Add-unix-as-dependency-to-dose3.common-in-META.in.patch \ 1109 %D%/packages/patches/ocaml-dose3-add-unix-dependency.patch \
1108 %D%/packages/patches/ocaml-dose3-Fix-for-ocaml-4.06.patch \ 1110 %D%/packages/patches/ocaml-dose3-Fix-for-ocaml-4.06.patch \
1109 %D%/packages/patches/ocaml-dose3-dont-make-printconf.patch \ 1111 %D%/packages/patches/ocaml-dose3-dont-make-printconf.patch \
1110 %D%/packages/patches/ocaml-dose3-Install-mli-cmx-etc.patch \ 1112 %D%/packages/patches/ocaml-dose3-Install-mli-cmx-etc.patch \
@@ -1117,7 +1119,6 @@ dist_patch_DATA = \
1117 %D%/packages/patches/openjdk-10-idlj-reproducibility.patch \ 1119 %D%/packages/patches/openjdk-10-idlj-reproducibility.patch \
1118 %D%/packages/patches/openocd-nrf52.patch \ 1120 %D%/packages/patches/openocd-nrf52.patch \
1119 %D%/packages/patches/opensmtpd-fix-crash.patch \ 1121 %D%/packages/patches/opensmtpd-fix-crash.patch \
1120 %D%/packages/patches/openssh-CVE-2018-20685.patch \
1121 %D%/packages/patches/openssl-runpath.patch \ 1122 %D%/packages/patches/openssl-runpath.patch \
1122 %D%/packages/patches/openssl-1.1-c-rehash-in.patch \ 1123 %D%/packages/patches/openssl-1.1-c-rehash-in.patch \
1123 %D%/packages/patches/openssl-c-rehash-in.patch \ 1124 %D%/packages/patches/openssl-c-rehash-in.patch \
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 3a250eeaa84..94145c04e89 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -181,14 +181,14 @@ and provides a \"top-like\" mode (monitoring).")
181(define-public shepherd 181(define-public shepherd
182 (package 182 (package
183 (name "shepherd") 183 (name "shepherd")
184 (version "0.5.0") 184 (version "0.6.0")
185 (source (origin 185 (source (origin
186 (method url-fetch) 186 (method url-fetch)
187 (uri (string-append "https://alpha.gnu.org/gnu/shepherd/shepherd-" 187 (uri (string-append "mirror://gnu/shepherd/shepherd-"
188 version ".tar.gz")) 188 version ".tar.gz"))
189 (sha256 189 (sha256
190 (base32 190 (base32
191 "1wmciqml9yplnx1s4ynn00giqyk06rbrcsgvpjj2df47sawk2jp8")))) 191 "1ys2w83vm62spr8bx38sccfdpy9fqmj7wfywm5k8ihsy2k61da2i"))))
192 (build-system gnu-build-system) 192 (build-system gnu-build-system)
193 (arguments 193 (arguments
194 '(#:configure-flags '("--localstatedir=/var"))) 194 '(#:configure-flags '("--localstatedir=/var")))
@@ -211,8 +211,7 @@ the execution of system services, replacing similar functionality found in
211typical init systems. It provides dependency-handling through a convenient 211typical init systems. It provides dependency-handling through a convenient
212interface and is based on GNU Guile.") 212interface and is based on GNU Guile.")
213 (license license:gpl3+) 213 (license license:gpl3+)
214 (home-page "https://www.gnu.org/software/shepherd/") 214 (home-page "https://www.gnu.org/software/shepherd/")))
215 (properties '((ftp-server . "alpha.gnu.org")))))
216 215
217(define-public daemontools 216(define-public daemontools
218 (package 217 (package
@@ -2925,7 +2924,7 @@ Logitech Unifying Receiver.")
2925 (package 2924 (package
2926 (name "lynis") 2925 (name "lynis")
2927 ;; Also update the ‘lynis-sdk’ input to the commit matching this release. 2926 ;; Also update the ‘lynis-sdk’ input to the commit matching this release.
2928 (version "2.7.3") 2927 (version "2.7.4")
2929 (source 2928 (source
2930 (origin 2929 (origin
2931 (method git-fetch) 2930 (method git-fetch)
@@ -2934,7 +2933,7 @@ Logitech Unifying Receiver.")
2934 (commit version))) 2933 (commit version)))
2935 (file-name (git-file-name name version)) 2934 (file-name (git-file-name name version))
2936 (sha256 2935 (sha256
2937 (base32 "0md1w86i3fy9l78i98ijr5136nbhdiik2dxyw9qnzmvdlvkqmw70")) 2936 (base32 "1jjk5hcxmp4f4ppsljiq95l2ln6b03azydap3b35lsvxkjybv88k"))
2938 (modules '((guix build utils))) 2937 (modules '((guix build utils)))
2939 (snippet 2938 (snippet
2940 '(begin 2939 '(begin
@@ -2951,10 +2950,10 @@ Logitech Unifying Receiver.")
2951 (method git-fetch) 2950 (method git-fetch)
2952 (uri (git-reference 2951 (uri (git-reference
2953 (url "https://github.com/CISOfy/lynis-sdk") 2952 (url "https://github.com/CISOfy/lynis-sdk")
2954 (commit "c166b6a67a53b24f5c1fecd4eb5033f54279a5b3"))) 2953 (commit "90f301e21c204792cf372f1cf05890a562f2e31b")))
2955 (file-name (git-file-name "lynis-sdk" version)) 2954 (file-name (git-file-name "lynis-sdk" version))
2956 (sha256 2955 (sha256
2957 (base32 "0wa2azcmx6pj9axvq1jmwmz7826rj1c214asmmn1hq7pxmfw62zr")))))) 2956 (base32 "1d0smr1fxrvbc3hl8lzy33im9ahzr0hgs3kk09r8g8xccjkcm52l"))))))
2958 (arguments 2957 (arguments
2959 `(#:phases 2958 `(#:phases
2960 (modify-phases %standard-phases 2959 (modify-phases %standard-phases
diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index 6025af83236..ab5dcd92a7d 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -1,7 +1,7 @@
1;;; GNU Guix --- Functional package management for GNU 1;;; GNU Guix --- Functional package management for GNU
2;;; Copyright © 2016 John Darrington <jmd@gnu.org> 2;;; Copyright © 2016 John Darrington <jmd@gnu.org>
3;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> 3;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
4;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il> 4;;; Copyright © 2018, 2019 Efraim Flashner <efraim@flashner.co.il>
5;;; 5;;;
6;;; This file is part of GNU Guix. 6;;; This file is part of GNU Guix.
7;;; 7;;;
@@ -23,6 +23,7 @@
23 #:use-module ((guix licenses) #:prefix license:) 23 #:use-module ((guix licenses) #:prefix license:)
24 #:use-module (guix download) 24 #:use-module (guix download)
25 #:use-module (guix utils) 25 #:use-module (guix utils)
26 #:use-module (gnu packages autotools)
26 #:use-module (gnu packages image) 27 #:use-module (gnu packages image)
27 #:use-module (gnu packages compression) 28 #:use-module (gnu packages compression)
28 #:use-module (gnu packages gettext) 29 #:use-module (gnu packages gettext)
@@ -103,7 +104,7 @@ header.")
103(define-public gnuastro 104(define-public gnuastro
104 (package 105 (package
105 (name "gnuastro") 106 (name "gnuastro")
106 (version "0.8") 107 (version "0.9")
107 (source 108 (source
108 (origin 109 (origin
109 (method url-fetch) 110 (method url-fetch)
@@ -111,7 +112,7 @@ header.")
111 version ".tar.lz")) 112 version ".tar.lz"))
112 (sha256 113 (sha256
113 (base32 114 (base32
114 "0gx6iar3z07k9sdvpa6kchsz6fpk94xn5vcvbcigssl2dwqmlnkb")))) 115 "1c1894ixz3l8p1nmzkysgl9lz8vpqbfw1dd404kh6lvrpml7jzig"))))
115 (inputs 116 (inputs
116 `(("cfitsio" ,cfitsio) 117 `(("cfitsio" ,cfitsio)
117 ("gsl" ,gsl) 118 ("gsl" ,gsl)
@@ -120,7 +121,8 @@ header.")
120 ("wcslib" ,wcslib) 121 ("wcslib" ,wcslib)
121 ("zlib" ,zlib))) 122 ("zlib" ,zlib)))
122 (native-inputs 123 (native-inputs
123 `(("lzip" ,lzip))) 124 `(("libtool" ,libtool)
125 ("lzip" ,lzip)))
124 (build-system gnu-build-system) 126 (build-system gnu-build-system)
125 (home-page "https://www.gnu.org/software/gnuastro/") 127 (home-page "https://www.gnu.org/software/gnuastro/")
126 (synopsis "Astronomy utilities") 128 (synopsis "Astronomy utilities")
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 8160ba5487c..7a79f4dcabe 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -547,14 +547,14 @@ plugins are provided.")
547(define-public calf 547(define-public calf
548 (package 548 (package
549 (name "calf") 549 (name "calf")
550 (version "0.90.1") 550 (version "0.90.2")
551 (source (origin 551 (source (origin
552 (method url-fetch) 552 (method url-fetch)
553 (uri (string-append "https://calf-studio-gear.org/files/calf-" 553 (uri (string-append "https://calf-studio-gear.org/files/calf-"
554 version ".tar.gz")) 554 version ".tar.gz"))
555 (sha256 555 (sha256
556 (base32 556 (base32
557 "0znwx5gidr5n503gya9n8gagr8cfym6cwlbiv2r6iksji7jc4fpb")))) 557 "0bn4j1klw2yfxz8clbmasaydifq25rdfsv0n6iisxrzcj1lx7sgh"))))
558 (build-system gnu-build-system) 558 (build-system gnu-build-system)
559 (inputs 559 (inputs
560 `(("fluidsynth" ,fluidsynth) 560 `(("fluidsynth" ,fluidsynth)
@@ -713,7 +713,7 @@ emulation (valve, tape), bit fiddling (decimator, pointer-cast), etc.")
713(define-public csound 713(define-public csound
714 (package 714 (package
715 (name "csound") 715 (name "csound")
716 (version "6.12.0") 716 (version "6.12.2")
717 (source (origin 717 (source (origin
718 (method git-fetch) 718 (method git-fetch)
719 (uri (git-reference 719 (uri (git-reference
@@ -722,7 +722,7 @@ emulation (valve, tape), bit fiddling (decimator, pointer-cast), etc.")
722 (file-name (git-file-name name version)) 722 (file-name (git-file-name name version))
723 (sha256 723 (sha256
724 (base32 724 (base32
725 "0pv4s54cayvavdp6y30n3r1l5x83x9whyyd2v24y0dh224v3hbxi")))) 725 "01krxcf0alw9k7p5sv0s707600an4sl7lhw3bymbwgqrj0v2p9z2"))))
726 (build-system cmake-build-system) 726 (build-system cmake-build-system)
727 (inputs 727 (inputs
728 `(("alsa-lib" ,alsa-lib) 728 `(("alsa-lib" ,alsa-lib)
@@ -1104,7 +1104,7 @@ follower.")
1104(define-public fluidsynth 1104(define-public fluidsynth
1105 (package 1105 (package
1106 (name "fluidsynth") 1106 (name "fluidsynth")
1107 (version "2.0.4") 1107 (version "2.0.5")
1108 (source (origin 1108 (source (origin
1109 (method git-fetch) 1109 (method git-fetch)
1110 (uri (git-reference 1110 (uri (git-reference
@@ -1113,7 +1113,7 @@ follower.")
1113 (file-name (string-append name "-" version "-checkout")) 1113 (file-name (string-append name "-" version "-checkout"))
1114 (sha256 1114 (sha256
1115 (base32 1115 (base32
1116 "1v2vji02fbrjgypwb4fw2r90hnfwfbfh3d24j8vjwlbqxhxp16s0")))) 1116 "0rv0apxbj0cgm8f8sqf5xr6kdi4q58ph92ip6cg716ha0ca5lr8y"))))
1117 (build-system cmake-build-system) 1117 (build-system cmake-build-system)
1118 (arguments 1118 (arguments
1119 '(#:tests? #f ; no check target 1119 '(#:tests? #f ; no check target
@@ -2120,14 +2120,14 @@ different audio devices such as ALSA or PulseAudio.")
2120(define-public qjackctl 2120(define-public qjackctl
2121 (package 2121 (package
2122 (name "qjackctl") 2122 (name "qjackctl")
2123 (version "0.5.6") 2123 (version "0.5.7")
2124 (source (origin 2124 (source (origin
2125 (method url-fetch) 2125 (method url-fetch)
2126 (uri (string-append "mirror://sourceforge/qjackctl/qjackctl/" 2126 (uri (string-append "mirror://sourceforge/qjackctl/qjackctl/"
2127 version "/qjackctl-" version ".tar.gz")) 2127 version "/qjackctl-" version ".tar.gz"))
2128 (sha256 2128 (sha256
2129 (base32 2129 (base32
2130 "0wlmbb9m7cf3wr7c2h2hji18592x2b119m7mx85wksjs6rjaq2mj")))) 2130 "1g6a5j74p45yisl28bw4fcc9nr6b710ikk459p4mp6djh9gs8v95"))))
2131 (build-system gnu-build-system) 2131 (build-system gnu-build-system)
2132 (arguments 2132 (arguments
2133 '(#:tests? #f)) ; no check target 2133 '(#:tests? #f)) ; no check target
@@ -2316,7 +2316,7 @@ aimed at audio/musical applications.")
2316(define-public rubberband 2316(define-public rubberband
2317 (package 2317 (package
2318 (name "rubberband") 2318 (name "rubberband")
2319 (version "1.8.1") 2319 (version "1.8.2")
2320 (source (origin 2320 (source (origin
2321 (method url-fetch) 2321 (method url-fetch)
2322 (uri 2322 (uri
@@ -2326,9 +2326,19 @@ aimed at audio/musical applications.")
2326 (file-name (string-append name "-" version ".tar.bz2")) 2326 (file-name (string-append name "-" version ".tar.bz2"))
2327 (sha256 2327 (sha256
2328 (base32 2328 (base32
2329 "05amrbrxx0da3w7m237q51799r8xgs4ffqabi2qv06hq8dpcj386")))) 2329 "0462fmjnfqpv2qi0s6ny42drqarkr0xy9lw8frjmfgzyzl5n9294"))))
2330 (build-system gnu-build-system) 2330 (build-system gnu-build-system)
2331 (arguments `(#:tests? #f)) ; no check target 2331 (arguments
2332 `(#:tests? #f ; no check target
2333 #:phases
2334 (modify-phases %standard-phases
2335 (add-after 'unpack 'skip-jni-installation
2336 ;; ‘make install’ unconditionally installs librubberband-jni.so,
2337 ;; which is never built by ‘make all’. Skip it.
2338 (lambda _
2339 (substitute* "Makefile.in"
2340 ((".*cp -f \\$\\(JNI_TARGET\\).*") ""))
2341 #t)))))
2332 (inputs 2342 (inputs
2333 `(("ladspa" ,ladspa) 2343 `(("ladspa" ,ladspa)
2334 ("libsamplerate" ,libsamplerate) 2344 ("libsamplerate" ,libsamplerate)
@@ -2861,14 +2871,14 @@ interface.")
2861(define-public qsynth 2871(define-public qsynth
2862 (package 2872 (package
2863 (name "qsynth") 2873 (name "qsynth")
2864 (version "0.5.5") 2874 (version "0.5.6")
2865 (source 2875 (source
2866 (origin 2876 (origin
2867 (method url-fetch) 2877 (method url-fetch)
2868 (uri (string-append "mirror://sourceforge/qsynth/qsynth/" version 2878 (uri (string-append "mirror://sourceforge/qsynth/qsynth/" version
2869 "/qsynth-" version ".tar.gz")) 2879 "/qsynth-" version ".tar.gz"))
2870 (sha256 2880 (sha256
2871 (base32 "08x7znvbwi9miavcarymi7dsv8njmxzwzma20dbmz8j2aswm53w5")))) 2881 (base32 "0h4hhja8qbyzd6v24flw9wr4mwl03nplryx1gyrppn7sg13l1sx6"))))
2872 (build-system gnu-build-system) 2882 (build-system gnu-build-system)
2873 (arguments 2883 (arguments
2874 `(#:tests? #f ; no "check" phase 2884 `(#:tests? #f ; no "check" phase
@@ -3375,14 +3385,14 @@ on the ALSA software PCM plugin.")
3375(define-public snd 3385(define-public snd
3376 (package 3386 (package
3377 (name "snd") 3387 (name "snd")
3378 (version "19.2") 3388 (version "19.3")
3379 (source (origin 3389 (source (origin
3380 (method url-fetch) 3390 (method url-fetch)
3381 (uri (string-append "ftp://ccrma-ftp.stanford.edu/pub/Lisp/" 3391 (uri (string-append "ftp://ccrma-ftp.stanford.edu/pub/Lisp/"
3382 "snd-" version ".tar.gz")) 3392 "snd-" version ".tar.gz"))
3383 (sha256 3393 (sha256
3384 (base32 3394 (base32
3385 "1a6ls2hyvggss12idca22hq5vsq4jw2xkwrx22dx29i9926gdr6h")))) 3395 "16j3fqyw361wdsr1076f0p3va2y7wdzq1lvr4ijz1ajmbxdlc723"))))
3386 (build-system glib-or-gtk-build-system) 3396 (build-system glib-or-gtk-build-system)
3387 (arguments 3397 (arguments
3388 `(#:tests? #f ; no tests 3398 `(#:tests? #f ; no tests
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index dc5d84653c4..4cf69004987 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -9438,40 +9438,33 @@ and irregular enzymatic cleavages, mass measurement accuracy, etc.")
9438(define-public r-seurat 9438(define-public r-seurat
9439 (package 9439 (package
9440 (name "r-seurat") 9440 (name "r-seurat")
9441 (version "2.3.4") 9441 (version "3.0.0")
9442 (source (origin 9442 (source (origin
9443 (method url-fetch) 9443 (method url-fetch)
9444 (uri (cran-uri "Seurat" version)) 9444 (uri (cran-uri "Seurat" version))
9445 (sha256 9445 (sha256
9446 (base32 9446 (base32
9447 "0l8bv4i9nzz26mirnva10mq6pimibj24vk7vpvfypgn7xk4942hd")))) 9447 "183lm2wk0i3g114jbdf7pb4ssizr48qzqv3cknbsiackr8kvpsvc"))))
9448 (properties `((upstream-name . "Seurat"))) 9448 (properties `((upstream-name . "Seurat")))
9449 (build-system r-build-system) 9449 (build-system r-build-system)
9450 (propagated-inputs 9450 (propagated-inputs
9451 `(("r-ape" ,r-ape) 9451 `(("r-ape" ,r-ape)
9452 ("r-cluster" ,r-cluster) 9452 ("r-cluster" ,r-cluster)
9453 ("r-cowplot" ,r-cowplot) 9453 ("r-cowplot" ,r-cowplot)
9454 ("r-dosnow" ,r-dosnow)
9455 ("r-dplyr" ,r-dplyr)
9456 ("r-dtw" ,r-dtw)
9457 ("r-fitdistrplus" ,r-fitdistrplus) 9454 ("r-fitdistrplus" ,r-fitdistrplus)
9458 ("r-foreach" ,r-foreach) 9455 ("r-future" ,r-future)
9459 ("r-fpc" ,r-fpc) 9456 ("r-future-apply" ,r-future-apply)
9460 ("r-ggplot2" ,r-ggplot2) 9457 ("r-ggplot2" ,r-ggplot2)
9458 ("r-ggrepel" ,r-ggrepel)
9461 ("r-ggridges" ,r-ggridges) 9459 ("r-ggridges" ,r-ggridges)
9462 ("r-gplots" ,r-gplots)
9463 ("r-hdf5r" ,r-hdf5r)
9464 ("r-hmisc" ,r-hmisc)
9465 ("r-httr" ,r-httr)
9466 ("r-ica" ,r-ica) 9460 ("r-ica" ,r-ica)
9467 ("r-igraph" ,r-igraph) 9461 ("r-igraph" ,r-igraph)
9468 ("r-irlba" ,r-irlba) 9462 ("r-irlba" ,r-irlba)
9469 ("r-lars" ,r-lars) 9463 ("r-kernsmooth" ,r-kernsmooth)
9470 ("r-lmtest" ,r-lmtest) 9464 ("r-lmtest" ,r-lmtest)
9471 ("r-mass" ,r-mass) 9465 ("r-mass" ,r-mass)
9472 ("r-matrix" ,r-matrix) 9466 ("r-matrix" ,r-matrix)
9473 ("r-metap" ,r-metap) 9467 ("r-metap" ,r-metap)
9474 ("r-mixtools" ,r-mixtools)
9475 ("r-pbapply" ,r-pbapply) 9468 ("r-pbapply" ,r-pbapply)
9476 ("r-plotly" ,r-plotly) 9469 ("r-plotly" ,r-plotly)
9477 ("r-png" ,r-png) 9470 ("r-png" ,r-png)
@@ -9480,12 +9473,14 @@ and irregular enzymatic cleavages, mass measurement accuracy, etc.")
9480 ("r-rcpp" ,r-rcpp) 9473 ("r-rcpp" ,r-rcpp)
9481 ("r-rcppeigen" ,r-rcppeigen) 9474 ("r-rcppeigen" ,r-rcppeigen)
9482 ("r-rcppprogress" ,r-rcppprogress) 9475 ("r-rcppprogress" ,r-rcppprogress)
9483 ("r-reshape2" ,r-reshape2)
9484 ("r-reticulate" ,r-reticulate) 9476 ("r-reticulate" ,r-reticulate)
9477 ("r-rlang" ,r-rlang)
9485 ("r-rocr" ,r-rocr) 9478 ("r-rocr" ,r-rocr)
9479 ("r-rsvd" ,r-rsvd)
9486 ("r-rtsne" ,r-rtsne) 9480 ("r-rtsne" ,r-rtsne)
9481 ("r-scales" ,r-scales)
9482 ("r-sctransform" ,r-sctransform)
9487 ("r-sdmtools" ,r-sdmtools) 9483 ("r-sdmtools" ,r-sdmtools)
9488 ("r-tidyr" ,r-tidyr)
9489 ("r-tsne" ,r-tsne))) 9484 ("r-tsne" ,r-tsne)))
9490 (home-page "http://www.satijalab.org/seurat") 9485 (home-page "http://www.satijalab.org/seurat")
9491 (synopsis "Seurat is an R toolkit for single cell genomics") 9486 (synopsis "Seurat is an R toolkit for single cell genomics")
diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index d6ef7d52b57..b4eabaea481 100644
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@ -90,7 +90,8 @@
90 (base32 90 (base32
91 "03vvdfhdmf16121v7xs8is2krwnv15wpkhkf16a4yf8nsfc3f2w1")) 91 "03vvdfhdmf16121v7xs8is2krwnv15wpkhkf16a4yf8nsfc3f2w1"))
92 (patches (search-patches "grub-check-error-efibootmgr.patch" 92 (patches (search-patches "grub-check-error-efibootmgr.patch"
93 "grub-binutils-compat.patch")))) 93 "grub-binutils-compat.patch"
94 "grub-efi-fat-serial-number.patch"))))
94 (build-system gnu-build-system) 95 (build-system gnu-build-system)
95 (arguments 96 (arguments
96 `(#:phases (modify-phases %standard-phases 97 `(#:phases (modify-phases %standard-phases
diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index 4e8f12248f6..e0af0dd1a90 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -72,16 +72,14 @@ operating system functions.")
72 72
73(define-public rct 73(define-public rct
74 (let* ((commit "b3e6f41d9844ef64420e628e0c65ed98278a843a") 74 (let* ((commit "b3e6f41d9844ef64420e628e0c65ed98278a843a")
75 (revision "2") 75 (revision "2"))
76 (version (git-version "0.0.0" revision commit)))
77 (package 76 (package
78 (name "rct") 77 (name "rct")
79 (version version) 78 (version (git-version "0.0.0" revision commit))
80 (home-page "https://github.com/Andersbakken/rct")
81 (source (origin 79 (source (origin
82 (method git-fetch) 80 (method git-fetch)
83 (uri (git-reference 81 (uri (git-reference
84 (url home-page) 82 (url "https://github.com/Andersbakken/rct")
85 (commit commit))) 83 (commit commit)))
86 (sha256 84 (sha256
87 (base32 85 (base32
@@ -99,6 +97,7 @@ operating system functions.")
99 (inputs 97 (inputs
100 `(("openssl" ,openssl) 98 `(("openssl" ,openssl)
101 ("zlib" ,zlib))) 99 ("zlib" ,zlib)))
100 (home-page "https://github.com/Andersbakken/rct")
102 (synopsis "C++ library providing Qt-like APIs on top of the STL") 101 (synopsis "C++ library providing Qt-like APIs on top of the STL")
103 (description "Rct is a set of C++ tools that provide nicer (more Qt-like) 102 (description "Rct is a set of C++ tools that provide nicer (more Qt-like)
104 APIs on top of Standard Template Library (@dfn{STL}) classes.") 103 APIs on top of Standard Template Library (@dfn{STL}) classes.")
diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 47cd1d7217f..742bc5f6633 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -78,14 +78,14 @@
78(define-public r-clipr 78(define-public r-clipr
79 (package 79 (package
80 (name "r-clipr") 80 (name "r-clipr")
81 (version "0.5.0") 81 (version "0.6.0")
82 (source 82 (source
83 (origin 83 (origin
84 (method url-fetch) 84 (method url-fetch)
85 (uri (cran-uri "clipr" version)) 85 (uri (cran-uri "clipr" version))
86 (sha256 86 (sha256
87 (base32 87 (base32
88 "1grx0lyww1cxmdvsr44wmbhz9i6zmiwxbchb97gxrfi9gy5kyc7x")))) 88 "0k9kimkmmj9k7290sxiqn4kd1vvm4w7q9a44wp0w30b7yjpavx2m"))))
89 (build-system r-build-system) 89 (build-system r-build-system)
90 (home-page "https://github.com/mdlincoln/clipr") 90 (home-page "https://github.com/mdlincoln/clipr")
91 (synopsis "Read and write from the system clipboard") 91 (synopsis "Read and write from the system clipboard")
@@ -3050,14 +3050,14 @@ programming} (SQP) based solver).")
3050(define-public r-hardyweinberg 3050(define-public r-hardyweinberg
3051 (package 3051 (package
3052 (name "r-hardyweinberg") 3052 (name "r-hardyweinberg")
3053 (version "1.6.1") 3053 (version "1.6.2")
3054 (source 3054 (source
3055 (origin 3055 (origin
3056 (method url-fetch) 3056 (method url-fetch)
3057 (uri (cran-uri "HardyWeinberg" version)) 3057 (uri (cran-uri "HardyWeinberg" version))
3058 (sha256 3058 (sha256
3059 (base32 3059 (base32
3060 "16n8qanxx0p5ny5zqxafn8hwb1xv94y1wig1iql8as5a5qh8lwcz")))) 3060 "15i7b444hikkfgqmx2ki827998xwra38k9v7a7kavwz6zmq5mmv9"))))
3061 (properties `((upstream-name . "HardyWeinberg"))) 3061 (properties `((upstream-name . "HardyWeinberg")))
3062 (build-system r-build-system) 3062 (build-system r-build-system)
3063 (propagated-inputs 3063 (propagated-inputs
@@ -3317,14 +3317,14 @@ normalizations, minimum variance matching, and so on.")
3317(define-public r-sdmtools 3317(define-public r-sdmtools
3318 (package 3318 (package
3319 (name "r-sdmtools") 3319 (name "r-sdmtools")
3320 (version "1.1-221") 3320 (version "1.1-221.1")
3321 (source 3321 (source
3322 (origin 3322 (origin
3323 (method url-fetch) 3323 (method url-fetch)
3324 (uri (cran-uri "SDMTools" version)) 3324 (uri (cran-uri "SDMTools" version))
3325 (sha256 3325 (sha256
3326 (base32 3326 (base32
3327 "1kacrpamshv7wz83yn45sfbw4m9c44xrrngzcklnwx8gcxx2knm6")))) 3327 "1fsgnlc7glawimzijp11j53g5bnfp1mdq9wb0754idmxcdi8a99q"))))
3328 (properties `((upstream-name . "SDMTools"))) 3328 (properties `((upstream-name . "SDMTools")))
3329 (build-system r-build-system) 3329 (build-system r-build-system)
3330 (propagated-inputs `(("r-r-utils" ,r-r-utils))) 3330 (propagated-inputs `(("r-r-utils" ,r-r-utils)))
@@ -5489,14 +5489,14 @@ results to the user.")
5489(define-public r-hdf5r 5489(define-public r-hdf5r
5490 (package 5490 (package
5491 (name "r-hdf5r") 5491 (name "r-hdf5r")
5492 (version "1.1.1") 5492 (version "1.2.0")
5493 (source 5493 (source
5494 (origin 5494 (origin
5495 (method url-fetch) 5495 (method url-fetch)
5496 (uri (cran-uri "hdf5r" version)) 5496 (uri (cran-uri "hdf5r" version))
5497 (sha256 5497 (sha256
5498 (base32 5498 (base32
5499 "1cq4rdfd0rqvy29ml3x1iid142ljnscs8f4d2y1na13hlvkl3k05")))) 5499 "10gynjwaaxks8y9c2fl8k040j0nbwn372nil70009yfk9wrkx0aq"))))
5500 (build-system r-build-system) 5500 (build-system r-build-system)
5501 (inputs 5501 (inputs
5502 `(("hdf5" ,hdf5) 5502 `(("hdf5" ,hdf5)
@@ -5605,14 +5605,14 @@ hierarchical models using Markov Chain Monte Carlo (MCMC) simulation.")
5605(define-public r-rdpack 5605(define-public r-rdpack
5606 (package 5606 (package
5607 (name "r-rdpack") 5607 (name "r-rdpack")
5608 (version "0.10-1") 5608 (version "0.11-0")
5609 (source 5609 (source
5610 (origin 5610 (origin
5611 (method url-fetch) 5611 (method url-fetch)
5612 (uri (cran-uri "Rdpack" version)) 5612 (uri (cran-uri "Rdpack" version))
5613 (sha256 5613 (sha256
5614 (base32 5614 (base32
5615 "0bbjnw88h54v40hzim00i8yd3p4rk9i84zfdmgcbnylscwvsf0av")))) 5615 "11cd27s6zp5cxnwxcvz6rjf00y0r7aq8ywhzwpf1r4xy1z44kd4g"))))
5616 (properties `((upstream-name . "Rdpack"))) 5616 (properties `((upstream-name . "Rdpack")))
5617 (build-system r-build-system) 5617 (build-system r-build-system)
5618 (propagated-inputs 5618 (propagated-inputs
@@ -13253,14 +13253,14 @@ self-intersections from polygon data.")
13253(define-public r-urltools 13253(define-public r-urltools
13254 (package 13254 (package
13255 (name "r-urltools") 13255 (name "r-urltools")
13256 (version "1.7.2") 13256 (version "1.7.3")
13257 (source 13257 (source
13258 (origin 13258 (origin
13259 (method url-fetch) 13259 (method url-fetch)
13260 (uri (cran-uri "urltools" version)) 13260 (uri (cran-uri "urltools" version))
13261 (sha256 13261 (sha256
13262 (base32 13262 (base32
13263 "18lp66f2l504b8q3j4xy8j9pyzzlljw9f112sn6qii1cg83072wm")))) 13263 "04x3my655dd287cbsszbnf75q0swmjlxxrblcsay7a8n3df3a830"))))
13264 (build-system r-build-system) 13264 (build-system r-build-system)
13265 (propagated-inputs 13265 (propagated-inputs
13266 `(("r-rcpp" ,r-rcpp) 13266 `(("r-rcpp" ,r-rcpp)
@@ -13888,3 +13888,65 @@ regular expressions. Regular expressions are a very powerful feature, however
13888they are often difficult to interpret. Rex allows you to build complex 13888they are often difficult to interpret. Rex allows you to build complex
13889regular expressions from human readable expressions") 13889regular expressions from human readable expressions")
13890 (license license:expat))) 13890 (license license:expat)))
13891
13892(define-public r-sctransform
13893 (package
13894 (name "r-sctransform")
13895 (version "0.2.0")
13896 (source
13897 (origin
13898 (method url-fetch)
13899 (uri (cran-uri "sctransform" version))
13900 (sha256
13901 (base32
13902 "1r5kiqqs318q59h2i8m7c6nhghp9w6q26ss2y5a390lkhsawgx6p"))))
13903 (build-system r-build-system)
13904 (propagated-inputs
13905 `(("r-future" ,r-future)
13906 ("r-future-apply" ,r-future-apply)
13907 ("r-ggplot2" ,r-ggplot2)
13908 ("r-gridextra" ,r-gridextra)
13909 ("r-mass" ,r-mass)
13910 ("r-matrix" ,r-matrix)
13911 ("r-rcpp" ,r-rcpp)
13912 ("r-rcppeigen" ,r-rcppeigen)
13913 ("r-reshape2" ,r-reshape2)))
13914 (home-page "https://github.com/ChristophH/sctransform")
13915 (synopsis "Variance stabilizing transformations for Single Cell UMI Data")
13916 (description
13917 "This package provides a normalization method for single-cell UMI count
13918data using a variance stabilizing transformation. The transformation is based
13919on a negative binomial regression model with regularized parameters. As part
13920of the same regression framework, this package also provides functions for
13921batch correction, and data correction.")
13922 (license license:gpl3)))
13923
13924(define-public r-styler
13925 (package
13926 (name "r-styler")
13927 (version "1.1.0")
13928 (source
13929 (origin
13930 (method url-fetch)
13931 (uri (cran-uri "styler" version))
13932 (sha256
13933 (base32
13934 "1z24mi88snbz1avjw9phq0lzmigddvycc56s83nxzr9w9z85mh05"))))
13935 (build-system r-build-system)
13936 (propagated-inputs
13937 `(("r-backports" ,r-backports)
13938 ("r-cli" ,r-cli)
13939 ("r-magrittr" ,r-magrittr)
13940 ("r-purrr" ,r-purrr)
13941 ("r-rematch2" ,r-rematch2)
13942 ("r-rlang" ,r-rlang)
13943 ("r-rprojroot" ,r-rprojroot)
13944 ("r-tibble" ,r-tibble)
13945 ("r-withr" ,r-withr)
13946 ("r-xfun" ,r-xfun)))
13947 (home-page "https://github.com/r-lib/styler")
13948 (synopsis "Non-invasive pretty printing of R code")
13949 (description
13950 "This is a package for pretty-printing R code without changing the user's
13951formatting intent.")
13952 (license license:gpl3)))
diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm
index 5b90d405ea8..748f67ba1ec 100644
--- a/gnu/packages/cups.scm
+++ b/gnu/packages/cups.scm
@@ -639,14 +639,14 @@ printer/driver specific, but spooler-independent PPD file.")
639(define-public foo2zjs 639(define-public foo2zjs
640 (package 640 (package
641 (name "foo2zjs") 641 (name "foo2zjs")
642 (version "20180910") 642 (version "20190413")
643 (source (origin 643 (source (origin
644 (method url-fetch) 644 (method url-fetch)
645 ;; XXX: This is an unversioned URL! 645 ;; XXX: This is an unversioned URL!
646 (uri "http://foo2zjs.rkkda.com/foo2zjs.tar.gz") 646 (uri "http://foo2zjs.rkkda.com/foo2zjs.tar.gz")
647 (sha256 647 (sha256
648 (base32 648 (base32
649 "1clddqy4y4vvws0lllv1v90dfiihihdc23bn93c544yb3fvmwmr6")))) 649 "00k22vmghxls7rk2hrbz9v17wi5z8vdk3fmsp2lrfghfcad8nhpx"))))
650 (build-system gnu-build-system) 650 (build-system gnu-build-system)
651 (arguments 651 (arguments
652 '(#:phases (modify-phases %standard-phases 652 '(#:phases (modify-phases %standard-phases
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index ed46f897b05..74c0efe07b4 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -265,14 +265,14 @@ mapping from string keys to string values.")
265(define-public memcached 265(define-public memcached
266 (package 266 (package
267 (name "memcached") 267 (name "memcached")
268 (version "1.5.12") 268 (version "1.5.13")
269 (source 269 (source
270 (origin 270 (origin
271 (method url-fetch) 271 (method url-fetch)
272 (uri (string-append 272 (uri (string-append
273 "https://memcached.org/files/memcached-" version ".tar.gz")) 273 "https://memcached.org/files/memcached-" version ".tar.gz"))
274 (sha256 274 (sha256
275 (base32 "0aav15f0lh8k4i62aza2bdv4s8vv65j38pz2zc4v45snd3arfby0")))) 275 (base32 "0qsdkjrns4f02lmabq8c7mzl5n4382q2p6a0dvmsjdcpjisagqb1"))))
276 (build-system gnu-build-system) 276 (build-system gnu-build-system)
277 (inputs 277 (inputs
278 `(("libevent" ,libevent) 278 `(("libevent" ,libevent)
@@ -1942,13 +1942,13 @@ for ODBC.")
1942(define-public python-pyodbc 1942(define-public python-pyodbc
1943 (package 1943 (package
1944 (name "python-pyodbc") 1944 (name "python-pyodbc")
1945 (version "4.0.25") 1945 (version "4.0.26")
1946 (source 1946 (source
1947 (origin 1947 (origin
1948 (method url-fetch) 1948 (method url-fetch)
1949 (uri (pypi-uri "pyodbc" version)) 1949 (uri (pypi-uri "pyodbc" version))
1950 (sha256 1950 (sha256
1951 (base32 "1bbwrb812w5i0x56jfn0l86mxc2ck904hl8y87mziay96znwia0f")) 1951 (base32 "1qrxnf7ji5hml7z4y669k4wmk3iz2pcsr05bnn1n912asash09z5"))
1952 (file-name (string-append name "-" version ".tar.gz")))) 1952 (file-name (string-append name "-" version ".tar.gz"))))
1953 (build-system python-build-system) 1953 (build-system python-build-system)
1954 (inputs 1954 (inputs
@@ -2189,13 +2189,13 @@ Database API 2.0T.")
2189(define-public python-sqlalchemy 2189(define-public python-sqlalchemy
2190 (package 2190 (package
2191 (name "python-sqlalchemy") 2191 (name "python-sqlalchemy")
2192 (version "1.3.1") 2192 (version "1.3.3")
2193 (source 2193 (source
2194 (origin 2194 (origin
2195 (method url-fetch) 2195 (method url-fetch)
2196 (uri (pypi-uri "SQLAlchemy" version)) 2196 (uri (pypi-uri "SQLAlchemy" version))
2197 (sha256 2197 (sha256
2198 (base32 "12sr36646sipf9ac3n2xh8z0w5pz4d3dvw5qjv2kzvcls6wvf7vq")))) 2198 (base32 "06c3lcv7nijsgqsjaaa4djrwlzgh9f910zlqxkmgq22h6jl4rici"))))
2199 (build-system python-build-system) 2199 (build-system python-build-system)
2200 (native-inputs 2200 (native-inputs
2201 `(("python-cython" ,python-cython) ; for C extensions 2201 `(("python-cython" ,python-cython) ; for C extensions
@@ -2571,15 +2571,15 @@ reasonable substitute.")
2571(define-public python-redis 2571(define-public python-redis
2572 (package 2572 (package
2573 (name "python-redis") 2573 (name "python-redis")
2574 (version "3.2.0") 2574 (version "3.2.1")
2575 (source 2575 (source
2576 (origin 2576 (origin
2577 (method url-fetch) 2577 (method url-fetch)
2578 (uri (pypi-uri "redis" version)) 2578 (uri (pypi-uri "redis" version))
2579 (sha256 2579 (sha256
2580 (base32 "0m1b88wg1w6xdwg0siky5k86x8sh6smhbr42ixz41ra81lv34jbj")))) 2580 (base32 "0wwj8il4c3aff15xwwcjfci367zxsakq05ps1a2il6yavp91i94c"))))
2581 (build-system python-build-system) 2581 (build-system python-build-system)
2582 ;; Tests require a running Redis server 2582 ;; Tests require a running Redis server.
2583 (arguments '(#:tests? #f)) 2583 (arguments '(#:tests? #f))
2584 ;; As long as we are not running test, we do not need this input :-) 2584 ;; As long as we are not running test, we do not need this input :-)
2585 ;;(native-inputs 2585 ;;(native-inputs
diff --git a/gnu/packages/dictionaries.scm b/gnu/packages/dictionaries.scm
index e0cd7604b67..ee038ac8f55 100644
--- a/gnu/packages/dictionaries.scm
+++ b/gnu/packages/dictionaries.scm
@@ -3,7 +3,7 @@
3;;; Copyright © 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il> 3;;; Copyright © 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
4;;; Copyright © 2016 Sou Bunnbu <iyzsong@gmail.com> 4;;; Copyright © 2016 Sou Bunnbu <iyzsong@gmail.com>
5;;; Copyright © 2017, 2018 Nicolas Goaziou <mail@nicolasgoaziou.fr> 5;;; Copyright © 2017, 2018 Nicolas Goaziou <mail@nicolasgoaziou.fr>
6;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> 6;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
7;;; Copyright © 2018 Pierre-Antoine Rouby <contact@parouby.fr> 7;;; Copyright © 2018 Pierre-Antoine Rouby <contact@parouby.fr>
8;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net> 8;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net>
9;;; 9;;;
@@ -218,15 +218,15 @@ It comes with a German-English dictionary with approximately 270,000 entries.")
218(define-public grammalecte 218(define-public grammalecte
219 (package 219 (package
220 (name "grammalecte") 220 (name "grammalecte")
221 (version "0.6.5") 221 (version "1.0.1")
222 (source 222 (source
223 (origin 223 (origin
224 (method url-fetch/zipbomb) 224 (method url-fetch/zipbomb)
225 (uri (string-append "https://www.dicollecte.org/grammalecte/zip/" 225 (uri (string-append "https://grammalecte.net/grammalecte/zip/"
226 "Grammalecte-fr-v" version ".zip")) 226 "Grammalecte-fr-v" version ".zip"))
227 (sha256 227 (sha256
228 (base32 228 (base32
229 "11byjs3ggdhia5f4vyfqfvbbczsfqimll98h98g7hlsrm7vrifb0")))) 229 "0p005mqgmckkbif3syv3d90rr1zsm5n5vvac5b29nn8g4v8jjpfs"))))
230 (build-system python-build-system) 230 (build-system python-build-system)
231 (home-page "https://grammalecte.net") 231 (home-page "https://grammalecte.net")
232 (synopsis "French spelling and grammar checker") 232 (synopsis "French spelling and grammar checker")
@@ -245,7 +245,7 @@ and a Python library.")
245(define-public translate-shell 245(define-public translate-shell
246 (package 246 (package
247 (name "translate-shell") 247 (name "translate-shell")
248 (version "0.9.6.9") 248 (version "0.9.6.10")
249 (source 249 (source
250 (origin 250 (origin
251 (method git-fetch) 251 (method git-fetch)
@@ -254,13 +254,12 @@ and a Python library.")
254 (commit (string-append "v" version)))) 254 (commit (string-append "v" version))))
255 (file-name (git-file-name name version)) 255 (file-name (git-file-name name version))
256 (sha256 256 (sha256
257 (base32 257 (base32 "1dmh3flldfhnqfay3a6c5hanqcjwrmbly1bq8mlk022qfi1fv33y"))))
258 "1xyf0vdxmbgqcgsr1gvgwh1q4fh080h68radkim6pfcwzffliszm"))))
259 (build-system gnu-build-system) 258 (build-system gnu-build-system)
260 (arguments 259 (arguments
261 `(#:phases 260 `(#:phases
262 (modify-phases %standard-phases 261 (modify-phases %standard-phases
263 (delete 'configure) ; no configure phase 262 (delete 'configure) ; no configure script
264 (add-after 'unpack 'remove-unnecessary-file 263 (add-after 'unpack 'remove-unnecessary-file
265 ;; This file gets generated during the build phase. 264 ;; This file gets generated during the build phase.
266 (lambda _ 265 (lambda _
diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm
index 9cffe3b822a..24b6384eab5 100644
--- a/gnu/packages/dns.scm
+++ b/gnu/packages/dns.scm
@@ -294,14 +294,14 @@ asynchronous fashion.")
294(define-public nsd 294(define-public nsd
295 (package 295 (package
296 (name "nsd") 296 (name "nsd")
297 (version "4.1.26") 297 (version "4.1.27")
298 (source 298 (source
299 (origin 299 (origin
300 (method url-fetch) 300 (method url-fetch)
301 (uri (string-append "https://www.nlnetlabs.nl/downloads/nsd/nsd-" 301 (uri (string-append "https://www.nlnetlabs.nl/downloads/nsd/nsd-"
302 version ".tar.gz")) 302 version ".tar.gz"))
303 (sha256 303 (sha256
304 (base32 "1x0mvj4872dzj1rr9adnchdm4dhn41xmc459p5j4s0r13m1l32lz")))) 304 (base32 "1sjfbwr4vq25304hr9vmd9j821g2vzv8lpy95hpsravc80q5zaqv"))))
305 (build-system gnu-build-system) 305 (build-system gnu-build-system)
306 (arguments 306 (arguments
307 `(#:configure-flags 307 `(#:configure-flags
diff --git a/gnu/packages/elf.scm b/gnu/packages/elf.scm
index 1f8263b9c5a..99f49eb7a7f 100644
--- a/gnu/packages/elf.scm
+++ b/gnu/packages/elf.scm
@@ -96,14 +96,14 @@ Executable and Linkable Format (@dfn{ELF}). This includes @command{ld},
96 (package 96 (package
97 (name "libabigail") 97 (name "libabigail")
98 (home-page "https://sourceware.org/libabigail/") 98 (home-page "https://sourceware.org/libabigail/")
99 (version "1.5") 99 (version "1.6")
100 (source (origin 100 (source (origin
101 (method url-fetch) 101 (method url-fetch)
102 (uri (string-append "https://sourceware.org/pub/" name 102 (uri (string-append "https://sourceware.org/pub/libabigail/"
103 "/" name "-" version ".tar.gz")) 103 "libabigail-" version ".tar.gz"))
104 (sha256 104 (sha256
105 (base32 105 (base32
106 "0srfnkbm386sl2n85686nl28da6ksbs7jgnfks9k0n61c772aas4")))) 106 "04j07lhvwbp6qp8pdwbf7iqnr7kgpabmqylsw4invpmzwnyp6g6g"))))
107 (build-system gnu-build-system) 107 (build-system gnu-build-system)
108 (arguments 108 (arguments
109 `(#:configure-flags '("--disable-static" 109 `(#:configure-flags '("--disable-static"
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 04da4e3b401..92c2dd31844 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -2924,7 +2924,7 @@ These are distributed in separate files and can be used individually.")
2924 (description "Irony-mode provides Clang-assisted syntax checking and 2924 (description "Irony-mode provides Clang-assisted syntax checking and
2925completion for C, C++, and ObjC in GNU Emacs. Using @code{libclang} it can 2925completion for C, C++, and ObjC in GNU Emacs. Using @code{libclang} it can
2926provide syntax checking and autocompletion on compiler level which is very 2926provide syntax checking and autocompletion on compiler level which is very
2927resistent against false positives. It also integrates well with other 2927resistant against false positives. It also integrates well with other
2928packages like @code{eldoc-mode} and especially @code{company-mode} as 2928packages like @code{eldoc-mode} and especially @code{company-mode} as
2929described on the homepage.") 2929described on the homepage.")
2930 (license license:gpl3+))) 2930 (license license:gpl3+)))
@@ -14018,7 +14018,7 @@ opposed to character-based).")
14018(define-public emacs-disk-usage 14018(define-public emacs-disk-usage
14019 (package 14019 (package
14020 (name "emacs-disk-usage") 14020 (name "emacs-disk-usage")
14021 (version "1.3.0") 14021 (version "1.3.3")
14022 (home-page "https://gitlab.com/Ambrevar/emacs-disk-usage") 14022 (home-page "https://gitlab.com/Ambrevar/emacs-disk-usage")
14023 (source 14023 (source
14024 (origin 14024 (origin
@@ -14029,7 +14029,7 @@ opposed to character-based).")
14029 ".el")) 14029 ".el"))
14030 (sha256 14030 (sha256
14031 (base32 14031 (base32
14032 "0ky6c34z7c6hd4yvcrcsidkfk2kvffkg63v02vch2i6hg1n6n028")))) 14032 "0h1jwznd41gi0vg830ilfgm01q05zknikzahwasm9cizwm2wyizj"))))
14033 (build-system emacs-build-system) 14033 (build-system emacs-build-system)
14034 (synopsis "Sort and browse disk usage listings with Emacs") 14034 (synopsis "Sort and browse disk usage listings with Emacs")
14035 (description "Disk Usage is a file system analyzer: it offers a tabulated 14035 (description "Disk Usage is a file system analyzer: it offers a tabulated
diff --git a/gnu/packages/fpga.scm b/gnu/packages/fpga.scm
index 24a1219ce53..83854ef9c62 100644
--- a/gnu/packages/fpga.scm
+++ b/gnu/packages/fpga.scm
@@ -301,14 +301,14 @@ Includes the actual FTDI connector.")
301(define-public gtkwave 301(define-public gtkwave
302 (package 302 (package
303 (name "gtkwave") 303 (name "gtkwave")
304 (version "3.3.99") 304 (version "3.3.100")
305 (source (origin 305 (source (origin
306 (method url-fetch) 306 (method url-fetch)
307 (uri (string-append "http://gtkwave.sourceforge.net/" 307 (uri (string-append "http://gtkwave.sourceforge.net/"
308 name "-" version ".tar.gz")) 308 "gtkwave-" version ".tar.gz"))
309 (sha256 309 (sha256
310 (base32 310 (base32
311 "0lc4y2vizrbxldjk5yw2i4y7pyprjdjqx3iafzjfnin694zp2630")))) 311 "1z60i5nh8dz8j9ii63fwaw7k0p3x0scp91478cxmdv4xhp4njlxa"))))
312 (build-system gnu-build-system) 312 (build-system gnu-build-system)
313 (native-inputs 313 (native-inputs
314 `(("gperf" ,gperf) 314 `(("gperf" ,gperf)
diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
index 79b87856d59..5dd22215b80 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -1400,9 +1400,9 @@ Fenix.")
1400 ("openssl" ,openssl) 1400 ("openssl" ,openssl)
1401 ("sdl-mixer" ,sdl-mixer) 1401 ("sdl-mixer" ,sdl-mixer)
1402 ("bennu-game-development" ,bennu-game-development))) 1402 ("bennu-game-development" ,bennu-game-development)))
1403 (synopsis "Modules for the Bennu Game Developement programming language") 1403 (synopsis "Modules for the Bennu Game Development programming language")
1404 (description "This package contains a collection of modules for the Bennu 1404 (description "This package contains a collection of modules for the Bennu
1405Game Developement programming language, from CD handling through SDL to 1405Game Development programming language, from CD handling through SDL to
1406joystick support."))) 1406joystick support.")))
1407 1407
1408(define-public plib 1408(define-public plib
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 0b93409c767..da917e28707 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -7,7 +7,7 @@
7;;; Copyright © 2014 Sylvain Beucler <beuc@beuc.net> 7;;; Copyright © 2014 Sylvain Beucler <beuc@beuc.net>
8;;; Copyright © 2014, 2015, 2018, 2019 Ludovic Courtès <ludo@gnu.org> 8;;; Copyright © 2014, 2015, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
9;;; Copyright © 2014, 2015, 2016 Sou Bunnbu <iyzsong@gmail.com> 9;;; Copyright © 2014, 2015, 2016 Sou Bunnbu <iyzsong@gmail.com>
10;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org> 10;;; Copyright © 2014, 2015, 2019 Mark H Weaver <mhw@netris.org>
11;;; Copyright © 2015, 2016 Andreas Enge <andreas@enge.fr> 11;;; Copyright © 2015, 2016 Andreas Enge <andreas@enge.fr>
12;;; Copyright © 2015 David Hashe <david.hashe@dhashe.com> 12;;; Copyright © 2015 David Hashe <david.hashe@dhashe.com>
13;;; Copyright © 2015, 2017, 2018 Christopher Lemmer Webber <cwebber@dustycloud.org> 13;;; Copyright © 2015, 2017, 2018 Christopher Lemmer Webber <cwebber@dustycloud.org>
@@ -38,6 +38,7 @@
38;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com> 38;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com>
39;;; Copyright © 2019 Pierre Neidhardt <mail@ambrevar.xyz> 39;;; Copyright © 2019 Pierre Neidhardt <mail@ambrevar.xyz>
40;;; Copyright © 2019 Oleg Pykhalov <go.wigust@gmail.com> 40;;; Copyright © 2019 Oleg Pykhalov <go.wigust@gmail.com>
41;;; Copyright © 2019 Pierre Langlois <pierre.langlois@gmx.com>
41;;; 42;;;
42;;; This file is part of GNU Guix. 43;;; This file is part of GNU Guix.
43;;; 44;;;
@@ -237,6 +238,56 @@ enemy, ally, weapon and mission types. Features include simulated 4D texturing,
237mouse and joystick control, and original music.") 238mouse and joystick control, and original music.")
238 (license license:gpl2))) 239 (license license:gpl2)))
239 240
241(define-public alex4
242 (package
243 (name "alex4")
244 (version "1.2-alpha")
245 (source
246 (origin
247 (method url-fetch)
248 (uri (string-append "https://github.com/carstene1ns/alex4/archive/"
249 version ".tar.gz"))
250 (sha256
251 (base32 "0jj1g3v1a6lyfwp5g2ly0n9z65ryqck8jxvzr01kaqjj3lsfkrhg"))))
252 (build-system gnu-build-system)
253 (arguments
254 `(#:tests? #f ; no check target
255 #:make-flags
256 (list "-Csrc"
257 "CC=gcc"
258 "CFLAGS=-D_FILE_OFFSET_BITS=64"
259 (string-append "DATADIR=" (assoc-ref %outputs "out")
260 "/share/" ,name)
261 (string-append "PREFIX=" (assoc-ref %outputs "out")))
262 #:phases
263 (modify-phases %standard-phases
264 (replace 'configure
265 (lambda _
266 (substitute* '("src/main.c"
267 "src/shooter.c")
268 (("fcos") "fixcos")
269 (("fmul") "fixmul")
270 (("fsin") "fixsin"))
271 #t))
272 (add-after 'install 'install-data
273 (lambda* (#:key outputs #:allow-other-keys)
274 (let ((share (string-append (assoc-ref outputs "out")
275 "/share/" ,name)))
276 (install-file "alex4.ini" share)
277 #t))))))
278 (inputs
279 `(("allegro" ,allegro-4)
280 ("dumb" ,dumb-allegro4)))
281 (home-page "http://allegator.sourceforge.net/")
282 (synopsis "Retro platform game")
283 (description
284 "Guide Alex the Allegator through the jungle in order to save his
285girlfriend Lola from evil humans who want to make a pair of shoes out of her.
286Plenty of classic platforming in four nice colors guaranteed!
287
288The game includes a built-in editor so you can design and share your own maps.")
289 (license license:gpl2+)))
290
240(define-public armagetron-advanced 291(define-public armagetron-advanced
241 (package 292 (package
242 (name "armagetron-advanced") 293 (name "armagetron-advanced")
@@ -1795,7 +1846,7 @@ match, cannon keep, and grave-itation pit.")
1795(define minetest-data 1846(define minetest-data
1796 (package 1847 (package
1797 (name "minetest-data") 1848 (name "minetest-data")
1798 (version "5.0.0") 1849 (version "5.0.1")
1799 (source (origin 1850 (source (origin
1800 (method git-fetch) 1851 (method git-fetch)
1801 (uri (git-reference 1852 (uri (git-reference
@@ -1804,7 +1855,7 @@ match, cannon keep, and grave-itation pit.")
1804 (file-name (git-file-name name version)) 1855 (file-name (git-file-name name version))
1805 (sha256 1856 (sha256
1806 (base32 1857 (base32
1807 "186i1pna2f3fwa2001y8mw5131h0sndhfdxzfqq2gnr1m83sjm0w")))) 1858 "1hw3n7qqpasq6bivxhq01kr0d58w0gp46s0baxixp1fakd79p8a7"))))
1808 (build-system trivial-build-system) 1859 (build-system trivial-build-system)
1809 (native-inputs 1860 (native-inputs
1810 `(("source" ,source))) 1861 `(("source" ,source)))
@@ -1822,14 +1873,14 @@ match, cannon keep, and grave-itation pit.")
1822 #t)))) 1873 #t))))
1823 (synopsis "Main game data for the Minetest game engine") 1874 (synopsis "Main game data for the Minetest game engine")
1824 (description 1875 (description
1825 "Game data for the Minetest infinite-world block sandox game.") 1876 "Game data for the Minetest infinite-world block sandbox game.")
1826 (home-page "http://minetest.net") 1877 (home-page "http://minetest.net")
1827 (license license:lgpl2.1+))) 1878 (license license:lgpl2.1+)))
1828 1879
1829(define-public minetest 1880(define-public minetest
1830 (package 1881 (package
1831 (name "minetest") 1882 (name "minetest")
1832 (version "5.0.0") 1883 (version "5.0.1")
1833 (source (origin 1884 (source (origin
1834 (method git-fetch) 1885 (method git-fetch)
1835 (uri (git-reference 1886 (uri (git-reference
@@ -1838,7 +1889,7 @@ match, cannon keep, and grave-itation pit.")
1838 (file-name (git-file-name name version)) 1889 (file-name (git-file-name name version))
1839 (sha256 1890 (sha256
1840 (base32 1891 (base32
1841 "1b8n8nzlvmld1hl3zgs1xg4jbc1nsf1m2bn7fi794vdr06s6n911")) 1892 "11i8fqjpdggqfdlx440k5758zy0nbf9phxan9r63mavc7mph88ay"))
1842 (modules '((guix build utils))) 1893 (modules '((guix build utils)))
1843 (snippet 1894 (snippet
1844 '(begin 1895 '(begin
@@ -1865,7 +1916,7 @@ match, cannon keep, and grave-itation pit.")
1865 `(("pkg-config" ,pkg-config))) 1916 `(("pkg-config" ,pkg-config)))
1866 (inputs 1917 (inputs
1867 `(("curl" ,curl) 1918 `(("curl" ,curl)
1868 ("freetype" ,(@ (gnu packages fontutils) freetype)) 1919 ("freetype" ,freetype)
1869 ("gettext" ,gettext-minimal) 1920 ("gettext" ,gettext-minimal)
1870 ("gmp" ,gmp) 1921 ("gmp" ,gmp)
1871 ("irrlicht" ,irrlicht) 1922 ("irrlicht" ,irrlicht)
@@ -2066,7 +2117,7 @@ This game is based on the GPL version of the famous game TuxRacer.")
2066(define-public supertuxkart 2117(define-public supertuxkart
2067 (package 2118 (package
2068 (name "supertuxkart") 2119 (name "supertuxkart")
2069 (version "0.9.3") 2120 (version "1.0")
2070 (source 2121 (source
2071 (origin 2122 (origin
2072 (method url-fetch) 2123 (method url-fetch)
@@ -2074,55 +2125,36 @@ This game is based on the GPL version of the famous game TuxRacer.")
2074 version "/supertuxkart-" version "-src.tar.xz")) 2125 version "/supertuxkart-" version "-src.tar.xz"))
2075 (sha256 2126 (sha256
2076 (base32 2127 (base32
2077 "1c4w47ibj87lgwiqygq8qi7jiz6gklj4dwf5bs5zk15s0rqlw0fq")) 2128 "106rlp99hq18b4q1kdri3pl06cc4v7iqfp1hp9k2f8751lzz923d"))
2078 (modules '((guix build utils))) 2129 (modules '((guix build utils)))
2079 (snippet 2130 (snippet
2080 ;; Delete bundled library sources 2131 ;; Delete bundled library sources
2081 '(begin 2132 '(begin
2082 ;; FIXME: try to unbundle enet, and angelscript 2133 ;; Supertuxkart uses modified versions of the Irrlicht engine
2134 ;; and the bullet library. The developers gave an explanation
2135 ;; here: http://forum.freegamedev.net/viewtopic.php?f=17&t=3906
2136 ;; FIXME: try to unbundle angelscript
2083 (for-each delete-file-recursively 2137 (for-each delete-file-recursively
2084 '("lib/zlib" 2138 '("lib/zlib"
2085 "lib/libpng" 2139 "lib/libpng"
2086 "lib/jpeglib" 2140 "lib/jpeglib"
2087 "lib/glew" 2141 "lib/glew"
2088 "lib/wiiuse")) 2142 "lib/wiiuse"
2089 (substitute* "CMakeLists.txt" 2143 "lib/enet"))
2090 ;; Supertuxkart uses modified versions of the Irrlicht engine
2091 ;; and the bullet library. The developers gave an explanation here:
2092 ;; http://forum.freegamedev.net/viewtopic.php?f=17&t=3906
2093 (("add_subdirectory\\(.*/(glew|zlib)\"\\)") ""))
2094 #t)))) 2144 #t))))
2095 (build-system cmake-build-system) 2145 (build-system cmake-build-system)
2096 (arguments 2146 (arguments
2097 `(#:tests? #f ; no check target 2147 `(#:tests? #f ; no check target
2098 #:configure-flags 2148 #:configure-flags
2099 (list "-DUSE_WIIUSE=0" 2149 (list "-DUSE_WIIUSE=0"
2100 ;; Do not use the bundled zlib 2150 ;; Do not use the bundled zlib, glew and enet.
2101 "-DNO_IRR_COMPILE_WITH_ZLIB_=TRUE" 2151 "-DNO_IRR_COMPILE_WITH_ZLIB_=TRUE"
2152 "-DUSE_SYSTEM_GLEW=TRUE"
2153 "-DUSE_SYSTEM_ENET=TRUE"
2102 ;; FIXME: needs libopenglrecorder 2154 ;; FIXME: needs libopenglrecorder
2103 "-DBUILD_RECORDER=0" 2155 "-DBUILD_RECORDER=0"
2104 ;; Irrlicht returns an integer instead of a boolean 2156 ;; Irrlicht returns an integer instead of a boolean
2105 "-DCMAKE_C_FLAGS=-fpermissive") 2157 "-DCMAKE_C_FLAGS=-fpermissive")))
2106 #:phases
2107 (modify-phases %standard-phases
2108 ;; see https://github.com/supertuxkart/stk-code/issues/3557
2109 (add-after 'unpack 'patch-for-mesa-18.3
2110 (lambda _
2111 (substitute* "src/graphics/gl_headers.hpp"
2112 (("#if !defined\\(USE_GLES2\\)")
2113 "#if !defined(USE_GLES2)\n# define __gl_glext_h_"))
2114 #t))
2115 (add-after 'unpack 'unbundle
2116 (lambda* (#:key inputs #:allow-other-keys)
2117 (substitute* "CMakeLists.txt"
2118 (("glew")
2119 (string-append (assoc-ref inputs "glew")
2120 "/lib/libGLEW.a"))
2121 (("include_directories\\(\"\\$\\{PROJECT_SOURCE_DIR\\}/lib/glew/include\"\\)")
2122 (string-append "include_directories(\""
2123 (assoc-ref inputs "glew")
2124 "/include\")")))
2125 #t)))))
2126 (inputs 2158 (inputs
2127 `(("glew" ,glew) 2159 `(("glew" ,glew)
2128 ("zlib" ,zlib) 2160 ("zlib" ,zlib)
@@ -2136,7 +2168,9 @@ This game is based on the GPL version of the famous game TuxRacer.")
2136 ("curl" ,curl) 2168 ("curl" ,curl)
2137 ;; The following input is needed to build the bundled and modified 2169 ;; The following input is needed to build the bundled and modified
2138 ;; version of irrlicht. 2170 ;; version of irrlicht.
2139 ("libjpeg" ,libjpeg))) 2171 ("libjpeg" ,libjpeg)
2172 ("openssl" ,openssl)
2173 ("enet" ,enet)))
2140 (native-inputs 2174 (native-inputs
2141 `(("pkg-config" ,pkg-config))) 2175 `(("pkg-config" ,pkg-config)))
2142 (home-page "https://supertuxkart.net/") 2176 (home-page "https://supertuxkart.net/")
@@ -4476,7 +4510,7 @@ fish. The whole game is accompanied by quiet, comforting music.")
4476(define-public dungeon-crawl-stone-soup 4510(define-public dungeon-crawl-stone-soup
4477 (package 4511 (package
4478 (name "dungeon-crawl-stone-soup") 4512 (name "dungeon-crawl-stone-soup")
4479 (version "0.23.1") 4513 (version "0.23.2")
4480 (source 4514 (source
4481 (origin 4515 (origin
4482 (method url-fetch) 4516 (method url-fetch)
@@ -4489,8 +4523,7 @@ fish. The whole game is accompanied by quiet, comforting music.")
4489 (string-append "http://crawl.develz.org/release/stone_soup-" 4523 (string-append "http://crawl.develz.org/release/stone_soup-"
4490 version "-nodeps.tar.xz"))) 4524 version "-nodeps.tar.xz")))
4491 (sha256 4525 (sha256
4492 (base32 4526 (base32 "1hw10hqhh688mrqs9vxrl17y1dzfjzsmxz6izg1a9dzmjlhrc01a"))
4493 "0c3mx49kpz6i2xvv2dwsaj9s7mm4mif1h2qdkfyi80lv2j1ay51h"))
4494 (patches (search-patches "crawl-upgrade-saves.patch")))) 4527 (patches (search-patches "crawl-upgrade-saves.patch"))))
4495 (build-system gnu-build-system) 4528 (build-system gnu-build-system)
4496 (inputs 4529 (inputs
@@ -4512,7 +4545,7 @@ fish. The whole game is accompanied by quiet, comforting music.")
4512 (list (string-append "SQLITE_INCLUDE_DIR=" sqlite "/include") 4545 (list (string-append "SQLITE_INCLUDE_DIR=" sqlite "/include")
4513 (string-append "prefix=" out) 4546 (string-append "prefix=" out)
4514 "SAVEDIR=~/.crawl" 4547 "SAVEDIR=~/.crawl"
4515 ;; Don't compile with SSE on systems which don't use it 4548 ;; Don't compile with SSE on systems which don't have it.
4516 ,@(match (%current-system) 4549 ,@(match (%current-system)
4517 ((or "i686-linux" "x86_64-linux") 4550 ((or "i686-linux" "x86_64-linux")
4518 '()) 4551 '())
@@ -6486,7 +6519,7 @@ the desired spell.")
6486(define-public the-legend-of-edgar 6519(define-public the-legend-of-edgar
6487 (package 6520 (package
6488 (name "the-legend-of-edgar") 6521 (name "the-legend-of-edgar")
6489 (version "1.30") 6522 (version "1.31")
6490 (source 6523 (source
6491 (origin 6524 (origin
6492 (method url-fetch) 6525 (method url-fetch)
@@ -6494,10 +6527,9 @@ the desired spell.")
6494 (string-append "https://github.com/riksweeney/edgar/releases/download/" 6527 (string-append "https://github.com/riksweeney/edgar/releases/download/"
6495 version "/edgar-" version "-1.tar.gz")) 6528 version "/edgar-" version "-1.tar.gz"))
6496 (sha256 6529 (sha256
6497 (base32 6530 (base32 "0i4851ci8a86ql4bhdq3xdfmf4b9z5zrd4xpc6vhi06697zgm13i"))))
6498 "0bhbs33dg0nb8wqlh6px1jj41j05f89ngdqwdkffabmjk7wq5isx"))))
6499 (build-system gnu-build-system) 6531 (build-system gnu-build-system)
6500 (arguments '(#:tests? #f ; there are no tests 6532 (arguments '(#:tests? #f ; there are no tests
6501 #:make-flags 6533 #:make-flags
6502 (list "CC=gcc" 6534 (list "CC=gcc"
6503 (string-append "PREFIX=" (assoc-ref %outputs "out")) 6535 (string-append "PREFIX=" (assoc-ref %outputs "out"))
@@ -6507,14 +6539,13 @@ the desired spell.")
6507 (delete 'configure) 6539 (delete 'configure)
6508 (add-before 'build 'fix-env 6540 (add-before 'build 'fix-env
6509 (lambda* (#:key inputs #:allow-other-keys) 6541 (lambda* (#:key inputs #:allow-other-keys)
6510 (setenv "CPATH" (string-append (assoc-ref inputs "sdl") 6542 (setenv "CPATH"
6511 "/include/SDL/")) 6543 (string-append (assoc-ref inputs "sdl2-union")
6544 "/include/SDL2"))
6512 #t))))) 6545 #t)))))
6513 (inputs `(("sdl" ,sdl) 6546 (inputs
6514 ("sdl-img" ,sdl-image) 6547 `(("sdl2-union" ,(sdl-union (list sdl2 sdl2-image sdl2-mixer sdl2-ttf)))
6515 ("sdl-mixer" ,sdl-mixer) 6548 ("zlib" ,zlib)))
6516 ("sdl-ttf" ,sdl-ttf)
6517 ("zlib" ,zlib)))
6518 (native-inputs 6549 (native-inputs
6519 `(("pkg-config" ,pkg-config) 6550 `(("pkg-config" ,pkg-config)
6520 ("autoconf" ,autoconf) 6551 ("autoconf" ,autoconf)
diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
index 0795be3619a..2ee65015a6e 100644
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@ -369,7 +369,7 @@ libskba (working with X.509 certificates and CMS data).")
369(define-public gpgme 369(define-public gpgme
370 (package 370 (package
371 (name "gpgme") 371 (name "gpgme")
372 (version "1.12.0") 372 (version "1.13.0")
373 (source 373 (source
374 (origin 374 (origin
375 (method url-fetch) 375 (method url-fetch)
@@ -377,16 +377,7 @@ libskba (working with X.509 certificates and CMS data).")
377 ".tar.bz2")) 377 ".tar.bz2"))
378 (sha256 378 (sha256
379 (base32 379 (base32
380 "1n4c1q2ls7sqx1vpr3p5n8vbjkw6kqp8jxqa28p0x9j36wf9bp5l")) 380 "0c6676g0yhfsmy32i1dgwh5cx0ja8vhcqf4k08zad177m53kxcnl"))))
381 ;; One test fails because the conflict keys have expired. See
382 ;; https://dev.gnupg.org/T3815
383 (patches (list (origin
384 (method url-fetch)
385 (uri "https://dev.gnupg.org/rM66376f3e206a1aa791d712fb8577bb3490268f60?diff=1")
386 (file-name "gpgme-fix-conflict-test-keys.patch")
387 (sha256
388 (base32
389 "0j718iy5a9fhkrfs4gzrnm4ggi163prqf1i8lfmqczswvz88zfly")))))))
390 (build-system gnu-build-system) 381 (build-system gnu-build-system)
391 (native-inputs 382 (native-inputs
392 `(("gnupg" ,gnupg))) 383 `(("gnupg" ,gnupg)))
diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index e7f9e8fe933..03fd63837e4 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -948,40 +948,37 @@ Guile.")
948 `(("guile" ,guile-2.2) 948 `(("guile" ,guile-2.2)
949 ("guile-email" ,guile-email)))))) 949 ("guile-email" ,guile-email))))))
950 950
951;; There has not been any release yet.
952(define-public guile-newt 951(define-public guile-newt
953 (let ((commit "80c1e9e71945f833386d1632b52573e59325804f") 952 (package
954 (revision "4")) 953 (name "guile-newt")
955 (package 954 (version "0.0.1")
956 (name "guile-newt") 955 (source (origin
957 (version (string-append "0-" revision "." (string-take commit 9))) 956 (method git-fetch)
958 (source (origin 957 (uri (git-reference
959 (method git-fetch) 958 (url "https://gitlab.com/mothacehe/guile-newt")
960 (uri (git-reference 959 (commit version)))
961 (url "https://gitlab.com/mothacehe/guile-newt") 960 (file-name (git-file-name name version))
962 (commit commit))) 961 (sha256
963 (file-name (string-append name "-" version "-checkout")) 962 (base32
964 (sha256 963 "1w7qy4dw1f4bx622l6hw8mv49sf1ha8kch8j4nganyk8fj0wn695"))))
965 (base32 964 (build-system gnu-build-system)
966 "1w7qy4dw1f4bx622l6hw8mv49sf1ha8kch8j4nganyk8fj0wn695")))) 965 (arguments
967 (build-system gnu-build-system) 966 '(#:make-flags
968 (arguments 967 '("GUILE_AUTO_COMPILE=0"))) ;to prevent guild warnings
969 '(#:make-flags 968 (inputs
970 '("GUILE_AUTO_COMPILE=0"))) ;to prevent guild warnings 969 `(("guile" ,guile-2.2)
971 (inputs 970 ("newt" ,newt)))
972 `(("guile" ,guile-2.2) 971 (native-inputs
973 ("newt" ,newt))) 972 `(("autoconf" ,autoconf)
974 (native-inputs 973 ("automake" ,automake)
975 `(("autoconf" ,autoconf) 974 ("pkg-config" ,pkg-config)))
976 ("automake" ,automake) 975 (synopsis "Guile bindings to Newt")
977 ("pkg-config" ,pkg-config))) 976 (description
978 (synopsis "Guile bindings to Newt") 977 "This package provides bindings for Newt, a programming library for
979 (description
980 "This package provides bindings for Newt, a programming library for
981color text mode, widget based user interfaces. The bindings are written in pure 978color text mode, widget based user interfaces. The bindings are written in pure
982Scheme by using Guile’s foreign function interface.") 979Scheme by using Guile’s foreign function interface.")
983 (home-page "https://gitlab.com/mothacehe/guile-newt") 980 (home-page "https://gitlab.com/mothacehe/guile-newt")
984 (license license:gpl3+)))) 981 (license license:gpl3+)))
985 982
986(define-public guile-mastodon 983(define-public guile-mastodon
987 (package 984 (package
@@ -1012,42 +1009,39 @@ Scheme by using Guile’s foreign function interface.")
1012microblogging service.") 1009microblogging service.")
1013 (license license:gpl3+))) 1010 (license license:gpl3+)))
1014 1011
1015;; There has not been any release yet.
1016(define-public guile-parted 1012(define-public guile-parted
1017 (let ((commit "ea3f1a1f6844775fc59d3078d2a09c62ffb341b8") 1013 (package
1018 (revision "0")) 1014 (name "guile-parted")
1019 (package 1015 (version "0.0.1")
1020 (name "guile-parted") 1016 (source (origin
1021 (version (string-append "0-" revision "." (string-take commit 9))) 1017 (method git-fetch)
1022 (source (origin 1018 (uri (git-reference
1023 (method git-fetch) 1019 (url "https://gitlab.com/mothacehe/guile-parted")
1024 (uri (git-reference 1020 (commit version)))
1025 (url "https://gitlab.com/mothacehe/guile-parted") 1021 (file-name (git-file-name name version))
1026 (commit commit))) 1022 (sha256
1027 (file-name (string-append name "-" version "-checkout")) 1023 (base32
1028 (sha256 1024 "1q7425gpjlwi2wvhzq7kw046yyx7v6j6jyzkd1cr861iz34mjwiq"))))
1029 (base32 1025 (build-system gnu-build-system)
1030 "1q7425gpjlwi2wvhzq7kw046yyx7v6j6jyzkd1cr861iz34mjwiq")))) 1026 (arguments
1031 (build-system gnu-build-system) 1027 '(#:make-flags
1032 (arguments 1028 '("GUILE_AUTO_COMPILE=0"))) ;to prevent guild warnings
1033 '(#:make-flags 1029 (inputs
1034 '("GUILE_AUTO_COMPILE=0"))) ;to prevent guild warnings 1030 `(("guile" ,guile-2.2)
1035 (inputs 1031 ("parted" ,parted)))
1036 `(("guile" ,guile-2.2) 1032 (propagated-inputs
1037 ("parted" ,parted))) 1033 `(("guile-bytestructures" ,guile-bytestructures)))
1038 (propagated-inputs 1034 (native-inputs
1039 `(("guile-bytestructures" ,guile-bytestructures))) 1035 `(("autoconf" ,autoconf)
1040 (native-inputs 1036 ("automake" ,automake)
1041 `(("autoconf" ,autoconf) 1037 ("pkg-config" ,pkg-config)))
1042 ("automake" ,automake) 1038 (synopsis "Guile bindings to GNU Parted")
1043 ("pkg-config" ,pkg-config))) 1039 (description
1044 (synopsis "Guile bindings to GNU Parted") 1040 "This package provides bindings for GNU Parted library, a C library
1045 (description 1041allowing disk partition tables creation and manipulation. The bindings are
1046 "This package provides bindings for GNU Parted library, a C library
1047allowing disk partition tables creation and manipulation. The bindings are
1048written in pure Scheme by using Guile's foreign function interface.") 1042written in pure Scheme by using Guile's foreign function interface.")
1049 (home-page "https://gitlab.com/mothacehe/guile-parted") 1043 (home-page "https://gitlab.com/mothacehe/guile-parted")
1050 (license license:gpl3+)))) 1044 (license license:gpl3+)))
1051 1045
1052(define-public guile-xosd 1046(define-public guile-xosd
1053 (package 1047 (package
diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index 3d269cea83b..4b4a4b5e00d 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -12,7 +12,7 @@
12;;; Copyright © 2017 Peter Mikkelsen <petermikkelsen10@gmail.com> 12;;; Copyright © 2017 Peter Mikkelsen <petermikkelsen10@gmail.com>
13;;; Copyright © 2017, 2018 Alex Vong <alexvong1995@gmail.com> 13;;; Copyright © 2017, 2018 Alex Vong <alexvong1995@gmail.com>
14;;; Copyright © 2017 rsiddharth <s@ricketyspace.net> 14;;; Copyright © 2017 rsiddharth <s@ricketyspace.net>
15;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr> 15;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
16;;; Copyright © 2018 Tonton <tonton@riseup.net> 16;;; Copyright © 2018 Tonton <tonton@riseup.net>
17;;; Copyright © 2018, 2019 Timothy Sample <samplet@ngyro.com> 17;;; Copyright © 2018, 2019 Timothy Sample <samplet@ngyro.com>
18;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net> 18;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net>
@@ -1335,7 +1335,7 @@ Happy works in a similar way to the yacc tool for C.")
1335(define-public ghc-haskell-lexer 1335(define-public ghc-haskell-lexer
1336 (package 1336 (package
1337 (name "ghc-haskell-lexer") 1337 (name "ghc-haskell-lexer")
1338 (version "1.0.1") 1338 (version "1.0.2")
1339 (source 1339 (source
1340 (origin 1340 (origin
1341 (method url-fetch) 1341 (method url-fetch)
@@ -1343,8 +1343,7 @@ Happy works in a similar way to the yacc tool for C.")
1343 "https://hackage.haskell.org/package/haskell-lexer/haskell-lexer-" 1343 "https://hackage.haskell.org/package/haskell-lexer/haskell-lexer-"
1344 version ".tar.gz")) 1344 version ".tar.gz"))
1345 (sha256 1345 (sha256
1346 (base32 1346 (base32 "1wyxd8x33x4v5vxyzkhm610pl86gbkc8y439092fr1735q9g7kfq"))))
1347 "0rj3r1pk88hh3sk3mj61whp8czz5kpxhbc78xlr04bxwqjrjmm6p"))))
1348 (build-system haskell-build-system) 1347 (build-system haskell-build-system)
1349 (home-page "http://hackage.haskell.org/package/haskell-lexer") 1348 (home-page "http://hackage.haskell.org/package/haskell-lexer")
1350 (synopsis "Fully compliant Haskell 98 lexer") 1349 (synopsis "Fully compliant Haskell 98 lexer")
diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm
index 77aecce9f26..f652cca1c23 100644
--- a/gnu/packages/ibus.scm
+++ b/gnu/packages/ibus.scm
@@ -57,7 +57,7 @@
57(define-public ibus 57(define-public ibus
58 (package 58 (package
59 (name "ibus") 59 (name "ibus")
60 (version "1.5.19") 60 (version "1.5.20")
61 (source (origin 61 (source (origin
62 (method url-fetch) 62 (method url-fetch)
63 (uri (string-append "https://github.com/ibus/ibus/" 63 (uri (string-append "https://github.com/ibus/ibus/"
@@ -65,23 +65,15 @@
65 version "/ibus-" version ".tar.gz")) 65 version "/ibus-" version ".tar.gz"))
66 (sha256 66 (sha256
67 (base32 67 (base32
68 "0a94bnpm24581317hdnihwr4cniriml10p4ffgxg14xhvaccfrjb")))) 68 "0d6hcbw6ai91jl87lqnyn8bxi5y5kba5i9nz7knknyh69g5fbwac"))))
69 (build-system glib-or-gtk-build-system) 69 (build-system glib-or-gtk-build-system)
70 (arguments 70 (arguments
71 `(#:tests? #f ; tests fail because there's no connection to dbus 71 `(#:tests? #f ; tests fail because there's no connection to dbus
72 #:configure-flags `("--disable-emoji-dict" ; cannot find emoji.json path 72 #:configure-flags `("--disable-emoji-dict" ; cannot find emoji.json path
73 "--disable-python2"
74 "--enable-python-library" 73 "--enable-python-library"
75 ,(string-append "--with-ucd-dir=" 74 ,(string-append "--with-ucd-dir="
76 (getcwd) "/ucd") 75 (getcwd) "/ucd")
77 "--enable-wayland") 76 "--enable-wayland")
78 #:make-flags
79 (list "CC=gcc"
80 (string-append "pyoverridesdir="
81 (assoc-ref %outputs "out")
82 "/lib/python"
83 ,(version-major+minor (package-version python))
84 "/site-packages/gi/overrides/"))
85 #:phases 77 #:phases
86 (modify-phases %standard-phases 78 (modify-phases %standard-phases
87 (add-after 'unpack 'prepare-ucd-dir 79 (add-after 'unpack 'prepare-ucd-dir
@@ -90,6 +82,18 @@
90 (symlink (assoc-ref inputs "unicode-blocks") "../ucd/Blocks.txt") 82 (symlink (assoc-ref inputs "unicode-blocks") "../ucd/Blocks.txt")
91 (symlink (assoc-ref inputs "unicode-nameslist") "../ucd/NamesList.txt") 83 (symlink (assoc-ref inputs "unicode-nameslist") "../ucd/NamesList.txt")
92 #t)) 84 #t))
85 (add-after 'unpack 'patch-python-target-directories
86 (lambda* (#:key outputs #:allow-other-keys)
87 (let ((root (string-append (assoc-ref outputs "out")
88 "/lib/python"
89 ,(version-major+minor (package-version python))
90 "/site-packages")))
91 (substitute* "configure"
92 (("(py2?overridesdir)=.*" _ var)
93 (string-append var "=" root "/gi/overrides/"))
94 (("(pkgpython2dir=).*" _ var)
95 (string-append var root "/ibus"))))
96 #t))
93 (add-before 'configure 'disable-dconf-update 97 (add-before 'configure 'disable-dconf-update
94 (lambda _ 98 (lambda _
95 (substitute* "data/dconf/Makefile.in" 99 (substitute* "data/dconf/Makefile.in"
@@ -131,7 +135,7 @@
131 ("gconf" ,gconf) 135 ("gconf" ,gconf)
132 ("gtk2" ,gtk+-2) 136 ("gtk2" ,gtk+-2)
133 ("gtk+" ,gtk+) 137 ("gtk+" ,gtk+)
134 ("intltool" ,intltool) 138 ("gettext" ,gnu-gettext)
135 ("json-glib" ,json-glib) 139 ("json-glib" ,json-glib)
136 ("libnotify" ,libnotify) 140 ("libnotify" ,libnotify)
137 ("libx11" ,libx11) 141 ("libx11" ,libx11)
@@ -175,7 +179,7 @@ may also simplify input method development.")
175(define-public ibus-libpinyin 179(define-public ibus-libpinyin
176 (package 180 (package
177 (name "ibus-libpinyin") 181 (name "ibus-libpinyin")
178 (version "1.10.0") 182 (version "1.11.0")
179 (source (origin 183 (source (origin
180 (method url-fetch) 184 (method url-fetch)
181 (uri (string-append "https://github.com/libpinyin/ibus-libpinyin/" 185 (uri (string-append "https://github.com/libpinyin/ibus-libpinyin/"
@@ -183,7 +187,7 @@ may also simplify input method development.")
183 "/ibus-libpinyin-" version ".tar.gz")) 187 "/ibus-libpinyin-" version ".tar.gz"))
184 (sha256 188 (sha256
185 (base32 189 (base32
186 "0yq8aw4lddiviag8cnik6fp52vvk8lxv6bym13a3xya84c6zii3c")))) 190 "1sypbr5n96sf7mgqhxrwbawdmszgb6yi28iqkmfmb8xr93pwq7fq"))))
187 (build-system glib-or-gtk-build-system) 191 (build-system glib-or-gtk-build-system)
188 (arguments 192 (arguments
189 `(#:phases 193 `(#:phases
@@ -209,6 +213,7 @@ may also simplify input method development.")
209 ("sqlite" ,sqlite) 213 ("sqlite" ,sqlite)
210 ("python" ,python) 214 ("python" ,python)
211 ("pyxdg" ,python-pyxdg) 215 ("pyxdg" ,python-pyxdg)
216 ("pygobject2" ,python-pygobject)
212 ("gtk+" ,gtk+))) 217 ("gtk+" ,gtk+)))
213 (native-inputs 218 (native-inputs
214 `(("pkg-config" ,pkg-config) 219 `(("pkg-config" ,pkg-config)
@@ -224,15 +229,15 @@ ZhuYin (Bopomofo) input method based on libpinyin for IBus.")
224(define-public libpinyin 229(define-public libpinyin
225 (package 230 (package
226 (name "libpinyin") 231 (name "libpinyin")
227 (version "2.2.0") 232 (version "2.3.0")
228 (source (origin 233 (source (origin
229 (method url-fetch) 234 (method url-fetch)
230 (uri (string-append "https://github.com/libpinyin/libpinyin/" 235 (uri (string-append "https://github.com/libpinyin/libpinyin/"
231 "releases/download/" version 236 "releases/download/" version
232 "/libpinyin-2.2.0.tar.gz")) 237 "/libpinyin-" version ".tar.gz"))
233 (sha256 238 (sha256
234 (base32 239 (base32
235 "1c4wxvcvjxvk23mcwqvsfsv4nhimx4kpjhabxa28gx1ih10l88gj")))) 240 "14969v6w8n1aiqphl2386dws7dmsdwbzyqnlz4kr8ppm39m9rp5k"))))
236 (build-system gnu-build-system) 241 (build-system gnu-build-system)
237 (inputs 242 (inputs
238 `(("glib" ,glib) 243 `(("glib" ,glib)
diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index 3b2bb232520..4443e1c83d6 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -87,6 +87,7 @@
87 (package 87 (package
88 (name "libpng") 88 (name "libpng")
89 (version "1.6.34") 89 (version "1.6.34")
90 (replacement libpng-1.6.37)
90 (source (origin 91 (source (origin
91 (method url-fetch) 92 (method url-fetch)
92 (uri (list (string-append "mirror://sourceforge/libpng/libpng16/" 93 (uri (list (string-append "mirror://sourceforge/libpng/libpng16/"
@@ -112,6 +113,25 @@ library. It supports almost all PNG features and is extensible.")
112 (license license:zlib) 113 (license license:zlib)
113 (home-page "http://www.libpng.org/pub/png/libpng.html"))) 114 (home-page "http://www.libpng.org/pub/png/libpng.html")))
114 115
116;; This graft exists to fix CVE-2018-14048, CVE-2018-14550, and CVE-2019-7317.
117(define-public libpng-1.6.37
118 (package
119 (inherit libpng)
120 (version "1.6.37")
121 (source (origin
122 (method url-fetch)
123 (uri (list (string-append "mirror://sourceforge/libpng/libpng16/"
124 version "/libpng-" version ".tar.xz")
125 (string-append
126 "ftp://ftp.simplesystems.org/pub/libpng/png/src"
127 "/libpng16/libpng-" version ".tar.xz")
128 (string-append
129 "ftp://ftp.simplesystems.org/pub/libpng/png/src/history"
130 "/libpng16/libpng-" version ".tar.xz")))
131 (sha256
132 (base32
133 "1jl8in381z0128vgxnvn33nln6hzckl7l7j9nqvkaf1m9n1p0pjh"))))))
134
115;; libpng-apng should be updated when the APNG patch is released: 135;; libpng-apng should be updated when the APNG patch is released:
116;; <https://bugs.gnu.org/27556> 136;; <https://bugs.gnu.org/27556>
117(define-public libpng-apng 137(define-public libpng-apng
@@ -1153,13 +1173,13 @@ the programmer.")
1153 (version "1.3") 1173 (version "1.3")
1154 (source 1174 (source
1155 (origin 1175 (origin
1156 (method url-fetch) 1176 (method git-fetch)
1157 (uri (string-append "https://github.com/myint/perceptualdiff/archive/v" 1177 (uri (git-reference
1158 version ".tar.gz")) 1178 (url "https://github.com/myint/perceptualdiff.git")
1159 (file-name (string-append name "-" version ".tar.gz")) 1179 (commit (string-append "v" version))))
1160 (sha256 1180 (file-name (git-file-name name version))
1161 (base32 1181 (sha256
1162 "0zl6xmp971fffg7fzcz2fbgxg5x2w7l8qa65c008i4kbkc9016ps")))) 1182 (base32 "0yys55f9i9g3wjjg0j2m0p0k21zwnid8520a8lrr30khm4k5gibp"))))
1163 (build-system cmake-build-system) 1183 (build-system cmake-build-system)
1164 (inputs `(("freeimage" ,freeimage))) 1184 (inputs `(("freeimage" ,freeimage)))
1165 (arguments 1185 (arguments
@@ -1505,15 +1525,14 @@ in-memory raw vectors.")
1505(define-public gifsicle 1525(define-public gifsicle
1506 (package 1526 (package
1507 (name "gifsicle") 1527 (name "gifsicle")
1508 (version "1.91") 1528 (version "1.92")
1509 (source 1529 (source
1510 (origin 1530 (origin
1511 (method url-fetch) 1531 (method url-fetch)
1512 (uri (string-append "http://www.lcdf.org/gifsicle/gifsicle-" 1532 (uri (string-append "https://www.lcdf.org/gifsicle/gifsicle-"
1513 version ".tar.gz")) 1533 version ".tar.gz"))
1514 (sha256 1534 (sha256
1515 (base32 1535 (base32 "0rffpzxcak19k6cngpxn73khvm3z1gswrqs90ycdzzb53p05ddas"))))
1516 "00586z1yz86qcblgmf16yly39n4lkjrscl52hvfxqk14m81fckha"))))
1517 (build-system gnu-build-system) 1536 (build-system gnu-build-system)
1518 (arguments 1537 (arguments
1519 '(#:phases 1538 '(#:phases
@@ -1528,9 +1547,9 @@ in-memory raw vectors.")
1528 (("/bin/rm") 1547 (("/bin/rm")
1529 (which "rm"))) 1548 (which "rm")))
1530 #t))))) 1549 #t)))))
1531 (native-inputs `(("perl" ,perl))) ; Only for tests. 1550 (native-inputs `(("perl" ,perl))) ; only for tests
1532 (inputs `(("libx11" ,libx11))) 1551 (inputs `(("libx11" ,libx11)))
1533 (home-page "http://www.lcdf.org/gifsicle/") 1552 (home-page "https://www.lcdf.org/gifsicle/")
1534 (synopsis "Edit GIF images and animations") 1553 (synopsis "Edit GIF images and animations")
1535 (description "Gifsicle is a command-line GIF image manipulation tool that: 1554 (description "Gifsicle is a command-line GIF image manipulation tool that:
1536 1555
diff --git a/gnu/packages/libedit.scm b/gnu/packages/libedit.scm
index b5e20f30f83..7681677938c 100644
--- a/gnu/packages/libedit.scm
+++ b/gnu/packages/libedit.scm
@@ -1,7 +1,7 @@
1;;; GNU Guix --- Functional package management for GNU 1;;; GNU Guix --- Functional package management for GNU
2;;; Copyright © 2015 Federico Beffa <beffa@fbengineering.ch> 2;;; Copyright © 2015 Federico Beffa <beffa@fbengineering.ch>
3;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net> 3;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
4;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> 4;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
5;;; Copyright © 2019 Gábor Boskovits <boskovits@gmail.com> 5;;; Copyright © 2019 Gábor Boskovits <boskovits@gmail.com>
6;;; 6;;;
7;;; This file is part of GNU Guix. 7;;; This file is part of GNU Guix.
@@ -29,15 +29,14 @@
29(define-public libedit 29(define-public libedit
30 (package 30 (package
31 (name "libedit") 31 (name "libedit")
32 (version "20181209-3.1") 32 (version "20190324-3.1")
33 (source 33 (source
34 (origin 34 (origin
35 (method url-fetch) 35 (method url-fetch)
36 (uri (string-append "http://thrysoee.dk/editline" 36 (uri (string-append "http://thrysoee.dk/editline"
37 "/" name "-" version ".tar.gz")) 37 "/libedit-" version ".tar.gz"))
38 (sha256 38 (sha256
39 (base32 39 (base32 "1bhvp8xkkgrg89k4ci1k8vjl3nhb6szd4ghy9lp4jrfgq58hz3xc"))))
40 "0r0hc4lg71xnn0vrrk2g7is42i0k0dra7cbw3fljq3q01c6df498"))))
41 (build-system gnu-build-system) 40 (build-system gnu-build-system)
42 (inputs 41 (inputs
43 `(("ncurses" ,ncurses))) 42 `(("ncurses" ,ncurses)))
diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm
index 3b8fa514d1f..9f5bedd9138 100644
--- a/gnu/packages/libreoffice.scm
+++ b/gnu/packages/libreoffice.scm
@@ -554,8 +554,8 @@ Java.")
554 (source 554 (source
555 (origin 555 (origin
556 (method url-fetch) 556 (method url-fetch)
557 (uri (string-append "https://dev-www.libreoffice.org/src/" name "/" 557 (uri (string-append "https://dev-www.libreoffice.org/src/libpagemaker/"
558 name "-" version ".tar.xz")) 558 "libpagemaker-" version ".tar.xz"))
559 (sha256 (base32 559 (sha256 (base32
560 "17ai8ajffr0ixxmmcv3k5vgjlcsix38ldb4fw2arild70pbsrbb6")))) 560 "17ai8ajffr0ixxmmcv3k5vgjlcsix38ldb4fw2arild70pbsrbb6"))))
561 (build-system gnu-build-system) 561 (build-system gnu-build-system)
@@ -581,8 +581,8 @@ created by PageMaker version 6.x and 7.")
581 (source 581 (source
582 (origin 582 (origin
583 (method url-fetch) 583 (method url-fetch)
584 (uri (string-append "http://dev-www.libreoffice.org/src/" name "/" 584 (uri (string-append "http://dev-www.libreoffice.org/src/libvisio/"
585 name "-" version ".tar.xz")) 585 "libvisio-" version ".tar.xz"))
586 (sha256 (base32 586 (sha256 (base32
587 "1yahpfl13qk6178irv8jn5ppxdn7isafqisyqsdw0lqxcz9h447y")))) 587 "1yahpfl13qk6178irv8jn5ppxdn7isafqisyqsdw0lqxcz9h447y"))))
588 (build-system gnu-build-system) 588 (build-system gnu-build-system)
@@ -611,8 +611,8 @@ Microsoft Visio documents of all versions.")
611 (source 611 (source
612 (origin 612 (origin
613 (method url-fetch) 613 (method url-fetch)
614 (uri (string-append "mirror://sourceforge/libwpd/" name "/" 614 (uri (string-append "mirror://sourceforge/libwpd/libodfgen/"
615 name "-" version "/" name "-" version ".tar.xz")) 615 "libodfgen-" version "/libodfgen-" version ".tar.xz"))
616 (sha256 (base32 616 (sha256 (base32
617 "0cdq48wlpp8m0qmndybv64r0m4vh0qsqx69cn6ms533cjlgljgij")))) 617 "0cdq48wlpp8m0qmndybv64r0m4vh0qsqx69cn6ms533cjlgljgij"))))
618 (build-system gnu-build-system) 618 (build-system gnu-build-system)
@@ -638,14 +638,14 @@ text documents, vector drawings, presentations and spreadsheets.")
638(define-public libmwaw 638(define-public libmwaw
639 (package 639 (package
640 (name "libmwaw") 640 (name "libmwaw")
641 (version "0.3.14") 641 (version "0.3.15")
642 (source 642 (source
643 (origin 643 (origin
644 (method url-fetch) 644 (method url-fetch)
645 (uri (string-append "mirror://sourceforge/" name "/" name "/" name "-" 645 (uri (string-append "mirror://sourceforge/libmwaw/libmwaw/libmwaw-"
646 version "/" name "-" version ".tar.xz")) 646 version "/libmwaw-" version ".tar.xz"))
647 (sha256 (base32 647 (sha256 (base32
648 "1s9wyf8pyh3fbazq2d2b6fgi7s7bid60viw2xbdkmn2ywlfbza5c")))) 648 "1cdhm9yhanyv3w4vr73zhgyynmkhhkp3dyld7m11jd2yy04vnh04"))))
649 (build-system gnu-build-system) 649 (build-system gnu-build-system)
650 (native-inputs 650 (native-inputs
651 `(("doxygen" ,doxygen) 651 `(("doxygen" ,doxygen)
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index b429cda3542..b44598996bf 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -423,8 +423,8 @@ for ARCH and optionally VARIANT, or #f if there is no such configuration."
423It has been modified to remove all non-free binary blobs.") 423It has been modified to remove all non-free binary blobs.")
424 (license license:gpl2))) 424 (license license:gpl2)))
425 425
426(define %linux-libre-version "5.0.7") 426(define %linux-libre-version "5.0.9")
427(define %linux-libre-hash "0c8g20crv03xxxpirj0jylcxxy33dn9f9x7viv451rzh9frc5mal") 427(define %linux-libre-hash "0j2xnpvc13370kprnnq79a08bq6dak0iab94d9hsc6m8v1rxaw2i")
428 428
429(define %linux-libre-5.0-patches 429(define %linux-libre-5.0-patches
430 (list %boot-logo-patch 430 (list %boot-logo-patch
@@ -459,8 +459,8 @@ It has been modified to remove all non-free binary blobs.")
459between the CDemu userspace daemon and linux kernel.") 459between the CDemu userspace daemon and linux kernel.")
460 (license license:gpl2+))) 460 (license license:gpl2+)))
461 461
462(define %linux-libre-4.19-version "4.19.34") 462(define %linux-libre-4.19-version "4.19.36")
463(define %linux-libre-4.19-hash "0rmpyj2qb651p2k2srpjndjxry87hr5vq0jkk4rvxjhm5y3sb65l") 463(define %linux-libre-4.19-hash "0dvwza26spa742iznz7rfgsyl4f07x8i6jh2cv5hma9l9fpqc9pi")
464 464
465(define %linux-libre-4.19-patches 465(define %linux-libre-4.19-patches
466 (list %boot-logo-patch 466 (list %boot-logo-patch
@@ -473,8 +473,8 @@ between the CDemu userspace daemon and linux kernel.")
473 #:patches %linux-libre-4.19-patches 473 #:patches %linux-libre-4.19-patches
474 #:configuration-file kernel-config)) 474 #:configuration-file kernel-config))
475 475
476(define %linux-libre-4.14-version "4.14.111") 476(define %linux-libre-4.14-version "4.14.113")
477(define %linux-libre-4.14-hash "1b34f96yigdxxh5wg798933nrv7rak1w0v0q1jfviyrllrg3hkmq") 477(define %linux-libre-4.14-hash "0z547pdi1vhybyhnfr5krsfyxmdwnv5p5fps9jjyx6rvkxasddvh")
478 478
479(define-public linux-libre-4.14 479(define-public linux-libre-4.14
480 (make-linux-libre %linux-libre-4.14-version 480 (make-linux-libre %linux-libre-4.14-version
@@ -483,8 +483,8 @@ between the CDemu userspace daemon and linux kernel.")
483 #:configuration-file kernel-config)) 483 #:configuration-file kernel-config))
484 484
485(define-public linux-libre-4.9 485(define-public linux-libre-4.9
486 (make-linux-libre "4.9.168" 486 (make-linux-libre "4.9.170"
487 "1nli5di7i7x4jyad7nappm1awz207rg18n08wb82b1w8rwqyqgy3" 487 "15fz2qxvic4sfxm8vi0rghqqi5rv038xyrq9dl6fz6i1c7497g8s"
488 '("x86_64-linux" "i686-linux") 488 '("x86_64-linux" "i686-linux")
489 #:configuration-file kernel-config)) 489 #:configuration-file kernel-config))
490 490
@@ -4148,7 +4148,7 @@ of flash storage.")
4148(define-public libseccomp 4148(define-public libseccomp
4149 (package 4149 (package
4150 (name "libseccomp") 4150 (name "libseccomp")
4151 (version "2.4.0") 4151 (version "2.4.1")
4152 (source (origin 4152 (source (origin
4153 (method url-fetch) 4153 (method url-fetch)
4154 (uri (string-append "https://github.com/seccomp/libseccomp/" 4154 (uri (string-append "https://github.com/seccomp/libseccomp/"
@@ -4156,7 +4156,7 @@ of flash storage.")
4156 "/libseccomp-" version ".tar.gz")) 4156 "/libseccomp-" version ".tar.gz"))
4157 (sha256 4157 (sha256
4158 (base32 4158 (base32
4159 "0paj1szszpf8plykrd66jqg1x3kmqs395rbjskahld2bnplcfx1f")))) 4159 "1s06h2cgk0xxwmhwj72z33bllafc1xqnxzk2yyra2rmg959778qw"))))
4160 (build-system gnu-build-system) 4160 (build-system gnu-build-system)
4161 (native-inputs 4161 (native-inputs
4162 `(("which" ,which))) 4162 `(("which" ,which)))
diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 2ae3fda9a77..844e393a9eb 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -919,51 +919,43 @@ ing, and tagging large collections of email messages.")
919 (license gpl3+))) 919 (license gpl3+)))
920 920
921(define-public notmuch-addrlookup-c 921(define-public notmuch-addrlookup-c
922 ;; This commit includes a compatibility fix for notmuch-0.25, and is not 922 (package
923 ;; currently part of any release. Please update this package when 923 (name "notmuch-addrlookup-c")
924 ;; notmuch-addrlookup-c-9 is released. 924 (version (string-append "9"))
925 (let ((commit "88f156d04990a71c6ad6fc2757b537b44e3c4d00") 925 (source (origin
926 (revision "1")) ;Guix package revision 926 (method git-fetch)
927 (package 927 (uri (git-reference
928 (name "notmuch-addrlookup-c") 928 (url "https://github.com/aperezdc/notmuch-addrlookup-c.git")
929 (version (string-append "8-" revision "." 929 (commit (string-append "v" version))))
930 (string-take commit 7))) 930 (file-name (string-append name "-" version "-checkout"))
931 (source (origin 931 (sha256
932 (method git-fetch) 932 (base32
933 (uri (git-reference 933 "1j3zdx161i1x4w0nic14ix5i8hd501rb31daf8api0k8855sx4rc"))))
934 (url "https://github.com/aperezdc/notmuch-addrlookup-c.git") 934 (build-system gnu-build-system)
935 (commit commit))) 935 (arguments
936 (file-name (string-append name "-" version "-checkout")) 936 '(#:tests? #f ; no tests
937 (sha256 937 #:make-flags (list "CC=gcc")
938 (base32 938 #:phases (modify-phases %standard-phases
939 "0v0wzs7qzy4n1hbql8s10qrwgalcxdzbxf8pj6cii1pv2jwmkxbm")))) 939 (delete 'configure)
940 (build-system gnu-build-system) 940 ;; Remove vim code completion config, it's not needed to
941 (arguments 941 ;; build (or be patched).
942 '(#:tests? #f ; no tests 942 (add-before 'patch-source-shebangs 'delete-ycm-file
943 #:make-flags (list "CC=gcc" 943 (lambda _ (delete-file ".ycm_extra_conf.py")))
944 (string-append "PREFIX=" 944 (replace 'install
945 (assoc-ref %outputs "out"))) 945 (lambda* (#:key outputs #:allow-other-keys)
946 #:phases (modify-phases %standard-phases 946 (let ((bin (string-append
947 (delete 'configure) 947 (assoc-ref outputs "out") "/bin")))
948 ;; Remove vim code completion config, it's not needed to 948 (install-file "notmuch-addrlookup" bin)))))))
949 ;; build (or be patched). 949 (native-inputs
950 (add-before 'patch-source-shebangs 'delete-ycm-file 950 `(("pkg-config" ,pkg-config)))
951 (lambda _ (delete-file ".ycm_extra_conf.py"))) 951 (inputs
952 (replace 'install 952 `(("glib" ,glib)
953 (lambda* (#:key outputs #:allow-other-keys) 953 ("notmuch" ,notmuch)))
954 (let ((bin (string-append 954 (home-page "https://github.com/aperezdc/notmuch-addrlookup-c")
955 (assoc-ref outputs "out") "/bin"))) 955 (synopsis "Address lookup tool for Notmuch")
956 (install-file "notmuch-addrlookup" bin))))))) 956 (description "This is an address lookup tool using a Notmuch database,
957 (native-inputs
958 `(("pkg-config" ,pkg-config)))
959 (inputs
960 `(("glib" ,glib)
961 ("notmuch" ,notmuch)))
962 (home-page "https://github.com/aperezdc/notmuch-addrlookup-c")
963 (synopsis "Address lookup tool for Notmuch")
964 (description "This is an address lookup tool using a Notmuch database,
965useful for email address completion.") 957useful for email address completion.")
966 (license license:expat)))) 958 (license license:expat)))
967 959
968(define-public python-notmuch 960(define-public python-notmuch
969 (package 961 (package
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 9bf5f03390d..25de298d5a8 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -7,7 +7,7 @@
7;;; Copyright © 2014 Mathieu Lirzin <mathieu.lirzin@openmailbox.org> 7;;; Copyright © 2014 Mathieu Lirzin <mathieu.lirzin@openmailbox.org>
8;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus <rekado@elephly.net> 8;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
9;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com> 9;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com>
10;;; Copyright © 2015 Mark H Weaver <mhw@netris.org> 10;;; Copyright © 2015, 2018 Mark H Weaver <mhw@netris.org>
11;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il> 11;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il>
12;;; Copyright © 2015 Fabian Harfert <fhmgufs@web.de> 12;;; Copyright © 2015 Fabian Harfert <fhmgufs@web.de>
13;;; Copyright © 2016 Roel Janssen <roel@gnu.org> 13;;; Copyright © 2016 Roel Janssen <roel@gnu.org>
@@ -2796,12 +2796,12 @@ to BMP, JPEG or PNG image formats.")
2796 ;; of Debian's Maxima package. 2796 ;; of Debian's Maxima package.
2797 ;; If Maxima can successfully run this, the binary to be installed 2797 ;; If Maxima can successfully run this, the binary to be installed
2798 ;; should be fine. 2798 ;; should be fine.
2799 (zero? 2799 (invoke "sh" "-c"
2800 (system 2800 (string-append
2801 (string-append "./maxima-local " 2801 "./maxima-local "
2802 "--lisp=gcl " 2802 "--lisp=gcl "
2803 "--batch-string=\"run_testsuite();\" " 2803 "--batch-string=\"run_testsuite();\" "
2804 "| grep -q \"No unexpected errors found\""))))) 2804 "| grep -q \"No unexpected errors found\""))))
2805 ;; Make sure the doc and emacs files are found in the 2805 ;; Make sure the doc and emacs files are found in the
2806 ;; standard location. Also configure maxima to find gnuplot 2806 ;; standard location. Also configure maxima to find gnuplot
2807 ;; without having it on the PATH. 2807 ;; without having it on the PATH.
diff --git a/gnu/packages/mtools.scm b/gnu/packages/mtools.scm
index 5be3da0137e..b93d5789b98 100644
--- a/gnu/packages/mtools.scm
+++ b/gnu/packages/mtools.scm
@@ -1,6 +1,6 @@
1;;; GNU Guix --- Functional package management for GNU 1;;; GNU Guix --- Functional package management for GNU
2;;; Copyright © 2013 John Darrington <jmd@gnu.org> 2;;; Copyright © 2013 John Darrington <jmd@gnu.org>
3;;; Copyright © 2015 Ludovic Courtès <ludo@gnu.org> 3;;; Copyright © 2015, 2019 Ludovic Courtès <ludo@gnu.org>
4;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> 4;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
5;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il> 5;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il>
6;;; 6;;;
@@ -23,20 +23,22 @@
23 #:use-module (guix licenses) 23 #:use-module (guix licenses)
24 #:use-module (guix packages) 24 #:use-module (guix packages)
25 #:use-module (guix download) 25 #:use-module (guix download)
26 #:use-module (guix build-system gnu)) 26 #:use-module (guix build-system gnu)
27 #:use-module (gnu packages))
27 28
28(define-public mtools 29(define-public mtools
29 (package 30 (package
30 (name "mtools") 31 (name "mtools")
31 (version "4.0.23") 32 (version "4.0.23")
32 (source 33 (source (origin
33 (origin 34 (method url-fetch)
34 (method url-fetch) 35 (uri (string-append "mirror://gnu/mtools/mtools-"
35 (uri (string-append "mirror://gnu/mtools/mtools-" 36 version ".tar.bz2"))
36 version ".tar.bz2")) 37 (sha256
37 (sha256 38 (base32
38 (base32 39 "1qwfxzr964fasxlzhllahk8mzh7c82s808wvly95dsqsflkdp27i"))
39 "1qwfxzr964fasxlzhllahk8mzh7c82s808wvly95dsqsflkdp27i")))) 40 (patches
41 (search-patches "mtools-mformat-uninitialized.patch"))))
40 (build-system gnu-build-system) 42 (build-system gnu-build-system)
41 (home-page "https://www.gnu.org/software/mtools/") 43 (home-page "https://www.gnu.org/software/mtools/")
42 (synopsis "Access MS-DOS disks without mounting") 44 (synopsis "Access MS-DOS disks without mounting")
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 10a23c919f3..c0b0163d621 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -5,7 +5,7 @@
5;;; Copyright © 2016 Al McElrath <hello@yrns.org> 5;;; Copyright © 2016 Al McElrath <hello@yrns.org>
6;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il> 6;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
7;;; Copyright © 2016, 2018 Leo Famulari <leo@famulari.name> 7;;; Copyright © 2016, 2018 Leo Famulari <leo@famulari.name>
8;;; Copyright © 2016, 2017 Kei Kebreau <kkebreau@posteo.net> 8;;; Copyright © 2016, 2017, 2019 Kei Kebreau <kkebreau@posteo.net>
9;;; Copyright © 2016 John J. Foerch <jjfoerch@earthlink.net> 9;;; Copyright © 2016 John J. Foerch <jjfoerch@earthlink.net>
10;;; Copyright © 2016 Alex Griffin <a@ajgrf.com> 10;;; Copyright © 2016 Alex Griffin <a@ajgrf.com>
11;;; Copyright © 2017 ng0 <ng0@n0.is> 11;;; Copyright © 2017 ng0 <ng0@n0.is>
@@ -81,6 +81,7 @@
81 #:use-module (gnu packages fonts) 81 #:use-module (gnu packages fonts)
82 #:use-module (gnu packages fontutils) 82 #:use-module (gnu packages fontutils)
83 #:use-module (gnu packages freedesktop) 83 #:use-module (gnu packages freedesktop)
84 #:use-module (gnu packages game-development)
84 #:use-module (gnu packages gcc) 85 #:use-module (gnu packages gcc)
85 #:use-module (gnu packages gnupg) 86 #:use-module (gnu packages gnupg)
86 #:use-module (gnu packages gettext) 87 #:use-module (gnu packages gettext)
@@ -446,6 +447,51 @@ background while you work.")
446 (home-page "http://www.denemo.org") 447 (home-page "http://www.denemo.org")
447 (license license:gpl3+))) 448 (license license:gpl3+)))
448 449
450(define-public dumb
451 (package
452 (name "dumb")
453 (version "2.0.3")
454 (source
455 (origin
456 (method git-fetch)
457 (uri (git-reference
458 (url "https://github.com/kode54/dumb.git")
459 (commit version)))
460 (sha256
461 (base32 "1cnq6rb14d4yllr0yi32p9jmcig8avs3f43bvdjrx4r1mpawspi6"))
462 (file-name (git-file-name name version))))
463 (build-system cmake-build-system)
464 (arguments
465 '(#:tests? #f ; no check target
466 #:configure-flags
467 (list "-DBUILD_SHARED_LIBS=ON"
468 "-DBUILD_EXAMPLES=OFF")))
469 (home-page "https://github.com/kode54/dumb")
470 (synopsis "Module audio renderer library")
471 (description
472 "DUMB is a tracker library with support for IT, XM, S3M and MOD files. It
473targets maximum accuracy to the original formats, with low-pass resonant filters
474for the IT files, accurate timing and pitching, and three resampling quality
475settings (aliasing, linear interpolation and cubic interpolation).")
476 ;; The DUMB license is a bit peculiar.
477 ;; Clause 8 states that clauses 4, 5 and 6 are null and void, leaving only
478 ;; the first three clauses for genuine consideration.
479 ;; Clauses 1, 2 and 3 are analogous to clauses 1, 2 and 3 of the zlib
480 ;; license, a known free software license.
481 ;; Therefore, the DUMB license may be considered a free software license.
482 (license (license:fsf-free "file://LICENSE"))))
483
484(define-public dumb-allegro4
485 (package
486 (inherit dumb)
487 (name "dumb-allegro4")
488 (arguments
489 (substitute-keyword-arguments (package-arguments dumb)
490 ((#:configure-flags flags)
491 `(cons "-DBUILD_ALLEGRO4=ON" ,flags))))
492 (inputs
493 `(("allegro" ,allegro-4)))))
494
449(define-public hydrogen 495(define-public hydrogen
450 (package 496 (package
451 (name "hydrogen") 497 (name "hydrogen")
@@ -721,7 +767,16 @@ audio and video).")
721 (arguments 767 (arguments
722 `(#:scons-flags (list (string-append "PREFIX=" %output)) 768 `(#:scons-flags (list (string-append "PREFIX=" %output))
723 #:scons ,scons-python2 769 #:scons ,scons-python2
724 #:tests? #f)) ;no "check" target 770 #:tests? #f ; no "check" target
771 #:phases
772 (modify-phases %standard-phases
773 (add-after 'unpack 'replace-removed-scons-syntax
774 (lambda _
775 (substitute* "SConstruct"
776 (("BoolOption") "BoolVariable")
777 (("PathOption") "PathVariable")
778 (("Options") "Variables"))
779 #t)))))
725 (inputs 780 (inputs
726 `(("boost" ,boost) 781 `(("boost" ,boost)
727 ("jack" ,jack-1) 782 ("jack" ,jack-1)
diff --git a/gnu/packages/nano.scm b/gnu/packages/nano.scm
index 04877f33baa..cb4ca996d4b 100644
--- a/gnu/packages/nano.scm
+++ b/gnu/packages/nano.scm
@@ -1,6 +1,6 @@
1;;; GNU Guix --- Functional package management for GNU 1;;; GNU Guix --- Functional package management for GNU
2;;; Copyright © 2012 Nikita Karetnikov <nikita@karetnikov.org> 2;;; Copyright © 2012 Nikita Karetnikov <nikita@karetnikov.org>
3;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il> 3;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il>
4;;; Copyright © 2016 Rene Saavedra <rennes@openmailbox.org> 4;;; Copyright © 2016 Rene Saavedra <rennes@openmailbox.org>
5;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> 5;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
6;;; 6;;;
@@ -30,7 +30,7 @@
30(define-public nano 30(define-public nano
31 (package 31 (package
32 (name "nano") 32 (name "nano")
33 (version "4.0") 33 (version "4.1")
34 (source 34 (source
35 (origin 35 (origin
36 (method url-fetch) 36 (method url-fetch)
@@ -38,7 +38,7 @@
38 version ".tar.xz")) 38 version ".tar.xz"))
39 (sha256 39 (sha256
40 (base32 40 (base32
41 "1hxsx6qi7897d8bwkbnijlwvnn1dfy5pd1b7v2kj8ikq6pmcybqy")))) 41 "1l11sa957g8njfz9v8q1f2m3w2xz1rf7i7dl37kgvmiql2bfbgc6"))))
42 (build-system gnu-build-system) 42 (build-system gnu-build-system)
43 (inputs 43 (inputs
44 `(("gettext" ,gettext-minimal) 44 `(("gettext" ,gettext-minimal)
diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 6bb15dc5e9d..ee8b82d8f49 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -405,7 +405,7 @@ underlying solvers like Cplex, Gurobi, Lpsolver, Glpk, CbC, SCIP or WBO.")
405 "00yvyfm4j423zqndvgc1ycnmiffaa2l9ab40cyg23pf51qmzk2jm")) 405 "00yvyfm4j423zqndvgc1ycnmiffaa2l9ab40cyg23pf51qmzk2jm"))
406 (patches 406 (patches
407 (search-patches 407 (search-patches
408 "ocaml-dose3-Add-unix-as-dependency-to-dose3.common-in-META.in.patch" 408 "ocaml-dose3-add-unix-dependency.patch"
409 "ocaml-dose3-Fix-for-ocaml-4.06.patch" 409 "ocaml-dose3-Fix-for-ocaml-4.06.patch"
410 "ocaml-dose3-dont-make-printconf.patch" 410 "ocaml-dose3-dont-make-printconf.patch"
411 "ocaml-dose3-Install-mli-cmx-etc.patch")))) 411 "ocaml-dose3-Install-mli-cmx-etc.patch"))))
@@ -5653,7 +5653,7 @@ storage of large amounts of data.")
5653 (properties `((upstream-name . "ppx_hash"))) 5653 (properties `((upstream-name . "ppx_hash")))
5654 (home-page "https://github.com/janestreet/ppx_hash") 5654 (home-page "https://github.com/janestreet/ppx_hash")
5655 (synopsis "Generation of hash functions from type expressions and definitions") 5655 (synopsis "Generation of hash functions from type expressions and definitions")
5656 (description "This package is a collecton of ppx rewriters that generate 5656 (description "This package is a collection of ppx rewriters that generate
5657hash functions from type exrpessions and definitions.") 5657hash functions from type exrpessions and definitions.")
5658 (license license:asl2.0))) 5658 (license license:asl2.0)))
5659 5659
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index 4808687227c..6708a761eb2 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -110,8 +110,8 @@
110 ;; Note: the 'update-guix-package.scm' script expects this definition to 110 ;; Note: the 'update-guix-package.scm' script expects this definition to
111 ;; start precisely like this. 111 ;; start precisely like this.
112 (let ((version "0.16.0") 112 (let ((version "0.16.0")
113 (commit "d78bfd27bdc449cf93fe4c5497d242c2da1aeac8") 113 (commit "b8b1e4d9a2a976c4cd9933bb6a7451340f17e9ec")
114 (revision 12)) 114 (revision 13))
115 (package 115 (package
116 (name "guix") 116 (name "guix")
117 117
@@ -127,7 +127,7 @@
127 (commit commit))) 127 (commit commit)))
128 (sha256 128 (sha256
129 (base32 129 (base32
130 "1i24snn7dq7r8c3mf4waz13k11lglhgvx0zb6xqiqiplmb6f7q6n")) 130 "1rljn9db8lxajbdcl94a6i7skk4a3rgjs25mxf35hnh0lpipqa03"))
131 (file-name (string-append "guix-" version "-checkout")))) 131 (file-name (string-append "guix-" version "-checkout"))))
132 (build-system gnu-build-system) 132 (build-system gnu-build-system)
133 (arguments 133 (arguments
@@ -137,9 +137,6 @@
137 (string-append "--with-bash-completion-dir=" 137 (string-append "--with-bash-completion-dir="
138 (assoc-ref %outputs "out") 138 (assoc-ref %outputs "out")
139 "/etc/bash_completion.d") 139 "/etc/bash_completion.d")
140 (string-append "--with-libgcrypt-prefix="
141 (assoc-ref %build-inputs
142 "libgcrypt"))
143 140
144 ;; Set 'DOT_USER_PROGRAM' to the empty string so 141 ;; Set 'DOT_USER_PROGRAM' to the empty string so
145 ;; we don't keep a reference to Graphviz, whose 142 ;; we don't keep a reference to Graphviz, whose
diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm
index ceedae2e610..8b648785537 100644
--- a/gnu/packages/parallel.scm
+++ b/gnu/packages/parallel.scm
@@ -48,14 +48,14 @@
48(define-public parallel 48(define-public parallel
49 (package 49 (package
50 (name "parallel") 50 (name "parallel")
51 (version "20190322") 51 (version "20190422")
52 (source 52 (source
53 (origin 53 (origin
54 (method url-fetch) 54 (method url-fetch)
55 (uri (string-append "mirror://gnu/parallel/parallel-" 55 (uri (string-append "mirror://gnu/parallel/parallel-"
56 version ".tar.bz2")) 56 version ".tar.bz2"))
57 (sha256 57 (sha256
58 (base32 "12q0ys0dp019wykx7jcqbrilz8798hgb66k97aj2s2m7xdpw41ym")))) 58 (base32 "0xdl5fnh1vpjp3zpmqsrbbgjixazlhl4d9awk42nz4snzynysjxl"))))
59 (build-system gnu-build-system) 59 (build-system gnu-build-system)
60 (arguments 60 (arguments
61 `(#:phases 61 `(#:phases
diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm
index 5c11d8c4377..b238d39a709 100644
--- a/gnu/packages/password-utils.scm
+++ b/gnu/packages/password-utils.scm
@@ -6,7 +6,7 @@
6;;; Copyright © 2016 Jessica Tallon <tsyesika@tsyesika.se> 6;;; Copyright © 2016 Jessica Tallon <tsyesika@tsyesika.se>
7;;; Copyright © 2016 Andreas Enge <andreas@enge.fr> 7;;; Copyright © 2016 Andreas Enge <andreas@enge.fr>
8;;; Copyright © 2016 Lukas Gradl <lgradl@openmailbox.org> 8;;; Copyright © 2016 Lukas Gradl <lgradl@openmailbox.org>
9;;; Copyright © 2016 Alex Griffin <a@ajgrf.com> 9;;; Copyright © 2016, 2019 Alex Griffin <a@ajgrf.com>
10;;; Copyright © 2017 Leo Famulari <leo@famulari.name> 10;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
11;;; Copyright © 2017, 2018 Clément Lassieur <clement@lassieur.org> 11;;; Copyright © 2017, 2018 Clément Lassieur <clement@lassieur.org>
12;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> 12;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
@@ -48,6 +48,7 @@
48 #:use-module (gnu packages) 48 #:use-module (gnu packages)
49 #:use-module (gnu packages admin) 49 #:use-module (gnu packages admin)
50 #:use-module (gnu packages aidc) 50 #:use-module (gnu packages aidc)
51 #:use-module (gnu packages authentication)
51 #:use-module (gnu packages base) 52 #:use-module (gnu packages base)
52 #:use-module (gnu packages check) 53 #:use-module (gnu packages check)
53 #:use-module (gnu packages compression) 54 #:use-module (gnu packages compression)
@@ -74,6 +75,7 @@
74 #:use-module (gnu packages python-web) 75 #:use-module (gnu packages python-web)
75 #:use-module (gnu packages python-xyz) 76 #:use-module (gnu packages python-xyz)
76 #:use-module (gnu packages suckless) 77 #:use-module (gnu packages suckless)
78 #:use-module (gnu packages tcl)
77 #:use-module (gnu packages tls) 79 #:use-module (gnu packages tls)
78 #:use-module (gnu packages qt) 80 #:use-module (gnu packages qt)
79 #:use-module (gnu packages version-control) 81 #:use-module (gnu packages version-control)
@@ -423,6 +425,19 @@ any X11 window.")
423 (modify-phases %standard-phases 425 (modify-phases %standard-phases
424 (delete 'configure) 426 (delete 'configure)
425 (delete 'build) 427 (delete 'build)
428 (add-before 'install 'patch-system-extension-dir
429 (lambda* (#:key outputs #:allow-other-keys)
430 (let* ((out (assoc-ref outputs "out"))
431 (extension-dir (string-append out "/lib/password-store/extensions")))
432 (substitute* "src/password-store.sh"
433 (("^SYSTEM_EXTENSION_DIR=.*$")
434 ;; lead with whitespace to prevent 'make install' from
435 ;; overwriting it again
436 (string-append " SYSTEM_EXTENSION_DIR=\""
437 "${PASSWORD_STORE_SYSTEM_EXTENSION_DIR:-"
438 extension-dir
439 "}\"\n"))))
440 #t))
426 (add-before 'install 'patch-passmenu-path 441 (add-before 'install 'patch-passmenu-path
427 (lambda* (#:key inputs #:allow-other-keys) 442 (lambda* (#:key inputs #:allow-other-keys)
428 (substitute* "contrib/dmenu/passmenu" 443 (substitute* "contrib/dmenu/passmenu"
@@ -461,6 +476,10 @@ any X11 window.")
461 ;; timeout in some circumstances. 476 ;; timeout in some circumstances.
462 #:parallel-tests? #f 477 #:parallel-tests? #f
463 #:test-target "test")) 478 #:test-target "test"))
479 (native-search-paths
480 (list (search-path-specification
481 (variable "PASSWORD_STORE_SYSTEM_EXTENSION_DIR")
482 (files '("lib/password-store/extensions")))))
464 (inputs 483 (inputs
465 `(("dmenu" ,dmenu) 484 `(("dmenu" ,dmenu)
466 ("getopt" ,util-linux) 485 ("getopt" ,util-linux)
@@ -482,6 +501,55 @@ changes to your password database to a git repository that can be managed
482through the pass command.") 501through the pass command.")
483 (license license:gpl2+))) 502 (license license:gpl2+)))
484 503
504(define-public pass-otp
505 (package
506 (name "pass-otp")
507 (version "1.2.0")
508 (source
509 (origin
510 (method url-fetch)
511 (uri
512 (string-append "https://github.com/tadfisher/pass-otp/releases/"
513 "download/v" version "/pass-otp-" version ".tar.gz"))
514 (sha256
515 (base32
516 "0rrs3iazq80dn0wbl20xkh270428jd8l99m5gd7hl93s4r4sc82p"))))
517 (build-system gnu-build-system)
518 (arguments
519 '(#:make-flags
520 (let* ((out (assoc-ref %outputs "out"))
521 (bashcomp (string-append out "/etc/bash_completion.d")))
522 (list (string-append "PREFIX=" %output)
523 (string-append "BASHCOMPDIR=" bashcomp)))
524 #:phases
525 (modify-phases %standard-phases
526 (delete 'configure)
527 (add-after 'build 'patch-oath-path
528 (lambda* (#:key inputs #:allow-other-keys)
529 (substitute* "otp.bash"
530 (("^OATH=.*$")
531 (string-append
532 "OATH="
533 (assoc-ref inputs "oath-toolkit")
534 "/bin/oathtool\n")))
535 #t)))
536 #:test-target "test"))
537 (inputs
538 `(("oath-toolkit" ,oath-toolkit)))
539 (native-inputs
540 `(("password-store" ,password-store)
541 ("expect" ,expect)
542 ("git" ,git)
543 ("gnupg" ,gnupg)
544 ("which" ,which)))
545 (home-page "https://github.com/tadfisher/pass-otp")
546 (synopsis "Pass extension for managing one-time-password (OTP) tokens")
547 (description
548 "Pass OTP is an extension for password-store that allows adding
549one-time-password (OTP) secrets, generating OTP codes, and displaying secret
550key URIs using the standard otpauth:// scheme.")
551 (license license:gpl3+)))
552
485(define-public argon2 553(define-public argon2
486 (package 554 (package
487 (name "argon2") 555 (name "argon2")
diff --git a/gnu/packages/patches/grub-efi-fat-serial-number.patch b/gnu/packages/patches/grub-efi-fat-serial-number.patch
new file mode 100644
index 00000000000..ad92f9bc9ee
--- /dev/null
+++ b/gnu/packages/patches/grub-efi-fat-serial-number.patch
@@ -0,0 +1,27 @@
1Change 'grub-mkrescue' to honor the 'GRUB_FAT_SERIAL_NUMBER'
2environment variable. That way, the caller can specify a fixed
3serial number (instead of the randomly chosen one) to create EFI
4images (the 'efi.img' file) that are reproducible bit-for-bit.
5
6Patch by Ludovic Courtès <ludo@gnu.org>.
7
8--- grub-2.02/util/grub-mkrescue.c 2019-04-20 19:15:26.180242812 +0200
9+++ grub-2.02/util/grub-mkrescue.c 2019-04-20 21:56:34.672370849 +0200
10@@ -788,8 +788,15 @@ main (int argc, char *argv[])
11
12 efiimgfat = grub_util_path_concat (2, iso9660_dir, "efi.img");
13 int rv;
14- rv = grub_util_exec ((const char * []) { "mformat", "-C", "-f", "2880", "-L", "16", "-i",
15- efiimgfat, "::", NULL });
16+
17+ const char *fat_serial_number = getenv ("GRUB_FAT_SERIAL_NUMBER");
18+ const char *mformat_args[] =
19+ { "mformat", "-C", "-f", "2880", "-L", "16",
20+ fat_serial_number != NULL ? "-N" : "-C",
21+ fat_serial_number != NULL ? fat_serial_number : "-C",
22+ "-i", efiimgfat, "::", NULL };
23+
24+ rv = grub_util_exec (mformat_args);
25 if (rv != 0)
26 grub_util_error ("`%s` invocation failed\n", "mformat");
27 rv = grub_util_exec ((const char * []) { "mcopy", "-s", "-i", efiimgfat, efidir_efi, "::/", NULL });
diff --git a/gnu/packages/patches/linkchecker-mark-more-tests-that-require-the-network.patch b/gnu/packages/patches/linkchecker-tests-require-network.patch
index f3e488cec2a..f3e488cec2a 100644
--- a/gnu/packages/patches/linkchecker-mark-more-tests-that-require-the-network.patch
+++ b/gnu/packages/patches/linkchecker-tests-require-network.patch
diff --git a/gnu/packages/patches/mtools-mformat-uninitialized.patch b/gnu/packages/patches/mtools-mformat-uninitialized.patch
new file mode 100644
index 00000000000..ae69d45c990
--- /dev/null
+++ b/gnu/packages/patches/mtools-mformat-uninitialized.patch
@@ -0,0 +1,20 @@
1Fix a bug whereby 'mformat' could end up passing uninitialized bytes
2to write(2). This could be reproduced with:
3
4 mformat -C -f 1440 -L 16 -N 77777777 -i /tmp/x ::
5
6where the output of /tmp/x would be non-deterministic.
7
8Patch by Ludovic Courtès <ludo@gnu.org>.
9
10--- mtools-4.0.23/mformat.c 2019-04-21 00:12:01.496116195 +0200
11+++ mtools-4.0.23/mformat.c 2019-04-21 00:12:36.675967157 +0200
12@@ -927,6 +927,7 @@ void mformat(int argc, char **argv, int
13
14 char *endptr;
15
16+ memset(&boot.bytes, '\0', sizeof boot);
17 hs = hs_set = 0;
18 argtracks = 0;
19 argheads = 0;
20
diff --git a/gnu/packages/patches/ocaml-dose3-Add-unix-as-dependency-to-dose3.common-in-META.in.patch b/gnu/packages/patches/ocaml-dose3-add-unix-dependency.patch
index d2cc44c7840..d2cc44c7840 100644
--- a/gnu/packages/patches/ocaml-dose3-Add-unix-as-dependency-to-dose3.common-in-META.in.patch
+++ b/gnu/packages/patches/ocaml-dose3-add-unix-dependency.patch
diff --git a/gnu/packages/patches/openssh-CVE-2018-20685.patch b/gnu/packages/patches/openssh-CVE-2018-20685.patch
deleted file mode 100644
index 463c08a9d4e..00000000000
--- a/gnu/packages/patches/openssh-CVE-2018-20685.patch
+++ /dev/null
@@ -1,44 +0,0 @@
1Fix CVE-2018-20685:
2
3https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-20685
4
5Patch copied from upstream source repository:
6
7https://github.com/openssh/openssh-portable/commit/6010c0303a422a9c5fa8860c061bf7105eb7f8b2
8
9From 6010c0303a422a9c5fa8860c061bf7105eb7f8b2 Mon Sep 17 00:00:00 2001
10From: "djm@openbsd.org" <djm@openbsd.org>
11Date: Fri, 16 Nov 2018 03:03:10 +0000
12Subject: [PATCH] upstream: disallow empty incoming filename or ones that refer
13 to the
14
15current directory; based on report/patch from Harry Sintonen
16
17OpenBSD-Commit-ID: f27651b30eaee2df49540ab68d030865c04f6de9
18---
19 scp.c | 5 +++--
20 1 file changed, 3 insertions(+), 2 deletions(-)
21
22diff --git a/scp.c b/scp.c
23index 60682c68..4f3fdcd3 100644
24--- a/scp.c
25+++ b/scp.c
26#@@ -1,4 +1,4 @@
27#-/* $OpenBSD: scp.c,v 1.197 2018/06/01 04:31:48 dtucker Exp $ */
28#+/* $OpenBSD: scp.c,v 1.198 2018/11/16 03:03:10 djm Exp $ */
29# /*
30# * scp - secure remote copy. This is basically patched BSD rcp which
31# * uses ssh to do the data transfer (instead of using rcmd).
32@@ -1106,7 +1106,8 @@ sink(int argc, char **argv)
33 SCREWUP("size out of range");
34 size = (off_t)ull;
35
36- if ((strchr(cp, '/') != NULL) || (strcmp(cp, "..") == 0)) {
37+ if (*cp == '\0' || strchr(cp, '/') != NULL ||
38+ strcmp(cp, ".") == 0 || strcmp(cp, "..") == 0) {
39 run_err("error: unexpected filename: %s", cp);
40 exit(1);
41 }
42--
432.20.1
44
diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm
index 86d07c3ccc0..b2fcd2b9e4a 100644
--- a/gnu/packages/perl.scm
+++ b/gnu/packages/perl.scm
@@ -2541,9 +2541,22 @@ the DateTime.pm class.")
2541 (base32 2541 (base32
2542 "0kz5kz47awf2bhb85xx5rbajkr093ipm2d2vkhqs8lqq0f305r3a")))) 2542 "0kz5kz47awf2bhb85xx5rbajkr093ipm2d2vkhqs8lqq0f305r3a"))))
2543 (build-system perl-build-system) 2543 (build-system perl-build-system)
2544 (arguments
2545 '(#:phases
2546 (modify-phases %standard-phases
2547 (add-after 'unpack 'patch-tzdata
2548 (lambda* (#:key inputs #:allow-other-keys)
2549 (substitute* "lib/DateTime/TimeZone/Local/Unix.pm"
2550 (("our \\$ZoneinfoDir = '\\/usr\\/share\\/zoneinfo';")
2551 (string-append "our $ZoneinfoDir = '"
2552 (assoc-ref inputs "tzdata") "/share/zoneinfo"
2553 "';")))
2554 #t)))))
2544 (native-inputs 2555 (native-inputs
2545 `(("perl-test-fatal" ,perl-test-fatal) 2556 `(("perl-test-fatal" ,perl-test-fatal)
2546 ("perl-test-requires" ,perl-test-requires))) 2557 ("perl-test-requires" ,perl-test-requires)))
2558 (inputs
2559 `(("tzdata" ,tzdata)))
2547 (propagated-inputs 2560 (propagated-inputs
2548 `(("perl-class-singleton" ,perl-class-singleton) 2561 `(("perl-class-singleton" ,perl-class-singleton)
2549 ("perl-list-allutils" ,perl-list-allutils) 2562 ("perl-list-allutils" ,perl-list-allutils)
@@ -8421,7 +8434,7 @@ text sequences from strings.")
8421 (source 8434 (source
8422 (origin 8435 (origin
8423 (method url-fetch) 8436 (method url-fetch)
8424 (uri (string-append "mirror://cpan/authors/id/M/MA/MAKAMAKA/" 8437 (uri (string-append "mirror://cpan/authors/id/I/IS/ISHIGAKI/"
8425 "Text-CSV-" version ".tar.gz")) 8438 "Text-CSV-" version ".tar.gz"))
8426 (sha256 8439 (sha256
8427 (base32 "1llccsl6sr11g9affh43m6q5r85qgnpi9n7idcs1vi9cn4ww0kp7")))) 8440 (base32 "1llccsl6sr11g9affh43m6q5r85qgnpi9n7idcs1vi9cn4ww0kp7"))))
diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm
index fd9c95dd0a2..6248be0c9bd 100644
--- a/gnu/packages/python-crypto.scm
+++ b/gnu/packages/python-crypto.scm
@@ -970,14 +970,14 @@ derivation function.")
970(define-public python-service-identity 970(define-public python-service-identity
971 (package 971 (package
972 (name "python-service-identity") 972 (name "python-service-identity")
973 (version "17.0.0") 973 (version "18.1.0")
974 (source 974 (source
975 (origin 975 (origin
976 (method url-fetch) 976 (method url-fetch)
977 (uri (pypi-uri "service_identity" version)) 977 (uri (pypi-uri "service_identity" version))
978 (sha256 978 (sha256
979 (base32 979 (base32
980 "1aq24cn3nnsjr9g797dayhx4g653h6bd41ksqhidzq0rvarzn0a0")))) 980 "0b9f5qiqjy8ralzgwjgkhx82h6h8sa7532psmb8mkd65md5aan08"))))
981 (build-system python-build-system) 981 (build-system python-build-system)
982 (propagated-inputs 982 (propagated-inputs
983 `(("python-attrs" ,python-attrs) 983 `(("python-attrs" ,python-attrs)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 065c06df2ad..50d7097d38b 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -897,14 +897,14 @@ dispatching systems can be built.")
897(define-public python-zope-interface 897(define-public python-zope-interface
898 (package 898 (package
899 (name "python-zope-interface") 899 (name "python-zope-interface")
900 (version "4.1.3") 900 (version "4.6.0")
901 (source 901 (source
902 (origin 902 (origin
903 (method url-fetch) 903 (method url-fetch)
904 (uri (pypi-uri "zope.interface" version)) 904 (uri (pypi-uri "zope.interface" version))
905 (sha256 905 (sha256
906 (base32 906 (base32
907 "0ks8h73b2g4bkad821qbv0wzjppdrwys33i7ka45ik3wxjg1l8if")))) 907 "1rgh2x3rcl9r0v0499kf78xy86rnmanajf4ywmqb943wpk50sg8v"))))
908 (build-system python-build-system) 908 (build-system python-build-system)
909 (native-inputs 909 (native-inputs
910 `(("python-zope-event" ,python-zope-event))) 910 `(("python-zope-event" ,python-zope-event)))
@@ -2959,14 +2959,14 @@ ecosystem.")
2959(define-public python-hyperlink 2959(define-public python-hyperlink
2960 (package 2960 (package
2961 (name "python-hyperlink") 2961 (name "python-hyperlink")
2962 (version "18.0.0") 2962 (version "19.0.0")
2963 (source 2963 (source
2964 (origin 2964 (origin
2965 (method url-fetch) 2965 (method url-fetch)
2966 (uri (pypi-uri "hyperlink" version)) 2966 (uri (pypi-uri "hyperlink" version))
2967 (sha256 2967 (sha256
2968 (base32 2968 (base32
2969 "01m3y19arfqljksngy8grc966zdb4larysralb8cajzi8kvly6zh")))) 2969 "0m2nhi0j8wmgfscf974wd5v1xfq8mah286hil6npy1ys0m3y7222"))))
2970 (build-system python-build-system) 2970 (build-system python-build-system)
2971 (propagated-inputs 2971 (propagated-inputs
2972 `(("python-idna" ,python-idna))) 2972 `(("python-idna" ,python-idna)))
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 1b75ed70e32..5fd8a2d0eb9 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -26,7 +26,7 @@
26;;; Copyright © 2016, 2017 ng0 <ng0@n0.is> 26;;; Copyright © 2016, 2017 ng0 <ng0@n0.is>
27;;; Copyright © 2016 Dylan Jeffers <sapientech@sapientech@openmailbox.org> 27;;; Copyright © 2016 Dylan Jeffers <sapientech@sapientech@openmailbox.org>
28;;; Copyright © 2016 David Craven <david@craven.ch> 28;;; Copyright © 2016 David Craven <david@craven.ch>
29;;; Copyright © 2016, 2017, 2018 Marius Bakke <mbakke@fastmail.com> 29;;; Copyright © 2016, 2017, 2018, 2019 Marius Bakke <mbakke@fastmail.com>
30;;; Copyright © 2016, 2017 Stefan Reichör <stefan@xsteve.at> 30;;; Copyright © 2016, 2017 Stefan Reichör <stefan@xsteve.at>
31;;; Copyright © 2016 Dylan Jeffers <sapientech@sapientech@openmailbox.org> 31;;; Copyright © 2016 Dylan Jeffers <sapientech@sapientech@openmailbox.org>
32;;; Copyright © 2016, 2017 Alex Vong <alexvong1995@gmail.com> 32;;; Copyright © 2016, 2017 Alex Vong <alexvong1995@gmail.com>
@@ -615,24 +615,27 @@ version identifier.")
615(define-public python-serpent 615(define-public python-serpent
616 (package 616 (package
617 (name "python-serpent") 617 (name "python-serpent")
618 (version "1.27") 618 (version "1.28")
619 (source 619 (source
620 (origin 620 (origin
621 (method url-fetch) 621 (method url-fetch)
622 (uri (pypi-uri "serpent" version)) 622 (uri (pypi-uri "serpent" version))
623 (sha256 623 (sha256
624 (base32 624 (base32 "1arnckykpkvv2qrp49l1k7q5mr5pisswl0rvdx98x8wsl1n361pk"))))
625 "04p9dsrm5pv8vhk3flvih55kgvlzpi38hlaykdiakddmgwqw93bg"))))
626 (build-system python-build-system) 625 (build-system python-build-system)
626 (native-inputs
627 `(("python-attrs" ,python-attrs)
628 ("python-pytz" ,python-pytz)))
627 (home-page "https://github.com/irmen/Serpent") 629 (home-page "https://github.com/irmen/Serpent")
628 (synopsis "Serializer for literal Python expressions") 630 (synopsis "Serializer for literal Python expressions")
629 (description 631 (description
630 "Serpent provides ast.literal_eval() compatible object tree 632 "Serpent provides @code{ast.literal_eval()}-compatible object tree
631serialization. It serializes an object tree into bytes (utf-8 encoded string) 633serialization. It serializes an object tree into bytes (an utf-8 encoded
632that can be decoded and then passed as-is to ast.literal_eval() to rebuild it 634string) that can be decoded and then passed as-is to @code{ast.literal_eval()}
633as the original object tree. As such it is safe to send serpent data to other 635to rebuild the original object tree.
634machines over the network for instance (because only safe literals are 636
635encoded).") 637Because only safe literals are encoded, it is safe to send serpent data to
638other machines, such as over the network.")
636 (license license:expat))) 639 (license license:expat)))
637 640
638(define-public python-setuptools 641(define-public python-setuptools
@@ -889,7 +892,7 @@ of @code{xmlfile}.")
889(define-public python-openpyxl 892(define-public python-openpyxl
890 (package 893 (package
891 (name "python-openpyxl") 894 (name "python-openpyxl")
892 (version "2.6.0") 895 (version "2.6.2")
893 (source 896 (source
894 (origin 897 (origin
895 ;; We use the upstream repository, as the tests are not included in the 898 ;; We use the upstream repository, as the tests are not included in the
@@ -900,8 +903,7 @@ of @code{xmlfile}.")
900 (changeset version))) 903 (changeset version)))
901 (file-name (string-append name "-" version "-checkout")) 904 (file-name (string-append name "-" version "-checkout"))
902 (sha256 905 (sha256
903 (base32 906 (base32 "1qhij6kcvdxqjy4g6193nsv4q7fy8n4fwyd3c2z047idlm6s3j4w"))))
904 "1x47ngn7ybaqdbvg90c8h2x0j6yfdfj25gjfinp2w5rf62gsany7"))))
905 (build-system python-build-system) 907 (build-system python-build-system)
906 (arguments 908 (arguments
907 `(#:phases (modify-phases %standard-phases 909 `(#:phases (modify-phases %standard-phases
@@ -1722,6 +1724,37 @@ from git information.
1722(define-public python2-pbr 1724(define-public python2-pbr
1723 (package-with-python2 python-pbr)) 1725 (package-with-python2 python-pbr))
1724 1726
1727(define-public python-pyrsistent
1728 (package
1729 (name "python-pyrsistent")
1730 (version "0.14.11")
1731 (home-page "https://github.com/tobgu/pyrsistent")
1732 (source (origin
1733 (method url-fetch)
1734 (uri (pypi-uri "pyrsistent" version))
1735 (sha256
1736 (base32
1737 "1qkh74bm296mp5g3r11lgsksr6bh4w1bf8pji4nmxdlfj542ga1w"))))
1738 (build-system python-build-system)
1739 (native-inputs
1740 `(("python-hypothesis" ,python-hypothesis)
1741 ("python-pytest" ,python-pytest)
1742 ("python-pytest-runner" ,python-pytest-runner)))
1743 (propagated-inputs
1744 `(("python-six" ,python-six)))
1745 (synopsis "Persistent data structures for Python")
1746 (description
1747 "Pyrsistent is a number of persistent collections (by some referred to as
1748functional data structures). Persistent in the sense that they are immutable.
1749
1750All methods on a data structure that would normally mutate it instead return a
1751new copy of the structure containing the requested updates. The original
1752structure is left untouched.")
1753 (license license:expat)))
1754
1755(define-public python2-pyrsistent
1756 (package-with-python2 python-pyrsistent))
1757
1725(define-public python-exif-read 1758(define-public python-exif-read
1726 (package 1759 (package
1727 (name "python-exif-read") 1760 (name "python-exif-read")
@@ -1892,21 +1925,28 @@ between Julian dates and Gregorian dates.")
1892(define-public python-jsonschema 1925(define-public python-jsonschema
1893 (package 1926 (package
1894 (name "python-jsonschema") 1927 (name "python-jsonschema")
1895 (version "2.6.0") 1928 (version "3.0.1")
1896 (source (origin 1929 (source (origin
1897 (method url-fetch) 1930 (method url-fetch)
1898 (uri (pypi-uri "jsonschema" version)) 1931 (uri (pypi-uri "jsonschema" version))
1899 (sha256 1932 (sha256
1900 (base32 1933 (base32
1901 "00kf3zmpp9ya4sydffpifn0j0mzm342a2vzh82p6r0vh10cg7xbg")))) 1934 "03g20i1xfg4qdlk4475pl4pp7y0h37g1fbgs5qhy678q9xb822hc"))))
1902 (build-system python-build-system) 1935 (build-system python-build-system)
1903 (arguments 1936 (arguments
1904 '(#:phases 1937 '(#:phases
1905 (modify-phases %standard-phases 1938 (modify-phases %standard-phases
1906 (replace 'check (lambda _ (invoke "nosetests")))))) 1939 (replace 'check
1940 (lambda _
1941 (setenv "PYTHONPATH" (string-append ".:" (getenv "PYTHONPATH")))
1942 (invoke "trial" "jsonschema"))))))
1907 (native-inputs 1943 (native-inputs
1908 `(("python-nose" ,python-nose) 1944 `(("python-setuptools_scm" ,python-setuptools-scm)
1909 ("python-vcversioner" ,python-vcversioner))) 1945 ("python-twisted" ,python-twisted)))
1946 (propagated-inputs
1947 `(("python-attrs" ,python-attrs)
1948 ("python-pyrsistent" ,python-pyrsistent)
1949 ("python-six" ,python-six)))
1910 (home-page "https://github.com/Julian/jsonschema") 1950 (home-page "https://github.com/Julian/jsonschema")
1911 (synopsis "Implementation of JSON Schema for Python") 1951 (synopsis "Implementation of JSON Schema for Python")
1912 (description 1952 (description
@@ -1918,11 +1958,9 @@ between Julian dates and Gregorian dates.")
1918 (let ((jsonschema (package-with-python2 1958 (let ((jsonschema (package-with-python2
1919 (strip-python2-variant python-jsonschema)))) 1959 (strip-python2-variant python-jsonschema))))
1920 (package (inherit jsonschema) 1960 (package (inherit jsonschema)
1921 (native-inputs
1922 `(("python2-mock" ,python2-mock)
1923 ,@(package-native-inputs jsonschema)))
1924 (propagated-inputs 1961 (propagated-inputs
1925 `(("python2-functools32" ,python2-functools32)))))) 1962 `(("python2-functools32" ,python2-functools32)
1963 ,@(package-propagated-inputs jsonschema))))))
1926 1964
1927(define-public python-schema 1965(define-public python-schema
1928 (package 1966 (package
@@ -6928,14 +6966,14 @@ versions of Python.")
6928(define-public python-idna 6966(define-public python-idna
6929 (package 6967 (package
6930 (name "python-idna") 6968 (name "python-idna")
6931 (version "2.7") 6969 (version "2.8")
6932 (source 6970 (source
6933 (origin 6971 (origin
6934 (method url-fetch) 6972 (method url-fetch)
6935 (uri (pypi-uri "idna" version)) 6973 (uri (pypi-uri "idna" version))
6936 (sha256 6974 (sha256
6937 (base32 6975 (base32
6938 "05jam7d31767dr12x0rbvvs8lxnpb1mhdb2zdlfxgh83z6k3hjk8")))) 6976 "01rlkigdxg17sf9yar1jl8n18ls59367wqh59hnawlyg53vb6my3"))))
6939 (build-system python-build-system) 6977 (build-system python-build-system)
6940 (home-page "https://github.com/kjd/idna") 6978 (home-page "https://github.com/kjd/idna")
6941 (synopsis "Internationalized domain names in applications") 6979 (synopsis "Internationalized domain names in applications")
@@ -9664,23 +9702,19 @@ format.")
9664(define-public python-twisted 9702(define-public python-twisted
9665 (package 9703 (package
9666 (name "python-twisted") 9704 (name "python-twisted")
9667 (version "17.5.0") 9705 (version "19.2.0")
9668 (source (origin 9706 (source (origin
9669 (method url-fetch) 9707 (method url-fetch)
9670 (uri (pypi-uri "Twisted" version ".tar.bz2")) 9708 (uri (pypi-uri "Twisted" version ".tar.bz2"))
9671 (sha256 9709 (sha256
9672 (base32 9710 (base32
9673 "1sh2h23nnizcdyrl2rn7zxijglikxwz7z7grqpvq496zy2aa967i")))) 9711 "1gmb8d57s13d8znvqnxi47vqzqz141z443dbxg9wjkp8ia9f220p"))))
9674 (build-system python-build-system) 9712 (build-system python-build-system)
9675 (arguments 9713 (arguments
9676 '(#:tests? #f)) ; FIXME: Some tests are failing. 9714 '(#:tests? #f)) ; FIXME: Some tests are failing.
9677 ;; #:phases
9678 ;; (modify-phases %standard-phases
9679 ;; (replace 'check
9680 ;; (lambda _
9681 ;; (zero? (system* "./bin/trial" "twisted")))))
9682 (propagated-inputs 9715 (propagated-inputs
9683 `(("python-zope-interface" ,python-zope-interface) 9716 `(("python-zope-interface" ,python-zope-interface)
9717 ("python-pyhamcrest" ,python-pyhamcrest)
9684 ("python-incremental" ,python-incremental) 9718 ("python-incremental" ,python-incremental)
9685 ("python-hyperlink" ,python-hyperlink) 9719 ("python-hyperlink" ,python-hyperlink)
9686 ("python-constantly" ,python-constantly) 9720 ("python-constantly" ,python-constantly)
@@ -11577,13 +11611,13 @@ instead of servers and network commands.")
11577(define-public python-automat 11611(define-public python-automat
11578 (package 11612 (package
11579 (name "python-automat") 11613 (name "python-automat")
11580 (version "0.6.0") 11614 (version "0.7.0")
11581 (source (origin 11615 (source (origin
11582 (method url-fetch) 11616 (method url-fetch)
11583 (uri (pypi-uri "Automat" version)) 11617 (uri (pypi-uri "Automat" version))
11584 (sha256 11618 (sha256
11585 (base32 11619 (base32
11586 "1a7nsrljysfmdqmpn2apfa1gg6rfah4y9sizvns8gb08rx7d07rw")))) 11620 "03ivg70n3b1cbcd2zvjhk8y4kmqxcvhmili39lmgx09dza1qpmyb"))))
11587 (build-system python-build-system) 11621 (build-system python-build-system)
11588 ;; We disable the tests because they require python-twisted, while 11622 ;; We disable the tests because they require python-twisted, while
11589 ;; python-twisted depends on python-automat. Twisted is optional, but the 11623 ;; python-twisted depends on python-automat. Twisted is optional, but the
@@ -11610,13 +11644,13 @@ transducers).")
11610(define-public python-m2r 11644(define-public python-m2r
11611 (package 11645 (package
11612 (name "python-m2r") 11646 (name "python-m2r")
11613 (version "0.1.12") 11647 (version "0.2.1")
11614 (source (origin 11648 (source (origin
11615 (method url-fetch) 11649 (method url-fetch)
11616 (uri (pypi-uri "m2r" version)) 11650 (uri (pypi-uri "m2r" version))
11617 (sha256 11651 (sha256
11618 (base32 11652 (base32
11619 "1axrwnf425sz4qz3c0qc7yhhki4myzb8rki7pczcsgzznzmqdyxd")))) 11653 "16gdm8i06jjmlpvckpfmlkr4693dh0vs192vgsqn84fsdkbbm45z"))))
11620 (build-system python-build-system) 11654 (build-system python-build-system)
11621 (propagated-inputs 11655 (propagated-inputs
11622 `(("python-docutils" ,python-docutils) 11656 `(("python-docutils" ,python-docutils)
@@ -13832,11 +13866,12 @@ and works only with Python 2 and NumPy < 1.9.")
13832 (synopsis "Send files to the user's @file{~/Trash} directory") 13866 (synopsis "Send files to the user's @file{~/Trash} directory")
13833 (description "This package provides a Python library to send files to the 13867 (description "This package provides a Python library to send files to the
13834user's @file{~/Trash} directory.") 13868user's @file{~/Trash} directory.")
13869 (properties `((python2-variant . ,(delay python2-send2trash))))
13835 (license license:bsd-3))) 13870 (license license:bsd-3)))
13836 13871
13837(define-public python2-send2trash 13872(define-public python2-send2trash
13838 (package 13873 (package
13839 (inherit (package-with-python2 python-send2trash)) 13874 (inherit (package-with-python2 (strip-python2-variant python-send2trash)))
13840 (arguments 13875 (arguments
13841 (substitute-keyword-arguments (package-arguments python-send2trash) 13876 (substitute-keyword-arguments (package-arguments python-send2trash)
13842 ((#:phases phases) 13877 ((#:phases phases)
@@ -13845,8 +13880,7 @@ user's @file{~/Trash} directory.")
13845 (lambda _ 13880 (lambda _
13846 (setenv "PYTHONPATH" 13881 (setenv "PYTHONPATH"
13847 (string-append (getcwd) ":" (getenv "PYTHONPATH"))) 13882 (string-append (getcwd) ":" (getenv "PYTHONPATH")))
13848 #t)))))) 13883 #t))))))))
13849 (properties `((python2-variant . ,(delay python-send2trash))))))
13850 13884
13851(define-public python-yapf 13885(define-public python-yapf
13852 (package 13886 (package
@@ -14899,16 +14933,15 @@ object-oriented library such as @code{scikit-learn}.")
14899(define-public python-dill 14933(define-public python-dill
14900 (package 14934 (package
14901 (name "python-dill") 14935 (name "python-dill")
14902 (version "0.2.8.2") 14936 (version "0.2.9")
14903 (source 14937 (source
14904 (origin 14938 (origin
14905 (method url-fetch) 14939 (method url-fetch)
14906 (uri (pypi-uri "dill" version)) 14940 (uri (pypi-uri "dill" version))
14907 (sha256 14941 (sha256
14908 (base32 14942 (base32 "0vwqyi6hyz2r29zydc78dqymkbc5y7gia16xcdh215cikxph9mpn"))))
14909 "1cymzn9fxwdy33h21zkk4gqgzvd25110hh3zdqnvnwa3p52c4kb2"))))
14910 (build-system python-build-system) 14943 (build-system python-build-system)
14911 ;; FIXME: The check phase fails with "don't know how to make test". 14944 ;; FIXME: The check phase fails with "don't know how to make test from: …".
14912 (arguments '(#:tests? #f)) 14945 (arguments '(#:tests? #f))
14913 (home-page "https://pypi.org/project/dill") 14946 (home-page "https://pypi.org/project/dill")
14914 (synopsis "Serialize all of Python") 14947 (synopsis "Serialize all of Python")
diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm
index c88a1c6b2a7..5451a0059a4 100644
--- a/gnu/packages/security-token.scm
+++ b/gnu/packages/security-token.scm
@@ -95,7 +95,7 @@ readers and is needed to communicate with such devices through the
95(define-public eid-mw 95(define-public eid-mw
96 (package 96 (package
97 (name "eid-mw") 97 (name "eid-mw")
98 (version "4.4.13") 98 (version "4.4.16")
99 (source 99 (source
100 (origin 100 (origin
101 (method git-fetch) 101 (method git-fetch)
@@ -103,7 +103,7 @@ readers and is needed to communicate with such devices through the
103 (url "https://github.com/Fedict/eid-mw") 103 (url "https://github.com/Fedict/eid-mw")
104 (commit (string-append "v" version)))) 104 (commit (string-append "v" version))))
105 (sha256 105 (sha256
106 (base32 "14bgn2k0xbd6241qdghg787pgxy7k9rvcspaf74zwwyibaqknzyx")))) 106 (base32 "1q82fw63xzrnrgh1wyh457hal6vfdl6swqfq7l6kviywiwlzx7kd"))))
107 (build-system glib-or-gtk-build-system) 107 (build-system glib-or-gtk-build-system)
108 (native-inputs 108 (native-inputs
109 `(("autoconf" ,autoconf) 109 `(("autoconf" ,autoconf)
diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm
index 88c0f32e99d..59a8b744eb4 100644
--- a/gnu/packages/shellutils.scm
+++ b/gnu/packages/shellutils.scm
@@ -128,13 +128,14 @@ are already there.")
128 (delete 'configure) 128 (delete 'configure)
129 ;; Help the build scripts find the Go language dependencies. 129 ;; Help the build scripts find the Go language dependencies.
130 (add-before 'unpack 'setup-go-environment 130 (add-before 'unpack 'setup-go-environment
131 (assoc-ref go:%standard-phases 'setup-go-environment))))) 131 (assoc-ref go:%standard-phases 'setup-go-environment))
132 (inputs 132 (add-after 'install 'remove-go-references
133 (assoc-ref go:%standard-phases 'remove-go-references)))))
134 (native-inputs
133 `(("go" ,go) 135 `(("go" ,go)
134 ("go-github-com-burntsushi-toml" ,go-github-com-burntsushi-toml) 136 ("go-github-com-burntsushi-toml" ,go-github-com-burntsushi-toml)
135 ("go-github-com-direnv-go-dotenv" ,go-github-com-direnv-go-dotenv))) 137 ("go-github-com-direnv-go-dotenv" ,go-github-com-direnv-go-dotenv)
136 (native-inputs 138 ("which" ,which)))
137 `(("which" ,which)))
138 (home-page "https://direnv.net/") 139 (home-page "https://direnv.net/")
139 (synopsis "Environment switcher for the shell") 140 (synopsis "Environment switcher for the shell")
140 (description 141 (description
diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm
index 83a831660d5..e887cd7e705 100644
--- a/gnu/packages/ssh.scm
+++ b/gnu/packages/ssh.scm
@@ -164,15 +164,14 @@ a server that supports the SSH-2 protocol.")
164(define-public openssh 164(define-public openssh
165 (package 165 (package
166 (name "openssh") 166 (name "openssh")
167 (version "7.9p1") 167 (version "8.0p1")
168 (source (origin 168 (source (origin
169 (method url-fetch) 169 (method url-fetch)
170 (uri (string-append "mirror://openbsd/OpenSSH/portable/" 170 (uri (string-append "mirror://openbsd/OpenSSH/portable/"
171 name "-" version ".tar.gz")) 171 name "-" version ".tar.gz"))
172 (patches (search-patches "openssh-CVE-2018-20685.patch"))
173 (sha256 172 (sha256
174 (base32 173 (base32
175 "1b8sy6v0b8v4ggmknwcqx3y1rjcpsll0f1f8f4vyv11x4ni3njvb")))) 174 "0s7xh4s0qcipnjh9ls5blxcpvhyd116z9dxn3q1yi64lwrwki55x"))))
176 (build-system gnu-build-system) 175 (build-system gnu-build-system)
177 (native-inputs `(("groff" ,groff) 176 (native-inputs `(("groff" ,groff)
178 ("pkg-config" ,pkg-config))) 177 ("pkg-config" ,pkg-config)))
diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index 26e5f626668..fac4c51a546 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -5284,14 +5284,14 @@ to Applied regression, Second Edition, Sage, 2011.")
5284(define-public r-caret 5284(define-public r-caret
5285 (package 5285 (package
5286 (name "r-caret") 5286 (name "r-caret")
5287 (version "6.0-82") 5287 (version "6.0-83")
5288 (source 5288 (source
5289 (origin 5289 (origin
5290 (method url-fetch) 5290 (method url-fetch)
5291 (uri (cran-uri "caret" version)) 5291 (uri (cran-uri "caret" version))
5292 (sha256 5292 (sha256
5293 (base32 5293 (base32
5294 "0zgkmiiarl7ll2ffyciikah61jyps41fin5pjb5l8ja2b26lgrdg")))) 5294 "1vyw43z73wa4nrbbyq6km18yh1352g03j93cw2zr1dphl56mxplv"))))
5295 (build-system r-build-system) 5295 (build-system r-build-system)
5296 (propagated-inputs 5296 (propagated-inputs
5297 `(("r-foreach" ,r-foreach) 5297 `(("r-foreach" ,r-foreach)
diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm
index 1aae3a8ed68..136ffec9e78 100644
--- a/gnu/packages/sync.scm
+++ b/gnu/packages/sync.scm
@@ -252,7 +252,7 @@ over the Internet in an HTTP and CDN friendly way;
252(define-public rclone 252(define-public rclone
253 (package 253 (package
254 (name "rclone") 254 (name "rclone")
255 (version "1.46") 255 (version "1.47.0")
256 (source (origin 256 (source (origin
257 (method git-fetch) 257 (method git-fetch)
258 (uri (git-reference 258 (uri (git-reference
@@ -261,7 +261,7 @@ over the Internet in an HTTP and CDN friendly way;
261 (file-name (git-file-name name version)) 261 (file-name (git-file-name name version))
262 (sha256 262 (sha256
263 (base32 263 (base32
264 "1fl52dl41n76r678nzkxa2kgk9khn1fxraxgk8jd3ayc787qs9ia")))) 264 "1nxwjr9jly6wh1ixr6a7zhlg4b3298v940040fsm0n3lcljd37zx"))))
265 ;; FIXME: Rclone bundles some libraries Guix already provides. Need to 265 ;; FIXME: Rclone bundles some libraries Guix already provides. Need to
266 ;; un-bundle them. 266 ;; un-bundle them.
267 (build-system go-build-system) 267 (build-system go-build-system)
diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm
index 7436fdeb97d..da5cd011d8d 100644
--- a/gnu/packages/textutils.scm
+++ b/gnu/packages/textutils.scm
@@ -519,7 +519,7 @@ in a portable way.")
519 (origin 519 (origin
520 (method url-fetch) 520 (method url-fetch)
521 (uri (string-append "http://www.lbreyer.com/gpl/" 521 (uri (string-append "http://www.lbreyer.com/gpl/"
522 name "-" version ".tar.gz")) 522 "dbacl-" version ".tar.gz"))
523 (sha256 523 (sha256
524 (base32 524 (base32
525 "0224g6x71hyvy7jikfxmgcwww1r5lvk0jx36cva319cb9nmrbrq7")))) 525 "0224g6x71hyvy7jikfxmgcwww1r5lvk0jx36cva319cb9nmrbrq7"))))
diff --git a/gnu/packages/valgrind.scm b/gnu/packages/valgrind.scm
index 9952fa1647a..f1584c896af 100644
--- a/gnu/packages/valgrind.scm
+++ b/gnu/packages/valgrind.scm
@@ -79,3 +79,18 @@ tools. There are Valgrind tools that can automatically detect many memory
79management and threading bugs, and profile your programs in detail. You can 79management and threading bugs, and profile your programs in detail. You can
80also use Valgrind to build new tools.") 80also use Valgrind to build new tools.")
81 (license gpl2+))) 81 (license gpl2+)))
82
83(define-public valgrind-3.15
84 (package
85 (inherit valgrind)
86 (version "3.15.0")
87 (source (origin
88 (method url-fetch)
89 (uri (list (string-append "http://www.valgrind.org/downloads"
90 "/valgrind-" version ".tar.bz2")
91 (string-append "ftp://sourceware.org/pub/valgrind"
92 "/valgrind-" version ".tar.bz2")))
93 (sha256
94 (base32
95 "1ccawxrni8brcvwhygy12iprkvz409hbr9xkk1bd03gnm2fplz21"))
96 (patches (search-patches "valgrind-enable-arm.patch"))))))
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 22771a129c5..3432e70c1b1 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -23,6 +23,7 @@
23;;; Copyright © 2018 Timothy Sample <samplet@ngyro.com> 23;;; Copyright © 2018 Timothy Sample <samplet@ngyro.com>
24;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net> 24;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net>
25;;; Copyright © 2019 Jovany Leandro G.C <bit4bit@riseup.net> 25;;; Copyright © 2019 Jovany Leandro G.C <bit4bit@riseup.net>
26;;; Copyright © 2019 Kei Kebreau <kkebreau@posteo.net>
26;;; 27;;;
27;;; This file is part of GNU Guix. 28;;; This file is part of GNU Guix.
28;;; 29;;;
@@ -47,6 +48,7 @@
47 #:use-module (guix git-download) 48 #:use-module (guix git-download)
48 #:use-module (guix build-system cmake) 49 #:use-module (guix build-system cmake)
49 #:use-module (guix build-system gnu) 50 #:use-module (guix build-system gnu)
51 #:use-module (guix build-system go)
50 #:use-module (guix build-system python) 52 #:use-module (guix build-system python)
51 #:use-module (guix build-system trivial) 53 #:use-module (guix build-system trivial)
52 #:use-module (gnu packages apr) 54 #:use-module (gnu packages apr)
@@ -2144,3 +2146,27 @@ design goals are to reduce the pain of resolving merge conflicts by finding
2144the smallest possible conflicts and to allow a merge to be saved, tested, 2146the smallest possible conflicts and to allow a merge to be saved, tested,
2145interrupted, published, and collaborated on while in progress.") 2147interrupted, published, and collaborated on while in progress.")
2146 (license license:gpl2+))) 2148 (license license:gpl2+)))
2149
2150(define-public git-lfs
2151 (package
2152 (name "git-lfs")
2153 (version "2.7.1")
2154 (source (origin
2155 (method git-fetch)
2156 (uri (git-reference
2157 (url "https://github.com/git-lfs/git-lfs")
2158 (commit (string-append "v" version))))
2159 (file-name (git-file-name name version))
2160 (sha256
2161 (base32
2162 "10v38w8qfz0x8750kv31n8gg2dimvq4wz40m374pd1xaypfs9670"))))
2163 (build-system go-build-system)
2164 (arguments
2165 '(#:import-path "github.com/git-lfs/git-lfs"))
2166 (home-page "https://git-lfs.github.com/")
2167 (synopsis "Git extension for versioning large files")
2168 (description
2169 "Git Large File Storage (LFS) replaces large files such as audio samples,
2170videos, datasets, and graphics with text pointers inside Git, while storing the
2171file contents on a remote server.")
2172 (license license:expat)))
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 9bc3073ab0d..ade3b0b8524 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -1446,7 +1446,7 @@ access to mpv's powerful playback capabilities.")
1446(define-public youtube-dl 1446(define-public youtube-dl
1447 (package 1447 (package
1448 (name "youtube-dl") 1448 (name "youtube-dl")
1449 (version "2019.04.07") 1449 (version "2019.04.17")
1450 (source (origin 1450 (source (origin
1451 (method url-fetch) 1451 (method url-fetch)
1452 (uri (string-append "https://github.com/rg3/youtube-dl/releases/" 1452 (uri (string-append "https://github.com/rg3/youtube-dl/releases/"
@@ -1454,7 +1454,7 @@ access to mpv's powerful playback capabilities.")
1454 version ".tar.gz")) 1454 version ".tar.gz"))
1455 (sha256 1455 (sha256
1456 (base32 1456 (base32
1457 "1krx4y8nzpaqpq9qs8dnv2y988jpdccyfl9sdx9wrb0baycl119k")))) 1457 "0dznw06qbb75glzirhnsbsd5xqix08jxdngbd21wndxcj1yq5y8a"))))
1458 (build-system python-build-system) 1458 (build-system python-build-system)
1459 (arguments 1459 (arguments
1460 ;; The problem here is that the directory for the man page and completion 1460 ;; The problem here is that the directory for the man page and completion
@@ -3425,11 +3425,11 @@ transitions, and effects and then export your film to many common formats.")
3425(define-public dav1d 3425(define-public dav1d
3426 (package 3426 (package
3427 (name "dav1d") 3427 (name "dav1d")
3428 (version "0.2.1") 3428 (version "0.2.2")
3429 (source 3429 (source
3430 (origin 3430 (origin
3431 (method url-fetch) 3431 (method url-fetch)
3432 (uri (list ;; The canonical download site 3432 (uri (list ;; The canonical download site.
3433 (string-append "https://downloads.videolan.org/pub/videolan/" 3433 (string-append "https://downloads.videolan.org/pub/videolan/"
3434 "dav1d/" version "/dav1d-" version ".tar.xz") 3434 "dav1d/" version "/dav1d-" version ".tar.xz")
3435 3435
@@ -3437,7 +3437,7 @@ transitions, and effects and then export your film to many common formats.")
3437 (string-append "https://code.videolan.org/videolan/dav1d/-/" 3437 (string-append "https://code.videolan.org/videolan/dav1d/-/"
3438 "archive/" version "/dav1d-" version ".tar.bz2"))) 3438 "archive/" version "/dav1d-" version ".tar.bz2")))
3439 (sha256 3439 (sha256
3440 (base32 "0cp7harg2gf61v35hyki2ddk9yr0xli9bkk3smxblabmq9rv5cs3")))) 3440 (base32 "1llf4v486avj83d31670vdd5nshbq10qrx9vwrm1j078dh4ax4q0"))))
3441 (build-system meson-build-system) 3441 (build-system meson-build-system)
3442 (native-inputs `(("nasm" ,nasm))) 3442 (native-inputs `(("nasm" ,nasm)))
3443 (home-page "https://code.videolan.org/videolan/dav1d") 3443 (home-page "https://code.videolan.org/videolan/dav1d")
diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm
index cd772113777..60a96610400 100644
--- a/gnu/packages/vulkan.scm
+++ b/gnu/packages/vulkan.scm
@@ -41,37 +41,33 @@
41 #:use-module (gnu packages xorg)) 41 #:use-module (gnu packages xorg))
42 42
43(define-public spirv-headers 43(define-public spirv-headers
44 ;; Keep updated in accordance with 44 (package
45 ;; https://github.com/google/shaderc/blob/known-good/known_good.json 45 (name "spirv-headers")
46 (let ((commit "8bea0a266ac9b718aa0818d9e3a47c0b77c2cb23") 46 (version "1.3.7")
47 (revision "4")) 47 (source
48 (package 48 (origin
49 (name "spirv-headers") 49 (method git-fetch)
50 (version (string-append "0.0-" revision "." (string-take commit 9))) 50 (uri (git-reference
51 (source 51 (url "https://github.com/KhronosGroup/SPIRV-Headers")
52 (origin 52 (commit version)))
53 (method git-fetch) 53 (sha256
54 (uri (git-reference 54 (base32
55 (url "https://github.com/KhronosGroup/SPIRV-Headers") 55 "0m56smanfcczjfif4yfcqhjj4d4sc088kwg6dgia8fwdsjavdm4d"))
56 (commit commit))) 56 (file-name (string-append name "-" version "-checkout"))))
57 (sha256 57 (build-system cmake-build-system)
58 (base32 58 (arguments
59 "01qyjghjz42hmyw9111zz20a1paf37ps39p4xbj8abjba65d8lqx")) 59 `(#:tests? #f ;; No tests
60 (file-name (string-append name "-" version "-checkout")))) 60 #:phases (modify-phases %standard-phases
61 (build-system cmake-build-system) 61 (replace 'install
62 (arguments 62 (lambda* (#:key outputs #:allow-other-keys)
63 `(#:tests? #f ;; No tests 63 (invoke "cmake" "-E" "copy_directory"
64 #:phases (modify-phases %standard-phases 64 "../source/include/spirv"
65 (replace 'install 65 (string-append (assoc-ref outputs "out")
66 (lambda* (#:key outputs #:allow-other-keys) 66 "/include/spirv")))))))
67 (invoke "cmake" "-E" "copy_directory" 67 (home-page "https://github.com/KhronosGroup/SPIRV-Headers")
68 "../source/include/spirv" 68 (synopsis "Machine-readable files from the SPIR-V Registry")
69 (string-append (assoc-ref outputs "out") 69 (description
70 "/include/spirv"))))))) 70 "SPIRV-Headers is a repository containing machine-readable files from
71 (home-page "https://github.com/KhronosGroup/SPIRV-Headers")
72 (synopsis "Machine-readable files from the SPIR-V Registry")
73 (description
74 "SPIRV-Headers is a repository containing machine-readable files from
75the SPIR-V Registry. This includes: 71the SPIR-V Registry. This includes:
76@itemize 72@itemize
77@item Header files for various languages. 73@item Header files for various languages.
@@ -79,9 +75,9 @@ the SPIR-V Registry. This includes:
79and for the GLSL.std.450 extended instruction set. 75and for the GLSL.std.450 extended instruction set.
80@item The XML registry file. 76@item The XML registry file.
81@end itemize\n") 77@end itemize\n")
82 (license (license:x11-style 78 (license (license:x11-style
83 (string-append "https://github.com/KhronosGroup/SPIRV-Headers/blob/" 79 (string-append "https://github.com/KhronosGroup/SPIRV-Headers/blob/"
84 commit "/LICENSE")))))) 80 version "/LICENSE")))))
85 81
86(define-public spirv-tools 82(define-public spirv-tools
87 (package 83 (package
@@ -124,7 +120,7 @@ parser,disassembler, validator, and optimizer for SPIR-V.")
124(define-public glslang 120(define-public glslang
125 (package 121 (package
126 (name "glslang") 122 (name "glslang")
127 (version "7.11.3113") 123 (version "7.11.3188")
128 (source 124 (source
129 (origin 125 (origin
130 (method git-fetch) 126 (method git-fetch)
@@ -133,7 +129,7 @@ parser,disassembler, validator, and optimizer for SPIR-V.")
133 (commit version))) 129 (commit version)))
134 (sha256 130 (sha256
135 (base32 131 (base32
136 "1kzv2b4q1fddxd7c0hc754nd6rw6y9vijb9fsi13xzzq9dficgb6")) 132 "04y4dd1cqdkd4qffmhgmg3agf9j07ii2w38vpp4jw53ir818bqdq"))
137 (file-name (string-append name "-" version "-checkout")))) 133 (file-name (string-append name "-" version "-checkout"))))
138 (build-system cmake-build-system) 134 (build-system cmake-build-system)
139 (arguments 135 (arguments
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index fd6bfbab22d..7d8e51b5af7 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -5435,8 +5435,7 @@ Instagram and YouTube.")
5435 (url "https://github.com/linkchecker/linkchecker") 5435 (url "https://github.com/linkchecker/linkchecker")
5436 (commit (string-append "v" version)))) 5436 (commit (string-append "v" version))))
5437 (patches 5437 (patches
5438 (search-patches 5438 (search-patches "linkchecker-tests-require-network.patch"))
5439 "linkchecker-mark-more-tests-that-require-the-network.patch"))
5440 (file-name (git-file-name name version)) 5439 (file-name (git-file-name name version))
5441 (sha256 5440 (sha256
5442 (base32 5441 (base32
diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 2695b5f99c4..c7dea8ba9b2 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -8,7 +8,7 @@
8;;; Copyright © 2016, 2019 Efraim Flashner <efraim@flashner.co.il> 8;;; Copyright © 2016, 2019 Efraim Flashner <efraim@flashner.co.il>
9;;; Copyright © 2016 Al McElrath <hello@yrns.org> 9;;; Copyright © 2016 Al McElrath <hello@yrns.org>
10;;; Copyright © 2016 Carlo Zancanaro <carlo@zancanaro.id.au> 10;;; Copyright © 2016 Carlo Zancanaro <carlo@zancanaro.id.au>
11;;; Copyright © 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org> 11;;; Copyright © 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
12;;; Copyright © 2016, 2017, 2018 ng0 <ng0@n0.is> 12;;; Copyright © 2016, 2017, 2018 ng0 <ng0@n0.is>
13;;; Copyright © 2016 doncatnip <gnopap@gmail.com> 13;;; Copyright © 2016 doncatnip <gnopap@gmail.com>
14;;; Copyright © 2016 Ivan Vilata i Balaguer <ivan@selidor.net> 14;;; Copyright © 2016 Ivan Vilata i Balaguer <ivan@selidor.net>
@@ -811,7 +811,7 @@ experience.")
811 "Awesome has been designed as a framework window manager. It is fast, small, 811 "Awesome has been designed as a framework window manager. It is fast, small,
812dynamic and extensible using the Lua programming language.") 812dynamic and extensible using the Lua programming language.")
813 (license license:gpl2+) 813 (license license:gpl2+)
814 (home-page "https://awesome.naquadah.org/"))) 814 (home-page "https://awesomewm.org/")))
815 815
816(define-public menumaker 816(define-public menumaker
817 (package 817 (package
diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index c4b7f9a87fb..739de9d25ab 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -574,7 +574,7 @@ selection's dimensions to stdout.")
574(define-public maim 574(define-public maim
575 (package 575 (package
576 (name "maim") 576 (name "maim")
577 (version "5.5.2") 577 (version "5.5.3")
578 (source (origin 578 (source (origin
579 (method git-fetch) 579 (method git-fetch)
580 (uri (git-reference 580 (uri (git-reference
@@ -583,7 +583,7 @@ selection's dimensions to stdout.")
583 (file-name (git-file-name name version)) 583 (file-name (git-file-name name version))
584 (sha256 584 (sha256
585 (base32 585 (base32
586 "14mfxdm39kc5jk8wysrzx05ag2g4sk9l24i8m5pzqn8j611150v3")))) 586 "1kbxsz8whfxl5blwsvpva2q95zwy72argwhi1cfqh5lrhzq5zrpp"))))
587 (build-system cmake-build-system) 587 (build-system cmake-build-system)
588 (arguments 588 (arguments
589 '(#:tests? #f)) ; no "check" target 589 '(#:tests? #f)) ; no "check" target
diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm
index f739f207e7c..6ae9cd65d50 100644
--- a/gnu/packages/xml.scm
+++ b/gnu/packages/xml.scm
@@ -929,14 +929,14 @@ XSL-T processor. It also performs any necessary post-processing.")
929(define-public xmlsec 929(define-public xmlsec
930 (package 930 (package
931 (name "xmlsec") 931 (name "xmlsec")
932 (version "1.2.27") 932 (version "1.2.28")
933 (source (origin 933 (source (origin
934 (method url-fetch) 934 (method url-fetch)
935 (uri (string-append "https://www.aleksey.com/xmlsec/download/" 935 (uri (string-append "https://www.aleksey.com/xmlsec/download/"
936 "xmlsec1-" version ".tar.gz")) 936 "xmlsec1-" version ".tar.gz"))
937 (sha256 937 (sha256
938 (base32 938 (base32
939 "1dlf263mvxj9n4lnhhjawc2hv45agrwjf8kxk7k8h9g9v2x5dmwp")))) 939 "1m12caglhyx08g8lh2sl3nkldlpryzdx2d572q73y3m33s0w9vhk"))))
940 (build-system gnu-build-system) 940 (build-system gnu-build-system)
941 (propagated-inputs ; according to xmlsec1.pc 941 (propagated-inputs ; according to xmlsec1.pc
942 `(("libxml2" ,libxml2) 942 `(("libxml2" ,libxml2)
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index d3e6b792774..5d8b3498e62 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -2915,8 +2915,8 @@ X server.")
2915 2915
2916 2916
2917(define-public xf86-video-intel 2917(define-public xf86-video-intel
2918 (let ((commit "33ee0c3b21ea279e08d0863fcb2e874f0974b00e") 2918 (let ((commit "6afed33b2d673d88674f0c76efe500ae414e8e1b")
2919 (revision "12")) 2919 (revision "13"))
2920 (package 2920 (package
2921 (name "xf86-video-intel") 2921 (name "xf86-video-intel")
2922 (version (git-version "2.99.917" revision commit)) 2922 (version (git-version "2.99.917" revision commit))
@@ -2929,7 +2929,7 @@ X server.")
2929 (commit commit))) 2929 (commit commit)))
2930 (sha256 2930 (sha256
2931 (base32 2931 (base32
2932 "1ryjaj52nd2fbrjf1id5fr5vndzvv287rggbj3lzhbwzxv52r0gj")) 2932 "1s3fqlqzmql7s15m7qy21vai93n6q9f0ccpv0p353rwfx16mmf35"))
2933 (file-name (git-file-name name version)))) 2933 (file-name (git-file-name name version))))
2934 (build-system gnu-build-system) 2934 (build-system gnu-build-system)
2935 (inputs `(("mesa" ,mesa) 2935 (inputs `(("mesa" ,mesa)
@@ -6001,7 +6001,7 @@ basic eye-candy effects.")
6001(define-public xpra 6001(define-public xpra
6002 (package 6002 (package
6003 (name "xpra") 6003 (name "xpra")
6004 (version "2.5") 6004 (version "2.5.1")
6005 (source 6005 (source
6006 (origin 6006 (origin
6007 (method url-fetch) 6007 (method url-fetch)
@@ -6009,7 +6009,7 @@ basic eye-candy effects.")
6009 version ".tar.xz")) 6009 version ".tar.xz"))
6010 (sha256 6010 (sha256
6011 (base32 6011 (base32
6012 "0q6c7ijgpp2wk6jlh0pzqki1w60i36wyl2zfwkg0gpdh40ypab3x")))) 6012 "14l3bs7mlkd2lphjhnbw5dr95pg7x1k61s9wk35dra4li2xjy1lm"))))
6013 (build-system python-build-system) 6013 (build-system python-build-system)
6014 (inputs `(("ffmpeg" ,ffmpeg) 6014 (inputs `(("ffmpeg" ,ffmpeg)
6015 ("flac" ,flac) 6015 ("flac" ,flac)
@@ -6347,7 +6347,7 @@ output.")
6347(define-public console-setup 6347(define-public console-setup
6348 (package 6348 (package
6349 (name "console-setup") 6349 (name "console-setup")
6350 (version "1.190") 6350 (version "1.191")
6351 (source 6351 (source
6352 (origin 6352 (origin
6353 (method git-fetch) 6353 (method git-fetch)
@@ -6355,7 +6355,7 @@ output.")
6355 (url "https://salsa.debian.org/installer-team/console-setup.git") 6355 (url "https://salsa.debian.org/installer-team/console-setup.git")
6356 (commit version))) 6356 (commit version)))
6357 (sha256 6357 (sha256
6358 (base32 "0qklm9ww1wap2bs7hp31xkfjyhdrirg2mk4hiv7h6fiqckzmdwvd")) 6358 (base32 "0wplhjadk530fqxhfnizil32rcvkcl5m2r18yskspcib53r4pmim"))
6359 (file-name (git-file-name name version)))) 6359 (file-name (git-file-name name version))))
6360 (build-system gnu-build-system) 6360 (build-system gnu-build-system)
6361 (arguments 6361 (arguments
diff --git a/gnu/services/authentication.scm b/gnu/services/authentication.scm
index ab54aaf698a..16df4da1fc8 100644
--- a/gnu/services/authentication.scm
+++ b/gnu/services/authentication.scm
@@ -42,17 +42,19 @@
42 nslcd-configuration? 42 nslcd-configuration?
43 nslcd-service-type)) 43 nslcd-service-type))
44 44
45(define-record-type* <fprintd-configuration> 45(define-configuration fprintd-configuration
46 fprintd-configuration make-fprintd-configuration 46 (fprintd (package fprintd)
47 fprintd-configuration? 47 "The fprintd package"))
48 (ntp fprintd-configuration-fprintd 48
49 (default fprintd))) 49(define (fprintd-dbus-service config)
50 (list (fprintd-configuration-fprintd config)))
50 51
51(define fprintd-service-type 52(define fprintd-service-type
52 (service-type (name 'fprintd) 53 (service-type (name 'fprintd)
53 (extensions 54 (extensions
54 (list (service-extension dbus-root-service-type 55 (list (service-extension dbus-root-service-type
55 list))) 56 fprintd-dbus-service)))
57 (default-value (fprintd-configuration))
56 (description 58 (description
57 "Run fprintd, a fingerprint management daemon."))) 59 "Run fprintd, a fingerprint management daemon.")))
58 60
diff --git a/gnu/services/shepherd.scm b/gnu/services/shepherd.scm
index 12d649f5425..45c67e04ebc 100644
--- a/gnu/services/shepherd.scm
+++ b/gnu/services/shepherd.scm
@@ -1,5 +1,5 @@
1;;; GNU Guix --- Functional package management for GNU 1;;; GNU Guix --- Functional package management for GNU
2;;; Copyright © 2013, 2014, 2015, 2016, 2018 Ludovic Courtès <ludo@gnu.org> 2;;; Copyright © 2013, 2014, 2015, 2016, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
3;;; Copyright © 2017 Clément Lassieur <clement@lassieur.org> 3;;; Copyright © 2017 Clément Lassieur <clement@lassieur.org>
4;;; Copyright © 2018 Carlo Zancanaro <carlo@zancanaro.id.au> 4;;; Copyright © 2018 Carlo Zancanaro <carlo@zancanaro.id.au>
5;;; 5;;;
@@ -44,6 +44,7 @@
44 shepherd-service-provision 44 shepherd-service-provision
45 shepherd-service-canonical-name 45 shepherd-service-canonical-name
46 shepherd-service-requirement 46 shepherd-service-requirement
47 shepherd-service-one-shot?
47 shepherd-service-respawn? 48 shepherd-service-respawn?
48 shepherd-service-start 49 shepherd-service-start
49 shepherd-service-stop 50 shepherd-service-stop
@@ -59,7 +60,6 @@
59 %default-modules 60 %default-modules
60 61
61 shepherd-service-file 62 shepherd-service-file
62 %containerized-shepherd-service
63 63
64 shepherd-service-lookup-procedure 64 shepherd-service-lookup-procedure
65 shepherd-service-back-edges 65 shepherd-service-back-edges
@@ -149,6 +149,8 @@ DEFAULT is given, use it as the service's default value."
149 (provision shepherd-service-provision) ;list of symbols 149 (provision shepherd-service-provision) ;list of symbols
150 (requirement shepherd-service-requirement ;list of symbols 150 (requirement shepherd-service-requirement ;list of symbols
151 (default '())) 151 (default '()))
152 (one-shot? shepherd-service-one-shot? ;Boolean
153 (default #f))
152 (respawn? shepherd-service-respawn? ;Boolean 154 (respawn? shepherd-service-respawn? ;Boolean
153 (default #t)) 155 (default #t))
154 (start shepherd-service-start) ;g-expression (procedure) 156 (start shepherd-service-start) ;g-expression (procedure)
@@ -238,6 +240,11 @@ stored."
238 #:docstring '#$(shepherd-service-documentation service) 240 #:docstring '#$(shepherd-service-documentation service)
239 #:provides '#$(shepherd-service-provision service) 241 #:provides '#$(shepherd-service-provision service)
240 #:requires '#$(shepherd-service-requirement service) 242 #:requires '#$(shepherd-service-requirement service)
243
244 ;; The 'one-shot?' slot is new in Shepherd 0.6.0.
245 ;; Older versions ignore it.
246 #:one-shot? '#$(shepherd-service-one-shot? service)
247
241 #:respawn? '#$(shepherd-service-respawn? service) 248 #:respawn? '#$(shepherd-service-respawn? service)
242 #:start #$(shepherd-service-start service) 249 #:start #$(shepherd-service-start service)
243 #:stop #$(shepherd-service-stop service) 250 #:stop #$(shepherd-service-stop service)
@@ -338,21 +345,6 @@ symbols provided/required by a service."
338 (lambda (service) 345 (lambda (service)
339 (vhash-foldq* cons '() service edges))) 346 (vhash-foldq* cons '() service edges)))
340 347
341(define %containerized-shepherd-service
342 ;; XXX: This service works around a bug in the Shepherd 0.5.0: shepherd
343 ;; calls reboot(2) (via 'disable-reboot-on-ctrl-alt-del') when it starts,
344 ;; but in a container that fails with EINVAL. This was fixed in Shepherd
345 ;; commit 92e806bac1abaeeaf5d60f0ab50d1ae85ba6a62f.
346 (simple-service 'containerized-shepherd
347 shepherd-root-service-type
348 (list (shepherd-service
349 (provision '(containerized-shepherd))
350 (start #~(lambda ()
351 (set! (@@ (shepherd)
352 disable-reboot-on-ctrl-alt-del)
353 (const #t))
354 #t))))))
355
356(define (shepherd-service-upgrade live target) 348(define (shepherd-service-upgrade live target)
357 "Return two values: the subset of LIVE (a list of <live-service>) that needs 349 "Return two values: the subset of LIVE (a list of <live-service>) that needs
358to be unloaded, and the subset of TARGET (a list of <shepherd-service>) that 350to be unloaded, and the subset of TARGET (a list of <shepherd-service>) that
diff --git a/gnu/system.scm b/gnu/system.scm
index 24243eb7078..c4f5740df26 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -160,7 +160,7 @@
160 (kernel operating-system-kernel ; package 160 (kernel operating-system-kernel ; package
161 (default linux-libre)) 161 (default linux-libre))
162 (kernel-arguments operating-system-user-kernel-arguments 162 (kernel-arguments operating-system-user-kernel-arguments
163 (default '())) ; list of gexps/strings 163 (default '("quiet"))) ; list of gexps/strings
164 (bootloader operating-system-bootloader) ; <bootloader-configuration> 164 (bootloader operating-system-bootloader) ; <bootloader-configuration>
165 (label operating-system-label ; string 165 (label operating-system-label ; string
166 (thunked) 166 (thunked)
diff --git a/gnu/system/install.scm b/gnu/system/install.scm
index d887313132d..f20d94f385e 100644
--- a/gnu/system/install.scm
+++ b/gnu/system/install.scm
@@ -427,6 +427,12 @@ Access documentation at any time by pressing Alt-F2.\x1b[0m
427 (label (string-append "GNU Guix installation " 427 (label (string-append "GNU Guix installation "
428 (package-version guix))) 428 (package-version guix)))
429 429
430 ;; XXX: The AMD Radeon driver is reportedly broken, which makes kmscon
431 ;; non-functional:
432 ;; <https://lists.gnu.org/archive/html/guix-devel/2019-03/msg00441.html>.
433 ;; Thus, blacklist it.
434 (kernel-arguments '("quiet" "modprobe.blacklist=radeon"))
435
430 (file-systems 436 (file-systems
431 ;; Note: the disk image build code overrides this root file system with 437 ;; Note: the disk image build code overrides this root file system with
432 ;; the appropriate one. 438 ;; the appropriate one.
diff --git a/gnu/system/linux-container.scm b/gnu/system/linux-container.scm
index 37a053cdc38..149c3d08a32 100644
--- a/gnu/system/linux-container.scm
+++ b/gnu/system/linux-container.scm
@@ -29,7 +29,6 @@
29 #:use-module (gnu build linux-container) 29 #:use-module (gnu build linux-container)
30 #:use-module (gnu services) 30 #:use-module (gnu services)
31 #:use-module (gnu services base) 31 #:use-module (gnu services base)
32 #:use-module (gnu services shepherd)
33 #:use-module (gnu system) 32 #:use-module (gnu system)
34 #:use-module (gnu system file-systems) 33 #:use-module (gnu system file-systems)
35 #:export (system-container 34 #:export (system-container
@@ -52,7 +51,7 @@ from OS that are needed on the bare metal and not in a container."
52 (let ((locale (operating-system-locale-directory os))) 51 (let ((locale (operating-system-locale-directory os)))
53 (with-monad %store-monad 52 (with-monad %store-monad
54 (return `(("locale" ,locale)))))) 53 (return `(("locale" ,locale))))))
55 (append base (list %containerized-shepherd-service)))) 54 base))
56 55
57(define (containerized-operating-system os mappings) 56(define (containerized-operating-system os mappings)
58 "Return an operating system based on OS for use in a Linux container 57 "Return an operating system based on OS for use in a Linux container
diff --git a/gnu/system/shadow.scm b/gnu/system/shadow.scm
index 7dc36f4a451..13b8b140954 100644
--- a/gnu/system/shadow.scm
+++ b/gnu/system/shadow.scm
@@ -323,6 +323,7 @@ accounts among ACCOUNTS+GROUPS."
323 (list (shepherd-service 323 (list (shepherd-service
324 (requirement '(file-systems)) 324 (requirement '(file-systems))
325 (provision '(user-homes)) 325 (provision '(user-homes))
326 (one-shot? #t)
326 (modules '((gnu build activation) 327 (modules '((gnu build activation)
327 (gnu system accounts))) 328 (gnu system accounts)))
328 (start (with-imported-modules (source-module-closure 329 (start (with-imported-modules (source-module-closure
@@ -332,9 +333,7 @@ accounts among ACCOUNTS+GROUPS."
332 (activate-user-home 333 (activate-user-home
333 (map sexp->user-account 334 (map sexp->user-account
334 (list #$@(map user-account->gexp accounts)))) 335 (list #$@(map user-account->gexp accounts))))
335 #f))) ;stop 336 #t))) ;success
336 (stop #~(const #f))
337 (respawn? #f)
338 (documentation "Create user home directories.")))) 337 (documentation "Create user home directories."))))
339 338
340(define (shells-file shells) 339(define (shells-file shells)