diff options
Diffstat (limited to 'gnu')
80 files changed, 2393 insertions, 413 deletions
diff --git a/gnu/build/linux-boot.scm b/gnu/build/linux-boot.scm index 03f2ea245c..f273957d78 100644 --- a/gnu/build/linux-boot.scm +++ b/gnu/build/linux-boot.scm @@ -471,10 +471,6 @@ upon error." mounts) "ext4")) - (define (lookup-module name) - (string-append linux-module-directory "/" - (ensure-dot-ko name))) - (display "Welcome, this is GNU's early boot Guile.\n") (display "Use '--repl' for an initrd REPL.\n\n") @@ -489,9 +485,8 @@ upon error." (start-repl)) (display "loading kernel modules...\n") - (for-each (cut load-linux-module* <> - #:lookup-module lookup-module) - (map lookup-module linux-modules)) + (load-linux-modules-from-directory linux-modules + linux-module-directory) (when keymap-file (let ((status (system* "loadkeys" keymap-file))) diff --git a/gnu/build/linux-modules.scm b/gnu/build/linux-modules.scm index c66ef97012..a149eff329 100644 --- a/gnu/build/linux-modules.scm +++ b/gnu/build/linux-modules.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014, 2016, 2018, 2019 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com> +;;; Copyright © 2018 Danny Milosavljevic <dannym@scratchpost.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -30,8 +31,10 @@ #:use-module (ice-9 vlist) #:use-module (ice-9 match) #:use-module (ice-9 rdelim) + #:autoload (ice-9 pretty-print) (pretty-print) #:export (dot-ko ensure-dot-ko + module-formal-name module-aliases module-dependencies module-soft-dependencies @@ -42,13 +45,18 @@ modules-loaded module-loaded? load-linux-module* + load-linux-modules-from-directory current-module-debugging-port device-module-aliases known-module-aliases matching-modules - missing-modules)) + missing-modules + + write-module-name-database + write-module-alias-database + write-module-device-database)) ;;; Commentary: ;;; @@ -95,6 +103,14 @@ key/value pairs.." (define %not-comma (char-set-complement (char-set #\,))) +(define (module-formal-name file) + "Return the module name of FILE as it appears in its info section. Usually +the module name is the same as the base name of FILE, modulo hyphens and minus +the \".ko\" extension." + (match (assq 'name (modinfo-section-contents file)) + (('name . name) name) + (#f #f))) + (define (module-dependencies file) "Return the list of modules that FILE depends on. The returned list contains module names, not actual file names." @@ -310,6 +326,18 @@ appears in BLACK-LIST are not loaded." (or (and recursive? (= EEXIST (system-error-errno args))) (apply throw args))))))) +(define (load-linux-modules-from-directory modules directory) + "Load MODULES and their dependencies from DIRECTORY, a directory containing +the '.ko' files. The '.ko' suffix is automatically added to MODULES if +needed." + (define module-name->file-name + (module-name-lookup directory)) + + (for-each (lambda (module) + (load-linux-module* (module-name->file-name module) + #:lookup-module module-name->file-name)) + modules)) + ;;; ;;; Device modules. @@ -486,4 +514,121 @@ are required to access DEVICE." (remove (cut member <> provided) modules)) '())) + +;;; +;;; Module databases. +;;; + +(define (module-name->file-name/guess directory name) + "Guess the file name corresponding to NAME, a module name. That doesn't +always work because sometimes underscores in NAME map to hyphens (e.g., +\"input-leds.ko\"), sometimes not (e.g., \"mac_hid.ko\")." + (string-append directory "/" (ensure-dot-ko name))) + +(define (module-name-lookup directory) + "Return a one argument procedure that takes a module name (e.g., +\"input_leds\") and returns its absolute file name (e.g., +\"/.../input-leds.ko\")." + (catch 'system-error + (lambda () + (define mapping + (call-with-input-file (string-append directory "/modules.name") + read)) + + (lambda (name) + (or (assoc-ref mapping name) + (module-name->file-name/guess directory name)))) + (lambda args + (if (= ENOENT (system-error-errno args)) + (cut module-name->file-name/guess directory <>) + (apply throw args))))) + +(define (write-module-name-database directory) + "Write a database that maps \"module names\" as they appear in the relevant +ELF section of '.ko' files, to actual file names. This format is +Guix-specific. It aims to deal with inconsistent naming, in particular +hyphens vs. underscores." + (define mapping + (map (lambda (file) + (match (module-formal-name file) + (#f (cons (basename file ".ko") file)) + (name (cons name file)))) + (find-files directory "\\.ko$"))) + + (call-with-output-file (string-append directory "/modules.name") + (lambda (port) + (display ";; Module name to file name mapping. +;; +;; This format is Guix-specific; it is not supported by upstream Linux tools. +\n" + port) + (pretty-print mapping port)))) + +(define (write-module-alias-database directory) + "Traverse the '.ko' files in DIRECTORY and create the corresponding +'modules.alias' file." + (define aliases + (map (lambda (file) + (cons (file-name->module-name file) (module-aliases file))) + (find-files directory "\\.ko$"))) + + (call-with-output-file (string-append directory "/modules.alias") + (lambda (port) + (display "# Aliases extracted from modules themselves.\n" port) + (for-each (match-lambda + ((module . aliases) + (for-each (lambda (alias) + (format port "alias ~a ~a\n" alias module)) + aliases))) + aliases)))) + +(define (aliases->device-tuple aliases) + "Traverse ALIASES, a list of module aliases, and search for +\"char-major-M-N\", \"block-major-M-N\", or \"devname:\" aliases. When they +are found, return a tuple (DEVNAME TYPE MAJOR MINOR), otherwise return #f." + (define (char/block-major? alias) + (or (string-prefix? "char-major-" alias) + (string-prefix? "block-major-" alias))) + + (define (char/block-major->tuple alias) + (match (string-tokenize alias %not-dash) + ((type "major" (= string->number major) (= string->number minor)) + (list (match type + ("char" "c") + ("block" "b")) + major minor)))) + + (let* ((devname (any (lambda (alias) + (and (string-prefix? "devname:" alias) + (string-drop alias 8))) + aliases)) + (major/minor (match (find char/block-major? aliases) + (#f #f) + (str (char/block-major->tuple str))))) + (and devname major/minor + (cons devname major/minor)))) + +(define %not-dash + (char-set-complement (char-set #\-))) + +(define (write-module-device-database directory) + "Traverse the '.ko' files in DIRECTORY and create the corresponding +'modules.devname' file. This file contains information about modules that can +be loaded on-demand, such as file system modules." + (define aliases + (filter-map (lambda (file) + (match (aliases->device-tuple (module-aliases file)) + (#f #f) + (tuple (cons (file-name->module-name file) tuple)))) + (find-files directory "\\.ko$"))) + + (call-with-output-file (string-append directory "/modules.devname") + (lambda (port) + (display "# Device nodes to trigger on-demand module loading.\n" port) + (for-each (match-lambda + ((module devname type major minor) + (format port "~a ~a ~a~a:~a~%" + module devname type major minor))) + aliases)))) + ;;; linux-modules.scm ends here diff --git a/gnu/ci.scm b/gnu/ci.scm index aeebd4f14b..5d5a826647 100644 --- a/gnu/ci.scm +++ b/gnu/ci.scm @@ -331,8 +331,12 @@ valid." "Return the list of packages to build." (define (adjust package result) (cond ((package-replacement package) - (cons* package ;build both - (package-replacement package) + ;; XXX: If PACKAGE and its replacement have the same name/version, + ;; then both Cuirass jobs will have the same name, which + ;; effectively means that the second one will be ignored. Thus, + ;; return the replacement first. + (cons* (package-replacement package) ;build both + package result)) ((package-superseded package) result) ;don't build it diff --git a/gnu/installer.scm b/gnu/installer.scm index 15d971dfc4..167653263f 100644 --- a/gnu/installer.scm +++ b/gnu/installer.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2019 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; ;;; This file is part of GNU Guix. ;;; @@ -226,15 +227,6 @@ selected keymap." (#$keymap-step current-installer))) (configuration-formatter keyboard-layout->configuration)) - ;; Run a partitioning tool allowing the user to modify - ;; partition tables, partitions and their mount points. - (installer-step - (id 'partition) - (description (G_ "Partitioning")) - (compute (lambda _ - ((installer-partition-page current-installer)))) - (configuration-formatter user-partitions->configuration)) - ;; Ask the user to input a hostname for the system. (installer-step (id 'hostname) @@ -267,6 +259,17 @@ selected keymap." ((installer-services-page current-installer)))) (configuration-formatter system-services->configuration)) + ;; Run a partitioning tool allowing the user to modify + ;; partition tables, partitions and their mount points. + ;; Do this last so the user has something to boot if any + ;; of the previous steps didn't go as expected. + (installer-step + (id 'partition) + (description (G_ "Partitioning")) + (compute (lambda _ + ((installer-partition-page current-installer)))) + (configuration-formatter user-partitions->configuration)) + (installer-step (id 'final) (description (G_ "Configuration file")) diff --git a/gnu/installer/newt/page.scm b/gnu/installer/newt/page.scm index 728721c08f..630efde9cc 100644 --- a/gnu/installer/newt/page.scm +++ b/gnu/installer/newt/page.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2019 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; ;;; This file is part of GNU Guix. ;;; @@ -75,7 +76,7 @@ this page to TITLE." #:key (allow-empty-input? #f) (default-text #f) - (input-hide-checkbox? #f) + (input-visibility-checkbox? #f) (input-field-width 40) (input-flags 0)) "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." input-field-width #:flags FLAG-BORDER)) (input-visible-cb - (make-checkbox -1 -1 (G_ "Hide") #\x "x ")) - (input-flags* (if input-hide-checkbox? + (make-checkbox -1 -1 (G_ "Show") #\space "x ")) + (input-flags* (if input-visibility-checkbox? (logior FLAG-PASSWORD FLAG-SCROLL input-flags) input-flags)) @@ -102,7 +103,7 @@ input box, such as FLAG-PASSWORD." (apply horizontal-stacked-grid GRID-ELEMENT-COMPONENT input-entry - `(,@(if input-hide-checkbox? + `(,@(if input-visibility-checkbox? (list GRID-ELEMENT-COMPONENT input-visible-cb) '()))) GRID-ELEMENT-COMPONENT ok-button)) diff --git a/gnu/installer/newt/user.scm b/gnu/installer/newt/user.scm index dab805198f..b747886c55 100644 --- a/gnu/installer/newt/user.scm +++ b/gnu/installer/newt/user.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2019 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; ;;; This file is part of GNU Guix. ;;; @@ -55,7 +56,7 @@ REAL-NAME, and HOME-DIRECTORY as the initial values in the form." (entry-home-directory (make-entry -1 -1 entry-width #:initial-value home-directory)) (password-visible-cb - (make-checkbox -1 -1 (G_ "Hide") #\x "x ")) + (make-checkbox -1 -1 (G_ "Show") #\space "x ")) (entry-password (make-entry -1 -1 entry-width #:flags (logior FLAG-PASSWORD FLAG-SCROLL))) @@ -156,7 +157,7 @@ a thunk, if the confirmation doesn't match PASSWORD, and return its result." (run-input-page (G_ "Please confirm the password.") (G_ "Password confirmation required") #:allow-empty-input? #t - #:input-hide-checkbox? #t)) + #:input-visibility-checkbox? #t)) (if (string=? password confirmation) password @@ -173,7 +174,7 @@ a thunk, if the confirmation doesn't match PASSWORD, and return its result." (run-input-page (G_ "Please choose a password for the system \ administrator (\"root\").") (G_ "System administrator password") - #:input-hide-checkbox? #t)) + #:input-visibility-checkbox? #t)) (confirm-password password run-root-password-page)) diff --git a/gnu/installer/newt/wifi.scm b/gnu/installer/newt/wifi.scm index 1cb2ef2df3..3fd5756b99 100644 --- a/gnu/installer/newt/wifi.scm +++ b/gnu/installer/newt/wifi.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2019 Meiyo Peng <meiyo@riseup.net> +;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; ;;; This file is part of GNU Guix. ;;; @@ -88,7 +89,8 @@ nmc_wifi_strength_bars." (define (run-wifi-password-page) "Run a page prompting user for a password and return it." (run-input-page (G_ "Please enter the wifi password.") - (G_ "Password required"))) + (G_ "Password required") + #:input-visibility-checkbox? #t)) (define (run-wrong-password-page service-name) "Run a page to inform user of a wrong password input." diff --git a/gnu/local.mk b/gnu/local.mk index 38a06e5620..a756316f77 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -128,6 +128,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/cryptsetup.scm \ %D%/packages/cups.scm \ %D%/packages/curl.scm \ + %D%/packages/cvassistant.scm \ %D%/packages/cyrus-sasl.scm \ %D%/packages/databases.scm \ %D%/packages/datamash.scm \ @@ -161,6 +162,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/electronics.scm \ %D%/packages/elf.scm \ %D%/packages/elixir.scm \ + %D%/packages/elm.scm \ %D%/packages/embedded.scm \ %D%/packages/emacs.scm \ %D%/packages/emacs-xyz.scm \ @@ -771,9 +773,12 @@ dist_patch_DATA = \ %D%/packages/patches/dstat-fix-crash-when-specifying-delay.patch \ %D%/packages/patches/dstat-skip-devices-without-io.patch \ %D%/packages/patches/dvd+rw-tools-add-include.patch \ + %D%/packages/patches/einstein-build.patch \ %D%/packages/patches/elfutils-tests-ptrace.patch \ %D%/packages/patches/elixir-path-length.patch \ - %D%/packages/patches/einstein-build.patch \ + %D%/packages/patches/elm-compiler-disable-reactor.patch \ + %D%/packages/patches/elm-compiler-fix-map-key.patch \ + %D%/packages/patches/elm-compiler-relax-glsl-bound.patch \ %D%/packages/patches/emacs-dired-toggle-sudo-emacs-26.patch \ %D%/packages/patches/emacs-exec-path.patch \ %D%/packages/patches/emacs-fix-scheme-indent-function.patch \ @@ -1013,6 +1018,7 @@ dist_patch_DATA = \ %D%/packages/patches/libexif-CVE-2016-6328.patch \ %D%/packages/patches/libexif-CVE-2017-7544.patch \ %D%/packages/patches/libexif-CVE-2018-20030.patch \ + %D%/packages/patches/libextractor-exiv2.patch \ %D%/packages/patches/libgcrypt-make-yat2m-reproducible.patch \ %D%/packages/patches/libgit2-avoid-python.patch \ %D%/packages/patches/libgit2-mtime-0.patch \ diff --git a/gnu/machine/ssh.scm b/gnu/machine/ssh.scm index ac3aa3e370..6e3ed0e092 100644 --- a/gnu/machine/ssh.scm +++ b/gnu/machine/ssh.scm @@ -126,7 +126,9 @@ an environment type of 'managed-host." #:build-locally? (machine-ssh-configuration-build-locally? config) #:system - (machine-ssh-configuration-system config)))) + (machine-ssh-configuration-system config) + #:become-command + (machine-become-command machine)))) ;;; @@ -164,7 +166,8 @@ MACHINE's 'system' declaration do not exist on the machine." (define (check-labeled-file-system fs) (define remote-exp - (with-imported-modules '((gnu build file-systems)) + (with-imported-modules (source-module-closure + '((gnu build file-systems))) #~(begin (use-modules (gnu build file-systems)) (find-partition-by-label #$(file-system-label->string @@ -241,7 +244,7 @@ MACHINE's 'system' declaration do not exist on the machine." #$(uuid->string device)))) ((file-system-label? device) #~(find-partition-by-label - (file-system-label->string #$device))))) + #$(file-system-label->string device))))) (missing-modules dev '#$(operating-system-initrd-modules (machine-operating-system machine))))))) @@ -377,7 +380,8 @@ have you run 'guix archive --generate-key?'") (lambda (port) (string->canonical-sexp (get-string-all port)))) - (machine-ssh-session machine))) + (machine-ssh-session machine) + (machine-become-command machine))) (mlet %store-monad ((_ (check-deployment-sanity machine)) (boot-parameters (machine-boot-parameters machine))) (let* ((os (machine-operating-system machine)) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index bd3c14033e..eb298dca3b 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -684,7 +684,7 @@ connection alive.") (define-public isc-dhcp (let* ((bind-major-version "9") (bind-minor-version "11") - (bind-patch-version "9") + (bind-patch-version "10") (bind-release-type "") ; for patch release, use "-P" (bind-release-version "") ; for patch release, e.g. "6" (bind-version (string-append bind-major-version @@ -825,7 +825,7 @@ connection alive.") "/bind-" bind-version ".tar.gz")) (sha256 (base32 - "03n57as73ygw6g3lqsmq2idkykajpbskzgixixdvi5a76m4g0fwn")))) + "1hvhdaar9swh5087kzkbmav1nbn19rxh0m60x0d7gri0v8689fxj")))) ;; When cross-compiling, we need the cross Coreutils and sed. ;; Otherwise just use those from %FINAL-INPUTS. @@ -1240,9 +1240,10 @@ commands and their arguments.") CONFIG_READLINE=y\n" port) (close-port port)) #t)) - (add-after 'install 'install-man-pages + (add-after 'install 'install-documentation (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) + (doc (string-append out "/share/doc/wpa-supplicant")) (man (string-append out "/share/man")) (man5 (string-append man "/man5")) (man8 (string-append man "/man8"))) @@ -1255,6 +1256,15 @@ commands and their arguments.") (find-files "doc/docbook" "\\.5")) (for-each (copy-man-page man8) (find-files "doc/docbook" "\\.8")) + + ;; wpa_supplicant.conf(5) does not explain all configuration + ;; options but refers to the example config file, so install it + ;; along with READMEs. + (for-each (lambda (file) + (install-file file doc)) + '("README" "README-DPP" "README-HS20" + "README-P2P" "README-WPS" + "wpa_supplicant.conf")) #t)))) #:make-flags (list "CC=gcc" @@ -1303,7 +1313,7 @@ command.") CONFIG_CTRL_IFACE_DBUS_INTRO=y\n" port) (close-port port)) #t)) - (add-after 'install-man-pages 'install-dbus-conf + (add-after 'install-documentation 'install-dbus-conf (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (dir (string-append out "/etc/dbus-1/system.d"))) @@ -2124,14 +2134,14 @@ done with the @code{auditctl} utility.") (define-public nmap (package (name "nmap") - (version "7.70") + (version "7.80") (source (origin (method url-fetch) (uri (string-append "https://nmap.org/dist/nmap-" version ".tar.bz2")) (sha256 (base32 - "063fg8adx23l4irrh5kn57hsmi1xvjkar4vm4k6g94ppan4hcyw4")) + "1aizfys6l9f9grm82bk878w56mg0zpkfns3spzj157h98875mypw")) (modules '((guix build utils))) (snippet '(begin @@ -2744,14 +2754,14 @@ you are running, what theme or icon set you are using, etc.") (define-public nnn (package (name "nnn") - (version "1.9") + (version "2.6") (source (origin (method url-fetch) (uri (string-append "https://github.com/jarun/nnn/releases/download/v" version "/nnn-v" version ".tar.gz")) (sha256 - (base32 "1d6z12y4rlg4dzhpm30irpq2ak8hjh5zykkp2n7vxnz5m4ki89zp")))) + (base32 "0xb6crd9vig3xgjwl8m4bmgcs4azfmfdpx3g8pdpzs28jdg7i3rr")))) (build-system gnu-build-system) (inputs `(("ncurses" ,ncurses) diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 3312fe0c47..1160feb553 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -81,15 +81,15 @@ in FITS files.") (define-public wcslib (package (name "wcslib") - (version "6.2") + (version "6.4") (source (origin (method url-fetch) (uri (string-append - "ftp://ftp.atnf.csiro.au/pub/software/wcslib/wcslib" version + "ftp://ftp.atnf.csiro.au/pub/software/wcslib/wcslib-" version ".tar.bz2")) (sha256 - (base32 "01fqckazhbfqqhyr0wd9vcks1m2afmsh83l981alxg2r54jgwkdv")))) + (base32 "003h23m6d5wcs29v2vbnl63f3z35k5x70lpsqlz5c9bp1bvizh8k")))) (inputs `(("cfitsio" ,cfitsio))) (build-system gnu-build-system) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index fc0d6f80db..af2951fcd5 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -714,7 +714,7 @@ emulation (valve, tape), bit fiddling (decimator, pointer-cast), etc.") (define-public csound (package (name "csound") - (version "6.12.2") + (version "6.13.0") (source (origin (method git-fetch) (uri (git-reference @@ -723,7 +723,7 @@ emulation (valve, tape), bit fiddling (decimator, pointer-cast), etc.") (file-name (git-file-name name version)) (sha256 (base32 - "01krxcf0alw9k7p5sv0s707600an4sl7lhw3bymbwgqrj0v2p9z2")))) + "14822ybqyp31z18gky2y9zadr9dkbhabg97y139py73w7v3af1bh")))) (build-system cmake-build-system) (inputs `(("alsa-lib" ,alsa-lib) @@ -1105,16 +1105,16 @@ follower.") (define-public fluidsynth (package (name "fluidsynth") - (version "2.0.5") + (version "2.0.6") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/FluidSynth/fluidsynth.git") (commit (string-append "v" version)))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 - "0rv0apxbj0cgm8f8sqf5xr6kdi4q58ph92ip6cg716ha0ca5lr8y")))) + "0nas9pp9r8rnziznxm65x2yzf1ryg98zr3946g0br3s38sjf8l3a")))) (build-system cmake-build-system) (arguments '(#:tests? #f ; no check target @@ -3382,21 +3382,22 @@ on the ALSA software PCM plugin.") (define-public snd (package (name "snd") - (version "19.5") + (version "19.6") (source (origin (method url-fetch) (uri (string-append "ftp://ccrma-ftp.stanford.edu/pub/Lisp/" "snd-" version ".tar.gz")) (sha256 (base32 - "0sk6iyykwi2mm3f1g4r0iqbsrwk3zmyagp6jjqkh8njbq42cjr1y")))) + "0s2qv8sznvw6559bi39qj9p072azh9qcb2b86w6w8clz2azjaa76")))) (build-system glib-or-gtk-build-system) (arguments `(#:tests? #f ; no tests #:out-of-source? #f ; for the 'install-doc' phase #:configure-flags (let* ((out (assoc-ref %outputs "out")) - (docdir (string-append out "/share/doc/snd"))) + (docdir (string-append out "/share/doc/" + ,name "-" ,version))) (list "--with-alsa" "--with-jack" "--with-gmp" (string-append "--with-doc-dir=" docdir))) #:phases @@ -3409,7 +3410,7 @@ on the ALSA software PCM plugin.") (for-each (lambda (f) (install-file f doc)) - (find-files "." "\\.html$|COPYING")) + (find-files "." "\\.html$")) (copy-recursively "pix" (string-append doc "/pix")) #t)))))) (native-inputs diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index a9e0264369..62f368c139 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -2749,7 +2749,7 @@ quantitative phenotypes.") (define-public edirect (package (name "edirect") - (version "10.2.20181018") + (version "12.1.20190819") (source (origin (method url-fetch) (uri (string-append "ftp://ftp.ncbi.nlm.nih.gov/entrez/entrezdirect" @@ -2757,7 +2757,7 @@ quantitative phenotypes.") "/edirect-" version ".tar.gz")) (sha256 (base32 - "091f4aigzpbqih6h82nq566gkp3y07i72yqndmqskfgar1vwgci7")))) + "1i9s9mppcfqd60pfywpm8vdyz5vpnyslw22nd7dv0bhykrdnkz9g")))) (build-system perl-build-system) (arguments `(#:phases @@ -7458,13 +7458,13 @@ names in their natural, rather than lexicographic, order.") (define-public r-edger (package (name "r-edger") - (version "3.26.6") + (version "3.26.7") (source (origin (method url-fetch) (uri (bioconductor-uri "edgeR" version)) (sha256 (base32 - "17vadhamjv4x0l4qqq2p2fi6j2bkllz5zd8dq761vgd5ic23zizm")))) + "1xbhb8aa1ygm5crkp1bmqs2x1601ppa2kgc2xlf2zh8jj8zqapg8")))) (properties `((upstream-name . "edgeR"))) (build-system r-build-system) (propagated-inputs @@ -10273,14 +10273,14 @@ family of feature/genome hypotheses.") (define-public r-gviz (package (name "r-gviz") - (version "1.28.0") + (version "1.28.1") (source (origin (method url-fetch) (uri (bioconductor-uri "Gviz" version)) (sha256 (base32 - "02alz27w8fnnm2ga71g3jg2b94f95ccv6r1fyszj4yb1k2g7rkxk")))) + "0chsb3ijwd8zh588s1vqgfassn2rzax5rhqrhl0ini6pi4ilchp2")))) (properties `((upstream-name . "Gviz"))) (build-system r-build-system) (propagated-inputs diff --git a/gnu/packages/ccache.scm b/gnu/packages/ccache.scm index 0a1112c310..b3f0cbbd95 100644 --- a/gnu/packages/ccache.scm +++ b/gnu/packages/ccache.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014, 2015, 2016, 2018 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il> -;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; ;;; This file is part of GNU Guix. ;;; @@ -30,15 +30,14 @@ (define-public ccache (package (name "ccache") - (version "3.5") + (version "3.6") (source (origin - (method url-fetch) - (uri (string-append "https://www.samba.org/ftp/ccache/ccache-" - version ".tar.xz")) - (sha256 - (base32 - "04n0xram2416pv98qrd7pi5lfsk0bjqyz7zgvvia41j5mrr4pm5x")))) + (method url-fetch) + (uri (string-append "https://www.samba.org/ftp/ccache/ccache-" + version ".tar.xz")) + (sha256 + (base32 "07wv75xdcxpdkfsz9h5ffrm8pjbvr1dh6wnb02nyzz18cdbjkcd6")))) (build-system gnu-build-system) (native-inputs `(("perl" ,perl) ; for test/run ("which" ,(@ (gnu packages base) which)))) diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index 4af2cdc6ea..608cd0af23 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -47,8 +47,8 @@ #:use-module (guix build-system gnu)) (define-public cuirass - (let ((commit "0b40dca734468e8b12b3ff58e3e779679f17d38e") - (revision "21")) + (let ((commit "1cd2f9334dde13542732c22753c4ebde61bc95e0") + (revision "23")) (package (name "cuirass") (version (string-append "0.0.1-" revision "." (string-take commit 7))) @@ -60,7 +60,7 @@ (file-name (string-append name "-" version)) (sha256 (base32 - "1kdxs8dzdyldfs4wsz5hb64hprkbrnq5ljdll631f3bj8pbvvvc1")))) + "0r3x8gv0v89brjqi8r31p6c0mblbaf2kdk2fz99jiab4pir16w87")))) (build-system gnu-build-system) (arguments '(#:modules ((guix build utils) @@ -121,7 +121,7 @@ `(("guile" ,guile-2.2) ("guile-fibers" ,guile-fibers) ("guile-gcrypt" ,guile-gcrypt) - ("guile-json" ,guile-json-1) + ("guile-json" ,guile-json-3) ("guile-sqlite3" ,guile-sqlite3) ("guile-git" ,guile-git) ;; FIXME: this is propagated by "guile-git", but it needs to be among diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 9834fcbe63..bda43bfd18 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1954,3 +1954,49 @@ reading from and writing to ZIP archives. ") ;; Project is distributed under LGPL, but "quazip/z*" "quazip/unzip.*" are ;; distributed under zlib terms. (license (list license:lgpl2.1+ license:zlib)))) + +(define-public zutils + (package + (name "zutils") + ;; Check and remove the lint-hidden-cve property when updating. + (version "1.8") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://savannah/zutils/zutils-" version ".tar.lz")) + (sha256 + (base32 "0dx35mv78fgqgz6sszs05ng8ipz2xy09ry9vpmka2rmy08b7x907")))) + (build-system gnu-build-system) + (arguments + `(#:configure-flags + (list "--sysconfdir=/etc") + #:phases + (modify-phases %standard-phases + (replace 'install + (lambda* (#:key make-flags outputs #:allow-other-keys) + (apply invoke "make" "install" + (string-append "sysconfdir=" (assoc-ref outputs "out") + "/etc") + make-flags)))))) + (native-inputs + ;; Needed to extract the source tarball and run the test suite. + `(("lzip" ,lzip))) + (properties `((lint-hidden-cve . ("CVE-2018-1000637")))) + (home-page "https://www.nongnu.org/zutils/zutils.html") + (synopsis "Utilities that transparently operate on compressed files") + (description + "Zutils is a collection of utilities able to process any combination of +compressed and uncompressed files transparently. If any given file, including +standard input, is compressed, its decompressed content is used instead. + +@command{zcat}, @command{zcmp}, @command{zdiff}, and @command{zgrep} are +improved replacements for the shell scripts provided by GNU gzip. +@command{ztest} tests the integrity of supported compressed files. +@command{zupdate} recompresses files with lzip, similar to gzip's +@command{znew}. + +Supported compression formats are bzip2, gzip, lzip, and xz. Zutils uses +external compressors: the compressor to be used for each format is configurable +at run time, and must be installed separately.") + (license (list license:bsd-2 ; arg_parser.{cc,h} + license:gpl2+)))) ; the rest diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 76ea2ed847..ae8e9c5a47 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2230,14 +2230,14 @@ topics for ecologists (ISBN 978-0-691-12522-0).") (define-public r-lpsolve (package (name "r-lpsolve") - (version "5.6.13.2") + (version "5.6.13.3") (source (origin (method url-fetch) (uri (cran-uri "lpSolve" version)) (sha256 (base32 - "0fc5m259ayc880f5hvnq59ih6nb2rlp394n756n1khmxbjpw1w3m")))) + "1xazby8amb47vw5n12k13awv7x3bjci3q8vdd3vk1ms0ii16ahg6")))) (properties `((upstream-name . "lpSolve"))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/lpSolve") @@ -5851,14 +5851,14 @@ functions.") (define-public r-rjags (package (name "r-rjags") - (version "4-8") + (version "4-9") (source (origin (method url-fetch) (uri (cran-uri "rjags" version)) (sha256 (base32 - "17xmjksj69f9wk4x71jxk4cgiqhaf2fj6bjm0mgzp4qln5x84a8m")))) + "1vrmxxfnia2mkmfkp5yaq5qrlh4xg3ggab6fnj14mrp1231wb91a")))) (build-system r-build-system) (propagated-inputs `(("r-coda" ,r-coda))) @@ -6823,13 +6823,13 @@ and coverage methods to tune the choice of threshold.") (define-public r-ggstance (package (name "r-ggstance") - (version "0.3.2") + (version "0.3.3") (source (origin (method url-fetch) (uri (cran-uri "ggstance" version)) (sha256 - (base32 "078ih9s5b0xzf582qg0vjnxvg5qad5ms1v2vdd062ckahi8zz1r8")))) + (base32 "0kdksay61hyb6612b07r84chh7a9aibjyclk3qcypvr9aang8hkh")))) (build-system r-build-system) (propagated-inputs `(("r-ggplot2" ,r-ggplot2) @@ -14752,14 +14752,14 @@ into R and converted to @code{BibEntry} objects.") (define-public r-citr (package (name "r-citr") - (version "0.3.1") + (version "0.3.2") (source (origin (method url-fetch) (uri (cran-uri "citr" version)) (sha256 (base32 - "0p2sg0fl7cppxxmr20qyqzs2469kglmgpsvykynw4qx501as57rc")))) + "1qbarvafjb8jgkrnrhh6jw7mcglmjwf7dpdiibxf39jkmlhf7las")))) (build-system r-build-system) (propagated-inputs `(("r-assertthat" ,r-assertthat) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 6500adb215..45966389dd 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019 Ivan Petkov <ivanppetkov@gmail.com> ;;; Copyright © 2019 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2019 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; ;;; This file is part of GNU Guix. ;;; @@ -313,6 +314,38 @@ friction with idiomatic Rust structs to ease interopability.") (license (list license:asl2.0 license:expat)))) +(define-public rust-libc + (package + (name "rust-libc") + (version "0.2.62") + (source + (origin + (method url-fetch) + (uri (crate-uri "libc" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1fh69kpjg8hqff36kdczx7sax98gk4qs4ws1dwvjz0rgip0d5z1l")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core)))) + (home-page "https://github.com/rust-lang/libc") + (synopsis "Raw FFI bindings to platform libraries like libc") + (description + "libc provides all of the definitions necessary to easily +interoperate with C code (or \"C-like\" code) on each of the platforms +that Rust supports. This includes type definitions (e.g., c_int), +constants (e.g., EINVAL) as well as function headers (e.g., malloc). + +This crate exports all underlying platform types, functions, and +constants under the crate root, so all items are accessible as +@samp{libc::foo}. The types and values of all the exported APIs match +the platform that libc is compiled for.") + (license (list license:expat + license:asl2.0)))) + (define-public rust-maplit (package (name "rust-maplit") @@ -371,6 +404,55 @@ whether an expression matches a pattern.") (license (list license:asl2.0 license:expat)))) +(define-public rust-num-integer + (package + (name "rust-num-integer") + (version "0.1.41") + (source + (origin + (method url-fetch) + (uri (crate-uri "num-integer" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "02dwjjpfbi16c71fq689s4sw3ih52cvfzr5z5gs6qpr5z0g58pmq")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-autocfg" ,rust-autocfg) + ("rust-num-traits" ,rust-num-traits)))) + (home-page "https://github.com/rust-num/num-integer") + (synopsis "Integer traits and functions") + (description "Integer traits and functions.") + ;; Dual licensed. + (license (list license:asl2.0 + license:expat)))) + +(define-public rust-num-traits + (package + (name "rust-num-traits") + (version "0.2.8") + (source + (origin + (method url-fetch) + (uri (crate-uri "num-traits" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0clvrm34rrqc8p6gq5ps5fcgws3kgq5knh7nlqxf2ayarwks9abb")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-development-inputs + (("rust-autocfg" ,rust-autocfg)))) + (home-page "https://github.com/rust-num/num-traits") + (synopsis "Numeric traits for generic mathematics") + (description "Numeric traits for generic mathematics.") + ;; Dual licensed. + (license (list license:asl2.0 + license:expat)))) + (define-public rust-peeking-take-while (package (name "rust-peeking-take-while") @@ -863,6 +945,26 @@ whitespace from a string.") (license (list license:asl2.0 license:expat)))) +(define-public rust-wasi + (package + (name "rust-wasi") + (version "0.5.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "wasi" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1ir3pd4phdfml0cbziw9bqp7mnk0vfp9biy8bh25lln6raml4m7x")))) + (build-system cargo-build-system) + (home-page "https://github.com/CraneStation/rust-wasi") + (synopsis "Experimental WASI API bindings for Rust") + (description "This package contains experimental WASI API bindings +in Rust.") + (license license:asl2.0))) + (define-public rust-wasm-bindgen-shared (package (name "rust-wasm-bindgen-shared") @@ -950,3 +1052,4 @@ x86_64-pc-windows-gnu target. Please don't use this crate directly, depend on @code{winapi} instead.") (license (list license:asl2.0 license:expat)))) + diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index 467aa5d84c..22b87460ab 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.") (method url-fetch) (uri (string-append "http://www.openprinting.org/download/foomatic/" - name "-" version ".tar.gz")) + "foomatic-filters-" version ".tar.gz")) (sha256 (base32 "1qrkgbm5jay2r7sh9qbyf0aiyrsl1mdc844hxf7fhw95a0zfbqm2")) @@ -639,14 +639,14 @@ printer/driver specific, but spooler-independent PPD file.") (define-public foo2zjs (package (name "foo2zjs") - (version "20190413") + (version "20190517") (source (origin (method url-fetch) ;; XXX: This is an unversioned URL! (uri "http://foo2zjs.rkkda.com/foo2zjs.tar.gz") (sha256 (base32 - "0djzp3ddslmzyxkjhzkhkg6qqqm02whjfnfvh5glprkshcskzlg9")))) + "13gzsd26nq4brx1xzpwmg1qnr4nk7ykgi94qr1hbjqfi561prki4")))) (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases diff --git a/gnu/packages/cvassistant.scm b/gnu/packages/cvassistant.scm new file mode 100644 index 0000000000..f57806d734 --- /dev/null +++ b/gnu/packages/cvassistant.scm @@ -0,0 +1,90 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2019 Nicolas Goaziou <mail@nicolasgoaziou.fr> +;;; Copyright © 2019 Jesse Gibbons <jgibbons2357+guix@gmail.com> +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. + +(define-module (gnu packages cvassistant) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix build-system gnu) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (gnu packages qt) + #:use-module (gnu packages compression)) + +(define-public cvassistant + (package + (name "cvassistant") + (version "3.1.0") + (source (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/cvassistant/" + "cvassistant-" version "-src.tar.bz2")) + (sha256 + (base32 + "1y2680bazyiwm50gdhdd4982ckbjscrkbw2mngyk7yw708iadvr7")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'remove-donation-banner + ;; Remove dialog box with a donation link, as suggested by + ;; the INSTALL file. + (lambda _ + (substitute* "controllers/mainwindow.cpp" + (("//(#define NO_DONATION_PROMPT)" _ line) line)) + #t)) + (add-after 'unpack 'fix-quazip-directory + (lambda _ + (substitute* "models/resumedocument.h" + (("quazip(/quazipfile\\.h)" _ suffix) + (string-append "quazip5" suffix))) + #t)) + (add-after 'fix-quazip-directory 'fix-quazip-link + (lambda _ + (substitute* "CVAssistant.pro" + (("lquazip-qt5") + "lquazip5")) + #t)) + (add-after 'fix-quazip-directory 'fix-install-root + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (substitute* "CVAssistant.pro" + (("/usr/(bin|share/)" _ suffix) + (string-append out "/" suffix))) + #t))) + (replace 'configure + (lambda _ (invoke "qmake")))))) + (inputs + `(("qtbase" ,qtbase) + ("quazip" ,quazip) + ("zlib" ,zlib))) + (home-page "https://cvassistant.sourceforge.io/") + (synopsis "Job application organizer") + (description "Whether you're looking for a job or trying to help + a friend to find one, CVAssistant is a tool for you. It helps you by + preparing resumes and cover letters and organizing your job + application process. It: + @itemize + @item Stores all your skills and experiences. + @item Creates resumes tailored for each job you apply. + @item Creates cover letters summarized to match each job + advertisement. + @item Keeps a history of job applications so you are ready when you + receive a phone call. + @item Writes resumes in your language. All languages are supported! + @end itemize") + (license license:gpl3+))) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 6ced8ac184..333a88b8c7 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -2101,20 +2101,19 @@ for ODBC.") (define-public python-pyodbc (package (name "python-pyodbc") - (version "4.0.26") + (version "4.0.27") (source (origin (method url-fetch) (uri (pypi-uri "pyodbc" version)) (sha256 - (base32 "1qrxnf7ji5hml7z4y669k4wmk3iz2pcsr05bnn1n912asash09z5")) + (base32 "1kd2i7hc1330cli72vawzby17c3039cqn1aba4i0zrjnpghjhmib")) (file-name (string-append name "-" version ".tar.gz")))) (build-system python-build-system) (inputs `(("unixodbc" ,unixodbc))) (arguments - `(;; No unit tests exist. - #:tests? #f)) + `(#:tests? #f)) ; no unit tests exist (home-page "https://github.com/mkleehammer/pyodbc") (synopsis "Python ODBC Library") (description "@code{python-pyodbc} provides a Python DB-API driver @@ -2729,13 +2728,13 @@ reasonable substitute.") (define-public python-redis (package (name "python-redis") - (version "3.2.1") + (version "3.3.8") (source (origin (method url-fetch) (uri (pypi-uri "redis" version)) (sha256 - (base32 "0wwj8il4c3aff15xwwcjfci367zxsakq05ps1a2il6yavp91i94c")))) + (base32 "0fyxzqax7lcwzwhvnz0i0q6v62hxyv1mv52ywx3bpff9a2vjz8lq")))) (build-system python-build-system) ;; Tests require a running Redis server. (arguments '(#:tests? #f)) diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index 187ef74b4e..cf53142533 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -760,7 +760,7 @@ LVM D-Bus API).") (define-public rmlint (package (name "rmlint") - (version "2.8.0") + (version "2.9.0") (source (origin (method git-fetch) (uri (git-reference @@ -769,7 +769,7 @@ LVM D-Bus API).") (file-name (git-file-name name version)) (sha256 (base32 - "1gc7gbnh0qg1kl151cv1ld87vhpm1v3pnkn7prhscdcc21jrg8nz")))) + "1b5cziam14h80xrfb285fmfrzz2rligxcpsq1xsig14xf4l2875i")))) (build-system scons-build-system) (arguments `(#:scons ,scons-python2 diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index b4d5a9ab27..ae2e5cf8fa 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -109,7 +109,7 @@ and BOOTP/TFTP for network booting of diskless machines.") (define-public isc-bind (package (name "bind") - (version "9.14.4") + (version "9.14.5") (source (origin (method url-fetch) (uri (string-append @@ -117,7 +117,7 @@ and BOOTP/TFTP for network booting of diskless machines.") "/bind-" version ".tar.gz")) (sha256 (base32 - "0gxqws7ml15lwkjw9mdcd759gv5kk3s9m17j3vrp9448ls1gnbii")))) + "0ic0k0kpavwnbyf10rwx6yypxg66f65fprwc0dbmp61xp0n6gl0j")))) (build-system gnu-build-system) (outputs `("out" "utils")) (inputs @@ -303,14 +303,14 @@ asynchronous fashion.") (define-public nsd (package (name "nsd") - (version "4.2.0") + (version "4.2.2") (source (origin (method url-fetch) (uri (string-append "https://www.nlnetlabs.nl/downloads/nsd/nsd-" version ".tar.gz")) (sha256 - (base32 "0k57xl3ybdnqjqw9a3dmi7l6qmhkiic6wsghkz08ir809aj1rpsi")))) + (base32 "1ys608jyp5scc957q4brm094c97sxlwymina7d2nvzi51aa37cw3")))) (build-system gnu-build-system) (arguments `(#:configure-flags diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index 0bb9c099fb..440746a28c 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -480,3 +480,43 @@ use the computer and at the same time teach them a little math, letters of the alphabet, spelling, eye-hand coordination, etc.") (home-page "http://www.schoolsplay.org") (license license:gpl3+))) + +(define-public fet + (package + (name "fet") + (version "5.39.0") + (source (origin + (method url-fetch) + (uri (string-append "https://www.lalescu.ro/liviu/fet/download/" + "fet-" version ".tar.bz2")) + (sha256 + (base32 + "100bmggkychqs2cavqxy7015lr4icw6k99qb03im0v4jasqqmyix")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-hardcoded-directories + (lambda* (#:key outputs #:allow-other-keys) + (substitute* (list "fet.pro" + "src/src.pro" + "src/src-cl.pro" + "src/interface/fet.cpp") + (("/usr") (assoc-ref outputs "out"))) + #t)) + (replace 'configure + (lambda _ (invoke "qmake" "fet.pro")))))) + (inputs + `(("qtbase" ,qtbase))) + (home-page "https://www.lalescu.ro/liviu/fet/") + (synopsis "Timetabling software") + (description "FET is a program for automatically scheduling the +timetable of a school, high-school or university. It uses a fast and +efficient timetabling algorithm. + +Usually, FET is able to solve a complicated timetable in maximum 5-20 +minutes. For simpler timetables, it may take a shorter time, under +5 minutes (in some cases, a matter of seconds). For extremely +difficult timetables, it may take a longer time, a matter of hours.") + (license license:agpl3+))) + diff --git a/gnu/packages/elm.scm b/gnu/packages/elm.scm new file mode 100644 index 0000000000..8b5ec36621 --- /dev/null +++ b/gnu/packages/elm.scm @@ -0,0 +1,81 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2019 Robert Vollmert <rob@vllmrt.net> +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. + +(define-module (gnu packages elm) + #:use-module (gnu packages) + #:use-module (gnu packages haskell) + #:use-module (gnu packages haskell-check) + #:use-module (gnu packages haskell-crypto) + #:use-module (gnu packages haskell-xyz) + #:use-module (gnu packages haskell-web) + #:use-module (guix build-system haskell) + #:use-module (guix git-download) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages)) + +;; The full elm build calls out to itself via Template Haskell to +;; compile the elm reactor web app. elm reactor isn't required to +;; compile elm applications, so we take this part out of this +;; bootstrap package. +(define-public elm-compiler + (package + (name "elm-compiler") + (version "0.19.0") + (source + (origin + (method git-fetch) + (file-name (git-file-name name version)) + (uri (git-reference + (url "https://github.com/elm/compiler/") + (commit version))) + (sha256 + (base32 "0s93z9vr0vp5w894ghc5s34nsq09sg1msf59zfiba87sid5vgjqy")) + (patches + (search-patches "elm-compiler-disable-reactor.patch" + "elm-compiler-relax-glsl-bound.patch" + "elm-compiler-fix-map-key.patch")))) + (build-system haskell-build-system) + (inputs + `(("ghc-ansi-terminal" ,ghc-ansi-terminal) + ("ghc-ansi-wl-pprint" ,ghc-ansi-wl-pprint) + ("ghc-edit-distance" ,ghc-edit-distance) + ("ghc-file-embed" ,ghc-file-embed) + ("ghc-http" ,ghc-http) + ("ghc-http-client" ,ghc-http-client) + ("ghc-http-client-tls" ,ghc-http-client-tls) + ("ghc-http-types" ,ghc-http-types) + ("ghc-language-glsl" ,ghc-language-glsl) + ("ghc-logict" ,ghc-logict) + ("ghc-network" ,ghc-network) + ("ghc-raw-strings-qq" ,ghc-raw-strings-qq) + ("ghc-scientific" ,ghc-scientific) + ("ghc-sha" ,ghc-sha) + ("ghc-snap-core" ,ghc-snap-core) + ("ghc-snap-server" ,ghc-snap-server) + ("ghc-unordered-containers" + ,ghc-unordered-containers) + ("ghc-utf8-string" ,ghc-utf8-string) + ("ghc-vector" ,ghc-vector) + ("ghc-zip-archive" ,ghc-zip-archive))) + (home-page "https://elm-lang.org") + (synopsis "Programming language for Web applications") + (description + "This package provides Elm, a statically-typed functional programming +language for the browser. It includes commands for developers such as +@command{elm make} and @command{elm repl}.") + (license license:bsd-3))) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 6e612cab56..c5d667a7aa 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -40,7 +40,7 @@ ;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr> ;;; Copyright © 2018 Alex Branham <alex.branham@gmail.com> ;;; Copyright © 2018 Thorsten Wilms <t_w_@freenet.de> -;;; Copyright © 2018 Pierre Langlois <pierre.langlois@gmx.com> +;;; Copyright © 2018, 2019 Pierre Langlois <pierre.langlois@gmx.com> ;;; Copyright © 2018, 2019 Brett Gilio <brettg@posteo.net> ;;; Copyright © 2019 Dimakakos Dimos <bendersteed@teknik.io> ;;; Copyright © 2019 Brian Leung <bkleung89@gmail.com> @@ -52,6 +52,7 @@ ;;; Copyright © 2019 Giacomo Leidi <goodoldpaul@autitici.org> ;;; Copyright © 2019 Jens Mølgaard <jens@zete.tk> ;;; Copyright © 2019 Amin Bandali <bandali@gnu.org> +;;; Copyright © 2019 Jelle Licht <jlicht@fsfe.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -904,6 +905,35 @@ skip set strings, which are arguments to @code{skip-chars-forward} and @code{skip-chars-backward}.") (license license:gpl3+))) +(define-public emacs-ample-regexps + (let ((commit "cbe91e148cac1ee8e223874dc956ed4cf607f046") + (revision "1")) + (package + (name "emacs-ample-regexps") + (version (git-version "0.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/immerrr/ample-regexps.el") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1mm4icrwx4mscp7kbbmlc34995r164dhrfczn5ybkyxjzzf76jn1")))) + (build-system emacs-build-system) + (native-inputs + `(("ert-runner" ,emacs-ert-runner))) + (arguments + `(#:tests? #t + #:test-command '("ert-runner" "-l" "ample-regexps"))) + (home-page "https://github.com/immerrr/ample-regexps.el") + (synopsis "Compose and reuse Emacs regexps") + (description + "This package allows common parts of regexps to be easily picked out +and reused.") + (license license:gpl3+)))) + (define-public emacs-reformatter (package (name "emacs-reformatter") @@ -2255,7 +2285,7 @@ display and behaviour is easily customisable.") (define-public emacs-git-timemachine (package (name "emacs-git-timemachine") - (version "4.10") + (version "4.11") (source (origin (method git-fetch) @@ -2265,7 +2295,7 @@ display and behaviour is easily customisable.") (file-name (git-file-name name version)) (sha256 (base32 - "08zsn3lsnnf01wkv5ls38jga02s5dnf0j3gigy4qd6im3j3d04m1")))) + "1pz4l1xnq6s67w5yq9107vm8dg7rqf8n9dmbn90jys97c722g70n")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-transient" ,emacs-transient))) @@ -2729,6 +2759,78 @@ naming style of a symbol. It supports different naming conventions such as: tables.") (license license:gpl2+))) +(define-public emacs-org-rich-yank + (package + (name "emacs-org-rich-yank") + (version "0.2.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/unhammer/org-rich-yank.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0gxb0fnh5gxjmld0hnk5hli0cvdd8gjd27m30bk2b80kwldxlq1z")))) + (build-system emacs-build-system) + (home-page "https://github.com/unhammer/org-rich-yank") + (synopsis "Automatically surround source code pasted into Org with +@code{#+BEGIN_SRC} blocks") + (description + "This package provides a utility function for Org buffers that makes a +@code{_SRC} block with the appropriate language annotation for code that has +been copied from an Emacs major mode.") + (license license:gpl2+))) + +(define-public emacs-ob-restclient + (let ((commit "53376667eeddb1388fd6c6976f3222e7c8adcd46")) + (package + (name "emacs-ob-restclient") + (version (git-version "0.02" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/alf/ob-restclient.el.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1djg53cp7y83gic2v71y6r5z76kwrbkp0r69hl25rs99dx6p89dy")))) + (propagated-inputs + `(("emacs-restclient" ,emacs-restclient))) + (build-system emacs-build-system) + (home-page "https://github.com/alf/ob-restclient.el") + (synopsis "Org-babel functionality for @code{restclient-mode}") + (description + "This package integrates @code{restclient-mode} with Org.") + (license license:gpl3+)))) + +(define-public emacs-org-now + (let ((commit "8f6b277a73f1c66e58ccb4b7f40d406851befc91")) + (package + (name "emacs-org-now") + (version (git-version "0.1-pre" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/alphapapa/org-now.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "117zzkryznznk6h4i1jqzdn888nl019xrgxm2gza0lndx8dxsg2c")))) + (propagated-inputs + `(("emacs-dash" ,emacs-dash))) + (build-system emacs-build-system) + (home-page "https://github.com/alphapapa/org-now") + (synopsis "Show current Org tasks in a sidebar") + (description + "This package provides commands to show Org headings in a sidebar +window while working on them. After defining one heading as the \"now\" +heading, other headings can be refiled to it with one command, and back to +their original location with another.") + (license license:gpl3+)))) + (define-public emacs-rich-minority (package (name "emacs-rich-minority") @@ -3460,6 +3562,55 @@ completion candidate when using the Company text completion framework.") a customizable list.") (license license:gpl3+)))) +(define-public emacs-phi-search + (let ((commit "9a089b8271cb1cff9640848850298c9ec855286c") + (revision "1")) + (package + (name "emacs-phi-search") + (version (git-version "20160630" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/zk-phi/phi-search.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1gr5plcbrfdc4pglfj905s89hf8x0kc083h30wcnd81bnw9jwz1x")))) + (build-system emacs-build-system) + (home-page "https://github.com/zk-phi/phi-search") + (synopsis "Interactive search compatible with @code{multiple-cursors}") + (description "This package can be used with @code{multiple-cursors} to +provide an incremental search that moves all fake cursors in sync.") + (license license:gpl2+)))) + +(define-public emacs-phi-search-mc + (let ((commit "7aa671910f766437089aec26c3aa7814222d1356") + (revision "1")) + (package + (name "emacs-phi-search-mc") + (version (git-version "2.2.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/knu/phi-search-mc.el.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0wr86ad0yl52im6b9z0b9pzmhcn39qg5m9878yfv1nbxliw40lcd")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-phi-search" ,emacs-phi-search) + ("emacs-multiple-cursors" ,emacs-multiple-cursors))) + (home-page "https://github.com/knu/phi-search-mc.el") + (synopsis "Extend @code{phi-search} with additional +@code{multiple-cursors} functionality") + (description "This package provides further integration between +@code{multiple-cursors} and @code{phi-search}, a package that allows for +interactive searches to move multiple fake cursors.") + (license license:bsd-2)))) + (define-public emacs-multiple-cursors (package (name "emacs-multiple-cursors") @@ -3754,7 +3905,7 @@ in @code{html-mode}.") (define-public emacs-slime (package (name "emacs-slime") - (version "2.23") + (version "2.24") (source (origin (method git-fetch) @@ -3763,7 +3914,7 @@ in @code{html-mode}.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0i637n0ragpbj39hqx65nx5k99xf0464c4w6w1qpzykm6z42grky")))) + (base32 "0js24x42m7b5iymb4rxz501dff19vav5pywnzv50b673rbkaaqvh")))) (build-system emacs-build-system) (native-inputs `(("texinfo" ,texinfo))) @@ -4487,6 +4638,29 @@ regardless of @code{highlight-symbol-idle-delay}. @code{highlight-symbol-query-replace} can be used to replace the symbol. ") (license license:gpl2+)))) +(define-public emacs-symbol-overlay + (let ((commit "e40a7c407f24158c45eaa5f54ed41f5e416a51dc") + (revision "1")) + (package + (name "emacs-symbol-overlay") + (version (git-version "4.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/wolray/symbol-overlay.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0ibz3392d3jw1l8006h9kf8s7bg6vl7jc92bmqc031a433009ic7")))) + (build-system emacs-build-system) + (home-page "https://github.com/wolray/symbol-overlay") + (synopsis "Highlight symbols and perform various search operations on them") + (description + "This package provides functions for highlighting and navigating +between symbols.") + (license license:gpl3+)))) + (define-public emacs-hl-todo (package (name "emacs-hl-todo") @@ -6101,20 +6275,20 @@ not tied in the trap of backward compatibility.") (define-public emacs-helm-swoop (package (name "emacs-helm-swoop") - (version "1.7.4") + (version "2.0.0") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/ShingoFukuyama/helm-swoop.git") + (url "https://github.com/emacsorphanage/helm-swoop.git") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0b23j1bkpg4pm310hqdhgnl4mxsj05gpl08b6kb2ja4fzrg6adsk")))) + (base32 "0k0ns92g45x8dbymqpl6ylk5mj3wiw2h03f48q5cy1z8in0c4rjd")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-helm" ,emacs-helm))) - (home-page "https://github.com/ShingoFukuyama/helm-swoop") + (home-page "https://github.com/emacsorphanage/helm-swoop") (synopsis "Filter and jump to lines in an Emacs buffer using Helm") (description "This package builds on the Helm interface to provide several commands @@ -6409,6 +6583,33 @@ used for reverse direction.") end of a line and increment or decrement it.") (license license:gpl3+)))) +(define-public emacs-evil-owl + (let ((commit "36a5fe057f44d48e377e3ef4f04b4eb30e1af309") + (revision "1")) + (package + (name "emacs-evil-owl") + (version (git-version "0.0.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mamapanda/evil-owl") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "07a6n0gqss1qx9a50dqzqqq0gj6n7a4ykbcv1a0c9qd4fnfnm90m")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-evil" ,emacs-evil) + ("emacs-posframe" ,emacs-posframe))) + (home-page "https://github.com/mamapanda/evil-owl") + (synopsis "Preview candidates when using Evil registers and marks") + (description + "This package supplements Evil's register- and mark-based commands with +a popup window for previewing candidates.") + (license license:gpl3+)))) + (define-public emacs-evil-exchange (let ((commit "47691537815150715e64e6f6ec79be7746c96120") (version "0.41") @@ -7133,6 +7334,60 @@ Additionally it can display the number of unread emails in the mode-line.") (license license:gpl3+))) +(define-public emacs-mu4e-jump-to-list + (let ((commit "358bba003543b49ffa266e503e54aebd0ebe614b") + (revision "1")) + (package + (name "emacs-mu4e-jump-to-list") + (version (git-version "1.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/wavexx/mu4e-jump-to-list.el.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "00y9nap61q1z2cdql4k9g7fgi2gdgd9iy5s5lzrd9a4agbx6r7sv")))) + (build-system emacs-build-system) + (propagated-inputs + `(("mu" ,mu))) + (home-page "https://gitlab.com/wavexx/mu4e-jump-to-list.el") + (synopsis "Select and view mailing lists in mu4e") + (description + "@code{mu4e-jump-to-list} allows you to select and view mailing lists +automatically using existing List-ID headers in your mu database. Just press +\"l\" in the headers view and any mailing list you've subscribed to will be +automatically discovered and presented in recency order.") + (license license:gpl3+)))) + +(define-public emacs-mu4e-patch + (let ((commit "522da46c1653b1cacc79cde91d6534da7ae9517d") + (revision "1")) + (package + (name "emacs-mu4e-patch") + (version (git-version "0.1.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/seanfarley/mu4e-patch") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "10lzf3b70pk6rzdrgx0ww0gc94v0ydh9zj1gbsa20xw27ds7hmfn")))) + (build-system emacs-build-system) + (propagated-inputs + `(("mu" ,mu))) + (home-page "https://github.com/seanfarley/mu4e-patch") + (synopsis "Colorize patch-like emails in mu4e") + (description + "Extension for mu4e to colorize patch-like emails with diff-mode. +This is based on Frank Terbeck's @code{gnus-article-treat-patch.el} but has +been adapted to work with mu4e.") + (license license:gpl3+)))) + (define-public emacs-pretty-mode (package (name "emacs-pretty-mode") @@ -7302,7 +7557,7 @@ above over the network.") (define-public emacs-helm-org-rifle (package (name "emacs-helm-org-rifle") - (version "1.6.1") + (version "1.7.0") (source (origin (method git-fetch) @@ -7312,12 +7567,13 @@ above over the network.") (file-name (git-file-name name version)) (sha256 (base32 - "1r38xhwvgbv6kn5x159phz3xgss7f1rc7icq27rnr4d8aj91wm6k")))) + "058zvh7cdall7dl3xay9ibcjvs13fbqp8fli3lz980pinmsds3r2")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-dash" ,emacs-dash) ("emacs-f" ,emacs-f) ("emacs-helm" ,emacs-helm) + ("emacs-org" ,emacs-org) ("emacs-s" ,emacs-s))) (home-page "https://github.com/alphapapa/helm-org-rifle") (synopsis "Rifle through Org files") @@ -9633,7 +9889,7 @@ Feautures: (define-public emacs-evil-matchit (package (name "emacs-evil-matchit") - (version "2.3.0") + (version "2.3.3") (source (origin (method git-fetch) @@ -9642,7 +9898,7 @@ Feautures: (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0y6q42hml7jgf060d83m7hf270h01858g5kxw12na9n4r4jjpdg1")))) + (base32 "04kllxd7vvziwqiff3vx60a0r6805wynsla73j8xkcz4yzk8q91r")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-evil" ,emacs-evil))) @@ -10051,6 +10307,61 @@ environment variables to be retrieved from the shell, so that Emacs will see the same values you get in a terminal.") (license license:gpl3+))) +(define-public emacs-frog-menu + (let ((commit "740bbc88b8535d31f783f3b2043a2a6683afbf31") + (revision "1")) + (package + (name "emacs-frog-menu") + (version (git-version "0.2.9" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/clemera/frog-menu") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1g77424jwq62qj06rvld44s5hp0dw8rw2pwmmag6gd536zf65xrj")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-posframe" ,emacs-posframe) + ("emacs-avy" ,emacs-avy))) + (home-page "https://github.com/clemera/frog-menu") + (synopsis "Quickly pick items from ad hoc menus") + (description + "This package provides a popup offering a preview of a list of +candidates on which user-defined dispatch actions can act.") + (license license:gpl3+)))) + +(define-public emacs-frog-jump-buffer + (let ((commit "2d7b342785ae27d45f5d252272df6eb773c78e20") + (revision "1")) + (package + (name "emacs-frog-jump-buffer") + (version (git-version "0.1.4" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/waymondo/frog-jump-buffer") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1z00by8hiss1r2lwmzrl8pnz6jykia2849dqqm4l3z5rf6lwvc0f")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-dash" ,emacs-dash) + ("emacs-frog-menu" ,emacs-frog-menu) + ("emacs-avy" ,emacs-avy))) + (home-page "https://github.com/waymondo/frog-jump-buffer") + (synopsis "Jump to any Emacs buffer with minimal keystrokes") + (description + "This package provides a preview window of buffers that can be switched +to with quicklink-style selections.") + (license license:gpl3+)))) + (define-public emacs-deft (package (name "emacs-deft") @@ -10724,6 +11035,31 @@ tables of contents.") files, allowing for actions to be performed based on search criteria.") (license license:gpl3+))) +(define-public emacs-org-auto-expand + (let ((commit "4938d5f6460e2f8f051ba9ac000b291bfa43ef62") + (revision "1")) + (package + (name "emacs-org-auto-expand") + (version (git-version "0.1" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/alphapapa/org-auto-expand") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1my0c6xmkh37lwi6l472lz9d86lf20h6xcllzlxm1lxa24rhva6v")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-org" ,emacs-org) + ("emacs-dash" ,emacs-dash))) + (home-page "https://github.com/alphapapa/org-auto-expand") + (synopsis "Automatically expand certain Org headings") + (description "This package allows a customizable set of headings in Org +files to be expanded upon opening them.") + (license license:gpl3+)))) + (define-public emacs-parsebib (package (name "emacs-parsebib") @@ -12421,12 +12757,11 @@ perform regression test for packages that provide font-lock rules.") (license license:gpl3+)))) (define-public emacs-racket-mode - (let ((commit "b977873e6128f8399432dcd60cc39f6a6f803d9c") - (revision "2")) + (let ((commit "5300aa004f08535c3fac99f1af78462f129aca81") + (revision "3")) (package (name "emacs-racket-mode") - (version (string-append "0.0.2" "-" revision "." - (string-take commit 7))) + (version (git-version "0.0.2" revision commit)) (source (origin (method git-fetch) @@ -12436,7 +12771,7 @@ perform regression test for packages that provide font-lock rules.") (file-name (git-file-name name version)) (sha256 (base32 - "0vp4bbbplqvmnhjpl6ajrlydmrhqzil56cfbs18m5c5fddx0zlh7")))) + "1gkpm4fl1ybsm9qqgrkwyjbd9znddy438x266k27fs90lkxrfray")))) (build-system emacs-build-system) (arguments `(#:include '("\\.el$" "\\.rkt$"))) @@ -13311,6 +13646,32 @@ integrating @code{iedit-mode} into Evil mode with an attempt at sensible defaults.") (license license:gpl3+))) +(define-public emacs-evil-mc + (let ((commit "5205fe671803465149e578849bbbe803c23a8e4e") + (revision "1")) + (package + (name "emacs-evil-mc") + (version (git-version "0.0.3" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/gabesoft/evil-mc.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "03pxpjjxbai4dwp84bgxh52ahh0f6ac58xi2mds1kl4v93nm7v42")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-evil" ,emacs-evil))) + (native-inputs + `(("emacs-espuds" ,emacs-espuds))) + (home-page "https://github.com/gabesoft/evil-mc") + (synopsis "Interactive search compatible with @code{multiple-cursors}") + (description "This package can be used with @code{multiple-cursors} to +provide an incremental search that moves all fake cursors in sync.") + (license license:expat)))) + (define-public emacs-evil-org (let ((commit "b6d652a9163d3430a9e0933a554bdbee5244bbf6")) (package @@ -14385,7 +14746,7 @@ buffers – other modes on the TODO list). (define-public emacs-magit-todos (package (name "emacs-magit-todos") - (version "1.3") + (version "1.4") (source (origin (method git-fetch) @@ -14395,7 +14756,7 @@ buffers – other modes on the TODO list). (file-name (git-file-name name version)) (sha256 (base32 - "0gfm6wn2a4v5i9lfsvvin0kwpr9n96ddm3z4yf50jd3kg2igzry1")))) + "09pjb4k409gc0h51vb5az1shx02c1hx8cnvhi529n7dm4maildg5")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-async" ,emacs-async) @@ -14771,7 +15132,7 @@ correctly.") (define-public emacs-helm-slime (package (name "emacs-helm-slime") - (version "0.3.0") + (version "0.4.0") (source (origin (method git-fetch) (uri (git-reference @@ -14780,7 +15141,7 @@ correctly.") (file-name (git-file-name name version)) (sha256 (base32 - "1qhb9446rpj17pm0hi3miy5gs5k3ld43bq29kzy0y26bf7ivfcjv")))) + "0mrpjhpijdrq353fnfvdj9l9xfsz390qlcvifcair9732ma7i8l0")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-helm" ,emacs-helm) @@ -14905,7 +15266,7 @@ RPC channels with users and other software.") (define-public emacs-sesman (package (name "emacs-sesman") - (version "0.3.3") + (version "0.3.4") (source (origin (method git-fetch) @@ -14915,10 +15276,18 @@ RPC channels with users and other software.") (file-name (git-file-name name version)) (sha256 (base32 - "0r32f8ma9ddczxrrdz0nadp14j3zmk10q1ch02gb82synkx3xdra")))) + "0z5jb4vpbjsi63w3wjy6d2lgz33qdfvrgfb3bszv4hcf6a96y7fc")))) (build-system emacs-build-system) (arguments - `(#:tests? #t + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'set-shell + ;; Setting the SHELL environment variable is required for the tests + ;; to find sh. + (lambda _ + (setenv "SHELL" (which "sh")) + #t))) + #:tests? #t #:test-command '("make" "test"))) (home-page "https://github.com/vspinu/sesman") (synopsis "Session manager for Emacs based IDEs") @@ -15815,12 +16184,11 @@ packages with a consistent way to use them.") (license license:gpl3+)))) (define-public emacs-undo-propose-el - (let ((commit "5f1fa99a04369a959aad01b476fe4f34229f28cd") - (version "1.0.0") + (let ((commit "21a5cdc8ebfe8113f7039867c4abb0197c0fe71c") (revision "1")) (package (name "emacs-undo-propose-el") - (version (git-version version revision commit)) + (version (git-version "3.0.0" revision commit)) (source (origin (method git-fetch) @@ -15830,7 +16198,7 @@ packages with a consistent way to use them.") (file-name (git-file-name name version)) (sha256 (base32 - "1p9h1fqmva07mcs46rqrg9vqn537b615as84s9b7xh76k1r8h1c0")))) + "035hav4lfxwgikg3zpb4cz1nf08qfp27awl87dqbm2ly6d74lpny")))) (build-system emacs-build-system) (home-page "https://github.com/jackkamm/undo-propose-el") (synopsis "Simple and safe navigation of @code{undo} history") @@ -16432,7 +16800,7 @@ previewed by scrolling up and down within a @code{dired} buffer.") (define-public emacs-counsel-etags (package (name "emacs-counsel-etags") - (version "1.8.7") + (version "1.8.9") (source (origin (method git-fetch) @@ -16442,7 +16810,7 @@ previewed by scrolling up and down within a @code{dired} buffer.") (file-name (git-file-name name version)) (sha256 (base32 - "0vjcjspfrz1csnmfi6r7p7f070a496adxkqnsxwx1gx8cpylwp1g")))) + "0rmdl93kgyydwa96yclds9vwly41bpk8v18cbqc1x266w6v77dr9")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-ivy" ,emacs-ivy))) @@ -17050,7 +17418,8 @@ connections using TLS encryption.") "0nnlxzsmhsbszqigcyxak9i1a0digrd13gv6v18ck4h760mihh1m")))) (build-system emacs-build-system) (propagated-inputs - `(("emacs-all-the-icons" ,emacs-all-the-icons))) + `(("emacs-flycheck" ,emacs-flycheck) + ("emacs-all-the-icons" ,emacs-all-the-icons))) (home-page "https://gitlab.petton.fr/nico/zerodark-theme") (synopsis @@ -17241,3 +17610,165 @@ federated microblogging social network.") Emacs. It's a re-write of the Insidious Big Brother Database (BBDB) using Emacs Lisp's (relatively new) EIEIO object oriented libraries.") (license license:gpl3+)))) + +(define-public emacs-refactor + (package + (name "emacs-refactor") + (version "0.4") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Wilfred/emacs-refactor.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1yky7vlv91501xb43xk19rr8mxlvrsxhawsc98jivf64nad5dqay")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-dash" ,emacs-dash) + ("emacs-s" ,emacs-s) + ("emacs-popup" ,emacs-popup) + ("emacs-list-utils" ,emacs-list-utils) + ("emacs-iedit" ,emacs-iedit))) + (home-page "https://github.com/Wilfred/emacs-refactor/") + (synopsis "Language-specific refactoring in Emacs") + (description "Emacs Refactor (EMR) is a framework for providing +language-specific refactoring in Emacs. It includes refactoring commands for +a variety of languages, including elisp itself.") + (license license:gpl3+))) + +(define-public emacs-flyspell-correct + (package + (name "emacs-flyspell-correct") + (version "0.5") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/d12frosted/flyspell-correct.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1r9hmz7sihhy7npv6nxp04sy57glzmfax5d67mwn96fdnc0yhlnd")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-helm" ,emacs-helm) + ("emacs-ivy" ,emacs-ivy) + ("emacs-popup" ,emacs-popup))) + (home-page + "https://github.com/d12frosted/flyspell-correct") + (synopsis + "Correcting words with flyspell via custom interfaces") + (description + "This package provides functionality for correcting words via custom +interfaces. Several interfaces are supported beside the classic ido: popup, +helm and ivy.") + (license license:gpl3+))) + +(define-public emacs-org-emms + (let ((commit "07a8917f3d628c32e5de1dbd118ac08203772533") + (revision "1")) + (package + (name "emacs-org-emms") + (version + (git-version "0.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/jagrg/org-emms.git") + (commit commit))) + (file-name (git-file-name name commit)) + (sha256 + (base32 + "1sqsm5sv311xfdk4f4rsnvprdf2v2vm7l1b3vqi7pc0g8adlnw1d")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emms" ,emacs-emms) + ("emacs-org" ,emacs-org))) + (home-page "https://gitlab.com/jagrg/org-emms") + (synopsis "Play multimedia files from org-mode") + (description + "This package provides a new org link type for playing back multimedia +files from org-mode using EMMS, The Emacs Multimedia System. If the link +contains a track position, playback will start at the specified position.") + (license license:gpl3+)))) + +(define-public emacs-org-jira + (package + (name "emacs-org-jira") + (version "4.3.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ahungry/org-jira.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1l80r2a9zzbfk2c78i40h0ww79vm9v4j6xi2h5i4w9kqh10rs6h2")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-request" ,emacs-request) + ("emacs-s" ,emacs-s) + ("emacs-dash" ,emacs-dash) + ("emacs-org" ,emacs-org))) + (home-page "https://github.com/ahungry/org-jira") + (synopsis "Syncing between Jira and Org-mode") + (description + "This package provides an extension to org-mode for syncing issues with +JIRA issue servers.") + (license license:gpl3+))) + +(define-public emacs-systemd-mode + (package + (name "emacs-systemd-mode") + (version "1.6") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/holomorph/systemd-mode.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0ylgnvpfindg4cxccbqy02ic7p0i9rygf1w16dm1filwhbqvjplq")))) + (build-system emacs-build-system) + (arguments '(#:include '("\\.el$" "\\.txt$"))) + (home-page "https://github.com/holomorph/systemd-mode") + (synopsis + "Major mode for editing systemd units") + (description + "Major mode for editing systemd units in GNU Emacs.") + (license license:gpl3+))) + +(define-public emacs-ssh-config-mode + (let ((commit "4c1dfa57d452cb5654453bf186c8ff63e1e71b56") + (revision "1")) + (package + (name "emacs-ssh-config-mode") + (version (git-version "8.0" revision commit)) + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/jhgorrell/ssh-config-mode-el.git") + (commit commit))) + (file-name (git-file-name name commit)) + (sha256 + (base32 + "0crglfdazzckizbwzmgl2rn6j85avfzkr1q7ijxd17rp2anvr9bd")))) + (build-system emacs-build-system) + (arguments '(#:include '("\\.el$" "\\.txt$"))) + (home-page + "https://github.com/jhgorrell/ssh-config-mode-el") + (synopsis + "Mode for fontification of ~/.ssh/config") + (description + "This packages fontifies the ssh config keywords and creates +keybindings for skipping from host section to host section.") + (license license:gpl3+)))) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 388611d1d8..930878dc58 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -485,16 +485,17 @@ and Game Boy Color games.") (delete 'configure) ;; Makefile is in a subdirectory. (add-before - 'build 'cd-to-project-dir + 'build 'chdir-to-project-directory (lambda _ - (chdir "projects/unix")))) + (chdir "projects/unix") + #t))) #:make-flags (let ((out (assoc-ref %outputs "out"))) (list "all" (string-append "PREFIX=" out))) ;; There are no tests. #:tests? #f)) ;; As per the Makefile (in projects/unix/Makefile): (supported-systems '("i686-linux" "x86_64-linux")) - (home-page "http://www.mupen64plus.org/") + (home-page "https://www.mupen64plus.org/") (synopsis "Nintendo 64 emulator core library") (description "Mupen64Plus is a cross-platform plugin-based Nintendo 64 (N64) emulator @@ -540,7 +541,7 @@ core library.") (string-append "APIDIR=" m64p "/include/mupen64plus"))) ;; There are no tests. #:tests? #f)) - (home-page "http://www.mupen64plus.org/") + (home-page "https://www.mupen64plus.org/") (synopsis "Mupen64Plus SDL input plugin") (description "Mupen64Plus is a cross-platform plugin-based Nintendo 64 (N64) emulator @@ -585,7 +586,7 @@ SDL audio plugin.") (string-append "APIDIR=" m64p "/include/mupen64plus"))) ;; There are no tests. #:tests? #f)) - (home-page "http://www.mupen64plus.org/") + (home-page "https://www.mupen64plus.org/") (synopsis "Mupen64Plus SDL input plugin") (description "Mupen64Plus is a cross-platform plugin-based Nintendo 64 (N64) emulator @@ -627,7 +628,7 @@ SDL input plugin.") (string-append "APIDIR=" m64p "/include/mupen64plus"))) ;; There are no tests. #:tests? #f)) - (home-page "http://www.mupen64plus.org/") + (home-page "https://www.mupen64plus.org/") (synopsis "Mupen64Plus SDL input plugin") (description "Mupen64Plus is a cross-platform plugin-based Nintendo 64 (N64) emulator @@ -669,7 +670,7 @@ high-level emulation (HLE) RSP processor plugin.") (string-append "APIDIR=" m64p "/include/mupen64plus"))) ;; There are no tests. #:tests? #f)) - (home-page "http://www.mupen64plus.org/") + (home-page "https://www.mupen64plus.org/") (synopsis "Mupen64Plus SDL input plugin") (description "Mupen64Plus is a cross-platform plugin-based Nintendo 64 (N64) emulator @@ -715,7 +716,7 @@ Z64 RSP processor plugin.") (string-append "APIDIR=" m64p "/include/mupen64plus"))) ;; There are no tests. #:tests? #f)) - (home-page "http://www.mupen64plus.org/") + (home-page "https://www.mupen64plus.org/") (synopsis "Mupen64Plus Rice Video plugin") (description "Mupen64Plus is a cross-platform plugin-based Nintendo 64 (N64) emulator @@ -769,7 +770,7 @@ Arachnoid video plugin.") (string-append "APIDIR=" m64p "/include/mupen64plus"))) ;; There are no tests. #:tests? #f)) - (home-page "http://www.mupen64plus.org/") + (home-page "https://www.mupen64plus.org/") (synopsis "Mupen64Plus Rice Video plugin") (description "Mupen64Plus is a cross-platform plugin-based Nintendo 64 (N64) emulator @@ -819,7 +820,7 @@ Glide64 video plugin.") (string-append "APIDIR=" m64p "/include/mupen64plus"))) ;; There are no tests. #:tests? #f)) - (home-page "http://www.mupen64plus.org/") + (home-page "https://www.mupen64plus.org/") (synopsis "Mupen64Plus Rice Video plugin") (description "Mupen64Plus is a cross-platform plugin-based Nintendo 64 (N64) emulator @@ -867,7 +868,7 @@ Glide64MK2 video plugin.") (string-append "APIDIR=" m64p "/include/mupen64plus"))) ;; There are no tests. #:tests? #f)) - (home-page "http://www.mupen64plus.org/") + (home-page "https://www.mupen64plus.org/") (synopsis "Mupen64Plus Rice Video plugin") (description "Mupen64Plus is a cross-platform plugin-based Nintendo 64 (N64) emulator @@ -922,7 +923,7 @@ Rice Video plugin.") (string-append "APIDIR=" m64p "/include/mupen64plus"))) ;; There are no tests. #:tests? #f)) - (home-page "http://www.mupen64plus.org/") + (home-page "https://www.mupen64plus.org/") (synopsis "Mupen64Plus Z64 video plugin") (description "Mupen64Plus is a cross-platform plugin-based Nintendo 64 (N64) emulator @@ -986,8 +987,8 @@ Z64 video plugin.") (string-append "COREDIR=" m64p "/lib/"))) ;; There are no tests. #:tests? #f)) - (home-page "http://www.mupen64plus.org/") - (synopsis "Mupen64Plus SDL input plugin") + (home-page "https://www.mupen64plus.org/") + (synopsis "Mupen64Plus command line user interface") (description "Mupen64Plus is a cross-platform plugin-based Nintendo 64 (N64) emulator which is capable of accurately playing many games. This package contains the @@ -1049,7 +1050,7 @@ emulation community. It provides highly accurate emulation.") (define-public retroarch (package (name "retroarch") - (version "1.7.7") + (version "1.7.8") (source (origin (method git-fetch) @@ -1058,7 +1059,7 @@ emulation community. It provides highly accurate emulation.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "026720z0vpiwr4da7l2x2yinns09fmg6yxsib203xwnixj399azi")))) + (base32 "0xxd9nhqiclpkdd9crymvba37fl0xs5mikwhya68nfzcgar7w480")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no tests @@ -1080,8 +1081,7 @@ emulation community. It provides highly accurate emulation.") (("/bin/true") (which "true"))) ;; Use shared zlib. (substitute* '("libretro-common/file/archive_file_zlib.c" - "libretro-common/streams/trans_stream_zlib.c" - "network/httpserver/httpserver.c") + "libretro-common/streams/trans_stream_zlib.c") (("<compat/zlib.h>") "<zlib.h>")) ;; The configure script does not yet accept the extra arguments ;; (like ‘CONFIG_SHELL=’) passed by the default configure phase. diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index 90aa48c23c..c28968e649 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -65,7 +65,7 @@ (define-public efl (package (name "efl") - (version "1.22.2") + (version "1.22.3") (source (origin (method url-fetch) (uri (string-append @@ -73,7 +73,7 @@ version ".tar.xz")) (sha256 (base32 - "1l0wdgzxqm2y919277b1p9d37xzg808zwxxaw0nn44arh8gqk68n")))) + "1j1i8cwq4ym9z34ikv35mdmv5q7q69hdp494mc6l03g9n6cl2yky")))) (outputs '("out" ; 53 MB "include")) ; 21 MB (build-system gnu-build-system) @@ -242,7 +242,7 @@ contents and more.") (define-public rage (package (name "rage") - (version "0.3.0") + (version "0.3.1") (source (origin (method url-fetch) (uri @@ -251,7 +251,7 @@ contents and more.") version ".tar.xz")) (sha256 (base32 - "0gfzdd4jg78bkmj61yg49w7bzspl5m1nh6agqgs8k7qrq9q26xqy")))) + "04fdk23bbgvni212zrfy4ndg7vmshbsjgicrhckdvhay87pk9i75")))) (build-system meson-build-system) (arguments '(#:phases diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 7bfe5e62ff..377cb3a405 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -445,7 +445,7 @@ other machines/servers. Electroncash does not download the Bitcoin Cash blockch ;; the system's dynamically linked library. (package (name "monero") - (version "0.14.1.0") + (version "0.14.1.2") (source (origin (method git-fetch) @@ -466,7 +466,7 @@ other machines/servers. Electroncash does not download the Bitcoin Cash blockch #t)) (sha256 (base32 - "1asa197fad81jfv12qgaa7y7pdr1r1pda96m9pvivkh4v30cx0nh")))) + "00zl883c7lcd9z7g4y3vv7rxmr7ppzrxdblnhk32r9l3qzyw55r6")))) (build-system cmake-build-system) (native-inputs `(("doxygen" ,doxygen) @@ -508,6 +508,11 @@ other machines/servers. Electroncash does not download the Bitcoin Cash blockch (("return \\(") "return ((std::string(getenv(\"HOME\"))) / ")) #t)) + (add-after 'change-log-path 'fix-file-permissions-for-tests + (lambda _ + (for-each make-file-writable + (find-files "tests/data/" "wallet_9svHk1.*")) + #t)) ;; Only try tests that don't need access to network or system (replace 'check (lambda _ @@ -522,11 +527,6 @@ other machines/servers. Electroncash does not download the Bitcoin Cash blockch "DNSResolver.DNSSECSuccess" "DNSResolver.DNSSECFailure" "DNSResolver.GetTXTRecord" - ;; TODO: Find why portability_wallet test fails - ;; Maybe the Boost version used to create the test - ;; wallet and the current Boost version are not - ;; completely compatible? - "Serialization.portability_wallet" "is_hdd.linux_os_root") ":"))) (invoke "tests/unit_tests/unit_tests" @@ -1111,3 +1111,31 @@ information.") (description "This allows a Trezor hardware wallet to communicate to the Trezor wallet.") (license license:lgpl3+))) + +(define-public bitcoin-abc + (package + (inherit bitcoin-core) + (name "bitcoin-abc") + (version "0.19.8") + (source (origin + (method url-fetch) + (uri (string-append "https://download.bitcoinabc.org/" + version "/linux/src/bitcoin-abc-" + version ".tar.gz")) + (sha256 + (base32 + "0ndvkxv5m8346bdhfqzgdiz1k9wyjycj05jp7daf9pml3cw79sz5")))) + (home-page "https://www.bitcoinabc.org/") + (synopsis "Bitcoin ABC peer-to-peer full node for the Bitcoin Cash protocol") + (description + "Bitcoin Cash brings sound money to the world, fulfilling the original +promise of Bitcoin as Peer-to-Peer Electronic Cash. Merchants and users are +empowered with low fees and reliable confirmations is a digital currency that +enables instant payments to anyone anywhere in the world. It uses +peer-to-peer technology to operate without central authority: managing +transactions and issuing money are carried out collectively by the network. +As a fork it implemented changes lowering the time between blocks and now +offers confimations after less than 5 seconds and have significantly lower +fees that BTC. Bitcoin ABC is the reference implementation of the Bitcoin +Cash protocol. This package provides the Bitcoin Cash command line client and +a client based on Qt. This is a fork of Bitcoin Core."))) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 2dc1df45c8..1e28191ae1 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -26,6 +26,7 @@ ;;; Copyright © 2019 Jens Mølgaard <jens@zete.tk> ;;; Copyright © 2019 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2019 Baptiste Strazzulla <bstrazzull@hotmail.fr> +;;; Copyright © 2019 Alva <alva@skogen.is> ;;; ;;; This file is part of GNU Guix. ;;; @@ -63,7 +64,7 @@ (define-public font-ibm-plex (package (name "font-ibm-plex") - (version "1.0.1") + (version "2.0.0") (source (origin (method url-fetch) (uri (string-append @@ -71,7 +72,7 @@ "v" version "/OpenType.zip")) (sha256 (base32 - "0nzxw9z6waixslam248yr26ci3fbk83c7jf6m90hncnaj6zxx795")))) + "1lv65z3qnqgh2w36daf5wyz0ma9rg1qj9s9lzlnva8l7q3h8c9b8")))) (build-system font-build-system) (home-page "https://github.com/IBM/plex") (synopsis "IBM Plex typeface") diff --git a/gnu/packages/fpga.scm b/gnu/packages/fpga.scm index 7b661d39ac..b4f259bf3a 100644 --- a/gnu/packages/fpga.scm +++ b/gnu/packages/fpga.scm @@ -85,20 +85,20 @@ formal verification.") (define-public iverilog (package (name "iverilog") - (version "10.2") + (version "10.3") (source (origin (method url-fetch) (uri (string-append "ftp://ftp.icarus.com/pub/eda/verilog/v10/" "verilog-" version ".tar.gz")) (sha256 - (base32 - "0075x5nsxwkrgn7b3635il9kw7mslckaji518pdmwdrdn7fxppln")))) + (base32 + "1vv88ckvfwq7mrysyjnilsrcrzm9d173kp9w5ivwh6rdw7klbgc6")))) (build-system gnu-build-system) (native-inputs `(("flex" ,flex) ("bison" ,bison) - ("ghostscript" ,ghostscript))) ; ps2pdf + ("ghostscript" ,ghostscript))) ; ps2pdf (home-page "http://iverilog.icarus.com/") (synopsis "FPGA Verilog simulation and synthesis tool") (description "Icarus Verilog is a Verilog simulation and synthesis tool. diff --git a/gnu/packages/freeipmi.scm b/gnu/packages/freeipmi.scm index 5f1931e7fe..57fe527cbe 100644 --- a/gnu/packages/freeipmi.scm +++ b/gnu/packages/freeipmi.scm @@ -28,14 +28,14 @@ (define-public freeipmi (package (name "freeipmi") - (version "1.6.3") + (version "1.6.4") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/freeipmi/freeipmi-" version ".tar.gz")) (sha256 (base32 - "1sg12ycig2g5yv9l3vx25wsjmz7ybnrsvji0vs51yjmclwsygm5a")))) + "0g0s4iwx0ng4rv7hp5cc3kkx4drahsc89981gwjblf04lfavppv5")))) (build-system gnu-build-system) (inputs `(("libgcrypt" ,libgcrypt))) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index c37364e369..870becc50b 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -1383,7 +1383,7 @@ that beneath its ruins lay buried an ancient evil.") (define-public angband (package (name "angband") - (version "4.1.3") + (version "4.2.0") (source (origin (method url-fetch) @@ -1392,7 +1392,7 @@ that beneath its ruins lay buried an ancient evil.") "/angband-" version ".tar.gz")) (sha256 (base32 - "0vs0314lbdc6rzxn4jnb7zp6n1p1cdb8r53savadn7k9vbwc80ll")) + "0vdm1ymm28wawp94nl1p5q3lhc0k7cnn2kkvvrkfx962gif4kqfk")) (modules '((guix build utils))) (snippet ;; So, some of the sounds/graphics/tilesets are under different @@ -1406,7 +1406,7 @@ that beneath its ruins lay buried an ancient evil.") (delete-file-recursively lib-subdir))) '("fonts" "icons" "sounds" "tiles")) (substitute* "lib/Makefile" - ;; And don't try to invoke makefiles in the directories we removed + ;; And don't try to invoke makefiles in the directories we removed. (("gamedata customize help screens fonts tiles sounds icons user") "gamedata customize help screens user")) #t)))) @@ -2337,15 +2337,15 @@ on the screen and keyboard to display letters.") (define-public manaplus (package (name "manaplus") - (version "1.7.6.10") + (version "1.9.3.23") (source (origin (method url-fetch) (uri (string-append - "http://repo.manaplus.org/manaplus/download/" + "https://repo.manaplus.org/manaplus/download/" version "/manaplus-" version ".tar.xz")) (sha256 (base32 - "0l7swvpzq20am4w2rsjpp6fsvbjv07il6wbfy45a7h9zsdihmqhl")))) + "1ky182p4svwdqm6cf7jbns85hidkhkhq4s17cs2p381f0klapfjz")))) (build-system gnu-build-system) (arguments '(#:configure-flags @@ -2360,7 +2360,7 @@ on the screen and keyboard to display letters.") ("libxml2" ,libxml2) ("mesa" ,mesa) ("sdl-union" ,(sdl-union)))) - (home-page "http://manaplus.org") + (home-page "https://manaplus.org") (synopsis "Client for 'The Mana World' and similar games") (description "ManaPlus is a 2D MMORPG client for game servers. It is the only diff --git a/gnu/packages/genealogy.scm b/gnu/packages/genealogy.scm index 2db3fdb918..ec9d99400f 100644 --- a/gnu/packages/genealogy.scm +++ b/gnu/packages/genealogy.scm @@ -38,7 +38,7 @@ (define-public gramps (package (name "gramps") - (version "5.0.1") + (version "5.0.2") (source (origin (method git-fetch) @@ -48,7 +48,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "1jz1fbjj6byndvir7qxzhd2ryirrd5h2kwndxpp53xdc05z1i8g7")))) + "0wg743q8ixy5dmwricgkl4zck4109vq5ppmkyi18qjmna9m0aq7r")))) (build-system python-build-system) (native-inputs `(("gettext" ,gettext-minimal) diff --git a/gnu/packages/ghostscript.scm b/gnu/packages/ghostscript.scm index 53a9b60fdb..139682b5d0 100644 --- a/gnu/packages/ghostscript.scm +++ b/gnu/packages/ghostscript.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2013 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2014, 2015, 2016, 2017 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net> -;;; Copyright © 2013, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2013, 2015, 2016, 2017, 2019 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2017 Alex Vong <alexvong1995@gmail.com> ;;; Copyright © 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2017 Leo Famulari <leo@famulari.name> @@ -145,6 +145,12 @@ printing, and psresize, for adjusting page sizes.") (package (name "ghostscript") (version "9.26") + + ;; The problems addressed by GHOSTSCRIPT/FIXED are not security-related, + ;; but they have a significant impact on usability, hence this graft. + ;; TODO: Ungraft on next update cycle. + (replacement ghostscript/fixed) + (source (origin (method url-fetch) @@ -269,6 +275,25 @@ output file formats and printers.") (home-page "https://www.ghostscript.com/") (license license:agpl3+))) +(define-public ghostscript/fixed + ;; This adds the Freetype dependency (among other things), which fixes the + ;; rendering issues described in <https://issues.guix.gnu.org/issue/34877>. + (package/inherit + ghostscript + (arguments + (substitute-keyword-arguments (package-arguments ghostscript) + ((#:configure-flags flags ''()) + `(append (list "--disable-compile-inits" + (string-append "--with-fontpath=" + (assoc-ref %build-inputs "gs-fonts") + "/share/fonts/type1/ghostscript")) + ,flags)))) + (native-inputs `(("pkg-config" ,pkg-config) ;needed for freetype + ,@(package-native-inputs ghostscript))) + (inputs `(("gs-fonts" ,gs-fonts) + ("fontconfig" ,fontconfig) + ,@(package-inputs ghostscript))))) + (define-public ghostscript/x (package/inherit ghostscript (name (string-append (package-name ghostscript) "-with-x")) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index da6cbf2a05..6ef6fdfc42 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5967,7 +5967,10 @@ devices using the GNOME desktop.") (arguments '(#:glib-or-gtk? #t #:configure-flags - (list "-Dcheese=false") + (list "-Dcheese=false" + (string-append "-Dgnome_session_libexecdir=" + (assoc-ref %build-inputs "gnome-session") + "/libexec")) #:phases (modify-phases %standard-phases (add-before 'configure 'patch-paths @@ -5975,7 +5978,8 @@ devices using the GNOME desktop.") (let ((libc (assoc-ref inputs "libc")) (tzdata (assoc-ref inputs "tzdata")) (libgnomekbd (assoc-ref inputs "libgnomekbd")) - (nm-applet (assoc-ref inputs "network-manager-applet"))) + (nm-applet (assoc-ref inputs "network-manager-applet")) + (gnome-desktop (assoc-ref inputs "gnome-desktop"))) (substitute* "panels/datetime/tz.h" (("/usr/share/zoneinfo/zone.tab") (string-append tzdata "/share/zoneinfo/zone.tab"))) @@ -5995,6 +5999,10 @@ devices using the GNOME desktop.") (substitute* '("panels/user-accounts/run-passwd.c") (("/usr/bin/passwd") "/run/setuid-programs/passwd")) + (substitute* "panels/info/cc-info-overview-panel.c" + (("DATADIR \"/gnome/gnome-version.xml\"") + (string-append "\"" gnome-desktop + "/share/gnome/gnome-version.xml\""))) #t)))))) (native-inputs `(("glib:bin" ,glib "bin") ; for glib-mkenums, etc. @@ -6014,6 +6022,7 @@ devices using the GNOME desktop.") ("gnome-desktop" ,gnome-desktop) ("gnome-online-accounts" ,gnome-online-accounts) ("gnome-online-accounts:lib" ,gnome-online-accounts "lib") + ("gnome-session" ,gnome-session) ("gnome-settings-daemon" ,gnome-settings-daemon) ("grilo" ,grilo) ("ibus" ,ibus) @@ -8042,7 +8051,7 @@ hexadecimal or ASCII. It is useful for editing binary files in general.") (define-public libdazzle (package (name "libdazzle") - (version "3.28.5") + (version "3.33.90") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/libdazzle/" @@ -8050,17 +8059,11 @@ hexadecimal or ASCII. It is useful for editing binary files in general.") "libdazzle-" version ".tar.xz")) (sha256 (base32 - "08qdwv2flywnh6kibkyv0pnm67pk8xlmjh4yqx6hf13hyhkxkqgg")))) + "189m7q88d1a7bq0yyal9f3yhm9kz46lb61379nn4wsnnhpa1d0qs")))) (build-system meson-build-system) (arguments `(#:phases (modify-phases %standard-phases - (add-after 'unpack 'disable-failing-test - (lambda _ - ;; Disable failing test. - (substitute* "tests/meson.build" - (("test\\('test-application") "#")) - #t)) (add-before 'check 'pre-check (lambda _ ;; Tests require a running X server. @@ -8283,3 +8286,35 @@ advanced image management tool") (description "The aim of the handy library is to help with developing user intefaces for mobile devices using GTK+.") (license license:lgpl2.1+))) + +(define-public libgit2-glib + (package + (name "libgit2-glib") + (version "0.28.0.1") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0a0g7aw66rfgnqr4z7fgbk5zzcjq66m4rp8v4val3a212941h0g7")))) + (build-system meson-build-system) + (native-inputs + `(("glib:bin" ,glib "bin") ;; For glib-mkenums + ("gobject-introspection" ,gobject-introspection) + ("intltool" ,intltool) + ("libssh2" ,libssh2) + ("pkg-config" ,pkg-config) + ("python-pygobject" ,python-pygobject) + ("python-wrapper" ,python-wrapper) + ("vala" ,vala))) + (inputs + `(("glib" ,glib) + ("libgit2" ,libgit2))) + (synopsis "GLib wrapper around the libgit2 Git access library") + (description "libgit2-glib is a GLib wrapper library around the libgit2 Git +access library. It only implements the core plumbing functions, not really the +higher level porcelain stuff.") + (home-page "https://wiki.gnome.org/Projects/Libgit2-glib") + (license license:gpl2+))) diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index 2653645c5d..2d82f47d99 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -75,7 +75,8 @@ version ".tar.gz")) (sha256 (base32 - "1zz2zvikvfibxnk1va3kgzs7djsmiqy7bmk8y01vbsf54ryjb3zh")))) + "1zz2zvikvfibxnk1va3kgzs7djsmiqy7bmk8y01vbsf54ryjb3zh")) + (patches (search-patches "libextractor-exiv2.patch")))) (build-system gnu-build-system) ;; WARNING: Checks require /dev/shm to be in the build chroot, especially ;; not to be a symbolic link to /run/shm. diff --git a/gnu/packages/gsasl.scm b/gnu/packages/gsasl.scm index 127b476ef3..6cdc395ec5 100644 --- a/gnu/packages/gsasl.scm +++ b/gnu/packages/gsasl.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2012 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2017 Eric Bavier <bavier@member.fsf.org> -;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; ;;; This file is part of GNU Guix. ;;; diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 8c36658361..16e30b9de7 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -916,7 +916,7 @@ tracker's SOAP service, such as @url{https://bugs.gnu.org}.") version ".tar.lz")) (sha256 (base32 - "05pm0rwdxhjdlpmvhn0kyfslph6j5m1gv76givs0hshb30nirl2x")))) + "0zgvh2329zrclxfb1lh7dnqrq46jj77l0lx7j9y6y3xgbhd2d9l0")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index b8a53824b4..5683ebd2fc 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -303,14 +303,14 @@ without requiring the source code to be rewritten.") (package (inherit guile-2.2) (name "guile-next") - (version "2.9.3") + (version "2.9.4") (source (origin (inherit (package-source guile-2.2)) (uri (string-append "ftp://alpha.gnu.org/gnu/guile/guile-" version ".tar.xz")) (sha256 (base32 - "14990wcpysgw58kij03wbgiggmi5z94jmy7wdcqnn6ny7cimkkgr")))) + "1milviqhipyfx400pqhngxpxyajalzwmp597dxn5514pkk0g7v0p")))) (native-search-paths (list (search-path-specification (variable "GUILE_LOAD_PATH") diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 8787f10789..b544190895 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -8361,7 +8361,7 @@ generated SQL and optimize it for your backend.") (define-public shellcheck (package (name "shellcheck") - (version "0.5.0") + (version "0.7.0") (source (origin (method url-fetch) @@ -8369,12 +8369,12 @@ generated SQL and optimize it for your backend.") "https://hackage.haskell.org/package/ShellCheck/ShellCheck-" version ".tar.gz")) (sha256 - (base32 - "0z1hscbr11hwkq8k1v0vaa947hb9m6k4cm831jk1gpj8dxrk151b")) + (base32 "1vx895cp5k5h0680xfwj74lk97m9y627n965x6srds0gfnbkzy9s")) (file-name (string-append name "-" version ".tar.gz")))) (build-system haskell-build-system) (inputs `(("ghc-aeson" ,ghc-aeson) + ("ghc-diff" ,ghc-diff) ("ghc-quickcheck" ,ghc-quickcheck) ("ghc-regex-tdfa" ,ghc-regex-tdfa))) (home-page "https://github.com/koalaman/shellcheck") diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index d33a9857c9..51062df7a3 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2017, 2018 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2013, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014 Ian Denhardt <ian@zenhack.net> ;;; Copyright © 2015, 2016 Alex Kost <alezost@gmail.com> ;;; Copyright © 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il> @@ -131,6 +131,11 @@ actions.") `( ;; Enable support for a "map" pane using GPS data. #:configure-flags '("--enable-map") + ;; Parallel builds fail with something like: + ;; image-load.c:143:9: error: ‘gq_marshal_VOID__INT_INT_INT_INT’ undeclared + ;; due to unexpressed makefile dependencies. + #:parallel-build? #f + #:phases (modify-phases %standard-phases (add-before 'bootstrap 'pre-bootstrap @@ -496,14 +501,14 @@ preloading.") (define-public chafa (package (name "chafa") - (version "1.0.1") + (version "1.2.1") (source (origin (method url-fetch) (uri (string-append "https://hpjansson.org/chafa/releases/chafa-" version ".tar.xz")) (sha256 (base32 - "00cf2z52az0z6bzc3hfm4l8infipy5ck410wqmbaybd2csjr3m29")))) + "1hj4vdyczby8h52ff23qxl8ng18p5jy549idngpiddwszf5s4drz")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) diff --git a/gnu/packages/ipfs.scm b/gnu/packages/ipfs.scm index 4f61f2ba66..2dd2097075 100644 --- a/gnu/packages/ipfs.scm +++ b/gnu/packages/ipfs.scm @@ -219,7 +219,7 @@ written in Go.") (define-public go-ipfs (package (name "go-ipfs") - (version "0.4.19") + (version "0.4.22") (source (origin (method url-fetch/tarbomb) @@ -227,7 +227,7 @@ written in Go.") "https://dist.ipfs.io/go-ipfs/v" version "/go-ipfs-source.tar.gz")) (sha256 - (base32 "0s04ap14p6hnipjm27nm5k8s28zv9k5g9mziyh3ibgwn7dzb1kpx")) + (base32 "1gyz9yqb4y7p6vdjbcm66nvm6gjs4mdrjygdn79z3misv1pb5nkg")) (file-name (string-append name "-" version "-source")))) (build-system go-build-system) (arguments diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 026ce92aab..239cabdd2e 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -335,8 +335,8 @@ as Alfresco or Nuxeo.") (source (origin (method url-fetch) - (uri (string-append "https://dev-www.libreoffice.org/src/" name "/" - name "-" version ".tar.xz")) + (uri (string-append "https://dev-www.libreoffice.org/src/libabw/" + "libabw-" version ".tar.xz")) (sha256 (base32 "11949iscdb99f2jplxjd39282jxcrf2fw0sqbh5dl7gqb96r8whb")))) (build-system gnu-build-system) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 301979a7a5..3a7efcab67 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -182,31 +182,31 @@ defconfig. Return the appropriate make target if applicable, otherwise return (define deblob-scripts-5.2 (linux-libre-deblob-scripts - "5.2.3" + "5.2.10" (base32 "076fwxlm6jq6z4vg1xq3kr474zz7qk71r90sf9dnfia3rw2pb4fa") (base32 "0d3pp1bqchqc7vnxr1a56km5r0hzjiiipzz2xc3wgjwfi51k9kxc"))) (define deblob-scripts-4.19 (linux-libre-deblob-scripts - "4.19.61" + "4.19.68" (base32 "02zs405awaxydbapka4nz8h6lmnc0dahgczqsrs5s2bmzjyyqkcy") (base32 "1fyacg28aym6virxyn7wk99qil2fjbks3iwm7p3hxy51pccn34za"))) (define deblob-scripts-4.14 (linux-libre-deblob-scripts - "4.14.134" + "4.14.140" (base32 "091jk9jkn9jf39bxpc7395bhcb7p96nkg3a8047380ki06lnfxh6") (base32 "0x9nd3hnyrm753cbgdqmy92mbnyw86w64g4hvyibnkpq5n7s3z9n"))) (define deblob-scripts-4.9 (linux-libre-deblob-scripts - "4.9.186" + "4.9.190" (base32 "1wvldzlv7q2xdbadas87dh593nxr4a8p5n0f8zpm72lja6w18hmg") - (base32 "1gmjn5cwxydg6qb47wcmahwkv37npsjx4papynzkkdxyidmrccya"))) + (base32 "0is8gn4qdd7h5l6lacvhqdch26lmrbgxfm8ab7fx8n85ha7y358w"))) (define deblob-scripts-4.4 (linux-libre-deblob-scripts - "4.4.186" + "4.4.190" (base32 "0x2j1i88am54ih2mk7gyl79g25l9zz4r08xhl482l3fvjj2irwbw") (base32 "1x40lbiaizksy8z38ax7wpqr9ldgq7qvkxbb0ca98vd1axpklb10"))) @@ -350,42 +350,42 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." "linux-" version ".tar.xz")) (sha256 hash))) -(define-public linux-libre-5.2-version "5.2.8") +(define-public linux-libre-5.2-version "5.2.10") (define-public linux-libre-5.2-pristine-source (let ((version linux-libre-5.2-version) - (hash (base32 "0dv91zfjkil29lp2l35lswkrhrqbc4kjh965ciaqwih1rh3cs9x1"))) + (hash (base32 "0jgw7gj71i9kf4prbdi9h791ngxf24nr90302glnsa9aghwc95k0"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.2))) -(define-public linux-libre-4.19-version "4.19.66") +(define-public linux-libre-4.19-version "4.19.68") (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "0r6vzarmi77fhivd1n6f667sgcw8zd54ykmhmp6rd52bbkhsp0f9"))) + (hash (base32 "0ax04sivi1lsx01m3abi16w6d0jd3qvwzzq2zbn8q2lca505k1wi"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -(define-public linux-libre-4.14-version "4.14.138") +(define-public linux-libre-4.14-version "4.14.140") (define-public linux-libre-4.14-pristine-source (let ((version linux-libre-4.14-version) - (hash (base32 "0yw39cqpk6g42q0xcv2aq8yyzsi0kzx9nvlfbw0iyg58wcfvsl7j"))) + (hash (base32 "1wmx7xgm21dk1hvrq14sxh3c4304284sgxr4vngg4pki2ljyspkr"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.14))) -(define-public linux-libre-4.9-version "4.9.189") +(define-public linux-libre-4.9-version "4.9.190") (define-public linux-libre-4.9-pristine-source (let ((version linux-libre-4.9-version) - (hash (base32 "1cyhwnxkjd0qa5d48657yppjnzbi830q0p25jjv2dxs629k4bnck"))) + (hash (base32 "05ha3snfk0vdqk9i27icwpq2if0h2jvshavn69ldwqm4h2h1r2py"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.9))) -(define-public linux-libre-4.4-version "4.4.189") +(define-public linux-libre-4.4-version "4.4.190") (define-public linux-libre-4.4-pristine-source (let ((version linux-libre-4.4-version) - (hash (base32 "0nc8v62gw89m3ykqg6nqf749fzm8y1n481ns8vny4gbinyikjhlp"))) + (hash (base32 "1rf28cjrrmj7mm8xqlfld6k20ddk15j4mmyarqibjx9pk9acij7y"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.4))) @@ -3928,6 +3928,49 @@ repair and easy administration.") from the btrfs-progs package. It is meant to be used in initrds.") (license (package-license btrfs-progs)))) +(define-public compsize + (package + (name "compsize") + (version "1.3") + (home-page "https://github.com/kilobyte/compsize") + (source (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit (string-append "v" version)))) + (sha256 + (base32 "1c69whla844nwis30jxbj00zkpiw3ccndhkmzjii8av5358mjn43")) + (file-name (git-file-name name version)))) + (build-system gnu-build-system) + (inputs + `(("btrfs-progs" ,btrfs-progs))) + (arguments + `(#:tests? #f ; No tests. + #:make-flags (list "CC=gcc") + #:phases + (modify-phases %standard-phases + (delete 'configure) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (install-file "compsize" (string-append out "/bin")) + (install-file "compsize.8" (string-append out "/share/man/man8")))))))) + (synopsis "Find compression type/ratio on Btrfs files") + (description "@command{compsize} takes a list of files (given as +arguments) on a Btrfs file system and measures used compression types and +effective compression ratio, producing a report. + +A directory has no extents but has a (recursive) list of files. A non-regular +file is silently ignored. + +As it makes no sense to talk about compression ratio of a partial extent, +every referenced extent is counted whole, exactly once -- no matter if you use +only a few bytes of a 1GB extent or reflink it a thousand times. Thus, the +uncompressed size will not match the number given by @command{tar} or +@command{du}. On the other hand, the space used should be accurate (although +obviously it can be shared with files outside our set).") + (license license:gpl2+))) + (define-public f2fs-tools-1.7 (package (name "f2fs-tools") @@ -4799,14 +4842,14 @@ running boot option, and more.") (define-public sysstat (package (name "sysstat") - (version "11.4.3") + (version "12.1.6") (source (origin (method url-fetch) - (uri (string-append "http://perso.orange.fr/sebastien.godard/" + (uri (string-append "http://pagesperso-orange.fr/sebastien.godard/" "sysstat-" version ".tar.xz")) (sha256 (base32 - "1ryf9myjzpa2279i3rvsh6fr5psm6qvr5r9kbm1sxyspapxcms82")))) + "0agi17n82k363mf9f7cky3isq195hw112vs98v26yfhm0v2g6lpp")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; No test suite. diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index d2bed231bd..d32f4b19bd 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -327,14 +327,14 @@ an interpreter, a compiler, a debugger, and much more.") (define-public sbcl (package (name "sbcl") - (version "1.5.1") + (version "1.5.5") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/sbcl/sbcl/" version "/sbcl-" version "-source.tar.bz2")) (sha256 - (base32 "08z62qba0kmm15k93s2rq7ipi769895g8iwigcp20qjh6amwnwph")) + (base32 "1qmapk2hyxxqd3ajiqacz4isij0ibx7gn10n8dbmq33gm3kgliyb")) (modules '((guix build utils))) (snippet ;; Add sbcl-bundle-systems to 'default-system-source-registry'. @@ -364,7 +364,8 @@ an interpreter, a compiler, a debugger, and much more.") ("inetutils" ,inetutils) ;for hostname(1) ("ed" ,ed) ("texlive" ,(texlive-union (list texlive-tex-texinfo))) - ("texinfo" ,texinfo))) + ("texinfo" ,texinfo) + ("zlib" ,zlib))) (arguments `(#:modules ((guix build gnu-build-system) (guix build utils) @@ -431,7 +432,9 @@ an interpreter, a compiler, a debugger, and much more.") (_ `("clisp"))) (string-append "--prefix=" - (assoc-ref outputs "out"))))) + (assoc-ref outputs "out")) + "--with-sb-core-compression" + "--with-sb-xref-for-internals"))) (replace 'install (lambda _ (invoke "sh" "install.sh"))) @@ -440,6 +443,21 @@ an interpreter, a compiler, a debugger, and much more.") (with-directory-excursion "doc/manual" (and (invoke "make" "info") (invoke "make" "dist"))))) + (add-after 'build 'build-source + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (rc (string-append out "/lib/sbcl/sbclrc")) + (source-dir (string-append out "/share/sbcl"))) + (for-each (lambda (p) + (copy-recursively p (string-append source-dir "/" p))) + '("src" "contrib")) + (mkdir-p (dirname rc)) + (with-output-to-file rc + (lambda () + (display + (string-append "(sb-ext:set-sbcl-source-location \"" + source-dir "\")") ))) + #t))) (add-after 'install 'install-doc (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -5319,7 +5337,7 @@ port within a range.") (define-public txr (package (name "txr") - (version "216") + (version "223") (source (origin (method url-fetch) @@ -5329,7 +5347,7 @@ port within a range.") (patches (search-patches "txr-shell.patch")) (sha256 (base32 - "07cxdpc9zsqd0c2668g00dqjpd6zc4mfdn74aarr6d2hpzdhh937")))) + "0109q8idqggba3kx58dpm5ccfpdrki68npkcxm18p5ga24611fcv")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("cc=gcc") @@ -5343,7 +5361,7 @@ port within a range.") #t)) (replace 'check (lambda _ - (zero? (system* "make" "tests"))))))) + (invoke "make" "tests")))))) (native-inputs `(("bison" ,bison) ("flex" ,flex))) diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index a8699b3d09..e72f5b82d9 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -1245,6 +1245,39 @@ easily publishing them on internet image hosting services.") (license license:gpl2+))) +(define-public lxqt-archiver + (package + (name "lxqt-archiver") + (version "0.0.96") + (source + (origin + (method git-fetch) + (uri (git-reference + (url (string-append "https://github.com/lxqt/" name ".git")) + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "09rw774vxj96wcpxxncz6nr9bmw7l4l0kwylmz1saq6rpa2yvn2i")))) + (build-system cmake-build-system) + (inputs + `(("glib" ,glib) + ("json-glib" ,json-glib) + ("libfm-qt" ,libfm-qt) + ("qtbase" ,qtbase) + ("qtx11extras" ,qtx11extras))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("lxqt-build-tools" ,lxqt-build-tools) + ("qttools" ,qttools))) + (arguments + '(#:tests? #f)) + (home-page "https://lxqt.org/") + (synopsis "Simple & lightweight desktop-agnostic Qt file archiver") + (description + "This package provides a Qt graphical interface to archiving programs +like @command{tar} and @command{zip}.") + (license license:gpl2+))) + ;; The LXQt Desktop Environment (define-public lxqt diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index b81b15d80c..bb3bf2bfb5 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -998,18 +998,17 @@ and search library.") (define-public getmail (package (name "getmail") - (version "5.6") + (version "5.14") (source (origin (method url-fetch) (uri (string-append "http://pyropus.ca/software/getmail/old-versions/" - name "-" version ".tar.gz")) + "getmail-" version ".tar.gz")) (sha256 - (base32 - "16nmvj80szr6yvcxxgmxn2lxqpjqqj4xg5a0b66zhvck6j42q3a6")))) + (base32 "1hcrd9h4g12f5gvl1djsbchcjry02ghq4icdr897s8v48pkrzagk")))) (build-system python-build-system) (arguments - `(#:tests? #f ; no tests + `(#:tests? #f ; no tests #:python ,python-2)) (home-page "http://pyropus.ca/software/getmail/") (synopsis "Mail retriever") @@ -2270,14 +2269,14 @@ e-mails with other systems speaking the SMTP protocol.") (define-public opensmtpd-next (package (name "opensmtpd-next") - (version "6.4.1p2") + (version "6.4.2p1") (source (origin (method url-fetch) (uri (string-append "https://www.opensmtpd.org/archives/" "opensmtpd-" version ".tar.gz")) (sha256 - (base32 "0cppqlx4fk6l8rbim5symh2fm1kzshf421256g596j6c9f9q96xn")))) + (base32 "0pgv080ai7d98l9340jadp9wjiaqj2qvgpqhilcz0kps2mdiawbd")))) (build-system gnu-build-system) (inputs `(("bdb" ,bdb) diff --git a/gnu/packages/man.scm b/gnu/packages/man.scm index f5c888186f..e0e15355dd 100644 --- a/gnu/packages/man.scm +++ b/gnu/packages/man.scm @@ -227,14 +227,14 @@ automatically.") (define-public help2man/latest (package (inherit help2man) - (version "1.47.10") + (version "1.47.11") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/help2man/help2man-" version ".tar.xz")) (sha256 (base32 - "1yywli520246aba12vpgj7bhr1r13swad3xm49a0cygqcgywnwgk")))))) + "123vsimgx8zq1h077sbyh3bd0hbmlc3wih2231wwh133z1bv51ar")))))) (define-public scdoc (package diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index ab3b4458b2..4a07b8e687 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -246,7 +246,7 @@ triangulations.") (define-public python-cvxopt (package (name "python-cvxopt") - (version "1.2.1") + (version "1.2.3") (source (origin (method git-fetch) (uri (git-reference @@ -255,7 +255,7 @@ triangulations.") (file-name (git-file-name name version)) (sha256 (base32 - "05mnjil9palaa48xafdfh4f5pr4z7aqjr995rwl08qfyxs8y0crf")))) + "1kiy2m62xgs2d5id6dnnwy4vap85cd70p7pgkb9nh23qf9xnak7b")))) (build-system python-build-system) (arguments `(#:phases @@ -2967,7 +2967,7 @@ point numbers.") (define-public wxmaxima (package (name "wxmaxima") - (version "19.05.7") + (version "19.08.0") (source (origin (method git-fetch) @@ -2977,7 +2977,7 @@ point numbers.") (file-name (git-file-name name version)) (sha256 (base32 - "0zaz71fh156b9inrxf86scnix247al5pl9v18cxhjxcm0lanqxdp")))) + "028g4g2081vsgslbdliskfy5q2wknvknw89lk3zp89py6wranxas")))) (build-system cmake-build-system) (native-inputs `(("gettext" ,gettext-minimal))) diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index 5468ba901e..e8b1e6e0b1 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -91,7 +91,7 @@ interfacing MPD in the C, C++ & Objective C languages.") (define-public mpd (package (name "mpd") - (version "0.21.13") + (version "0.21.14") (source (origin (method url-fetch) (uri @@ -100,7 +100,7 @@ interfacing MPD in the C, C++ & Objective C languages.") "/mpd-" version ".tar.xz")) (sha256 (base32 - "1sjyhmq50nlccwmd8xn7m0bk8xvyixvfyr24v9dy3g86hhk0pdwm")))) + "0iknnm9xvwfgk8h82hjwrmbijpk9l0dgap0794c2nyg8i66qlb0y")))) (build-system meson-build-system) (arguments `(#:configure-flags '("-Ddocumentation=true") ; the default is 'false'... diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 5dfa320d2c..d4aaecc1e2 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1543,7 +1543,7 @@ reverb effects.") (define-public setbfree (package (name "setbfree") - (version "0.8.8") + (version "0.8.9") (source (origin (method git-fetch) (uri (git-reference @@ -1552,7 +1552,7 @@ reverb effects.") (file-name (git-file-name name version)) (sha256 (base32 - "15dr1nyj69wc9jnjq5z8ril90a3c0mcrii4zjyz0z3h7dhia3382")))) + "1lpsa64xvwa9xbbp8zcwxy5w0daffc7fziny2pizabqh7m9xqjl2")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no "check" target @@ -1790,7 +1790,7 @@ export.") (define-public pd (package (name "pd") - (version "0.49-0") + (version "0.50-0") (source (origin (method url-fetch) (uri @@ -1798,10 +1798,10 @@ export.") version ".src.tar.gz")) (sha256 (base32 - "18rzqbpgnnvyslap7k0ly87aw1bbxkb0rk5agpr423ibs9slxq6j")))) + "0hg4n5b55f650qsc0mjx559072dp7vfza7w0pvk6rk2l831cvsps")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; no "check" target + `(#:tests? #f ; no "check" target #:configure-flags (list "--enable-jack" diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 16e04aaa13..9383e1a1d8 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -29,6 +29,7 @@ ;;; Copyright © 2019 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2019 Vasile Dumitrascu <va511e@yahoo.com> ;;; Copyright © 2019 Julien Lepiller <julien@lepiller.eu> +;;; Copyright © 2019 Timotej Lazar <timotej.lazar@araneo.si> ;;; ;;; This file is part of GNU Guix. ;;; @@ -551,15 +552,14 @@ and up to 1 Mbit/s downstream.") (define-public whois (package (name "whois") - (version "5.5.0") + (version "5.5.1") (source (origin (method url-fetch) (uri (string-append "mirror://debian/pool/main/w/whois/" - name "_" version ".tar.xz")) + "whois_" version ".tar.xz")) (sha256 - (base32 - "0gbg9fis05zf2fl4264jplbphy75l50k3g92cz6mkmbsklrn7v34")))) + (base32 "10mc7iqhdnvd1kk8gnnhihd5ga2rw3sz69n3nd6x8fb65qpq13gf")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no test suite @@ -947,6 +947,82 @@ attacking, testing, and cracking. All tools are command-line driven, which allows for heavy scripting.") (license (list license:gpl2+ license:bsd-3)))) +(define-public pixiewps + (package + (name "pixiewps") + (version "1.4.2") + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/wiire-a/pixiewps/releases/" + "download/v" version "/" name "-" version ".tar.xz")) + (sha256 + (base32 + "07nym6bqml0k9v29vnj003nrgnwrywgjvnljb7cdpsvnwilhbp64")))) + (build-system gnu-build-system) + (arguments + '(#:make-flags + (list "CC=gcc" + (string-append "PREFIX=" (assoc-ref %outputs "out"))) + #:phases + (modify-phases %standard-phases + (delete 'configure)) ; no configure script + #:tests? #f)) ; there are no tests + (home-page "https://github.com/wiire-a/pixiewps/") + (synopsis "Offline brute-force tool for Wi-Fi Protected Setup") + (description "Pixiewps implements the pixie-dust attack to brute +force the Wi-Fi Protected Setup (WPS) PIN by exploiting the low or +non-existing entropy of some access points.") + (license license:gpl3+))) + +(define-public reaver + (package + (name "reaver") + (version "1.6.5") + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/t6x/reaver-wps-fork-t6x/releases/" + "download/v" version "/" name "-" version ".tar.xz")) + (sha256 + (base32 + "0sva3g0kwgv143n9l3lg4qp5iiqz7nk76nr0hwivsnglbhk9sbil")))) + (build-system gnu-build-system) + (arguments + `(#:configure-flags + ;; Save session files to current directory instead of /var. + (list "--enable-savetocurrent" + "--localstatedir=/tmp/dummy") ; prevent creating /var during install + #:phases + (modify-phases %standard-phases + (add-before 'configure 'change-directory + (lambda _ + (chdir "src") + #t)) + (add-after 'install 'install-doc + (lambda* (#:key outputs #:allow-other-keys) + (chdir "../docs") + (let* ((out (assoc-ref outputs "out")) + (doc (string-append out "/share/doc/" ,name "-" ,version)) + (man1 (string-append out "/share/man/man1"))) + (for-each (lambda (file) (install-file file doc)) + (find-files "." "README.*")) + (install-file "reaver.1" man1) + #t)))) + #:tests? #f)) ; there are no tests + (inputs + `(("libpcap" ,libpcap))) + (propagated-inputs + `(("aircrack-ng" ,aircrack-ng) + ("pixiewps" ,pixiewps))) + (home-page "https://github.com/t6x/reaver-wps-fork-t6x/") + (synopsis "Attack tool for Wi-Fi Protected Setup") + (description "Reaver performs a brute force attack against an access +point's Wi-Fi Protected Setup (WPS) PIN. Once the PIN is found, the WPA +passphrase can be recovered and the AP's wireless settings can be +reconfigured.") + (license license:gpl2+))) + (define-public perl-danga-socket (package (name "perl-danga-socket") @@ -2283,7 +2359,7 @@ Ethernet and TAP interfaces is supported. Packet capture is also supported.") (define-public hcxtools (package (name "hcxtools") - (version "5.1.6") + (version "5.2.0") (source (origin (method git-fetch) @@ -2291,7 +2367,7 @@ Ethernet and TAP interfaces is supported. Packet capture is also supported.") (url "https://github.com/ZerBea/hcxtools.git") (commit version))) (sha256 - (base32 "05sjbmv2wq3nlmammrwxqc62c4sagjjgczzddr1jcqkf6kywzkl8")) + (base32 "0k2qlq9hz5zc21nyc6yrnfqzga7hydn5mm0x3rpl2fhkwl81lxcn")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (inputs @@ -2326,7 +2402,7 @@ packets from wireless devices for use with hashcat or John the Ripper.") (define-public hcxdumptool (package (name "hcxdumptool") - (version "5.1.5") + (version "5.2.0") (source (origin (method git-fetch) @@ -2334,7 +2410,7 @@ packets from wireless devices for use with hashcat or John the Ripper.") (url "https://github.com/ZerBea/hcxdumptool.git") (commit version))) (sha256 - (base32 "0xkzdvwpi6dq9wsrn882f2ljb7d5v2bvarq8gs6jm8znfx3y8hi2")) + (base32 "0pg1pvg029gm4rj0fj5kcsjb32hixgn4cxsgiir7spkmacf1qm4q")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 3b003fd30f..98be212382 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -111,8 +111,8 @@ ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "1.0.1") - (commit "4a54ed774913480c0f8dad3caf0cd627e4fa8ebf") - (revision 3)) + (commit "c902458863d1d341ffd74970b75e69c2bb848183") + (revision 4)) (package (name "guix") @@ -128,7 +128,7 @@ (commit commit))) (sha256 (base32 - "14m4a4bn0d5hav6mrks5d7r223knx9dpswgbsc875wgr2921na2h")) + "0w93qjgy9n0qqyij12s7hm7fl4wb6h99bmfril4cqf4ynckpdvbb")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments @@ -293,7 +293,7 @@ (propagated-inputs `(("gnutls" ,gnutls) ("guile-gcrypt" ,guile-gcrypt) - ("guile-json" ,guile-json-1) + ("guile-json" ,guile-json-3) ("guile-sqlite3" ,guile-sqlite3) ("guile-ssh" ,guile-ssh) ("guile-git" ,guile-git))) @@ -325,7 +325,7 @@ the Nix package manager.") (inputs `(("gnutls" ,gnutls) ("guile-git" ,guile-git) - ("guile-json" ,guile-json-1) + ("guile-json" ,guile-json-3) ("guile-gcrypt" ,guile-gcrypt) ,@(fold alist-delete (package-inputs guix) '("boot-guile" "boot-guile/i686" "util-linux")))) @@ -561,75 +561,83 @@ transactions from C or Python.") (license license:gpl2+))) (define-public diffoscope - (package - (name "diffoscope") - (version "120") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://salsa.debian.org/reproducible-builds/diffoscope.git") - (commit "120"))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "07z9yclvfkw4326739l2ywzzihax5vdijiaqqpfix9rz1rb923aa")))) - (build-system python-build-system) - (arguments - `(#:phases (modify-phases %standard-phases - ;; setup.py mistakenly requires python-magic from PyPi, even - ;; though the Python bindings of `file` are sufficient. - ;; https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=815844 - (add-after 'unpack 'dependency-on-python-magic - (lambda _ - (substitute* "setup.py" - (("'python-magic',") "")))) - ;; This test is broken because our `file` package has a - ;; bug in berkeley-db file type detection. - (add-after 'unpack 'remove-berkeley-test - (lambda _ - (delete-file "tests/comparators/test_berkeley_db.py") - #t)) - (add-after 'unpack 'embed-tool-references - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "diffoscope/comparators/utils/compare.py" - (("\\['xxd',") - (string-append "['" (which "xxd") "',"))) - (substitute* "diffoscope/comparators/elf.py" - (("@tool_required\\('readelf'\\)") "") - (("get_tool_name\\('readelf'\\)") - (string-append "'" (which "readelf") "'"))) - (substitute* "diffoscope/comparators/directory.py" - (("@tool_required\\('stat'\\)") "") - (("@tool_required\\('getfacl'\\)") "") - (("\\['stat',") - (string-append "['" (which "stat") "',")) - (("\\['getfacl',") - (string-append "['" (which "getfacl") "',"))) - #t)) - (add-before 'check 'delete-failing-test - (lambda _ - ;; this requires /sbin to be on the path - (delete-file "tests/test_tools.py") - #t))))) - (inputs `(("rpm" ,rpm) ;for rpm-python - ("python-file" ,python-file) - ("python-debian" ,python-debian) - ("python-libarchive-c" ,python-libarchive-c) - ("python-tlsh" ,python-tlsh) - ("acl" ,acl) ;for getfacl - ("colordiff" ,colordiff) - ("xxd" ,xxd))) - ;; Below are modules used for tests. - (native-inputs `(("python-pytest" ,python-pytest) - ("python-chardet" ,python-chardet))) - (home-page "https://diffoscope.org/") - (synopsis "Compare files, archives, and directories in depth") - (description - "Diffoscope tries to get to the bottom of what makes files or directories + (let ((version "121")) + (package + (name "diffoscope") + (version version) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://salsa.debian.org/reproducible-builds/diffoscope.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1bw7s8qs1vnr93vhifl6pj6h6w6r6nrpc5anzhh9wx2gcaipkb3m")))) + (build-system python-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + ;; setup.py mistakenly requires python-magic from PyPi, even + ;; though the Python bindings of `file` are sufficient. + ;; https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=815844 + (add-after 'unpack 'dependency-on-python-magic + (lambda _ + (substitute* "setup.py" + (("'python-magic',") "")))) + ;; This test is broken because our `file` package has a + ;; bug in berkeley-db file type detection. + (add-after 'unpack 'remove-berkeley-test + (lambda _ + (delete-file "tests/comparators/test_berkeley_db.py") + #t)) + (add-after 'unpack 'embed-tool-references + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "diffoscope/comparators/utils/compare.py" + (("\\['xxd',") + (string-append "['" (which "xxd") "',"))) + (substitute* "diffoscope/comparators/elf.py" + (("@tool_required\\('readelf'\\)") "") + (("get_tool_name\\('readelf'\\)") + (string-append "'" (which "readelf") "'"))) + (substitute* "diffoscope/comparators/directory.py" + (("@tool_required\\('stat'\\)") "") + (("@tool_required\\('getfacl'\\)") "") + (("\\['stat',") + (string-append "['" (which "stat") "',")) + (("\\['getfacl',") + (string-append "['" (which "getfacl") "',"))) + #t)) + (add-before 'check 'writable-test-data + (lambda _ + ;; tests/comparators/test_elf.py needs write access to + ;; test data + (make-file-writable + "tests/data/ignore_readelf_errors_expected_diff") + #t)) + (add-before 'check 'delete-failing-test + (lambda _ + ;; this requires /sbin to be on the path + (delete-file "tests/test_tools.py") + #t))))) + (inputs `(("rpm" ,rpm) ;for rpm-python + ("python-file" ,python-file) + ("python-debian" ,python-debian) + ("python-libarchive-c" ,python-libarchive-c) + ("python-tlsh" ,python-tlsh) + ("acl" ,acl) ;for getfacl + ("colordiff" ,colordiff) + ("xxd" ,xxd))) + ;; Below are modules used for tests. + (native-inputs `(("python-pytest" ,python-pytest) + ("python-chardet" ,python-chardet))) + (home-page "https://diffoscope.org/") + (synopsis "Compare files, archives, and directories in depth") + (description + "Diffoscope tries to get to the bottom of what makes files or directories different. It recursively unpacks archives of many kinds and transforms various binary formats into more human readable forms to compare them. It can compare two tarballs, ISO images, or PDFs just as easily.") - (license license:gpl3+))) + (license license:gpl3+)))) (define-public trydiffoscope (package diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm index cdc35b4703..3b7ce4c150 100644 --- a/gnu/packages/parallel.scm +++ b/gnu/packages/parallel.scm @@ -52,14 +52,14 @@ (define-public parallel (package (name "parallel") - (version "20190522") + (version "20190822") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/parallel/parallel-" version ".tar.bz2")) (sha256 - (base32 "0y3z9wybs3gak3zwgsby8r5gg6dwd3qlrkch0q4fn0i1j1jhmijv")))) + (base32 "1mi3a18fdwcx50jg51pw1ks1fkmc2slyinff0yb3xhihi2szbskp")))) (build-system gnu-build-system) (arguments `(#:phases diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index 49024b26c4..6ca16025ef 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -236,28 +236,40 @@ platforms.") (define-public shroud (package (name "shroud") - (version "0.1.1") + (version "0.1.2") (source (origin (method url-fetch) (uri (string-append "https://files.dthompson.us/shroud/shroud-" version ".tar.gz")) (sha256 (base32 - "1y43yhgy2zbrk5bqj3qyx9rkcz2bma9sinlrg7dip3jqms9gq4lr")))) + "1l2shrhvcwfzkar9qiwb75nhcqmx25iz55lzmz0c187nbjhqzi9p")))) (build-system gnu-build-system) + (native-inputs + `(("pkg-config" ,pkg-config))) (arguments - '(#:phases + `(#:modules ((guix build gnu-build-system) + (guix build utils) + (ice-9 popen) + (ice-9 rdelim)) + #:phases (modify-phases %standard-phases (add-after 'install 'wrap-shroud - (lambda* (#:key outputs #:allow-other-keys) + (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) - (ccachedir (string-append out "/lib/guile/2.0/ccache")) + (guile (assoc-ref inputs "guile")) + (effective (read-line + (open-pipe* OPEN_READ + (string-append guile "/bin/guile") + "-c" "(display (effective-version))"))) + (ccachedir (string-append out + "/lib/guile/" effective "/site-ccache")) (prog (string-append out "/bin/shroud"))) (wrap-program prog `("GUILE_LOAD_COMPILED_PATH" ":" prefix (,ccachedir))) #t)))))) (inputs - `(("guile" ,guile-2.0) + `(("guile" ,guile-2.2) ("gnupg" ,gnupg) ("xclip" ,xclip))) (synopsis "GnuPG-based secret manager") diff --git a/gnu/packages/patches/elm-compiler-disable-reactor.patch b/gnu/packages/patches/elm-compiler-disable-reactor.patch new file mode 100644 index 0000000000..9871b55e8d --- /dev/null +++ b/gnu/packages/patches/elm-compiler-disable-reactor.patch @@ -0,0 +1,71 @@ +commit 20d80e2323b565a36751c9455e535d8f73fa32f7 +Author: Robert Vollmert <rob@vllmrt.net> +Date: Fri Jun 14 16:05:47 2019 +0200 + + disable reactor + +diff --git a/elm.cabal b/elm.cabal +index c75f9689..ece63c46 100644 +--- a/elm.cabal ++++ b/elm.cabal +@@ -45,9 +45,6 @@ Executable elm + builder/src + ui/terminal/src + +- other-extensions: +- TemplateHaskell +- + Main-Is: + Main.hs + +@@ -56,8 +53,6 @@ Executable elm + Develop + Develop.Generate.Help + Develop.Generate.Index +- Develop.StaticFiles +- Develop.StaticFiles.Build + Diff + Init + Install +diff --git a/ui/terminal/src/Develop.hs b/ui/terminal/src/Develop.hs +index 4b2252e1..7ed7716e 100644 +--- a/ui/terminal/src/Develop.hs ++++ b/ui/terminal/src/Develop.hs +@@ -23,7 +23,6 @@ import Snap.Util.FileServe + import qualified Elm.Project as Project + import qualified Develop.Generate.Help as Generate + import qualified Develop.Generate.Index as Index +-import qualified Develop.StaticFiles as StaticFiles + import qualified Generate.Output as Output + import qualified Json.Encode as Encode + import qualified Reporting.Exit as Exit +@@ -219,16 +218,7 @@ compileToHtmlBuilder mode file = + + + serveAssets :: Snap () +-serveAssets = +- do file <- getSafePath +- case StaticFiles.lookup file of +- Nothing -> +- pass +- +- Just (content, mimeType) -> +- do modifyResponse (setContentType (mimeType <> ";charset=utf-8")) +- writeBS content +- ++serveAssets = pass + + + -- MIME TYPES +diff --git a/ui/terminal/src/Main.hs b/terminal/src/Main.hs +index 7000f3ca..2c76965a 100644 +--- a/ui/terminal/src/Main.hs ++++ b/ui/terminal/src/Main.hs +@@ -39,7 +39,6 @@ main = + complex intro outro + [ repl + , init +- , reactor + , make + , install + , bump diff --git a/gnu/packages/patches/elm-compiler-fix-map-key.patch b/gnu/packages/patches/elm-compiler-fix-map-key.patch new file mode 100644 index 0000000000..4f05ded530 --- /dev/null +++ b/gnu/packages/patches/elm-compiler-fix-map-key.patch @@ -0,0 +1,38 @@ +commit e3512d887df41a8162c3e361171c04beca08415b +Author: Tom Stejskal <tom.stejskal@gmail.com> +Date: Mon Nov 19 20:09:43 2018 +0100 + + Fix Map.!: given key is not an element in the map + +diff --git a/compiler/src/Elm/Compiler/Type/Extract.hs b/compiler/src/Elm/Compiler/Type/Extract.hs +index 1aafe1d4..99763392 100644 +--- a/compiler/src/Elm/Compiler/Type/Extract.hs ++++ b/compiler/src/Elm/Compiler/Type/Extract.hs +@@ -10,6 +10,7 @@ module Elm.Compiler.Type.Extract + + + import Data.Map ((!)) ++import qualified Data.Map as Map + import qualified Data.Maybe as Maybe + import qualified Data.Set as Set + +@@ -134,11 +135,15 @@ extractUnion interfaces (Opt.Global home name) = + else + let + pname = toPublicName home name +- unions = I._unions (interfaces ! home) ++ maybeUnions = I._unions <$> Map.lookup home interfaces + in +- case I.toUnionInternals (unions ! name) of +- Can.Union vars ctors _ _ -> +- T.Union pname vars <$> traverse extractCtor ctors ++ case Map.lookup name =<< maybeUnions of ++ Just union -> ++ case I.toUnionInternals union of ++ Can.Union vars ctors _ _ -> ++ T.Union pname vars <$> traverse extractCtor ctors ++ Nothing -> ++ return $ T.Union pname [] [] + + + extractCtor :: Can.Ctor -> Extractor (N.Name, [T.Type]) diff --git a/gnu/packages/patches/elm-compiler-relax-glsl-bound.patch b/gnu/packages/patches/elm-compiler-relax-glsl-bound.patch new file mode 100644 index 0000000000..3f8be810c2 --- /dev/null +++ b/gnu/packages/patches/elm-compiler-relax-glsl-bound.patch @@ -0,0 +1,19 @@ +commit 4c649a5a270aba15cc6a3913c3ad51a293047f40 +Author: Rémi Lefèvre <rlefevre@gmail.com> +Date: Mon Sep 3 19:18:54 2018 +0200 + + update language-glsl maximum version + +diff --git a/elm.cabal b/elm.cabal +index 48aa84f0..464fe9d5 100644 +--- a/elm.cabal ++++ b/elm.cabal +@@ -246,7 +246,7 @@ Executable elm + http-client >= 0.5 && < 0.6, + http-client-tls >= 0.3 && < 0.4, + http-types >= 0.9 && < 1.0, +- language-glsl >= 0.0.2 && < 0.3, ++ language-glsl >= 0.0.2 && < 0.4, + logict, + mtl >= 2.2.1 && < 3, + network >= 2.4 && < 2.7, diff --git a/gnu/packages/patches/libextractor-exiv2.patch b/gnu/packages/patches/libextractor-exiv2.patch new file mode 100644 index 0000000000..b92fef3ca1 --- /dev/null +++ b/gnu/packages/patches/libextractor-exiv2.patch @@ -0,0 +1,124 @@ +This patch allows us to build libextractor against exiv2 0.27.x. +Adapted from this upstream commit: + + commit 1ecee9a47717e36cb8a3925d011d1a6de11d631c + Author: Christian Grothoff <christian@grothoff.org> + Date: Mon Jul 29 17:58:18 2019 +0200 + + importing patch from Gentoo/AS to address exiv2 build issue (#5820) + +diff --git a/src/plugins/exiv2_extractor.cc b/src/plugins/exiv2_extractor.cc +index 8741d40..ef402a8 100644 +--- a/src/plugins/exiv2_extractor.cc ++++ b/src/plugins/exiv2_extractor.cc +@@ -27,10 +27,7 @@ + #include <cassert> + #include <cstring> + #include <math.h> +-#include <exiv2/exif.hpp> +-#include <exiv2/error.hpp> +-#include <exiv2/image.hpp> +-#include <exiv2/futils.hpp> ++#include <exiv2/exiv2.hpp> + + /** + * Enable debugging to get error messages. +@@ -180,7 +177,7 @@ public: + * + * @return -1 on error + */ +-#if EXIV2_VERSION >= EXIV2_MAKE_VERSION(0,26,0) ++#if EXIV2_TEST_VERSION(0,26,0) + virtual size_t size (void) const; + #else + virtual long int size (void) const; +@@ -316,7 +313,11 @@ ExtractorIO::getb () + const unsigned char *r; + + if (1 != ec->read (ec->cls, &data, 1)) ++#if EXIV2_TEST_VERSION(0,27,0) ++ throw Exiv2::BasicError<char> (Exiv2::kerDecodeLangAltQualifierFailed); ++#else + throw Exiv2::BasicError<char> (42 /* error code */); ++#endif + r = (const unsigned char *) data; + return *r; + } +@@ -371,7 +372,11 @@ ExtractorIO::putb (Exiv2::byte data) + void + ExtractorIO::transfer (Exiv2::BasicIo& src) + { ++#if EXIV2_TEST_VERSION(0,27,0) ++ throw Exiv2::BasicError<char> (Exiv2::kerDecodeLangAltQualifierFailed); ++#else + throw Exiv2::BasicError<char> (42 /* error code */); ++#endif + } + + +@@ -416,7 +421,11 @@ ExtractorIO::seek (long offset, + Exiv2::byte * + ExtractorIO::mmap (bool isWritable) + { ++#if EXIV2_TEST_VERSION(0,27,0) ++ throw Exiv2::BasicError<char> (Exiv2::kerDecodeLangAltQualifierFailed); ++#else + throw Exiv2::BasicError<char> (42 /* error code */); ++#endif + } + + +@@ -449,7 +458,7 @@ ExtractorIO::tell (void) const + * + * @return -1 on error + */ +-#if EXIV2_VERSION >= EXIV2_MAKE_VERSION(0,26,0) ++#if EXIV2_TEST_VERSION(0,26,0) + size_t + #else + long int +@@ -504,7 +513,11 @@ ExtractorIO::eof () const + std::string + ExtractorIO::path () const + { ++#if EXIV2_TEST_VERSION(0,27,0) ++ throw Exiv2::BasicError<char> (Exiv2::kerDecodeLangAltQualifierFailed); ++#else + throw Exiv2::BasicError<char> (42 /* error code */); ++#endif + } + + +@@ -517,7 +530,11 @@ ExtractorIO::path () const + std::wstring + ExtractorIO::wpath () const + { ++#if EXIV2_TEST_VERSION(0,27,0) ++ throw Exiv2::BasicError<char> (Exiv2::kerDecodeLangAltQualifierFailed); ++#else + throw Exiv2::BasicError<char> (42 /* error code */); ++#endif + } + #endif + +@@ -531,7 +548,11 @@ Exiv2::BasicIo::AutoPtr + ExtractorIO::temporary () const + { + fprintf (stderr, "throwing temporary error\n"); ++#if EXIV2_TEST_VERSION(0,27,0) ++ throw Exiv2::BasicError<char> (Exiv2::kerDecodeLangAltQualifierFailed); ++#else + throw Exiv2::BasicError<char> (42 /* error code */); ++#endif + } + + +@@ -697,7 +718,7 @@ EXTRACTOR_exiv2_extract_method (struct EXTRACTOR_ExtractContext *ec) + { + try + { +-#if EXIV2_MAKE_VERSION(0,23,0) <= EXIV2_VERSION ++#if !EXIV2_TEST_VERSION(0,24,0) + Exiv2::LogMsg::setLevel (Exiv2::LogMsg::mute); + #endif + std::auto_ptr<Exiv2::BasicIo> eio(new ExtractorIO (ec)); diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 55d88d07e8..56a857c0f8 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -6495,19 +6495,18 @@ Perl (back to 5.6.0).") (define-public perl-namespace-autoclean (package (name "perl-namespace-autoclean") - (version "0.28") + (version "0.29") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/E/ET/ETHER/" "namespace-autoclean-" version ".tar.gz")) (sha256 - (base32 - "0fbcq99yaix1aa99jl3v811dbw24il9jxnh5i2i23mddh4b0lhfd")))) + (base32 "012qqs561xyyhm082znmzsl8lz4n299fa6p0v246za2l9bkdiss5")))) (build-system perl-build-system) (native-inputs `(("perl-module-build" ,perl-module-build) - ("perl-test-requires" ,perl-test-requires))) + ("perl-test-needs" ,perl-test-needs))) (propagated-inputs `(("perl-b-hooks-endofscope" ,perl-b-hooks-endofscope) ("perl-namespace-clean" ,perl-namespace-clean) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 735f033883..e622f27d6b 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -24,7 +24,7 @@ ;;; Copyright © 2015, 2016 David Thompson <davet@gnu.org> ;;; Copyright © 2017 Mark Meyer <mark@ofosos.org> ;;; Copyright © 2018 Tomáš Čech <sleep_walker@gnu.org> -;;; Copyright © 2018 Nicolas Goaziou <mail@nicolasgoaziou.fr> +;;; Copyright © 2018, 2019 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2018 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2018 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2019 Vagrant Cascadian <vagrant@debian.org> @@ -3248,3 +3248,26 @@ Python.") (description "This package provides a @command{slufigy} command and library to create slugs from unicode strings while keeping it DRY.") (license license:expat))) + +(define-public python-branca + (package + (name "python-branca") + (version "0.3.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "branca" version)) + (sha256 + (base32 + "0pmigd521j2228xf8x34vbx0niwvms7xl7za0lymywj0vydjqxiy")))) + (build-system python-build-system) + (propagated-inputs + `(("python-jinja2" ,python-jinja2) + ("python-six" ,python-six))) + (native-inputs + `(("python-pytest" ,python-pytest))) + (home-page "https://github.com/python-visualization/branca") + (synopsis "Generate complex HTML+JS pages with Python") + (description "Generate complex HTML+JS pages with Python") + (license license:expat))) + diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 459d5d44e1..79bcd7090f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -4356,14 +4356,14 @@ the OleFileIO module from PIL, the Python Image Library.") (define-public python-pillow (package (name "python-pillow") - (version "5.4.1") + (version "6.1.0") (source (origin (method url-fetch) (uri (pypi-uri "Pillow" version)) (sha256 (base32 - "17waygkhhzjd75kajlfw9v57mbb41lcpg6cvkdijqd7smm76ccsj")))) + "1pnrsz0f0n0c819v1pdr8j6rm8xvhc9f3kh1fv9xpdp9n5ygf108")))) (build-system python-build-system) (native-inputs `(("python-pytest" ,python-pytest))) @@ -7312,14 +7312,14 @@ responses, rather than doing any computation.") (define-public python-pip (package (name "python-pip") - (version "18.1") + (version "19.2.1") (source (origin (method url-fetch) (uri (pypi-uri "pip" version)) (sha256 (base32 - "188fclay154s520n43s7cxxlhdaiysvxf19zk8vr1xbyjyyr58n0")))) + "100sd12ss4mbdj5lf3wawad29cm573b27765mq098x6xhcj71395")))) (build-system python-build-system) (arguments '(#:tests? #f)) ; there are no tests in the pypi archive. @@ -9978,13 +9978,13 @@ format.") (define-public python-twisted (package (name "python-twisted") - (version "19.2.1") + (version "19.7.0") (source (origin (method url-fetch) (uri (pypi-uri "Twisted" version ".tar.bz2")) (sha256 (base32 - "0liymyd4pzphizjlpwkncxjpm9akyr3lkfkm77yfg6wasv108b7s")))) + "17d3hnxv9qndagzz63mdpyk99xj63p9gq586vjn0rxk8cl197nym")))) (build-system python-build-system) (arguments '(#:tests? #f)) ; FIXME: some tests fail @@ -16058,3 +16058,78 @@ one-off scripts.") time-or-computationally-expensive properties quick and easy and works in Python 2 or 3.") (license license:bsd-3))) + +(define-public python-folium + (package + (name "python-folium") + (version "0.10.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "folium" version)) + (sha256 + (base32 + "18fzxijsgrb95r0a8anc9ba5ijyw3nlnv3rpavfbkqa5v878x84f")))) + (build-system python-build-system) + (propagated-inputs + `(("python-branca" ,python-branca) + ("python-jinja2" ,python-jinja2) + ("python-numpy" ,python-numpy) + ("python-requests" ,python-requests))) + (native-inputs + `(("python-pytest" ,python-pytest))) + (home-page "https://github.com/python-visualization/folium") + (synopsis "Make beautiful maps with Leaflet.js & Python") + (description "@code{folium} makes it easy to visualize data that’s been +manipulated in Python on an interactive leaflet map. It enables both the +binding of data to a map for @code{choropleth} visualizations as well as +passing rich vector/raster/HTML visualizations as markers on the map. + +The library has a number of built-in tilesets from OpenStreetMap, Mapbox, and +Stamen, and supports custom tilesets with Mapbox or Cloudmade API keys. It +supports Image, Video, GeoJSON and TopoJSON overlays.") + (license license:expat))) + +(define-public jube + (package + ;; This is a command-line tool, so no "python-" prefix. + (name "jube") + (version "2.2.2") + (source (origin + (method url-fetch) + (uri (string-append + "http://apps.fz-juelich.de/jsc/jube/jube2/download.php?version=" + version)) + (sha256 + (base32 + "0xq4k1q63s1p6swgyp61vahlrd1fqmgbm0gm5kpj8ikwy0yc0nqk")) + (file-name (string-append "jube-" version ".tar.gz")))) + (build-system python-build-system) + (home-page "https://apps.fz-juelich.de/jsc/jube/jube2/docu/index.html") + (synopsis "Benchmarking environment") + (description + "JUBE helps perform and analyze benchmarks in a systematic way. For each +benchmarked application, benchmark data is stored in a format that allows JUBE +to deduct the desired information. This data can be parsed by automatic pre- +and post-processing scripts that draw information and store it more densely +for manual interpretation.") + (license license:gpl3+))) + +(define-public python-pyroutelib3 + (package + (name "python-pyroutelib3") + (version "1.3.post1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pyroutelib3" version)) + (sha256 + (base32 + "1hpbydpn2alyswiajfbvhzq4c7f36vdmvxy91hgv8l1lb2g2vfrj")))) + (build-system python-build-system) + (propagated-inputs + `(("python-dateutil" ,python-dateutil))) + (home-page "https://github.com/MKuranowski/pyroutelib3") + (synopsis "Library for simple routing on OSM data") + (description "Library for simple routing on OSM data") + (license license:gpl3+))) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 1b70f842ae..ef9792bc0f 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -15,6 +15,8 @@ ;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com> ;;; Copyright © 2019 Pierre Neidhardt <mail@ambrevar.xyz> ;;; Copyright © 2019 Mikhail Kirillov <w96k.ru@gmail.com> +;;; Copyright © 2019 Jelle Licht <jlicht@fsfe.org> +;;; Copyright © 2019 Brian Leung <bkleung89@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -2034,13 +2036,13 @@ the SimpleCov code coverage tool for Ruby version 1.9 and above.") (define-public ruby-simplecov (package (name "ruby-simplecov") - (version "0.12.0") + (version "0.17.0") (source (origin (method url-fetch) (uri (rubygems-uri "simplecov" version)) (sha256 (base32 - "0ffhyrfnq2zm2mc1742a4hqy475g3qa1zf6yfldwg1ldh5sn3qbx")))) + "0dq0nkaxvbsnl70hkimy35g4yjfs3blx4s7nbpzbvgqx72hxgv5v")))) (build-system ruby-build-system) ;; Simplecov depends on rubocop for code style checking at build time. ;; Rubocop needs simplecov at build time. @@ -3637,24 +3639,24 @@ to reproduce user environments.") (define-public ruby-mini-portile-2 (package (inherit ruby-mini-portile) - (version "2.2.0") + (version "2.4.0") (source (origin (method url-fetch) (uri (rubygems-uri "mini_portile2" version)) (sha256 (base32 - "0g5bpgy08q0nc0anisg3yvwc1gc3inl854fcrg48wvg7glqd6dpm")))))) + "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy")))))) (define-public ruby-nokogiri (package (name "ruby-nokogiri") - (version "1.8.0") + (version "1.10.4") (source (origin (method url-fetch) (uri (rubygems-uri "nokogiri" version)) (sha256 (base32 - "1nffsyx1xjg6v5n9rrbi8y1arrcx2i5f21cp6clgh9iwiqkr7rnn")))) + "0nmdrqqz1gs0fwkgzxjl4wr554gr8dc1fkrqjc2jpsvwgm41rygv")))) (build-system ruby-build-system) (arguments ;; Tests fail because Nokogiri can only test with an installed extension, @@ -8570,6 +8572,33 @@ characteristics.") (home-page "https://github.com/sinatra/mustermann") (license license:expat))) +(define-public ruby-htmlentities + (package + (name "ruby-htmlentities") + (version "4.3.4") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "htmlentities" version)) + (sha256 + (base32 + "1nkklqsn8ir8wizzlakncfv42i32wc0w9hxp00hvdlgjr7376nhj")))) + (build-system ruby-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda _ + (map (lambda (file) + (invoke "ruby" "-Itest" file)) + (find-files "./test" ".*_test\\.rb"))))))) + (synopsis "Encode and decode (X)HTML entities") + (description + "This package provides a module for encoding and decoding (X)HTML +entities.") + (home-page "https://github.com/threedaymonk/htmlentities") + (license license:expat))) + (define-public ruby-sinatra (package (name "ruby-sinatra") @@ -8737,3 +8766,161 @@ then check out http://127.0.0.1:1080 to see the mail.") "This package provides a pure Ruby library for event-driven IO.") (home-page "https://github.com/castwide/backport") (license license:expat))) + +(define-public ruby-json-schema + (package + (name "ruby-json-schema") + (version "2.8.1") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "json-schema" version)) + (sha256 + (base32 + "1yv5lfmr2nzd14af498xqd5p89f3g080q8wk0klr3vxgypsikkb5")))) + (build-system ruby-build-system) + (arguments + `(#:tests? #f ; no tests + #:phases + (modify-phases %standard-phases + (replace 'build + (lambda _ + (invoke "gem" "build" ".gemspec")))))) + (propagated-inputs + `(("ruby-addressable" ,ruby-addressable))) + (synopsis "Ruby JSON Schema Validator") + (description "This library provides Ruby with an interface for validating +JSON objects against a JSON schema conforming to JSON Schema Draft 4. Legacy +support for JSON Schema Draft 3, JSON Schema Draft 2, and JSON Schema Draft 1 +is also included.") + (home-page "https://github.com/ruby-json-schema/json-schema") + (license license:expat))) + +(define-public swagger-diff + (package + (name "swagger-diff") + (version "1.1.2") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "swagger-diff" version)) + (sha256 + (base32 + "1hxx50nga1bqn254iqjcdwkc9c72364ks9lyjyw10ajz0l0ly7sn")))) + (build-system ruby-build-system) + (arguments + `(#:test-target "spec" + #:phases + (modify-phases %standard-phases + ;; Don't run or require rubocop, the code linting tool, as this is a + ;; bit unnecessary. + (add-after 'unpack 'dont-run-rubocop + (lambda _ + (substitute* "Rakefile" + ((".*rubocop.*") "") + ((".*RuboCop.*") "")) + #t))))) + (propagated-inputs + `(("ruby-json-schema" ,ruby-json-schema))) + (native-inputs + `(("bundler" ,bundler) + ("ruby-rspec-core" ,ruby-rspec-core) + ("ruby-rspec-expectations" ,ruby-rspec-expectations))) + (synopsis + "Compare Open API Initiative specification files") + (description + "Swagger::Diff is a utility for comparing two different Open API +Initiative (OAI) specifications (formerly known as Swagger specifications). +It is intended to determine whether a newer API specification is +backwards-compatible with an older API specification.") + (home-page "https://github.com/civisanalytics/swagger-diff") + (license license:bsd-3))) + +(define-public ruby-reverse-markdown + (package + (name "ruby-reverse-markdown") + (version "1.1.0") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "reverse_markdown" version)) + (sha256 + (base32 + "0w7y5n74daajvl9gixr91nh8670d7mkgspkk3ql71m8azq3nffbg")))) + (build-system ruby-build-system) + (propagated-inputs + `(("ruby-nokogiri" ,ruby-nokogiri))) + (native-inputs + `(("bundler" ,bundler) + ("ruby-rspec" ,ruby-rspec) + ("ruby-kramdown" ,ruby-kramdown) + ("ruby-simplecov" ,ruby-simplecov))) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "rspec")) + #t))))) + (synopsis "Convert HTML into Markdown") + (description + "This Ruby module allows you to map simple HTML back into +Markdown---e.g., if you want to import existing HTML data in your +application.") + (home-page "https://github.com/xijo/reverse_markdown") + (license license:wtfpl2))) + +(define-public ruby-solargraph + (package + (name "ruby-solargraph") + (version "0.36.0") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "solargraph" version)) + (sha256 + (base32 + "0b93xzkgd1h06da9gdnwivj1mzbil8lc072y2838dy6i7bxgpy9i")))) + (build-system ruby-build-system) + (propagated-inputs + `(("ruby-backport" ,ruby-backport) + ("bundler" ,bundler) + ("ruby-htmlentities" ,ruby-htmlentities) + ("ruby-jaro-winkler" ,ruby-jaro-winkler) + ("ruby-maruku" ,ruby-maruku) + ("ruby-nokogiri" ,ruby-nokogiri) + ("ruby-parser" ,ruby-parser) + ("ruby-reverse-markdown" ,ruby-reverse-markdown) + ("ruby-rubocop" ,ruby-rubocop) + ("ruby-thor" ,ruby-thor) + ("ruby-tilt" ,ruby-tilt) + ("ruby-yard" ,ruby-yard))) + (native-inputs + `(("ruby-rspec" ,ruby-rspec) + ("ruby-pry" ,ruby-pry) + ("ruby-simplecov" ,ruby-simplecov) + ("ruby-webmock" ,ruby-webmock-2))) + ;; FIXME: can't figure out how to run the tests properly: + + ;; An error occurred while loading spec_helper. + ;; Failure/Error: return gem_original_require(path) + ;; LoadError: + ;; cannot load such file -- spec_helper + (arguments + '(#:tests? #f + #:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "rspec")) + #t))))) + (synopsis + "IDE tools for code completion, inline documentation, and static analysis") + (description + "Solargraph provides a comprehensive suite of tools for Ruby +programming: intellisense, diagnostics, inline documentation, and type +checking.") + (home-page "https://solargraph.org/") + (license license:expat))) diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm index 3d6ad4f9d7..90892a57e8 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.") (define-public python-pyscard (package (name "python-pyscard") - (version "1.9.8") + (version "1.9.9") (source (origin (method url-fetch) ;; The maintainer publishes releases on various sites, but @@ -363,7 +363,7 @@ retrieve a YubiKey's serial number, and so forth.") version "/pyscard-" version ".tar.gz")) (sha256 (base32 - "15fh00z1an6r5j7hrz3jlq0rb3jygwf3x4jcwsa008bv8vpcg7gm")))) + "082cjkbxadaz2jb4rbhr0mkrirzlqyqhcf3r823qb0q1k50ybgg6")))) (build-system python-build-system) (arguments `(#:phases diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm index 1c80b7978e..ccebe40e9d 100644 --- a/gnu/packages/sync.scm +++ b/gnu/packages/sync.scm @@ -183,8 +183,20 @@ their folder. #:test-target "tests" #:phases (modify-phases %standard-phases - ;; No install target. + (add-after 'unpack 'search-$PATH-for-binaries + ;; lsyncd requires and hard-codes absolute file names to binaries. + ;; Make it fall back to searching $PATH for relative file names. + (lambda _ + (substitute* "lsyncd.c" + (("execv\\(") "execvp(")) + (substitute* (list "lsyncd.lua" + "default-direct.lua" + "default-rsync.lua" + "default-rsyncssh.lua") + (("(|/usr)/bin/") "")) + #t)) (replace 'install + ;; No install target. (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (bin (string-append out "/bin")) diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 9077d295db..bca8b14dad 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}, while also supporting native scrolling and @command{tmux} control mode (@code{tmux -CC}).") (license license:asl2.0))) + +(define-public wterm + (package + (name "wterm") + (version "0.7") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/majestrate/wterm.git") + (commit "0ae42717c08a85a6509214e881422c7fbe7ecc45"))) + (sha256 + (base32 + "0g4lzmc1w6na81i6hny32xds4xfig4xzswzfijyi6p93a1226dv0")) + (file-name (git-file-name name version)))) + (build-system gnu-build-system) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("fontconfig" ,fontconfig) + ("freetype" ,freetype) + ("libdrm" ,libdrm) + ("libxkbcommon" ,libxkbcommon) + ("ncurses" ,ncurses) + ("pixman" ,pixman) + ("wayland" ,wayland))) + (arguments + '(#:tests? #f + + ;; Without -j1 it fails to find file libwld.a. + #:parallel-build? #f + + #:make-flags (list "CC=gcc" + (string-append "PREFIX=" %output) + (string-append "TERMINFO=" + (assoc-ref %outputs "out") + "/share/terminfo")) + #:phases + (modify-phases %standard-phases + (delete 'configure) + (add-after 'unpack 'terminfo-fix + (lambda _ + (substitute* "Makefile" + (("\ttic .*") "\tmkdir -p $(SHARE_PREFIX)/share/terminfo +\ttic -o $(SHARE_PREFIX)/share/terminfo -s wterm.info\n")) + #t))))) + (native-search-paths + (list (search-path-specification + (variable "TERMINFO_DIRS") + (files '("share/terminfo"))))) + (home-page "https://github.com/majestrate/wterm") + (synopsis "Terminal emulator for Wayland") + (description "wterm is a native Wayland terminal emulator based on +an st fork using wld. st is a simple terminal emulator for X originally +made by suckless.") + (license license:x11))) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 20dc69282a..833a3715af 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -532,13 +532,13 @@ netcat implementation that supports TLS.") (package (name "python-acme") ;; Remember to update the hash of certbot when updating python-acme. - (version "0.35.1") + (version "0.37.2") (source (origin (method url-fetch) (uri (pypi-uri "acme" version)) (sha256 (base32 - "08y4ankn0di34c9d1c3pqd9by9n0ckzz7b5ld1g0fx6c32sbi259")))) + "0p3zqhna9p8iy5i9mfhzdf5bmjigs05r6rlwnxykk4n67fp8yyc8")))) (build-system python-build-system) (arguments `(#:phases @@ -586,10 +586,10 @@ netcat implementation that supports TLS.") (version (package-version python-acme)) (source (origin (method url-fetch) - (uri (pypi-uri name version)) + (uri (pypi-uri "certbot" version)) (sha256 (base32 - "0q0855qvsvs4mgglss5iim7f1p22rv4rn1n6j731vv869v0yrs6p")))) + "1xbfv4fwkgfp9qqzlk8wxbhchc61349m26q9fg35j9fnm253cm74")))) (build-system python-build-system) (arguments `(,@(substitute-keyword-arguments (package-arguments python-acme) diff --git a/gnu/packages/tmux.scm b/gnu/packages/tmux.scm index 730cb421de..6f1ef45ae1 100644 --- a/gnu/packages/tmux.scm +++ b/gnu/packages/tmux.scm @@ -38,7 +38,7 @@ (define-public tmux (package (name "tmux") - (version "2.9") + (version "2.9a") (source (origin (method url-fetch) (uri (string-append @@ -46,12 +46,12 @@ version "/tmux-" version ".tar.gz")) (sha256 (base32 - "10195hp5ydkwwmpcr7188fgx9daqwrslb1lylgrrkzc6yhr1541l")))) + "099vn8mg2nnizbqqc87a5mxm8c46kadfhx30dgxbz9hp8mx1d7c3")))) (build-system gnu-build-system) (inputs `(("libevent" ,libevent) ("ncurses" ,ncurses))) - (home-page "http://tmux.github.io/") + (home-page "https://tmux.github.io/") (synopsis "Terminal multiplexer") (description "tmux is a terminal multiplexer: it enables a number of terminals (or diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm index c330c853d5..2e8e48c8e2 100644 --- a/gnu/packages/tor.scm +++ b/gnu/packages/tor.scm @@ -50,14 +50,14 @@ (define-public tor (package (name "tor") - (version "0.4.0.5") + (version "0.4.1.5") (source (origin (method url-fetch) (uri (string-append "https://dist.torproject.org/tor-" version ".tar.gz")) (sha256 (base32 - "0vk9j3ybz5dwwbmqrdj1bjcsxy76pc8frmfvflkdzwfkvkqcp8mm")))) + "0984jb6hdcc10f7aq8xzl7l4jf93skp45wkv2v63z4zv0nvf0r58")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index e05a4928f4..4ef46df50b 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -146,14 +146,14 @@ as well as the classic centralized workflow.") (name "git") ;; XXX When updating Git, check if the special 'git-source' input to cgit ;; needs to be updated as well. - (version "2.22.1") + (version "2.23.0") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/software/scm/git/git-" version ".tar.xz")) (sha256 (base32 - "093qjgagha937w96izkpsjkhxf5drsa7rvk5snlyjivqnwxgkqac")))) + "0rv0y45gcd3h191isppn77acih695v4pipdj031jvs9rd1ds0kr3")))) (build-system gnu-build-system) (native-inputs `(("native-perl" ,perl) @@ -166,7 +166,7 @@ as well as the classic centralized workflow.") version ".tar.xz")) (sha256 (base32 - "17vpqv9g8li58njx7z5124b3c2zb2n63z4dalh5gw9iys7qb8446")))) + "0sllhyl0w29v4n303hqfmcc3apafnwk4sk78anyjjhpzd0zl6n4m")))) ;; For subtree documentation. ("asciidoc" ,asciidoc) ("docbook-xsl" ,docbook-xsl) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 9b809d007f..06b32c065e 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -357,15 +357,14 @@ H.264 (MPEG-4 AVC) video streams.") (define-public mkvtoolnix (package (name "mkvtoolnix") - (version "31.0.0") + (version "37.0.0") (source (origin (method url-fetch) (uri (string-append "https://mkvtoolnix.download/sources/" - name "-" version ".tar.xz")) + "mkvtoolnix-" version ".tar.xz")) (sha256 - (base32 - "0d8va2iamzc7y3wi71z8mk2vnqvnkgwb2p7casdfp37400x8r2pr")) + (base32 "0r4d9318ymb9a0mkc0shi9p4kjy3m70s49v4f8dmjhvj63silhix")) (modules '((guix build utils))) (snippet '(begin ;; Delete bundled libraries. @@ -1052,7 +1051,7 @@ videoformats depend on the configuration flags of ffmpeg.") (define-public vlc (package (name "vlc") - (version "3.0.7.1") + (version "3.0.8") (source (origin (method url-fetch) (uri (string-append @@ -1061,7 +1060,7 @@ videoformats depend on the configuration flags of ffmpeg.") "/vlc-" version ".tar.xz")) (sha256 (base32 - "1xb4c8n0hkwijzfdlbwadhxnx9z8rlhmrdq4c7q74rq9f51q0m86")))) + "1xmxjpyzdhabchwncz6lvx3kzvl7fz9c42bkv3nbj68albs9w570")))) (build-system gnu-build-system) (native-inputs `(("flex" ,flex) @@ -3373,30 +3372,32 @@ online.") (license license:expat))) (define-public vidstab - (package - (name "vidstab") - (version "1.1.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/georgmartius/vid.stab.git") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0a3frpm2kdbx7vszhg64p3alisag73bcspl7fp3a2f1kgq7rbh38")))) - (build-system cmake-build-system) - (arguments - '(#:tests? #f)) ; tests are not run as part of standard build process - (home-page "http://public.hronopik.de/vid.stab/") - (synopsis "Video stabilization library") - (description "Vidstab is a video stabilization library which can be used + (let ((commit "aeabc8daa7904f9edf7441a11f293965a5ef53b8") + (revision "0")) + (package + (name "vidstab") + (version (git-version "1.1.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/georgmartius/vid.stab.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "042iy0f3khwzr68djzvqgn301sy21ljvkf52rnc2c73q7ircnzzn")))) + (build-system cmake-build-system) + (arguments + '(#:tests? #f)) ; tests are not run as part of standard build process + (home-page "http://public.hronopik.de/vid.stab/") + (synopsis "Video stabilization library") + (description "Vidstab is a video stabilization library which can be used with FFmpeg. A video acquired using a hand-held camera or a camera mounted on a vehicle typically suffers from undesirable shakes and jitters. Activities such as surfing, skiing, riding and walking while shooting videos are especially prone to erratic camera shakes. Vidstab targets these video contents to help create smoother and stable videos.") - (license license:gpl2+))) + (license license:gpl2+)))) (define-public libopenshot (package diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 314ed8c149..9b2be15e20 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -133,14 +133,14 @@ (define-public httpd (package (name "httpd") - (version "2.4.39") + (version "2.4.41") (source (origin (method url-fetch) (uri (string-append "mirror://apache/httpd/httpd-" version ".tar.bz2")) (sha256 (base32 - "18ngvsjq65qxk3biggnkhkq8jlll9dsg9n3csra9p99sfw2rvjml")))) + "0h7a31yxwyh7h521frnmlppl0h7sh9icc3ka6vlmlcg5iwllhg8k")))) (build-system gnu-build-system) (native-inputs `(("pcre" ,pcre "bin"))) ;for 'pcre-config' (inputs `(("apr" ,apr) @@ -5417,7 +5417,7 @@ snippets on @url{https://commandlinefu.com}.") (define-public rss-bridge (package (name "rss-bridge") - (version "2019-01-13") + (version "2019-07-06") (source (origin (method git-fetch) @@ -5427,7 +5427,7 @@ snippets on @url{https://commandlinefu.com}.") (file-name (git-file-name name version)) (sha256 (base32 - "1m0dq491954f0d7k4508ddlywk09whcz9j21rc4yk3lbwpf0nd4c")))) + "0zd0c9xzvpx55mvj8xrafakfkvafnwkkvhw9b1j0bf897xdkfsyb")))) (build-system trivial-build-system) (arguments '(#:modules ((guix build utils)) diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index 43dae3cf7c..4cf1a3ac4b 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -72,7 +72,7 @@ (define-public wine (package (name "wine") - (version "4.0.1") + (version "4.0.2") (source (origin (method url-fetch) (uri (string-append "https://dl.winehq.org/wine/source/" @@ -80,7 +80,7 @@ "/wine-" version ".tar.xz")) (sha256 (base32 - "0j29df0px6dzin4j0cbxgza4msvf9spmwranv25krq1g9kq959nk")))) + "0x5x9pvhryzhq1m7i8gx5wwwj341zz05zymadlhfw5w45xlm0h4r")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) ("gettext" ,gettext-minimal) @@ -318,7 +318,7 @@ integrate Windows applications into your desktop.") (define-public wine-staging-patchset-data (package (name "wine-staging-patchset-data") - (version "4.13") + (version "4.14") (source (origin (method git-fetch) @@ -328,7 +328,7 @@ integrate Windows applications into your desktop.") (file-name (git-file-name name version)) (sha256 (base32 - "0bbwsd2qpjilxpjscqbp78p0gl0awj1yj62g0wvybh4x89fzy8zj")))) + "1s17hcrp1aa0v99y5iav2s0lxdx2rzgm7z0c4zhxyydqxj399f5j")))) (build-system trivial-build-system) (native-inputs `(("bash" ,bash) @@ -374,7 +374,7 @@ integrate Windows applications into your desktop.") (file-name (string-append name "-" version ".tar.xz")) (sha256 (base32 - "0rqx8g394aj5q913cd18zsi60sldvxarrp178w6ja0y4rd8l25vr")))) + "1rl1a3k5sr0hyxc61d68kwandhxcnxwv6b77vh7x2rkl1h4nxmfs")))) (inputs `(("autoconf" ,autoconf) ; for autoreconf ("faudio" ,faudio) ("ffmpeg" ,ffmpeg) @@ -499,7 +499,6 @@ integrated into the main branch.") (script (string-append (assoc-ref %build-inputs "wine-staging-patchset-data") "/share/wine-staging/patches/patchinstall.sh"))) - ;; Exclude specific patches that conflict with FAudio. (invoke script (string-append "DESTDIR=" ".") "--all") #t))) (add-after 'install 'copy-wine32-binaries diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index bd30fd2fd2..bcc61f59af 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -716,18 +716,18 @@ shows it again when the mouse cursor moves or a mouse button is pressed.") (define-public xlockmore (package (name "xlockmore") - (version "5.57") + (version "5.58") (source (origin (method url-fetch) (uri (list (string-append "http://sillycycle.com/xlock/" - name "-" version ".tar.xz") + "xlockmore-" version ".tar.xz") ;; Previous releases are moved to a subdirectory. (string-append "http://sillycycle.com/xlock/" "recent-releases/" - name "-" version ".tar.xz"))) + "xlockmore-" version ".tar.xz"))) (sha256 (base32 - "18r8rh8fzdn9miicbpc3qbdd4mm2g1jpsbcvj29sr66pxydzkb7r")))) + "1va11sbv5lbkxkp0i0msz5md3n2n82nzppk27rzdrw7y79vq37zw")))) (build-system gnu-build-system) (arguments '(#:configure-flags (list (string-append "--enable-appdefaultdir=" diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 926fb746b0..352a28a8b1 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -1805,7 +1805,7 @@ used with other display managers such as gdm or kdm.") (define-public setxkbmap (package (name "setxkbmap") - (version "1.3.1") + (version "1.3.2") (source (origin (method url-fetch) @@ -1815,7 +1815,7 @@ used with other display managers such as gdm or kdm.") ".tar.bz2")) (sha256 (base32 - "1qfk097vjysqb72pq89h0la3462kbb2dh1d11qzs2fr67ybb7pd9")))) + "1xdrxs65v7d0rw1yaz0vsz55w4hxym99216p085ya9978j379wlg")))) (build-system gnu-build-system) (inputs `(("libxkbfile" ,libxkbfile) @@ -4155,16 +4155,16 @@ an X server.") (define-public xrandr (package (name "xrandr") - (version "1.5.0") + (version "1.5.1") (source (origin (method url-fetch) (uri (string-append "mirror://xorg/individual/app/xrandr-" - version ".tar.bz2")) + version ".tar.xz")) (sha256 (base32 - "1kaih7rmzxr1vp5a5zzjhm5x7dn9mckya088sqqw026pskhx9ky1")))) + "0ql75s1n3dm2m3g1ilb9l6hqh15r0v709bgghpwazy3jknpnvivv")))) (build-system gnu-build-system) (inputs `(("libxrender" ,libxrender) diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 537d30add5..dcb7278f0f 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2018 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2019 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2019 John Soo <jsoo1@asu.edu> ;;; ;;; This file is part of GNU Guix. ;;; @@ -801,10 +802,14 @@ to add @var{device} to the kernel's entropy pool. The service will fail if (description "Install the given fonts on the specified ttys (fonts are per virtual console on GNU/Linux). The value of this service is a list of -tty/font pairs like: +tty/font pairs. The font can be the name of a font provided by the @code{kbd} +package or any valid argument to @command{setfont}, as in this example: @example -'((\"tty1\" . \"LatGrkCyr-8x16\")) +'((\"tty1\" . \"LatGrkCyr-8x16\") + (\"tty2\" . (file-append + font-tamzen + \"/share/kbd/consolefonts/TamzenForPowerline10x20.psf\"))) @end example\n"))) (define* (console-font-service tty #:optional (font "LatGrkCyr-8x16")) diff --git a/gnu/services/cuirass.scm b/gnu/services/cuirass.scm index f92d33bf94..138a5cf67c 100644 --- a/gnu/services/cuirass.scm +++ b/gnu/services/cuirass.scm @@ -106,8 +106,6 @@ #$(scheme-file "cuirass-specs.scm" specs) "--database" #$database "--ttl" #$(string-append (number->string ttl) "s") - "--port" #$(number->string port) - "--listen" #$host "--interval" #$(number->string interval) #$@(if use-substitutes? '("--use-substitutes") '()) #$@(if one-shot? '("--one-shot") '()) @@ -121,6 +119,28 @@ #:user #$user #:group #$group #:log-file #$log-file)) + (stop #~(make-kill-destructor))) + (shepherd-service + (documentation "Run Cuirass web interface.") + (provision '(cuirass-web)) + (requirement '(guix-daemon networking)) + (start #~(make-forkexec-constructor + (list (string-append #$cuirass "/bin/cuirass") + "--cache-directory" #$cache-directory + "--specifications" + #$(scheme-file "cuirass-specs.scm" specs) + "--database" #$database + "--ttl" #$(string-append (number->string ttl) "s") + "--web" + "--port" #$(number->string port) + "--listen" #$host + "--interval" #$(number->string interval) + #$@(if use-substitutes? '("--use-substitutes") '()) + #$@(if fallback? '("--fallback") '())) + + #:user #$user + #:group #$group + #:log-file #$log-file)) (stop #~(make-kill-destructor))))))) (define (cuirass-account config) diff --git a/gnu/services/pm.scm b/gnu/services/pm.scm index 3817bd09de..1e01b5059d 100644 --- a/gnu/services/pm.scm +++ b/gnu/services/pm.scm @@ -401,7 +401,8 @@ shutdown on system startup.")) (compose list tlp-configuration-tlp)) (service-extension activation-service-type tlp-activation))) - (default-value (tlp-configuration)))) + (default-value (tlp-configuration)) + (description "Run TLP, a power management tool."))) (define (generate-tlp-documentation) (generate-documentation @@ -441,4 +442,6 @@ shutdown on system startup.")) (name 'thermald) (extensions (list (service-extension shepherd-root-service-type thermald-shepherd-service))) - (default-value (thermald-configuration)))) + (default-value (thermald-configuration)) + (description "Run thermald, a CPU frequency scaling service that helps +prevent overheating."))) diff --git a/gnu/system/linux-initrd.scm b/gnu/system/linux-initrd.scm index c90b87c023..7e9563b923 100644 --- a/gnu/system/linux-initrd.scm +++ b/gnu/system/linux-initrd.scm @@ -133,7 +133,10 @@ MODULES and taken from LINUX." (copy-file module (string-append #$output "/" (basename module)))) - (delete-duplicates modules))))) + (delete-duplicates modules)) + + ;; Hyphen or underscore? This database tells us. + (write-module-name-database #$output)))) (computed-file "linux-modules" build-exp)) |