From 450226ebc1b2611ff62469d314e7ca2973bbf131 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sun, 23 Dec 2018 23:01:55 +0100 Subject: gnu: baloo: Fix build. The substitute for removing a failing test did no longer work since the way the test is included changed in v5.45.0: Formerly the test has listed, now there is a separate statement for this test. * gnu/package/kde-frameworks.scm((baloo)[arguments]<#phases>: Change substitute in phase 'remove-failing-test'. --- gnu/packages/kde-frameworks.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index f5a084a7e8..bc28511d3f 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -2003,7 +2003,8 @@ gallons).") ;; This test fails on i686 and aarch64 (lambda _ (substitute* "autotests/unit/file/CMakeLists.txt" - (("metadatamovertest") "")) + (("^\\s*ecm_add_test\\(.* TEST_NAME metadatamovertest .*" line) + (string-append "# " line))) #t)) (replace 'check (lambda _ -- cgit v1.2.3 From e47c69f22638dc92ee962942b8e24284c8dee832 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 16 Dec 2018 14:44:31 +0200 Subject: gnu: file: Fix CVE-2018-10360. * gnu/packages/patches/file-CVE-2018-10360.patch: New file. * gnu/packages/file.scm (file)[replacement]: New field. (file/fixed): New variable. * gnu/packages/commencement.scm (file-boot0): Use 'package/inherit' to receive security fixes. * gnu/local.mk (dist_patch_DATA): Register it. --- gnu/local.mk | 1 + gnu/packages/commencement.scm | 3 +-- gnu/packages/file.scm | 9 +++++++++ gnu/packages/patches/file-CVE-2018-10360.patch | 27 ++++++++++++++++++++++++++ 4 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/file-CVE-2018-10360.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 0a945e419c..925d955a66 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -691,6 +691,7 @@ dist_patch_DATA = \ %D%/packages/patches/fcgi-2.4.0-poll.patch \ %D%/packages/patches/fifo-map-fix-flags-for-gcc.patch \ %D%/packages/patches/fifo-map-remove-catch.hpp.patch \ + %D%/packages/patches/file-CVE-2018-10360.patch \ %D%/packages/patches/findutils-gnulib-libio.patch \ %D%/packages/patches/findutils-localstatedir.patch \ %D%/packages/patches/findutils-makedev.patch \ diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 0aa65fe638..bd48eb7f80 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -126,8 +126,7 @@ (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) diff --git a/gnu/packages/file.scm b/gnu/packages/file.scm index 78f0360c2e..4518c8d3dc 100644 --- a/gnu/packages/file.scm +++ b/gnu/packages/file.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2014, 2015 Mark H Weaver ;;; Copyright © 2016, 2017 Efraim Flashner ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -30,6 +31,7 @@ (package (name "file") (version "5.33") + (replacement file/fixed) (source (origin (method url-fetch) (uri (string-append "ftp://ftp.astron.com/pub/file/file-" @@ -51,3 +53,10 @@ extensions to tell you the type of a file, but looks at the actual contents of the file. This package provides the libmagic library.") (license bsd-2) (home-page "https://www.darwinsys.com/file/"))) + +(define file/fixed + (package + (inherit file) + (source + (origin (inherit (package-source file)) + (patches (search-patches "file-CVE-2018-10360.patch")))))) diff --git a/gnu/packages/patches/file-CVE-2018-10360.patch b/gnu/packages/patches/file-CVE-2018-10360.patch new file mode 100644 index 0000000000..9285611c04 --- /dev/null +++ b/gnu/packages/patches/file-CVE-2018-10360.patch @@ -0,0 +1,27 @@ +https://github.com/file/file/commit/a642587a9c9e2dd7feacdf513c3643ce26ad3c22.patch +The leading part of the patch starting at line 27 was trimmed off. +This patch should be OK to drop with file@5.35. + +From a642587a9c9e2dd7feacdf513c3643ce26ad3c22 Mon Sep 17 00:00:00 2001 +From: Christos Zoulas +Date: Sat, 9 Jun 2018 16:00:06 +0000 +Subject: [PATCH] Avoid reading past the end of buffer (Rui Reis) + +--- + src/readelf.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/src/readelf.c b/src/readelf.c +index 79c83f9f5..1f41b4611 100644 +--- a/src/readelf.c ++++ b/src/readelf.c +@@ -842,7 +842,8 @@ do_core_note(struct magic_set *ms, unsigned char *nbuf, uint32_t type, + + cname = (unsigned char *) + &nbuf[doff + prpsoffsets(i)]; +- for (cp = cname; *cp && isprint(*cp); cp++) ++ for (cp = cname; cp < nbuf + size && *cp ++ && isprint(*cp); cp++) + continue; + /* + * Linux apparently appends a space at the end -- cgit v1.2.3 From 3c515b22255c8ca4a727ba230168cf1083979086 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 11 Dec 2018 16:42:56 +0200 Subject: doc: Example vm-image doesn't need firmware. * gnu/system/examples/vm-image.tmpl (firmware): New field, explicitly empty list. --- gnu/system/examples/vm-image.tmpl | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu') diff --git a/gnu/system/examples/vm-image.tmpl b/gnu/system/examples/vm-image.tmpl index 36e272722d..f149f67113 100644 --- a/gnu/system/examples/vm-image.tmpl +++ b/gnu/system/examples/vm-image.tmpl @@ -24,6 +24,8 @@ partprobe, and then 2) resizing the filesystem with resize2fs.\n")) (timezone "Etc/UTC") (locale "en_US.utf8") +(firmware '()) + ;; Assuming /dev/sdX is the target hard disk, and "my-root" is ;; the label of the target root file system. (bootloader (bootloader-configuration -- cgit v1.2.3 From dcad57d5fca43a111e1b314264171c80d4d9a75b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 12 Dec 2018 10:15:08 +0200 Subject: services: Add quassel. * gnu/services/messaging.scm (): New record type. (%quassel-account, %quassel-activation): New procedures. (quassel-service-type): New variable. * gnu/tests/messaging.scm (%test-quassel): New variable. (run-quassel-test): New procedure. * doc/guix.texi (Messaging): Document quassel service. --- doc/guix.texi | 31 ++++++++++++++++ gnu/services/messaging.scm | 90 +++++++++++++++++++++++++++++++++++++++++++++- gnu/tests/messaging.scm | 54 +++++++++++++++++++++++++++- 3 files changed, 173 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/doc/guix.texi b/doc/guix.texi index 484a29f2e1..2553ba7fe0 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -16298,6 +16298,37 @@ Configuration snippet added as-is to the BitlBee configuration file. @end table @end deftp +@subsubheading Quassel Service + +@cindex IRC (Internet Relay Chat) +@url{https://quassel-irc.org/,Quassel} is a distributed IRC client, +meaning that one or more clients can attach to and detach from the +central core. + +@defvr {Scheme Variable} quassel-service-type +This is the service type for the @url{https://quassel-irc.org/,Quassel} +IRC backend daemon. Its value is a @code{quassel-configuration} +(see below). +@end defvr + +@deftp {Data Type} quassel-configuration +This is the configuration for Quassel, with the following fields: + +@table @asis +@item @code{quassel} (default: @code{quassel}) +The Quassel package to use. + +@item @code{interface} (default: @code{"::,0.0.0.0"}) +@item @code{port} (default: @code{4242}) +Listen on the network interface(s) corresponding to the IPv4 or IPv6 +interfaces specified in the comma delimited @var{interface}, on +@var{port}. + +@item @code{loglevel} (default: @code{"Info"}) +The level of logging desired. Accepted values are Debug, Info, Warning +and Error. +@end table +@end deftp @node Telephony Services @subsubsection Telephony Services diff --git a/gnu/services/messaging.scm b/gnu/services/messaging.scm index 1108006411..92f86a1b83 100644 --- a/gnu/services/messaging.scm +++ b/gnu/services/messaging.scm @@ -22,6 +22,8 @@ (define-module (gnu services messaging) #:use-module (gnu packages messaging) #:use-module (gnu packages admin) + #:use-module (gnu packages irc) + #:use-module (gnu packages tls) #:use-module (gnu services) #:use-module (gnu services shepherd) #:use-module (gnu services configuration) @@ -50,7 +52,10 @@ bitlbee-configuration bitlbee-configuration? bitlbee-service - bitlbee-service-type)) + bitlbee-service-type + + quassel-configuration + quassel-service-type)) ;;; Commentary: ;;; @@ -895,3 +900,86 @@ configuration file." (bitlbee bitlbee) (interface interface) (port port) (extra-settings extra-settings)))) + + +;;; +;;; Quassel. +;;; + +(define-record-type* + quassel-configuration make-quassel-configuration + quassel-configuration? + (quassel quassel-configuration-quassel + (default quassel)) + (interface quassel-configuration-interface + (default "::,0.0.0.0")) + (port quassel-configuration-port + (default 4242)) + (loglevel quassel-configuration-loglevel + (default "Info"))) + +(define quassel-shepherd-service + (match-lambda + (($ quassel interface port loglevel) + (with-imported-modules (source-module-closure + '((gnu build shepherd) + (gnu system file-systems))) + (list (shepherd-service + (provision '(quassel)) + (requirement '(user-processes networking)) + (modules '((gnu build shepherd) + (gnu system file-systems))) + (start #~(make-forkexec-constructor/container + (list #$(file-append quassel "/bin/quasselcore") + "--configdir=/var/lib/quassel" + "--logfile=/var/log/quassel/core.log" + (string-append "--loglevel=" #$loglevel) + (string-append "--port=" (number->string #$port)) + (string-append "--listen=" #$interface)) + #:mappings (list (file-system-mapping + (source "/var/lib/quassel") + (target source) + (writable? #t)) + (file-system-mapping + (source "/var/log/quassel") + (target source) + (writable? #t))))) + (stop #~(make-kill-destructor)))))))) + +(define %quassel-account + (list (user-group (name "quassel") (system? #t)) + (user-account + (name "quasselcore") + (group "quassel") + (system? #t) + (comment "Quassel daemon user") + (home-directory "/var/lib/quassel") + (shell (file-append shadow "/sbin/nologin"))))) + +(define %quassel-activation + #~(begin + (use-modules (guix build utils)) + (mkdir-p "/var/lib/quassel") + (mkdir-p "/var/log/quassel") + (let ((cert "/var/lib/quassel/quasselCert.pem")) + (unless (file-exists? cert) + (invoke #$(file-append openssl "/bin/openssl") + "req" "-x509" "-nodes" "-batch" "-days" "680" "-newkey" + "rsa" "-keyout" cert "-out" cert))))) + +(define quassel-service-type + (service-type (name 'quassel) + (extensions + (list (service-extension shepherd-root-service-type + quassel-shepherd-service) + (service-extension profile-service-type + (compose list quassel-configuration-quassel)) + (service-extension account-service-type + (const %quassel-account)) + (service-extension activation-service-type + (const %quassel-activation)))) + (default-value (quassel-configuration)) + (description + "Run @url{https://quassel-irc.org/,quasselcore}, the backend +for the distributed IRC client quassel, which allows you to connect from +multiple machines simultaneously."))) diff --git a/gnu/tests/messaging.scm b/gnu/tests/messaging.scm index 36afb987af..176e3d08cb 100644 --- a/gnu/tests/messaging.scm +++ b/gnu/tests/messaging.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017, 2018 Clément Lassieur ;;; Copyright © 2017, 2018 Ludovic Courtès +;;; Copyright © 2018 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -29,7 +30,8 @@ #:use-module (guix store) #:use-module (guix modules) #:export (%test-prosody - %test-bitlbee)) + %test-bitlbee + %test-quassel)) (define (run-xmpp-test name xmpp-service pid-file create-account) "Run a test of an OS running XMPP-SERVICE, which writes its PID to PID-FILE." @@ -239,3 +241,53 @@ (name "bitlbee") (description "Connect to a BitlBee IRC server.") (value (run-bitlbee-test)))) + +(define (run-quassel-test) + (define os + (marionette-operating-system + (simple-operating-system (service dhcp-client-service-type) + (service quassel-service-type)) + #:imported-modules (source-module-closure + '((gnu services herd))))) + + (define vm + (virtual-machine + (operating-system os) + (port-forwardings `((4242 . 4242))))) + + (define test + (with-imported-modules '((gnu build marionette)) + #~(begin + (use-modules (srfi srfi-64) + (gnu build marionette)) + + (define marionette + (make-marionette (list #$vm))) + + (mkdir #$output) + (chdir #$output) + + (test-begin "quassel") + + (test-assert "service started" + (marionette-eval + '(begin + (use-modules (gnu services herd)) + (start-service 'quassel)) + marionette)) + + (test-assert "certificate file" + (marionette-eval + '(file-exists? "/var/lib/quassel/quasselCert.pem") + marionette)) + + (test-end) + (exit (= (test-runner-fail-count (test-runner-current)) 0))))) + + (gexp->derivation "quassel-test" test)) + +(define %test-quassel + (system-test + (name "quassel") + (description "Connect to a quassel IRC server.") + (value (run-quassel-test)))) -- cgit v1.2.3 From ff46016e9040f6265e9875b07d362a787e1765b9 Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Fri, 7 Dec 2018 22:00:14 +1100 Subject: gnu: ardour: Add a phase to install Freedesktop files. * gnu/packages/audio.scm (ardour): [arguments]: - Correct comment about --freedesktop flag. - Adjust pretty printing for consistency. - Add 'install-free-desktop-files phase to actually install the files that were build. Fixes bug#33585 reported by baconicsynergy. Signed-off-by: Efraim Flashner --- gnu/packages/audio.scm | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 2786f62163..d3d1dcd02c 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -17,6 +17,7 @@ ;;; Copyright © 2018 Marius Bakke ;;; Copyright © 2018 Thorsten Wilms ;;; Copyright © 2018 Eric Bavier +;;; Copyright © 2018 Brendan Tildesley ;;; ;;; This file is part of GNU Guix. ;;; @@ -229,13 +230,34 @@ namespace ARDOUR { const char* revision = \"" version "\" ; }")) (arguments `(#:configure-flags '("--cxx11" ; required by gtkmm "--no-phone-home" ; don't contact ardour.org - "--freedesktop" ; install .desktop file + "--freedesktop" ; build .desktop file "--test") ; build unit tests #:phases (modify-phases %standard-phases - (add-after - 'unpack 'set-rpath-in-LDFLAGS - ,(ardour-rpath-phase (version-major version)))) + (add-after 'unpack 'set-rpath-in-LDFLAGS + ,(ardour-rpath-phase (version-major version))) + (add-after 'install 'install-freedesktop-files + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (share (string-append out "/share")) + (ver ,(version-major version))) + (for-each + (lambda (size) + (let ((dir (string-append share "/icons/hicolor/" + size "x" size "/apps"))) + (mkdir-p dir) + (copy-file + (string-append "gtk2_ardour/resources/Ardour-icon_" + size "px.png") + (string-append dir "/ardour" ver ".png")))) + '("16" "22" "32" "48" "256")) + (install-file (string-append "build/gtk2_ardour/ardour" + ver ".desktop") + (string-append share "/applications/")) + (install-file (string-append "build/gtk2_ardour/ardour" + ver ".appdata.xml") + (string-append share "/appdata/"))) + #t))) #:test-target "test" #:python ,python-2)) (inputs -- cgit v1.2.3 From 72d9ef1b0c74d4202c9847ff3e9c559360145083 Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Sat, 8 Dec 2018 02:34:12 +1100 Subject: gnu: ardour: Add libusb input. * gnu/packages/audio.scm (ardour): [inputs]: add libusb. --- gnu/packages/audio.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index d3d1dcd02c..9d43f9618f 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -75,6 +75,7 @@ #:use-module (gnu packages qt) #:use-module (gnu packages libbsd) #:use-module (gnu packages linux) + #:use-module (gnu packages libusb) #:use-module (gnu packages llvm) #:use-module (gnu packages mp3) ;taglib #:use-module (gnu packages perl) @@ -278,6 +279,7 @@ namespace ARDOUR { const char* revision = \"" version "\" ; }")) ("libsamplerate" ,libsamplerate) ("libxml2" ,libxml2) ("libogg" ,libogg) + ("libusb" ,libusb) ("libvorbis" ,libvorbis) ("flac" ,flac) ("lv2" ,lv2) -- cgit v1.2.3 From 19dd523c9934f10056c4e591e47e4768a9c5ff79 Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Sat, 8 Dec 2018 14:42:07 +1100 Subject: gnu: ardour: Sort inputs and native-inputs. * gnu/packages/audio.scm (ardour)[inputs]: Sort alphabetically. [native-inputs]: Same. --- gnu/packages/audio.scm | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 9d43f9618f..d47dd90f56 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -263,47 +263,47 @@ namespace ARDOUR { const char* revision = \"" version "\" ; }")) #:python ,python-2)) (inputs `(("alsa-lib" ,alsa-lib) + ("atkmm" ,atkmm) ("aubio" ,aubio) - ("lrdf" ,lrdf) ("boost" ,boost) - ("atkmm" ,atkmm) ("cairomm" ,cairomm) + ("curl" ,curl) ("eudev" ,eudev) - ("gtkmm" ,gtkmm-2) + ("fftw" ,fftw) + ("fftwf" ,fftwf) + ("flac" ,flac) ("glibmm" ,glibmm) + ("gtkmm" ,gtkmm-2) + ("jack" ,jack-1) + ("libarchive" ,libarchive) ("libart-lgpl" ,libart-lgpl) ("libgnomecanvasmm" ,libgnomecanvasmm) - ("pangomm" ,pangomm) ("liblo" ,liblo) - ("libsndfile" ,libsndfile) - ("libsamplerate" ,libsamplerate) - ("libxml2" ,libxml2) ("libogg" ,libogg) + ("libsamplerate" ,libsamplerate) + ("libsndfile" ,libsndfile) ("libusb" ,libusb) ("libvorbis" ,libvorbis) - ("flac" ,flac) + ("libxml2" ,libxml2) + ("lilv" ,lilv) + ("lrdf" ,lrdf) ("lv2" ,lv2) - ("vamp" ,vamp) - ("curl" ,curl) - ("fftw" ,fftw) - ("fftwf" ,fftwf) - ("jack" ,jack-1) + ("pangomm" ,pangomm) + ("python-rdflib" ,python-rdflib) + ("readline" ,readline) + ("redland" ,redland) + ("rubberband" ,rubberband) ("serd" ,serd) ("sord" ,sord) ("sratom" ,sratom) ("suil" ,suil) - ("lilv" ,lilv) - ("readline" ,readline) - ("redland" ,redland) - ("rubberband" ,rubberband) - ("libarchive" ,libarchive) ("taglib" ,taglib) - ("python-rdflib" ,python-rdflib))) + ("vamp" ,vamp))) (native-inputs - `(("perl" ,perl) - ("cppunit" ,cppunit) - ("itstool" ,itstool) + `(("cppunit" ,cppunit) ("gettext" ,gettext-minimal) + ("itstool" ,itstool) + ("perl" ,perl) ("pkg-config" ,pkg-config))) (home-page "http://ardour.org") (synopsis "Digital audio workstation") -- cgit v1.2.3 From 09654adee785952cf0f759d22179b353d2665719 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Mon, 24 Dec 2018 12:54:00 +0100 Subject: gnu: wine-staging: Update to 4.0-rc3. * gnu/packages/wine.scm (wine-staging-patchset-data): Update to 4.0-rc3. * gnu/packages/wine.scm (wine-staging): Update to 4.0-rc3. --- gnu/packages/wine.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index 802b3dd38f..f56699f8c9 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -225,7 +225,7 @@ integrate Windows applications into your desktop.") (define-public wine-staging-patchset-data (package (name "wine-staging-patchset-data") - (version "3.21") + (version "4.0-rc3") (source (origin (method git-fetch) @@ -235,7 +235,7 @@ integrate Windows applications into your desktop.") (file-name (git-file-name name version)) (sha256 (base32 - "1bxryvqw5rvhcx8vjl714jaj0rjsrh95kh3sn499rrljc3c8qsbl")))) + "1yx758mv605w2g7f9aj4xf09p8q5dvbf6b9h1kdvsyhm8bkrgx66")))) (build-system trivial-build-system) (native-inputs `(("bash" ,bash) @@ -276,12 +276,12 @@ integrate Windows applications into your desktop.") (method url-fetch) (uri (string-append "https://dl.winehq.org/wine/source/" - (version-major version) ".x" + (version-major version) ".0" "/wine-" version ".tar.xz")) (file-name (string-append name "-" version ".tar.xz")) (sha256 (base32 - "1h70wb7kysbzv36i3fblyiihvalwhy6sj4s2a8nf21nz2mhc0k58")))) + "176cdnznbk3pikh87j5q4cjb7rky5dxikf1nr0mp8a9cycycxr7w")))) (inputs `(("autoconf" ,autoconf) ; for autoreconf ("gtk+" ,gtk+) ("libva" ,libva) -- cgit v1.2.3 From 8f5825540db0a0f1fb637cde95739f25157f89ab Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Mon, 24 Dec 2018 12:55:23 +0100 Subject: gnu: parallel: Update to 20181222. * gnu/packages/parallel.scm (parallel): Update to 20181222. --- gnu/packages/parallel.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm index df8ac180b3..25d3c0737c 100644 --- a/gnu/packages/parallel.scm +++ b/gnu/packages/parallel.scm @@ -48,7 +48,7 @@ (define-public parallel (package (name "parallel") - (version "20181122") + (version "20181222") (source (origin (method url-fetch) @@ -56,7 +56,7 @@ version ".tar.bz2")) (sha256 (base32 - "1mcqymf6vg8jhnjv71sswcz5xrwpq2h2ishi8m1hz8rwhc65h1ig")))) + "0sd39nzgff3rpyzfwkffb5yxbdm5r6amrkslbgpjlrcrymy9z305")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From 311462f642dd87ca488bf9af180b2c609ea6e788 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sun, 23 Dec 2018 18:46:06 +0100 Subject: gnu: Remove obsolete package gpgmepp. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This package is unused, is part of gpgme since version 1.7 and has been marked as superseded since 18 months now. * gnu/packages/kde-frameworks.scm (gpgmepp): Remove variable. Signed-off-by: Ludovic Courtès --- gnu/packages/kde-frameworks.scm | 27 --------------------------- 1 file changed, 27 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index bc28511d3f..988bf44c3d 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -207,33 +207,6 @@ Phonon-GStreamer is a backend based on the GStreamer multimedia library.") ;; license: source files mention "either version 2.1 or 3" (license (list license:lgpl2.1 license:lgpl3)))) -(define-public gpgmepp - (package - (name "gpgmepp") - (version "16.08.2") - (source (origin - (method url-fetch) - (uri (string-append - "mirror://kde/stable/applications" - "/" version "/src/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "0828qlhdi1i26n2xgyb01c0q77m6jlppbxv6mprryxq0ma88940a")))) - (build-system cmake-build-system) - (native-inputs - `(("extra-cmake-modules" ,extra-cmake-modules))) - (propagated-inputs - `(("boost" ,boost) - ("gpgme" ,gpgme))) - (inputs - `(("qtbase" ,qtbase))) - (home-page "https://community.kde.org/Frameworks") - (synopsis "C++ bindings/wrapper for gpgme") - (description "C++ bindings/wrapper for gpgme.") - (license license:lgpl2.1+) - (properties `((superseded . ,gpgme))))) - (define-public kpmcore (package (name "kpmcore") -- cgit v1.2.3 From 3c5e13642ccc6db31ae8a017ea3076e63966ccd3 Mon Sep 17 00:00:00 2001 From: Gabriel Hondet Date: Sun, 23 Dec 2018 09:43:18 +0100 Subject: gnu: Add font-mononoki. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/fonts.scm (font-mononoki): New variable. Co-authored-by: Ludovic Courtès --- gnu/packages/fonts.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index b0cb78c5cb..88315008bd 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -22,6 +22,7 @@ ;;; Copyright © 2017, 2018 Arun Isaac ;;; Copyright © 2017 Mohammed Sadiq ;;; Copyright © 2018 Charlie Ritter +;;; Copyright © 2018 Gabriel Hondet ;;; ;;; This file is part of GNU Guix. ;;; @@ -1351,3 +1352,24 @@ reproduction and display environments. This package provides only TrueType files (TTF).") (home-page "https://software.sil.org/charis/") (license license:silofl1.1))) + +(define-public font-mononoki + (package + (name "font-mononoki") + (version "1.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/madmalik/mononoki/") + (commit version))) + (sha256 + (base32 + "1rkzyxn30rn8qv2h2xz324j7q15hzg2lci8790a7cdl1dfgic4xi")) + (file-name (git-file-name name version)))) + (build-system font-build-system) + (synopsis "Font for programming and code review") + (description + "Mononoki is a typeface by Matthias Tellen, created to enhance code +formatting.") + (home-page "https://madmalik.github.io/mononoki/") + (license license:silofl1.1))) -- cgit v1.2.3 From 6f1e0bb79266f34b50b09200b9280a641b8aa7c8 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 24 Dec 2018 18:18:24 +0100 Subject: gnu: commencement: Do not graft early bootstrap packages. This is a followup to e47c69f22638dc92ee962942b8e24284c8dee832 and a repetition of f00b85ff8d34df0a1879e593d4a85629b8586af7. * gnu/packages/commencement.scm (file-boot0): Use 'inherit' instead of 'package/inherit'. --- gnu/packages/commencement.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index bd48eb7f80..0aa65fe638 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -126,7 +126,8 @@ (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) -- cgit v1.2.3 From 78bc4eb627c6063df441ce651c666cc64096c2a7 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 24 Dec 2018 18:48:19 +0100 Subject: gnu: guix: Update to 6f1e0bb. * gnu/packages/package-management.scm (guix): Update to 6f1e0bb. --- 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 3598ac4e67..9bb71dc80f 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -105,8 +105,8 @@ ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "0.16.0") - (commit "bdf860c2e99077d431da0cc1db4fc14db2a35d31") - (revision 6)) + (commit "6f1e0bb79266f34b50b09200b9280a641b8aa7c8") + (revision 7)) (package (name "guix") @@ -122,7 +122,7 @@ (commit commit))) (sha256 (base32 - "0876y2pjcrwb3ynxqlpkn3pxx2iil8hrzdadh23jd6jbhvm087q1")) + "0xk4ki5zsliwknxc9a3lvpjzpckz8nx4dz55xmw9sydq5z5mmy50")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From 3619b26196f92bd9dbf265ddea65cc3884b92965 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 24 Dec 2018 22:17:17 +0200 Subject: gnu: gcompris-qt: Update to 0.95. * gnu/packages/education.scm (gcompris-qt): Update to 0.95. [arguments]: Remove custom phase to patch for qt@5.11. --- gnu/packages/education.scm | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index 567dfce58d..3487db436b 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -115,7 +115,7 @@ of categories with some of the activities available in that category. (define-public gcompris-qt (package (name "gcompris-qt") - (version "0.91") + (version "0.95") (source (origin (method url-fetch) @@ -124,18 +124,11 @@ of categories with some of the activities available in that category. version ".tar.xz")) (sha256 (base32 - "09h098w9q79hnzla1pcpqlnnr6dbafm4q6zmdp7wlk11ym8n9kvg")))) + "1aaijjx2b7k1cyx59jhs64hlp1sppw1faa81qxl5lxc79vifrlrl")))) (build-system cmake-build-system) (arguments `(#:phases (modify-phases %standard-phases - (add-after 'unpack 'patch-for-qt5.11 - (lambda _ - (substitute* "src/core/CMakeLists.txt" - (("qt5_use_modules") "target_link_libraries") - (("Qml Quick Gui Multimedia Network XmlPatterns Svg Xml Sensors Core") - "Qt5::Qml Qt5::Quick Qt5::Gui Qt5::Multimedia Qt5::Core Qt5::Svg Qt5::Xml Qt5::XmlPatterns Qt5::Sensors")) - #t)) (add-after 'install 'wrap-executable (lambda* (#:key inputs outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) -- cgit v1.2.3 From 7e48e8492a09bffa17814d00189c0c73b227a0db Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 24 Dec 2018 22:18:37 +0200 Subject: gnu: gcompris-qt: Enable tests. * gnu/packages/education.scm (gcompris-qt)[arguments]: Add custom phase to start X server before tests. Add configure flag to build tests. Enable tests. [native-inputs]: Add xorg-server. --- gnu/packages/education.scm | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index 3487db436b..ef97d58a84 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -41,6 +41,7 @@ #:use-module (gnu packages qt) #:use-module (gnu packages sdl) #:use-module (gnu packages texinfo) + #:use-module (gnu packages xorg) #:use-module (gnu packages xml) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) @@ -129,6 +130,13 @@ of categories with some of the activities available in that category. (arguments `(#:phases (modify-phases %standard-phases + (add-before 'check 'start-xorg-server + (lambda* (#:key inputs #:allow-other-keys) + ;; The test suite requires a running X server. + (system (string-append (assoc-ref inputs "xorg-server") + "/bin/Xvfb :1 &")) + (setenv "DISPLAY" ":1") + #t)) (add-after 'install 'wrap-executable (lambda* (#:key inputs outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) @@ -145,13 +153,14 @@ of categories with some of the activities available in that category. '("qtdeclarative" "qtgraphicaleffects" "qtmultimedia" "qtquickcontrols")))) #t)))) - #:configure-flags (list "-DQML_BOX2D_MODULE=disabled") - #:tests? #f)) ; no test target + #:configure-flags (list "-DQML_BOX2D_MODULE=disabled" + "-DBUILD_TESTING=TRUE"))) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) ("gettext" ,gettext-minimal) ("perl" ,perl) - ("qttools" ,qttools))) + ("qttools" ,qttools) + ("xorg-server" ,xorg-server))) (inputs `(("python-2" ,python-2) ("qtbase" ,qtbase) -- cgit v1.2.3 From 5a3f32ca758644dcfa9935f2db6a959737229f86 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 24 Dec 2018 18:01:08 -0500 Subject: gnu: darktable: Update to 2.6.0. * gnu/packages/photo.scm (darktable): Update to 2.6.0. --- 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 7b40c2361c..07047f4cf3 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -353,7 +353,7 @@ photographic equipment.") (define-public darktable (package (name "darktable") - (version "2.4.4") + (version "2.6.0") (source (origin (method url-fetch) (uri (string-append @@ -362,7 +362,7 @@ photographic equipment.") version "/darktable-" version ".tar.xz")) (sha256 (base32 - "0kdhmiw4wxk2w9v2hms9yk8nl4ymdshnqyj0l07nivzzr6w20hwn")))) + "0y04cx0a0rwdclmn16f5y0z2vnm7yxly291gzjgdhcn59a77sga8")))) (build-system cmake-build-system) (arguments `(#:tests? #f ; There are no tests. -- cgit v1.2.3 From 66b266e6df9b3b831c20820f91e55a88da4814c7 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 23 Dec 2018 20:11:18 +0200 Subject: gnu: librime: Update to 1.3.2. * gnu/packages/ibus.scm (librime): Update to 1.3.2. --- gnu/packages/ibus.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index a2687ac8c3..f68eaf35f8 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2015, 2016, 2017, 2018 Ricardo Wurmus ;;; Copyright © 2015 Andreas Enge ;;; Copyright © 2016 Chris Marusich -;;; Copyright © 2017 Efraim Flashner +;;; Copyright © 2017, 2018 Efraim Flashner ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Meiyo Peng ;;; @@ -292,7 +292,7 @@ Japanese language input in most graphical applications.") (define-public librime (package (name "librime") - (version "1.3.1") + (version "1.3.2") (source (origin (method git-fetch) @@ -301,7 +301,7 @@ Japanese language input in most graphical applications.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1y0h3nnz97smx9z8h5fzk4c27mvrwv8kajxffqc43bhyvxvb2jd6")))) + (base32 "06q10cv7a3i6d8l3sq79nasw3p1njvmjgh4jq2hqw9abcx351m1r")))) (build-system cmake-build-system) (inputs `(("boost" ,boost) -- cgit v1.2.3 From 950ebfd116d7307ef8c69686576bf37eeaea0de7 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 23 Dec 2018 20:36:27 +0200 Subject: gnu: librime: Remove bundled sources. * gnu/packages/ibus.scm (librime)[source]: Add snippet to remove bundled sources. [arguments]: Add custom phase to not search bundled headers. [native-inputs]: Add googletest, xorgproto. --- gnu/packages/ibus.scm | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index f68eaf35f8..b994beb560 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -34,6 +34,7 @@ #:use-module (gnu packages autotools) #:use-module (gnu packages base) #:use-module (gnu packages boost) + #:use-module (gnu packages check) #:use-module (gnu packages cmake) #:use-module (gnu packages databases) #:use-module (gnu packages datastructures) @@ -301,8 +302,25 @@ Japanese language input in most graphical applications.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "06q10cv7a3i6d8l3sq79nasw3p1njvmjgh4jq2hqw9abcx351m1r")))) + (base32 + "06q10cv7a3i6d8l3sq79nasw3p1njvmjgh4jq2hqw9abcx351m1r")) + (modules '((guix build utils))) + (snippet + '(begin + (delete-file-recursively "thirdparty/src") + (delete-file-recursively "thirdparty/bin") + (delete-file-recursively "thirdparty/include/X11") + #t)))) (build-system cmake-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-source + (lambda _ + (substitute* "CMakeLists.txt" + (("include_directories\\($\\{PROJECT_SOURCE_DIR\\}/thirdparty/include\\)") "") + (("link_directories\\($\\{PROJECT_SOURCE_DIR\\}/thirdparty/lib\\)") "")) + #t))))) (inputs `(("boost" ,boost) ("glog" ,glog) @@ -310,6 +328,9 @@ Japanese language input in most graphical applications.") ("marisa" ,marisa) ("opencc" ,opencc) ("yaml-cpp" ,yaml-cpp))) + (native-inputs + `(("googletest" ,googletest) + ("xorgproto" ,xorgproto))) ; keysym.h (home-page "https://rime.im/") (synopsis "The core library of Rime Input Method Engine") (description "@dfn{librime} is the core library of Rime Input Method -- cgit v1.2.3 From 522d1b87bc88dd459ade51b1ee0545937da8d3b5 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Tue, 25 Dec 2018 12:29:22 +0100 Subject: gnu: llvm@7.0.0: Update to 7.0.1. * gnu/packages/llvm.scm (llvm@7.0.0): Update to 7.0.1. Rename to llvm@7.0.1. --- gnu/packages/llvm.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 7eb785c364..6dab9c5195 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -97,10 +97,10 @@ of programming tools as well as libraries with equivalent functionality.") ;; TODO: Build Mesa with LLVM 7 in the next staging cycle. ;; TODO: Make LLVM 7 the default LLVM once Clang is also upgraded. -(define-public llvm-7.0.0 +(define-public llvm-7.0.1 (package (inherit llvm) (name "llvm") - (version "7.0.0") + (version "7.0.1") (source (origin (method url-fetch) @@ -108,7 +108,7 @@ of programming tools as well as libraries with equivalent functionality.") version "/llvm-" version ".src.tar.xz")) (sha256 (base32 - "08p27wv1pr9ql2zc3f3qkkymci46q7myvh8r5ijippnbwr2gihcb")))))) + "16s196wqzdw4pmri15hadzqgdi926zln3an2viwyq0kini6zr3d3")))))) ;; FIXME: This package is here to prevent many rebuilds on x86_64 and i686 ;; from commit fc9dbf41311d99d0fd8befc789ea7c0e35911890. Update users of -- cgit v1.2.3 From d8dcbcc91d066a48e585cdfb063b108778db1b37 Mon Sep 17 00:00:00 2001 From: Meiyo Peng Date: Sun, 23 Dec 2018 23:05:38 +0800 Subject: gnu: Add polybar. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/wm.scm (polybar): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/wm.scm | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 2e211e3892..a761bce235 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -76,6 +76,7 @@ #:use-module (gnu packages lua) #:use-module (gnu packages linux) #:use-module (gnu packages suckless) + #:use-module (gnu packages mpd) #:use-module (guix download) #:use-module (guix git-download)) @@ -1051,3 +1052,45 @@ its size @item Display preview images in a tiled icon layout @end itemize") (license license:gpl2+))) + +(define-public polybar + (package + (name "polybar") + (version "3.3.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/jaagr/polybar/releases/" + "download/" version "/polybar.tar")) + (sha256 + (base32 "0sjh3xmf11g09spi88zj7xsc3a3vv78kixab6n5i7436py7xwzb4")) + (file-name (string-append name "-" version ".tar")))) + (build-system cmake-build-system) + (arguments + ;; Test is disabled because it requires downloading googletest from the + ;; Internet. + '(#:tests? #f)) + (inputs + `(("alsa-lib" ,alsa-lib) + ("cairo" ,cairo) + ("i3-wm" ,i3-wm) + ("libmpdclient" ,libmpdclient) + ("libnl" ,libnl) + ("libxcb" ,libxcb) + ("pulseaudio" ,pulseaudio) + ("xcb-proto" ,xcb-proto) + ("xcb-util" ,xcb-util) + ("xcb-util-cursor" ,xcb-util-cursor) + ("xcb-util-image" ,xcb-util-image) + ("xcb-util-wm" ,xcb-util-wm) + ("xcb-util-xrm" ,xcb-util-xrm))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("python-2" ,python-2) ; lib/xpp depends on python 2 + ("python" ,python))) ; xcb-proto depends on python 3 + (home-page "https://polybar.github.io/") + (synopsis "Fast and easy-to-use status bar") + (description "Polybar aims to help users build beautiful and highly +customizable status bars for their desktop environment. It has built-in +functionality to display information about the most commonly used services.") + (license license:expat))) -- cgit v1.2.3 From 5895696e4c28938d9201e4527d3a007dd8b47e32 Mon Sep 17 00:00:00 2001 From: Gabriel Hondet Date: Tue, 25 Dec 2018 16:31:10 +0100 Subject: gnu: Add dedukti. * gnu/packages/ocaml.scm (dedukti): New variable. Signed-off-by: Julien Lepiller --- gnu/packages/ocaml.scm | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 3b1ddcb5b6..603db34dbd 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2017 Ben Woodcroft ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Peter Kreye +;;; Copyright © 2018 Gabriel Hondet ;;; ;;; This file is part of GNU Guix. ;;; @@ -4989,3 +4990,57 @@ provides BigN, BigZ, BigQ that used to be part of Coq standard library.") simplifying the proofs of inequalities on expressions of real numbers for the Coq proof assistant.") (license license:cecill-c))) + +(define-public dedukti + (package + (name "dedukti") + (version "2.6.0") + (home-page "https://deducteam.github.io/") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/deducteam/dedukti.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0frl3diff033i4fmq304b8wbsdnc9mvlhmwd7a3zd699ng2lzbxb")))) + (inputs + `(("menhir" ,ocaml-menhir))) + (native-inputs + `(("ocamlbuild" ,ocamlbuild))) + (build-system ocaml-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (delete 'configure) + (replace 'build + (lambda _ + (invoke "make") + #t)) + (replace 'check + (lambda _ + (invoke "make" "tests") + #t)) + (add-before 'install 'set-binpath + ;; Change binary path in the makefile + (lambda _ + (let ((out (assoc-ref %outputs "out"))) + (substitute* "GNUmakefile" + (("BINDIR = (.*)$") + (string-append "BINDIR = " out "/bin")))) + #t)) + (replace 'install + (lambda _ + (invoke "make" "install") + #t))))) + (synopsis "Proof-checker for the λΠ-calculus modulo theory, an extension of +the λ-calculus") + (description "Dedukti is a proof-checker for the λΠ-calculus modulo +theory. The λΠ-calculus is an extension of the simply typed λ-calculus with +dependent types. The λΠ-calculus modulo theory is itself an extension of the +λΠ-calculus where the context contains variable declaration as well as rewrite +rules. This system is not designed to develop proofs, but to check proofs +developed in other systems. In particular, it enjoys a minimalistic syntax.") + (license license:cecill-c))) -- cgit v1.2.3 From cfa3b7182d156753fcbdf419b152ce8285d1a0be Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 25 Dec 2018 21:16:34 +0200 Subject: gnu: translate-shell: Use 'git-fetch'. * gnu/packages/dictionaries.scm (translate-shell)[source]: Use 'git-fetch'. [arguments]: Add custom phase to remove "translate" file. --- gnu/packages/dictionaries.scm | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/dictionaries.scm b/gnu/packages/dictionaries.scm index 039ec45965..cb633c2f34 100644 --- a/gnu/packages/dictionaries.scm +++ b/gnu/packages/dictionaries.scm @@ -250,18 +250,24 @@ and a Python library.") (version "0.9.6.8") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/soimort/" name "/archive/v" - version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url"https://github.com/soimort/translate-shell.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "17yc2kwk8957wwxyih0jmsai720ai2yqyvmrqrglcncqg6zdbz9w")) - (file-name (string-append name "-" version ".tar.gz")))) + "17fc5nlc594lvmihx39h4ddmi8ja3qqsyswzxadbaz7l3zm356b8")))) (build-system gnu-build-system) (arguments `(#:phases (modify-phases %standard-phases (delete 'configure) ; no configure phase + (add-after 'unpack 'remove-unnecessary-file + ;; This file gets generated during the build phase. + (lambda _ + (delete-file "translate") + #t)) (add-after 'install 'emacs-install (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) -- cgit v1.2.3 From f76335740c8e0aff2fee70d4c1062f9f5ff87952 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 25 Dec 2018 21:45:49 +0200 Subject: gnu: translate-shell: Update to 0.9.6.9. * gnu/packages/dictionaries.scm (translate-shell): Update to 0.9.6.9. --- gnu/packages/dictionaries.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/dictionaries.scm b/gnu/packages/dictionaries.scm index cb633c2f34..e32df64ec0 100644 --- a/gnu/packages/dictionaries.scm +++ b/gnu/packages/dictionaries.scm @@ -247,7 +247,7 @@ and a Python library.") (define-public translate-shell (package (name "translate-shell") - (version "0.9.6.8") + (version "0.9.6.9") (source (origin (method git-fetch) @@ -257,7 +257,7 @@ and a Python library.") (file-name (git-file-name name version)) (sha256 (base32 - "17fc5nlc594lvmihx39h4ddmi8ja3qqsyswzxadbaz7l3zm356b8")))) + "1xyf0vdxmbgqcgsr1gvgwh1q4fh080h68radkim6pfcwzffliszm")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From cf51b828af5358c1303bbb797f58433dd8d4c043 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 25 Dec 2018 21:57:09 +0200 Subject: gnu: translate-shell: Wrap binary. * gnu/packages/dictionaries.scm (translate-shell)[arguments]: Add custom phase to wrap the 'trans' binary with the inputs. [native-inputs]: Move curl, fribidi, rlwrap ... [inputs]: ... to here. --- gnu/packages/dictionaries.scm | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/dictionaries.scm b/gnu/packages/dictionaries.scm index e32df64ec0..9e06ac7124 100644 --- a/gnu/packages/dictionaries.scm +++ b/gnu/packages/dictionaries.scm @@ -268,6 +268,20 @@ and a Python library.") (lambda _ (delete-file "translate") #t)) + (add-after 'install 'wrap-binary + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin/trans")) + (curl (assoc-ref inputs "curl")) + (fribidi (assoc-ref inputs "fribidi")) + (rlwrap (assoc-ref inputs "rlwrap"))) + (wrap-program bin + `("PATH" ":" prefix + (,(string-append out "/bin:" + curl "/bin:" + fribidi "/bin:" + rlwrap "/bin"))))) + #t)) (add-after 'install 'emacs-install (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -283,7 +297,7 @@ and a Python library.") (guix build emacs-utils) (guix build utils)) #:test-target "test")) - (propagated-inputs + (inputs `(("curl" ,curl) ("fribidi" ,fribidi) ("rlwrap" ,rlwrap))) -- cgit v1.2.3 From fb075e2fda6d95e204d948357a28c36cfd7a446a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 26 Dec 2018 11:15:15 +0200 Subject: gnu: python-apache-libcloud: Update to 2.4.0. * gnu/packages/python.scm (python-apache-libcloud): Update to 2.4.0. --- gnu/packages/python.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index bb4c5ab760..9ef0654cb8 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -12637,14 +12637,14 @@ validating Swagger API specifications.") (define-public python-apache-libcloud (package (name "python-apache-libcloud") - (version "2.3.0") + (version "2.4.0") (source (origin (method url-fetch) (uri (pypi-uri "apache-libcloud" version)) (sha256 - (base32 - "15xg79ad4g2xrk081ylvj41k5hmg9hl1xvbmb5hd0fqn08wfwbhf")))) + (base32 + "0daj3mkzw79v5zin2r1s2wkrz1hplfc16bwj4ss68i5qjq4l2p0j")))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.2.3 From fb4fcfab9d961726436d165252042a2e711bb6da Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 26 Dec 2018 11:34:22 +0200 Subject: gnu: python-gpg: Update to 1.10.0. * gnu/packages/gnupg.scm (python-gpg): Update to 1.10.0. [arguments]: Add custom phase to set 'gcc' call. --- gnu/packages/gnupg.scm | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 53fdc8200c..951fc05fa2 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -471,16 +471,23 @@ interface (FFI) of Guile.") (define-public python-gpg (package (name "python-gpg") - (version "1.8.0") + (version "1.10.0") (source (origin (method url-fetch) (uri (pypi-uri "gpg" version)) (sha256 (base32 - "1x74i6q713c0bckls7rdm8kgsmllf9qvy9x62jghszlhgjkyh9nd")))) + "1ji3ynhp36m1ccx7bmaq75dhij9frpn19v9mpi4aajn8csl194il")))) (build-system python-build-system) (arguments - '(#:tests? #f)) ; No test suite. + '(#:phases + (modify-phases %standard-phases + (add-before 'build 'set-environment + (lambda _ + (substitute* "setup.py" + (("cc") (which "gcc"))) + #t))) + #:tests? #f)) ; No test suite. (inputs `(("gpgme" ,gpgme))) (native-inputs -- cgit v1.2.3 From 10275b7466853fce6d5b925f0267c20c304ba25a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 26 Dec 2018 12:28:58 +0200 Subject: gnu: python-openid: Update to 3.1.0. * gnu/packages/python-web.scm (python-openid): Update to 3.1.0. [arguments]: Update custom 'check phase. [native-inputs]: Add python-coverage. --- gnu/packages/python-web.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index a5b4b7578d..8412325377 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -509,27 +509,28 @@ is Python’s.") (define-public python-openid (package (name "python-openid") - (version "3.0.10") + (version "3.1.0") (source (origin (method url-fetch) (uri (pypi-uri "python3-openid" version)) (sha256 (base32 - "1x3nh3fycqfn43jp5j5pb4q4y2jxp4mdka4absaa3bc0078qd758")))) + "00l5hrjh19740w00b3fnsqldnla41wbr2rics09dl4kyd1fkd3b2")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases (replace 'check (lambda _ - (invoke "./admin/runtests") - #t))))) + (invoke "coverage" "run" "-m" + "unittest" "openid.test.test_suite")))))) (properties `((python2-variant . ,(delay python2-openid)))) (propagated-inputs `(("python-defusedxml" ,python-defusedxml))) (native-inputs - `(("python-psycopg2" ,python-psycopg2) + `(("python-coverage" ,python-coverage) + ("python-psycopg2" ,python-psycopg2) ("python-django" ,python-django))) (home-page "https://github.com/necaris/python3-openid") (synopsis "OpenID support for servers and consumers") -- cgit v1.2.3