From 4bee557d4346a366fb27d2352f899f1e1ec723cc Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 16 Apr 2019 23:10:33 +0200 Subject: gnu: rubberband: Update to 1.8.2. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/audio.scm (rubberband): Update to 1.8.2. [arguments]: Add ‘skip-jni-installation’ phase. --- gnu/packages/audio.scm | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 8160ba5487..10dab82ba1 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -2316,7 +2316,7 @@ (define-public raul-devel (define-public rubberband (package (name "rubberband") - (version "1.8.1") + (version "1.8.2") (source (origin (method url-fetch) (uri @@ -2326,9 +2326,19 @@ (define-public rubberband (file-name (string-append name "-" version ".tar.bz2")) (sha256 (base32 - "05amrbrxx0da3w7m237q51799r8xgs4ffqabi2qv06hq8dpcj386")))) + "0462fmjnfqpv2qi0s6ny42drqarkr0xy9lw8frjmfgzyzl5n9294")))) (build-system gnu-build-system) - (arguments `(#:tests? #f)) ; no check target + (arguments + `(#:tests? #f ; no check target + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'skip-jni-installation + ;; ‘make install’ unconditionally installs librubberband-jni.so, + ;; which is never built by ‘make all’. Skip it. + (lambda _ + (substitute* "Makefile.in" + ((".*cp -f \\$\\(JNI_TARGET\\).*") "")) + #t))))) (inputs `(("ladspa" ,ladspa) ("libsamplerate" ,libsamplerate) -- cgit v1.2.3 From 881a3521f6121eb8270de63fb08daf13633f1a58 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 16 Apr 2019 23:14:09 +0200 Subject: gnu: emacs-irony-mode: Fix typo in description. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/emacs-xyz.scm (emacs-irony-mode)[description]: Re-spell ‘resistent’. --- gnu/packages/emacs-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 7aec695205..54663496fe 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -2899,7 +2899,7 @@ (define-public emacs-irony-mode (description "Irony-mode provides Clang-assisted syntax checking and completion for C, C++, and ObjC in GNU Emacs. Using @code{libclang} it can provide syntax checking and autocompletion on compiler level which is very -resistent against false positives. It also integrates well with other +resistant against false positives. It also integrates well with other packages like @code{eldoc-mode} and especially @code{company-mode} as described on the homepage.") (license license:gpl3+))) -- cgit v1.2.3 From 0525864bdc08778892116e5cc2684a3b958d6e03 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 16 Apr 2019 23:16:31 +0200 Subject: gnu: bennu-game-development-modules: Fix typos. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/game-development.scm (bennu-game-development-modules) [synopsis, description]: Fix ‘developement’ spelling. --- gnu/packages/game-development.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 79b87856d5..5dd22215b8 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1400,9 +1400,9 @@ (define-public bennu-game-development-modules ("openssl" ,openssl) ("sdl-mixer" ,sdl-mixer) ("bennu-game-development" ,bennu-game-development))) - (synopsis "Modules for the Bennu Game Developement programming language") + (synopsis "Modules for the Bennu Game Development programming language") (description "This package contains a collection of modules for the Bennu -Game Developement programming language, from CD handling through SDL to +Game Development programming language, from CD handling through SDL to joystick support."))) (define-public plib -- cgit v1.2.3 From b24ada5110e9f6b5b3d4777d6de3c48d12bb3fec Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 16 Apr 2019 23:26:01 +0200 Subject: gnu: snd: Update to 19.3. * gnu/packages/audio.scm (snd): Update to 19.3. --- gnu/packages/audio.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 10dab82ba1..c6ea0c9ca3 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -3385,14 +3385,14 @@ (define-public bluez-alsa (define-public snd (package (name "snd") - (version "19.2") + (version "19.3") (source (origin (method url-fetch) (uri (string-append "ftp://ccrma-ftp.stanford.edu/pub/Lisp/" "snd-" version ".tar.gz")) (sha256 (base32 - "1a6ls2hyvggss12idca22hq5vsq4jw2xkwrx22dx29i9926gdr6h")))) + "16j3fqyw361wdsr1076f0p3va2y7wdzq1lvr4ijz1ajmbxdlc723")))) (build-system glib-or-gtk-build-system) (arguments `(#:tests? #f ; no tests -- cgit v1.2.3 From 18061de9e160c353dd2c57d00ee20ec91313fc86 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 16 Apr 2019 23:53:13 +0200 Subject: gnu: minetest: Update to 5.0.1. * gnu/packages/games.scm (minetest): Update to 5.0.1. games minetest --- gnu/packages/games.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 0b93409c76..8e17d29d2a 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -1829,7 +1829,7 @@ (define minetest-data (define-public minetest (package (name "minetest") - (version "5.0.0") + (version "5.0.1") (source (origin (method git-fetch) (uri (git-reference @@ -1838,7 +1838,7 @@ (define-public minetest (file-name (git-file-name name version)) (sha256 (base32 - "1b8n8nzlvmld1hl3zgs1xg4jbc1nsf1m2bn7fi794vdr06s6n911")) + "11i8fqjpdggqfdlx440k5758zy0nbf9phxan9r63mavc7mph88ay")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 564df7e58427248f4678d02d720286d0a0538d0d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 17 Apr 2019 00:22:22 +0200 Subject: gnu: dungeon-crawl-stone-soup: Update to 0.23.2. * gnu/packages/games.scm (dungeon-crawl-stone-soup): Update to 0.23.2. --- gnu/packages/games.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 8e17d29d2a..c7bd35fbff 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -4476,7 +4476,7 @@ (define-public fillets-ng (define-public dungeon-crawl-stone-soup (package (name "dungeon-crawl-stone-soup") - (version "0.23.1") + (version "0.23.2") (source (origin (method url-fetch) @@ -4489,8 +4489,7 @@ (define-public dungeon-crawl-stone-soup (string-append "http://crawl.develz.org/release/stone_soup-" version "-nodeps.tar.xz"))) (sha256 - (base32 - "0c3mx49kpz6i2xvv2dwsaj9s7mm4mif1h2qdkfyi80lv2j1ay51h")) + (base32 "1hw10hqhh688mrqs9vxrl17y1dzfjzsmxz6izg1a9dzmjlhrc01a")) (patches (search-patches "crawl-upgrade-saves.patch")))) (build-system gnu-build-system) (inputs @@ -4512,7 +4511,7 @@ (define-public dungeon-crawl-stone-soup (list (string-append "SQLITE_INCLUDE_DIR=" sqlite "/include") (string-append "prefix=" out) "SAVEDIR=~/.crawl" - ;; Don't compile with SSE on systems which don't use it + ;; Don't compile with SSE on systems which don't have it. ,@(match (%current-system) ((or "i686-linux" "x86_64-linux") '()) -- cgit v1.2.3 From 067826abe37fd087681da4ed906d398977a14847 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 17 Apr 2019 00:42:16 +0200 Subject: gnu: the-legend-of-edgar: Update to 1.31. * gnu/packages/games.scm (the-legend-of-edgar): Update to 1.31. [inputs]: Use SDL 2 union. [arguments]: Adjust accordingly. --- gnu/packages/games.scm | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index c7bd35fbff..d22d8ba7a4 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -6485,7 +6485,7 @@ (define-public arx-libertatis (define-public the-legend-of-edgar (package (name "the-legend-of-edgar") - (version "1.30") + (version "1.31") (source (origin (method url-fetch) @@ -6493,10 +6493,9 @@ (define-public the-legend-of-edgar (string-append "https://github.com/riksweeney/edgar/releases/download/" version "/edgar-" version "-1.tar.gz")) (sha256 - (base32 - "0bhbs33dg0nb8wqlh6px1jj41j05f89ngdqwdkffabmjk7wq5isx")))) + (base32 "0i4851ci8a86ql4bhdq3xdfmf4b9z5zrd4xpc6vhi06697zgm13i")))) (build-system gnu-build-system) - (arguments '(#:tests? #f ; there are no tests + (arguments '(#:tests? #f ; there are no tests #:make-flags (list "CC=gcc" (string-append "PREFIX=" (assoc-ref %outputs "out")) @@ -6506,14 +6505,13 @@ (define-public the-legend-of-edgar (delete 'configure) (add-before 'build 'fix-env (lambda* (#:key inputs #:allow-other-keys) - (setenv "CPATH" (string-append (assoc-ref inputs "sdl") - "/include/SDL/")) + (setenv "CPATH" + (string-append (assoc-ref inputs "sdl2-union") + "/include/SDL2")) #t))))) - (inputs `(("sdl" ,sdl) - ("sdl-img" ,sdl-image) - ("sdl-mixer" ,sdl-mixer) - ("sdl-ttf" ,sdl-ttf) - ("zlib" ,zlib))) + (inputs + `(("sdl2-union" ,(sdl-union (list sdl2 sdl2-image sdl2-mixer sdl2-ttf))) + ("zlib" ,zlib))) (native-inputs `(("pkg-config" ,pkg-config) ("autoconf" ,autoconf) -- cgit v1.2.3 From 9b15ef935071670da5f8d04fe52e37403b446a6d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 17 Apr 2019 05:56:54 +0200 Subject: gnu: calf: Update to 0.90.2. * gnu/packages/audio.scm (calf): Update to 0.90.2. --- gnu/packages/audio.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index c6ea0c9ca3..5429c83d67 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -547,14 +547,14 @@ (define-public azr3 (define-public calf (package (name "calf") - (version "0.90.1") + (version "0.90.2") (source (origin (method url-fetch) (uri (string-append "https://calf-studio-gear.org/files/calf-" version ".tar.gz")) (sha256 (base32 - "0znwx5gidr5n503gya9n8gagr8cfym6cwlbiv2r6iksji7jc4fpb")))) + "0bn4j1klw2yfxz8clbmasaydifq25rdfsv0n6iisxrzcj1lx7sgh")))) (build-system gnu-build-system) (inputs `(("fluidsynth" ,fluidsynth) -- cgit v1.2.3 From 315d7dda35b62b9b6c93cc9e655fb35125fcf45c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 17 Apr 2019 06:12:48 +0200 Subject: gnu: gtkwave: Don't use NAME in source URI. * gnu/packages/fpga.scm (gtkwave)[source]: Hard-code NAME. --- gnu/packages/fpga.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/fpga.scm b/gnu/packages/fpga.scm index 24a1219ce5..9760a75706 100644 --- a/gnu/packages/fpga.scm +++ b/gnu/packages/fpga.scm @@ -305,7 +305,7 @@ (define-public gtkwave (source (origin (method url-fetch) (uri (string-append "http://gtkwave.sourceforge.net/" - name "-" version ".tar.gz")) + "gtkwave-" version ".tar.gz")) (sha256 (base32 "0lc4y2vizrbxldjk5yw2i4y7pyprjdjqx3iafzjfnin694zp2630")))) -- cgit v1.2.3 From 9a8aac168907ec97602d19e2e75bbb3f63898a68 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 17 Apr 2019 06:15:09 +0200 Subject: gnu: csound: Update to 6.12.2. * gnu/packages/audio.scm (csound): Update to 6.12.2. --- gnu/packages/audio.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 5429c83d67..9b17098de4 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -713,7 +713,7 @@ (define-public swh-plugins-lv2 (define-public csound (package (name "csound") - (version "6.12.0") + (version "6.12.2") (source (origin (method git-fetch) (uri (git-reference @@ -722,7 +722,7 @@ (define-public csound (file-name (git-file-name name version)) (sha256 (base32 - "0pv4s54cayvavdp6y30n3r1l5x83x9whyyd2v24y0dh224v3hbxi")))) + "01krxcf0alw9k7p5sv0s707600an4sl7lhw3bymbwgqrj0v2p9z2")))) (build-system cmake-build-system) (inputs `(("alsa-lib" ,alsa-lib) -- cgit v1.2.3 From 11f38e9052d31efa14520eee3513954fc895891c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 17 Apr 2019 06:15:17 +0200 Subject: gnu: qjackctl: Update to 0.5.7. * gnu/packages/audio.scm (qjackctl): Update to 0.5.7. --- gnu/packages/audio.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 9b17098de4..7b0d7c21ba 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -2120,14 +2120,14 @@ (define-public pcaudiolib (define-public qjackctl (package (name "qjackctl") - (version "0.5.6") + (version "0.5.7") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/qjackctl/qjackctl/" version "/qjackctl-" version ".tar.gz")) (sha256 (base32 - "0wlmbb9m7cf3wr7c2h2hji18592x2b119m7mx85wksjs6rjaq2mj")))) + "1g6a5j74p45yisl28bw4fcc9nr6b710ikk459p4mp6djh9gs8v95")))) (build-system gnu-build-system) (arguments '(#:tests? #f)) ; no check target -- cgit v1.2.3 From 9043c1c56196ce0737b9ca54efe830212dd9080e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 17 Apr 2019 06:15:25 +0200 Subject: gnu: qsynth: Update to 0.5.6. * gnu/packages/audio.scm (qsynth): Update to 0.5.6. --- gnu/packages/audio.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 7b0d7c21ba..cb0a3df3b5 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -2871,14 +2871,14 @@ (define-public portaudio (define-public qsynth (package (name "qsynth") - (version "0.5.5") + (version "0.5.6") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/qsynth/qsynth/" version "/qsynth-" version ".tar.gz")) (sha256 - (base32 "08x7znvbwi9miavcarymi7dsv8njmxzwzma20dbmz8j2aswm53w5")))) + (base32 "0h4hhja8qbyzd6v24flw9wr4mwl03nplryx1gyrppn7sg13l1sx6")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no "check" phase -- cgit v1.2.3 From 38dd8b60585fea6749a4fcd35ce167bdee8fb2e6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 17 Apr 2019 06:15:36 +0200 Subject: gnu: gtkwave: Update to 3.3.100. * gnu/packages/fpga.scm (gtkwave): Update to 3.3.100. --- gnu/packages/fpga.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/fpga.scm b/gnu/packages/fpga.scm index 9760a75706..83854ef9c6 100644 --- a/gnu/packages/fpga.scm +++ b/gnu/packages/fpga.scm @@ -301,14 +301,14 @@ (define-public arachne-pnr (define-public gtkwave (package (name "gtkwave") - (version "3.3.99") + (version "3.3.100") (source (origin (method url-fetch) (uri (string-append "http://gtkwave.sourceforge.net/" "gtkwave-" version ".tar.gz")) (sha256 (base32 - "0lc4y2vizrbxldjk5yw2i4y7pyprjdjqx3iafzjfnin694zp2630")))) + "1z60i5nh8dz8j9ii63fwaw7k0p3x0scp91478cxmdv4xhp4njlxa")))) (build-system gnu-build-system) (native-inputs `(("gperf" ,gperf) -- cgit v1.2.3 From 0682f084635cdc289aabafc4b2583639e00a28b3 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Wed, 17 Apr 2019 08:47:54 +0200 Subject: services: fprintd: Fix service. * gnu/services/authentication.scm ()[ntp]: Rename to... [fprintd]: ...this. (fprintd-dbus-service): New procedure. (fprintd-service-type): Use it. [default-value]: Add value. --- gnu/services/authentication.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/services/authentication.scm b/gnu/services/authentication.scm index ab54aaf698..6a9dab9185 100644 --- a/gnu/services/authentication.scm +++ b/gnu/services/authentication.scm @@ -45,14 +45,18 @@ (define-module (gnu services authentication) (define-record-type* fprintd-configuration make-fprintd-configuration fprintd-configuration? - (ntp fprintd-configuration-fprintd + (fprintd fprintd-configuration-fprintd (default fprintd))) +(define (fprintd-dbus-service config) + (list (fprintd-configuration-fprintd config))) + (define fprintd-service-type (service-type (name 'fprintd) (extensions (list (service-extension dbus-root-service-type - list))) + fprintd-dbus-service))) + (default-value (fprintd-configuration)) (description "Run fprintd, a fingerprint management daemon."))) -- cgit v1.2.3 From a0158c26e29f73459c9f8bb03e072d99bd91a601 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 16 Apr 2019 22:57:45 +0200 Subject: gnu: awesome: Update home page. * gnu/packages/wm.scm (awesome)[home-page]: Update. --- gnu/packages/wm.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 82aa5788c2..3741bdc2d5 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2016, 2019 Efraim Flashner ;;; Copyright © 2016 Al McElrath ;;; Copyright © 2016 Carlo Zancanaro -;;; Copyright © 2016, 2017, 2018 Ludovic Courtès +;;; Copyright © 2016, 2017, 2018, 2019 Ludovic Courtès ;;; Copyright © 2016, 2017, 2018 ng0 ;;; Copyright © 2016 doncatnip ;;; Copyright © 2016 Ivan Vilata i Balaguer @@ -811,7 +811,7 @@ (define-public awesome "Awesome has been designed as a framework window manager. It is fast, small, dynamic and extensible using the Lua programming language.") (license license:gpl2+) - (home-page "https://awesome.naquadah.org/"))) + (home-page "https://awesomewm.org/"))) (define-public menumaker (package -- cgit v1.2.3 From a0e16bec376c1117ad03394164a5860c56c66973 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 16 Apr 2019 23:34:20 +0200 Subject: gnu: guix: Don't pass '--with-libgcrypt-prefix'. * gnu/packages/package-management.scm (guix)[arguments]: Remove "--with-libgcrypt-prefix" from the configure flags. --- gnu/packages/package-management.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 4808687227..96b8293120 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -137,9 +137,6 @@ (define-public guix (string-append "--with-bash-completion-dir=" (assoc-ref %outputs "out") "/etc/bash_completion.d") - (string-append "--with-libgcrypt-prefix=" - (assoc-ref %build-inputs - "libgcrypt")) ;; Set 'DOT_USER_PROGRAM' to the empty string so ;; we don't keep a reference to Graphviz, whose -- cgit v1.2.3 From 3ad3c55842dd34adc4b1a1b65ba0abfbdf5b92ee Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 17 Apr 2019 00:27:04 +0200 Subject: installer: Desktop environment page now includes window managers. * gnu/installer/services.scm ()[snippet]: Change to be a list of sexps and add default value. [packages]: New field. (%system-services): Adjust 'snippet' fields to be lists of sexps. Add Openbox, awesome, i3, and ratpoison. (system-services->configuration): Adjust 'snippet' handling. Honor 'packages' field. --- gnu/installer/services.scm | 51 ++++++++++++++++++++++++++++++---------------- 1 file changed, 33 insertions(+), 18 deletions(-) (limited to 'gnu') diff --git a/gnu/installer/services.scm b/gnu/installer/services.scm index 4dbfe74bf9..6d9d65e8c5 100644 --- a/gnu/installer/services.scm +++ b/gnu/installer/services.scm @@ -20,7 +20,6 @@ (define-module (gnu installer services) #:use-module (guix records) #:use-module (srfi srfi-1) - #:use-module (ice-9 match) #:export (system-service? system-service-name system-service-type @@ -37,7 +36,10 @@ (define-record-type* system-service? (name system-service-name) ;string (type system-service-type) ;'desktop | 'networking - (snippet system-service-snippet)) ;sexp + (snippet system-service-snippet ;list of sexps + (default '())) + (packages system-service-packages ;list of sexps + (default '()))) ;; This is the list of desktop environments supported as services. (define %system-services @@ -51,26 +53,38 @@ (define %system-services (list (desktop-environment (name "GNOME") - (snippet '(service gnome-desktop-service-type))) + (snippet '((service gnome-desktop-service-type)))) (desktop-environment (name "Xfce") - (snippet '(service xfce-desktop-service-type))) + (snippet '((service xfce-desktop-service-type)))) (desktop-environment (name "MATE") - (snippet '(service mate-desktop-service-type))) + (snippet '((service mate-desktop-service-type)))) (desktop-environment (name "Enlightenment") - (snippet '(service enlightenment-desktop-service-type))) + (snippet '((service enlightenment-desktop-service-type)))) + (desktop-environment + (name "Openbox") + (packages '((specification->package "openbox")))) + (desktop-environment + (name "awesome") + (packages '((specification->package "awesome")))) + (desktop-environment + (name "i3") + (packages '((specification->package "i3-wm")))) + (desktop-environment + (name "ratpoison") + (packages '((specification->package "ratpoison")))) ;; Networking. (system-service (name (G_ "OpenSSH secure shell daemon (sshd)")) (type 'networking) - (snippet '(service openssh-service-type))) + (snippet '((service openssh-service-type)))) (system-service (name (G_ "Tor anonymous network router")) (type 'networking) - (snippet '(service tor-service-type))) + (snippet '((service tor-service-type)))) ;; Network connectivity management. (system-service @@ -86,7 +100,7 @@ (define %system-services (system-service (name (G_ "DHCP client (dynamic IP address assignment)")) (type 'network-management) - (snippet '(service dhcp-client-service-type)))))) + (snippet '((service dhcp-client-service-type))))))) (define (desktop-system-service? service) "Return true if SERVICE is a desktop environment service." @@ -98,20 +112,21 @@ (define (networking-system-service? service) (define (system-services->configuration services) "Return the configuration field for SERVICES." - (let* ((snippets (append-map (lambda (service) - (match (system-service-snippet service) - ((and lst (('service _ ...) ...)) - lst) - (sexp - (list sexp)))) - services)) + (let* ((snippets (append-map system-service-snippet services)) + (packages (append-map system-service-packages services)) (desktop? (find desktop-system-service? services)) (base (if desktop? '%desktop-services '%base-services))) (if (null? snippets) - `((services ,base)) - `((services (append (list ,@snippets + `(,@(if (null? packages) + '() + `((packages (list ,@packages)))) + (services ,base)) + `(,@(if (null? packages) + '() + `((packages (list ,@packages)))) + (services (append (list ,@snippets ,@(if desktop? ;; XXX: Assume 'keyboard-layout' is in -- cgit v1.2.3 From 15dca289b8bd1418c5f5f3b545cb497497cad02e Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 17 Apr 2019 10:29:24 +0200 Subject: gnu: guix: Update to b8b1e4d. * gnu/packages/package-management.scm (guix): Update to b8b1e4d. --- gnu/packages/package-management.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 96b8293120..6708a761eb 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -110,8 +110,8 @@ (define-public guix ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "0.16.0") - (commit "d78bfd27bdc449cf93fe4c5497d242c2da1aeac8") - (revision 12)) + (commit "b8b1e4d9a2a976c4cd9933bb6a7451340f17e9ec") + (revision 13)) (package (name "guix") @@ -127,7 +127,7 @@ (define-public guix (commit commit))) (sha256 (base32 - "1i24snn7dq7r8c3mf4waz13k11lglhgvx0zb6xqiqiplmb6f7q6n")) + "1rljn9db8lxajbdcl94a6i7skk4a3rgjs25mxf35hnh0lpipqa03")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From 2d5867a213c4d23882e463d599eb236032086250 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 17 Apr 2019 10:34:02 +0200 Subject: installer: Change language as soon as it has been chosen. Previously we'd call 'setlocale' only after the complete 'locale' step had finished. * gnu/installer/newt/locale.scm (run-language-page): Set the 'LANGUAGE' environment variable before returning. --- gnu/installer/newt/locale.scm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/installer/newt/locale.scm b/gnu/installer/newt/locale.scm index b819d06691..01bcf76025 100644 --- a/gnu/installer/newt/locale.scm +++ b/gnu/installer/newt/locale.scm @@ -30,9 +30,9 @@ (define-module (gnu installer newt locale) #:export (run-locale-page)) (define (run-language-page languages language->text) - (let ((title (G_ "Locale language"))) + (define result (run-listbox-selection-page - #:title title + #:title (G_ "Locale language") #:info-text (G_ "Choose the language to use for the \ installation process and for the installed system.") #:info-textbox-width 70 @@ -44,7 +44,13 @@ (define (run-language-page languages language->text) (lambda _ (raise (condition - (&installer-step-abort))))))) + (&installer-step-abort)))))) + + ;; Immediately install the chosen language so that the territory page that + ;; comes after (optionally) is displayed in the chosen language. + (setenv "LANGUAGE" result) + + result) (define (run-territory-page territories territory->text) (let ((title (G_ "Locale location"))) -- cgit v1.2.3 From 7837a57241775fed221c9e03700af73263e222ed Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 17 Apr 2019 11:07:21 +0200 Subject: installer: Display language and territory names natively. * gnu/installer.scm (installer-program): Add calls to 'bindtextdomain'. * gnu/installer/newt/locale.scm (run-locale-page) : Add calls to 'gettext'. --- gnu/installer.scm | 10 ++++++++++ gnu/installer/newt/locale.scm | 18 +++++++++++++----- 2 files changed, 23 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/installer.scm b/gnu/installer.scm index 6a7a556271..5baead8137 100644 --- a/gnu/installer.scm +++ b/gnu/installer.scm @@ -343,6 +343,16 @@ (define installer-builder ;; Add some binaries used by the installers to PATH. #$set-installer-path + ;; Arrange for language and territory name translations to be + ;; available. We need them at run time, not just compile time, + ;; because some territories have several corresponding languages + ;; (e.g., "French" is always displayed as "français", but + ;; "Belgium" could be translated to Dutch, French, or German.) + (bindtextdomain "iso_639-3" ;languages + #+(file-append iso-codes "/share/locale")) + (bindtextdomain "iso_3166-1" ;territories + #+(file-append iso-codes "/share/locale")) + (let* ((current-installer newt-installer) (steps (#$steps current-installer))) ((installer-init current-installer)) diff --git a/gnu/installer/newt/locale.scm b/gnu/installer/newt/locale.scm index 01bcf76025..7108e2960b 100644 --- a/gnu/installer/newt/locale.scm +++ b/gnu/installer/newt/locale.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Mathieu Othacehe +;;; Copyright © 2019 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -161,7 +162,13 @@ (define locale-steps (run-language-page (sort-languages (delete-duplicates (map locale-language supported-locales))) - (cut language-code->language-name iso639-languages <>))))) + (lambda (language) + (let ((english (language-code->language-name iso639-languages + language))) + (setenv "LANGUAGE" language) + (let ((native (gettext english "iso_639-3"))) + (unsetenv "LANGUAGE") + native))))))) (installer-step (id 'territory) (compute @@ -175,10 +182,11 @@ (define locale-steps ;; supported by the previously selected language. (run-territory-page (delete-duplicates (map locale-territory locales)) - (lambda (territory-code) - (if territory-code - (territory-code->territory-name iso3166-territories - territory-code) + (lambda (territory) + (if territory + (let ((english (territory-code->territory-name + iso3166-territories territory))) + (gettext english "iso_3166-1")) (G_ "No location")))))))) (installer-step (id 'codeset) -- cgit v1.2.3 From 7cb7be17af77caa084c1b5ebf20748dd04f208fa Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 17 Apr 2019 11:41:52 +0200 Subject: installer: Look up timezone name translations in "iso_3166-1". * gnu/installer/newt/timezone.scm (run-timezone-page): Add call to 'gettext' for timezone names. --- gnu/installer/newt/timezone.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/installer/newt/timezone.scm b/gnu/installer/newt/timezone.scm index 63b44af729..67bf41ff84 100644 --- a/gnu/installer/newt/timezone.scm +++ b/gnu/installer/newt/timezone.scm @@ -50,12 +50,15 @@ (define (all-but-last list) (define (run-page timezone-tree) (define (loop path) + ;; XXX: Translation of time zones isn't perfect here because the + ;; "iso_3166-1" domain contains translation for "territories" (like + ;; "Antarctic") but not for continents (like "Africa"). (let ((timezones (locate-children timezone-tree path))) (run-listbox-selection-page #:title (G_ "Timezone") #:info-text (G_ "Please select a timezone.") #:listbox-items timezones - #:listbox-item->text identity + #:listbox-item->text (cut gettext <> "iso_3166-1") #:button-text (if (null? path) (G_ "Exit") (G_ "Back")) -- cgit v1.2.3 From 14755829dc268a3983036908750f4ea40c5224b3 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 17 Apr 2019 11:51:31 +0200 Subject: installer: Sort items with 'string-locale key is pressed, otherwise nothing will happen. @@ -249,7 +250,7 @@ (define (fill-listbox listbox items) items)) (define (sort-listbox-items listbox-items) - "Return LISTBOX-ITEMS sorted using the 'string<=' procedure on the text + "Return LISTBOX-ITEMS sorted using the 'string-localetext item))) @@ -258,7 +259,7 @@ (define (sort-listbox-items listbox-items) (sort items (lambda (a b) (let ((text-a (cdr a)) (text-b (cdr b))) - (string<= text-a text-b)))))) + (string-locale Date: Wed, 17 Apr 2019 15:11:21 +0200 Subject: installer: Translate keyboard layout names. * gnu/installer.scm (installer-program)[installer-builder]: Call 'bindtextdomain' for "xkeyboard-config". * gnu/installer/newt/keymap.scm (run-keymap-page): Add calls to 'gettext'. --- gnu/installer.scm | 4 ++++ gnu/installer/newt/keymap.scm | 10 ++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/installer.scm b/gnu/installer.scm index 5baead8137..881c40ee9b 100644 --- a/gnu/installer.scm +++ b/gnu/installer.scm @@ -353,6 +353,10 @@ (define installer-builder (bindtextdomain "iso_3166-1" ;territories #+(file-append iso-codes "/share/locale")) + ;; Likewise for XKB keyboard layout names. + (bindtextdomain "xkeyboard-config" + #+(file-append xkeyboard-config "/share/locale")) + (let* ((current-installer newt-installer) (steps (#$steps current-installer))) ((installer-init current-installer)) diff --git a/gnu/installer/newt/keymap.scm b/gnu/installer/newt/keymap.scm index 948b54783c..623bfe079d 100644 --- a/gnu/installer/newt/keymap.scm +++ b/gnu/installer/newt/keymap.scm @@ -97,7 +97,8 @@ (define keymap-steps (run-layout-page (sort-layouts layouts) (lambda (layout) - (x11-keymap-layout-description layout)))))) + (gettext (x11-keymap-layout-description layout) + "xkeyboard-config")))))) ;; Propose the user to select a variant among those supported by the ;; previously selected layout. (installer-step @@ -111,15 +112,16 @@ (define keymap-steps (run-variant-page (sort-variants variants) (lambda (variant) - (x11-keymap-variant-description - variant)))))))))) + (gettext (x11-keymap-variant-description variant) + "xkeyboard-config")))))))))) (define (format-result result) (let ((layout (x11-keymap-layout-name (result-step result 'layout))) (variant (and=> (result-step result 'variant) (lambda (variant) - (x11-keymap-variant-name variant))))) + (gettext (x11-keymap-variant-name variant) + "xkeyboard-config"))))) (list layout (or variant "")))) (format-result (run-installer-steps #:steps keymap-steps))) -- cgit v1.2.3 From 818595a974a3fc9caa7edd8a4f19d5485c91caba Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 17 Apr 2019 15:13:31 +0200 Subject: installer: Parse the 'shortDescription' field from xkeyboard-config. * gnu/installer/keymap.scm ()[synopsis]: New field. (xkb-rules->models+layouts): Fill out the 'synopsis' field. --- gnu/installer/keymap.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/installer/keymap.scm b/gnu/installer/keymap.scm index d66b376d9c..df9fc5e441 100644 --- a/gnu/installer/keymap.scm +++ b/gnu/installer/keymap.scm @@ -36,6 +36,7 @@ (define-module (gnu installer keymap) make-x11-keymap-layout x11-keymap-layout? x11-keymap-layout-name + x11-keymap-layout-synopsis x11-keymap-layout-description x11-keymap-layout-variants @@ -60,7 +61,8 @@ (define-record-type* x11-keymap-layout make-x11-keymap-layout x11-keymap-layout? (name x11-keymap-layout-name) ;string - (description x11-keymap-layout-description) ;string + (synopsis x11-keymap-layout-synopsis) ;string (e.g., "en") + (description x11-keymap-layout-description) ;string (a whole phrase) (variants x11-keymap-layout-variants)) ;list of (define-record-type* @@ -117,6 +119,8 @@ (define (layout l) (variantList ,[variant -> v] ...)) (x11-keymap-layout (name name) + (synopsis (car + (assoc-ref rest-layout 'shortDescription))) (description (car (assoc-ref rest-layout 'description))) (variants (list v ...)))] @@ -126,6 +130,8 @@ (define (layout l) . ,rest-layout)) (x11-keymap-layout (name name) + (synopsis (car + (assoc-ref rest-layout 'shortDescription))) (description (car (assoc-ref rest-layout 'description))) (variants '()))])) -- cgit v1.2.3 From 9015e63996156dfaafecef182d20128f268c2719 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 17 Apr 2019 15:16:08 +0200 Subject: installer: Sort keyboard layouts according to language and translations. Previously, we would always (1) put English first, and (2) sort the other layouts based on their English description. This fixes both issues. * gnu/installer/newt/keymap.scm (sort-layouts)[layoutconfiguration)) @@ -64,14 +65,29 @@ (define (run-variant-page variants variant->text) (define (sort-layouts layouts) "Sort LAYOUTS list by putting the US layout ahead and return it." + (define (layout <>))) + (lambda (main others) + (append (sort main layout Date: Wed, 17 Apr 2019 15:54:54 +0200 Subject: gnu: console-setup: Update to 1.191. * gnu/packages/xorg.scm (console-setup): Update to 1.191. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index af86c6d7f1..0028698e22 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -6356,7 +6356,7 @@ (define-public bdfresize (define-public console-setup (package (name "console-setup") - (version "1.190") + (version "1.191") (source (origin (method git-fetch) @@ -6364,7 +6364,7 @@ (define-public console-setup (url "https://salsa.debian.org/installer-team/console-setup.git") (commit version))) (sha256 - (base32 "0qklm9ww1wap2bs7hp31xkfjyhdrirg2mk4hiv7h6fiqckzmdwvd")) + (base32 "0wplhjadk530fqxhfnizil32rcvkcl5m2r18yskspcib53r4pmim")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From 2ad0310615a0dea72d56c8067f38ef544601a771 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 17 Apr 2019 16:25:57 +0200 Subject: gnu: rclone: Update to 1.47.0. * gnu/packages/sync.scm (rclone): Update to 1.47.0. --- gnu/packages/sync.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm index 1aae3a8ed6..136ffec9e7 100644 --- a/gnu/packages/sync.scm +++ b/gnu/packages/sync.scm @@ -252,7 +252,7 @@ (define-public casync (define-public rclone (package (name "rclone") - (version "1.46") + (version "1.47.0") (source (origin (method git-fetch) (uri (git-reference @@ -261,7 +261,7 @@ (define-public rclone (file-name (git-file-name name version)) (sha256 (base32 - "1fl52dl41n76r678nzkxa2kgk9khn1fxraxgk8jd3ayc787qs9ia")))) + "1nxwjr9jly6wh1ixr6a7zhlg4b3298v940040fsm0n3lcljd37zx")))) ;; FIXME: Rclone bundles some libraries Guix already provides. Need to ;; un-bundle them. (build-system go-build-system) -- cgit v1.2.3 From fd6d2fd871aa3eb443037483998b7790d15be709 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Thu, 18 Apr 2019 09:23:24 +0200 Subject: gnu: xpra: Update to 2.5.1. * gnu/packages/xorg.scm (xpra): Update to 2.5.1. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 0028698e22..fc7c55b084 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -6010,7 +6010,7 @@ (define-public xcompmgr (define-public xpra (package (name "xpra") - (version "2.5") + (version "2.5.1") (source (origin (method url-fetch) @@ -6018,7 +6018,7 @@ (define-public xpra version ".tar.xz")) (sha256 (base32 - "0q6c7ijgpp2wk6jlh0pzqki1w60i36wyl2zfwkg0gpdh40ypab3x")))) + "14l3bs7mlkd2lphjhnbw5dr95pg7x1k61s9wk35dra4li2xjy1lm")))) (build-system python-build-system) (inputs `(("ffmpeg" ,ffmpeg) ("flac" ,flac) -- cgit v1.2.3 From 5d450aba1f560a3f8656dab2cefb437b81511ea2 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 18 Apr 2019 16:59:28 +0300 Subject: gnu: nano: Update to 4.1. * gnu/packages/nano.scm (nano): Update to 4.1. --- gnu/packages/nano.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/nano.scm b/gnu/packages/nano.scm index 04877f33ba..cb4ca996d4 100644 --- a/gnu/packages/nano.scm +++ b/gnu/packages/nano.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012 Nikita Karetnikov -;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner +;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner ;;; Copyright © 2016 Rene Saavedra ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; @@ -30,7 +30,7 @@ (define-module (gnu packages nano) (define-public nano (package (name "nano") - (version "4.0") + (version "4.1") (source (origin (method url-fetch) @@ -38,7 +38,7 @@ (define-public nano version ".tar.xz")) (sha256 (base32 - "1hxsx6qi7897d8bwkbnijlwvnn1dfy5pd1b7v2kj8ikq6pmcybqy")))) + "1l11sa957g8njfz9v8q1f2m3w2xz1rf7i7dl37kgvmiql2bfbgc6")))) (build-system gnu-build-system) (inputs `(("gettext" ,gettext-minimal) -- cgit v1.2.3 From bd5b6ce0d7562a669d24f710fe62adcd0b8bf67a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 18 Apr 2019 17:00:46 +0300 Subject: gnu: gnuastro: Update to 0.9. * gnu/packages/astronomy.scm (gnuastro): Update to 0.9. [native-inputs]: Add libtool. --- gnu/packages/astronomy.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 6025af8323..ab5dcd92a7 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 John Darrington ;;; Copyright © 2018 Tobias Geerinckx-Rice -;;; Copyright © 2018 Efraim Flashner +;;; Copyright © 2018, 2019 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -23,6 +23,7 @@ (define-module (gnu packages astronomy) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix download) #:use-module (guix utils) + #:use-module (gnu packages autotools) #:use-module (gnu packages image) #:use-module (gnu packages compression) #:use-module (gnu packages gettext) @@ -103,7 +104,7 @@ (define-public wcslib (define-public gnuastro (package (name "gnuastro") - (version "0.8") + (version "0.9") (source (origin (method url-fetch) @@ -111,7 +112,7 @@ (define-public gnuastro version ".tar.lz")) (sha256 (base32 - "0gx6iar3z07k9sdvpa6kchsz6fpk94xn5vcvbcigssl2dwqmlnkb")))) + "1c1894ixz3l8p1nmzkysgl9lz8vpqbfw1dd404kh6lvrpml7jzig")))) (inputs `(("cfitsio" ,cfitsio) ("gsl" ,gsl) @@ -120,7 +121,8 @@ (define-public gnuastro ("wcslib" ,wcslib) ("zlib" ,zlib))) (native-inputs - `(("lzip" ,lzip))) + `(("libtool" ,libtool) + ("lzip" ,lzip))) (build-system gnu-build-system) (home-page "https://www.gnu.org/software/gnuastro/") (synopsis "Astronomy utilities") -- cgit v1.2.3 From e6d782621a7a00bb830c8df92e588321646f34e0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 16 Apr 2019 23:51:43 +0200 Subject: gnu: xmlsec: Update to 1.2.28. * gnu/packages/xml.scm (xmlsec): Update to 1.2.28. --- gnu/packages/xml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index f739f207e7..6ae9cd65d5 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -929,14 +929,14 @@ (define-public xmlto (define-public xmlsec (package (name "xmlsec") - (version "1.2.27") + (version "1.2.28") (source (origin (method url-fetch) (uri (string-append "https://www.aleksey.com/xmlsec/download/" "xmlsec1-" version ".tar.gz")) (sha256 (base32 - "1dlf263mvxj9n4lnhhjawc2hv45agrwjf8kxk7k8h9g9v2x5dmwp")))) + "1m12caglhyx08g8lh2sl3nkldlpryzdx2d572q73y3m33s0w9vhk")))) (build-system gnu-build-system) (propagated-inputs ; according to xmlsec1.pc `(("libxml2" ,libxml2) -- cgit v1.2.3 From 8142eadd401c940abca240ce9a562110f7dfafec Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 17 Apr 2019 22:09:08 +0200 Subject: gnu: python-zope-interface: Update to 4.6.0. * gnu/packages/python-web.scm (python-zope-interface): Update to 4.6.0. --- gnu/packages/python-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index ec068bdf0b..7c6d055191 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -897,14 +897,14 @@ (define-public python2-zope-event (define-public python-zope-interface (package (name "python-zope-interface") - (version "4.1.3") + (version "4.6.0") (source (origin (method url-fetch) (uri (pypi-uri "zope.interface" version)) (sha256 (base32 - "0ks8h73b2g4bkad821qbv0wzjppdrwys33i7ka45ik3wxjg1l8if")))) + "1rgh2x3rcl9r0v0499kf78xy86rnmanajf4ywmqb943wpk50sg8v")))) (build-system python-build-system) (native-inputs `(("python-zope-event" ,python-zope-event))) -- cgit v1.2.3 From 431a0d26c8e12dc357c84878f1ed76975b270786 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 17 Apr 2019 22:09:41 +0200 Subject: gnu: python-hyperlink: Update to 19.0.0. * gnu/packages/python-web.scm (python-hyperlink): Update to 19.0.0. --- gnu/packages/python-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 7c6d055191..b7d03acb4b 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -2960,14 +2960,14 @@ (define-public python-pyfxa (define-public python-hyperlink (package (name "python-hyperlink") - (version "18.0.0") + (version "19.0.0") (source (origin (method url-fetch) (uri (pypi-uri "hyperlink" version)) (sha256 (base32 - "01m3y19arfqljksngy8grc966zdb4larysralb8cajzi8kvly6zh")))) + "0m2nhi0j8wmgfscf974wd5v1xfq8mah286hil6npy1ys0m3y7222")))) (build-system python-build-system) (propagated-inputs `(("python-idna" ,python-idna))) -- cgit v1.2.3 From e95c983706164bdd93176b0632369e7df23dfc87 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 17 Apr 2019 22:10:58 +0200 Subject: gnu: python-idna: Update to 2.8. * gnu/packages/python-xyz.scm (python-idna): Update to 2.8. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 14fb413cf4..bf309f4a0b 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -6645,14 +6645,14 @@ (define-public python2-ipaddr (define-public python-idna (package (name "python-idna") - (version "2.7") + (version "2.8") (source (origin (method url-fetch) (uri (pypi-uri "idna" version)) (sha256 (base32 - "05jam7d31767dr12x0rbvvs8lxnpb1mhdb2zdlfxgh83z6k3hjk8")))) + "01rlkigdxg17sf9yar1jl8n18ls59367wqh59hnawlyg53vb6my3")))) (build-system python-build-system) (home-page "https://github.com/kjd/idna") (synopsis "Internationalized domain names in applications") -- cgit v1.2.3 From bcfb8fac36b8c02fb190f4b2c66272dbe8c06a91 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 17 Apr 2019 22:12:23 +0200 Subject: gnu: python-m2r: Update to 0.2.1. * gnu/packages/python-xyz.scm (python-m2r): Update to 0.2.1. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index bf309f4a0b..eefa2be76b 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11327,13 +11327,13 @@ (define-public python2-automat (define-public python-m2r (package (name "python-m2r") - (version "0.1.12") + (version "0.2.1") (source (origin (method url-fetch) (uri (pypi-uri "m2r" version)) (sha256 (base32 - "1axrwnf425sz4qz3c0qc7yhhki4myzb8rki7pczcsgzznzmqdyxd")))) + "16gdm8i06jjmlpvckpfmlkr4693dh0vs192vgsqn84fsdkbbm45z")))) (build-system python-build-system) (propagated-inputs `(("python-docutils" ,python-docutils) -- cgit v1.2.3 From 919d80a0e06839051dc1bcacd260c8b22092b47b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 17 Apr 2019 22:12:53 +0200 Subject: gnu: python-automat: Update to 0.7.0. * gnu/packages/python-xyz.scm (python-automat): Update to 0.7.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index eefa2be76b..df3adf47e1 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11294,13 +11294,13 @@ (define-public python2-invoke (define-public python-automat (package (name "python-automat") - (version "0.6.0") + (version "0.7.0") (source (origin (method url-fetch) (uri (pypi-uri "Automat" version)) (sha256 (base32 - "1a7nsrljysfmdqmpn2apfa1gg6rfah4y9sizvns8gb08rx7d07rw")))) + "03ivg70n3b1cbcd2zvjhk8y4kmqxcvhmili39lmgx09dza1qpmyb")))) (build-system python-build-system) ;; We disable the tests because they require python-twisted, while ;; python-twisted depends on python-automat. Twisted is optional, but the -- cgit v1.2.3 From 52ca1c4abf6deaef2d5d5b9b7fc4d9dc949ae59c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 17 Apr 2019 22:15:24 +0200 Subject: gnu: python-twisted: Update to 19.2.0. * gnu/packages/python-xyz.scm (python-twisted): Update to 19.2.0. [propagated-inputs]: Add PYTHON-PYHAMCREST. --- gnu/packages/python-xyz.scm | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index df3adf47e1..212f550b59 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -9381,23 +9381,19 @@ (define-public python2-fastimport (define-public python-twisted (package (name "python-twisted") - (version "17.5.0") + (version "19.2.0") (source (origin (method url-fetch) (uri (pypi-uri "Twisted" version ".tar.bz2")) (sha256 (base32 - "1sh2h23nnizcdyrl2rn7zxijglikxwz7z7grqpvq496zy2aa967i")))) + "1gmb8d57s13d8znvqnxi47vqzqz141z443dbxg9wjkp8ia9f220p")))) (build-system python-build-system) (arguments '(#:tests? #f)) ; FIXME: Some tests are failing. - ;; #:phases - ;; (modify-phases %standard-phases - ;; (replace 'check - ;; (lambda _ - ;; (zero? (system* "./bin/trial" "twisted"))))) (propagated-inputs `(("python-zope-interface" ,python-zope-interface) + ("python-pyhamcrest" ,python-pyhamcrest) ("python-incremental" ,python-incremental) ("python-hyperlink" ,python-hyperlink) ("python-constantly" ,python-constantly) -- cgit v1.2.3 From ea43f0d58186fe5686800ccc3d5373b4e6fc48b9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 17 Apr 2019 22:18:49 +0200 Subject: gnu: Add python-pyrsistent. * gnu/packages/python-xyz.scm (python-pyrsistent, python2-pyrsistent): New public variables. --- gnu/packages/python-xyz.scm | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 212f550b59..45bb6548af 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -26,7 +26,7 @@ ;;; Copyright © 2016, 2017 ng0 ;;; Copyright © 2016 Dylan Jeffers ;;; Copyright © 2016 David Craven -;;; Copyright © 2016, 2017, 2018 Marius Bakke +;;; Copyright © 2016, 2017, 2018, 2019 Marius Bakke ;;; Copyright © 2016, 2017 Stefan Reichör ;;; Copyright © 2016 Dylan Jeffers ;;; Copyright © 2016, 2017 Alex Vong @@ -1722,6 +1722,37 @@ (define-public python-pbr (define-public python2-pbr (package-with-python2 python-pbr)) +(define-public python-pyrsistent + (package + (name "python-pyrsistent") + (version "0.14.11") + (home-page "https://github.com/tobgu/pyrsistent") + (source (origin + (method url-fetch) + (uri (pypi-uri "pyrsistent" version)) + (sha256 + (base32 + "1qkh74bm296mp5g3r11lgsksr6bh4w1bf8pji4nmxdlfj542ga1w")))) + (build-system python-build-system) + (native-inputs + `(("python-hypothesis" ,python-hypothesis) + ("python-pytest" ,python-pytest) + ("python-pytest-runner" ,python-pytest-runner))) + (propagated-inputs + `(("python-six" ,python-six))) + (synopsis "Persistent data structures for Python") + (description + "Pyrsistent is a number of persistent collections (by some referred to as +functional data structures). Persistent in the sense that they are immutable. + +All methods on a data structure that would normally mutate it instead return a +new copy of the structure containing the requested updates. The original +structure is left untouched.") + (license license:expat))) + +(define-public python2-pyrsistent + (package-with-python2 python-pyrsistent)) + (define-public python-exif-read (package (name "python-exif-read") -- cgit v1.2.3 From 1adde06e4e70e124229316d7781b0527b64de088 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 17 Apr 2019 22:19:22 +0200 Subject: gnu: python-jsonschema: Update to 3.0.1. * gnu/packages/python-xyz.scm (python-jsonschema): Update to 3.0.1. [arguments]: Adjust check phase for Twisted instead of nosetests. [native-inputs]: Remove PYTHON-NOSE and PYTHON-VCVERSIONER. Add PYTHON-SETUPTOOLS-SCM and PYTHON-TWISTED. [propagated-inputs]: Add PYTHON-ATTRS, PYTHON-PYRSISTENT and PYTHON-SIX. (python2-jsonschema)[native-inputs, propagated-inputs]: Inherit. --- gnu/packages/python-xyz.scm | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 45bb6548af..4e0a67a1e8 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1923,21 +1923,28 @@ (define-public python2-jdcal (define-public python-jsonschema (package (name "python-jsonschema") - (version "2.6.0") + (version "3.0.1") (source (origin (method url-fetch) (uri (pypi-uri "jsonschema" version)) (sha256 (base32 - "00kf3zmpp9ya4sydffpifn0j0mzm342a2vzh82p6r0vh10cg7xbg")))) + "03g20i1xfg4qdlk4475pl4pp7y0h37g1fbgs5qhy678q9xb822hc")))) (build-system python-build-system) (arguments '(#:phases (modify-phases %standard-phases - (replace 'check (lambda _ (invoke "nosetests")))))) + (replace 'check + (lambda _ + (setenv "PYTHONPATH" (string-append ".:" (getenv "PYTHONPATH"))) + (invoke "trial" "jsonschema")))))) (native-inputs - `(("python-nose" ,python-nose) - ("python-vcversioner" ,python-vcversioner))) + `(("python-setuptools_scm" ,python-setuptools-scm) + ("python-twisted" ,python-twisted))) + (propagated-inputs + `(("python-attrs" ,python-attrs) + ("python-pyrsistent" ,python-pyrsistent) + ("python-six" ,python-six))) (home-page "https://github.com/Julian/jsonschema") (synopsis "Implementation of JSON Schema for Python") (description @@ -1949,11 +1956,9 @@ (define-public python2-jsonschema (let ((jsonschema (package-with-python2 (strip-python2-variant python-jsonschema)))) (package (inherit jsonschema) - (native-inputs - `(("python2-mock" ,python2-mock) - ,@(package-native-inputs jsonschema))) (propagated-inputs - `(("python2-functools32" ,python2-functools32)))))) + `(("python2-functools32" ,python2-functools32) + ,@(package-propagated-inputs jsonschema)))))) (define-public python-schema (package -- cgit v1.2.3 From c105e5090397f3f634c0cd082b4866b5222cd5b4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 17 Apr 2019 22:27:18 +0200 Subject: gnu: python-service-identity: Update to 18.1.0. * gnu/packages/python-crypto.scm (python-service-identity): Update to 18.1.0. --- gnu/packages/python-crypto.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index fd9c95dd0a..6248be0c9b 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -970,14 +970,14 @@ (define-public python-scrypt (define-public python-service-identity (package (name "python-service-identity") - (version "17.0.0") + (version "18.1.0") (source (origin (method url-fetch) (uri (pypi-uri "service_identity" version)) (sha256 (base32 - "1aq24cn3nnsjr9g797dayhx4g653h6bd41ksqhidzq0rvarzn0a0")))) + "0b9f5qiqjy8ralzgwjgkhx82h6h8sa7532psmb8mkd65md5aan08")))) (build-system python-build-system) (propagated-inputs `(("python-attrs" ,python-attrs) -- cgit v1.2.3 From 4782a06f45d515eebc4d1ee8e958def409a0ef9f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 17 Apr 2019 22:31:51 +0200 Subject: gnu: python-send2trash: Properly delay python2 variant. * gnu/packages/python-xyz.scm (python2-send2trash)[properties]: Move from here ... (python-send2trash)[properties]: ... to here. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 4e0a67a1e8..51382184d2 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -13581,6 +13581,7 @@ (define-public python-send2trash (synopsis "Send files to the user's @file{~/Trash} directory") (description "This package provides a Python library to send files to the user's @file{~/Trash} directory.") + (properties `((python2-variant . ,(delay python-send2trash)))) (license license:bsd-3))) (define-public python2-send2trash @@ -13594,8 +13595,7 @@ (define-public python2-send2trash (lambda _ (setenv "PYTHONPATH" (string-append (getcwd) ":" (getenv "PYTHONPATH"))) - #t)))))) - (properties `((python2-variant . ,(delay python-send2trash)))))) + #t)))))))) (define-public python-yapf (package -- cgit v1.2.3 From cbeb891344d46e5cdc001f0116a0a2974b5db99d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 18 Apr 2019 00:24:45 +0200 Subject: gnu: gpgme: Update to 1.13.0. * gnu/packages/gnupg.scm (gpgme): Update to 1.13.0. [source](patches): Remove. --- gnu/packages/gnupg.scm | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 0795be3619..2ee65015a6 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -369,7 +369,7 @@ (define-public gnupg-1 (define-public gpgme (package (name "gpgme") - (version "1.12.0") + (version "1.13.0") (source (origin (method url-fetch) @@ -377,16 +377,7 @@ (define-public gpgme ".tar.bz2")) (sha256 (base32 - "1n4c1q2ls7sqx1vpr3p5n8vbjkw6kqp8jxqa28p0x9j36wf9bp5l")) - ;; One test fails because the conflict keys have expired. See - ;; https://dev.gnupg.org/T3815 - (patches (list (origin - (method url-fetch) - (uri "https://dev.gnupg.org/rM66376f3e206a1aa791d712fb8577bb3490268f60?diff=1") - (file-name "gpgme-fix-conflict-test-keys.patch") - (sha256 - (base32 - "0j718iy5a9fhkrfs4gzrnm4ggi163prqf1i8lfmqczswvz88zfly"))))))) + "0c6676g0yhfsmy32i1dgwh5cx0ja8vhcqf4k08zad177m53kxcnl")))) (build-system gnu-build-system) (native-inputs `(("gnupg" ,gnupg))) -- cgit v1.2.3 From 20b3fde7763a14f605ac8a0aba1abfa73a6e7dda Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 19 Apr 2019 01:57:34 +0200 Subject: gnu: python-send2trash: Really delay Python2 variant. This is a follow-up to commit 4782a06f45d515eebc4d1ee8e958def409a0ef9f, which somehow solved my problem, but did so incorrectly. * gnu/packages/python-xyz.scm (python-send2trash)[properties]: Refer to PYTHON2-SEND2TRASH. --- gnu/packages/python-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 51382184d2..f64a09e9b3 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -13581,7 +13581,7 @@ (define-public python-send2trash (synopsis "Send files to the user's @file{~/Trash} directory") (description "This package provides a Python library to send files to the user's @file{~/Trash} directory.") - (properties `((python2-variant . ,(delay python-send2trash)))) + (properties `((python2-variant . ,(delay python2-send2trash)))) (license license:bsd-3))) (define-public python2-send2trash -- cgit v1.2.3 From f32164abd3d9c307959cf60393cdc9027b8703ca Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 19 Apr 2019 02:29:43 +0200 Subject: gnu: python2-send2trash: Don't inherit properties from python-send2trash. This is a follow-up to commit 20b3fde7763a14f605ac8a0aba1abfa73a6e7dda. Commits and beer do not mix well. * gnu/packages/python-xyz.scm (python2-send2trash): Inherit using STRIP-PYTHON2-VARIANT. --- gnu/packages/python-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index f64a09e9b3..9d661411c4 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -13586,7 +13586,7 @@ (define-public python-send2trash (define-public python2-send2trash (package - (inherit (package-with-python2 python-send2trash)) + (inherit (package-with-python2 (strip-python2-variant python-send2trash))) (arguments (substitute-keyword-arguments (package-arguments python-send2trash) ((#:phases phases) -- cgit v1.2.3 From 35259437a7b13f8573f407c39e8c2c0308123a37 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Fri, 19 Apr 2019 11:39:38 +0100 Subject: gnu: perl-datetime-timezone: Fix missing timezone data. I noticed this when using Sqitch, on systems without /usr/share/zoneinfo, actions like deploy fail. * gnu/packages/perl.scm (perl-datetime-timezone)[arguments]: Add 'patch-tzdata phase to replace /usr/share/zoneinfo with a reference to the tzdata package. [inputs]: Add the tzdata package. --- gnu/packages/perl.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 86d07c3ccc..cde75bc06e 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -2541,9 +2541,22 @@ (define-public perl-datetime-timezone (base32 "0kz5kz47awf2bhb85xx5rbajkr093ipm2d2vkhqs8lqq0f305r3a")))) (build-system perl-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-tzdata + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "lib/DateTime/TimeZone/Local/Unix.pm" + (("our \\$ZoneinfoDir = '\\/usr\\/share\\/zoneinfo';") + (string-append "our $ZoneinfoDir = '" + (assoc-ref inputs "tzdata") "/share/zoneinfo" + "';"))) + #t))))) (native-inputs `(("perl-test-fatal" ,perl-test-fatal) ("perl-test-requires" ,perl-test-requires))) + (inputs + `(("tzdata" ,tzdata))) (propagated-inputs `(("perl-class-singleton" ,perl-class-singleton) ("perl-list-allutils" ,perl-list-allutils) -- cgit v1.2.3 From f00067dbfbb41a375c170f29fa963bd0acab24d8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 19 Apr 2019 14:22:03 +0200 Subject: gnu: klick: Fix build with latest scons. * gnu/packages/music.scm (klick)[arguments]: Patch "SConstruct" file to make it compatible with the current version of scons. --- gnu/packages/music.scm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 10a23c919f..361aba1a51 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -721,7 +721,16 @@ (define-public klick (arguments `(#:scons-flags (list (string-append "PREFIX=" %output)) #:scons ,scons-python2 - #:tests? #f)) ;no "check" target + #:tests? #f ; no "check" target + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'replace-removed-scons-syntax + (lambda _ + (substitute* "SConstruct" + (("BoolOption") "BoolVariable") + (("PathOption") "PathVariable") + (("Options") "Variables")) + #t))))) (inputs `(("boost" ,boost) ("jack" ,jack-1) -- cgit v1.2.3 From 664a6bc1a6daf20b42af9d1ac9f225d29f13cff2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 19 Apr 2019 14:42:51 +0200 Subject: gnu: r-caret: Update to 6.0-83. * gnu/packages/statistics.scm (r-caret): Update to 6.0-83. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 26e5f62666..fac4c51a54 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -5284,14 +5284,14 @@ (define-public r-car (define-public r-caret (package (name "r-caret") - (version "6.0-82") + (version "6.0-83") (source (origin (method url-fetch) (uri (cran-uri "caret" version)) (sha256 (base32 - "0zgkmiiarl7ll2ffyciikah61jyps41fin5pjb5l8ja2b26lgrdg")))) + "1vyw43z73wa4nrbbyq6km18yh1352g03j93cw2zr1dphl56mxplv")))) (build-system r-build-system) (propagated-inputs `(("r-foreach" ,r-foreach) -- cgit v1.2.3 From 8e79d820d0f150106f96a1109e1618bbede10d25 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 19 Apr 2019 14:43:10 +0200 Subject: gnu: r-clipr: Update to 0.6.0. * gnu/packages/cran.scm (r-clipr): Update to 0.6.0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 47cd1d7217..5da23ea414 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -78,14 +78,14 @@ (define-module (gnu packages cran) (define-public r-clipr (package (name "r-clipr") - (version "0.5.0") + (version "0.6.0") (source (origin (method url-fetch) (uri (cran-uri "clipr" version)) (sha256 (base32 - "1grx0lyww1cxmdvsr44wmbhz9i6zmiwxbchb97gxrfi9gy5kyc7x")))) + "0k9kimkmmj9k7290sxiqn4kd1vvm4w7q9a44wp0w30b7yjpavx2m")))) (build-system r-build-system) (home-page "https://github.com/mdlincoln/clipr") (synopsis "Read and write from the system clipboard") -- cgit v1.2.3 From 3d60c80713d36aa3280fe76d181b82801fed4c2c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 19 Apr 2019 14:43:17 +0200 Subject: gnu: r-hardyweinberg: Update to 1.6.2. * gnu/packages/cran.scm (r-hardyweinberg): Update to 1.6.2. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 5da23ea414..ec60e283aa 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -3050,14 +3050,14 @@ (define-public r-rsolnp (define-public r-hardyweinberg (package (name "r-hardyweinberg") - (version "1.6.1") + (version "1.6.2") (source (origin (method url-fetch) (uri (cran-uri "HardyWeinberg" version)) (sha256 (base32 - "16n8qanxx0p5ny5zqxafn8hwb1xv94y1wig1iql8as5a5qh8lwcz")))) + "15i7b444hikkfgqmx2ki827998xwra38k9v7a7kavwz6zmq5mmv9")))) (properties `((upstream-name . "HardyWeinberg"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 5ac82ee33b20a3cdf95a910e8152d5e8e35e410d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 19 Apr 2019 14:43:23 +0200 Subject: gnu: r-sdmtools: Update to 1.1-221.1. * gnu/packages/cran.scm (r-sdmtools): Update to 1.1-221.1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index ec60e283aa..ec896f4a91 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -3317,14 +3317,14 @@ (define-public r-dtw (define-public r-sdmtools (package (name "r-sdmtools") - (version "1.1-221") + (version "1.1-221.1") (source (origin (method url-fetch) (uri (cran-uri "SDMTools" version)) (sha256 (base32 - "1kacrpamshv7wz83yn45sfbw4m9c44xrrngzcklnwx8gcxx2knm6")))) + "1fsgnlc7glawimzijp11j53g5bnfp1mdq9wb0754idmxcdi8a99q")))) (properties `((upstream-name . "SDMTools"))) (build-system r-build-system) (propagated-inputs `(("r-r-utils" ,r-r-utils))) -- cgit v1.2.3 From f0826fec468d4cf539403b44e27c22b2559c2374 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 19 Apr 2019 14:43:29 +0200 Subject: gnu: r-rdpack: Update to 0.11-0. * gnu/packages/cran.scm (r-rdpack): Update to 0.11-0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index ec896f4a91..bbc83d6b6e 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5605,14 +5605,14 @@ (define-public r-rjags (define-public r-rdpack (package (name "r-rdpack") - (version "0.10-1") + (version "0.11-0") (source (origin (method url-fetch) (uri (cran-uri "Rdpack" version)) (sha256 (base32 - "0bbjnw88h54v40hzim00i8yd3p4rk9i84zfdmgcbnylscwvsf0av")))) + "11cd27s6zp5cxnwxcvz6rjf00y0r7aq8ywhzwpf1r4xy1z44kd4g")))) (properties `((upstream-name . "Rdpack"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 7015ae6881e2cb6cbcb2bcab817c2c751d118416 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 19 Apr 2019 14:43:34 +0200 Subject: gnu: r-urltools: Update to 1.7.3. * gnu/packages/cran.scm (r-urltools): Update to 1.7.3. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index bbc83d6b6e..8816b2082b 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -13253,14 +13253,14 @@ (define-public r-polyclip (define-public r-urltools (package (name "r-urltools") - (version "1.7.2") + (version "1.7.3") (source (origin (method url-fetch) (uri (cran-uri "urltools" version)) (sha256 (base32 - "18lp66f2l504b8q3j4xy8j9pyzzlljw9f112sn6qii1cg83072wm")))) + "04x3my655dd287cbsszbnf75q0swmjlxxrblcsay7a8n3df3a830")))) (build-system r-build-system) (propagated-inputs `(("r-rcpp" ,r-rcpp) -- cgit v1.2.3 From 9b86fea05f223a3215e19cccc75d3504f707a1c2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 19 Apr 2019 15:38:25 +0200 Subject: gnu: Add r-sctransform. * gnu/packages/cran.scm (r-sctransform): New variable. --- gnu/packages/cran.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 8816b2082b..5ea36cfdd6 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -13888,3 +13888,35 @@ (define-public r-rex they are often difficult to interpret. Rex allows you to build complex regular expressions from human readable expressions") (license license:expat))) + +(define-public r-sctransform + (package + (name "r-sctransform") + (version "0.2.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "sctransform" version)) + (sha256 + (base32 + "1r5kiqqs318q59h2i8m7c6nhghp9w6q26ss2y5a390lkhsawgx6p")))) + (build-system r-build-system) + (propagated-inputs + `(("r-future" ,r-future) + ("r-future-apply" ,r-future-apply) + ("r-ggplot2" ,r-ggplot2) + ("r-gridextra" ,r-gridextra) + ("r-mass" ,r-mass) + ("r-matrix" ,r-matrix) + ("r-rcpp" ,r-rcpp) + ("r-rcppeigen" ,r-rcppeigen) + ("r-reshape2" ,r-reshape2))) + (home-page "https://github.com/ChristophH/sctransform") + (synopsis "Variance stabilizing transformations for Single Cell UMI Data") + (description + "This package provides a normalization method for single-cell UMI count +data using a variance stabilizing transformation. The transformation is based +on a negative binomial regression model with regularized parameters. As part +of the same regression framework, this package also provides functions for +batch correction, and data correction.") + (license license:gpl3))) -- cgit v1.2.3 From 296da6e624633f4e049244e72647ceff535a6cc0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 19 Apr 2019 14:44:10 +0200 Subject: gnu: r-seurat: Update to 3.0.0. * gnu/packages/bioinformatics.scm (r-seurat): Update to 3.0.0. [propagated-inputs]: Remove r-dosnow, r-dplyr, r-dtw, r-foreach, r-fpc, r-gplots, r-hdf5r, r-hmisc, r-httr, r-lars, r-mixtools, r-reshape2, and r-tidyr; add r-future, r-future-apply, r-ggrepel, r-kernsmooth, r-rlang, r-rsvd, r-scales, and r-sctransform. --- gnu/packages/bioinformatics.scm | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index dc5d84653c..4cf6900498 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -9438,40 +9438,33 @@ (define-public r-msnid (define-public r-seurat (package (name "r-seurat") - (version "2.3.4") + (version "3.0.0") (source (origin (method url-fetch) (uri (cran-uri "Seurat" version)) (sha256 (base32 - "0l8bv4i9nzz26mirnva10mq6pimibj24vk7vpvfypgn7xk4942hd")))) + "183lm2wk0i3g114jbdf7pb4ssizr48qzqv3cknbsiackr8kvpsvc")))) (properties `((upstream-name . "Seurat"))) (build-system r-build-system) (propagated-inputs `(("r-ape" ,r-ape) ("r-cluster" ,r-cluster) ("r-cowplot" ,r-cowplot) - ("r-dosnow" ,r-dosnow) - ("r-dplyr" ,r-dplyr) - ("r-dtw" ,r-dtw) ("r-fitdistrplus" ,r-fitdistrplus) - ("r-foreach" ,r-foreach) - ("r-fpc" ,r-fpc) + ("r-future" ,r-future) + ("r-future-apply" ,r-future-apply) ("r-ggplot2" ,r-ggplot2) + ("r-ggrepel" ,r-ggrepel) ("r-ggridges" ,r-ggridges) - ("r-gplots" ,r-gplots) - ("r-hdf5r" ,r-hdf5r) - ("r-hmisc" ,r-hmisc) - ("r-httr" ,r-httr) ("r-ica" ,r-ica) ("r-igraph" ,r-igraph) ("r-irlba" ,r-irlba) - ("r-lars" ,r-lars) + ("r-kernsmooth" ,r-kernsmooth) ("r-lmtest" ,r-lmtest) ("r-mass" ,r-mass) ("r-matrix" ,r-matrix) ("r-metap" ,r-metap) - ("r-mixtools" ,r-mixtools) ("r-pbapply" ,r-pbapply) ("r-plotly" ,r-plotly) ("r-png" ,r-png) @@ -9480,12 +9473,14 @@ (define-public r-seurat ("r-rcpp" ,r-rcpp) ("r-rcppeigen" ,r-rcppeigen) ("r-rcppprogress" ,r-rcppprogress) - ("r-reshape2" ,r-reshape2) ("r-reticulate" ,r-reticulate) + ("r-rlang" ,r-rlang) ("r-rocr" ,r-rocr) + ("r-rsvd" ,r-rsvd) ("r-rtsne" ,r-rtsne) + ("r-scales" ,r-scales) + ("r-sctransform" ,r-sctransform) ("r-sdmtools" ,r-sdmtools) - ("r-tidyr" ,r-tidyr) ("r-tsne" ,r-tsne))) (home-page "http://www.satijalab.org/seurat") (synopsis "Seurat is an R toolkit for single cell genomics") -- cgit v1.2.3 From 30a6cd7cd0c458a05f0e38bbd7477785542ccc69 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 19 Apr 2019 16:58:52 +0200 Subject: gnu: ocaml-dose3: Shorten patch file name. This file name was too long for 'tar', as reported by 'guix lint'. * gnu/packages/patches/ocaml-dose3-Add-unix-as-dependency-to-dose3.common-in-META.in.patch: Rename to... * gnu/packages/patches/ocaml-dose3-add-unix-dependency.patch: ... this. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/ocaml.scm (ocaml-dose3)[source]: Adjust accordingly. --- gnu/local.mk | 2 +- gnu/packages/ocaml.scm | 2 +- ...-as-dependency-to-dose3.common-in-META.in.patch | 25 ---------------------- .../patches/ocaml-dose3-add-unix-dependency.patch | 25 ++++++++++++++++++++++ 4 files changed, 27 insertions(+), 27 deletions(-) delete mode 100644 gnu/packages/patches/ocaml-dose3-Add-unix-as-dependency-to-dose3.common-in-META.in.patch create mode 100644 gnu/packages/patches/ocaml-dose3-add-unix-dependency.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 41924a7de5..974a0875f3 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1106,7 +1106,7 @@ dist_patch_DATA = \ %D%/packages/patches/ocaml-CVE-2015-8869.patch \ %D%/packages/patches/ocaml-Add-a-.file-directive.patch \ %D%/packages/patches/ocaml-enable-ocamldoc-reproducibility.patch \ - %D%/packages/patches/ocaml-dose3-Add-unix-as-dependency-to-dose3.common-in-META.in.patch \ + %D%/packages/patches/ocaml-dose3-add-unix-dependency.patch \ %D%/packages/patches/ocaml-dose3-Fix-for-ocaml-4.06.patch \ %D%/packages/patches/ocaml-dose3-dont-make-printconf.patch \ %D%/packages/patches/ocaml-dose3-Install-mli-cmx-etc.patch \ diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 6bb15dc5e9..7b75c6bba6 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -405,7 +405,7 @@ (define-public ocaml-dose3 "00yvyfm4j423zqndvgc1ycnmiffaa2l9ab40cyg23pf51qmzk2jm")) (patches (search-patches - "ocaml-dose3-Add-unix-as-dependency-to-dose3.common-in-META.in.patch" + "ocaml-dose3-add-unix-dependency.patch" "ocaml-dose3-Fix-for-ocaml-4.06.patch" "ocaml-dose3-dont-make-printconf.patch" "ocaml-dose3-Install-mli-cmx-etc.patch")))) diff --git a/gnu/packages/patches/ocaml-dose3-Add-unix-as-dependency-to-dose3.common-in-META.in.patch b/gnu/packages/patches/ocaml-dose3-Add-unix-as-dependency-to-dose3.common-in-META.in.patch deleted file mode 100644 index d2cc44c784..0000000000 --- a/gnu/packages/patches/ocaml-dose3-Add-unix-as-dependency-to-dose3.common-in-META.in.patch +++ /dev/null @@ -1,25 +0,0 @@ -From b94cf24739818e5aff397e0a83b19ea32dc81f42 Mon Sep 17 00:00:00 2001 -From: Louis Gesbert -Date: Tue, 6 Feb 2018 10:15:45 +0100 -Subject: [PATCH 3/3] Add "unix" as dependency to dose3.common in META.in - ---- - META.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/META.in b/META.in -index aa2cd8d..0f9d337 100644 ---- a/META.in -+++ b/META.in -@@ -8,7 +8,7 @@ package "common" ( - version = "@PACKAGE_VERSION@" - archive(byte) = "common.cma" - archive(native) = "common.cmxa" --requires = "extlib, re.pcre, cudf, @ZIP@, @BZ2@" -+requires = "extlib, re.pcre, cudf, unix, @ZIP@, @BZ2@" - ) - - package "algo" ( --- -2.11.0 - diff --git a/gnu/packages/patches/ocaml-dose3-add-unix-dependency.patch b/gnu/packages/patches/ocaml-dose3-add-unix-dependency.patch new file mode 100644 index 0000000000..d2cc44c784 --- /dev/null +++ b/gnu/packages/patches/ocaml-dose3-add-unix-dependency.patch @@ -0,0 +1,25 @@ +From b94cf24739818e5aff397e0a83b19ea32dc81f42 Mon Sep 17 00:00:00 2001 +From: Louis Gesbert +Date: Tue, 6 Feb 2018 10:15:45 +0100 +Subject: [PATCH 3/3] Add "unix" as dependency to dose3.common in META.in + +--- + META.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/META.in b/META.in +index aa2cd8d..0f9d337 100644 +--- a/META.in ++++ b/META.in +@@ -8,7 +8,7 @@ package "common" ( + version = "@PACKAGE_VERSION@" + archive(byte) = "common.cma" + archive(native) = "common.cmxa" +-requires = "extlib, re.pcre, cudf, @ZIP@, @BZ2@" ++requires = "extlib, re.pcre, cudf, unix, @ZIP@, @BZ2@" + ) + + package "algo" ( +-- +2.11.0 + -- cgit v1.2.3 From 60ecacdeaae83164d0e876d81c4891d6a973fac0 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 19 Apr 2019 17:02:28 +0200 Subject: gnu: linkchecker: Shorten patch file name. This file name was too long for 'tar', as reported by 'guix lint'. * gnu/packages/patches/linkchecker-mark-more-tests-that-require-the-network.patch: Rename to... * gnu/packages/patches/linkchecker-tests-require-network.patch: ... this. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/web.scm (linkchecker)[source]: Likewise. --- gnu/local.mk | 2 +- ...-mark-more-tests-that-require-the-network.patch | 182 --------------------- .../linkchecker-tests-require-network.patch | 182 +++++++++++++++++++++ gnu/packages/web.scm | 3 +- 4 files changed, 184 insertions(+), 185 deletions(-) delete mode 100644 gnu/packages/patches/linkchecker-mark-more-tests-that-require-the-network.patch create mode 100644 gnu/packages/patches/linkchecker-tests-require-network.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 974a0875f3..04d11cf467 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1031,7 +1031,7 @@ dist_patch_DATA = \ %D%/packages/patches/lierolibre-newer-libconfig.patch \ %D%/packages/patches/lierolibre-remove-arch-warning.patch \ %D%/packages/patches/lierolibre-try-building-other-arch.patch \ - %D%/packages/patches/linkchecker-mark-more-tests-that-require-the-network.patch \ + %D%/packages/patches/linkchecker-tests-require-network.patch \ %D%/packages/patches/linux-pam-no-setfsuid.patch \ %D%/packages/patches/lirc-localstatedir.patch \ %D%/packages/patches/lirc-reproducible-build.patch \ diff --git a/gnu/packages/patches/linkchecker-mark-more-tests-that-require-the-network.patch b/gnu/packages/patches/linkchecker-mark-more-tests-that-require-the-network.patch deleted file mode 100644 index f3e488cec2..0000000000 --- a/gnu/packages/patches/linkchecker-mark-more-tests-that-require-the-network.patch +++ /dev/null @@ -1,182 +0,0 @@ -From f24c88a0732024028fffe0372039a847e91722ea Mon Sep 17 00:00:00 2001 -From: Christopher Baines -Date: Tue, 1 Jan 2019 22:36:29 +0000 -Subject: [PATCH] Mark more tests that require the network - -I believe all these tests require the network, at least they seem to -fail if it's I run them without connecting my computer to the web. - -I'm looking at this as part of packaging linkchecker for GNU Guix, -where the package is build and the tests are run in a isolated -environment, intentionally without network access, to avoid issues -with non-reproducible package builds. ---- - tests/checker/test_http.py | 2 ++ - tests/checker/test_http_misc.py | 2 ++ - tests/checker/test_http_redirect.py | 2 ++ - tests/checker/test_httpbin.py | 5 +++++ - tests/checker/test_misc.py | 4 ++++ - tests/checker/test_whitespace.py | 3 +++ - 6 files changed, 18 insertions(+) - -diff --git a/tests/checker/test_http.py b/tests/checker/test_http.py -index e4c1e097..8a8af567 100644 ---- a/tests/checker/test_http.py -+++ b/tests/checker/test_http.py -@@ -20,6 +20,7 @@ - - import pytest - -+from tests import need_network - from .httpserver import HttpServerTest, CookieRedirectHttpRequestHandler - - class TestHttp (HttpServerTest): -@@ -29,6 +30,7 @@ def __init__(self, methodName='runTest'): - super(TestHttp, self).__init__(methodName=methodName) - self.handler = CookieRedirectHttpRequestHandler - -+ @need_network - def test_html (self): - confargs = dict(recursionlevel=1) - self.file_test("http.html", confargs=confargs) -diff --git a/tests/checker/test_http_misc.py b/tests/checker/test_http_misc.py -index 9922d85f..c6b6afdb 100644 ---- a/tests/checker/test_http_misc.py -+++ b/tests/checker/test_http_misc.py -@@ -20,11 +20,13 @@ - import os - import sys - from .httpserver import HttpServerTest -+from tests import need_network - from linkcheck.network import iputil - - class TestHttpMisc (HttpServerTest): - """Test http:// misc link checking.""" - -+ @need_network - def test_html (self): - self.swf_test() - self.obfuscate_test() -diff --git a/tests/checker/test_http_redirect.py b/tests/checker/test_http_redirect.py -index f212d98e..2253a70d 100644 ---- a/tests/checker/test_http_redirect.py -+++ b/tests/checker/test_http_redirect.py -@@ -17,6 +17,7 @@ - """ - Test http checking. - """ -+from tests import need_network - from .httpserver import HttpServerTest, CookieRedirectHttpRequestHandler - - class TestHttpRedirect (HttpServerTest): -@@ -26,6 +27,7 @@ def __init__(self, methodName='runTest'): - super(TestHttpRedirect, self).__init__(methodName=methodName) - self.handler = CookieRedirectHttpRequestHandler - -+ @need_network - def test_redirect (self): - self.redirect1() - self.redirect2() -diff --git a/tests/checker/test_httpbin.py b/tests/checker/test_httpbin.py -index 0319c2f6..4c8fa846 100644 ---- a/tests/checker/test_httpbin.py -+++ b/tests/checker/test_httpbin.py -@@ -18,6 +18,7 @@ - Test http stuff with httpbin.org. - """ - import re -+from tests import need_network - from . import LinkCheckTest - - -@@ -30,6 +31,7 @@ def get_httpbin_url(path): - class TestHttpbin(LinkCheckTest): - """Test http:// link redirection checking.""" - -+ @need_network - def test_http_link(self): - linkurl = u"http://www.example.com" - nlinkurl = self.norm(linkurl) -@@ -48,6 +50,7 @@ def test_http_link(self): - ] - self.direct(url, resultlines, recursionlevel=1) - -+ @need_network - def test_basic_auth(self): - user = u"testuser" - password = u"testpassword" -@@ -67,6 +70,7 @@ def test_basic_auth(self): - ] - self.direct(url, resultlines, confargs=confargs) - -+ @need_network - def test_http_refresh_header(self): - linkurl = u"http://www.example.com" - nlinkurl = self.norm(linkurl) -@@ -85,6 +89,7 @@ def test_http_refresh_header(self): - ] - self.direct(url, resultlines, recursionlevel=1) - -+ @need_network - def test_http_content_location_header(self): - linkurl = u"http://www.example.com" - nlinkurl = self.norm(linkurl) -diff --git a/tests/checker/test_misc.py b/tests/checker/test_misc.py -index 2e4cfd07..f9591f9d 100644 ---- a/tests/checker/test_misc.py -+++ b/tests/checker/test_misc.py -@@ -17,6 +17,7 @@ - """ - Test miscellaneous html tag parsing and URL types - """ -+from tests import need_network - from . import LinkCheckTest - - -@@ -25,15 +26,18 @@ class TestMisc (LinkCheckTest): - Test misc link types. - """ - -+ @need_network - def test_misc (self): - self.file_test("misc.html") - - def test_html5 (self): - self.file_test("html5.html") - -+ @need_network - def test_archive (self): - self.file_test("archive.html") - -+ @need_network - def test_itms_services(self): - url = u"itms-services:?action=download-manifest&url=http://www.example.com/" - resultlines = [ -diff --git a/tests/checker/test_whitespace.py b/tests/checker/test_whitespace.py -index 609c108a..fc2727d6 100644 ---- a/tests/checker/test_whitespace.py -+++ b/tests/checker/test_whitespace.py -@@ -17,6 +17,7 @@ - """ - Test whitespace handling. - """ -+from tests import need_network - from . import LinkCheckTest - - -@@ -25,6 +26,7 @@ class TestWhitespace (LinkCheckTest): - Test whitespace in URLs. - """ - -+ @need_network - def test_leading_whitespace (self): - # Leading whitespace - url = u" http://www.example.org/" -@@ -50,6 +52,7 @@ def test_leading_whitespace (self): - ] - self.direct(url, resultlines) - -+ @need_network - def test_trailing_whitespace (self): - # Trailing whitespace - url = u"http://www.example.org/ " diff --git a/gnu/packages/patches/linkchecker-tests-require-network.patch b/gnu/packages/patches/linkchecker-tests-require-network.patch new file mode 100644 index 0000000000..f3e488cec2 --- /dev/null +++ b/gnu/packages/patches/linkchecker-tests-require-network.patch @@ -0,0 +1,182 @@ +From f24c88a0732024028fffe0372039a847e91722ea Mon Sep 17 00:00:00 2001 +From: Christopher Baines +Date: Tue, 1 Jan 2019 22:36:29 +0000 +Subject: [PATCH] Mark more tests that require the network + +I believe all these tests require the network, at least they seem to +fail if it's I run them without connecting my computer to the web. + +I'm looking at this as part of packaging linkchecker for GNU Guix, +where the package is build and the tests are run in a isolated +environment, intentionally without network access, to avoid issues +with non-reproducible package builds. +--- + tests/checker/test_http.py | 2 ++ + tests/checker/test_http_misc.py | 2 ++ + tests/checker/test_http_redirect.py | 2 ++ + tests/checker/test_httpbin.py | 5 +++++ + tests/checker/test_misc.py | 4 ++++ + tests/checker/test_whitespace.py | 3 +++ + 6 files changed, 18 insertions(+) + +diff --git a/tests/checker/test_http.py b/tests/checker/test_http.py +index e4c1e097..8a8af567 100644 +--- a/tests/checker/test_http.py ++++ b/tests/checker/test_http.py +@@ -20,6 +20,7 @@ + + import pytest + ++from tests import need_network + from .httpserver import HttpServerTest, CookieRedirectHttpRequestHandler + + class TestHttp (HttpServerTest): +@@ -29,6 +30,7 @@ def __init__(self, methodName='runTest'): + super(TestHttp, self).__init__(methodName=methodName) + self.handler = CookieRedirectHttpRequestHandler + ++ @need_network + def test_html (self): + confargs = dict(recursionlevel=1) + self.file_test("http.html", confargs=confargs) +diff --git a/tests/checker/test_http_misc.py b/tests/checker/test_http_misc.py +index 9922d85f..c6b6afdb 100644 +--- a/tests/checker/test_http_misc.py ++++ b/tests/checker/test_http_misc.py +@@ -20,11 +20,13 @@ + import os + import sys + from .httpserver import HttpServerTest ++from tests import need_network + from linkcheck.network import iputil + + class TestHttpMisc (HttpServerTest): + """Test http:// misc link checking.""" + ++ @need_network + def test_html (self): + self.swf_test() + self.obfuscate_test() +diff --git a/tests/checker/test_http_redirect.py b/tests/checker/test_http_redirect.py +index f212d98e..2253a70d 100644 +--- a/tests/checker/test_http_redirect.py ++++ b/tests/checker/test_http_redirect.py +@@ -17,6 +17,7 @@ + """ + Test http checking. + """ ++from tests import need_network + from .httpserver import HttpServerTest, CookieRedirectHttpRequestHandler + + class TestHttpRedirect (HttpServerTest): +@@ -26,6 +27,7 @@ def __init__(self, methodName='runTest'): + super(TestHttpRedirect, self).__init__(methodName=methodName) + self.handler = CookieRedirectHttpRequestHandler + ++ @need_network + def test_redirect (self): + self.redirect1() + self.redirect2() +diff --git a/tests/checker/test_httpbin.py b/tests/checker/test_httpbin.py +index 0319c2f6..4c8fa846 100644 +--- a/tests/checker/test_httpbin.py ++++ b/tests/checker/test_httpbin.py +@@ -18,6 +18,7 @@ + Test http stuff with httpbin.org. + """ + import re ++from tests import need_network + from . import LinkCheckTest + + +@@ -30,6 +31,7 @@ def get_httpbin_url(path): + class TestHttpbin(LinkCheckTest): + """Test http:// link redirection checking.""" + ++ @need_network + def test_http_link(self): + linkurl = u"http://www.example.com" + nlinkurl = self.norm(linkurl) +@@ -48,6 +50,7 @@ def test_http_link(self): + ] + self.direct(url, resultlines, recursionlevel=1) + ++ @need_network + def test_basic_auth(self): + user = u"testuser" + password = u"testpassword" +@@ -67,6 +70,7 @@ def test_basic_auth(self): + ] + self.direct(url, resultlines, confargs=confargs) + ++ @need_network + def test_http_refresh_header(self): + linkurl = u"http://www.example.com" + nlinkurl = self.norm(linkurl) +@@ -85,6 +89,7 @@ def test_http_refresh_header(self): + ] + self.direct(url, resultlines, recursionlevel=1) + ++ @need_network + def test_http_content_location_header(self): + linkurl = u"http://www.example.com" + nlinkurl = self.norm(linkurl) +diff --git a/tests/checker/test_misc.py b/tests/checker/test_misc.py +index 2e4cfd07..f9591f9d 100644 +--- a/tests/checker/test_misc.py ++++ b/tests/checker/test_misc.py +@@ -17,6 +17,7 @@ + """ + Test miscellaneous html tag parsing and URL types + """ ++from tests import need_network + from . import LinkCheckTest + + +@@ -25,15 +26,18 @@ class TestMisc (LinkCheckTest): + Test misc link types. + """ + ++ @need_network + def test_misc (self): + self.file_test("misc.html") + + def test_html5 (self): + self.file_test("html5.html") + ++ @need_network + def test_archive (self): + self.file_test("archive.html") + ++ @need_network + def test_itms_services(self): + url = u"itms-services:?action=download-manifest&url=http://www.example.com/" + resultlines = [ +diff --git a/tests/checker/test_whitespace.py b/tests/checker/test_whitespace.py +index 609c108a..fc2727d6 100644 +--- a/tests/checker/test_whitespace.py ++++ b/tests/checker/test_whitespace.py +@@ -17,6 +17,7 @@ + """ + Test whitespace handling. + """ ++from tests import need_network + from . import LinkCheckTest + + +@@ -25,6 +26,7 @@ class TestWhitespace (LinkCheckTest): + Test whitespace in URLs. + """ + ++ @need_network + def test_leading_whitespace (self): + # Leading whitespace + url = u" http://www.example.org/" +@@ -50,6 +52,7 @@ def test_leading_whitespace (self): + ] + self.direct(url, resultlines) + ++ @need_network + def test_trailing_whitespace (self): + # Trailing whitespace + url = u"http://www.example.org/ " diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index fd6bfbab22..7d8e51b5af 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5435,8 +5435,7 @@ (define-public linkchecker (url "https://github.com/linkchecker/linkchecker") (commit (string-append "v" version)))) (patches - (search-patches - "linkchecker-mark-more-tests-that-require-the-network.patch")) + (search-patches "linkchecker-tests-require-network.patch")) (file-name (git-file-name name version)) (sha256 (base32 -- cgit v1.2.3 From 2613bab627e1cbc5557841ceee0c1ba08d1897f1 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 19 Apr 2019 18:37:22 +0200 Subject: gnu: grammalecte: Update to 1.0.1. * gnu/packages/dictionaries.scm (grammalecte): Update to 1.0.1. [source]: Update URL. --- gnu/packages/dictionaries.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/dictionaries.scm b/gnu/packages/dictionaries.scm index e0cd7604b6..9aae53e239 100644 --- a/gnu/packages/dictionaries.scm +++ b/gnu/packages/dictionaries.scm @@ -218,15 +218,15 @@ (define-public ding (define-public grammalecte (package (name "grammalecte") - (version "0.6.5") + (version "1.0.1") (source (origin (method url-fetch/zipbomb) - (uri (string-append "https://www.dicollecte.org/grammalecte/zip/" + (uri (string-append "https://grammalecte.net/grammalecte/zip/" "Grammalecte-fr-v" version ".zip")) (sha256 (base32 - "11byjs3ggdhia5f4vyfqfvbbczsfqimll98h98g7hlsrm7vrifb0")))) + "0p005mqgmckkbif3syv3d90rr1zsm5n5vvac5b29nn8g4v8jjpfs")))) (build-system python-build-system) (home-page "https://grammalecte.net") (synopsis "French spelling and grammar checker") -- cgit v1.2.3 From 107850b3915c007fe1227bcb396cfe377e661e0f Mon Sep 17 00:00:00 2001 From: Nicolò Balzarotti Date: Fri, 1 Mar 2019 09:07:57 +0100 Subject: gnu: Add r-styler. * gnu/packages/cran.scm (r-styler): New variable. Signed-off-by: Ricardo Wurmus --- gnu/packages/cran.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 5ea36cfdd6..2f9e4770ef 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -13920,3 +13920,33 @@ (define-public r-sctransform of the same regression framework, this package also provides functions for batch correction, and data correction.") (license license:gpl3))) + +(define-public r-styler + (package + (name "r-styler") + (version "1.1.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "styler" version)) + (sha256 + (base32 + "1z24mi88snbz1avjw9phq0lzmigddvycc56s83nxzr9w9z85mh05")))) + (build-system r-build-system) + (propagated-inputs + `(("r-backports" ,r-backports) + ("r-cli" ,r-cli) + ("r-magrittr" ,r-magrittr) + ("r-purrr" ,r-purrr) + ("r-rematch2" ,r-rematch2) + ("r-rlang" ,r-rlang) + ("r-rprojroot" ,r-rprojroot) + ("r-tibble" ,r-tibble) + ("r-withr" ,r-withr) + ("r-xfun" ,r-xfun))) + (home-page "https://github.com/r-lib/styler") + (synopsis "Non-invasive pretty printing of R code") + (description + "This is a package for pretty-printing R code without changing the user's +formatting intent.") + (license license:gpl3))) -- cgit v1.2.3 From a85190ddd095fd9e3808fa52ef5e2a839031b2d5 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 19 Apr 2019 14:26:19 -0400 Subject: gnu: linux-libre@4.9: Update to 4.9.169. * gnu/packages/linux.scm (linux-libre-4.9): Update to 4.9.169. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index e6776236d1..fd294aa275 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -483,8 +483,8 @@ (define-public linux-libre-4.14 #:configuration-file kernel-config)) (define-public linux-libre-4.9 - (make-linux-libre "4.9.168" - "1nli5di7i7x4jyad7nappm1awz207rg18n08wb82b1w8rwqyqgy3" + (make-linux-libre "4.9.169" + "0kgycw8bngihx4nks1w6gz36pwzqg4x3y3ipyc1sdlyld7zy9lz7" '("x86_64-linux" "i686-linux") #:configuration-file kernel-config)) -- cgit v1.2.3 From 3f6b7699cd360d0721b87f4a2b145ca9fdd44bbc Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 19 Apr 2019 14:26:59 -0400 Subject: gnu: linux-libre@4.14: Update to 4.14.112. * gnu/packages/linux.scm (%linux-libre-4.14-version): Update to 4.14.112. (%linux-libre-4.14-hash): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index fd294aa275..4d01daf766 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -473,8 +473,8 @@ (define-public linux-libre-4.19 #:patches %linux-libre-4.19-patches #:configuration-file kernel-config)) -(define %linux-libre-4.14-version "4.14.111") -(define %linux-libre-4.14-hash "1b34f96yigdxxh5wg798933nrv7rak1w0v0q1jfviyrllrg3hkmq") +(define %linux-libre-4.14-version "4.14.112") +(define %linux-libre-4.14-hash "0nvd5y84y0g5dlzygna86vvmb3lznm4wsmdgr8rp0z0vm93xcx6m") (define-public linux-libre-4.14 (make-linux-libre %linux-libre-4.14-version -- cgit v1.2.3 From 5547653eb8416cde862b65ab9f747361c2ff08e9 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 19 Apr 2019 14:27:42 -0400 Subject: gnu: linux-libre@4.19: Update to 4.19.35. * gnu/packages/linux.scm (%linux-libre-4.19-version): Update to 4.19.35. (%linux-libre-4.19-hash): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 4d01daf766..22f5f9e166 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -459,8 +459,8 @@ (define-public vhba-module between the CDemu userspace daemon and linux kernel.") (license license:gpl2+))) -(define %linux-libre-4.19-version "4.19.34") -(define %linux-libre-4.19-hash "0rmpyj2qb651p2k2srpjndjxry87hr5vq0jkk4rvxjhm5y3sb65l") +(define %linux-libre-4.19-version "4.19.35") +(define %linux-libre-4.19-hash "1vz9h7m02012xszsfzzfxnvi4ghfi47gx8xqkcclkiyh8ql337cf") (define %linux-libre-4.19-patches (list %boot-logo-patch -- cgit v1.2.3 From 18f8770d58c824448f9a3c3a48bfcee1fe8b2a91 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 19 Apr 2019 14:29:20 -0400 Subject: gnu: linux-libre: Update to 5.0.8. * gnu/packages/linux.scm (%linux-libre-version): Update to 5.0.8. (%linux-libre-hash): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 22f5f9e166..b562a23b2f 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -423,8 +423,8 @@ (define* (make-linux-libre version hash supported-systems It has been modified to remove all non-free binary blobs.") (license license:gpl2))) -(define %linux-libre-version "5.0.7") -(define %linux-libre-hash "0c8g20crv03xxxpirj0jylcxxy33dn9f9x7viv451rzh9frc5mal") +(define %linux-libre-version "5.0.8") +(define %linux-libre-hash "0kfn861rhric78h6wmp6ss1vr1zmly345n6n33vv9qwbi3rr555y") (define %linux-libre-5.0-patches (list %boot-logo-patch -- cgit v1.2.3 From 1e72a23d498c137f99b21ae05b5e559c07e22bc6 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 19 Apr 2019 15:10:58 -0400 Subject: gnu: rct: Be more idiomatic. * gnu/packages/cpp.scm (rct): Move the call to 'git-version' into the package definition. [source]: Explicitly include the source URI rather than using 'home-page'. --- gnu/packages/cpp.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 4e8f12248f..e0af0dd1a9 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -72,16 +72,14 @@ (define-public libzen (define-public rct (let* ((commit "b3e6f41d9844ef64420e628e0c65ed98278a843a") - (revision "2") - (version (git-version "0.0.0" revision commit))) + (revision "2")) (package (name "rct") - (version version) - (home-page "https://github.com/Andersbakken/rct") + (version (git-version "0.0.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference - (url home-page) + (url "https://github.com/Andersbakken/rct") (commit commit))) (sha256 (base32 @@ -99,6 +97,7 @@ (define-public rct (inputs `(("openssl" ,openssl) ("zlib" ,zlib))) + (home-page "https://github.com/Andersbakken/rct") (synopsis "C++ library providing Qt-like APIs on top of the STL") (description "Rct is a set of C++ tools that provide nicer (more Qt-like) APIs on top of Standard Template Library (@dfn{STL}) classes.") -- cgit v1.2.3 From b2c6b467f331d8e8b0f0d4654fb1a436a167565f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 20 Apr 2019 12:03:49 +0200 Subject: gnu: ibus: Update to 1.5.20. * gnu/packages/ibus.scm (ibus): Update to 1.5.20. [arguments]: Remove make-flags; remove "--disable-python2" from configure-flags; add build phase "patch-python-target-directories". [inputs]: Replace intltool with gnu-gettext. --- gnu/packages/ibus.scm | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index 77aecce9f2..7d2e060d77 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -57,7 +57,7 @@ (define-module (gnu packages ibus) (define-public ibus (package (name "ibus") - (version "1.5.19") + (version "1.5.20") (source (origin (method url-fetch) (uri (string-append "https://github.com/ibus/ibus/" @@ -65,23 +65,15 @@ (define-public ibus version "/ibus-" version ".tar.gz")) (sha256 (base32 - "0a94bnpm24581317hdnihwr4cniriml10p4ffgxg14xhvaccfrjb")))) + "0d6hcbw6ai91jl87lqnyn8bxi5y5kba5i9nz7knknyh69g5fbwac")))) (build-system glib-or-gtk-build-system) (arguments `(#:tests? #f ; tests fail because there's no connection to dbus #:configure-flags `("--disable-emoji-dict" ; cannot find emoji.json path - "--disable-python2" "--enable-python-library" ,(string-append "--with-ucd-dir=" (getcwd) "/ucd") "--enable-wayland") - #:make-flags - (list "CC=gcc" - (string-append "pyoverridesdir=" - (assoc-ref %outputs "out") - "/lib/python" - ,(version-major+minor (package-version python)) - "/site-packages/gi/overrides/")) #:phases (modify-phases %standard-phases (add-after 'unpack 'prepare-ucd-dir @@ -90,6 +82,18 @@ (define-public ibus (symlink (assoc-ref inputs "unicode-blocks") "../ucd/Blocks.txt") (symlink (assoc-ref inputs "unicode-nameslist") "../ucd/NamesList.txt") #t)) + (add-after 'unpack 'patch-python-target-directories + (lambda* (#:key outputs #:allow-other-keys) + (let ((root (string-append (assoc-ref outputs "out") + "/lib/python" + ,(version-major+minor (package-version python)) + "/site-packages"))) + (substitute* "configure" + (("(py2?overridesdir)=.*" _ var) + (string-append var "=" root "/gi/overrides/")) + (("(pkgpython2dir=).*" _ var) + (string-append var root "/ibus")))) + #t)) (add-before 'configure 'disable-dconf-update (lambda _ (substitute* "data/dconf/Makefile.in" @@ -131,7 +135,7 @@ (define-public ibus ("gconf" ,gconf) ("gtk2" ,gtk+-2) ("gtk+" ,gtk+) - ("intltool" ,intltool) + ("gettext" ,gnu-gettext) ("json-glib" ,json-glib) ("libnotify" ,libnotify) ("libx11" ,libx11) -- cgit v1.2.3 From 811eae11cd6741bd70ecac63050a95e1e61cb316 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 20 Apr 2019 12:05:00 +0200 Subject: gnu: ibus-libpinyin: Update to 1.11.0. * gnu/packages/ibus.scm (ibus-libpinyin): Update to 1.11.0. --- gnu/packages/ibus.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index 7d2e060d77..b761060a1f 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -179,7 +179,7 @@ (define-public ibus (define-public ibus-libpinyin (package (name "ibus-libpinyin") - (version "1.10.0") + (version "1.11.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/libpinyin/ibus-libpinyin/" @@ -187,7 +187,7 @@ (define-public ibus-libpinyin "/ibus-libpinyin-" version ".tar.gz")) (sha256 (base32 - "0yq8aw4lddiviag8cnik6fp52vvk8lxv6bym13a3xya84c6zii3c")))) + "1sypbr5n96sf7mgqhxrwbawdmszgb6yi28iqkmfmb8xr93pwq7fq")))) (build-system glib-or-gtk-build-system) (arguments `(#:phases -- cgit v1.2.3 From 446130300e6c0a176a35de33e623aa727909b7b0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 20 Apr 2019 12:05:06 +0200 Subject: gnu: libpinyin: Update to 2.3.0. * gnu/packages/ibus.scm (libpinyin): Update to 2.3.0. --- gnu/packages/ibus.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index b761060a1f..130940af4c 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -228,15 +228,15 @@ (define-public ibus-libpinyin (define-public libpinyin (package (name "libpinyin") - (version "2.2.0") + (version "2.3.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/libpinyin/libpinyin/" "releases/download/" version - "/libpinyin-2.2.0.tar.gz")) + "/libpinyin-" version ".tar.gz")) (sha256 (base32 - "1c4wxvcvjxvk23mcwqvsfsv4nhimx4kpjhabxa28gx1ih10l88gj")))) + "14969v6w8n1aiqphl2386dws7dmsdwbzyqnlz4kr8ppm39m9rp5k")))) (build-system gnu-build-system) (inputs `(("glib" ,glib) -- cgit v1.2.3 From afabb9ecfb2776e70717b5b84f4aa694ffb02b8b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 20 Apr 2019 12:33:10 +0200 Subject: gnu: ibus-libpinyin: Add missing runtime input. * gnu/packages/ibus.scm (ibus-libpinyin)[inputs]: Add python-pygobject. --- gnu/packages/ibus.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu') diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index 130940af4c..f652cca1c2 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -213,6 +213,7 @@ (define-public ibus-libpinyin ("sqlite" ,sqlite) ("python" ,python) ("pyxdg" ,python-pyxdg) + ("pygobject2" ,python-pygobject) ("gtk+" ,gtk+))) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From a3e6cf987684cc7476b6ee544091c464378cbcd9 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sat, 6 Apr 2019 10:34:40 -0400 Subject: gnu: Add git-lfs. * gnu/packages/version-control.scm (git-lfs): New variable. --- gnu/packages/version-control.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 22771a129c..3432e70c1b 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -23,6 +23,7 @@ ;;; Copyright © 2018 Timothy Sample ;;; Copyright © 2018 Arun Isaac ;;; Copyright © 2019 Jovany Leandro G.C +;;; Copyright © 2019 Kei Kebreau ;;; ;;; This file is part of GNU Guix. ;;; @@ -47,6 +48,7 @@ (define-module (gnu packages version-control) #:use-module (guix git-download) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) + #:use-module (guix build-system go) #:use-module (guix build-system python) #:use-module (guix build-system trivial) #:use-module (gnu packages apr) @@ -2144,3 +2146,27 @@ (define-public git-imerge the smallest possible conflicts and to allow a merge to be saved, tested, interrupted, published, and collaborated on while in progress.") (license license:gpl2+))) + +(define-public git-lfs + (package + (name "git-lfs") + (version "2.7.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/git-lfs/git-lfs") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "10v38w8qfz0x8750kv31n8gg2dimvq4wz40m374pd1xaypfs9670")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/git-lfs/git-lfs")) + (home-page "https://git-lfs.github.com/") + (synopsis "Git extension for versioning large files") + (description + "Git Large File Storage (LFS) replaces large files such as audio samples, +videos, datasets, and graphics with text pointers inside Git, while storing the +file contents on a remote server.") + (license license:expat))) -- cgit v1.2.3 From 785919121066a10b291d783b6903b5e368e992a8 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 20 Apr 2019 11:43:23 +0200 Subject: install: Pass "modprobe.blacklist=radeon". * gnu/system/install.scm (installation-os)[kernel-arguments]: New field. --- gnu/system/install.scm | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'gnu') diff --git a/gnu/system/install.scm b/gnu/system/install.scm index d887313132..80b7fe8e69 100644 --- a/gnu/system/install.scm +++ b/gnu/system/install.scm @@ -427,6 +427,12 @@ (define installation-os (label (string-append "GNU Guix installation " (package-version guix))) + ;; XXX: The AMD Radeon driver is reportedly broken, which makes kmscon + ;; non-functional: + ;; . + ;; Thus, blacklist it. + (kernel-arguments '("modprobe.blacklist=radeon")) + (file-systems ;; Note: the disk image build code overrides this root file system with ;; the appropriate one. -- cgit v1.2.3 From 833480cc1fa934b64a192fe7b2401491d4f169df Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 20 Apr 2019 14:42:53 +0200 Subject: vm: Reset file timestamps in ISO images. Partly fixes . Reported by Florian Pelz . * gnu/build/vm.scm (make-iso9660-image): Pass "-volume_date all_file_dates =1". --- gnu/build/vm.scm | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'gnu') diff --git a/gnu/build/vm.scm b/gnu/build/vm.scm index e15ca4d5fb..75f1394d1a 100644 --- a/gnu/build/vm.scm +++ b/gnu/build/vm.scm @@ -471,6 +471,10 @@ (define items "mnt=/tmp/root/mnt" "-path-list" "-" "--" + + ;; Set all timestamps to 1. + "-volume_date" "all_file_dates" "=1" + "-volid" (string-upcase volume-id) (if volume-uuid `("-volume_date" "uuid" -- cgit v1.2.3 From 6901b9248ea21f81f033e7b0de32502e389a5b71 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 20 Apr 2019 22:34:28 +0200 Subject: vm: Reset file timestamps of the EFI image in ISO images. Partly fixes . * gnu/build/vm.scm (make-iso9660-image): Set the 'SOURCE_DATE_EPOCH' environment variable. --- gnu/build/vm.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'gnu') diff --git a/gnu/build/vm.scm b/gnu/build/vm.scm index 75f1394d1a..a63a5d2eea 100644 --- a/gnu/build/vm.scm +++ b/gnu/build/vm.scm @@ -37,6 +37,7 @@ (define-module (gnu build vm) #:use-module (ice-9 popen) #:use-module (srfi srfi-1) #:use-module (srfi srfi-9) + #:use-module (srfi srfi-19) #:use-module (srfi srfi-26) #:export (qemu-command load-in-linux-vm @@ -458,6 +459,15 @@ (define items closures) (register-bootcfg-root "/tmp/root" config-file)) + ;; 'grub-mkrescue' calls out to mtools programs to create 'efi.img', a FAT + ;; file system image, and mtools honors SOURCE_DATE_EPOCH for the mtime of + ;; those files. The epoch for FAT is Jan. 1st 1980, not 1970, so choose + ;; that. + (setenv "SOURCE_DATE_EPOCH" + (number->string + (time-second + (date->time-utc (make-date 0 0 0 0 1 1 1980 0))))) + (let ((pipe (apply open-pipe* OPEN_WRITE grub-mkrescue "-o" target -- cgit v1.2.3 From 52b5fe5bcf39ec54a7ff4f4230b4bd390b859a32 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 20 Apr 2019 23:52:09 +0200 Subject: gnu: grub: 'grub-mkrescue' honors 'GRUB_FAT_SERIAL_NUMBER'. * gnu/packages/patches/grub-efi-fat-serial-number.patch: New file. * gnu/packages/bootloaders.scm (grub)[source](patches): Add it. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/bootloaders.scm | 3 ++- .../patches/grub-efi-fat-serial-number.patch | 27 ++++++++++++++++++++++ 3 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/grub-efi-fat-serial-number.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 04d11cf467..c6f09df54d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -873,6 +873,7 @@ dist_patch_DATA = \ %D%/packages/patches/groovy-add-exceptionutilsgenerator.patch \ %D%/packages/patches/grub-binutils-compat.patch \ %D%/packages/patches/grub-check-error-efibootmgr.patch \ + %D%/packages/patches/grub-efi-fat-serial-number.patch \ %D%/packages/patches/gsl-test-i686.patch \ %D%/packages/patches/gspell-dash-test.patch \ %D%/packages/patches/gst-plugins-good-libvpx-compat.patch \ diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index d6ef7d52b5..b4eabaea48 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -90,7 +90,8 @@ (define-public grub (base32 "03vvdfhdmf16121v7xs8is2krwnv15wpkhkf16a4yf8nsfc3f2w1")) (patches (search-patches "grub-check-error-efibootmgr.patch" - "grub-binutils-compat.patch")))) + "grub-binutils-compat.patch" + "grub-efi-fat-serial-number.patch")))) (build-system gnu-build-system) (arguments `(#:phases (modify-phases %standard-phases diff --git a/gnu/packages/patches/grub-efi-fat-serial-number.patch b/gnu/packages/patches/grub-efi-fat-serial-number.patch new file mode 100644 index 0000000000..ad92f9bc9e --- /dev/null +++ b/gnu/packages/patches/grub-efi-fat-serial-number.patch @@ -0,0 +1,27 @@ +Change 'grub-mkrescue' to honor the 'GRUB_FAT_SERIAL_NUMBER' +environment variable. That way, the caller can specify a fixed +serial number (instead of the randomly chosen one) to create EFI +images (the 'efi.img' file) that are reproducible bit-for-bit. + +Patch by Ludovic Courtès . + +--- grub-2.02/util/grub-mkrescue.c 2019-04-20 19:15:26.180242812 +0200 ++++ grub-2.02/util/grub-mkrescue.c 2019-04-20 21:56:34.672370849 +0200 +@@ -788,8 +788,15 @@ main (int argc, char *argv[]) + + efiimgfat = grub_util_path_concat (2, iso9660_dir, "efi.img"); + int rv; +- rv = grub_util_exec ((const char * []) { "mformat", "-C", "-f", "2880", "-L", "16", "-i", +- efiimgfat, "::", NULL }); ++ ++ const char *fat_serial_number = getenv ("GRUB_FAT_SERIAL_NUMBER"); ++ const char *mformat_args[] = ++ { "mformat", "-C", "-f", "2880", "-L", "16", ++ fat_serial_number != NULL ? "-N" : "-C", ++ fat_serial_number != NULL ? fat_serial_number : "-C", ++ "-i", efiimgfat, "::", NULL }; ++ ++ rv = grub_util_exec (mformat_args); + if (rv != 0) + grub_util_error ("`%s` invocation failed\n", "mformat"); + rv = grub_util_exec ((const char * []) { "mcopy", "-s", "-i", efiimgfat, efidir_efi, "::/", NULL }); -- cgit v1.2.3 From 605815023cd21becc0156916f4ce08950b4459e5 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 21 Apr 2019 00:16:57 +0200 Subject: vm: Use a fixed FAT serial number for 'efi.img' in ISO images. Partly fixes . * gnu/build/vm.scm (make-iso9660-image): Set the 'GRUB_FAT_SERIAL_NUMBER' environment variable. --- gnu/build/vm.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'gnu') diff --git a/gnu/build/vm.scm b/gnu/build/vm.scm index a63a5d2eea..f2953621ec 100644 --- a/gnu/build/vm.scm +++ b/gnu/build/vm.scm @@ -468,6 +468,16 @@ (define items (time-second (date->time-utc (make-date 0 0 0 0 1 1 1980 0))))) + ;; Our patched 'grub-mkrescue' honors this environment variable and passes + ;; it to 'mformat', which makes it the serial number of 'efi.img'. This + ;; allows for deterministic builds. + (setenv "GRUB_FAT_SERIAL_NUMBER" + (number->string (if volume-uuid + (string-hash (iso9660-uuid->string volume-uuid) + (expt 2 32)) + #x77777777) + 16)) + (let ((pipe (apply open-pipe* OPEN_WRITE grub-mkrescue "-o" target -- cgit v1.2.3 From 5502fbd7fd8073e7eeb0b447530d7c88c1b79367 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 21 Apr 2019 00:18:45 +0200 Subject: gnu: valgrind: Add 3.15.0. * gnu/packages/valgrind.scm (valgrind-3.15): New variable. --- gnu/packages/valgrind.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/valgrind.scm b/gnu/packages/valgrind.scm index 0a6206b3b1..14f45db9be 100644 --- a/gnu/packages/valgrind.scm +++ b/gnu/packages/valgrind.scm @@ -84,3 +84,18 @@ (define-public valgrind ;; Building VEX on mips64el-linux fails with "opcode not supported on this ;; processor: mips3". (supported-systems (delete "mips64el-linux" %supported-systems)))) + +(define-public valgrind-3.15 + (package + (inherit valgrind) + (version "3.15.0") + (source (origin + (method url-fetch) + (uri (list (string-append "http://www.valgrind.org/downloads" + "/valgrind-" version ".tar.bz2") + (string-append "ftp://sourceware.org/pub/valgrind" + "/valgrind-" version ".tar.bz2"))) + (sha256 + (base32 + "1ccawxrni8brcvwhygy12iprkvz409hbr9xkk1bd03gnm2fplz21")) + (patches (search-patches "valgrind-enable-arm.patch")))))) -- cgit v1.2.3 From 1b0b1651b16bd67fa5a583cfe6ce98ac9df80e56 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 21 Apr 2019 00:46:44 +0200 Subject: gnu: mtools: 'mformat' initializes boot sector before writing it. This is the last bit fixing . Previously, 'mformat' (used by 'grub-mkrescue') would pass uninitialized bytes to write(2), leading to non-deterministic FAT image contents. This patch fixes that. * gnu/packages/patches/mtools-mformat-uninitialized.patch: New file. * gnu/packages/mtools.scm (mtools)[source]: Use it. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/mtools.scm | 22 ++++++++++++---------- .../patches/mtools-mformat-uninitialized.patch | 20 ++++++++++++++++++++ 3 files changed, 33 insertions(+), 10 deletions(-) create mode 100644 gnu/packages/patches/mtools-mformat-uninitialized.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index c6f09df54d..b6b6259438 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1078,6 +1078,7 @@ dist_patch_DATA = \ %D%/packages/patches/mozjs38-tracelogger.patch \ %D%/packages/patches/mozjs38-version-detection.patch \ %D%/packages/patches/mrrescue-support-love-11.patch \ + %D%/packages/patches/mtools-mformat-uninitialized.patch \ %D%/packages/patches/mumble-1.2.19-abs.patch \ %D%/packages/patches/mumps-build-parallelism.patch \ %D%/packages/patches/mupen64plus-ui-console-notice.patch \ diff --git a/gnu/packages/mtools.scm b/gnu/packages/mtools.scm index 5be3da0137..b93d5789b9 100644 --- a/gnu/packages/mtools.scm +++ b/gnu/packages/mtools.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013 John Darrington -;;; Copyright © 2015 Ludovic Courtès +;;; Copyright © 2015, 2019 Ludovic Courtès ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Efraim Flashner ;;; @@ -23,20 +23,22 @@ (define-module (gnu packages mtools) #:use-module (guix licenses) #:use-module (guix packages) #:use-module (guix download) - #:use-module (guix build-system gnu)) + #:use-module (guix build-system gnu) + #:use-module (gnu packages)) (define-public mtools (package (name "mtools") (version "4.0.23") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://gnu/mtools/mtools-" - version ".tar.bz2")) - (sha256 - (base32 - "1qwfxzr964fasxlzhllahk8mzh7c82s808wvly95dsqsflkdp27i")))) + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/mtools/mtools-" + version ".tar.bz2")) + (sha256 + (base32 + "1qwfxzr964fasxlzhllahk8mzh7c82s808wvly95dsqsflkdp27i")) + (patches + (search-patches "mtools-mformat-uninitialized.patch")))) (build-system gnu-build-system) (home-page "https://www.gnu.org/software/mtools/") (synopsis "Access MS-DOS disks without mounting") diff --git a/gnu/packages/patches/mtools-mformat-uninitialized.patch b/gnu/packages/patches/mtools-mformat-uninitialized.patch new file mode 100644 index 0000000000..ae69d45c99 --- /dev/null +++ b/gnu/packages/patches/mtools-mformat-uninitialized.patch @@ -0,0 +1,20 @@ +Fix a bug whereby 'mformat' could end up passing uninitialized bytes +to write(2). This could be reproduced with: + + mformat -C -f 1440 -L 16 -N 77777777 -i /tmp/x :: + +where the output of /tmp/x would be non-deterministic. + +Patch by Ludovic Courtès . + +--- mtools-4.0.23/mformat.c 2019-04-21 00:12:01.496116195 +0200 ++++ mtools-4.0.23/mformat.c 2019-04-21 00:12:36.675967157 +0200 +@@ -927,6 +927,7 @@ void mformat(int argc, char **argv, int + + char *endptr; + ++ memset(&boot.bytes, '\0', sizeof boot); + hs = hs_set = 0; + argtracks = 0; + argheads = 0; + -- cgit v1.2.3 From 442a11f68f141264283a9eee0e0e15bebe104cf8 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sun, 21 Apr 2019 09:45:36 +0200 Subject: gnu: guile-newt: Update to 0.0.1. * gnu/packages/guile-xyz.scm (guile-newt): Update to 0.0.1. --- gnu/packages/guile-xyz.scm | 59 ++++++++++++++++++++++------------------------ 1 file changed, 28 insertions(+), 31 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index e7f9e8fe93..125b6a5785 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -948,40 +948,37 @@ (define-public guile-debbugs-next `(("guile" ,guile-2.2) ("guile-email" ,guile-email)))))) -;; There has not been any release yet. (define-public guile-newt - (let ((commit "80c1e9e71945f833386d1632b52573e59325804f") - (revision "4")) - (package - (name "guile-newt") - (version (string-append "0-" revision "." (string-take commit 9))) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://gitlab.com/mothacehe/guile-newt") - (commit commit))) - (file-name (string-append name "-" version "-checkout")) - (sha256 - (base32 - "1w7qy4dw1f4bx622l6hw8mv49sf1ha8kch8j4nganyk8fj0wn695")))) - (build-system gnu-build-system) - (arguments - '(#:make-flags - '("GUILE_AUTO_COMPILE=0"))) ;to prevent guild warnings - (inputs - `(("guile" ,guile-2.2) - ("newt" ,newt))) - (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("pkg-config" ,pkg-config))) - (synopsis "Guile bindings to Newt") - (description - "This package provides bindings for Newt, a programming library for + (package + (name "guile-newt") + (version "0.0.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/mothacehe/guile-newt") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1w7qy4dw1f4bx622l6hw8mv49sf1ha8kch8j4nganyk8fj0wn695")))) + (build-system gnu-build-system) + (arguments + '(#:make-flags + '("GUILE_AUTO_COMPILE=0"))) ;to prevent guild warnings + (inputs + `(("guile" ,guile-2.2) + ("newt" ,newt))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("pkg-config" ,pkg-config))) + (synopsis "Guile bindings to Newt") + (description + "This package provides bindings for Newt, a programming library for color text mode, widget based user interfaces. The bindings are written in pure Scheme by using Guile’s foreign function interface.") - (home-page "https://gitlab.com/mothacehe/guile-newt") - (license license:gpl3+)))) + (home-page "https://gitlab.com/mothacehe/guile-newt") + (license license:gpl3+))) (define-public guile-mastodon (package -- cgit v1.2.3 From dbcd503c46f769c3ac70d0ad1d72071c7015574e Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sun, 21 Apr 2019 09:48:26 +0200 Subject: gnu: guile-parted: Update to 0.0.1. * gnu/packages/guile-xyz.scm (guile-parted): Update to 0.0.1. --- gnu/packages/guile-xyz.scm | 65 ++++++++++++++++++++++------------------------ 1 file changed, 31 insertions(+), 34 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 125b6a5785..03fd63837e 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -1009,42 +1009,39 @@ (define-public guile-mastodon microblogging service.") (license license:gpl3+))) -;; There has not been any release yet. (define-public guile-parted - (let ((commit "ea3f1a1f6844775fc59d3078d2a09c62ffb341b8") - (revision "0")) - (package - (name "guile-parted") - (version (string-append "0-" revision "." (string-take commit 9))) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://gitlab.com/mothacehe/guile-parted") - (commit commit))) - (file-name (string-append name "-" version "-checkout")) - (sha256 - (base32 - "1q7425gpjlwi2wvhzq7kw046yyx7v6j6jyzkd1cr861iz34mjwiq")))) - (build-system gnu-build-system) - (arguments - '(#:make-flags - '("GUILE_AUTO_COMPILE=0"))) ;to prevent guild warnings - (inputs - `(("guile" ,guile-2.2) - ("parted" ,parted))) - (propagated-inputs - `(("guile-bytestructures" ,guile-bytestructures))) - (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("pkg-config" ,pkg-config))) - (synopsis "Guile bindings to GNU Parted") - (description - "This package provides bindings for GNU Parted library, a C library -allowing disk partition tables creation and manipulation. The bindings are + (package + (name "guile-parted") + (version "0.0.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/mothacehe/guile-parted") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1q7425gpjlwi2wvhzq7kw046yyx7v6j6jyzkd1cr861iz34mjwiq")))) + (build-system gnu-build-system) + (arguments + '(#:make-flags + '("GUILE_AUTO_COMPILE=0"))) ;to prevent guild warnings + (inputs + `(("guile" ,guile-2.2) + ("parted" ,parted))) + (propagated-inputs + `(("guile-bytestructures" ,guile-bytestructures))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("pkg-config" ,pkg-config))) + (synopsis "Guile bindings to GNU Parted") + (description + "This package provides bindings for GNU Parted library, a C library +allowing disk partition tables creation and manipulation. The bindings are written in pure Scheme by using Guile's foreign function interface.") - (home-page "https://gitlab.com/mothacehe/guile-parted") - (license license:gpl3+)))) + (home-page "https://gitlab.com/mothacehe/guile-parted") + (license license:gpl3+))) (define-public guile-xosd (package -- cgit v1.2.3 From 17ae31b7a80e0794a5b621bc04f8dec5b88fef96 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 21 Apr 2019 10:16:17 +0200 Subject: gnu: r-hdf5r: Update to 1.2.0. * gnu/packages/cran.scm (r-hdf5r): Update to 1.2.0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 2f9e4770ef..742bc5f663 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5489,14 +5489,14 @@ (define-public r-nbclust (define-public r-hdf5r (package (name "r-hdf5r") - (version "1.1.1") + (version "1.2.0") (source (origin (method url-fetch) (uri (cran-uri "hdf5r" version)) (sha256 (base32 - "1cq4rdfd0rqvy29ml3x1iid142ljnscs8f4d2y1na13hlvkl3k05")))) + "10gynjwaaxks8y9c2fl8k040j0nbwn372nil70009yfk9wrkx0aq")))) (build-system r-build-system) (inputs `(("hdf5" ,hdf5) -- cgit v1.2.3 From dc01978288318a8155e2e2657be9b278a754ebac Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Wed, 17 Apr 2019 08:56:32 +0200 Subject: services: fprintd: Use define-configuration. * gnu/services/authentication.scm: Use define-configuration in fprintd. --- gnu/services/authentication.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/services/authentication.scm b/gnu/services/authentication.scm index 6a9dab9185..16df4da1fc 100644 --- a/gnu/services/authentication.scm +++ b/gnu/services/authentication.scm @@ -42,11 +42,9 @@ (define-module (gnu services authentication) nslcd-configuration? nslcd-service-type)) -(define-record-type* - fprintd-configuration make-fprintd-configuration - fprintd-configuration? - (fprintd fprintd-configuration-fprintd - (default fprintd))) +(define-configuration fprintd-configuration + (fprintd (package fprintd) + "The fprintd package")) (define (fprintd-dbus-service config) (list (fprintd-configuration-fprintd config))) -- cgit v1.2.3 From 9729b6ea2fe89d5b8cfd180ef2dfca367c7417e5 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 21 Apr 2019 10:33:18 +0100 Subject: gnu: direnv: Remove go references from output. In the long run, it would be good to move direnv across to the go-build-system, and update the package, but these changes do succeed in reducing the closure size a lot. Thanks to Tanguy Le Carrour for raising this issue on guix-devel. * gnu/packages/shellutils.scm (direnv)[arguments]: Include the remove-go-references phase from the go-build-system. [inputs,native-inputs]: Move all inputs to native-inputs, as these are no longer referenced in the output. --- gnu/packages/shellutils.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm index 88c0f32e99..59a8b744eb 100644 --- a/gnu/packages/shellutils.scm +++ b/gnu/packages/shellutils.scm @@ -128,13 +128,14 @@ (define-public direnv (delete 'configure) ;; Help the build scripts find the Go language dependencies. (add-before 'unpack 'setup-go-environment - (assoc-ref go:%standard-phases 'setup-go-environment))))) - (inputs + (assoc-ref go:%standard-phases 'setup-go-environment)) + (add-after 'install 'remove-go-references + (assoc-ref go:%standard-phases 'remove-go-references))))) + (native-inputs `(("go" ,go) ("go-github-com-burntsushi-toml" ,go-github-com-burntsushi-toml) - ("go-github-com-direnv-go-dotenv" ,go-github-com-direnv-go-dotenv))) - (native-inputs - `(("which" ,which))) + ("go-github-com-direnv-go-dotenv" ,go-github-com-direnv-go-dotenv) + ("which" ,which))) (home-page "https://direnv.net/") (synopsis "Environment switcher for the shell") (description -- cgit v1.2.3 From 33023baac8ec548fe64ce8e4eb48840b5411ee4c Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sun, 21 Apr 2019 12:06:25 +0200 Subject: installer: Fix skip-to-step issue. When trying to jump to the first step, DONE-STEPS ends-up being null, which fails the matching condition. * gnu/installer/steps.scm (skip-to-step): Split matching conditions to handle the empty DONE-STEPS case properly. --- gnu/installer/steps.scm | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/installer/steps.scm b/gnu/installer/steps.scm index 1483cdc3db..039dd0ca10 100644 --- a/gnu/installer/steps.scm +++ b/gnu/installer/steps.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2018 Mathieu Othacehe +;;; Copyright © 2018, 2019 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -113,16 +113,24 @@ (define (first-step? steps step) (define* (skip-to-step step result #:key todo-steps done-steps) - (match (list todo-steps done-steps) - (((todo . rest-todo) (prev-done ... last-done)) - (if (eq? (installer-step-id todo) - (installer-step-id step)) + (match todo-steps + ((todo . rest-todo) + (let ((found? (eq? (installer-step-id todo) + (installer-step-id step)))) + (cond + (found? (run result #:todo-steps todo-steps - #:done-steps done-steps) - (skip-to-step step (pop-result result) - #:todo-steps (cons last-done todo-steps) - #:done-steps prev-done))))) + #:done-steps done-steps)) + ((and (not found?) + (null? done-steps)) + (error (format #f "Step ~a not found" (installer-step-id step)))) + (else + (match done-steps + ((prev-done ... last-done) + (skip-to-step step (pop-result result) + #:todo-steps (cons last-done todo-steps) + #:done-steps prev-done))))))))) (define* (run result #:key todo-steps done-steps) (match todo-steps -- cgit v1.2.3 From 72385c34ba3a512f6a9d61f60de4bfbb405a158d Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Tue, 26 Mar 2019 21:37:26 -0400 Subject: gnu: Add dumb. * gnu/packages/music.scm (dumb): New variable. --- gnu/packages/music.scm | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 361aba1a51..f2feb90b8e 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2016 Al McElrath ;;; Copyright © 2016, 2017 Efraim Flashner ;;; Copyright © 2016, 2018 Leo Famulari -;;; Copyright © 2016, 2017 Kei Kebreau +;;; Copyright © 2016, 2017, 2019 Kei Kebreau ;;; Copyright © 2016 John J. Foerch ;;; Copyright © 2016 Alex Griffin ;;; Copyright © 2017 ng0 @@ -81,6 +81,7 @@ (define-module (gnu packages music) #:use-module (gnu packages fonts) #:use-module (gnu packages fontutils) #:use-module (gnu packages freedesktop) + #:use-module (gnu packages game-development) #:use-module (gnu packages gcc) #:use-module (gnu packages gnupg) #:use-module (gnu packages gettext) @@ -446,6 +447,40 @@ (define-public denemo (home-page "http://www.denemo.org") (license license:gpl3+))) +(define-public dumb + (package + (name "dumb") + (version "2.0.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/kode54/dumb.git") + (commit version))) + (sha256 + (base32 "1cnq6rb14d4yllr0yi32p9jmcig8avs3f43bvdjrx4r1mpawspi6")) + (file-name (git-file-name name version)))) + (build-system cmake-build-system) + (arguments + '(#:tests? #f ; no check target + #:configure-flags + (list "-DBUILD_SHARED_LIBS=ON" + "-DBUILD_EXAMPLES=OFF"))) + (home-page "https://github.com/kode54/dumb") + (synopsis "Module audio renderer library") + (description + "DUMB is a tracker library with support for IT, XM, S3M and MOD files. It +targets maximum accuracy to the original formats, with low-pass resonant filters +for the IT files, accurate timing and pitching, and three resampling quality +settings (aliasing, linear interpolation and cubic interpolation).") + ;; The DUMB license is a bit peculiar. + ;; Clause 8 states that clauses 4, 5 and 6 are null and void, leaving only + ;; the first three clauses for genuine consideration. + ;; Clauses 1, 2 and 3 are analogous to clauses 1, 2 and 3 of the zlib + ;; license, a known free software license. + ;; Therefore, the DUMB license may be considered a free software license. + (license (license:fsf-free "file://LICENSE")))) + (define-public hydrogen (package (name "hydrogen") -- cgit v1.2.3 From d61dcb1b47285e2951c39ffab3a685910febb7ac Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Mon, 15 Apr 2019 09:44:02 -0400 Subject: gnu: Add dumb-allegro4. * gnu/packages/music.scm (dumb-allegro4): New variable. --- gnu/packages/music.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index f2feb90b8e..c0b0163d62 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -481,6 +481,17 @@ (define-public dumb ;; Therefore, the DUMB license may be considered a free software license. (license (license:fsf-free "file://LICENSE")))) +(define-public dumb-allegro4 + (package + (inherit dumb) + (name "dumb-allegro4") + (arguments + (substitute-keyword-arguments (package-arguments dumb) + ((#:configure-flags flags) + `(cons "-DBUILD_ALLEGRO4=ON" ,flags)))) + (inputs + `(("allegro" ,allegro-4))))) + (define-public hydrogen (package (name "hydrogen") -- cgit v1.2.3 From f9fee46ffbf392af22f732b83be7d4b31109e052 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Tue, 26 Mar 2019 21:42:53 -0400 Subject: gnu: Add alex4. * gnu/packages/games.scm (alex4): New variable. --- gnu/packages/games.scm | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index d22d8ba7a4..378bbc2eec 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -237,6 +237,56 @@ (define-public adanaxisgpl mouse and joystick control, and original music.") (license license:gpl2))) +(define-public alex4 + (package + (name "alex4") + (version "1.2-alpha") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/carstene1ns/alex4/archive/" + version ".tar.gz")) + (sha256 + (base32 "0jj1g3v1a6lyfwp5g2ly0n9z65ryqck8jxvzr01kaqjj3lsfkrhg")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; no check target + #:make-flags + (list "-Csrc" + "CC=gcc" + "CFLAGS=-D_FILE_OFFSET_BITS=64" + (string-append "DATADIR=" (assoc-ref %outputs "out") + "/share/" ,name) + (string-append "PREFIX=" (assoc-ref %outputs "out"))) + #:phases + (modify-phases %standard-phases + (replace 'configure + (lambda _ + (substitute* '("src/main.c" + "src/shooter.c") + (("fcos") "fixcos") + (("fmul") "fixmul") + (("fsin") "fixsin")) + #t)) + (add-after 'install 'install-data + (lambda* (#:key outputs #:allow-other-keys) + (let ((share (string-append (assoc-ref outputs "out") + "/share/" ,name))) + (install-file "alex4.ini" share) + #t)))))) + (inputs + `(("allegro" ,allegro-4) + ("dumb" ,dumb-allegro4))) + (home-page "http://allegator.sourceforge.net/") + (synopsis "Retro platform game") + (description + "Guide Alex the Allegator through the jungle in order to save his +girlfriend Lola from evil humans who want to make a pair of shoes out of her. +Plenty of classic platforming in four nice colors guaranteed! + +The game includes a built-in editor so you can design and share your own maps.") + (license license:gpl2+))) + (define-public armagetron-advanced (package (name "armagetron-advanced") -- cgit v1.2.3 From 60af1822d40c4bc7f33de46895741032dc3db80a Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Sun, 21 Apr 2019 19:09:47 +0100 Subject: gnu: supertuxkart: Update to 1.0. * gnu/packages/games.scm (supertuxkart): Update to 1.0. [inputs]: Add openssl. Signed-off-by: Christopher Baines --- gnu/packages/games.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 378bbc2eec..0ca3cdcf8c 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -38,6 +38,7 @@ ;;; Copyright © 2018 Alex Vong ;;; Copyright © 2019 Pierre Neidhardt ;;; Copyright © 2019 Oleg Pykhalov +;;; Copyright © 2019 Pierre Langlois ;;; ;;; This file is part of GNU Guix. ;;; @@ -2116,7 +2117,7 @@ (define-public extremetuxracer (define-public supertuxkart (package (name "supertuxkart") - (version "0.9.3") + (version "1.0") (source (origin (method url-fetch) @@ -2124,7 +2125,7 @@ (define-public supertuxkart version "/supertuxkart-" version "-src.tar.xz")) (sha256 (base32 - "1c4w47ibj87lgwiqygq8qi7jiz6gklj4dwf5bs5zk15s0rqlw0fq")) + "106rlp99hq18b4q1kdri3pl06cc4v7iqfp1hp9k2f8751lzz923d")) (modules '((guix build utils))) (snippet ;; Delete bundled library sources @@ -2186,7 +2187,8 @@ (define-public supertuxkart ("curl" ,curl) ;; The following input is needed to build the bundled and modified ;; version of irrlicht. - ("libjpeg" ,libjpeg))) + ("libjpeg" ,libjpeg) + ("openssl" ,openssl))) (native-inputs `(("pkg-config" ,pkg-config))) (home-page "https://supertuxkart.net/") -- cgit v1.2.3 From 56a4858210ebaf45c32dc99bdfbd12b9bc5a234e Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Sun, 21 Apr 2019 19:09:48 +0100 Subject: gnu: supertuxkart: Simplify unbundling and unbundle enet. * gnu/packages/games.scm (supertuxkart)[source](snippet): Delete "lib/enet". Remove "CMakeList.txt" substitution. [arguments]<#:configure-flags>: Add "-DUSER_SYSTEM_GLEW=TRUE" and "-DUSE_SYSTEM_ENET=TRUE". <#:phases>: Delete. Signed-off-by: Christopher Baines --- gnu/packages/games.scm | 42 ++++++++++++------------------------------ 1 file changed, 12 insertions(+), 30 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 0ca3cdcf8c..6a782b27e9 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -2130,50 +2130,31 @@ (define-public supertuxkart (snippet ;; Delete bundled library sources '(begin - ;; FIXME: try to unbundle enet, and angelscript + ;; Supertuxkart uses modified versions of the Irrlicht engine + ;; and the bullet library. The developers gave an explanation + ;; here: http://forum.freegamedev.net/viewtopic.php?f=17&t=3906 + ;; FIXME: try to unbundle angelscript (for-each delete-file-recursively '("lib/zlib" "lib/libpng" "lib/jpeglib" "lib/glew" - "lib/wiiuse")) - (substitute* "CMakeLists.txt" - ;; Supertuxkart uses modified versions of the Irrlicht engine - ;; and the bullet library. The developers gave an explanation here: - ;; http://forum.freegamedev.net/viewtopic.php?f=17&t=3906 - (("add_subdirectory\\(.*/(glew|zlib)\"\\)") "")) + "lib/wiiuse" + "lib/enet")) #t)))) (build-system cmake-build-system) (arguments `(#:tests? #f ; no check target #:configure-flags (list "-DUSE_WIIUSE=0" - ;; Do not use the bundled zlib + ;; Do not use the bundled zlib, glew and enet. "-DNO_IRR_COMPILE_WITH_ZLIB_=TRUE" + "-DUSE_SYSTEM_GLEW=TRUE" + "-DUSE_SYSTEM_ENET=TRUE" ;; FIXME: needs libopenglrecorder "-DBUILD_RECORDER=0" ;; Irrlicht returns an integer instead of a boolean - "-DCMAKE_C_FLAGS=-fpermissive") - #:phases - (modify-phases %standard-phases - ;; see https://github.com/supertuxkart/stk-code/issues/3557 - (add-after 'unpack 'patch-for-mesa-18.3 - (lambda _ - (substitute* "src/graphics/gl_headers.hpp" - (("#if !defined\\(USE_GLES2\\)") - "#if !defined(USE_GLES2)\n# define __gl_glext_h_")) - #t)) - (add-after 'unpack 'unbundle - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "CMakeLists.txt" - (("glew") - (string-append (assoc-ref inputs "glew") - "/lib/libGLEW.a")) - (("include_directories\\(\"\\$\\{PROJECT_SOURCE_DIR\\}/lib/glew/include\"\\)") - (string-append "include_directories(\"" - (assoc-ref inputs "glew") - "/include\")"))) - #t))))) + "-DCMAKE_C_FLAGS=-fpermissive"))) (inputs `(("glew" ,glew) ("zlib" ,zlib) @@ -2188,7 +2169,8 @@ (define-public supertuxkart ;; The following input is needed to build the bundled and modified ;; version of irrlicht. ("libjpeg" ,libjpeg) - ("openssl" ,openssl))) + ("openssl" ,openssl) + ("enet" ,enet))) (native-inputs `(("pkg-config" ,pkg-config))) (home-page "https://supertuxkart.net/") -- cgit v1.2.3 From f465562b1060071c77483f2bd33eb9e1299ed409 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 20 Apr 2019 17:22:43 +0200 Subject: gnu: foo2zjs: Update to 20190413. * gnu/packages/cups.scm (foo2zjs): Update to 20190413. --- gnu/packages/cups.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index b77fb20781..9d657d912d 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -633,14 +633,14 @@ (define-public foomatic-filters (define-public foo2zjs (package (name "foo2zjs") - (version "20180910") + (version "20190413") (source (origin (method url-fetch) ;; XXX: This is an unversioned URL! (uri "http://foo2zjs.rkkda.com/foo2zjs.tar.gz") (sha256 (base32 - "1clddqy4y4vvws0lllv1v90dfiihihdc23bn93c544yb3fvmwmr6")))) + "00k22vmghxls7rk2hrbz9v17wi5z8vdk3fmsp2lrfghfcad8nhpx")))) (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From 34a169010e841d4fb89a5141aff74850213d5bb9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 21 Apr 2019 17:11:47 +0200 Subject: gnu: dav1d: Update to 0.2.2. * gnu/packages/video.scm (dav1d): Update to 0.2.2. --- gnu/packages/video.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index c1240e418d..6daf8ac138 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -3424,11 +3424,11 @@ (define-public openshot (define-public dav1d (package (name "dav1d") - (version "0.2.1") + (version "0.2.2") (source (origin (method url-fetch) - (uri (list ;; The canonical download site + (uri (list ;; The canonical download site. (string-append "https://downloads.videolan.org/pub/videolan/" "dav1d/" version "/dav1d-" version ".tar.xz") @@ -3436,7 +3436,7 @@ (define-public dav1d (string-append "https://code.videolan.org/videolan/dav1d/-/" "archive/" version "/dav1d-" version ".tar.bz2"))) (sha256 - (base32 "0cp7harg2gf61v35hyki2ddk9yr0xli9bkk3smxblabmq9rv5cs3")))) + (base32 "1llf4v486avj83d31670vdd5nshbq10qrx9vwrm1j078dh4ax4q0")))) (build-system meson-build-system) (native-inputs `(("nasm" ,nasm))) (home-page "https://code.videolan.org/videolan/dav1d") -- cgit v1.2.3 From 3671cbe51a0f2c7b578fecd9da218e3632da5392 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 21 Apr 2019 18:35:23 +0200 Subject: gnu: youtube-dl: Update to 2019.04.17. * gnu/packages/video.scm (youtube-dl): Update to 2019.04.17. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 6daf8ac138..8247867d39 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1446,7 +1446,7 @@ (define-public libvpx-1.7 (define-public youtube-dl (package (name "youtube-dl") - (version "2019.04.07") + (version "2019.04.17") (source (origin (method url-fetch) (uri (string-append "https://github.com/rg3/youtube-dl/releases/" @@ -1454,7 +1454,7 @@ (define-public youtube-dl version ".tar.gz")) (sha256 (base32 - "1krx4y8nzpaqpq9qs8dnv2y988jpdccyfl9sdx9wrb0baycl119k")))) + "0dznw06qbb75glzirhnsbsd5xqix08jxdngbd21wndxcj1yq5y8a")))) (build-system python-build-system) (arguments ;; The problem here is that the directory for the man page and completion -- cgit v1.2.3 From 50b01dcf3c2a2990b8192ec790adbb855f4410e1 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 21 Apr 2019 18:40:31 +0200 Subject: gnu: dbacl: Don't use NAME in source URI. * gnu/packages/textutils.scm (dbacl)[source]: Hard-code NAME. --- gnu/packages/textutils.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index 7436fdeb97..da5cd011d8 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -519,7 +519,7 @@ (define-public dbacl (origin (method url-fetch) (uri (string-append "http://www.lbreyer.com/gpl/" - name "-" version ".tar.gz")) + "dbacl-" version ".tar.gz")) (sha256 (base32 "0224g6x71hyvy7jikfxmgcwww1r5lvk0jx36cva319cb9nmrbrq7")))) -- cgit v1.2.3 From 5df6934cdb1fb42cc54c6b06cfb9ab2113479ec3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 21 Apr 2019 19:39:08 +0200 Subject: gnu: eid-mw: Update to 4.4.16. * gnu/packages/security-token.scm (eid-mw): Update to 4.4.16. --- gnu/packages/security-token.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm index c88a1c6b2a..5451a0059a 100644 --- a/gnu/packages/security-token.scm +++ b/gnu/packages/security-token.scm @@ -95,7 +95,7 @@ (define-public ccid (define-public eid-mw (package (name "eid-mw") - (version "4.4.13") + (version "4.4.16") (source (origin (method git-fetch) @@ -103,7 +103,7 @@ (define-public eid-mw (url "https://github.com/Fedict/eid-mw") (commit (string-append "v" version)))) (sha256 - (base32 "14bgn2k0xbd6241qdghg787pgxy7k9rvcspaf74zwwyibaqknzyx")))) + (base32 "1q82fw63xzrnrgh1wyh457hal6vfdl6swqfq7l6kviywiwlzx7kd")))) (build-system glib-or-gtk-build-system) (native-inputs `(("autoconf" ,autoconf) -- cgit v1.2.3 From 8dafe89593b810bcc7e46add88f3ce178a321bdd Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 21 Apr 2019 22:19:27 +0200 Subject: gnu: parallel: Update to 20190422. * gnu/packages/parallel.scm (parallel): Update to 20190422. --- gnu/packages/parallel.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm index ceedae2e61..8b64878553 100644 --- a/gnu/packages/parallel.scm +++ b/gnu/packages/parallel.scm @@ -48,14 +48,14 @@ (define-module (gnu packages parallel) (define-public parallel (package (name "parallel") - (version "20190322") + (version "20190422") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/parallel/parallel-" version ".tar.bz2")) (sha256 - (base32 "12q0ys0dp019wykx7jcqbrilz8798hgb66k97aj2s2m7xdpw41ym")))) + (base32 "0xdl5fnh1vpjp3zpmqsrbbgjixazlhl4d9awk42nz4snzynysjxl")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From 654563ec83c3ec6c0a1713aa2371959f1d6443c3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 21 Apr 2019 22:24:29 +0200 Subject: gnu: perl-text-csv: Fix build. * gnu/packages/perl.scm (perl-text-csv)[source]: Update URL. --- gnu/packages/perl.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index cde75bc06e..b2fcd2b9e4 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -8434,7 +8434,7 @@ (define-public perl-text-csv (source (origin (method url-fetch) - (uri (string-append "mirror://cpan/authors/id/M/MA/MAKAMAKA/" + (uri (string-append "mirror://cpan/authors/id/I/IS/ISHIGAKI/" "Text-CSV-" version ".tar.gz")) (sha256 (base32 "1llccsl6sr11g9affh43m6q5r85qgnpi9n7idcs1vi9cn4ww0kp7")))) -- cgit v1.2.3 From 441e6d936fd24acc9fe7d609735722a9f49a07cc Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 22 Apr 2019 00:31:37 +0200 Subject: gnu: python-openpyxl: Update to 2.6.2. * gnu/packages/python-xyz.scm (python-openpyxl): Update to 2.6.2. --- gnu/packages/python-xyz.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 9d661411c4..330c784848 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -889,7 +889,7 @@ (define-public python2-et-xmlfile (define-public python-openpyxl (package (name "python-openpyxl") - (version "2.6.0") + (version "2.6.2") (source (origin ;; We use the upstream repository, as the tests are not included in the @@ -900,8 +900,7 @@ (define-public python-openpyxl (changeset version))) (file-name (string-append name "-" version "-checkout")) (sha256 - (base32 - "1x47ngn7ybaqdbvg90c8h2x0j6yfdfj25gjfinp2w5rf62gsany7")))) + (base32 "1qhij6kcvdxqjy4g6193nsv4q7fy8n4fwyd3c2z047idlm6s3j4w")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From fa9d14ac50cf946e94caa244c25e0b2ec16b0e13 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 22 Apr 2019 00:47:38 +0200 Subject: gnu: python-serpent: Update to 1.28. * gnu/packages/python-xyz.scm (python-serpent): Update to 1.28. [native-inputs]: Add python-attrs & python-pytz. --- gnu/packages/python-xyz.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 330c784848..6eb4ba1886 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -615,15 +615,17 @@ (define-public python2-semantic-version (define-public python-serpent (package (name "python-serpent") - (version "1.27") + (version "1.28") (source (origin (method url-fetch) (uri (pypi-uri "serpent" version)) (sha256 - (base32 - "04p9dsrm5pv8vhk3flvih55kgvlzpi38hlaykdiakddmgwqw93bg")))) + (base32 "1arnckykpkvv2qrp49l1k7q5mr5pisswl0rvdx98x8wsl1n361pk")))) (build-system python-build-system) + (native-inputs + `(("python-attrs" ,python-attrs) + ("python-pytz" ,python-pytz))) (home-page "https://github.com/irmen/Serpent") (synopsis "Serializer for literal Python expressions") (description -- cgit v1.2.3 From 1d3c78036ff90ec94001abbeded2678dd76ef654 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 22 Apr 2019 00:48:49 +0200 Subject: gnu: python-serpent: Tweak description. * gnu/packages/python-xyz.scm (python-serpent)[description]: Use @code{} and edit slightly. --- gnu/packages/python-xyz.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 6eb4ba1886..99d9bfded7 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -629,12 +629,13 @@ (define-public python-serpent (home-page "https://github.com/irmen/Serpent") (synopsis "Serializer for literal Python expressions") (description - "Serpent provides ast.literal_eval() compatible object tree -serialization. It serializes an object tree into bytes (utf-8 encoded string) -that can be decoded and then passed as-is to ast.literal_eval() to rebuild it -as the original object tree. As such it is safe to send serpent data to other -machines over the network for instance (because only safe literals are -encoded).") + "Serpent provides @code{ast.literal_eval()}-compatible object tree +serialization. It serializes an object tree into bytes (an utf-8 encoded +string) that can be decoded and then passed as-is to @code{ast.literal_eval()} +to rebuild the original object tree. + +Because only safe literals are encoded, it is safe to send serpent data to +other machines, such as over the network.") (license license:expat))) (define-public python-setuptools -- cgit v1.2.3 From c60b15cc6200caa9f67a186548d974dbb83d19aa Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 22 Apr 2019 02:31:14 +0200 Subject: gnu: python-dill: Update to 0.2.9. * gnu/packages/python-xyz.scm (python-dill): Update to 0.2.9. --- gnu/packages/python-xyz.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 99d9bfded7..cbae299ea5 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -14650,16 +14650,15 @@ (define-public python-anndata (define-public python-dill (package (name "python-dill") - (version "0.2.8.2") + (version "0.2.9") (source (origin (method url-fetch) (uri (pypi-uri "dill" version)) (sha256 - (base32 - "1cymzn9fxwdy33h21zkk4gqgzvd25110hh3zdqnvnwa3p52c4kb2")))) + (base32 "0vwqyi6hyz2r29zydc78dqymkbc5y7gia16xcdh215cikxph9mpn")))) (build-system python-build-system) - ;; FIXME: The check phase fails with "don't know how to make test". + ;; FIXME: The check phase fails with "don't know how to make test from: …". (arguments '(#:tests? #f)) (home-page "https://pypi.org/project/dill") (synopsis "Serialize all of Python") -- cgit v1.2.3 From 555415564964d82d36db8ee63c00c5d178691830 Mon Sep 17 00:00:00 2001 From: Alex Griffin Date: Sat, 20 Apr 2019 11:56:23 -0500 Subject: gnu: password-store: Allow external packages to provide extensions. * gnu/packages/password-utils.scm (password-store): Add mechanism for providing pass extensions in separate packages. [arguments]: Add patch-system-extension-dir phase. [native-search-paths]: Add PASSWORD_STORE_SYSTEM_EXTENSION_DIR. Signed-off-by: Christopher Baines --- gnu/packages/password-utils.scm | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index 5c11d8c437..8c5f3dd9e8 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2016 Jessica Tallon ;;; Copyright © 2016 Andreas Enge ;;; Copyright © 2016 Lukas Gradl -;;; Copyright © 2016 Alex Griffin +;;; Copyright © 2016, 2019 Alex Griffin ;;; Copyright © 2017 Leo Famulari ;;; Copyright © 2017, 2018 Clément Lassieur ;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice @@ -423,6 +423,19 @@ (define-public password-store (modify-phases %standard-phases (delete 'configure) (delete 'build) + (add-before 'install 'patch-system-extension-dir + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (extension-dir (string-append out "/lib/password-store/extensions"))) + (substitute* "src/password-store.sh" + (("^SYSTEM_EXTENSION_DIR=.*$") + ;; lead with whitespace to prevent 'make install' from + ;; overwriting it again + (string-append " SYSTEM_EXTENSION_DIR=\"" + "${PASSWORD_STORE_SYSTEM_EXTENSION_DIR:-" + extension-dir + "}\"\n")))) + #t)) (add-before 'install 'patch-passmenu-path (lambda* (#:key inputs #:allow-other-keys) (substitute* "contrib/dmenu/passmenu" @@ -461,6 +474,10 @@ (define-public password-store ;; timeout in some circumstances. #:parallel-tests? #f #:test-target "test")) + (native-search-paths + (list (search-path-specification + (variable "PASSWORD_STORE_SYSTEM_EXTENSION_DIR") + (files '("lib/password-store/extensions"))))) (inputs `(("dmenu" ,dmenu) ("getopt" ,util-linux) -- cgit v1.2.3 From 54b41d2d7158f1696a663ac2ae46661e759a1648 Mon Sep 17 00:00:00 2001 From: Alex Griffin Date: Sat, 20 Apr 2019 11:59:35 -0500 Subject: gnu: Add pass-otp. * gnu/packages/password-utils.scm (pass-otp): New variable. Signed-off-by: Christopher Baines --- gnu/packages/password-utils.scm | 51 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index 8c5f3dd9e8..b238d39a70 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -48,6 +48,7 @@ (define-module (gnu packages password-utils) #:use-module (gnu packages) #:use-module (gnu packages admin) #:use-module (gnu packages aidc) + #:use-module (gnu packages authentication) #:use-module (gnu packages base) #:use-module (gnu packages check) #:use-module (gnu packages compression) @@ -74,6 +75,7 @@ (define-module (gnu packages password-utils) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) #:use-module (gnu packages suckless) + #:use-module (gnu packages tcl) #:use-module (gnu packages tls) #:use-module (gnu packages qt) #:use-module (gnu packages version-control) @@ -499,6 +501,55 @@ (define-public password-store through the pass command.") (license license:gpl2+))) +(define-public pass-otp + (package + (name "pass-otp") + (version "1.2.0") + (source + (origin + (method url-fetch) + (uri + (string-append "https://github.com/tadfisher/pass-otp/releases/" + "download/v" version "/pass-otp-" version ".tar.gz")) + (sha256 + (base32 + "0rrs3iazq80dn0wbl20xkh270428jd8l99m5gd7hl93s4r4sc82p")))) + (build-system gnu-build-system) + (arguments + '(#:make-flags + (let* ((out (assoc-ref %outputs "out")) + (bashcomp (string-append out "/etc/bash_completion.d"))) + (list (string-append "PREFIX=" %output) + (string-append "BASHCOMPDIR=" bashcomp))) + #:phases + (modify-phases %standard-phases + (delete 'configure) + (add-after 'build 'patch-oath-path + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "otp.bash" + (("^OATH=.*$") + (string-append + "OATH=" + (assoc-ref inputs "oath-toolkit") + "/bin/oathtool\n"))) + #t))) + #:test-target "test")) + (inputs + `(("oath-toolkit" ,oath-toolkit))) + (native-inputs + `(("password-store" ,password-store) + ("expect" ,expect) + ("git" ,git) + ("gnupg" ,gnupg) + ("which" ,which))) + (home-page "https://github.com/tadfisher/pass-otp") + (synopsis "Pass extension for managing one-time-password (OTP) tokens") + (description + "Pass OTP is an extension for password-store that allows adding +one-time-password (OTP) secrets, generating OTP codes, and displaying secret +key URIs using the standard otpauth:// scheme.") + (license license:gpl3+))) + (define-public argon2 (package (name "argon2") -- cgit v1.2.3 From cfb7aee078f21285edf3d6a75730907fbeb144a1 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Mon, 22 Apr 2019 07:04:04 -0400 Subject: gnu: linux-libre@4.9: Update to 4.9.170. * gnu/packages/linux.scm (linux-libre-4.9): Update to 4.9.170. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index b562a23b2f..e5ae45f70f 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -483,8 +483,8 @@ (define-public linux-libre-4.14 #:configuration-file kernel-config)) (define-public linux-libre-4.9 - (make-linux-libre "4.9.169" - "0kgycw8bngihx4nks1w6gz36pwzqg4x3y3ipyc1sdlyld7zy9lz7" + (make-linux-libre "4.9.170" + "15fz2qxvic4sfxm8vi0rghqqi5rv038xyrq9dl6fz6i1c7497g8s" '("x86_64-linux" "i686-linux") #:configuration-file kernel-config)) -- cgit v1.2.3 From 689b628025ef275e8c6d84693a7c0c012aec0781 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Mon, 22 Apr 2019 07:05:55 -0400 Subject: gnu: linux-libre@4.14: Update to 4.14.113. * gnu/packages/linux.scm (%linux-libre-4.14-version): Update to 4.14.113. (%linux-libre-4.14-hash): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index e5ae45f70f..6c2ff750b0 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -473,8 +473,8 @@ (define-public linux-libre-4.19 #:patches %linux-libre-4.19-patches #:configuration-file kernel-config)) -(define %linux-libre-4.14-version "4.14.112") -(define %linux-libre-4.14-hash "0nvd5y84y0g5dlzygna86vvmb3lznm4wsmdgr8rp0z0vm93xcx6m") +(define %linux-libre-4.14-version "4.14.113") +(define %linux-libre-4.14-hash "0z547pdi1vhybyhnfr5krsfyxmdwnv5p5fps9jjyx6rvkxasddvh") (define-public linux-libre-4.14 (make-linux-libre %linux-libre-4.14-version -- cgit v1.2.3 From e81148a11d3fe9ba7dde3f50ca26a8df712bd069 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Mon, 22 Apr 2019 07:06:57 -0400 Subject: gnu: linux-libre@4.19: Update to 4.19.36. * gnu/packages/linux.scm (%linux-libre-4.19-version): Update to 4.19.36. (%linux-libre-4.19-hash): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 6c2ff750b0..b80cd0d662 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -459,8 +459,8 @@ (define-public vhba-module between the CDemu userspace daemon and linux kernel.") (license license:gpl2+))) -(define %linux-libre-4.19-version "4.19.35") -(define %linux-libre-4.19-hash "1vz9h7m02012xszsfzzfxnvi4ghfi47gx8xqkcclkiyh8ql337cf") +(define %linux-libre-4.19-version "4.19.36") +(define %linux-libre-4.19-hash "0dvwza26spa742iznz7rfgsyl4f07x8i6jh2cv5hma9l9fpqc9pi") (define %linux-libre-4.19-patches (list %boot-logo-patch -- cgit v1.2.3 From 6dc4dceba5c0b2ce62c2df8bed083a59fc1e1ded Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Mon, 22 Apr 2019 07:08:08 -0400 Subject: gnu: linux-libre: Update to 5.0.9. * gnu/packages/linux.scm (%linux-libre-version): Update to 5.0.9. (%linux-libre-hash): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index b80cd0d662..9049fbc313 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -423,8 +423,8 @@ (define* (make-linux-libre version hash supported-systems It has been modified to remove all non-free binary blobs.") (license license:gpl2))) -(define %linux-libre-version "5.0.8") -(define %linux-libre-hash "0kfn861rhric78h6wmp6ss1vr1zmly345n6n33vv9qwbi3rr555y") +(define %linux-libre-version "5.0.9") +(define %linux-libre-hash "0j2xnpvc13370kprnnq79a08bq6dak0iab94d9hsc6m8v1rxaw2i") (define %linux-libre-5.0-patches (list %boot-logo-patch -- cgit v1.2.3 From 7f221c0e0d412110cfc1c0057dca1123415987ec Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 22 Apr 2019 14:12:37 +0200 Subject: gnu: translate-shell: Update to 0.9.6.10. * gnu/packages/dictionaries.scm (translate-shell): Update to 0.9.6.10. --- gnu/packages/dictionaries.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/dictionaries.scm b/gnu/packages/dictionaries.scm index 9aae53e239..ee038ac8f5 100644 --- a/gnu/packages/dictionaries.scm +++ b/gnu/packages/dictionaries.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2016, 2017, 2018 Efraim Flashner ;;; Copyright © 2016 Sou Bunnbu ;;; Copyright © 2017, 2018 Nicolas Goaziou -;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 Pierre-Antoine Rouby ;;; Copyright © 2018 Arun Isaac ;;; @@ -245,7 +245,7 @@ (define-public grammalecte (define-public translate-shell (package (name "translate-shell") - (version "0.9.6.9") + (version "0.9.6.10") (source (origin (method git-fetch) @@ -254,13 +254,12 @@ (define-public translate-shell (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 - "1xyf0vdxmbgqcgsr1gvgwh1q4fh080h68radkim6pfcwzffliszm")))) + (base32 "1dmh3flldfhnqfay3a6c5hanqcjwrmbly1bq8mlk022qfi1fv33y")))) (build-system gnu-build-system) (arguments `(#:phases (modify-phases %standard-phases - (delete 'configure) ; no configure phase + (delete 'configure) ; no configure script (add-after 'unpack 'remove-unnecessary-file ;; This file gets generated during the build phase. (lambda _ -- cgit v1.2.3 From fe74e6ac6b0027ae1a0b918643f66bd1a61c3346 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 22 Apr 2019 14:17:00 +0200 Subject: gnu: memcached: Update to 1.5.13. * gnu/packages/databases.scm (memcached): Update to 1.5.13. --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index da2a193a1a..13312dff4a 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -265,14 +265,14 @@ (define-public leveldb (define-public memcached (package (name "memcached") - (version "1.5.12") + (version "1.5.13") (source (origin (method url-fetch) (uri (string-append "https://memcached.org/files/memcached-" version ".tar.gz")) (sha256 - (base32 "0aav15f0lh8k4i62aza2bdv4s8vv65j38pz2zc4v45snd3arfby0")))) + (base32 "0qsdkjrns4f02lmabq8c7mzl5n4382q2p6a0dvmsjdcpjisagqb1")))) (build-system gnu-build-system) (inputs `(("libevent" ,libevent) -- cgit v1.2.3 From ba18ea5f41e292b8e078b300e59fce9c5619748f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 22 Apr 2019 14:25:14 +0200 Subject: gnu: python-pyodbc: Update to 4.0.26. * gnu/packages/databases.scm (python-pyodbc): Update to 4.0.26. --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 13312dff4a..f291650e5d 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1941,13 +1941,13 @@ (define-public python2-pyodbc-c (define-public python-pyodbc (package (name "python-pyodbc") - (version "4.0.25") + (version "4.0.26") (source (origin (method url-fetch) (uri (pypi-uri "pyodbc" version)) (sha256 - (base32 "1bbwrb812w5i0x56jfn0l86mxc2ck904hl8y87mziay96znwia0f")) + (base32 "1qrxnf7ji5hml7z4y669k4wmk3iz2pcsr05bnn1n912asash09z5")) (file-name (string-append name "-" version ".tar.gz")))) (build-system python-build-system) (inputs -- cgit v1.2.3 From 15357dd7a98545ce74dfde6ba02422ec9bbec3c4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 22 Apr 2019 14:53:48 +0200 Subject: gnu: nsd: Update to 4.1.27. * gnu/packages/dns.scm (nsd): Update to 4.1.27. --- gnu/packages/dns.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index 9cffe3b822..24b6384eab 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -294,14 +294,14 @@ (define-public libasr (define-public nsd (package (name "nsd") - (version "4.1.26") + (version "4.1.27") (source (origin (method url-fetch) (uri (string-append "https://www.nlnetlabs.nl/downloads/nsd/nsd-" version ".tar.gz")) (sha256 - (base32 "1x0mvj4872dzj1rr9adnchdm4dhn41xmc459p5j4s0r13m1l32lz")))) + (base32 "1sjfbwr4vq25304hr9vmd9j821g2vzv8lpy95hpsravc80q5zaqv")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From 1f2f358b69a8a65f9edb7e0ca72583ced2c2b61e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 22 Apr 2019 14:55:58 +0200 Subject: gnu: python-sqlalchemy: Update to 1.3.3. * gnu/packages/databases.scm (python-sqlalchemy): Update to 1.3.3. --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index f291650e5d..cfbc743da2 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -2188,13 +2188,13 @@ (define-public python2-pysqlite (define-public python-sqlalchemy (package (name "python-sqlalchemy") - (version "1.3.1") + (version "1.3.3") (source (origin (method url-fetch) (uri (pypi-uri "SQLAlchemy" version)) (sha256 - (base32 "12sr36646sipf9ac3n2xh8z0w5pz4d3dvw5qjv2kzvcls6wvf7vq")))) + (base32 "06c3lcv7nijsgqsjaaa4djrwlzgh9f910zlqxkmgq22h6jl4rici")))) (build-system python-build-system) (native-inputs `(("python-cython" ,python-cython) ; for C extensions -- cgit v1.2.3 From 29cc1154362f74112cae588f737f549124b70939 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 22 Apr 2019 15:03:52 +0200 Subject: gnu: libabigail: Update to 1.6. * gnu/packages/elf.scm (libabigail): Update to 1.6. --- gnu/packages/elf.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/elf.scm b/gnu/packages/elf.scm index ace31ec663..c3f00fb291 100644 --- a/gnu/packages/elf.scm +++ b/gnu/packages/elf.scm @@ -96,14 +96,14 @@ (define-public libabigail (package (name "libabigail") (home-page "https://sourceware.org/libabigail/") - (version "1.5") + (version "1.6") (source (origin (method url-fetch) (uri (string-append "https://sourceware.org/pub/" name "/" name "-" version ".tar.gz")) (sha256 (base32 - "0srfnkbm386sl2n85686nl28da6ksbs7jgnfks9k0n61c772aas4")))) + "04j07lhvwbp6qp8pdwbf7iqnr7kgpabmqylsw4invpmzwnyp6g6g")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--disable-static" -- cgit v1.2.3 From 4dfdcbf5feed2d820a2c450ae53589d9089f90f0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 22 Apr 2019 15:03:59 +0200 Subject: gnu: libabigail: Don't use NAME in source URI. * gnu/packages/elf.scm (libabigail)[source]: Hard-code NAME. --- gnu/packages/elf.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/elf.scm b/gnu/packages/elf.scm index c3f00fb291..6c68695d5f 100644 --- a/gnu/packages/elf.scm +++ b/gnu/packages/elf.scm @@ -99,8 +99,8 @@ (define-public libabigail (version "1.6") (source (origin (method url-fetch) - (uri (string-append "https://sourceware.org/pub/" name - "/" name "-" version ".tar.gz")) + (uri (string-append "https://sourceware.org/pub/libabigail/" + "libabigail-" version ".tar.gz")) (sha256 (base32 "04j07lhvwbp6qp8pdwbf7iqnr7kgpabmqylsw4invpmzwnyp6g6g")))) -- cgit v1.2.3 From a263a9768709870fd46eaaac45a0e8e863a9dfb9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 22 Apr 2019 15:20:34 +0200 Subject: gnu: python-redis: Update to 3.2.1. * gnu/packages/databases.scm (python-redis): Update to 3.2.1. --- gnu/packages/databases.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index cfbc743da2..023ab84b75 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -2570,15 +2570,15 @@ (define-public python2-fakeredis (define-public python-redis (package (name "python-redis") - (version "3.2.0") + (version "3.2.1") (source (origin (method url-fetch) (uri (pypi-uri "redis" version)) (sha256 - (base32 "0m1b88wg1w6xdwg0siky5k86x8sh6smhbr42ixz41ra81lv34jbj")))) + (base32 "0wwj8il4c3aff15xwwcjfci367zxsakq05ps1a2il6yavp91i94c")))) (build-system python-build-system) - ;; Tests require a running Redis server + ;; Tests require a running Redis server. (arguments '(#:tests? #f)) ;; As long as we are not running test, we do not need this input :-) ;;(native-inputs -- cgit v1.2.3 From 233eb6c8fe80fa75a471fd133b76a373de1bfded Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 22 Apr 2019 18:08:18 +0200 Subject: gnu: ghc-haskell-lexer: Update to 1.0.2. * gnu/packages/haskell.scm (ghc-haskell-lexer): Update to 1.0.2. --- gnu/packages/haskell.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 3d269cea83..4b4a4b5e00 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -12,7 +12,7 @@ ;;; Copyright © 2017 Peter Mikkelsen ;;; Copyright © 2017, 2018 Alex Vong ;;; Copyright © 2017 rsiddharth -;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 Tonton ;;; Copyright © 2018, 2019 Timothy Sample ;;; Copyright © 2018 Arun Isaac @@ -1335,7 +1335,7 @@ (define-public ghc-happy (define-public ghc-haskell-lexer (package (name "ghc-haskell-lexer") - (version "1.0.1") + (version "1.0.2") (source (origin (method url-fetch) @@ -1343,8 +1343,7 @@ (define-public ghc-haskell-lexer "https://hackage.haskell.org/package/haskell-lexer/haskell-lexer-" version ".tar.gz")) (sha256 - (base32 - "0rj3r1pk88hh3sk3mj61whp8czz5kpxhbc78xlr04bxwqjrjmm6p")))) + (base32 "1wyxd8x33x4v5vxyzkhm610pl86gbkc8y439092fr1735q9g7kfq")))) (build-system haskell-build-system) (home-page "http://hackage.haskell.org/package/haskell-lexer") (synopsis "Fully compliant Haskell 98 lexer") -- cgit v1.2.3 From df129041dd7cf0f25e5d256b19bb2b383abcf600 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 12 Dec 2018 23:23:32 -0500 Subject: gnu: maxima: Return #t from custom 'check' phase. * gnu/packages/maths.scm (maxima)[arguments]: Use invoke in the custom check phase. --- gnu/packages/maths.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 373b99727d..6e2c10d93a 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2014 Mathieu Lirzin ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus ;;; Copyright © 2015 Sou Bunnbu -;;; Copyright © 2015 Mark H Weaver +;;; Copyright © 2015, 2018 Mark H Weaver ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner ;;; Copyright © 2015 Fabian Harfert ;;; Copyright © 2016 Roel Janssen @@ -2795,12 +2795,12 @@ (define-public maxima ;; of Debian's Maxima package. ;; If Maxima can successfully run this, the binary to be installed ;; should be fine. - (zero? - (system - (string-append "./maxima-local " - "--lisp=gcl " - "--batch-string=\"run_testsuite();\" " - "| grep -q \"No unexpected errors found\""))))) + (invoke "sh" "-c" + (string-append + "./maxima-local " + "--lisp=gcl " + "--batch-string=\"run_testsuite();\" " + "| grep -q \"No unexpected errors found\"")))) ;; Make sure the doc and emacs files are found in the ;; standard location. Also configure maxima to find gnuplot ;; without having it on the PATH. -- cgit v1.2.3 From ab0c796b675ccfb287f2f93b63a3ac6b08d7122d Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sat, 20 Apr 2019 19:27:00 -0400 Subject: gnu: minetest-data: Update to 5.0.1. * gnu/packages/games.scm (minetest-data): Update to 5.0.1. [description]: Fix typo. --- gnu/packages/games.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 6a782b27e9..fd22570adc 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2014 Sylvain Beucler ;;; Copyright © 2014, 2015, 2018, 2019 Ludovic Courtès ;;; Copyright © 2014, 2015, 2016 Sou Bunnbu -;;; Copyright © 2014, 2015 Mark H Weaver +;;; Copyright © 2014, 2015, 2019 Mark H Weaver ;;; Copyright © 2015, 2016 Andreas Enge ;;; Copyright © 2015 David Hashe ;;; Copyright © 2015, 2017, 2018 Christopher Lemmer Webber @@ -1846,7 +1846,7 @@ (define-public mars (define minetest-data (package (name "minetest-data") - (version "5.0.0") + (version "5.0.1") (source (origin (method git-fetch) (uri (git-reference @@ -1855,7 +1855,7 @@ (define minetest-data (file-name (git-file-name name version)) (sha256 (base32 - "186i1pna2f3fwa2001y8mw5131h0sndhfdxzfqq2gnr1m83sjm0w")))) + "1hw3n7qqpasq6bivxhq01kr0d58w0gp46s0baxixp1fakd79p8a7")))) (build-system trivial-build-system) (native-inputs `(("source" ,source))) @@ -1873,7 +1873,7 @@ (define minetest-data #t)))) (synopsis "Main game data for the Minetest game engine") (description - "Game data for the Minetest infinite-world block sandox game.") + "Game data for the Minetest infinite-world block sandbox game.") (home-page "http://minetest.net") (license license:lgpl2.1+))) -- cgit v1.2.3 From 8c064d01a011f145a6d962ef6bde78247389fac2 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sat, 20 Apr 2019 19:34:00 -0400 Subject: gnu: minetest: Simplify 'freetype' input specification. * gnu/packages/games.scm (minetest)[inputs]: Eliminate an unnecessary use of Guile's '@' syntax to reference the 'freetype' package. --- gnu/packages/games.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index fd22570adc..da917e2870 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -1916,7 +1916,7 @@ (define-public minetest `(("pkg-config" ,pkg-config))) (inputs `(("curl" ,curl) - ("freetype" ,(@ (gnu packages fontutils) freetype)) + ("freetype" ,freetype) ("gettext" ,gettext-minimal) ("gmp" ,gmp) ("irrlicht" ,irrlicht) -- cgit v1.2.3 From fa61900705ced88b058e2b49d9a8cc3ae3ba907e Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sun, 21 Apr 2019 00:19:39 -0400 Subject: gnu: openssh: Update to 8.0p1. * gnu/packages/ssh.scm (openssh): Update to 8.0p1. [source]: Remove patch. * gnu/packages/patches/openssh-CVE-2018-20685.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/patches/openssh-CVE-2018-20685.patch | 44 ----------------------- gnu/packages/ssh.scm | 5 ++- 3 files changed, 2 insertions(+), 48 deletions(-) delete mode 100644 gnu/packages/patches/openssh-CVE-2018-20685.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index b6b6259438..7073181b1f 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1121,7 +1121,6 @@ dist_patch_DATA = \ %D%/packages/patches/openjdk-10-idlj-reproducibility.patch \ %D%/packages/patches/openocd-nrf52.patch \ %D%/packages/patches/opensmtpd-fix-crash.patch \ - %D%/packages/patches/openssh-CVE-2018-20685.patch \ %D%/packages/patches/openssl-runpath.patch \ %D%/packages/patches/openssl-1.1-c-rehash-in.patch \ %D%/packages/patches/openssl-c-rehash-in.patch \ diff --git a/gnu/packages/patches/openssh-CVE-2018-20685.patch b/gnu/packages/patches/openssh-CVE-2018-20685.patch deleted file mode 100644 index 463c08a9d4..0000000000 --- a/gnu/packages/patches/openssh-CVE-2018-20685.patch +++ /dev/null @@ -1,44 +0,0 @@ -Fix CVE-2018-20685: - -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-20685 - -Patch copied from upstream source repository: - -https://github.com/openssh/openssh-portable/commit/6010c0303a422a9c5fa8860c061bf7105eb7f8b2 - -From 6010c0303a422a9c5fa8860c061bf7105eb7f8b2 Mon Sep 17 00:00:00 2001 -From: "djm@openbsd.org" -Date: Fri, 16 Nov 2018 03:03:10 +0000 -Subject: [PATCH] upstream: disallow empty incoming filename or ones that refer - to the - -current directory; based on report/patch from Harry Sintonen - -OpenBSD-Commit-ID: f27651b30eaee2df49540ab68d030865c04f6de9 ---- - scp.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/scp.c b/scp.c -index 60682c68..4f3fdcd3 100644 ---- a/scp.c -+++ b/scp.c -#@@ -1,4 +1,4 @@ -#-/* $OpenBSD: scp.c,v 1.197 2018/06/01 04:31:48 dtucker Exp $ */ -#+/* $OpenBSD: scp.c,v 1.198 2018/11/16 03:03:10 djm Exp $ */ -# /* -# * scp - secure remote copy. This is basically patched BSD rcp which -# * uses ssh to do the data transfer (instead of using rcmd). -@@ -1106,7 +1106,8 @@ sink(int argc, char **argv) - SCREWUP("size out of range"); - size = (off_t)ull; - -- if ((strchr(cp, '/') != NULL) || (strcmp(cp, "..") == 0)) { -+ if (*cp == '\0' || strchr(cp, '/') != NULL || -+ strcmp(cp, ".") == 0 || strcmp(cp, "..") == 0) { - run_err("error: unexpected filename: %s", cp); - exit(1); - } --- -2.20.1 - diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index 83a831660d..e887cd7e70 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -164,15 +164,14 @@ (define-public libssh2-1.8.0 (define-public openssh (package (name "openssh") - (version "7.9p1") + (version "8.0p1") (source (origin (method url-fetch) (uri (string-append "mirror://openbsd/OpenSSH/portable/" name "-" version ".tar.gz")) - (patches (search-patches "openssh-CVE-2018-20685.patch")) (sha256 (base32 - "1b8sy6v0b8v4ggmknwcqx3y1rjcpsll0f1f8f4vyv11x4ni3njvb")))) + "0s7xh4s0qcipnjh9ls5blxcpvhyd116z9dxn3q1yi64lwrwki55x")))) (build-system gnu-build-system) (native-inputs `(("groff" ,groff) ("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 5582aa8e31bf88f981caedeb4fbbb758486b6ca7 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 21 Apr 2019 21:36:47 +0100 Subject: system: Change default kernel-arguments to '("quiet"). This improves the readability of the boot process, especially when using full disk encryption where you're required to enter the passphrase at a particular point. * gnu/system.scm ()[kernel-arguments]: Change the default to '("quiet"). * doc/guix.texi (operating-system Reference): Document this change. --- doc/guix.texi | 2 +- gnu/system.scm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/doc/guix.texi b/doc/guix.texi index 785329add8..3ec1cf852a 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -10461,7 +10461,7 @@ The package object of the operating system kernel to use@footnote{Currently only the Linux-libre kernel is supported. In the future, it will be possible to use the GNU@tie{}Hurd.}. -@item @code{kernel-arguments} (default: @code{'()}) +@item @code{kernel-arguments} (default: @code{'("quiet")}) List of strings or gexps representing additional arguments to pass on the command-line of the kernel---e.g., @code{("console=ttyS0")}. diff --git a/gnu/system.scm b/gnu/system.scm index 24243eb707..c4f5740df2 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -160,7 +160,7 @@ (define-record-type* operating-system (kernel operating-system-kernel ; package (default linux-libre)) (kernel-arguments operating-system-user-kernel-arguments - (default '())) ; list of gexps/strings + (default '("quiet"))) ; list of gexps/strings (bootloader operating-system-bootloader) ; (label operating-system-label ; string (thunked) -- cgit v1.2.3 From 7611074f677f1c3cfe5da426f387eeda1b6ad825 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 23 Apr 2019 00:08:54 +0200 Subject: installer: Run 'guix system init' with the right locale. * gnu/installer/utils.scm (run-shell-command): Add #:locale and honor it. * gnu/installer/newt/final.scm (run-install-shell): Add 'locale' parameter; pass it to 'install-system'. (run-final-page): Obtain locale from RESULT; pass it to 'run-install-shell'. * gnu/installer/final.scm (install-system): Add 'locale' parameter; pass it to 'run-shell-command'. --- gnu/installer/final.scm | 8 +++++--- gnu/installer/newt/final.scm | 9 +++++---- gnu/installer/utils.scm | 14 +++++++++++++- 3 files changed, 23 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/installer/final.scm b/gnu/installer/final.scm index e1c62f5ce0..07946f72c3 100644 --- a/gnu/installer/final.scm +++ b/gnu/installer/final.scm @@ -24,13 +24,15 @@ (define-module (gnu installer final) #:use-module (guix build utils) #:export (install-system)) -(define (install-system) +(define (install-system locale) "Start COW-STORE service on target directory and launch guix install command -in a subshell." +in a subshell. LOCALE must be the locale name under which that command will +run, or #f." (let ((install-command (format #f "guix system init ~a ~a" (%installer-configuration-file) (%installer-target-dir)))) (mkdir-p (%installer-target-dir)) (start-service 'cow-store (list (%installer-target-dir))) - (false-if-exception (run-shell-command install-command)))) + (false-if-exception (run-shell-command install-command + #:locale locale)))) diff --git a/gnu/installer/newt/final.scm b/gnu/installer/newt/final.scm index 645c1e8689..f492c5dbb7 100644 --- a/gnu/installer/newt/final.scm +++ b/gnu/installer/newt/final.scm @@ -65,22 +65,23 @@ (define (run-install-failed-page) (G_ "The final system installation step failed. You can retry the \ last step, or restart the installer."))) -(define (run-install-shell) +(define (run-install-shell locale) (clear-screen) (newt-suspend) - (let ((install-ok? (install-system))) + (let ((install-ok? (install-system locale))) (newt-resume) install-ok?)) (define (run-final-page result prev-steps) - (let* ((configuration (format-configuration prev-steps result)) + (let* ((configuration (format-configuration prev-steps result)) (user-partitions (result-step result 'partition)) + (locale (result-step result 'locale)) (install-ok? (with-mounted-partitions user-partitions (configuration->file configuration) (run-config-display-page) - (run-install-shell)))) + (run-install-shell locale)))) (if install-ok? (run-install-success-page) (run-install-failed-page)))) diff --git a/gnu/installer/utils.scm b/gnu/installer/utils.scm index e91f90a84d..256722729c 100644 --- a/gnu/installer/utils.scm +++ b/gnu/installer/utils.scm @@ -54,9 +54,21 @@ (define (read-percentage percentage) (and result (string->number (match:substring result 1))))) -(define (run-shell-command command) +(define* (run-shell-command command #:key locale) + "Run COMMAND, a string, with Bash, and in the given LOCALE." (call-with-temporary-output-file (lambda (file port) + (when locale + (let ((supported? (false-if-exception + (setlocale LC_ALL locale)))) + ;; If LOCALE is not supported, then set LANGUAGE, which might at + ;; least give us translated messages. + (if supported? + (format port "export LC_ALL=\"~a\"~%" locale) + (format port "export LANGUAGE=\"~a\"~%" + (string-take locale + (string-index locale #\_)))))) + (format port "~a~%" command) ;; (format port "exit~%") (close port) -- cgit v1.2.3 From 519177ad41b713dd963f466bf1c3c9e2eb8d1d99 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 23 Apr 2019 00:40:50 +0200 Subject: install: Pass "quiet" to the kernel. This is a followup to 5582aa8e31bf88f981caedeb4fbbb758486b6ca7. * gnu/system/install.scm (installation-os)[kernel-arguments]: Add "quiet". --- gnu/system/install.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/system/install.scm b/gnu/system/install.scm index 80b7fe8e69..f20d94f385 100644 --- a/gnu/system/install.scm +++ b/gnu/system/install.scm @@ -431,7 +431,7 @@ (define installation-os ;; non-functional: ;; . ;; Thus, blacklist it. - (kernel-arguments '("modprobe.blacklist=radeon")) + (kernel-arguments '("quiet" "modprobe.blacklist=radeon")) (file-systems ;; Note: the disk image build code overrides this root file system with -- cgit v1.2.3 From 83126aa8a9cb09de00f12ba74e3eaaa79bd47828 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Tue, 23 Apr 2019 10:43:54 +0200 Subject: gnu: emacs-disk-usage: Update to 1.3.3. * gnu/packages/emacs-xyz.scm (emacs-disk-usage): Update to 1.3.3. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 54663496fe..13a4c68ace 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -13993,7 +13993,7 @@ (define-public emacs-redshank (define-public emacs-disk-usage (package (name "emacs-disk-usage") - (version "1.3.0") + (version "1.3.3") (home-page "https://gitlab.com/Ambrevar/emacs-disk-usage") (source (origin @@ -14004,7 +14004,7 @@ (define-public emacs-disk-usage ".el")) (sha256 (base32 - "0ky6c34z7c6hd4yvcrcsidkfk2kvffkg63v02vch2i6hg1n6n028")))) + "0h1jwznd41gi0vg830ilfgm01q05zknikzahwasm9cizwm2wyizj")))) (build-system emacs-build-system) (synopsis "Sort and browse disk usage listings with Emacs") (description "Disk Usage is a file system analyzer: it offers a tabulated -- cgit v1.2.3 From b2e417f3f11578f30a7635300cf338f96c15d981 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Tue, 23 Apr 2019 10:49:19 +0200 Subject: gnu: glslang: Update to 7.11.3188. * gnu/packages/vulkan.scm (glslang): Update to 7.11.3188. --- gnu/packages/vulkan.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 2866bad4f6..996b6cdd49 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -124,7 +124,7 @@ (define-public spirv-tools (define-public glslang (package (name "glslang") - (version "7.11.3113") + (version "7.11.3188") (source (origin (method git-fetch) @@ -133,7 +133,7 @@ (define-public glslang (commit version))) (sha256 (base32 - "1kzv2b4q1fddxd7c0hc754nd6rw6y9vijb9fsi13xzzq9dficgb6")) + "04y4dd1cqdkd4qffmhgmg3agf9j07ii2w38vpp4jw53ir818bqdq")) (file-name (string-append name "-" version "-checkout")))) (build-system cmake-build-system) (arguments -- cgit v1.2.3 From 93c5c6d1648570a66c34e41470ef6dde98317f0c Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Tue, 23 Apr 2019 10:55:59 +0200 Subject: gnu: spirv-headers: Update to 1.3.7. * gnu/packages/vulkan.scm (spirv-headers): Update to 1.3.7. --- gnu/packages/vulkan.scm | 64 +++++++++++++++++++++++-------------------------- 1 file changed, 30 insertions(+), 34 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 996b6cdd49..543b77f7d4 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -41,37 +41,33 @@ (define-module (gnu packages vulkan) #:use-module (gnu packages xorg)) (define-public spirv-headers - ;; Keep updated in accordance with - ;; https://github.com/google/shaderc/blob/known-good/known_good.json - (let ((commit "8bea0a266ac9b718aa0818d9e3a47c0b77c2cb23") - (revision "4")) - (package - (name "spirv-headers") - (version (string-append "0.0-" revision "." (string-take commit 9))) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/KhronosGroup/SPIRV-Headers") - (commit commit))) - (sha256 - (base32 - "01qyjghjz42hmyw9111zz20a1paf37ps39p4xbj8abjba65d8lqx")) - (file-name (string-append name "-" version "-checkout")))) - (build-system cmake-build-system) - (arguments - `(#:tests? #f ;; No tests - #:phases (modify-phases %standard-phases - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (invoke "cmake" "-E" "copy_directory" - "../source/include/spirv" - (string-append (assoc-ref outputs "out") - "/include/spirv"))))))) - (home-page "https://github.com/KhronosGroup/SPIRV-Headers") - (synopsis "Machine-readable files from the SPIR-V Registry") - (description - "SPIRV-Headers is a repository containing machine-readable files from + (package + (name "spirv-headers") + (version "1.3.7") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/KhronosGroup/SPIRV-Headers") + (commit version))) + (sha256 + (base32 + "0m56smanfcczjfif4yfcqhjj4d4sc088kwg6dgia8fwdsjavdm4d")) + (file-name (string-append name "-" version "-checkout")))) + (build-system cmake-build-system) + (arguments + `(#:tests? #f ;; No tests + #:phases (modify-phases %standard-phases + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (invoke "cmake" "-E" "copy_directory" + "../source/include/spirv" + (string-append (assoc-ref outputs "out") + "/include/spirv"))))))) + (home-page "https://github.com/KhronosGroup/SPIRV-Headers") + (synopsis "Machine-readable files from the SPIR-V Registry") + (description + "SPIRV-Headers is a repository containing machine-readable files from the SPIR-V Registry. This includes: @itemize @item Header files for various languages. @@ -79,9 +75,9 @@ (define-public spirv-headers and for the GLSL.std.450 extended instruction set. @item The XML registry file. @end itemize\n") - (license (license:x11-style - (string-append "https://github.com/KhronosGroup/SPIRV-Headers/blob/" - commit "/LICENSE")))))) + (license (license:x11-style + (string-append "https://github.com/KhronosGroup/SPIRV-Headers/blob/" + version "/LICENSE"))))) (define-public spirv-tools (package -- cgit v1.2.3 From 9fb1ca080861c8418a1cc6710bf0dfef1ee77248 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 23 Apr 2019 14:27:48 +0200 Subject: gnu: shepherd: Update to 0.6.0. * gnu/packages/admin.scm (shepherd): Update to 0.6.0. Use "mirror://gnu" as the URL base. [properties]: Remove. --- gnu/packages/admin.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 3a250eeaa8..11db178d4b 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -181,14 +181,14 @@ (define-public progress (define-public shepherd (package (name "shepherd") - (version "0.5.0") + (version "0.6.0") (source (origin (method url-fetch) - (uri (string-append "https://alpha.gnu.org/gnu/shepherd/shepherd-" + (uri (string-append "mirror://gnu/shepherd/shepherd-" version ".tar.gz")) (sha256 (base32 - "1wmciqml9yplnx1s4ynn00giqyk06rbrcsgvpjj2df47sawk2jp8")))) + "1ys2w83vm62spr8bx38sccfdpy9fqmj7wfywm5k8ihsy2k61da2i")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--localstatedir=/var"))) @@ -211,8 +211,7 @@ (define-public shepherd typical init systems. It provides dependency-handling through a convenient interface and is based on GNU Guile.") (license license:gpl3+) - (home-page "https://www.gnu.org/software/shepherd/") - (properties '((ftp-server . "alpha.gnu.org"))))) + (home-page "https://www.gnu.org/software/shepherd/"))) (define-public daemontools (package -- cgit v1.2.3 From 95ef8b85b16f19557ea07d0d0cbf856f85657368 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 23 Apr 2019 14:48:56 +0200 Subject: services: shepherd: Support one-shot services. * gnu/services/shepherd.scm ()[one-shot?]: New field. (shepherd-service-file): Pass #:one-shot? to the constructor. * doc/guix.texi (Shepherd Services): Document it. --- doc/guix.texi | 6 ++++++ gnu/services/shepherd.scm | 10 +++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/doc/guix.texi b/doc/guix.texi index 3ec1cf852a..955fd1f172 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -25124,6 +25124,12 @@ shepherd, The GNU Shepherd Manual}). @xref{Slots of services, the @item @code{requirements} (default: @code{'()}) List of symbols denoting the Shepherd services this one depends on. +@cindex one-shot services, for the Shepherd +@item @code{one-shot?} (default: @code{#f}) +Whether this service is @dfn{one-shot}. One-shot services stop immediately +after their @code{start} action has completed. @xref{Slots of services,,, +shepherd, The GNU Shepherd Manual}, for more info. + @item @code{respawn?} (default: @code{#t}) Whether to restart the service when it stops, for instance when the underlying process dies. diff --git a/gnu/services/shepherd.scm b/gnu/services/shepherd.scm index 12d649f542..21baacbaf7 100644 --- a/gnu/services/shepherd.scm +++ b/gnu/services/shepherd.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015, 2016, 2018 Ludovic Courtès +;;; Copyright © 2013, 2014, 2015, 2016, 2018, 2019 Ludovic Courtès ;;; Copyright © 2017 Clément Lassieur ;;; Copyright © 2018 Carlo Zancanaro ;;; @@ -44,6 +44,7 @@ (define-module (gnu services shepherd) shepherd-service-provision shepherd-service-canonical-name shepherd-service-requirement + shepherd-service-one-shot? shepherd-service-respawn? shepherd-service-start shepherd-service-stop @@ -149,6 +150,8 @@ (define-record-type* (provision shepherd-service-provision) ;list of symbols (requirement shepherd-service-requirement ;list of symbols (default '())) + (one-shot? shepherd-service-one-shot? ;Boolean + (default #f)) (respawn? shepherd-service-respawn? ;Boolean (default #t)) (start shepherd-service-start) ;g-expression (procedure) @@ -238,6 +241,11 @@ (define (shepherd-service-file service) #:docstring '#$(shepherd-service-documentation service) #:provides '#$(shepherd-service-provision service) #:requires '#$(shepherd-service-requirement service) + + ;; The 'one-shot?' slot is new in Shepherd 0.6.0. + ;; Older versions ignore it. + #:one-shot? '#$(shepherd-service-one-shot? service) + #:respawn? '#$(shepherd-service-respawn? service) #:start #$(shepherd-service-start service) #:stop #$(shepherd-service-stop service) -- cgit v1.2.3 From 051b279fd08eec80cda248aa12e6875005b7dc4f Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 23 Apr 2019 14:51:47 +0200 Subject: services: account: Make 'user-homes' a one-shot service. * gnu/system/shadow.scm (account-shepherd-service): Add 'one-shot?' field. Return #t from 'start'. --- gnu/system/shadow.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/system/shadow.scm b/gnu/system/shadow.scm index 7dc36f4a45..13b8b14095 100644 --- a/gnu/system/shadow.scm +++ b/gnu/system/shadow.scm @@ -323,6 +323,7 @@ (define accounts (list (shepherd-service (requirement '(file-systems)) (provision '(user-homes)) + (one-shot? #t) (modules '((gnu build activation) (gnu system accounts))) (start (with-imported-modules (source-module-closure @@ -332,9 +333,7 @@ (define accounts (activate-user-home (map sexp->user-account (list #$@(map user-account->gexp accounts)))) - #f))) ;stop - (stop #~(const #f)) - (respawn? #f) + #t))) ;success (documentation "Create user home directories.")))) (define (shells-file shells) -- cgit v1.2.3 From 86b8869ffffad96e06e98d523f287b25684a6fa6 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 23 Apr 2019 15:08:31 +0200 Subject: linux-container: Remove '%containerized-shepherd-service' hack. This hack worked around a defect in the Shepherd 0.5.0 and is no longer needed. * gnu/services/shepherd.scm (%containerized-shepherd-service): Remove. * gnu/system/linux-container.scm (container-essential-services): Don't use it. --- gnu/services/shepherd.scm | 16 ---------------- gnu/system/linux-container.scm | 3 +-- 2 files changed, 1 insertion(+), 18 deletions(-) (limited to 'gnu') diff --git a/gnu/services/shepherd.scm b/gnu/services/shepherd.scm index 21baacbaf7..45c67e04eb 100644 --- a/gnu/services/shepherd.scm +++ b/gnu/services/shepherd.scm @@ -60,7 +60,6 @@ (define-module (gnu services shepherd) %default-modules shepherd-service-file - %containerized-shepherd-service shepherd-service-lookup-procedure shepherd-service-back-edges @@ -346,21 +345,6 @@ (define edges (lambda (service) (vhash-foldq* cons '() service edges))) -(define %containerized-shepherd-service - ;; XXX: This service works around a bug in the Shepherd 0.5.0: shepherd - ;; calls reboot(2) (via 'disable-reboot-on-ctrl-alt-del') when it starts, - ;; but in a container that fails with EINVAL. This was fixed in Shepherd - ;; commit 92e806bac1abaeeaf5d60f0ab50d1ae85ba6a62f. - (simple-service 'containerized-shepherd - shepherd-root-service-type - (list (shepherd-service - (provision '(containerized-shepherd)) - (start #~(lambda () - (set! (@@ (shepherd) - disable-reboot-on-ctrl-alt-del) - (const #t)) - #t)))))) - (define (shepherd-service-upgrade live target) "Return two values: the subset of LIVE (a list of ) that needs to be unloaded, and the subset of TARGET (a list of ) that diff --git a/gnu/system/linux-container.scm b/gnu/system/linux-container.scm index 37a053cdc3..149c3d08a3 100644 --- a/gnu/system/linux-container.scm +++ b/gnu/system/linux-container.scm @@ -29,7 +29,6 @@ (define-module (gnu system linux-container) #:use-module (gnu build linux-container) #:use-module (gnu services) #:use-module (gnu services base) - #:use-module (gnu services shepherd) #:use-module (gnu system) #:use-module (gnu system file-systems) #:export (system-container @@ -52,7 +51,7 @@ (define base (let ((locale (operating-system-locale-directory os))) (with-monad %store-monad (return `(("locale" ,locale)))))) - (append base (list %containerized-shepherd-service)))) + base)) (define (containerized-operating-system os mappings) "Return an operating system based on OS for use in a Linux container -- cgit v1.2.3 From 5c46e1dda8535f239a5d136d48e85bcf7210f339 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 22 Apr 2019 23:55:52 +0200 Subject: gnu: gifsicle: Update to 1.92. * gnu/packages/image.scm (gifsicle): Update to 1.92. --- gnu/packages/image.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 3b2bb23252..dd6b2711a8 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -1505,15 +1505,14 @@ (define-public r-jpeg (define-public gifsicle (package (name "gifsicle") - (version "1.91") + (version "1.92") (source (origin (method url-fetch) (uri (string-append "http://www.lcdf.org/gifsicle/gifsicle-" version ".tar.gz")) (sha256 - (base32 - "00586z1yz86qcblgmf16yly39n4lkjrscl52hvfxqk14m81fckha")))) + (base32 "0rffpzxcak19k6cngpxn73khvm3z1gswrqs90ycdzzb53p05ddas")))) (build-system gnu-build-system) (arguments '(#:phases @@ -1528,7 +1527,7 @@ (define-public gifsicle (("/bin/rm") (which "rm"))) #t))))) - (native-inputs `(("perl" ,perl))) ; Only for tests. + (native-inputs `(("perl" ,perl))) ; only for tests (inputs `(("libx11" ,libx11))) (home-page "http://www.lcdf.org/gifsicle/") (synopsis "Edit GIF images and animations") -- cgit v1.2.3 From 645b6c7fc72cf15b549de6a01b63174df18622d3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 22 Apr 2019 23:56:38 +0200 Subject: gnu: gifsicle: Use HTTPS. * gnu/packages/image.scm (gifsicle)[source, home-page]: Use HTTPS. --- gnu/packages/image.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index dd6b2711a8..78e155fa39 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -1509,7 +1509,7 @@ (define-public gifsicle (source (origin (method url-fetch) - (uri (string-append "http://www.lcdf.org/gifsicle/gifsicle-" + (uri (string-append "https://www.lcdf.org/gifsicle/gifsicle-" version ".tar.gz")) (sha256 (base32 "0rffpzxcak19k6cngpxn73khvm3z1gswrqs90ycdzzb53p05ddas")))) @@ -1529,7 +1529,7 @@ (define-public gifsicle #t))))) (native-inputs `(("perl" ,perl))) ; only for tests (inputs `(("libx11" ,libx11))) - (home-page "http://www.lcdf.org/gifsicle/") + (home-page "https://www.lcdf.org/gifsicle/") (synopsis "Edit GIF images and animations") (description "Gifsicle is a command-line GIF image manipulation tool that: -- cgit v1.2.3 From be59c48d15ccfdec2d935801e632e2c5dcf11d07 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 23 Apr 2019 00:22:41 +0200 Subject: gnu: perceptualdiff: Don't use unstable tarball. It's still broken by freeimage, unfortunately. * gnu/packages/image.scm (perceptualdiff)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/image.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 78e155fa39..4010fd0ace 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -1153,13 +1153,13 @@ (define-public perceptualdiff (version "1.3") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/myint/perceptualdiff/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "0zl6xmp971fffg7fzcz2fbgxg5x2w7l8qa65c008i4kbkc9016ps")))) + (method git-fetch) + (uri (git-reference + (url "https://github.com/myint/perceptualdiff.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0yys55f9i9g3wjjg0j2m0p0k21zwnid8520a8lrr30khm4k5gibp")))) (build-system cmake-build-system) (inputs `(("freeimage" ,freeimage))) (arguments -- cgit v1.2.3 From 44aaf1e00ac88a7e2e969a3f30e0092f5502b3b2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 23 Apr 2019 04:28:33 +0200 Subject: gnu: libmwaw: Update to 0.3.15. * gnu/packages/libreoffice.scm (libmwaw): Update to 0.3.15. --- gnu/packages/libreoffice.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 3b8fa514d1..d348a7aa89 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -638,14 +638,14 @@ (define-public libodfgen (define-public libmwaw (package (name "libmwaw") - (version "0.3.14") + (version "0.3.15") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/" name "/" name "/" name "-" version "/" name "-" version ".tar.xz")) (sha256 (base32 - "1s9wyf8pyh3fbazq2d2b6fgi7s7bid60viw2xbdkmn2ywlfbza5c")))) + "1cdhm9yhanyv3w4vr73zhgyynmkhhkp3dyld7m11jd2yy04vnh04")))) (build-system gnu-build-system) (native-inputs `(("doxygen" ,doxygen) -- cgit v1.2.3 From cb4c99ceb91124a88a40f4cb46a04e6b64ac9b2c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 23 Apr 2019 14:11:24 +0200 Subject: gnu: libpagemaker: Don't use NAME in source URI. * gnu/packages/libreoffice.scm (libpagemaker)[source]: Hard-code NAME. --- gnu/packages/libreoffice.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index d348a7aa89..dd289af74e 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -554,8 +554,8 @@ (define-public libpagemaker (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/libpagemaker/" + "libpagemaker-" version ".tar.xz")) (sha256 (base32 "17ai8ajffr0ixxmmcv3k5vgjlcsix38ldb4fw2arild70pbsrbb6")))) (build-system gnu-build-system) -- cgit v1.2.3 From 9a4f6ceb10ae39d611f3fae1cb10c45daab57cc3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 23 Apr 2019 14:11:31 +0200 Subject: gnu: libvisio: Don't use NAME in source URI. * gnu/packages/libreoffice.scm (libvisio)[source]: Hard-code NAME. --- gnu/packages/libreoffice.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index dd289af74e..df40570fcc 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -581,8 +581,8 @@ (define-public libvisio (source (origin (method url-fetch) - (uri (string-append "http://dev-www.libreoffice.org/src/" name "/" - name "-" version ".tar.xz")) + (uri (string-append "http://dev-www.libreoffice.org/src/libvisio/" + "libvisio-" version ".tar.xz")) (sha256 (base32 "1yahpfl13qk6178irv8jn5ppxdn7isafqisyqsdw0lqxcz9h447y")))) (build-system gnu-build-system) -- cgit v1.2.3 From 9148ed7cd2912a361d9296bebe1334f908432986 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 23 Apr 2019 14:11:37 +0200 Subject: gnu: libodfgen: Don't use NAME in source URI. * gnu/packages/libreoffice.scm (libodfgen)[source]: Hard-code NAME. --- gnu/packages/libreoffice.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index df40570fcc..946f630f04 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -611,8 +611,8 @@ (define-public libodfgen (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/libwpd/" name "/" - name "-" version "/" name "-" version ".tar.xz")) + (uri (string-append "mirror://sourceforge/libwpd/libodfgen/" + "libodfgen-" version "/libodfgen-" version ".tar.xz")) (sha256 (base32 "0cdq48wlpp8m0qmndybv64r0m4vh0qsqx69cn6ms533cjlgljgij")))) (build-system gnu-build-system) -- cgit v1.2.3 From 7b7abb07c2913d9c9a4accb7b6437afa3b30236e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 23 Apr 2019 14:11:42 +0200 Subject: gnu: libmwaw: Don't use NAME in source URI. * gnu/packages/libreoffice.scm (libmwaw)[source]: Hard-code NAME. --- gnu/packages/libreoffice.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 946f630f04..9f5bedd913 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -642,8 +642,8 @@ (define-public libmwaw (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/" name "/" name "/" name "-" - version "/" name "-" version ".tar.xz")) + (uri (string-append "mirror://sourceforge/libmwaw/libmwaw/libmwaw-" + version "/libmwaw-" version ".tar.xz")) (sha256 (base32 "1cdhm9yhanyv3w4vr73zhgyynmkhhkp3dyld7m11jd2yy04vnh04")))) (build-system gnu-build-system) -- cgit v1.2.3 From ef93b55e4281175570632a102cd01caff9b7a79b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 23 Apr 2019 14:44:52 +0200 Subject: gnu: lynis: Update to 2.7.4. * gnu/packages/admin.scm (lynis): Update to 2.7.4. --- gnu/packages/admin.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 11db178d4b..94145c04e8 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2924,7 +2924,7 @@ (define-public lynis (package (name "lynis") ;; Also update the ‘lynis-sdk’ input to the commit matching this release. - (version "2.7.3") + (version "2.7.4") (source (origin (method git-fetch) @@ -2933,7 +2933,7 @@ (define-public lynis (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0md1w86i3fy9l78i98ijr5136nbhdiik2dxyw9qnzmvdlvkqmw70")) + (base32 "1jjk5hcxmp4f4ppsljiq95l2ln6b03azydap3b35lsvxkjybv88k")) (modules '((guix build utils))) (snippet '(begin @@ -2950,10 +2950,10 @@ (define-public lynis (method git-fetch) (uri (git-reference (url "https://github.com/CISOfy/lynis-sdk") - (commit "c166b6a67a53b24f5c1fecd4eb5033f54279a5b3"))) + (commit "90f301e21c204792cf372f1cf05890a562f2e31b"))) (file-name (git-file-name "lynis-sdk" version)) (sha256 - (base32 "0wa2azcmx6pj9axvq1jmwmz7826rj1c214asmmn1hq7pxmfw62zr")))))) + (base32 "1d0smr1fxrvbc3hl8lzy33im9ahzr0hgs3kk09r8g8xccjkcm52l")))))) (arguments `(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From 97f4ff6d291b6cc9612dbec4b45a0676c6b0834d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 23 Apr 2019 18:12:23 +0200 Subject: gnu: libedit: Update to 20190324-3.1. * gnu/packages/libedit.scm (libedit): Update to 20190324-3.1. --- gnu/packages/libedit.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/libedit.scm b/gnu/packages/libedit.scm index b5e20f30f8..7681677938 100644 --- a/gnu/packages/libedit.scm +++ b/gnu/packages/libedit.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015 Federico Beffa ;;; Copyright © 2015 Ricardo Wurmus -;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2019 Gábor Boskovits ;;; ;;; This file is part of GNU Guix. @@ -29,15 +29,14 @@ (define-module (gnu packages libedit) (define-public libedit (package (name "libedit") - (version "20181209-3.1") + (version "20190324-3.1") (source (origin (method url-fetch) (uri (string-append "http://thrysoee.dk/editline" - "/" name "-" version ".tar.gz")) + "/libedit-" version ".tar.gz")) (sha256 - (base32 - "0r0hc4lg71xnn0vrrk2g7is42i0k0dra7cbw3fljq3q01c6df498")))) + (base32 "1bhvp8xkkgrg89k4ci1k8vjl3nhb6szd4ghy9lp4jrfgq58hz3xc")))) (build-system gnu-build-system) (inputs `(("ncurses" ,ncurses))) -- cgit v1.2.3 From 74ee98eed4e4962b4843630f9785d5c62c10f4bc Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 23 Apr 2019 18:14:39 +0200 Subject: gnu: ocaml-ppx-hash: Fix typo in description. * gnu/packages/ocaml.scm (ocaml-ppx-hash)[description]: Fix non-functional typo. --- gnu/packages/ocaml.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 7b75c6bba6..ee8b82d8f4 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5653,7 +5653,7 @@ (define-public ocaml-ppx-hash (properties `((upstream-name . "ppx_hash"))) (home-page "https://github.com/janestreet/ppx_hash") (synopsis "Generation of hash functions from type expressions and definitions") - (description "This package is a collecton of ppx rewriters that generate + (description "This package is a collection of ppx rewriters that generate hash functions from type exrpessions and definitions.") (license license:asl2.0))) -- cgit v1.2.3 From 9694b44e3b8aaac230c2ae8c8ddcf676ba19a1d7 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Tue, 23 Apr 2019 20:14:16 +0530 Subject: gnu: notmuch-addrlookup-c: Update to 9. * gnu/packages/mail.scm (notmuch-addrlookup-c): Update to 9. [arguments]: Remove PREFIX from #:make-flags. --- gnu/packages/mail.scm | 80 +++++++++++++++++++++++---------------------------- 1 file changed, 36 insertions(+), 44 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 2ae3fda9a7..844e393a9e 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -919,51 +919,43 @@ (define-public notmuch (license gpl3+))) (define-public notmuch-addrlookup-c - ;; This commit includes a compatibility fix for notmuch-0.25, and is not - ;; currently part of any release. Please update this package when - ;; notmuch-addrlookup-c-9 is released. - (let ((commit "88f156d04990a71c6ad6fc2757b537b44e3c4d00") - (revision "1")) ;Guix package revision - (package - (name "notmuch-addrlookup-c") - (version (string-append "8-" revision "." - (string-take commit 7))) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/aperezdc/notmuch-addrlookup-c.git") - (commit commit))) - (file-name (string-append name "-" version "-checkout")) - (sha256 - (base32 - "0v0wzs7qzy4n1hbql8s10qrwgalcxdzbxf8pj6cii1pv2jwmkxbm")))) - (build-system gnu-build-system) - (arguments - '(#:tests? #f ; no tests - #:make-flags (list "CC=gcc" - (string-append "PREFIX=" - (assoc-ref %outputs "out"))) - #:phases (modify-phases %standard-phases - (delete 'configure) - ;; Remove vim code completion config, it's not needed to - ;; build (or be patched). - (add-before 'patch-source-shebangs 'delete-ycm-file - (lambda _ (delete-file ".ycm_extra_conf.py"))) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let ((bin (string-append - (assoc-ref outputs "out") "/bin"))) - (install-file "notmuch-addrlookup" bin))))))) - (native-inputs - `(("pkg-config" ,pkg-config))) - (inputs - `(("glib" ,glib) - ("notmuch" ,notmuch))) - (home-page "https://github.com/aperezdc/notmuch-addrlookup-c") - (synopsis "Address lookup tool for Notmuch") - (description "This is an address lookup tool using a Notmuch database, + (package + (name "notmuch-addrlookup-c") + (version (string-append "9")) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/aperezdc/notmuch-addrlookup-c.git") + (commit (string-append "v" version)))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "1j3zdx161i1x4w0nic14ix5i8hd501rb31daf8api0k8855sx4rc")))) + (build-system gnu-build-system) + (arguments + '(#:tests? #f ; no tests + #:make-flags (list "CC=gcc") + #:phases (modify-phases %standard-phases + (delete 'configure) + ;; Remove vim code completion config, it's not needed to + ;; build (or be patched). + (add-before 'patch-source-shebangs 'delete-ycm-file + (lambda _ (delete-file ".ycm_extra_conf.py"))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((bin (string-append + (assoc-ref outputs "out") "/bin"))) + (install-file "notmuch-addrlookup" bin))))))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("glib" ,glib) + ("notmuch" ,notmuch))) + (home-page "https://github.com/aperezdc/notmuch-addrlookup-c") + (synopsis "Address lookup tool for Notmuch") + (description "This is an address lookup tool using a Notmuch database, useful for email address completion.") - (license license:expat)))) + (license license:expat))) (define-public python-notmuch (package -- cgit v1.2.3 From 30023aa670dfa3fb7fb1234d119e6a839f6bd914 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 17 Apr 2019 02:29:42 +0200 Subject: gnu: xf86-video-intel: Update to 2.99.917-13.6afed33. * gnu/packages/xorg.scm (xf86-video-intel): Update to 2.99.917-13.6afed33. --- gnu/packages/xorg.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index fc7c55b084..7cbeede66f 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -2915,8 +2915,8 @@ (define-public xf86-video-i128 (define-public xf86-video-intel - (let ((commit "33ee0c3b21ea279e08d0863fcb2e874f0974b00e") - (revision "12")) + (let ((commit "6afed33b2d673d88674f0c76efe500ae414e8e1b") + (revision "13")) (package (name "xf86-video-intel") (version (git-version "2.99.917" revision commit)) @@ -2929,7 +2929,7 @@ (define-public xf86-video-intel (commit commit))) (sha256 (base32 - "1ryjaj52nd2fbrjf1id5fr5vndzvv287rggbj3lzhbwzxv52r0gj")) + "1s3fqlqzmql7s15m7qy21vai93n6q9f0ccpv0p353rwfx16mmf35")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (inputs `(("mesa" ,mesa) -- cgit v1.2.3 From a18581a02da0b5ca1c99f2114129513cdf5fa05d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 17 Apr 2019 22:36:47 +0200 Subject: gnu: libpng: Replace with 1.6.37 [security fixes]. This fixes CVE-2018-14048, CVE-2018-14550, and CVE-2019-7317. * gnu/packages/image.scm (libpng)[replacement]: New field. (libpng-1.6.37): New public variable. --- gnu/packages/image.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 4010fd0ace..4443e1c83d 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -87,6 +87,7 @@ (define-public libpng (package (name "libpng") (version "1.6.34") + (replacement libpng-1.6.37) (source (origin (method url-fetch) (uri (list (string-append "mirror://sourceforge/libpng/libpng16/" @@ -112,6 +113,25 @@ (define-public libpng (license license:zlib) (home-page "http://www.libpng.org/pub/png/libpng.html"))) +;; This graft exists to fix CVE-2018-14048, CVE-2018-14550, and CVE-2019-7317. +(define-public libpng-1.6.37 + (package + (inherit libpng) + (version "1.6.37") + (source (origin + (method url-fetch) + (uri (list (string-append "mirror://sourceforge/libpng/libpng16/" + version "/libpng-" version ".tar.xz") + (string-append + "ftp://ftp.simplesystems.org/pub/libpng/png/src" + "/libpng16/libpng-" version ".tar.xz") + (string-append + "ftp://ftp.simplesystems.org/pub/libpng/png/src/history" + "/libpng16/libpng-" version ".tar.xz"))) + (sha256 + (base32 + "1jl8in381z0128vgxnvn33nln6hzckl7l7j9nqvkaf1m9n1p0pjh")))))) + ;; libpng-apng should be updated when the APNG patch is released: ;; (define-public libpng-apng -- cgit v1.2.3 From 8949b640045a93da885c9502e22a911573db64f5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 23 Apr 2019 13:30:36 +0200 Subject: gnu: fluidsynth: Update to 2.0.5. * gnu/packages/audio.scm (fluidsynth): Update to 2.0.5. --- gnu/packages/audio.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index cb0a3df3b5..7a79f4dcab 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -1104,7 +1104,7 @@ (define-public g2reverb (define-public fluidsynth (package (name "fluidsynth") - (version "2.0.4") + (version "2.0.5") (source (origin (method git-fetch) (uri (git-reference @@ -1113,7 +1113,7 @@ (define-public fluidsynth (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "1v2vji02fbrjgypwb4fw2r90hnfwfbfh3d24j8vjwlbqxhxp16s0")))) + "0rv0apxbj0cgm8f8sqf5xr6kdi4q58ph92ip6cg716ha0ca5lr8y")))) (build-system cmake-build-system) (arguments '(#:tests? #f ; no check target -- cgit v1.2.3 From af1d777e6c03a89f8d5da0bc41b7d5709aebcaea Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 23 Apr 2019 13:32:05 +0200 Subject: gnu: maim: Update to 5.5.3. * gnu/packages/xdisorg.scm (maim): Update to 5.5.3. --- gnu/packages/xdisorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 974233fd1e..79cd73cbfb 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -573,7 +573,7 @@ (define-public slop (define-public maim (package (name "maim") - (version "5.5.2") + (version "5.5.3") (source (origin (method git-fetch) (uri (git-reference @@ -582,7 +582,7 @@ (define-public maim (file-name (git-file-name name version)) (sha256 (base32 - "14mfxdm39kc5jk8wysrzx05ag2g4sk9l24i8m5pzqn8j611150v3")))) + "1kbxsz8whfxl5blwsvpva2q95zwy72argwhi1cfqh5lrhzq5zrpp")))) (build-system cmake-build-system) (arguments '(#:tests? #f)) ; no "check" target -- cgit v1.2.3 From e01bd1a67447c1f2a2b5b03e8ea8fbbccd2cd5bd Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 23 Apr 2019 14:30:19 +0200 Subject: gnu: libseccomp: Update to 2.4.1. * gnu/packages/linux.scm (libseccomp): Update to 2.4.1. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 9049fbc313..f3ed832417 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4141,7 +4141,7 @@ (define-public mtd-utils (define-public libseccomp (package (name "libseccomp") - (version "2.4.0") + (version "2.4.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/seccomp/libseccomp/" @@ -4149,7 +4149,7 @@ (define-public libseccomp "/libseccomp-" version ".tar.gz")) (sha256 (base32 - "0paj1szszpf8plykrd66jqg1x3kmqs395rbjskahld2bnplcfx1f")))) + "1s06h2cgk0xxwmhwj72z33bllafc1xqnxzk2yyra2rmg959778qw")))) (build-system gnu-build-system) (native-inputs `(("which" ,which))) -- cgit v1.2.3