diff options
| author | Mark H Weaver <mhw@netris.org> | 2019-08-29 17:19:18 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2019-08-29 17:19:18 -0400 |
| commit | 0481289cbccba2646bf654f0ae49ac9c45602d5d (patch) | |
| tree | cbe1351e2751e9d22c4c8add02991a3e6674f26a /gnu | |
| parent | c55fae452032aa4b1b63406983e9abdf70adc957 (diff) | |
| parent | 9fbf4d2a52d4d3e01059f3432bb3f78182b5a822 (diff) | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu')
73 files changed, 4002 insertions, 671 deletions
diff --git a/gnu/build/accounts.scm b/gnu/build/accounts.scm index 5094456ab1a..f60d68d9b33 100644 --- a/gnu/build/accounts.scm +++ b/gnu/build/accounts.scm | |||
| @@ -238,7 +238,7 @@ to it atomically and set the appropriate permissions." | |||
| 238 | (for-each (lambda (entry) | 238 | (for-each (lambda (entry) |
| 239 | (display (entry->string entry) port) | 239 | (display (entry->string entry) port) |
| 240 | (newline port)) | 240 | (newline port)) |
| 241 | entries)) | 241 | (delete-duplicates entries))) |
| 242 | 242 | ||
| 243 | (if (port? file-or-port) | 243 | (if (port? file-or-port) |
| 244 | (write-entries file-or-port) | 244 | (write-entries file-or-port) |
diff --git a/gnu/build/cross-toolchain.scm b/gnu/build/cross-toolchain.scm index 1704157750f..6bdbdd54113 100644 --- a/gnu/build/cross-toolchain.scm +++ b/gnu/build/cross-toolchain.scm | |||
| @@ -128,7 +128,11 @@ C_*INCLUDE_PATH." | |||
| 128 | 128 | ||
| 129 | (substitute* (string-append mingw-headers "/crt/_mingw.h") | 129 | (substitute* (string-append mingw-headers "/crt/_mingw.h") |
| 130 | (("@MINGW_HAS_SECURE_API@") | 130 | (("@MINGW_HAS_SECURE_API@") |
| 131 | "#define MINGW_HAS_SECURE_API 1")) | 131 | "#define MINGW_HAS_SECURE_API 1") |
| 132 | (("@DEFAULT_WIN32_WINNT@") | ||
| 133 | "0x502") | ||
| 134 | (("@DEFAULT_MSVCRT_VERSION@") | ||
| 135 | "0x700")) | ||
| 132 | 136 | ||
| 133 | (let ((cpath (string-append mingw-headers "/include" | 137 | (let ((cpath (string-append mingw-headers "/include" |
| 134 | ":" mingw-headers "/crt" | 138 | ":" mingw-headers "/crt" |
diff --git a/gnu/ci.scm b/gnu/ci.scm index aeebd4f14b3..5d5a826647c 100644 --- a/gnu/ci.scm +++ b/gnu/ci.scm | |||
| @@ -331,8 +331,12 @@ valid." | |||
| 331 | "Return the list of packages to build." | 331 | "Return the list of packages to build." |
| 332 | (define (adjust package result) | 332 | (define (adjust package result) |
| 333 | (cond ((package-replacement package) | 333 | (cond ((package-replacement package) |
| 334 | (cons* package ;build both | 334 | ;; XXX: If PACKAGE and its replacement have the same name/version, |
| 335 | (package-replacement package) | 335 | ;; then both Cuirass jobs will have the same name, which |
| 336 | ;; effectively means that the second one will be ignored. Thus, | ||
| 337 | ;; return the replacement first. | ||
| 338 | (cons* (package-replacement package) ;build both | ||
| 339 | package | ||
| 336 | result)) | 340 | result)) |
| 337 | ((package-superseded package) | 341 | ((package-superseded package) |
| 338 | result) ;don't build it | 342 | result) ;don't build it |
diff --git a/gnu/installer.scm b/gnu/installer.scm index 15d971dfc4d..167653263fc 100644 --- a/gnu/installer.scm +++ b/gnu/installer.scm | |||
| @@ -1,6 +1,7 @@ | |||
| 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 | ;;; Copyright © 2019 Ludovic Courtès <ludo@gnu.org> |
| 4 | ;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr> | ||
| 4 | ;;; | 5 | ;;; |
| 5 | ;;; This file is part of GNU Guix. | 6 | ;;; This file is part of GNU Guix. |
| 6 | ;;; | 7 | ;;; |
| @@ -226,15 +227,6 @@ selected keymap." | |||
| 226 | (#$keymap-step current-installer))) | 227 | (#$keymap-step current-installer))) |
| 227 | (configuration-formatter keyboard-layout->configuration)) | 228 | (configuration-formatter keyboard-layout->configuration)) |
| 228 | 229 | ||
| 229 | ;; Run a partitioning tool allowing the user to modify | ||
| 230 | ;; partition tables, partitions and their mount points. | ||
| 231 | (installer-step | ||
| 232 | (id 'partition) | ||
| 233 | (description (G_ "Partitioning")) | ||
| 234 | (compute (lambda _ | ||
| 235 | ((installer-partition-page current-installer)))) | ||
| 236 | (configuration-formatter user-partitions->configuration)) | ||
| 237 | |||
| 238 | ;; Ask the user to input a hostname for the system. | 230 | ;; Ask the user to input a hostname for the system. |
| 239 | (installer-step | 231 | (installer-step |
| 240 | (id 'hostname) | 232 | (id 'hostname) |
| @@ -267,6 +259,17 @@ selected keymap." | |||
| 267 | ((installer-services-page current-installer)))) | 259 | ((installer-services-page current-installer)))) |
| 268 | (configuration-formatter system-services->configuration)) | 260 | (configuration-formatter system-services->configuration)) |
| 269 | 261 | ||
| 262 | ;; Run a partitioning tool allowing the user to modify | ||
| 263 | ;; partition tables, partitions and their mount points. | ||
| 264 | ;; Do this last so the user has something to boot if any | ||
| 265 | ;; of the previous steps didn't go as expected. | ||
| 266 | (installer-step | ||
| 267 | (id 'partition) | ||
| 268 | (description (G_ "Partitioning")) | ||
| 269 | (compute (lambda _ | ||
| 270 | ((installer-partition-page current-installer)))) | ||
| 271 | (configuration-formatter user-partitions->configuration)) | ||
| 272 | |||
| 270 | (installer-step | 273 | (installer-step |
| 271 | (id 'final) | 274 | (id 'final) |
| 272 | (description (G_ "Configuration file")) | 275 | (description (G_ "Configuration file")) |
diff --git a/gnu/installer/newt/page.scm b/gnu/installer/newt/page.scm index 728721c08f2..630efde9cc5 100644 --- a/gnu/installer/newt/page.scm +++ b/gnu/installer/newt/page.scm | |||
| @@ -1,6 +1,7 @@ | |||
| 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 | ;;; Copyright © 2019 Ludovic Courtès <ludo@gnu.org> |
| 4 | ;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr> | ||
| 4 | ;;; | 5 | ;;; |
| 5 | ;;; This file is part of GNU Guix. | 6 | ;;; This file is part of GNU Guix. |
| 6 | ;;; | 7 | ;;; |
| @@ -75,7 +76,7 @@ this page to TITLE." | |||
| 75 | #:key | 76 | #:key |
| 76 | (allow-empty-input? #f) | 77 | (allow-empty-input? #f) |
| 77 | (default-text #f) | 78 | (default-text #f) |
| 78 | (input-hide-checkbox? #f) | 79 | (input-visibility-checkbox? #f) |
| 79 | (input-field-width 40) | 80 | (input-field-width 40) |
| 80 | (input-flags 0)) | 81 | (input-flags 0)) |
| 81 | "Run a page to prompt user for an input. The given TEXT will be displayed | 82 | "Run a page to prompt user for an input. The given TEXT will be displayed |
| @@ -88,8 +89,8 @@ input box, such as FLAG-PASSWORD." | |||
| 88 | input-field-width | 89 | input-field-width |
| 89 | #:flags FLAG-BORDER)) | 90 | #:flags FLAG-BORDER)) |
| 90 | (input-visible-cb | 91 | (input-visible-cb |
| 91 | (make-checkbox -1 -1 (G_ "Hide") #\x "x ")) | 92 | (make-checkbox -1 -1 (G_ "Show") #\space "x ")) |
| 92 | (input-flags* (if input-hide-checkbox? | 93 | (input-flags* (if input-visibility-checkbox? |
| 93 | (logior FLAG-PASSWORD FLAG-SCROLL | 94 | (logior FLAG-PASSWORD FLAG-SCROLL |
| 94 | input-flags) | 95 | input-flags) |
| 95 | input-flags)) | 96 | input-flags)) |
| @@ -102,7 +103,7 @@ input box, such as FLAG-PASSWORD." | |||
| 102 | (apply | 103 | (apply |
| 103 | horizontal-stacked-grid | 104 | horizontal-stacked-grid |
| 104 | GRID-ELEMENT-COMPONENT input-entry | 105 | GRID-ELEMENT-COMPONENT input-entry |
| 105 | `(,@(if input-hide-checkbox? | 106 | `(,@(if input-visibility-checkbox? |
| 106 | (list GRID-ELEMENT-COMPONENT input-visible-cb) | 107 | (list GRID-ELEMENT-COMPONENT input-visible-cb) |
| 107 | '()))) | 108 | '()))) |
| 108 | GRID-ELEMENT-COMPONENT ok-button)) | 109 | GRID-ELEMENT-COMPONENT ok-button)) |
diff --git a/gnu/installer/newt/user.scm b/gnu/installer/newt/user.scm index dab805198f3..b747886c550 100644 --- a/gnu/installer/newt/user.scm +++ b/gnu/installer/newt/user.scm | |||
| @@ -1,6 +1,7 @@ | |||
| 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 | ;;; Copyright © 2019 Ludovic Courtès <ludo@gnu.org> |
| 4 | ;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr> | ||
| 4 | ;;; | 5 | ;;; |
| 5 | ;;; This file is part of GNU Guix. | 6 | ;;; This file is part of GNU Guix. |
| 6 | ;;; | 7 | ;;; |
| @@ -55,7 +56,7 @@ REAL-NAME, and HOME-DIRECTORY as the initial values in the form." | |||
| 55 | (entry-home-directory (make-entry -1 -1 entry-width | 56 | (entry-home-directory (make-entry -1 -1 entry-width |
| 56 | #:initial-value home-directory)) | 57 | #:initial-value home-directory)) |
| 57 | (password-visible-cb | 58 | (password-visible-cb |
| 58 | (make-checkbox -1 -1 (G_ "Hide") #\x "x ")) | 59 | (make-checkbox -1 -1 (G_ "Show") #\space "x ")) |
| 59 | (entry-password (make-entry -1 -1 entry-width | 60 | (entry-password (make-entry -1 -1 entry-width |
| 60 | #:flags (logior FLAG-PASSWORD | 61 | #:flags (logior FLAG-PASSWORD |
| 61 | FLAG-SCROLL))) | 62 | FLAG-SCROLL))) |
| @@ -156,7 +157,7 @@ a thunk, if the confirmation doesn't match PASSWORD, and return its result." | |||
| 156 | (run-input-page (G_ "Please confirm the password.") | 157 | (run-input-page (G_ "Please confirm the password.") |
| 157 | (G_ "Password confirmation required") | 158 | (G_ "Password confirmation required") |
| 158 | #:allow-empty-input? #t | 159 | #:allow-empty-input? #t |
| 159 | #:input-hide-checkbox? #t)) | 160 | #:input-visibility-checkbox? #t)) |
| 160 | 161 | ||
| 161 | (if (string=? password confirmation) | 162 | (if (string=? password confirmation) |
| 162 | password | 163 | password |
| @@ -173,7 +174,7 @@ a thunk, if the confirmation doesn't match PASSWORD, and return its result." | |||
| 173 | (run-input-page (G_ "Please choose a password for the system \ | 174 | (run-input-page (G_ "Please choose a password for the system \ |
| 174 | administrator (\"root\").") | 175 | administrator (\"root\").") |
| 175 | (G_ "System administrator password") | 176 | (G_ "System administrator password") |
| 176 | #:input-hide-checkbox? #t)) | 177 | #:input-visibility-checkbox? #t)) |
| 177 | 178 | ||
| 178 | (confirm-password password run-root-password-page)) | 179 | (confirm-password password run-root-password-page)) |
| 179 | 180 | ||
diff --git a/gnu/installer/newt/wifi.scm b/gnu/installer/newt/wifi.scm index 1cb2ef2df39..3fd5756b991 100644 --- a/gnu/installer/newt/wifi.scm +++ b/gnu/installer/newt/wifi.scm | |||
| @@ -1,6 +1,7 @@ | |||
| 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 Meiyo Peng <meiyo@riseup.net> | 3 | ;;; Copyright © 2019 Meiyo Peng <meiyo@riseup.net> |
| 4 | ;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr> | ||
| 4 | ;;; | 5 | ;;; |
| 5 | ;;; This file is part of GNU Guix. | 6 | ;;; This file is part of GNU Guix. |
| 6 | ;;; | 7 | ;;; |
| @@ -88,7 +89,8 @@ nmc_wifi_strength_bars." | |||
| 88 | (define (run-wifi-password-page) | 89 | (define (run-wifi-password-page) |
| 89 | "Run a page prompting user for a password and return it." | 90 | "Run a page prompting user for a password and return it." |
| 90 | (run-input-page (G_ "Please enter the wifi password.") | 91 | (run-input-page (G_ "Please enter the wifi password.") |
| 91 | (G_ "Password required"))) | 92 | (G_ "Password required") |
| 93 | #:input-visibility-checkbox? #t)) | ||
| 92 | 94 | ||
| 93 | (define (run-wrong-password-page service-name) | 95 | (define (run-wrong-password-page service-name) |
| 94 | "Run a page to inform user of a wrong password input." | 96 | "Run a page to inform user of a wrong password input." |
diff --git a/gnu/local.mk b/gnu/local.mk index 44a553d871e..fe476534c21 100644 --- a/gnu/local.mk +++ b/gnu/local.mk | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | # Copyright © 2018 Stefan Stefanović <stefanx2ovic@gmail.com> | 21 | # Copyright © 2018 Stefan Stefanović <stefanx2ovic@gmail.com> |
| 22 | # Copyright © 2018 Maxim Cournoyer <maxim.cournoyer@gmail.com> | 22 | # Copyright © 2018 Maxim Cournoyer <maxim.cournoyer@gmail.com> |
| 23 | # Copyright © 2019 Guillaume Le Vaillant <glv@posteo.net> | 23 | # Copyright © 2019 Guillaume Le Vaillant <glv@posteo.net> |
| 24 | # Copyright © 2019 John Soo <jsoo1@asu.edu> | ||
| 24 | # | 25 | # |
| 25 | # This file is part of GNU Guix. | 26 | # This file is part of GNU Guix. |
| 26 | # | 27 | # |
| @@ -99,6 +100,7 @@ GNU_SYSTEM_MODULES = \ | |||
| 99 | %D%/packages/calcurse.scm \ | 100 | %D%/packages/calcurse.scm \ |
| 100 | %D%/packages/ccache.scm \ | 101 | %D%/packages/ccache.scm \ |
| 101 | %D%/packages/cdrom.scm \ | 102 | %D%/packages/cdrom.scm \ |
| 103 | %D%/packages/cedille.scm \ | ||
| 102 | %D%/packages/certs.scm \ | 104 | %D%/packages/certs.scm \ |
| 103 | %D%/packages/check.scm \ | 105 | %D%/packages/check.scm \ |
| 104 | %D%/packages/chemistry.scm \ | 106 | %D%/packages/chemistry.scm \ |
| @@ -128,6 +130,7 @@ GNU_SYSTEM_MODULES = \ | |||
| 128 | %D%/packages/cryptsetup.scm \ | 130 | %D%/packages/cryptsetup.scm \ |
| 129 | %D%/packages/cups.scm \ | 131 | %D%/packages/cups.scm \ |
| 130 | %D%/packages/curl.scm \ | 132 | %D%/packages/curl.scm \ |
| 133 | %D%/packages/cvassistant.scm \ | ||
| 131 | %D%/packages/cyrus-sasl.scm \ | 134 | %D%/packages/cyrus-sasl.scm \ |
| 132 | %D%/packages/databases.scm \ | 135 | %D%/packages/databases.scm \ |
| 133 | %D%/packages/datamash.scm \ | 136 | %D%/packages/datamash.scm \ |
| @@ -410,6 +413,7 @@ GNU_SYSTEM_MODULES = \ | |||
| 410 | %D%/packages/rdf.scm \ | 413 | %D%/packages/rdf.scm \ |
| 411 | %D%/packages/re2c.scm \ | 414 | %D%/packages/re2c.scm \ |
| 412 | %D%/packages/readline.scm \ | 415 | %D%/packages/readline.scm \ |
| 416 | %D%/packages/rednotebook.scm \ | ||
| 413 | %D%/packages/regex.scm \ | 417 | %D%/packages/regex.scm \ |
| 414 | %D%/packages/robotics.scm \ | 418 | %D%/packages/robotics.scm \ |
| 415 | %D%/packages/rrdtool.scm \ | 419 | %D%/packages/rrdtool.scm \ |
| @@ -697,6 +701,7 @@ dist_patch_DATA = \ | |||
| 697 | %D%/packages/patches/avidemux-install-to-lib.patch \ | 701 | %D%/packages/patches/avidemux-install-to-lib.patch \ |
| 698 | %D%/packages/patches/awesome-reproducible-png.patch \ | 702 | %D%/packages/patches/awesome-reproducible-png.patch \ |
| 699 | %D%/packages/patches/azr3.patch \ | 703 | %D%/packages/patches/azr3.patch \ |
| 704 | %D%/packages/patches/bash-4.4-linux-pgrp-pipe.patch \ | ||
| 700 | %D%/packages/patches/bash-completion-directories.patch \ | 705 | %D%/packages/patches/bash-completion-directories.patch \ |
| 701 | %D%/packages/patches/bastet-change-source-of-unordered_set.patch \ | 706 | %D%/packages/patches/bastet-change-source-of-unordered_set.patch \ |
| 702 | %D%/packages/patches/bazaar-CVE-2017-14176.patch \ | 707 | %D%/packages/patches/bazaar-CVE-2017-14176.patch \ |
| @@ -1021,6 +1026,7 @@ dist_patch_DATA = \ | |||
| 1021 | %D%/packages/patches/libexif-CVE-2016-6328.patch \ | 1026 | %D%/packages/patches/libexif-CVE-2016-6328.patch \ |
| 1022 | %D%/packages/patches/libexif-CVE-2017-7544.patch \ | 1027 | %D%/packages/patches/libexif-CVE-2017-7544.patch \ |
| 1023 | %D%/packages/patches/libexif-CVE-2018-20030.patch \ | 1028 | %D%/packages/patches/libexif-CVE-2018-20030.patch \ |
| 1029 | %D%/packages/patches/libextractor-exiv2.patch \ | ||
| 1024 | %D%/packages/patches/libgit2-avoid-python.patch \ | 1030 | %D%/packages/patches/libgit2-avoid-python.patch \ |
| 1025 | %D%/packages/patches/libgit2-mtime-0.patch \ | 1031 | %D%/packages/patches/libgit2-mtime-0.patch \ |
| 1026 | %D%/packages/patches/libgnome-encoding.patch \ | 1032 | %D%/packages/patches/libgnome-encoding.patch \ |
| @@ -1099,7 +1105,7 @@ dist_patch_DATA = \ | |||
| 1099 | %D%/packages/patches/meson-for-build-rpath.patch \ | 1105 | %D%/packages/patches/meson-for-build-rpath.patch \ |
| 1100 | %D%/packages/patches/metabat-fix-compilation.patch \ | 1106 | %D%/packages/patches/metabat-fix-compilation.patch \ |
| 1101 | %D%/packages/patches/mhash-keygen-test-segfault.patch \ | 1107 | %D%/packages/patches/mhash-keygen-test-segfault.patch \ |
| 1102 | %D%/packages/patches/mingw-w64-5.0rc2-gcc-4.9.3.patch \ | 1108 | %D%/packages/patches/mingw-w64-6.0.0-gcc.patch \ |
| 1103 | %D%/packages/patches/mpc123-initialize-ao.patch \ | 1109 | %D%/packages/patches/mpc123-initialize-ao.patch \ |
| 1104 | %D%/packages/patches/module-init-tools-moduledir.patch \ | 1110 | %D%/packages/patches/module-init-tools-moduledir.patch \ |
| 1105 | %D%/packages/patches/monero-use-system-miniupnpc.patch \ | 1111 | %D%/packages/patches/monero-use-system-miniupnpc.patch \ |
diff --git a/gnu/packages/agda.scm b/gnu/packages/agda.scm index 0f9b4299c37..c085bfac2e4 100644 --- a/gnu/packages/agda.scm +++ b/gnu/packages/agda.scm | |||
| @@ -3,6 +3,8 @@ | |||
| 3 | ;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net> | 3 | ;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net> |
| 4 | ;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com> | 4 | ;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com> |
| 5 | ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> | 5 | ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> |
| 6 | ;;; Copyright © 2018 John Soo <jsoo1@asu.edu> | ||
| 7 | ;;; Copyright © 2019 Ludovic Courtès <ludo@gnu.org> | ||
| 6 | ;;; | 8 | ;;; |
| 7 | ;;; This file is part of GNU Guix. | 9 | ;;; This file is part of GNU Guix. |
| 8 | ;;; | 10 | ;;; |
| @@ -24,9 +26,11 @@ | |||
| 24 | #:use-module (gnu packages haskell-check) | 26 | #:use-module (gnu packages haskell-check) |
| 25 | #:use-module (gnu packages haskell-web) | 27 | #:use-module (gnu packages haskell-web) |
| 26 | #:use-module (guix build-system emacs) | 28 | #:use-module (guix build-system emacs) |
| 29 | #:use-module (guix build-system gnu) | ||
| 27 | #:use-module (guix build-system haskell) | 30 | #:use-module (guix build-system haskell) |
| 28 | #:use-module (guix build-system trivial) | 31 | #:use-module (guix build-system trivial) |
| 29 | #:use-module (guix download) | 32 | #:use-module (guix download) |
| 33 | #:use-module (guix git-download) | ||
| 30 | #:use-module ((guix licenses) #:prefix license:) | 34 | #:use-module ((guix licenses) #:prefix license:) |
| 31 | #:use-module (guix packages)) | 35 | #:use-module (guix packages)) |
| 32 | 36 | ||
| @@ -154,3 +158,45 @@ such as Coq, Epigram and NuPRL.") | |||
| 154 | (synopsis "Emacs mode for Agda") | 158 | (synopsis "Emacs mode for Agda") |
| 155 | (description "This Emacs mode enables interactive development with | 159 | (description "This Emacs mode enables interactive development with |
| 156 | Agda. It also aids the input of Unicode characters."))) | 160 | Agda. It also aids the input of Unicode characters."))) |
| 161 | |||
| 162 | (define-public agda-ial | ||
| 163 | (package | ||
| 164 | (name "agda-ial") | ||
| 165 | (version "1.5.0") | ||
| 166 | (home-page "https://github.com/cedille/ial") | ||
| 167 | (source (origin | ||
| 168 | (method git-fetch) | ||
| 169 | (uri (git-reference (url home-page) | ||
| 170 | (commit (string-append "v" version)))) | ||
| 171 | (file-name (git-file-name name version)) | ||
| 172 | (sha256 | ||
| 173 | (base32 | ||
| 174 | "0dlis6v6nzbscf713cmwlx8h9n2gxghci8y21qak3hp18gkxdp0g")))) | ||
| 175 | (build-system gnu-build-system) | ||
| 176 | (inputs | ||
| 177 | `(("agda" ,agda))) | ||
| 178 | (arguments | ||
| 179 | `(#:parallel-build? #f | ||
| 180 | #:phases | ||
| 181 | (modify-phases %standard-phases | ||
| 182 | (delete 'configure) | ||
| 183 | (add-before 'build 'patch-dependencies | ||
| 184 | (lambda _ (patch-shebang "find-deps.sh") #t)) | ||
| 185 | (delete 'check) | ||
| 186 | (replace 'install | ||
| 187 | (lambda* (#:key outputs #:allow-other-keys) | ||
| 188 | (let* ((out (assoc-ref outputs "out")) | ||
| 189 | (include (string-append out "/include/agda/ial"))) | ||
| 190 | (for-each (lambda (file) | ||
| 191 | (make-file-writable file) | ||
| 192 | (install-file file include)) | ||
| 193 | (find-files "." "\\.agdai?(-lib)?$")) | ||
| 194 | #t)))))) | ||
| 195 | (synopsis "The Iowa Agda Library") | ||
| 196 | (description | ||
| 197 | "The goal is to provide a concrete library focused on verification | ||
| 198 | examples, as opposed to mathematics. The library has a good number | ||
| 199 | of theorems for booleans, natural numbers, and lists. It also has | ||
| 200 | trees, tries, vectors, and rudimentary IO. A number of good ideas | ||
| 201 | come from Agda's standard library.") | ||
| 202 | (license license:expat))) | ||
diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 1160feb5534..3aa608ae298 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm | |||
| @@ -120,7 +120,7 @@ header.") | |||
| 120 | (define-public gnuastro | 120 | (define-public gnuastro |
| 121 | (package | 121 | (package |
| 122 | (name "gnuastro") | 122 | (name "gnuastro") |
| 123 | (version "0.9") | 123 | (version "0.10") |
| 124 | (source | 124 | (source |
| 125 | (origin | 125 | (origin |
| 126 | (method url-fetch) | 126 | (method url-fetch) |
| @@ -128,7 +128,7 @@ header.") | |||
| 128 | version ".tar.lz")) | 128 | version ".tar.lz")) |
| 129 | (sha256 | 129 | (sha256 |
| 130 | (base32 | 130 | (base32 |
| 131 | "1c1894ixz3l8p1nmzkysgl9lz8vpqbfw1dd404kh6lvrpml7jzig")))) | 131 | "0gmhmh0yddb2aql4hd5ffrr0d4hrmh4pa3yln0n186hslqinp81b")))) |
| 132 | (inputs | 132 | (inputs |
| 133 | `(("cfitsio" ,cfitsio) | 133 | `(("cfitsio" ,cfitsio) |
| 134 | ("gsl" ,gsl) | 134 | ("gsl" ,gsl) |
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index dec94dd6c5b..341281c9433 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm | |||
| @@ -3374,21 +3374,22 @@ on the ALSA software PCM plugin.") | |||
| 3374 | (define-public snd | 3374 | (define-public snd |
| 3375 | (package | 3375 | (package |
| 3376 | (name "snd") | 3376 | (name "snd") |
| 3377 | (version "19.5") | 3377 | (version "19.6") |
| 3378 | (source (origin | 3378 | (source (origin |
| 3379 | (method url-fetch) | 3379 | (method url-fetch) |
| 3380 | (uri (string-append "ftp://ccrma-ftp.stanford.edu/pub/Lisp/" | 3380 | (uri (string-append "ftp://ccrma-ftp.stanford.edu/pub/Lisp/" |
| 3381 | "snd-" version ".tar.gz")) | 3381 | "snd-" version ".tar.gz")) |
| 3382 | (sha256 | 3382 | (sha256 |
| 3383 | (base32 | 3383 | (base32 |
| 3384 | "0sk6iyykwi2mm3f1g4r0iqbsrwk3zmyagp6jjqkh8njbq42cjr1y")))) | 3384 | "0s2qv8sznvw6559bi39qj9p072azh9qcb2b86w6w8clz2azjaa76")))) |
| 3385 | (build-system glib-or-gtk-build-system) | 3385 | (build-system glib-or-gtk-build-system) |
| 3386 | (arguments | 3386 | (arguments |
| 3387 | `(#:tests? #f ; no tests | 3387 | `(#:tests? #f ; no tests |
| 3388 | #:out-of-source? #f ; for the 'install-doc' phase | 3388 | #:out-of-source? #f ; for the 'install-doc' phase |
| 3389 | #:configure-flags | 3389 | #:configure-flags |
| 3390 | (let* ((out (assoc-ref %outputs "out")) | 3390 | (let* ((out (assoc-ref %outputs "out")) |
| 3391 | (docdir (string-append out "/share/doc/snd"))) | 3391 | (docdir (string-append out "/share/doc/" |
| 3392 | ,name "-" ,version))) | ||
| 3392 | (list "--with-alsa" "--with-jack" "--with-gmp" | 3393 | (list "--with-alsa" "--with-jack" "--with-gmp" |
| 3393 | (string-append "--with-doc-dir=" docdir))) | 3394 | (string-append "--with-doc-dir=" docdir))) |
| 3394 | #:phases | 3395 | #:phases |
| @@ -3401,7 +3402,7 @@ on the ALSA software PCM plugin.") | |||
| 3401 | (for-each | 3402 | (for-each |
| 3402 | (lambda (f) | 3403 | (lambda (f) |
| 3403 | (install-file f doc)) | 3404 | (install-file f doc)) |
| 3404 | (find-files "." "\\.html$|COPYING")) | 3405 | (find-files "." "\\.html$")) |
| 3405 | (copy-recursively "pix" (string-append doc "/pix")) | 3406 | (copy-recursively "pix" (string-append doc "/pix")) |
| 3406 | #t)))))) | 3407 | #t)))))) |
| 3407 | (native-inputs | 3408 | (native-inputs |
diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index b0893d94102..adb377f25f8 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm | |||
| @@ -131,7 +131,7 @@ DHT, µTP, PEX and Magnet Links.") | |||
| 131 | (define-public libtorrent | 131 | (define-public libtorrent |
| 132 | (package | 132 | (package |
| 133 | (name "libtorrent") | 133 | (name "libtorrent") |
| 134 | (version "0.13.6") | 134 | (version "0.13.8") |
| 135 | (source (origin | 135 | (source (origin |
| 136 | (method url-fetch) | 136 | (method url-fetch) |
| 137 | (uri (string-append | 137 | (uri (string-append |
| @@ -139,7 +139,7 @@ DHT, µTP, PEX and Magnet Links.") | |||
| 139 | version ".tar.gz")) | 139 | version ".tar.gz")) |
| 140 | (sha256 | 140 | (sha256 |
| 141 | (base32 | 141 | (base32 |
| 142 | "012s1nwcvz5m5r4d2z9klgy2n34kpgn9kgwgzxm97zgdjs6a0f18")))) | 142 | "10z9i1rc41cmmi7nx8k7k1agsx6afv09g9cl7g9zr35fyhl5l4gd")))) |
| 143 | (build-system gnu-build-system) | 143 | (build-system gnu-build-system) |
| 144 | (inputs `(("openssl" ,openssl) | 144 | (inputs `(("openssl" ,openssl) |
| 145 | ("zlib" ,zlib))) | 145 | ("zlib" ,zlib))) |
| @@ -156,7 +156,7 @@ speed and efficiency.") | |||
| 156 | (define-public rtorrent | 156 | (define-public rtorrent |
| 157 | (package | 157 | (package |
| 158 | (name "rtorrent") | 158 | (name "rtorrent") |
| 159 | (version "0.9.6") | 159 | (version "0.9.8") |
| 160 | (source (origin | 160 | (source (origin |
| 161 | (method url-fetch) | 161 | (method url-fetch) |
| 162 | (uri (string-append | 162 | (uri (string-append |
| @@ -164,7 +164,7 @@ speed and efficiency.") | |||
| 164 | version ".tar.gz")) | 164 | version ".tar.gz")) |
| 165 | (sha256 | 165 | (sha256 |
| 166 | (base32 | 166 | (base32 |
| 167 | "03jvzw9pi2mhcm913h8qg0qw9gwjqc6lhwynb1yz1y163x7w4s8y")))) | 167 | "1bs2fnf4q7mlhkhzp3i1v052v9xn8qa7g845pk9ia8hlpw207pwy")))) |
| 168 | (build-system gnu-build-system) | 168 | (build-system gnu-build-system) |
| 169 | (inputs `(("libtorrent" ,libtorrent) | 169 | (inputs `(("libtorrent" ,libtorrent) |
| 170 | ("ncurses" ,ncurses) | 170 | ("ncurses" ,ncurses) |
diff --git a/gnu/packages/cedille.scm b/gnu/packages/cedille.scm new file mode 100644 index 00000000000..36fa3ae17eb --- /dev/null +++ b/gnu/packages/cedille.scm | |||
| @@ -0,0 +1,124 @@ | |||
| 1 | ;;; GNU Guix --- Functional package management for GNU | ||
| 2 | ;;; Copyright © 2019 John Soo <jsoo1@asu.edu> | ||
| 3 | ;;; | ||
| 4 | ;;; This file is part of GNU Guix. | ||
| 5 | ;;; | ||
| 6 | ;;; GNU Guix is free software; you can redistribute it and/or modify it | ||
| 7 | ;;; under the terms of the GNU General Public License as published by | ||
| 8 | ;;; the Free Software Foundation; either version 3 of the License, or (at | ||
| 9 | ;;; your option) any later version. | ||
| 10 | ;;; | ||
| 11 | ;;; GNU Guix is distributed in the hope that it will be useful, but | ||
| 12 | ;;; WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 13 | ;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 14 | ;;; GNU General Public License for more details. | ||
| 15 | ;;; | ||
| 16 | ;;; You should have received a copy of the GNU General Public License | ||
| 17 | ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. | ||
| 18 | |||
| 19 | (define-module (gnu packages cedille) | ||
| 20 | #:use-module (gnu packages) | ||
| 21 | #:use-module (gnu packages agda) | ||
| 22 | #:use-module (gnu packages emacs-xyz) | ||
| 23 | #:use-module (gnu packages haskell) | ||
| 24 | #:use-module (guix build-system emacs) | ||
| 25 | #:use-module (guix git-download) | ||
| 26 | #:use-module ((guix licenses) #:prefix license:) | ||
| 27 | #:use-module (guix packages)) | ||
| 28 | |||
| 29 | (define-public cedille | ||
| 30 | (package | ||
| 31 | (name "cedille") | ||
| 32 | (version "1.1.1") | ||
| 33 | (source | ||
| 34 | (origin | ||
| 35 | (method git-fetch) | ||
| 36 | (uri (git-reference | ||
| 37 | (url "https://github.com/cedille/cedille") | ||
| 38 | (commit (string-append "v" version)))) | ||
| 39 | (file-name (git-file-name name version)) | ||
| 40 | (sha256 | ||
| 41 | (base32 | ||
| 42 | "07kv9wncyipfjf5w4ax8h2p35g70zb1qw6zc4afd7c225xia55wp")))) | ||
| 43 | (inputs | ||
| 44 | `(("agda" ,agda) | ||
| 45 | ("agda-ial" ,agda-ial) | ||
| 46 | ("ghc" ,ghc-8.4) | ||
| 47 | ("ghc-alex" ,ghc-alex) | ||
| 48 | ("ghc-happy" ,ghc-happy))) | ||
| 49 | (build-system emacs-build-system) | ||
| 50 | (arguments | ||
| 51 | `(#:phases | ||
| 52 | (modify-phases %standard-phases | ||
| 53 | (add-after 'unpack 'patch-cedille-path-el | ||
| 54 | (lambda* (#:key outputs #:allow-other-keys) | ||
| 55 | (let ((out (assoc-ref outputs "out"))) | ||
| 56 | (substitute* "cedille-mode.el" | ||
| 57 | (("/usr/share/emacs/site-lisp/cedille-mode") | ||
| 58 | (string-append | ||
| 59 | out "/share/emacs/site-lisp/guix.d/cedille-" | ||
| 60 | ,version))) | ||
| 61 | #t))) | ||
| 62 | (add-after 'unpack 'copy-cedille-mode | ||
| 63 | (lambda* (#:key outputs #:allow-other-keys) | ||
| 64 | (let* ((out (assoc-ref outputs "out")) | ||
| 65 | (lisp | ||
| 66 | (string-append | ||
| 67 | out "/share/emacs/site-lisp/guix.d/cedille-" | ||
| 68 | ,version "/"))) | ||
| 69 | (mkdir-p (string-append lisp "cedille-mode")) | ||
| 70 | (copy-recursively | ||
| 71 | "cedille-mode" | ||
| 72 | (string-append lisp "cedille-mode")) | ||
| 73 | (mkdir-p (string-append lisp "se-mode")) | ||
| 74 | (copy-recursively | ||
| 75 | "se-mode" | ||
| 76 | (string-append lisp "se-mode")) | ||
| 77 | #t))) | ||
| 78 | ;; FIXME: Byte compilation fails | ||
| 79 | (delete 'build) | ||
| 80 | (replace 'check | ||
| 81 | (lambda _ | ||
| 82 | (with-directory-excursion "cedille-tests" | ||
| 83 | (invoke "sh" "run-tests.sh")))) | ||
| 84 | (add-after 'unpack 'patch-libraries | ||
| 85 | (lambda _ (patch-shebang "create-libraries.sh") #t)) | ||
| 86 | (add-after 'unpack 'copy-ial | ||
| 87 | (lambda* (#:key inputs #:allow-other-keys) | ||
| 88 | (copy-recursively | ||
| 89 | (string-append (assoc-ref inputs "agda-ial") | ||
| 90 | "/include/agda/ial") | ||
| 91 | "ial") | ||
| 92 | ;; Ambiguous module if main is included from ial | ||
| 93 | (delete-file "ial/main.agda") | ||
| 94 | #t)) | ||
| 95 | (add-after 'check 'build-cedille | ||
| 96 | ;; Agda has a hard time with parallel compilation | ||
| 97 | (lambda _ | ||
| 98 | (invoke "touch" "src/Templates.hs") | ||
| 99 | (make-file-writable "src/Templates.hs") | ||
| 100 | (invoke "touch" "src/templates.agda") | ||
| 101 | (make-file-writable "src/templates.agda") | ||
| 102 | (invoke "make" "--jobs=1"))) | ||
| 103 | (add-after 'install 'install-cedille | ||
| 104 | (lambda* (#:key outputs #:allow-other-keys) | ||
| 105 | (let ((out (assoc-ref outputs "out"))) | ||
| 106 | (copy-recursively | ||
| 107 | "lib" (string-append out "/lib/cedille")) | ||
| 108 | (install-file "cedille" (string-append out "/bin")) | ||
| 109 | (install-file "core/cedille-core" | ||
| 110 | (string-append out "/bin")) | ||
| 111 | #t)))))) | ||
| 112 | (home-page "https://cedille.github.io/") | ||
| 113 | (synopsis | ||
| 114 | "Language based on Calculus of Dependent Lambda Eliminations") | ||
| 115 | (description | ||
| 116 | "Cedille is an interactive theorem-prover and dependently typed | ||
| 117 | programming language, based on extrinsic (aka Curry-style) type theory. This | ||
| 118 | makes it rather different from type theories like Coq and Agda, which are | ||
| 119 | intrinsic (aka Church-style). In Cedille, terms are nothing more than | ||
| 120 | annotated versions of terms of pure untyped lambda calculus. In contrast, in | ||
| 121 | Coq or Agda, the typing annotations are intrinsic parts of terms. The typing | ||
| 122 | annotations can only be erased as an optimization under certain conditions, | ||
| 123 | not by virtue of the definition of the type theory.") | ||
| 124 | (license license:expat))) | ||
diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm index 3b45c430cae..aad1fd92037 100644 --- a/gnu/packages/chromium.scm +++ b/gnu/packages/chromium.scm | |||
| @@ -238,7 +238,7 @@ from forcing GEXP-PROMISE." | |||
| 238 | #:system system | 238 | #:system system |
| 239 | #:guile-for-build guile))) | 239 | #:guile-for-build guile))) |
| 240 | 240 | ||
| 241 | (define %chromium-version "76.0.3809.100") | 241 | (define %chromium-version "76.0.3809.132") |
| 242 | (define %ungoogled-revision "8eba5c0df1a318012e3deab39a9add252a0d56a3") | 242 | (define %ungoogled-revision "8eba5c0df1a318012e3deab39a9add252a0d56a3") |
| 243 | (define %debian-revision "debian/76.0.3809.87-2") | 243 | (define %debian-revision "debian/76.0.3809.87-2") |
| 244 | (define package-revision "0") | 244 | (define package-revision "0") |
| @@ -254,7 +254,7 @@ from forcing GEXP-PROMISE." | |||
| 254 | %chromium-version ".tar.xz")) | 254 | %chromium-version ".tar.xz")) |
| 255 | (sha256 | 255 | (sha256 |
| 256 | (base32 | 256 | (base32 |
| 257 | "0vfjfxsqf8jrmd7y08ln1lpbilwi150875zn2bawwdq87vd3mncc")))) | 257 | "0hajwjf7swlgh1flpf8ljfrb2zhmcpzvrigvvxqd36g3nm04cknm")))) |
| 258 | 258 | ||
| 259 | (define %ungoogled-origin | 259 | (define %ungoogled-origin |
| 260 | (origin | 260 | (origin |
diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index d706e8d04bb..608cd0af23a 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm | |||
| @@ -47,8 +47,8 @@ | |||
| 47 | #:use-module (guix build-system gnu)) | 47 | #:use-module (guix build-system gnu)) |
| 48 | 48 | ||
| 49 | (define-public cuirass | 49 | (define-public cuirass |
| 50 | (let ((commit "858b6b8c8f2ae7b1ddaf4ae363147121be1f1fe8") | 50 | (let ((commit "1cd2f9334dde13542732c22753c4ebde61bc95e0") |
| 51 | (revision "22")) | 51 | (revision "23")) |
| 52 | (package | 52 | (package |
| 53 | (name "cuirass") | 53 | (name "cuirass") |
| 54 | (version (string-append "0.0.1-" revision "." (string-take commit 7))) | 54 | (version (string-append "0.0.1-" revision "." (string-take commit 7))) |
| @@ -60,7 +60,7 @@ | |||
| 60 | (file-name (string-append name "-" version)) | 60 | (file-name (string-append name "-" version)) |
| 61 | (sha256 | 61 | (sha256 |
| 62 | (base32 | 62 | (base32 |
| 63 | "049hg0yaakmfp27950cn0yn43r0v7bqva75xi082n8cxzi6vadgc")))) | 63 | "0r3x8gv0v89brjqi8r31p6c0mblbaf2kdk2fz99jiab4pir16w87")))) |
| 64 | (build-system gnu-build-system) | 64 | (build-system gnu-build-system) |
| 65 | (arguments | 65 | (arguments |
| 66 | '(#:modules ((guix build utils) | 66 | '(#:modules ((guix build utils) |
diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index ae8e9c5a476..458b141f912 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm | |||
| @@ -15097,3 +15097,42 @@ datasets, developed and maintained by the Macosko lab. It relies on | |||
| 15097 | integrative non-negative matrix factorization to identify shared and | 15097 | integrative non-negative matrix factorization to identify shared and |
| 15098 | dataset-specific factors.") | 15098 | dataset-specific factors.") |
| 15099 | (license license:gpl3))) | 15099 | (license license:gpl3))) |
| 15100 | |||
| 15101 | (define-public r-harmony | ||
| 15102 | ;; There are no tagged commits | ||
| 15103 | (let ((commit "4d1653870d4dd70fff1807c182882db1fbf9af5a") | ||
| 15104 | (revision "1")) | ||
| 15105 | (package | ||
| 15106 | (name "r-harmony") | ||
| 15107 | (version (git-version "1.0" revision commit)) | ||
| 15108 | (source | ||
| 15109 | (origin | ||
| 15110 | (method git-fetch) | ||
| 15111 | (uri (git-reference | ||
| 15112 | (url "https://github.com/immunogenomics/harmony") | ||
| 15113 | (commit commit))) | ||
| 15114 | (file-name (git-file-name name version)) | ||
| 15115 | (sha256 | ||
| 15116 | (base32 | ||
| 15117 | "1gasdldr4aalr9h2q9kmm3y4i7azkgnhdn4bmvsszs7lg9xacw85")))) | ||
| 15118 | (build-system r-build-system) | ||
| 15119 | (propagated-inputs | ||
| 15120 | `(("r-cowplot" ,r-cowplot) | ||
| 15121 | ("r-dplyr" ,r-dplyr) | ||
| 15122 | ("r-ggplot2" ,r-ggplot2) | ||
| 15123 | ("r-irlba" ,r-irlba) | ||
| 15124 | ("r-matrix" ,r-matrix) | ||
| 15125 | ("r-rcpp" ,r-rcpp) | ||
| 15126 | ("r-rcpparmadillo" ,r-rcpparmadillo) | ||
| 15127 | ("r-rcppprogress" ,r-rcppprogress) | ||
| 15128 | ("r-rlang" ,r-rlang) | ||
| 15129 | ("r-tibble" ,r-tibble) | ||
| 15130 | ("r-tidyr" ,r-tidyr))) | ||
| 15131 | (home-page "https://github.com/immunogenomics/harmony") | ||
| 15132 | (synopsis "Integration of single cell sequencing data") | ||
| 15133 | (description | ||
| 15134 | "This package provides an implementation of the Harmony algorithm for | ||
| 15135 | single cell integration, described in Korsunsky et al | ||
| 15136 | @url{doi.org/10.1101/461954}. The package includes a standalone Harmony | ||
| 15137 | function and interfaces to external frameworks.") | ||
| 15138 | (license license:gpl3)))) | ||
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 6500adb215d..c3d2419f886 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm | |||
| @@ -1,6 +1,7 @@ | |||
| 1 | ;;; GNU Guix --- Functional package management for GNU | 1 | ;;; GNU Guix --- Functional package management for GNU |
| 2 | ;;; Copyright © 2019 Ivan Petkov <ivanppetkov@gmail.com> | 2 | ;;; Copyright © 2019 Ivan Petkov <ivanppetkov@gmail.com> |
| 3 | ;;; Copyright © 2019 Efraim Flashner <efraim@flashner.co.il> | 3 | ;;; Copyright © 2019 Efraim Flashner <efraim@flashner.co.il> |
| 4 | ;;; Copyright © 2019 Nicolas Goaziou <mail@nicolasgoaziou.fr> | ||
| 4 | ;;; | 5 | ;;; |
| 5 | ;;; This file is part of GNU Guix. | 6 | ;;; This file is part of GNU Guix. |
| 6 | ;;; | 7 | ;;; |
| @@ -21,12 +22,58 @@ | |||
| 21 | #:use-module (guix build-system cargo) | 22 | #:use-module (guix build-system cargo) |
| 22 | #:use-module (guix download) | 23 | #:use-module (guix download) |
| 23 | #:use-module ((guix licenses) #:prefix license:) | 24 | #:use-module ((guix licenses) #:prefix license:) |
| 24 | #:use-module (guix packages)) | 25 | #:use-module (guix packages) |
| 26 | #:use-module (gnu packages pkg-config)) | ||
| 25 | 27 | ||
| 26 | ;;; | 28 | ;;; |
| 27 | ;;; Please: Try to add new module packages in alphabetic order. | 29 | ;;; Please: Try to add new module packages in alphabetic order. |
| 28 | ;;; | 30 | ;;; |
| 29 | 31 | ||
| 32 | (define-public rust-antidote | ||
| 33 | (package | ||
| 34 | (name "rust-antidote") | ||
| 35 | (version "1.0.0") | ||
| 36 | (source | ||
| 37 | (origin | ||
| 38 | (method url-fetch) | ||
| 39 | (uri (crate-uri "antidote" version)) | ||
| 40 | (file-name (string-append name "-" version ".tar.gz")) | ||
| 41 | (sha256 | ||
| 42 | (base32 | ||
| 43 | "19g2sw2qa2ibnh4x7j1snk46593jgx6y7rnvva496ynq61af5z9l")))) | ||
| 44 | (build-system cargo-build-system) | ||
| 45 | (home-page "https://github.com/sfackler/rust-antidote") | ||
| 46 | (synopsis "Poison-free Mutex and RwLock types") | ||
| 47 | (description | ||
| 48 | "These types expose identical APIs to the standard library @code{Mutex} and | ||
| 49 | @code{RwLock} except that they do not return @code{PoisonError}s.") | ||
| 50 | (license (list license:asl2.0 | ||
| 51 | license:expat)))) | ||
| 52 | |||
| 53 | (define-public rust-atty | ||
| 54 | (package | ||
| 55 | (name "rust-atty") | ||
| 56 | (version "0.2.13") | ||
| 57 | (source | ||
| 58 | (origin | ||
| 59 | (method url-fetch) | ||
| 60 | (uri (crate-uri "atty" version)) | ||
| 61 | (file-name (string-append name "-" version ".tar.gz")) | ||
| 62 | (sha256 | ||
| 63 | (base32 | ||
| 64 | "140sswp1bwqwc4zk80bxkbnfb3g936hgrb77g9g0k1zcld3wc0qq")))) | ||
| 65 | (build-system cargo-build-system) | ||
| 66 | (arguments | ||
| 67 | `(#:cargo-inputs | ||
| 68 | (("rust-libc" ,rust-libc) | ||
| 69 | ("rust-winapi" ,rust-winapi)) | ||
| 70 | #:tests? #f)) ; tests fail in our sandbox | ||
| 71 | (home-page "https://github.com/softprops/atty") | ||
| 72 | (synopsis "A simple interface for querying atty") | ||
| 73 | (description | ||
| 74 | "This package provides a simple interface for querying atty.") | ||
| 75 | (license license:expat))) | ||
| 76 | |||
| 30 | (define-public rust-autocfg | 77 | (define-public rust-autocfg |
| 31 | (package | 78 | (package |
| 32 | (name "rust-autocfg") | 79 | (name "rust-autocfg") |
| @@ -91,6 +138,50 @@ behave like a set of bitflags.") | |||
| 91 | (license (list license:asl2.0 | 138 | (license (list license:asl2.0 |
| 92 | license:expat)))) | 139 | license:expat)))) |
| 93 | 140 | ||
| 141 | (define-public rust-blas-sys | ||
| 142 | (package | ||
| 143 | (name "rust-blas-sys") | ||
| 144 | (version "0.7.1") | ||
| 145 | (source | ||
| 146 | (origin | ||
| 147 | (method url-fetch) | ||
| 148 | (uri (crate-uri "blas-sys" version)) | ||
| 149 | (file-name (string-append name "-" version ".tar.gz")) | ||
| 150 | (sha256 | ||
| 151 | (base32 | ||
| 152 | "0h14zjycwc76v15h8qll9z1xiryvmpvsb5gam97pqpdjrrwv5c8k")))) | ||
| 153 | (build-system cargo-build-system) | ||
| 154 | (arguments | ||
| 155 | `(#:cargo-inputs (("rust-libc" ,rust-libc)))) | ||
| 156 | (home-page "https://github.com/blas-lapack-rs/blas-sys") | ||
| 157 | (synopsis "Bindings to BLAS (Fortran)") | ||
| 158 | (description | ||
| 159 | "Ths package provides bindings to BLAS (Fortran).") | ||
| 160 | (license (list license:asl2.0 | ||
| 161 | license:expat)))) | ||
| 162 | |||
| 163 | (define-public rust-cblas-sys | ||
| 164 | (package | ||
| 165 | (name "rust-cblas-sys") | ||
| 166 | (version "0.1.4") | ||
| 167 | (source | ||
| 168 | (origin | ||
| 169 | (method url-fetch) | ||
| 170 | (uri (crate-uri "cblas-sys" version)) | ||
| 171 | (file-name (string-append name "-" version ".tar.gz")) | ||
| 172 | (sha256 | ||
| 173 | (base32 | ||
| 174 | "0rgsn3klhhh09d8qf3b87zl4rwk93l2g0qzh9hhb0lff5kcfrzmn")))) | ||
| 175 | (build-system cargo-build-system) | ||
| 176 | (arguments | ||
| 177 | `(#:cargo-inputs (("rust-libc" ,rust-libc)))) | ||
| 178 | (home-page "https://github.com/blas-lapack-rs/cblas-sys") | ||
| 179 | (synopsis "Bindings to CBLAS (C)") | ||
| 180 | (description | ||
| 181 | "The package provides bindings to CBLAS (C).") | ||
| 182 | (license (list license:asl2.0 | ||
| 183 | license:expat)))) | ||
| 184 | |||
| 94 | (define-public rust-cfg-if | 185 | (define-public rust-cfg-if |
| 95 | (package | 186 | (package |
| 96 | (name "rust-cfg-if") | 187 | (name "rust-cfg-if") |
| @@ -112,6 +203,127 @@ depending on a large number of #[cfg] parameters. Structured like an | |||
| 112 | (license (list license:asl2.0 | 203 | (license (list license:asl2.0 |
| 113 | license:expat)))) | 204 | license:expat)))) |
| 114 | 205 | ||
| 206 | (define-public rust-clicolors-control | ||
| 207 | (package | ||
| 208 | (name "rust-clicolors-control") | ||
| 209 | (version "1.0.0") | ||
| 210 | (source | ||
| 211 | (origin | ||
| 212 | (method url-fetch) | ||
| 213 | (uri (crate-uri "clicolors-control" version)) | ||
| 214 | (file-name (string-append name "-" version ".tar.gz")) | ||
| 215 | (sha256 | ||
| 216 | (base32 | ||
| 217 | "1y80cgarxhrd1bz5yjm81r444v6flvy36aaxrrsac0yhfd6gvavk")))) | ||
| 218 | (build-system cargo-build-system) | ||
| 219 | (arguments | ||
| 220 | `(#:cargo-inputs | ||
| 221 | (("rust-atty" ,rust-atty) | ||
| 222 | ("rust-lazy-static" ,rust-lazy-static) | ||
| 223 | ("rust-libc" ,rust-libc) | ||
| 224 | ("rust-winapi" ,rust-winapi)))) | ||
| 225 | (home-page "https://github.com/mitsuhiko/clicolors-control") | ||
| 226 | (synopsis "Common utility library to control CLI colorization") | ||
| 227 | (description | ||
| 228 | "This package provides a common utility library to control CLI | ||
| 229 | colorization.") | ||
| 230 | (license license:expat))) | ||
| 231 | |||
| 232 | (define-public rust-cloudabi | ||
| 233 | (package | ||
| 234 | (name "rust-cloudabi") | ||
| 235 | (version "0.0.3") | ||
| 236 | (source | ||
| 237 | (origin | ||
| 238 | (method url-fetch) | ||
| 239 | (uri (crate-uri "cloudabi" version)) | ||
| 240 | (file-name (string-append name "-" version ".tar.gz")) | ||
| 241 | (sha256 | ||
| 242 | (base32 | ||
| 243 | "0kxcg83jlihy0phnd2g8c2c303px3l2p3pkjz357ll6llnd5pz6x")))) | ||
| 244 | (build-system cargo-build-system) | ||
| 245 | (arguments | ||
| 246 | `(#:cargo-inputs | ||
| 247 | (("rust-bitflags" ,rust-bitflags)))) | ||
| 248 | (home-page "https://nuxi.nl/cloudabi/") | ||
| 249 | (synopsis "Low level interface to CloudABI") | ||
| 250 | (description | ||
| 251 | "Low level interface to CloudABI. Contains all syscalls and related types.") | ||
| 252 | (license license:bsd-2))) | ||
| 253 | |||
| 254 | (define-public rust-core-foundation-sys | ||
| 255 | (package | ||
| 256 | (name "rust-core-foundation-sys") | ||
| 257 | (version "0.6.2") | ||
| 258 | (source | ||
| 259 | (origin | ||
| 260 | (method url-fetch) | ||
| 261 | (uri (crate-uri "core-foundation-sys" version)) | ||
| 262 | (file-name (string-append name "-" version ".tar.gz")) | ||
| 263 | (sha256 | ||
| 264 | (base32 | ||
| 265 | "0fzsw1j9g1x598yhwklg59l15hwzc0pyvs01w9fg2kin4598mjp7")))) | ||
| 266 | (build-system cargo-build-system) | ||
| 267 | (home-page "https://github.com/servo/core-foundation-rs") | ||
| 268 | (synopsis "Bindings to Core Foundation for OS X") | ||
| 269 | (description | ||
| 270 | "Bindings to Core Foundation for OS X.") | ||
| 271 | (license (list license:asl2.0 | ||
| 272 | license:expat)))) | ||
| 273 | |||
| 274 | (define-public rust-data-encoding | ||
| 275 | (package | ||
| 276 | (name "rust-data-encoding") | ||
| 277 | (version "2.1.2") | ||
| 278 | (source | ||
| 279 | (origin | ||
| 280 | (method url-fetch) | ||
| 281 | (uri (crate-uri "data-encoding" version)) | ||
| 282 | (file-name (string-append name "-" version ".tar.gz")) | ||
| 283 | (sha256 | ||
| 284 | (base32 | ||
| 285 | "15xd6afhsjl08285piwczrafmckpp8i29padj8v12xhahshprx7l")))) | ||
| 286 | (build-system cargo-build-system) | ||
| 287 | (home-page "https://github.com/ia0/data-encoding") | ||
| 288 | (synopsis "Efficient and customizable data-encoding functions") | ||
| 289 | (description | ||
| 290 | "This library provides encodings for many different common cases, including | ||
| 291 | hexadecimal, bas32, and base64.") | ||
| 292 | (license license:expat))) | ||
| 293 | |||
| 294 | (define-public rust-defmac | ||
| 295 | (package | ||
| 296 | (name "rust-defmac") | ||
| 297 | (version "0.2.0") | ||
| 298 | (source | ||
| 299 | (origin | ||
| 300 | (method url-fetch) | ||
| 301 | (uri (crate-uri "defmac" version)) | ||
| 302 | (file-name (string-append name "-" version ".tar.gz")) | ||
| 303 | (sha256 | ||
| 304 | (base32 | ||
| 305 | "01ff3jdmcc5waffkwllndnx5hsn414r7x1rq4ib73n7awsyzxkxv")))) | ||
| 306 | (build-system cargo-build-system) | ||
| 307 | (home-page "https://github.com/bluss/defmac") | ||
| 308 | (synopsis "Macro to define lambda-like macros inline") | ||
| 309 | (description "A macro to define lambda-like macros inline.") | ||
| 310 | (license (list license:asl2.0 | ||
| 311 | license:expat)))) | ||
| 312 | |||
| 313 | (define-public rust-defmac-0.1 | ||
| 314 | (package | ||
| 315 | (inherit rust-defmac) | ||
| 316 | (name "rust-defmac") | ||
| 317 | (version "0.1.3") | ||
| 318 | (source | ||
| 319 | (origin | ||
| 320 | (method url-fetch) | ||
| 321 | (uri (crate-uri "defmac" version)) | ||
| 322 | (file-name (string-append name "-" version ".tar.gz")) | ||
| 323 | (sha256 | ||
| 324 | (base32 | ||
| 325 | "17giv0n0n1r64z0dahfvkjy3ys517jxyhs8sd9lmgvcljpjyryxa")))))) | ||
| 326 | |||
| 115 | (define-public rust-discard | 327 | (define-public rust-discard |
| 116 | (package | 328 | (package |
| 117 | (name "rust-discard") | 329 | (name "rust-discard") |
| @@ -193,6 +405,50 @@ provides implementations for @code{HashMap} and @code{HashSet}.") | |||
| 193 | (license (list license:asl2.0 | 405 | (license (list license:asl2.0 |
| 194 | license:expat)))) | 406 | license:expat)))) |
| 195 | 407 | ||
| 408 | (define-public rust-findshlibs | ||
| 409 | (package | ||
| 410 | (name "rust-findshlibs") | ||
| 411 | (version "0.5.0") | ||
| 412 | (source | ||
| 413 | (origin | ||
| 414 | (method url-fetch) | ||
| 415 | (uri (crate-uri "findshlibs" version)) | ||
| 416 | (file-name (string-append name "-" version ".tar.gz")) | ||
| 417 | (sha256 | ||
| 418 | (base32 | ||
| 419 | "1n2vagn0q5yim32hxkwi1cjgp3yn1dm45p7z8nw6lapywihhs9mi")))) | ||
| 420 | (build-system cargo-build-system) | ||
| 421 | (arguments | ||
| 422 | `(#:cargo-inputs | ||
| 423 | (("rust-lazy-static" ,rust-lazy-static) | ||
| 424 | ("rust-libc" ,rust-libc)))) | ||
| 425 | (home-page "https://github.com/gimli-rs/findshlibs") | ||
| 426 | (synopsis "Find the set of shared libraries loaded in the current process") | ||
| 427 | (description | ||
| 428 | "Find the set of shared libraries loaded in the current process with a | ||
| 429 | cross platform API.") | ||
| 430 | (license (list license:asl2.0 | ||
| 431 | license:expat)))) | ||
| 432 | |||
| 433 | (define-public rust-fixedbitset | ||
| 434 | (package | ||
| 435 | (name "rust-fixedbitset") | ||
| 436 | (version "0.1.9") | ||
| 437 | (source | ||
| 438 | (origin | ||
| 439 | (method url-fetch) | ||
| 440 | (uri (crate-uri "fixedbitset" version)) | ||
| 441 | (file-name (string-append name "-" version ".tar.gz")) | ||
| 442 | (sha256 | ||
| 443 | (base32 | ||
| 444 | "0czam11mi80dbyhf4rd4lz0ihcf7vkfchrdcrn45wbs0h40dxm46")))) | ||
| 445 | (build-system cargo-build-system) | ||
| 446 | (home-page "https://github.com/bluss/fixedbitset") | ||
| 447 | (synopsis "FixedBitSet is a simple bitset collection") | ||
| 448 | (description "FixedBitSet is a simple bitset collection.") | ||
| 449 | (license (list license:asl2.0 | ||
| 450 | license:expat)))) | ||
| 451 | |||
| 196 | (define-public rust-fnv | 452 | (define-public rust-fnv |
| 197 | (package | 453 | (package |
| 198 | (name "rust-fnv") | 454 | (name "rust-fnv") |
| @@ -213,6 +469,26 @@ implementation that is more efficient for smaller hash keys.") | |||
| 213 | (license (list license:asl2.0 | 469 | (license (list license:asl2.0 |
| 214 | license:expat)))) | 470 | license:expat)))) |
| 215 | 471 | ||
| 472 | (define-public rust-foreign-types-shared | ||
| 473 | (package | ||
| 474 | (name "rust-foreign-types-shared") | ||
| 475 | (version "0.2.0") | ||
| 476 | (source | ||
| 477 | (origin | ||
| 478 | (method url-fetch) | ||
| 479 | (uri (crate-uri "foreign-types-shared" version)) | ||
| 480 | (file-name (string-append name "-" version ".tar.gz")) | ||
| 481 | (sha256 | ||
| 482 | (base32 | ||
| 483 | "0kanxlif1vp0ffh2r9l610jqbkmb3183yqykxq1z5w1vay2rn7y6")))) | ||
| 484 | (build-system cargo-build-system) | ||
| 485 | (home-page "https://github.com/sfackler/foreign-types") | ||
| 486 | (synopsis "An internal crate used by foreign-types") | ||
| 487 | (description | ||
| 488 | "An internal crate used by foreign-types.") | ||
| 489 | (license (list license:asl2.0 | ||
| 490 | license:expat)))) | ||
| 491 | |||
| 216 | (define-public rust-fs-extra | 492 | (define-public rust-fs-extra |
| 217 | (package | 493 | (package |
| 218 | (name "rust-fs-extra") | 494 | (name "rust-fs-extra") |
| @@ -233,6 +509,70 @@ implementation that is more efficient for smaller hash keys.") | |||
| 233 | process and much more.") | 509 | process and much more.") |
| 234 | (license license:expat))) | 510 | (license license:expat))) |
| 235 | 511 | ||
| 512 | (define-public rust-fuchsia-cprng | ||
| 513 | (package | ||
| 514 | (name "rust-fuchsia-cprng") | ||
| 515 | (version "0.1.1") | ||
| 516 | (source | ||
| 517 | (origin | ||
| 518 | (method url-fetch) | ||
| 519 | (uri (crate-uri "fuchsia-cprng" version)) | ||
| 520 | (file-name (string-append name "-" version ".tar.gz")) | ||
| 521 | (sha256 | ||
| 522 | (base32 | ||
| 523 | "1fnkqrbz7ixxzsb04bsz9p0zzazanma8znfdqjvh39n14vapfvx0")))) | ||
| 524 | (build-system cargo-build-system) | ||
| 525 | (arguments | ||
| 526 | `(#:tests? #f)) ; tests require zircon | ||
| 527 | (home-page "https://fuchsia.googlesource.com/fuchsia/+/master/garnet/public/rust/fuchsia-cprng") | ||
| 528 | (synopsis "Fuchsia cryptographically secure pseudorandom number generator") | ||
| 529 | (description "Rust crate for the Fuchsia cryptographically secure | ||
| 530 | pseudorandom number generator") | ||
| 531 | (license license:bsd-3))) | ||
| 532 | |||
| 533 | (define-public rust-fuchsia-zircon | ||
| 534 | (package | ||
| 535 | (name "rust-fuchsia-zircon") | ||
| 536 | (version "0.3.3") | ||
| 537 | (source | ||
| 538 | (origin | ||
| 539 | (method url-fetch) | ||
| 540 | (uri (crate-uri "fuchsia-zircon" version)) | ||
| 541 | (file-name (string-append name "-" version ".tar.gz")) | ||
| 542 | (sha256 | ||
| 543 | (base32 | ||
| 544 | "10jxc5ks1x06gpd0xg51kcjrxr35nj6qhx2zlc5n7bmskv3675rf")))) | ||
| 545 | (build-system cargo-build-system) | ||
| 546 | (arguments | ||
| 547 | `(#:cargo-inputs | ||
| 548 | (("rust-bitflags" ,rust-bitflags) | ||
| 549 | ("rust-fuchsia-zircon-sys" ,rust-fuchsia-zircon-sys)) | ||
| 550 | #:tests? #f)) ; tests require zircon | ||
| 551 | (home-page "https://fuchsia.googlesource.com/garnet/") | ||
| 552 | (synopsis "Rust bindings for the Zircon kernel") | ||
| 553 | (description "Rust bindings for the Zircon kernel.") | ||
| 554 | (license license:bsd-3))) | ||
| 555 | |||
| 556 | (define-public rust-fuchsia-zircon-sys | ||
| 557 | (package | ||
| 558 | (name "rust-fuchsia-zircon-sys") | ||
| 559 | (version "0.3.3") | ||
| 560 | (source | ||
| 561 | (origin | ||
| 562 | (method url-fetch) | ||
| 563 | (uri (crate-uri "fuchsia-zircon-sys" version)) | ||
| 564 | (file-name (string-append name "-" version ".tar.gz")) | ||
| 565 | (sha256 | ||
| 566 | (base32 | ||
| 567 | "19zp2085qsyq2bh1gvcxq1lb8w6v6jj9kbdkhpdjrl95fypakjix")))) | ||
| 568 | (build-system cargo-build-system) | ||
| 569 | (arguments | ||
| 570 | `(#:tests? #f)) ; tests require zircon | ||
| 571 | (home-page "https://fuchsia.googlesource.com/garnet/") | ||
| 572 | (synopsis "Low-level Rust bindings for the Zircon kernel") | ||
| 573 | (description "Low-level Rust bindings for the Zircon kernel.") | ||
| 574 | (license license:bsd-3))) | ||
| 575 | |||
| 236 | (define-public rust-futures | 576 | (define-public rust-futures |
| 237 | (package | 577 | (package |
| 238 | (name "rust-futures") | 578 | (name "rust-futures") |
| @@ -253,6 +593,77 @@ featuring zero allocations, composability, and iterator-like interfaces.") | |||
| 253 | (license (list license:asl2.0 | 593 | (license (list license:asl2.0 |
| 254 | license:expat)))) | 594 | license:expat)))) |
| 255 | 595 | ||
| 596 | (define-public rust-futures-cpupool | ||
| 597 | (package | ||
| 598 | (name "rust-futures-cpupool") | ||
| 599 | (version "0.1.8") | ||
| 600 | (source | ||
| 601 | (origin | ||
| 602 | (method url-fetch) | ||
| 603 | (uri (crate-uri "futures-cpupool" version)) | ||
| 604 | (file-name (string-append name "-" version ".tar.gz")) | ||
| 605 | (sha256 | ||
| 606 | (base32 | ||
| 607 | "1r32456gpblzfvnkf60545v8acqk7gh5zhyhi1jn669k9gicv45b")))) | ||
| 608 | (build-system cargo-build-system) | ||
| 609 | (arguments | ||
| 610 | `(#:cargo-inputs | ||
| 611 | (("rust-futures" ,rust-futures) | ||
| 612 | ("rust-num-cpus" ,rust-num-cpus)))) | ||
| 613 | (home-page "https://github.com/alexcrichton/futures-rs") | ||
| 614 | (synopsis "Implementation of thread pools which hand out futures") | ||
| 615 | (description | ||
| 616 | "An implementation of thread pools which hand out futures to the results of | ||
| 617 | the computation on the threads themselves.") | ||
| 618 | (license (list license:asl2.0 | ||
| 619 | license:expat)))) | ||
| 620 | |||
| 621 | (define-public rust-futures-io-preview | ||
| 622 | (package | ||
| 623 | (name "rust-futures-io-preview") | ||
| 624 | (version "0.3.0-alpha.17") | ||
| 625 | (source | ||
| 626 | (origin | ||
| 627 | (method url-fetch) | ||
| 628 | (uri (crate-uri "futures-io-preview" version)) | ||
| 629 | (file-name (string-append name "-" version ".tar.gz")) | ||
| 630 | (sha256 | ||
| 631 | (base32 | ||
| 632 | "0fhvwhdb8ywjjbfng0ra1r8yyc9yzpyxg9sv3spb3f7w0lk40bh8")))) | ||
| 633 | (build-system cargo-build-system) | ||
| 634 | (home-page "https://rust-lang-nursery.github.io/futures-rs/") | ||
| 635 | (synopsis "Async read and write traits for the futures library") | ||
| 636 | (description "This crate provides the @code{AsyncRead} and | ||
| 637 | @code{AsyncWrite} traits for the @code{futures-rs} library.") | ||
| 638 | (license (list license:asl2.0 | ||
| 639 | license:expat)))) | ||
| 640 | |||
| 641 | (define-public rust-heapsize | ||
| 642 | (package | ||
| 643 | (name "rust-heapsize") | ||
| 644 | (version "0.4.2") | ||
| 645 | (source | ||
| 646 | (origin | ||
| 647 | (method url-fetch) | ||
| 648 | (uri (crate-uri "heapsize" version)) | ||
| 649 | (file-name (string-append name "-" version ".tar.gz")) | ||
| 650 | (sha256 | ||
| 651 | (base32 | ||
| 652 | "0q94q9ppqjgrw71swiyia4hgby2cz6dldp7ij57nkvhd6zmfcy8n")))) | ||
| 653 | (build-system cargo-build-system) | ||
| 654 | (arguments | ||
| 655 | `(#:cargo-inputs (("rust-winapi" ,rust-winapi)) | ||
| 656 | ;; Tests assume rust is built with jemalloc. | ||
| 657 | ;; https://github.com/servo/heapsize/issues/74 | ||
| 658 | #:cargo-test-flags '("--features" "flexible-tests"))) | ||
| 659 | (home-page "https://github.com/servo/heapsize") | ||
| 660 | (synopsis "Measure the total runtime size of an object on the heap") | ||
| 661 | (description | ||
| 662 | "Infrastructure for measuring the total runtime size of an object on the | ||
| 663 | heap.") | ||
| 664 | (license (list license:asl2.0 | ||
| 665 | license:expat)))) | ||
| 666 | |||
| 256 | (define-public rust-hex | 667 | (define-public rust-hex |
| 257 | (package | 668 | (package |
| 258 | (name "rust-hex") | 669 | (name "rust-hex") |
| @@ -273,6 +684,53 @@ hexadecimal representation.") | |||
| 273 | (license (list license:asl2.0 | 684 | (license (list license:asl2.0 |
| 274 | license:expat)))) | 685 | license:expat)))) |
| 275 | 686 | ||
| 687 | (define-public rust-hostname | ||
| 688 | (package | ||
| 689 | (name "rust-hostname") | ||
| 690 | (version "0.1.5") | ||
| 691 | (source | ||
| 692 | (origin | ||
| 693 | (method url-fetch) | ||
| 694 | (uri (crate-uri "hostname" version)) | ||
| 695 | (file-name (string-append name "-" version ".tar.gz")) | ||
| 696 | (sha256 | ||
| 697 | (base32 | ||
| 698 | "0kprf862qaa7lwdms6aw7f3275h0j2rwhs9nz5784pm8hdmb9ki1")))) | ||
| 699 | (build-system cargo-build-system) | ||
| 700 | (arguments | ||
| 701 | `(#:cargo-inputs | ||
| 702 | (("rust-libc" ,rust-libc) | ||
| 703 | ("rust-winutil" ,rust-winutil)))) | ||
| 704 | (home-page "https://github.com/fengcen/hostname") | ||
| 705 | (synopsis "Get hostname for Rust") | ||
| 706 | (description | ||
| 707 | "Get hostname for Rust.") | ||
| 708 | (license license:expat))) | ||
| 709 | |||
| 710 | (define-public rust-iovec | ||
| 711 | (package | ||
| 712 | (name "rust-iovec") | ||
| 713 | (version "0.1.2") | ||
| 714 | (source | ||
| 715 | (origin | ||
| 716 | (method url-fetch) | ||
| 717 | (uri (crate-uri "iovec" version)) | ||
| 718 | (file-name (string-append name "-" version ".tar.gz")) | ||
| 719 | (sha256 | ||
| 720 | (base32 | ||
| 721 | "025vi072m22299z3fg73qid188z2iip7k41ba6v5v5yhwwby9rnv")))) | ||
| 722 | (build-system cargo-build-system) | ||
| 723 | (arguments | ||
| 724 | `(#:cargo-inputs | ||
| 725 | (("rust-libc" ,rust-libc) | ||
| 726 | ("rust-winapi" ,rust-winapi-0.2)))) | ||
| 727 | (home-page "https://github.com/carllerche/iovec") | ||
| 728 | (synopsis "Portable buffer type for scatter/gather I/O operations") | ||
| 729 | (description | ||
| 730 | "Portable buffer type for scatter/gather I/O operations.") | ||
| 731 | (license (list license:asl2.0 | ||
| 732 | license:expat)))) | ||
| 733 | |||
| 276 | (define-public rust-itoa | 734 | (define-public rust-itoa |
| 277 | (package | 735 | (package |
| 278 | (name "rust-itoa") | 736 | (name "rust-itoa") |
| @@ -313,6 +771,94 @@ friction with idiomatic Rust structs to ease interopability.") | |||
| 313 | (license (list license:asl2.0 | 771 | (license (list license:asl2.0 |
| 314 | license:expat)))) | 772 | license:expat)))) |
| 315 | 773 | ||
| 774 | (define-public rust-kernel32-sys | ||
| 775 | (package | ||
| 776 | (name "rust-kernel32-sys") | ||
| 777 | (version "0.2.2") | ||
| 778 | (source | ||
| 779 | (origin | ||
| 780 | (method url-fetch) | ||
| 781 | (uri (crate-uri "kernel32-sys" version)) | ||
| 782 | (file-name (string-append name "-" version ".tar.gz")) | ||
| 783 | (sha256 | ||
| 784 | (base32 | ||
| 785 | "1389av0601a9yz8dvx5zha9vmkd6ik7ax0idpb032d28555n41vm")))) | ||
| 786 | (build-system cargo-build-system) | ||
| 787 | (arguments | ||
| 788 | `(#:cargo-inputs | ||
| 789 | (("rust-winapi" ,rust-winapi-0.2) | ||
| 790 | ("rust-winapi-build" ,rust-winapi-build)) | ||
| 791 | #:phases | ||
| 792 | (modify-phases %standard-phases | ||
| 793 | (add-after 'unpack 'fix-Cargo-toml | ||
| 794 | (lambda _ | ||
| 795 | (substitute* "Cargo.toml" | ||
| 796 | ((", path =.* }") "}\n")) | ||
| 797 | #t))))) | ||
| 798 | (home-page "https://github.com/retep998/winapi-rs") | ||
| 799 | (synopsis "Function definitions for the Windows API library kernel32") | ||
| 800 | (description "Contains function definitions for the Windows API library | ||
| 801 | kernel32.") | ||
| 802 | (license license:expat))) | ||
| 803 | |||
| 804 | (define-public rust-lazy-static | ||
| 805 | (package | ||
| 806 | (name "rust-lazy-static") | ||
| 807 | (version "1.3.0") | ||
| 808 | (source | ||
| 809 | (origin | ||
| 810 | (method url-fetch) | ||
| 811 | (uri (crate-uri "lazy_static" version)) | ||
| 812 | (file-name (string-append name "-" version ".tar.gz")) | ||
| 813 | (sha256 | ||
| 814 | (base32 | ||
| 815 | "052ac27w189hrf1j3hz7sga46rp84zl2hqnzyihxv78mgzr2jmxw")))) | ||
| 816 | (build-system cargo-build-system) | ||
| 817 | (arguments | ||
| 818 | `(#:cargo-inputs (("rust-spin" ,rust-spin)))) | ||
| 819 | (home-page "https://github.com/rust-lang-nursery/lazy-static.rs") | ||
| 820 | (synopsis "Macro for declaring lazily evaluated statics in Rust") | ||
| 821 | (description | ||
| 822 | "This package provides a macro for declaring lazily evaluated statics in | ||
| 823 | Rust. Using this macro, it is possible to have @code{static}s that require code | ||
| 824 | to be executed at runtime in order to be initialized. This includes anything | ||
| 825 | requiring heap allocations, like vectors or hash maps, as well as anything that | ||
| 826 | requires non-const function calls to be computed.") | ||
| 827 | (license (list license:asl2.0 | ||
| 828 | license:expat)))) | ||
| 829 | |||
| 830 | (define-public rust-libc | ||
| 831 | (package | ||
| 832 | (name "rust-libc") | ||
| 833 | (version "0.2.62") | ||
| 834 | (source | ||
| 835 | (origin | ||
| 836 | (method url-fetch) | ||
| 837 | (uri (crate-uri "libc" version)) | ||
| 838 | (file-name | ||
| 839 | (string-append name "-" version ".tar.gz")) | ||
| 840 | (sha256 | ||
| 841 | (base32 | ||
| 842 | "1fh69kpjg8hqff36kdczx7sax98gk4qs4ws1dwvjz0rgip0d5z1l")))) | ||
| 843 | (build-system cargo-build-system) | ||
| 844 | (arguments | ||
| 845 | `(#:cargo-inputs | ||
| 846 | (("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core)))) | ||
| 847 | (home-page "https://github.com/rust-lang/libc") | ||
| 848 | (synopsis "Raw FFI bindings to platform libraries like libc") | ||
| 849 | (description | ||
| 850 | "libc provides all of the definitions necessary to easily | ||
| 851 | interoperate with C code (or \"C-like\" code) on each of the platforms | ||
| 852 | that Rust supports. This includes type definitions (e.g., c_int), | ||
| 853 | constants (e.g., EINVAL) as well as function headers (e.g., malloc). | ||
| 854 | |||
| 855 | This crate exports all underlying platform types, functions, and | ||
| 856 | constants under the crate root, so all items are accessible as | ||
| 857 | @samp{libc::foo}. The types and values of all the exported APIs match | ||
| 858 | the platform that libc is compiled for.") | ||
| 859 | (license (list license:expat | ||
| 860 | license:asl2.0)))) | ||
| 861 | |||
| 316 | (define-public rust-maplit | 862 | (define-public rust-maplit |
| 317 | (package | 863 | (package |
| 318 | (name "rust-maplit") | 864 | (name "rust-maplit") |
| @@ -371,6 +917,222 @@ whether an expression matches a pattern.") | |||
| 371 | (license (list license:asl2.0 | 917 | (license (list license:asl2.0 |
| 372 | license:expat)))) | 918 | license:expat)))) |
| 373 | 919 | ||
| 920 | (define-public rust-mime | ||
| 921 | (package | ||
| 922 | (name "rust-mime") | ||
| 923 | (version "0.3.13") | ||
| 924 | (source | ||
| 925 | (origin | ||
| 926 | (method url-fetch) | ||
| 927 | (uri (crate-uri "mime" version)) | ||
| 928 | (file-name (string-append name "-" version ".tar.gz")) | ||
| 929 | (sha256 | ||
| 930 | (base32 | ||
| 931 | "09clbyvdkwflp8anwjhqdib0sw8191gphcchdp80nc8ayhhwl9ry")))) | ||
| 932 | (build-system cargo-build-system) | ||
| 933 | (arguments | ||
| 934 | `(#:cargo-inputs | ||
| 935 | (("rust-unicase" ,rust-unicase)))) | ||
| 936 | (home-page "https://github.com/hyperium/mime") | ||
| 937 | (synopsis "Strongly Typed Mimes") | ||
| 938 | (description | ||
| 939 | "Support MIME (HTTP Media Types) as strong types in Rust.") | ||
| 940 | (license (list license:asl2.0 | ||
| 941 | license:expat)))) | ||
| 942 | |||
| 943 | (define-public rust-modifier | ||
| 944 | (package | ||
| 945 | (name "rust-modifier") | ||
| 946 | (version "0.1.0") | ||
| 947 | (source | ||
| 948 | (origin | ||
| 949 | (method url-fetch) | ||
| 950 | (uri (crate-uri "modifier" version)) | ||
| 951 | (file-name (string-append name "-" version ".tar.gz")) | ||
| 952 | (sha256 | ||
| 953 | (base32 | ||
| 954 | "0n3fmgli1nsskl0whrfzm1gk0rmwwl6pw1q4nb9sqqmn5h8wkxa1")))) | ||
| 955 | (build-system cargo-build-system) | ||
| 956 | (home-page "https://github.com/reem/rust-modifier") | ||
| 957 | (synopsis | ||
| 958 | "Chaining APIs for both self -> Self and &mut self methods.") | ||
| 959 | (description | ||
| 960 | "Chaining APIs for both self -> Self and &mut self methods.") | ||
| 961 | (license license:expat))) | ||
| 962 | |||
| 963 | (define-public rust-net2 | ||
| 964 | (package | ||
| 965 | (name "rust-net2") | ||
| 966 | (version "0.2.33") | ||
| 967 | (source | ||
| 968 | (origin | ||
| 969 | (method url-fetch) | ||
| 970 | (uri (crate-uri "net2" version)) | ||
| 971 | (file-name (string-append name "-" version ".tar.gz")) | ||
| 972 | (sha256 | ||
| 973 | (base32 | ||
| 974 | "126g3fgfxp06zimc1l9iyxnn9cif1hjsg7sd81nlls5nnyghsma2")))) | ||
| 975 | (build-system cargo-build-system) | ||
| 976 | (arguments | ||
| 977 | `(#:cargo-inputs | ||
| 978 | (("rust-cfg-if" ,rust-cfg-if) | ||
| 979 | ("rust-libc" ,rust-libc) | ||
| 980 | ("rust-winapi" ,rust-winapi)))) | ||
| 981 | (home-page "https://github.com/rust-lang-nursery/net2-rs") | ||
| 982 | (synopsis "Extensions to the standard library's networking types") | ||
| 983 | (description | ||
| 984 | "This library contains extensions to the standard library's networking | ||
| 985 | types as proposed in RFC 1158.") | ||
| 986 | (license (list license:asl2.0 | ||
| 987 | license:expat)))) | ||
| 988 | |||
| 989 | (define-public rust-nodrop | ||
| 990 | (package | ||
| 991 | (name "rust-nodrop") | ||
| 992 | (version "0.1.13") | ||
| 993 | (source | ||
| 994 | (origin | ||
| 995 | (method url-fetch) | ||
| 996 | (uri (crate-uri "nodrop" version)) | ||
| 997 | (file-name (string-append name "-" version ".tar.gz")) | ||
| 998 | (sha256 | ||
| 999 | (base32 | ||
| 1000 | "0if9ifn6rvar5jirx4b3qh4sl5kjkmcifycvzhxa9j3crkfng5ig")))) | ||
| 1001 | (build-system cargo-build-system) | ||
| 1002 | (arguments | ||
| 1003 | `(#:cargo-inputs | ||
| 1004 | (("rust-nodrop-union" ,rust-nodrop-union)))) | ||
| 1005 | (home-page "https://github.com/bluss/arrayvec") | ||
| 1006 | (synopsis "Wrapper type to inhibit drop (destructor)") | ||
| 1007 | (description "This package provides a wrapper type to inhibit drop | ||
| 1008 | (destructor). Use @code{std::mem::ManuallyDrop} instead!") | ||
| 1009 | (license (list license:asl2.0 | ||
| 1010 | license:expat)))) | ||
| 1011 | |||
| 1012 | ;; This package requires features which are unavailable | ||
| 1013 | ;; on the stable releases of Rust. | ||
| 1014 | (define-public rust-nodrop-union | ||
| 1015 | (package | ||
| 1016 | (name "rust-nodrop-union") | ||
| 1017 | (version "0.1.10") | ||
| 1018 | (source | ||
| 1019 | (origin | ||
| 1020 | (method url-fetch) | ||
| 1021 | (uri (crate-uri "nodrop-union" version)) | ||
| 1022 | (file-name (string-append name "-" version ".tar.gz")) | ||
| 1023 | (sha256 | ||
| 1024 | (base32 | ||
| 1025 | "0jsnkdn9l8jlmb9h4wssi76sxnyxwnyi00p6y1p2gdq7c1gdw2b7")))) | ||
| 1026 | (build-system cargo-build-system) | ||
| 1027 | (home-page "https://github.com/bluss/arrayvec") | ||
| 1028 | (synopsis "Wrapper type to inhibit drop (destructor)") | ||
| 1029 | (description "This package provides a wrapper type to inhibit drop | ||
| 1030 | (destructor). Implementation crate for nodrop, the untagged unions | ||
| 1031 | implementation (which is unstable / requires nightly).") | ||
| 1032 | (properties '((hidden? . #t))) | ||
| 1033 | (license (list license:asl2.0 | ||
| 1034 | license:expat)))) | ||
| 1035 | |||
| 1036 | (define-public rust-num-cpus | ||
| 1037 | (package | ||
| 1038 | (name "rust-num-cpus") | ||
| 1039 | (version "1.10.1") | ||
| 1040 | (source | ||
| 1041 | (origin | ||
| 1042 | (method url-fetch) | ||
| 1043 | (uri (crate-uri "num_cpus" version)) | ||
| 1044 | (file-name (string-append name "-" version ".tar.gz")) | ||
| 1045 | (sha256 | ||
| 1046 | (base32 | ||
| 1047 | "0wrj3zvj6h3q26sqj9zxpd59frjb54n7jhjwf307clq31ic47vxw")))) | ||
| 1048 | (build-system cargo-build-system) | ||
| 1049 | (arguments | ||
| 1050 | `(#:cargo-inputs | ||
| 1051 | (("rust-libc" ,rust-libc)) | ||
| 1052 | #:cargo-development-inputs | ||
| 1053 | (("rust-doc-comment" ,rust-doc-comment)))) | ||
| 1054 | (home-page "https://github.com/seanmonstar/num_cpus") | ||
| 1055 | (synopsis "Get the number of CPUs on a machine") | ||
| 1056 | (description | ||
| 1057 | "Get the number of CPUs on a machine.") | ||
| 1058 | (license (list license:asl2.0 | ||
| 1059 | license:expat)))) | ||
| 1060 | |||
| 1061 | (define-public rust-num-integer | ||
| 1062 | (package | ||
| 1063 | (name "rust-num-integer") | ||
| 1064 | (version "0.1.41") | ||
| 1065 | (source | ||
| 1066 | (origin | ||
| 1067 | (method url-fetch) | ||
| 1068 | (uri (crate-uri "num-integer" version)) | ||
| 1069 | (file-name | ||
| 1070 | (string-append name "-" version ".tar.gz")) | ||
| 1071 | (sha256 | ||
| 1072 | (base32 | ||
| 1073 | "02dwjjpfbi16c71fq689s4sw3ih52cvfzr5z5gs6qpr5z0g58pmq")))) | ||
| 1074 | (build-system cargo-build-system) | ||
| 1075 | (arguments | ||
| 1076 | `(#:cargo-inputs | ||
| 1077 | (("rust-autocfg" ,rust-autocfg) | ||
| 1078 | ("rust-num-traits" ,rust-num-traits)))) | ||
| 1079 | (home-page "https://github.com/rust-num/num-integer") | ||
| 1080 | (synopsis "Integer traits and functions") | ||
| 1081 | (description "Integer traits and functions.") | ||
| 1082 | ;; Dual licensed. | ||
| 1083 | (license (list license:asl2.0 | ||
| 1084 | license:expat)))) | ||
| 1085 | |||
| 1086 | (define-public rust-num-iter | ||
| 1087 | (package | ||
| 1088 | (name "rust-num-iter") | ||
| 1089 | (version "0.1.39") | ||
| 1090 | (source | ||
| 1091 | (origin | ||
| 1092 | (method url-fetch) | ||
| 1093 | (uri (crate-uri "num-iter" version)) | ||
| 1094 | (file-name (string-append name "-" version ".tar.gz")) | ||
| 1095 | (sha256 | ||
| 1096 | (base32 | ||
| 1097 | "0bhk2qbr3261r6zvfc58lz4spfqjhvdripxgz5mks5rd85r55gbn")))) | ||
| 1098 | (build-system cargo-build-system) | ||
| 1099 | (arguments | ||
| 1100 | `(#:cargo-inputs | ||
| 1101 | (("rust-num-integer" ,rust-num-integer) | ||
| 1102 | ("rust-num-traits" ,rust-num-traits)) | ||
| 1103 | #:cargo-development-inputs | ||
| 1104 | (("rust-autocfg" ,rust-autocfg)))) | ||
| 1105 | (home-page "https://github.com/rust-num/num-iter") | ||
| 1106 | (synopsis "External iterators for generic mathematics") | ||
| 1107 | (description | ||
| 1108 | "This crate provides external iterators for generic mathematics.") | ||
| 1109 | (license (list license:asl2.0 | ||
| 1110 | license:expat)))) | ||
| 1111 | |||
| 1112 | (define-public rust-num-traits | ||
| 1113 | (package | ||
| 1114 | (name "rust-num-traits") | ||
| 1115 | (version "0.2.8") | ||
| 1116 | (source | ||
| 1117 | (origin | ||
| 1118 | (method url-fetch) | ||
| 1119 | (uri (crate-uri "num-traits" version)) | ||
| 1120 | (file-name | ||
| 1121 | (string-append name "-" version ".tar.gz")) | ||
| 1122 | (sha256 | ||
| 1123 | (base32 | ||
| 1124 | "0clvrm34rrqc8p6gq5ps5fcgws3kgq5knh7nlqxf2ayarwks9abb")))) | ||
| 1125 | (build-system cargo-build-system) | ||
| 1126 | (arguments | ||
| 1127 | `(#:cargo-inputs | ||
| 1128 | (("rust-autocfg" ,rust-autocfg)))) | ||
| 1129 | (home-page "https://github.com/rust-num/num-traits") | ||
| 1130 | (synopsis "Numeric traits for generic mathematics") | ||
| 1131 | (description "Numeric traits for generic mathematics.") | ||
| 1132 | ;; Dual licensed. | ||
| 1133 | (license (list license:asl2.0 | ||
| 1134 | license:expat)))) | ||
| 1135 | |||
| 374 | (define-public rust-peeking-take-while | 1136 | (define-public rust-peeking-take-while |
| 375 | (package | 1137 | (package |
| 376 | (name "rust-peeking-take-while") | 1138 | (name "rust-peeking-take-while") |
| @@ -413,6 +1175,28 @@ the @code{take_while} predicate returned false after dropping the @code{by_ref}. | |||
| 413 | (license (list license:asl2.0 | 1175 | (license (list license:asl2.0 |
| 414 | license:expat)))) | 1176 | license:expat)))) |
| 415 | 1177 | ||
| 1178 | (define-public rust-permutohedron | ||
| 1179 | (package | ||
| 1180 | (name "rust-permutohedron") | ||
| 1181 | (version "0.2.4") | ||
| 1182 | (source | ||
| 1183 | (origin | ||
| 1184 | (method url-fetch) | ||
| 1185 | (uri (crate-uri "permutohedron" version)) | ||
| 1186 | (file-name (string-append name "-" version ".tar.gz")) | ||
| 1187 | (sha256 | ||
| 1188 | (base32 | ||
| 1189 | "0b1pzh48j86v46wxngch6k1kx9cdw3jr3lwa86gd6jd4bmxzz1xn")))) | ||
| 1190 | (build-system cargo-build-system) | ||
| 1191 | (home-page "https://github.com/bluss/permutohedron") | ||
| 1192 | (synopsis "Generate permutations of sequences") | ||
| 1193 | (description | ||
| 1194 | "Generate permutations of sequences. Either lexicographical order | ||
| 1195 | permutations, or a minimal swaps permutation sequence implemented using Heap's | ||
| 1196 | algorithm.") | ||
| 1197 | (license (list license:asl2.0 | ||
| 1198 | license:expat)))) | ||
| 1199 | |||
| 416 | (define-public rust-pin-utils | 1200 | (define-public rust-pin-utils |
| 417 | (package | 1201 | (package |
| 418 | (name "rust-pin-utils") | 1202 | (name "rust-pin-utils") |
| @@ -432,6 +1216,32 @@ the @code{take_while} predicate returned false after dropping the @code{by_ref}. | |||
| 432 | (license (list license:asl2.0 | 1216 | (license (list license:asl2.0 |
| 433 | license:expat)))) | 1217 | license:expat)))) |
| 434 | 1218 | ||
| 1219 | (define-public rust-pkg-config | ||
| 1220 | (package | ||
| 1221 | (name "rust-pkg-config") | ||
| 1222 | (version "0.3.14") | ||
| 1223 | (source | ||
| 1224 | (origin | ||
| 1225 | (method url-fetch) | ||
| 1226 | (uri (crate-uri "pkg-config" version)) | ||
| 1227 | (file-name (string-append name "-" version ".tar.gz")) | ||
| 1228 | (sha256 | ||
| 1229 | (base32 | ||
| 1230 | "135ia995lqzr0gxpk85h0bjxf82kj6hbxdx924sh9jdln6r8wvk7")))) | ||
| 1231 | (build-system cargo-build-system) | ||
| 1232 | (arguments | ||
| 1233 | `(#:cargo-development-inputs | ||
| 1234 | (("rust-lazy-static" ,rust-lazy-static)))) | ||
| 1235 | (inputs | ||
| 1236 | `(("pkg-config" ,pkg-config))) | ||
| 1237 | (home-page "https://github.com/alexcrichton/pkg-config-rs") | ||
| 1238 | (synopsis "Library to run the pkg-config system tool") | ||
| 1239 | (description | ||
| 1240 | "A library to run the pkg-config system tool at build time in order to be | ||
| 1241 | used in Cargo build scripts.") | ||
| 1242 | (license (list license:asl2.0 | ||
| 1243 | license:expat)))) | ||
| 1244 | |||
| 435 | (define-public rust-plain | 1245 | (define-public rust-plain |
| 436 | (package | 1246 | (package |
| 437 | (name "rust-plain") | 1247 | (name "rust-plain") |
| @@ -452,6 +1262,30 @@ the @code{take_while} predicate returned false after dropping the @code{by_ref}. | |||
| 452 | (license (list license:asl2.0 | 1262 | (license (list license:asl2.0 |
| 453 | license:expat)))) | 1263 | license:expat)))) |
| 454 | 1264 | ||
| 1265 | (define-public rust-plugin | ||
| 1266 | (package | ||
| 1267 | (name "rust-plugin") | ||
| 1268 | (version "0.2.6") | ||
| 1269 | (source | ||
| 1270 | (origin | ||
| 1271 | (method url-fetch) | ||
| 1272 | (uri (crate-uri "plugin" version)) | ||
| 1273 | (file-name (string-append name "-" version ".tar.gz")) | ||
| 1274 | (sha256 | ||
| 1275 | (base32 | ||
| 1276 | "1q7nghkpvxxr168y2jnzh3w7qc9vfrby9n7ygy3xpj0bj71hsshs")))) | ||
| 1277 | (build-system cargo-build-system) | ||
| 1278 | (arguments | ||
| 1279 | `(#:cargo-inputs | ||
| 1280 | (("rust-typemap" ,rust-typemap)) | ||
| 1281 | #:cargo-development-inputs | ||
| 1282 | (("rust-void" ,rust-void)))) | ||
| 1283 | (home-page "https://github.com/reem/rust-plugin") | ||
| 1284 | (synopsis "Lazily evaluated, order-independent plugins for extensible types") | ||
| 1285 | (description | ||
| 1286 | "Lazily evaluated, order-independent plugins for extensible types.") | ||
| 1287 | (license license:expat))) | ||
| 1288 | |||
| 455 | (define-public rust-pocket-resources | 1289 | (define-public rust-pocket-resources |
| 456 | (package | 1290 | (package |
| 457 | (name "rust-pocket-resources") | 1291 | (name "rust-pocket-resources") |
| @@ -558,6 +1392,107 @@ to write.") | |||
| 558 | ;; Dual licensed. | 1392 | ;; Dual licensed. |
| 559 | (license (list license:asl2.0 license:expat)))) | 1393 | (license (list license:asl2.0 license:expat)))) |
| 560 | 1394 | ||
| 1395 | (define-public rust-rawpointer | ||
| 1396 | (package | ||
| 1397 | (name "rust-rawpointer") | ||
| 1398 | (version "0.1.0") | ||
| 1399 | (source | ||
| 1400 | (origin | ||
| 1401 | (method url-fetch) | ||
| 1402 | (uri (crate-uri "rawpointer" version)) | ||
| 1403 | (file-name (string-append name "-" version ".tar.gz")) | ||
| 1404 | (sha256 | ||
| 1405 | (base32 | ||
| 1406 | "06ghpm9y7gacks78s3maakha07kbnwrxif5q37r2l7z1sali3b7b")))) | ||
| 1407 | (build-system cargo-build-system) | ||
| 1408 | (home-page "https://github.com/bluss/rawpointer/") | ||
| 1409 | (synopsis "Extra methods for raw pointers") | ||
| 1410 | (description "Extra methods for raw pointers. For example | ||
| 1411 | @code{.post_inc()} and @code{.pre_dec()} (c.f. @code{ptr++} and @code{--ptr}) | ||
| 1412 | and @code{ptrdistance}.") | ||
| 1413 | (license (list license:asl2.0 | ||
| 1414 | license:expat)))) | ||
| 1415 | |||
| 1416 | (define-public rust-regex-syntax | ||
| 1417 | (package | ||
| 1418 | (name "rust-regex-syntax") | ||
| 1419 | (version "0.6.10") | ||
| 1420 | (source | ||
| 1421 | (origin | ||
| 1422 | (method url-fetch) | ||
| 1423 | (uri (crate-uri "regex-syntax" version)) | ||
| 1424 | (file-name (string-append name "-" version ".tar.gz")) | ||
| 1425 | (sha256 | ||
| 1426 | (base32 | ||
| 1427 | "0p47lf38yj2g2fnmvnraccqlxwk35zr76hlnqi8yva932nzqam6d")))) | ||
| 1428 | (build-system cargo-build-system) | ||
| 1429 | (arguments | ||
| 1430 | `(#:cargo-inputs | ||
| 1431 | (("rust-ucd-util" ,rust-ucd-util)))) | ||
| 1432 | (home-page "https://github.com/rust-lang/regex") | ||
| 1433 | (synopsis "Regular expression parser") | ||
| 1434 | (description | ||
| 1435 | "This package provides a regular expression parser.") | ||
| 1436 | (license (list license:asl2.0 | ||
| 1437 | license:expat)))) | ||
| 1438 | |||
| 1439 | (define-public rust-remove-dir-all | ||
| 1440 | (package | ||
| 1441 | (name "rust-remove-dir-all") | ||
| 1442 | (version "0.5.2") | ||
| 1443 | (source | ||
| 1444 | (origin | ||
| 1445 | (method url-fetch) | ||
| 1446 | (uri (crate-uri "remove_dir_all" version)) | ||
| 1447 | (file-name (string-append name "-" version ".tar.gz")) | ||
| 1448 | (sha256 | ||
| 1449 | (base32 | ||
| 1450 | "0bkrlyg26mgizpiy1yb2hhpgscxcag8r5fnckqsvk25608vzm0sa")))) | ||
| 1451 | (build-system cargo-build-system) | ||
| 1452 | (arguments | ||
| 1453 | `(#:cargo-inputs | ||
| 1454 | (("rust-winapi" ,rust-winapi)) | ||
| 1455 | #:cargo-development-inputs | ||
| 1456 | (("rust-doc-comment" ,rust-doc-comment)) | ||
| 1457 | #:phases | ||
| 1458 | (modify-phases %standard-phases | ||
| 1459 | (add-after 'unpack 'fix-source | ||
| 1460 | ;; The test phase expects there to be a README.md in the root directory. | ||
| 1461 | (lambda _ | ||
| 1462 | (invoke "touch" "README.md")))))) | ||
| 1463 | (home-page "https://github.com/XAMPPRocky/remove_dir_all.git") | ||
| 1464 | (synopsis "Implementation of remove_dir_all for Windows") | ||
| 1465 | (description | ||
| 1466 | "This package provides a safe, reliable implementation of | ||
| 1467 | @code{remove_dir_all} for Windows") | ||
| 1468 | (license (list license:asl2.0 | ||
| 1469 | license:expat)))) | ||
| 1470 | |||
| 1471 | (define-public rust-resolv-conf | ||
| 1472 | (package | ||
| 1473 | (name "rust-resolv-conf") | ||
| 1474 | (version "0.6.2") | ||
| 1475 | (source | ||
| 1476 | (origin | ||
| 1477 | (method url-fetch) | ||
| 1478 | (uri (crate-uri "resolv-conf" version)) | ||
| 1479 | (file-name (string-append name "-" version ".tar.gz")) | ||
| 1480 | (sha256 | ||
| 1481 | (base32 | ||
| 1482 | "1jvdsmksdf6yiipm3aqahyv8n1cjd7wqc8sa0p0gzsax3fmb8qxj")))) | ||
| 1483 | (build-system cargo-build-system) | ||
| 1484 | (arguments | ||
| 1485 | `(#:cargo-inputs | ||
| 1486 | (("rust-quick-error" ,rust-quick-error) | ||
| 1487 | ("rust-hostname" ,rust-hostname)) | ||
| 1488 | #:cargo-test-flags '("--release" "--lib" "--examples"))) ; doc tests fail | ||
| 1489 | (home-page "https://github.com/tailhook/resolv-conf") | ||
| 1490 | (synopsis "/etc/resolv.conf parser") | ||
| 1491 | (description | ||
| 1492 | "An /etc/resolv.conf parser crate for Rust.") | ||
| 1493 | (license (list license:asl2.0 | ||
| 1494 | license:expat)))) | ||
| 1495 | |||
| 561 | (define-public rust-rustc-std-workspace-core | 1496 | (define-public rust-rustc-std-workspace-core |
| 562 | (package | 1497 | (package |
| 563 | (name "rust-rustc-std-workspace-core") | 1498 | (name "rust-rustc-std-workspace-core") |
| @@ -578,6 +1513,74 @@ rust-lang/rust integration.") | |||
| 578 | (license (list license:asl2.0 | 1513 | (license (list license:asl2.0 |
| 579 | license:expat)))) | 1514 | license:expat)))) |
| 580 | 1515 | ||
| 1516 | (define-public rust-safemem | ||
| 1517 | (package | ||
| 1518 | (name "rust-safemem") | ||
| 1519 | (version "0.3.2") | ||
| 1520 | (source | ||
| 1521 | (origin | ||
| 1522 | (method url-fetch) | ||
| 1523 | (uri (crate-uri "safemem" version)) | ||
| 1524 | (file-name (string-append name "-" version ".tar.gz")) | ||
| 1525 | (sha256 | ||
| 1526 | (base32 | ||
| 1527 | "1l1ljkm4lpyryrv2ndaxi1f7z1f3v9bwy1rzl9f9mbhx04iq9c6j")))) | ||
| 1528 | (build-system cargo-build-system) | ||
| 1529 | (home-page "https://github.com/abonander/safemem") | ||
| 1530 | (synopsis "Safe wrappers for memory-accessing functions") | ||
| 1531 | (description | ||
| 1532 | "Safe wrappers for memory-accessing functions, like @code{std::ptr::copy()}.") | ||
| 1533 | (license (list license:asl2.0 | ||
| 1534 | license:expat)))) | ||
| 1535 | |||
| 1536 | (define-public rust-same-file | ||
| 1537 | (package | ||
| 1538 | (name "rust-same-file") | ||
| 1539 | (version "1.0.5") | ||
| 1540 | (source | ||
| 1541 | (origin | ||
| 1542 | (method url-fetch) | ||
| 1543 | (uri (crate-uri "same-file" version)) | ||
| 1544 | (file-name (string-append name "-" version ".tar.gz")) | ||
| 1545 | (sha256 | ||
| 1546 | (base32 | ||
| 1547 | "08a4zy10pjindf2rah320s6shgswk13mqw7s61m8i1y1xpf8spjq")))) | ||
| 1548 | (build-system cargo-build-system) | ||
| 1549 | (arguments | ||
| 1550 | `(#:cargo-inputs | ||
| 1551 | (("rust-winapi-util" ,rust-winapi-util)))) | ||
| 1552 | (home-page "https://github.com/BurntSushi/same-file") | ||
| 1553 | (synopsis "Determine whether two file paths point to the same file") | ||
| 1554 | (description | ||
| 1555 | "This package provides a simple crate for determining whether two file | ||
| 1556 | paths point to the same file.") | ||
| 1557 | (license (list license:unlicense | ||
| 1558 | license:expat)))) | ||
| 1559 | |||
| 1560 | (define-public rust-schannel | ||
| 1561 | (package | ||
| 1562 | (name "rust-schannel") | ||
| 1563 | (version "0.1.15") | ||
| 1564 | (source | ||
| 1565 | (origin | ||
| 1566 | (method url-fetch) | ||
| 1567 | (uri (crate-uri "schannel" version)) | ||
| 1568 | (file-name (string-append name "-" version ".tar.gz")) | ||
| 1569 | (sha256 | ||
| 1570 | (base32 | ||
| 1571 | "0f9k4pm8yc3z0n1n8hazvnrvg52f0sfxjc91bhf3r76rb3rapxpj")))) | ||
| 1572 | (build-system cargo-build-system) | ||
| 1573 | (arguments | ||
| 1574 | `(#:cargo-inputs | ||
| 1575 | (("rust-lazy-static" ,rust-lazy-static) | ||
| 1576 | ("rust-winapi" ,rust-winapi)))) | ||
| 1577 | (home-page "https://github.com/steffengy/schannel-rs") | ||
| 1578 | (synopsis "Rust bindings to the Windows SChannel APIs") | ||
| 1579 | (description | ||
| 1580 | "Rust bindings to the Windows SChannel APIs providing TLS client and | ||
| 1581 | server functionality.") | ||
| 1582 | (license license:expat))) | ||
| 1583 | |||
| 581 | (define-public rust-scoped-tls | 1584 | (define-public rust-scoped-tls |
| 582 | (package | 1585 | (package |
| 583 | (name "rust-scoped-tls") | 1586 | (name "rust-scoped-tls") |
| @@ -599,6 +1602,20 @@ library's old @code{scoped_thread_local!} macro for providing scoped access to | |||
| 599 | (license (list license:asl2.0 | 1602 | (license (list license:asl2.0 |
| 600 | license:expat)))) | 1603 | license:expat)))) |
| 601 | 1604 | ||
| 1605 | (define-public rust-scoped-tls-0.1 | ||
| 1606 | (package | ||
| 1607 | (inherit rust-scoped-tls) | ||
| 1608 | (name "rust-scoped-tls") | ||
| 1609 | (version "0.1.2") | ||
| 1610 | (source | ||
| 1611 | (origin | ||
| 1612 | (method url-fetch) | ||
| 1613 | (uri (crate-uri "scoped-tls" version)) | ||
| 1614 | (file-name (string-append name "-" version ".tar.gz")) | ||
| 1615 | (sha256 | ||
| 1616 | (base32 | ||
| 1617 | "0a2bn9d2mb07c6l16sadijy4p540g498zddfxyiq4rsqpwrglbrk")))))) | ||
| 1618 | |||
| 602 | (define-public rust-scopeguard | 1619 | (define-public rust-scopeguard |
| 603 | (package | 1620 | (package |
| 604 | (name "rust-scopeguard") | 1621 | (name "rust-scopeguard") |
| @@ -622,6 +1639,45 @@ with one of the implemented strategies.") | |||
| 622 | (license (list license:asl2.0 | 1639 | (license (list license:asl2.0 |
| 623 | license:expat)))) | 1640 | license:expat)))) |
| 624 | 1641 | ||
| 1642 | (define-public rust-scopeguard-0.3 | ||
| 1643 | (package | ||
| 1644 | (inherit rust-scopeguard) | ||
| 1645 | (name "rust-scopeguard") | ||
| 1646 | (version "0.3.3") | ||
| 1647 | (source | ||
| 1648 | (origin | ||
| 1649 | (method url-fetch) | ||
| 1650 | (uri (crate-uri "scopeguard" version)) | ||
| 1651 | (file-name | ||
| 1652 | (string-append name "-" version ".tar.gz")) | ||
| 1653 | (sha256 | ||
| 1654 | (base32 | ||
| 1655 | "09sy9wbqp409pkwmqni40qmwa99ldqpl48pp95m1xw8sc19qy9cl")))))) | ||
| 1656 | |||
| 1657 | (define-public rust-security-framework-sys | ||
| 1658 | (package | ||
| 1659 | (name "rust-security-framework-sys") | ||
| 1660 | (version "0.3.1") | ||
| 1661 | (source | ||
| 1662 | (origin | ||
| 1663 | (method url-fetch) | ||
| 1664 | (uri (crate-uri "security-framework-sys" version)) | ||
| 1665 | (file-name (string-append name "-" version ".tar.gz")) | ||
| 1666 | (sha256 | ||
| 1667 | (base32 | ||
| 1668 | "0mlsakq9kmqyc0fg2hcbgm6rjk55mb0rhjw2wid3hqdzkjcghdln")))) | ||
| 1669 | (build-system cargo-build-system) | ||
| 1670 | (arguments | ||
| 1671 | `(#:cargo-inputs | ||
| 1672 | (("rust-core-foundation-sys" | ||
| 1673 | ,rust-core-foundation-sys)))) | ||
| 1674 | (home-page "https://lib.rs/crates/security-framework-sys") | ||
| 1675 | (synopsis "Apple `Security.framework` low-level FFI bindings") | ||
| 1676 | (description | ||
| 1677 | "Apple `Security.framework` low-level FFI bindings.") | ||
| 1678 | (license (list license:asl2.0 | ||
| 1679 | license:expat)))) | ||
| 1680 | |||
| 625 | (define-public rust-semver-parser | 1681 | (define-public rust-semver-parser |
| 626 | (package | 1682 | (package |
| 627 | (name "rust-semver-parser") | 1683 | (name "rust-semver-parser") |
| @@ -700,6 +1756,30 @@ spinning. They may contain data, are usable without @code{std},and static | |||
| 700 | initializers are available.") | 1756 | initializers are available.") |
| 701 | (license license:expat))) | 1757 | (license license:expat))) |
| 702 | 1758 | ||
| 1759 | (define-public rust-stable-deref-trait | ||
| 1760 | (package | ||
| 1761 | (name "rust-stable-deref-trait") | ||
| 1762 | (version "1.1.1") | ||
| 1763 | (source | ||
| 1764 | (origin | ||
| 1765 | (method url-fetch) | ||
| 1766 | (uri (crate-uri "stable_deref_trait" version)) | ||
| 1767 | (file-name (string-append name "-" version ".tar.gz")) | ||
| 1768 | (sha256 | ||
| 1769 | (base32 | ||
| 1770 | "1j2lkgakksmz4vc5hfawcch2ipiskrhjs1sih0f3br7s7rys58fv")))) | ||
| 1771 | (build-system cargo-build-system) | ||
| 1772 | (home-page "https://github.com/storyyeller/stable_deref_trait0") | ||
| 1773 | (synopsis "Defines an unsafe marker trait, StableDeref") | ||
| 1774 | (description | ||
| 1775 | "This crate defines an unsafe marker trait, StableDeref, for container | ||
| 1776 | types which deref to a fixed address which is valid even when the containing | ||
| 1777 | type is moved. For example, Box, Vec, Rc, Arc and String implement this trait. | ||
| 1778 | Additionally, it defines CloneStableDeref for types like Rc where clones deref | ||
| 1779 | to the same address.") | ||
| 1780 | (license (list license:asl2.0 | ||
| 1781 | license:expat)))) | ||
| 1782 | |||
| 703 | (define-public rust-stdweb-internal-runtime | 1783 | (define-public rust-stdweb-internal-runtime |
| 704 | (package | 1784 | (package |
| 705 | (name "rust-stdweb-internal-runtime") | 1785 | (name "rust-stdweb-internal-runtime") |
| @@ -720,6 +1800,53 @@ crate.") | |||
| 720 | (license (list license:asl2.0 | 1800 | (license (list license:asl2.0 |
| 721 | license:expat)))) | 1801 | license:expat)))) |
| 722 | 1802 | ||
| 1803 | (define-public rust-stdweb-internal-test-macro | ||
| 1804 | (package | ||
| 1805 | (name "rust-stdweb-internal-test-macro") | ||
| 1806 | (version "0.1.0") | ||
| 1807 | (source | ||
| 1808 | (origin | ||
| 1809 | (method url-fetch) | ||
| 1810 | (uri (crate-uri "stdweb-internal-test-macro" version)) | ||
| 1811 | (file-name (string-append name "-" version ".tar.gz")) | ||
| 1812 | (sha256 | ||
| 1813 | (base32 | ||
| 1814 | "12rrm7p77xnm3xacgn3rgniiyyjb4gq7902wpbljsvbx045z69l2")))) | ||
| 1815 | (build-system cargo-build-system) | ||
| 1816 | (arguments | ||
| 1817 | `(#:cargo-inputs | ||
| 1818 | (("rust-proc-macro2" ,rust-proc-macro2) | ||
| 1819 | ("rust-quote" ,rust-quote)))) | ||
| 1820 | (home-page "https://github.com/koute/stdweb") | ||
| 1821 | (synopsis "Internal crate of the `stdweb` crate") | ||
| 1822 | (description | ||
| 1823 | "Internal crate of the @code{stdweb} crate.") | ||
| 1824 | (license (list license:asl2.0 | ||
| 1825 | license:expat)))) | ||
| 1826 | |||
| 1827 | (define-public rust-streaming-stats | ||
| 1828 | (package | ||
| 1829 | (name "rust-streaming-stats") | ||
| 1830 | (version "0.2.2") | ||
| 1831 | (source | ||
| 1832 | (origin | ||
| 1833 | (method url-fetch) | ||
| 1834 | (uri (crate-uri "streaming-stats" version)) | ||
| 1835 | (file-name (string-append name "-" version ".tar.gz")) | ||
| 1836 | (sha256 | ||
| 1837 | (base32 | ||
| 1838 | "0l7xz4g6709s80zqpvlhrg0qhgz64r94cwhmfsg8xhabgznbp2px")))) | ||
| 1839 | (build-system cargo-build-system) | ||
| 1840 | (arguments | ||
| 1841 | `(#:cargo-inputs | ||
| 1842 | (("rust-num-traits" ,rust-num-traits)))) | ||
| 1843 | (home-page "https://github.com/BurntSushi/rust-stats") | ||
| 1844 | (synopsis "Compute basic statistics on streams") | ||
| 1845 | (description | ||
| 1846 | "Experimental crate for computing basic statistics on streams.") | ||
| 1847 | (license (list license:unlicense | ||
| 1848 | license:expat)))) | ||
| 1849 | |||
| 723 | (define-public rust-strsim | 1850 | (define-public rust-strsim |
| 724 | (package | 1851 | (package |
| 725 | (name "rust-strsim") | 1852 | (name "rust-strsim") |
| @@ -759,6 +1886,242 @@ and Jaro-Winkler.") | |||
| 759 | "This package provides helper test traits for synstructure doctests.") | 1886 | "This package provides helper test traits for synstructure doctests.") |
| 760 | (license license:expat))) | 1887 | (license license:expat))) |
| 761 | 1888 | ||
| 1889 | (define-public rust-termcolor | ||
| 1890 | (package | ||
| 1891 | (name "rust-termcolor") | ||
| 1892 | (version "1.0.5") | ||
| 1893 | (source | ||
| 1894 | (origin | ||
| 1895 | (method url-fetch) | ||
| 1896 | (uri (crate-uri "termcolor" version)) | ||
| 1897 | (file-name (string-append name "-" version ".tar.gz")) | ||
| 1898 | (sha256 | ||
| 1899 | (base32 | ||
| 1900 | "0vjfsn1a8zvqhnrbygrz1id6yckwv1dncw3w4zj65qdx0f00kmln")))) | ||
| 1901 | (build-system cargo-build-system) | ||
| 1902 | (arguments | ||
| 1903 | `(#:cargo-inputs | ||
| 1904 | (("rust-wincolor" ,rust-wincolor)))) | ||
| 1905 | (home-page "https://github.com/BurntSushi/termcolor") | ||
| 1906 | (synopsis "Library for writing colored text to a terminal") | ||
| 1907 | (description "This package provides a simple cross platform library for | ||
| 1908 | writing colored text to a terminal.") | ||
| 1909 | (license (list license:unlicense | ||
| 1910 | license:expat)))) | ||
| 1911 | |||
| 1912 | (define-public rust-termios | ||
| 1913 | (package | ||
| 1914 | (name "rust-termios") | ||
| 1915 | (version "0.3.1") | ||
| 1916 | (source | ||
| 1917 | (origin | ||
| 1918 | (method url-fetch) | ||
| 1919 | (uri (crate-uri "termios" version)) | ||
| 1920 | (file-name (string-append name "-" version ".tar.gz")) | ||
| 1921 | (sha256 | ||
| 1922 | (base32 | ||
| 1923 | "09any1p4jp4bphvb5ikagnvwjc3xn2djchy96nkpa782xb2j1dkj")))) | ||
| 1924 | (build-system cargo-build-system) | ||
| 1925 | (arguments | ||
| 1926 | `(#:cargo-inputs (("rust-libc" ,rust-libc)))) | ||
| 1927 | (home-page "https://github.com/dcuddeback/termios-rs") | ||
| 1928 | (synopsis "Safe bindings for the termios library") | ||
| 1929 | (description | ||
| 1930 | "The termios crate provides safe bindings for the Rust programming language | ||
| 1931 | to the terminal I/O interface implemented by Unix operating systems. The safe | ||
| 1932 | bindings are a small wrapper around the raw C functions, which converts integer | ||
| 1933 | return values to @code{std::io::Result} to indicate success or failure.") | ||
| 1934 | (license license:expat))) | ||
| 1935 | |||
| 1936 | (define-public rust-thread-local | ||
| 1937 | (package | ||
| 1938 | (name "rust-thread-local") | ||
| 1939 | (version "0.3.6") | ||
| 1940 | (source | ||
| 1941 | (origin | ||
| 1942 | (method url-fetch) | ||
| 1943 | (uri (crate-uri "thread_local" version)) | ||
| 1944 | (file-name (string-append name "-" version ".tar.gz")) | ||
| 1945 | (sha256 | ||
| 1946 | (base32 | ||
| 1947 | "06rzik99p8c5js8238yhc8rk6np543ylb1dy9nrw5v80j0r3xdf6")))) | ||
| 1948 | (build-system cargo-build-system) | ||
| 1949 | (arguments | ||
| 1950 | `(#:cargo-inputs | ||
| 1951 | (("rust-lazy-static" ,rust-lazy-static)))) | ||
| 1952 | (home-page "https://github.com/Amanieu/thread_local-rs") | ||
| 1953 | (synopsis "Per-object thread-local storage") | ||
| 1954 | (description "Per-object thread-local storage") | ||
| 1955 | (license (list license:asl2.0 | ||
| 1956 | license:expat)))) | ||
| 1957 | |||
| 1958 | (define-public rust-threadpool | ||
| 1959 | (package | ||
| 1960 | (name "rust-threadpool") | ||
| 1961 | (version "1.7.1") | ||
| 1962 | (source | ||
| 1963 | (origin | ||
| 1964 | (method url-fetch) | ||
| 1965 | (uri (crate-uri "threadpool" version)) | ||
| 1966 | (file-name (string-append name "-" version ".tar.gz")) | ||
| 1967 | (sha256 | ||
| 1968 | (base32 | ||
| 1969 | "0rd89n1q7vy47w4c32cnynibffv9kj3jy3dwr0536n9lbw5ckw72")))) | ||
| 1970 | (build-system cargo-build-system) | ||
| 1971 | (arguments | ||
| 1972 | `(#:cargo-inputs | ||
| 1973 | (("rust-num-cpus" ,rust-num-cpus)))) | ||
| 1974 | (home-page "https://github.com/rust-threadpool/rust-threadpool") | ||
| 1975 | (synopsis "Thread pool for running jobs on a fixed set of worker threads") | ||
| 1976 | (description | ||
| 1977 | "This package provides a thread pool for running a number of jobs on a | ||
| 1978 | fixed set of worker threads.") | ||
| 1979 | (license (list license:asl2.0 | ||
| 1980 | license:expat)))) | ||
| 1981 | |||
| 1982 | (define-public rust-tokio-mock-task | ||
| 1983 | (package | ||
| 1984 | (name "rust-tokio-mock-task") | ||
| 1985 | (version "0.1.1") | ||
| 1986 | (source | ||
| 1987 | (origin | ||
| 1988 | (method url-fetch) | ||
| 1989 | (uri (crate-uri "tokio-mock-task" version)) | ||
| 1990 | (file-name (string-append name "-" version ".tar.gz")) | ||
| 1991 | (sha256 | ||
| 1992 | (base32 | ||
| 1993 | "1y7q83qfk9ljjfvs82b453pmz9x1v3d6kr4x55j8mal01s6790dw")))) | ||
| 1994 | (build-system cargo-build-system) | ||
| 1995 | (arguments | ||
| 1996 | `(#:cargo-inputs (("rust-futures" ,rust-futures)))) | ||
| 1997 | (home-page "https://github.com/carllerche/tokio-mock-task") | ||
| 1998 | (synopsis "Mock a Tokio task") | ||
| 1999 | (description "Mock a Tokio task") | ||
| 2000 | (license license:expat))) | ||
| 2001 | |||
| 2002 | (define-public rust-tracing-core | ||
| 2003 | (package | ||
| 2004 | (name "rust-tracing-core") | ||
| 2005 | (version "0.1.2") | ||
| 2006 | (source | ||
| 2007 | (origin | ||
| 2008 | (method url-fetch) | ||
| 2009 | (uri (crate-uri "tracing-core" version)) | ||
| 2010 | (file-name (string-append name "-" version ".tar.gz")) | ||
| 2011 | (sha256 | ||
| 2012 | (base32 | ||
| 2013 | "01fa73wzw2m5ybi3kkd52dgrw97mgc3i6inmhwys46ab28giwnxi")))) | ||
| 2014 | (build-system cargo-build-system) | ||
| 2015 | (arguments | ||
| 2016 | `(#:cargo-inputs | ||
| 2017 | (("rust-lazy-static" ,rust-lazy-static)))) | ||
| 2018 | (home-page "https://tokio.rs") | ||
| 2019 | (synopsis "Core primitives for application-level tracing") | ||
| 2020 | (description | ||
| 2021 | "Core primitives for application-level tracing.") | ||
| 2022 | (license (list license:asl2.0 | ||
| 2023 | license:expat)))) | ||
| 2024 | |||
| 2025 | (define-public rust-traitobject | ||
| 2026 | (package | ||
| 2027 | (name "rust-traitobject") | ||
| 2028 | (version "0.1.0") | ||
| 2029 | (source | ||
| 2030 | (origin | ||
| 2031 | (method url-fetch) | ||
| 2032 | (uri (crate-uri "traitobject" version)) | ||
| 2033 | (file-name (string-append name "-" version ".tar.gz")) | ||
| 2034 | (sha256 | ||
| 2035 | (base32 | ||
| 2036 | "0yb0n8822mr59j200fyr2fxgzzgqljyxflx9y8bdy3rlaqngilgg")))) | ||
| 2037 | (build-system cargo-build-system) | ||
| 2038 | (home-page "https://github.com/reem/rust-traitobject.git") | ||
| 2039 | (synopsis "Unsafe helpers for dealing with raw trait objects") | ||
| 2040 | (description "Unsafe helpers for dealing with raw trait objects.") | ||
| 2041 | (license (list license:asl2.0 | ||
| 2042 | license:expat)))) | ||
| 2043 | |||
| 2044 | (define-public rust-try-from | ||
| 2045 | (package | ||
| 2046 | (name "rust-try-from") | ||
| 2047 | (version "0.3.2") | ||
| 2048 | (source | ||
| 2049 | (origin | ||
| 2050 | (method url-fetch) | ||
| 2051 | (uri (crate-uri "try_from" version)) | ||
| 2052 | (file-name (string-append name "-" version ".tar.gz")) | ||
| 2053 | (sha256 | ||
| 2054 | (base32 | ||
| 2055 | "12wdd4ja7047sd3rx70hv2056hyc8gcdllcx3a41g1rnw64kng98")))) | ||
| 2056 | (build-system cargo-build-system) | ||
| 2057 | (arguments | ||
| 2058 | `(#:cargo-inputs | ||
| 2059 | (("rust-cfg-if" ,rust-cfg-if)))) | ||
| 2060 | (home-page "https://github.com/derekjw/try_from") | ||
| 2061 | (synopsis "TryFrom and TryInto traits for failable conversions") | ||
| 2062 | (description | ||
| 2063 | "TryFrom and TryInto traits for failable conversions that return a Result.") | ||
| 2064 | (license license:expat))) | ||
| 2065 | |||
| 2066 | (define-public rust-try-lock | ||
| 2067 | (package | ||
| 2068 | (name "rust-try-lock") | ||
| 2069 | (version "0.2.2") | ||
| 2070 | (source | ||
| 2071 | (origin | ||
| 2072 | (method url-fetch) | ||
| 2073 | (uri (crate-uri "try-lock" version)) | ||
| 2074 | (file-name (string-append name "-" version ".tar.gz")) | ||
| 2075 | (sha256 | ||
| 2076 | (base32 | ||
| 2077 | "10p36rx6pqi9d0zr876xa8vksx2m66ha45myakl50rn08dxyn176")))) | ||
| 2078 | (build-system cargo-build-system) | ||
| 2079 | (home-page "https://github.com/seanmonstar/try-lock") | ||
| 2080 | (synopsis "Lightweight atomic lock") | ||
| 2081 | (description | ||
| 2082 | "This package provides a lightweight atomic lock.") | ||
| 2083 | (license license:expat))) | ||
| 2084 | |||
| 2085 | (define-public rust-typeable | ||
| 2086 | (package | ||
| 2087 | (name "rust-typeable") | ||
| 2088 | (version "0.1.2") | ||
| 2089 | (source | ||
| 2090 | (origin | ||
| 2091 | (method url-fetch) | ||
| 2092 | (uri (crate-uri "typeable" version)) | ||
| 2093 | (file-name (string-append name "-" version ".tar.gz")) | ||
| 2094 | (sha256 | ||
| 2095 | (base32 | ||
| 2096 | "11w8dywgnm32hb291izjvh4zjd037ccnkk77ahk63l913zwzc40l")))) | ||
| 2097 | (build-system cargo-build-system) | ||
| 2098 | (home-page "https://github.com/reem/rust-typeable") | ||
| 2099 | (synopsis "Exposes Typeable, for getting TypeIds at runtime") | ||
| 2100 | (description "Exposes Typeable, for getting TypeIds at runtime.") | ||
| 2101 | (license license:expat))) | ||
| 2102 | |||
| 2103 | (define-public rust-typemap | ||
| 2104 | (package | ||
| 2105 | (name "rust-typemap") | ||
| 2106 | (version "0.3.3") | ||
| 2107 | (source | ||
| 2108 | (origin | ||
| 2109 | (method url-fetch) | ||
| 2110 | (uri (crate-uri "typemap" version)) | ||
| 2111 | (file-name (string-append name "-" version ".tar.gz")) | ||
| 2112 | (sha256 | ||
| 2113 | (base32 | ||
| 2114 | "1xm1gbvz9qisj1l6d36hrl9pw8imr8ngs6qyanjnsad3h0yfcfv5")))) | ||
| 2115 | (build-system cargo-build-system) | ||
| 2116 | (arguments | ||
| 2117 | `(#:cargo-inputs | ||
| 2118 | (("rust-unsafe-any" ,rust-unsafe-any)))) | ||
| 2119 | (home-page "https://github.com/reem/rust-typemap") | ||
| 2120 | (synopsis "Typesafe store for many value types") | ||
| 2121 | (description | ||
| 2122 | "A typesafe store for many value types.") | ||
| 2123 | (license license:expat))) | ||
| 2124 | |||
| 762 | (define-public rust-typenum | 2125 | (define-public rust-typenum |
| 763 | (package | 2126 | (package |
| 764 | (name "rust-typenum") | 2127 | (name "rust-typenum") |
| @@ -781,6 +2144,29 @@ implementation is incomplete.") | |||
| 781 | (license (list license:asl2.0 | 2144 | (license (list license:asl2.0 |
| 782 | license:expat)))) | 2145 | license:expat)))) |
| 783 | 2146 | ||
| 2147 | (define-public rust-ucd-trie | ||
| 2148 | (package | ||
| 2149 | (name "rust-ucd-trie") | ||
| 2150 | (version "0.1.2") | ||
| 2151 | (source | ||
| 2152 | (origin | ||
| 2153 | (method url-fetch) | ||
| 2154 | (uri (crate-uri "ucd-trie" version)) | ||
| 2155 | (file-name (string-append name "-" version ".tar.gz")) | ||
| 2156 | (sha256 | ||
| 2157 | (base32 | ||
| 2158 | "1hh6kyzh5xygwy96wfmsf8v8czlzhps2lgbcyhj1xzy1w1xys04g")))) | ||
| 2159 | (build-system cargo-build-system) | ||
| 2160 | (arguments | ||
| 2161 | `(#:cargo-development-inputs | ||
| 2162 | (("rust-lazy-static" ,rust-lazy-static)))) | ||
| 2163 | (home-page "https://github.com/BurntSushi/ucd-generate") | ||
| 2164 | (synopsis "Trie for storing Unicode codepoint sets and maps") | ||
| 2165 | (description | ||
| 2166 | "This package provides a trie for storing Unicode codepoint sets and maps.") | ||
| 2167 | (license (list license:asl2.0 | ||
| 2168 | license:expat)))) | ||
| 2169 | |||
| 784 | (define-public rust-ucd-util | 2170 | (define-public rust-ucd-util |
| 785 | (package | 2171 | (package |
| 786 | (name "rust-ucd-util") | 2172 | (name "rust-ucd-util") |
| @@ -801,6 +2187,28 @@ with the Unicode character database.") | |||
| 801 | (license (list license:asl2.0 | 2187 | (license (list license:asl2.0 |
| 802 | license:expat)))) | 2188 | license:expat)))) |
| 803 | 2189 | ||
| 2190 | (define-public rust-unicase | ||
| 2191 | (package | ||
| 2192 | (name "rust-unicase") | ||
| 2193 | (version "2.4.0") | ||
| 2194 | (source | ||
| 2195 | (origin | ||
| 2196 | (method url-fetch) | ||
| 2197 | (uri (crate-uri "unicase" version)) | ||
| 2198 | (file-name (string-append name "-" version ".tar.gz")) | ||
| 2199 | (sha256 | ||
| 2200 | (base32 | ||
| 2201 | "1xmpmkakhhblq7dzab1kwyv925kv7fqjkjsxjspg6ix9n88makm8")))) | ||
| 2202 | (build-system cargo-build-system) | ||
| 2203 | (arguments | ||
| 2204 | `(#:cargo-inputs (("rust-version-check" ,rust-version-check-0.1)))) | ||
| 2205 | (home-page "https://github.com/seanmonstar/unicase") | ||
| 2206 | (synopsis "Case-insensitive wrapper around strings") | ||
| 2207 | (description | ||
| 2208 | "A case-insensitive wrapper around strings.") | ||
| 2209 | (license (list license:asl2.0 | ||
| 2210 | license:expat)))) | ||
| 2211 | |||
| 804 | (define-public rust-unicode-width | 2212 | (define-public rust-unicode-width |
| 805 | (package | 2213 | (package |
| 806 | (name "rust-unicode-width") | 2214 | (name "rust-unicode-width") |
| @@ -863,6 +2271,151 @@ whitespace from a string.") | |||
| 863 | (license (list license:asl2.0 | 2271 | (license (list license:asl2.0 |
| 864 | license:expat)))) | 2272 | license:expat)))) |
| 865 | 2273 | ||
| 2274 | (define-public rust-unsafe-any | ||
| 2275 | (package | ||
| 2276 | (name "rust-unsafe-any") | ||
| 2277 | (version "0.4.2") | ||
| 2278 | (source | ||
| 2279 | (origin | ||
| 2280 | (method url-fetch) | ||
| 2281 | (uri (crate-uri "unsafe-any" version)) | ||
| 2282 | (file-name (string-append name "-" version ".tar.gz")) | ||
| 2283 | (sha256 | ||
| 2284 | (base32 | ||
| 2285 | "0zwwphsqkw5qaiqmjwngnfpv9ym85qcsyj7adip9qplzjzbn00zk")))) | ||
| 2286 | (build-system cargo-build-system) | ||
| 2287 | (arguments | ||
| 2288 | `(#:cargo-inputs | ||
| 2289 | (("rust-traitobject" ,rust-traitobject)))) | ||
| 2290 | (home-page "https://tokio.rs") | ||
| 2291 | (synopsis "Traits and implementations for unchecked downcasting") | ||
| 2292 | (description | ||
| 2293 | "Traits and implementations for unchecked downcasting.") | ||
| 2294 | (license license:expat))) | ||
| 2295 | |||
| 2296 | (define-public rust-untrusted | ||
| 2297 | (package | ||
| 2298 | (name "rust-untrusted") | ||
| 2299 | (version "0.7.0") | ||
| 2300 | (source | ||
| 2301 | (origin | ||
| 2302 | (method url-fetch) | ||
| 2303 | (uri (crate-uri "untrusted" version)) | ||
| 2304 | (file-name (string-append name "-" version ".tar.gz")) | ||
| 2305 | (sha256 | ||
| 2306 | (base32 | ||
| 2307 | "1kmfykcwif6ashkwg54gcnhxj03kpba2i9vc7z5rpr0xlgvrwdk0")))) | ||
| 2308 | (build-system cargo-build-system) | ||
| 2309 | (home-page "https://github.com/briansmith/untrusted") | ||
| 2310 | (synopsis "Zero-allocation parsing of untrusted inputs in Rust") | ||
| 2311 | (description | ||
| 2312 | "Safe, fast, zero-panic, zero-crashing, zero-allocation parsing of | ||
| 2313 | untrusted inputs in Rust.") | ||
| 2314 | (license license:isc))) | ||
| 2315 | |||
| 2316 | (define-public rust-version-check | ||
| 2317 | (package | ||
| 2318 | (name "rust-version-check") | ||
| 2319 | (version "0.9.1") | ||
| 2320 | (source | ||
| 2321 | (origin | ||
| 2322 | (method url-fetch) | ||
| 2323 | (uri (crate-uri "version_check" version)) | ||
| 2324 | (file-name (string-append name "-" version ".tar.gz")) | ||
| 2325 | (sha256 | ||
| 2326 | (base32 | ||
| 2327 | "1kikqlnggii1rvnxrbls55sc46lxvinz5k3giscgncjj4p87b1q7")))) | ||
| 2328 | (build-system cargo-build-system) | ||
| 2329 | (home-page "https://github.com/SergioBenitez/version_check") | ||
| 2330 | (synopsis "Check that the installed rustc meets some version requirements") | ||
| 2331 | (description | ||
| 2332 | "This tiny crate checks that the running or installed rustc meets some | ||
| 2333 | version requirements. The version is queried by calling the Rust compiler with | ||
| 2334 | @code{--version}. The path to the compiler is determined first via the | ||
| 2335 | @code{RUSTC} environment variable. If it is not set, then @code{rustc} is used. | ||
| 2336 | If that fails, no determination is made, and calls return None.") | ||
| 2337 | (license (list license:asl2.0 | ||
| 2338 | license:expat)))) | ||
| 2339 | |||
| 2340 | (define-public rust-version-check-0.1 | ||
| 2341 | (package | ||
| 2342 | (inherit rust-version-check) | ||
| 2343 | (name "rust-version-check") | ||
| 2344 | (version "0.1.5") | ||
| 2345 | (source | ||
| 2346 | (origin | ||
| 2347 | (method url-fetch) | ||
| 2348 | (uri (crate-uri "version_check" version)) | ||
| 2349 | (file-name (string-append name "-" version ".tar.gz")) | ||
| 2350 | (sha256 | ||
| 2351 | (base32 | ||
| 2352 | "1pf91pvj8n6akh7w6j5ypka6aqz08b3qpzgs0ak2kjf4frkiljwi")))))) | ||
| 2353 | |||
| 2354 | (define-public rust-void | ||
| 2355 | (package | ||
| 2356 | (name "rust-void") | ||
| 2357 | (version "1.0.2") | ||
| 2358 | (source | ||
| 2359 | (origin | ||
| 2360 | (method url-fetch) | ||
| 2361 | (uri (crate-uri "void" version)) | ||
| 2362 | (file-name (string-append name "-" version ".tar.gz")) | ||
| 2363 | (sha256 | ||
| 2364 | (base32 | ||
| 2365 | "0zc8f0ksxvmhvgx4fdg0zyn6vdnbxd2xv9hfx4nhzg6kbs4f80ka")))) | ||
| 2366 | (build-system cargo-build-system) | ||
| 2367 | (home-page "https://github.com/reem/rust-void.git") | ||
| 2368 | (synopsis "Void type for use in statically impossible cases") | ||
| 2369 | (description | ||
| 2370 | "The uninhabited void type for use in statically impossible cases.") | ||
| 2371 | (license license:expat))) | ||
| 2372 | |||
| 2373 | (define-public rust-walkdir | ||
| 2374 | (package | ||
| 2375 | (name "rust-walkdir") | ||
| 2376 | (version "2.2.9") | ||
| 2377 | (source | ||
| 2378 | (origin | ||
| 2379 | (method url-fetch) | ||
| 2380 | (uri (crate-uri "walkdir" version)) | ||
| 2381 | (file-name (string-append name "-" version ".tar.gz")) | ||
| 2382 | (sha256 | ||
| 2383 | (base32 | ||
| 2384 | "07ppalpvxkf8cnqr64np422792y4z5bs9m8b4nrflh5rm17wjn4n")))) | ||
| 2385 | (build-system cargo-build-system) | ||
| 2386 | (arguments | ||
| 2387 | `(#:cargo-inputs | ||
| 2388 | (("rust-same-file" ,rust-same-file) | ||
| 2389 | ("rust-winapi" ,rust-winapi) | ||
| 2390 | ("rust-winapi-util" ,rust-winapi-util)) | ||
| 2391 | #:cargo-development-inputs | ||
| 2392 | (("rust-doc-comment" ,rust-doc-comment)))) | ||
| 2393 | (home-page "https://github.com/BurntSushi/walkdir") | ||
| 2394 | (synopsis "Recursively walk a directory") | ||
| 2395 | (description "Recursively walk a directory.") | ||
| 2396 | (license (list license:unlicense | ||
| 2397 | license:expat)))) | ||
| 2398 | |||
| 2399 | (define-public rust-wasi | ||
| 2400 | (package | ||
| 2401 | (name "rust-wasi") | ||
| 2402 | (version "0.5.0") | ||
| 2403 | (source | ||
| 2404 | (origin | ||
| 2405 | (method url-fetch) | ||
| 2406 | (uri (crate-uri "wasi" version)) | ||
| 2407 | (file-name | ||
| 2408 | (string-append name "-" version ".tar.gz")) | ||
| 2409 | (sha256 | ||
| 2410 | (base32 | ||
| 2411 | "1ir3pd4phdfml0cbziw9bqp7mnk0vfp9biy8bh25lln6raml4m7x")))) | ||
| 2412 | (build-system cargo-build-system) | ||
| 2413 | (home-page "https://github.com/CraneStation/rust-wasi") | ||
| 2414 | (synopsis "Experimental WASI API bindings for Rust") | ||
| 2415 | (description "This package contains experimental WASI API bindings | ||
| 2416 | in Rust.") | ||
| 2417 | (license license:asl2.0))) | ||
| 2418 | |||
| 866 | (define-public rust-wasm-bindgen-shared | 2419 | (define-public rust-wasm-bindgen-shared |
| 867 | (package | 2420 | (package |
| 868 | (name "rust-wasm-bindgen-shared") | 2421 | (name "rust-wasm-bindgen-shared") |
| @@ -883,10 +2436,59 @@ whitespace from a string.") | |||
| 883 | (license (list license:asl2.0 | 2436 | (license (list license:asl2.0 |
| 884 | license:expat)))) | 2437 | license:expat)))) |
| 885 | 2438 | ||
| 2439 | (define-public rust-wasm-bindgen-test-macro | ||
| 2440 | (package | ||
| 2441 | (name "rust-wasm-bindgen-test-macro") | ||
| 2442 | (version "0.2.48") | ||
| 2443 | (source | ||
| 2444 | (origin | ||
| 2445 | (method url-fetch) | ||
| 2446 | (uri (crate-uri "wasm-bindgen-test-macro" version)) | ||
| 2447 | (file-name (string-append name "-" version ".tar.gz")) | ||
| 2448 | (sha256 | ||
| 2449 | (base32 | ||
| 2450 | "0n28mr6vncf1k1qr2b5bvfxq4jvqkjdzq0z0ab6w2f5d6v8q3q3l")))) | ||
| 2451 | (build-system cargo-build-system) | ||
| 2452 | (arguments | ||
| 2453 | `(#:cargo-inputs | ||
| 2454 | (("rust-proc-macro2" ,rust-proc-macro2) | ||
| 2455 | ("rust-quote" ,rust-quote)))) | ||
| 2456 | (home-page "https://github.com/rustwasm/wasm-bindgen") | ||
| 2457 | (synopsis "Internal testing macro for wasm-bindgen") | ||
| 2458 | (description | ||
| 2459 | "This library contains the internal testing macro for wasm-bindgen.") | ||
| 2460 | (license (list license:asl2.0 | ||
| 2461 | license:expat)))) | ||
| 2462 | |||
| 2463 | (define-public rust-widestring | ||
| 2464 | (package | ||
| 2465 | (name "rust-widestring") | ||
| 2466 | (version "0.4.0") | ||
| 2467 | (source | ||
| 2468 | (origin | ||
| 2469 | (method url-fetch) | ||
| 2470 | (uri (crate-uri "widestring" version)) | ||
| 2471 | (file-name (string-append name "-" version ".tar.gz")) | ||
| 2472 | (sha256 | ||
| 2473 | (base32 | ||
| 2474 | "1dhx6dndjsz1y7c9w06922412kdxyrrkqblvggm76mh8z17hxz7g")))) | ||
| 2475 | (build-system cargo-build-system) | ||
| 2476 | (arguments | ||
| 2477 | `(#:cargo-development-inputs | ||
| 2478 | (("rust-winapi" ,rust-winapi)))) | ||
| 2479 | (home-page "https://github.com/starkat99/widestring-rs") | ||
| 2480 | (synopsis "Wide string Rust FFI library") | ||
| 2481 | (description | ||
| 2482 | "A wide string Rust FFI library for converting to and from wide strings, | ||
| 2483 | such as those often used in Windows API or other FFI libaries. Both UTF-16 and | ||
| 2484 | UTF-32 types are provided, including support for malformed encoding.") | ||
| 2485 | (license (list license:asl2.0 | ||
| 2486 | license:expat)))) | ||
| 2487 | |||
| 886 | (define-public rust-winapi | 2488 | (define-public rust-winapi |
| 887 | (package | 2489 | (package |
| 888 | (name "rust-winapi") | 2490 | (name "rust-winapi") |
| 889 | (version "0.3.7") | 2491 | (version "0.3.8") |
| 890 | (source | 2492 | (source |
| 891 | (origin | 2493 | (origin |
| 892 | (method url-fetch) | 2494 | (method url-fetch) |
| @@ -894,7 +2496,7 @@ whitespace from a string.") | |||
| 894 | (file-name (string-append name "-" version ".tar.gz")) | 2496 | (file-name (string-append name "-" version ".tar.gz")) |
| 895 | (sha256 | 2497 | (sha256 |
| 896 | (base32 | 2498 | (base32 |
| 897 | "0w7pbhcl087lkggxdflfp2i92rq89ahsfdkjkv44fgmiy9m3h3pi")))) | 2499 | "1ii9j9lzrhwri0902652awifzx9fpayimbp6hfhhc296xcg0k4w0")))) |
| 898 | (build-system cargo-build-system) | 2500 | (build-system cargo-build-system) |
| 899 | (arguments | 2501 | (arguments |
| 900 | `(#:cargo-inputs | 2502 | `(#:cargo-inputs |
| @@ -909,6 +2511,46 @@ whitespace from a string.") | |||
| 909 | (license (list license:asl2.0 | 2511 | (license (list license:asl2.0 |
| 910 | license:expat)))) | 2512 | license:expat)))) |
| 911 | 2513 | ||
| 2514 | (define-public rust-winapi-0.2 | ||
| 2515 | (package | ||
| 2516 | (inherit rust-winapi) | ||
| 2517 | (name "rust-winapi") | ||
| 2518 | (version "0.2.8") | ||
| 2519 | (source | ||
| 2520 | (origin | ||
| 2521 | (method url-fetch) | ||
| 2522 | (uri (crate-uri "winapi" version)) | ||
| 2523 | (file-name (string-append name "-" version ".tar.gz")) | ||
| 2524 | (sha256 | ||
| 2525 | (base32 | ||
| 2526 | "0yh816lh6lf56dpsgxy189c2ai1z3j8mw9si6izqb6wsjkbcjz8n")))) | ||
| 2527 | ;; We do not want to package 48 -sys crates for a package we do not want. | ||
| 2528 | ;; They are all dev dependencies, so we skip building and testing. | ||
| 2529 | (arguments | ||
| 2530 | `(#:tests? #f | ||
| 2531 | #:phases | ||
| 2532 | (modify-phases %standard-phases | ||
| 2533 | (delete 'build)))))) | ||
| 2534 | |||
| 2535 | (define-public rust-winapi-build | ||
| 2536 | (package | ||
| 2537 | (name "rust-winapi-build") | ||
| 2538 | (version "0.1.1") | ||
| 2539 | (source | ||
| 2540 | (origin | ||
| 2541 | (method url-fetch) | ||
| 2542 | (uri (crate-uri "winapi-build" version)) | ||
| 2543 | (file-name (string-append name "-" version ".tar.gz")) | ||
| 2544 | (sha256 | ||
| 2545 | (base32 | ||
| 2546 | "1g4rqsgjky0a7530qajn2bbfcrl2v0zb39idgdws9b1l7gp5wc9d")))) | ||
| 2547 | (build-system cargo-build-system) | ||
| 2548 | (home-page "https://github.com/retep998/winapi-rs") | ||
| 2549 | (synopsis "Common code for build.rs in WinAPI -sys crates") | ||
| 2550 | (description | ||
| 2551 | "Common code for build.rs in WinAPI -sys crates.") | ||
| 2552 | (license license:expat))) | ||
| 2553 | |||
| 912 | (define-public rust-winapi-i686-pc-windows-gnu | 2554 | (define-public rust-winapi-i686-pc-windows-gnu |
| 913 | (package | 2555 | (package |
| 914 | (name "rust-winapi-i686-pc-windows-gnu") | 2556 | (name "rust-winapi-i686-pc-windows-gnu") |
| @@ -930,6 +2572,29 @@ i686-pc-windows-gnu target. Please don't use this crate directly, depend on | |||
| 930 | (license (list license:asl2.0 | 2572 | (license (list license:asl2.0 |
| 931 | license:expat)))) | 2573 | license:expat)))) |
| 932 | 2574 | ||
| 2575 | (define-public rust-winapi-util | ||
| 2576 | (package | ||
| 2577 | (name "rust-winapi-util") | ||
| 2578 | (version "0.1.2") | ||
| 2579 | (source | ||
| 2580 | (origin | ||
| 2581 | (method url-fetch) | ||
| 2582 | (uri (crate-uri "winapi-util" version)) | ||
| 2583 | (file-name (string-append name "-" version ".tar.gz")) | ||
| 2584 | (sha256 | ||
| 2585 | (base32 | ||
| 2586 | "1j839dc6y8vszvrsb7yk0qvs0w6asnahxzbyans37vnsw6vbls3i")))) | ||
| 2587 | (build-system cargo-build-system) | ||
| 2588 | (arguments | ||
| 2589 | `(#:cargo-inputs (("rust-winapi" ,rust-winapi)))) | ||
| 2590 | (home-page "https://github.com/BurntSushi/winapi-util") | ||
| 2591 | (synopsis "Dumping ground for high level safe wrappers over winapi") | ||
| 2592 | (description | ||
| 2593 | "This package provides a dumping ground for high level safe wrappers over | ||
| 2594 | winapi.") | ||
| 2595 | (license (list license:unlicense | ||
| 2596 | license:expat)))) | ||
| 2597 | |||
| 933 | (define-public rust-winapi-x86-64-pc-windows-gnu | 2598 | (define-public rust-winapi-x86-64-pc-windows-gnu |
| 934 | (package | 2599 | (package |
| 935 | (name "rust-winapi-x86-64-pc-windows-gnu") | 2600 | (name "rust-winapi-x86-64-pc-windows-gnu") |
| @@ -950,3 +2615,106 @@ x86_64-pc-windows-gnu target. Please don't use this crate directly, depend on | |||
| 950 | @code{winapi} instead.") | 2615 | @code{winapi} instead.") |
| 951 | (license (list license:asl2.0 | 2616 | (license (list license:asl2.0 |
| 952 | license:expat)))) | 2617 | license:expat)))) |
| 2618 | |||
| 2619 | (define-public rust-wincolor | ||
| 2620 | (package | ||
| 2621 | (name "rust-wincolor") | ||
| 2622 | (version "1.0.2") | ||
| 2623 | (source | ||
| 2624 | (origin | ||
| 2625 | (method url-fetch) | ||
| 2626 | (uri (crate-uri "wincolor" version)) | ||
| 2627 | (file-name (string-append name "-" version ".tar.gz")) | ||
| 2628 | (sha256 | ||
| 2629 | (base32 | ||
| 2630 | "1agaf3hcav113i86912ajnw6jxcy4rvkrgyf8gdj8kc031mh3xcn")))) | ||
| 2631 | (build-system cargo-build-system) | ||
| 2632 | (arguments | ||
| 2633 | `(#:cargo-inputs | ||
| 2634 | (("rust-winapi" ,rust-winapi) | ||
| 2635 | ("rust-winapi-util" ,rust-winapi-util)))) | ||
| 2636 | (home-page "https://github.com/BurntSushi/termcolor/tree/master/wincolor") | ||
| 2637 | (synopsis "Windows API for controlling text color in a Windows console") | ||
| 2638 | (description | ||
| 2639 | "This package provides a simple Windows specific API for controlling text | ||
| 2640 | color in a Windows console.") | ||
| 2641 | (license (list license:unlicense | ||
| 2642 | license:expat)))) | ||
| 2643 | |||
| 2644 | (define-public rust-winutil | ||
| 2645 | (package | ||
| 2646 | (name "rust-winutil") | ||
| 2647 | (version "0.1.1") | ||
| 2648 | (source | ||
| 2649 | (origin | ||
| 2650 | (method url-fetch) | ||
| 2651 | (uri (crate-uri "winutil" version)) | ||
| 2652 | (file-name (string-append name "-" version ".tar.gz")) | ||
| 2653 | (sha256 | ||
| 2654 | (base32 | ||
| 2655 | "0vkyl3fbbf05n5ph5yz8sfaccrk9x3qsr25560w6w68ldf5i7bvx")))) | ||
| 2656 | (build-system cargo-build-system) | ||
| 2657 | (arguments | ||
| 2658 | `(#:cargo-inputs | ||
| 2659 | (("rust-winapi" ,rust-winapi)) | ||
| 2660 | ;; This unmaintained crate cannot find winapi when built directly. | ||
| 2661 | #:tests? #f | ||
| 2662 | #:phases | ||
| 2663 | (modify-phases %standard-phases | ||
| 2664 | (delete 'build)))) | ||
| 2665 | (home-page "https://bitbucket.org/DaveLancaster/winutil") | ||
| 2666 | (synopsis "Library wrapping a handful of useful winapi functions") | ||
| 2667 | (description | ||
| 2668 | "A simple library wrapping a handful of useful winapi functions.") | ||
| 2669 | (license license:expat))) | ||
| 2670 | |||
| 2671 | (define-public rust-ws2-32-sys | ||
| 2672 | (package | ||
| 2673 | (name "rust-ws2-32-sys") | ||
| 2674 | (version "0.2.1") | ||
| 2675 | (source | ||
| 2676 | (origin | ||
| 2677 | (method url-fetch) | ||
| 2678 | (uri (crate-uri "ws2_32-sys" version)) | ||
| 2679 | (file-name (string-append name "-" version ".tar.gz")) | ||
| 2680 | (sha256 | ||
| 2681 | (base32 | ||
| 2682 | "0ppscg5qfqaw0gzwv2a4nhn5bn01ff9iwn6ysqnzm4n8s3myz76m")))) | ||
| 2683 | (build-system cargo-build-system) | ||
| 2684 | (arguments | ||
| 2685 | `(#:cargo-inputs | ||
| 2686 | (("rust-winapi" ,rust-winapi-0.2) | ||
| 2687 | ("rust-winapi-build" ,rust-winapi-build)) | ||
| 2688 | #:phases | ||
| 2689 | (modify-phases %standard-phases | ||
| 2690 | (add-after 'unpack 'fix-Cargo-toml | ||
| 2691 | (lambda _ | ||
| 2692 | (substitute* "Cargo.toml" | ||
| 2693 | ((", path =.* }") "}\n")) | ||
| 2694 | #t))))) | ||
| 2695 | (home-page "https://github.com/retep998/winapi-rs") | ||
| 2696 | (synopsis "Function definitions for the Windows API library ws2_32") | ||
| 2697 | (description | ||
| 2698 | "Contains function definitions for the Windows API library ws2_32.") | ||
| 2699 | (license license:expat))) | ||
| 2700 | |||
| 2701 | (define-public rust-xdg | ||
| 2702 | (package | ||
| 2703 | (name "rust-xdg") | ||
| 2704 | (version "2.2.0") | ||
| 2705 | (source | ||
| 2706 | (origin | ||
| 2707 | (method url-fetch) | ||
| 2708 | (uri (crate-uri "xdg" version)) | ||
| 2709 | (file-name (string-append name "-" version ".tar.gz")) | ||
| 2710 | (sha256 | ||
| 2711 | (base32 | ||
| 2712 | "0mws8a0fr3cqk5nh7aq9lmkmhzghvasqy4mhw6nnza06l4d6i2fh")))) | ||
| 2713 | (build-system cargo-build-system) | ||
| 2714 | (home-page "https://github.com/whitequark/rust-xdg") | ||
| 2715 | (synopsis "Store and retrieve files according to XDG specification") | ||
| 2716 | (description | ||
| 2717 | "This package provides a library for storing and retrieving files according | ||
| 2718 | to XDG Base Directory specification") | ||
| 2719 | (license (list license:asl2.0 | ||
| 2720 | license:expat)))) | ||
diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index 467aa5d84c1..22b87460abc 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm | |||
| @@ -594,7 +594,7 @@ should only be used as part of the Guix cups-pk-helper service.") | |||
| 594 | (method url-fetch) | 594 | (method url-fetch) |
| 595 | (uri (string-append | 595 | (uri (string-append |
| 596 | "http://www.openprinting.org/download/foomatic/" | 596 | "http://www.openprinting.org/download/foomatic/" |
| 597 | name "-" version ".tar.gz")) | 597 | "foomatic-filters-" version ".tar.gz")) |
| 598 | (sha256 | 598 | (sha256 |
| 599 | (base32 | 599 | (base32 |
| 600 | "1qrkgbm5jay2r7sh9qbyf0aiyrsl1mdc844hxf7fhw95a0zfbqm2")) | 600 | "1qrkgbm5jay2r7sh9qbyf0aiyrsl1mdc844hxf7fhw95a0zfbqm2")) |
| @@ -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 "20190413") | 642 | (version "20190517") |
| 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 | "0djzp3ddslmzyxkjhzkhkg6qqqm02whjfnfvh5glprkshcskzlg9")))) | 649 | "13gzsd26nq4brx1xzpwmg1qnr4nk7ykgi94qr1hbjqfi561prki4")))) |
| 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/cvassistant.scm b/gnu/packages/cvassistant.scm new file mode 100644 index 00000000000..f57806d734f --- /dev/null +++ b/gnu/packages/cvassistant.scm | |||
| @@ -0,0 +1,90 @@ | |||
| 1 | ;;; GNU Guix --- Functional package management for GNU | ||
| 2 | ;;; Copyright © 2019 Nicolas Goaziou <mail@nicolasgoaziou.fr> | ||
| 3 | ;;; Copyright © 2019 Jesse Gibbons <jgibbons2357+guix@gmail.com> | ||
| 4 | ;;; | ||
| 5 | ;;; This file is part of GNU Guix. | ||
| 6 | ;;; | ||
| 7 | ;;; GNU Guix is free software; you can redistribute it and/or modify it | ||
| 8 | ;;; under the terms of the GNU General Public License as published by | ||
| 9 | ;;; the Free Software Foundation; either version 3 of the License, or (at | ||
| 10 | ;;; your option) any later version. | ||
| 11 | ;;; | ||
| 12 | ;;; GNU Guix is distributed in the hope that it will be useful, but | ||
| 13 | ;;; WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 14 | ;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 15 | ;;; GNU General Public License for more details. | ||
| 16 | ;;; | ||
| 17 | ;;; You should have received a copy of the GNU General Public License | ||
| 18 | ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. | ||
| 19 | |||
| 20 | (define-module (gnu packages cvassistant) | ||
| 21 | #:use-module (guix packages) | ||
| 22 | #:use-module (guix download) | ||
| 23 | #:use-module (guix build-system gnu) | ||
| 24 | #:use-module ((guix licenses) #:prefix license:) | ||
| 25 | #:use-module (gnu packages qt) | ||
| 26 | #:use-module (gnu packages compression)) | ||
| 27 | |||
| 28 | (define-public cvassistant | ||
| 29 | (package | ||
| 30 | (name "cvassistant") | ||
| 31 | (version "3.1.0") | ||
| 32 | (source (origin | ||
| 33 | (method url-fetch) | ||
| 34 | (uri (string-append "mirror://sourceforge/cvassistant/" | ||
| 35 | "cvassistant-" version "-src.tar.bz2")) | ||
| 36 | (sha256 | ||
| 37 | (base32 | ||
| 38 | "1y2680bazyiwm50gdhdd4982ckbjscrkbw2mngyk7yw708iadvr7")))) | ||
| 39 | (build-system gnu-build-system) | ||
| 40 | (arguments | ||
| 41 | `(#:phases | ||
| 42 | (modify-phases %standard-phases | ||
| 43 | (add-after 'unpack 'remove-donation-banner | ||
| 44 | ;; Remove dialog box with a donation link, as suggested by | ||
| 45 | ;; the INSTALL file. | ||
| 46 | (lambda _ | ||
| 47 | (substitute* "controllers/mainwindow.cpp" | ||
| 48 | (("//(#define NO_DONATION_PROMPT)" _ line) line)) | ||
| 49 | #t)) | ||
| 50 | (add-after 'unpack 'fix-quazip-directory | ||
| 51 | (lambda _ | ||
| 52 | (substitute* "models/resumedocument.h" | ||
| 53 | (("quazip(/quazipfile\\.h)" _ suffix) | ||
| 54 | (string-append "quazip5" suffix))) | ||
| 55 | #t)) | ||
| 56 | (add-after 'fix-quazip-directory 'fix-quazip-link | ||
| 57 | (lambda _ | ||
| 58 | (substitute* "CVAssistant.pro" | ||
| 59 | (("lquazip-qt5") | ||
| 60 | "lquazip5")) | ||
| 61 | #t)) | ||
| 62 | (add-after 'fix-quazip-directory 'fix-install-root | ||
| 63 | (lambda* (#:key outputs #:allow-other-keys) | ||
| 64 | (let ((out (assoc-ref outputs "out"))) | ||
| 65 | (substitute* "CVAssistant.pro" | ||
| 66 | (("/usr/(bin|share/)" _ suffix) | ||
| 67 | (string-append out "/" suffix))) | ||
| 68 | #t))) | ||
| 69 | (replace 'configure | ||
| 70 | (lambda _ (invoke "qmake")))))) | ||
| 71 | (inputs | ||
| 72 | `(("qtbase" ,qtbase) | ||
| 73 | ("quazip" ,quazip) | ||
| 74 | ("zlib" ,zlib))) | ||
| 75 | (home-page "https://cvassistant.sourceforge.io/") | ||
| 76 | (synopsis "Job application organizer") | ||
| 77 | (description "Whether you're looking for a job or trying to help | ||
| 78 | a friend to find one, CVAssistant is a tool for you. It helps you by | ||
| 79 | preparing resumes and cover letters and organizing your job | ||
| 80 | application process. It: | ||
| 81 | @itemize | ||
| 82 | @item Stores all your skills and experiences. | ||
| 83 | @item Creates resumes tailored for each job you apply. | ||
| 84 | @item Creates cover letters summarized to match each job | ||
| 85 | advertisement. | ||
| 86 | @item Keeps a history of job applications so you are ready when you | ||
| 87 | receive a phone call. | ||
| 88 | @item Writes resumes in your language. All languages are supported! | ||
| 89 | @end itemize") | ||
| 90 | (license license:gpl3+))) | ||
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 4194f1f607f..a15ac62b8fe 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm | |||
| @@ -2101,20 +2101,19 @@ for ODBC.") | |||
| 2101 | (define-public python-pyodbc | 2101 | (define-public python-pyodbc |
| 2102 | (package | 2102 | (package |
| 2103 | (name "python-pyodbc") | 2103 | (name "python-pyodbc") |
| 2104 | (version "4.0.26") | 2104 | (version "4.0.27") |
| 2105 | (source | 2105 | (source |
| 2106 | (origin | 2106 | (origin |
| 2107 | (method url-fetch) | 2107 | (method url-fetch) |
| 2108 | (uri (pypi-uri "pyodbc" version)) | 2108 | (uri (pypi-uri "pyodbc" version)) |
| 2109 | (sha256 | 2109 | (sha256 |
| 2110 | (base32 "1qrxnf7ji5hml7z4y669k4wmk3iz2pcsr05bnn1n912asash09z5")) | 2110 | (base32 "1kd2i7hc1330cli72vawzby17c3039cqn1aba4i0zrjnpghjhmib")) |
| 2111 | (file-name (string-append name "-" version ".tar.gz")))) | 2111 | (file-name (string-append name "-" version ".tar.gz")))) |
| 2112 | (build-system python-build-system) | 2112 | (build-system python-build-system) |
| 2113 | (inputs | 2113 | (inputs |
| 2114 | `(("unixodbc" ,unixodbc))) | 2114 | `(("unixodbc" ,unixodbc))) |
| 2115 | (arguments | 2115 | (arguments |
| 2116 | `(;; No unit tests exist. | 2116 | `(#:tests? #f)) ; no unit tests exist |
| 2117 | #:tests? #f)) | ||
| 2118 | (home-page "https://github.com/mkleehammer/pyodbc") | 2117 | (home-page "https://github.com/mkleehammer/pyodbc") |
| 2119 | (synopsis "Python ODBC Library") | 2118 | (synopsis "Python ODBC Library") |
| 2120 | (description "@code{python-pyodbc} provides a Python DB-API driver | 2119 | (description "@code{python-pyodbc} provides a Python DB-API driver |
| @@ -2431,14 +2430,14 @@ You might also want to install the following optional dependencies: | |||
| 2431 | (define-public python-alembic | 2430 | (define-public python-alembic |
| 2432 | (package | 2431 | (package |
| 2433 | (name "python-alembic") | 2432 | (name "python-alembic") |
| 2434 | (version "1.0.10") | 2433 | (version "1.0.11") |
| 2435 | (source | 2434 | (source |
| 2436 | (origin | 2435 | (origin |
| 2437 | (method url-fetch) | 2436 | (method url-fetch) |
| 2438 | (uri (pypi-uri "alembic" version)) | 2437 | (uri (pypi-uri "alembic" version)) |
| 2439 | (sha256 | 2438 | (sha256 |
| 2440 | (base32 | 2439 | (base32 |
| 2441 | "1dwl0264r6ri2jyrjr68am04x538ab26xwy4crqjnnhm4alwm3c2")))) | 2440 | "1k5hag0vahd5vrf9abx8fdj2whrwaw2iq2yp736mmxnbsn5xkdyd")))) |
| 2442 | (build-system python-build-system) | 2441 | (build-system python-build-system) |
| 2443 | (native-inputs | 2442 | (native-inputs |
| 2444 | `(("python-mock" ,python-mock) | 2443 | `(("python-mock" ,python-mock) |
| @@ -2449,8 +2448,7 @@ You might also want to install the following optional dependencies: | |||
| 2449 | ("python-mako" ,python-mako) | 2448 | ("python-mako" ,python-mako) |
| 2450 | ("python-editor" ,python-editor))) | 2449 | ("python-editor" ,python-editor))) |
| 2451 | (home-page "https://bitbucket.org/zzzeek/alembic") | 2450 | (home-page "https://bitbucket.org/zzzeek/alembic") |
| 2452 | (synopsis | 2451 | (synopsis "Database migration tool for SQLAlchemy") |
| 2453 | "Database migration tool for SQLAlchemy") | ||
| 2454 | (description | 2452 | (description |
| 2455 | "Alembic is a lightweight database migration tool for usage with the | 2453 | "Alembic is a lightweight database migration tool for usage with the |
| 2456 | SQLAlchemy Database Toolkit for Python.") | 2454 | SQLAlchemy Database Toolkit for Python.") |
diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index 187ef74b4e2..cf531425333 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm | |||
| @@ -760,7 +760,7 @@ LVM D-Bus API).") | |||
| 760 | (define-public rmlint | 760 | (define-public rmlint |
| 761 | (package | 761 | (package |
| 762 | (name "rmlint") | 762 | (name "rmlint") |
| 763 | (version "2.8.0") | 763 | (version "2.9.0") |
| 764 | (source (origin | 764 | (source (origin |
| 765 | (method git-fetch) | 765 | (method git-fetch) |
| 766 | (uri (git-reference | 766 | (uri (git-reference |
| @@ -769,7 +769,7 @@ LVM D-Bus API).") | |||
| 769 | (file-name (git-file-name name version)) | 769 | (file-name (git-file-name name version)) |
| 770 | (sha256 | 770 | (sha256 |
| 771 | (base32 | 771 | (base32 |
| 772 | "1gc7gbnh0qg1kl151cv1ld87vhpm1v3pnkn7prhscdcc21jrg8nz")))) | 772 | "1b5cziam14h80xrfb285fmfrzz2rligxcpsq1xsig14xf4l2875i")))) |
| 773 | (build-system scons-build-system) | 773 | (build-system scons-build-system) |
| 774 | (arguments | 774 | (arguments |
| 775 | `(#:scons ,scons-python2 | 775 | `(#:scons ,scons-python2 |
diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index 70e7c8331b4..58214747e79 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm | |||
| @@ -481,3 +481,43 @@ use the computer and at the same time teach them a little math, | |||
| 481 | letters of the alphabet, spelling, eye-hand coordination, etc.") | 481 | letters of the alphabet, spelling, eye-hand coordination, etc.") |
| 482 | (home-page "http://www.schoolsplay.org") | 482 | (home-page "http://www.schoolsplay.org") |
| 483 | (license license:gpl3+))) | 483 | (license license:gpl3+))) |
| 484 | |||
| 485 | (define-public fet | ||
| 486 | (package | ||
| 487 | (name "fet") | ||
| 488 | (version "5.39.0") | ||
| 489 | (source (origin | ||
| 490 | (method url-fetch) | ||
| 491 | (uri (string-append "https://www.lalescu.ro/liviu/fet/download/" | ||
| 492 | "fet-" version ".tar.bz2")) | ||
| 493 | (sha256 | ||
| 494 | (base32 | ||
| 495 | "100bmggkychqs2cavqxy7015lr4icw6k99qb03im0v4jasqqmyix")))) | ||
| 496 | (build-system gnu-build-system) | ||
| 497 | (arguments | ||
| 498 | `(#:phases | ||
| 499 | (modify-phases %standard-phases | ||
| 500 | (add-after 'unpack 'fix-hardcoded-directories | ||
| 501 | (lambda* (#:key outputs #:allow-other-keys) | ||
| 502 | (substitute* (list "fet.pro" | ||
| 503 | "src/src.pro" | ||
| 504 | "src/src-cl.pro" | ||
| 505 | "src/interface/fet.cpp") | ||
| 506 | (("/usr") (assoc-ref outputs "out"))) | ||
| 507 | #t)) | ||
| 508 | (replace 'configure | ||
| 509 | (lambda _ (invoke "qmake" "fet.pro")))))) | ||
| 510 | (inputs | ||
| 511 | `(("qtbase" ,qtbase))) | ||
| 512 | (home-page "https://www.lalescu.ro/liviu/fet/") | ||
| 513 | (synopsis "Timetabling software") | ||
| 514 | (description "FET is a program for automatically scheduling the | ||
| 515 | timetable of a school, high-school or university. It uses a fast and | ||
| 516 | efficient timetabling algorithm. | ||
| 517 | |||
| 518 | Usually, FET is able to solve a complicated timetable in maximum 5-20 | ||
| 519 | minutes. For simpler timetables, it may take a shorter time, under | ||
| 520 | 5 minutes (in some cases, a matter of seconds). For extremely | ||
| 521 | difficult timetables, it may take a longer time, a matter of hours.") | ||
| 522 | (license license:agpl3+))) | ||
| 523 | |||
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 2862f7b975d..06043dcdd36 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm | |||
| @@ -905,6 +905,35 @@ skip set strings, which are arguments to @code{skip-chars-forward} and | |||
| 905 | @code{skip-chars-backward}.") | 905 | @code{skip-chars-backward}.") |
| 906 | (license license:gpl3+))) | 906 | (license license:gpl3+))) |
| 907 | 907 | ||
| 908 | (define-public emacs-ample-regexps | ||
| 909 | (let ((commit "cbe91e148cac1ee8e223874dc956ed4cf607f046") | ||
| 910 | (revision "1")) | ||
| 911 | (package | ||
| 912 | (name "emacs-ample-regexps") | ||
| 913 | (version (git-version "0.1" revision commit)) | ||
| 914 | (source | ||
| 915 | (origin | ||
| 916 | (method git-fetch) | ||
| 917 | (uri (git-reference | ||
| 918 | (url "https://github.com/immerrr/ample-regexps.el") | ||
| 919 | (commit commit))) | ||
| 920 | (file-name (git-file-name name version)) | ||
| 921 | (sha256 | ||
| 922 | (base32 | ||
| 923 | "1mm4icrwx4mscp7kbbmlc34995r164dhrfczn5ybkyxjzzf76jn1")))) | ||
| 924 | (build-system emacs-build-system) | ||
| 925 | (native-inputs | ||
| 926 | `(("ert-runner" ,emacs-ert-runner))) | ||
| 927 | (arguments | ||
| 928 | `(#:tests? #t | ||
| 929 | #:test-command '("ert-runner" "-l" "ample-regexps"))) | ||
| 930 | (home-page "https://github.com/immerrr/ample-regexps.el") | ||
| 931 | (synopsis "Compose and reuse Emacs regexps") | ||
| 932 | (description | ||
| 933 | "This package allows common parts of regexps to be easily picked out | ||
| 934 | and reused.") | ||
| 935 | (license license:gpl3+)))) | ||
| 936 | |||
| 908 | (define-public emacs-reformatter | 937 | (define-public emacs-reformatter |
| 909 | (package | 938 | (package |
| 910 | (name "emacs-reformatter") | 939 | (name "emacs-reformatter") |
| @@ -3048,30 +3077,27 @@ for Flow files.") | |||
| 3048 | (license license:gpl3+)))) | 3077 | (license license:gpl3+)))) |
| 3049 | 3078 | ||
| 3050 | (define-public emacs-elisp-demos | 3079 | (define-public emacs-elisp-demos |
| 3051 | (let ((commit "4c1fbc392668662890b685ab297e950259227e06") | 3080 | (package |
| 3052 | (version "0.1") | 3081 | (name "emacs-elisp-demos") |
| 3053 | (revision "1")) | 3082 | (version "2019.08.16") |
| 3054 | (package | 3083 | (source |
| 3055 | (name "emacs-elisp-demos") | 3084 | (origin |
| 3056 | (version (git-version version revision commit)) | 3085 | (method git-fetch) |
| 3057 | (source | 3086 | (uri (git-reference |
| 3058 | (origin | 3087 | (url "https://github.com/xuchunyang/elisp-demos") |
| 3059 | (method git-fetch) | 3088 | (commit version))) |
| 3060 | (uri (git-reference | 3089 | (file-name (git-file-name name version)) |
| 3061 | (url "https://github.com/xuchunyang/elisp-demos") | 3090 | (sha256 |
| 3062 | (commit commit))) | 3091 | (base32 |
| 3063 | (file-name (git-file-name name version)) | 3092 | "0lybadq66bl4snkwph9i1y0qxln29wyfjn222ii3nfwany28cj66")))) |
| 3064 | (sha256 | 3093 | (build-system emacs-build-system) |
| 3065 | (base32 | 3094 | (arguments '(#:include '("\\.el$" "\\.org$"))) |
| 3066 | "01cbkmjgmzxdf02w9xgbf4bhnx1mh53vvpkri13yxfksym5zizp4")))) | 3095 | (home-page "https://github.com/xuchunyang/elisp-demos/") |
| 3067 | (build-system emacs-build-system) | 3096 | (synopsis "Enhance @code{*Help*} buffers with additional examples") |
| 3068 | (arguments '(#:include '("\\.el$" "\\.org$"))) | 3097 | (description |
| 3069 | (home-page "https://github.com/xuchunyang/elisp-demos/") | 3098 | "This package injects example uses of Elisp functions into their |
| 3070 | (synopsis "Enhance @code{*Help*} buffers with additional examples") | ||
| 3071 | (description | ||
| 3072 | "This package injects example uses of Elisp functions into their | ||
| 3073 | respective @code{*Help*} buffers.") | 3099 | respective @code{*Help*} buffers.") |
| 3074 | (license license:gpl3+)))) | 3100 | (license license:gpl3+))) |
| 3075 | 3101 | ||
| 3076 | (define-public emacs-docker-compose-mode | 3102 | (define-public emacs-docker-compose-mode |
| 3077 | (package | 3103 | (package |
| @@ -3876,7 +3902,7 @@ in @code{html-mode}.") | |||
| 3876 | (define-public emacs-slime | 3902 | (define-public emacs-slime |
| 3877 | (package | 3903 | (package |
| 3878 | (name "emacs-slime") | 3904 | (name "emacs-slime") |
| 3879 | (version "2.23") | 3905 | (version "2.24") |
| 3880 | (source | 3906 | (source |
| 3881 | (origin | 3907 | (origin |
| 3882 | (method git-fetch) | 3908 | (method git-fetch) |
| @@ -3885,7 +3911,7 @@ in @code{html-mode}.") | |||
| 3885 | (commit (string-append "v" version)))) | 3911 | (commit (string-append "v" version)))) |
| 3886 | (file-name (git-file-name name version)) | 3912 | (file-name (git-file-name name version)) |
| 3887 | (sha256 | 3913 | (sha256 |
| 3888 | (base32 "0i637n0ragpbj39hqx65nx5k99xf0464c4w6w1qpzykm6z42grky")))) | 3914 | (base32 "0js24x42m7b5iymb4rxz501dff19vav5pywnzv50b673rbkaaqvh")))) |
| 3889 | (build-system emacs-build-system) | 3915 | (build-system emacs-build-system) |
| 3890 | (native-inputs | 3916 | (native-inputs |
| 3891 | `(("texinfo" ,texinfo))) | 3917 | `(("texinfo" ,texinfo))) |
| @@ -6246,20 +6272,20 @@ not tied in the trap of backward compatibility.") | |||
| 6246 | (define-public emacs-helm-swoop | 6272 | (define-public emacs-helm-swoop |
| 6247 | (package | 6273 | (package |
| 6248 | (name "emacs-helm-swoop") | 6274 | (name "emacs-helm-swoop") |
| 6249 | (version "1.7.4") | 6275 | (version "2.0.0") |
| 6250 | (source | 6276 | (source |
| 6251 | (origin | 6277 | (origin |
| 6252 | (method git-fetch) | 6278 | (method git-fetch) |
| 6253 | (uri (git-reference | 6279 | (uri (git-reference |
| 6254 | (url "https://github.com/ShingoFukuyama/helm-swoop.git") | 6280 | (url "https://github.com/emacsorphanage/helm-swoop.git") |
| 6255 | (commit version))) | 6281 | (commit version))) |
| 6256 | (file-name (git-file-name name version)) | 6282 | (file-name (git-file-name name version)) |
| 6257 | (sha256 | 6283 | (sha256 |
| 6258 | (base32 "0b23j1bkpg4pm310hqdhgnl4mxsj05gpl08b6kb2ja4fzrg6adsk")))) | 6284 | (base32 "0k0ns92g45x8dbymqpl6ylk5mj3wiw2h03f48q5cy1z8in0c4rjd")))) |
| 6259 | (build-system emacs-build-system) | 6285 | (build-system emacs-build-system) |
| 6260 | (propagated-inputs | 6286 | (propagated-inputs |
| 6261 | `(("emacs-helm" ,emacs-helm))) | 6287 | `(("emacs-helm" ,emacs-helm))) |
| 6262 | (home-page "https://github.com/ShingoFukuyama/helm-swoop") | 6288 | (home-page "https://github.com/emacsorphanage/helm-swoop") |
| 6263 | (synopsis "Filter and jump to lines in an Emacs buffer using Helm") | 6289 | (synopsis "Filter and jump to lines in an Emacs buffer using Helm") |
| 6264 | (description | 6290 | (description |
| 6265 | "This package builds on the Helm interface to provide several commands | 6291 | "This package builds on the Helm interface to provide several commands |
| @@ -6555,8 +6581,8 @@ end of a line and increment or decrement it.") | |||
| 6555 | (license license:gpl3+)))) | 6581 | (license license:gpl3+)))) |
| 6556 | 6582 | ||
| 6557 | (define-public emacs-evil-owl | 6583 | (define-public emacs-evil-owl |
| 6558 | (let ((commit "36a5fe057f44d48e377e3ef4f04b4eb30e1af309") | 6584 | (let ((commit "e8fe5b2f745e36db04cb71eb689bf91c5409614f") |
| 6559 | (revision "1")) | 6585 | (revision "2")) |
| 6560 | (package | 6586 | (package |
| 6561 | (name "emacs-evil-owl") | 6587 | (name "emacs-evil-owl") |
| 6562 | (version (git-version "0.0.1" revision commit)) | 6588 | (version (git-version "0.0.1" revision commit)) |
| @@ -6569,11 +6595,10 @@ end of a line and increment or decrement it.") | |||
| 6569 | (file-name (git-file-name name version)) | 6595 | (file-name (git-file-name name version)) |
| 6570 | (sha256 | 6596 | (sha256 |
| 6571 | (base32 | 6597 | (base32 |
| 6572 | "07a6n0gqss1qx9a50dqzqqq0gj6n7a4ykbcv1a0c9qd4fnfnm90m")))) | 6598 | "1g7kplna62f271135mnjdbvxk2ayx7m4gvd6l86d2394alx16nhq")))) |
| 6573 | (build-system emacs-build-system) | 6599 | (build-system emacs-build-system) |
| 6574 | (propagated-inputs | 6600 | (propagated-inputs |
| 6575 | `(("emacs-evil" ,emacs-evil) | 6601 | `(("emacs-evil" ,emacs-evil))) |
| 6576 | ("emacs-posframe" ,emacs-posframe))) | ||
| 6577 | (home-page "https://github.com/mamapanda/evil-owl") | 6602 | (home-page "https://github.com/mamapanda/evil-owl") |
| 6578 | (synopsis "Preview candidates when using Evil registers and marks") | 6603 | (synopsis "Preview candidates when using Evil registers and marks") |
| 6579 | (description | 6604 | (description |
| @@ -13617,6 +13642,32 @@ integrating @code{iedit-mode} into Evil mode with an attempt at sensible | |||
| 13617 | defaults.") | 13642 | defaults.") |
| 13618 | (license license:gpl3+))) | 13643 | (license license:gpl3+))) |
| 13619 | 13644 | ||
| 13645 | (define-public emacs-evil-mc | ||
| 13646 | (let ((commit "5205fe671803465149e578849bbbe803c23a8e4e") | ||
| 13647 | (revision "1")) | ||
| 13648 | (package | ||
| 13649 | (name "emacs-evil-mc") | ||
| 13650 | (version (git-version "0.0.3" revision commit)) | ||
| 13651 | (source | ||
| 13652 | (origin | ||
| 13653 | (method git-fetch) | ||
| 13654 | (uri (git-reference | ||
| 13655 | (url "https://github.com/gabesoft/evil-mc.git") | ||
| 13656 | (commit commit))) | ||
| 13657 | (file-name (git-file-name name version)) | ||
| 13658 | (sha256 | ||
| 13659 | (base32 "03pxpjjxbai4dwp84bgxh52ahh0f6ac58xi2mds1kl4v93nm7v42")))) | ||
| 13660 | (build-system emacs-build-system) | ||
| 13661 | (propagated-inputs | ||
| 13662 | `(("emacs-evil" ,emacs-evil))) | ||
| 13663 | (native-inputs | ||
| 13664 | `(("emacs-espuds" ,emacs-espuds))) | ||
| 13665 | (home-page "https://github.com/gabesoft/evil-mc") | ||
| 13666 | (synopsis "Interactive search compatible with @code{multiple-cursors}") | ||
| 13667 | (description "This package can be used with @code{multiple-cursors} to | ||
| 13668 | provide an incremental search that moves all fake cursors in sync.") | ||
| 13669 | (license license:expat)))) | ||
| 13670 | |||
| 13620 | (define-public emacs-evil-org | 13671 | (define-public emacs-evil-org |
| 13621 | (let ((commit "b6d652a9163d3430a9e0933a554bdbee5244bbf6")) | 13672 | (let ((commit "b6d652a9163d3430a9e0933a554bdbee5244bbf6")) |
| 13622 | (package | 13673 | (package |
| @@ -16129,12 +16180,11 @@ packages with a consistent way to use them.") | |||
| 16129 | (license license:gpl3+)))) | 16180 | (license license:gpl3+)))) |
| 16130 | 16181 | ||
| 16131 | (define-public emacs-undo-propose-el | 16182 | (define-public emacs-undo-propose-el |
| 16132 | (let ((commit "5f1fa99a04369a959aad01b476fe4f34229f28cd") | 16183 | (let ((commit "21a5cdc8ebfe8113f7039867c4abb0197c0fe71c") |
| 16133 | (version "1.0.0") | ||
| 16134 | (revision "1")) | 16184 | (revision "1")) |
| 16135 | (package | 16185 | (package |
| 16136 | (name "emacs-undo-propose-el") | 16186 | (name "emacs-undo-propose-el") |
| 16137 | (version (git-version version revision commit)) | 16187 | (version (git-version "3.0.0" revision commit)) |
| 16138 | (source | 16188 | (source |
| 16139 | (origin | 16189 | (origin |
| 16140 | (method git-fetch) | 16190 | (method git-fetch) |
| @@ -16144,7 +16194,7 @@ packages with a consistent way to use them.") | |||
| 16144 | (file-name (git-file-name name version)) | 16194 | (file-name (git-file-name name version)) |
| 16145 | (sha256 | 16195 | (sha256 |
| 16146 | (base32 | 16196 | (base32 |
| 16147 | "1p9h1fqmva07mcs46rqrg9vqn537b615as84s9b7xh76k1r8h1c0")))) | 16197 | "035hav4lfxwgikg3zpb4cz1nf08qfp27awl87dqbm2ly6d74lpny")))) |
| 16148 | (build-system emacs-build-system) | 16198 | (build-system emacs-build-system) |
| 16149 | (home-page "https://github.com/jackkamm/undo-propose-el") | 16199 | (home-page "https://github.com/jackkamm/undo-propose-el") |
| 16150 | (synopsis "Simple and safe navigation of @code{undo} history") | 16200 | (synopsis "Simple and safe navigation of @code{undo} history") |
| @@ -17364,7 +17414,8 @@ connections using TLS encryption.") | |||
| 17364 | "0nnlxzsmhsbszqigcyxak9i1a0digrd13gv6v18ck4h760mihh1m")))) | 17414 | "0nnlxzsmhsbszqigcyxak9i1a0digrd13gv6v18ck4h760mihh1m")))) |
| 17365 | (build-system emacs-build-system) | 17415 | (build-system emacs-build-system) |
| 17366 | (propagated-inputs | 17416 | (propagated-inputs |
| 17367 | `(("emacs-all-the-icons" ,emacs-all-the-icons))) | 17417 | `(("emacs-flycheck" ,emacs-flycheck) |
| 17418 | ("emacs-all-the-icons" ,emacs-all-the-icons))) | ||
| 17368 | (home-page | 17419 | (home-page |
| 17369 | "https://gitlab.petton.fr/nico/zerodark-theme") | 17420 | "https://gitlab.petton.fr/nico/zerodark-theme") |
| 17370 | (synopsis | 17421 | (synopsis |
diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index f581b2a38ae..89649748e87 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm | |||
| @@ -479,16 +479,17 @@ and Game Boy Color games.") | |||
| 479 | (delete 'configure) | 479 | (delete 'configure) |
| 480 | ;; Makefile is in a subdirectory. | 480 | ;; Makefile is in a subdirectory. |
| 481 | (add-before | 481 | (add-before |
| 482 | 'build 'cd-to-project-dir | 482 | 'build 'chdir-to-project-directory |
| 483 | (lambda _ | 483 | (lambda _ |
| 484 | (chdir "projects/unix")))) | 484 | (chdir "projects/unix") |
| 485 | #t))) | ||
| 485 | #:make-flags (let ((out (assoc-ref %outputs "out"))) | 486 | #:make-flags (let ((out (assoc-ref %outputs "out"))) |
| 486 | (list "all" (string-append "PREFIX=" out))) | 487 | (list "all" (string-append "PREFIX=" out))) |
| 487 | ;; There are no tests. | 488 | ;; There are no tests. |
| 488 | #:tests? #f)) | 489 | #:tests? #f)) |
| 489 | ;; As per the Makefile (in projects/unix/Makefile): | 490 | ;; As per the Makefile (in projects/unix/Makefile): |
| 490 | (supported-systems '("i686-linux" "x86_64-linux")) | 491 | (supported-systems '("i686-linux" "x86_64-linux")) |
| 491 | (home-page "http://www.mupen64plus.org/") | 492 | (home-page "https://www.mupen64plus.org/") |
| 492 | (synopsis "Nintendo 64 emulator core library") | 493 | (synopsis "Nintendo 64 emulator core library") |
| 493 | (description | 494 | (description |
| 494 | "Mupen64Plus is a cross-platform plugin-based Nintendo 64 (N64) emulator | 495 | "Mupen64Plus is a cross-platform plugin-based Nintendo 64 (N64) emulator |
| @@ -534,7 +535,7 @@ core library.") | |||
| 534 | (string-append "APIDIR=" m64p "/include/mupen64plus"))) | 535 | (string-append "APIDIR=" m64p "/include/mupen64plus"))) |
| 535 | ;; There are no tests. | 536 | ;; There are no tests. |
| 536 | #:tests? #f)) | 537 | #:tests? #f)) |
| 537 | (home-page "http://www.mupen64plus.org/") | 538 | (home-page "https://www.mupen64plus.org/") |
| 538 | (synopsis "Mupen64Plus SDL input plugin") | 539 | (synopsis "Mupen64Plus SDL input plugin") |
| 539 | (description | 540 | (description |
| 540 | "Mupen64Plus is a cross-platform plugin-based Nintendo 64 (N64) emulator | 541 | "Mupen64Plus is a cross-platform plugin-based Nintendo 64 (N64) emulator |
| @@ -579,7 +580,7 @@ SDL audio plugin.") | |||
| 579 | (string-append "APIDIR=" m64p "/include/mupen64plus"))) | 580 | (string-append "APIDIR=" m64p "/include/mupen64plus"))) |
| 580 | ;; There are no tests. | 581 | ;; There are no tests. |
| 581 | #:tests? #f)) | 582 | #:tests? #f)) |
| 582 | (home-page "http://www.mupen64plus.org/") | 583 | (home-page "https://www.mupen64plus.org/") |
| 583 | (synopsis "Mupen64Plus SDL input plugin") | 584 | (synopsis "Mupen64Plus SDL input plugin") |
| 584 | (description | 585 | (description |
| 585 | "Mupen64Plus is a cross-platform plugin-based Nintendo 64 (N64) emulator | 586 | "Mupen64Plus is a cross-platform plugin-based Nintendo 64 (N64) emulator |
| @@ -621,7 +622,7 @@ SDL input plugin.") | |||
| 621 | (string-append "APIDIR=" m64p "/include/mupen64plus"))) | 622 | (string-append "APIDIR=" m64p "/include/mupen64plus"))) |
| 622 | ;; There are no tests. | 623 | ;; There are no tests. |
| 623 | #:tests? #f)) | 624 | #:tests? #f)) |
| 624 | (home-page "http://www.mupen64plus.org/") | 625 | (home-page "https://www.mupen64plus.org/") |
| 625 | (synopsis "Mupen64Plus SDL input plugin") | 626 | (synopsis "Mupen64Plus SDL input plugin") |
| 626 | (description | 627 | (description |
| 627 | "Mupen64Plus is a cross-platform plugin-based Nintendo 64 (N64) emulator | 628 | "Mupen64Plus is a cross-platform plugin-based Nintendo 64 (N64) emulator |
| @@ -663,7 +664,7 @@ high-level emulation (HLE) RSP processor plugin.") | |||
| 663 | (string-append "APIDIR=" m64p "/include/mupen64plus"))) | 664 | (string-append "APIDIR=" m64p "/include/mupen64plus"))) |
| 664 | ;; There are no tests. | 665 | ;; There are no tests. |
| 665 | #:tests? #f)) | 666 | #:tests? #f)) |
| 666 | (home-page "http://www.mupen64plus.org/") | 667 | (home-page "https://www.mupen64plus.org/") |
| 667 | (synopsis "Mupen64Plus SDL input plugin") | 668 | (synopsis "Mupen64Plus SDL input plugin") |
| 668 | (description | 669 | (description |
| 669 | "Mupen64Plus is a cross-platform plugin-based Nintendo 64 (N64) emulator | 670 | "Mupen64Plus is a cross-platform plugin-based Nintendo 64 (N64) emulator |
| @@ -709,7 +710,7 @@ Z64 RSP processor plugin.") | |||
| 709 | (string-append "APIDIR=" m64p "/include/mupen64plus"))) | 710 | (string-append "APIDIR=" m64p "/include/mupen64plus"))) |
| 710 | ;; There are no tests. | 711 | ;; There are no tests. |
| 711 | #:tests? #f)) | 712 | #:tests? #f)) |
| 712 | (home-page "http://www.mupen64plus.org/") | 713 | (home-page "https://www.mupen64plus.org/") |
| 713 | (synopsis "Mupen64Plus Rice Video plugin") | 714 | (synopsis "Mupen64Plus Rice Video plugin") |
| 714 | (description | 715 | (description |
| 715 | "Mupen64Plus is a cross-platform plugin-based Nintendo 64 (N64) emulator | 716 | "Mupen64Plus is a cross-platform plugin-based Nintendo 64 (N64) emulator |
| @@ -763,7 +764,7 @@ Arachnoid video plugin.") | |||
| 763 | (string-append "APIDIR=" m64p "/include/mupen64plus"))) | 764 | (string-append "APIDIR=" m64p "/include/mupen64plus"))) |
| 764 | ;; There are no tests. | 765 | ;; There are no tests. |
| 765 | #:tests? #f)) | 766 | #:tests? #f)) |
| 766 | (home-page "http://www.mupen64plus.org/") | 767 | (home-page "https://www.mupen64plus.org/") |
| 767 | (synopsis "Mupen64Plus Rice Video plugin") | 768 | (synopsis "Mupen64Plus Rice Video plugin") |
| 768 | (description | 769 | (description |
| 769 | "Mupen64Plus is a cross-platform plugin-based Nintendo 64 (N64) emulator | 770 | "Mupen64Plus is a cross-platform plugin-based Nintendo 64 (N64) emulator |
| @@ -813,7 +814,7 @@ Glide64 video plugin.") | |||
| 813 | (string-append "APIDIR=" m64p "/include/mupen64plus"))) | 814 | (string-append "APIDIR=" m64p "/include/mupen64plus"))) |
| 814 | ;; There are no tests. | 815 | ;; There are no tests. |
| 815 | #:tests? #f)) | 816 | #:tests? #f)) |
| 816 | (home-page "http://www.mupen64plus.org/") | 817 | (home-page "https://www.mupen64plus.org/") |
| 817 | (synopsis "Mupen64Plus Rice Video plugin") | 818 | (synopsis "Mupen64Plus Rice Video plugin") |
| 818 | (description | 819 | (description |
| 819 | "Mupen64Plus is a cross-platform plugin-based Nintendo 64 (N64) emulator | 820 | "Mupen64Plus is a cross-platform plugin-based Nintendo 64 (N64) emulator |
| @@ -861,7 +862,7 @@ Glide64MK2 video plugin.") | |||
| 861 | (string-append "APIDIR=" m64p "/include/mupen64plus"))) | 862 | (string-append "APIDIR=" m64p "/include/mupen64plus"))) |
| 862 | ;; There are no tests. | 863 | ;; There are no tests. |
| 863 | #:tests? #f)) | 864 | #:tests? #f)) |
| 864 | (home-page "http://www.mupen64plus.org/") | 865 | (home-page "https://www.mupen64plus.org/") |
| 865 | (synopsis "Mupen64Plus Rice Video plugin") | 866 | (synopsis "Mupen64Plus Rice Video plugin") |
| 866 | (description | 867 | (description |
| 867 | "Mupen64Plus is a cross-platform plugin-based Nintendo 64 (N64) emulator | 868 | "Mupen64Plus is a cross-platform plugin-based Nintendo 64 (N64) emulator |
| @@ -916,7 +917,7 @@ Rice Video plugin.") | |||
| 916 | (string-append "APIDIR=" m64p "/include/mupen64plus"))) | 917 | (string-append "APIDIR=" m64p "/include/mupen64plus"))) |
| 917 | ;; There are no tests. | 918 | ;; There are no tests. |
| 918 | #:tests? #f)) | 919 | #:tests? #f)) |
| 919 | (home-page "http://www.mupen64plus.org/") | 920 | (home-page "https://www.mupen64plus.org/") |
| 920 | (synopsis "Mupen64Plus Z64 video plugin") | 921 | (synopsis "Mupen64Plus Z64 video plugin") |
| 921 | (description | 922 | (description |
| 922 | "Mupen64Plus is a cross-platform plugin-based Nintendo 64 (N64) emulator | 923 | "Mupen64Plus is a cross-platform plugin-based Nintendo 64 (N64) emulator |
| @@ -1043,7 +1044,7 @@ emulation community. It provides highly accurate emulation.") | |||
| 1043 | (define-public retroarch | 1044 | (define-public retroarch |
| 1044 | (package | 1045 | (package |
| 1045 | (name "retroarch") | 1046 | (name "retroarch") |
| 1046 | (version "1.7.7") | 1047 | (version "1.7.8") |
| 1047 | (source | 1048 | (source |
| 1048 | (origin | 1049 | (origin |
| 1049 | (method git-fetch) | 1050 | (method git-fetch) |
| @@ -1052,7 +1053,7 @@ emulation community. It provides highly accurate emulation.") | |||
| 1052 | (commit (string-append "v" version)))) | 1053 | (commit (string-append "v" version)))) |
| 1053 | (file-name (git-file-name name version)) | 1054 | (file-name (git-file-name name version)) |
| 1054 | (sha256 | 1055 | (sha256 |
| 1055 | (base32 "026720z0vpiwr4da7l2x2yinns09fmg6yxsib203xwnixj399azi")))) | 1056 | (base32 "0xxd9nhqiclpkdd9crymvba37fl0xs5mikwhya68nfzcgar7w480")))) |
| 1056 | (build-system gnu-build-system) | 1057 | (build-system gnu-build-system) |
| 1057 | (arguments | 1058 | (arguments |
| 1058 | `(#:tests? #f ; no tests | 1059 | `(#:tests? #f ; no tests |
| @@ -1074,8 +1075,7 @@ emulation community. It provides highly accurate emulation.") | |||
| 1074 | (("/bin/true") (which "true"))) | 1075 | (("/bin/true") (which "true"))) |
| 1075 | ;; Use shared zlib. | 1076 | ;; Use shared zlib. |
| 1076 | (substitute* '("libretro-common/file/archive_file_zlib.c" | 1077 | (substitute* '("libretro-common/file/archive_file_zlib.c" |
| 1077 | "libretro-common/streams/trans_stream_zlib.c" | 1078 | "libretro-common/streams/trans_stream_zlib.c") |
| 1078 | "network/httpserver/httpserver.c") | ||
| 1079 | (("<compat/zlib.h>") "<zlib.h>")) | 1079 | (("<compat/zlib.h>") "<zlib.h>")) |
| 1080 | ;; The configure script does not yet accept the extra arguments | 1080 | ;; The configure script does not yet accept the extra arguments |
| 1081 | ;; (like ‘CONFIG_SHELL=’) passed by the default configure phase. | 1081 | ;; (like ‘CONFIG_SHELL=’) passed by the default configure phase. |
diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index 90aa48c23c8..5e62f5e3da6 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm | |||
| @@ -65,7 +65,7 @@ | |||
| 65 | (define-public efl | 65 | (define-public efl |
| 66 | (package | 66 | (package |
| 67 | (name "efl") | 67 | (name "efl") |
| 68 | (version "1.22.2") | 68 | (version "1.22.3") |
| 69 | (source (origin | 69 | (source (origin |
| 70 | (method url-fetch) | 70 | (method url-fetch) |
| 71 | (uri (string-append | 71 | (uri (string-append |
| @@ -73,7 +73,7 @@ | |||
| 73 | version ".tar.xz")) | 73 | version ".tar.xz")) |
| 74 | (sha256 | 74 | (sha256 |
| 75 | (base32 | 75 | (base32 |
| 76 | "1l0wdgzxqm2y919277b1p9d37xzg808zwxxaw0nn44arh8gqk68n")))) | 76 | "1j1i8cwq4ym9z34ikv35mdmv5q7q69hdp494mc6l03g9n6cl2yky")))) |
| 77 | (outputs '("out" ; 53 MB | 77 | (outputs '("out" ; 53 MB |
| 78 | "include")) ; 21 MB | 78 | "include")) ; 21 MB |
| 79 | (build-system gnu-build-system) | 79 | (build-system gnu-build-system) |
| @@ -242,7 +242,7 @@ contents and more.") | |||
| 242 | (define-public rage | 242 | (define-public rage |
| 243 | (package | 243 | (package |
| 244 | (name "rage") | 244 | (name "rage") |
| 245 | (version "0.3.0") | 245 | (version "0.3.1") |
| 246 | (source (origin | 246 | (source (origin |
| 247 | (method url-fetch) | 247 | (method url-fetch) |
| 248 | (uri | 248 | (uri |
| @@ -251,7 +251,7 @@ contents and more.") | |||
| 251 | version ".tar.xz")) | 251 | version ".tar.xz")) |
| 252 | (sha256 | 252 | (sha256 |
| 253 | (base32 | 253 | (base32 |
| 254 | "0gfzdd4jg78bkmj61yg49w7bzspl5m1nh6agqgs8k7qrq9q26xqy")))) | 254 | "04fdk23bbgvni212zrfy4ndg7vmshbsjgicrhckdvhay87pk9i75")))) |
| 255 | (build-system meson-build-system) | 255 | (build-system meson-build-system) |
| 256 | (arguments | 256 | (arguments |
| 257 | '(#:phases | 257 | '(#:phases |
| @@ -273,20 +273,22 @@ Libraries with some extra bells and whistles.") | |||
| 273 | (define-public enlightenment | 273 | (define-public enlightenment |
| 274 | (package | 274 | (package |
| 275 | (name "enlightenment") | 275 | (name "enlightenment") |
| 276 | (version "0.22.4") | 276 | (version "0.23.0") |
| 277 | (source (origin | 277 | (source (origin |
| 278 | (method url-fetch) | 278 | (method url-fetch) |
| 279 | (uri | 279 | (uri |
| 280 | (string-append "https://download.enlightenment.org/rel/apps/" | 280 | (string-append "https://download.enlightenment.org/rel/apps/" |
| 281 | name "/" name "-" version ".tar.xz")) | 281 | "enlightenment/enlightenment-" version ".tar.xz")) |
| 282 | (sha256 | 282 | (sha256 |
| 283 | (base32 | 283 | (base32 |
| 284 | "0ygy891rrw5c7lhk539nhif77j88phvz2h0fhx172iaridy9kx2r")) | 284 | "1y7x594gvyvl5zbb1rnf3clj2pm6j97n8wl5mp9x6xjmhx0d1idq")) |
| 285 | (patches (search-patches "enlightenment-fix-setuid-path.patch")))) | 285 | (patches (search-patches "enlightenment-fix-setuid-path.patch")))) |
| 286 | (build-system gnu-build-system) | 286 | (build-system meson-build-system) |
| 287 | (arguments | 287 | (arguments |
| 288 | `(#:phases | 288 | `(#:configure-flags '("-Dsystemd=false") |
| 289 | #:phases | ||
| 289 | (modify-phases %standard-phases | 290 | (modify-phases %standard-phases |
| 291 | (delete 'bootstrap) ; We don't want to run the autogen script. | ||
| 290 | (add-before 'configure 'set-system-actions | 292 | (add-before 'configure 'set-system-actions |
| 291 | (lambda* (#:key inputs #:allow-other-keys) | 293 | (lambda* (#:key inputs #:allow-other-keys) |
| 292 | (setenv "HOME" "/tmp") | 294 | (setenv "HOME" "/tmp") |
| @@ -294,6 +296,7 @@ Libraries with some extra bells and whistles.") | |||
| 294 | (setxkbmap (assoc-ref inputs "setxkbmap")) | 296 | (setxkbmap (assoc-ref inputs "setxkbmap")) |
| 295 | (utils (assoc-ref inputs "util-linux")) | 297 | (utils (assoc-ref inputs "util-linux")) |
| 296 | (libc (assoc-ref inputs "libc")) | 298 | (libc (assoc-ref inputs "libc")) |
| 299 | (bluez (assoc-ref inputs "bluez")) | ||
| 297 | (efl (assoc-ref inputs "efl"))) | 300 | (efl (assoc-ref inputs "efl"))) |
| 298 | ;; We need to patch the path to 'base.lst' to be able | 301 | ;; We need to patch the path to 'base.lst' to be able |
| 299 | ;; to switch the keyboard layout in E. | 302 | ;; to switch the keyboard layout in E. |
| @@ -314,12 +317,14 @@ Libraries with some extra bells and whistles.") | |||
| 314 | (string-append efl "/bin/edje_cc -v %s %s %s\""))) | 317 | (string-append efl "/bin/edje_cc -v %s %s %s\""))) |
| 315 | (substitute* "src/modules/everything/evry_plug_apps.c" | 318 | (substitute* "src/modules/everything/evry_plug_apps.c" |
| 316 | (("/usr/bin/") "")) | 319 | (("/usr/bin/") "")) |
| 317 | (substitute* "configure" | 320 | (substitute* "data/etc/meson.build" |
| 318 | (("/bin/mount") (string-append utils "/bin/mount")) | 321 | (("/bin/mount") (string-append utils "/bin/mount")) |
| 319 | (("/bin/umount") (string-append utils "/bin/umount")) | 322 | (("/bin/umount") (string-append utils "/bin/umount")) |
| 320 | (("/usr/bin/eject") (string-append utils "/bin/eject")) | 323 | (("/usr/bin/eject") (string-append utils "/bin/eject")) |
| 321 | (("/etc/acpi/sleep.sh force") "/run/current-system/profile/bin/loginctl suspend") | 324 | (("/usr/bin/l2ping") (string-append bluez "/bin/l2ling")) |
| 322 | (("/etc/acpi/hibernate.sh force") "/run/current-system/profile/bin/loginctl hibernate") | 325 | (("/bin/rfkill") (string-append utils "/sbin/rfkill")) |
| 326 | (("SUSPEND = ''") "SUSPEND = '/run/current-system/profile/bin/loginctl suspend'") | ||
| 327 | (("HIBERNATE = ''") "HIBERNATE = '/run/current-system/profile/bin/loginctl hibernate'") | ||
| 323 | (("/sbin/shutdown -h now") "/run/current-system/profile/bin/loginctl poweroff now") | 328 | (("/sbin/shutdown -h now") "/run/current-system/profile/bin/loginctl poweroff now") |
| 324 | (("/sbin/shutdown -r now") "/run/current-system/profile/bin/loginctl reboot now")) | 329 | (("/sbin/shutdown -r now") "/run/current-system/profile/bin/loginctl reboot now")) |
| 325 | #t)))))) | 330 | #t)))))) |
| @@ -329,12 +334,14 @@ Libraries with some extra bells and whistles.") | |||
| 329 | ("util-linux" ,util-linux))) | 334 | ("util-linux" ,util-linux))) |
| 330 | (inputs | 335 | (inputs |
| 331 | `(("alsa-lib" ,alsa-lib) | 336 | `(("alsa-lib" ,alsa-lib) |
| 337 | ("bluez" ,bluez) | ||
| 332 | ("dbus" ,dbus) | 338 | ("dbus" ,dbus) |
| 333 | ("efl" ,efl) | 339 | ("efl" ,efl) |
| 334 | ("freetype" ,freetype) | 340 | ("freetype" ,freetype) |
| 335 | ("libxcb" ,libxcb) | 341 | ("libxcb" ,libxcb) |
| 336 | ("libxext" ,libxext) | 342 | ("libxext" ,libxext) |
| 337 | ("linux-pam" ,linux-pam) | 343 | ("linux-pam" ,linux-pam) |
| 344 | ("puleseaudio" ,pulseaudio) | ||
| 338 | ("setxkbmap" ,setxkbmap) | 345 | ("setxkbmap" ,setxkbmap) |
| 339 | ("xcb-util-keysyms" ,xcb-util-keysyms) | 346 | ("xcb-util-keysyms" ,xcb-util-keysyms) |
| 340 | ("xkeyboard-config" ,xkeyboard-config))) | 347 | ("xkeyboard-config" ,xkeyboard-config))) |
diff --git a/gnu/packages/fpga.scm b/gnu/packages/fpga.scm index 7b661d39ac0..b4f259bf3a0 100644 --- a/gnu/packages/fpga.scm +++ b/gnu/packages/fpga.scm | |||
| @@ -85,20 +85,20 @@ formal verification.") | |||
| 85 | (define-public iverilog | 85 | (define-public iverilog |
| 86 | (package | 86 | (package |
| 87 | (name "iverilog") | 87 | (name "iverilog") |
| 88 | (version "10.2") | 88 | (version "10.3") |
| 89 | (source (origin | 89 | (source (origin |
| 90 | (method url-fetch) | 90 | (method url-fetch) |
| 91 | (uri | 91 | (uri |
| 92 | (string-append "ftp://ftp.icarus.com/pub/eda/verilog/v10/" | 92 | (string-append "ftp://ftp.icarus.com/pub/eda/verilog/v10/" |
| 93 | "verilog-" version ".tar.gz")) | 93 | "verilog-" version ".tar.gz")) |
| 94 | (sha256 | 94 | (sha256 |
| 95 | (base32 | 95 | (base32 |
| 96 | "0075x5nsxwkrgn7b3635il9kw7mslckaji518pdmwdrdn7fxppln")))) | 96 | "1vv88ckvfwq7mrysyjnilsrcrzm9d173kp9w5ivwh6rdw7klbgc6")))) |
| 97 | (build-system gnu-build-system) | 97 | (build-system gnu-build-system) |
| 98 | (native-inputs | 98 | (native-inputs |
| 99 | `(("flex" ,flex) | 99 | `(("flex" ,flex) |
| 100 | ("bison" ,bison) | 100 | ("bison" ,bison) |
| 101 | ("ghostscript" ,ghostscript))) ; ps2pdf | 101 | ("ghostscript" ,ghostscript))) ; ps2pdf |
| 102 | (home-page "http://iverilog.icarus.com/") | 102 | (home-page "http://iverilog.icarus.com/") |
| 103 | (synopsis "FPGA Verilog simulation and synthesis tool") | 103 | (synopsis "FPGA Verilog simulation and synthesis tool") |
| 104 | (description "Icarus Verilog is a Verilog simulation and synthesis tool. | 104 | (description "Icarus Verilog is a Verilog simulation and synthesis tool. |
diff --git a/gnu/packages/ghostscript.scm b/gnu/packages/ghostscript.scm index 817104cde1a..3239ab4fd5c 100644 --- a/gnu/packages/ghostscript.scm +++ b/gnu/packages/ghostscript.scm | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | ;;; Copyright © 2013 Andreas Enge <andreas@enge.fr> | 2 | ;;; Copyright © 2013 Andreas Enge <andreas@enge.fr> |
| 3 | ;;; Copyright © 2014, 2015, 2016, 2017 Mark H Weaver <mhw@netris.org> | 3 | ;;; Copyright © 2014, 2015, 2016, 2017 Mark H Weaver <mhw@netris.org> |
| 4 | ;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net> | 4 | ;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net> |
| 5 | ;;; Copyright © 2013, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org> | 5 | ;;; Copyright © 2013, 2015, 2016, 2017, 2019 Ludovic Courtès <ludo@gnu.org> |
| 6 | ;;; Copyright © 2017 Alex Vong <alexvong1995@gmail.com> | 6 | ;;; Copyright © 2017 Alex Vong <alexvong1995@gmail.com> |
| 7 | ;;; Copyright © 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il> | 7 | ;;; Copyright © 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il> |
| 8 | ;;; Copyright © 2017 Leo Famulari <leo@famulari.name> | 8 | ;;; Copyright © 2017 Leo Famulari <leo@famulari.name> |
| @@ -138,6 +138,12 @@ printing, and psresize, for adjusting page sizes.") | |||
| 138 | (package | 138 | (package |
| 139 | (name "ghostscript") | 139 | (name "ghostscript") |
| 140 | (version "9.27") | 140 | (version "9.27") |
| 141 | |||
| 142 | ;; The problems addressed by GHOSTSCRIPT/FIXED are not security-related, | ||
| 143 | ;; but they have a significant impact on usability, hence this graft. | ||
| 144 | ;; TODO: Ungraft on next update cycle. | ||
| 145 | (replacement ghostscript/fixed) | ||
| 146 | |||
| 141 | (source | 147 | (source |
| 142 | (origin | 148 | (origin |
| 143 | (method url-fetch) | 149 | (method url-fetch) |
| @@ -269,6 +275,25 @@ output file formats and printers.") | |||
| 269 | (home-page "https://www.ghostscript.com/") | 275 | (home-page "https://www.ghostscript.com/") |
| 270 | (license license:agpl3+))) | 276 | (license license:agpl3+))) |
| 271 | 277 | ||
| 278 | (define-public ghostscript/fixed | ||
| 279 | ;; This adds the Freetype dependency (among other things), which fixes the | ||
| 280 | ;; rendering issues described in <https://issues.guix.gnu.org/issue/34877>. | ||
| 281 | (package/inherit | ||
| 282 | ghostscript | ||
| 283 | (arguments | ||
| 284 | (substitute-keyword-arguments (package-arguments ghostscript) | ||
| 285 | ((#:configure-flags flags ''()) | ||
| 286 | `(append (list "--disable-compile-inits" | ||
| 287 | (string-append "--with-fontpath=" | ||
| 288 | (assoc-ref %build-inputs "gs-fonts") | ||
| 289 | "/share/fonts/type1/ghostscript")) | ||
| 290 | ,flags)))) | ||
| 291 | (native-inputs `(("pkg-config" ,pkg-config) ;needed for freetype | ||
| 292 | ,@(package-native-inputs ghostscript))) | ||
| 293 | (inputs `(("gs-fonts" ,gs-fonts) | ||
| 294 | ("fontconfig" ,fontconfig) | ||
| 295 | ,@(package-inputs ghostscript))))) | ||
| 296 | |||
| 272 | (define-public ghostscript/x | 297 | (define-public ghostscript/x |
| 273 | (package/inherit ghostscript | 298 | (package/inherit ghostscript |
| 274 | (name (string-append (package-name ghostscript) "-with-x")) | 299 | (name (string-append (package-name ghostscript) "-with-x")) |
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 3e173304477..3a50347f86d 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm | |||
| @@ -10,6 +10,7 @@ | |||
| 10 | ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> | 10 | ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> |
| 11 | ;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com> | 11 | ;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com> |
| 12 | ;;; Copyright © 2019 Maxim Cournoyer <maxim.cournoyer@gmail.com> | 12 | ;;; Copyright © 2019 Maxim Cournoyer <maxim.cournoyer@gmail.com> |
| 13 | ;;; Copyright © 2019 Giacomo Leidi <goodoldpaul@autistici.org> | ||
| 13 | ;;; | 14 | ;;; |
| 14 | ;;; This file is part of GNU Guix. | 15 | ;;; This file is part of GNU Guix. |
| 15 | ;;; | 16 | ;;; |
| @@ -925,3 +926,40 @@ main loop, simply get a connection to the bus via the methods in | |||
| 925 | @code{Net::DBus::GLib} rather than the usual @code{Net::DBus} module. Every | 926 | @code{Net::DBus::GLib} rather than the usual @code{Net::DBus} module. Every |
| 926 | other API remains the same.") | 927 | other API remains the same.") |
| 927 | (license license:gpl2+))) | 928 | (license license:gpl2+))) |
| 929 | |||
| 930 | (define-public template-glib | ||
| 931 | (package | ||
| 932 | (name "template-glib") | ||
| 933 | (version "3.32.0") | ||
| 934 | (source (origin | ||
| 935 | (method url-fetch) | ||
| 936 | (uri (string-append "mirror://gnome/sources/" name "/" | ||
| 937 | (version-major+minor version) "/" | ||
| 938 | name "-" version ".tar.xz")) | ||
| 939 | (sha256 | ||
| 940 | (base32 | ||
| 941 | "1g0zx0sxpw8kqp7p3sgl9kngaqrg9xl6cir24nrahks0vgsk98rr")))) | ||
| 942 | (build-system meson-build-system) | ||
| 943 | (arguments | ||
| 944 | `(#:configure-flags '("-D" "enable_gtk_doc=true"))) | ||
| 945 | (inputs | ||
| 946 | `(("gettext" ,gettext-minimal) | ||
| 947 | ("glib" ,glib) | ||
| 948 | ("gobject-introspection" ,gobject-introspection))) | ||
| 949 | (native-inputs | ||
| 950 | `(("bison" ,bison) | ||
| 951 | ("flex" ,flex) | ||
| 952 | ("glib:bin" ,glib "bin") ;; For glib-mkenums | ||
| 953 | ("gtk-doc" ,gtk-doc) | ||
| 954 | ("pkg-config" ,pkg-config) | ||
| 955 | ("vala" ,vala))) | ||
| 956 | (home-page "https://gitlab.gnome.org/GNOME/template-glib") | ||
| 957 | (synopsis "Library for template expansion") | ||
| 958 | (description | ||
| 959 | "Template-GLib is a library to help you generate text based on a template and | ||
| 960 | user defined state. Template-GLib does not use a language runtime, so it is | ||
| 961 | safe to use from any GObject-Introspectable language. | ||
| 962 | |||
| 963 | Template-GLib allows you to access properties on GObjects as well as call | ||
| 964 | simple methods via GObject-Introspection.") | ||
| 965 | (license license:lgpl2.1+))) | ||
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index ca00bb0ffdf..e37c2a4070b 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm | |||
| @@ -8053,7 +8053,7 @@ hexadecimal or ASCII. It is useful for editing binary files in general.") | |||
| 8053 | (define-public libdazzle | 8053 | (define-public libdazzle |
| 8054 | (package | 8054 | (package |
| 8055 | (name "libdazzle") | 8055 | (name "libdazzle") |
| 8056 | (version "3.30.2") | 8056 | (version "3.33.90") |
| 8057 | (source (origin | 8057 | (source (origin |
| 8058 | (method url-fetch) | 8058 | (method url-fetch) |
| 8059 | (uri (string-append "mirror://gnome/sources/libdazzle/" | 8059 | (uri (string-append "mirror://gnome/sources/libdazzle/" |
| @@ -8061,17 +8061,11 @@ hexadecimal or ASCII. It is useful for editing binary files in general.") | |||
| 8061 | "libdazzle-" version ".tar.xz")) | 8061 | "libdazzle-" version ".tar.xz")) |
| 8062 | (sha256 | 8062 | (sha256 |
| 8063 | (base32 | 8063 | (base32 |
| 8064 | "1m9n1gcxndly24rjkxzvmx02a2rkb6ad4cy7p6ncanm1kyp0wxvq")))) | 8064 | "189m7q88d1a7bq0yyal9f3yhm9kz46lb61379nn4wsnnhpa1d0qs")))) |
| 8065 | (build-system meson-build-system) | 8065 | (build-system meson-build-system) |
| 8066 | (arguments | 8066 | (arguments |
| 8067 | `(#:phases | 8067 | `(#:phases |
| 8068 | (modify-phases %standard-phases | 8068 | (modify-phases %standard-phases |
| 8069 | (add-after 'unpack 'disable-failing-test | ||
| 8070 | (lambda _ | ||
| 8071 | ;; Disable failing test. | ||
| 8072 | (substitute* "tests/meson.build" | ||
| 8073 | (("test\\('test-application") "#")) | ||
| 8074 | #t)) | ||
| 8075 | (add-before 'check 'pre-check | 8069 | (add-before 'check 'pre-check |
| 8076 | (lambda _ | 8070 | (lambda _ |
| 8077 | ;; Tests require a running X server. | 8071 | ;; Tests require a running X server. |
diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index 2653645c5d6..e07702f994e 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm | |||
| @@ -75,7 +75,8 @@ | |||
| 75 | version ".tar.gz")) | 75 | version ".tar.gz")) |
| 76 | (sha256 | 76 | (sha256 |
| 77 | (base32 | 77 | (base32 |
| 78 | "1zz2zvikvfibxnk1va3kgzs7djsmiqy7bmk8y01vbsf54ryjb3zh")))) | 78 | "1zz2zvikvfibxnk1va3kgzs7djsmiqy7bmk8y01vbsf54ryjb3zh")) |
| 79 | (patches (search-patches "libextractor-exiv2.patch")))) | ||
| 79 | (build-system gnu-build-system) | 80 | (build-system gnu-build-system) |
| 80 | ;; WARNING: Checks require /dev/shm to be in the build chroot, especially | 81 | ;; WARNING: Checks require /dev/shm to be in the build chroot, especially |
| 81 | ;; not to be a symbolic link to /run/shm. | 82 | ;; not to be a symbolic link to /run/shm. |
| @@ -146,14 +147,14 @@ tool to extract metadata from a file and print the results.") | |||
| 146 | (define-public libmicrohttpd | 147 | (define-public libmicrohttpd |
| 147 | (package | 148 | (package |
| 148 | (name "libmicrohttpd") | 149 | (name "libmicrohttpd") |
| 149 | (version "0.9.65") | 150 | (version "0.9.66") |
| 150 | (source (origin | 151 | (source (origin |
| 151 | (method url-fetch) | 152 | (method url-fetch) |
| 152 | (uri (string-append "mirror://gnu/libmicrohttpd/libmicrohttpd-" | 153 | (uri (string-append "mirror://gnu/libmicrohttpd/libmicrohttpd-" |
| 153 | version ".tar.gz")) | 154 | version ".tar.gz")) |
| 154 | (sha256 | 155 | (sha256 |
| 155 | (base32 | 156 | (base32 |
| 156 | "1jdk6wigvnkh5bi9if4rik8i9sbvdql61lm8ipgpypyxqmcpjipj")))) | 157 | "06xblz77bnn29y7sl43avxbcrjbw486x3416plpr3x3l2pdx8rjf")))) |
| 157 | (build-system gnu-build-system) | 158 | (build-system gnu-build-system) |
| 158 | (inputs | 159 | (inputs |
| 159 | `(("curl" ,curl) | 160 | `(("curl" ,curl) |
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index a0a1baa9a26..20f5462528d 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm | |||
| @@ -15,6 +15,7 @@ | |||
| 15 | ;;; Copyright @ 2018, 2019 Katherine Cox-Buday <cox.katherine.e@gmail.com> | 15 | ;;; Copyright @ 2018, 2019 Katherine Cox-Buday <cox.katherine.e@gmail.com> |
| 16 | ;;; Copyright @ 2019 Giovanni Biscuolo <g@xelera.eu> | 16 | ;;; Copyright @ 2019 Giovanni Biscuolo <g@xelera.eu> |
| 17 | ;;; Copyright @ 2019 Alex Griffin <a@ajgrf.com> | 17 | ;;; Copyright @ 2019 Alex Griffin <a@ajgrf.com> |
| 18 | ;;; Copyright © 2019 Arun Isaac <arunisaac@systemreboot.net> | ||
| 18 | ;;; | 19 | ;;; |
| 19 | ;;; This file is part of GNU Guix. | 20 | ;;; This file is part of GNU Guix. |
| 20 | ;;; | 21 | ;;; |
| @@ -3636,3 +3637,26 @@ stack traces. It simplifies the traces to make salient information more visible | |||
| 3636 | and aid debugging.") | 3637 | and aid debugging.") |
| 3637 | (home-page "https://github.com/maruel/panicparse") | 3638 | (home-page "https://github.com/maruel/panicparse") |
| 3638 | (license license:asl2.0))) | 3639 | (license license:asl2.0))) |
| 3640 | |||
| 3641 | (define-public go-github-com-robfig-cron | ||
| 3642 | (package | ||
| 3643 | (name "go-github-com-robfig-cron") | ||
| 3644 | (version "3.0.0") | ||
| 3645 | (source | ||
| 3646 | (origin | ||
| 3647 | (method git-fetch) | ||
| 3648 | (uri (git-reference | ||
| 3649 | (url "https://github.com/robfig/cron") | ||
| 3650 | (commit (string-append "v" version)))) | ||
| 3651 | (file-name (git-file-name name version)) | ||
| 3652 | (sha256 | ||
| 3653 | (base32 | ||
| 3654 | "0bvq5gxkhyj21lq32nma23i4dpwp7bswnp2yks6372ilkcyisx2z")))) | ||
| 3655 | (build-system go-build-system) | ||
| 3656 | (arguments | ||
| 3657 | `(#:import-path "github.com/robfig/cron")) | ||
| 3658 | (home-page "https://godoc.org/github.com/robfig/cron") | ||
| 3659 | (synopsis "Cron library for Go") | ||
| 3660 | (description "This package provides a cron library for Go. It implements | ||
| 3661 | a cron spec parser and job runner.") | ||
| 3662 | (license license:expat))) | ||
diff --git a/gnu/packages/gsasl.scm b/gnu/packages/gsasl.scm index 9296f3d80f9..c1a0360b0e0 100644 --- a/gnu/packages/gsasl.scm +++ b/gnu/packages/gsasl.scm | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | ;;; Copyright © 2012 Andreas Enge <andreas@enge.fr> | 2 | ;;; Copyright © 2012 Andreas Enge <andreas@enge.fr> |
| 3 | ;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net> | 3 | ;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net> |
| 4 | ;;; Copyright © 2017 Eric Bavier <bavier@member.fsf.org> | 4 | ;;; Copyright © 2017 Eric Bavier <bavier@member.fsf.org> |
| 5 | ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> | 5 | ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> |
| 6 | ;;; | 6 | ;;; |
| 7 | ;;; This file is part of GNU Guix. | 7 | ;;; This file is part of GNU Guix. |
| 8 | ;;; | 8 | ;;; |
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index b80a0f799a4..34f9ca3844d 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | ;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net> | 21 | ;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net> |
| 22 | ;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz> | 22 | ;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz> |
| 23 | ;;; Copyright © 2019 Meiyo Peng <meiyo@riseup.net> | 23 | ;;; Copyright © 2019 Meiyo Peng <meiyo@riseup.net> |
| 24 | ;;; Copyright © 2019 Giacomo Leidi <goodoldpaul@autistici.org> | ||
| 24 | ;;; | 25 | ;;; |
| 25 | ;;; This file is part of GNU Guix. | 26 | ;;; This file is part of GNU Guix. |
| 26 | ;;; | 27 | ;;; |
| @@ -1597,7 +1598,8 @@ glass artworks done by Venicians glass blowers.") | |||
| 1597 | (build-system gnu-build-system) | 1598 | (build-system gnu-build-system) |
| 1598 | (native-inputs | 1599 | (native-inputs |
| 1599 | `(("intltool" ,intltool) | 1600 | `(("intltool" ,intltool) |
| 1600 | ("pkg-config" ,pkg-config))) | 1601 | ("pkg-config" ,pkg-config) |
| 1602 | ("vala" ,vala))) | ||
| 1601 | (inputs | 1603 | (inputs |
| 1602 | `(("gobject-introspection" ,gobject-introspection) | 1604 | `(("gobject-introspection" ,gobject-introspection) |
| 1603 | ("gtk+" ,gtk+) | 1605 | ("gtk+" ,gtk+) |
diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 16e30b9de72..7dff0c6269c 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | ;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr> | 21 | ;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr> |
| 22 | ;;; Copyright © 2018 Eric Bavier <bavier@member.fsf.org> | 22 | ;;; Copyright © 2018 Eric Bavier <bavier@member.fsf.org> |
| 23 | ;;; Copyright © 2019 swedebugia <swedebugia@riseup.net> | 23 | ;;; Copyright © 2019 swedebugia <swedebugia@riseup.net> |
| 24 | ;;; Copyright © 2019 Amar Singh <nly@disroot.org> | ||
| 24 | ;;; | 25 | ;;; |
| 25 | ;;; This file is part of GNU Guix. | 26 | ;;; This file is part of GNU Guix. |
| 26 | ;;; | 27 | ;;; |
| @@ -55,6 +56,7 @@ | |||
| 55 | #:use-module (gnu packages gl) | 56 | #:use-module (gnu packages gl) |
| 56 | #:use-module (gnu packages glib) | 57 | #:use-module (gnu packages glib) |
| 57 | #:use-module (gnu packages gnome) | 58 | #:use-module (gnu packages gnome) |
| 59 | #:use-module (gnu packages gnupg) | ||
| 58 | #:use-module (gnu packages gperf) | 60 | #:use-module (gnu packages gperf) |
| 59 | #:use-module (gnu packages gtk) | 61 | #:use-module (gnu packages gtk) |
| 60 | #:use-module (gnu packages guile) | 62 | #:use-module (gnu packages guile) |
| @@ -70,6 +72,7 @@ | |||
| 70 | #:use-module (gnu packages ncurses) | 72 | #:use-module (gnu packages ncurses) |
| 71 | #:use-module (gnu packages networking) | 73 | #:use-module (gnu packages networking) |
| 72 | #:use-module (gnu packages noweb) | 74 | #:use-module (gnu packages noweb) |
| 75 | #:use-module (gnu packages password-utils) | ||
| 73 | #:use-module (gnu packages perl) | 76 | #:use-module (gnu packages perl) |
| 74 | #:use-module (gnu packages pkg-config) | 77 | #:use-module (gnu packages pkg-config) |
| 75 | #:use-module (gnu packages python) | 78 | #:use-module (gnu packages python) |
| @@ -2350,22 +2353,52 @@ more expressive and flexible than the traditional @code{format} procedure.") | |||
| 2350 | ("pkg-config" ,pkg-config) | 2353 | ("pkg-config" ,pkg-config) |
| 2351 | ("texinfo" ,texinfo) | 2354 | ("texinfo" ,texinfo) |
| 2352 | ("texlive" ,(texlive-union (list texlive-generic-epsf))))) | 2355 | ("texlive" ,(texlive-union (list texlive-generic-epsf))))) |
| 2353 | (propagated-inputs | 2356 | (inputs |
| 2354 | `(("dbus-glib" ,dbus-glib) | 2357 | `(("dbus-glib" ,dbus-glib) |
| 2355 | ("guile" ,guile-2.2) | 2358 | ("guile" ,guile-2.2) |
| 2356 | ("guile-lib" ,guile-lib) | 2359 | ("guile-lib" ,guile-lib) |
| 2357 | ("guile-readline" ,guile-readline) | 2360 | ("guile-readline" ,guile-readline) |
| 2358 | ("glib-networking" ,glib-networking) | ||
| 2359 | ("freeglut" ,freeglut) | 2361 | ("freeglut" ,freeglut) |
| 2360 | ("gssettings-desktop-schemas" ,gsettings-desktop-schemas) | ||
| 2361 | ("webkitgtk" ,webkitgtk))) | 2362 | ("webkitgtk" ,webkitgtk))) |
| 2363 | (propagated-inputs | ||
| 2364 | `(("glib-networking" ,glib-networking) | ||
| 2365 | ("gssettings-desktop-schemas" ,gsettings-desktop-schemas))) | ||
| 2362 | (arguments | 2366 | (arguments |
| 2363 | `(#:phases | 2367 | `(#:modules ((guix build gnu-build-system) |
| 2368 | (guix build utils) | ||
| 2369 | (ice-9 popen) | ||
| 2370 | (ice-9 rdelim) | ||
| 2371 | (ice-9 regex) | ||
| 2372 | (ice-9 ftw) | ||
| 2373 | (srfi srfi-26)) | ||
| 2374 | #:phases | ||
| 2364 | (modify-phases %standard-phases | 2375 | (modify-phases %standard-phases |
| 2365 | (add-before 'configure 'setenv | 2376 | (add-before 'configure 'setenv |
| 2366 | (lambda _ | 2377 | (lambda _ |
| 2367 | (setenv "GUILE_AUTO_COMPILE" "0") | 2378 | (setenv "GUILE_AUTO_COMPILE" "0") |
| 2368 | #t))))) | 2379 | #t)) |
| 2380 | (add-after 'install 'wrap-binaries | ||
| 2381 | (lambda* (#:key inputs outputs #:allow-other-keys) | ||
| 2382 | (let* ((out (assoc-ref outputs "out")) | ||
| 2383 | (effective (read-line | ||
| 2384 | (open-pipe* OPEN_READ | ||
| 2385 | "guile" "-c" | ||
| 2386 | "(display (effective-version))"))) | ||
| 2387 | (deps (map (cut assoc-ref inputs <>) | ||
| 2388 | '("guile-lib" "guile-readline"))) | ||
| 2389 | (scm-path (map (cut string-append <> "/share/guile/site/" | ||
| 2390 | effective) `(,out ,@deps))) | ||
| 2391 | (go-path (map (cut string-append <> "/lib/guile/" effective | ||
| 2392 | "/site-ccache/") `(,out ,@deps))) | ||
| 2393 | (examples (filter (cut string-match "emacsy" <>) | ||
| 2394 | (scandir (string-append out "/bin/")))) | ||
| 2395 | (progs (map (cut string-append out "/bin/" <>) | ||
| 2396 | examples))) | ||
| 2397 | (map (cut wrap-program <> | ||
| 2398 | `("GUILE_LOAD_PATH" ":" prefix ,scm-path) | ||
| 2399 | `("GUILE_LOAD_COMPILED_PATH" ":" prefix ,go-path)) | ||
| 2400 | progs) | ||
| 2401 | #t)))))) | ||
| 2369 | (home-page "https://savannah.nongnu.org/projects/emacsy") | 2402 | (home-page "https://savannah.nongnu.org/projects/emacsy") |
| 2370 | (synopsis "Embeddable GNU Emacs-like library using Guile") | 2403 | (synopsis "Embeddable GNU Emacs-like library using Guile") |
| 2371 | (description | 2404 | (description |
| @@ -2377,6 +2410,36 @@ comes with a simple counter example using FreeGLUT and browser examples | |||
| 2377 | in C using Gtk+-3 and WebKitGtk.") | 2410 | in C using Gtk+-3 and WebKitGtk.") |
| 2378 | (license license:gpl3+))) | 2411 | (license license:gpl3+))) |
| 2379 | 2412 | ||
| 2413 | (define-public emacsy-minimal | ||
| 2414 | (let ((commit "f3bf0dbd803d7805b6ae8303253507ad13922293")) | ||
| 2415 | (package | ||
| 2416 | (inherit emacsy) | ||
| 2417 | (name "emacsy-minimal") | ||
| 2418 | (version (git-version "v0.4.1" "19" commit)) | ||
| 2419 | (source (origin | ||
| 2420 | (method git-fetch) | ||
| 2421 | (uri (git-reference | ||
| 2422 | (url "https://git.savannah.gnu.org/git/emacsy.git") | ||
| 2423 | (commit commit))) | ||
| 2424 | (file-name (git-file-name name version)) | ||
| 2425 | (sha256 | ||
| 2426 | (base32 | ||
| 2427 | "0ivy28km1p7nlrf63xx3hvrpxf5ld5amk1wcan3k7sqv1kq9mqdb")))) | ||
| 2428 | (build-system gnu-build-system) | ||
| 2429 | (inputs | ||
| 2430 | `(("guile" ,guile-2.2) | ||
| 2431 | ("guile-lib" ,guile-lib) | ||
| 2432 | ("guile-readline" ,guile-readline))) | ||
| 2433 | (propagated-inputs '()) | ||
| 2434 | (arguments | ||
| 2435 | `(#:configure-flags '("--without-examples") | ||
| 2436 | #:phases | ||
| 2437 | (modify-phases %standard-phases | ||
| 2438 | (add-before 'configure 'setenv | ||
| 2439 | (lambda _ | ||
| 2440 | (setenv "GUILE_AUTO_COMPILE" "0") | ||
| 2441 | #t)))))))) | ||
| 2442 | |||
| 2380 | (define-public guile-jpeg | 2443 | (define-public guile-jpeg |
| 2381 | (let ((commit "6a1673578b297c2c1b28e44a76bd5c49e76a5046") | 2444 | (let ((commit "6a1673578b297c2c1b28e44a76bd5c49e76a5046") |
| 2382 | (revision "0")) | 2445 | (revision "0")) |
| @@ -2410,3 +2473,95 @@ in C using Gtk+-3 and WebKitGtk.") | |||
| 2410 | "Guile-JPEG is a Scheme library to parse JPEG image files and to | 2473 | "Guile-JPEG is a Scheme library to parse JPEG image files and to |
| 2411 | perform geometrical transforms on JPEG images.") | 2474 | perform geometrical transforms on JPEG images.") |
| 2412 | (license license:gpl3+)))) | 2475 | (license license:gpl3+)))) |
| 2476 | |||
| 2477 | (define-public nomad | ||
| 2478 | (package | ||
| 2479 | (name "nomad") | ||
| 2480 | (version "0.1.1-alpha") | ||
| 2481 | (source (origin | ||
| 2482 | (method git-fetch) | ||
| 2483 | (uri (git-reference | ||
| 2484 | (url "https://git.savannah.gnu.org/git/nomad.git") | ||
| 2485 | (commit version))) | ||
| 2486 | (file-name (git-file-name name version)) | ||
| 2487 | (sha256 | ||
| 2488 | (base32 | ||
| 2489 | "0abz07hl5dh802ciy71xzkvkhyryypq1i94wna40a2wndbd73f7z")))) | ||
| 2490 | (build-system gnu-build-system) | ||
| 2491 | (native-inputs | ||
| 2492 | `(("autoconf" ,autoconf) | ||
| 2493 | ("automake" ,automake) | ||
| 2494 | ("bash" ,bash) | ||
| 2495 | ("pkg-config" ,pkg-config) | ||
| 2496 | ("libtool" ,libtool) | ||
| 2497 | ("guile" ,guile-2.2) | ||
| 2498 | ("glib:bin" ,glib "bin"))) | ||
| 2499 | (inputs | ||
| 2500 | `(("guile" ,guile-2.2) | ||
| 2501 | ("guile-lib" ,guile-lib) | ||
| 2502 | ("guile-gcrypt" ,guile-gcrypt) | ||
| 2503 | ("guile-readline" ,guile-readline) | ||
| 2504 | ("gnutls" ,gnutls) | ||
| 2505 | ("shroud" ,shroud) | ||
| 2506 | ("emacsy" ,emacsy-minimal) | ||
| 2507 | ("glib" ,glib) | ||
| 2508 | ("dbus-glib" ,dbus-glib) | ||
| 2509 | ("gtk+" ,gtk+) | ||
| 2510 | ("gtksourceview" ,gtksourceview) | ||
| 2511 | ("webkitgtk" ,webkitgtk) | ||
| 2512 | ("xorg-server" ,xorg-server))) | ||
| 2513 | (propagated-inputs | ||
| 2514 | `(("glib" ,glib) | ||
| 2515 | ("glib-networking" ,glib-networking) | ||
| 2516 | ("gsettings-desktop-schemas" ,gsettings-desktop-schemas))) | ||
| 2517 | (arguments | ||
| 2518 | `(#:modules ((guix build gnu-build-system) | ||
| 2519 | (guix build utils) | ||
| 2520 | (ice-9 popen) | ||
| 2521 | (ice-9 rdelim) | ||
| 2522 | (srfi srfi-26)) | ||
| 2523 | #:phases | ||
| 2524 | (modify-phases %standard-phases | ||
| 2525 | (add-before 'check 'start-xorg-server | ||
| 2526 | (lambda* (#:key inputs #:allow-other-keys) | ||
| 2527 | ;; The test suite requires a running X server. | ||
| 2528 | (system (format #f "~a/bin/Xvfb :1 &" | ||
| 2529 | (assoc-ref inputs "xorg-server"))) | ||
| 2530 | (setenv "DISPLAY" ":1") | ||
| 2531 | #t)) | ||
| 2532 | (add-after 'install 'wrap-binaries | ||
| 2533 | (lambda* (#:key inputs outputs #:allow-other-keys) | ||
| 2534 | (let* ((out (assoc-ref outputs "out")) | ||
| 2535 | (gio-deps (map (cut assoc-ref inputs <>) '("glib-networking" | ||
| 2536 | "glib"))) | ||
| 2537 | (gio-mod-path (map (cut string-append <> "/lib/gio/modules") | ||
| 2538 | gio-deps)) | ||
| 2539 | (effective (read-line (open-pipe* | ||
| 2540 | OPEN_READ | ||
| 2541 | "guile" "-c" | ||
| 2542 | "(display (effective-version))"))) | ||
| 2543 | (deps (map (cut assoc-ref inputs <>) | ||
| 2544 | '("emacsy" "guile-lib" "guile-readline" | ||
| 2545 | "shroud"))) | ||
| 2546 | (scm-path (map (cut string-append <> | ||
| 2547 | "/share/guile/site/" effective) | ||
| 2548 | `(,out ,@deps))) | ||
| 2549 | (go-path (map (cut string-append <> | ||
| 2550 | "/lib/guile/" effective "/site-ccache") | ||
| 2551 | `(,out ,@deps))) | ||
| 2552 | (progs (map (cut string-append out "/bin/" <>) | ||
| 2553 | '("nomad")))) | ||
| 2554 | (map (cut wrap-program <> | ||
| 2555 | `("GIO_EXTRA_MODULES" ":" prefix ,gio-mod-path) | ||
| 2556 | `("GUILE_LOAD_PATH" ":" prefix ,scm-path) | ||
| 2557 | `("GUILE_LOAD_COMPILED_PATH" ":" | ||
| 2558 | prefix ,go-path)) | ||
| 2559 | progs) | ||
| 2560 | #t)))))) | ||
| 2561 | (home-page "https://savannah.nongnu.org/projects/nomad/") | ||
| 2562 | (synopsis "Extensible Web Browser in Guile Scheme") | ||
| 2563 | (description "Nomad is an Emacs-like Web Browser built using Webkitgtk and | ||
| 2564 | Emacsy. It has a small C layer and most browser features are fully | ||
| 2565 | programmable in Guile. It has hooks, keymaps, and self documentation | ||
| 2566 | features.") | ||
| 2567 | (license license:gpl3+))) | ||
diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index b07a5706545..475a6c5ef09 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm | |||
| @@ -264,14 +264,14 @@ without requiring the source code to be rewritten.") | |||
| 264 | (package | 264 | (package |
| 265 | (inherit guile-2.2) | 265 | (inherit guile-2.2) |
| 266 | (name "guile-next") | 266 | (name "guile-next") |
| 267 | (version "2.9.3") | 267 | (version "2.9.4") |
| 268 | (source (origin | 268 | (source (origin |
| 269 | (inherit (package-source guile-2.2)) | 269 | (inherit (package-source guile-2.2)) |
| 270 | (uri (string-append "ftp://alpha.gnu.org/gnu/guile/guile-" | 270 | (uri (string-append "ftp://alpha.gnu.org/gnu/guile/guile-" |
| 271 | version ".tar.xz")) | 271 | version ".tar.xz")) |
| 272 | (sha256 | 272 | (sha256 |
| 273 | (base32 | 273 | (base32 |
| 274 | "14990wcpysgw58kij03wbgiggmi5z94jmy7wdcqnn6ny7cimkkgr")))) | 274 | "1milviqhipyfx400pqhngxpxyajalzwmp597dxn5514pkk0g7v0p")))) |
| 275 | (native-search-paths | 275 | (native-search-paths |
| 276 | (list (search-path-specification | 276 | (list (search-path-specification |
| 277 | (variable "GUILE_LOAD_PATH") | 277 | (variable "GUILE_LOAD_PATH") |
| @@ -541,7 +541,7 @@ Guile's foreign function interface.") | |||
| 541 | (define-public guile-bytestructures | 541 | (define-public guile-bytestructures |
| 542 | (package | 542 | (package |
| 543 | (name "guile-bytestructures") | 543 | (name "guile-bytestructures") |
| 544 | (version "1.0.5") | 544 | (version "1.0.6") |
| 545 | (source (origin | 545 | (source (origin |
| 546 | (method url-fetch) | 546 | (method url-fetch) |
| 547 | (uri (string-append "https://github.com/TaylanUB/scheme-bytestructures" | 547 | (uri (string-append "https://github.com/TaylanUB/scheme-bytestructures" |
| @@ -549,7 +549,7 @@ Guile's foreign function interface.") | |||
| 549 | "/bytestructures-" version ".tar.gz")) | 549 | "/bytestructures-" version ".tar.gz")) |
| 550 | (sha256 | 550 | (sha256 |
| 551 | (base32 | 551 | (base32 |
| 552 | "0ibk7fjwpb450lnrva4bx45sgln3pbyb645az4ansvh1spgani43")))) | 552 | "07dffrmc6cnw9mmw0pdrqlkbhzzpz0hm8p26z738l2j5i84dypnk")))) |
| 553 | (build-system gnu-build-system) | 553 | (build-system gnu-build-system) |
| 554 | (native-inputs | 554 | (native-inputs |
| 555 | `(("pkg-config" ,pkg-config))) | 555 | `(("pkg-config" ,pkg-config))) |
| @@ -563,7 +563,8 @@ of the C programming language, to be used on bytevectors. C's type | |||
| 563 | system works on raw memory, and Guile works on bytevectors which are | 563 | system works on raw memory, and Guile works on bytevectors which are |
| 564 | an abstraction over raw memory. It's also more powerful than the C | 564 | an abstraction over raw memory. It's also more powerful than the C |
| 565 | type system, elevating types to first-class status.") | 565 | type system, elevating types to first-class status.") |
| 566 | (license license:gpl3+))) | 566 | (license license:gpl3+) |
| 567 | (properties '((upstream-name . "bytestructures"))))) | ||
| 567 | 568 | ||
| 568 | (define-public guile2.0-bytestructures | 569 | (define-public guile2.0-bytestructures |
| 569 | (package-for-guile-2.0 guile-bytestructures)) | 570 | (package-for-guile-2.0 guile-bytestructures)) |
diff --git a/gnu/packages/ipfs.scm b/gnu/packages/ipfs.scm index 4f61f2ba661..2dd2097075d 100644 --- a/gnu/packages/ipfs.scm +++ b/gnu/packages/ipfs.scm | |||
| @@ -219,7 +219,7 @@ written in Go.") | |||
| 219 | (define-public go-ipfs | 219 | (define-public go-ipfs |
| 220 | (package | 220 | (package |
| 221 | (name "go-ipfs") | 221 | (name "go-ipfs") |
| 222 | (version "0.4.19") | 222 | (version "0.4.22") |
| 223 | (source | 223 | (source |
| 224 | (origin | 224 | (origin |
| 225 | (method url-fetch/tarbomb) | 225 | (method url-fetch/tarbomb) |
| @@ -227,7 +227,7 @@ written in Go.") | |||
| 227 | "https://dist.ipfs.io/go-ipfs/v" version | 227 | "https://dist.ipfs.io/go-ipfs/v" version |
| 228 | "/go-ipfs-source.tar.gz")) | 228 | "/go-ipfs-source.tar.gz")) |
| 229 | (sha256 | 229 | (sha256 |
| 230 | (base32 "0s04ap14p6hnipjm27nm5k8s28zv9k5g9mziyh3ibgwn7dzb1kpx")) | 230 | (base32 "1gyz9yqb4y7p6vdjbcm66nvm6gjs4mdrjygdn79z3misv1pb5nkg")) |
| 231 | (file-name (string-append name "-" version "-source")))) | 231 | (file-name (string-append name "-" version "-source")))) |
| 232 | (build-system go-build-system) | 232 | (build-system go-build-system) |
| 233 | (arguments | 233 | (arguments |
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index f15715ee404..e03d30cb037 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm | |||
| @@ -181,31 +181,31 @@ defconfig. Return the appropriate make target if applicable, otherwise return | |||
| 181 | 181 | ||
| 182 | (define deblob-scripts-5.2 | 182 | (define deblob-scripts-5.2 |
| 183 | (linux-libre-deblob-scripts | 183 | (linux-libre-deblob-scripts |
| 184 | "5.2.3" | 184 | "5.2.10" |
| 185 | (base32 "076fwxlm6jq6z4vg1xq3kr474zz7qk71r90sf9dnfia3rw2pb4fa") | 185 | (base32 "076fwxlm6jq6z4vg1xq3kr474zz7qk71r90sf9dnfia3rw2pb4fa") |
| 186 | (base32 "0d3pp1bqchqc7vnxr1a56km5r0hzjiiipzz2xc3wgjwfi51k9kxc"))) | 186 | (base32 "0d3pp1bqchqc7vnxr1a56km5r0hzjiiipzz2xc3wgjwfi51k9kxc"))) |
| 187 | 187 | ||
| 188 | (define deblob-scripts-4.19 | 188 | (define deblob-scripts-4.19 |
| 189 | (linux-libre-deblob-scripts | 189 | (linux-libre-deblob-scripts |
| 190 | "4.19.61" | 190 | "4.19.68" |
| 191 | (base32 "02zs405awaxydbapka4nz8h6lmnc0dahgczqsrs5s2bmzjyyqkcy") | 191 | (base32 "02zs405awaxydbapka4nz8h6lmnc0dahgczqsrs5s2bmzjyyqkcy") |
| 192 | (base32 "1fyacg28aym6virxyn7wk99qil2fjbks3iwm7p3hxy51pccn34za"))) | 192 | (base32 "1fyacg28aym6virxyn7wk99qil2fjbks3iwm7p3hxy51pccn34za"))) |
| 193 | 193 | ||
| 194 | (define deblob-scripts-4.14 | 194 | (define deblob-scripts-4.14 |
| 195 | (linux-libre-deblob-scripts | 195 | (linux-libre-deblob-scripts |
| 196 | "4.14.134" | 196 | "4.14.140" |
| 197 | (base32 "091jk9jkn9jf39bxpc7395bhcb7p96nkg3a8047380ki06lnfxh6") | 197 | (base32 "091jk9jkn9jf39bxpc7395bhcb7p96nkg3a8047380ki06lnfxh6") |
| 198 | (base32 "0x9nd3hnyrm753cbgdqmy92mbnyw86w64g4hvyibnkpq5n7s3z9n"))) | 198 | (base32 "0x9nd3hnyrm753cbgdqmy92mbnyw86w64g4hvyibnkpq5n7s3z9n"))) |
| 199 | 199 | ||
| 200 | (define deblob-scripts-4.9 | 200 | (define deblob-scripts-4.9 |
| 201 | (linux-libre-deblob-scripts | 201 | (linux-libre-deblob-scripts |
| 202 | "4.9.186" | 202 | "4.9.190" |
| 203 | (base32 "1wvldzlv7q2xdbadas87dh593nxr4a8p5n0f8zpm72lja6w18hmg") | 203 | (base32 "1wvldzlv7q2xdbadas87dh593nxr4a8p5n0f8zpm72lja6w18hmg") |
| 204 | (base32 "1gmjn5cwxydg6qb47wcmahwkv37npsjx4papynzkkdxyidmrccya"))) | 204 | (base32 "0is8gn4qdd7h5l6lacvhqdch26lmrbgxfm8ab7fx8n85ha7y358w"))) |
| 205 | 205 | ||
| 206 | (define deblob-scripts-4.4 | 206 | (define deblob-scripts-4.4 |
| 207 | (linux-libre-deblob-scripts | 207 | (linux-libre-deblob-scripts |
| 208 | "4.4.186" | 208 | "4.4.190" |
| 209 | (base32 "0x2j1i88am54ih2mk7gyl79g25l9zz4r08xhl482l3fvjj2irwbw") | 209 | (base32 "0x2j1i88am54ih2mk7gyl79g25l9zz4r08xhl482l3fvjj2irwbw") |
| 210 | (base32 "1x40lbiaizksy8z38ax7wpqr9ldgq7qvkxbb0ca98vd1axpklb10"))) | 210 | (base32 "1x40lbiaizksy8z38ax7wpqr9ldgq7qvkxbb0ca98vd1axpklb10"))) |
| 211 | 211 | ||
| @@ -349,42 +349,42 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." | |||
| 349 | "linux-" version ".tar.xz")) | 349 | "linux-" version ".tar.xz")) |
| 350 | (sha256 hash))) | 350 | (sha256 hash))) |
| 351 | 351 | ||
| 352 | (define-public linux-libre-5.2-version "5.2.9") | 352 | (define-public linux-libre-5.2-version "5.2.11") |
| 353 | (define-public linux-libre-5.2-pristine-source | 353 | (define-public linux-libre-5.2-pristine-source |
| 354 | (let ((version linux-libre-5.2-version) | 354 | (let ((version linux-libre-5.2-version) |
| 355 | (hash (base32 "1rnlnphw9rih4qhdld9ic5lnj5jh4vy5nqbj9lqwv9bc615jmw5n"))) | 355 | (hash (base32 "1y9kn1zny3xpmbi5an3g7hbzywnycys8chfaw6laij1xk4gq6ahc"))) |
| 356 | (make-linux-libre-source version | 356 | (make-linux-libre-source version |
| 357 | (%upstream-linux-source version hash) | 357 | (%upstream-linux-source version hash) |
| 358 | deblob-scripts-5.2))) | 358 | deblob-scripts-5.2))) |
| 359 | 359 | ||
| 360 | (define-public linux-libre-4.19-version "4.19.67") | 360 | (define-public linux-libre-4.19-version "4.19.69") |
| 361 | (define-public linux-libre-4.19-pristine-source | 361 | (define-public linux-libre-4.19-pristine-source |
| 362 | (let ((version linux-libre-4.19-version) | 362 | (let ((version linux-libre-4.19-version) |
| 363 | (hash (base32 "00m5k0nfcvgff70686rbhn3w8c9wc3jxqvyddw40lylaqdh3s72s"))) | 363 | (hash (base32 "11yrw8ixd5ni9rlpndqsz2ihx6k8qaf35a1lf164lkhaa85pd4f0"))) |
| 364 | (make-linux-libre-source version | 364 | (make-linux-libre-source version |
| 365 | (%upstream-linux-source version hash) | 365 | (%upstream-linux-source version hash) |
| 366 | deblob-scripts-4.19))) | 366 | deblob-scripts-4.19))) |
| 367 | 367 | ||
| 368 | (define-public linux-libre-4.14-version "4.14.139") | 368 | (define-public linux-libre-4.14-version "4.14.141") |
| 369 | (define-public linux-libre-4.14-pristine-source | 369 | (define-public linux-libre-4.14-pristine-source |
| 370 | (let ((version linux-libre-4.14-version) | 370 | (let ((version linux-libre-4.14-version) |
| 371 | (hash (base32 "0hkhwcbxg6bry13w9kspx48b10274w6pgv200wh91fjd8jax8qlc"))) | 371 | (hash (base32 "05rs411rw10hhnfzvaxmcik3pq20i1i05shvvra4bv164f0z1f8b"))) |
| 372 | (make-linux-libre-source version | 372 | (make-linux-libre-source version |
| 373 | (%upstream-linux-source version hash) | 373 | (%upstream-linux-source version hash) |
| 374 | deblob-scripts-4.14))) | 374 | deblob-scripts-4.14))) |
| 375 | 375 | ||
| 376 | (define-public linux-libre-4.9-version "4.9.189") | 376 | (define-public linux-libre-4.9-version "4.9.190") |
| 377 | (define-public linux-libre-4.9-pristine-source | 377 | (define-public linux-libre-4.9-pristine-source |
| 378 | (let ((version linux-libre-4.9-version) | 378 | (let ((version linux-libre-4.9-version) |
| 379 | (hash (base32 "1cyhwnxkjd0qa5d48657yppjnzbi830q0p25jjv2dxs629k4bnck"))) | 379 | (hash (base32 "05ha3snfk0vdqk9i27icwpq2if0h2jvshavn69ldwqm4h2h1r2py"))) |
| 380 | (make-linux-libre-source version | 380 | (make-linux-libre-source version |
| 381 | (%upstream-linux-source version hash) | 381 | (%upstream-linux-source version hash) |
| 382 | deblob-scripts-4.9))) | 382 | deblob-scripts-4.9))) |
| 383 | 383 | ||
| 384 | (define-public linux-libre-4.4-version "4.4.189") | 384 | (define-public linux-libre-4.4-version "4.4.190") |
| 385 | (define-public linux-libre-4.4-pristine-source | 385 | (define-public linux-libre-4.4-pristine-source |
| 386 | (let ((version linux-libre-4.4-version) | 386 | (let ((version linux-libre-4.4-version) |
| 387 | (hash (base32 "0nc8v62gw89m3ykqg6nqf749fzm8y1n481ns8vny4gbinyikjhlp"))) | 387 | (hash (base32 "1rf28cjrrmj7mm8xqlfld6k20ddk15j4mmyarqibjx9pk9acij7y"))) |
| 388 | (make-linux-libre-source version | 388 | (make-linux-libre-source version |
| 389 | (%upstream-linux-source version hash) | 389 | (%upstream-linux-source version hash) |
| 390 | deblob-scripts-4.4))) | 390 | deblob-scripts-4.4))) |
| @@ -4854,14 +4854,14 @@ running boot option, and more.") | |||
| 4854 | (define-public sysstat | 4854 | (define-public sysstat |
| 4855 | (package | 4855 | (package |
| 4856 | (name "sysstat") | 4856 | (name "sysstat") |
| 4857 | (version "11.4.3") | 4857 | (version "12.1.6") |
| 4858 | (source (origin | 4858 | (source (origin |
| 4859 | (method url-fetch) | 4859 | (method url-fetch) |
| 4860 | (uri (string-append "http://perso.orange.fr/sebastien.godard/" | 4860 | (uri (string-append "http://pagesperso-orange.fr/sebastien.godard/" |
| 4861 | "sysstat-" version ".tar.xz")) | 4861 | "sysstat-" version ".tar.xz")) |
| 4862 | (sha256 | 4862 | (sha256 |
| 4863 | (base32 | 4863 | (base32 |
| 4864 | "1ryf9myjzpa2279i3rvsh6fr5psm6qvr5r9kbm1sxyspapxcms82")))) | 4864 | "0agi17n82k363mf9f7cky3isq195hw112vs98v26yfhm0v2g6lpp")))) |
| 4865 | (build-system gnu-build-system) | 4865 | (build-system gnu-build-system) |
| 4866 | (arguments | 4866 | (arguments |
| 4867 | `(#:tests? #f ; No test suite. | 4867 | `(#:tests? #f ; No test suite. |
diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index a42369ba068..34edea41dec 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm | |||
| @@ -327,14 +327,14 @@ an interpreter, a compiler, a debugger, and much more.") | |||
| 327 | (define-public sbcl | 327 | (define-public sbcl |
| 328 | (package | 328 | (package |
| 329 | (name "sbcl") | 329 | (name "sbcl") |
| 330 | (version "1.5.1") | 330 | (version "1.5.5") |
| 331 | (source | 331 | (source |
| 332 | (origin | 332 | (origin |
| 333 | (method url-fetch) | 333 | (method url-fetch) |
| 334 | (uri (string-append "mirror://sourceforge/sbcl/sbcl/" version "/sbcl-" | 334 | (uri (string-append "mirror://sourceforge/sbcl/sbcl/" version "/sbcl-" |
| 335 | version "-source.tar.bz2")) | 335 | version "-source.tar.bz2")) |
| 336 | (sha256 | 336 | (sha256 |
| 337 | (base32 "08z62qba0kmm15k93s2rq7ipi769895g8iwigcp20qjh6amwnwph")) | 337 | (base32 "1qmapk2hyxxqd3ajiqacz4isij0ibx7gn10n8dbmq33gm3kgliyb")) |
| 338 | (modules '((guix build utils))) | 338 | (modules '((guix build utils))) |
| 339 | (snippet | 339 | (snippet |
| 340 | ;; Add sbcl-bundle-systems to 'default-system-source-registry'. | 340 | ;; Add sbcl-bundle-systems to 'default-system-source-registry'. |
| @@ -364,7 +364,8 @@ an interpreter, a compiler, a debugger, and much more.") | |||
| 364 | ("inetutils" ,inetutils) ;for hostname(1) | 364 | ("inetutils" ,inetutils) ;for hostname(1) |
| 365 | ("ed" ,ed) | 365 | ("ed" ,ed) |
| 366 | ("texlive" ,(texlive-union (list texlive-tex-texinfo))) | 366 | ("texlive" ,(texlive-union (list texlive-tex-texinfo))) |
| 367 | ("texinfo" ,texinfo))) | 367 | ("texinfo" ,texinfo) |
| 368 | ("zlib" ,zlib))) | ||
| 368 | (arguments | 369 | (arguments |
| 369 | `(#:modules ((guix build gnu-build-system) | 370 | `(#:modules ((guix build gnu-build-system) |
| 370 | (guix build utils) | 371 | (guix build utils) |
| @@ -431,7 +432,9 @@ an interpreter, a compiler, a debugger, and much more.") | |||
| 431 | (_ | 432 | (_ |
| 432 | `("clisp"))) | 433 | `("clisp"))) |
| 433 | (string-append "--prefix=" | 434 | (string-append "--prefix=" |
| 434 | (assoc-ref outputs "out"))))) | 435 | (assoc-ref outputs "out")) |
| 436 | "--with-sb-core-compression" | ||
| 437 | "--with-sb-xref-for-internals"))) | ||
| 435 | (replace 'install | 438 | (replace 'install |
| 436 | (lambda _ | 439 | (lambda _ |
| 437 | (invoke "sh" "install.sh"))) | 440 | (invoke "sh" "install.sh"))) |
| @@ -440,6 +443,21 @@ an interpreter, a compiler, a debugger, and much more.") | |||
| 440 | (with-directory-excursion "doc/manual" | 443 | (with-directory-excursion "doc/manual" |
| 441 | (and (invoke "make" "info") | 444 | (and (invoke "make" "info") |
| 442 | (invoke "make" "dist"))))) | 445 | (invoke "make" "dist"))))) |
| 446 | (add-after 'build 'build-source | ||
| 447 | (lambda* (#:key outputs #:allow-other-keys) | ||
| 448 | (let* ((out (assoc-ref outputs "out")) | ||
| 449 | (rc (string-append out "/lib/sbcl/sbclrc")) | ||
| 450 | (source-dir (string-append out "/share/sbcl"))) | ||
| 451 | (for-each (lambda (p) | ||
| 452 | (copy-recursively p (string-append source-dir "/" p))) | ||
| 453 | '("src" "contrib")) | ||
| 454 | (mkdir-p (dirname rc)) | ||
| 455 | (with-output-to-file rc | ||
| 456 | (lambda () | ||
| 457 | (display | ||
| 458 | (string-append "(sb-ext:set-sbcl-source-location \"" | ||
| 459 | source-dir "\")") ))) | ||
| 460 | #t))) | ||
| 443 | (add-after 'install 'install-doc | 461 | (add-after 'install 'install-doc |
| 444 | (lambda* (#:key outputs #:allow-other-keys) | 462 | (lambda* (#:key outputs #:allow-other-keys) |
| 445 | (let* ((out (assoc-ref outputs "out")) | 463 | (let* ((out (assoc-ref outputs "out")) |
| @@ -6650,3 +6668,75 @@ discoverable library instead of many; consistency and composability, where | |||
| 6650 | @code{s} is always the last argument, which makes it easier to feed pipes and | 6668 | @code{s} is always the last argument, which makes it easier to feed pipes and |
| 6651 | arrows.") | 6669 | arrows.") |
| 6652 | (license license:expat)))) | 6670 | (license license:expat)))) |
| 6671 | |||
| 6672 | (define-public sbcl-cl-xmlspam | ||
| 6673 | (let ((commit "ea06abcca2a73a9779bcfb09081e56665f94e22a")) | ||
| 6674 | (package | ||
| 6675 | (name "sbcl-cl-xmlspam") | ||
| 6676 | (build-system asdf-build-system/sbcl) | ||
| 6677 | (version (git-version "0.0.0" "1" commit)) | ||
| 6678 | (home-page "https://github.com/rogpeppe/cl-xmlspam") | ||
| 6679 | (source | ||
| 6680 | (origin | ||
| 6681 | (method git-fetch) | ||
| 6682 | (uri (git-reference | ||
| 6683 | (url home-page) | ||
| 6684 | (commit commit))) | ||
| 6685 | (file-name (string-append name "-" version)) | ||
| 6686 | (sha256 | ||
| 6687 | (base32 | ||
| 6688 | "0w4rqvrgdgk3fwfq3kx4r7wwdr2bv3b6n3bdqwsiriw9psqzpz2s")))) | ||
| 6689 | (inputs | ||
| 6690 | `(("cxml" ,sbcl-cxml) | ||
| 6691 | ("cl-ppcre" ,sbcl-cl-ppcre))) | ||
| 6692 | (synopsis "Concise, regexp-like pattern matching on streaming XML for Common Lisp") | ||
| 6693 | (description "CXML does an excellent job at parsing XML elements, but what | ||
| 6694 | do you do when you have a XML file that's larger than you want to fit in | ||
| 6695 | memory, and you want to extract some information from it? Writing code to deal | ||
| 6696 | with SAX events, or even using Klacks, quickly becomes tedious. | ||
| 6697 | @code{cl-xmlspam} (for XML Stream PAttern Matcher) is designed to make it easy | ||
| 6698 | to write code that mirrors the structure of the XML that it's parsing. It | ||
| 6699 | also makes it easy to shift paradigms when necessary - the usual Lisp control | ||
| 6700 | constructs can be used interchangeably with pattern matching, and the full | ||
| 6701 | power of CXML is available when necessary.") | ||
| 6702 | (license license:bsd-3)))) | ||
| 6703 | |||
| 6704 | ;; TODO: dbus uses ASDF's package-inferred-system which is not supported by | ||
| 6705 | ;; asdf-build-system/sbcl as of 2019-08-02. We should fix | ||
| 6706 | ;; asdf-build-system/sbcl. | ||
| 6707 | (define-public cl-dbus | ||
| 6708 | (let ((commit "24b452df3a45ca5dc95015500f34baad175c981a") | ||
| 6709 | (revision "1")) | ||
| 6710 | (package | ||
| 6711 | (name "cl-dbus") | ||
| 6712 | (build-system asdf-build-system/source) | ||
| 6713 | (version (git-version "20190408" revision commit)) | ||
| 6714 | (home-page "https://github.com/death/dbus") | ||
| 6715 | (source | ||
| 6716 | (origin | ||
| 6717 | (method git-fetch) | ||
| 6718 | (uri (git-reference | ||
| 6719 | (url home-page) | ||
| 6720 | (commit commit))) | ||
| 6721 | (file-name (git-file-name name version)) | ||
| 6722 | (sha256 | ||
| 6723 | (base32 | ||
| 6724 | "0fw2q866yddbf23nk9pxphm9gsasx35vjyss82xzvndnjmzlqfl5")))) | ||
| 6725 | ;; Inputs must be propagated or else packages depending on this won't have the necessary packages. | ||
| 6726 | (propagated-inputs | ||
| 6727 | `(("alexandria" ,sbcl-alexandria) | ||
| 6728 | ("trivial-garbage" ,sbcl-trivial-garbage) | ||
| 6729 | ("babel" ,sbcl-babel) | ||
| 6730 | ("iolib" ,sbcl-iolib) | ||
| 6731 | ("iolib+multiplex" ,(@@ (gnu packages lisp) sbcl-iolib+multiplex)) | ||
| 6732 | ("iolib+syscalls" ,(@@ (gnu packages lisp) sbcl-iolib+syscalls)) | ||
| 6733 | ("iolib+streams" ,(@@ (gnu packages lisp) sbcl-iolib+streams)) | ||
| 6734 | ("iolib+sockets" ,(@@ (gnu packages lisp) sbcl-iolib+sockets)) | ||
| 6735 | ("ieee-floats" ,sbcl-ieee-floats) | ||
| 6736 | ("flexi-streams" ,sbcl-flexi-streams) | ||
| 6737 | ("cl-xmlspam" ,sbcl-cl-xmlspam) | ||
| 6738 | ("ironclad" ,sbcl-ironclad))) | ||
| 6739 | (synopsis "D-Bus client library for Common Lisp") | ||
| 6740 | (description "This is a Common Lisp library that allows to publish D-Bus | ||
| 6741 | objects as well as send and notify other objects connected to a bus.") | ||
| 6742 | (license license:bsd-2)))) | ||
diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index bb3bf2bfb5b..30ce5cd70c8 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm | |||
| @@ -1285,7 +1285,7 @@ facilities for checking incoming mail.") | |||
| 1285 | (define-public dovecot | 1285 | (define-public dovecot |
| 1286 | (package | 1286 | (package |
| 1287 | (name "dovecot") | 1287 | (name "dovecot") |
| 1288 | (version "2.3.6") | 1288 | (version "2.3.7.2") |
| 1289 | (source | 1289 | (source |
| 1290 | (origin | 1290 | (origin |
| 1291 | (method url-fetch) | 1291 | (method url-fetch) |
| @@ -1293,7 +1293,8 @@ facilities for checking incoming mail.") | |||
| 1293 | (version-major+minor version) "/" | 1293 | (version-major+minor version) "/" |
| 1294 | "dovecot-" version ".tar.gz")) | 1294 | "dovecot-" version ".tar.gz")) |
| 1295 | (sha256 | 1295 | (sha256 |
| 1296 | (base32 "1irnalplb47nlc26dn7zzdi95zhrxxi3miza7p3wdsgapv0qs7gd")))) | 1296 | (base32 |
| 1297 | "0q0jgcv3ni2znkgyhc966ffphj1wk73y76wssh0yciqafs2f0v36")))) | ||
| 1297 | (build-system gnu-build-system) | 1298 | (build-system gnu-build-system) |
| 1298 | (native-inputs | 1299 | (native-inputs |
| 1299 | `(("pkg-config" ,pkg-config))) | 1300 | `(("pkg-config" ,pkg-config))) |
diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index 2163b646f62..4594e2fe368 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm | |||
| @@ -2,8 +2,8 @@ | |||
| 2 | ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org> | 2 | ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org> |
| 3 | ;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il> | 3 | ;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il> |
| 4 | ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> | 4 | ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> |
| 5 | ;;; Copyright © 2018 Mark H Weaver <mhw@netris.org> | 5 | ;;; Copyright © 2018, 2019 Mark H Weaver <mhw@netris.org> |
| 6 | ;;; Copyright © 2018 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> | 6 | ;;; Copyright © 2018, 2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> |
| 7 | ;;; Copyright © 2019 Marius Bakke <mbakke@fastmail.com> | 7 | ;;; Copyright © 2019 Marius Bakke <mbakke@fastmail.com> |
| 8 | ;;; | 8 | ;;; |
| 9 | ;;; This file is part of GNU Guix. | 9 | ;;; This file is part of GNU Guix. |
| @@ -158,6 +158,15 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." | |||
| 158 | (current-source-location) | 158 | (current-source-location) |
| 159 | #:native-inputs native-inputs)) | 159 | #:native-inputs native-inputs)) |
| 160 | 160 | ||
| 161 | (define static-bash-for-bootstrap | ||
| 162 | (package | ||
| 163 | (inherit static-bash) | ||
| 164 | (source (origin | ||
| 165 | (inherit (package-source static-bash)) | ||
| 166 | (patches | ||
| 167 | (cons (search-patch "bash-4.4-linux-pgrp-pipe.patch") | ||
| 168 | (origin-patches (package-source static-bash)))))))) | ||
| 169 | |||
| 161 | (define %static-inputs | 170 | (define %static-inputs |
| 162 | ;; Packages that are to be used as %BOOTSTRAP-INPUTS. | 171 | ;; Packages that are to be used as %BOOTSTRAP-INPUTS. |
| 163 | (let ((coreutils (package (inherit coreutils) | 172 | (let ((coreutils (package (inherit coreutils) |
| @@ -234,7 +243,7 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." | |||
| 234 | (("-Wl,-export-dynamic") "")) | 243 | (("-Wl,-export-dynamic") "")) |
| 235 | #t))))))) | 244 | #t))))))) |
| 236 | (inputs (if (%current-target-system) | 245 | (inputs (if (%current-target-system) |
| 237 | `(("bash" ,static-bash)) | 246 | `(("bash" ,static-bash-for-bootstrap)) |
| 238 | '())))) | 247 | '())))) |
| 239 | (tar (package (inherit tar) | 248 | (tar (package (inherit tar) |
| 240 | (arguments | 249 | (arguments |
| @@ -280,7 +289,7 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." | |||
| 280 | ("sed" ,sed) | 289 | ("sed" ,sed) |
| 281 | ("grep" ,grep) | 290 | ("grep" ,grep) |
| 282 | ("gawk" ,gawk))) | 291 | ("gawk" ,gawk))) |
| 283 | ("bash" ,static-bash)))) | 292 | ("bash" ,static-bash-for-bootstrap)))) |
| 284 | 293 | ||
| 285 | (define %static-binaries | 294 | (define %static-binaries |
| 286 | (package | 295 | (package |
| @@ -585,8 +594,32 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." | |||
| 585 | #t)))) | 594 | #t)))) |
| 586 | (inputs `(("gcc" ,%gcc-static))))) | 595 | (inputs `(("gcc" ,%gcc-static))))) |
| 587 | 596 | ||
| 597 | ;; One package: build + remove store references | ||
| 598 | ;; (define %mescc-tools-static-stripped | ||
| 599 | ;; ;; A statically linked Mescc Tools with store references removed, for | ||
| 600 | ;; ;; bootstrap. | ||
| 601 | ;; (package | ||
| 602 | ;; (inherit mescc-tools) | ||
| 603 | ;; (name "mescc-tools-static-stripped") | ||
| 604 | ;; (arguments | ||
| 605 | ;; `(#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")) | ||
| 606 | ;; "CC=gcc -static") | ||
| 607 | ;; #:test-target "test" | ||
| 608 | ;; #:phases (modify-phases %standard-phases | ||
| 609 | ;; (delete 'configure) | ||
| 610 | ;; (add-after 'install 'strip-store-references | ||
| 611 | ;; (lambda _ | ||
| 612 | ;; (let* ((out (assoc-ref %outputs "out")) | ||
| 613 | ;; (bin (string-append out "/bin"))) | ||
| 614 | ;; (for-each (lambda (file) | ||
| 615 | ;; (let ((target (string-append bin "/" file))) | ||
| 616 | ;; (format #t "strippingg `~a'...~%" target) | ||
| 617 | ;; (remove-store-references target))) | ||
| 618 | ;; '( "M1" "blood-elf" "hex2")))))))))) | ||
| 619 | |||
| 620 | ;; Two packages: first build static, bare minimum content. | ||
| 588 | (define %mescc-tools-static | 621 | (define %mescc-tools-static |
| 589 | ;; A statically linked MesCC Tools for bootstrap. | 622 | ;; A statically linked MesCC Tools. |
| 590 | (package | 623 | (package |
| 591 | (inherit mescc-tools) | 624 | (inherit mescc-tools) |
| 592 | (name "mescc-tools-static") | 625 | (name "mescc-tools-static") |
| @@ -596,12 +629,73 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." | |||
| 596 | ((#:make-flags flags) | 629 | ((#:make-flags flags) |
| 597 | `(cons "CC=gcc -static" ,flags))))))) | 630 | `(cons "CC=gcc -static" ,flags))))))) |
| 598 | 631 | ||
| 599 | (define-public %mes-minimal-stripped | 632 | ;; ... next remove store references. |
| 600 | ;; A minimal Mes without documentation dependencies, for bootstrap. | 633 | (define %mescc-tools-static-stripped |
| 634 | ;; A statically linked Mescc Tools with store references removed, for | ||
| 635 | ;; bootstrap. | ||
| 636 | (package | ||
| 637 | (inherit %mescc-tools-static) | ||
| 638 | (name (string-append (package-name %mescc-tools-static) "-stripped")) | ||
| 639 | (build-system trivial-build-system) | ||
| 640 | (arguments | ||
| 641 | `(#:modules ((guix build utils)) | ||
| 642 | #:builder | ||
| 643 | (begin | ||
| 644 | (use-modules (guix build utils)) | ||
| 645 | (let* ((in (assoc-ref %build-inputs "mescc-tools")) | ||
| 646 | (out (assoc-ref %outputs "out")) | ||
| 647 | (bin (string-append out "/bin"))) | ||
| 648 | (mkdir-p bin) | ||
| 649 | (for-each (lambda (file) | ||
| 650 | (let ((target (string-append bin "/" file))) | ||
| 651 | (format #t "copying `~a'...~%" file) | ||
| 652 | (copy-file (string-append in "/bin/" file) | ||
| 653 | target) | ||
| 654 | (remove-store-references target))) | ||
| 655 | '( "M1" "blood-elf" "hex2")) | ||
| 656 | #t)))) | ||
| 657 | (inputs `(("mescc-tools" ,%mescc-tools-static))))) | ||
| 658 | |||
| 659 | ;; (define-public %mes-minimal-stripped | ||
| 660 | ;; ;; A minimal Mes without documentation dependencies, for bootstrap. | ||
| 661 | ;; (let ((triplet "i686-unknown-linux-gnu")) | ||
| 662 | ;; (package | ||
| 663 | ;; (inherit mes) | ||
| 664 | ;; (name "mes-minimal-stripped") | ||
| 665 | ;; (native-inputs | ||
| 666 | ;; `(("guile" ,guile-2.2))) | ||
| 667 | ;; (arguments | ||
| 668 | ;; `(#:system "i686-linux" | ||
| 669 | ;; #:strip-binaries? #f | ||
| 670 | ;; #:configure-flags '("--mes") | ||
| 671 | ;; #:phases | ||
| 672 | ;; (modify-phases %standard-phases | ||
| 673 | ;; (delete 'patch-shebangs) | ||
| 674 | ;; (add-after 'install 'strip-install | ||
| 675 | ;; (lambda _ | ||
| 676 | ;; (let* ((out (assoc-ref %outputs "out")) | ||
| 677 | ;; (share (string-append out "/share"))) | ||
| 678 | ;; (delete-file-recursively (string-append out "/lib/guile")) | ||
| 679 | ;; (delete-file-recursively (string-append share "/guile")) | ||
| 680 | ;; (delete-file-recursively (string-append share "/mes/scaffold")) | ||
| 681 | |||
| 682 | ;; (for-each delete-file | ||
| 683 | ;; (find-files | ||
| 684 | ;; (string-append share "/mes/lib") "\\.(h|c)")) | ||
| 685 | |||
| 686 | ;; (for-each (lambda (dir) | ||
| 687 | ;; (for-each remove-store-references | ||
| 688 | ;; (find-files (string-append out "/" dir) | ||
| 689 | ;; ".*"))) | ||
| 690 | ;; '("bin" "share/mes"))))))))))) | ||
| 691 | |||
| 692 | ;; Two packages: first build static, bare minimum content. | ||
| 693 | (define-public %mes-minimal | ||
| 694 | ;; A minimal Mes without documentation. | ||
| 601 | (let ((triplet "i686-unknown-linux-gnu")) | 695 | (let ((triplet "i686-unknown-linux-gnu")) |
| 602 | (package | 696 | (package |
| 603 | (inherit mes) | 697 | (inherit mes) |
| 604 | (name "mes-minimal-stripped") | 698 | (name "mes-minimal") |
| 605 | (native-inputs | 699 | (native-inputs |
| 606 | `(("guile" ,guile-2.2))) | 700 | `(("guile" ,guile-2.2))) |
| 607 | (arguments | 701 | (arguments |
| @@ -610,6 +704,7 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." | |||
| 610 | #:configure-flags '("--mes") | 704 | #:configure-flags '("--mes") |
| 611 | #:phases | 705 | #:phases |
| 612 | (modify-phases %standard-phases | 706 | (modify-phases %standard-phases |
| 707 | (delete 'patch-shebangs) | ||
| 613 | (add-after 'install 'strip-install | 708 | (add-after 'install 'strip-install |
| 614 | (lambda _ | 709 | (lambda _ |
| 615 | (let* ((out (assoc-ref %outputs "out")) | 710 | (let* ((out (assoc-ref %outputs "out")) |
| @@ -617,10 +712,35 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." | |||
| 617 | (delete-file-recursively (string-append out "/lib/guile")) | 712 | (delete-file-recursively (string-append out "/lib/guile")) |
| 618 | (delete-file-recursively (string-append share "/guile")) | 713 | (delete-file-recursively (string-append share "/guile")) |
| 619 | (delete-file-recursively (string-append share "/mes/scaffold")) | 714 | (delete-file-recursively (string-append share "/mes/scaffold")) |
| 620 | (for-each | 715 | |
| 621 | delete-file | 716 | (for-each delete-file |
| 622 | (find-files (string-append share "/mes/lib") | 717 | (find-files |
| 623 | "\\.(h|c)"))))))))))) | 718 | (string-append share "/mes/lib") |
| 719 | "\\.(h|c)"))))))))))) | ||
| 720 | |||
| 721 | ;; next remove store references. | ||
| 722 | (define %mes-minimal-stripped | ||
| 723 | ;; A minimal Mes with store references removed, for bootstrap. | ||
| 724 | (package | ||
| 725 | (inherit %mes-minimal) | ||
| 726 | (name (string-append (package-name %mes-minimal) "-stripped")) | ||
| 727 | (build-system trivial-build-system) | ||
| 728 | (arguments | ||
| 729 | `(#:modules ((guix build utils)) | ||
| 730 | #:builder | ||
| 731 | (begin | ||
| 732 | (use-modules (guix build utils)) | ||
| 733 | (let ((in (assoc-ref %build-inputs "mes")) | ||
| 734 | (out (assoc-ref %outputs "out"))) | ||
| 735 | |||
| 736 | (copy-recursively in out) | ||
| 737 | (for-each (lambda (dir) | ||
| 738 | (for-each remove-store-references | ||
| 739 | (find-files (string-append out "/" dir) | ||
| 740 | ".*"))) | ||
| 741 | '("bin" "share/mes")) | ||
| 742 | #t)))) | ||
| 743 | (inputs `(("mes" ,%mes-minimal))))) | ||
| 624 | 744 | ||
| 625 | (define %guile-static | 745 | (define %guile-static |
| 626 | ;; A statically-linked Guile that is relocatable--i.e., it can search | 746 | ;; A statically-linked Guile that is relocatable--i.e., it can search |
| @@ -680,6 +800,10 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." | |||
| 680 | ((#:tests? _ #f) | 800 | ((#:tests? _ #f) |
| 681 | ;; There are uses of `dynamic-link' in | 801 | ;; There are uses of `dynamic-link' in |
| 682 | ;; {foreign,coverage}.test that don't fly here. | 802 | ;; {foreign,coverage}.test that don't fly here. |
| 803 | #f) | ||
| 804 | ((#:parallel-build? _ #f) | ||
| 805 | ;; Work around the fact that the Guile build system is | ||
| 806 | ;; not deterministic when parallel-build is enabled. | ||
| 683 | #f)))))) | 807 | #f)))))) |
| 684 | (package-with-relocatable-glibc (static-package guile)))) | 808 | (package-with-relocatable-glibc (static-package guile)))) |
| 685 | 809 | ||
| @@ -790,11 +914,11 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." | |||
| 790 | (tarball-package %guile-static-stripped)) | 914 | (tarball-package %guile-static-stripped)) |
| 791 | 915 | ||
| 792 | (define %mescc-tools-bootstrap-tarball | 916 | (define %mescc-tools-bootstrap-tarball |
| 793 | ;; A tarball with MesCC binary seed. | 917 | ;; A tarball with statically-linked MesCC binary seed. |
| 794 | (tarball-package %mescc-tools-static)) | 918 | (tarball-package %mescc-tools-static-stripped)) |
| 795 | 919 | ||
| 796 | (define %mes-bootstrap-tarball | 920 | (define %mes-bootstrap-tarball |
| 797 | ;; A tarball with Mes ASCII Seed and binary Mes C Library. | 921 | ;; A tarball with Mes binary seed. |
| 798 | (tarball-package %mes-minimal-stripped)) | 922 | (tarball-package %mes-minimal-stripped)) |
| 799 | 923 | ||
| 800 | (define %bootstrap-tarballs | 924 | (define %bootstrap-tarballs |
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 7a04aa979e9..38bb81242f7 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm | |||
| @@ -246,7 +246,7 @@ triangulations.") | |||
| 246 | (define-public python-cvxopt | 246 | (define-public python-cvxopt |
| 247 | (package | 247 | (package |
| 248 | (name "python-cvxopt") | 248 | (name "python-cvxopt") |
| 249 | (version "1.2.1") | 249 | (version "1.2.3") |
| 250 | (source (origin | 250 | (source (origin |
| 251 | (method git-fetch) | 251 | (method git-fetch) |
| 252 | (uri (git-reference | 252 | (uri (git-reference |
| @@ -255,7 +255,7 @@ triangulations.") | |||
| 255 | (file-name (git-file-name name version)) | 255 | (file-name (git-file-name name version)) |
| 256 | (sha256 | 256 | (sha256 |
| 257 | (base32 | 257 | (base32 |
| 258 | "05mnjil9palaa48xafdfh4f5pr4z7aqjr995rwl08qfyxs8y0crf")))) | 258 | "1kiy2m62xgs2d5id6dnnwy4vap85cd70p7pgkb9nh23qf9xnak7b")))) |
| 259 | (build-system python-build-system) | 259 | (build-system python-build-system) |
| 260 | (arguments | 260 | (arguments |
| 261 | `(#:phases | 261 | `(#:phases |
diff --git a/gnu/packages/mingw.scm b/gnu/packages/mingw.scm index 017f9453abc..fe51780fa38 100644 --- a/gnu/packages/mingw.scm +++ b/gnu/packages/mingw.scm | |||
| @@ -36,15 +36,15 @@ | |||
| 36 | (let ((triplet (string-append machine "-" "w64-mingw32"))) | 36 | (let ((triplet (string-append machine "-" "w64-mingw32"))) |
| 37 | (package | 37 | (package |
| 38 | (name (string-append "mingw-w64" "-" machine)) | 38 | (name (string-append "mingw-w64" "-" machine)) |
| 39 | (version "5.0.4") | 39 | (version "6.0.0") |
| 40 | (source (origin | 40 | (source (origin |
| 41 | (method url-fetch) | 41 | (method url-fetch) |
| 42 | (uri (string-append | 42 | (uri (string-append |
| 43 | "https://sourceforge.net/projects/mingw-w64/files/mingw-w64/" | 43 | "https://sourceforge.net/projects/mingw-w64/files/mingw-w64/" |
| 44 | "mingw-w64-release/mingw-w64-v" version ".tar.bz2")) | 44 | "mingw-w64-release/mingw-w64-v" version ".tar.bz2")) |
| 45 | (sha256 | 45 | (sha256 |
| 46 | (base32 "00zq3z1hbzd5yzmskskjg79xrzwsqx7ihyprfaxy4hb897vf29sm")) | 46 | (base32 "1w28mynv500y03h92nh87rgw3fnp82qwnjbxrrzqkmr63q812pl0")) |
| 47 | (patches (search-patches "mingw-w64-5.0rc2-gcc-4.9.3.patch")))) | 47 | (patches (search-patches "mingw-w64-6.0.0-gcc.patch")))) |
| 48 | (native-inputs `(("xgcc-core" ,(cross-gcc triplet)) | 48 | (native-inputs `(("xgcc-core" ,(cross-gcc triplet)) |
| 49 | ("xbinutils" ,(cross-binutils triplet)))) | 49 | ("xbinutils" ,(cross-binutils triplet)))) |
| 50 | (build-system gnu-build-system) | 50 | (build-system gnu-build-system) |
diff --git a/gnu/packages/nano.scm b/gnu/packages/nano.scm index 6f79dd49fc6..8a3cef33773 100644 --- a/gnu/packages/nano.scm +++ b/gnu/packages/nano.scm | |||
| @@ -30,13 +30,13 @@ | |||
| 30 | (define-public nano | 30 | (define-public nano |
| 31 | (package | 31 | (package |
| 32 | (name "nano") | 32 | (name "nano") |
| 33 | (version "4.3") | 33 | (version "4.4") |
| 34 | (source | 34 | (source |
| 35 | (origin | 35 | (origin |
| 36 | (method url-fetch) | 36 | (method url-fetch) |
| 37 | (uri (string-append "mirror://gnu/nano/nano-" version ".tar.xz")) | 37 | (uri (string-append "mirror://gnu/nano/nano-" version ".tar.xz")) |
| 38 | (sha256 | 38 | (sha256 |
| 39 | (base32 "108dzj6azqmini9bvgl26r0q1y59s3nnrw75hfzv91bs50davlq0")))) | 39 | (base32 "1iw2ypq34g1gfqyhgka2fz5yj5vrlz85q6zk7amgyj286ph25wia")))) |
| 40 | (build-system gnu-build-system) | 40 | (build-system gnu-build-system) |
| 41 | (inputs | 41 | (inputs |
| 42 | `(("gettext" ,gettext-minimal) | 42 | `(("gettext" ,gettext-minimal) |
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index fce0d0f84d8..49ac949b06e 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm | |||
| @@ -465,32 +465,17 @@ sub-directory.") | |||
| 465 | (define-public stow | 465 | (define-public stow |
| 466 | (package | 466 | (package |
| 467 | (name "stow") | 467 | (name "stow") |
| 468 | (version "2.3.0") | 468 | (version "2.3.1") |
| 469 | (source (origin | 469 | (source (origin |
| 470 | (method url-fetch) | 470 | (method url-fetch) |
| 471 | (uri (string-append "mirror://gnu/stow/stow-" | 471 | (uri (string-append "mirror://gnu/stow/stow-" |
| 472 | version ".tar.gz")) | 472 | version ".tar.gz")) |
| 473 | (sha256 | 473 | (sha256 |
| 474 | (base32 | 474 | (base32 |
| 475 | "0h8qr2rxsrkg6d8jxjk68r23jgn1dxdxyp4bnzzinpa8sjhfl905")))) | 475 | "0jrxy12ywn7smdzdnvwzjw77l6knx6jkj2rckgykg1dpf6bdkm89")))) |
| 476 | (build-system gnu-build-system) | 476 | (build-system gnu-build-system) |
| 477 | (arguments | ||
| 478 | '(#:phases | ||
| 479 | (modify-phases %standard-phases | ||
| 480 | (add-after 'install 'wrap-stow | ||
| 481 | (lambda* (#:key inputs outputs #:allow-other-keys) | ||
| 482 | (let ((out (assoc-ref outputs "out"))) | ||
| 483 | (wrap-program (string-append out "/bin/stow") | ||
| 484 | `("PERL5LIB" ":" prefix | ||
| 485 | ,(map (lambda (i) (string-append (assoc-ref inputs i) | ||
| 486 | "/lib/perl5/site_perl")) | ||
| 487 | '("perl-clone-choose" "perl-clone" "perl-hash-merge")))) | ||
| 488 | #t)))))) | ||
| 489 | (inputs | 477 | (inputs |
| 490 | `(("perl" ,perl) | 478 | `(("perl" ,perl))) |
| 491 | ("perl-clone" ,perl-clone) | ||
| 492 | ("perl-clone-choose" ,perl-clone-choose) | ||
| 493 | ("perl-hash-merge" ,perl-hash-merge))) | ||
| 494 | (native-inputs | 479 | (native-inputs |
| 495 | `(("perl-test-simple" ,perl-test-simple) | 480 | `(("perl-test-simple" ,perl-test-simple) |
| 496 | ("perl-test-output" ,perl-test-output) | 481 | ("perl-test-output" ,perl-test-output) |
| @@ -559,75 +544,83 @@ transactions from C or Python.") | |||
| 559 | (license license:gpl2+))) | 544 | (license license:gpl2+))) |
| 560 | 545 | ||
| 561 | (define-public diffoscope | 546 | (define-public diffoscope |
| 562 | (package | 547 | (let ((version "121")) |
| 563 | (name "diffoscope") | 548 | (package |
| 564 | (version "120") | 549 | (name "diffoscope") |
| 565 | (source (origin | 550 | (version version) |
| 566 | (method git-fetch) | 551 | (source (origin |
| 567 | (uri (git-reference | 552 | (method git-fetch) |
| 568 | (url "https://salsa.debian.org/reproducible-builds/diffoscope.git") | 553 | (uri (git-reference |
| 569 | (commit "120"))) | 554 | (url "https://salsa.debian.org/reproducible-builds/diffoscope.git") |
| 570 | (file-name (git-file-name name version)) | 555 | (commit version))) |
| 571 | (sha256 | 556 | (file-name (git-file-name name version)) |
| 572 | (base32 | 557 | (sha256 |
| 573 | "07z9yclvfkw4326739l2ywzzihax5vdijiaqqpfix9rz1rb923aa")))) | 558 | (base32 |
| 574 | (build-system python-build-system) | 559 | "1bw7s8qs1vnr93vhifl6pj6h6w6r6nrpc5anzhh9wx2gcaipkb3m")))) |
| 575 | (arguments | 560 | (build-system python-build-system) |
| 576 | `(#:phases (modify-phases %standard-phases | 561 | (arguments |
| 577 | ;; setup.py mistakenly requires python-magic from PyPi, even | 562 | `(#:phases (modify-phases %standard-phases |
| 578 | ;; though the Python bindings of `file` are sufficient. | 563 | ;; setup.py mistakenly requires python-magic from PyPi, even |
| 579 | ;; https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=815844 | 564 | ;; though the Python bindings of `file` are sufficient. |
| 580 | (add-after 'unpack 'dependency-on-python-magic | 565 | ;; https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=815844 |
| 581 | (lambda _ | 566 | (add-after 'unpack 'dependency-on-python-magic |
| 582 | (substitute* "setup.py" | 567 | (lambda _ |
| 583 | (("'python-magic',") "")))) | 568 | (substitute* "setup.py" |
| 584 | ;; This test is broken because our `file` package has a | 569 | (("'python-magic',") "")))) |
| 585 | ;; bug in berkeley-db file type detection. | 570 | ;; This test is broken because our `file` package has a |
| 586 | (add-after 'unpack 'remove-berkeley-test | 571 | ;; bug in berkeley-db file type detection. |
| 587 | (lambda _ | 572 | (add-after 'unpack 'remove-berkeley-test |
| 588 | (delete-file "tests/comparators/test_berkeley_db.py") | 573 | (lambda _ |
| 589 | #t)) | 574 | (delete-file "tests/comparators/test_berkeley_db.py") |
| 590 | (add-after 'unpack 'embed-tool-references | 575 | #t)) |
| 591 | (lambda* (#:key inputs #:allow-other-keys) | 576 | (add-after 'unpack 'embed-tool-references |
| 592 | (substitute* "diffoscope/comparators/utils/compare.py" | 577 | (lambda* (#:key inputs #:allow-other-keys) |
| 593 | (("\\['xxd',") | 578 | (substitute* "diffoscope/comparators/utils/compare.py" |
| 594 | (string-append "['" (which "xxd") "',"))) | 579 | (("\\['xxd',") |
| 595 | (substitute* "diffoscope/comparators/elf.py" | 580 | (string-append "['" (which "xxd") "',"))) |
| 596 | (("@tool_required\\('readelf'\\)") "") | 581 | (substitute* "diffoscope/comparators/elf.py" |
| 597 | (("get_tool_name\\('readelf'\\)") | 582 | (("@tool_required\\('readelf'\\)") "") |
| 598 | (string-append "'" (which "readelf") "'"))) | 583 | (("get_tool_name\\('readelf'\\)") |
| 599 | (substitute* "diffoscope/comparators/directory.py" | 584 | (string-append "'" (which "readelf") "'"))) |
| 600 | (("@tool_required\\('stat'\\)") "") | 585 | (substitute* "diffoscope/comparators/directory.py" |
| 601 | (("@tool_required\\('getfacl'\\)") "") | 586 | (("@tool_required\\('stat'\\)") "") |
| 602 | (("\\['stat',") | 587 | (("@tool_required\\('getfacl'\\)") "") |
| 603 | (string-append "['" (which "stat") "',")) | 588 | (("\\['stat',") |
| 604 | (("\\['getfacl',") | 589 | (string-append "['" (which "stat") "',")) |
| 605 | (string-append "['" (which "getfacl") "',"))) | 590 | (("\\['getfacl',") |
| 606 | #t)) | 591 | (string-append "['" (which "getfacl") "',"))) |
| 607 | (add-before 'check 'delete-failing-test | 592 | #t)) |
| 608 | (lambda _ | 593 | (add-before 'check 'writable-test-data |
| 609 | ;; this requires /sbin to be on the path | 594 | (lambda _ |
| 610 | (delete-file "tests/test_tools.py") | 595 | ;; tests/comparators/test_elf.py needs write access to |
| 611 | #t))))) | 596 | ;; test data |
| 612 | (inputs `(("rpm" ,rpm) ;for rpm-python | 597 | (make-file-writable |
| 613 | ("python-file" ,python-file) | 598 | "tests/data/ignore_readelf_errors_expected_diff") |
| 614 | ("python-debian" ,python-debian) | 599 | #t)) |
| 615 | ("python-libarchive-c" ,python-libarchive-c) | 600 | (add-before 'check 'delete-failing-test |
| 616 | ("python-tlsh" ,python-tlsh) | 601 | (lambda _ |
| 617 | ("acl" ,acl) ;for getfacl | 602 | ;; this requires /sbin to be on the path |
| 618 | ("colordiff" ,colordiff) | 603 | (delete-file "tests/test_tools.py") |
| 619 | ("xxd" ,xxd))) | 604 | #t))))) |
| 620 | ;; Below are modules used for tests. | 605 | (inputs `(("rpm" ,rpm) ;for rpm-python |
| 621 | (native-inputs `(("python-pytest" ,python-pytest) | 606 | ("python-file" ,python-file) |
| 622 | ("python-chardet" ,python-chardet))) | 607 | ("python-debian" ,python-debian) |
| 623 | (home-page "https://diffoscope.org/") | 608 | ("python-libarchive-c" ,python-libarchive-c) |
| 624 | (synopsis "Compare files, archives, and directories in depth") | 609 | ("python-tlsh" ,python-tlsh) |
| 625 | (description | 610 | ("acl" ,acl) ;for getfacl |
| 626 | "Diffoscope tries to get to the bottom of what makes files or directories | 611 | ("colordiff" ,colordiff) |
| 612 | ("xxd" ,xxd))) | ||
| 613 | ;; Below are modules used for tests. | ||
| 614 | (native-inputs `(("python-pytest" ,python-pytest) | ||
| 615 | ("python-chardet" ,python-chardet))) | ||
| 616 | (home-page "https://diffoscope.org/") | ||
| 617 | (synopsis "Compare files, archives, and directories in depth") | ||
| 618 | (description | ||
| 619 | "Diffoscope tries to get to the bottom of what makes files or directories | ||
| 627 | different. It recursively unpacks archives of many kinds and transforms | 620 | different. It recursively unpacks archives of many kinds and transforms |
| 628 | various binary formats into more human readable forms to compare them. It can | 621 | various binary formats into more human readable forms to compare them. It can |
| 629 | compare two tarballs, ISO images, or PDFs just as easily.") | 622 | compare two tarballs, ISO images, or PDFs just as easily.") |
| 630 | (license license:gpl3+))) | 623 | (license license:gpl3+)))) |
| 631 | 624 | ||
| 632 | (define-public trydiffoscope | 625 | (define-public trydiffoscope |
| 633 | (package | 626 | (package |
diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm index cdc35b47038..3b7ce4c1501 100644 --- a/gnu/packages/parallel.scm +++ b/gnu/packages/parallel.scm | |||
| @@ -52,14 +52,14 @@ | |||
| 52 | (define-public parallel | 52 | (define-public parallel |
| 53 | (package | 53 | (package |
| 54 | (name "parallel") | 54 | (name "parallel") |
| 55 | (version "20190522") | 55 | (version "20190822") |
| 56 | (source | 56 | (source |
| 57 | (origin | 57 | (origin |
| 58 | (method url-fetch) | 58 | (method url-fetch) |
| 59 | (uri (string-append "mirror://gnu/parallel/parallel-" | 59 | (uri (string-append "mirror://gnu/parallel/parallel-" |
| 60 | version ".tar.bz2")) | 60 | version ".tar.bz2")) |
| 61 | (sha256 | 61 | (sha256 |
| 62 | (base32 "0y3z9wybs3gak3zwgsby8r5gg6dwd3qlrkch0q4fn0i1j1jhmijv")))) | 62 | (base32 "1mi3a18fdwcx50jg51pw1ks1fkmc2slyinff0yb3xhihi2szbskp")))) |
| 63 | (build-system gnu-build-system) | 63 | (build-system gnu-build-system) |
| 64 | (arguments | 64 | (arguments |
| 65 | `(#:phases | 65 | `(#:phases |
diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index 8b1bca37e18..ff13be24db0 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm | |||
| @@ -236,28 +236,40 @@ platforms.") | |||
| 236 | (define-public shroud | 236 | (define-public shroud |
| 237 | (package | 237 | (package |
| 238 | (name "shroud") | 238 | (name "shroud") |
| 239 | (version "0.1.1") | 239 | (version "0.1.2") |
| 240 | (source (origin | 240 | (source (origin |
| 241 | (method url-fetch) | 241 | (method url-fetch) |
| 242 | (uri (string-append "https://files.dthompson.us/shroud/shroud-" | 242 | (uri (string-append "https://files.dthompson.us/shroud/shroud-" |
| 243 | version ".tar.gz")) | 243 | version ".tar.gz")) |
| 244 | (sha256 | 244 | (sha256 |
| 245 | (base32 | 245 | (base32 |
| 246 | "1y43yhgy2zbrk5bqj3qyx9rkcz2bma9sinlrg7dip3jqms9gq4lr")))) | 246 | "1l2shrhvcwfzkar9qiwb75nhcqmx25iz55lzmz0c187nbjhqzi9p")))) |
| 247 | (build-system gnu-build-system) | 247 | (build-system gnu-build-system) |
| 248 | (native-inputs | ||
| 249 | `(("pkg-config" ,pkg-config))) | ||
| 248 | (arguments | 250 | (arguments |
| 249 | '(#:phases | 251 | `(#:modules ((guix build gnu-build-system) |
| 252 | (guix build utils) | ||
| 253 | (ice-9 popen) | ||
| 254 | (ice-9 rdelim)) | ||
| 255 | #:phases | ||
| 250 | (modify-phases %standard-phases | 256 | (modify-phases %standard-phases |
| 251 | (add-after 'install 'wrap-shroud | 257 | (add-after 'install 'wrap-shroud |
| 252 | (lambda* (#:key outputs #:allow-other-keys) | 258 | (lambda* (#:key inputs outputs #:allow-other-keys) |
| 253 | (let* ((out (assoc-ref outputs "out")) | 259 | (let* ((out (assoc-ref outputs "out")) |
| 254 | (ccachedir (string-append out "/lib/guile/2.0/ccache")) | 260 | (guile (assoc-ref inputs "guile")) |
| 261 | (effective (read-line | ||
| 262 | (open-pipe* OPEN_READ | ||
| 263 | (string-append guile "/bin/guile") | ||
| 264 | "-c" "(display (effective-version))"))) | ||
| 265 | (ccachedir (string-append out | ||
| 266 | "/lib/guile/" effective "/site-ccache")) | ||
| 255 | (prog (string-append out "/bin/shroud"))) | 267 | (prog (string-append out "/bin/shroud"))) |
| 256 | (wrap-program prog | 268 | (wrap-program prog |
| 257 | `("GUILE_LOAD_COMPILED_PATH" ":" prefix (,ccachedir))) | 269 | `("GUILE_LOAD_COMPILED_PATH" ":" prefix (,ccachedir))) |
| 258 | #t)))))) | 270 | #t)))))) |
| 259 | (inputs | 271 | (inputs |
| 260 | `(("guile" ,guile-2.0) | 272 | `(("guile" ,guile-2.2) |
| 261 | ("gnupg" ,gnupg) | 273 | ("gnupg" ,gnupg) |
| 262 | ("xclip" ,xclip))) | 274 | ("xclip" ,xclip))) |
| 263 | (synopsis "GnuPG-based secret manager") | 275 | (synopsis "GnuPG-based secret manager") |
diff --git a/gnu/packages/patches/bash-4.4-linux-pgrp-pipe.patch b/gnu/packages/patches/bash-4.4-linux-pgrp-pipe.patch new file mode 100644 index 00000000000..0d03d7ce37a --- /dev/null +++ b/gnu/packages/patches/bash-4.4-linux-pgrp-pipe.patch | |||
| @@ -0,0 +1,30 @@ | |||
| 1 | Unconditionally enable PGRP_PIPE on Linux (the kernel), regardless of | ||
| 2 | the kernel version in use on the build machine. | ||
| 3 | |||
| 4 | --- configure.ac.orig 1969-12-31 19:00:00.000000000 -0500 | ||
| 5 | +++ configure.ac 2019-08-11 22:28:26.038841961 -0400 | ||
| 6 | @@ -1092,9 +1092,7 @@ | ||
| 7 | solaris2*) LOCAL_CFLAGS=-DSOLARIS ;; | ||
| 8 | lynxos*) LOCAL_CFLAGS=-DRECYCLES_PIDS ;; | ||
| 9 | linux*) LOCAL_LDFLAGS=-rdynamic # allow dynamic loading | ||
| 10 | - case "`uname -r`" in | ||
| 11 | - 2.[[456789]]*|[[34]]*) AC_DEFINE(PGRP_PIPE) ;; | ||
| 12 | - esac ;; | ||
| 13 | + AC_DEFINE(PGRP_PIPE) ;; | ||
| 14 | *qnx6*) LOCAL_CFLAGS="-Dqnx -Dqnx6" LOCAL_LIBS="-lncurses" ;; | ||
| 15 | *qnx*) LOCAL_CFLAGS="-Dqnx -F -3s" LOCAL_LDFLAGS="-3s" LOCAL_LIBS="-lunix -lncurses" ;; | ||
| 16 | powerux*) LOCAL_LIBS="-lgen" ;; | ||
| 17 | --- configure.orig 1969-12-31 19:00:00.000000000 -0500 | ||
| 18 | +++ configure 2019-08-11 22:28:10.166763255 -0400 | ||
| 19 | @@ -16064,10 +16064,7 @@ | ||
| 20 | solaris2*) LOCAL_CFLAGS=-DSOLARIS ;; | ||
| 21 | lynxos*) LOCAL_CFLAGS=-DRECYCLES_PIDS ;; | ||
| 22 | linux*) LOCAL_LDFLAGS=-rdynamic # allow dynamic loading | ||
| 23 | - case "`uname -r`" in | ||
| 24 | - 2.[456789]*|[34]*) $as_echo "#define PGRP_PIPE 1" >>confdefs.h | ||
| 25 | - ;; | ||
| 26 | - esac ;; | ||
| 27 | + $as_echo "#define PGRP_PIPE 1" >>confdefs.h ;; | ||
| 28 | *qnx6*) LOCAL_CFLAGS="-Dqnx -Dqnx6" LOCAL_LIBS="-lncurses" ;; | ||
| 29 | *qnx*) LOCAL_CFLAGS="-Dqnx -F -3s" LOCAL_LDFLAGS="-3s" LOCAL_LIBS="-lunix -lncurses" ;; | ||
| 30 | powerux*) LOCAL_LIBS="-lgen" ;; | ||
diff --git a/gnu/packages/patches/enlightenment-fix-setuid-path.patch b/gnu/packages/patches/enlightenment-fix-setuid-path.patch index 90e16d3e676..c48f18c8ec3 100644 --- a/gnu/packages/patches/enlightenment-fix-setuid-path.patch +++ b/gnu/packages/patches/enlightenment-fix-setuid-path.patch | |||
| @@ -28,7 +28,7 @@ index 2bced6766..208e583ba 100644 | |||
| 28 | } | 28 | } |
| 29 | #endif // HAVE_EEZE || __FreeBSD_kernel__ | 29 | #endif // HAVE_EEZE || __FreeBSD_kernel__ |
| 30 | diff --git a/src/bin/e_fm/e_fm_main_eeze.c b/src/bin/e_fm/e_fm_main_eeze.c | 30 | diff --git a/src/bin/e_fm/e_fm_main_eeze.c b/src/bin/e_fm/e_fm_main_eeze.c |
| 31 | index b7d9e3eba..d8a9eb82c 100644 | 31 | index 0fcffa249..c1921121d 100644 |
| 32 | --- a/src/bin/e_fm/e_fm_main_eeze.c | 32 | --- a/src/bin/e_fm/e_fm_main_eeze.c |
| 33 | +++ b/src/bin/e_fm/e_fm_main_eeze.c | 33 | +++ b/src/bin/e_fm/e_fm_main_eeze.c |
| 34 | @@ -318,7 +318,7 @@ _e_fm_main_eeze_volume_eject(E_Volume *v) | 34 | @@ -318,7 +318,7 @@ _e_fm_main_eeze_volume_eject(E_Volume *v) |
| @@ -59,10 +59,10 @@ index b7d9e3eba..d8a9eb82c 100644 | |||
| 59 | } | 59 | } |
| 60 | v->guard = ecore_timer_loop_add(E_FM_MOUNT_TIMEOUT, (Ecore_Task_Cb)_e_fm_main_eeze_vol_mount_timeout, v); | 60 | v->guard = ecore_timer_loop_add(E_FM_MOUNT_TIMEOUT, (Ecore_Task_Cb)_e_fm_main_eeze_vol_mount_timeout, v); |
| 61 | diff --git a/src/bin/e_sys.c b/src/bin/e_sys.c | 61 | diff --git a/src/bin/e_sys.c b/src/bin/e_sys.c |
| 62 | index 6781a9b5a..8cd140f1b 100644 | 62 | index 671fbcd9a..90ee04cf1 100644 |
| 63 | --- a/src/bin/e_sys.c | 63 | --- a/src/bin/e_sys.c |
| 64 | +++ b/src/bin/e_sys.c | 64 | +++ b/src/bin/e_sys.c |
| 65 | @@ -653,20 +653,16 @@ _e_sys_cb_timer(void *data EINA_UNUSED) | 65 | @@ -702,20 +702,16 @@ _e_sys_cb_timer(void *data EINA_UNUSED) |
| 66 | 66 | ||
| 67 | e_init_status_set(_("Checking System Permissions")); | 67 | e_init_status_set(_("Checking System Permissions")); |
| 68 | snprintf(buf, sizeof(buf), | 68 | snprintf(buf, sizeof(buf), |
| @@ -87,9 +87,9 @@ index 6781a9b5a..8cd140f1b 100644 | |||
| 87 | _e_sys_hibernate_check_exe = ecore_exe_run(buf, NULL); | 87 | _e_sys_hibernate_check_exe = ecore_exe_run(buf, NULL); |
| 88 | return ECORE_CALLBACK_CANCEL; | 88 | return ECORE_CALLBACK_CANCEL; |
| 89 | } | 89 | } |
| 90 | @@ -1079,8 +1075,7 @@ _e_sys_action_do(E_Sys_Action a, char *param EINA_UNUSED, Eina_Bool raw) | 90 | @@ -1134,8 +1130,7 @@ _e_sys_action_do(E_Sys_Action a, char *param EINA_UNUSED, Eina_Bool raw) |
| 91 | /* shutdown -h now */ | ||
| 92 | if (e_util_immortal_check()) return 0; | 91 | if (e_util_immortal_check()) return 0; |
| 92 | e_fm2_die(); | ||
| 93 | snprintf(buf, sizeof(buf), | 93 | snprintf(buf, sizeof(buf), |
| 94 | - "%s/enlightenment/utils/enlightenment_sys halt", | 94 | - "%s/enlightenment/utils/enlightenment_sys halt", |
| 95 | - e_prefix_lib_get()); | 95 | - e_prefix_lib_get()); |
| @@ -97,9 +97,9 @@ index 6781a9b5a..8cd140f1b 100644 | |||
| 97 | if (_e_sys_exe) | 97 | if (_e_sys_exe) |
| 98 | { | 98 | { |
| 99 | if ((ecore_time_get() - _e_sys_begin_time) > 2.0) | 99 | if ((ecore_time_get() - _e_sys_begin_time) > 2.0) |
| 100 | @@ -1114,8 +1109,7 @@ _e_sys_action_do(E_Sys_Action a, char *param EINA_UNUSED, Eina_Bool raw) | 100 | @@ -1170,8 +1165,7 @@ _e_sys_action_do(E_Sys_Action a, char *param EINA_UNUSED, Eina_Bool raw) |
| 101 | /* shutdown -r now */ | ||
| 102 | if (e_util_immortal_check()) return 0; | 101 | if (e_util_immortal_check()) return 0; |
| 102 | e_fm2_die(); | ||
| 103 | snprintf(buf, sizeof(buf), | 103 | snprintf(buf, sizeof(buf), |
| 104 | - "%s/enlightenment/utils/enlightenment_sys reboot", | 104 | - "%s/enlightenment/utils/enlightenment_sys reboot", |
| 105 | - e_prefix_lib_get()); | 105 | - e_prefix_lib_get()); |
| @@ -107,7 +107,7 @@ index 6781a9b5a..8cd140f1b 100644 | |||
| 107 | if (_e_sys_exe) | 107 | if (_e_sys_exe) |
| 108 | { | 108 | { |
| 109 | if ((ecore_time_get() - _e_sys_begin_time) > 2.0) | 109 | if ((ecore_time_get() - _e_sys_begin_time) > 2.0) |
| 110 | @@ -1148,8 +1142,7 @@ _e_sys_action_do(E_Sys_Action a, char *param EINA_UNUSED, Eina_Bool raw) | 110 | @@ -1204,8 +1198,7 @@ _e_sys_action_do(E_Sys_Action a, char *param EINA_UNUSED, Eina_Bool raw) |
| 111 | case E_SYS_SUSPEND: | 111 | case E_SYS_SUSPEND: |
| 112 | /* /etc/acpi/sleep.sh force */ | 112 | /* /etc/acpi/sleep.sh force */ |
| 113 | snprintf(buf, sizeof(buf), | 113 | snprintf(buf, sizeof(buf), |
| @@ -117,7 +117,7 @@ index 6781a9b5a..8cd140f1b 100644 | |||
| 117 | if (_e_sys_exe) | 117 | if (_e_sys_exe) |
| 118 | { | 118 | { |
| 119 | if ((ecore_time_get() - _e_sys_begin_time) > 2.0) | 119 | if ((ecore_time_get() - _e_sys_begin_time) > 2.0) |
| 120 | @@ -1208,8 +1201,7 @@ _e_sys_action_do(E_Sys_Action a, char *param EINA_UNUSED, Eina_Bool raw) | 120 | @@ -1265,8 +1258,7 @@ _e_sys_action_do(E_Sys_Action a, char *param EINA_UNUSED, Eina_Bool raw) |
| 121 | case E_SYS_HIBERNATE: | 121 | case E_SYS_HIBERNATE: |
| 122 | /* /etc/acpi/hibernate.sh force */ | 122 | /* /etc/acpi/hibernate.sh force */ |
| 123 | snprintf(buf, sizeof(buf), | 123 | snprintf(buf, sizeof(buf), |
| @@ -152,11 +152,26 @@ index 4b5148634..47d34b07f 100644 | |||
| 152 | autolock_exe = ecore_exe_run(eina_strbuf_string_get(buf), NULL); | 152 | autolock_exe = ecore_exe_run(eina_strbuf_string_get(buf), NULL); |
| 153 | eina_strbuf_free(buf); | 153 | eina_strbuf_free(buf); |
| 154 | 154 | ||
| 155 | diff --git a/src/modules/bluez5/e_mod_main.c b/src/modules/bluez5/e_mod_main.c | ||
| 156 | index a581c466c..095d8f360 100644 | ||
| 157 | --- a/src/modules/bluez5/e_mod_main.c | ||
| 158 | +++ b/src/modules/bluez5/e_mod_main.c | ||
| 159 | @@ -321,8 +321,8 @@ ebluez5_rfkill_unblock(const char *name) | ||
| 160 | if (buf) | ||
| 161 | { | ||
| 162 | eina_strbuf_append_printf | ||
| 163 | - (buf, "%s/enlightenment/utils/enlightenment_sys rfkill-unblock %s", | ||
| 164 | - e_prefix_lib_get(), name); | ||
| 165 | + (buf, "/run/setuid-programs/enlightenment_sys rfkill-unblock %s", | ||
| 166 | + name); | ||
| 167 | _rfkill_exe = ecore_exe_run(eina_strbuf_string_get(buf), NULL); | ||
| 168 | eina_strbuf_free(buf); | ||
| 169 | } | ||
| 155 | diff --git a/src/modules/cpufreq/e_mod_main.c b/src/modules/cpufreq/e_mod_main.c | 170 | diff --git a/src/modules/cpufreq/e_mod_main.c b/src/modules/cpufreq/e_mod_main.c |
| 156 | index f4ba259b6..ae228bae3 100644 | 171 | index b66b365d8..bab0802cc 100644 |
| 157 | --- a/src/modules/cpufreq/e_mod_main.c | 172 | --- a/src/modules/cpufreq/e_mod_main.c |
| 158 | +++ b/src/modules/cpufreq/e_mod_main.c | 173 | +++ b/src/modules/cpufreq/e_mod_main.c |
| 159 | @@ -1450,8 +1450,7 @@ e_modapi_init(E_Module *m) | 174 | @@ -1452,8 +1452,7 @@ e_modapi_init(E_Module *m) |
| 160 | } | 175 | } |
| 161 | E_CONFIG_LIMIT(cpufreq_config->poll_interval, 1, 1024); | 176 | E_CONFIG_LIMIT(cpufreq_config->poll_interval, 1, 1024); |
| 162 | 177 | ||
| @@ -166,3 +181,40 @@ index f4ba259b6..ae228bae3 100644 | |||
| 166 | cpufreq_config->set_exe_path = strdup(buf); | 181 | cpufreq_config->set_exe_path = strdup(buf); |
| 167 | 182 | ||
| 168 | if (stat(buf, &st) < 0) | 183 | if (stat(buf, &st) < 0) |
| 184 | diff --git a/src/modules/sysinfo/cpuclock/cpuclock.c b/src/modules/sysinfo/cpuclock/cpuclock.c | ||
| 185 | index 938916e53..00d5067d0 100644 | ||
| 186 | --- a/src/modules/sysinfo/cpuclock/cpuclock.c | ||
| 187 | +++ b/src/modules/sysinfo/cpuclock/cpuclock.c | ||
| 188 | @@ -80,8 +80,7 @@ _cpuclock_set_governor(const char *governor) | ||
| 189 | char buf[4096 + 100], exe[4096]; | ||
| 190 | struct stat st; | ||
| 191 | |||
| 192 | - snprintf(exe, 4096, "%s/%s/cpuclock_sysfs", | ||
| 193 | - e_module_dir_get(sysinfo_config->module), MODULE_ARCH); | ||
| 194 | + snprintf(exe, 4096, "/run/setuid-programs/cpuclock_sysfs"); | ||
| 195 | if (stat(exe, &st) < 0) return; | ||
| 196 | |||
| 197 | snprintf(buf, sizeof(buf), | ||
| 198 | @@ -108,8 +107,7 @@ _cpuclock_set_frequency(int frequency) | ||
| 199 | if (system(buf) != 0) | ||
| 200 | ERR("Error code from trying to run \"%s\"", buf); | ||
| 201 | #else | ||
| 202 | - snprintf(exe, 4096, "%s/%s/cpuclock_sysfs", | ||
| 203 | - e_module_dir_get(sysinfo_config->module), MODULE_ARCH); | ||
| 204 | + snprintf(exe, 4096, "/run/setuid-programs/cpuclock_sysfs"); | ||
| 205 | if (stat(exe, &st) < 0) return; | ||
| 206 | snprintf(buf, sizeof(buf), | ||
| 207 | "%s %s %i", exe, "frequency", frequency); | ||
| 208 | @@ -127,8 +125,7 @@ _cpuclock_set_pstate(int min, int max, int turbo) | ||
| 209 | char buf[4096 + 100], exe[4096]; | ||
| 210 | struct stat st; | ||
| 211 | |||
| 212 | - snprintf(exe, 4096, "%s/%s/cpuclock_sysfs", | ||
| 213 | - e_module_dir_get(sysinfo_config->module), MODULE_ARCH); | ||
| 214 | + snprintf(exe, 4096, "/run/setuid-programs/cpuclock_sysfs"); | ||
| 215 | if (stat(exe, &st) < 0) return; | ||
| 216 | snprintf(buf, sizeof(buf), | ||
| 217 | "%s %s %i %i %i", exe, "pstate", min, max, turbo); | ||
| 218 | -- | ||
| 219 | 2.23.0 | ||
| 220 | |||
diff --git a/gnu/packages/patches/libextractor-exiv2.patch b/gnu/packages/patches/libextractor-exiv2.patch new file mode 100644 index 00000000000..b92fef3ca1f --- /dev/null +++ b/gnu/packages/patches/libextractor-exiv2.patch | |||
| @@ -0,0 +1,124 @@ | |||
| 1 | This patch allows us to build libextractor against exiv2 0.27.x. | ||
| 2 | Adapted from this upstream commit: | ||
| 3 | |||
| 4 | commit 1ecee9a47717e36cb8a3925d011d1a6de11d631c | ||
| 5 | Author: Christian Grothoff <christian@grothoff.org> | ||
| 6 | Date: Mon Jul 29 17:58:18 2019 +0200 | ||
| 7 | |||
| 8 | importing patch from Gentoo/AS to address exiv2 build issue (#5820) | ||
| 9 | |||
| 10 | diff --git a/src/plugins/exiv2_extractor.cc b/src/plugins/exiv2_extractor.cc | ||
| 11 | index 8741d40..ef402a8 100644 | ||
| 12 | --- a/src/plugins/exiv2_extractor.cc | ||
| 13 | +++ b/src/plugins/exiv2_extractor.cc | ||
| 14 | @@ -27,10 +27,7 @@ | ||
| 15 | #include <cassert> | ||
| 16 | #include <cstring> | ||
| 17 | #include <math.h> | ||
| 18 | -#include <exiv2/exif.hpp> | ||
| 19 | -#include <exiv2/error.hpp> | ||
| 20 | -#include <exiv2/image.hpp> | ||
| 21 | -#include <exiv2/futils.hpp> | ||
| 22 | +#include <exiv2/exiv2.hpp> | ||
| 23 | |||
| 24 | /** | ||
| 25 | * Enable debugging to get error messages. | ||
| 26 | @@ -180,7 +177,7 @@ public: | ||
| 27 | * | ||
| 28 | * @return -1 on error | ||
| 29 | */ | ||
| 30 | -#if EXIV2_VERSION >= EXIV2_MAKE_VERSION(0,26,0) | ||
| 31 | +#if EXIV2_TEST_VERSION(0,26,0) | ||
| 32 | virtual size_t size (void) const; | ||
| 33 | #else | ||
| 34 | virtual long int size (void) const; | ||
| 35 | @@ -316,7 +313,11 @@ ExtractorIO::getb () | ||
| 36 | const unsigned char *r; | ||
| 37 | |||
| 38 | if (1 != ec->read (ec->cls, &data, 1)) | ||
| 39 | +#if EXIV2_TEST_VERSION(0,27,0) | ||
| 40 | + throw Exiv2::BasicError<char> (Exiv2::kerDecodeLangAltQualifierFailed); | ||
| 41 | +#else | ||
| 42 | throw Exiv2::BasicError<char> (42 /* error code */); | ||
| 43 | +#endif | ||
| 44 | r = (const unsigned char *) data; | ||
| 45 | return *r; | ||
| 46 | } | ||
| 47 | @@ -371,7 +372,11 @@ ExtractorIO::putb (Exiv2::byte data) | ||
| 48 | void | ||
| 49 | ExtractorIO::transfer (Exiv2::BasicIo& src) | ||
| 50 | { | ||
| 51 | +#if EXIV2_TEST_VERSION(0,27,0) | ||
| 52 | + throw Exiv2::BasicError<char> (Exiv2::kerDecodeLangAltQualifierFailed); | ||
| 53 | +#else | ||
| 54 | throw Exiv2::BasicError<char> (42 /* error code */); | ||
| 55 | +#endif | ||
| 56 | } | ||
| 57 | |||
| 58 | |||
| 59 | @@ -416,7 +421,11 @@ ExtractorIO::seek (long offset, | ||
| 60 | Exiv2::byte * | ||
| 61 | ExtractorIO::mmap (bool isWritable) | ||
| 62 | { | ||
| 63 | +#if EXIV2_TEST_VERSION(0,27,0) | ||
| 64 | + throw Exiv2::BasicError<char> (Exiv2::kerDecodeLangAltQualifierFailed); | ||
| 65 | +#else | ||
| 66 | throw Exiv2::BasicError<char> (42 /* error code */); | ||
| 67 | +#endif | ||
| 68 | } | ||
| 69 | |||
| 70 | |||
| 71 | @@ -449,7 +458,7 @@ ExtractorIO::tell (void) const | ||
| 72 | * | ||
| 73 | * @return -1 on error | ||
| 74 | */ | ||
| 75 | -#if EXIV2_VERSION >= EXIV2_MAKE_VERSION(0,26,0) | ||
| 76 | +#if EXIV2_TEST_VERSION(0,26,0) | ||
| 77 | size_t | ||
| 78 | #else | ||
| 79 | long int | ||
| 80 | @@ -504,7 +513,11 @@ ExtractorIO::eof () const | ||
| 81 | std::string | ||
| 82 | ExtractorIO::path () const | ||
| 83 | { | ||
| 84 | +#if EXIV2_TEST_VERSION(0,27,0) | ||
| 85 | + throw Exiv2::BasicError<char> (Exiv2::kerDecodeLangAltQualifierFailed); | ||
| 86 | +#else | ||
| 87 | throw Exiv2::BasicError<char> (42 /* error code */); | ||
| 88 | +#endif | ||
| 89 | } | ||
| 90 | |||
| 91 | |||
| 92 | @@ -517,7 +530,11 @@ ExtractorIO::path () const | ||
| 93 | std::wstring | ||
| 94 | ExtractorIO::wpath () const | ||
| 95 | { | ||
| 96 | +#if EXIV2_TEST_VERSION(0,27,0) | ||
| 97 | + throw Exiv2::BasicError<char> (Exiv2::kerDecodeLangAltQualifierFailed); | ||
| 98 | +#else | ||
| 99 | throw Exiv2::BasicError<char> (42 /* error code */); | ||
| 100 | +#endif | ||
| 101 | } | ||
| 102 | #endif | ||
| 103 | |||
| 104 | @@ -531,7 +548,11 @@ Exiv2::BasicIo::AutoPtr | ||
| 105 | ExtractorIO::temporary () const | ||
| 106 | { | ||
| 107 | fprintf (stderr, "throwing temporary error\n"); | ||
| 108 | +#if EXIV2_TEST_VERSION(0,27,0) | ||
| 109 | + throw Exiv2::BasicError<char> (Exiv2::kerDecodeLangAltQualifierFailed); | ||
| 110 | +#else | ||
| 111 | throw Exiv2::BasicError<char> (42 /* error code */); | ||
| 112 | +#endif | ||
| 113 | } | ||
| 114 | |||
| 115 | |||
| 116 | @@ -697,7 +718,7 @@ EXTRACTOR_exiv2_extract_method (struct EXTRACTOR_ExtractContext *ec) | ||
| 117 | { | ||
| 118 | try | ||
| 119 | { | ||
| 120 | -#if EXIV2_MAKE_VERSION(0,23,0) <= EXIV2_VERSION | ||
| 121 | +#if !EXIV2_TEST_VERSION(0,24,0) | ||
| 122 | Exiv2::LogMsg::setLevel (Exiv2::LogMsg::mute); | ||
| 123 | #endif | ||
| 124 | std::auto_ptr<Exiv2::BasicIo> eio(new ExtractorIO (ec)); | ||
diff --git a/gnu/packages/patches/mingw-w64-5.0rc2-gcc-4.9.3.patch b/gnu/packages/patches/mingw-w64-5.0rc2-gcc-4.9.3.patch deleted file mode 100644 index e8f841c4fd3..00000000000 --- a/gnu/packages/patches/mingw-w64-5.0rc2-gcc-4.9.3.patch +++ /dev/null | |||
| @@ -1,218 +0,0 @@ | |||
| 1 | This patch includes | ||
| 2 | |||
| 3 | * mingw-w64-headers/include/winnt.h: compile fixes for1 gcc-4.9.3 | ||
| 4 | * mingw-w64-headers/crt/math.h: Likewise | ||
| 5 | * mingw-w64-headers/crt/float.h (FLT_EPSILON,DBL_EPSILON,LDBL_EPSILON): Add | ||
| 6 | symbols. | ||
| 7 | * mingw-w64-headers/crt/stat.h (S_ISLNK,S_ISSOCK,S_ISUID,S_ISGID,S_ISLINK): | ||
| 8 | Add symbols. | ||
| 9 | (lstat): Add function. | ||
| 10 | * mingw-w64-headers/crt/_mingw_stat64.h: Likewise | ||
| 11 | * mingw-w64-headers/crt/stdlib.h (realpath): Add function. | ||
| 12 | |||
| 13 | Needed for building with gcc-4.9.3 and using with cross-libtool-2.4.6. | ||
| 14 | |||
| 15 | Upstream status: not yet presented upstream. | ||
| 16 | |||
| 17 | index 9c5cf87..74a8541 100644 | ||
| 18 | --- a/mingw-w64-crt/misc/dirname.c | ||
| 19 | +++ b/mingw-w64-crt/misc/dirname.c | ||
| 20 | @@ -29,6 +29,12 @@ | ||
| 21 | #define __cdecl /* this may not be defined. */ | ||
| 22 | #endif | ||
| 23 | |||
| 24 | +char *__cdecl | ||
| 25 | +realpath(const char *name, char *resolved) | ||
| 26 | +{ | ||
| 27 | + return resolved ? strcpy (resolved, name) : strdup (name); | ||
| 28 | +} | ||
| 29 | + | ||
| 30 | char * __cdecl | ||
| 31 | dirname(char *path) | ||
| 32 | { | ||
| 33 | diff --git a/mingw-w64-headers/crt/_mingw_stat64.h b/mingw-w64-headers/crt/_mingw_stat64.h | ||
| 34 | index 17e754c..7d2339b 100644 | ||
| 35 | --- a/mingw-w64-headers/crt/_mingw_stat64.h | ||
| 36 | +++ b/mingw-w64-headers/crt/_mingw_stat64.h | ||
| 37 | @@ -2,13 +2,17 @@ | ||
| 38 | |||
| 39 | #ifdef _USE_32BIT_TIME_T | ||
| 40 | #define _fstat32 _fstat | ||
| 41 | +#define _lstat32 _lstat | ||
| 42 | #define _stat32 _stat | ||
| 43 | #define _wstat32 _wstat | ||
| 44 | #define _fstat32i64 _fstati64 | ||
| 45 | +#define _lstat32i64 _lstati64 | ||
| 46 | #define _stat32i64 _stati64 | ||
| 47 | #define _wstat32i64 _wstati64 | ||
| 48 | #else | ||
| 49 | #define _fstat _fstat64i32 | ||
| 50 | +#define _lstat _lstat64i32 | ||
| 51 | +#define _lstati64 _lstat64 | ||
| 52 | #define _fstati64 _fstat64 | ||
| 53 | #define _stat _stat64i32 | ||
| 54 | #define _stati64 _stat64 | ||
| 55 | diff --git a/mingw-w64-headers/crt/float.h b/mingw-w64-headers/crt/float.h | ||
| 56 | index 5874f4e..bdf4ead 100644 | ||
| 57 | --- a/mingw-w64-headers/crt/float.h | ||
| 58 | +++ b/mingw-w64-headers/crt/float.h | ||
| 59 | @@ -22,6 +22,15 @@ | ||
| 60 | #if (__GNUC__ < 4) | ||
| 61 | #error Corrupt install of gcc-s internal headers, or search order was changed. | ||
| 62 | #else | ||
| 63 | + | ||
| 64 | + /* From gcc-4.9.3 float.h. */ | ||
| 65 | + #undef FLT_EPSILON | ||
| 66 | + #undef DBL_EPSILON | ||
| 67 | + #undef LDBL_EPSILON | ||
| 68 | + #define FLT_EPSILON __FLT_EPSILON__ | ||
| 69 | + #define DBL_EPSILON __DBL_EPSILON__ | ||
| 70 | + #define LDBL_EPSILON __LDBL_EPSILON__ | ||
| 71 | + | ||
| 72 | /* #include_next <float_ginclude.h> */ | ||
| 73 | |||
| 74 | /* Number of decimal digits, q, such that any floating-point number with q | ||
| 75 | diff --git a/mingw-w64-headers/crt/math.h b/mingw-w64-headers/crt/math.h | ||
| 76 | index 1e970f4..99a332f 100644 | ||
| 77 | --- a/mingw-w64-headers/crt/math.h | ||
| 78 | +++ b/mingw-w64-headers/crt/math.h | ||
| 79 | @@ -216,6 +216,7 @@ extern "C" { | ||
| 80 | #endif | ||
| 81 | } | ||
| 82 | |||
| 83 | +#if 0 | ||
| 84 | __CRT_INLINE long double __cdecl fabsl (long double x) | ||
| 85 | { | ||
| 86 | #ifdef __arm__ | ||
| 87 | @@ -226,6 +227,7 @@ extern "C" { | ||
| 88 | return res; | ||
| 89 | #endif | ||
| 90 | } | ||
| 91 | +#endif | ||
| 92 | |||
| 93 | __CRT_INLINE double __cdecl fabs (double x) | ||
| 94 | { | ||
| 95 | @@ -905,7 +907,7 @@ __mingw_choose_expr ( \ | ||
| 96 | /* 7.12.7.3 */ | ||
| 97 | extern double __cdecl hypot (double, double) __MINGW_ATTRIB_DEPRECATED_MSVC2005; /* in libmoldname.a */ | ||
| 98 | extern float __cdecl hypotf (float x, float y); | ||
| 99 | -#ifndef __CRT__NO_INLINE | ||
| 100 | +#if 0 //ndef __CRT__NO_INLINE | ||
| 101 | __CRT_INLINE float __cdecl hypotf (float x, float y) { return (float) hypot ((double)x, (double)y);} | ||
| 102 | #endif | ||
| 103 | extern long double __cdecl hypotl (long double, long double); | ||
| 104 | diff --git a/mingw-w64-headers/crt/stdlib.h b/mingw-w64-headers/crt/stdlib.h | ||
| 105 | index dfc5ae4..6f0fee3 100644 | ||
| 106 | --- a/mingw-w64-headers/crt/stdlib.h | ||
| 107 | +++ b/mingw-w64-headers/crt/stdlib.h | ||
| 108 | @@ -8,6 +8,7 @@ | ||
| 109 | |||
| 110 | #include <crtdefs.h> | ||
| 111 | #include <limits.h> | ||
| 112 | +#include <string.h> | ||
| 113 | |||
| 114 | #if defined (__USE_MINGW_ANSI_STDIO) && ((__USE_MINGW_ANSI_STDIO + 0) != 0) && !defined (__USE_MINGW_STRTOX) | ||
| 115 | #define __USE_MINGW_STRTOX 1 | ||
| 116 | @@ -676,6 +677,8 @@ unsigned long __cdecl _lrotr(unsigned long,int); | ||
| 117 | |||
| 118 | #endif /* !__NO_ISOCEXT */ | ||
| 119 | |||
| 120 | +char *__cdecl realpath (const char *name, char *resolved); | ||
| 121 | + | ||
| 122 | #ifdef __cplusplus | ||
| 123 | } | ||
| 124 | #endif | ||
| 125 | diff --git a/mingw-w64-headers/crt/sys/stat.h b/mingw-w64-headers/crt/sys/stat.h | ||
| 126 | index ed60219..d88b4f1 100644 | ||
| 127 | --- a/mingw-w64-headers/crt/sys/stat.h | ||
| 128 | +++ b/mingw-w64-headers/crt/sys/stat.h | ||
| 129 | @@ -58,16 +58,21 @@ extern "C" { | ||
| 130 | #include <_mingw_stat64.h> | ||
| 131 | |||
| 132 | #define _S_IFMT 0xF000 | ||
| 133 | +#define _S_IFLNK 0xA000 | ||
| 134 | +#define _S_IFSOCK 0xC000 | ||
| 135 | #define _S_IFDIR 0x4000 | ||
| 136 | #define _S_IFCHR 0x2000 | ||
| 137 | #define _S_IFIFO 0x1000 | ||
| 138 | #define _S_IFREG 0x8000 | ||
| 139 | +#define _S_ISUID 0x0400 | ||
| 140 | +#define _S_ISGID 0x0200 | ||
| 141 | #define _S_IREAD 0x0100 | ||
| 142 | #define _S_IWRITE 0x0080 | ||
| 143 | #define _S_IEXEC 0x0040 | ||
| 144 | |||
| 145 | _CRTIMP int __cdecl _fstat32(int _FileDes,struct _stat32 *_Stat); | ||
| 146 | _CRTIMP int __cdecl _stat32(const char *_Name,struct _stat32 *_Stat); | ||
| 147 | + static inline int __cdecl _lstat32(const char *_Name,struct _stat32 *_Stat) {return _stat32(_Name, _Stat);} | ||
| 148 | _CRTIMP int __cdecl _fstat64(int _FileDes,struct _stat64 *_Stat); | ||
| 149 | _CRTIMP int __cdecl _fstat32i64(int _FileDes,struct _stat32i64 *_Stat); | ||
| 150 | int __cdecl _fstat64i32(int _FileDes,struct _stat64i32 *_Stat); | ||
| 151 | @@ -97,6 +102,9 @@ extern "C" { | ||
| 152 | _CRTIMP int __cdecl _stat64(const char *_Name,struct _stat64 *_Stat); | ||
| 153 | _CRTIMP int __cdecl _stat32i64(const char *_Name,struct _stat32i64 *_Stat); | ||
| 154 | int __cdecl _stat64i32(const char *_Name,struct _stat64i32 *_Stat); | ||
| 155 | + static inline int __cdecl _lstat64(const char *_Name,struct _stat64 *_Stat) {return _stat64(_Name, _Stat);} | ||
| 156 | + static inline int __cdecl _lstat32i64(const char *_Name,struct _stat32i64 *_Stat) {return _stat32i64(_Name, _Stat);} | ||
| 157 | + static inline int __cdecl _lstat64i32(const char *_Name,struct _stat64i32 *_Stat) {return _stat64i32(_Name, _Stat);} | ||
| 158 | #ifndef __CRT__NO_INLINE | ||
| 159 | __CRT_INLINE int __cdecl _stat64i32(const char *_Name,struct _stat64i32 *_Stat) | ||
| 160 | { | ||
| 161 | @@ -132,6 +140,8 @@ extern "C" { | ||
| 162 | #ifndef NO_OLDNAMES | ||
| 163 | #define _S_IFBLK 0x3000 /* Block: Is this ever set under w32? */ | ||
| 164 | |||
| 165 | +#define S_IFLNK _S_IFLNK | ||
| 166 | +#define S_IFSOCK _S_IFSOCK | ||
| 167 | #define S_IFMT _S_IFMT | ||
| 168 | #define S_IFDIR _S_IFDIR | ||
| 169 | #define S_IFCHR _S_IFCHR | ||
| 170 | @@ -162,6 +172,11 @@ extern "C" { | ||
| 171 | #define S_IXOTH (S_IXGRP >> 3) | ||
| 172 | #define S_IRWXO (S_IRWXG >> 3) | ||
| 173 | |||
| 174 | +#define S_ISUID _S_ISUID | ||
| 175 | +#define S_ISGID _S_ISGID | ||
| 176 | + | ||
| 177 | +#define S_ISLNK(m) (((m) & S_IFMT) == S_IFLNK) | ||
| 178 | +#define S_ISSOCK(m) (((m) & S_IFMT) == S_IFSOCK) | ||
| 179 | #define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR) | ||
| 180 | #define S_ISFIFO(m) (((m) & S_IFMT) == S_IFIFO) | ||
| 181 | #define S_ISCHR(m) (((m) & S_IFMT) == S_IFCHR) | ||
| 182 | @@ -174,6 +189,7 @@ extern "C" { | ||
| 183 | int __cdecl stat(const char *_Filename,struct stat *_Stat); | ||
| 184 | int __cdecl fstat(int _Desc,struct stat *_Stat); | ||
| 185 | int __cdecl wstat(const wchar_t *_Filename,struct stat *_Stat); | ||
| 186 | +static inline int __cdecl lstat(const char *_Filename,struct stat *_Stat){return stat(_Filename, _Stat);} | ||
| 187 | |||
| 188 | #ifndef __CRT__NO_INLINE | ||
| 189 | #ifdef _USE_32BIT_TIME_T | ||
| 190 | @@ -262,9 +278,11 @@ __CRT_INLINE int __cdecl | ||
| 191 | |||
| 192 | #if defined(_FILE_OFFSET_BITS) && (_FILE_OFFSET_BITS == 64) | ||
| 193 | #ifdef _USE_32BIT_TIME_T | ||
| 194 | +#define lstat _lstat32i64 | ||
| 195 | #define stat _stat32i64 | ||
| 196 | #define fstat _fstat32i64 | ||
| 197 | #else | ||
| 198 | +#define lstat _lstat64 | ||
| 199 | #define stat _stat64 | ||
| 200 | #define fstat _fstat64 | ||
| 201 | #endif | ||
| 202 | diff --git a/mingw-w64-headers/include/winnt.h b/mingw-w64-headers/include/winnt.h | ||
| 203 | index 52af29b..8626396 100644 | ||
| 204 | --- a/mingw-w64-headers/include/winnt.h | ||
| 205 | +++ b/mingw-w64-headers/include/winnt.h | ||
| 206 | @@ -6895,7 +6895,12 @@ __buildmemorybarrier() | ||
| 207 | DWORD Reg : 3; | ||
| 208 | DWORD R : 1; | ||
| 209 | DWORD L : 1; | ||
| 210 | +/* C is used as a const specifier */ | ||
| 211 | +#define save_C C | ||
| 212 | +#undef C | ||
| 213 | DWORD C : 1; | ||
| 214 | +#define C save_C | ||
| 215 | +#undef save_C | ||
| 216 | DWORD StackAdjust : 10; | ||
| 217 | } DUMMYSTRUCTNAME; | ||
| 218 | } DUMMYUNIONNAME; | ||
diff --git a/gnu/packages/patches/mingw-w64-6.0.0-gcc.patch b/gnu/packages/patches/mingw-w64-6.0.0-gcc.patch new file mode 100644 index 00000000000..036cf79f919 --- /dev/null +++ b/gnu/packages/patches/mingw-w64-6.0.0-gcc.patch | |||
| @@ -0,0 +1,65 @@ | |||
| 1 | This patch includes | ||
| 2 | |||
| 3 | * mingw-w64-headers/include/winnt.h: compile fixes for1 gcc-4.9.3 | ||
| 4 | * mingw-w64-headers/crt/math.h: Likewise | ||
| 5 | * mingw-w64-headers/crt/float.h (FLT_EPSILON,DBL_EPSILON,LDBL_EPSILON): Add | ||
| 6 | symbols. | ||
| 7 | * mingw-w64-headers/crt/stat.h (S_ISLNK,S_ISSOCK,S_ISUID,S_ISGID,S_ISLINK): | ||
| 8 | Add symbols. | ||
| 9 | (lstat): Add function. | ||
| 10 | * mingw-w64-headers/crt/_mingw_stat64.h: Likewise | ||
| 11 | * mingw-w64-headers/crt/stdlib.h (realpath): Add function. | ||
| 12 | |||
| 13 | Needed for building with gcc-4.9.3 and using with cross-libtool-2.4.6. | ||
| 14 | |||
| 15 | Upstream status: not yet presented upstream. | ||
| 16 | |||
| 17 | diff --git a/mingw-w64-headers/crt/float.h b/mingw-w64-headers/crt/float.h | ||
| 18 | index 5874f4e..bdf4ead 100644 | ||
| 19 | --- a/mingw-w64-headers/crt/float.h | ||
| 20 | +++ b/mingw-w64-headers/crt/float.h | ||
| 21 | @@ -22,6 +22,15 @@ | ||
| 22 | #if (__GNUC__ < 4) | ||
| 23 | #error Corrupt install of gcc-s internal headers, or search order was changed. | ||
| 24 | #else | ||
| 25 | + | ||
| 26 | + /* From gcc-4.9.3 float.h. */ | ||
| 27 | + #undef FLT_EPSILON | ||
| 28 | + #undef DBL_EPSILON | ||
| 29 | + #undef LDBL_EPSILON | ||
| 30 | + #define FLT_EPSILON __FLT_EPSILON__ | ||
| 31 | + #define DBL_EPSILON __DBL_EPSILON__ | ||
| 32 | + #define LDBL_EPSILON __LDBL_EPSILON__ | ||
| 33 | + | ||
| 34 | /* #include_next <float_ginclude.h> */ | ||
| 35 | |||
| 36 | /* Number of decimal digits, q, such that any floating-point number with q | ||
| 37 | diff --git a/mingw-w64-headers/crt/math.h b/mingw-w64-headers/crt/math.h | ||
| 38 | index 1e970f4..99a332f 100644 | ||
| 39 | --- a/mingw-w64-headers/crt/math.h | ||
| 40 | +++ b/mingw-w64-headers/crt/math.h | ||
| 41 | @@ -216,6 +216,7 @@ extern "C" { | ||
| 42 | #endif | ||
| 43 | } | ||
| 44 | |||
| 45 | +#if 0 | ||
| 46 | __CRT_INLINE long double __cdecl fabsl (long double x) | ||
| 47 | { | ||
| 48 | #ifdef __arm__ | ||
| 49 | @@ -226,6 +227,7 @@ extern "C" { | ||
| 50 | return res; | ||
| 51 | #endif | ||
| 52 | } | ||
| 53 | +#endif | ||
| 54 | |||
| 55 | __CRT_INLINE double __cdecl fabs (double x) | ||
| 56 | { | ||
| 57 | @@ -905,7 +907,7 @@ __mingw_choose_expr ( \ | ||
| 58 | /* 7.12.7.3 */ | ||
| 59 | extern double __cdecl hypot (double, double) __MINGW_ATTRIB_DEPRECATED_MSVC2005; /* in libmoldname.a */ | ||
| 60 | extern float __cdecl hypotf (float x, float y); | ||
| 61 | -#ifndef __CRT__NO_INLINE | ||
| 62 | +#if 0 //ndef __CRT__NO_INLINE | ||
| 63 | __CRT_INLINE float __cdecl hypotf (float x, float y) { return (float) hypot ((double)x, (double)y);} | ||
| 64 | #endif | ||
| 65 | extern long double __cdecl hypotl (long double, long double); | ||
diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index a3f6e5d050c..79d8f3b684f 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm | |||
| @@ -6495,19 +6495,18 @@ Perl (back to 5.6.0).") | |||
| 6495 | (define-public perl-namespace-autoclean | 6495 | (define-public perl-namespace-autoclean |
| 6496 | (package | 6496 | (package |
| 6497 | (name "perl-namespace-autoclean") | 6497 | (name "perl-namespace-autoclean") |
| 6498 | (version "0.28") | 6498 | (version "0.29") |
| 6499 | (source | 6499 | (source |
| 6500 | (origin | 6500 | (origin |
| 6501 | (method url-fetch) | 6501 | (method url-fetch) |
| 6502 | (uri (string-append "mirror://cpan/authors/id/E/ET/ETHER/" | 6502 | (uri (string-append "mirror://cpan/authors/id/E/ET/ETHER/" |
| 6503 | "namespace-autoclean-" version ".tar.gz")) | 6503 | "namespace-autoclean-" version ".tar.gz")) |
| 6504 | (sha256 | 6504 | (sha256 |
| 6505 | (base32 | 6505 | (base32 "012qqs561xyyhm082znmzsl8lz4n299fa6p0v246za2l9bkdiss5")))) |
| 6506 | "0fbcq99yaix1aa99jl3v811dbw24il9jxnh5i2i23mddh4b0lhfd")))) | ||
| 6507 | (build-system perl-build-system) | 6506 | (build-system perl-build-system) |
| 6508 | (native-inputs | 6507 | (native-inputs |
| 6509 | `(("perl-module-build" ,perl-module-build) | 6508 | `(("perl-module-build" ,perl-module-build) |
| 6510 | ("perl-test-requires" ,perl-test-requires))) | 6509 | ("perl-test-needs" ,perl-test-needs))) |
| 6511 | (propagated-inputs | 6510 | (propagated-inputs |
| 6512 | `(("perl-b-hooks-endofscope" ,perl-b-hooks-endofscope) | 6511 | `(("perl-b-hooks-endofscope" ,perl-b-hooks-endofscope) |
| 6513 | ("perl-namespace-clean" ,perl-namespace-clean) | 6512 | ("perl-namespace-clean" ,perl-namespace-clean) |
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index d87eb9f5612..dde35a1f3ab 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm | |||
| @@ -2218,24 +2218,21 @@ applications.") | |||
| 2218 | (define-public python-flask-sqlalchemy | 2218 | (define-public python-flask-sqlalchemy |
| 2219 | (package | 2219 | (package |
| 2220 | (name "python-flask-sqlalchemy") | 2220 | (name "python-flask-sqlalchemy") |
| 2221 | (version "2.1") | 2221 | (version "2.4.0") |
| 2222 | (source | 2222 | (source (origin |
| 2223 | (origin | 2223 | (method url-fetch) |
| 2224 | (method url-fetch) | 2224 | (uri (pypi-uri "Flask-SQLAlchemy" version)) |
| 2225 | (uri (pypi-uri "Flask-SQLAlchemy" version)) | 2225 | (sha256 |
| 2226 | (sha256 | 2226 | (base32 |
| 2227 | (base32 | 2227 | "0nnllf0ddbh9jlhngnyjj98lbxgxr1csaplllx0caw98syq0k5hc")))) |
| 2228 | "1i9ps5d5snih9xlqhrvmi3qfiygkmqzxh92n25kj4pf89kj4s965")))) | ||
| 2229 | (build-system python-build-system) | 2228 | (build-system python-build-system) |
| 2230 | (propagated-inputs | 2229 | (propagated-inputs |
| 2231 | `(("python-flask" ,python-flask) | 2230 | `(("python-flask" ,python-flask) |
| 2232 | ("python-sqlalchemy" ,python-sqlalchemy))) | 2231 | ("python-sqlalchemy" ,python-sqlalchemy))) |
| 2233 | (home-page | 2232 | (home-page "https://github.com/mitsuhiko/flask-sqlalchemy") |
| 2234 | "https://github.com/mitsuhiko/flask-sqlalchemy") | 2233 | (synopsis "Module adding SQLAlchemy support to your Flask application") |
| 2235 | (synopsis | ||
| 2236 | "Module adding SQLAlchemy support to your Flask application") | ||
| 2237 | (description | 2234 | (description |
| 2238 | "This package adds SQLAlchemy support to your Flask application.") | 2235 | "This package adds SQLAlchemy support to your Flask application.") |
| 2239 | (license license:bsd-3))) | 2236 | (license license:bsd-3))) |
| 2240 | 2237 | ||
| 2241 | (define-public python-flask-restplus | 2238 | (define-public python-flask-restplus |
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 4c3ba688514..43e341b43d5 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm | |||
| @@ -64,6 +64,7 @@ | |||
| 64 | ;;; Copyright © 2019 Alex Griffin <a@ajgrf.com> | 64 | ;;; Copyright © 2019 Alex Griffin <a@ajgrf.com> |
| 65 | ;;; Copyright © 2019 Pierre Langlois <pierre.langlois@gmx.com> | 65 | ;;; Copyright © 2019 Pierre Langlois <pierre.langlois@gmx.com> |
| 66 | ;;; Copyright © 2019 Jacob MacDonald <jaccarmac@gmail.com> | 66 | ;;; Copyright © 2019 Jacob MacDonald <jaccarmac@gmail.com> |
| 67 | ;;; Copyright © 2019 Giacomo Leidi <goodoldpaul@autistici.org> | ||
| 67 | ;;; | 68 | ;;; |
| 68 | ;;; This file is part of GNU Guix. | 69 | ;;; This file is part of GNU Guix. |
| 69 | ;;; | 70 | ;;; |
| @@ -6999,14 +7000,14 @@ Supported netlink families and protocols include: | |||
| 6999 | (define-public python-wrapt | 7000 | (define-public python-wrapt |
| 7000 | (package | 7001 | (package |
| 7001 | (name "python-wrapt") | 7002 | (name "python-wrapt") |
| 7002 | (version "1.11.1") | 7003 | (version "1.11.2") |
| 7003 | (source | 7004 | (source |
| 7004 | (origin | 7005 | (origin |
| 7005 | (method url-fetch) | 7006 | (method url-fetch) |
| 7006 | (uri (pypi-uri "wrapt" version)) | 7007 | (uri (pypi-uri "wrapt" version)) |
| 7007 | (sha256 | 7008 | (sha256 |
| 7008 | (base32 | 7009 | (base32 |
| 7009 | "0cqmysny1pz01jw26q48q5zasvns6507rwhgm6wcw743f0r01sja")))) | 7010 | "1q81762dgsgrd12f8qc39zk8s5wll3m5xc32jdmlf6cls4gh4njn")))) |
| 7010 | (build-system python-build-system) | 7011 | (build-system python-build-system) |
| 7011 | (arguments | 7012 | (arguments |
| 7012 | ;; Tests are not included in the tarball, they are only available in the | 7013 | ;; Tests are not included in the tarball, they are only available in the |
| @@ -7015,7 +7016,7 @@ Supported netlink families and protocols include: | |||
| 7015 | (home-page "https://github.com/GrahamDumpleton/wrapt") | 7016 | (home-page "https://github.com/GrahamDumpleton/wrapt") |
| 7016 | (synopsis "Module for decorators, wrappers and monkey patching") | 7017 | (synopsis "Module for decorators, wrappers and monkey patching") |
| 7017 | (description | 7018 | (description |
| 7018 | "The aim of the wrapt module is to provide a transparent object proxy for | 7019 | "The aim of the wrapt module is to provide a transparent object proxy for |
| 7019 | Python, which can be used as the basis for the construction of function | 7020 | Python, which can be used as the basis for the construction of function |
| 7020 | wrappers and decorator functions.") | 7021 | wrappers and decorator functions.") |
| 7021 | (license license:bsd-2))) | 7022 | (license license:bsd-2))) |
| @@ -7322,14 +7323,14 @@ responses, rather than doing any computation.") | |||
| 7322 | (define-public python-pip | 7323 | (define-public python-pip |
| 7323 | (package | 7324 | (package |
| 7324 | (name "python-pip") | 7325 | (name "python-pip") |
| 7325 | (version "18.1") | 7326 | (version "19.2.1") |
| 7326 | (source | 7327 | (source |
| 7327 | (origin | 7328 | (origin |
| 7328 | (method url-fetch) | 7329 | (method url-fetch) |
| 7329 | (uri (pypi-uri "pip" version)) | 7330 | (uri (pypi-uri "pip" version)) |
| 7330 | (sha256 | 7331 | (sha256 |
| 7331 | (base32 | 7332 | (base32 |
| 7332 | "188fclay154s520n43s7cxxlhdaiysvxf19zk8vr1xbyjyyr58n0")))) | 7333 | "100sd12ss4mbdj5lf3wawad29cm573b27765mq098x6xhcj71395")))) |
| 7333 | (build-system python-build-system) | 7334 | (build-system python-build-system) |
| 7334 | (arguments | 7335 | (arguments |
| 7335 | '(#:tests? #f)) ; there are no tests in the pypi archive. | 7336 | '(#:tests? #f)) ; there are no tests in the pypi archive. |
| @@ -9990,13 +9991,13 @@ format.") | |||
| 9990 | (define-public python-twisted | 9991 | (define-public python-twisted |
| 9991 | (package | 9992 | (package |
| 9992 | (name "python-twisted") | 9993 | (name "python-twisted") |
| 9993 | (version "19.2.1") | 9994 | (version "19.7.0") |
| 9994 | (source (origin | 9995 | (source (origin |
| 9995 | (method url-fetch) | 9996 | (method url-fetch) |
| 9996 | (uri (pypi-uri "Twisted" version ".tar.bz2")) | 9997 | (uri (pypi-uri "Twisted" version ".tar.bz2")) |
| 9997 | (sha256 | 9998 | (sha256 |
| 9998 | (base32 | 9999 | (base32 |
| 9999 | "0liymyd4pzphizjlpwkncxjpm9akyr3lkfkm77yfg6wasv108b7s")))) | 10000 | "17d3hnxv9qndagzz63mdpyk99xj63p9gq586vjn0rxk8cl197nym")))) |
| 10000 | (build-system python-build-system) | 10001 | (build-system python-build-system) |
| 10001 | (arguments | 10002 | (arguments |
| 10002 | '(#:tests? #f)) ; FIXME: some tests fail | 10003 | '(#:tests? #f)) ; FIXME: some tests fail |
| @@ -16088,3 +16089,72 @@ The library has a number of built-in tilesets from OpenStreetMap, Mapbox, and | |||
| 16088 | Stamen, and supports custom tilesets with Mapbox or Cloudmade API keys. It | 16089 | Stamen, and supports custom tilesets with Mapbox or Cloudmade API keys. It |
| 16089 | supports Image, Video, GeoJSON and TopoJSON overlays.") | 16090 | supports Image, Video, GeoJSON and TopoJSON overlays.") |
| 16090 | (license license:expat))) | 16091 | (license license:expat))) |
| 16092 | |||
| 16093 | (define-public jube | ||
| 16094 | (package | ||
| 16095 | ;; This is a command-line tool, so no "python-" prefix. | ||
| 16096 | (name "jube") | ||
| 16097 | (version "2.2.2") | ||
| 16098 | (source (origin | ||
| 16099 | (method url-fetch) | ||
| 16100 | (uri (string-append | ||
| 16101 | "http://apps.fz-juelich.de/jsc/jube/jube2/download.php?version=" | ||
| 16102 | version)) | ||
| 16103 | (sha256 | ||
| 16104 | (base32 | ||
| 16105 | "0xq4k1q63s1p6swgyp61vahlrd1fqmgbm0gm5kpj8ikwy0yc0nqk")) | ||
| 16106 | (file-name (string-append "jube-" version ".tar.gz")))) | ||
| 16107 | (build-system python-build-system) | ||
| 16108 | (home-page "https://apps.fz-juelich.de/jsc/jube/jube2/docu/index.html") | ||
| 16109 | (synopsis "Benchmarking environment") | ||
| 16110 | (description | ||
| 16111 | "JUBE helps perform and analyze benchmarks in a systematic way. For each | ||
| 16112 | benchmarked application, benchmark data is stored in a format that allows JUBE | ||
| 16113 | to deduct the desired information. This data can be parsed by automatic pre- | ||
| 16114 | and post-processing scripts that draw information and store it more densely | ||
| 16115 | for manual interpretation.") | ||
| 16116 | (license license:gpl3+))) | ||
| 16117 | |||
| 16118 | (define-public python-pyroutelib3 | ||
| 16119 | (package | ||
| 16120 | (name "python-pyroutelib3") | ||
| 16121 | (version "1.3.post1") | ||
| 16122 | (source | ||
| 16123 | (origin | ||
| 16124 | (method url-fetch) | ||
| 16125 | (uri (pypi-uri "pyroutelib3" version)) | ||
| 16126 | (sha256 | ||
| 16127 | (base32 | ||
| 16128 | "1hpbydpn2alyswiajfbvhzq4c7f36vdmvxy91hgv8l1lb2g2vfrj")))) | ||
| 16129 | (build-system python-build-system) | ||
| 16130 | (propagated-inputs | ||
| 16131 | `(("python-dateutil" ,python-dateutil))) | ||
| 16132 | (home-page "https://github.com/MKuranowski/pyroutelib3") | ||
| 16133 | (synopsis "Library for simple routing on OSM data") | ||
| 16134 | (description "Library for simple routing on OSM data") | ||
| 16135 | (license license:gpl3+))) | ||
| 16136 | |||
| 16137 | (define-public python-elementpath | ||
| 16138 | (package | ||
| 16139 | (name "python-elementpath") | ||
| 16140 | (version "1.2.0") | ||
| 16141 | (source | ||
| 16142 | (origin | ||
| 16143 | (method url-fetch) | ||
| 16144 | (uri (pypi-uri "elementpath" version)) | ||
| 16145 | (sha256 | ||
| 16146 | (base32 | ||
| 16147 | "1syn2z543brab23dskh3fjd9pqvz6npqbcicrs2d88dbg26xl08p")))) | ||
| 16148 | (build-system python-build-system) | ||
| 16149 | (home-page | ||
| 16150 | "https://github.com/sissaschool/elementpath") | ||
| 16151 | (synopsis | ||
| 16152 | "XPath 1.0/2.0 parsers and selectors for ElementTree and lxml") | ||
| 16153 | (description | ||
| 16154 | "The proposal of this package is to provide XPath 1.0 and 2.0 selectors | ||
| 16155 | for Python's ElementTree XML data structures, both for the standard | ||
| 16156 | ElementTree library and for the @uref{http://lxml.de, lxml.etree} library. | ||
| 16157 | |||
| 16158 | For lxml.etree this package can be useful for providing XPath 2.0 selectors, | ||
| 16159 | because lxml.etree already has it's own implementation of XPath 1.0.") | ||
| 16160 | (license license:expat))) | ||
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 61f096d7f84..2104e684f4c 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm | |||
| @@ -2216,6 +2216,9 @@ content") | |||
| 2216 | (description "QtWebKit provides a Web browser engine that makes it easy to | 2216 | (description "QtWebKit provides a Web browser engine that makes it easy to |
| 2217 | embed content from the World Wide Web into your Qt application. At the same | 2217 | embed content from the World Wide Web into your Qt application. At the same |
| 2218 | time Web content can be enhanced with native controls.") | 2218 | time Web content can be enhanced with native controls.") |
| 2219 | ;; Building QtWebKit takes around 13 hours on an AArch64 machine. Give some | ||
| 2220 | ;; room for slower or busy hardware. | ||
| 2221 | (properties '((timeout . 64800))) ;18 hours | ||
| 2219 | (license license:lgpl2.1+))) | 2222 | (license license:lgpl2.1+))) |
| 2220 | 2223 | ||
| 2221 | (define-public dotherside | 2224 | (define-public dotherside |
diff --git a/gnu/packages/rednotebook.scm b/gnu/packages/rednotebook.scm new file mode 100644 index 00000000000..e5b1b2c7bfb --- /dev/null +++ b/gnu/packages/rednotebook.scm | |||
| @@ -0,0 +1,91 @@ | |||
| 1 | ;;; GNU Guix --- Functional package management for GNU | ||
| 2 | ;;; Copyright © 2019 Jesse Gibbons <jgibbons2357+guix@gmail.com> | ||
| 3 | ;;; | ||
| 4 | ;;; This file is part of GNU Guix. | ||
| 5 | ;;; | ||
| 6 | ;;; GNU Guix is free software; you can redistribute it and/or modify it | ||
| 7 | ;;; under the terms of the GNU General Public License as published by | ||
| 8 | ;;; the Free Software Foundation; either version 3 of the License, or (at | ||
| 9 | ;;; your option) any later version. | ||
| 10 | ;;; | ||
| 11 | ;;; GNU Guix is distributed in the hope that it will be useful, but | ||
| 12 | ;;; WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 13 | ;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 14 | ;;; GNU General Public License for more details. | ||
| 15 | ;;; | ||
| 16 | ;;; You should have received a copy of the GNU General Public License | ||
| 17 | ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. | ||
| 18 | |||
| 19 | (define-module (gnu packages rednotebook) | ||
| 20 | #:use-module (guix packages) | ||
| 21 | #:use-module (guix git-download) | ||
| 22 | #:use-module (guix build-system python) | ||
| 23 | #:use-module ((guix licenses) #:prefix license:) | ||
| 24 | #:use-module (gnu packages python) | ||
| 25 | #:use-module (gnu packages glib) | ||
| 26 | #:use-module (gnu packages gtk) | ||
| 27 | #:use-module (gnu packages webkit) | ||
| 28 | #:use-module (gnu packages python-xyz)) | ||
| 29 | |||
| 30 | (define-public rednotebook | ||
| 31 | (package | ||
| 32 | (name "rednotebook") | ||
| 33 | (version "2.11.1") | ||
| 34 | (source | ||
| 35 | (origin | ||
| 36 | (method git-fetch) | ||
| 37 | (uri (git-reference | ||
| 38 | (url "https://github.com/jendrikseipp/rednotebook.git") | ||
| 39 | (commit (string-append "v" version)))) | ||
| 40 | (file-name (git-file-name name version)) | ||
| 41 | (sha256 | ||
| 42 | (base32 "04c7a0wgmdl88v9386y1052c38ajbkryiwhqps5lx34d4g7r6hm1")))) | ||
| 43 | (build-system python-build-system) | ||
| 44 | (arguments | ||
| 45 | ;; Tests fail to find the "_" function. | ||
| 46 | ;; It should be defined in rednotebook/info.py if '_' is not a member of | ||
| 47 | ;; 'builtins'. It is either not defined or not exported during the check | ||
| 48 | ;; phase. The program does not have this problem after it is installed. | ||
| 49 | ;; TODO: Fix tests. | ||
| 50 | `(#:tests? #f | ||
| 51 | #:imported-modules ((guix build glib-or-gtk-build-system) | ||
| 52 | ,@%python-build-system-modules) | ||
| 53 | #:modules ((ice-9 match) | ||
| 54 | (guix build python-build-system) | ||
| 55 | ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:) | ||
| 56 | (guix build utils)) | ||
| 57 | #:phases | ||
| 58 | (modify-phases %standard-phases | ||
| 59 | ;; Make sure rednotebook can find the typelibs and webkitgtk shared | ||
| 60 | ;; libraries. | ||
| 61 | (add-before 'wrap 'wrap-with-library-paths | ||
| 62 | (lambda* (#:key inputs outputs #:allow-other-keys) | ||
| 63 | (let ((out (assoc-ref outputs "out")) | ||
| 64 | (gi-typelib-path (getenv "GI_TYPELIB_PATH")) | ||
| 65 | (webkitgtk-path (string-append | ||
| 66 | (assoc-ref inputs "webkitgtk") | ||
| 67 | "/lib"))) | ||
| 68 | (wrap-program (string-append out "/bin/rednotebook") | ||
| 69 | `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path)) | ||
| 70 | `("LD_LIBRARY_PATH" ":" prefix (,webkitgtk-path))) | ||
| 71 | #t)))))) | ||
| 72 | (inputs | ||
| 73 | `(("gtk+" ,gtk+) | ||
| 74 | ("gtksourceview" ,gtksourceview-3) | ||
| 75 | ("python-pyyaml" ,python-pyyaml) | ||
| 76 | ("python-pygobject" ,python-pygobject) | ||
| 77 | ("webkitgtk" ,webkitgtk))) | ||
| 78 | ;; TODO: package the following for python3 (if possible), add them as | ||
| 79 | ;; dependencies, and remove them from rednotebook source: | ||
| 80 | ;; pygtkspellcheck, elib.intl, msgfmt, txt2tags | ||
| 81 | ;; TODO: package and add pyenchant for python3 and add it as a dependency. | ||
| 82 | (home-page "https://www.rednotebook.app") | ||
| 83 | (synopsis "Daily journal with calendar, templates and keyword searching") | ||
| 84 | (description | ||
| 85 | "RedNotebook is a modern desktop journal. It lets you format, tag and | ||
| 86 | search your entries. You can also add pictures, links and customizable | ||
| 87 | templates, spell check your notes, and export to plain text, HTML, Latex or | ||
| 88 | PDF.") | ||
| 89 | (license (list license:gpl2+ ; rednotebook, txt2tags | ||
| 90 | license:lgpl3+ ; elib.intl | ||
| 91 | license:gpl3+)))) ; pygtkspellcheck | ||
diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 33a42a2da2f..1f3fb29aba3 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | ;;; Copyright © 2019 Pierre Neidhardt <mail@ambrevar.xyz> | 16 | ;;; Copyright © 2019 Pierre Neidhardt <mail@ambrevar.xyz> |
| 17 | ;;; Copyright © 2019 Mikhail Kirillov <w96k.ru@gmail.com> | 17 | ;;; Copyright © 2019 Mikhail Kirillov <w96k.ru@gmail.com> |
| 18 | ;;; Copyright © 2019 Jelle Licht <jlicht@fsfe.org> | 18 | ;;; Copyright © 2019 Jelle Licht <jlicht@fsfe.org> |
| 19 | ;;; Copyright © 2019 Brian Leung <bkleung89@gmail.com> | ||
| 19 | ;;; | 20 | ;;; |
| 20 | ;;; This file is part of GNU Guix. | 21 | ;;; This file is part of GNU Guix. |
| 21 | ;;; | 22 | ;;; |
| @@ -2035,13 +2036,13 @@ the SimpleCov code coverage tool for Ruby version 1.9 and above.") | |||
| 2035 | (define-public ruby-simplecov | 2036 | (define-public ruby-simplecov |
| 2036 | (package | 2037 | (package |
| 2037 | (name "ruby-simplecov") | 2038 | (name "ruby-simplecov") |
| 2038 | (version "0.12.0") | 2039 | (version "0.17.0") |
| 2039 | (source (origin | 2040 | (source (origin |
| 2040 | (method url-fetch) | 2041 | (method url-fetch) |
| 2041 | (uri (rubygems-uri "simplecov" version)) | 2042 | (uri (rubygems-uri "simplecov" version)) |
| 2042 | (sha256 | 2043 | (sha256 |
| 2043 | (base32 | 2044 | (base32 |
| 2044 | "0ffhyrfnq2zm2mc1742a4hqy475g3qa1zf6yfldwg1ldh5sn3qbx")))) | 2045 | "0dq0nkaxvbsnl70hkimy35g4yjfs3blx4s7nbpzbvgqx72hxgv5v")))) |
| 2045 | (build-system ruby-build-system) | 2046 | (build-system ruby-build-system) |
| 2046 | ;; Simplecov depends on rubocop for code style checking at build time. | 2047 | ;; Simplecov depends on rubocop for code style checking at build time. |
| 2047 | ;; Rubocop needs simplecov at build time. | 2048 | ;; Rubocop needs simplecov at build time. |
| @@ -3638,24 +3639,24 @@ to reproduce user environments.") | |||
| 3638 | 3639 | ||
| 3639 | (define-public ruby-mini-portile-2 | 3640 | (define-public ruby-mini-portile-2 |
| 3640 | (package (inherit ruby-mini-portile) | 3641 | (package (inherit ruby-mini-portile) |
| 3641 | (version "2.2.0") | 3642 | (version "2.4.0") |
| 3642 | (source (origin | 3643 | (source (origin |
| 3643 | (method url-fetch) | 3644 | (method url-fetch) |
| 3644 | (uri (rubygems-uri "mini_portile2" version)) | 3645 | (uri (rubygems-uri "mini_portile2" version)) |
| 3645 | (sha256 | 3646 | (sha256 |
| 3646 | (base32 | 3647 | (base32 |
| 3647 | "0g5bpgy08q0nc0anisg3yvwc1gc3inl854fcrg48wvg7glqd6dpm")))))) | 3648 | "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy")))))) |
| 3648 | 3649 | ||
| 3649 | (define-public ruby-nokogiri | 3650 | (define-public ruby-nokogiri |
| 3650 | (package | 3651 | (package |
| 3651 | (name "ruby-nokogiri") | 3652 | (name "ruby-nokogiri") |
| 3652 | (version "1.8.0") | 3653 | (version "1.10.4") |
| 3653 | (source (origin | 3654 | (source (origin |
| 3654 | (method url-fetch) | 3655 | (method url-fetch) |
| 3655 | (uri (rubygems-uri "nokogiri" version)) | 3656 | (uri (rubygems-uri "nokogiri" version)) |
| 3656 | (sha256 | 3657 | (sha256 |
| 3657 | (base32 | 3658 | (base32 |
| 3658 | "1nffsyx1xjg6v5n9rrbi8y1arrcx2i5f21cp6clgh9iwiqkr7rnn")))) | 3659 | "0nmdrqqz1gs0fwkgzxjl4wr554gr8dc1fkrqjc2jpsvwgm41rygv")))) |
| 3659 | (build-system ruby-build-system) | 3660 | (build-system ruby-build-system) |
| 3660 | (arguments | 3661 | (arguments |
| 3661 | ;; Tests fail because Nokogiri can only test with an installed extension, | 3662 | ;; Tests fail because Nokogiri can only test with an installed extension, |
| @@ -8571,6 +8572,33 @@ characteristics.") | |||
| 8571 | (home-page "https://github.com/sinatra/mustermann") | 8572 | (home-page "https://github.com/sinatra/mustermann") |
| 8572 | (license license:expat))) | 8573 | (license license:expat))) |
| 8573 | 8574 | ||
| 8575 | (define-public ruby-htmlentities | ||
| 8576 | (package | ||
| 8577 | (name "ruby-htmlentities") | ||
| 8578 | (version "4.3.4") | ||
| 8579 | (source | ||
| 8580 | (origin | ||
| 8581 | (method url-fetch) | ||
| 8582 | (uri (rubygems-uri "htmlentities" version)) | ||
| 8583 | (sha256 | ||
| 8584 | (base32 | ||
| 8585 | "1nkklqsn8ir8wizzlakncfv42i32wc0w9hxp00hvdlgjr7376nhj")))) | ||
| 8586 | (build-system ruby-build-system) | ||
| 8587 | (arguments | ||
| 8588 | `(#:phases | ||
| 8589 | (modify-phases %standard-phases | ||
| 8590 | (replace 'check | ||
| 8591 | (lambda _ | ||
| 8592 | (map (lambda (file) | ||
| 8593 | (invoke "ruby" "-Itest" file)) | ||
| 8594 | (find-files "./test" ".*_test\\.rb"))))))) | ||
| 8595 | (synopsis "Encode and decode (X)HTML entities") | ||
| 8596 | (description | ||
| 8597 | "This package provides a module for encoding and decoding (X)HTML | ||
| 8598 | entities.") | ||
| 8599 | (home-page "https://github.com/threedaymonk/htmlentities") | ||
| 8600 | (license license:expat))) | ||
| 8601 | |||
| 8574 | (define-public ruby-sinatra | 8602 | (define-public ruby-sinatra |
| 8575 | (package | 8603 | (package |
| 8576 | (name "ruby-sinatra") | 8604 | (name "ruby-sinatra") |
| @@ -8807,3 +8835,92 @@ It is intended to determine whether a newer API specification is | |||
| 8807 | backwards-compatible with an older API specification.") | 8835 | backwards-compatible with an older API specification.") |
| 8808 | (home-page "https://github.com/civisanalytics/swagger-diff") | 8836 | (home-page "https://github.com/civisanalytics/swagger-diff") |
| 8809 | (license license:bsd-3))) | 8837 | (license license:bsd-3))) |
| 8838 | |||
| 8839 | (define-public ruby-reverse-markdown | ||
| 8840 | (package | ||
| 8841 | (name "ruby-reverse-markdown") | ||
| 8842 | (version "1.1.0") | ||
| 8843 | (source | ||
| 8844 | (origin | ||
| 8845 | (method url-fetch) | ||
| 8846 | (uri (rubygems-uri "reverse_markdown" version)) | ||
| 8847 | (sha256 | ||
| 8848 | (base32 | ||
| 8849 | "0w7y5n74daajvl9gixr91nh8670d7mkgspkk3ql71m8azq3nffbg")))) | ||
| 8850 | (build-system ruby-build-system) | ||
| 8851 | (propagated-inputs | ||
| 8852 | `(("ruby-nokogiri" ,ruby-nokogiri))) | ||
| 8853 | (native-inputs | ||
| 8854 | `(("bundler" ,bundler) | ||
| 8855 | ("ruby-rspec" ,ruby-rspec) | ||
| 8856 | ("ruby-kramdown" ,ruby-kramdown) | ||
| 8857 | ("ruby-simplecov" ,ruby-simplecov))) | ||
| 8858 | (arguments | ||
| 8859 | `(#:phases | ||
| 8860 | (modify-phases %standard-phases | ||
| 8861 | (replace 'check | ||
| 8862 | (lambda* (#:key tests? #:allow-other-keys) | ||
| 8863 | (when tests? | ||
| 8864 | (invoke "rspec")) | ||
| 8865 | #t))))) | ||
| 8866 | (synopsis "Convert HTML into Markdown") | ||
| 8867 | (description | ||
| 8868 | "This Ruby module allows you to map simple HTML back into | ||
| 8869 | Markdown---e.g., if you want to import existing HTML data in your | ||
| 8870 | application.") | ||
| 8871 | (home-page "https://github.com/xijo/reverse_markdown") | ||
| 8872 | (license license:wtfpl2))) | ||
| 8873 | |||
| 8874 | (define-public ruby-solargraph | ||
| 8875 | (package | ||
| 8876 | (name "ruby-solargraph") | ||
| 8877 | (version "0.36.0") | ||
| 8878 | (source | ||
| 8879 | (origin | ||
| 8880 | (method url-fetch) | ||
| 8881 | (uri (rubygems-uri "solargraph" version)) | ||
| 8882 | (sha256 | ||
| 8883 | (base32 | ||
| 8884 | "0b93xzkgd1h06da9gdnwivj1mzbil8lc072y2838dy6i7bxgpy9i")))) | ||
| 8885 | (build-system ruby-build-system) | ||
| 8886 | (propagated-inputs | ||
| 8887 | `(("ruby-backport" ,ruby-backport) | ||
| 8888 | ("bundler" ,bundler) | ||
| 8889 | ("ruby-htmlentities" ,ruby-htmlentities) | ||
| 8890 | ("ruby-jaro-winkler" ,ruby-jaro-winkler) | ||
| 8891 | ("ruby-maruku" ,ruby-maruku) | ||
| 8892 | ("ruby-nokogiri" ,ruby-nokogiri) | ||
| 8893 | ("ruby-parser" ,ruby-parser) | ||
| 8894 | ("ruby-reverse-markdown" ,ruby-reverse-markdown) | ||
| 8895 | ("ruby-rubocop" ,ruby-rubocop) | ||
| 8896 | ("ruby-thor" ,ruby-thor) | ||
| 8897 | ("ruby-tilt" ,ruby-tilt) | ||
| 8898 | ("ruby-yard" ,ruby-yard))) | ||
| 8899 | (native-inputs | ||
| 8900 | `(("ruby-rspec" ,ruby-rspec) | ||
| 8901 | ("ruby-pry" ,ruby-pry) | ||
| 8902 | ("ruby-simplecov" ,ruby-simplecov) | ||
| 8903 | ("ruby-webmock" ,ruby-webmock-2))) | ||
| 8904 | ;; FIXME: can't figure out how to run the tests properly: | ||
| 8905 | |||
| 8906 | ;; An error occurred while loading spec_helper. | ||
| 8907 | ;; Failure/Error: return gem_original_require(path) | ||
| 8908 | ;; LoadError: | ||
| 8909 | ;; cannot load such file -- spec_helper | ||
| 8910 | (arguments | ||
| 8911 | '(#:tests? #f | ||
| 8912 | #:phases | ||
| 8913 | (modify-phases %standard-phases | ||
| 8914 | (replace 'check | ||
| 8915 | (lambda* (#:key tests? #:allow-other-keys) | ||
| 8916 | (when tests? | ||
| 8917 | (invoke "rspec")) | ||
| 8918 | #t))))) | ||
| 8919 | (synopsis | ||
| 8920 | "IDE tools for code completion, inline documentation, and static analysis") | ||
| 8921 | (description | ||
| 8922 | "Solargraph provides a comprehensive suite of tools for Ruby | ||
| 8923 | programming: intellisense, diagnostics, inline documentation, and type | ||
| 8924 | checking.") | ||
| 8925 | (home-page "https://solargraph.org/") | ||
| 8926 | (license license:expat))) | ||
diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm index 3d6ad4f9d70..90892a57e84 100644 --- a/gnu/packages/security-token.scm +++ b/gnu/packages/security-token.scm | |||
| @@ -353,7 +353,7 @@ retrieve a YubiKey's serial number, and so forth.") | |||
| 353 | (define-public python-pyscard | 353 | (define-public python-pyscard |
| 354 | (package | 354 | (package |
| 355 | (name "python-pyscard") | 355 | (name "python-pyscard") |
| 356 | (version "1.9.8") | 356 | (version "1.9.9") |
| 357 | (source (origin | 357 | (source (origin |
| 358 | (method url-fetch) | 358 | (method url-fetch) |
| 359 | ;; The maintainer publishes releases on various sites, but | 359 | ;; The maintainer publishes releases on various sites, but |
| @@ -363,7 +363,7 @@ retrieve a YubiKey's serial number, and so forth.") | |||
| 363 | version "/pyscard-" version ".tar.gz")) | 363 | version "/pyscard-" version ".tar.gz")) |
| 364 | (sha256 | 364 | (sha256 |
| 365 | (base32 | 365 | (base32 |
| 366 | "15fh00z1an6r5j7hrz3jlq0rb3jygwf3x4jcwsa008bv8vpcg7gm")))) | 366 | "082cjkbxadaz2jb4rbhr0mkrirzlqyqhcf3r823qb0q1k50ybgg6")))) |
| 367 | (build-system python-build-system) | 367 | (build-system python-build-system) |
| 368 | (arguments | 368 | (arguments |
| 369 | `(#:phases | 369 | `(#:phases |
diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 9077d295db6..bca8b14dad3 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm | |||
| @@ -1106,3 +1106,59 @@ and IP roaming. ET provides the same core functionality as @command{mosh}, | |||
| 1106 | while also supporting native scrolling and @command{tmux} control mode | 1106 | while also supporting native scrolling and @command{tmux} control mode |
| 1107 | (@code{tmux -CC}).") | 1107 | (@code{tmux -CC}).") |
| 1108 | (license license:asl2.0))) | 1108 | (license license:asl2.0))) |
| 1109 | |||
| 1110 | (define-public wterm | ||
| 1111 | (package | ||
| 1112 | (name "wterm") | ||
| 1113 | (version "0.7") | ||
| 1114 | (source | ||
| 1115 | (origin | ||
| 1116 | (method git-fetch) | ||
| 1117 | (uri (git-reference | ||
| 1118 | (url "https://github.com/majestrate/wterm.git") | ||
| 1119 | (commit "0ae42717c08a85a6509214e881422c7fbe7ecc45"))) | ||
| 1120 | (sha256 | ||
| 1121 | (base32 | ||
| 1122 | "0g4lzmc1w6na81i6hny32xds4xfig4xzswzfijyi6p93a1226dv0")) | ||
| 1123 | (file-name (git-file-name name version)))) | ||
| 1124 | (build-system gnu-build-system) | ||
| 1125 | (native-inputs | ||
| 1126 | `(("pkg-config" ,pkg-config))) | ||
| 1127 | (inputs | ||
| 1128 | `(("fontconfig" ,fontconfig) | ||
| 1129 | ("freetype" ,freetype) | ||
| 1130 | ("libdrm" ,libdrm) | ||
| 1131 | ("libxkbcommon" ,libxkbcommon) | ||
| 1132 | ("ncurses" ,ncurses) | ||
| 1133 | ("pixman" ,pixman) | ||
| 1134 | ("wayland" ,wayland))) | ||
| 1135 | (arguments | ||
| 1136 | '(#:tests? #f | ||
| 1137 | |||
| 1138 | ;; Without -j1 it fails to find file libwld.a. | ||
| 1139 | #:parallel-build? #f | ||
| 1140 | |||
| 1141 | #:make-flags (list "CC=gcc" | ||
| 1142 | (string-append "PREFIX=" %output) | ||
| 1143 | (string-append "TERMINFO=" | ||
| 1144 | (assoc-ref %outputs "out") | ||
| 1145 | "/share/terminfo")) | ||
| 1146 | #:phases | ||
| 1147 | (modify-phases %standard-phases | ||
| 1148 | (delete 'configure) | ||
| 1149 | (add-after 'unpack 'terminfo-fix | ||
| 1150 | (lambda _ | ||
| 1151 | (substitute* "Makefile" | ||
| 1152 | (("\ttic .*") "\tmkdir -p $(SHARE_PREFIX)/share/terminfo | ||
| 1153 | \ttic -o $(SHARE_PREFIX)/share/terminfo -s wterm.info\n")) | ||
| 1154 | #t))))) | ||
| 1155 | (native-search-paths | ||
| 1156 | (list (search-path-specification | ||
| 1157 | (variable "TERMINFO_DIRS") | ||
| 1158 | (files '("share/terminfo"))))) | ||
| 1159 | (home-page "https://github.com/majestrate/wterm") | ||
| 1160 | (synopsis "Terminal emulator for Wayland") | ||
| 1161 | (description "wterm is a native Wayland terminal emulator based on | ||
| 1162 | an st fork using wld. st is a simple terminal emulator for X originally | ||
| 1163 | made by suckless.") | ||
| 1164 | (license license:x11))) | ||
diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index 4412d545794..432e79e3500 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm | |||
| @@ -41,6 +41,7 @@ | |||
| 41 | #:use-module (gnu packages documentation) | 41 | #:use-module (gnu packages documentation) |
| 42 | #:use-module (gnu packages fontutils) | 42 | #:use-module (gnu packages fontutils) |
| 43 | #:use-module (gnu packages gcc) | 43 | #:use-module (gnu packages gcc) |
| 44 | #:use-module (gnu packages gettext) | ||
| 44 | #:use-module (gnu packages glib) | 45 | #:use-module (gnu packages glib) |
| 45 | #:use-module (gnu packages gtk) | 46 | #:use-module (gnu packages gtk) |
| 46 | #:use-module (gnu packages guile) | 47 | #:use-module (gnu packages guile) |
| @@ -567,3 +568,55 @@ The basic features of Geany are: | |||
| 567 | @item extensibility through plugins | 568 | @item extensibility through plugins |
| 568 | @end itemize") | 569 | @end itemize") |
| 569 | (license license:gpl2+))) | 570 | (license license:gpl2+))) |
| 571 | |||
| 572 | (define-public fe | ||
| 573 | (package | ||
| 574 | (name "fe") | ||
| 575 | ;; Stable release is 1.8. However, this development version | ||
| 576 | ;; introduces support for UTF-8. | ||
| 577 | (version "2.0") | ||
| 578 | (source (origin | ||
| 579 | (method url-fetch) | ||
| 580 | (uri (string-append "http://www.moria.de/~michael/fe/" | ||
| 581 | "fe-" version ".tar.gz")) | ||
| 582 | (sha256 | ||
| 583 | (base32 | ||
| 584 | "1hwws7si1752z6hp61zxznvgsb6846lp8zl1hn5ddhsbafwalwb9")))) | ||
| 585 | (build-system gnu-build-system) | ||
| 586 | (arguments | ||
| 587 | `(#:tests? #f ;no test | ||
| 588 | ;; Sendmail is only used to send a crash log. Disable the | ||
| 589 | ;; feature since it is (1) undocumented (2) not very useful. | ||
| 590 | #:configure-flags (list "--disable-sendmail") | ||
| 591 | #:phases | ||
| 592 | (modify-phases %standard-phases | ||
| 593 | (add-after 'install 'install-doc | ||
| 594 | (lambda* (#:key outputs #:allow-other-keys) | ||
| 595 | (let* ((out (assoc-ref outputs "out")) | ||
| 596 | (doc (string-append out "/share/doc/" ,name "-" ,version))) | ||
| 597 | (for-each (lambda (f) (install-file f doc)) | ||
| 598 | '("fe.doc" "fe.html" "fe.ps" "feref.ps" "README")) | ||
| 599 | #t)))))) | ||
| 600 | (native-inputs | ||
| 601 | `(("gettext" ,gettext-minimal))) | ||
| 602 | (inputs | ||
| 603 | `(("ncurses" ,ncurses))) | ||
| 604 | (home-page "http://www.moria.de/~michael/fe/") | ||
| 605 | (synopsis "Small folding editor") | ||
| 606 | (description "Fe is a small folding editor. It allows to fold | ||
| 607 | arbitrary text regions; it is not bound to syntactic units. | ||
| 608 | |||
| 609 | Fe has no configuration or extension language and requires no setup. | ||
| 610 | Its user interface is emacs-like and it has menues for the very most | ||
| 611 | important functions to help beginners. Further there is a reference | ||
| 612 | card. It offers: | ||
| 613 | |||
| 614 | @itemize | ||
| 615 | @item Regions and Emacs-like kill ring | ||
| 616 | @item Incremental search | ||
| 617 | @item Keyboard macros | ||
| 618 | @item Editing binary files | ||
| 619 | @item Multiple windows and views | ||
| 620 | @item Compose function for Latin 1 characters | ||
| 621 | @end itemize") | ||
| 622 | (license license:gpl2+))) | ||
diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index 2c520dfbdf0..330e10610d2 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm | |||
| @@ -10,7 +10,7 @@ | |||
| 10 | ;;; Copyright © 2016 Marius Bakke <mbakke@fastmail.com> | 10 | ;;; Copyright © 2016 Marius Bakke <mbakke@fastmail.com> |
| 11 | ;;; Copyright © 2017 Eric Bavier <bavier@member.fsf.org> | 11 | ;;; Copyright © 2017 Eric Bavier <bavier@member.fsf.org> |
| 12 | ;;; Copyright © 2017 Rene Saavedra <rennes@openmailbox.org> | 12 | ;;; Copyright © 2017 Rene Saavedra <rennes@openmailbox.org> |
| 13 | ;;; Copyright © 2017 Hartmut Goebel <h.goebel@crazy-compilers.com> | 13 | ;;; Copyright © 2017,2019 Hartmut Goebel <h.goebel@crazy-compilers.com> |
| 14 | ;;; Copyright © 2017 Kei Kebreau <kkebreau@posteo.net> | 14 | ;;; Copyright © 2017 Kei Kebreau <kkebreau@posteo.net> |
| 15 | ;;; Copyright © 2017 Alex Vong <alexvong1995@gmail.com> | 15 | ;;; Copyright © 2017 Alex Vong <alexvong1995@gmail.com> |
| 16 | ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> | 16 | ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> |
| @@ -45,6 +45,7 @@ | |||
| 45 | #:use-module (guix build-system python) | 45 | #:use-module (guix build-system python) |
| 46 | #:use-module (gnu packages) | 46 | #:use-module (gnu packages) |
| 47 | #:use-module (gnu packages autotools) | 47 | #:use-module (gnu packages autotools) |
| 48 | #:use-module (gnu packages base) | ||
| 48 | #:use-module (gnu packages compression) | 49 | #:use-module (gnu packages compression) |
| 49 | #:use-module (gnu packages gettext) | 50 | #:use-module (gnu packages gettext) |
| 50 | #:use-module (gnu packages java) | 51 | #:use-module (gnu packages java) |
| @@ -321,6 +322,112 @@ input bits thoroughly but are not suitable for cryptography.") | |||
| 321 | ;; entails." | 322 | ;; entails." |
| 322 | (license license:public-domain))) | 323 | (license license:public-domain))) |
| 323 | 324 | ||
| 325 | (define-public ascii2binary | ||
| 326 | (package | ||
| 327 | (name "ascii2binary") | ||
| 328 | (version "2.14") | ||
| 329 | (source | ||
| 330 | (origin | ||
| 331 | (method url-fetch) | ||
| 332 | (uri (string-append "http://billposer.org/Software/Downloads/" | ||
| 333 | "ascii2binary-" version ".tar.bz2")) | ||
| 334 | (sha256 | ||
| 335 | (base32 "0dc9fxcdmppbs9s06jvq61zbk552laxps0xyk098gj41697ihd96")))) | ||
| 336 | (build-system gnu-build-system) | ||
| 337 | (native-inputs | ||
| 338 | `(("gettext" ,gettext-minimal))) | ||
| 339 | (home-page "https://billposer.org/Software/a2b.html") | ||
| 340 | (synopsis "Convert between ASCII, hexadecimal and binary representations") | ||
| 341 | (description "The two programs are useful for generating test data, for | ||
| 342 | inspecting binary files, and for interfacing programs that generate textual | ||
| 343 | output to programs that require binary input and conversely. They can also be | ||
| 344 | useful when it is desired to reformat numbers. | ||
| 345 | |||
| 346 | @itemize | ||
| 347 | |||
| 348 | @item @command{ascii2binary} reads input consisting of ascii or hexadecimal | ||
| 349 | representation numbers separated by whitespace and produces as output | ||
| 350 | the binary equivalents. The type and precision of the binary output | ||
| 351 | is selected using command line flags. | ||
| 352 | |||
| 353 | @item @command{binary2ascii} reads input consisting of binary numbers | ||
| 354 | and converts them to their ascii or hexadecimal representation. | ||
| 355 | Command line flags specify the type and size of the binary numbers | ||
| 356 | and provide control over the format of the output. | ||
| 357 | Unsigned integers may be written out in binary, octal, decimal, | ||
| 358 | or hexadecimal. | ||
| 359 | |||
| 360 | Signed integers may be written out only in binary or decimal. Floating | ||
| 361 | point numbers may be written out only decimal, either in standard or | ||
| 362 | scientific notation. (If you want to examine the binary representation | ||
| 363 | of floating point numbers, just treat the input as a sequence of unsigned | ||
| 364 | characters.) | ||
| 365 | |||
| 366 | @end itemize") | ||
| 367 | (license license:gpl3))) | ||
| 368 | |||
| 369 | (define-public uniutils | ||
| 370 | (package | ||
| 371 | (name "uniutils") | ||
| 372 | (version "2.27") | ||
| 373 | (source | ||
| 374 | (origin | ||
| 375 | (method url-fetch) | ||
| 376 | (uri (string-append "http://billposer.org/Software/Downloads/" | ||
| 377 | "uniutils-" version ".tar.bz2")) | ||
| 378 | (sha256 | ||
| 379 | (base32 "19w1510w87gx7n4qy3zsb0m467a4rn5scvh4ajajg7jh6x5xri08")))) | ||
| 380 | (build-system gnu-build-system) | ||
| 381 | (arguments | ||
| 382 | '(#:configure-flags '("--disable-dependency-tracking") | ||
| 383 | #:phases | ||
| 384 | (modify-phases %standard-phases | ||
| 385 | (add-after 'build 'fix-paths | ||
| 386 | (lambda* (#:key outputs inputs #:allow-other-keys) | ||
| 387 | (let ((out (assoc-ref outputs "out")) | ||
| 388 | (a2b (assoc-ref inputs "ascii2binary")) | ||
| 389 | (iconv (assoc-ref inputs "libiconv"))) | ||
| 390 | (substitute* "utf8lookup" | ||
| 391 | (("^ascii2binary ") (string-append a2b "/bin/ascii2binary ")) | ||
| 392 | (("^uniname ") (string-append out "/bin/uniname ")) | ||
| 393 | (("^iconv ") (string-append iconv "/bin/iconv "))) | ||
| 394 | #t)))))) | ||
| 395 | (inputs | ||
| 396 | `(("ascii2binary" ,ascii2binary) | ||
| 397 | ("libiconv" ,libiconv))) | ||
| 398 | (home-page "https://billposer.org/Software/unidesc.html") | ||
| 399 | (synopsis "Find out what is in a Unicode file") | ||
| 400 | (description "Useful tools when working with Unicode files when one | ||
| 401 | doesn't know the writing system, doesn't have the necessary font, needs to | ||
| 402 | inspect invisible characters, needs to find out whether characters have been | ||
| 403 | combined or in what order they occur, or needs statistics on which characters | ||
| 404 | occur. | ||
| 405 | |||
| 406 | @itemize | ||
| 407 | |||
| 408 | @item @command{uniname} defaults to printing the character offset of each | ||
| 409 | character, its byte offset, its hex code value, its encoding, the glyph | ||
| 410 | itself, and its name. It may also be used to validate UTF-8 input. | ||
| 411 | |||
| 412 | @item @command{unidesc} reports the character ranges to which different | ||
| 413 | portions of the text belong. It can also be used to identify Unicode encodings | ||
| 414 | (e.g. UTF-16be) flagged by magic numbers. | ||
| 415 | |||
| 416 | @item @command{unihist} generates a histogram of the characters in its input. | ||
| 417 | |||
| 418 | @item @command{ExplicateUTF8} is intended for debugging or for learning about | ||
| 419 | Unicode. It determines and explains the validity of a sequence of bytes as a | ||
| 420 | UTF8 encoding. | ||
| 421 | |||
| 422 | @item @command{utf8lookup} provides a handy way to look up Unicode characters | ||
| 423 | from the command line. | ||
| 424 | |||
| 425 | @item @command{unireverse} reverse each line of UTF-8 input | ||
| 426 | character-by-character. | ||
| 427 | |||
| 428 | @end itemize") | ||
| 429 | (license license:gpl3))) | ||
| 430 | |||
| 324 | (define-public libconfig | 431 | (define-public libconfig |
| 325 | (package | 432 | (package |
| 326 | (name "libconfig") | 433 | (name "libconfig") |
diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index f2e7f4ad0c4..d896908a124 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm | |||
| @@ -505,13 +505,13 @@ netcat implementation that supports TLS.") | |||
| 505 | (package | 505 | (package |
| 506 | (name "python-acme") | 506 | (name "python-acme") |
| 507 | ;; Remember to update the hash of certbot when updating python-acme. | 507 | ;; Remember to update the hash of certbot when updating python-acme. |
| 508 | (version "0.35.1") | 508 | (version "0.37.2") |
| 509 | (source (origin | 509 | (source (origin |
| 510 | (method url-fetch) | 510 | (method url-fetch) |
| 511 | (uri (pypi-uri "acme" version)) | 511 | (uri (pypi-uri "acme" version)) |
| 512 | (sha256 | 512 | (sha256 |
| 513 | (base32 | 513 | (base32 |
| 514 | "08y4ankn0di34c9d1c3pqd9by9n0ckzz7b5ld1g0fx6c32sbi259")))) | 514 | "0p3zqhna9p8iy5i9mfhzdf5bmjigs05r6rlwnxykk4n67fp8yyc8")))) |
| 515 | (build-system python-build-system) | 515 | (build-system python-build-system) |
| 516 | (arguments | 516 | (arguments |
| 517 | `(#:phases | 517 | `(#:phases |
| @@ -559,10 +559,10 @@ netcat implementation that supports TLS.") | |||
| 559 | (version (package-version python-acme)) | 559 | (version (package-version python-acme)) |
| 560 | (source (origin | 560 | (source (origin |
| 561 | (method url-fetch) | 561 | (method url-fetch) |
| 562 | (uri (pypi-uri name version)) | 562 | (uri (pypi-uri "certbot" version)) |
| 563 | (sha256 | 563 | (sha256 |
| 564 | (base32 | 564 | (base32 |
| 565 | "0q0855qvsvs4mgglss5iim7f1p22rv4rn1n6j731vv869v0yrs6p")))) | 565 | "1xbfv4fwkgfp9qqzlk8wxbhchc61349m26q9fg35j9fnm253cm74")))) |
| 566 | (build-system python-build-system) | 566 | (build-system python-build-system) |
| 567 | (arguments | 567 | (arguments |
| 568 | `(,@(substitute-keyword-arguments (package-arguments python-acme) | 568 | `(,@(substitute-keyword-arguments (package-arguments python-acme) |
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 2376f8bda18..4fb2d76c337 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm | |||
| @@ -357,15 +357,14 @@ H.264 (MPEG-4 AVC) video streams.") | |||
| 357 | (define-public mkvtoolnix | 357 | (define-public mkvtoolnix |
| 358 | (package | 358 | (package |
| 359 | (name "mkvtoolnix") | 359 | (name "mkvtoolnix") |
| 360 | (version "31.0.0") | 360 | (version "37.0.0") |
| 361 | (source | 361 | (source |
| 362 | (origin | 362 | (origin |
| 363 | (method url-fetch) | 363 | (method url-fetch) |
| 364 | (uri (string-append "https://mkvtoolnix.download/sources/" | 364 | (uri (string-append "https://mkvtoolnix.download/sources/" |
| 365 | name "-" version ".tar.xz")) | 365 | "mkvtoolnix-" version ".tar.xz")) |
| 366 | (sha256 | 366 | (sha256 |
| 367 | (base32 | 367 | (base32 "0r4d9318ymb9a0mkc0shi9p4kjy3m70s49v4f8dmjhvj63silhix")) |
| 368 | "0d8va2iamzc7y3wi71z8mk2vnqvnkgwb2p7casdfp37400x8r2pr")) | ||
| 369 | (modules '((guix build utils))) | 368 | (modules '((guix build utils))) |
| 370 | (snippet '(begin | 369 | (snippet '(begin |
| 371 | ;; Delete bundled libraries. | 370 | ;; Delete bundled libraries. |
| @@ -419,6 +418,13 @@ H.264 (MPEG-4 AVC) video streams.") | |||
| 419 | "--enable-precompiled-headers=no") | 418 | "--enable-precompiled-headers=no") |
| 420 | #:phases | 419 | #:phases |
| 421 | (modify-phases %standard-phases | 420 | (modify-phases %standard-phases |
| 421 | (add-after 'unpack 'patch-relative-file-names | ||
| 422 | (lambda* (#:key outputs #:allow-other-keys) | ||
| 423 | (let ((out (assoc-ref outputs "out"))) | ||
| 424 | (substitute* "src/mkvtoolnix-gui/util/settings.cpp" | ||
| 425 | (("mkvmerge" match) | ||
| 426 | (string-append out "/bin/" match))) | ||
| 427 | #t))) | ||
| 422 | (add-before 'configure 'add-googletest | 428 | (add-before 'configure 'add-googletest |
| 423 | (lambda* (#:key inputs #:allow-other-keys) | 429 | (lambda* (#:key inputs #:allow-other-keys) |
| 424 | (symlink | 430 | (symlink |
| @@ -466,8 +472,9 @@ H.264 (MPEG-4 AVC) video streams.") | |||
| 466 | (synopsis "Tools to create, alter and inspect Matroska files") | 472 | (synopsis "Tools to create, alter and inspect Matroska files") |
| 467 | (description | 473 | (description |
| 468 | "MKVToolNix provides tools for getting information about Matroska files | 474 | "MKVToolNix provides tools for getting information about Matroska files |
| 469 | (@code{mkvinfo}), extracting tracks/data from Matroska files (@code{mkvextract}) | 475 | (@command{mkvinfo}), extracting tracks/data from Matroska files |
| 470 | and creating Matroska files from other media files (@code{mkvmerge}).") | 476 | (@command{mkvextract}), and creating Matroska files from other media files |
| 477 | (@command{mkvmerge}).") | ||
| 471 | (license license:gpl2))) | 478 | (license license:gpl2))) |
| 472 | 479 | ||
| 473 | (define-public x265 | 480 | (define-public x265 |
| @@ -1485,7 +1492,7 @@ access to mpv's powerful playback capabilities.") | |||
| 1485 | (define-public youtube-dl | 1492 | (define-public youtube-dl |
| 1486 | (package | 1493 | (package |
| 1487 | (name "youtube-dl") | 1494 | (name "youtube-dl") |
| 1488 | (version "2019.08.02") | 1495 | (version "2019.08.13") |
| 1489 | (source (origin | 1496 | (source (origin |
| 1490 | (method url-fetch) | 1497 | (method url-fetch) |
| 1491 | (uri (string-append "https://github.com/rg3/youtube-dl/releases/" | 1498 | (uri (string-append "https://github.com/rg3/youtube-dl/releases/" |
| @@ -1493,7 +1500,7 @@ access to mpv's powerful playback capabilities.") | |||
| 1493 | version ".tar.gz")) | 1500 | version ".tar.gz")) |
| 1494 | (sha256 | 1501 | (sha256 |
| 1495 | (base32 | 1502 | (base32 |
| 1496 | "101b6jrf6ckbxrn76ppvgdyrb25p7d247kn8qgq7n476sfnkfg2p")))) | 1503 | "0b94hrhbqa7jhn91pxsbphg2ylwkpkknb2y4v4sczp7rjvgmjgdj")))) |
| 1497 | (build-system python-build-system) | 1504 | (build-system python-build-system) |
| 1498 | (arguments | 1505 | (arguments |
| 1499 | ;; The problem here is that the directory for the man page and completion | 1506 | ;; The problem here is that the directory for the man page and completion |
diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index cb281920e9a..8fafe438d0f 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm | |||
| @@ -365,10 +365,10 @@ vim editor and also easily configurable during runtime. Vimb is mostly keyboard | |||
| 365 | driven and does not detract you from your daily work.") | 365 | driven and does not detract you from your daily work.") |
| 366 | (license license:gpl3+))) | 366 | (license license:gpl3+))) |
| 367 | 367 | ||
| 368 | (define-public next-gtk-webkit | 368 | (define next-gtk-webkit |
| 369 | (package | 369 | (package |
| 370 | (name "next-gtk-webkit") | 370 | (name "next-gtk-webkit") |
| 371 | (version "1.2.2") | 371 | (version "1.3.0") |
| 372 | (source | 372 | (source |
| 373 | (origin | 373 | (origin |
| 374 | (method git-fetch) | 374 | (method git-fetch) |
| @@ -377,7 +377,7 @@ driven and does not detract you from your daily work.") | |||
| 377 | (commit version))) | 377 | (commit version))) |
| 378 | (sha256 | 378 | (sha256 |
| 379 | (base32 | 379 | (base32 |
| 380 | "1bif1k738knhifxhkn0d2x1m521zkx40pri44vyjqncp9r95hkbk")) | 380 | "0ibq30xrf871pkpasi8p9krn0pmd86rsdzb3jqvz3wnp4wa3hl9d")) |
| 381 | (file-name (git-file-name "next" version)))) | 381 | (file-name (git-file-name "next" version)))) |
| 382 | (build-system glib-or-gtk-build-system) | 382 | (build-system glib-or-gtk-build-system) |
| 383 | (arguments | 383 | (arguments |
| @@ -405,71 +405,124 @@ key-bindings, is fully configurable and extensible in Lisp, and has powerful | |||
| 405 | features for productive professionals.") | 405 | features for productive professionals.") |
| 406 | (license license:bsd-3))) | 406 | (license license:bsd-3))) |
| 407 | 407 | ||
| 408 | (define-public sbcl-next | 408 | (define sbcl-next-download-manager |
| 409 | (package | 409 | (package |
| 410 | (inherit next-gtk-webkit) | 410 | (inherit next-gtk-webkit) |
| 411 | (name "sbcl-next") | 411 | (name "sbcl-next-download-manager") |
| 412 | (build-system asdf-build-system/sbcl) | 412 | (build-system asdf-build-system/sbcl) |
| 413 | (outputs '("out" "lib")) | ||
| 414 | (arguments | 413 | (arguments |
| 415 | `(#:tests? #f ; no tests | 414 | `(#:tests? #f ; Need online access. |
| 416 | #:phases (modify-phases %standard-phases | 415 | #:asd-file "next.asd" |
| 417 | (add-after 'unpack 'patch-platform-port-path | 416 | #:asd-system-name "download-manager")) |
| 418 | (lambda* (#:key inputs #:allow-other-keys) | ||
| 419 | (substitute* "source/ports/gtk-webkit.lisp" | ||
| 420 | (("\"next-gtk-webkit\"") | ||
| 421 | (string-append "\"" (assoc-ref inputs "next-gtk-webkit") | ||
| 422 | "/bin/next-gtk-webkit\""))))) | ||
| 423 | (add-before 'cleanup 'move-bundle | ||
| 424 | (lambda* (#:key outputs #:allow-other-keys) | ||
| 425 | (define lib (assoc-ref outputs "lib")) | ||
| 426 | (define actual-fasl (string-append | ||
| 427 | lib | ||
| 428 | "/lib/sbcl/next.fasl")) | ||
| 429 | (define expected-fasl (string-append | ||
| 430 | lib | ||
| 431 | "/lib/sbcl/next--system.fasl")) | ||
| 432 | (copy-file actual-fasl expected-fasl) | ||
| 433 | #t)) | ||
| 434 | (add-after 'create-symlinks 'build-program | ||
| 435 | (lambda* (#:key outputs #:allow-other-keys) | ||
| 436 | (build-program | ||
| 437 | (string-append (assoc-ref outputs "out") "/bin/next") | ||
| 438 | outputs | ||
| 439 | #:entry-program '((next:start-with-port) 0)))) | ||
| 440 | (add-before 'build 'install-assets | ||
| 441 | ;; Since the ASDF build system generates a new .asd with a | ||
| 442 | ;; possibly suffixed and thus illegal version number, assets | ||
| 443 | ;; should not be installed after the 'build phase or else | ||
| 444 | ;; the illegal version will result in NIL in the .desktop | ||
| 445 | ;; file. | ||
| 446 | (lambda* (#:key outputs #:allow-other-keys) | ||
| 447 | (with-output-to-file "version" | ||
| 448 | (lambda _ | ||
| 449 | (format #t "~a" ,(package-version next-gtk-webkit)))) | ||
| 450 | (invoke "make" "install-assets" | ||
| 451 | (string-append "PREFIX=" | ||
| 452 | (assoc-ref outputs "out")))))))) | ||
| 453 | (inputs | 417 | (inputs |
| 454 | `(("next-gtk-webkit" ,next-gtk-webkit) | 418 | `(;; ASD libraries: |
| 455 | ;; Lisp libraries: | ||
| 456 | ("trivial-features" ,sbcl-trivial-features) | 419 | ("trivial-features" ,sbcl-trivial-features) |
| 457 | ("alexandria" ,sbcl-alexandria) | 420 | ;; Lisp libraries: |
| 458 | ("anaphora" ,sbcl-anaphora) | 421 | ("cl-ppcre" ,sbcl-cl-ppcre) |
| 459 | ("closer-mop" ,sbcl-closer-mop) | 422 | ("dexador" ,sbcl-dexador) |
| 460 | ("log4cl" ,sbcl-log4cl) | 423 | ("log4cl" ,sbcl-log4cl) |
| 461 | ("find-port" ,sbcl-find-port) | 424 | ("lparallel" ,sbcl-lparallel) |
| 462 | ("cl-strings" ,sbcl-cl-strings) | 425 | ("quri" ,sbcl-quri) |
| 463 | ("cl-string-match" ,sbcl-cl-string-match) | 426 | ("str" ,sbcl-cl-str))) |
| 464 | ("puri" ,sbcl-puri) | 427 | (native-inputs |
| 465 | ("sqlite" ,sbcl-cl-sqlite) | 428 | `(("prove-asdf" ,sbcl-prove-asdf))) |
| 466 | ("parenscript" ,sbcl-parenscript) | 429 | (synopsis "Infinitely extensible web-browser (download manager)"))) |
| 467 | ("cl-json" ,sbcl-cl-json) | 430 | |
| 468 | ("swank" ,sbcl-slime-swank) | 431 | (define-public next |
| 469 | ("cl-markup" ,sbcl-cl-markup) | 432 | (let ((version (package-version next-gtk-webkit))) |
| 470 | ("cl-css" ,sbcl-cl-css) | 433 | (package |
| 471 | ("bordeaux-threads" ,sbcl-bordeaux-threads) | 434 | (inherit next-gtk-webkit) |
| 472 | ("s-xml-rpc" ,sbcl-s-xml-rpc) | 435 | (name "next") |
| 473 | ("unix-opts" ,sbcl-unix-opts) | 436 | (build-system asdf-build-system/sbcl) |
| 474 | ("trivial-clipboard" ,sbcl-trivial-clipboard))) | 437 | (outputs '("out" "lib")) |
| 475 | (synopsis "Infinitely extensible web-browser (with Lisp development files)"))) | 438 | (arguments |
| 439 | `(#:tests? #f ; no tests | ||
| 440 | #:asd-system-name "next" | ||
| 441 | #:phases (modify-phases %standard-phases | ||
| 442 | (add-after 'unpack 'patch-platform-port-path | ||
| 443 | (lambda* (#:key inputs #:allow-other-keys) | ||
| 444 | (substitute* "source/ports/gtk-webkit.lisp" | ||
| 445 | (("\"next-gtk-webkit\"") | ||
| 446 | (string-append "\"" (assoc-ref inputs "next-gtk-webkit") | ||
| 447 | "/bin/next-gtk-webkit\""))) | ||
| 448 | #t)) | ||
| 449 | (add-after 'patch-platform-port-path 'patch-version | ||
| 450 | ;; When the version is not just dot-separated numerals | ||
| 451 | ;; (e.g. a git-commit version), Guix modifies the .asd with | ||
| 452 | ;; an illegal version number, and then Next fails to query | ||
| 453 | ;; it. So we hard-code it here. | ||
| 454 | (lambda* (#:key inputs #:allow-other-keys) | ||
| 455 | (let ((version (format #f "~a" ,version))) | ||
| 456 | (substitute* "source/global.lisp" | ||
| 457 | (("version\\)\\)\\)") | ||
| 458 | (string-append "version))) | ||
| 459 | (setf +version+ \"" version "\")")))) | ||
| 460 | #t)) | ||
| 461 | (add-before 'cleanup 'move-bundle | ||
| 462 | (lambda* (#:key outputs #:allow-other-keys) | ||
| 463 | (define lib (assoc-ref outputs "lib")) | ||
| 464 | (define actual-fasl (string-append | ||
| 465 | lib | ||
| 466 | "/lib/sbcl/next.fasl")) | ||
| 467 | (define expected-fasl (string-append | ||
| 468 | lib | ||
| 469 | "/lib/sbcl/next--system.fasl")) | ||
| 470 | (copy-file actual-fasl expected-fasl) | ||
| 471 | #t)) | ||
| 472 | (add-after 'create-symlinks 'build-program | ||
| 473 | (lambda* (#:key outputs #:allow-other-keys) | ||
| 474 | (build-program | ||
| 475 | (string-append (assoc-ref outputs "out") "/bin/next") | ||
| 476 | outputs | ||
| 477 | #:entry-program '((next:entry-point) 0)))) | ||
| 478 | (add-before 'build 'install-assets | ||
| 479 | ;; Since the ASDF build system generates a new .asd with a | ||
| 480 | ;; possibly suffixed and thus illegal version number, assets | ||
| 481 | ;; should not be installed after the 'build phase or else | ||
| 482 | ;; the illegal version will result in NIL in the .desktop | ||
| 483 | ;; file. | ||
| 484 | (lambda* (#:key outputs #:allow-other-keys) | ||
| 485 | (with-output-to-file "version" | ||
| 486 | (lambda _ | ||
| 487 | (format #t "~a" ,(package-version next-gtk-webkit)))) | ||
| 488 | (invoke "make" "install-assets" | ||
| 489 | (string-append "PREFIX=" | ||
| 490 | (assoc-ref outputs "out")))))))) | ||
| 491 | (inputs | ||
| 492 | `(("next-gtk-webkit" ,next-gtk-webkit) | ||
| 493 | ;; ASD libraries: | ||
| 494 | ("trivial-features" ,sbcl-trivial-features) | ||
| 495 | ("trivial-garbage" ,sbcl-trivial-garbage) | ||
| 496 | ;; Lisp libraries: | ||
| 497 | ("alexandria" ,sbcl-alexandria) | ||
| 498 | ("bordeaux-threads" ,sbcl-bordeaux-threads) | ||
| 499 | ("cl-css" ,sbcl-cl-css) | ||
| 500 | ("cl-json" ,sbcl-cl-json) | ||
| 501 | ("cl-markup" ,sbcl-cl-markup) | ||
| 502 | ("cl-ppcre" ,sbcl-cl-ppcre) | ||
| 503 | ("cl-ppcre-unicode" ,sbcl-cl-ppcre-unicode) | ||
| 504 | ("cl-string-match" ,sbcl-cl-string-match) | ||
| 505 | ("cl-strings" ,sbcl-cl-strings) | ||
| 506 | ("closer-mop" ,sbcl-closer-mop) | ||
| 507 | ("dbus" ,cl-dbus) | ||
| 508 | ("dexador" ,sbcl-dexador) | ||
| 509 | ("ironclad" ,sbcl-ironclad) | ||
| 510 | ("log4cl" ,sbcl-log4cl) | ||
| 511 | ("lparallel" ,sbcl-lparallel) | ||
| 512 | ("mk-string-metrics" ,sbcl-mk-string-metrics) | ||
| 513 | ("parenscript" ,sbcl-parenscript) | ||
| 514 | ("quri" ,sbcl-quri) | ||
| 515 | ("sqlite" ,sbcl-cl-sqlite) | ||
| 516 | ("str" ,sbcl-cl-str) | ||
| 517 | ("swank" ,sbcl-slime-swank) | ||
| 518 | ("trivia" ,sbcl-trivia) | ||
| 519 | ("trivial-clipboard" ,sbcl-trivial-clipboard) | ||
| 520 | ("unix-opts" ,sbcl-unix-opts) | ||
| 521 | ;; Local deps | ||
| 522 | ("next-download-manager" ,sbcl-next-download-manager))) | ||
| 523 | (native-inputs | ||
| 524 | `(("prove-asdf" ,sbcl-prove-asdf))) | ||
| 525 | (synopsis "Infinitely extensible web-browser (with Lisp development files)")))) | ||
| 526 | |||
| 527 | (define-public sbcl-next | ||
| 528 | (deprecated-package "sbcl-next" next)) | ||
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 065700465e2..2008b8ee464 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm | |||
| @@ -68,6 +68,7 @@ | |||
| 68 | #:use-module (guix build-system python) | 68 | #:use-module (guix build-system python) |
| 69 | #:use-module (guix build-system ant) | 69 | #:use-module (guix build-system ant) |
| 70 | #:use-module (guix build-system scons) | 70 | #:use-module (guix build-system scons) |
| 71 | #:use-module (guix build-system go) | ||
| 71 | #:use-module (gnu packages) | 72 | #:use-module (gnu packages) |
| 72 | #:use-module (gnu packages admin) | 73 | #:use-module (gnu packages admin) |
| 73 | #:use-module (gnu packages adns) | 74 | #:use-module (gnu packages adns) |
| @@ -92,6 +93,7 @@ | |||
| 92 | #:use-module (gnu packages gnome) | 93 | #:use-module (gnu packages gnome) |
| 93 | #:use-module (gnu packages gnu-doc) | 94 | #:use-module (gnu packages gnu-doc) |
| 94 | #:use-module (gnu packages gnupg) | 95 | #:use-module (gnu packages gnupg) |
| 96 | #:use-module (gnu packages golang) | ||
| 95 | #:use-module (gnu packages gperf) | 97 | #:use-module (gnu packages gperf) |
| 96 | #:use-module (gnu packages gtk) | 98 | #:use-module (gnu packages gtk) |
| 97 | #:use-module (gnu packages guile) | 99 | #:use-module (gnu packages guile) |
| @@ -6596,3 +6598,35 @@ It's also possible to rewrite existing log files. | |||
| 6596 | 6598 | ||
| 6597 | Anonip can also be uses as a Python module in your own Python application.") | 6599 | Anonip can also be uses as a Python module in your own Python application.") |
| 6598 | (license license:bsd-3))) | 6600 | (license license:bsd-3))) |
| 6601 | |||
| 6602 | (define-public poussetaches | ||
| 6603 | (package | ||
| 6604 | (name "poussetaches") | ||
| 6605 | (version "0.0.1") | ||
| 6606 | (source | ||
| 6607 | (origin | ||
| 6608 | (method git-fetch) | ||
| 6609 | (uri (git-reference | ||
| 6610 | (url "https://github.com/tsileo/poussetaches") | ||
| 6611 | (commit version))) | ||
| 6612 | (file-name (git-file-name name version)) | ||
| 6613 | (sha256 | ||
| 6614 | (base32 | ||
| 6615 | "07106kfcz3a39jvrv3mlqqxlihsmdhgkrjnqznyjsij9absgvdv6")))) | ||
| 6616 | (build-system go-build-system) | ||
| 6617 | (propagated-inputs | ||
| 6618 | `(("go-github-com-robfig-cron" ,go-github-com-robfig-cron) | ||
| 6619 | ("go-golang-org-x-time-rate" ,go-golang-org-x-time-rate))) | ||
| 6620 | (arguments | ||
| 6621 | `(#:import-path "github.com/tsileo/poussetaches")) | ||
| 6622 | (home-page "https://github.com/tsileo/poussetaches") | ||
| 6623 | (synopsis "Lightweight asynchronous task execution service") | ||
| 6624 | (description "Poussetaches (which literally means \"push tasks\" in | ||
| 6625 | French) is a lightweight asynchronous task execution service that aims to | ||
| 6626 | replace Celery and RabbitMQ for small Python applications. | ||
| 6627 | |||
| 6628 | The app posts base64-encoded payload to poussetaches and specifies the | ||
| 6629 | endpoint that will be used to trigger the task. Poussetaches makes HTTP | ||
| 6630 | requests with the registered payload until the right status code is | ||
| 6631 | returned.") | ||
| 6632 | (license license:isc))) | ||
diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index 538c97675db..ea7cee54e37 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | ;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com> | 2 | ;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com> |
| 3 | ;;; Copyright © 2015 David Hashe <david.hashe@dhashe.com> | 3 | ;;; Copyright © 2015 David Hashe <david.hashe@dhashe.com> |
| 4 | ;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net> | 4 | ;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net> |
| 5 | ;;; Copyright © 2015, 2016, 2017, 2018 Mark H Weaver <mhw@netris.org> | 5 | ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Mark H Weaver <mhw@netris.org> |
| 6 | ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> | 6 | ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> |
| 7 | ;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz> | 7 | ;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz> |
| 8 | ;;; | 8 | ;;; |
| @@ -59,14 +59,14 @@ | |||
| 59 | (define-public webkitgtk | 59 | (define-public webkitgtk |
| 60 | (package | 60 | (package |
| 61 | (name "webkitgtk") | 61 | (name "webkitgtk") |
| 62 | (version "2.24.3") | 62 | (version "2.24.4") |
| 63 | (source (origin | 63 | (source (origin |
| 64 | (method url-fetch) | 64 | (method url-fetch) |
| 65 | (uri (string-append "https://www.webkitgtk.org/releases/" | 65 | (uri (string-append "https://www.webkitgtk.org/releases/" |
| 66 | name "-" version ".tar.xz")) | 66 | name "-" version ".tar.xz")) |
| 67 | (sha256 | 67 | (sha256 |
| 68 | (base32 | 68 | (base32 |
| 69 | "0lbcrw5axwrbrajxq7fqywfyh0djqi23ynzb5wi5ghw2grnp83cl")))) | 69 | "1n3x5g1z6rg9n1ssna7wi0z6zlprjm4wzk544v14wqi6q0lv2s46")))) |
| 70 | (build-system cmake-build-system) | 70 | (build-system cmake-build-system) |
| 71 | (outputs '("out" "doc")) | 71 | (outputs '("out" "doc")) |
| 72 | (arguments | 72 | (arguments |
diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index b8a22641537..4cf1a3ac4b1 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm | |||
| @@ -72,7 +72,7 @@ | |||
| 72 | (define-public wine | 72 | (define-public wine |
| 73 | (package | 73 | (package |
| 74 | (name "wine") | 74 | (name "wine") |
| 75 | (version "4.0.1") | 75 | (version "4.0.2") |
| 76 | (source (origin | 76 | (source (origin |
| 77 | (method url-fetch) | 77 | (method url-fetch) |
| 78 | (uri (string-append "https://dl.winehq.org/wine/source/" | 78 | (uri (string-append "https://dl.winehq.org/wine/source/" |
| @@ -80,7 +80,7 @@ | |||
| 80 | "/wine-" version ".tar.xz")) | 80 | "/wine-" version ".tar.xz")) |
| 81 | (sha256 | 81 | (sha256 |
| 82 | (base32 | 82 | (base32 |
| 83 | "0j29df0px6dzin4j0cbxgza4msvf9spmwranv25krq1g9kq959nk")))) | 83 | "0x5x9pvhryzhq1m7i8gx5wwwj341zz05zymadlhfw5w45xlm0h4r")))) |
| 84 | (build-system gnu-build-system) | 84 | (build-system gnu-build-system) |
| 85 | (native-inputs `(("pkg-config" ,pkg-config) | 85 | (native-inputs `(("pkg-config" ,pkg-config) |
| 86 | ("gettext" ,gettext-minimal) | 86 | ("gettext" ,gettext-minimal) |
diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 709037da37c..e644cc94cc2 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm | |||
| @@ -1183,7 +1183,7 @@ modules for building a Wayland compositor.") | |||
| 1183 | (define-public sway | 1183 | (define-public sway |
| 1184 | (package | 1184 | (package |
| 1185 | (name "sway") | 1185 | (name "sway") |
| 1186 | (version "1.1.1") | 1186 | (version "1.2") |
| 1187 | (source | 1187 | (source |
| 1188 | (origin | 1188 | (origin |
| 1189 | (method git-fetch) | 1189 | (method git-fetch) |
| @@ -1192,7 +1192,7 @@ modules for building a Wayland compositor.") | |||
| 1192 | (commit version))) | 1192 | (commit version))) |
| 1193 | (file-name (git-file-name name version)) | 1193 | (file-name (git-file-name name version)) |
| 1194 | (sha256 | 1194 | (sha256 |
| 1195 | (base32 "0yhn9zdg9mzfhn97c440lk3pw6122nrhx0is5sqmvgr6p814f776")))) | 1195 | (base32 "0vch2zm5afc76ia78p3vg71zr2fyda67l9hd2h0x1jq3mnvfbxnd")))) |
| 1196 | (build-system meson-build-system) | 1196 | (build-system meson-build-system) |
| 1197 | (arguments | 1197 | (arguments |
| 1198 | `(#:phases | 1198 | `(#:phases |
diff --git a/gnu/services/cuirass.scm b/gnu/services/cuirass.scm index f92d33bf947..7bd43cd427e 100644 --- a/gnu/services/cuirass.scm +++ b/gnu/services/cuirass.scm | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | ;;; Copyright © 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org> | 3 | ;;; Copyright © 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org> |
| 4 | ;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com> | 4 | ;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com> |
| 5 | ;;; Copyright © 2017 Jan Nieuwenhuizen <janneke@gnu.org> | 5 | ;;; Copyright © 2017 Jan Nieuwenhuizen <janneke@gnu.org> |
| 6 | ;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net> | 6 | ;;; Copyright © 2018, 2019 Ricardo Wurmus <rekado@elephly.net> |
| 7 | ;;; Copyright © 2018 Clément Lassieur <clement@lassieur.org> | 7 | ;;; Copyright © 2018 Clément Lassieur <clement@lassieur.org> |
| 8 | ;;; | 8 | ;;; |
| 9 | ;;; This file is part of GNU Guix. | 9 | ;;; This file is part of GNU Guix. |
| @@ -52,6 +52,8 @@ | |||
| 52 | (default cuirass)) | 52 | (default cuirass)) |
| 53 | (log-file cuirass-configuration-log-file ;string | 53 | (log-file cuirass-configuration-log-file ;string |
| 54 | (default "/var/log/cuirass.log")) | 54 | (default "/var/log/cuirass.log")) |
| 55 | (web-log-file cuirass-configuration-web-log-file ;string | ||
| 56 | (default "/var/log/cuirass-web.log")) | ||
| 55 | (cache-directory cuirass-configuration-cache-directory ;string (dir-name) | 57 | (cache-directory cuirass-configuration-cache-directory ;string (dir-name) |
| 56 | (default "/var/cache/cuirass")) | 58 | (default "/var/cache/cuirass")) |
| 57 | (ttl cuirass-configuration-ttl ;integer | 59 | (ttl cuirass-configuration-ttl ;integer |
| @@ -83,6 +85,7 @@ | |||
| 83 | (cuirass-configuration? config) | 85 | (cuirass-configuration? config) |
| 84 | (let ((cuirass (cuirass-configuration-cuirass config)) | 86 | (let ((cuirass (cuirass-configuration-cuirass config)) |
| 85 | (cache-directory (cuirass-configuration-cache-directory config)) | 87 | (cache-directory (cuirass-configuration-cache-directory config)) |
| 88 | (web-log-file (cuirass-configuration-web-log-file config)) | ||
| 86 | (log-file (cuirass-configuration-log-file config)) | 89 | (log-file (cuirass-configuration-log-file config)) |
| 87 | (user (cuirass-configuration-user config)) | 90 | (user (cuirass-configuration-user config)) |
| 88 | (group (cuirass-configuration-group config)) | 91 | (group (cuirass-configuration-group config)) |
| @@ -106,8 +109,6 @@ | |||
| 106 | #$(scheme-file "cuirass-specs.scm" specs) | 109 | #$(scheme-file "cuirass-specs.scm" specs) |
| 107 | "--database" #$database | 110 | "--database" #$database |
| 108 | "--ttl" #$(string-append (number->string ttl) "s") | 111 | "--ttl" #$(string-append (number->string ttl) "s") |
| 109 | "--port" #$(number->string port) | ||
| 110 | "--listen" #$host | ||
| 111 | "--interval" #$(number->string interval) | 112 | "--interval" #$(number->string interval) |
| 112 | #$@(if use-substitutes? '("--use-substitutes") '()) | 113 | #$@(if use-substitutes? '("--use-substitutes") '()) |
| 113 | #$@(if one-shot? '("--one-shot") '()) | 114 | #$@(if one-shot? '("--one-shot") '()) |
| @@ -121,6 +122,28 @@ | |||
| 121 | #:user #$user | 122 | #:user #$user |
| 122 | #:group #$group | 123 | #:group #$group |
| 123 | #:log-file #$log-file)) | 124 | #:log-file #$log-file)) |
| 125 | (stop #~(make-kill-destructor))) | ||
| 126 | (shepherd-service | ||
| 127 | (documentation "Run Cuirass web interface.") | ||
| 128 | (provision '(cuirass-web)) | ||
| 129 | (requirement '(guix-daemon networking)) | ||
| 130 | (start #~(make-forkexec-constructor | ||
| 131 | (list (string-append #$cuirass "/bin/cuirass") | ||
| 132 | "--cache-directory" #$cache-directory | ||
| 133 | "--specifications" | ||
| 134 | #$(scheme-file "cuirass-specs.scm" specs) | ||
| 135 | "--database" #$database | ||
| 136 | "--ttl" #$(string-append (number->string ttl) "s") | ||
| 137 | "--web" | ||
| 138 | "--port" #$(number->string port) | ||
| 139 | "--listen" #$host | ||
| 140 | "--interval" #$(number->string interval) | ||
| 141 | #$@(if use-substitutes? '("--use-substitutes") '()) | ||
| 142 | #$@(if fallback? '("--fallback") '())) | ||
| 143 | |||
| 144 | #:user #$user | ||
| 145 | #:group #$group | ||
| 146 | #:log-file #$web-log-file)) | ||
| 124 | (stop #~(make-kill-destructor))))))) | 147 | (stop #~(make-kill-destructor))))))) |
| 125 | 148 | ||
| 126 | (define (cuirass-account config) | 149 | (define (cuirass-account config) |
diff --git a/gnu/services/cups.scm b/gnu/services/cups.scm index 9d21b6e70c7..e77c43bfbff 100644 --- a/gnu/services/cups.scm +++ b/gnu/services/cups.scm | |||
| @@ -3,6 +3,7 @@ | |||
| 3 | ;;; Copyright © 2017 Clément Lassieur <clement@lassieur.org> | 3 | ;;; Copyright © 2017 Clément Lassieur <clement@lassieur.org> |
| 4 | ;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net> | 4 | ;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net> |
| 5 | ;;; Copyright © 2019 Alex Griffin <a@ajgrf.com> | 5 | ;;; Copyright © 2019 Alex Griffin <a@ajgrf.com> |
| 6 | ;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr> | ||
| 6 | ;;; | 7 | ;;; |
| 7 | ;;; This file is part of GNU Guix. | 8 | ;;; This file is part of GNU Guix. |
| 8 | ;;; | 9 | ;;; |
| @@ -170,7 +171,10 @@ | |||
| 170 | 171 | ||
| 171 | (define (ssl-options? x) | 172 | (define (ssl-options? x) |
| 172 | (and (list? x) | 173 | (and (list? x) |
| 173 | (and-map (lambda (elt) (memq elt '(AllowRC4 AllowSSL3))) x))) | 174 | (and-map (lambda (elt) (memq elt '(AllowRC4 |
| 175 | AllowSSL3 | ||
| 176 | DenyCBC | ||
| 177 | DenyTLS1.0))) x))) | ||
| 174 | (define (serialize-ssl-options field-name val) | 178 | (define (serialize-ssl-options field-name val) |
| 175 | (serialize-field field-name | 179 | (serialize-field field-name |
| 176 | (match val | 180 | (match val |
| @@ -805,12 +809,15 @@ an IPv6 address enclosed in brackets, an IPv4 address, or @code{*} to indicate | |||
| 805 | all addresses.") | 809 | all addresses.") |
| 806 | (ssl-options | 810 | (ssl-options |
| 807 | (ssl-options '()) | 811 | (ssl-options '()) |
| 808 | "Sets encryption options. | 812 | "Sets encryption options. By default, CUPS only supports encryption |
| 809 | By default, CUPS only supports encryption using TLS v1.0 or higher using known | 813 | using TLS v1.0 or higher using known secure cipher suites. Security is |
| 810 | secure cipher suites. The @code{AllowRC4} option enables the 128-bit RC4 | 814 | reduced when @code{Allow} options are used, and enhanced when @code{Deny} |
| 811 | cipher suites, which are required for some older clients that do not implement | 815 | options are used. The @code{AllowRC4} option enables the 128-bit RC4 cipher |
| 812 | newer ones. The @code{AllowSSL3} option enables SSL v3.0, which is required | 816 | suites, which are required for some older clients. The @code{AllowSSL3} option |
| 813 | for some older clients that do not support TLS v1.0.") | 817 | enables SSL v3.0, which is required for some older clients that do not support |
| 818 | TLS v1.0. The @code{DenyCBC} option disables all CBC cipher suites. The | ||
| 819 | @code{DenyTLS1.0} option disables TLS v1.0 support - this sets the minimum | ||
| 820 | protocol version to TLS v1.1.") | ||
| 814 | #; | 821 | #; |
| 815 | (ssl-port | 822 | (ssl-port |
| 816 | (non-negative-integer 631) | 823 | (non-negative-integer 631) |
diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm index 343d507c14b..a32756e0403 100644 --- a/gnu/services/desktop.scm +++ b/gnu/services/desktop.scm | |||
| @@ -963,23 +963,29 @@ with the administrator's password." | |||
| 963 | (match-record enlightenment-desktop-configuration | 963 | (match-record enlightenment-desktop-configuration |
| 964 | <enlightenment-desktop-configuration> | 964 | <enlightenment-desktop-configuration> |
| 965 | (enlightenment) | 965 | (enlightenment) |
| 966 | (list (file-append enlightenment | 966 | (let ((module-arch (match (string-tokenize (%current-system) |
| 967 | "/lib/enlightenment/utils/enlightenment_sys") | 967 | (char-set-complement (char-set #\-))) |
| 968 | (file-append enlightenment | 968 | ((arch "linux") (string-append "linux-gnu-" arch)) |
| 969 | "/lib/enlightenment/utils/enlightenment_backlight") | 969 | ((arch "gnu") (string-append "gnu-" arch))))) |
| 970 | ;; TODO: Move this binary to a screen-locker service. | 970 | (list (file-append enlightenment |
| 971 | (file-append enlightenment | 971 | "/lib/enlightenment/utils/enlightenment_sys") |
| 972 | "/lib/enlightenment/utils/enlightenment_ckpasswd") | 972 | (file-append enlightenment |
| 973 | (file-append enlightenment | 973 | "/lib/enlightenment/utils/enlightenment_backlight") |
| 974 | (string-append | 974 | ;; TODO: Move this binary to a screen-locker service. |
| 975 | "/lib/enlightenment/modules/cpufreq/" | 975 | (file-append enlightenment |
| 976 | (match (string-tokenize (%current-system) | 976 | "/lib/enlightenment/utils/enlightenment_ckpasswd") |
| 977 | (char-set-complement (char-set #\-))) | 977 | (file-append enlightenment |
| 978 | ((arch "linux") (string-append "linux-gnu-" arch)) | 978 | (string-append |
| 979 | ((arch "gnu") (string-append "gnu-" arch))) | 979 | "/lib/enlightenment/modules/cpufreq/" |
| 980 | "-" | 980 | module-arch "-" |
| 981 | (version-major+minor (package-version enlightenment)) | 981 | (package-version enlightenment) |
| 982 | "/freqset"))))) | 982 | "/freqset")) |
| 983 | (file-append enlightenment | ||
| 984 | (string-append | ||
| 985 | "/lib/enlightenment/modules/sysinfo/" | ||
| 986 | module-arch "-" | ||
| 987 | (package-version enlightenment) | ||
| 988 | "/cpuclock_sysfs")))))) | ||
| 983 | 989 | ||
| 984 | (define enlightenment-desktop-service-type | 990 | (define enlightenment-desktop-service-type |
| 985 | (service-type | 991 | (service-type |
diff --git a/gnu/services/pm.scm b/gnu/services/pm.scm index 3817bd09de2..1e01b5059da 100644 --- a/gnu/services/pm.scm +++ b/gnu/services/pm.scm | |||
| @@ -401,7 +401,8 @@ shutdown on system startup.")) | |||
| 401 | (compose list tlp-configuration-tlp)) | 401 | (compose list tlp-configuration-tlp)) |
| 402 | (service-extension activation-service-type | 402 | (service-extension activation-service-type |
| 403 | tlp-activation))) | 403 | tlp-activation))) |
| 404 | (default-value (tlp-configuration)))) | 404 | (default-value (tlp-configuration)) |
| 405 | (description "Run TLP, a power management tool."))) | ||
| 405 | 406 | ||
| 406 | (define (generate-tlp-documentation) | 407 | (define (generate-tlp-documentation) |
| 407 | (generate-documentation | 408 | (generate-documentation |
| @@ -441,4 +442,6 @@ shutdown on system startup.")) | |||
| 441 | (name 'thermald) | 442 | (name 'thermald) |
| 442 | (extensions (list (service-extension shepherd-root-service-type | 443 | (extensions (list (service-extension shepherd-root-service-type |
| 443 | thermald-shepherd-service))) | 444 | thermald-shepherd-service))) |
| 444 | (default-value (thermald-configuration)))) | 445 | (default-value (thermald-configuration)) |
| 446 | (description "Run thermald, a CPU frequency scaling service that helps | ||
| 447 | prevent overheating."))) | ||
diff --git a/gnu/tests/docker.scm b/gnu/tests/docker.scm index 3ec5c3d6eed..3f98a1e3167 100644 --- a/gnu/tests/docker.scm +++ b/gnu/tests/docker.scm | |||
| @@ -100,7 +100,7 @@ inside %DOCKER-OS." | |||
| 100 | marionette)) | 100 | marionette)) |
| 101 | 101 | ||
| 102 | (test-equal "Load docker image and run it" | 102 | (test-equal "Load docker image and run it" |
| 103 | '("hello world" "hi!" "JSON!") | 103 | '("hello world" "hi!" "JSON!" #o1777) |
| 104 | (marionette-eval | 104 | (marionette-eval |
| 105 | `(begin | 105 | `(begin |
| 106 | (define slurp | 106 | (define slurp |
| @@ -131,8 +131,15 @@ inside %DOCKER-OS." | |||
| 131 | ,(string-append #$docker-cli "/bin/docker") | 131 | ,(string-append #$docker-cli "/bin/docker") |
| 132 | "run" repository&tag | 132 | "run" repository&tag |
| 133 | "-c" "(use-modules (json)) | 133 | "-c" "(use-modules (json)) |
| 134 | (display (json-string->scm (scm->json-string \"JSON!\")))"))) | 134 | (display (json-string->scm (scm->json-string \"JSON!\")))")) |
| 135 | (list response1 response2 response3))) | 135 | |
| 136 | ;; Check whether /tmp exists. | ||
| 137 | (response4 (slurp | ||
| 138 | ,(string-append #$docker-cli "/bin/docker") | ||
| 139 | "run" repository&tag "-c" | ||
| 140 | "(display (stat:perms (lstat \"/tmp\")))"))) | ||
| 141 | (list response1 response2 response3 | ||
| 142 | (string->number response4)))) | ||
| 136 | marionette)) | 143 | marionette)) |
| 137 | 144 | ||
| 138 | (test-end) | 145 | (test-end) |
