From aab322d909c0b4abec132ef7aff31c31a1208841 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 4 Dec 2017 23:31:15 +0100 Subject: install: Don't start sshd by default. Reported by Christopher Baines at . * gnu/services/ssh.scm ()[%auto-start?]: New field. (openssh-shepherd-service): Honor it. * gnu/system/install.scm (%installation-services): Set '%auto-start?' to #f for openssh-service-type. --- gnu/services/ssh.scm | 12 ++++++++++-- gnu/system/install.scm | 5 ++++- 2 files changed, 14 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/services/ssh.scm b/gnu/services/ssh.scm index b33ec946c6..301ba74041 100644 --- a/gnu/services/ssh.scm +++ b/gnu/services/ssh.scm @@ -304,7 +304,14 @@ (define-record-type* ;; list of user-name/file-like tuples (authorized-keys openssh-authorized-keys - (default '()))) + (default '())) + + ;; Boolean + ;; XXX: This should really be handled in an orthogonal way, for instance as + ;; proposed in . Keep it internal/undocumented + ;; for now. + (%auto-start? openssh-auto-start? + (default #t))) (define %openssh-accounts (list (user-group (name "sshd") (system? #t)) @@ -445,7 +452,8 @@ (define openssh-command (provision '(ssh-daemon)) (start #~(make-forkexec-constructor #$openssh-command #:pid-file #$pid-file)) - (stop #~(make-kill-destructor))))) + (stop #~(make-kill-destructor)) + (auto-start? (openssh-auto-start? config))))) (define (openssh-pam-services config) "Return a list of for sshd with CONFIG." diff --git a/gnu/system/install.scm b/gnu/system/install.scm index 78f2bf3a13..0dd7688634 100644 --- a/gnu/system/install.scm +++ b/gnu/system/install.scm @@ -264,7 +264,10 @@ (define bare-bones-os ;; The root account is passwordless, so make sure ;; a password is set before allowing logins. (allow-empty-passwords? #f) - (password-authentication? #t))) + (password-authentication? #t) + + ;; Don't start it upfront. + (%auto-start? #f))) ;; Since this is running on a USB stick with a overlayfs as the root ;; file system, use an appropriate cache configuration. -- cgit v1.2.3 From f00b85ff8d34df0a1879e593d4a85629b8586af7 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 5 Dec 2017 11:50:00 +0100 Subject: gnu: commencement: Do not graft early bootstrap packages. By definition, these packages are not depended on at run time by any of the packages we use. Thus it does not make sense to inherit grafts. Furthermore, those grafts would often lead to extra overhead for users who would end up downloading those "-boot0" packages just to build package replacements that are in fact not going to be used. This reverts parts of f1597427f220b0799b9c8847768d2f5a93fe3730 and ce27857f710ff32c05f4ba19a04a695c1cc2ce20. Reported by Christopher Baines at . * gnu/packages/commencement.scm (file-boot0, binutils-boot0): Use plain 'inherit' instead of 'package/inherit'. --- gnu/packages/commencement.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 406a23b21c..c5c00688e4 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -113,7 +113,8 @@ (define findutils-boot0 (define file-boot0 (package-with-bootstrap-guile - (package-with-explicit-inputs (package/inherit file + (package-with-explicit-inputs (package + (inherit file) (name "file-boot0")) `(("make" ,gnu-make-boot0) ,@%bootstrap-inputs) @@ -140,7 +141,7 @@ (define* (boot-triplet #:optional (system (%current-system))) (define binutils-boot0 (package-with-bootstrap-guile - (package/inherit binutils + (package (inherit binutils) (name "binutils-cross-boot0") (arguments `(#:guile ,%bootstrap-guile -- cgit v1.2.3 From 3e442f85fdbb5a0f8b7499010bf1c2c34a27f592 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 5 Dec 2017 17:49:48 +0100 Subject: gnu: ghostscript-with-cups: Turn into a public variable. Tris allows Hydra/Cuirass to pick it up and to build its replacement. Failing that, users have to build "ghostscript-with-cups-9.22" from source. * gnu/packages/cups.scm (ghostscript/cups): Move to 'ghostscript.scm'. (cups-filters)[inputs]: Remove 'force'. * gnu/packages/ghostscript.scm (ghostscript/cups): New variable. --- gnu/packages/cups.scm | 10 +--------- gnu/packages/ghostscript.scm | 7 +++++++ 2 files changed, 8 insertions(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index bbf2699f00..e3a252bc0c 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -46,14 +46,6 @@ (define-module (gnu packages cups) #:use-module (gnu packages pkg-config) #:use-module (gnu packages tls)) -;; Delay to avoid module circularity problems. -(define ghostscript/cups - (delay - (package/inherit ghostscript - (name "ghostscript-with-cups") - (inputs `(("cups" ,cups-minimal) - ,@(package-inputs ghostscript)))))) - (define-public cups-filters (package (name "cups-filters") @@ -146,7 +138,7 @@ (define-public cups-filters ("fontconfig" ,fontconfig) ("freetype" ,freetype) ("font-dejavu" ,font-dejavu) ; also needed by test suite - ("ghostscript" ,(force ghostscript/cups)) + ("ghostscript" ,ghostscript/cups) ("ijs" ,ijs) ("dbus" ,dbus) ("lcms" ,lcms) diff --git a/gnu/packages/ghostscript.scm b/gnu/packages/ghostscript.scm index 28477b2c42..f0a28d0752 100644 --- a/gnu/packages/ghostscript.scm +++ b/gnu/packages/ghostscript.scm @@ -26,6 +26,7 @@ (define-module (gnu packages ghostscript) #:use-module (gnu packages) #:use-module (gnu packages autotools) #:use-module (gnu packages compression) + #:use-module (gnu packages cups) #:use-module (gnu packages fontutils) #:use-module (gnu packages image) #:use-module (gnu packages perl) @@ -281,6 +282,12 @@ (define-public ghostscript/x ("libxt" ,libxt) ,@(package-inputs ghostscript))))) +(define-public ghostscript/cups + (package/inherit ghostscript + (name "ghostscript-with-cups") + (inputs `(("cups" ,cups-minimal) + ,@(package-inputs ghostscript))))) + (define-public ijs (package (name "ijs") -- cgit v1.2.3 From 614f8cc1c3e0065bff2de9e7ab625d710a94ffd4 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 5 Dec 2017 17:57:22 +0100 Subject: gnu: guix: Update snapshot to 91c9b5d. * gnu/packages/package-management.scm (guix): Update to 91c9b5d. --- 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 a1fb3b9cf7..d496416b19 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -86,8 +86,8 @@ (define-public guix ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "0.13.0") - (commit "3fb6464ba43141b671481ce5ba158b6e6d1badfe") - (revision 13)) + (commit "91c9b5d016ac8bed127557d378c70fbc56cec0e5") + (revision 14)) (package (name "guix") @@ -103,7 +103,7 @@ (define-public guix (commit commit))) (sha256 (base32 - "0nx3nvr3myjhg7zyyrvxfs63ddmb7yv0ndzn1dq4gp2is65n3krr")) + "1cfkk78baj2fkfq8wwmliwpcmnarjnqlj4sk6q9zf03krs95zfl3")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From 3908546a21a790b00ae8a4a44c200bf963884e82 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 5 Dec 2017 18:02:08 +0100 Subject: gnu: acpica: Mark up description. * gnu/packages/admin.scm (acpica)[description]: Use @dfn. --- gnu/packages/admin.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 3250be5349..dbc80a5b8e 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1102,10 +1102,10 @@ (define-public acpica (home-page "http://acpica.org/") (synopsis "Tools for the development and debug of ACPI tables") (description - "The ACPI Component Architecture (ACPICA) project provides an + "The ACPI Component Architecture (@dfn{ACPICA}) project provides an OS-independent reference implementation of the Advanced Configuration and -Power Interface Specification (ACPI). ACPICA code contains those portions of -ACPI meant to be directly integrated into the host OS as a kernel-resident +Power Interface Specification (@dfn{ACPI}). ACPICA code contains those portions +of ACPI meant to be directly integrated into the host OS as a kernel-resident subsystem, and a small set of tools to assist in developing and debugging ACPI tables. This package contains only the user-space tools needed for ACPI table development, not the kernel implementation of ACPI.") -- cgit v1.2.3 From 4a462aa7f410e4f88bbe7fb1bac769805bef1baa Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 5 Dec 2017 18:57:43 +0100 Subject: gnu: acpica: Update to 20171110. * gnu/packages/admin.scm (acpica): Update to 20171110. [arguments]: Add "CC=gcc". --- gnu/packages/admin.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index dbc80a5b8e..7f62f30597 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1081,7 +1081,7 @@ (define-public dmidecode (define-public acpica (package (name "acpica") - (version "20150410") + (version "20171110") (source (origin (method url-fetch) (uri (string-append @@ -1089,12 +1089,13 @@ (define-public acpica version ".tar.gz")) (sha256 (base32 - "0q1fjwkyw9x6gsva6fd0zbn7ly4fx0ha4853f416np9kf2irillw")))) + "08g83qvhfx04vzb3f3pfpkp0w601v6csjzdv7z1vjzz1k71h7yml")))) (build-system gnu-build-system) (native-inputs `(("flex" ,flex) ("bison" ,bison))) (arguments '(#:make-flags (list (string-append "PREFIX=" %output) + "CC=gcc" "HOST=_LINUX" "OPT_CFLAGS=-Wall -fno-strict-aliasing") #:tests? #f ; no 'check' target. -- cgit v1.2.3 From 2ec42868b06a146796d2ae669bf54ba4d318beb0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 6 Dec 2017 00:17:10 +0100 Subject: gnu: xlockmore: Update source URIs and home page. * gnu/packages/xdisorg.scm (xlockmore)[source, home-page]: Use the new sillycycle.com domain. --- gnu/packages/xdisorg.scm | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 2e1ed2ee9e..4213afdc4d 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -621,13 +621,12 @@ (define-public xlockmore (version "5.47") (source (origin (method url-fetch) - (uri (list (string-append - "http://www.tux.org/~bagleyd/xlock/xlockmore-" - version ".tar.xz") - (string-append - "http://www.tux.org/~bagleyd/xlock/xlockmore-old" - "/xlockmore-" version - "/xlockmore-" version ".tar.xz"))) + (uri (list (string-append "http://sillycycle.com/xlock/" + name "-" version ".tar.xz") + ;; Previous releases are moved to a subdirectory. + (string-append "http://sillycycle.com/xlock/" + "recent-releases/" + name "-" version ".tar.xz"))) (sha256 (base32 "138d79b8zc2hambbr9fnxp3fhihlcljgqns04zf0kv2f53pavqwl")))) @@ -642,7 +641,7 @@ (define-public xlockmore ("libXext" ,libxext) ("libXt" ,libxt) ("linux-pam" ,linux-pam))) - (home-page "http://www.tux.org/~bagleyd/xlockmore.html") + (home-page "http://sillycycle.com/xlockmore.html") (synopsis "Screen locker for the X Window System") (description "XLockMore is a classic screen locker and screen saver for the -- cgit v1.2.3 From 50269c0197deca710e04c9ad6b92ab8740758133 Mon Sep 17 00:00:00 2001 From: Clément Lassieur Date: Mon, 4 Dec 2017 16:12:27 +0100 Subject: gnu: lua5.1-socket: Update to 3.0-rc1 (for IPv6 support). * gnu/packages/lua.scm (lua5.1-socket): Update to 3.0-rc1. [source]: Change upstream URI. [arguments]: Set INSTALL_TOP environment variable instead of INSTALL_TOP_SHARE and INSTALL_TOP_LIB. --- gnu/packages/lua.scm | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm index d5f55b9631..3a528599fa 100644 --- a/gnu/packages/lua.scm +++ b/gnu/packages/lua.scm @@ -173,21 +173,20 @@ (define-public lua5.1-expat (define-public lua5.1-socket (package (name "lua5.1-socket") - (version "2.0.2") + (version "3.0-rc1") (source (origin (method url-fetch) - (uri (string-append "http://files.luaforge.net/releases/" - "luasocket/luasocket/luasocket-" - version "/luasocket-" version ".tar.gz")) + (uri (string-append + "https://github.com/diegonehab/luasocket/archive/v" + version ".tar.gz")) (sha256 (base32 - "19ichkbc4rxv00ggz8gyf29jibvc2wq9pqjik0ll326rrxswgnag")))) + "0j8jx8bjicvp9khs26xjya8c495wrpb7parxfnabdqa5nnsxjrwb")))) (build-system gnu-build-system) (arguments `(#:make-flags (let ((out (assoc-ref %outputs "out"))) - (list (string-append "INSTALL_TOP_SHARE=" out "/share/lua/5.1") - (string-append "INSTALL_TOP_LIB=" out "/lib/lua/5.1"))) + (list (string-append "INSTALL_TOP=" out))) #:phases (modify-phases %standard-phases (delete 'configure) -- cgit v1.2.3 From 787e8a80d54d8bd5320d76276dc5f4bafe5b86c0 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 6 Dec 2017 08:52:31 +0100 Subject: services: console-font: Use 'tcsetattr' instead of invoking 'unicode_start'. This is more robust, faster, and incidentally gets rid of remaining "error in the finalization thread: Bad file descriptor" messages. * gnu/services/base.scm (unicode-start): Rewrite to use 'tcgetattr' and 'tcsetattr'. (console-font-shepherd-services)[start]: Add 'loop' to check whether DEVICE is ready. Tolerate EX_OSERR return from 'setfont'. [modules]: New field. --- gnu/services/base.scm | 56 ++++++++++++++++++++++++++++++++++----------------- 1 file changed, 38 insertions(+), 18 deletions(-) (limited to 'gnu') diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 11f55c588c..291dd63256 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -621,21 +621,23 @@ (define (host-name-service name) (define (unicode-start tty) "Return a gexp to start Unicode support on @var{tty}." - - ;; We have to run 'unicode_start' in a pipe so that when it invokes the - ;; 'tty' command, that command returns TTY. - #~(begin - (let ((pid (primitive-fork))) - (case pid - ((0) - (close-fdes 0) - (dup2 (open-fdes #$tty O_RDONLY) 0) - (close-fdes 1) - (dup2 (open-fdes #$tty O_WRONLY) 1) - (execl #$(file-append kbd "/bin/unicode_start") - "unicode_start")) - (else - (zero? (cdr (waitpid pid)))))))) + (with-imported-modules '((guix build syscalls)) + #~(let* ((fd (open-fdes #$tty O_RDWR)) + (termios (tcgetattr fd))) + (define (set-utf8-input termios) + (set-field termios (termios-input-flags) + (logior (input-flags IUTF8) + (termios-input-flags termios)))) + + ;; See console_codes(4). + (display "\x1b%G" (fdes->outport fd)) + + (tcsetattr fd (tcsetattr-action TCSAFLUSH) + (set-utf8-input termios)) + + ;; TODO: ioctl(fd, KDSKBMODE, K_UNICODE); + (close-fdes fd) + #t))) (define console-keymap-service-type (shepherd-service-type @@ -674,11 +676,29 @@ (define (console-font-shepherd-services tty+font) (requirement (list (symbol-append 'term- (string->symbol tty)))) + (modules '((guix build syscalls) ;for 'tcsetattr' + (srfi srfi-9 gnu))) ;for 'set-field' (start #~(lambda _ + ;; It could be that mingetty is not fully ready yet, + ;; which we check by calling 'ttyname'. + (let loop ((i 10)) + (unless (or (zero? i) + (call-with-input-file #$device + (lambda (port) + (false-if-exception (ttyname port))))) + (usleep 500) + (loop (- i 1)))) + (and #$(unicode-start device) - (zero? - (system* #$(file-append kbd "/bin/setfont") - "-C" #$device #$font))))) + ;; 'setfont' returns EX_OSERR (71) when an + ;; KDFONTOP ioctl fails, for example. Like + ;; systemd's vconsole support, let's not treat + ;; this as an error. + (case (status:exit-val + (system* #$(file-append kbd "/bin/setfont") + "-C" #$device #$font)) + ((0 71) #t) + (else #f))))) (stop #~(const #t)) (respawn? #f))))) tty+font)) -- cgit v1.2.3 From a6888fe3cdad3df1b7ce761d28889b802783eda7 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 6 Dec 2017 10:50:17 +0200 Subject: gnu: lua5.1-socket: Add missing file-name field. * gnu/packages/lua.scm (lua5.1-socket)[source]: Add missing file-name field. --- gnu/packages/lua.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu') diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm index 3a528599fa..3fd1c43d4a 100644 --- a/gnu/packages/lua.scm +++ b/gnu/packages/lua.scm @@ -179,6 +179,7 @@ (define-public lua5.1-socket (uri (string-append "https://github.com/diegonehab/luasocket/archive/v" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "0j8jx8bjicvp9khs26xjya8c495wrpb7parxfnabdqa5nnsxjrwb")))) -- cgit v1.2.3 From 12746aa9b8ab50c75f6546b9858b9c7686c7e960 Mon Sep 17 00:00:00 2001 From: Clément Lassieur Date: Wed, 6 Dec 2017 10:49:07 +0100 Subject: gnu: python-git-review: Update to 1.26.0. * gnu/packages/openstack.scm (python-git-review): Update to 1.26.0. --- gnu/packages/openstack.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm index 31922833b7..90168ef70b 100644 --- a/gnu/packages/openstack.scm +++ b/gnu/packages/openstack.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015 Cyril Roelandt ;;; Copyright © 2015, 2016 Efraim Flashner -;;; Copyright © 2016 Clément Lassieur +;;; Copyright © 2016, 2017 Clément Lassieur ;;; ;;; This file is part of GNU Guix. ;;; @@ -849,14 +849,14 @@ (define-public python2-swiftclient (define-public python-git-review (package (name "python-git-review") - (version "1.25.0") + (version "1.26.0") (source (origin (method url-fetch) (uri (pypi-uri "git-review" version)) (sha256 (base32 - "07d1jn9ryff5j5ic6qj5pbk10m1ccmpllj0wyalrcms1q9yhlzh8")))) + "150b1zvm6favd1ad8yl2bilq7xkr4m1mw9510frh47f8ghfkqz28")))) (build-system python-build-system) (arguments '(#:tests? #f ; tests require a running Gerrit server -- cgit v1.2.3 From ad4953bc0ec1684c49c0934304c7ec200a0cd280 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 6 Dec 2017 10:58:17 +0100 Subject: gnu: guix: Update to 0.14.0. --- gnu/packages/package-management.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index d496416b19..37db83ae09 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -85,9 +85,9 @@ (define-public guix ;; Latest version of Guix, which may or may not correspond to a release. ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. - (let ((version "0.13.0") - (commit "91c9b5d016ac8bed127557d378c70fbc56cec0e5") - (revision 14)) + (let ((version "0.14.0") + (commit "40f5c53d89da266055a1dd6571c380f5c57fe5f9") + (revision 0)) (package (name "guix") @@ -103,7 +103,7 @@ (define-public guix (commit commit))) (sha256 (base32 - "1cfkk78baj2fkfq8wwmliwpcmnarjnqlj4sk6q9zf03krs95zfl3")) + "05d4cwliymipmfxqzz3khq6zw1iblkq0w3fkmj2819xlqjwa5wy5")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From 0dd91619a597b52bcb5d6d1bb675a9eb65242c44 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 6 Dec 2017 10:58:29 +0100 Subject: gnu: guix: Update to ad4953b. --- 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 37db83ae09..45119bc708 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -86,8 +86,8 @@ (define-public guix ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "0.14.0") - (commit "40f5c53d89da266055a1dd6571c380f5c57fe5f9") - (revision 0)) + (commit "ad4953bc0ec1684c49c0934304c7ec200a0cd280") + (revision 1)) (package (name "guix") @@ -103,7 +103,7 @@ (define-public guix (commit commit))) (sha256 (base32 - "05d4cwliymipmfxqzz3khq6zw1iblkq0w3fkmj2819xlqjwa5wy5")) + "0ngra4cb1kf3kwccslmhnvlr116drsnbqrsjniq1hrg5mqf6vf1b")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From a08801e205e0800c60e99743d9d47fe76a3a3aee Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 5 Dec 2017 18:23:32 +0100 Subject: gnu: ghc-http-types: Update to 0.11. * gnu/packages/haskell-web.scm (ghc-http-types): Update to 0.11. --- gnu/packages/haskell-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index 0d4129f8fc..fb7e27048b 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -95,7 +95,7 @@ (define-public ghc-cookie (define-public ghc-http-types (package (name "ghc-http-types") - (version "0.9") + (version "0.11") (source (origin (method url-fetch) @@ -105,7 +105,7 @@ (define-public ghc-http-types ".tar.gz")) (sha256 (base32 - "0ny15jgm5skhs2yx6snr13lrnw19hwjgfygrpsmhib8wqa8cz8cc")))) + "08w30rf1i7kbh2j1iajqmj6yhhmglnb8kjggc8kdni3xahhrgcss")))) (build-system haskell-build-system) (arguments `(#:tests? #f)) ; FIXME: Tests cannot find ; Blaze.Bytestring.Builder, which should be -- cgit v1.2.3 From d4846779715ff77ccb35476a669bda34a291a1ab Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 5 Dec 2017 18:25:00 +0100 Subject: gnu: ghc-http-types: Run tests. * gnu/packages/haskell-web.scm (ghc-http-types)[arguments]: Run tests. [native-inputs]: Add ghc-doctest, ghc-hspec, ghc-quickcheck, ghc-quickcheck-instances, and hspec-discover. --- gnu/packages/haskell-web.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index fb7e27048b..c295477e2f 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -107,9 +107,12 @@ (define-public ghc-http-types (base32 "08w30rf1i7kbh2j1iajqmj6yhhmglnb8kjggc8kdni3xahhrgcss")))) (build-system haskell-build-system) - (arguments `(#:tests? #f)) ; FIXME: Tests cannot find - ; Blaze.Bytestring.Builder, which should be - ; provided by ghc-blaze-builder. + (native-inputs + `(("ghc-doctest" ,ghc-doctest) + ("ghc-hspec" ,ghc-hspec) + ("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-quickcheck-instances" ,ghc-quickcheck-instances) + ("hspec-discover" ,hspec-discover))) (inputs `(("ghc-case-insensitive" ,ghc-case-insensitive) ("ghc-blaze-builder" ,ghc-blaze-builder) -- cgit v1.2.3 From 0faddfc392a62c4b5b4e68487d1835ab1aeab858 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 5 Dec 2017 18:45:19 +0100 Subject: gnu: ghc-aws: Update to 0.18. * gnu/packages/haskell.scm (ghc-aws): Update to 0.18. [inputs]: Replace ghc-cryptohash with ghc-cryptonite. --- gnu/packages/haskell.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 66ccbae7f4..4d1aabff0b 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -7985,14 +7985,14 @@ (define-public ghc-conduit-combinators (define-public ghc-aws (package (name "ghc-aws") - (version "0.17.1") + (version "0.18") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" "aws-" version "/aws-" version ".tar.gz")) (sha256 (base32 - "1q4qh58vj8447a4fl88n3nkpdc4yv293qsh02w6zvszd6ch61yh7")))) + "0h7473wkvc5xjzx5fd5k5fp70rjq5gqmn1cpy95mswvvfsq3irxj")))) (build-system haskell-build-system) (arguments `(#:tests? #f)) ; Tests require AWS credentials. (inputs @@ -8006,7 +8006,7 @@ (define-public ghc-aws ("ghc-cereal" ,ghc-cereal) ("ghc-conduit" ,ghc-conduit) ("ghc-conduit-extra" ,ghc-conduit-extra) - ("ghc-cryptohash" ,ghc-cryptohash) + ("ghc-cryptonite" ,ghc-cryptonite) ("ghc-data-default" ,ghc-data-default) ("ghc-http-conduit" ,ghc-http-conduit) ("ghc-http-types" ,ghc-http-types) -- cgit v1.2.3 From 7dc82755120717ce158ced521d1a6d278606aada Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 6 Dec 2017 01:37:11 +0100 Subject: gnu: ghc-http-client: Update to 0.5.7.1. * gnup/packages/haskell-web.scm (ghc-http-client): Update to 0.5.7.1. --- gnu/packages/haskell-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index c295477e2f..abb15db292 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -160,7 +160,7 @@ (define-public ghc-http (define-public ghc-http-client (package (name "ghc-http-client") - (version "0.5.6.1") + (version "0.5.7.1") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" @@ -168,7 +168,7 @@ (define-public ghc-http-client version ".tar.gz")) (sha256 (base32 - "1v9bdb8dkhb5g6jl9azk86ig7ia8xh9arr64n7s8r94fp0vl6c1c")))) + "19cvnnfcjj2m3pgs6ivyjs21rw9wx5ynarh6hvb27a76cscai2fy")))) (build-system haskell-build-system) ;; Tests require access to the web. (arguments `(#:tests? #f)) -- cgit v1.2.3 From 5a568e4a7ea6cab602ab00095e0319a5ceb1a09f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 6 Dec 2017 01:38:00 +0100 Subject: gnu: ghc-http-client-tls: Update to 0.3.5.1. * gnup/packages/haskell-web.scm (ghc-http-client-tls): Update to 0.3.5.1. --- gnu/packages/haskell-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index abb15db292..b64d57e557 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -201,7 +201,7 @@ (define-public ghc-http-client (define-public ghc-http-client-tls (package (name "ghc-http-client-tls") - (version "0.3.4.1") + (version "0.3.5.1") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" @@ -209,7 +209,7 @@ (define-public ghc-http-client-tls version ".tar.gz")) (sha256 (base32 - "1mbwdfn4hs8lcwml2l6xv4n068l9zlasyv6vwb2ylgm030pyv3xh")))) + "0n4mi8z77qaggfyq17z79cl304nf1f4h6gag60v4wjwghvmj7yn1")))) (build-system haskell-build-system) ;; Tests require Internet access (arguments `(#:tests? #f)) -- cgit v1.2.3 From e82152c400af8c658d922337864c0673280ef2c7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 6 Dec 2017 01:39:46 +0100 Subject: gnu: ghc-http-conduit: Update to 2.2.4. * gnup/packages/haskell-web.scm (ghc-http-conduit): Update to 2.2.4. --- gnu/packages/haskell-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index b64d57e557..e43f20b843 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -296,7 +296,7 @@ (define-public ghc-http2 (define-public ghc-http-conduit (package (name "ghc-http-conduit") - (version "2.2.3.1") + (version "2.2.4") (source (origin (method url-fetch) @@ -304,7 +304,7 @@ (define-public ghc-http-conduit "http-conduit-" version "/" "http-conduit-" version ".tar.gz")) (sha256 (base32 - "03na2nbm9la0shlijvjyb5mpp1prfskk4jmjy8iz707r0731dbjk")))) + "1wcl3lpg4v1ylq9j77j9fmf6l9qbmp8dmj3a9829q19q6bbgza7l")))) (build-system haskell-build-system) ;; FIXME: `httpLbs TLS` in test-suite `test` fails with ;; ConnectionFailure getProtocolByName: does not exist (no such protocol -- cgit v1.2.3 From e6f6d765f23d669149bb762bdff5f6302849f565 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 6 Dec 2017 01:35:54 +0100 Subject: gnu: xlockmore: Update to 5.55. * gnu/packages/xdisorg.scm (xlockmore): Update to 5.55. --- 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 4213afdc4d..22a85fb009 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -618,7 +618,7 @@ (define-public xautomation (define-public xlockmore (package (name "xlockmore") - (version "5.47") + (version "5.55") (source (origin (method url-fetch) (uri (list (string-append "http://sillycycle.com/xlock/" @@ -629,7 +629,7 @@ (define-public xlockmore name "-" version ".tar.xz"))) (sha256 (base32 - "138d79b8zc2hambbr9fnxp3fhihlcljgqns04zf0kv2f53pavqwl")))) + "1y3f76rq2nd10fgi2rx81aj6pijglmm661vjsxi05hpg35dzmwfl")))) (build-system gnu-build-system) (arguments '(#:configure-flags (list (string-append "--enable-appdefaultdir=" -- cgit v1.2.3 From 6c441efc5a554bdb6a0139d552dbb38fecbd93ba Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 6 Dec 2017 01:41:41 +0100 Subject: gnu: acpica: Use HTTPS for home page. * gnu/packages/admin.scm (acpica)[home-page]: Use HTTPS. --- gnu/packages/admin.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 7f62f30597..e97fa79ac9 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1100,7 +1100,7 @@ (define-public acpica "OPT_CFLAGS=-Wall -fno-strict-aliasing") #:tests? #f ; no 'check' target. #:phases (modify-phases %standard-phases (delete 'configure)))) - (home-page "http://acpica.org/") + (home-page "https://acpica.org/") (synopsis "Tools for the development and debug of ACPI tables") (description "The ACPI Component Architecture (@dfn{ACPICA}) project provides an -- cgit v1.2.3 From fdfdecdb7ebfd05b4ae66cc5140078dbfc10fc35 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 3 Sep 2017 01:19:38 +0200 Subject: gnu, doc, tests: Use ‘bootloader-configuration’ everywhere. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * doc/guix.texi (Proceeding with the Installation): Replace the old-style ‘grub-configuration’ with the newer ‘bootloader-configuration’ syntax. * gnu/system/examples/vm-image.tmpl: Likewise. * gnu/system/install.scm (installation-os): Likewise. * gnu/tests.scm (%simple-os): Likewise. * gnu/tests/install.scm (%minimal-os, %minimal-os-on-vda, %separate-home-os) (%separate-store-os, %raid-root-os, %encrypted-root-os, %btrfs-root-os): Likewise. * gnu/tests/nfs.scm (%base-os): Likewise. * tests/guix-system.scm (OS_BASE, make_user_config): Likewise. * tests/system.scm (%os, %os-with-mapped-device): Likewise. --- doc/guix.texi | 4 ++-- gnu/system/examples/vm-image.tmpl | 6 ++++-- gnu/system/install.scm | 5 ++++- gnu/tests.scm | 6 +++++- gnu/tests/install.scm | 29 ++++++++++++++++++++++------- gnu/tests/nfs.scm | 6 +++++- tests/guix-system.sh | 9 +++++++-- tests/system.scm | 9 +++++++-- 8 files changed, 56 insertions(+), 18 deletions(-) (limited to 'gnu') diff --git a/doc/guix.texi b/doc/guix.texi index 2267fadd1d..3c33a19dec 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -8241,8 +8241,8 @@ in particular: @itemize @item -Make sure the @code{grub-configuration} form refers to the target you -want to install GRUB on. It should mention @code{grub-bootloader} if +Make sure the @code{bootloader-configuration} form refers to the target +you want to install GRUB on. It should mention @code{grub-bootloader} if you are installing GRUB in the legacy way, or @code{grub-efi-bootloader} for newer UEFI systems. For legacy systems, the @code{target} field names a device, like @code{/dev/sda}; for UEFI systems it names a path diff --git a/gnu/system/examples/vm-image.tmpl b/gnu/system/examples/vm-image.tmpl index 056b439c5f..ce3653c8b4 100644 --- a/gnu/system/examples/vm-image.tmpl +++ b/gnu/system/examples/vm-image.tmpl @@ -26,8 +26,10 @@ partprobe, and then 2) resizing the filesystem with resize2fs.\n")) ;; Assuming /dev/sdX is the target hard disk, and "my-root" is ;; the label of the target root file system. - (bootloader (grub-configuration (target "/dev/sda") - (terminal-outputs '(console)))) + (bootloader (bootloader-configuration + (bootloader grub-bootloader) + (target "/dev/sda") + (terminal-outputs '(console)))) (file-systems (cons (file-system (device "my-root") (title 'label) diff --git a/gnu/system/install.scm b/gnu/system/install.scm index 78f2bf3a13..2e4dd05bb2 100644 --- a/gnu/system/install.scm +++ b/gnu/system/install.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2015 Mark H Weaver ;;; Copyright © 2016 Andreas Enge ;;; Copyright © 2017 Marius Bakke +;;; Copyright © 2017 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -301,7 +302,9 @@ (define installation-os (host-name "gnu") (timezone "Europe/Paris") (locale "en_US.utf8") - (bootloader (grub-configuration (target "/dev/sda"))) + (bootloader (bootloader-configuration + (bootloader grub-bootloader) + (target "/dev/sda"))) (file-systems ;; Note: the disk image build code overrides this root file system with ;; the appropriate one. diff --git a/gnu/tests.scm b/gnu/tests.scm index 97b9cc5107..0caa922fdf 100644 --- a/gnu/tests.scm +++ b/gnu/tests.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016, 2017 Ludovic Courtès ;;; Copyright © 2017 Mathieu Othacehe +;;; Copyright © 2017 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -21,6 +22,7 @@ (define-module (gnu tests) #:use-module (guix gexp) #:use-module (guix utils) #:use-module (guix records) + #:use-module (gnu bootloader) #:use-module (gnu bootloader grub) #:use-module (gnu system) #:use-module (gnu system file-systems) @@ -206,7 +208,9 @@ (define %simple-os (timezone "Europe/Berlin") (locale "en_US.UTF-8") - (bootloader (grub-configuration (target "/dev/sdX"))) + (bootloader (bootloader-configuration + (bootloader grub-bootloader) + (target "/dev/sdX"))) (file-systems (cons (file-system (device "my-root") (title 'label) diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm index 0e97de0a87..3ac4a579da 100644 --- a/gnu/tests/install.scm +++ b/gnu/tests/install.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016, 2017 Ludovic Courtès +;;; Copyright © 2017 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -60,7 +61,9 @@ (define-os-with-source (%minimal-os %minimal-os-source) (timezone "Europe/Paris") (locale "en_US.UTF-8") - (bootloader (grub-configuration (target "/dev/vdb"))) + (bootloader (bootloader-configuration + (bootloader grub-bootloader) + (target "/dev/vdb"))) (kernel-arguments '("console=ttyS0")) (file-systems (cons (file-system (device "my-root") @@ -343,7 +346,9 @@ (define-os-with-source (%minimal-os-on-vda %minimal-os-on-vda-source) (timezone "Europe/Paris") (locale "en_US.UTF-8") - (bootloader (grub-configuration (target "/dev/vda"))) + (bootloader (bootloader-configuration + (bootloader grub-bootloader) + (target "/dev/vda"))) (kernel-arguments '("console=ttyS0")) (file-systems (cons (file-system (device "my-root") @@ -418,7 +423,9 @@ (define-os-with-source (%separate-home-os %separate-home-os-source) (timezone "Europe/Paris") (locale "en_US.utf8") - (bootloader (grub-configuration (target "/dev/vdb"))) + (bootloader (bootloader-configuration + (bootloader grub-bootloader) + (target "/dev/vdb"))) (kernel-arguments '("console=ttyS0")) (file-systems (cons* (file-system (device "my-root") @@ -476,7 +483,9 @@ (define-os-with-source (%separate-store-os %separate-store-os-source) (timezone "Europe/Paris") (locale "en_US.UTF-8") - (bootloader (grub-configuration (target "/dev/vdb"))) + (bootloader (bootloader-configuration + (bootloader grub-bootloader) + (target "/dev/vdb"))) (kernel-arguments '("console=ttyS0")) (file-systems (cons* (file-system (device "root-fs") @@ -552,7 +561,9 @@ (define-os-with-source (%raid-root-os %raid-root-os-source) (timezone "Europe/Paris") (locale "en_US.utf8") - (bootloader (grub-configuration (target "/dev/vdb"))) + (bootloader (bootloader-configuration + (bootloader grub-bootloader) + (target "/dev/vdb"))) (kernel-arguments '("console=ttyS0")) (initrd (lambda (file-systems . rest) ;; Add a kernel module for RAID-0 (aka. "stripe"). @@ -635,7 +646,9 @@ (define-os-with-source (%encrypted-root-os %encrypted-root-os-source) (timezone "Europe/Paris") (locale "en_US.UTF-8") - (bootloader (grub-configuration (target "/dev/vdb"))) + (bootloader (bootloader-configuration + (bootloader grub-bootloader) + (target "/dev/vdb"))) ;; Note: Do not pass "console=ttyS0" so we can use our passphrase prompt ;; detection logic in 'enter-luks-passphrase'. @@ -762,7 +775,9 @@ (define-os-with-source (%btrfs-root-os %btrfs-root-os-source) (timezone "Europe/Paris") (locale "en_US.UTF-8") - (bootloader (grub-configuration (target "/dev/vdb"))) + (bootloader (bootloader-configuration + (bootloader grub-bootloader) + (target "/dev/vdb"))) (kernel-arguments '("console=ttyS0")) (file-systems (cons (file-system (device "my-root") diff --git a/gnu/tests/nfs.scm b/gnu/tests/nfs.scm index 889f578d01..d58cf7aefd 100644 --- a/gnu/tests/nfs.scm +++ b/gnu/tests/nfs.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2016, 2017 Ludovic Courtès ;;; Copyright © 2016 John Darrington ;;; Copyright © 2017 Mathieu Othacehe +;;; Copyright © 2017 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -20,6 +21,7 @@ (define-module (gnu tests nfs) #:use-module (gnu tests) + #:use-module (gnu bootloader) #:use-module (gnu bootloader grub) #:use-module (gnu system) #:use-module (gnu system file-systems) @@ -41,7 +43,9 @@ (define %base-os (timezone "Europe/Berlin") (locale "en_US.UTF-8") - (bootloader (grub-configuration (target "/dev/sdX"))) + (bootloader (bootloader-configuration + (bootloader grub-bootloader) + (target "/dev/sdX"))) (file-systems %base-file-systems) (users %base-user-accounts) (packages (cons* diff --git a/tests/guix-system.sh b/tests/guix-system.sh index 213864833a..ed8563c8aa 100644 --- a/tests/guix-system.sh +++ b/tests/guix-system.sh @@ -1,5 +1,6 @@ # GNU Guix --- Functional package management for GNU # Copyright © 2014, 2015, 2016, 2017 Ludovic Courtès +# Copyright © 2017 Tobias Geerinckx-Rice # # This file is part of GNU Guix. # @@ -134,7 +135,9 @@ OS_BASE=' (timezone "Europe/Paris") (locale "en_US.UTF-8") - (bootloader (grub-configuration (device "/dev/sdX"))) + (bootloader (bootloader-configuration + (bootloader grub-bootloader) + (device "/dev/sdX"))) (file-systems (cons (file-system (device "root") (title (string->symbol "label")) @@ -205,7 +208,9 @@ make_user_config () (timezone "Europe/Paris") (locale "en_US.UTF-8") - (bootloader (grub-configuration (device "/dev/sdX"))) + (bootloader (bootloader-configuration + (bootloader grub-bootloader) + (device "/dev/sdX"))) (file-systems (cons (file-system (device "root") (title 'label) diff --git a/tests/system.scm b/tests/system.scm index a661544a5f..6a7f45c59c 100644 --- a/tests/system.scm +++ b/tests/system.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 Ludovic Courtès +;;; Copyright © 2017 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -36,7 +37,9 @@ (define %os (host-name "komputilo") (timezone "Europe/Berlin") (locale "en_US.utf8") - (bootloader (grub-configuration (target "/dev/sdX"))) + (bootloader (bootloader-configuration + (bootloader grub-bootloader) + (target "/dev/sdX"))) (file-systems (cons %root-fs %base-file-systems)) (users %base-user-accounts))) @@ -51,7 +54,9 @@ (define %os-with-mapped-device (host-name "komputilo") (timezone "Europe/Berlin") (locale "en_US.utf8") - (bootloader (grub-configuration (target "/dev/sdX"))) + (bootloader (bootloader-configuration + (bootloader grub-bootloader) + (target "/dev/sdX"))) (mapped-devices (list %luks-device)) (file-systems (cons (file-system (inherit %root-fs) -- cgit v1.2.3 From ceffa180a208868fe3d55e822f368a81ac14027b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 6 Dec 2017 16:07:39 +0100 Subject: gnu: zynaddsubfx: Update to 3.0.3. * gnu/packages/music.scm (zynaddsubfx): Update to 3.0.3. --- gnu/packages/music.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 479b4f9b2d..afb91e4e58 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1811,7 +1811,7 @@ (define-public drumstick (define-public zynaddsubfx (package (name "zynaddsubfx") - (version "3.0.2") + (version "3.0.3") (source (origin (method url-fetch) (uri (string-append @@ -1819,7 +1819,7 @@ (define-public zynaddsubfx version "/zynaddsubfx-" version ".tar.bz2")) (sha256 (base32 - "09mr23lqc51r7gskry5b7hk84pghdpgn1s4vnrzvx7xpa21gvplm")))) + "1hfpiqdm337gl4ynkmmp2qss2m5z8mzqzjrbiyg6w1v4js7l9phi")))) (build-system cmake-build-system) (arguments `(#:phases -- cgit v1.2.3 From bb6693b86b591b0403d5e8daadf96d0ff036b2ef Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 6 Dec 2017 16:07:55 +0100 Subject: gnu: qtractor: Update to 0.8.5. * gnu/packages/music.scm (qtractor): Update to 0.8.5. --- gnu/packages/music.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index afb91e4e58..1aabe814be 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2004,14 +2004,14 @@ (define-public cursynth (define-public qtractor (package (name "qtractor") - (version "0.8.4") + (version "0.8.5") (source (origin (method url-fetch) (uri (string-append "http://downloads.sourceforge.net/qtractor/" "qtractor-" version ".tar.gz")) (sha256 (base32 - "17bbjfn94843g5q1h7xh23fwyazpfgg4fw6drrn5wgk2vx7qpkis")))) + "0anhsd3gg8cxbf31mn2mimf19ycbbxqvd7ldizk93yq2zfbzzqqa")))) (build-system gnu-build-system) (arguments `(#:tests? #f)) ; no "check" target (inputs -- cgit v1.2.3 From 128890f71d043e3b7dbe9a27c5ab1e24ca1e604d Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 6 Dec 2017 12:44:54 -0500 Subject: gnu: go-github-com-syndtr-goleveldb: Update to 0.0.0-1.549b6d6. * gnu/packages/syncthing.scm (go-github-com-syndtr-goleveldb): Update to 0.0.0-1.549b6d6. --- gnu/packages/syncthing.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index 615247f48d..e6ee4e9c2f 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -711,8 +711,8 @@ (define-public go-github-com-sasha-s-go-deadlock (license asl2.0)))) (define-public go-github-com-syndtr-goleveldb - (let ((commit "3c5717caf1475fd25964109a0fc640bd150fce43") - (revision "0")) + (let ((commit "549b6d6b1c0419617182954dd77770f2e2685ed5") + (revision "1")) (package (name "go-github-com-syndtr-goleveldb") (version (git-version "0.0.0" revision commit)) @@ -724,7 +724,7 @@ (define-public go-github-com-syndtr-goleveldb (file-name (git-file-name name version)) (sha256 (base32 - "0wng25bw885ppiny9rz42kq0a7ddkym5zl0glb8rfk0m8dpvi1dd")))) + "1hs8bsxyjfq9d7000i1jk8bq7p2ab8snz23air13aw5ra2ri36bq")))) (build-system go-build-system) (propagated-inputs `(("go-github-com-golang-snappy" ,go-github-com-golang-snappy))) -- cgit v1.2.3 From fc6f1ce9141ab25ca3026c2f2503f1ced7e0a547 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 6 Dec 2017 12:47:15 -0500 Subject: gnu: go-github-com-audriusbutkevicius-pfilter: Update to 0.0.0-1.56143fe. * gnu/packages/syncthing.scm (go-github-com-audriusbutkevicius-pfilter): Update to 0.0.0-1.56143fe. --- gnu/packages/syncthing.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index e6ee4e9c2f..b7c8ee952d 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -1506,8 +1506,8 @@ (define-public go-golang-org-x-text-unicode-norm (license bsd-3)))) (define-public go-github-com-audriusbutkevicius-pfilter - (let ((commit "09b3cfdd04de89f0196caecb0b335d7149a6593a") - (revision "0")) + (let ((commit "56143fe9cebe95636de1275acf30fcca36a1383d") + (revision "1")) (package (name "go-github-com-audriusbutkevicius-pfilter") (version (git-version "0.0.0" revision commit)) @@ -1520,7 +1520,7 @@ (define-public go-github-com-audriusbutkevicius-pfilter (file-name (git-file-name name version)) (sha256 (base32 - "176g8dmi2i94bxpnpgvj3dv5y9hripi45kbrfvy2bk884hwbp1zq")))) + "0slzly2f2fczixavzh6wa69873va29ikxww4lbkvhyi85c4sc5ib")))) (build-system go-build-system) (arguments '(#:import-path "github.com/AudriusButkevicius/pfilter")) -- cgit v1.2.3 From 7bcfb590a6d25fb4f675f0ab5cf743d6454729a8 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 6 Dec 2017 12:48:37 -0500 Subject: gnu: syncthing: Update to 0.14.41. * gnu/packages/syncthing.scm (syncthing): Update to 0.14.41. --- gnu/packages/syncthing.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index b7c8ee952d..170272222d 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -28,7 +28,7 @@ (define-module (gnu packages syncthing) (define-public syncthing (package (name "syncthing") - (version "0.14.40") + (version "0.14.41") (source (origin (method url-fetch) (uri (string-append "https://github.com/syncthing/syncthing" @@ -36,7 +36,7 @@ (define-public syncthing "/syncthing-source-v" version ".tar.gz")) (sha256 (base32 - "044pjz3x3fgpbsbkzgf72ljpwvvsqfj8fm9cnz7l8293cw2ssq4f")))) + "1liarl09grcb0mlw20nlrmir2glxqlykv4l0z0f0gj2w1wk3qz8a")))) (build-system go-build-system) ;; The primary Syncthing executable goes to "out", while the auxiliary ;; server programs and utility tools go to "utils". This reduces the size -- cgit v1.2.3 From 0d9824cc127f045d32c22d0c75df46d97cb61624 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 6 Dec 2017 19:12:16 +0100 Subject: gnu: bedtools: Update to 2.27.0. * gnu/packages/bioinformatics.scm (bedtools): Update to 2.27.0. [arguments]: Remove custom "install" phase; specify prefix. --- gnu/packages/bioinformatics.scm | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index f0b589b6c0..fedc8aec4c 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -421,31 +421,27 @@ (define-public bedops (define-public bedtools (package (name "bedtools") - (version "2.26.0") + (version "2.27.0") (source (origin (method url-fetch) - (uri (string-append "https://github.com/arq5x/bedtools2/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (uri (string-append "https://github.com/arq5x/bedtools2/releases/" + "download/v" version "/" + "bedtools-" version ".tar.gz")) (sha256 (base32 - "0xvri5hnp2iim1cx6mcd5d9f102p5ql41x69rd6106x1c17pinqm")))) + "0q6fsiz4s52yzxs6h2vxwq95fsi3n64wkpinkk05mfh4dmhybw74")))) (build-system gnu-build-system) - (native-inputs `(("python" ,python-2))) - (inputs `(("samtools" ,samtools) - ("zlib" ,zlib))) (arguments '(#:test-target "test" + #:make-flags + (list (string-append "prefix=" (assoc-ref %outputs "out"))) #:phases (modify-phases %standard-phases - (delete 'configure) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let ((bin (string-append (assoc-ref outputs "out") "/bin/"))) - (for-each (lambda (file) - (install-file file bin)) - (find-files "bin" ".*"))) - #t))))) + (delete 'configure)))) + (native-inputs `(("python" ,python-2))) + (inputs + `(("samtools" ,samtools) + ("zlib" ,zlib))) (home-page "https://github.com/arq5x/bedtools2") (synopsis "Tools for genome analysis and arithmetic") (description -- cgit v1.2.3 From 0e1a3e7a1ebc6660fe0e69a06df4a38cb851c3de Mon Sep 17 00:00:00 2001 From: ng0 Date: Wed, 6 Dec 2017 17:23:51 +0000 Subject: gnu: gnurl: Update to 7.57.0. * gnu/packages/gnunet.scm (gnurl): Update to 7.57.0. Signed-off-by: Leo Famulari --- gnu/packages/gnunet.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index 91e2e3f245..bf0274aa9c 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -185,14 +185,14 @@ (define-public libmicrohttpd (define-public gnurl (package (name "gnurl") - (version "7.56.1-2") + (version "7.57.0") (source (origin (method url-fetch) (uri (string-append "https://gnunet.org/sites/default/files/" name "-" version ".tar.bz2")) (sha256 (base32 - "092lpwjdg0z5bbf6i331ydm49qy05xrb3vagggmpi8pl7v3zv88j")))) + "1dykh12mc241jnxcd8q5pm1yw9ras53ywyba9f9dy5cq39j2mk9c")))) (build-system gnu-build-system) (outputs '("out" "doc")) ; 1.5 MiB of man3 pages -- cgit v1.2.3 From 6a7e81c8a2f7af98ccf5c99f1edeb25cc0890eef Mon Sep 17 00:00:00 2001 From: Theodoros Foradis Date: Mon, 4 Dec 2017 12:02:46 +0200 Subject: gnu: kicad: Install libraries to PREFIX/lib, not PREFIX/lib64. * gnu/packages/engineering.scm (kicad)[arguments]: : Remove install-lib-3d. : Add "-DCMAKE_INSTALL_LIBDIR". --- gnu/packages/engineering.scm | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 5c36de1dd2..77b1386b53 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -693,6 +693,8 @@ (define-public kicad (string-take commit 7)) "-DCMAKE_BUILD_TYPE=Release" "-DKICAD_SKIP_BOOST=ON"; Use our system's boost library. + (string-append "-DCMAKE_INSTALL_LIBDIR=" + (assoc-ref %outputs "out") "/lib") "-DKICAD_SCRIPTING=ON" "-DKICAD_SCRIPTING_MODULES=ON" "-DKICAD_SCRIPTING_WXPYTHON=ON" @@ -721,14 +723,6 @@ (define-public kicad `("PYTHONPATH" ":" prefix (,path)) `("PATH" ":" prefix (,(string-append python "/bin:"))))) - #t)) - (add-after 'wrap-program 'install-lib-3d - (lambda* (#:key inputs outputs #:allow-other-keys) - (for-each - (lambda (file) - (install-file file (string-append (assoc-ref outputs "out") - "/lib"))) - (find-files "." "^libkicad_3dsg.*")) #t))))) (native-inputs `(("boost" ,boost) -- cgit v1.2.3 From 65eaab635bd730a03b2dd44227b1bd998ae01de3 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Wed, 6 Dec 2017 12:09:54 +0100 Subject: gnu: qtox: Build with the latest FFmpeg. * gnu/packages/messaging.scm (qtox)[inputs]: Change ffmpeg-3.3 to ffmpeg. Signed-off-by: Leo Famulari --- gnu/packages/messaging.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index b6452c54c3..9525c9f5d1 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -875,7 +875,7 @@ (define-public qtox (("TIMESTAMP") "\"\"")) #t))))) (inputs - `(("ffmpeg" ,ffmpeg-3.3) + `(("ffmpeg" ,ffmpeg) ("filteraudio", filteraudio) ("glib" ,glib) ("gtk+" ,gtk+-2) -- cgit v1.2.3 From 537fe4568f4d7a90ab350a66cadfdf38c893bbee Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sat, 2 Dec 2017 19:43:08 -0500 Subject: gnu: windowmaker: Add '.desktop' file. * gnu/packages/gnustep.scm (windowmaker)[arguments]: Add 'install-xsession' phase. Add (guix build build-system), (guix build utils) and (ice-9 match) to #:modules. --- gnu/packages/gnustep.scm | 33 ++++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gnustep.scm b/gnu/packages/gnustep.scm index 195249c435..a6adc697a0 100644 --- a/gnu/packages/gnustep.scm +++ b/gnu/packages/gnustep.scm @@ -34,7 +34,8 @@ (define-module (gnu packages gnustep) #:use-module (gnu packages fontutils) #:use-module (gnu packages image) #:use-module (gnu packages pkg-config) - #:use-module (gnu packages xml)) + #:use-module (gnu packages xml) + #:use-module (ice-9 match)) (define-public gnustep-make (package @@ -65,6 +66,7 @@ (define-public windowmaker (package (name "windowmaker") (version "0.95.8") + (synopsis "NeXTSTEP-like window manager") (source (origin (method url-fetch) (uri (string-append @@ -75,7 +77,10 @@ (define-public windowmaker "12p8kljqgx5hnic0zvs5mxwp7kg21sb6qjagb2qw8ydvf5amrgwx")))) (build-system gnu-build-system) (arguments - '(#:phases + `(#:modules ((guix build gnu-build-system) + (guix build utils) + (ice-9 match)) + #:phases (modify-phases %standard-phases (add-before 'configure 'pre-configure (lambda* (#:key outputs #:allow-other-keys) @@ -97,14 +102,33 @@ (define-public windowmaker (substitute* "src/defaults.c" (("len = strlen\\(text\\) \\+ 40;") (string-append "len = strlen(text) + 107;")))))) - (add-after 'install 'wrap + (add-after 'install 'install-xsession + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (xsessions (string-append out "/share/xsessions"))) + (mkdir-p xsessions) + (call-with-output-file + (string-append xsessions "/windowmaker.desktop") + (lambda (port) + (format port "~ + [Desktop Entry]~@ + Name=Window Maker~@ + Comment=~a~@ + Exec=~a/bin/wmaker~@ + Type=Application~%" + (string-map (match-lambda + (#\newline #\space) + (chr chr)) + ,synopsis) %output)))) + #t)) + (add-after 'install-xsession 'wrap (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (bin (string-append out "/bin"))) ;; In turn, 'wmaker.inst' wants to invoke 'wmmenugen' ;; etc., so make sure everything is in $PATH. (wrap-program (string-append bin "/wmaker.inst") - `("PATH" ":" prefix (,bin))))))))) + `("PATH" ":" prefix (,bin))))))))) (inputs `(("libxmu" ,libxmu) ("libxft" ,libxft) @@ -117,7 +141,6 @@ (define-public windowmaker (native-inputs `(("pkg-config" ,pkg-config))) (home-page "http://windowmaker.org/") - (synopsis "NeXTSTEP-like window manager") (description "Window Maker is an X11 window manager originally designed to provide integration support for the GNUstep Desktop Environment. In every way -- cgit v1.2.3 From 0b7e437f98d77221fae57f11cac374abd8d9bdb9 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 6 Dec 2017 18:05:23 -0500 Subject: gnu: linux-libre@4.4: Update to 4.4.104. * gnu/packages/linux.scm (linux-libre-4.4): Update to 4.4.104. --- 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 995864f33e..0ce96f33a5 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -389,8 +389,8 @@ (define-public linux-libre-4.9 #:configuration-file kernel-config)) (define-public linux-libre-4.4 - (make-linux-libre "4.4.103" - "1x2pyrjz8myja77nz0zg2k74yrcbiq7g1caqjnafbgc8qwh31fp8" + (make-linux-libre "4.4.104" + "1971hphyqbzh80frkbidbqwhgk21r5p2a42bihjcd5kh3pssn4zl" %intel-compatible-systems #:configuration-file kernel-config)) -- cgit v1.2.3 From a748df480bddadb3486fb10f5aaefb88484851c6 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 6 Dec 2017 18:06:01 -0500 Subject: gnu: linux-libre@4.9: Update to 4.9.67. * gnu/packages/linux.scm (linux-libre-4.9): Update to 4.9.67. --- 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 0ce96f33a5..8e8d41a318 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -383,8 +383,8 @@ (define-public linux-libre #:configuration-file kernel-config)) (define-public linux-libre-4.9 - (make-linux-libre "4.9.66" - "0k29i5wnljck4nwkzcjxjfzrddwifj2pb6zxqh7f522j9cw2g4zd" + (make-linux-libre "4.9.67" + "1fr8h4g3j4ns0x33i36kgsgb175cdz9v530gx8sxcrbkd10i9i07" %intel-compatible-systems #:configuration-file kernel-config)) -- cgit v1.2.3 From 3c947fcc1bd7ce73f22d129004ad4c033390e8f4 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 6 Dec 2017 18:06:33 -0500 Subject: gnu: linux-libre: Update to 4.14.4. * gnu/packages/linux.scm (%linux-libre-version): Update to 4.14.4. (%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 8e8d41a318..28954b5ab6 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -369,8 +369,8 @@ (define* (make-linux-libre version hash supported-systems (define %intel-compatible-systems '("x86_64-linux" "i686-linux")) (define %linux-compatible-systems '("x86_64-linux" "i686-linux" "armhf-linux")) -(define %linux-libre-version "4.14.3") -(define %linux-libre-hash "1hs94lj2bryci4m75bfrhhj9aqrjpq6a57nhxic63zj6xjhi53l7") +(define %linux-libre-version "4.14.4") +(define %linux-libre-hash "1hl4n1jpqd05b7qnxbwjmbl2l5cgrh2spqsjq1fnihphmawjd3li") ;; linux-libre configuration for armhf-linux is derived from Debian armmp. It ;; supports qemu "virt" machine and possibly a large number of ARM boards. -- cgit v1.2.3 From 6e7d8419421ea660afe58722e76a1060ec61ec13 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 6 Dec 2017 15:11:59 -0500 Subject: gnu: icedtea@2: Update to 2.6.12 [security fixes]. Fixes CVE-2016-{9840,9841,9842,9843,10165} and CVE-2017-{10193,10198,10274, 10281,10285,10294,10345,10346,10347,10348,10349,10350,10355,10356,10357,10388}. * gnu/packages/java.scm (icedtea-7): Update to 2.6.12. --- gnu/packages/java.scm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index c9fbbb0a45..0be488dec3 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1070,7 +1070,7 @@ (define-public icedtea-6 (license license:gpl2+))) (define-public icedtea-7 - (let* ((version "2.6.11") + (let* ((version "2.6.12") (drop (lambda (name hash) (origin (method url-fetch) @@ -1088,7 +1088,7 @@ (define-public icedtea-7 version ".tar.xz")) (sha256 (base32 - "1ibp6ybqnf8g7mbs45bkbv44dwz4h2w9gr4rh15yvr1m8lqkq1i0")) + "0s0zh0mj1sab99kb516lsgq3859vsc951phc565gwix4l5g9zppk")) (modules '((guix build utils))) (snippet '(substitute* "Makefile.in" @@ -1498,25 +1498,25 @@ (define (import-cert cert) (native-inputs `(("openjdk-src" ,(drop "openjdk" - "1zhr4l9kxnbzghcsgjk3vmih9qpg1wrr9qry7fx04l97svp1ylhd")) + "15qf3nfidgnigh2zny6djfp8bhfwjnwk9i06mxs2jbq6na953ql2")) ("corba-drop" ,(drop "corba" - "108v15ncb2rnsyzgzncjlm1f57d1sv60zd9qbpas8kqmvpp8r0gz")) + "1phvn8fyl5mw2n2sn97f17nm442k75xsz2023bfw4h66ywzkqhqy")) ("jaxp-drop" ,(drop "jaxp" - "0zcpcmm3g1s7m31glrbw3ys7azi97ixcvbyxd40y9xzdja3jyr52")) + "0j4ms6lmnfa2cwfh9yfqdfg1bnn3fc40ay4x6k8zqa8yvspik5w5")) ("jaxws-drop" ,(drop "jaxws" - "1gkqm0p3sr8d0xpki3fhf7cvmgqxx8ambgl5f3jx2plfnhsg96d2")) + "09sddj73k7n29s39hvdk14r130mvlknbxkpd2w58f34sq5sgpdrg")) ("jdk-drop" ,(drop "jdk" - "1d9fjnzdx4m6gwkvmj2n097ag0mvkhm3lldaxjki8x8c6a5clknf")) + "0q896zz8wyswmksy225q1k27nz3v3l27052dcvvpv20ryykz8yp7")) ("langtools-drop" ,(drop "langtools" - "0zscdp9arcq7gr8j7jq4m75gq0w1i3ryxpdnrc8fl0msh4w2s2k5")) + "0niicyfccim4a9is4akh87jd7wbl8jrazdaab957mcv9l1x3bnqc")) ("hotspot-drop" ,(drop "hotspot" - "1y6vnssn5y50x27g4ypdb5wwpmi7zf7jdi8gqbymkwf6n8p5y1d6")) + "1jw42qhbm3wfavk39304m53lmqipcllrvjqiab2f42mjs10i8gfx")) ("ant" ,ant-bootstrap) ("attr" ,attr) ("coreutils" ,coreutils) -- cgit v1.2.3 From 84a0008ae75b6783f11ae183cd33dd41631a3591 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 6 Dec 2017 21:24:36 +0100 Subject: gnu: perl-dbi: Update to 1.637. * gnu/packages/databases.scm (perl-dbi): Update to 1.637 --- 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 56749320b3..98882b94ad 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1022,7 +1022,7 @@ (define-public tdb (define-public perl-dbi (package (name "perl-dbi") - (version "1.636") + (version "1.637") (source (origin (method url-fetch) (uri (string-append @@ -1030,7 +1030,7 @@ (define-public perl-dbi version ".tar.gz")) (sha256 (base32 - "0v37vnr5p0bx396cj0lb5kb69jbryq2mspp602hbgd04gklxqzcg")))) + "1ikbsb6sb0bd2m1dqknl4vx7ikmnd41y0xq8np1l40g8jcjp2mr5")))) (build-system perl-build-system) (synopsis "Database independent interface for Perl") (description "This package provides an database interface for Perl.") -- cgit v1.2.3 From b2b995622a7385cd13f618ff63a1b4ba21d19478 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 6 Dec 2017 21:28:14 +0100 Subject: gnu: perl-dbix-class-schema-loader: Update to 0.07047. * gnu/packages/databases.scm (perl-dbix-class-schema-loader): Update to 0.07047 --- 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 98882b94ad..fde7f76290 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1148,7 +1148,7 @@ (define-public perl-dbix-class-introspectablem2m (define-public perl-dbix-class-schema-loader (package (name "perl-dbix-class-schema-loader") - (version "0.07046") + (version "0.07047") (source (origin (method url-fetch) @@ -1156,7 +1156,7 @@ (define-public perl-dbix-class-schema-loader "DBIx-Class-Schema-Loader-" version ".tar.gz")) (sha256 (base32 - "08cgn0dx42y9xsxas9np7s55a7qmy4kf6sfmx0jmk4hryvbapml3")))) + "06s2q6xj95600sdlfph57spjk2z1gjs4zwq5b7mz7d5izcxgnwb6")))) (build-system perl-build-system) (native-inputs `(("perl-config-any" ,perl-config-any) -- cgit v1.2.3 From 47b059197db38ab20b7a40d9d47d8655d9ad8b72 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 6 Dec 2017 21:29:32 +0100 Subject: gnu: perl-sql-abstract: Update to 1.84. * gnu/packages/databases.scm (perl-sql-abstract): Update to 1.84 --- 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 fde7f76290..c9c22b2673 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1276,7 +1276,7 @@ (define-public perl-dbd-sqlite (define-public perl-sql-abstract (package (name "perl-sql-abstract") - (version "1.81") + (version "1.84") (source (origin (method url-fetch) @@ -1284,7 +1284,7 @@ (define-public perl-sql-abstract "SQL-Abstract-" version ".tar.gz")) (sha256 (base32 - "17sgwq3mvqjhv3b77cnvrq60xgp8harjhlnvpwmxc914rqc5ckaz")))) + "0xayvgv6nic61jm3nhg41rzwgm8h83wfyazvpaks0z7asjillpv5")))) (build-system perl-build-system) (native-inputs `(("perl-module-install" ,perl-module-install) -- cgit v1.2.3 From b10ac215112e7caa9e403c4fc3cdfb480db5bffd Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 6 Dec 2017 21:33:18 +0100 Subject: gnu: perl-dbd-pg: Update to 3.7.0. * gnu/packages/databases.scm (perl-dbd-pg): Update to 3.7.0 --- 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 c9c22b2673..4bd36c4c6f 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1204,7 +1204,7 @@ (define-public perl-dbix-class-schema-loader (define-public perl-dbd-pg (package (name "perl-dbd-pg") - (version "3.5.3") + (version "3.7.0") (source (origin (method url-fetch) @@ -1212,7 +1212,7 @@ (define-public perl-dbd-pg "DBD-Pg-" version ".tar.gz")) (sha256 (base32 - "03m9w1cd0yyrbqwkwcl92j1cpmasmm69f3hwvcrlfsi5fnwsk63y")))) + "0nb4wmkhq1q9f4g42sxy1m3d0xjqd3plqkxpmzni43ygr5ch8vp3")))) (build-system perl-build-system) (native-inputs `(("perl-dbi" ,perl-dbi))) -- cgit v1.2.3 From 5f83ccbdee489f185eea5989f2731e8ae3419696 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 6 Dec 2017 22:09:53 +0100 Subject: gnu: ghc-tasty-golden: Update to 2.3.1.1. * gnu/packages/haskell-check.scm (ghc-tasty-golden): Update to 2.3.1.1 --- gnu/packages/haskell-check.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm index 871e0b9790..2d72a04233 100644 --- a/gnu/packages/haskell-check.scm +++ b/gnu/packages/haskell-check.scm @@ -122,7 +122,7 @@ (define-public ghc-tasty-quickcheck (define-public ghc-tasty-golden (package (name "ghc-tasty-golden") - (version "2.3.0.2") + (version "2.3.1.1") (source (origin (method url-fetch) @@ -132,7 +132,7 @@ (define-public ghc-tasty-golden ".tar.gz")) (sha256 (base32 - "0n7nll1sx75n3lffwhgnjrxdn0jz1g0921z9mj193fxqw0wz8axh")))) + "0pcf5hsyp5mmbqn7krdm49jxpkjm6rb4j83j28f76h7q55dzm1wy")))) (build-system haskell-build-system) (inputs `(("ghc-temporary" ,ghc-temporary) -- cgit v1.2.3 From 49b9c8005c6d46ebb19b6f3e80014558a5e7d431 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 7 Dec 2017 00:33:08 +0100 Subject: gnu: ghc-tasty-golden: Mark up description. * gnu/packages/haskell-check.scm (ghc-tasty-golden)[description]: Use @dfn. --- gnu/packages/haskell-check.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm index 2d72a04233..28ed00db03 100644 --- a/gnu/packages/haskell-check.scm +++ b/gnu/packages/haskell-check.scm @@ -147,10 +147,10 @@ (define-public ghc-tasty-golden "https://github.com/feuerbach/tasty-golden") (synopsis "Golden tests support for tasty") (description - "This package provides support for 'golden testing'. A golden test is an -IO action that writes its result to a file. To pass the test, this output -file should be identical to the corresponding 'golden' file, which contains -the correct result for the test.") + "This package provides support for 'golden testing'. A @dfn{golden test} +is an IO action that writes its result to a file. To pass the test, this +output file should be identical to the corresponding 'golden' file, which +contains the correct result for the test.") (license license:expat))) ;; This package builds `clock` without tests, since the tests rely on tasty -- cgit v1.2.3 From 08bb5bbbca3ae0ed9234387d4fbc5b5a425cce5f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 6 Dec 2017 22:47:19 +0100 Subject: gnu: ghc-test-framework-hunit: Update to 0.3.0.2. * gnu/packages/haskell-check.scm (ghc-test-framework-hunit): Update to 0.3.0.2 --- gnu/packages/haskell-check.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm index 28ed00db03..9f90b25602 100644 --- a/gnu/packages/haskell-check.scm +++ b/gnu/packages/haskell-check.scm @@ -455,7 +455,7 @@ (define-public ghc-test-framework (define-public ghc-test-framework-hunit (package (name "ghc-test-framework-hunit") - (version "0.3.0.1") + (version "0.3.0.2") (source (origin (method url-fetch) @@ -464,7 +464,7 @@ (define-public ghc-test-framework-hunit version ".tar.gz")) (sha256 (base32 - "1h0h55kf6ff25nbfx1mhliwyknc0glwv3zi78wpzllbjbs7gvyfk")))) + "1y0b6vg8nfm43v90lxxcydhi6qlxhfy4vpxbzm5ic2w55bh8xjwm")))) (build-system haskell-build-system) (inputs `(("ghc-extensible-exceptions" ,ghc-extensible-exceptions) -- cgit v1.2.3 From f3ec98660ddc27d67f020a0c211ee2034da9d719 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 6 Dec 2017 23:32:30 +0100 Subject: gnu: ghc-tasty-smallcheck: Update to 0.8.1. * gnu/packages/haskell-check.scm (ghc-tasty-smallcheck): Update to 0.8.1 --- gnu/packages/haskell-check.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm index 9f90b25602..9828e218fc 100644 --- a/gnu/packages/haskell-check.scm +++ b/gnu/packages/haskell-check.scm @@ -68,7 +68,7 @@ (define-public ghc-tasty-ant-xml (define-public ghc-tasty-smallcheck (package (name "ghc-tasty-smallcheck") - (version "0.8.0.1") + (version "0.8.1") (source (origin (method url-fetch) @@ -78,7 +78,7 @@ (define-public ghc-tasty-smallcheck ".tar.gz")) (sha256 (base32 - "0yckfbz8na8ccyw2911i3a4hd3fdncclk3ng5343hs5cylw6y4sm")))) + "1n66ngzllf3xrlqykwszlkwsi96n5nkm7xbpfq7774vpvfnafjri")))) (build-system haskell-build-system) (inputs `(("ghc-tasty" ,ghc-tasty) -- cgit v1.2.3 From 1fd90622ffd1fe719dd39f217bfb555bd2b05bb0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 7 Dec 2017 00:26:52 +0100 Subject: gnu: ghc-tasty-smallcheck: Use HTTPS for home page. * gnu/packages/haskell-check.scm (ghc-tasty-smallcheck)[home-page]: Use HTTPS. --- gnu/packages/haskell-check.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm index 9828e218fc..27649fda68 100644 --- a/gnu/packages/haskell-check.scm +++ b/gnu/packages/haskell-check.scm @@ -85,7 +85,7 @@ (define-public ghc-tasty-smallcheck ("ghc-smallcheck" ,ghc-smallcheck) ("ghc-async" ,ghc-async) ("ghc-tagged" ,ghc-tagged))) - (home-page "http://documentup.com/feuerbach/tasty") + (home-page "https://documentup.com/feuerbach/tasty") (synopsis "SmallCheck support for the Tasty test framework") (description "This package provides SmallCheck support for the Tasty Haskell test framework.") -- cgit v1.2.3 From 0e9f42496b7da803e994199c1087e5fbfe5ea5e6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 7 Dec 2017 00:00:48 +0100 Subject: gnu: ghc-tasty-rerun: Update to 1.1.8. * gnu/packages/haskell-check.scm (ghc-tasty-rerun): Update to 1.1.8 --- gnu/packages/haskell-check.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm index 27649fda68..3536d9579e 100644 --- a/gnu/packages/haskell-check.scm +++ b/gnu/packages/haskell-check.scm @@ -284,7 +284,7 @@ (define-public ghc-tasty-th (define-public ghc-tasty-rerun (package (name "ghc-tasty-rerun") - (version "1.1.7") + (version "1.1.8") (source (origin (method url-fetch) (uri (string-append @@ -292,7 +292,7 @@ (define-public ghc-tasty-rerun "tasty-rerun-" version ".tar.gz")) (sha256 (base32 - "18hz1xqinf59mzvd68ygj9333v0a32qxfcas7crn4iniq5zv71kj")))) + "0yg8cicfn3qaazvp4rbanzy3dyk95k3y1kkd4bykvkl9v4076788")))) (build-system haskell-build-system) (inputs `(("ghc-mtl" ,ghc-mtl) -- cgit v1.2.3 From bb0e9ca4d9600197f80100b802671f775b38226a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 7 Dec 2017 00:58:04 +0100 Subject: gnu: ghc-quickcheck-io: Update to 0.2.0. * gnu/packages/haskell-check.scm (ghc-quickcheck-io): Update to 0.2.0 --- gnu/packages/haskell-check.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm index 3536d9579e..6bcf6c9589 100644 --- a/gnu/packages/haskell-check.scm +++ b/gnu/packages/haskell-check.scm @@ -366,7 +366,7 @@ (define-public ghc-quickcheck-unicode (define-public ghc-quickcheck-io (package (name "ghc-quickcheck-io") - (version "0.1.2") + (version "0.2.0") (source (origin (method url-fetch) @@ -376,7 +376,7 @@ (define-public ghc-quickcheck-io ".tar.gz")) (sha256 (base32 - "1kf1kfw9fsmly0rvzvdf6jvdw10qhkmikyj0wcwciw6wad95w9sh")))) + "08k4v7pkgjf30pv5j2dfv1gqv6hclxlniyq2sps8zq4zswcr2xzv")))) (build-system haskell-build-system) (inputs `(("ghc-quickcheck" ,ghc-quickcheck) -- cgit v1.2.3 From 3f148fc8068225771e3e6834951615148606a01f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 7 Dec 2017 04:00:13 +0100 Subject: gnu: libcue: Update to 2.2.0. * gnu/packages/cdrom.scm (libcue): Update to 2.2.0 --- gnu/packages/cdrom.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm index ddc035c1b0..523158d553 100644 --- a/gnu/packages/cdrom.scm +++ b/gnu/packages/cdrom.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2016 Marius Bakke ;;; Copyright © 2017 John Darrington ;;; Copyright © 2017 Thomas Danckaert +;;; Copyright © 2017 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -413,7 +414,7 @@ (define-public dvdstyler (define-public libcue (package (name "libcue") - (version "2.1.0") + (version "2.2.0") (source (origin (method url-fetch) (uri (string-append @@ -422,7 +423,7 @@ (define-public libcue (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1fradl3dx0pyy9rn1a0gak9gzgg40wax61f2s00zks7rwl0xv398")))) + "0y9808vbly1w6i3diaad9csjmmw6iaw572wjjr68ssqamsw193rj")))) (build-system cmake-build-system) (native-inputs `(("bison" ,bison) -- cgit v1.2.3 From b6b5a3db4332922821b555b93584155a619a867e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 7 Dec 2017 06:02:56 +0100 Subject: gnu: cmst: Update to 2017.09.19. * gnu/packages/connman.scm (cmst): Update to 2017.09.19. --- gnu/packages/connman.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/connman.scm b/gnu/packages/connman.scm index a2a5556fb8..25756019fd 100644 --- a/gnu/packages/connman.scm +++ b/gnu/packages/connman.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2017 Mathieu Othacehe ;;; Copyright © 2017 Clément Lassieur ;;; Copyright © 2017 Ricardo Wurmus +;;; Copyright © 2017 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -139,15 +140,15 @@ (define-public econnman (define-public cmst (package (name "cmst") - (version "2017.03.18") + (version "2017.09.19") (source (origin (method url-fetch) (uri (string-append "https://github.com/andrew-bibb/cmst/releases/download/cmst-" - version "/cmst-" version ".tar.gz")) + version "/cmst-" version ".tar.xz")) (sha256 - (base32 "16g9byxr1rkmrnzi6sjplpmkr8h6pqj7418jz30czqviw5qlkqwl")))) + (base32 "0dh4639n3l8a19svaagib41hdq5q7x70bnc28dmnwy4jflf38yrm")))) (inputs `(("qtbase" ,qtbase))) (native-inputs -- cgit v1.2.3 From e6d7686f9ae4057bad48d97a1917e64b3580477c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 7 Dec 2017 05:58:11 +0100 Subject: gnu: python2-defcon: Update to 0.3.5. * gnu/packages/fontutils.scm (python2-defcon): Update to 0.3.5 --- gnu/packages/fontutils.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index d2306a9423..9e672a419c 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2017 Rene Saavedra ;;; Copyright © 2017 Leo Famulari ;;; Copyright © 2017 ng0 +;;; Copyright © 2017 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -589,14 +590,14 @@ (define-public python2-ufolib (define-public python2-defcon (package (name "python2-defcon") - (version "0.3.4") + (version "0.3.5") (source (origin (method url-fetch) (uri (pypi-uri "defcon" version ".zip")) (sha256 (base32 - "1f41w54fdjy9izxcwzqa142kd56whqsg9nq5k4508jb6iip84h89")))) + "03jlm2gy9lvbwj68kfdm43yaddwd634jwkdg4wf0jxx2s8mwbg22")))) (build-system python-build-system) (arguments `(#:python ,python-2)) -- cgit v1.2.3 From a82bb552184c9c4dcece9b21d2ed2ccf9df709ae Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 7 Dec 2017 05:57:32 +0100 Subject: gnu: python2-ufolib: Update to 2.1.1. * gnu/packages/fontutils.scm (python2-ufolib): Update to 2.1.1 --- gnu/packages/fontutils.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index 9e672a419c..f20eb45f18 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -564,13 +564,13 @@ (define-public fontforge (define-public python2-ufolib (package (name "python2-ufolib") - (version "2.1.0") + (version "2.1.1") (source (origin (method url-fetch) (uri (pypi-uri "ufoLib" version ".zip")) (sha256 - (base32 "1njin1465qqzshnrvcl5sbv0bsy15gj6fycbw4lmcnwkx5sldgyx")))) + (base32 "07qy6mx7z0wi9a30lc2hj5i9q1gnz1n8l40dmjz2c19mj9s6mz9l")))) (build-system python-build-system) (arguments `(#:python ,python-2)) -- cgit v1.2.3 From 28faa40c40270e01ebe18d9f178d1dbdd2ce425b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 7 Dec 2017 05:42:18 +0100 Subject: gnu: sddm: Update to 0.17.0. * gnu/packages/display-managers.scm (sddm): Update to 0.17.0 [arguments]: Clean up comments. --- gnu/packages/display-managers.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/display-managers.scm b/gnu/packages/display-managers.scm index 7c7a70e950..fcc4f952a1 100644 --- a/gnu/packages/display-managers.scm +++ b/gnu/packages/display-managers.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2017 Ricardo Wurmus ;;; Copyright © 2017 Sou Bunnbu ;;; Copyright © 2017 Marius Bakke +;;; Copyright © 2017 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -133,7 +134,7 @@ (define-public greenisland (define-public sddm (package (name "sddm") - (version "0.16.0") + (version "0.17.0") (source (origin (method url-fetch) (uri (string-append @@ -142,7 +143,7 @@ (define-public sddm "sddm-" version ".tar.xz")) (sha256 (base32 - "0fwf1wsdak5yglykfyq4wbx9g9gi079n8ncjrdynz17hwwiql4z9")))) + "0ch6rdppgy2vbzw0c2x9a4c6ry46vx7p6b76d8xbh2nvxh23xv0k")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -161,15 +162,15 @@ (define-public sddm (arguments `(#:configure-flags (list - ;; Currently doesn't do anything - ;; Option added by enable wayland greeters PR + ;; This option currently does nothing, but will presumably be enabled + ;; if/when is merged. "-DENABLE_WAYLAND=ON" "-DENABLE_PAM=ON" ;; Both flags are required for elogind support. "-DNO_SYSTEMD=ON" "-DUSE_ELOGIND=ON" "-DCONFIG_FILE=/etc/sddm.conf" - ;; Set path to /etc/login.defs - ;; Alternatively use -DUID_MIN and -DUID_MAX + ;; Set path to /etc/login.defs. + ;; An alternative would be to use -DUID_MIN and -DUID_MAX. (string-append "-DLOGIN_DEFS_PATH=" (assoc-ref %build-inputs "shadow") "/etc/login.defs") -- cgit v1.2.3 From 0504daaace5252a123828319db676eba197c9882 Mon Sep 17 00:00:00 2001 From: ng0 Date: Mon, 4 Dec 2017 21:35:47 +0000 Subject: gnu: guile-xcb: Update to 1.3-1.db7d5a3. * gnu/packages/guile-wm.scm (guile-xcb): Update to 1.3-1.db7d5a3. (version): Use git-version. (source): Switch to git-fetch. (native-inputs): Add texinfo. (home-page): Update to new location. Signed-off-by: Kei Kebreau --- gnu/packages/guile-wm.scm | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/guile-wm.scm b/gnu/packages/guile-wm.scm index c28c4753cc..7a810ad529 100644 --- a/gnu/packages/guile-wm.scm +++ b/gnu/packages/guile-wm.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2013, 2014 Ludovic Courtès ;;; Copyright © 2016 Alex ter Weele ;;; Copyright © 2017 Ricardo Wurmus +;;; Copyright © 2017 ng0 ;;; ;;; This file is part of GNU Guix. ;;; @@ -24,22 +25,27 @@ (define-module (gnu packages guile-wm) #:use-module (gnu packages xorg) #:use-module (gnu packages guile) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages texinfo) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix git-download) #:use-module (guix build-system gnu)) (define-public guile-xcb + (let ((commit "db7d5a393cc37a56f66541b3f33938b40c6f35b3") + (revision "1")) (package (name "guile-xcb") - (version "1.3") + (version (git-version "1.3" revision commit)) (source (origin - (method url-fetch) - (uri (string-append "http://web.archive.org/web/20150803094848/" - "http://www.markwitmer.com/dist/guile-xcb-" - version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/mwitmer/guile-xcb") + (commit commit))) + (file-name (git-file-name name version)) (sha256 (base32 - "04dvbqdrrs67490gn4gkq9zk8mqy3mkls2818ha4p0ckhh0pm149")))) + "16w4vgzbmnwih4bgfn8rw85ryfvzhc6hyly6bic9sd7hhc82rcnd")))) (build-system gnu-build-system) (arguments '(;; Parallel builds fail. #:parallel-build? #f @@ -52,16 +58,17 @@ (define-public guile-xcb "--with-guile-site-ccache-dir=" (assoc-ref %outputs "out") "/share/guile/site/2.0")))) - (native-inputs `(("pkg-config" ,pkg-config))) + (native-inputs `(("pkg-config" ,pkg-config) + ("texinfo" ,texinfo))) (inputs `(("guile" ,guile-2.0) ("xcb" ,xcb-proto))) - (home-page "http://www.markwitmer.com/guile-xcb/guile-xcb.html") + (home-page "https://github.com/mwitmer/guile-xcb") (synopsis "XCB bindings for Guile") (description "Guile-XCB implements the XCB protocol and provides all the tools necessary to write X client code in Guile Scheme without any external dependencies.") - (license gpl3+))) + (license gpl3+)))) (define-public guile-wm (package -- cgit v1.2.3 From 7b45392616ad5842c278441cb8443febefccc6ae Mon Sep 17 00:00:00 2001 From: ng0 Date: Mon, 4 Dec 2017 21:48:44 +0000 Subject: gnu: guile-wm: Update to 1.0-1.f3c7b3b. * gnu/packages/guile-wm.scm (guile-xcb): Update to 1.0-1.f3c7b3b. (version): Use git-version. (source): Switch to git-fetch. (native-inputs): Add texinfo. (home-page): Update to new location. Signed-off-by: Kei Kebreau --- gnu/packages/guile-wm.scm | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/guile-wm.scm b/gnu/packages/guile-wm.scm index 7a810ad529..7f302668ab 100644 --- a/gnu/packages/guile-wm.scm +++ b/gnu/packages/guile-wm.scm @@ -71,18 +71,21 @@ (define-public guile-xcb (license gpl3+)))) (define-public guile-wm + (let ((commit "f3c7b3be719f425ffb87265d34855a73366351be") + (revision "1")) (package (name "guile-wm") - (version "1.0") + (version (git-version "1.0" revision commit)) (synopsis "X11 window manager toolkit in Scheme") (source (origin - (method url-fetch) - (uri (string-append "http://web.archive.org/web/20161005084324/" - "http://www.markwitmer.com/dist/guile-wm-" - version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/mwitmer/guile-wm") + (commit commit))) + (file-name (git-file-name name version)) (sha256 (base32 - "1l9qcz236jxvryndimjy62cf8zxf8i3f8vg3zpqqjhw15j9mdk3r")))) + "086dijnpl5dpglf70d6f9sizyakr313y7blpdjrmbi687j1x3qcl")))) (build-system gnu-build-system) (arguments `( ;; The '.scm' files go to $(datadir), so set that to the @@ -135,14 +138,15 @@ (define-public guile-wm Type=Application~%" ,name ,synopsis %output)))) #t))))) - (native-inputs `(("pkg-config" ,pkg-config))) + (native-inputs `(("pkg-config" ,pkg-config) + ("texinfo" ,texinfo))) (inputs `(("guile" ,guile-2.0) ("guile-xcb" ,guile-xcb))) - (home-page "http://www.markwitmer.com/guile-xcb/guile-wm.html") + (home-page "https://github.com/mwitmer/guile-wm/releases") (description "Guile-WM is a simple window manager that's completely customizable—you have total control of what it does by choosing which modules to include. Included with it are a few modules that provide basic TinyWM-like window management, some window record-keeping, multi-monitor support, and emacs-like keymaps and minibuffer. At this point, it's just enough to get you started.") - (license gpl3+))) + (license gpl3+)))) -- cgit v1.2.3 From 3fb8041c0dbd26c18a611951af48ba34c951b59f Mon Sep 17 00:00:00 2001 From: ng0 Date: Mon, 4 Dec 2017 22:08:53 +0000 Subject: gnu: guile-wm and guile-xcb: Build with guile-2.2. * gnu/packages/guile-wm.scm (guile-wm): Build with guile-2.2. (arguments)[configure-flags]: Replace references of "2.0" with "2.2". (inputs): Use guile-2.2. * (guile-xcb): Build with guile-2.2. (arguments)[configure-flags] Use Guile 2.2. Signed-off-by: Kei Kebreau --- gnu/packages/guile-wm.scm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/guile-wm.scm b/gnu/packages/guile-wm.scm index 7f302668ab..918761259f 100644 --- a/gnu/packages/guile-wm.scm +++ b/gnu/packages/guile-wm.scm @@ -53,14 +53,14 @@ (define-public guile-xcb #:configure-flags (list (string-append "--with-guile-site-dir=" (assoc-ref %outputs "out") - "/share/guile/site/2.0") + "/share/guile/site/2.2") (string-append "--with-guile-site-ccache-dir=" (assoc-ref %outputs "out") - "/share/guile/site/2.0")))) + "/share/guile/site/2.2")))) (native-inputs `(("pkg-config" ,pkg-config) ("texinfo" ,texinfo))) - (inputs `(("guile" ,guile-2.0) + (inputs `(("guile" ,guile-2.2) ("xcb" ,xcb-proto))) (home-page "https://github.com/mwitmer/guile-xcb") (synopsis "XCB bindings for Guile") @@ -92,17 +92,17 @@ (define-public guile-wm ;; standard value. #:configure-flags (list (string-append "--datadir=" (assoc-ref %outputs "out") - "/share/guile/site/2.0")) + "/share/guile/site/2.2")) #:phases (modify-phases %standard-phases (add-before 'configure 'set-go-directory (lambda* (#:key outputs #:allow-other-keys) - ;; Install .go files to $out/share/guile/site/2.0. + ;; Install .go files to $out/share/guile/site/2.2. (let ((out (assoc-ref outputs "out"))) (substitute* "module/Makefile.in" (("^wmdir = .*$") (string-append "wmdir = " out - "/share/guile/site/2.0\n")))) + "/share/guile/site/2.2\n")))) #t)) (add-after 'install 'set-load-path (lambda* (#:key inputs outputs #:allow-other-keys) @@ -111,10 +111,10 @@ (define-public guile-wm (let* ((out (assoc-ref outputs "out")) (prog (string-append out "/bin/guile-wm")) (mods (string-append - out "/share/guile/site/2.0")) + out "/share/guile/site/2.2")) (xcb (string-append (assoc-ref inputs "guile-xcb") - "/share/guile/site/2.0"))) + "/share/guile/site/2.2"))) (wrap-program prog `("GUILE_LOAD_PATH" ":" prefix (,mods ,xcb)) @@ -140,7 +140,7 @@ (define-public guile-wm #t))))) (native-inputs `(("pkg-config" ,pkg-config) ("texinfo" ,texinfo))) - (inputs `(("guile" ,guile-2.0) + (inputs `(("guile" ,guile-2.2) ("guile-xcb" ,guile-xcb))) (home-page "https://github.com/mwitmer/guile-wm/releases") (description -- cgit v1.2.3 From 17acac51357c057c91506837fb39b1b0fea6d81e Mon Sep 17 00:00:00 2001 From: ng0 Date: Mon, 4 Dec 2017 22:14:58 +0000 Subject: gnu: guile-xcb: Fix up indentation. * gnu/packages/guile-wm.scm (guile-xcb): Fix up indentation. Signed-off-by: Kei Kebreau --- gnu/packages/guile-wm.scm | 65 +++++++++++++++++++++++------------------------ 1 file changed, 32 insertions(+), 33 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/guile-wm.scm b/gnu/packages/guile-wm.scm index 918761259f..5a21975fd4 100644 --- a/gnu/packages/guile-wm.scm +++ b/gnu/packages/guile-wm.scm @@ -34,41 +34,40 @@ (define-module (gnu packages guile-wm) (define-public guile-xcb (let ((commit "db7d5a393cc37a56f66541b3f33938b40c6f35b3") (revision "1")) - (package - (name "guile-xcb") - (version (git-version "1.3" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/mwitmer/guile-xcb") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "16w4vgzbmnwih4bgfn8rw85ryfvzhc6hyly6bic9sd7hhc82rcnd")))) - (build-system gnu-build-system) - (arguments '(;; Parallel builds fail. - #:parallel-build? #f - - #:configure-flags (list (string-append - "--with-guile-site-dir=" - (assoc-ref %outputs "out") - "/share/guile/site/2.2") - (string-append - "--with-guile-site-ccache-dir=" - (assoc-ref %outputs "out") - "/share/guile/site/2.2")))) - (native-inputs `(("pkg-config" ,pkg-config) - ("texinfo" ,texinfo))) - (inputs `(("guile" ,guile-2.2) - ("xcb" ,xcb-proto))) - (home-page "https://github.com/mwitmer/guile-xcb") - (synopsis "XCB bindings for Guile") - (description - "Guile-XCB implements the XCB protocol and provides all the tools + (package + (name "guile-xcb") + (version (git-version "1.3" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mwitmer/guile-xcb") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "16w4vgzbmnwih4bgfn8rw85ryfvzhc6hyly6bic9sd7hhc82rcnd")))) + (build-system gnu-build-system) + (arguments '(;; Parallel builds fail. + #:parallel-build? #f + #:configure-flags (list (string-append + "--with-guile-site-dir=" + (assoc-ref %outputs "out") + "/share/guile/site/2.2") + (string-append + "--with-guile-site-ccache-dir=" + (assoc-ref %outputs "out") + "/share/guile/site/2.2")))) + (native-inputs `(("pkg-config" ,pkg-config) + ("texinfo" ,texinfo))) + (inputs `(("guile" ,guile-2.2) + ("xcb" ,xcb-proto))) + (home-page "https://github.com/mwitmer/guile-xcb") + (synopsis "XCB bindings for Guile") + (description + "Guile-XCB implements the XCB protocol and provides all the tools necessary to write X client code in Guile Scheme without any external dependencies.") - (license gpl3+)))) + (license gpl3+)))) (define-public guile-wm (let ((commit "f3c7b3be719f425ffb87265d34855a73366351be") -- cgit v1.2.3 From 5b4e0957efe366ec1b4a360a483c04f8d3318fda Mon Sep 17 00:00:00 2001 From: ng0 Date: Mon, 4 Dec 2017 22:18:40 +0000 Subject: gnu: guile-wm: Fix up indentation. * gnu/packages/guile-wm.scm (guile-wm): Fix up indentation. Signed-off-by: Kei Kebreau --- gnu/packages/guile-wm.scm | 138 +++++++++++++++++++++++----------------------- 1 file changed, 69 insertions(+), 69 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/guile-wm.scm b/gnu/packages/guile-wm.scm index 5a21975fd4..06c8399102 100644 --- a/gnu/packages/guile-wm.scm +++ b/gnu/packages/guile-wm.scm @@ -72,80 +72,80 @@ (define-public guile-xcb (define-public guile-wm (let ((commit "f3c7b3be719f425ffb87265d34855a73366351be") (revision "1")) - (package - (name "guile-wm") - (version (git-version "1.0" revision commit)) - (synopsis "X11 window manager toolkit in Scheme") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/mwitmer/guile-wm") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "086dijnpl5dpglf70d6f9sizyakr313y7blpdjrmbi687j1x3qcl")))) - (build-system gnu-build-system) - (arguments - `( ;; The '.scm' files go to $(datadir), so set that to the - ;; standard value. - #:configure-flags (list (string-append "--datadir=" - (assoc-ref %outputs "out") - "/share/guile/site/2.2")) - #:phases - (modify-phases %standard-phases - (add-before 'configure 'set-go-directory - (lambda* (#:key outputs #:allow-other-keys) - ;; Install .go files to $out/share/guile/site/2.2. - (let ((out (assoc-ref outputs "out"))) - (substitute* "module/Makefile.in" - (("^wmdir = .*$") - (string-append "wmdir = " out - "/share/guile/site/2.2\n")))) - #t)) - (add-after 'install 'set-load-path - (lambda* (#:key inputs outputs #:allow-other-keys) - ;; Put Guile-XCB's and Guile-WM's modules in the - ;; search path of PROG. - (let* ((out (assoc-ref outputs "out")) - (prog (string-append out "/bin/guile-wm")) - (mods (string-append - out "/share/guile/site/2.2")) - (xcb (string-append - (assoc-ref inputs "guile-xcb") - "/share/guile/site/2.2"))) - (wrap-program - prog - `("GUILE_LOAD_PATH" ":" prefix (,mods ,xcb)) - `("GUILE_LOAD_COMPILED_PATH" ":" prefix - (,mods ,xcb)))) - #t)) - (add-after 'install 'install-xsession - (lambda* (#:key outputs #:allow-other-keys) - ;; add a .desktop file to xsessions - (let ((xsessions (string-append - %output "/share/xsessions"))) - (mkdir-p xsessions) - (call-with-output-file (string-append - xsessions "/guile-wm.desktop") - (lambda (port) - (format port - "[Desktop Entry]~@ + (package + (name "guile-wm") + (version (git-version "1.0" revision commit)) + (synopsis "X11 window manager toolkit in Scheme") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mwitmer/guile-wm") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "086dijnpl5dpglf70d6f9sizyakr313y7blpdjrmbi687j1x3qcl")))) + (build-system gnu-build-system) + (arguments + `( ;; The '.scm' files go to $(datadir), so set that to the + ;; standard value. + #:configure-flags (list (string-append "--datadir=" + (assoc-ref %outputs "out") + "/share/guile/site/2.2")) + #:phases + (modify-phases %standard-phases + (add-before 'configure 'set-go-directory + (lambda* (#:key outputs #:allow-other-keys) + ;; Install .go files to $out/share/guile/site/2.2. + (let ((out (assoc-ref outputs "out"))) + (substitute* "module/Makefile.in" + (("^wmdir = .*$") + (string-append "wmdir = " out + "/share/guile/site/2.2\n")))) + #t)) + (add-after 'install 'set-load-path + (lambda* (#:key inputs outputs #:allow-other-keys) + ;; Put Guile-XCB's and Guile-WM's modules in the + ;; search path of PROG. + (let* ((out (assoc-ref outputs "out")) + (prog (string-append out "/bin/guile-wm")) + (mods (string-append + out "/share/guile/site/2.2")) + (xcb (string-append + (assoc-ref inputs "guile-xcb") + "/share/guile/site/2.2"))) + (wrap-program + prog + `("GUILE_LOAD_PATH" ":" prefix (,mods ,xcb)) + `("GUILE_LOAD_COMPILED_PATH" ":" prefix + (,mods ,xcb)))) + #t)) + (add-after 'install 'install-xsession + (lambda* (#:key outputs #:allow-other-keys) + ;; add a .desktop file to xsessions + (let ((xsessions (string-append + %output "/share/xsessions"))) + (mkdir-p xsessions) + (call-with-output-file (string-append + xsessions "/guile-wm.desktop") + (lambda (port) + (format port + "[Desktop Entry]~@ Name=~a~@ Comment=~a~@ Exec=~a/bin/guile-wm~@ Type=Application~%" - ,name ,synopsis %output)))) - #t))))) - (native-inputs `(("pkg-config" ,pkg-config) - ("texinfo" ,texinfo))) - (inputs `(("guile" ,guile-2.2) - ("guile-xcb" ,guile-xcb))) - (home-page "https://github.com/mwitmer/guile-wm/releases") - (description - "Guile-WM is a simple window manager that's completely customizable—you + ,name ,synopsis %output)))) + #t))))) + (native-inputs `(("pkg-config" ,pkg-config) + ("texinfo" ,texinfo))) + (inputs `(("guile" ,guile-2.2) + ("guile-xcb" ,guile-xcb))) + (home-page "https://github.com/mwitmer/guile-wm/releases") + (description + "Guile-WM is a simple window manager that's completely customizable—you have total control of what it does by choosing which modules to include. Included with it are a few modules that provide basic TinyWM-like window management, some window record-keeping, multi-monitor support, and emacs-like keymaps and minibuffer. At this point, it's just enough to get you started.") - (license gpl3+)))) + (license gpl3+)))) -- cgit v1.2.3 From 581a006b557c5e7cd604203b16b040e2c892a319 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 6 Dec 2017 00:44:21 +0100 Subject: gnu: ghc-glob: Fix typo. * gnu/packages/haskell.scm (ghc-glob)[description]: Add missing space. --- gnu/packages/haskell.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 4d1aabff0b..95bb3811ca 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -7145,7 +7145,7 @@ (define-public ghc-glob ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2))) (home-page "http://iki.fi/matti.niemenmaa/glob/") (synopsis "Haskell library matching glob patterns against file paths") - (description "This package providesa Haskell library for @dfn{globbing}: + (description "This package provides a Haskell library for @dfn{globbing}: matching patterns against file paths.") (license license:bsd-3))) -- cgit v1.2.3 From 0e7cb137c669426a9ca04caaf8d1e95e01780f7d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 7 Dec 2017 15:59:12 +0100 Subject: gnu: libraw: Update to 0.18.6. * gnu/packages/photo.scm (libraw): Update to 0.18.6. --- gnu/packages/photo.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index 8862bdfcb9..666058c9dc 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -65,14 +65,14 @@ (define-module (gnu packages photo) (define-public libraw (package (name "libraw") - (version "0.18.5") + (version "0.18.6") (source (origin (method url-fetch) (uri (string-append "https://www.libraw.org/data/LibRaw-" version ".tar.gz")) (sha256 (base32 - "0y519nlvl4bfnnxbwry35f6gbcv6jbbpd2lmiwv6pbyzv4a7saps")))) + "0fx5mwkg0rx37qgxnajc8g8i0mhc6822100ljay5g94aap5arf75")))) (build-system gnu-build-system) (home-page "https://www.libraw.org") (synopsis "Raw image decoder") -- cgit v1.2.3 From 61bfc18ee8fa084133a6dac500c0f8f037e5d925 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 7 Dec 2017 16:06:48 +0100 Subject: gnu: re2: Update to 2017-12-01. * gnu/packages/regex.scm (re2): Update to 2017-12-01. --- gnu/packages/regex.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/regex.scm b/gnu/packages/regex.scm index 010111c037..4648a4d004 100644 --- a/gnu/packages/regex.scm +++ b/gnu/packages/regex.scm @@ -28,7 +28,7 @@ (define-module (gnu packages regex) (define-public re2 (package (name "re2") - (version "2017-11-01") + (version "2017-12-01") (source (origin (method url-fetch) (uri @@ -38,7 +38,7 @@ (define-public re2 (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0r8p23wrqi5sdbh7990x8n1l0fqq3rkjcl6ikk55mpjxqlsm0v8a")))) + "03gv50hv7yaspx3ls8g8l1yj8nszbc3mplhcf4cr95fcsxy7wyb2")))) (build-system gnu-build-system) (arguments `(#:modules ((guix build gnu-build-system) -- cgit v1.2.3 From 9bb798948851f7418475d5da989fd62c26575fd2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 6 Dec 2017 02:07:56 +0100 Subject: gnu: sddm: Remove obsolete workaround. * gnu/packages/display-managers.scm (sddm)[arguments]: Remove obsolete 'fix-qml-include' phase. --- gnu/packages/display-managers.scm | 8 -------- 1 file changed, 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/display-managers.scm b/gnu/packages/display-managers.scm index fcc4f952a1..2f4a8c2d73 100644 --- a/gnu/packages/display-managers.scm +++ b/gnu/packages/display-managers.scm @@ -190,14 +190,6 @@ (define-public sddm (substitute* "CMakeLists.txt" (("/usr/bin/loginctl") (which "loginctl"))) #t)) - (add-before 'configure 'fix-qml-include - (lambda _ - ;; Make sure QtQml is found when building the helper. - ;; See . - (substitute* "src/helper/CMakeLists.txt" - (("target_link_libraries\\(sddm-helper") - "target_link_libraries(sddm-helper Qt5::Qml")) - #t)) (add-after 'install 'wrap-programs (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) -- cgit v1.2.3 From cf69135d5e6797e566b8bb18419ae9e3c8aeb621 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 7 Dec 2017 17:08:56 +0100 Subject: gnu: certbot: Update to 0.20.0. * gnu/packages/tls.scm (python-acme, certbot): Update to 0.20.0. --- gnu/packages/tls.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index d8cc1ccbc2..b321525d33 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -529,13 +529,13 @@ (define-public python-acme (package (name "python-acme") ;; Remember to update the hash of certbot when updating python-acme. - (version "0.19.0") + (version "0.20.0") (source (origin (method url-fetch) (uri (pypi-uri "acme" version)) (sha256 (base32 - "08p8w50zciqlhgn3ab0wbbvi1zyg3x37r1gywq0z1allsij3v8hz")))) + "1md3llp6640dviv9bzyy7qzn3szxil38645cjqcg7hlcdknil4j5")))) (build-system python-build-system) (arguments `(#:phases @@ -583,7 +583,7 @@ (define-public certbot (uri (pypi-uri name version)) (sha256 (base32 - "0lwxqz3r0fg3dy06fgba1dfs7n6ribc25z0rh5rqbl7mvy8hf8x7")))) + "126y6jg1nyd8js2jchl4dbmpg507hawaxnyw7510qh7vcidm1gya")))) (build-system python-build-system) (arguments `(,@(substitute-keyword-arguments (package-arguments python-acme) -- cgit v1.2.3