From da358e8c88293de23daf746d1b9e87df856b56ac Mon Sep 17 00:00:00 2001 From: Jan Wielkiewicz Date: Fri, 15 May 2020 02:47:05 +0200 Subject: gnu: Add ffmpeg-jami. This package is needed because Jami uses a modified version of ffmpeg, which provides GPU hardware acceleration, automatical adapting of bitrate and extra codecs. Because of the configure flags list being long, it is better to keep them separated in variables, instead of littering the package definition. * gnu/packages/jami.scm (ffmpeg-jami, %ffmpeg-default-configure-flags, %ffmpeg-linux-configure-flags, %ffmpeg-linux-x86-configure-flags): New variables. (ffmpeg-compose-configure-flags): New procedure. (libring)[inputs]: Use ffmpeg-jami instead of ffmpeg. Signed-off-by: Mathieu Othacehe --- gnu/packages/jami.scm | 256 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 254 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index 84f1d92d34..d5cb3b62f6 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -59,7 +59,8 @@ #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix packages) - #:use-module (guix utils)) + #:use-module (guix utils) + #:use-module (srfi srfi-1)) (define %jami-version "20200401.1.6f090de") @@ -186,6 +187,257 @@ "selftest: pjlib-test pjlib-util-test pjmedia-test")) #t))))))) +;; The following variables are configure flags used by ffmpeg-jami. They're +;; from the ring-project/daemon/contrib/src/ffmpeg/rules.mak file. We try to +;; keep it as close to the official Jami package as possible, to provide all +;; the codecs and extra features that are expected. +;; +;; See: +;; https://review.jami.net/plugins/gitiles/ring-daemon/+/refs/heads/master/contrib/src/ffmpeg/rules.mak + +(define %ffmpeg-default-configure-flags + '("--disable-everything" + "--enable-zlib" + "--enable-gpl" + "--enable-swscale" + "--enable-bsfs" + "--disable-filters" + "--disable-programs" + "--disable-postproc" + "--disable-protocols" + "--enable-protocol=crypto" + "--enable-protocol=file" + "--enable-protocol=rtp" + "--enable-protocol=srtp" + "--enable-protocol=tcp" + "--enable-protocol=udp" + "--enable-protocol=unix" + "--enable-protocol=pipe" + + ;; enable muxers/demuxers + "--disable-demuxers" + "--disable-muxers" + "--enable-muxer=rtp" + "--enable-muxer=g722" + "--enable-muxer=h263" + "--enable-muxer=h264" + "--enable-muxer=hevc" + "--enable-muxer=webm" + "--enable-muxer=ogg" + "--enable-muxer=pcm_s16be" + "--enable-muxer=pcm_s16le" + "--enable-demuxer=rtp" + "--enable-demuxer=mjpeg" + "--enable-demuxer=mjpeg_2000" + "--enable-demuxer=mpegvideo" + "--enable-demuxer=gif" + "--enable-demuxer=image_jpeg_pipe" + "--enable-demuxer=image_png_pipe" + "--enable-demuxer=image_webp_pipe" + "--enable-demuxer=matroska" + "--enable-demuxer=m4v" + "--enable-demuxer=mp3" + "--enable-demuxer=ogg" + "--enable-demuxer=flac" + "--enable-demuxer=wav" + "--enable-demuxer=ac3" + "--enable-demuxer=g722" + "--enable-demuxer=pcm_mulaw" + "--enable-demuxer=pcm_alaw" + "--enable-demuxer=pcm_s16be" + "--enable-demuxer=pcm_s16le" + "--enable-demuxer=h263" + "--enable-demuxer=h264" + "--enable-demuxer=hevc" + + ;; enable parsers + "--enable-parser=h263" + "--enable-parser=h264" + "--enable-parser=hevc" + "--enable-parser=mpeg4video" + "--enable-parser=vp8" + "--enable-parser=vp9" + "--enable-parser=opus" + + ;; encoders/decoders + "--enable-encoder=adpcm_g722" + "--enable-decoder=adpcm_g722" + "--enable-encoder=rawvideo" + "--enable-decoder=rawvideo" + "--enable-encoder=libx264" + "--enable-decoder=h264" + "--enable-encoder=pcm_alaw" + "--enable-decoder=pcm_alaw" + "--enable-encoder=pcm_mulaw" + "--enable-decoder=pcm_mulaw" + "--enable-encoder=mpeg4" + "--enable-decoder=mpeg4" + "--enable-encoder=libvpx_vp8" + "--enable-decoder=vp8" + "--enable-decoder=vp9" + "--enable-encoder=h263" + "--enable-encoder=h263p" + "--enable-decoder=h263" + "--enable-encoder=mjpeg" + "--enable-decoder=mjpeg" + "--enable-decoder=mjpegb" + "--enable-libspeex" + "--enable-libopus" + "--enable-libvpx" + "--enable-libx264" + "--enable-encoder=libspeex" + "--enable-decoder=libspeex" + "--enable-encoder=libopus" + "--enable-decoder=libopus" + + ;; decoders for ringtones and audio streaming + "--enable-decoder=flac" + "--enable-decoder=vorbis" + "--enable-decoder=aac" + "--enable-decoder=ac3" + "--enable-decoder=eac3" + "--enable-decoder=mp3" + "--enable-decoder=pcm_u24be" + "--enable-decoder=pcm_u24le" + "--enable-decoder=pcm_u32be" + "--enable-decoder=pcm_u32le" + "--enable-decoder=pcm_u8" + "--enable-decoder=pcm_f16le" + "--enable-decoder=pcm_f24le" + "--enable-decoder=pcm_f32be" + "--enable-decoder=pcm_f32le" + "--enable-decoder=pcm_f64be" + "--enable-decoder=pcm_f64le" + "--enable-decoder=pcm_s16be" + "--enable-decoder=pcm_s16be_planar" + "--enable-decoder=pcm_s16le" + "--enable-decoder=pcm_s16le_planar" + "--enable-decoder=pcm_s24be" + "--enable-decoder=pcm_s24le" + "--enable-decoder=pcm_s24le_planar" + "--enable-decoder=pcm_s32be" + "--enable-decoder=pcm_s32le" + "--enable-decoder=pcm_s32le_planar" + "--enable-decoder=pcm_s64be" + "--enable-decoder=pcm_s64le" + "--enable-decoder=pcm_s8" + "--enable-decoder=pcm_s8_planar" + "--enable-decoder=pcm_u16be" + "--enable-decoder=pcm_u16le" + + ;; encoders/decoders for images + "--enable-encoder=gif" + "--enable-decoder=gif" + "--enable-encoder=jpegls" + "--enable-decoder=jpegls" + "--enable-encoder=ljpeg" + "--enable-decoder=jpeg2000" + "--enable-encoder=png" + "--enable-decoder=png" + "--enable-encoder=bmp" + "--enable-decoder=bmp" + "--enable-encoder=tiff" + "--enable-decoder=tiff" + + ;; filters + "--enable-filter=scale" + "--enable-filter=overlay" + "--enable-filter=amix" + "--enable-filter=amerge" + "--enable-filter=aresample" + "--enable-filter=format" + "--enable-filter=aformat" + "--enable-filter=fps" + "--enable-filter=transpose" + "--enable-filter=pad")) + +(define %ffmpeg-linux-configure-flags + '("--enable-pic" + "--extra-cxxflags=-fPIC" + "--extra-cflags=-fPIC" + "--target-os=linux" + "--enable-indev=v4l2" + "--enable-indev=xcbgrab" + "--enable-vdpau" + "--enable-hwaccel=h264_vdpau" + "--enable-hwaccel=mpeg4_vdpau" + "--enable-vaapi" + "--enable-hwaccel=h264_vaapi" + "--enable-hwaccel=mpeg4_vaapi" + "--enable-hwaccel=h263_vaapi" + "--enable-hwaccel=vp8_vaapi" + "--enable-hwaccel=mjpeg_vaapi" + "--enable-hwaccel=hevc_vaapi" + "--enable-encoder=h264_vaapi" + "--enable-encoder=vp8_vaapi" + "--enable-encoder=mjpeg_vaapi" + "--enable-encoder=hevc_vaapi")) + +;; ffnvcodec is not supported on ARM then we enable it here for i386 and +;; x86_64 architectures. +(define %ffmpeg-linux-x86-configure-flags + '("--arch=x86" + "--enable-cuvid" + "--enable-ffnvcodec" + "--enable-nvdec" + "--enable-nvenc" + "--enable-hwaccel=h264_nvdec" + "--enable-hwaccel=hevc_nvdec" + "--enable-hwaccel=vp8_nvdec" + "--enable-hwaccel=mjpeg_nvdec" + "--enable-encoder=h264_nvenc" + "--enable-encoder=hevc_nvenc")) + +;; This procedure composes the configure flags list for ffmpeg-jami. +(define (ffmpeg-compose-configure-flags) + (define (system=? s) + (string-prefix? s (%current-system))) + + `(,@%ffmpeg-default-configure-flags + ,@(if (string-contains (%current-system) "linux") + (if (or (system=? "i686") + (system=? "x86_64")) + (append %ffmpeg-linux-configure-flags + %ffmpeg-linux-x86-configure-flags) + %ffmpeg-linux-configure-flags) + '()))) + +(define-public ffmpeg-jami + (package + (inherit ffmpeg) + (name "ffmpeg-jami") + (native-inputs + `(("sfl-patches" ,(jami-source)) + ("libiconv" ,libiconv) + ,@(package-native-inputs ffmpeg))) + (supported-systems '("x86_64-linux" "i686-linux" + "aarch64-linux" "armhf-linux")) + (arguments + (append + '(#:tests? #f) + (substitute-keyword-arguments (package-arguments ffmpeg) + ((#:configure-flags '()) + (ffmpeg-compose-configure-flags)) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'unpack 'make-git-checkout-writable + (lambda _ + (for-each make-file-writable (find-files ".")) + #t)) + (add-after 'unpack 'apply-patches + (lambda* (#:key inputs #:allow-other-keys) + (let ((jami-apply-dependency-patches + ,jami-apply-dependency-patches)) + ;; These patches come from: + ;; "ring-project/daemon/contrib/src/ffmpeg/rules.mak". + (jami-apply-dependency-patches #:inputs inputs + #:dep-name "ffmpeg" + #:patches + '("remove-mjpeg-log" + "change-RTCP-ratio" + "rtp_ext_abs_send_time")) + #t)))))))))) + (define-public libring (package (name "libring") @@ -197,7 +449,7 @@ ("boost" ,boost) ("dbus-c++" ,dbus-c++) ("eudev" ,eudev) - ("ffmpeg" ,ffmpeg) + ("ffmpeg" ,ffmpeg-jami) ("flac" ,flac) ("gmp" ,gmp) ("gsm" ,gsm) -- cgit v1.2.3 From afc46f22672eb3218fbd1e567f85fc6367286461 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 15 May 2020 09:37:58 +0200 Subject: gnu: openrct2: Update to 0.2.6. * gnu/packages/games.scm (openrct2): Update to 0.2.6. --- gnu/packages/games.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 63977f9c47..f7b21ce44f 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -3328,7 +3328,7 @@ Transport Tycoon Deluxe.") (define-public openrct2 (package (name "openrct2") - (version "0.2.4") + (version "0.2.6") (source (origin (method git-fetch) @@ -3337,7 +3337,7 @@ Transport Tycoon Deluxe.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1rlw3w20llg36sj3bk50g661qw766ng8ma3p42sdkj8br9dw800h")))) + (base32 "1vikbkg3wh5ngzdfilb6irbh6nqinf138qpdz8wz9izlvl8s36k4")))) (build-system cmake-build-system) (arguments `(#:configure-flags (list "-DDOWNLOAD_OBJECTS=OFF" -- cgit v1.2.3 From 729cfbdd07f95e60a44dfcdccdbda6696b265b5d Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 14 May 2020 20:50:42 -0400 Subject: gnu: blueman: Enable AppIndicator. * gnu/packages/networking.scm (blueman) [arguments]: Remove --disable -appindicator configure-flag. [inputs]: Add libappindicator. Signed-off-by: Pierre Neidhardt --- gnu/packages/networking.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 7ae1240e15..42a3609ac2 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -87,6 +87,7 @@ #:use-module (gnu packages dejagnu) #:use-module (gnu packages documentation) #:use-module (gnu packages flex) + #:use-module (gnu packages freedesktop) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) @@ -140,7 +141,6 @@ (build-system glib-or-gtk-build-system) (arguments `(#:configure-flags (list "--enable-polkit" - "--disable-appindicator" ; Not available "--without-systemdsystemunitdir" ; Not required "--without-systemduserunitdir") ; Not required #:phases @@ -232,6 +232,7 @@ ("pycairo" ,python-pycairo) ("pygobject" ,python-pygobject) ("python" ,python-wrapper) + ("libappindicator" ,libappindicator) ("libnm" ,network-manager))) (synopsis "GTK+ Bluetooth manager") (description "Blueman is a Bluetooth management utility using the Bluez -- cgit v1.2.3 From 04191985cc7581148bf3f3872f6deb20b6a98514 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Thu, 14 May 2020 23:03:10 +0200 Subject: gnu: chirp: Update to 20200430. * gnu/packages/radio.scm (chirp): Update to 20200430. --- gnu/packages/radio.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index 123357a2bc..f5dbbf7838 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -159,7 +159,7 @@ this package. E.g.: @code{(udev-rules-service 'rtl-sdr rtl-sdr)}") (define-public chirp (package (name "chirp") - (version "20181205") + (version "20200430") (source (origin (method url-fetch) @@ -167,7 +167,7 @@ this package. E.g.: @code{(udev-rules-service 'rtl-sdr rtl-sdr)}") version "/chirp-daily-" version ".tar.gz")) (sha256 (base32 - "1cp280b95j39xaxs50zn55jigg7pyfpm9n098hmsyxrplqn8z43c")))) + "060fzplgmpfrk6wkfaasx7phpfk90mmylk6drbwzk4f9r1655vda")))) (build-system python-build-system) (inputs `(("python2-libxml2" ,python2-libxml2) -- cgit v1.2.3 From e3c3fb1d39657d1681a0e05e5a03dc5cc93bcdf0 Mon Sep 17 00:00:00 2001 From: Ekaitz Zarraga Date: Thu, 14 May 2020 16:55:32 +0200 Subject: gnu: Add openctm. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/engineering.scm (openctm): New Variable. Co-authored-by: Ludovic Courtès --- gnu/packages/engineering.scm | 58 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 172f8481eb..190632436b 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -17,6 +17,7 @@ ;;; Copyright © 2020 Brice Waegeneire ;;; Copyright © 2020 Vincent Legoll ;;; Copyright © 2020 Marius Bakke +;;; Copyright © 2020 Ekaitz Zarraga ;;; ;;; This file is part of GNU Guix. ;;; @@ -38,6 +39,7 @@ #:use-module (guix download) #:use-module (guix gexp) #:use-module (guix git-download) + #:use-module (guix svn-download) #:use-module (guix monads) #:use-module (guix store) #:use-module (guix utils) @@ -2533,3 +2535,59 @@ without any changes. And programmers that are familiar with the magellan API can continue using it with a free library without the restrictions of the official SDK.") (license license:bsd-3))) + +(define-public openctm + (let ((revision 603)) + ;; Previous versions don't compile, they need to link libGL and libGLU. + ;; Fixed in this revision. + (package + (name "openctm") + (version (string-append "1.0.3." (number->string revision))) + (source + (origin + (method svn-fetch) + (uri (svn-reference + (url "https://svn.code.sf.net/p/openctm/code/trunk") + (revision revision))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 "01wb70m48xh5gwhv60a5brv4sxl0i0rh038w32cgnlxn5x86s9f1")))) + (build-system gnu-build-system) + (native-inputs + `(("mesa" ,mesa) + ("glu" ,glu) + ("glut" ,freeglut) + ("gtk" ,gtk+-2) + ("pkg-config" ,pkg-config))) + (arguments + `(#:tests? #f ;no tests + #:phases + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (rename-file "Makefile.linux" "Makefile") + (let ((out (assoc-ref outputs "out"))) + ;; Create output directories. + (mkdir-p (string-append out "/lib")) + (mkdir-p (string-append out "/include")) + (mkdir-p (string-append out "/bin")) + ;; Fix rpath. + (substitute* "tools/Makefile.linux" + (("-rpath,\\.") + (string-append "-rpath," out "/lib/")) + (("/usr/local") + out)) + ;; Set right output. + (substitute* "Makefile" + (("/usr/lib") + (string-append out "/lib")) + (("\\/usr\\/local") + out)) + #t)))))) + (synopsis "3D triangle mesh format and related tools and libraries") + (description "OpenCTM is a file format, a software library and a tool set +for compression of 3D triangle meshes. The geometry is compressed to a +fraction of comparable file formats (3DS, STL, COLLADA...), and the format is +accessible through a simple API") + (license license:zlib) + (home-page "http://openctm.sourceforge.net/")))) -- cgit v1.2.3 From e9c6aed15dfd1c6cbb61bb7645bb3c6c0ac02b46 Mon Sep 17 00:00:00 2001 From: Jonathan Brielmaier Date: Wed, 13 May 2020 12:24:47 +0200 Subject: gnu: libqmatrixclient: Update to 0.5.3.2. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/messaging.scm (libqmatrixclient): Update to 0.5.3.2. [source]: Name changed to libquotient, will be visible in 0.6. Signed-off-by: Ludovic Courtès --- gnu/packages/messaging.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 0ba166b591..7f1bfc9072 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1803,16 +1803,16 @@ notifications, and Python scripting support.") (define-public libqmatrixclient (package (name "libqmatrixclient") - (version "0.5.2") + (version "0.5.3.2") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/QMatrixClient/libqmatrixclient") + (url "https://github.com/quotient-im/libQuotient") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1bhlqfs7251fss4icx794ka614npr6zyrpp4qwc4q5408ykfm7lr")))) + (base32 "0gkwr3yw6k2m0j8cc085b5p2q788rf5nhp1p5hc5d55pc7mci2qs")))) (build-system cmake-build-system) (inputs `(("qtbase" ,qtbase) -- cgit v1.2.3 From 35d1ac7fd805b4258bfb52091af7ac8c5628b27b Mon Sep 17 00:00:00 2001 From: Jonathan Brielmaier Date: Wed, 13 May 2020 12:28:35 +0200 Subject: gnu: quaternion: Update to 0.0.9.4e. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/messaging.scm (quaternion): Update to 0.0.9.4e. [source]: Upstream moved the repo to quotient-im namespace. Signed-off-by: Ludovic Courtès --- gnu/packages/messaging.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 7f1bfc9072..7e30eeae75 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1955,16 +1955,16 @@ There is support for: (define-public quaternion (package (name "quaternion") - (version "0.0.9.4c") + (version "0.0.9.4e") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/QMatrixClient/Quaternion") + (url "https://github.com/quotient-im/Quaternion") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0gpv6b3nn3lsyym8809kiqkpdszfasldqjpk5s542zyn41gdlql4")))) + (base32 "0hqhg7l6wpkdbzrdjvrbqymmahziri07ba0hvbii7dd2p0h248fv")))) (build-system qt-build-system) (inputs `(("libqmatrixclient" ,libqmatrixclient) -- cgit v1.2.3 From 1130e8c8178386cf6d34c4ede7be0f5a9d30ad52 Mon Sep 17 00:00:00 2001 From: Edouard Klein Date: Tue, 12 May 2020 13:29:03 +0200 Subject: gnu: Add python-selenium. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-web.scm (python-selenium): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/python-web.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 88ba88e2e2..d64f698dbc 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -3746,3 +3746,26 @@ in Python with a focus on correctness and simplicity. Built on top of @code{asyncio}, Python's standard asynchronous I/O framework, it provides an elegant coroutine-based API.") (license license:bsd-3))) + +(define-public python-selenium + (package + (name "python-selenium") + (version "3.141.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "selenium" version)) + (sha256 + (base32 + "039hf9knvl4s3hp21bzwsp1g5ri9gxsh504dp48lc6nr1av35byy")))) + (build-system python-build-system) + (propagated-inputs + `(("python-urllib3" ,python-urllib3))) + (home-page + "https://github.com/SeleniumHQ/selenium/") + (synopsis "Python bindings for Selenium") + (description "Selenium enables web browser automation. +Selenium specifically provides infrastructure for the W3C WebDriver specification +— a platform and language-neutral coding interface compatible with all +major web browsers.") + (license license:asl2.0))) -- cgit v1.2.3 From b7a1cac603817dce2d717b490d2bff29bee46ac6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 14 May 2020 21:31:42 +0200 Subject: gnu: openjdk9: Simplify snippet. * gnu/packages/java.scm (openjdk9)[source]: Use only one find-files invocation. --- gnu/packages/java.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index e2f79c3dc5..d03d783448 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus +;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus ;;; Copyright © 2016 Leo Famulari ;;; Copyright © 2016, 2017 Roel Janssen ;;; Copyright © 2017, 2019 Carlo Zancanaro @@ -1808,9 +1808,8 @@ new Date();")) (modules '((guix build utils))) (snippet `(begin - (for-each delete-file (find-files "." ".*.bin$")) - (for-each delete-file (find-files "." ".*.exe$")) - (for-each delete-file (find-files "." ".*.jar$")) + (for-each delete-file + (find-files "." ".*.(bin|exe|jar)$")) #t)))) (build-system gnu-build-system) (outputs '("out" "jdk" "doc")) -- cgit v1.2.3 From f5789c265de99952ec703c3a5d8a2bfc1d9aa4d2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 14 May 2020 21:32:30 +0200 Subject: gnu: openjdk9: Build in parallel. * gnu/packages/java.scm (openjdk9)[arguments]: Add phase "write-source-revision-file"; replace "build" phase; add make-flags; remove GUIX_LD_WRAPPER_ALLOW_IMPURITIES. --- gnu/packages/java.scm | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index d03d783448..ef7796f681 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1815,6 +1815,7 @@ new Date();")) (outputs '("out" "jdk" "doc")) (arguments `(#:tests? #f; require jtreg + #:make-flags '("all") #:imported-modules ((guix build syscalls) ,@%gnu-build-system-modules) @@ -1839,14 +1840,20 @@ new Date();")) "--with-libjpeg=system" (string-append "--prefix=" (assoc-ref outputs "out"))) #t)) - (replace 'build + (add-before 'build 'write-source-revision-file (lambda _ (with-output-to-file ".src-rev" (lambda _ (display ,version))) - (setenv "GUIX_LD_WRAPPER_ALLOW_IMPURITIES" "yes") - (invoke "make" "all") #t)) + (replace 'build + (lambda* (#:key make-flags parallel-build? #:allow-other-keys) + (apply invoke "make" + `(,@(if parallel-build? + (list (string-append "JOBS=" + (number->string (parallel-job-count)))) + '()) + ,@make-flags)))) ;; Some of the libraries in the lib/ folder link to libjvm.so. ;; But that shared object is located in the server/ folder, so it ;; cannot be found. This phase creates a symbolic link in the @@ -1919,8 +1926,7 @@ new Date();")) (native-inputs `(("icedtea-8" ,icedtea-8) ("icedtea-8:jdk" ,icedtea-8 "jdk") - ;; XXX: The build system is not particularly parallel safe and - ;; fails with newer versions of GNU Make. + ;; XXX: The build system fails with newer versions of GNU Make. ("make@4.2" ,gnu-make-4.2) ("unzip" ,unzip) ("which" ,which) -- cgit v1.2.3 From 49ad6aec80394379c6b63e8c88608a104e1b5e40 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 14 May 2020 22:07:02 +0200 Subject: gnu: openjdk10: Simplify snippet. * gnu/packages/java.scm (openjdk10)[source]: Use regular expression in find-files. --- gnu/packages/java.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index ef7796f681..ba98182ede 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1954,9 +1954,7 @@ new Date();")) (modules '((guix build utils))) (snippet `(begin - (for-each delete-file (find-files "." ".*.bin$")) - (for-each delete-file (find-files "." ".*.exe$")) - (for-each delete-file (find-files "." ".*.jar$")) + (for-each delete-file (find-files "." ".*.(bin|exe|jar)$")) #t)))) (arguments (substitute-keyword-arguments (package-arguments openjdk9) -- cgit v1.2.3 From 62d46ad6131b45b07e949808304e5cf15515516e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 15 May 2020 00:12:49 +0200 Subject: gnu: openjdk11: Simplify snippet. * gnu/packages/java.scm (openjdk11)[source]: Use regular expression in find-files. --- gnu/packages/java.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index ba98182ede..f76dfc8681 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2001,9 +2001,7 @@ new Date();")) (modules '((guix build utils))) (snippet `(begin - (for-each delete-file (find-files "." ".*.bin$")) - (for-each delete-file (find-files "." ".*.exe$")) - (for-each delete-file (find-files "." ".*.jar$")) + (for-each delete-file (find-files "." ".*.(bin|exe|jar)$")) #t)))) (build-system gnu-build-system) (outputs '("out" "jdk" "doc")) -- cgit v1.2.3 From 7b82e1cdbed4c3a44ecbb99f754580a9e6a1b0ae Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 15 May 2020 00:15:25 +0200 Subject: gnu: openjdk11: Build in parallel. * gnu/packages/java.scm (openjdk11)[arguments]: Remove #:parallel-build?, #:parallel-tests?, and #:make-flags options; add "write-source-revision-file"; replace "build" phase; do not set GUIX_LD_WRAPPER_ALLOW_IMPURITIES; pass JOBS variable to make in "build" and "build-jre" phases. --- gnu/packages/java.scm | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index f76dfc8681..d74f0af9d9 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2013,11 +2013,6 @@ new Date();")) ,@%gnu-build-system-modules) #:tests? #f; requires jtreg ;; TODO package jtreg - ;; disable parallel builds, as the openjdk build system does not like -j - #:parallel-build? #f - #:parallel-tests? #f - ;; reenable parallel builds and tests by adding the flags manually - #:make-flags (list (string-append "JOBS=" (number->string (parallel-job-count)))) #:configure-flags `("--disable-option-checking" ; --enable-fast-install default flag errors otherwise "--disable-warnings-as-errors" @@ -2034,7 +2029,6 @@ new Date();")) (assoc-ref %build-inputs "freetype") "/include") ,(string-append "--with-freetype-lib=" (assoc-ref %build-inputs "freetype") "/lib")) - ;; TODO #:phases (modify-phases %standard-phases (add-after 'patch-source-shebangs 'fix-java-shebangs @@ -2044,22 +2038,32 @@ new Date();")) (substitute* "make/data/blacklistedcertsconverter/blacklisted.certs.pem" (("^#!.*") "#! java BlacklistedCertsConverter SHA-256\n")) #t)) - (replace 'build + (add-before 'build 'write-source-revision-file (lambda _ (with-output-to-file ".src-rev" (lambda _ (display ,version))) - (setenv "GUIX_LD_WRAPPER_ALLOW_IMPURITIES" "yes") - (invoke "make" "all") #t)) + (replace 'build + (lambda* (#:key parallel-build? make-flags #:allow-other-keys) + (apply invoke "make" "all" + `(,@(if parallel-build? + (list (string-append "JOBS=" + (number->string (parallel-job-count)))) + '()) + ,@make-flags)))) ;; jdk 11 does not build jre by default any more ;; building it anyways ;; for further information see: ;; https://github.com/AdoptOpenJDK/openjdk-build/issues/356 (add-after 'build 'build-jre - (lambda _ - (invoke "make" "legacy-jre-image") - #t)) + (lambda* (#:key parallel-build? make-flags #:allow-other-keys) + (apply invoke "make" "legacy-jre-image" + `(,@(if parallel-build? + (list (string-append "JOBS=" + (number->string (parallel-job-count)))) + '()) + ,@make-flags)))) (replace 'install (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out")) -- cgit v1.2.3 From c7c9370dd7c5d2dfc038cbbec802f0f001af158f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 15 May 2020 00:32:05 +0200 Subject: gnu: openjdk12: Simplify snippet. * gnu/packages/java.scm (openjdk12)[source]: Use regular expression in find-files. --- gnu/packages/java.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index d74f0af9d9..c0ec683ebe 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2231,9 +2231,7 @@ new Date();")) (modules '((guix build utils))) (snippet `(begin - (for-each delete-file (find-files "." ".*.bin$")) - (for-each delete-file (find-files "." ".*.exe$")) - (for-each delete-file (find-files "." ".*.jar$")) + (for-each delete-file (find-files "." ".*.(bin|exe|jar)$")) #t)))) (inputs `(("alsa-lib" ,alsa-lib) -- cgit v1.2.3 From ef9652ef4e6556fd85bc84dca53dfe97f518b060 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Fri, 15 May 2020 13:36:45 +0200 Subject: gnu: rottlog: Fix aarch64 cross-compilation. * gnu/packages/admin.scm (rottlog)[arguments]: Add a 'fix-configure phase to replace outdated config.sub and config.guess, without aarch64 support, [native-inputs]: add "automake". --- gnu/packages/admin.scm | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 6083691e19..9822ba8a9b 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1229,7 +1229,7 @@ at once based on a Perl regular expression.") #t)))) (build-system gnu-build-system) (arguments - '(#:configure-flags (list "ROTT_ETCDIR=/etc/rottlog" ;rc file location + `(#:configure-flags (list "ROTT_ETCDIR=/etc/rottlog" ;rc file location "--localstatedir=/var") ;; Install example config files in OUT/etc. @@ -1243,6 +1243,20 @@ at once based on a Perl regular expression.") (substitute* "rc/rc" (("/usr/sbin/sendmail") "sendmail")) #t)) + (add-after 'unpack 'fix-configure + (lambda* (#:key inputs native-inputs #:allow-other-keys) + ;; Replace outdated config.sub and config.guess: + (for-each (lambda (file) + (install-file + (string-append + (assoc-ref + (or native-inputs inputs) "automake") + "/share/automake-" + ,(version-major+minor + (package-version automake)) + "/" file) ".")) + '("config.sub" "config.guess")) + #t)) (add-after 'build 'set-packdir (lambda _ ;; Set a default location for archived logs. @@ -1263,6 +1277,7 @@ at once based on a Perl regular expression.") (lambda _ (invoke "make" "install-info")))))) (native-inputs `(("texinfo" ,texinfo) + ("automake" ,automake) ("util-linux" ,util-linux))) ; for 'cal' (home-page "https://www.gnu.org/software/rottlog/") (synopsis "Log rotation and management") -- cgit v1.2.3 From 89651117686da547ac6b1a97dbfeee601dd06934 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 15 May 2020 14:44:28 +0200 Subject: gnu: ocaml-octavius: Update to 1.2.2. * gnu/packages/ocaml.scm (ocaml-octavius): Update to 1.2.2. --- gnu/packages/ocaml.scm | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 525854676f..39d56e9fe0 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -4429,7 +4429,7 @@ storage of large amounts of data.") (define-public ocaml-octavius (package (name "ocaml-octavius") - (version "1.2.1") + (version "1.2.2") (source (origin (method git-fetch) (uri (git-reference @@ -4438,8 +4438,17 @@ storage of large amounts of data.") (file-name (git-file-name name version)) (sha256 (base32 - "1ck6yj6z5rvqyl39rz87ca1bnk0f1dpgvlk115631hjh8bwpfvfq")))) + "1c5m51xcn2jv42kjjpklr6g63sgx1k885wfdp1yr4wrmiaj9cbpx")))) (build-system dune-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'build 'make-writable + (lambda _ + (for-each (lambda (file) + (chmod file #o644)) + (find-files "." ".")) + #t))))) (properties `((upstream-name . "octavius"))) (home-page "https://github.com/ocaml-doc/octavius") (synopsis "Ocamldoc comment syntax parser") -- cgit v1.2.3 From bee8c8acd7a6c79a7786cec0400d83a2bd8819b4 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 15 May 2020 14:48:46 +0200 Subject: gnu: ocaml-fileutils: Update to 0.6.2. * gnu/packages/ocaml.scm (ocaml-fileutils): Update to 0.6.2. --- gnu/packages/ocaml.scm | 25 ++++--------------------- 1 file changed, 4 insertions(+), 21 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 39d56e9fe0..beb5258b32 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2453,7 +2453,7 @@ compatibility with older compiler to use these new features in their code.") (define-public ocaml-fileutils (package (name "ocaml-fileutils") - (version "0.6.0") + (version "0.6.2") (source (origin (method git-fetch) (uri (git-reference @@ -2462,29 +2462,12 @@ compatibility with older compiler to use these new features in their code.") (file-name (git-file-name name version)) (sha256 (base32 - "06gxbqfssl16xc8y4d34wpm0mwfr0jgph4lmlwfmgazyggnmvc7m")))) - (build-system ocaml-build-system) - (arguments - '(#:phases - (modify-phases %standard-phases - (add-before 'configure 'set-topfind - (lambda* (#:key inputs #:allow-other-keys) - ;; add the line #directory ".." at the top of each file - ;; using #use "topfind";; to be able to find topfind - (let* ((findlib-path (assoc-ref inputs "findlib")) - (findlib-libdir - (string-append findlib-path "/lib/ocaml/site-lib"))) - (substitute* "setup.ml" - (("#use \"topfind\";;" all) - (string-append "#directory \"" findlib-libdir "\"\n" - all)))) - #t))))) + "01qf51b8pb7vyfba7y0kb7ajwj1950im25d7f59821zwsibns3d9")))) + (build-system dune-build-system) (propagated-inputs `(("ocaml-stdlib-shims" ,ocaml-stdlib-shims))) (native-inputs - `(("ocamlbuild" ,ocamlbuild) - ("ocaml-oasis" ,ocaml-oasis) - ("ocaml-ounit" ,ocaml-ounit))) + `(("ocaml-ounit" ,ocaml-ounit))) (home-page "http://ocaml-fileutils.forge.ocamlcore.org") (synopsis "Pure OCaml functions to manipulate real file and filename") (description "Library to provide pure OCaml functions to manipulate real -- cgit v1.2.3 From 1ac2bf05c810917b4c1f9a96402550a6ad104278 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 15 May 2020 15:56:33 +0200 Subject: gnu: ocaml-ocurl: Update to 0.9.1. * gnu/packages/ocaml.scm (ocaml-ocurl): Update to 0.9.1. --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index beb5258b32..c5ec3174ed 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2192,14 +2192,14 @@ without a complete in-memory representation of the data.") (define-public ocaml-ocurl (package (name "ocaml-ocurl") - (version "0.8.2") + (version "0.9.1") (source (origin (method url-fetch) (uri (string-append "http://ygrek.org.ua/p/release/ocurl/ocurl-" version ".tar.gz")) (sha256 (base32 - "1ax3xdlzgb1zg7d0wr9nwgmh6a45a764m0wk8p6mx07ad94hz0q9")))) + "0n621cxb9012pj280c7821qqsdhypj8qy9qgrah79dkh6a8h2py6")))) (build-system ocaml-build-system) (arguments `(#:phases -- cgit v1.2.3 From 6207d749493dafc28d42944fdab5b8ae05cf39eb Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 15 May 2020 17:12:26 +0200 Subject: gnu: emacs-flycheck: Update to 31-2.9bcf6b6. * gnu/packages/emacs-xyz.scm (emacs-flycheck): Update to 31-2.9bcf6b6. --- gnu/packages/emacs-xyz.scm | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 015bb06e4a..1eb31e74a9 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -881,21 +881,21 @@ supports type hints, definition-jumping, completion, and more.") (license license:gpl3+)))) (define-public emacs-flycheck - ;; last release version was more than 300 commits ago - (let ((commit "0006a59259ebd02c9199ddc87f0e3ce22793a2ea") - (revision "1")) + ;; Last release version was more than 500 commits ago. + (let ((commit "9bcf6b665e15db94870bebc81dc8248c3eec20d3") + (revision "2")) (package (name "emacs-flycheck") (version (git-version "31" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/flycheck/flycheck/") - (commit commit))) - (sha256 - (base32 - "09q3h6ldpg528cfbmsbb1x2vf5hmzgm3fshqn6kdy144jxcdjlf1")) - (file-name (git-file-name name version)))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/flycheck/flycheck/") + (commit commit))) + (sha256 + (base32 "015ixss5bjr7gvhj8mkw5x2x1hy6fvvsjarr2xpv0gskkkngs7pg")) + (file-name (git-file-name name version)))) (build-system emacs-build-system) (propagated-inputs `(("emacs-dash" ,emacs-dash))) -- cgit v1.2.3 From 89c5b924e17ea43d0dd01eb78c198b72c19635aa Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 15 May 2020 15:51:48 +0200 Subject: gnu: bitcoin-unlimited: Update to 1.8.0.0. * gnu/packages/finance.scm (bitcoin-unlimited): Update to 1.8.0.0. [arguments]: Add 'fix-build' phase, update 'fix-tests' phase. --- gnu/packages/finance.scm | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 7018479665..6dd6049ced 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -1368,16 +1368,16 @@ entity management.") (define-public bitcoin-unlimited (package (name "bitcoin-unlimited") - (version "1.7.0.0") + (version "1.8.0.0") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/BitcoinUnlimited/BitcoinUnlimited.git") - (commit (string-append "bucash" version)))) + (commit (string-append "BCHunlimited" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "05rcd73mg2fb2zb6b1imzspck6jhcy3xymrr7n24kwjrzmvihdpx")))) + (base32 "1ivkig6q7i4n389dg1zv06cmfki20bjq0slmshx0p5a1aavkqj7k")))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) @@ -1415,12 +1415,23 @@ entity management.") "/bin/lupdate")) #:phases (modify-phases %standard-phases + (add-after 'unpack 'fix-build + (lambda _ + ;; The 'stack' header was not included in unlimited.cpp, which + ;; caused the build to fail. + (substitute* "src/unlimited.cpp" + (("#include " all) + (string-append all "\n#include "))) + #t)) (add-after 'unpack 'fix-tests (lambda _ - ;; TODO: Find why utilprocess_tests never ends. Disable for now. - (substitute* "src/test/utilprocess_tests.cpp" - (("#if \\(BOOST_OS_LINUX && \\(BOOST_VERSION >= 106500\\)\\)") - "#if 0")) + ;; TODO: Find why txvalidationcache_tests fails and + ;; utilprocess_tests never ends. Disable for now. + (substitute* "src/Makefile.test.include" + (("test/txvalidationcache_tests.cpp") + "") + (("test/utilprocess_tests.cpp") + "")) #t)) (add-before 'configure 'make-qt-deterministic (lambda _ -- cgit v1.2.3 From f7237a2e393a3fe034622c69d4a73362203fdf4b Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 15 May 2020 17:29:05 +0200 Subject: gnu: bitcoin-abc: Update to 0.21.6. * gnu/packages/finance.scm (bitcoin-abc): Update to 0.21.6. [build-system]: Use cmake-build-system. [native-inputs]: Remove autoconf, automake and libtool. [inputs]: Add zeromq. [arguments]: Drop inheritance from bitcoin-core and use explicit 'make-qt-deterministic', 'set-home' and 'check-functional' phases. --- gnu/packages/finance.scm | 35 +++++++++++++++++++++++++++-------- 1 file changed, 27 insertions(+), 8 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 6dd6049ced..7d7b2e20bd 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -1227,9 +1227,8 @@ Trezor wallet.") (define-public bitcoin-abc (package - (inherit bitcoin-core) (name "bitcoin-abc") - (version "0.20.7") + (version "0.21.6") (source (origin (method url-fetch) (uri (string-append "https://download.bitcoinabc.org/" @@ -1237,12 +1236,10 @@ Trezor wallet.") version ".tar.gz")) (sha256 (base32 - "0py5ilfi4r8qh5r9637vwch27sqrrn0dg9rz8bccnj3lp2xpzw27")))) + "1w3c397h2mxsi9471fwyc3yjxw7s4jgvr4q3w2qfh49bhr4wygqj")))) + (build-system cmake-build-system) (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("libtool" ,libtool) - ("pkg-config" ,pkg-config) + `(("pkg-config" ,pkg-config) ("python" ,python) ; for the tests ("util-linux" ,util-linux) ; provides the hexdump command for tests ("qttools" ,qttools))) @@ -1255,7 +1252,28 @@ Trezor wallet.") ("protobuf" ,protobuf) ("qrencode" ,qrencode) ("qtbase" ,qtbase) + ("zeromq" ,zeromq) ("zlib" ,zlib))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'configure 'make-qt-deterministic + (lambda _ + ;; Make Qt deterministic. + (setenv "QT_RCC_SOURCE_DATE_OVERRIDE" "1") + #t)) + (add-before 'check 'set-home + (lambda _ + (setenv "HOME" (getenv "TMPDIR")) ; tests write to $HOME + #t)) + (add-after 'check 'check-functional + (lambda _ + (invoke + "python3" "./test/functional/test_runner.py" + (string-append "--jobs=" (number->string (parallel-job-count))) + ;; TODO: find why the abc-miner-fund test fails. + "--exclude=abc-miner-fund") + #t))))) (home-page "https://www.bitcoinabc.org/") (synopsis "Bitcoin ABC peer-to-peer full node for the Bitcoin Cash protocol") (description @@ -1269,7 +1287,8 @@ As a fork it implemented changes lowering the time between blocks and now offers confimations after less than 5 seconds and have significantly lower fees that BTC. Bitcoin ABC is the reference implementation of the Bitcoin Cash protocol. This package provides the Bitcoin Cash command line client and -a client based on Qt. This is a fork of Bitcoin Core."))) +a client based on Qt. This is a fork of Bitcoin Core.") + (license license:expat))) (define-public libofx (package -- cgit v1.2.3 From 28740402b21f2aaef540df7e6ec8d8e22ae59495 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 May 2020 17:49:18 +0200 Subject: gnu: tor: Update to 0.4.3.5. * gnu/packages/tor.scm (tor): Update to 0.4.3.5. [arguments]: Enable compression features that aren't auto-detected. [native-inputs]: Use the default Python (3). [inputs]: Order alphabetically. --- gnu/packages/tor.scm | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm index 4ec503d2ed..2f2623b0e6 100644 --- a/gnu/packages/tor.scm +++ b/gnu/packages/tor.scm @@ -51,24 +51,28 @@ (define-public tor (package (name "tor") - (version "0.4.2.7") + (version "0.4.3.5") (source (origin (method url-fetch) (uri (string-append "https://dist.torproject.org/tor-" version ".tar.gz")) (sha256 (base32 - "0v82ngwwmmcb7i9563bgsmrjy6xp83xyhqhaljygd0pkvlsxi886")))) + "0s6qspi102drn1nk3gfxs51x992xarc44gkfsi8y3l48wr50wsk1")))) (build-system gnu-build-system) + (arguments + `(#:configure-flags + (list "--enable-lzma" + "--enable-zstd"))) (native-inputs `(("pkg-config" ,pkg-config) - ("python" ,python-2))) ; for tests + ("python" ,python))) ; for tests (inputs - `(("zlib" ,zlib) - ("openssl" ,openssl) - ("libevent" ,libevent) + `(("libevent" ,libevent) ("libseccomp" ,libseccomp) + ("openssl" ,openssl) ("xz" ,xz) + ("zlib" ,zlib) ("zstd" ,zstd "lib"))) (home-page "https://www.torproject.org/") (synopsis "Anonymous network router to improve privacy on the Internet") -- cgit v1.2.3 From dfc414c48937c063918bce0061f8e85ac1722ff8 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 15 May 2020 17:56:48 +0200 Subject: gnu: emacs-flycheck-grammalecte: Update to 1.2. * gnu/packages/emacs-xyz.scm (emacs-flycheck-grammalecte): Update to 1.2. [arguments]: Exclude "test-profile.el", build with full Emacs for libxml support. [inputs]: Remove curl as dependency. --- gnu/packages/emacs-xyz.scm | 43 ++++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 21 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 1eb31e74a9..45ccced99e 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -3759,7 +3759,7 @@ for Flow files.") (define-public emacs-flycheck-grammalecte (package (name "emacs-flycheck-grammalecte") - (version "1.0") + (version "1.2") (source (origin (method url-fetch) @@ -3767,30 +3767,31 @@ for Flow files.") "flycheck-grammalecte/snapshot/" "flycheck-grammalecte-" version ".tar.xz")) (sha256 - (base32 "02wxaw228dia8cps0v02327hrrribfqb4601qggjpi4l4ms1lf8b")))) + (base32 "1mzmzyik843r4j0ibpwqrxmb0g4xmirrf3lxr010bddkmmxf749a")))) (build-system emacs-build-system) (arguments `(#:include '("\\.(el|py)$") + #:exclude '("^test-profile.el$") + #:emacs ,emacs ;need libxml support #:phases (modify-phases %standard-phases - (add-after 'unpack 'set-external-executables - ;; Hardcode python3 and curl executables in the Emacs library. + (add-after 'unpack 'fix-python-executable + ;; Hardcode python3 executable in the Emacs library. (lambda* (#:key inputs #:allow-other-keys) (let ((python3 (string-append (assoc-ref inputs "python") - "/bin/python3")) - (curl (string-append (assoc-ref inputs "curl") - "/bin/curl"))) + "/bin/python3"))) (substitute* "flycheck-grammalecte.el" - (("\"python3?") (string-append "\"" python3)) - (("\"curl") (string-append "\"" curl))) + (("\"python3") (string-append "\"" python3))) #t))) - (add-after 'install 'link-to-grammalecte - ;; The package expects grammalecte to be in a sub-directory. - ;; Symlink it there from the store. + (add-before 'build 'link-to-grammalecte + ;; XXX: The Python part of the package requires grammalecte, but + ;; the library is not specified in PYTHONPATH, since we're not + ;; using Python build system. As a workaround, we symlink + ;; grammalecte libraries here. (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((grammalecte (assoc-ref inputs "grammalecte")) - (out (assoc-ref outputs "out")) - (version ,(version-major+minor (package-version python)))) + (let* ((out (assoc-ref outputs "out")) + (grammalecte (assoc-ref inputs "grammalecte")) + (version ,(version-major+minor (package-version python)))) (with-directory-excursion (string-append out "/share/emacs/site-lisp") (symlink (string-append grammalecte "/lib/" @@ -3799,17 +3800,17 @@ for Flow files.") "grammalecte")) #t)))))) (inputs - `(("curl" ,curl) - ("grammalecte" ,grammalecte) + `(("grammalecte" ,grammalecte) ("python" ,python))) (propagated-inputs `(("emacs-flycheck" ,emacs-flycheck))) (home-page "https://git.deparis.io/flycheck-grammalecte/") (synopsis "Integrate Grammalecte with Flycheck") - (description "Integrate the French grammar and typography checker -Grammalecte with Flycheck to automatically look for mistakes in your writings. -It also provides an easy way to find synonyms and antonyms for a given -word (to avoid repetitions for example).") + (description + "Integrate the French grammar and typography checker Grammalecte with +Flycheck to automatically look for mistakes in your writings. It also +provides an easy way to find synonyms and antonyms for a given word (to avoid +repetitions for example).") (license license:gpl3+))) (define-public emacs-flycheck-rust -- cgit v1.2.3 From 57b13d1cc0c28ffd597de651a6187e22ac211e82 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 May 2020 18:10:17 +0200 Subject: gnu: openconnect: Update to 8.10 [fixes CVE-2020-12823]. * gnu/packages/vpn.scm (openconnect): Update to 8.10. --- gnu/packages/vpn.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index 369d3200c1..e06a83bbd5 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -247,13 +247,13 @@ the user specifically asks to proxy, so the @dfn{VPN} interface no longer (define-public openconnect (package (name "openconnect") - (version "8.09") + (version "8.10") (source (origin (method url-fetch) (uri (string-append "ftp://ftp.infradead.org/pub/openconnect/" "openconnect-" version ".tar.gz")) (sha256 - (base32 "19p91hs6j348qp0v9c7abl3rb8d9ncc37k743qhrn29s9jz0567k")))) + (base32 "1cdsx4nsrwawbsisfkldfc9i4qn60g03vxb13nzppr2br9p4rrih")))) (build-system gnu-build-system) (propagated-inputs `(("libxml2" ,libxml2) -- cgit v1.2.3 From 1d8d90a82d6a1d61ea126f0a5456f382f941d529 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 May 2020 18:42:15 +0200 Subject: gnu: ethtool: Update to 5.6. * gnu/packages/networking.scm (ethtool): Update to 5.6. [native-inputs]: Add pkg-config. [inputs]: Add libmnl. --- gnu/packages/networking.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 42a3609ac2..54e71638cb 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -588,15 +588,19 @@ receiving NDP messages.") (define-public ethtool (package (name "ethtool") - (version "5.4") + (version "5.6") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/software/network/" "ethtool/ethtool-" version ".tar.xz")) (sha256 (base32 - "0srbqp4a3x9ryrbm5q854375y04ni8j0bmsrl89nmsyn4x4ixy12")))) + "159r0hwax0qs5diayw2glxshqxrigk0v67hgmbq56ldddm91n3ya")))) (build-system gnu-build-system) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("libmnl" ,libmnl))) (home-page "https://www.kernel.org/pub/software/network/ethtool/") (synopsis "Display or change Ethernet device settings") (description -- cgit v1.2.3 From d2e438d3e2fb7ba24213dccd7ee04a9dbbca96c3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 May 2020 18:42:34 +0200 Subject: gnu: clamav: Update to 0.102.3. * gnu/packages/antivirus.scm (clamav): Update to 0.102.3. --- gnu/packages/antivirus.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/antivirus.scm b/gnu/packages/antivirus.scm index dc4cc111e1..0491861afd 100644 --- a/gnu/packages/antivirus.scm +++ b/gnu/packages/antivirus.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Eric Bavier ;;; Copyright © 2018 Christopher Baines -;;; Copyright © 2019 Tobias Geerinckx-Rice +;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -44,14 +44,14 @@ (define-public clamav (package (name "clamav") - (version "0.102.2") + (version "0.102.3") (source (origin (method url-fetch) (uri (string-append "https://www.clamav.net/downloads/production/" "clamav-" version ".tar.gz")) (sha256 (base32 - "1lq7r6r2yl8pp3fkn32b0bsmbbl9pg90kpvhsa2clad3xg0drz49")) + "14q6vi178ih60yz4ja33b6181va1dcj8fyscnmxfx2crav250c7d")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 6e9ffc3f778b43aa42c2142ec9ebbe3be4bf47cc Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 May 2020 18:43:17 +0200 Subject: gnu: clamav: End snippet in truth. * gnu/packages/antivirus.scm (clamav)[source]: Return #t from snippet. --- gnu/packages/antivirus.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/antivirus.scm b/gnu/packages/antivirus.scm index 0491861afd..367ebe70dd 100644 --- a/gnu/packages/antivirus.scm +++ b/gnu/packages/antivirus.scm @@ -59,7 +59,8 @@ '("win32" ; unnecessary "libclamav/c++/llvm" ; use system llvm "libclamav/tomsfastmath" ; use system tomsfastmath - "libclamunrar")))) ; non-free license + "libclamunrar")) ; non-free license + #t)) (patches (search-patches "clamav-system-tomsfastmath.patch" "clamav-config-llvm-libs.patch")))) -- cgit v1.2.3 From 5225626ffcdc29a62e8e089abcbb3d304febd2f2 Mon Sep 17 00:00:00 2001 From: Ryan Prior Date: Fri, 1 May 2020 14:47:20 -0500 Subject: gnu: oil-shell: Rename to "oil". MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/shells.scm (oil): Rename variable from… (oil-shell): …this. Redefine using DEPRECATED-PACKAGE. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/shells.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index b752fb4a90..5c8c4b5d8a 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -780,9 +780,9 @@ Shell (pdksh).") (license (list miros isc)))) ; strlcpy.c -(define-public oil-shell +(define-public oil (package - (name "oil-shell") + (name "oil") (version "0.7.0") (source (origin (method url-fetch) @@ -826,6 +826,9 @@ is commonly written.") (license (list psfl ; The Oil sources include a patched Python 2 source tree asl2.0)))) +(define-public oil-shell + (deprecated-package "oil-shell" oil)) + (define-public gash (package (name "gash") -- cgit v1.2.3 From cb014f64a50c3c832858b8927de334740f83b8a5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 May 2020 19:11:47 +0200 Subject: gnu: kicad-i18l: Fix typo in… name. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/engineering.scm (kicad-i18n): New old variable previously… (kicad-i18l): …this. Redefine using DEPRECATED-PACKAGE. (kicad)[arguments, native-inputs]: Adjust accordingly. --- gnu/packages/engineering.scm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 190632436b..f80ea02e30 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -823,7 +823,7 @@ language.") (modify-phases %standard-phases (add-after 'install 'install-translations (lambda* (#:key inputs outputs #:allow-other-keys) - (copy-recursively (assoc-ref inputs "kicad-i18l") + (copy-recursively (assoc-ref inputs "kicad-i18n") (assoc-ref outputs "out")) #t)) (add-after 'install 'wrap-program @@ -861,7 +861,7 @@ language.") `(("boost" ,boost) ("desktop-file-utils" ,desktop-file-utils) ("gettext" ,gettext-minimal) - ("kicad-i18l" ,kicad-i18l) + ("kicad-i18n" ,kicad-i18n) ("pkg-config" ,pkg-config) ("swig" ,swig) ("zlib" ,zlib))) @@ -887,9 +887,9 @@ perform specific functions, for example, pcbnew (Editing PCB), eeschema (editing electrical diagrams), gerbview (viewing Gerber files) and others.") (license license:gpl3+))) -(define kicad-i18l +(define kicad-i18n (package - (name "kicad-i18l") + (name "kicad-i18n") (version "5.1.5") (source (origin (method git-fetch) @@ -914,6 +914,9 @@ electrical diagrams), gerbview (viewing Gerber files) and others.") translations for KiCad.") (license license:gpl3+))) +(define-public kicad-i18l + (deprecated-package "kicad-i18l" kicad-i18n)) + (define-public kicad-symbols (package (name "kicad-symbols") -- cgit v1.2.3 From 0094c4fa9116817865fccc5c3618f13dd380fa54 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 May 2020 21:50:30 +0200 Subject: gnu: kicad: Update to 5.1.6. * gnu/packages/engineering.scm (kicad): Update to 5.1.6. [source]: Use GIT-FETCH & GIT-FILE-NAME. --- gnu/packages/engineering.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index f80ea02e30..fd85c4f20a 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -800,16 +800,16 @@ language.") (define-public kicad (package (name "kicad") - (version "5.1.5") + (version "5.1.6") (source (origin - (method url-fetch) - (file-name (string-append name "-" version ".tar.xz")) - (uri (string-append - "https://launchpad.net/kicad/" (version-major version) - ".0/" version "/+download/kicad-" version ".tar.xz")) + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/kicad/code/kicad.git") + (commit version))) (sha256 - (base32 "0x3417f2pa7p65s9f7l49rqbnrzy8gz6i0n07mlbxqbnm0fmlql0")))) + (base32 "1pa3z0h0679jmgxlzc833h6q85b5paxdp69kf2h93vkaryj58622")) + (file-name (git-file-name name version)))) (build-system cmake-build-system) (arguments `(#:out-of-source? #t -- cgit v1.2.3 From 02d1bc6b58bb0df5ac14f5042063b629992b6cd9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 May 2020 21:50:43 +0200 Subject: gnu: kicad-i18n: Update to 5.1.6. * gnu/packages/engineering.scm (kicad-i18n): Update to 5.1.6. --- gnu/packages/engineering.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index fd85c4f20a..8db87b2d5a 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -890,7 +890,7 @@ electrical diagrams), gerbview (viewing Gerber files) and others.") (define kicad-i18n (package (name "kicad-i18n") - (version "5.1.5") + (version "5.1.6") (source (origin (method git-fetch) (uri (git-reference @@ -899,7 +899,7 @@ electrical diagrams), gerbview (viewing Gerber files) and others.") (file-name (git-file-name name version)) (sha256 (base32 - "1rfpifl8vky1gba2angizlb2n7mwmsiai3r6ip6qma60wdj8sbd3")))) + "0qryi8xjm23ka363zfl7bbga0v5c31fr3d4nyxp3m168vkv9zhha")))) (build-system cmake-build-system) (arguments `(#:phases -- cgit v1.2.3 From 3ef7c588dff8ac1edc22d2e07558c2795a20bdf9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 May 2020 21:50:49 +0200 Subject: gnu: kicad-symbols: Update to 5.1.6. * gnu/packages/engineering.scm (kicad-symbols): Update to 5.1.6. --- gnu/packages/engineering.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 8db87b2d5a..f350551f98 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -920,7 +920,7 @@ translations for KiCad.") (define-public kicad-symbols (package (name "kicad-symbols") - (version "5.1.5") + (version "5.1.6") (source (origin (method git-fetch) (uri (git-reference @@ -929,7 +929,7 @@ translations for KiCad.") (file-name (git-file-name name version)) (sha256 (base32 - "048b07ffsaav1ssrchw2p870lvb4rsyb5vnniy670k7q9p16qq6h")))) + "12w3rdy085drlikkpb27n9ni7cyg9l0pqy7hnr86cxjcw3l5wcx6")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) ; no tests exist -- cgit v1.2.3 From 47711ec9782653b1e20ca774f0bba1cbfbdf79ef Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 May 2020 21:54:35 +0200 Subject: gnu: kicad-footprints: Update to 5.1.6. * gnu/packages/engineering.scm (kicad-footprints): Update to 5.1.6. --- gnu/packages/engineering.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index f350551f98..a88c3e4a62 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -949,7 +949,7 @@ libraries.") (package (inherit kicad-symbols) (name "kicad-footprints") - (version "5.1.5") + (version "5.1.6") (source (origin (method git-fetch) (uri (git-reference @@ -958,7 +958,7 @@ libraries.") (file-name (git-file-name name version)) (sha256 (base32 - "1c4whgn14qhz4yqkl46w13p6rpv1k0hsc9s9h9368fxfcz9knb2j")))) + "1kmf91a5mmvj9izrv40mkaw1w36yjgn8daczd9rq2wlmd0rdp1zx")))) (synopsis "Official KiCad footprint libraries") (description "This package contains the official KiCad footprint libraries."))) -- cgit v1.2.3 From 57b90a5dae77bf110f204d6b3109fe1d95dfa458 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 May 2020 21:54:43 +0200 Subject: gnu: kicad-packages3d: Update to 5.1.6. * gnu/packages/engineering.scm (kicad-packages3d): Update to 5.1.6. --- gnu/packages/engineering.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index a88c3e4a62..ce781644c4 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -966,7 +966,7 @@ libraries.") (package (inherit kicad-symbols) (name "kicad-packages3d") - (version "5.1.5") + (version "5.1.6") (source (origin (method git-fetch) (uri (git-reference @@ -975,7 +975,7 @@ libraries.") (file-name (git-file-name name version)) (sha256 (base32 - "0cff2ms1bsw530kqb1fr1m2pjixyxzwa81mxgac3qpbcf8fnpvaz")))) + "0b9jglf77fy0n0r8xs4yqkv6zvipyfvp0z5dnqlzp32csy5aqpi1")))) (synopsis "Official KiCad 3D model libraries") (description "This package contains the official KiCad 3D model libraries."))) -- cgit v1.2.3 From fbfaafae27893f74f47188ecd0bce54df38981bd Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 May 2020 21:54:48 +0200 Subject: gnu: kicad-templates: Update to 5.1.6. * gnu/packages/engineering.scm (kicad-templates): Update to 5.1.6. --- gnu/packages/engineering.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index ce781644c4..fce76a7189 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -983,7 +983,7 @@ libraries.") (package (inherit kicad-symbols) (name "kicad-templates") - (version "5.1.5") + (version "5.1.6") (source (origin (method git-fetch) (uri (git-reference @@ -992,7 +992,7 @@ libraries.") (file-name (git-file-name name version)) (sha256 (base32 - "0cs3bm3zb5ngw5ldn0lzw5bvqm4kvcidyrn76438alffwiz2b15g")))) + "1hppcsrkn4dk6ggby6ckh0q65qxkywrbyxa4lwpaf7pxjyv498xg")))) (synopsis "Official KiCad project and worksheet templates") (description "This package contains the official KiCad project and worksheet templates."))) -- cgit v1.2.3 From 1c9403f6a6f5d544cda63c6cb81446c63f72321c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 May 2020 22:22:09 +0200 Subject: gnu: kicad: Re-use common fields in add-ons. * gnu/packages/engineering.scm (kicad-i18n, kicad-symbols): Re-use kicad's VERSION and HOME-PAGE. (kicad-symbols, kicad-footprints, kicad-packages3d, kicad-templates): Re-use kicad's VERSION. --- gnu/packages/engineering.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index fce76a7189..aec692174a 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -890,7 +890,7 @@ electrical diagrams), gerbview (viewing Gerber files) and others.") (define kicad-i18n (package (name "kicad-i18n") - (version "5.1.6") + (version (package-version kicad)) (source (origin (method git-fetch) (uri (git-reference @@ -908,7 +908,7 @@ electrical diagrams), gerbview (viewing Gerber files) and others.") (delete 'check)))) (native-inputs `(("gettext" ,gettext-minimal))) - (home-page "https://kicad-pcb.org/") + (home-page (package-home-page kicad)) (synopsis "KiCad GUI translations") (description "This package contains the po files that are used for the GUI translations for KiCad.") @@ -920,7 +920,7 @@ translations for KiCad.") (define-public kicad-symbols (package (name "kicad-symbols") - (version "5.1.6") + (version (package-version kicad)) (source (origin (method git-fetch) (uri (git-reference @@ -933,7 +933,7 @@ translations for KiCad.") (build-system cmake-build-system) (arguments `(#:tests? #f)) ; no tests exist - (home-page "https://kicad-pcb.org/") + (home-page (package-home-page kicad)) (synopsis "Official KiCad schematic symbol libraries") (description "This package contains the official KiCad schematic symbol libraries.") @@ -949,7 +949,7 @@ libraries.") (package (inherit kicad-symbols) (name "kicad-footprints") - (version "5.1.6") + (version (package-version kicad)) (source (origin (method git-fetch) (uri (git-reference @@ -966,7 +966,7 @@ libraries.") (package (inherit kicad-symbols) (name "kicad-packages3d") - (version "5.1.6") + (version (package-version kicad)) (source (origin (method git-fetch) (uri (git-reference @@ -983,7 +983,7 @@ libraries.") (package (inherit kicad-symbols) (name "kicad-templates") - (version "5.1.6") + (version (package-version kicad)) (source (origin (method git-fetch) (uri (git-reference -- cgit v1.2.3 From a7b20226b2bf1a73b8f0f6536e7fa43326f35e33 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Fri, 15 May 2020 22:54:33 +0200 Subject: gnu: python-libmpsse: Update to 1.4.1. * gnu/packages/embedded.scm (python-libmpsse): Update to 1.4.1. [arguments]<#:phases>[set-environment-up]: Fix build with Python 3.8. --- gnu/packages/embedded.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm index 6ac1a2d7f3..8b40990ec1 100644 --- a/gnu/packages/embedded.scm +++ b/gnu/packages/embedded.scm @@ -1073,8 +1073,7 @@ the Raspberry Pi chip.")))) (chdir "src") (setenv "PYDEV" (string-append python "/include/python" - ,(version-major+minor (package-version python)) - "m")) + ,(version-major+minor (package-version python)))) #t))) (replace 'install (lambda* (#:key inputs outputs make-flags #:allow-other-keys #:rest args) -- cgit v1.2.3 From b050e205dccb79e6026cc6a756e89545a2f3d0d3 Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Sat, 16 May 2020 15:50:25 +0800 Subject: gnu: matcha-theme: Update to 2020-05-09. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gnome-xyz.scm (matcha-theme): Update to 2020-05-09. [source]: Update URL. [arguments]: Update build script. Signed-off-by: 宋文武 --- gnu/packages/gnome-xyz.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index 673b8cf1d7..0997edb0e1 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -46,18 +46,18 @@ (define-public matcha-theme (package (name "matcha-theme") - (version "2019-11-02") + (version "2020-05-09") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/vinceliuice/matcha") + (url "https://github.com/vinceliuice/Matcha-gtk-theme") (commit version))) (file-name (git-file-name name version)) (sha256 (base32 - "0wci9ahap8kynq8cbyxr7aba9ndb1d4kiq42xvzr34vw1rhcahrr")))) + "0fp3ijynyvncy2byjjyba573p81x2pl2hdzv17mg40r8d5mjlkww")))) (build-system trivial-build-system) (arguments '(#:modules ((guix build utils)) @@ -73,9 +73,9 @@ (string-append coreutils "/bin:" (string-append bash "/bin:"))) (copy-recursively source (getcwd)) - (patch-shebang "Install") + (patch-shebang "install.sh") (mkdir-p themesdir) - (invoke "./Install" "-d" themesdir) + (invoke "./install.sh" "-d" themesdir) #t)))) (inputs `(("gtk-engines" ,gtk-engines))) -- cgit v1.2.3 From 9d681f1bc921711c1dff498b9950090e85585d11 Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Sat, 16 May 2020 16:23:45 +0800 Subject: gnu: papirus-icon-theme: Update to 20200430. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gnome-xyz.scm (papirus-icon-theme): Update to 20200430. Signed-off-by: 宋文武 --- gnu/packages/gnome-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index 0997edb0e1..ec3c622e0f 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -554,8 +554,8 @@ dark elements. It supports GNOME, Unity, Xfce, and Openbox.") (define-public papirus-icon-theme (let ((version "0.0.0") ;; The package does not use semver - (revision "0") - (tag "20191201")) + (revision "1") + (tag "20200430")) (package (name "papirus-icon-theme") (version (git-version version revision tag)) @@ -567,7 +567,7 @@ dark elements. It supports GNOME, Unity, Xfce, and Openbox.") (commit tag))) (sha256 (base32 - "0lnz1kmz28xh1f4slbsx7ycji5hgszyiyprbf5w5fbjhvi5gzw1h")) + "19dfiifc7cjwy0nb1hgzryzaijszsyix303xsgk5xbmhpwrv92hq")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From 8da0f5048f52d0a461b12e4f4b1c598812eca0b2 Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Sat, 16 May 2020 16:30:45 +0800 Subject: gnu: delft-icon-theme: Update to 1.12. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gnome-xyz.scm (delft-icon-theme): Update to 1.12. Signed-off-by: 宋文武 --- gnu/packages/gnome-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index ec3c622e0f..a60b5dbb61 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -92,7 +92,7 @@ like Gnome, Unity, Budgie, Pantheon, XFCE, Mate and others.") (define-public delft-icon-theme (package (name "delft-icon-theme") - (version "1.11") + (version "1.12") (source (origin (method git-fetch) @@ -101,7 +101,7 @@ like Gnome, Unity, Budgie, Pantheon, XFCE, Mate and others.") (commit (string-append "v" version)))) (sha256 (base32 - "1m3r4i4m3y3xsjb5f4bik0ylmi64amkfyr0y8pjbvv6gyj492mi6")) + "1r6b6jf793jxz15ljniwbqy3vcvsl2712qiigfrfrm46fdxlshjd")) (file-name (git-file-name name version)))) (build-system copy-build-system) (arguments -- cgit v1.2.3 From a23cd8d9c3bb9b1e7e5fa4558b9d2ef116b193e7 Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Sat, 16 May 2020 17:24:16 +0800 Subject: gnu: Add python-pytidylib. * gnu/packages/python-xyz.scm (python-pytidylib, python2-pytidylib): New variables. --- gnu/packages/python-xyz.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 657ebabe93..c26a766d64 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -19862,3 +19862,36 @@ module. @code{cmd2} provides a wealth of features on top of @code{cmd} to make your life easier and eliminates much of the boilerplate code which would be necessary when using @code{cmd}.") (license license:expat))) + +(define-public python-pytidylib + (package + (name "python-pytidylib") + (version "0.3.2") + (source (origin + (method url-fetch) + (uri (pypi-uri "pytidylib" version)) + (sha256 + (base32 + "1wqa9dv5d7swka14rnky862hc7dgk2g3dhlrz57hdn3hb7bwic92")))) + (build-system python-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-before 'build 'qualify-libtidy + (lambda* (#:key inputs #:allow-other-keys) + (let ((libtidy (string-append (assoc-ref inputs "tidy") + "/lib/libtidy.so"))) + (substitute* "tidylib/tidy.py" + (("ctypes\\.util\\.find_library\\('tidy'\\)") + (format #f "'~a'" libtidy))) + #t)))))) + (inputs `(("tidy" ,tidy))) + (home-page "https://github.com/countergram/pytidylib") + (synopsis "Python wrapper for HTML Tidy library") + (description + "PyTidyLib is a Python package that wraps the HTML Tidy library. This +allows you, from Python code, to “fix” invalid (X)HTML markup.") + (license license:expat))) + +(define-public python2-pytidylib + (package-with-python2 python-pytidylib)) -- cgit v1.2.3 From c58274133676e429bfc1486e3b58762ff8659131 Mon Sep 17 00:00:00 2001 From: raingloom Date: Tue, 12 May 2020 01:50:30 +0200 Subject: gnu: Add rawdog. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/syndication.scm (rawdog): New variable. Signed-off-by: 宋文武 --- gnu/packages/syndication.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm index 5bc3d19a92..acd7b63ef7 100644 --- a/gnu/packages/syndication.scm +++ b/gnu/packages/syndication.scm @@ -30,6 +30,7 @@ #:use-module (gnu packages gettext) #:use-module (gnu packages ncurses) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages python) #:use-module (gnu packages python-check) #:use-module (gnu packages python-xyz) #:use-module (gnu packages python-web) @@ -169,3 +170,29 @@ file system, and many more features.") "Tuir provides a simple terminal viewer for Reddit (Terminal UI for Reddit).") (license (list license:expat license:gpl3+)))) ; tuir/packages/praw + +(define-public rawdog + (package + (name "rawdog") + (version "2.23") + (source + (origin + (method url-fetch) + (uri (string-append "https://offog.org/files/rawdog-" + version ".tar.gz")) + (sha256 + (base32 + "18nyg19mwxyqdnykplkqmzb4n27vvrhvp639zai8f81gg9vdbsjp")))) + (build-system python-build-system) + (arguments + `(#:python ,python-2.7)) + (inputs + `(("python2-feedparser" ,python2-feedparser) + ("python2-pytidylib" ,python2-pytidylib))) + (home-page "https://offog.org/code/rawdog/") + (synopsis "RSS Aggregator Without Delusions Of Grandeur") + (description + "@command{rawdog} is a feed aggregator, capable of producing a personal +\"river of news\" or a public \"planet\" page. It supports all common feed +formats, including all versions of RSS and Atom.") + (license license:gpl2+))) -- cgit v1.2.3 From c4618174ecb6375849529f1d1026585817bb139e Mon Sep 17 00:00:00 2001 From: Not Zed Date: Tue, 28 Apr 2020 10:33:46 +0930 Subject: gnu: Add openjdk13. * gnu/packages/java.scm (openjdk13): New variable. Signed-off-by: Ricardo Wurmus --- gnu/packages/java.scm | 42 ++++++++++++++++++++++++++ gnu/packages/patches/openjdk-14-builtins.patch | 11 +++++++ 2 files changed, 53 insertions(+) create mode 100644 gnu/packages/patches/openjdk-14-builtins.patch (limited to 'gnu/packages') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index c0ec683ebe..2519b4780b 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2259,6 +2259,48 @@ new Date();")) ("zip" ,zip))) (home-page "https://openjdk.java.net/projects/jdk/12"))) +(define-public openjdk13 + (package + (inherit openjdk12) + (name "openjdk") + (version "13.0") + (source (origin + (method url-fetch) + (uri "http://hg.openjdk.java.net/jdk/jdk13/archive/9c250a7600e1.tar.bz2") + (file-name (string-append name "-" version ".tar.bz2")) + (sha256 + (base32 + "0v0ljvx5dyzp96dw4z4ksw3pvasil7783mgnmd1wk9gads5ab8iq")) + (modules '((guix build utils))) + (snippet + `(begin + (for-each delete-file (find-files "." ".*.(bin|exe|jar)$")) + #t)))) + (inputs + `(("alsa-lib" ,alsa-lib) + ("cups" ,cups) + ("fontconfig" ,fontconfig) + ("freetype" ,freetype) + ("giflib" ,giflib) + ("lcms" ,lcms) + ("libjpeg" ,libjpeg-turbo) + ("libpng" ,libpng) + ("libx11" ,libx11) + ("libxext" ,libxext) + ("libxrandr" ,libxrandr) + ("libxrender" ,libxrender) + ("libxt" ,libxt) + ("libxtst" ,libxtst))) + (native-inputs + `(("autoconf" ,autoconf) + ("openjdk12:jdk" ,openjdk12 "jdk") + ("make@4.2" ,gnu-make-4.2) + ("pkg-config" ,pkg-config) + ("unzip" ,unzip) + ("which" ,which) + ("zip" ,zip))) + (home-page "https://openjdk.java.net/projects/jdk/13"))) + (define-public icedtea icedtea-8) diff --git a/gnu/packages/patches/openjdk-14-builtins.patch b/gnu/packages/patches/openjdk-14-builtins.patch new file mode 100644 index 0000000000..0e7e3dcaa9 --- /dev/null +++ b/gnu/packages/patches/openjdk-14-builtins.patch @@ -0,0 +1,11 @@ +--- jdk14-bc54620a3848/make/autoconf/basics.m4 2020-02-07 04:40:54.000000000 +1030 ++++ jdk14-bc54620a3848-new/make/autoconf/basics.m4 2020-04-24 10:59:33.056098506 +0930 +@@ -583,7 +583,7 @@ + BASIC_SETUP_TOOL($1, [AC_PATH_PROGS($1, $2, , $3)]) + if test "x[$]$1" = x; then + AC_MSG_NOTICE([Required tool $2 not found in PATH, checking built-in]) +- if help $2 > /dev/null 2>&1; then ++ if command -v $2 > /dev/null 2>&1; then + AC_MSG_NOTICE([Found $2 as shell built-in. Using it]) + $1="$2" + else -- cgit v1.2.3 From 65a11a59de86fa759f2ffbb7db53430a6727c2ea Mon Sep 17 00:00:00 2001 From: Not Zed Date: Sat, 16 May 2020 10:26:06 +0200 Subject: gnu: Add openjdk14. * gnu/packages/java.scm (openjdk14): New variable. Signed-off-by: Ricardo Wurmus --- gnu/packages/java.scm | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 2519b4780b..071b97582d 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2301,6 +2301,52 @@ new Date();")) ("zip" ,zip))) (home-page "https://openjdk.java.net/projects/jdk/13"))) +(define-public openjdk14 + (package + (inherit openjdk13) + (name "openjdk") + (version "14.0") + (source (origin + (method url-fetch) + (uri "http://hg.openjdk.java.net/jdk/jdk14/archive/bc54620a3848.tar.bz2") + (file-name (string-append name "-" version ".tar.bz2")) + (sha256 + (base32 + "0z485pk7r1xpw8004g4nrwrzj17sabgx8yfdbxwfvzkjp8qyajch")) + (modules '((guix build utils))) + (snippet + `(begin + ;; The m4 macro uses 'help' to search for builtins, which is + ;; not available in bash-minimal + (substitute* "make/autoconf/basics.m4" + (("if help") "if command -v")) + (for-each delete-file (find-files "." ".*.(bin|exe|jar)$")) + #t)))) + (inputs + `(("alsa-lib" ,alsa-lib) + ("cups" ,cups) + ("fontconfig" ,fontconfig) + ("freetype" ,freetype) + ("giflib" ,giflib) + ("lcms" ,lcms) + ("libjpeg" ,libjpeg-turbo) + ("libpng" ,libpng) + ("libx11" ,libx11) + ("libxext" ,libxext) + ("libxrandr" ,libxrandr) + ("libxrender" ,libxrender) + ("libxt" ,libxt) + ("libxtst" ,libxtst))) + (native-inputs + `(("autoconf" ,autoconf) + ("make@4.2" ,gnu-make-4.2) + ("openjdk13:jdk" ,openjdk13 "jdk") + ("pkg-config" ,pkg-config) + ("unzip" ,unzip) + ("which" ,which) + ("zip" ,zip))) + (home-page "https://openjdk.java.net/projects/jdk/14"))) + (define-public icedtea icedtea-8) -- cgit v1.2.3 From dcaa156111c5f41ea2937612d7374115cd7bab3a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 16 May 2020 10:28:20 +0200 Subject: gnu: Add lldpd. * gnu/packages/networking.scm (lldpd): New variable. --- gnu/packages/networking.scm | 50 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 54e71638cb..65a94178c9 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014, 2017, 2018 Ludovic Courtès -;;; Copyright © 2015, 2016, 2017, 2018 Ricardo Wurmus +;;; Copyright © 2015, 2016, 2017, 2018, 2020 Ricardo Wurmus ;;; Copyright © 2015 Mark H Weaver ;;; Copyright © 2015, 2016, 2017 Stefan Reichör ;;; Copyright © 2016 Raimon Grau @@ -94,6 +94,7 @@ #:use-module (gnu packages gnupg) #:use-module (gnu packages gtk) #:use-module (gnu packages image) + #:use-module (gnu packages libevent) #:use-module (gnu packages libidn) #:use-module (gnu packages linux) #:use-module (gnu packages lua) @@ -3137,3 +3138,50 @@ thousands of connections is clearly realistic with today's hardware.") (license (list license:gpl2+ license:lgpl2.1 license:lgpl2.1+)))) + +(define-public lldpd + (package + (name "lldpd") + (version "1.0.5") + (source + (origin + (method url-fetch) + (uri (string-append "https://media.luffy.cx/files/lldpd/lldpd-" + version ".tar.gz")) + (sha256 + (base32 + "16fbqrs3l976gdslx647nds8x7sz4h5h3h4l4yxzrayvyh9b5lrd")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Drop bundled library. + (delete-file-recursively "libevent") + #t)))) + (arguments + `(#:configure-flags + (list + "--with-privsep-user=nobody" + "--with-privsep-group=nogroup" + "--localstatedir=/var" + "--enable-pie" + "--without-embedded-libevent" + (string-append "--with-systemdsystemunitdir=" + (assoc-ref %outputs "out") + "/lib/systemd/system")))) + (build-system gnu-build-system) + (inputs + `(("libevent" ,libevent) + ("libxml2" ,libxml2) + ("openssl" ,openssl) + ("readline" ,readline))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (home-page "https://vincentbernat.github.io/lldpd/") + (synopsis "Locate neighbors of your network equipment") + (description + "The @dfn{Link Layer Discovery Protocol} (LLDP) is an industry standard +protocol designed to supplant proprietary Link-Layer protocols such as EDP or +CDP. The goal of LLDP is to provide an inter-vendor compatible mechanism to +deliver Link-Layer notifications to adjacent network devices. @code{lldpd} is +an implementation of LLDP. It also supports some proprietary protocols.") + (license license:isc))) -- cgit v1.2.3 From 737b87cec8f8f2c27e287690d45ebf1fd57d08ae Mon Sep 17 00:00:00 2001 From: Tom Zander via Guix-patches via Date: Fri, 15 May 2020 17:53:42 +0200 Subject: gnu: fulcrum: Update to 1.1.1. * gnu/packages/finance.scm (fulcrum): Update to 1.1.1. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/finance.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 7d7b2e20bd..0eaca8895d 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -1472,14 +1472,14 @@ a Qt GUI.") (define-public fulcrum (package (name "fulcrum") - (version "1.1.0") + (version "1.1.1") (source (origin (method url-fetch) (uri (string-append "https://gitlab.com/FloweeTheHub/fulcrum/-/archive/v" version "/fulcrum-v" version ".tar.gz")) (sha256 - (base32 "1xywwgsdhkiblv6la0pfhvn2s9q8vnz6pjg35647rlwzi6ybf0ak")))) + (base32 "04w5gw02d39caa8a0l6wkn87kc43zzad2prqsyrcq97vlbkdx6x6")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From cbba85ebaf0ace51b0396b09540dbbc4264c436d Mon Sep 17 00:00:00 2001 From: Tom Zander via Guix-patches via Date: Fri, 15 May 2020 17:53:42 +0200 Subject: gnu: flowee: Update to 2020.03.3. * gnu/packages/finance.scm (flowee): Update to 2020.03.3. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/finance.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 0eaca8895d..92a00240f3 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -1510,14 +1510,14 @@ like Flowee the Hub, which Fulcrum connects to over RPC.") (define-public flowee (package (name "flowee") - (version "2020.03.2") + (version "2020.03.3") (source (origin (method url-fetch) (uri (string-append "https://gitlab.com/FloweeTheHub/thehub/-/archive/" version "/thehub-" version ".tar.gz")) (sha256 - (base32 "1m8wfwxljvd2gqpfj1w37xky4isa3h9a7g57cnf3l4r90r4bxj47")))) + (base32 "0ksyh7ll3v9p8f5y15vcb2vkrpzb4h0ricag9j90ad4b4rfsnpjw")))) (build-system cmake-build-system) (arguments `(#:configure-flags '("-Dbuild_tests=ON" "-Denable_gui=OFF") -- cgit v1.2.3 From ec16aaff5da9eb52b9d762531660f02e785d72de Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 16 May 2020 04:26:33 +0200 Subject: gnu: wine-staging-patchset-data: Update to 5.8. * gnu/packages/wine.scm (wine-staging-patchset-data): Update to 5.8. --- gnu/packages/wine.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index 86e0337884..aeec63a1b9 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -328,7 +328,7 @@ integrate Windows applications into your desktop.") (define-public wine-staging-patchset-data (package (name "wine-staging-patchset-data") - (version "5.6") + (version "5.8") (source (origin (method git-fetch) @@ -337,7 +337,7 @@ integrate Windows applications into your desktop.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1i9yiwbyxl0vshc4gbgnhp53m1ray8pkiii876gbiaf93k1irk0d")))) + (base32 "07i11alcymkfj1vgadcxd6khvjk1ay0x2dddwrvnc4gag9lvkddr")))) (build-system trivial-build-system) (native-inputs `(("bash" ,bash) @@ -387,7 +387,7 @@ integrate Windows applications into your desktop.") "/wine-" version ".tar.xz"))) (file-name (string-append name "-" version ".tar.xz")) (sha256 - (base32 "1rh0pk8mbi3bb0di13swzxn7nwnrbfsfizdv472vv3ymf5z8l6ah")))) + (base32 "1krk68lsfvisi0zpx7890cz0z5bp7jl7rka5d70vwyj3c7109bfb")))) (inputs `(("autoconf" ,autoconf) ; for autoreconf ("ffmpeg" ,ffmpeg) ("gtk+" ,gtk+) -- cgit v1.2.3 From 23e89f915e6111fa9ba330bfa317da82e292d50d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 16 May 2020 04:41:31 +0200 Subject: gnu: zsh-autosuggestions: Update to 0.6.4. * gnu/packages/shellutils.scm (zsh-autosuggestions): Update to 0.6.4. --- gnu/packages/shellutils.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm index 7496dd12dc..29e288a402 100644 --- a/gnu/packages/shellutils.scm +++ b/gnu/packages/shellutils.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2016, 2017 Alex Griffin ;;; Copyright © 2016 Christopher Baines ;;; Copyright © 2017 Stefan Reichör -;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018 Benjamin Slade ;;; Copyright © 2019 Collin J. Doering ;;; Copyright © 2020 Michael Rohleder @@ -46,7 +46,7 @@ (define-public zsh-autosuggestions (package (name "zsh-autosuggestions") - (version "0.6.3") + (version "0.6.4") (source (origin (method git-fetch) (uri (git-reference @@ -55,7 +55,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "1h8h2mz9wpjpymgl2p7pc146c1jgb3dggpvzwm9ln3in336wl95c")))) + "0h52p2waggzfshvy1wvhj4hf06fmzd44bv6j18k3l9rcx6aixzn6")))) (build-system gnu-build-system) (native-inputs `(("ruby" ,ruby) -- cgit v1.2.3 From be55f23475f545759d1c196d04ee982bed55e366 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 May 2020 23:29:37 +0200 Subject: gnu: lchat: Update to 0.0.0-4.e3b64e6. * gnu/packages/suckless.scm (lchat): Update to 0.0.0-4.e3b64e6. [source]: Use GIT-VERSION and GIT-FILE-NAME. --- gnu/packages/suckless.scm | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm index 0cf334d7e0..f5e30c4131 100644 --- a/gnu/packages/suckless.scm +++ b/gnu/packages/suckless.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2015 Leo Famulari ;;; Copyright © 2016 Eric Bavier ;;; Copyright © 2017 Alex Griffin -;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -677,21 +677,20 @@ as -1, to be used instead of U+FFFD. ;; No release tarballs so far. (define-public lchat - (let ((revision "3") - (commit "f95191970fd59c52a8b09cff32bd8d2135cbfc6b")) + (let ((revision "4") + (commit "e3b64e67b9b9d832462382246474ce1e7d92217c")) (package (name "lchat") - (version (string-append "0.0.0-" revision "." (string-take commit 7))) + (version (git-version "0.0.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/younix/lchat") (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 - (base32 - "07pxzziczhzprmjy61k7nl9i1kxpgnad37qkjf5fn4wf06nqdxpl")))) + (base32 "1qcjqbgmsskc04j2r6xl3amkwj05n520sq1wv2mqyqncz42qrxm0")))) (build-system gnu-build-system) (arguments `(#:test-target "test" -- cgit v1.2.3 From 5e1cc6685c1f911a2a05a792a50e1b8472e47303 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 May 2020 23:34:42 +0200 Subject: gnu: Don't use NAME in (gnu packages suckless) URIs. * gnu/packages/suckless.scm (spoon, xbattmon, wificurse, skroll, sbm) (prout, fortify-headers, colors, scron)[source]: Hard-code NAME. --- gnu/packages/suckless.scm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm index f5e30c4131..f1f7989f63 100644 --- a/gnu/packages/suckless.scm +++ b/gnu/packages/suckless.scm @@ -175,7 +175,7 @@ numbers of user-defined menu items efficiently.") (origin (method url-fetch) (uri (string-append "https://dl.2f30.org/releases/" - name "-" version ".tar.gz")) + "spoon-" version ".tar.gz")) (sha256 (base32 "1jpmg9k9f4f3lpz0k3cphqjswlyf8lz2sm8ccifiip93kd4rrdj0")))) @@ -356,7 +356,7 @@ few minutes.") (origin (method url-fetch) (uri (string-append "https://dl.2f30.org/releases/" - name "-" version ".tar.gz")) + "xbattmon-" version ".tar.gz")) (sha256 (base32 "1zr6y8lml9xkx0a3dbbsds2qz1bjxvskp7wsckkf8mlsqrbb3xsg")))) @@ -381,7 +381,7 @@ few minutes.") (origin (method url-fetch) (uri (string-append "https://dl.2f30.org/releases/" - name "-" version ".tar.gz")) + "wificurse-" version ".tar.gz")) (sha256 (base32 "067ghr1xly5ca41kc83xila1p5hpq0bxfcmc8jvxi2ggm6wrhavn")))) @@ -414,7 +414,7 @@ drivers capable of injecting packets in wireless networks.") (origin (method url-fetch) (uri (string-append "https://dl.2f30.org/releases/" - name "-" version ".tar.gz")) + "skroll-" version ".tar.gz")) (sha256 (base32 "0km6bjfz4ssb1z0xwld6iiixnn7d255ax8yjs3zkdm42z8q9yl0f")))) @@ -442,7 +442,7 @@ left.") (origin (method url-fetch) (uri (string-append "https://dl.2f30.org/releases/" - name "-" version ".tar.gz")) + "sbm-" version ".tar.gz")) (sha256 (base32 "1nks5mkh5wn30kyjzlkjlgi31bv1wq52kbp0r6nzbyfnvfdlywik")))) @@ -468,7 +468,7 @@ left.") (origin (method url-fetch) (uri (string-append "https://dl.2f30.org/releases/" - name "-" version ".tar.gz")) + "prout-" version ".tar.gz")) (sha256 (base32 "1s6c3ygg1h1fyxkh8gd7nzjk6qhnwsb4535d2k780kxnwns5fzas")))) @@ -564,7 +564,7 @@ environment variable.") (origin (method url-fetch) (uri (string-append "https://dl.2f30.org/releases/" - name "-" version ".tar.gz")) + "fortify-headers-" version ".tar.gz")) (sha256 (base32 "0nvplfg4y4a10x2j12qwmxzlk2q4j6287j0v5f9bfsdayb04qvh2")))) @@ -605,7 +605,7 @@ initially intended to be used on musl-based Linux distributions. (origin (method url-fetch) (uri (string-append "https://dl.2f30.org/releases/" - name "-" version ".tar.gz")) + "colors-" version ".tar.gz")) (sha256 (base32 "1lckmqpgj89841splng0sszbls2ag71ggkgr1wsv9y3v6y87589z")))) @@ -732,7 +732,7 @@ chat output in the background.") (origin (method url-fetch) (uri (string-append "https://dl.2f30.org/releases/" - name "-" version ".tar.gz")) + "scron-" version ".tar.gz")) (sha256 (base32 "066fwa55kqcgfrsqgxh94sqbkxfsr691360xg4ljxr4i75d25s2a")))) -- cgit v1.2.3 From dd3f0680c71a557e863cb0a08054c7e168115957 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 May 2020 23:36:01 +0200 Subject: gnu: st: Update to 0.8.3. * gnu/packages/suckless.scm (st): Update to 0.8.3. --- gnu/packages/suckless.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm index f1f7989f63..95933e4f39 100644 --- a/gnu/packages/suckless.scm +++ b/gnu/packages/suckless.scm @@ -226,14 +226,14 @@ numbers of user-defined menu items efficiently.") (define-public st (package (name "st") - (version "0.8.2") + (version "0.8.3") (source (origin (method url-fetch) (uri (string-append "https://dl.suckless.org/st/st-" version ".tar.gz")) (sha256 - (base32 "0ddz2mdp1c7q67rd5vrvws9r0493ln0mlqyc3d73dv8im884xdxf")))) + (base32 "0ll5wbw1szs70wdf8zy1y2ig5mfbqw2w4ls8d64r8z3y4gdf76lk")))) (build-system gnu-build-system) (arguments '(#:tests? #f ; no tests -- cgit v1.2.3 From ca39ee94dcddfabf9c407765397a76b7b1d45f6e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 May 2020 23:36:10 +0200 Subject: gnu: fortify-headers: Update to 1.1. * gnu/packages/suckless.scm (fortify-headers): Update to 1.1. --- gnu/packages/suckless.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm index 95933e4f39..69177f4e00 100644 --- a/gnu/packages/suckless.scm +++ b/gnu/packages/suckless.scm @@ -559,15 +559,14 @@ environment variable.") (define-public fortify-headers (package (name "fortify-headers") - (version "1.0") + (version "1.1") (source (origin (method url-fetch) (uri (string-append "https://dl.2f30.org/releases/" "fortify-headers-" version ".tar.gz")) (sha256 - (base32 - "0nvplfg4y4a10x2j12qwmxzlk2q4j6287j0v5f9bfsdayb04qvh2")))) + (base32 "1dhz41jq1azcf7rbvga8w6pnx19l1j9r6jwj8qrlrfnjl9hdi9bb")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no tests -- cgit v1.2.3 From 259da514950405492714e6c0f246af1dc832caf5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 May 2020 23:36:59 +0200 Subject: gnu: libutf: Use GIT- helpers. * gnu/packages/suckless (libutf)[source]: Use GIT-VERSION and GIT-FILE-NAME. --- gnu/packages/suckless.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm index 69177f4e00..bff7fc493b 100644 --- a/gnu/packages/suckless.scm +++ b/gnu/packages/suckless.scm @@ -634,14 +634,14 @@ colormap to stdout.") (commit "ff4c60635e1f455b0a0b4200f8183fbd5a88225b")) (package (name "libutf") - (version (string-append "0.0.0-" revision "." (string-take commit 7))) + (version (git-version "0.0.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/cls/libutf") (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "1ih5vjavilzggyr1j1z6w1z12c2fs5fg77cfnv7ami5ivsy3kg3d")))) -- cgit v1.2.3 From 211dc8cdd881b6a56ef40529bcaf6d5518c119c3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 16 May 2020 01:42:26 +0200 Subject: gnu: Support cross-gccs in (gnu packages suckless). * gnu/packages/suckless.scm (blind, dmenu, spoon, slock, st, surf, sent) (xbattmon, skroll, sbm, prout, noice, human, fortify-headers, colors) (libutf, lchat, scron)[arguments]: Use ${target}-gcc when cross-compiling. --- gnu/packages/suckless.scm | 200 +++++++++++++++++++++++++++++++--------------- 1 file changed, 135 insertions(+), 65 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm index bff7fc493b..2a476dc31c 100644 --- a/gnu/packages/suckless.scm +++ b/gnu/packages/suckless.scm @@ -61,10 +61,13 @@ "0nncvzyipvkkd7zlgzwbjygp82frzs2hvbnk71gxf671np607y94")))) (build-system gnu-build-system) (arguments - '(#:tests? #f ; no check target - #:make-flags (list - "CC=gcc" - (string-append "PREFIX=" %output)) + `(#:tests? #f ; no check target + #:make-flags + (let ((target ,(%current-target-system))) + (list (string-append "CC=" (if target + (string-append target "-gcc") + "gcc")) + (string-append "PREFIX=" %output))) #:phases (modify-phases %standard-phases (delete 'configure)))) ; no configure script @@ -147,12 +150,16 @@ optimising the environment for the application in use and the task performed.") "0ia9nqr83bv6x247q30bal0v42chcj9qcjgv59xs6xj46m7iz5xk")))) (build-system gnu-build-system) (arguments - '(#:tests? #f ; no tests - #:make-flags (list "CC=gcc" - (string-append "PREFIX=" %output) - (string-append "FREETYPEINC=" - (assoc-ref %build-inputs "freetype") - "/include/freetype2")) + `(#:tests? #f ; no tests + #:make-flags + (let ((target ,(%current-target-system))) + (list (string-append "CC=" (if target + (string-append target "-gcc") + "gcc")) + (string-append "PREFIX=" %output) + (string-append "FREETYPEINC=" + (assoc-ref %build-inputs "freetype") + "/include/freetype2"))) #:phases (modify-phases %standard-phases (delete 'configure)))) (inputs @@ -182,8 +189,12 @@ numbers of user-defined menu items efficiently.") (build-system gnu-build-system) (arguments `(#:tests? #f ; no tests - #:make-flags (list "CC=gcc" - (string-append "PREFIX=" %output)))) + #:make-flags + (let ((target ,(%current-target-system))) + (list (string-append "CC=" (if target + (string-append target "-gcc") + "gcc")) + (string-append "PREFIX=" %output))))) (inputs `(("libx11" ,libx11) ("libxkbfile" ,libxkbfile) @@ -208,9 +219,13 @@ numbers of user-defined menu items efficiently.") "0sif752303dg33f14k6pgwq2jp1hjyhqv6x4sy3sj281qvdljf5m")))) (build-system gnu-build-system) (arguments - '(#:tests? #f ; no tests - #:make-flags (list "CC=gcc" - (string-append "PREFIX=" %output)) + `(#:tests? #f ; no tests + #:make-flags + (let ((target ,(%current-target-system))) + (list (string-append "CC=" (if target + (string-append target "-gcc") + "gcc")) + (string-append "PREFIX=" %output))) #:phases (modify-phases %standard-phases (delete 'configure)))) (inputs `(("libx11" ,libx11) @@ -236,9 +251,13 @@ numbers of user-defined menu items efficiently.") (base32 "0ll5wbw1szs70wdf8zy1y2ig5mfbqw2w4ls8d64r8z3y4gdf76lk")))) (build-system gnu-build-system) (arguments - '(#:tests? #f ; no tests - #:make-flags (list "CC=gcc" - (string-append "PREFIX=" %output)) + `(#:tests? #f ; no tests + #:make-flags + (let ((target ,(%current-target-system))) + (list (string-append "CC=" (if target + (string-append target "-gcc") + "gcc")) + (string-append "PREFIX=" %output))) #:phases (modify-phases %standard-phases (delete 'configure) @@ -277,9 +296,13 @@ drawing.") "07cmajyafljigy10d21kkyvv5jf3hxkx06pz3rwwk3y3c9x4rvps")))) (build-system glib-or-gtk-build-system) (arguments - '(#:tests? #f ; no tests - #:make-flags (list "CC=gcc" - (string-append "PREFIX=" %output)) + `(#:tests? #f ; no tests + #:make-flags + (let ((target ,(%current-target-system))) + (list (string-append "CC=" (if target + (string-append target "-gcc") + "gcc")) + (string-append "PREFIX=" %output))) #:phases (modify-phases %standard-phases (delete 'configure) @@ -323,15 +346,18 @@ point surf to another URI by setting its XProperties.") `(#:phases (modify-phases %standard-phases (delete 'configure)) ; no configuration #:tests? #f ; no test suite - #:make-flags (let ((pkg-config (lambda (flag) - (string-append - "$(shell pkg-config " flag " " - "xft fontconfig x11 libpng)")))) - (list - "CC=gcc" - (string-append "PREFIX=" %output) - (string-append "INCS=-I. " (pkg-config "--cflags")) - (string-append "LIBS=" (pkg-config "--libs") " -lm"))))) + #:make-flags + (let ((target ,(%current-target-system)) + (pkg-config (lambda (flag) + (string-append + "$(shell pkg-config " flag " " + "xft fontconfig x11 libpng)")))) + (list (string-append "CC=" (if target + (string-append target "-gcc") + "gcc")) + (string-append "PREFIX=" %output) + (string-append "INCS=-I. " (pkg-config "--cflags")) + (string-append "LIBS=" (pkg-config "--libs") " -lm"))))) (native-inputs `(("pkg-config" ,pkg-config))) (inputs @@ -362,9 +388,13 @@ few minutes.") "1zr6y8lml9xkx0a3dbbsds2qz1bjxvskp7wsckkf8mlsqrbb3xsg")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; No tests - #:make-flags (list "CC=gcc" - (string-append "PREFIX=" %output)))) + `(#:tests? #f ; no tests + #:make-flags + (let ((target ,(%current-target-system))) + (list (string-append "CC=" (if target + (string-append target "-gcc") + "gcc")) + (string-append "PREFIX=" %output))))) (inputs `(("libx11" ,libx11))) (home-page "https://git.2f30.org/xbattmon/") @@ -420,12 +450,16 @@ drivers capable of injecting packets in wireless networks.") "0km6bjfz4ssb1z0xwld6iiixnn7d255ax8yjs3zkdm42z8q9yl0f")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; No tests - #:make-flags (list "CC=gcc" - (string-append "PREFIX=" %output)) + `(#:tests? #f ; no tests + #:make-flags + (let ((target ,(%current-target-system))) + (list (string-append "CC=" (if target + (string-append target "-gcc") + "gcc")) + (string-append "PREFIX=" %output))) #:phases (modify-phases %standard-phases - (delete 'configure)))) ; No configure script + (delete 'configure)))) ; no configure script (home-page "https://2f30.org/") (synopsis "Commandline utility which scrolls text") (description @@ -448,12 +482,16 @@ left.") "1nks5mkh5wn30kyjzlkjlgi31bv1wq52kbp0r6nzbyfnvfdlywik")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; No tests - #:make-flags (list "CC=gcc" - (string-append "PREFIX=" %output)) + `(#:tests? #f ; no tests + #:make-flags + (let ((target ,(%current-target-system))) + (list (string-append "CC=" (if target + (string-append target "-gcc") + "gcc")) + (string-append "PREFIX=" %output))) #:phases (modify-phases %standard-phases - (delete 'configure)))) ; No configure script + (delete 'configure)))) ; no configure script (home-page "https://git.2f30.org/sbm/") (synopsis "Simple bandwidth monitor") (description @@ -474,12 +512,16 @@ left.") "1s6c3ygg1h1fyxkh8gd7nzjk6qhnwsb4535d2k780kxnwns5fzas")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; No tests - #:make-flags (list "CC=gcc" - (string-append "PREFIX=" %output)) + `(#:tests? #f ; no tests + #:make-flags + (let ((target ,(%current-target-system))) + (list (string-append "CC=" (if target + (string-append target "-gcc") + "gcc")) + (string-append "PREFIX=" %output))) #:phases (modify-phases %standard-phases - (delete 'configure)))) ; No configure script + (delete 'configure)))) ; no configure script (inputs `(("cups-minimal" ,cups-minimal) ("zlib" ,zlib))) @@ -507,8 +549,12 @@ cups server to be installed.") (build-system gnu-build-system) (arguments `(#:tests? #f ; no tests - #:make-flags (list "CC=gcc" - (string-append "PREFIX=" %output)) + #:make-flags + (let ((target ,(%current-target-system))) + (list (string-append "CC=" (if target + (string-append target "-gcc") + "gcc")) + (string-append "PREFIX=" %output))) #:phases (modify-phases %standard-phases (delete 'configure) ; no configure script @@ -541,8 +587,12 @@ cups server to be installed.") (build-system gnu-build-system) (arguments `(#:tests? #f ; no tests - #:make-flags (list "CC=gcc" - (string-append "PREFIX=" %output)) + #:make-flags + (let ((target ,(%current-target-system))) + (list (string-append "CC=" (if target + (string-append target "-gcc") + "gcc")) + (string-append "PREFIX=" %output))) #:phases (modify-phases %standard-phases (delete 'configure)))) ; no configure script @@ -570,8 +620,12 @@ environment variable.") (build-system gnu-build-system) (arguments `(#:tests? #f ; no tests - #:make-flags (list "CC=gcc" - (string-append "PREFIX=" %output)) + #:make-flags + (let ((target ,(%current-target-system))) + (list (string-append "CC=" (if target + (string-append target "-gcc") + "gcc")) + (string-append "PREFIX=" %output))) #:phases (modify-phases %standard-phases (delete 'configure)))) ; no configure script @@ -610,12 +664,16 @@ initially intended to be used on musl-based Linux distributions. "1lckmqpgj89841splng0sszbls2ag71ggkgr1wsv9y3v6y87589z")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; No tests - #:make-flags (list "CC=gcc" - (string-append "PREFIX=" %output)) + `(#:tests? #f ; no tests + #:make-flags + (let ((target ,(%current-target-system))) + (list (string-append "CC=" (if target + (string-append target "-gcc") + "gcc")) + (string-append "PREFIX=" %output))) #:phases (modify-phases %standard-phases - (delete 'configure)))) ; No configure script + (delete 'configure)))) ; no configure script (inputs `(("libpng" ,libpng))) (home-page "https://git.2f30.org/colors/") @@ -647,12 +705,16 @@ colormap to stdout.") "1ih5vjavilzggyr1j1z6w1z12c2fs5fg77cfnv7ami5ivsy3kg3d")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; No tests - #:make-flags (list "CC=gcc" - (string-append "PREFIX=" %output)) + `(#:tests? #f ; no tests + #:make-flags + (let ((target ,(%current-target-system))) + (list (string-append "CC=" (if target + (string-append target "-gcc") + "gcc")) + (string-append "PREFIX=" %output))) #:phases (modify-phases %standard-phases - (delete 'configure)))) ; No configure script + (delete 'configure)))) ; no configure script (inputs `(("gawk" ,gawk))) (home-page "https://github.com/cls/libutf") @@ -693,8 +755,12 @@ as -1, to be used instead of U+FFFD. (build-system gnu-build-system) (arguments `(#:test-target "test" - #:make-flags (list "CC=gcc" - (string-append "PREFIX=" %output)) + #:make-flags + (let ((target ,(%current-target-system))) + (list (string-append "CC=" (if target + (string-append target "-gcc") + "gcc")) + (string-append "PREFIX=" %output))) #:phases (modify-phases %standard-phases (delete 'configure) ; no configure script @@ -737,12 +803,16 @@ chat output in the background.") "066fwa55kqcgfrsqgxh94sqbkxfsr691360xg4ljxr4i75d25s2a")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; No tests - #:make-flags (list "CC=gcc" - (string-append "PREFIX=" %output)) + `(#:tests? #f ; no tests + #:make-flags + (let ((target ,(%current-target-system))) + (list (string-append "CC=" (if target + (string-append target "-gcc") + "gcc")) + (string-append "PREFIX=" %output))) #:phases (modify-phases %standard-phases - (delete 'configure)))) ; No configure script + (delete 'configure)))) ; no configure script (home-page "https://git.2f30.org/scron/") (synopsis "Simple cron daemon") (description -- cgit v1.2.3 From b273158bb41e3e4b5e5ccf1077bab852e9df4b5d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 16 May 2020 01:45:50 +0200 Subject: gnu: Order (gnu packase suckless) module imports. * gnu/packages/suckless.scm: Order module imports alphabetically. --- gnu/packages/suckless.scm | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm index 2a476dc31c..5cabb40eb0 100644 --- a/gnu/packages/suckless.scm +++ b/gnu/packages/suckless.scm @@ -25,28 +25,28 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages suckless) - #:use-module ((guix licenses) #:prefix license:) - #:use-module (guix packages) - #:use-module (guix download) - #:use-module (guix git-download) - #:use-module (guix build-system gnu) - #:use-module (guix build-system glib-or-gtk) #:use-module (gnu packages) - #:use-module (gnu packages gnome) - #:use-module (gnu packages image) - #:use-module (gnu packages xorg) + #:use-module (gnu packages base) + #:use-module (gnu packages compression) + #:use-module (gnu packages cups) #:use-module (gnu packages fonts) - #:use-module (gnu packages pkg-config) - #:use-module (gnu packages webkit) #:use-module (gnu packages fontutils) - #:use-module (gnu packages mpd) + #:use-module (gnu packages gawk) + #:use-module (gnu packages gnome) + #:use-module (gnu packages image) + #:use-module (gnu packages libbsd) #:use-module (gnu packages linux) - #:use-module (gnu packages compression) - #:use-module (gnu packages cups) + #:use-module (gnu packages mpd) #:use-module (gnu packages ncurses) - #:use-module (gnu packages gawk) - #:use-module (gnu packages base) - #:use-module (gnu packages libbsd)) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages webkit) + #:use-module (gnu packages xorg) + #:use-module (guix build-system glib-or-gtk) + #:use-module (guix build-system gnu) + #:use-module (guix download) + #:use-module (guix git-download) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages)) (define-public blind (package -- cgit v1.2.3 From 63f2de031c7ddbfb0697cccc8f916bd29eaa85de Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 16 May 2020 01:57:24 +0200 Subject: gnu: utf8proc: Factor out UNICODE_VERSION. * gnu/packages/textutils.scm (utf8proc)[native-inputs]: Use a single UNICODE_VERSION. --- gnu/packages/textutils.scm | 37 ++++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 17 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index c2184de46b..54267bfe9b 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -151,24 +151,27 @@ libenca and several charset conversion libraries and tools.") (sha256 (base32 "1i42hqwc8znqii9brangwkxk5cyc2lk95ip405fg88zr7z2ncr34")))) (build-system gnu-build-system) - (native-inputs ;test data that is otherwise downloaded with curl - `(("NormalizationTest.txt" - ,(origin - (method url-fetch) - (uri (string-append "https://www.unicode.org/Public/12.1.0/ucd/" - "NormalizationTest.txt")) - (sha256 - (base32 "0hb97k9xv1lr847hwz0719ksqy39s47xw6k01dgs1368jdibvawc")))) - ("GraphemeBreakTest.txt" - ,(origin - (method url-fetch) - (uri (string-append "https://www.unicode.org/Public/12.1.0/ucd/" - "auxiliary/GraphemeBreakTest.txt")) - (sha256 - (base32 "0qc90ppmrwfn3y9cdn8jcjrn7qpdf0fhxkwh945yp4rvh37mbgcm")))) + (native-inputs + (let ((UNICODE_VERSION "12.1.0")) ; defined in data/Makefile + ;; Test data that is otherwise downloaded with curl. + `(("NormalizationTest.txt" + ,(origin + (method url-fetch) + (uri (string-append "https://www.unicode.org/Public/" + UNICODE_VERSION "/ucd/NormalizationTest.txt")) + (sha256 + (base32 "0hb97k9xv1lr847hwz0719ksqy39s47xw6k01dgs1368jdibvawc")))) + ("GraphemeBreakTest.txt" + ,(origin + (method url-fetch) + (uri (string-append "https://www.unicode.org/Public/" + UNICODE_VERSION + "/ucd/auxiliary/GraphemeBreakTest.txt")) + (sha256 + (base32 "0qc90ppmrwfn3y9cdn8jcjrn7qpdf0fhxkwh945yp4rvh37mbgcm")))) - ;; For tests. - ("perl" ,perl))) + ;; For tests. + ("perl" ,perl)))) (arguments '(#:make-flags (list "CC=gcc" (string-append "prefix=" (assoc-ref %outputs "out"))) -- cgit v1.2.3 From cbae20494624fc69442d9437302a6f4a38c1b083 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 16 May 2020 04:12:56 +0200 Subject: gnu: utf8proc: Update to 2.5.0. * gnu/packages/textutils.scm (utf8proc): Update to 2.5.0. [native-inputs]: Update test data UNICODE_VERSION. --- gnu/packages/textutils.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index 54267bfe9b..6fdcfd227e 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -140,7 +140,7 @@ libenca and several charset conversion libraries and tools.") (define-public utf8proc (package (name "utf8proc") - (version "2.4.0") + (version "2.5.0") (source (origin (method git-fetch) @@ -149,10 +149,10 @@ libenca and several charset conversion libraries and tools.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1i42hqwc8znqii9brangwkxk5cyc2lk95ip405fg88zr7z2ncr34")))) + (base32 "1xlkazhdnja4lksn5c9nf4bln5gjqa35a8gwlam5r0728w0h83qq")))) (build-system gnu-build-system) (native-inputs - (let ((UNICODE_VERSION "12.1.0")) ; defined in data/Makefile + (let ((UNICODE_VERSION "13.0.0")) ; defined in data/Makefile ;; Test data that is otherwise downloaded with curl. `(("NormalizationTest.txt" ,(origin @@ -160,7 +160,7 @@ libenca and several charset conversion libraries and tools.") (uri (string-append "https://www.unicode.org/Public/" UNICODE_VERSION "/ucd/NormalizationTest.txt")) (sha256 - (base32 "0hb97k9xv1lr847hwz0719ksqy39s47xw6k01dgs1368jdibvawc")))) + (base32 "07g0ya4f6zfzvpp24ccxkb2yq568kh83gls85rjl950nv5fya3nn")))) ("GraphemeBreakTest.txt" ,(origin (method url-fetch) @@ -168,7 +168,7 @@ libenca and several charset conversion libraries and tools.") UNICODE_VERSION "/ucd/auxiliary/GraphemeBreakTest.txt")) (sha256 - (base32 "0qc90ppmrwfn3y9cdn8jcjrn7qpdf0fhxkwh945yp4rvh37mbgcm")))) + (base32 "07f8rrvcsq4pibdz6zxggxy8w7zjjqyw2ggclqlhalyv45yv7prj")))) ;; For tests. ("perl" ,perl)))) -- cgit v1.2.3 From 13356b22c4e408246b8d809cd6370c6a2bf936b5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 16 May 2020 02:31:06 +0200 Subject: gnu: console-setup: Update to 1.195. * gnu/packages/xorg.scm (console-setup): Update to 1.195. --- gnu/packages/xorg.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 25f2793fa1..9a7b856791 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -6615,15 +6615,15 @@ output.") (define-public console-setup (package (name "console-setup") - (version "1.194") + (version "1.195") (source (origin (method git-fetch) (uri (git-reference (url "https://salsa.debian.org/installer-team/console-setup.git") - (commit version))) + (commit "38512eb9a97f57ead1f87f6aee6df455f721c645"))) ; no tag (sha256 - (base32 "0fkabv05j5dj10mfrpjyvv7lnxl9qaqkbjhwj72r18i9i4019vgh")) + (base32 "0d0xagigs5k3appzz5lzxdjncvnkgz4amz6ks7imiq8kkjixvmfy")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments @@ -6631,7 +6631,7 @@ output.") (let ((bash (assoc-ref %build-inputs "bash")) (out (assoc-ref %outputs "out"))) (list (string-append "SHELL=" bash "/bin/bash"))) - #:tests? #f ;no tests + #:tests? #f ; no tests #:phases (modify-phases %standard-phases (delete 'configure) @@ -6665,10 +6665,10 @@ output.") `(("pkg-config" ,pkg-config) ("bdftopcf" ,bdftopcf) ("bdfresize" ,bdfresize) - ("sharutils" ,sharutils) ;for 'uuencode' + ("sharutils" ,sharutils) ; for 'uuencode' ("perl" ,perl))) (inputs - `(("perl" ,perl))) ;used by 'ckbcomp' + `(("perl" ,perl))) ; used by 'ckbcomp' (synopsis "Set up the Linux console font and keyboard") (description "console-setup provides the console with the same keyboard -- cgit v1.2.3 From eeebf5729213abec5470416f26dd3265abed5c4a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 16 May 2020 14:55:41 +0200 Subject: gnu: youtube-dl: Update to 2020.05.08. * gnu/packages/video.scm (youtube-dl): Update to 2020.05.08. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index e0eb2db84a..f34da90d5d 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1610,7 +1610,7 @@ To load this plugin, specify the following option when starting mpv: (define-public youtube-dl (package (name "youtube-dl") - (version "2020.05.03") + (version "2020.05.08") (source (origin (method url-fetch) (uri (string-append "https://github.com/ytdl-org/youtube-dl/" @@ -1618,7 +1618,7 @@ To load this plugin, specify the following option when starting mpv: version ".tar.gz")) (sha256 (base32 - "0qigk1bml6vkck4rs0wnmr46j5gkz04zn30jvnw1r4czjs7vnpal")))) + "16zxa8ss2rka7cvkqyi67s8i1h9f4nxx88w9vjbxchbga6w0scc6")))) (build-system python-build-system) (arguments ;; The problem here is that the directory for the man page and completion -- cgit v1.2.3 From 0fe654ebcdf3399a950da65b50924096c947df42 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 16 May 2020 15:04:47 +0200 Subject: gnu: z3: Update to 4.8.8. * gnu/packages/maths.scm (z3): Update to 4.8.8. --- gnu/packages/maths.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index d60c033dbc..1821b2b1c7 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -20,7 +20,7 @@ ;;; Copyright © 2017 Ben Woodcroft ;;; Copyright © 2017 Theodoros Foradis ;;; Copyright © 2017, 2019 Arun Isaac -;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2017 Dave Love ;;; Copyright © 2018, 2019 Jan Nieuwenhuizen ;;; Copyright © 2018 Joshua Sierles, Nextjournal @@ -4366,7 +4366,7 @@ as equations, scalars, vectors, and matrices.") (define-public z3 (package (name "z3") - (version "4.8.7") + (version "4.8.8") (home-page "https://github.com/Z3Prover/z3") (source (origin (method git-fetch) @@ -4375,7 +4375,7 @@ as equations, scalars, vectors, and matrices.") (file-name (git-file-name name version)) (sha256 (base32 - "0hprcdwhhyjigmhhk6514m71bnmvqci9r8gglrqilgx424r6ff7q")))) + "1rn538ghqwxq0v8i6578j8mflk6fyv0cp4hjfqynzvinjbps56da")))) (build-system gnu-build-system) (arguments `(#:imported-modules ((guix build python-build-system) -- cgit v1.2.3 From a3dfe052850257de0a64bec6797f803145903179 Mon Sep 17 00:00:00 2001 From: Alex Sassmannshausen Date: Sat, 16 May 2020 17:30:35 +0200 Subject: gnu: guile-hall: Update to 0.3.0. * gnu/packages/guile-xyz.scm (guile-hall): Update to 0.3.0. --- gnu/packages/guile-xyz.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index d7f52b08f4..a5a4772117 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -1397,16 +1397,16 @@ above command-line parameters.") (define-public guile-hall (package (name "guile-hall") - (version "0.2.1") + (version "0.3.0") (source (origin (method git-fetch) (uri (git-reference (url "https://gitlab.com/a-sassmannshausen/guile-hall") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 (base32 - "0dwx5iyg0dmdf64wq0b4w306bapr86jwnw35npgbjq4cqm8qbzqn")))) + (commit version))) + (file-name "guile-hall-0.3.0-checkout") + (sha256 + (base32 "04vi9h1jj6sfdr4ikbvd41ls4rdgfp01x7dvbklb9mmgadzcibhn")))) (build-system gnu-build-system) (arguments `(#:modules -- cgit v1.2.3 From 523cbfbd55fa73d0c31e2ac84008a18fffbd42f5 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 16 May 2020 15:16:52 +0200 Subject: gnu: bap: Update to 2.0.0. * gnu/packages/ocaml.scm (bap): Update to 2.0.0. --- gnu/packages/ocaml.scm | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index c5ec3174ed..916c7fe292 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2975,7 +2975,7 @@ XML and Protocol Buffers formats.") (define-public bap (package (name "bap") - (version "1.6.0") + (version "2.0.0") (home-page "https://github.com/BinaryAnalysisPlatform/bap") (source (origin (method git-fetch) @@ -2985,7 +2985,7 @@ XML and Protocol Buffers formats.") (file-name (git-file-name name version)) (sha256 (base32 - "0ryf2xb37pj2f9mc3p5prqgqrylph9qgq7q9jnbx8b03nzzpa6h6")))) + "0lb9xkfp67wjjqr75p6krivmjra7l5673236v9ny4gp0xi0755bk")))) (build-system ocaml-build-system) (native-inputs `(("ocaml-oasis" ,(package-with-ocaml4.07 ocaml-oasis)) @@ -3003,16 +3003,23 @@ XML and Protocol Buffers formats.") ("ocaml-ocurl" ,(package-with-ocaml4.07 ocaml-ocurl)) ("ocaml-piqi" ,ocaml4.07-piqi) ("ocaml-ppx-jane" ,ocaml4.07-ppx-jane) + ("ocaml-utop" ,ocaml4.07-utop) ("ocaml-uuidm" ,(package-with-ocaml4.07 ocaml-uuidm)) ("ocaml-uri" ,ocaml4.07-uri) ("ocaml-zarith" ,(package-with-ocaml4.07 ocaml-zarith)))) (inputs - `(("llvm" ,llvm-3.8) - ("gmp" ,gmp))) + `(("gmp" ,gmp) + ("llvm" ,llvm-3.8) + ("ncurses" ,ncurses))) (arguments `(#:use-make? #t #:phases (modify-phases %standard-phases + (add-before 'configure 'fix-ncurses + (lambda _ + (substitute* "oasis/llvm" + (("-lcurses") "-lncurses")) + #t)) (replace 'configure (lambda* (#:key outputs inputs #:allow-other-keys) ;; add write for user, to prevent a failure in the install phase -- cgit v1.2.3 From 8ba990e69dcf471c3c24964cd8d7438c7fae427c Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 16 May 2020 15:59:39 +0200 Subject: gnu: Add java-picocli. gnu/packages/java.scm (java-picocli): New variable. --- gnu/packages/java.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 071b97582d..fc1f7d157a 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -11943,3 +11943,28 @@ involving one or more shared resources having ACID (Atomicity, Consistency, Isolation and Durability) properties.") ;; either gpl2 only with classpath exception or cddl. (license (list license:gpl2 license:cddl1.0)))) + +(define-public java-picocli + (package + (name "java-picocli") + (version "4.3.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/remkop/picocli") + (commit (string-append "v" version)))) + (sha256 + (base32 + "1sxp6rxjfgjd98ly14b3d15dvxkm5wg4g46w12jyhmr0kmkaca3c")))) + (build-system ant-build-system) + (arguments + `(#:jar-name "picocli.jar" + #:source-dir "src/main/java" + ;; Tests require missing dependencies (junitparams, system-rules) + #:tests? #f)) + (home-page "https://picocli.info") + (synopsis "REPL for the JVM") + (description "Picocli is a framework for building command line applications +for the JVM. It supports colors, autocompletion, subcommands, and more. Written +in Java, usable from Groovy, Kotlin, Scala, etc.") + (license license:asl2.0))) -- cgit v1.2.3 From 3c102716d0926602330d3cf616ec9dd0640b7c81 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Thu, 30 Apr 2020 18:19:11 +0200 Subject: gnu: Add font-api-mj-mincho. * gnu/packages/fonts.scm (font-api-mj-mincho): New variable. --- gnu/packages/fonts.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 64d5c17346..f4071f456f 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -33,6 +33,7 @@ ;;; Copyright © 2020 Michael Rohleder ;;; Copyright © 2020 John Soo ;;; Copyright © 2020 Raghav Gururajan +;;; Copyright © 2020 Julien Lepiller ;;; ;;; This file is part of GNU Guix. ;;; @@ -1737,3 +1738,35 @@ variation Arial. Tamil characters are inherently vertically-elliptical. The orthography of Roman glyphs of Meera Inimai are also based on this characteristic so that they sit smoothly with the Tamil glyphs.") (license license:silofl1.1))) + +(define-public font-ipa-mj-mincho + (package + (name "font-ipa-mj-mincho") + (version "006.01") + (source (origin + (method url-fetch/zipbomb) + (uri (string-append "https://mojikiban.ipa.go.jp/OSCDL/IPAmjMincho" + "/ipamjm" (string-join (string-split version #\.) "") + ".zip")) + (sha256 + (base32 + "0s2vs9p7vd7ajnn6c2icli069sjwi4d45a39fczqpwwn507lwj9m")))) + (build-system font-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'install 'install-doc + (lambda* (#:key outputs #:allow-other-keys) + (let ((doc-dir (string-append (assoc-ref outputs "out") + "/share/doc/font-ipa-mj-mincho"))) + (mkdir-p doc-dir) + (copy-file "Readme.txt" (string-append doc-dir "/README")) + (copy-file "IPA_Font_License_Agreement_v1.0.txt" + (string-append doc-dir "/LICENSE")) + #t)))))) + (home-page "https://mojikiban.ipa.go.jp/1300.html") + (synopsis "Japanese font from the Information-technology Promotion Agency") + (description "MJM Mincho is a font that aims at, for example, allowing you +to write people's name, or for formal business situations where it is necessary +to have a detailed and proper character style.") + (license license:ipa))) -- cgit v1.2.3 From d952eebd4689e06fec617047cf913bf0d40e8f83 Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Sat, 16 May 2020 17:14:02 +0200 Subject: gnu: emacs-pass: Update to 2.0. * gnu/packages/emacs-xyz.scm (emacs-pass): Update to 2.0. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 45ccced99e..4bbd482409 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -12691,7 +12691,7 @@ standard Unix password manager\").") (define-public emacs-pass (package (name "emacs-pass") - (version "1.8") + (version "2.0") (source (origin (method git-fetch) @@ -12700,7 +12700,7 @@ standard Unix password manager\").") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "05h4hacv3yygyjcjj004qbyqjpkl4pyhwgp25gsz8mw5c66l70cx")))) + (base32 "0jc8j421mlflspg24jvrqc2n3y5n3cpk3hjy560il8g36xi1049p")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-password-store" ,emacs-password-store) -- cgit v1.2.3 From 525fd26deb7051ece34aada91609e314f8d997bb Mon Sep 17 00:00:00 2001 From: Ekaitz Zarraga Date: Sat, 16 May 2020 10:24:47 +0000 Subject: gnu: openctm: Correct inputs vs native-inputs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/engineering.scm (openctm): Move mesa, glu, glut and gtk+-2 to inputs Signed-off-by: Ludovic Courtès --- gnu/packages/engineering.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index aec692174a..aab414bf0e 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -2557,11 +2557,12 @@ official SDK.") (base32 "01wb70m48xh5gwhv60a5brv4sxl0i0rh038w32cgnlxn5x86s9f1")))) (build-system gnu-build-system) (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs `(("mesa" ,mesa) ("glu" ,glu) ("glut" ,freeglut) - ("gtk" ,gtk+-2) - ("pkg-config" ,pkg-config))) + ("gtk" ,gtk+-2))) (arguments `(#:tests? #f ;no tests #:phases -- cgit v1.2.3 From 1c85ecec8e8337ee99c7e3a59587afd6512db425 Mon Sep 17 00:00:00 2001 From: Ekaitz Zarraga Date: Fri, 15 May 2020 16:05:11 +0200 Subject: gnu: Add lib3ds. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/engineering.scm (lib3ds): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/engineering.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index aab414bf0e..37b42ca3f5 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -2595,3 +2595,25 @@ fraction of comparable file formats (3DS, STL, COLLADA...), and the format is accessible through a simple API") (license license:zlib) (home-page "http://openctm.sourceforge.net/")))) + +(define-public lib3ds + (package + (name "lib3ds") + (version "1.3.0") + (source + (origin + (method url-fetch) + (uri (string-append + "https://storage.googleapis.com/google-code-archive-downloads" + "/v2/code.google.com/lib3ds/lib3ds-" version ".zip")) + (sha256 + (base32 "1qr9arfdkjf7q11xhvxwzmhxqz3nhcjkyb8zzfjpz9jm54q0rc7m")))) + (build-system gnu-build-system) + (native-inputs + `(("unzip" ,unzip))) + (home-page "https://code.google.com/archive/p/lib3ds") + (synopsis "3DS format file toolkit") + (description "Lib3ds is a toolkit for handling the 3DS format for 3D +model files. Its main goal is to simplify the creation of 3DS import and +export filters.") + (license license:lgpl2.1+))) -- cgit v1.2.3 From 7e6bbd8b09b090ba1c1d156caed859901757396e Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Sat, 9 May 2020 15:02:59 +0200 Subject: gnu: gnome-shell-extension-dash-to-dock: Update to 67. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gnome-xyz.scm (gnome-shell-extension-dash-to-dock): Update to 67. Signed-off-by: Ludovic Courtès --- gnu/packages/gnome-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index a60b5dbb61..83e37f97b0 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2019 Leo Prikler +;;; Copyright © 2019, 2020 Leo Prikler ;;; Copyright © 2019 Alexandros Theodotou ;;; Copyright © 2019 Giacomo Leidi ;;; Copyright © 2020 Alex Griffin @@ -239,7 +239,7 @@ easier to keep track of apps running in the backround.") (define-public gnome-shell-extension-dash-to-dock (package (name "gnome-shell-extension-dash-to-dock") - (version "66") + (version "67") (source (origin (method git-fetch) (uri (git-reference @@ -248,7 +248,7 @@ easier to keep track of apps running in the backround.") version)))) (sha256 (base32 - "04krl6rxlp1qc97psraf2kwin7h0mx4c7pnfpi7vhplmvasrwkfh")) + "1746xm0iyvyzj6m3pvjx11smh9w1s7naz426ki0dlr5l7jh3mpy5")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From 70d1e9714c2a3f2041731f79c7c9ab05a045752d Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Fri, 8 May 2020 14:51:43 +0200 Subject: gnu: tinyxml2: Update to 8.0.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/xml.scm (tinyxml2): Update to 8.0.0. Signed-off-by: Ludovic Courtès --- gnu/packages/xml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 03daebb4a7..51ac6d44d1 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -1101,7 +1101,7 @@ C++ programming language.") (define-public tinyxml2 (package (name "tinyxml2") - (version "7.0.1") + (version "8.0.0") (source (origin (method git-fetch) @@ -1110,7 +1110,7 @@ C++ programming language.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1sf6sch1kawrna2f9dc8f4xl836acqcddkghzdib0s7dl48m9r7m")))) + (base32 "0raa8r2hsagk7gjlqjwax95ib8d47ba79n91r4aws2zg8y6ssv1d")))) (build-system cmake-build-system) (synopsis "Small XML parser for C++") (description "TinyXML2 is a small and simple XML parsing library for the -- cgit v1.2.3 From 1f595f3cf46943f31b5cc96e5fd16c8264d0db52 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 15 May 2020 11:48:44 +0200 Subject: gnu: xdot: Fix typo in description. * gnu/packages/graphviz.scm (xdot)[description]: Add space after comma, capitalize 'Python'. --- gnu/packages/graphviz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/graphviz.scm b/gnu/packages/graphviz.scm index b887da1076..6e91d45503 100644 --- a/gnu/packages/graphviz.scm +++ b/gnu/packages/graphviz.scm @@ -315,8 +315,8 @@ structure and layout algorithms.") (synopsis "Interactive viewer for graphviz dot files") (description "Xdot is an interactive viewer for graphs written in @code{graphviz}’s dot language. Internally, it uses the xdot output format as -an intermediate format,and @code{gtk} and @code{cairo} for rendering. Xdot can -be used either as a standalone application, or as a python library.") +an intermediate format, and @code{gtk} and @code{cairo} for rendering. Xdot +can be used either as a standalone application, or as a Python library.") (license license:lgpl3+))) (define-public python-pydot -- cgit v1.2.3 From d1ed1d7560d454e271f682728a3dcaa76032077f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 16 May 2020 18:08:27 +0200 Subject: gnu: multipath-tools: Fetch with git. * gnu/packages/linux.scm (multipath-tools)[source]: Change to GIT-FETCH. --- gnu/packages/linux.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index bfee4374bd..793036a3ff 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4184,13 +4184,14 @@ arrays when needed.") (name "multipath-tools") (version "0.8.3") (source (origin - (method url-fetch) - (uri (string-append "https://git.opensvc.com/?p=multipath-tools/" - ".git;a=snapshot;h=" version ";sf=tgz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://git.opensvc.com/multipath-tools/.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "1c6ay97wlfv1fl0y8hcfpxhkps14hlnw9gzmj7884micsp7pa9yv")) + "02kdbk3gv3fx5dg445scz3l4lg0sznlv037qkjgpw9xkw4l50cfd")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From cfdd023bed634040ab3256680aebc8e06c134bd1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 16 May 2020 18:13:35 +0200 Subject: gnu: multipath-tools: Update to 0.8.4. * gnu/packages/patches/multipath-tools-sans-systemd.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/linux.scm (multipath-tools): Update to 0.8.4. [source](patches): New field. [arguments]: Add #:parallel-build?. Add phase to fix erroneous compiler warning. --- gnu/local.mk | 1 + gnu/packages/linux.scm | 17 ++++- .../patches/multipath-tools-sans-systemd.patch | 83 ++++++++++++++++++++++ 3 files changed, 99 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/multipath-tools-sans-systemd.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index ab2bac9bc5..025dfe114b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1275,6 +1275,7 @@ dist_patch_DATA = \ %D%/packages/patches/mozjs38-version-detection.patch \ %D%/packages/patches/mrrescue-support-love-11.patch \ %D%/packages/patches/mtools-mformat-uninitialized.patch \ + %D%/packages/patches/multipath-tools-sans-systemd.patch \ %D%/packages/patches/mumps-build-parallelism.patch \ %D%/packages/patches/mumps-shared-libseq.patch \ %D%/packages/patches/mumps-shared-mumps.patch \ diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 793036a3ff..2d8acea0e3 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4182,7 +4182,7 @@ arrays when needed.") (define-public multipath-tools (package (name "multipath-tools") - (version "0.8.3") + (version "0.8.4") (source (origin (method git-fetch) (uri (git-reference @@ -4191,7 +4191,8 @@ arrays when needed.") (file-name (git-file-name name version)) (sha256 (base32 - "02kdbk3gv3fx5dg445scz3l4lg0sznlv037qkjgpw9xkw4l50cfd")) + "14n8pcgnliicqxzc40xvjxk4cafm4qx7a3rsx5qva74r3ydzx8rn")) + (patches (search-patches "multipath-tools-sans-systemd.patch")) (modules '((guix build utils))) (snippet '(begin @@ -4205,9 +4206,12 @@ arrays when needed.") (build-system gnu-build-system) (arguments '(#:tests? #f ; no tests + #:parallel-build? #f ;XXX: broken in 0.8.4 #:make-flags (list "CC=gcc" (string-append "DESTDIR=" (assoc-ref %outputs "out")) + ;; Install Udev rules below this directory, relative + ;; to the prefix. "SYSTEMDPATH=lib" (string-append "LDFLAGS=-Wl,-rpath=" (assoc-ref %outputs "out") @@ -4229,6 +4233,15 @@ arrays when needed.") (("/usr/include/libudev.h") (string-append udev "/include/libudev.h"))) #t))) + (add-after 'unpack 'fix-maybe-uninitialized-variable + (lambda _ + ;; This variable gets initialized later if needed, but GCC 7 + ;; fails to notice. Should be fixed for > 0.8.4. + ;; https://www.redhat.com/archives/dm-devel/2020-March/msg00137.html + (substitute* "libmultipath/structs_vec.c" + (("bool is_queueing;") + "bool is_queueing = false;")) + #t)) (delete 'configure)))) ; no configure script (native-inputs `(("perl" ,perl) diff --git a/gnu/packages/patches/multipath-tools-sans-systemd.patch b/gnu/packages/patches/multipath-tools-sans-systemd.patch new file mode 100644 index 0000000000..8f3144718c --- /dev/null +++ b/gnu/packages/patches/multipath-tools-sans-systemd.patch @@ -0,0 +1,83 @@ +Fix various compiler warnings when built without systemd. + +Submitted upstream at . + +diff --git a/libmultipath/config.c b/libmultipath/config.c +--- a/libmultipath/config.c ++++ b/libmultipath/config.c +@@ -696,7 +696,7 @@ process_config_dir(struct config *conf, char *dir) + pthread_cleanup_pop(1); + } + +-static void set_max_checkint_from_watchdog(struct config *conf) ++static void set_max_checkint_from_watchdog(__attribute__((unused)) struct config *conf) + { + #ifdef USE_SYSTEMD + char *envp = getenv("WATCHDOG_USEC"); +diff --git a/multipathd/main.c b/multipathd/main.c +--- a/multipathd/main.c ++++ b/multipathd/main.c +@@ -176,6 +176,7 @@ daemon_status(void) + /* + * I love you too, systemd ... + */ ++#ifdef USE_SYSTEMD + static const char * + sd_notify_status(enum daemon_status state) + { +@@ -195,7 +196,6 @@ sd_notify_status(enum daemon_status state) + return NULL; + } + +-#ifdef USE_SYSTEMD + static void do_sd_notify(enum daemon_status old_state, + enum daemon_status new_state) + { +@@ -247,7 +247,9 @@ enum daemon_status wait_for_state_change_if(enum daemon_status oldstate, + static void __post_config_state(enum daemon_status state) + { + if (state != running_state && running_state != DAEMON_SHUTDOWN) { +- enum daemon_status old_state = running_state; ++ /* save state for sd_notify */ ++ enum daemon_status ++ __attribute__((unused)) old_state = running_state; + + running_state = state; + pthread_cond_broadcast(&config_cond); +@@ -272,7 +274,9 @@ int set_config_state(enum daemon_status state) + pthread_cleanup_push(config_cleanup, NULL); + pthread_mutex_lock(&config_lock); + if (running_state != state) { +- enum daemon_status old_state = running_state; ++ /* save state for sd_notify */ ++ enum daemon_status ++ __attribute__((unused)) old_state = running_state; + + if (running_state == DAEMON_SHUTDOWN) + rc = EINVAL; +@@ -2280,7 +2284,6 @@ checkerloop (void *ap) + struct timespec last_time; + struct config *conf; + int foreign_tick = 0; +- bool use_watchdog; + + pthread_cleanup_push(rcu_unregister, NULL); + rcu_register_thread(); +@@ -2292,11 +2295,15 @@ checkerloop (void *ap) + get_monotonic_time(&last_time); + last_time.tv_sec -= 1; + +- /* use_watchdog is set from process environment and never changes */ + conf = get_multipath_config(); +- use_watchdog = conf->use_watchdog; + put_multipath_config(conf); + ++#ifdef USE_SYSTEMD ++ /* use_watchdog is set from process environment and never changes */ ++ bool use_watchdog; ++ use_watchdog = conf->use_watchdog; ++#endif ++ + while (1) { + struct timespec diff_time, start_time, end_time; + int num_paths = 0, strict_timing, rc = 0; -- cgit v1.2.3 From 834c8684a274f72c0bbfab744177c3f0a16d12af Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 16 May 2020 19:59:27 +0200 Subject: gnu: gajim: Adapt search path for Python 3.8. Fixes . Reported by Raghav Gururajan . * gnu/packages/messaging.scm (gajim)[native-search-paths]: Update the PYTHONPATH variable to search for Python 3.8 packages. --- gnu/packages/messaging.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 7e30eeae75..57ff0835d1 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -704,7 +704,7 @@ else [])")) ;; FIXME: Cannot use this expression as it would ;; introduce a circular dependency at the top level. ;; (version-major+minor (package-version python)) - "3.7" + "3.8" "/site-packages")))))) (native-inputs -- cgit v1.2.3 From 5c4aa84e4ab891ae2cfc10b8601113887550c070 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 16 May 2020 14:32:37 -0400 Subject: gnu: heimdal: Update to 7.7.0. And fix the test suite failures as a side effect. * gnu/packages/kerberos.scm (heimdal): Update to 7.7.0. --- gnu/packages/kerberos.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/kerberos.scm b/gnu/packages/kerberos.scm index 896d15f485..20ed94b33b 100644 --- a/gnu/packages/kerberos.scm +++ b/gnu/packages/kerberos.scm @@ -170,7 +170,7 @@ After installation, the system administrator should generate keys using (define-public heimdal (package (name "heimdal") - (version "7.5.0") + (version "7.7.0") (source (origin (method url-fetch) (uri (string-append @@ -178,14 +178,14 @@ After installation, the system administrator should generate keys using "heimdal-" version "/" "heimdal-" version ".tar.gz")) (sha256 (base32 - "1bdc682in55ygrxmhncs7cf4s239apcblci3z8i80wnc1w1s18n5")) + "06vx3cb01s4lv3lpv0qzbbj97cln1np1wjphkkmmbk1lsqa36bgh")) (modules '((guix build utils))) (snippet '(begin (substitute* "configure" (("User=.*$") "User=Guix\n") (("Host=.*$") "Host=GNU") - (("Date=.*$") "Date=2017\n")) + (("Date=.*$") "Date=2019\n")) #t)))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From a43fe7acd1bbe9dd5118d7bff823f4730153cc48 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 16 May 2020 20:56:20 +0200 Subject: gnu: multipath-tools: Enable tests. * gnu/packages/linux.scm (multipath-tools)[arguments]: Remove #:tests?. Add #:test-target. Add phase to add missing linker flag. [native-inputs]: Add CMOCKA. --- gnu/packages/linux.scm | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 2d8acea0e3..aa52068794 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4205,7 +4205,7 @@ arrays when needed.") #t)))) (build-system gnu-build-system) (arguments - '(#:tests? #f ; no tests + '(#:test-target "test" #:parallel-build? #f ;XXX: broken in 0.8.4 #:make-flags (list "CC=gcc" (string-append "DESTDIR=" @@ -4242,11 +4242,22 @@ arrays when needed.") (("bool is_queueing;") "bool is_queueing = false;")) #t)) + (add-after 'unpack 'fix-linking-tests + (lambda _ + ;; Add missing linker flag for -lmpathcmd. This should be fixed + ;; for versions > 0.8.4. + (substitute* "tests/Makefile" + (("-lmultipath -lcmocka") + "-lmultipath -L$(mpathcmddir) -lmpathcmd -lcmocka")) + #t)) (delete 'configure)))) ; no configure script (native-inputs `(("perl" ,perl) ("pkg-config" ,pkg-config) - ("valgrind" ,valgrind))) + ("valgrind" ,valgrind) + + ;; For tests. + ("cmocka" ,cmocka))) (inputs `(("json-c" ,json-c) ("libaio" ,libaio) -- cgit v1.2.3 From 63fe1dc0b019eac616dfbbaa19c90874be545b00 Mon Sep 17 00:00:00 2001 From: Alex Sassmannshausen Date: Sat, 16 May 2020 22:54:45 +0200 Subject: gnu: guile-hall: Update to 0.3.1. * gnu/packages/guile-xyz.scm (guile-hall): Update to 0.3.1. --- gnu/packages/guile-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index a5a4772117..fb56fb25e5 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -1397,16 +1397,16 @@ above command-line parameters.") (define-public guile-hall (package (name "guile-hall") - (version "0.3.0") + (version "0.3.1") (source (origin (method git-fetch) (uri (git-reference (url "https://gitlab.com/a-sassmannshausen/guile-hall") (commit version))) - (file-name "guile-hall-0.3.0-checkout") + (file-name "guile-hall-0.3.1-checkout") (sha256 - (base32 "04vi9h1jj6sfdr4ikbvd41ls4rdgfp01x7dvbklb9mmgadzcibhn")))) + (base32 "1s24nigdra6rvclvy15l2aw00c3aq9vv8qwxylzs60darbl36206")))) (build-system gnu-build-system) (arguments `(#:modules -- cgit v1.2.3 From d5c0a835964e4990a7016f8d12c602c3ccb2bb9b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 17 May 2020 00:26:40 +0200 Subject: gnu: synthv1: Update to 0.9.14. * gnu/packages/music.scm (synthv1): Update to 0.9.14. --- gnu/packages/music.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 9a55f0db3a..b8752cea48 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1436,7 +1436,7 @@ users to select LV2 plugins and run them with jalv.") (define-public synthv1 (package (name "synthv1") - (version "0.9.13") + (version "0.9.14") (source (origin (method url-fetch) (uri @@ -1444,7 +1444,7 @@ users to select LV2 plugins and run them with jalv.") "/synthv1-" version ".tar.gz")) (sha256 (base32 - "0bb48myvgvqcibwm68qhd4852pjr2g19rasf059a799d1hzgfq3l")))) + "08n83krkak20924flb9azhm9hn40lyfvn29m63zs3lw3wajf0b40")))) (build-system gnu-build-system) (arguments `(#:tests? #f)) ; there are no tests -- cgit v1.2.3 From 1c822d526a178bf464cce328266a64cfb152e14c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 17 May 2020 00:26:45 +0200 Subject: gnu: drumkv1: Update to 0.9.14. * gnu/packages/music.scm (drumkv1): Update to 0.9.14. --- gnu/packages/music.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index b8752cea48..162bea9b87 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1468,7 +1468,7 @@ oscillators and stereo effects.") (define-public drumkv1 (package (name "drumkv1") - (version "0.9.13") + (version "0.9.14") (source (origin (method url-fetch) (uri @@ -1476,7 +1476,7 @@ oscillators and stereo effects.") "/drumkv1-" version ".tar.gz")) (sha256 (base32 - "1h88sakxs0b20k8v2sh14y05fin1zqmhnid6h9mk9c37ixxg58ia")))) + "0fr7pkp55zvjxf7p22drs93fsjgvqhbd55vxi0srhp2s2wzz5qak")))) (build-system gnu-build-system) (arguments `(#:tests? #f)) ; there are no tests -- cgit v1.2.3 From f5479ddf3dafa7ed0ddb1e535c219ab3e457ffc3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 17 May 2020 00:26:51 +0200 Subject: gnu: samplv1: Update to 0.9.14. * gnu/packages/music.scm (samplv1): Update to 0.9.14. --- gnu/packages/music.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 162bea9b87..1520daf1be 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1501,7 +1501,7 @@ effects.") (define-public samplv1 (package (name "samplv1") - (version "0.9.13") + (version "0.9.14") (source (origin (method url-fetch) (uri @@ -1509,7 +1509,7 @@ effects.") "/samplv1-" version ".tar.gz")) (sha256 (base32 - "0clsp6s5qfnh0xaxbd35vq2ppi72q9dfayrzlgl73800a8p7gh9m")))) + "0p3f9wsn1nz93szcl60yxhxdr554zm2z2jlbniwwify765lvasxc")))) (build-system gnu-build-system) (arguments `(#:tests? #f)) ; there are no tests -- cgit v1.2.3 From d393e113228304407e69c677335c8dd0e6aaa1fd Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 17 May 2020 00:26:55 +0200 Subject: gnu: padthv1: Update to 0.9.14. * gnu/packages/music.scm (padthv1): Update to 0.9.14. --- gnu/packages/music.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 1520daf1be..3736abb353 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1534,7 +1534,7 @@ effects.") (define-public padthv1 (package (name "padthv1") - (version "0.9.13") + (version "0.9.14") (source (origin (method url-fetch) (uri @@ -1542,7 +1542,7 @@ effects.") "/padthv1-" version ".tar.gz")) (sha256 (base32 - "1c1zllph86qswcxddz4vpsj6r9w21hbv4gkba0pyd3q7pbfqr7nz")))) + "079iwwlkl1gscyv70v9ambad8shxbs0ixdfp0vsl6dbh87b09qzh")))) (build-system gnu-build-system) (arguments `(#:tests? #f)) ; there are no tests -- cgit v1.2.3 From f2e99d989931846a4ffae9e8e42006b16e5df923 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 16 May 2020 22:32:38 +0200 Subject: gnu: supertux: Update to 0.6.2. * gnu/packages/games.scm (supertux): Update to 0.6.2. --- gnu/packages/games.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index f7b21ce44f..afc8b372a7 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -4132,7 +4132,7 @@ with the \"Stamp\" tool within Tux Paint.") (define-public supertux (package (name "supertux") - (version "0.6.1.1") + (version "0.6.2") (source (origin (method url-fetch) (uri (string-append "https://github.com/SuperTux/supertux/" @@ -4141,7 +4141,7 @@ with the \"Stamp\" tool within Tux Paint.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0n36qxwjlkdlksximz4s729az6pry2sdjavwgm7m65vfgdiz139f")) + "167m3z4m8n76dvbv42m1fnvabpbpsxvr28zk9641916jl9pfba96")) (patches (search-patches "supertux-unbundle-squirrel.patch")))) (arguments -- cgit v1.2.3 From 54cc2b4e068675206fe1bb8615857b7dc71a168a Mon Sep 17 00:00:00 2001 From: Björn Höfling Date: Thu, 14 May 2020 14:07:53 +0200 Subject: gnu: java-jmapviewer: Return #t from all phases. * gnu/packages/geo.scm (java-jmapviewer)[arguments]: Return #t from install phase. --- gnu/packages/geo.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 3c76b01c63..dc40974381 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -1151,7 +1151,8 @@ persisted. (lambda* (#:key outputs #:allow-other-keys) (let ((dir (string-append (assoc-ref outputs "out") "/share/java/"))) (mkdir-p dir) - (copy-file "JMapViewer.jar" (string-append dir "JMapViewer.jar")))))))) + (copy-file "JMapViewer.jar" (string-append dir "JMapViewer.jar")) + #t)))))) (home-page "https://wiki.openstreetmap.org/wiki/JMapViewer") (synopsis "OSM map integration in Java") (description "JMapViewer is a Java component which easily -- cgit v1.2.3 From 69a745b735c9110c6146dc2ea26e7ea367440219 Mon Sep 17 00:00:00 2001 From: Björn Höfling Date: Sat, 16 May 2020 23:12:26 +0200 Subject: gnu: mumble: End phase with #t. * gnu/packages/telephony.scm (mumble)[arguments] End install phase with #t. --- gnu/packages/telephony.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index 760c1e0727..4c84ddc85a 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -620,7 +620,8 @@ address of one of the participants.") (for-each (lambda (file) (install-file file lib)) (find-files "." "\\.so\\.")) (for-each (lambda (file) (install-file file lib)) - (find-files "release/plugins" "\\.so$")))))))) + (find-files "release/plugins" "\\.so$")) + #t)))))) (inputs `(("avahi" ,avahi) ("boost" ,boost) -- cgit v1.2.3 From 03418561915e54c17f25032e9d7b540279e9f0b1 Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Sat, 16 May 2020 22:53:16 +0200 Subject: gnu: julius: Update to 1.4.0. * gnu/packages/games.scm (julius): Update to 1.4.0. [inputs]: Add new dependency libpng. Signed-off-by: Nicolas Goaziou --- gnu/packages/games.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index afc8b372a7..b729dae63e 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -978,7 +978,7 @@ automata. The following features are available: (define-public julius (package (name "julius") - (version "1.3.0") + (version "1.4.0") (source (origin (method git-fetch) @@ -987,10 +987,11 @@ automata. The following features are available: (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1ws5lmwdhla73676fj0w26v859n47s0wyxa0mgd0dmkx0x91qriy")))) + (base32 "01rygr592ar530qv1flmaiq8icl0qdxgc8lhkcdyn1g09941z47v")))) (build-system cmake-build-system) (inputs - `(("sdl2" ,sdl2) + `(("libpng" ,libpng) + ("sdl2" ,sdl2) ("sdl2-mixer" ,sdl2-mixer))) (home-page "https://github.com/bvschaik/julius") (synopsis "Re-implementation of Caesar III game engine") -- cgit v1.2.3 From 527ab3125ae4361b687091c2e528795691f7075f Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Sat, 16 May 2020 22:53:17 +0200 Subject: gnu: julius: Remove unused bundled libraries. * gnu/packages/games.scm (julius)[source](snippet): Remove ext/{dirent,png,SDL2,zlib}. Signed-off-by: Nicolas Goaziou --- gnu/packages/games.scm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index b729dae63e..177436e6ec 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -987,7 +987,14 @@ automata. The following features are available: (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "01rygr592ar530qv1flmaiq8icl0qdxgc8lhkcdyn1g09941z47v")))) + (base32 "01rygr592ar530qv1flmaiq8icl0qdxgc8lhkcdyn1g09941z47v")) + ;; Remove unused bundled libraries. + (modules '((guix build utils))) + (snippet + '(begin + (with-directory-excursion "ext" + (for-each delete-file-recursively '("dirent" "png" "SDL2" "zlib"))) + #t)))) (build-system cmake-build-system) (inputs `(("libpng" ,libpng) @@ -1001,7 +1008,6 @@ Julius includes some UI enhancements while preserving the logic (including bugs) of the original game, so that saved games are compatible. This package does not include game data.") (license (list license:agpl3 - license:expat ; ext/dirent license:zlib)))) ; ext/tinyfiledialogs (define-public meandmyshadow -- cgit v1.2.3 From d308bc01e171f327084bfaa9fe79fb31fe662669 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 17 May 2020 01:48:28 +0200 Subject: gnu: java-xz: Remove duplicate definition. * gnu/packages/java.scm (java-xz): Remove duplicate variable. (java-plexus-archiver)[inputs]: Use java-xz. * gnu/packages/java-compression.scm (java-tukaani-xz): Rename to java-xz. --- gnu/packages/java-compression.scm | 4 ++-- gnu/packages/java.scm | 30 +----------------------------- 2 files changed, 3 insertions(+), 31 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/java-compression.scm b/gnu/packages/java-compression.scm index 536e1e6530..b1d3ae7060 100644 --- a/gnu/packages/java-compression.scm +++ b/gnu/packages/java-compression.scm @@ -282,9 +282,9 @@ It can be used as a replacement for the Apache @code{CBZip2InputStream} / @code{CBZip2OutputStream} classes.") (license license:expat))) -(define-public java-tukaani-xz +(define-public java-xz (package - (name "java-tukaani-xz") + (name "java-xz") (version "1.6") (source (origin (method url-fetch) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index fc1f7d157a..a4659240fc 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -3403,34 +3403,6 @@ is implemented.") license:mpl2.0 license:lgpl2.1+)))) -(define-public java-xz - (package - (name "java-xz") - (version "1.6") - (source (origin - (method url-fetch) - (uri (string-append "http://tukaani.org/xz/xz-java-" version ".zip")) - (sha256 - (base32 - "1z3p1ri1gvl07inxn0agx44ck8n7wrzfmvkz8nbq3njn8r9wba8x")))) - (build-system ant-build-system) - (arguments - `(#:tests? #f ; There are no tests to run. - #:jar-name ,(string-append "xz-" version ".jar") - #:phases - (modify-phases %standard-phases - ;; The unpack phase enters the "maven" directory by accident. - (add-after 'unpack 'chdir - (lambda _ (chdir "..") #t))))) - (native-inputs - `(("unzip" ,unzip))) - (home-page "https://tukaani.org/xz/java.html") - (synopsis "Implementation of XZ data compression in pure Java") - (description "This library aims to be a complete implementation of XZ data -compression in pure Java. Single-threaded streamed compression and -decompression and random access decompression have been fully implemented.") - (license license:public-domain))) - ;; java-hamcrest-core uses qdox version 1.12. We package this version instead ;; of the latest release. (define-public java-qdox-1.12 @@ -3957,7 +3929,7 @@ reusing it in maven.") ("junit" ,java-junit) ("classworld" ,java-plexus-classworlds) ("xbean" ,java-geronimo-xbean-reflect) - ("xz" ,java-tukaani-xz) + ("xz" ,java-xz) ("guava" ,java-guava))) (home-page "https://github.com/codehaus-plexus/plexus-archiver") (synopsis "Archiver component of the Plexus project") -- cgit v1.2.3 From 5dd8cb2ec3488edd7fcd1371c188403cc28c7d42 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 17 May 2020 01:28:09 +0200 Subject: gnu: spiped: Update to 1.6.1. * gnu/packages/networking.scm (spiped): Update to 1.6.1. --- gnu/packages/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 65a94178c9..4a2df4fd5a 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -1955,14 +1955,14 @@ returns the user name and other information about the connection.") (define-public spiped (package (name "spiped") - (version "1.6.0") + (version "1.6.1") (source (origin (method url-fetch) (uri (string-append "https://www.tarsnap.com/spiped/spiped-" version ".tgz")) (sha256 (base32 - "1r51rdcl7nib1yv3yvgd5alwlkkwmr387brqavaklb0p2bwzixz6")))) + "04rpnc53whfky7pp2m9h35gwzwn6788pnl6c1qd576mpknbqjw4d")))) (build-system gnu-build-system) (arguments '(#:test-target "test" -- cgit v1.2.3 From d28692a7b512d1d0a2e6b48aa83095f373969abd Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 17 May 2020 02:27:27 +0200 Subject: gnu: alpine: Update to 2.22. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/mail.scm (alpine): Update to 2.22. [arguments]: Add ‘assume-shadow-passwords’ phase. --- gnu/packages/mail.scm | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index ca1828b1b1..6e39dc2d15 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -2681,7 +2681,7 @@ operators and scripters.") ;; Upstream doesn't use git tags, but does ‘tag’ their releases in the ;; commit message. Hence the lack of GIT-VERSIONing despite using a commit ;; ID below. Don't forget to update it… - (version "2.21.99999") + (version "2.22") (source (origin (method git-fetch) @@ -2691,10 +2691,10 @@ operators and scripters.") ;; http://alpine.freeiz.com/alpine/readme/README.patches (uri (git-reference (url "http://repo.or.cz/alpine.git") - (commit "abeb2c25935ef8c75f1e5deef0f81276754dc975"))) + (commit "b50297779a4becb9ceca9c6b5b375d526fe3df78"))) (file-name (git-file-name name version)) (sha256 - (base32 "0rqgbw08a5lj41dkp82aq480lqkc4bnxagna7wpqffi821n8gkwz")) + (base32 "06js44fvdl7l33hfd4lsxpcd1cz3c0h796cswyzz0lkrzx89yl48")) (modules '((guix build utils))) (snippet '(begin @@ -2720,6 +2720,13 @@ operators and scripters.") "--with-date-stamp=Thu 1 Jan 01:00:01 CET 1970") #:phases (modify-phases %standard-phases + (add-after 'unpack 'assume-shadow-passwords + ;; Alpine's configure script confuses ‘shadow password support’ with + ;; ‘/etc/shadow exists in the build environment’. It does not. + (lambda _ + (substitute* "configure" + (("test -f /etc/shadow") "true")) + #t)) (add-after 'unpack 'make-reproducible (lambda _ ;; This removes time-dependent code to make alpine reproducible. -- cgit v1.2.3 From aa784dc850fd683ade4dee7f2e2ad630e604b432 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 17 May 2020 02:51:04 +0200 Subject: gnu: alpine: Support cross-gcc'ing. * gnu/packages/mail.scm (alpine)[arguments]: Use ${target}-gcc when cross-compiling. --- gnu/packages/mail.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 6e39dc2d15..e6728aae94 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -2703,7 +2703,11 @@ operators and scripters.") #t)))) (build-system gnu-build-system) (arguments - `(#:make-flags (list "CC=gcc") + `(#:make-flags + (let ((target ,(%current-target-system))) + (list (string-append "CC=" (if target + (string-append target "-gcc") + "gcc")))) #:configure-flags (list (string-append "--with-ssl-include-dir=" (assoc-ref %build-inputs "openssl") "/include/openssl") -- cgit v1.2.3 From 7f4b45a320d9661881e9cd488507bee2cf84e859 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 17 May 2020 01:38:26 +0200 Subject: gnu: soundconverter: Update to 3.0.2. * gnu/packages/gnome.scm (soundconverter): Update to 3.0.2. [source]: Remove upstreamed patch. * gnu/packages/patches/soundconverter-remove-gconf-dependency.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/gnome.scm | 7 ++---- .../soundconverter-remove-gconf-dependency.patch | 29 ---------------------- 3 files changed, 2 insertions(+), 35 deletions(-) delete mode 100644 gnu/packages/patches/soundconverter-remove-gconf-dependency.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 025dfe114b..118a9e24eb 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1498,7 +1498,6 @@ dist_patch_DATA = \ %D%/packages/patches/slim-display.patch \ %D%/packages/patches/snappy-add-O2-flag-in-CmakeLists.txt.patch \ %D%/packages/patches/sooperlooper-build-with-wx-30.patch \ - %D%/packages/patches/soundconverter-remove-gconf-dependency.patch \ %D%/packages/patches/steghide-fixes.patch \ %D%/packages/patches/suitesparse-mongoose-cmake.patch \ %D%/packages/patches/superlu-dist-awpm-grid.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index e4bb056e4c..fe874100b2 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -9198,7 +9198,7 @@ mp3, Ogg Vorbis and FLAC") (define-public soundconverter (package (name "soundconverter") - (version "3.0.1") + (version "3.0.2") (source (origin (method url-fetch) @@ -9207,10 +9207,7 @@ mp3, Ogg Vorbis and FLAC") "soundconverter-" version ".tar.xz")) (sha256 - (base32 "1d6x1yf8psqbd9zbybxivfqg55khcnngp2mn92l161dfdk9512c5")) - (patches - (search-patches - "soundconverter-remove-gconf-dependency.patch")))) + (base32 "1jv8m82hi23ilrgdznlc1jhp2jm8bw1yrw0chh3qw2l0sixvkl11")))) (build-system glib-or-gtk-build-system) (arguments `(#:imported-modules ((guix build python-build-system) diff --git a/gnu/packages/patches/soundconverter-remove-gconf-dependency.patch b/gnu/packages/patches/soundconverter-remove-gconf-dependency.patch deleted file mode 100644 index 29cdeb6e8d..0000000000 --- a/gnu/packages/patches/soundconverter-remove-gconf-dependency.patch +++ /dev/null @@ -1,29 +0,0 @@ -From: Tobias Geerinckx-Rice -Date: Tue, 19 Feb 2019 07:46:28 +0100 -Subject: [PATCH] gnu: soundconverter: Catch (and ignore) the right error. - -Without this patch and GConf: - - Traceback (most recent call last): - File "/gnu/…/bin/...soundconverter-real-real-real", line 164, in - from soundconverter.batch import cli_convert_main - File "/gnu/…/lib/soundconverter/python/soundconverter/batch.py", line 31, in - from soundconverter.gstreamer import TagReader - File "/gnu/…/lib/soundconverter/python/soundconverter/gstreamer.py", line 70, in - gi.require_version('GConf', '2.0') - File "/gnu/…/lib/python3.7/site-packages/gi/__init__.py", line 130, in require_version - raise ValueError('Namespace %s not available' % namespace) - ValueError: Namespace GConf not available ---- -diff -Naur soundconverter-3.0.1/soundconverter/gstreamer.py soundconverter-3.0.1/soundconverter/gstreamer.py ---- soundconverter-3.0.1/soundconverter/gstreamer.py 2018-11-23 20:38:46.000000000 +0100 -+++ soundconverter-3.0.1/soundconverter/gstreamer.py 2019-02-19 07:42:15.767684388 +0100 -@@ -88,7 +88,7 @@ - profile = description, extension, pipeline - audio_profiles_list.append(profile) - audio_profiles_dict[description] = profile --except ImportError: -+except ValueError: - pass - - required_elements = ('decodebin', 'fakesink', 'audioconvert', 'typefind', 'audiorate') -- cgit v1.2.3 From a7e6ec18d7bf9d3568bb829bde0fa32cd3fbf9e9 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 17 May 2020 10:13:41 +0300 Subject: gnu: qemu-minimal: Use 'match' to find architecture. * gnu/packages/virtualization.scm (qemu-minimal)[arguments]: Use 'match' to target the correct architecture. --- gnu/packages/virtualization.scm | 56 ++++++++++++++++++++--------------------- 1 file changed, 28 insertions(+), 28 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 371104cf22..c2025c4fbe 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -312,34 +312,34 @@ server and embedded PowerPC, and S390 guests.") (substitute-keyword-arguments (package-arguments qemu) ((#:configure-flags _ '(list)) ;; Restrict to the host's architecture. - (let ((arch (car (string-split (or (%current-target-system) - (%current-system)) - #\-)))) - (cond ((string=? arch "i686") - '(list "--target-list=i386-softmmu")) - ((string-prefix? "x86_64" arch) - '(list "--target-list=i386-softmmu,x86_64-softmmu")) - ((string-prefix? "mips64" arch) - '(list (string-append "--target-list=mips-softmmu,mipsel-softmmu," - "mips64-softmmu,mips64el-softmmu"))) - ((string-prefix? "mips" arch) - '(list "--target-list=mips-softmmu,mipsel-softmmu")) - ((string-prefix? "aarch64" arch) - '(list "--target-list=arm-softmmu,aarch64-softmmu")) - ((string-prefix? "arm" arch) - '(list "--target-list=arm-softmmu")) - ((string-prefix? "alpha" arch) - '(list "--target-list=alpha-softmmu")) - ((string-prefix? "powerpc64" arch) - '(list "--target-list=ppc-softmmu,ppc64-softmmu")) - ((string-prefix? "powerpc" arch) - '(list "--target-list=ppc-softmmu")) - ((string-prefix? "s390" arch) - '(list "--target-list=s390x-softmmu")) - ((string-prefix? "riscv" arch) - '(list "--target-list=riscv32-softmmu,riscv64-softmmu")) - (else ; An empty list actually builds all the targets. - ''())))))) + (match (car (string-split (or (%current-target-system) + (%current-system)) + #\-)) + ("i686" + '(list "--target-list=i386-softmmu")) + ("x86_64" + '(list "--target-list=i386-softmmu,x86_64-softmmu")) + ("mips64" + '(list (string-append "--target-list=mips-softmmu,mipsel-softmmu," + "mips64-softmmu,mips64el-softmmu"))) + ("mips" + '(list "--target-list=mips-softmmu,mipsel-softmmu")) + ("aarch64" + '(list "--target-list=arm-softmmu,aarch64-softmmu")) + ("arm" + '(list "--target-list=arm-softmmu")) + ("alpha" + '(list "--target-list=alpha-softmmu")) + ("powerpc64" + '(list "--target-list=ppc-softmmu,ppc64-softmmu")) + ("powerpc" + '(list "--target-list=ppc-softmmu")) + ("s390" + '(list "--target-list=s390x-softmmu")) + ("riscv" + '(list "--target-list=riscv32-softmmu,riscv64-softmmu")) + (else ; An empty list actually builds all the targets. + ''()))))) ;; Remove dependencies on optional libraries, notably GUI libraries. (native-inputs (fold alist-delete (package-native-inputs qemu) -- cgit v1.2.3 From 99bf646d8f5acb7958c49143a32de6e95fbde4cf Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Sun, 17 May 2020 11:16:57 +0200 Subject: gnu: racket: Update to 7.7. * gnu/packages/scheme.scm (racket): Update to 7.7. --- gnu/packages/scheme.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm index 46f1826ba1..5b290b9728 100644 --- a/gnu/packages/scheme.scm +++ b/gnu/packages/scheme.scm @@ -395,7 +395,7 @@ implementation techniques and as an expository tool.") (define-public racket (package (name "racket") - (version "7.6") + (version "7.7") (source (origin (method url-fetch) (uri (list (string-append "http://mirror.racket-lang.org/installers/" @@ -405,7 +405,7 @@ implementation techniques and as an expository tool.") version "/racket-" version "-src.tgz"))) (sha256 (base32 - "0yagy7qrnz96gwafnj3whh2vs54788k1ci3vkm100h68gsw638b8")) + "0cx5h3k0n58cb442qzp3jlc7n1b9dbaxv9blg2rjil2rn119yrb2")) (patches (search-patches "racket-store-checksum-override.patch")))) (build-system gnu-build-system) -- cgit v1.2.3 From 720855b5c516b5c4407cdbbe57af25ab93896311 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 17 May 2020 12:23:06 +0300 Subject: gnu: kdeconnect: Fix kdeconnectd path. * gnu/packages/kde.scm (kdeconnect)[arguments]: Add configure-flag to set libexec as a top-level directory in the output. --- gnu/packages/kde.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index bf1ccef3e3..a93e776bf0 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -578,7 +578,8 @@ different notification systems.") "02lr3xx5s2mgddac4n3lkgr7ppf1z5m6ajs90rjix0vs8a271kp5")))) (build-system qt-build-system) (arguments - `(#:configure-flags '("-DBUILD_TESTING=ON") + `(#:configure-flags '("-DBUILD_TESTING=ON" + "-DLIBEXEC_INSTALL_DIR=libexec") #:tests? #f)) ; tests fail hard in our build environment (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) -- cgit v1.2.3 From c1ca686bc8b227e9bb17ba533097aa3de02436dd Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 17 May 2020 05:09:19 +0200 Subject: gnu: acpica: Update to 20200430. * gnu/packages/admin.scm (acpica): Update to 20200430. --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 9822ba8a9b..8182544544 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1691,7 +1691,7 @@ module slots, and the list of I/O ports (e.g. serial, parallel, USB).") (define-public acpica (package (name "acpica") - (version "20200326") + (version "20200430") (source (origin (method url-fetch) (uri (string-append @@ -1699,7 +1699,7 @@ module slots, and the list of I/O ports (e.g. serial, parallel, USB).") version ".tar.gz")) (sha256 (base32 - "0y08l6djjn87jmsp5kj0myjdb48000g20xlfs0a22jzzi383h3by")))) + "1hiaz9lrmjzdbi5zl0ajfflja41cixzx2j76iyx02qbjlmy9cfjc")))) (build-system gnu-build-system) (native-inputs `(("flex" ,flex) ("bison" ,bison))) -- cgit v1.2.3 From 018be4ca5ebc0e25af4f50d22b3f1c43ff05fe5f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 17 May 2020 05:10:01 +0200 Subject: gnu: acpica: Fix typo in synopsis. * gnu/packages/admin.scm (acpica)[synopsis]: Fix typo or grammar. --- gnu/packages/admin.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 8182544544..f6bf8526ef 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1711,7 +1711,7 @@ module slots, and the list of I/O ports (e.g. serial, parallel, USB).") #:tests? #f ; no 'check' target #:phases (modify-phases %standard-phases (delete 'configure)))) (home-page "https://acpica.org/") - (synopsis "Tools for the development and debug of ACPI tables") + (synopsis "Tools for the development and debugging of ACPI tables") (description "The ACPI Component Architecture (@dfn{ACPICA}) project provides an OS-independent reference implementation of the Advanced Configuration and -- cgit v1.2.3 From 4d1e4af4e9cfcb75e1b531ec5e5408747f1c903c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 17 May 2020 05:11:29 +0200 Subject: gnu: acpica: Drop Texinfo @dfn{} usage. * gnu/packages/admin.scm (acpica)[description]: Substitute @acronym{} for @dfn{}. --- gnu/packages/admin.scm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index f6bf8526ef..9314abf5be 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1713,12 +1713,14 @@ module slots, and the list of I/O ports (e.g. serial, parallel, USB).") (home-page "https://acpica.org/") (synopsis "Tools for the development and debugging of ACPI tables") (description - "The ACPI Component Architecture (@dfn{ACPICA}) project provides an -OS-independent reference implementation of the Advanced Configuration and -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 + "The @acronym{ACPICA, ACPI Component Architecture} project provides an +OS-independent reference implementation of the @acronym{ACPI, Advanced +Configuration and Power Interface} specification. 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.") (license license:gpl2))) ; dual GPLv2/ACPICA Licence -- cgit v1.2.3 From 677515739e07cf6e99b70fa3cae5955a664566c7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 17 May 2020 05:16:00 +0200 Subject: gnu: cups: Update to 2.3.3 [fixes CVE-2020-3898 & CVE-2019-8842]. * gnu/packages/cups.scm (cups-minimal, cups)[replacement]: New fields. (cups-minimal-2.3.3, cups-2.3.3): New public variables. --- gnu/packages/cups.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index b253d0604e..f668d6c19b 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -187,6 +187,7 @@ filters for the PDF-centric printing workflow introduced by OpenPrinting.") ;; satisfy this dependency. (define-public cups-minimal (package + (replacement cups-minimal-2.3.3) (name "cups-minimal") (version "2.3.1") (source @@ -249,8 +250,22 @@ device-specific programs to convert and print many types of files.") ;; CUPS is Apache 2.0 with exceptions, see the NOTICE file. (license license:asl2.0))) +(define-public cups-minimal-2.3.3 + (package + (inherit cups-minimal) + (version "2.3.3") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/apple/cups/releases/download/v" + version "/cups-" version "-source.tar.gz")) + (sha256 + (base32 + "1vpk0b2vq830f8fvf9z8qjsm5k141i7pi8djbinpnr78pi4dj7r6")))))) + (define-public cups (package (inherit cups-minimal) + (replacement cups-2.3.3) (name "cups") (arguments `(;; Three tests fail: @@ -392,6 +407,12 @@ device-specific programs to convert and print many types of files.") ("cups-filters" ,cups-filters) ("zlib" ,zlib))))) +(define-public cups-2.3.3 + (package + (inherit cups) + (version "2.3.3") + (source (package-source cups-minimal-2.3.3)))) + (define-public cups-pk-helper (package (name "cups-pk-helper") -- cgit v1.2.3 From 5b4db51638d3fc828a59890ccb9b3f2e306a147e Mon Sep 17 00:00:00 2001 From: "B. Wilson" Date: Wed, 13 May 2020 13:51:19 +0900 Subject: gnu: Add bombadillo. gnu/packages/web-browsers.scm (bombadillo): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/web-browsers.scm | 47 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 46 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index 62b7a5bdca..b61ed7f3ca 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2019 Clément Lassieur ;;; Copyright © 2019 Brett Gilio ;;; Copyright © 2020 Raghav Gururajan +;;; Copyright © 2020 B. Wilson ;;; ;;; This file is part of GNU Guix. ;;; @@ -66,7 +67,8 @@ #:use-module (guix build-system gnu) #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system python) - #:use-module (guix build-system asdf)) + #:use-module (guix build-system asdf) + #:use-module (guix build-system go)) (define-public midori (package @@ -692,3 +694,46 @@ key-bindings and is fully configurable and extensible in Common Lisp.") (define-public sbcl-next (deprecated-package "sbcl-next" next)) + +(define-public bombadillo + (package + (name "bombadillo") + (version "2.2.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://tildegit.org/sloum/bombadillo") + (commit version))) + (sha256 + (base32 + "1m52b1wk48gkqmjy8l0x3jaksrx2v8w6w59lhr7zaw2i0n4f5k0z")) + (file-name (git-file-name name version)))) + (build-system go-build-system) + (arguments + `(#:import-path "tildegit.org/sloum/bombadillo" + #:install-source? #f + #:phases (modify-phases %standard-phases + (add-after 'install 'install-data + (lambda* (#:key outputs #:allow-other-keys) + (let* ((builddir "src/tildegit.org/sloum/bombadillo") + (out (assoc-ref outputs "out")) + (pkg (strip-store-file-name out)) + (sharedir (string-append out "/share")) + (appdir (string-append sharedir "/applications")) + (docdir (string-append sharedir "/doc/" pkg)) + (mandir (string-append sharedir "/man/man1")) + (pixdir (string-append sharedir "/pixmaps"))) + (with-directory-excursion builddir + (install-file "bombadillo.desktop" appdir) + (install-file "LICENSE" docdir) + (install-file "bombadillo.1" mandir) + (install-file "bombadillo-icon.png" pixdir) + #t))))))) + (home-page "http://bombadillo.colorfield.space") + (synopsis "Terminal browser for the gopher, gemini, and finger protocols") + (description "Bombadillo is a non-web browser for the terminal with +vim-like key bindings, a document pager, configurable settings, and robust +command selection. The following protocols are supported as first-class +citizens: gopher, gemini, finger, and local. There is also support for telnet, +http, and https via third-party applications.") + (license license:gpl3+))) -- cgit v1.2.3 From ad14938327b745f0dd7a7c58f5ae26f419379b2f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 17 May 2020 16:01:32 +0200 Subject: gnu: sane-backends-minimal: Update to 1.0.30 [Epson security fixes]. Fixes CVE-2020-12867 (GHSL-2020-075), CVE-2020-12862 (GHSL-2020-082), CVE-2020-12863 (GHSL-2020-083), CVE-2020-12865 (GHSL-2020-084), and several other memory management bugs. Mitigates CVE-2020-12866 (GHSL-2020-079), CVE-2020-12861 (GHSL-2020-080), and CVE-2020-12864 (GHSL-2020-081). * gnu/packages/scanner.scm (sane-backends-minimal): Update to 1.0.30. --- gnu/packages/scanner.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/scanner.scm b/gnu/packages/scanner.scm index 55a642241d..04d5065808 100644 --- a/gnu/packages/scanner.scm +++ b/gnu/packages/scanner.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2014 John Darrington ;;; Copyright © 2015 Andy Wingo ;;; Copyright © 2016 Andy Patterson -;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018 Efraim Flashner ;;; ;;; This file is part of GNU Guix. @@ -39,16 +39,16 @@ (define-public sane-backends-minimal (package (name "sane-backends-minimal") - (version "1.0.29") + (version "1.0.30") (source (origin (method url-fetch) (uri (string-append "https://gitlab.com/sane-project/backends/uploads/" - "54f858b20a364fc35d820df935a86478/" + "c3dd60c9e054b5dee1e7b01a7edc98b0/" "sane-backends-" version ".tar.gz")) (sha256 (base32 - "1vd83vhl0hddwsdh2jb0k3yzycfghi2xa9lc3ga9r12rbx77n0ma")) + "18vryaycps3zpjzxh0wjgg8nv2f4pdvcfxxmdfj28qbzqjlrcp9z")) (modules '((guix build utils))) (snippet ;; Generated HTML files and udev rules normally embed a -- cgit v1.2.3 From 074cd595bbcd343f86aad09794d8781846ff1927 Mon Sep 17 00:00:00 2001 From: Nicolò Balzarotti Date: Sun, 17 May 2020 14:46:25 +0200 Subject: gnu: lm-sensors: Patch references to ‘egrep’. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/linux.scm (lm-sensors)[arguments]: Patch unqualified references to ‘egrep’ as well as ‘grep’. Co-authored-by: Tobias Geerinckx-Rice --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index aa52068794..750111f4e1 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3541,9 +3541,9 @@ country-specific regulations for the wireless spectrum.") (("cat ") (string-append (assoc-ref inputs "coreutils") "/bin/cat ")) - (("grep ") + (("e?grep " match) (string-append (assoc-ref inputs "grep") - "/bin/grep ")) + "/bin/" match)) (("sed -e") (string-append (assoc-ref inputs "sed") "/bin/sed -e")) -- cgit v1.2.3 From 529d1d96ca99ac826afdd5ca8b22fccf87a9d8b8 Mon Sep 17 00:00:00 2001 From: Alex Sassmannshausen Date: Sun, 17 May 2020 17:28:18 +0200 Subject: gnu: guile-config: Update to 0.4.0. * gnu/packages/guile-xyz.scm (guile-config): Update to 0.4.0. --- gnu/packages/guile-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index fb56fb25e5..e53306ec3e 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -1353,16 +1353,16 @@ PostgreSQL.") (define-public guile-config (package (name "guile-config") - (version "0.3.1") + (version "0.4.0") (source (origin (method git-fetch) (uri (git-reference (url "https://gitlab.com/a-sassmannshausen/guile-config") - (commit (string-append "v" version)))) + (commit version))) (file-name (git-file-name name version)) (sha256 (base32 - "0gglsqwpw77gvrqcny8irpqfl7qdf2v8n9ggwrswanxalj4vcbvf")))) + "1ax7ifnnmxww6mxc1gfz577axvn6rqy152g3ks576vai88q631pr")))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) -- cgit v1.2.3 From 4bce3c03836bf9822b355daec847a721e82034a5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 17 May 2020 18:59:33 +0200 Subject: gnu: burp: Update to 2.3.26. * gnu/packages/backup.scm (burp): Update to 2.3.26. --- gnu/packages/backup.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 6a5080bcf8..0fe6676cc2 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -1029,14 +1029,14 @@ is format-agnostic, so you can feed virtually any files to it.") (define-public burp (package (name "burp") - (version "2.3.24") + (version "2.3.26") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/burp/burp-" version "/burp-" version ".tar.bz2")) (sha256 (base32 - "0dmahqx8ldqdrx9b47r7ag3m801n7h3kclcqja1cc1jzhfhfq27w")))) + "1kwm8wwmzla02cqacgpmac6n5466dqd5czx83lkbp97rmg9017h8")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From 74ff56a6676f5b7a8865c6fca4dc67cfccc97490 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 17 May 2020 19:04:23 +0200 Subject: gnu: knot: Update to 2.9.4. * gnu/packages/dns.scm (knot): Update to 2.9.4. --- gnu/packages/dns.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index 469ef7605d..051fea2de9 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -595,14 +595,14 @@ Extensions} (DNSSEC).") (define-public knot (package (name "knot") - (version "2.9.3") + (version "2.9.4") (source (origin (method url-fetch) (uri (string-append "https://secure.nic.cz/files/knot-dns/" "knot-" version ".tar.xz")) (sha256 - (base32 "0zm0642hkb16sqkqpa84f89f3s0bw44m837r1nia8m89swvz3bgj")) + (base32 "00d5lkan1yfxphw8q1vrmfpmg8kykdaky8082m1s1ps03cxckwsp")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From d74ea9e560d6419e6170991520c640483d21840b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 28 Apr 2020 21:25:51 +0300 Subject: gnu: valgrind: Fix build on powerpc. * gnu/packages/valgrind.scm (valgrind)[arguments]: Add make-flags for CPU optimizations when building on powerpc. --- gnu/packages/valgrind.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/valgrind.scm b/gnu/packages/valgrind.scm index dd080bb327..75e852915e 100644 --- a/gnu/packages/valgrind.scm +++ b/gnu/packages/valgrind.scm @@ -47,7 +47,11 @@ (outputs '("doc" ;16 MB "out")) (arguments - '(#:phases + `(,@(if (string-prefix? "powerpc" (or (%current-target-system) + (%current-system))) + `(#:make-flags '("CFLAGS+=-maltivec")) + '()) + #:phases (modify-phases %standard-phases (add-after 'install 'patch-suppression-files (lambda* (#:key outputs #:allow-other-keys) -- cgit v1.2.3 From f0a9cb9cf03b2b511342c768811a6a353b6e438a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 13 May 2020 10:32:47 +0300 Subject: gnu: gsl: Disable failing tests on powerpc. * gnu/packages/maths.scm (gsl)[arguments]: Skip the same set of tests on powerpc as skipped on aarch64. --- gnu/packages/maths.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 1821b2b1c7..e62fb38086 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus ;;; Copyright © 2015 Sou Bunnbu ;;; Copyright © 2015, 2018 Mark H Weaver -;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner +;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Efraim Flashner ;;; Copyright © 2015 Fabian Harfert ;;; Copyright © 2016 Roel Janssen ;;; Copyright © 2016, 2018, 2020 Kei Kebreau @@ -472,8 +472,9 @@ precision floating point numbers.") (arguments (let ((system (%current-system))) (cond - ((string-prefix? "aarch64" system) - ;; Some sparse matrix tests are failing on AArch64: + ((or (string-prefix? "aarch64" system) + (string-prefix? "powerpc" system)) + ;; Some sparse matrix tests are failing on AArch64 and PowerPC: ;; https://lists.gnu.org/archive/html/bug-gsl/2020-04/msg00001.html '(#:phases (modify-phases %standard-phases (add-before 'check 'disable-failing-tests -- cgit v1.2.3 From 03f4c9414b0c165c856d236ee0024fdf8d54862f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 28 Apr 2020 22:44:44 +0300 Subject: gnu: elfutils: Skip tests on powerpc. * gnu/packages/elf.scm (elfutils)[arguments]: Skip tests on powerpc. --- gnu/packages/elf.scm | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/elf.scm b/gnu/packages/elf.scm index 5fa66210db..098c0fc94a 100644 --- a/gnu/packages/elf.scm +++ b/gnu/packages/elf.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2013, 2014, 2015 Ludovic Courtès ;;; Copyright © 2014, 2015 Mark H Weaver ;;; Copyright © 2015 Andreas Enge -;;; Copyright © 2017, 2018, 2019 Efraim Flashner +;;; Copyright © 2017, 2018, 2019, 2020 Efraim Flashner ;;; Copyright © 2017 Leo Famulari ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Marius Bakke @@ -38,7 +38,9 @@ #:use-module (gnu packages python) #:use-module (gnu packages sphinx) #:use-module (gnu packages texinfo) - #:use-module (gnu packages xml)) + #:use-module (gnu packages xml) + #:use-module (srfi srfi-1) + #:use-module (srfi srfi-26)) (define-public elfutils (package @@ -67,10 +69,11 @@ (assoc-ref %outputs "out") "/lib")) - ;; Disable tests on MIPS (without changing + ;; Disable tests on MIPS and PowerPC (without changing ;; the arguments list on other systems). - ,@(if (string-prefix? "mips" (or (%current-target-system) - (%current-system))) + ,@(if (any (cute string-prefix? <> (or (%current-target-system) + (%current-system))) + '("mips" "powerpc")) '(#:tests? #f) '()) -- cgit v1.2.3 From d45571fe98b484233d079724fbab76af8d3f7005 Mon Sep 17 00:00:00 2001 From: nixo Date: Thu, 14 May 2020 17:17:08 +0200 Subject: gnu: julia: Specify correct llvm version. * gnu/packages/julia.scm (julia)[arguments]: Adjust configure-flag to specify the correct llvm version. Signed-off-by: Efraim Flashner --- gnu/packages/julia.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/julia.scm b/gnu/packages/julia.scm index c636fa756b..8db5e66131 100644 --- a/gnu/packages/julia.scm +++ b/gnu/packages/julia.scm @@ -416,7 +416,7 @@ libraries. It is also a bit like @code{ldd} and @code{otool -L}.") (assoc-ref %build-inputs "utf8proc") "/include") "USE_SYSTEM_LLVM=1" - "LLVM_VER=6.0.1" + "LLVM_VER=8.0.0" "USE_LLVM_SHLIB=1" "USE_SYSTEM_LIBUNWIND=1" -- cgit v1.2.3 From ec944bdde93c73724f3f3fec2ecd0347a964504c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 17 May 2020 21:20:32 +0200 Subject: gnu: mu: Update to 1.4.6. * gnu/packages/mail.scm (mu): Update to 1.4.6. --- gnu/packages/mail.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index e6728aae94..7398c9f4da 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -718,7 +718,7 @@ security functionality including PGP, S/MIME, SSH, and SSL.") (define-public mu (package (name "mu") - (version "1.4.4") + (version "1.4.6") (source (origin (method url-fetch) (uri (string-append "https://github.com/djcb/mu/releases/" @@ -726,7 +726,7 @@ security functionality including PGP, S/MIME, SSH, and SSL.") "mu-" version ".tar.xz")) (sha256 (base32 - "0pmx8zh5fsfhkdl0cr7ydcv6cywhxbgavnjrfr5p2ibz9gx3q3vf")))) + "15spbplf9p8cdxqfwnv3x67451sfpna9q5n2kgqqwh2y78i7zlhc")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From a6ce9e355db6842538b968603c80e2ed1013b739 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 17 May 2020 18:15:20 +0200 Subject: gnu: CUPS: Inherit replacement from cups-minimal. * gnu/packages/cups.scm (cups): Use PACKAGE/INHERIT. [replacement]: Remove. (cups-2.3.3): Remove variable. --- gnu/packages/cups.scm | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index f668d6c19b..0250f16db3 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -264,8 +264,7 @@ device-specific programs to convert and print many types of files.") "1vpk0b2vq830f8fvf9z8qjsm5k141i7pi8djbinpnr78pi4dj7r6")))))) (define-public cups - (package (inherit cups-minimal) - (replacement cups-2.3.3) + (package/inherit cups-minimal (name "cups") (arguments `(;; Three tests fail: @@ -407,12 +406,6 @@ device-specific programs to convert and print many types of files.") ("cups-filters" ,cups-filters) ("zlib" ,zlib))))) -(define-public cups-2.3.3 - (package - (inherit cups) - (version "2.3.3") - (source (package-source cups-minimal-2.3.3)))) - (define-public cups-pk-helper (package (name "cups-pk-helper") -- cgit v1.2.3 From 8415182a9a1c6a52dd4d18c63b421cf0a5e1b4ba Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 17 May 2020 19:15:52 +0200 Subject: gnu: kdiagram: Update to 2.7.0. * gnu/packages/kde.scm (kdiagram): Update to 2.7.0. --- gnu/packages/kde.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index a93e776bf0..4f28b5b90a 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -329,14 +329,14 @@ for some KDevelop language plugins (Ruby, PHP, CSS...).") (define-public kdiagram (package (name "kdiagram") - (version "2.6.1") + (version "2.7.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/kdiagram/" version "/kdiagram-" version ".tar.xz")) (sha256 - (base32 "1c6dbp9gssjrx59z8yxzq1ay56pnw7h28symjrv0gcvhxyjirrxx")) + (base32 "1pgvf2q8b59hw0jg5ajmj5nrn4q8cgnifpvdd0fynk2ml6zym8k3")) (patches (search-patches "kdiagram-Fix-missing-link-libraries.patch")))) (build-system qt-build-system) -- cgit v1.2.3 From 7d703a2fccc38baf9789f075b9ccfe2c47eff0b3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 17 May 2020 19:16:17 +0200 Subject: gnu: krita: Update to 4.2.9. * gnu/packages/kde.scm (krita): Update to 4.2.9. [arguments]: Add special configure flag for OPENEXR instead of ILMBASE. --- gnu/packages/kde.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 4f28b5b90a..323d2fcb00 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -360,7 +360,7 @@ illustrate project schedules.") (define-public krita (package (name "krita") - (version "4.2.7.1") + (version "4.2.9") (source (origin (method url-fetch) (uri (string-append @@ -368,14 +368,14 @@ illustrate project schedules.") "/krita-" version ".tar.gz")) (sha256 (base32 - "0gcwq1w09gmx53i2fir73l222p41299wagvhbvsxwrz0v3crzliy")))) + "1a3djmjhnvlp8dpiz68s0lwg71nv3ypq592jfgsnm5zlxa0vp1cz")))) (build-system cmake-build-system) (arguments `(#:tests? #f #:configure-flags (list "-DBUILD_TESTING=OFF" (string-append "-DCMAKE_CXX_FLAGS=-I" - (assoc-ref %build-inputs "ilmbase") + (assoc-ref %build-inputs "openexr") "/include/OpenEXR")) #:phases (modify-phases %standard-phases -- cgit v1.2.3 From 7c003383de85d7c899a0d30158cbb198b923268a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 17 May 2020 19:16:35 +0200 Subject: gnu: libkomparediff2: Update to 19.08.3. * gnu/packages/kde.scm (libkomparediff2): Update to 19.08.3. --- gnu/packages/kde.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 323d2fcb00..b8765c9851 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -449,14 +449,14 @@ features include brush stabilizers, brush engines and wrap-around mode.") (define-public libkomparediff2 (package (name "libkomparediff2") - (version "19.08.2") + (version "19.08.3") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/applications/" version "/src/libkomparediff2-" version ".tar.xz")) (sha256 - (base32 "1mvihd0xpkl8kryf5dvsfgpbgs9af8c9bzq8mmr74gfsvfb8ywy5")))) + (base32 "0p8j24d0lzylv5crdzak87016ppgph5hiyxkvapda1m8zlb5dfm1")))) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) ("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 565d2eb0fe39d1a8dca70a43e063f50d56fb4640 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 17 May 2020 19:17:02 +0200 Subject: gnu: qca: Update to 2.3.0. * gnu/packages/kde.scm (qca): Update to 2.3.0. --- gnu/packages/kde.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index b8765c9851..648c401ad0 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -481,7 +481,7 @@ used in KDE development tools Kompare and KDevelop.") (define-public qca (package (name "qca") - (version "2.2.1") + (version "2.3.0") (source (origin (method url-fetch) @@ -489,7 +489,7 @@ used in KDE development tools Kompare and KDevelop.") "/qca-" version ".tar.xz")) (sha256 (base32 - "00kv1vsrc8fp556hm8s6yw3240vx3l4067q6vfxrb3gdwgcd45np")))) + "1mrj748yz1grgzmfbmffgjkpcqiaj1l3m4pbddwcj7dnl50yys0x")))) (build-system cmake-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 5db3f6c18152f7f3a724cdbca50dcedea4389079 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 17 May 2020 19:17:19 +0200 Subject: gnu: kpmcore: Update to 4.1.0. * gnu/packages/patches/kpmcore-fix-tests.patch, gnu/packages/patches/kpmcore-remove-broken-test.patch: Delete files. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/kde.scm (kpmcore): Update to 4.1.0. [source](patches): Remove. --- gnu/local.mk | 2 - gnu/packages/kde.scm | 6 +- gnu/packages/patches/kpmcore-fix-tests.patch | 30 ----- .../patches/kpmcore-remove-broken-test.patch | 139 --------------------- 4 files changed, 2 insertions(+), 175 deletions(-) delete mode 100644 gnu/packages/patches/kpmcore-fix-tests.patch delete mode 100644 gnu/packages/patches/kpmcore-remove-broken-test.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 118a9e24eb..38b286203e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1136,8 +1136,6 @@ dist_patch_DATA = \ %D%/packages/patches/kpackage-allow-external-paths.patch \ %D%/packages/patches/kmplayer-aarch64.patch \ %D%/packages/patches/kmplayer-upstream_Fix-build-with-Qt-5.9.patch \ - %D%/packages/patches/kpmcore-fix-tests.patch \ - %D%/packages/patches/kpmcore-remove-broken-test.patch \ %D%/packages/patches/kobodeluxe-paths.patch \ %D%/packages/patches/kobodeluxe-enemies-pipe-decl.patch \ %D%/packages/patches/kobodeluxe-const-charp-conversion.patch \ diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 648c401ad0..4f2d2a2eba 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -507,7 +507,7 @@ cards.") (define-public kpmcore (package (name "kpmcore") - (version "4.0.1") + (version "4.1.0") (source (origin (method url-fetch) (uri (string-append @@ -516,9 +516,7 @@ cards.") name "-" version ".tar.xz")) (sha256 (base32 - "1sslkwcj2cyrn7bpjdjdwikp1q8wrsxpsg2sxxd8hsairgy7ygh3")) - (patches (search-patches "kpmcore-fix-tests.patch" - "kpmcore-remove-broken-test.patch")))) + "0jsig7algmab9h0fb09my0axjqzw83zgscamhzl8931lribs6idm")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) diff --git a/gnu/packages/patches/kpmcore-fix-tests.patch b/gnu/packages/patches/kpmcore-fix-tests.patch deleted file mode 100644 index 12043abe72..0000000000 --- a/gnu/packages/patches/kpmcore-fix-tests.patch +++ /dev/null @@ -1,30 +0,0 @@ -Git commit c02d59aa6d314678cef9683f96b28e2a1abd82b7 by Andrius Štikonas, on behalf of Hartmut Goebel. -Committed on 07/11/2019 at 22:16. -Pushed by stikonas into branch '4.0'. - -Fix test for kpmcore: stop helper only if formerly started. - -See https://bugs.kde.org/413851 and https://phabricator.kde.org/D25161 - -diff --git a/src/util/externalcommand.cpp b/src/util/externalcommand.cpp ---- a/src/util/externalcommand.cpp -+++ b/src/util/externalcommand.cpp -@@ -433,14 +433,17 @@ - - void ExternalCommand::stopHelper() - { -+ if (!helperStarted) -+ return; - auto *interface = new org::kde::kpmcore::externalcommand(QStringLiteral("org.kde.kpmcore.externalcommand"), - QStringLiteral("/Helper"), QDBusConnection::systemBus()); - QByteArray request; - const quint64 nonce = interface->getNonce(); - request.setNum(nonce); - QByteArray hash = QCryptographicHash::hash(request, QCryptographicHash::Sha512); - interface->exit(privateKey->signMessage(hash, QCA::EMSA3_Raw), nonce); - -+ helperStarted = false; - delete privateKey; - delete init; - } - diff --git a/gnu/packages/patches/kpmcore-remove-broken-test.patch b/gnu/packages/patches/kpmcore-remove-broken-test.patch deleted file mode 100644 index d02cca7883..0000000000 --- a/gnu/packages/patches/kpmcore-remove-broken-test.patch +++ /dev/null @@ -1,139 +0,0 @@ -From c9a08a593bac8b8610a647db118fea6f2958156d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= -Date: Thu, 7 Nov 2019 22:12:00 +0000 -Subject: [PATCH] Remove broken smart unit test. - -BUG: 413853 ---- - test/CMakeLists.txt | 9 ---- - test/testsmart.cpp | 102 -------------------------------------------- - 2 files changed, 111 deletions(-) - delete mode 100644 test/testsmart.cpp - -diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt -index 67f63a2..6a300d3 100644 ---- a/test/CMakeLists.txt -+++ b/test/CMakeLists.txt -@@ -53,12 +53,3 @@ find_package (Threads) - # Execute external commands as root - kpm_test(testexternalcommand testexternalcommand.cpp) - add_test(NAME testexternalcommand COMMAND testexternalcommand ${BACKEND}) -- --# Including SMART files reference --set(SMARTPARSER ${CMAKE_SOURCE_DIR}/src/core/smartdiskinformation.cpp -- ${CMAKE_SOURCE_DIR}/src/core/smartattributeparseddata.cpp -- ${CMAKE_SOURCE_DIR}/src/core/smartparser.cpp) -- --# Test SMART support --kpm_test(testsmart testsmart.cpp ${SMARTPARSER}) --add_test(NAME testsmart COMMAND testsmart ${BACKEND}) -diff --git a/test/testsmart.cpp b/test/testsmart.cpp -deleted file mode 100644 -index 2236af7..0000000 ---- a/test/testsmart.cpp -+++ /dev/null -@@ -1,102 +0,0 @@ --#include "helpers.h" -- --#include "util/externalcommand.h" --#include "backend/corebackend.h" --#include "backend/corebackendmanager.h" --#include "core/smartstatus.h" --#include "core/smartparser.h" -- --#include --#include -- --static QString getDefaultDevicePath(); --static bool testSmartStatus(); --static bool testSmartParser(); -- --int main(int argc, char **argv) --{ -- QCoreApplication app(argc, argv); -- -- KPMCoreInitializer i; -- -- if (argc == 2) -- i = KPMCoreInitializer(argv[1]); -- -- if (!i.isValid()) -- return 1; -- -- CoreBackend *backend = CoreBackendManager::self()->backend(); -- -- if (!backend) -- { -- qWarning() << "Couldn't get backend."; -- return 1; -- } -- -- if (!testSmartStatus() || !testSmartParser()) -- return 1; -- -- return app.exec(); --} -- --static QString getDefaultDevicePath() --{ -- // Getting default home partition using 'df -P /home | awk 'END{print $1}'' command -- ExternalCommand command(QStringLiteral("df"), { QStringLiteral("-P"), QStringLiteral("/home"), QStringLiteral("|"), -- QStringLiteral("awk"), QStringLiteral("\'END{print $1}\'") }); -- -- if (command.run() && command.exitCode() == 0) { -- QString output = command.output(); -- return output; -- } -- -- return QString(); --} -- --static bool testSmartStatus() --{ -- QString devicePath = getDefaultDevicePath(); -- -- SmartStatus smart(devicePath); -- -- if (smart.devicePath() != devicePath) -- return false; -- -- if (!smart.status()) -- return false; -- -- if (smart.modelName() == QString()) -- return false; -- -- if (smart.firmware() == QString()) -- return false; -- -- if (smart.serial() == QString()) -- return false; -- -- if (smart.selfTestStatus() != SmartStatus::SelfTestStatus::Success) -- return false; -- -- if (!smart.isValid()) -- return false; -- -- return true; --} -- --static bool testSmartParser() --{ -- QString devicePath = getDefaultDevicePath(); -- -- SmartParser parser(devicePath); -- -- if (!parser.init()) -- return false; -- -- if (parser.devicePath() != devicePath) -- return false; -- -- if (!parser.diskInformation()) -- return false; -- -- return true; --} --- -2.17.1 -- cgit v1.2.3 From d15c38b0f91c3f5e434755313f68fb150cd0219b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 17 May 2020 19:17:54 +0200 Subject: gnu: kqtquickcharts: Update to 19.08.3. * gnu/packages/kde.scm (kqtquickcharts): Update to 19.08.3. --- gnu/packages/kde.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 4f2d2a2eba..16a7e78c46 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -620,7 +620,7 @@ communicate with each other. Here's a few things KDE Connect can do: (define-public kqtquickcharts (package (name "kqtquickcharts") - (version "19.08.2") + (version "19.08.3") (source (origin (method url-fetch) @@ -628,7 +628,7 @@ communicate with each other. Here's a few things KDE Connect can do: version "/src/kqtquickcharts-" version ".tar.xz")) (sha256 (base32 - "1yy9fyd8y4g25ljdsbil19qdf4j3mzmzl489sx7rqpm3lfdzjh9k")))) + "0kwrqm7aa74plqkkyigi6b2hic6dzrygkgb6hsgj35ycrfn4rigi")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) -- cgit v1.2.3 From 843e77205162013b1001f0be898142309704e495 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 17 May 2020 19:18:15 +0200 Subject: gnu: kcachegrind: Update to 19.08.3. * gnu/packages/kde.scm (kcachegrind): Update to 19.08.3. --- gnu/packages/kde.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 16a7e78c46..c52feb5725 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -645,14 +645,14 @@ charts.") (define-public kcachegrind (package (name "kcachegrind") - (version "19.04.1") + (version "19.08.3") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/applications/" version "/src/kcachegrind-" version ".tar.xz")) (sha256 (base32 - "1hhsk64yp6q2xh8j269j4wp9y24ggmii861r6gf02mj1mbn2p1jb")))) + "0sm3085vd79svfql6nqjyrwlknnmdyyvi0yjnmyb09mq7djf1icg")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) -- cgit v1.2.3 From 006c3f2240d9c4f90205dea12aea5341140087c6 Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Tue, 12 May 2020 15:50:27 +0100 Subject: gnu: Add perl-lwpx-paranoidagent. * gnu/packages/web.scm (perl-lwpx-paranoidagent): New variable. --- gnu/packages/web.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index eabc3c0197..a3f69e1587 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -126,6 +126,7 @@ #:use-module (gnu packages lua) #:use-module (gnu packages markup) #:use-module (gnu packages ncurses) + #:use-module (gnu packages networking) #:use-module (gnu packages nss) #:use-module (gnu packages openldap) #:use-module (gnu packages openstack) @@ -3718,6 +3719,35 @@ possibly-temporary error (like a DNS lookup timeout), it'll wait a few seconds and retry a few times.") (license license:perl-license))) +(define-public perl-lwpx-paranoidagent + (package + (name "perl-lwpx-paranoidagent") + (version "1.12") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://cpan/authors/id/S/SA/SAXJAZMAN/lwp/LWPx-ParanoidAgent-" + version ".tar.gz")) + (sha256 + (base32 + "0gfhw3jbs25yya2dryv8xvyn9myngcfcmsybj7gkq62fnznil16c")))) + (build-system perl-build-system) + (propagated-inputs + `(("perl-libwww" ,perl-libwww) + ;; Users should instead make sure SSL_ca_path is set properly. + ;; ("perl-mozilla-ca" ,perl-mozilla-ca) + ("perl-net-dns" ,perl-net-dns))) + (home-page "https://metacpan.org/release/LWPx-ParanoidAgent") + (synopsis "Security enhanced subclass of LWP::UserAgent") + (description "@code{LWPx::ParanoidAgent} is a class subclassing +@code{LWP::UserAgent} but paranoid against attackers. Its purpose is +to vet requests for a remote resource on behalf of a possibly +malicious user. The class can do the same as @code{LWP::UserAgent}, +except that proxy support has been removed. Support for URI schemes +is limited to http and https.") + (license license:perl-license))) + (define-public perl-net-amazon-s3 (package (name "perl-net-amazon-s3") -- cgit v1.2.3 From 89bd9f41ff572d8e96a6e589e07f3f8802e36535 Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Thu, 14 May 2020 13:35:33 +0100 Subject: gnu: ikiwiki: Add missing input. * gnu/packages/web.scm (ikiwiki)[inputs]: Add perl-lwpx-paranoidagent. --- gnu/packages/web.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index a3f69e1587..5b18f84ac3 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4904,6 +4904,7 @@ NetSurf project.") ("perl-file-mimeinfo" ,perl-file-mimeinfo) ("perl-html-tagset" ,perl-html-tagset) ("perl-image-magick" ,perl-image-magick) + ("perl-lwpx-paranoidagent" ,perl-lwpx-paranoidagent) ("perl-mail-sendmail" ,perl-mail-sendmail) ("perl-timedate" ,perl-timedate) ("perl-xml-sax" ,perl-xml-sax) -- cgit v1.2.3 From 8ec6b9fe0c494ac5fd114b2b73ab66cac66da7b1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 16 May 2020 13:34:46 +0200 Subject: gnu: guile-studio: Build with Guile 3.0. * gnu/packages/guile-xyz.scm (guile-studio)[inputs]: Replace guile-2.2 with guile-3.0. --- gnu/packages/guile-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index e53306ec3e..e0ce1815da 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -2417,7 +2417,7 @@ The picture values can directly be displayed in Geiser.") (delete 'configure) (delete 'install)))) (inputs - `(("guile" ,guile-2.2) + `(("guile" ,guile-3.0) ("guile-picture-language" ,guile-picture-language) ("emacs" ,emacs) ("emacs-geiser" ,emacs-geiser) -- cgit v1.2.3 From c660779722f4130e95cda89c0eb0cff534a89ef2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 16 May 2020 14:18:02 +0200 Subject: gnu: guile-studio: Update to 0.0.2-1.d24d59a. * gnu/packages/guile-xyz.scm (guile-studio): Update to 0.0.2-1.d24d59a. --- gnu/packages/guile-xyz.scm | 118 +++++++++++++++++++++++---------------------- 1 file changed, 60 insertions(+), 58 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index e0ce1815da..f3a8cbf247 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -2375,67 +2375,69 @@ The picture values can directly be displayed in Geiser.") guile-picture-language)) (define-public guile-studio - (package - (name "guile-studio") - (version "0.0.2") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://git.elephly.net/software/guile-studio.git") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "10ls4ra148hd9ra7sin4kh9vv0am5pwk48p7dsjhrlg2l1hsh4hi")))) - (build-system gnu-build-system) - (arguments - `(#:modules - ((ice-9 match) - (srfi srfi-1) - ,@%gnu-build-system-modules) - #:tests? #f ; there are none - #:make-flags - (list (string-append "ICONS_DIR=" - (assoc-ref %build-inputs "adwaita-icon-theme") - "/share/icons/Adwaita/") - (string-append "PICT_DIR=" - (assoc-ref %build-inputs "guile-picture-language")) - (string-append "EMACS_DIR=" - (assoc-ref %build-inputs "emacs")) - (string-append "GUILE_DIR=" - (assoc-ref %build-inputs "guile")) - (string-join (cons "INPUTS=" - (filter-map - (lambda (input) - (match input - ((label . pkg) - (and (string-prefix? "emacs" label) pkg)))) - %build-inputs))) - (string-append "PREFIX=" (assoc-ref %outputs "out"))) - #:phases - (modify-phases %standard-phases - (delete 'configure) - (delete 'install)))) - (inputs - `(("guile" ,guile-3.0) - ("guile-picture-language" ,guile-picture-language) - ("emacs" ,emacs) - ("emacs-geiser" ,emacs-geiser) - ("emacs-company" ,emacs-company) - ("emacs-flycheck" ,emacs-flycheck) - ("emacs-smart-mode-line" ,emacs-smart-mode-line) - ("emacs-paren-face" ,emacs-paren-face) - ("adwaita-icon-theme" ,adwaita-icon-theme))) - (native-inputs - `(("texinfo" ,texinfo))) - (home-page "https://gnu.org/software/guile") - (synopsis "IDE for Guile") - (description - "This is Emacs with a few settings that make working with Guile easier + (let ((commit "d24d59a68e3f1fa9477e3430fc48a2efe97b805d") + (revision "1")) + (package + (name "guile-studio") + (version (git-version "0.0.2" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://git.elephly.net/software/guile-studio.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0kqi0q8a7si65n21b7gn8vbninwcg0fqy5hmvy3l1bi6iync20zr")))) + (build-system gnu-build-system) + (arguments + `(#:modules + ((ice-9 match) + (srfi srfi-1) + ,@%gnu-build-system-modules) + #:tests? #f ; there are none + #:make-flags + (list (string-append "ICONS_DIR=" + (assoc-ref %build-inputs "adwaita-icon-theme") + "/share/icons/Adwaita/") + (string-append "PICT_DIR=" + (assoc-ref %build-inputs "guile-picture-language")) + (string-append "EMACS_DIR=" + (assoc-ref %build-inputs "emacs")) + (string-append "GUILE_DIR=" + (assoc-ref %build-inputs "guile")) + (string-join (cons "INPUTS=" + (filter-map + (lambda (input) + (match input + ((label . pkg) + (and (string-prefix? "emacs" label) pkg)))) + %build-inputs))) + (string-append "PREFIX=" (assoc-ref %outputs "out"))) + #:phases + (modify-phases %standard-phases + (delete 'configure) + (delete 'install)))) + (inputs + `(("guile" ,guile-3.0) + ("guile-picture-language" ,guile-picture-language) + ("emacs" ,emacs) + ("emacs-geiser" ,emacs-geiser) + ("emacs-company" ,emacs-company) + ("emacs-flycheck" ,emacs-flycheck) + ("emacs-smart-mode-line" ,emacs-smart-mode-line) + ("emacs-paren-face" ,emacs-paren-face) + ("adwaita-icon-theme" ,adwaita-icon-theme))) + (native-inputs + `(("texinfo" ,texinfo))) + (home-page "https://gnu.org/software/guile") + (synopsis "IDE for Guile") + (description + "This is Emacs with a few settings that make working with Guile easier for people new to Emacs. Features include: CUA mode, Geiser, tool bar icons to evaluate Guile buffers, support for Guile's very own picture language, code completion, a simple mode line, etc.") - (license license:gpl3+))) + (license license:gpl3+)))) (define-public guile-stis-parser (let ((commit "6e85d37ffc333b722f4413a6c648263701eb75bd") -- cgit v1.2.3 From 58024d86e1c5b00567abfdb144fbff8cc2f6588e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 18 May 2020 14:15:02 +0200 Subject: gnu: dovecot: Update to 2.3.10.1 [security fixes]. Fixes CVE-2020-10957, CVE-2020-10958, and CVE-2020-10967. * gnu/packages/mail.scm (dovecot): Update to 2.3.10.1. --- gnu/packages/mail.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 7398c9f4da..935a7333a4 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1372,7 +1372,7 @@ facilities for checking incoming mail.") (define-public dovecot (package (name "dovecot") - (version "2.3.10") + (version "2.3.10.1") (source (origin (method url-fetch) @@ -1380,7 +1380,7 @@ facilities for checking incoming mail.") (version-major+minor version) "/" "dovecot-" version ".tar.gz")) (sha256 - (base32 "1ibiz3k2flablkcqbkvfzsjnq5b5kxximhcrplflsjl57mr88ca7")))) + (base32 "035idr2j81s5mngnhd58rih79dhwwak7q01mqbx3rcmi4cpychk6")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 14950b83b0939b5c1aace45d669e89cadac04f71 Mon Sep 17 00:00:00 2001 From: Alex Sassmannshausen Date: Mon, 18 May 2020 15:30:34 +0200 Subject: gnu: guile-config: Update to 0.4.1. * gnu/packages/guile-xyz.scm (guile-config): Update to 0.4.1. --- gnu/packages/guile-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index f3a8cbf247..674b1f922b 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -1353,7 +1353,7 @@ PostgreSQL.") (define-public guile-config (package (name "guile-config") - (version "0.4.0") + (version "0.4.1") (source (origin (method git-fetch) @@ -1362,7 +1362,7 @@ PostgreSQL.") (commit version))) (file-name (git-file-name name version)) (sha256 (base32 - "1ax7ifnnmxww6mxc1gfz577axvn6rqy152g3ks576vai88q631pr")))) + "1c59ch96d5p4c7si8qp55fdc15375klf2hyh29y3ap8ahqx9pxqj")))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) -- cgit v1.2.3 From ab67f84bbe89dd096ec6fb28c12e79654ea091d1 Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Sun, 17 May 2020 17:55:16 +0200 Subject: gnu: godot: Enable release build. * gnu/packages/game-development.scm (godot)[arguments]: Set release_debug target in #:scons-flags to enable optimized build. Signed-off-by: Nicolas Goaziou --- gnu/packages/game-development.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 26aa4f714b..dfa55b136f 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1585,7 +1585,7 @@ games.") (build-system scons-build-system) (arguments `(#:scons ,scons-python2 - #:scons-flags (list "platform=x11" + #:scons-flags (list "platform=x11" "target=release_debug" ,@(if (string-prefix? "aarch64" (or (%current-target-system) (%current-system))) `("CCFLAGS=-DNO_THREADS") -- cgit v1.2.3 From 6028541e61870e12da2db3e29924feb1c4298892 Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Sun, 17 May 2020 17:55:17 +0200 Subject: gnu: godot: Remove obsolete workaround for aarch64. * gnu/packages/game-development.scm (godot)[arguments]: Remove -DNO_THREADS from scons-flags as Godot now builds and runs without it on aarch64. Signed-off-by: Nicolas Goaziou --- gnu/packages/game-development.scm | 4 ---- 1 file changed, 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index dfa55b136f..d84b3fb24a 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1586,10 +1586,6 @@ games.") (arguments `(#:scons ,scons-python2 #:scons-flags (list "platform=x11" "target=release_debug" - ,@(if (string-prefix? "aarch64" (or (%current-target-system) - (%current-system))) - `("CCFLAGS=-DNO_THREADS") - '()) ;; Avoid using many of the bundled libs. ;; Note: These options can be found in the SConstruct file. "builtin_bullet=no" -- cgit v1.2.3 From 545511df77837079afa63c1b420d8dd2b67f7235 Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Sun, 17 May 2020 17:55:18 +0200 Subject: gnu: godot: Build and install the headless version. * gnu/packages/game-development.scm (godot): Build the headless (server) binary. This is needed to package games using Godot without depending on X. [outputs]: Add "headless". [arguments]<#:phases>[build-headless]: New phase. [arguments]<#:phases>[install]: Install headless version to separate output. Signed-off-by: Nicolas Goaziou --- gnu/packages/game-development.scm | 35 +++++++++++++++++++++++------------ 1 file changed, 23 insertions(+), 12 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index d84b3fb24a..03369a6d44 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1604,7 +1604,7 @@ games.") "builtin_wslay=no" "builtin_zlib=no" "builtin_zstd=no") - #:tests? #f ; There are no tests + #:tests? #f ; There are no tests #:phases (modify-phases %standard-phases (add-after 'unpack 'scons-use-env @@ -1617,20 +1617,30 @@ games.") "env_base = Environment(tools=custom_tools)\n" "env_base = Environment(ENV=os.environ)"))) #t)) + ;; Build headless tools, used for packaging games without depending on X. + (add-after 'build 'build-headless + (lambda* (#:key scons-flags #:allow-other-keys) + (apply invoke "scons" + `(,(string-append "-j" (number->string (parallel-job-count))) + "platform=server" ,@(delete "platform=x11" scons-flags))))) (replace 'install - (lambda* (#:key outputs #:allow-other-keys) + (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin"))) + (headless (assoc-ref outputs "headless")) + (zenity (assoc-ref inputs "zenity"))) + ;; Strip build info from filenames. (with-directory-excursion "bin" - (if (file-exists? "godot.x11.tools.64") - (rename-file "godot.x11.tools.64" "godot") - (rename-file "godot.x11.tools.32" "godot")) - (install-file "godot" bin)) - ;; Tell Godot where to find zenity for OS.alert(). - (wrap-program (string-append bin "/godot") - `("PATH" ":" prefix - (,(string-append (assoc-ref %build-inputs "zenity") "/bin")))) - #t))) + (for-each + (lambda (file) + (let ((dest (car (string-split (basename file) #\.)))) + (rename-file file dest))) + (find-files "." "godot.*\\.x11\\.opt\\.tools.*")) + (install-file "godot" (string-append out "/bin")) + (install-file "godot_server" (string-append headless "/bin"))) + ;; Tell the editor where to find zenity for OS.alert(). + (wrap-program (string-append out "/bin/godot") + `("PATH" ":" prefix (,(string-append zenity "/bin"))))) + #t)) (add-after 'install 'install-godot-desktop (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -1652,6 +1662,7 @@ games.") Type=Application~%" out))) #t)))))) + (outputs '("out" "headless")) (native-inputs `(("pkg-config" ,pkg-config))) (inputs `(("alsa-lib" ,alsa-lib) ("bullet" ,bullet) -- cgit v1.2.3 From bf076da917c3fe3732e2b1a8959b3ed2677b3b4a Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Sun, 17 May 2020 17:55:19 +0200 Subject: gnu: godot: Install provided .desktop file and icons. * gnu/packages/game-development.scm (godot)[arguments]: Install the provided godot.desktop instead of creating a new one. Copy icons to the correct location in share/icons/hicolor as per XDG. Signed-off-by: Nicolas Goaziou --- gnu/packages/game-development.scm | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 03369a6d44..ac9c2ce864 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1644,24 +1644,18 @@ games.") (add-after 'install 'install-godot-desktop (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) - (desktop (string-append out "/share/applications")) - (icon-dir (string-append out "/share/pixmaps"))) - (rename-file "icon.png" "godot.png") - (install-file "godot.png" icon-dir) - (mkdir-p desktop) - (with-output-to-file - (string-append desktop "/godot.desktop") - (lambda _ - (format #t - "[Desktop Entry]~@ - Name=godot~@ - Comment=The godot game engine~@ - Exec=~a/bin/godot~@ - TryExec=~@*~a/bin/godot~@ - Icon=godot~@ - Type=Application~%" - out))) - #t)))))) + (applications (string-append out "/share/applications")) + (icons (string-append out "/share/icons/hicolor"))) + (mkdir-p applications) + (copy-file "misc/dist/linux/org.godotengine.Godot.desktop" + (string-append applications "/godot.desktop")) + (for-each (lambda (icon dest) + (mkdir-p (dirname dest)) + (copy-file icon dest)) + '("icon.png" "icon.svg") + `(,(string-append icons "/256x256/apps/godot.png") + ,(string-append icons "/scalable/apps/godot.svg")))) + #t))))) (outputs '("out" "headless")) (native-inputs `(("pkg-config" ,pkg-config))) (inputs `(("alsa-lib" ,alsa-lib) -- cgit v1.2.3 From 756605ee9e8b8442a3a39f69ef6ce662910a6ccf Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Sun, 17 May 2020 17:55:20 +0200 Subject: gnu: Add superstarfighter. * gnu/packages/games.scm (superstarfighter): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/games.scm | 77 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 177436e6ec..96726eaa78 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -1733,6 +1733,83 @@ can be explored and changed freely.") license:gpl3+ license:silofl1.1)))) +(define-public superstarfighter + (package + (name "superstarfighter") + (version "0.6.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/notapixelstudio/superstarfighter.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1fly63yf5ls1xwm15if4lxwy67wi84k4gvjllljpykrl18vw2y0y")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ;there are no tests + #:phases + (modify-phases %standard-phases + (replace 'configure + (lambda _ + (chdir "godot") + (setenv "HOME" (getcwd)) + (with-output-to-file "export_presets.cfg" + (lambda () + (display + "[preset.0] +name=\"Guix\" +platform=\"Linux/X11\" +runnable=true +[preset.0.options]"))) + #t)) + (replace 'build + (lambda _ + (let ((godot (assoc-ref %build-inputs "godot-headless"))) + (invoke (string-append godot "/bin/godot_server") + "--export-pack" "Guix" + "superstarfighter.pck" "project.godot")) + #t)) + (replace 'install + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (share (string-append out "/share")) + (data (string-append share "/superstarfighter")) + (icons (string-append share "/icons/hicolor/256x256/apps"))) + (install-file "superstarfighter.pck" data) + (mkdir-p bin) + (call-with-output-file (string-append bin "/superstarfighter") + (lambda (port) + (format port + "#!/bin/sh~@ + exec ~a/bin/godot --main-pack ~a/superstarfighter.pck~%" + (assoc-ref inputs "godot") + data) + (chmod port #o755))) + (mkdir-p icons) + (copy-file "icon.png" (string-append icons "/" ,name ".png")) + (make-desktop-entry-file + (string-append share "/applications/" ,name ".desktop") + #:name "SuperStarfighter" + #:comment "Fast-paced arcade combat game" + #:exec ,name + #:icon ,name + #:categories '("Game" "ArcadeGame"))) + #t))))) + (native-inputs + `(("godot-headless" ,godot "headless"))) + (inputs + `(("godot" ,godot))) + (home-page "https://notapixel.itch.io/superstarfighter") + (synopsis "Fast-paced local multiplayer arcade game") + (description "In SuperStarfighter, up to four local players compete in a +2D arena with fast-moving ships and missiles. Different game types are +available, as well as a single-player mode with AI-controlled ships.") + (license (list license:expat ; game + license:silofl1.1)))) ; fonts + (define-public xshogi (package (name "xshogi") -- cgit v1.2.3 From 782cc119f52f28ea808a3ef0e63f80f7440b5b53 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Mon, 18 May 2020 19:07:23 +0200 Subject: gnu: python-mpsse: Update to 1.4.1. Follow-up to a7b20226b2bf1a73b8f0f6536e7fa43326f35e33. * gnu/packages/embedded.scm (python-libmpsse): Update to 1.4.1. --- gnu/packages/embedded.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm index 8b40990ec1..9be1065de2 100644 --- a/gnu/packages/embedded.scm +++ b/gnu/packages/embedded.scm @@ -1040,7 +1040,7 @@ the Raspberry Pi chip.")))) (define-public python-libmpsse (package (name "python-libmpsse") - (version "1.4") + (version "1.4.1") (source (origin (method git-fetch) @@ -1050,7 +1050,7 @@ the Raspberry Pi chip.")))) (file-name "libmpsse-checkout") (sha256 (base32 - "14f1kiiia4kfd9mzwx4h63aa8bpz9aknbrrr7mychnsp3arw0z25")))) + "1rypfb96k2szqgygp3jnwg2zq9kwmfz0460dsahn3r2vkzml8wn7")))) (build-system gnu-build-system) (inputs `(("libftdi" ,libftdi) -- cgit v1.2.3 From 056cd035205ff94d719352532d9bf684d833b606 Mon Sep 17 00:00:00 2001 From: Simon South Date: Mon, 18 May 2020 06:50:44 -0400 Subject: gnu: emacs-elpher: Update to 2.7.4. * gnu/packages/emacs-xyz.scm (emacs-elpher): Update to 2.7.4. [home-page, source]: Use new upstream URIs. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 4bbd482409..39083c90cf 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -20717,17 +20717,17 @@ it forcibly (define-public emacs-elpher (package (name "emacs-elpher") - (version "1.4.6") + (version "2.7.4") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/tgvaughan/elpher") + (url "git://thelambdalab.xyz/elpher.git") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 - "07xansmhn4l0b9ghzf56vyx8cqg0q01aq3pz5ikx2i19v5f0rc66")))) + "13ba72sjfyg1xvam131iapzqdf9pkwpn67zlyydmm6bv9pxlr431")))) (build-system emacs-build-system) (native-inputs `(("texinfo" ,texinfo))) @@ -20737,7 +20737,7 @@ it forcibly (add-before 'install 'build-doc (lambda _ (invoke "makeinfo" "elpher.texi")))))) - (home-page "https://github.com/tgvaughan/elpher") + (home-page "gopher://thelambdalab.xyz/1/projects/elpher/") (synopsis "Gopher client for Emacs") (description "Elpher is a full-featured gopher client for Emacs. Its features include intuitive keyboard and mouse-driven browsing, out-of-the-box -- cgit v1.2.3 From 2e59ae238426df3f886c6a1aeca08ddc96b61143 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 18 May 2020 19:32:09 -0400 Subject: gnu: svt-av1: Update to 0.8.3. * gnu/packages/video.scm (svt-av1): Update to 0.8.3. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index f34da90d5d..d5034e0d79 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -3873,7 +3873,7 @@ transcode or reformat the videos in any way, producing perfect backups.") (define-public svt-av1 (package (name "svt-av1") - (version "0.8.2") + (version "0.8.3") (source (origin (method git-fetch) (uri (git-reference @@ -3882,7 +3882,7 @@ transcode or reformat the videos in any way, producing perfect backups.") (file-name (git-file-name name version)) (sha256 (base32 - "0273fxgf4r832y9s0p8hqdj1j1nj8nlz4hylya0b4nsif89yfrhp")))) + "1rh4sz1bmrsxyxfxajsffw5jd17djcrymhwsi877v02fgln027qr")))) (build-system cmake-build-system) ;; SVT-AV1 only supports Intel-compatible CPUs. (supported-systems '("x86_64-linux" "i686-linux")) -- cgit v1.2.3 From 9f59a9b4bc93b3ef6cd3bd1c9eed04c30ba2d2d4 Mon Sep 17 00:00:00 2001 From: Ryan Prior Date: Fri, 15 May 2020 14:24:23 -0500 Subject: gnu: Add granite. * gnu/packages/pantheon.scm: New file. * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. Signed-off-by: Danny Milosavljevic --- gnu/local.mk | 1 + gnu/packages/pantheon.scm | 67 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+) create mode 100644 gnu/packages/pantheon.scm (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 38b286203e..2e12c5a873 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -403,6 +403,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/orpheus.scm \ %D%/packages/ots.scm \ %D%/packages/package-management.scm \ + %D%/packages/pantheon.scm \ %D%/packages/parallel.scm \ %D%/packages/password-utils.scm \ %D%/packages/patchutils.scm \ diff --git a/gnu/packages/pantheon.scm b/gnu/packages/pantheon.scm new file mode 100644 index 0000000000..8c5c1634ee --- /dev/null +++ b/gnu/packages/pantheon.scm @@ -0,0 +1,67 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2020 Ryan Prior +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages pantheon) + #:use-module (gnu packages gettext) + #:use-module (gnu packages glib) + #:use-module (gnu packages gnome) + #:use-module (gnu packages gtk) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages) + #:use-module (guix build-system meson) + #:use-module (guix git-download) + #:use-module ((guix licenses) :prefix license:) + #:use-module (guix packages) + #:use-module (guix utils)) + +(define-public granite + (package + (name "granite") + (version "5.4.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/elementary/granite.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0acicv3f9gksb352v88lwap8ailjsxdrfknl2xql7blasbjzl2q0")))) + (build-system meson-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'disable-icon-cache + (lambda _ + (setenv "DESTDIR" "/") + #t))))) + (inputs + `(("gtk" ,gtk+))) + (native-inputs + `(("gettext" ,gettext-minimal) + ("glib" ,glib) + ("gobject-introspection" ,gobject-introspection) + ("libgee" ,libgee) + ("pkg-config" ,pkg-config) + ("vala" ,vala))) + (home-page "https://github.com/elementary/granite") + (synopsis "Library that extends GTK with common widgets and utilities") + (description "Granite is a companion library for GTK+ and GLib. Among other +things, it provides complex widgets and convenience functions designed for use +in apps built for the Pantheon desktop.") + (license license:lgpl3+))) -- cgit v1.2.3 From 67c0d7fb9a32065fb77f0f595299182c60db85f4 Mon Sep 17 00:00:00 2001 From: Clément Lassieur Date: Tue, 19 May 2020 11:46:50 +0200 Subject: gnu: Add emacs-plantuml-mode. * gnu/packages/emacs-xyz.scm (emacs-plantuml-mode): New variable. --- gnu/packages/emacs-xyz.scm | 51 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 50 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 39083c90cf..69786f335b 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -19,7 +19,7 @@ ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Arun Isaac ;;; Copyright © 2017 Christopher Baines ;;; Copyright © 2017, 2018, 2019, 2020 Mathieu Othacehe -;;; Copyright © 2017, 2018, 2019 Clément Lassieur +;;; Copyright © 2017, 2018, 2019, 2020 Clément Lassieur ;;; Copyright © 2017 Vasile Dumitrascu ;;; Copyright © 2017, 2018 Kyle Meyer ;;; Copyright © 2017 Kei Kebreau @@ -168,6 +168,7 @@ #:use-module (gnu packages haskell-xyz) #:use-module (gnu packages wordnet) #:use-module (gnu packages photo) + #:use-module (gnu packages uml) #:use-module (guix utils) #:use-module (srfi srfi-1) #:use-module (ice-9 match)) @@ -22942,3 +22943,51 @@ deleting them with @code{(setq delete-by-moving-to-trash t)}. This package provides a simple but convenient user interface to manage those trashed files.") (license license:gpl3+))) + +(define-public emacs-plantuml-mode + (package + (name "emacs-plantuml-mode") + (version "1.4.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/skuro/plantuml-mode") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0yp41d2dmf3sx7qnl5x0zdjcr9y71b2wwc9m0q31v22xqn938ipc")))) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'use-local-plantuml + (lambda* (#:key inputs #:allow-other-keys) + (let ((plantuml (assoc-ref inputs "plantuml")) + (file "plantuml-mode.el")) + (chmod file #o644) + (emacs-substitute-variables file + ("plantuml-jar-path" + (string-append plantuml "/share/java/plantuml.jar")) + ("plantuml-executable-path" + (string-append plantuml "/bin/plantuml")) + ("plantuml-server-url" 'nil) + ("plantuml-default-exec-mode" ''executable)) + (emacs-batch-edit-file file + `(progn (progn + (goto-char (point-min)) + (re-search-forward "(defun plantuml-download-jar") + (beginning-of-line) + (kill-sexp)) + (basic-save-buffer))) + #t)))))) + (inputs + `(("plantuml" ,plantuml))) + (propagated-inputs + `(("emacs-dash" ,emacs-dash))) + (build-system emacs-build-system) + (home-page "https://github.com/skuro/plantuml-mode") + (synopsis "Major mode for editing PlantUML sources") + (description "This package provides a major mode for editing PlantUML +sources. It features syntax highlighting, autocompletion, preview of buffer +or region and use of locally installed binaries.") + (license license:gpl3+))) -- cgit v1.2.3 From 6437c598e70284b0ca380ce8ed5d8c2f63a6ddcc Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 19 May 2020 12:38:28 +0200 Subject: gnu: ngs-sdk: Update to 2.10.5. * gnu/packages/bioinformatics.scm (ngs-sdk): Update to 2.10.5. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 32b795948b..3dc40eb177 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -5723,7 +5723,7 @@ Roche 454, Ion Torrent and Pacific BioSciences SMRT.") (define-public ngs-sdk (package (name "ngs-sdk") - (version "2.9.6") + (version "2.10.5") (source (origin (method git-fetch) (uri (git-reference @@ -5732,7 +5732,7 @@ Roche 454, Ion Torrent and Pacific BioSciences SMRT.") (file-name (git-file-name name version)) (sha256 (base32 - "0d5k5kabgl15as37kj9x65xc92j4gcqms86hvihw3yb6wag0r0q3")))) + "1ix51c25hjn57w93qmwzw80xh2i34wx8j2hn7szh8p6w8i3az5qa")))) (build-system gnu-build-system) (arguments `(#:parallel-build? #f ; not supported -- cgit v1.2.3 From 68de9956749043bec425839c1154ad0ea64a4baa Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 19 May 2020 12:38:43 +0200 Subject: gnu: ncbi-vdb: Update to 2.10.6. * gnu/packages/bioinformatics.scm (ncbi-vdb): Update to 2.10.6. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 3dc40eb177..3ad08b9db5 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -5789,7 +5789,7 @@ simultaneously.") (define-public ncbi-vdb (package (name "ncbi-vdb") - (version "2.9.6") + (version "2.10.6") (source (origin (method git-fetch) (uri (git-reference @@ -5798,7 +5798,7 @@ simultaneously.") (file-name (git-file-name name version)) (sha256 (base32 - "0knkj1sq34hlivgv5qd6jlczqrs3ldmfgn6vbbw7p4mqxvb9mirk")))) + "0m8hlxscidsfqm9x9fyi62q6lpf1dv5115kgjjgnrkl49q9c27m6")))) (build-system gnu-build-system) (arguments `(#:parallel-build? #f ; not supported -- cgit v1.2.3 From 9dc50c8c4742811cb2ca953e075e0ea6e0c09213 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 19 May 2020 12:39:22 +0200 Subject: gnu: sra-tools: Update to 2.10.6. * gnu/packages/bioinformatics.scm (sra-tools): Update to 2.10.6. [arguments]: Replace CC variable in utf8proc Makefile. [inputs]: Replace hdf5 with hdf5-1.10; add python-wrapper. --- gnu/packages/bioinformatics.scm | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 3ad08b9db5..a738aa51a8 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -6148,7 +6148,7 @@ sequence itself can be retrieved from these databases.") (define-public sra-tools (package (name "sra-tools") - (version "2.9.6") + (version "2.10.6") (source (origin (method git-fetch) @@ -6158,11 +6158,11 @@ sequence itself can be retrieved from these databases.") (file-name (git-file-name name version)) (sha256 (base32 - "0vqzap68v81k0zif2mnqfy8pnw2nrhsg87p6mgq8qk3nk2jv2rgy")))) + "1cr2mijkfs5sm35ffjs6861qsd1qkgnhnbavdv65zg5d655abbjf")))) (build-system gnu-build-system) (arguments - `(#:parallel-build? #f ; not supported - #:tests? #f ; no "check" target + `(#:parallel-build? #f ; not supported + #:tests? #f ; no "check" target #:make-flags (list (string-append "DEFAULT_CRT=" (assoc-ref %build-inputs "ncbi-vdb") @@ -6205,6 +6205,9 @@ sequence itself can be retrieved from these databases.") ;; Dynamic linking (substitute* "tools/copycat/Makefile" (("smagic-static") "lmagic")) + (substitute* "tools/driver-tool/utf8proc/Makefile" + (("CC\\?=gcc") "myCC=gcc") + (("\\(CC\\)") "(myCC)")) ;; The 'configure' script doesn't recognize things like ;; '--enable-fast-install'. @@ -6217,8 +6220,9 @@ sequence itself can be retrieved from these databases.") (string-append "--with-magic-prefix=" (assoc-ref inputs "libmagic")) ;; TODO: building with libxml2 fails with linker errors - ;; (string-append "--with-xml2-prefix=" - ;; (assoc-ref inputs "libxml2")) + #; + (string-append "--with-xml2-prefix=" + (assoc-ref inputs "libxml2")) (string-append "--with-ncbi-vdb-sources=" (assoc-ref inputs "ncbi-vdb")) (string-append "--with-ncbi-vdb-build=" @@ -6234,8 +6238,9 @@ sequence itself can be retrieved from these databases.") ("ncbi-vdb" ,ncbi-vdb) ("libmagic" ,file) ("fuse" ,fuse) - ("hdf5" ,hdf5) - ("zlib" ,zlib))) + ("hdf5" ,hdf5-1.10) + ("zlib" ,zlib) + ("python" ,python-wrapper))) (home-page "https://trace.ncbi.nlm.nih.gov/Traces/sra/sra.cgi?view=software") (synopsis "Tools and libraries for reading and writing sequencing data") -- cgit v1.2.3 From 1942814978b85e0d1f5f31280767f75a95f0cd3f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 19 May 2020 12:41:14 +0200 Subject: gnu: bind: Update to 9.16.3 [fixes CVE-2020-8616 & CVE-2020-8617]. * gnu/packages/dns.scm (bind): Update to 9.16.3. --- gnu/packages/dns.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index 051fea2de9..d0c03ff2d5 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -119,7 +119,7 @@ and BOOTP/TFTP for network booting of diskless machines.") (define-public isc-bind (package (name "bind") - (version "9.16.2") + (version "9.16.3") (source (origin (method url-fetch) (uri (string-append @@ -127,7 +127,7 @@ and BOOTP/TFTP for network booting of diskless machines.") "/bind-" version ".tar.xz")) (sha256 (base32 - "0gwr4p14zy5jqq050n762rfc33km51qwipcwy6bsvk55ziybgrfr")))) + "0zjgaspnx0p0rp83h4yj595s25da7fjis94z9frhv3azvq9nbb17")))) (build-system gnu-build-system) (outputs `("out" "utils")) (inputs -- cgit v1.2.3 From 663def11dfa560066a910ebf290df82bcd72bfbc Mon Sep 17 00:00:00 2001 From: Ryan Prior via Guix-patches via Date: Fri, 15 May 2020 20:34:46 +0000 Subject: gnu: vte: Update to 0.60.2. * gnu/packages/gnome.scm (vte): Update to 0.60.2. [arguments]<#:configure-flags>: Disable systemd. Signed-off-by: Danny Milosavljevic --- gnu/packages/gnome.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index fe874100b2..5b926b5cb2 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -50,6 +50,7 @@ ;;; Copyright © 2020 raingloom ;;; Copyright © 2020 Nicolas Goaziou ;;; Copyright © 2020 Naga Malleswari +;;; Copyright © 2020 Ryan Prior ;;; ;;; This file is part of GNU Guix. ;;; @@ -3228,7 +3229,7 @@ libraries written in C.") (define-public vte (package (name "vte") - (version "0.58.3") + (version "0.60.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/vte/" @@ -3236,8 +3237,11 @@ libraries written in C.") "vte-" version ".tar.xz")) (sha256 (base32 - "0xa9ipwic4jnhhbzlnqbhssz10xkzv61cpkl1ammc6mdq95bbp12")))) + "19ccbw0yca78h5qcnm8claj4fg1pj68nj1fsjqqfpzhj7w72i81m")))) (build-system meson-build-system) + (arguments + `(#:configure-flags + '("-D_systemd=false"))) (native-inputs `(("pkg-config" ,pkg-config) ("intltool" ,intltool) -- cgit v1.2.3 From 11491e1b1bdac1255f1f529f13b8eecabdb7cc66 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Tue, 19 May 2020 12:42:56 +0200 Subject: gnu: vte: Enable vala bindings. * gnu/packages/gnome.scm (vte)[arguments]<#:configure-flags>: Add "-Dvapi=true". --- gnu/packages/gnome.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 5b926b5cb2..f4ae27cc44 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3241,7 +3241,8 @@ libraries written in C.") (build-system meson-build-system) (arguments `(#:configure-flags - '("-D_systemd=false"))) + '("-Dvapi=true" + "-D_systemd=false"))) (native-inputs `(("pkg-config" ,pkg-config) ("intltool" ,intltool) -- cgit v1.2.3 From 969811ad0e51adcbf503e38d9c9265814e3c2e27 Mon Sep 17 00:00:00 2001 From: Ryan Prior Date: Fri, 15 May 2020 14:57:34 -0500 Subject: gnu: Add pantheon-calculator. * gnu/packages/pantheon.scm (pantheon-calculator): New variable. Signed-off-by: Danny Milosavljevic --- gnu/packages/pantheon.scm | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/pantheon.scm b/gnu/packages/pantheon.scm index 8c5c1634ee..306a1d892d 100644 --- a/gnu/packages/pantheon.scm +++ b/gnu/packages/pantheon.scm @@ -17,6 +17,7 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages pantheon) + #:use-module (gnu packages cmake) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) @@ -65,3 +66,44 @@ things, it provides complex widgets and convenience functions designed for use in apps built for the Pantheon desktop.") (license license:lgpl3+))) + +(define-public pantheon-calculator + (package + (name "pantheon-calculator") + (version "1.5.5") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/elementary/calculator.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1csxsr2c8qvl97xz9ahwn91z095nzgr0i1mbcb1spljll2sr9lkj")))) + (build-system meson-build-system) + (arguments + `(#:glib-or-gtk? #t + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'disable-schema-cache-generation + (lambda _ + (setenv "DESTDIR" "/") + #t))))) + (inputs + `(("granite" ,granite) + ("glib" ,glib) + ("gtk" ,gtk+) + ("libgee" ,libgee))) + (native-inputs + `(("cmake" ,cmake) + ("glib:bin" ,glib "bin") ; for glib-compile-schemas + ("gettext" ,gettext-minimal) + ("pkg-config" ,pkg-config) + ("vala" ,vala))) + (home-page "https://github.com/elementary/calculator") + (synopsis "Desktop calculator") + (description "Calculator is an application for performing simple +arithmetic. It is the default calculator application in the Pantheon +desktop.") + (license license:gpl3))) -- cgit v1.2.3 From ef3cd15ed4336f661df0f72d4ca9d7a8c7e87d13 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Tue, 19 May 2020 13:06:27 +0200 Subject: gnu: granite: Fix cross-compilation. * gnu/packages/pantheon.scm (granite)[native-inputs]: Remove glib, libgee. [inputs]: Add glib, libgee. --- gnu/packages/pantheon.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/pantheon.scm b/gnu/packages/pantheon.scm index 306a1d892d..72910e5470 100644 --- a/gnu/packages/pantheon.scm +++ b/gnu/packages/pantheon.scm @@ -52,12 +52,12 @@ (setenv "DESTDIR" "/") #t))))) (inputs - `(("gtk" ,gtk+))) + `(("glib" ,glib) + ("gtk" ,gtk+) + ("libgee" ,libgee))) (native-inputs `(("gettext" ,gettext-minimal) - ("glib" ,glib) ("gobject-introspection" ,gobject-introspection) - ("libgee" ,libgee) ("pkg-config" ,pkg-config) ("vala" ,vala))) (home-page "https://github.com/elementary/granite") -- cgit v1.2.3 From c5a2b70135c9830e9c3051ddf4a096f9a80eb952 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 19 May 2020 10:44:02 +0200 Subject: gnu: openvpn: Update to 2.4.9 [fixes CVE-2020-11810]. * gnu/packages/vpn.scm (openvpn): Update to 2.4.9. --- gnu/packages/vpn.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index e06a83bbd5..da881493bf 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -282,7 +282,7 @@ and probably others.") (define-public openvpn (package (name "openvpn") - (version "2.4.8") + (version "2.4.9") (source (origin (method url-fetch) (uri (string-append @@ -290,7 +290,7 @@ and probably others.") version ".tar.xz")) (sha256 (base32 - "149z3agjy03i66mcj5bplim2mh45s2ps1wmxbxczyzw0nxmsd37v")))) + "1qpbllwlha7cffsd5dlddb8rl22g9rar5zflkz1wrcllhvfkl7v4")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--enable-iproute2=yes"))) -- cgit v1.2.3 From 273380fda2889e5ba4e7fba28b5b104306872c69 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 19 May 2020 14:51:06 +0200 Subject: gnu: Add hitch. * gnu/packages/web.scm (hitch): New public variable. --- gnu/packages/web.scm | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 5b18f84ac3..3be0da69f8 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -123,6 +123,7 @@ #:use-module (gnu packages libunwind) #:use-module (gnu packages linux) #:use-module (gnu packages lisp-xyz) + #:use-module (gnu packages lsof) #:use-module (gnu packages lua) #:use-module (gnu packages markup) #:use-module (gnu packages ncurses) @@ -5468,6 +5469,60 @@ HTTP statistics for system administrators that require a visual server report on the fly.") (license license:x11))) +(define-public hitch + (package + (name "hitch") + (version "1.5.2") + (home-page "https://hitch-tls.org/") + (source (origin + (method url-fetch) + (uri (string-append home-page "source/hitch-" version ".tar.gz")) + (sha256 + (base32 + "1nnzqqigfw78nqhp81a72x1s8d6v49ayw4w5df0zzm2cb1jgv95i")))) + (build-system gnu-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (add-before 'check 'pre-check + (lambda _ + ;; Most tests attempts to access hitch-tls.org which is + ;; unavailable in the build container. Run them against + ;; a dummy local web server instead. + (for-each (lambda (test) + (substitute* test + (("\\[hitch-tls\\.org\\]:80") + "[localhost]:8000"))) + (find-files "src/tests" "\\.sh$")) + (system "python3 -m http.server &") + + ;; The build container does not reap zombie processes, + ;; causing stop_hitch to hang indefinitely while waiting + ;; for the process to terminate because 'kill -0' never + ;; succeeds. Use a different test to see whether the + ;; process has shut down. + (substitute* "src/tests/hitch_test.sh" + (("kill -0 \"\\$HITCH_PID\"") + "$(ps -p $HITCH_PID -o state= | grep -qv '^Z$')")) + #t))))) + (native-inputs + `(("pkg-config" ,pkg-config) + + ;; For tests. + ("curl" ,curl) + ("egrep" ,grep) + ("lsof" ,lsof) + ("python" ,python))) + (inputs + `(("libev" ,libev) + ("openssl" ,openssl))) + (synopsis "Scalable TLS proxy") + (description + "Hitch is a performant TLS proxy based on @code{libev}. It terminates +SSL/TLS connections and forwards the unencrypted traffic to a backend such +as a web server. It is designed to handle many thousand connections on +multicore machines.") + (license license:bsd-2))) + (define-public httptunnel (package (name "httptunnel") -- cgit v1.2.3 From 4684580af59312c4c24f6a6af4c27e8bfea77ae9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 19 May 2020 15:39:38 +0200 Subject: gnu: vte: Remove obsolete input. * gnu/packages/gnome.scm (vte)[native-inputs]: Remove INTLTOOL. Add GETTEXT-MINIMAL. --- gnu/packages/gnome.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index f4ae27cc44..e35ffb7a72 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3245,7 +3245,7 @@ libraries written in C.") "-D_systemd=false"))) (native-inputs `(("pkg-config" ,pkg-config) - ("intltool" ,intltool) + ("gettext" ,gettext-minimal) ("vala" ,vala) ("gobject-introspection" ,gobject-introspection) ("glib" ,glib "bin") ; for glib-genmarshal, etc. -- cgit v1.2.3 From 970fcb0d4ae5f5ee659c001049aed63a219819dd Mon Sep 17 00:00:00 2001 From: Alex McGrath Date: Tue, 19 May 2020 00:01:46 +0100 Subject: gnu: Add wofi. * gnu/packages/xdisorg.scm (wofi): New variable. Signed-off-by: Danny Milosavljevic --- gnu/packages/xdisorg.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 256b86a39a..88719775df 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -58,6 +58,7 @@ #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) + #:use-module (guix hg-download) #:use-module (guix utils) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) @@ -2358,3 +2359,31 @@ is to find @file{.desktop} files and offer you a menu to start an application using @command{dmenu}.") (home-page "https://github.com/enkore/j4-dmenu-desktop") (license license:gpl3+))) + +(define-public wofi + (package + (name "wofi") + (version "1.1.2") + (source (origin + (method hg-fetch) + (uri (hg-reference + (url "https://hg.sr.ht/~scoopta/wofi") + (changeset (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "086j5wshawjbwdmmmldivfagc2rr7g5a2gk11l0snqqslm294xsn")))) + (build-system meson-build-system) + (arguments + `(#:glib-or-gtk? #t)) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("gtk3" ,gtk+) + ("wayland" ,wayland))) + (synopsis "Launcher/menu program for wayland") + (description + "Wofi is a launcher/menu program for wlroots based wayland compositors +such as sway, similar to @command{rofi}.") + (home-page "https://hg.sr.ht/~scoopta/wofi") + (license license:gpl3+))) -- cgit v1.2.3 From 75ac5c5281cf032f947847532718e73afdbb9167 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 19 May 2020 18:49:25 +0200 Subject: gnu: opensmtpd: Update to 6.7.0p1 [security fixes]. * gnu/packages/mail.scm (opensmtpd): Update to 6.7.0p1. --- gnu/packages/mail.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 935a7333a4..63e8d1f91a 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -2298,14 +2298,14 @@ transfer protocols.") (define-public opensmtpd (package (name "opensmtpd") - (version "6.6.4p1") + (version "6.7.0p1") (source (origin (method url-fetch) (uri (string-append "https://www.opensmtpd.org/archives/" "opensmtpd-" version ".tar.gz")) (sha256 - (base32 "1kyph9ycq0j21dl9n1sq5fns9p4gckdi0fmnf8awrcwrdcm9dyg2")))) + (base32 "1f8bp40ywyixflg5qbnang6l210bv4vqa1k2pgm2356bp7bmsgy1")))) (build-system gnu-build-system) (inputs `(("bdb" ,bdb) -- cgit v1.2.3 From 64d1d2b271babed83afaabf034dac67bbae3a364 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 19 May 2020 13:50:04 +0300 Subject: gnu: Add python-mujson. * gnu/packages/python-xyz.scm (python-mujson): New variable. --- gnu/packages/python-xyz.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index c26a766d64..8532de9873 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -19895,3 +19895,21 @@ allows you, from Python code, to “fix” invalid (X)HTML markup.") (define-public python2-pytidylib (package-with-python2 python-pytidylib)) + +(define-public python-mujson + (package + (name "python-mujson") + (version "1.4") + (source + (origin + (method url-fetch) + (uri (pypi-uri "mujson" version)) + (sha256 + (base32 + "0wbj6r8yzsdx2b0kbldlkznr1a9nn33za2q9x3g0hbg420dwzn97")))) + (build-system python-build-system) + (home-page "https://github.com/mattgiles/mujson") + (synopsis "Use the fastest JSON functions available at import time") + (description "This packages selects the fastest JSON functions available +at import time.") + (license license:expat))) -- cgit v1.2.3 From 3d41d5dfef6e5b5383c02057db64443b895ae43d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 19 May 2020 14:44:26 +0300 Subject: gnu: python-jsonrpc-server: Update to 0.3.4. * gnu/packages/python-xyz.scm (python-jsonrpc-server): Update to 0.3.4. [propagated-inputs]: Remove python-future. --- gnu/packages/python-xyz.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 8532de9873..e8f8d45cb4 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3720,18 +3720,17 @@ Language (TOML) configuration files.") (define-public python-jsonrpc-server (package (name "python-jsonrpc-server") - (version "0.3.2") + (version "0.3.4") (source (origin (method url-fetch) (uri (pypi-uri "python-jsonrpc-server" version)) (sha256 (base32 - "0ddgdp26dfxaz6isjbb12974b3rxavgsqrn2zrmck62cmipg5g05")))) + "0dzya99nbi4mw7q85vmyw1wfgbx5dpmysnvm0bwx5m4xbi4zafy7")))) (build-system python-build-system) (propagated-inputs - `(("python-future" ,python-future) - ("python-mock" ,python-mock) + `(("python-mock" ,python-mock) ("python-pytest" ,python-pytest) ("python-ujson" ,python-ujson))) (home-page -- cgit v1.2.3 From 255a206217ce1ed414c1753c13daa5e254875fbd Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 19 May 2020 15:42:01 +0300 Subject: gnu: Add python-rapidjson. * gnu/packages/python-web.scm (python-rapidjson): New variable. --- gnu/packages/python-web.scm | 46 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 45 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index d64f698dbc..9ead80f29d 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015 Eric Dvorsak -;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner +;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Efraim Flashner ;;; Copyright © 2017 Christopher Baines ;;; Copyright © 2016, 2017 Danny Milosavljevic ;;; Copyright © 2013, 2014, 2015, 2016 Andreas Enge @@ -3769,3 +3769,47 @@ Selenium specifically provides infrastructure for the W3C WebDriver specificatio — a platform and language-neutral coding interface compatible with all major web browsers.") (license license:asl2.0))) + +(define-public python-rapidjson + (package + (name "python-rapidjson") + (version "0.9.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "python-rapidjson" version)) + (sha256 + (base32 + "18cl2dhx3gds5vg52jxmh9wjlbiy8dx06c3n482rfpdi9dzbv05d")) + (modules '((guix build utils))) + (snippet + '(begin (delete-file-recursively "rapidjson") #t)))) + (build-system python-build-system) + (arguments + `(#:configure-flags + (list (string-append "--rj-include-dir=" + (assoc-ref %build-inputs "rapidjson") + "/include/rapidjson")) + #:phases + (modify-phases %standard-phases + (replace 'build + (lambda* (#:key inputs #:allow-other-keys) + (invoke "python" "setup.py" "build" + (string-append "--rj-include-dir=" + (assoc-ref %build-inputs "rapidjson") + "/include/rapidjson")))) + (replace 'check + (lambda* (#:key inputs outputs #:allow-other-keys) + (add-installed-pythonpath inputs outputs) + ;; Some tests are broken. + (delete-file "tests/test_base_types.py") + (delete-file "tests/test_validator.py") + (invoke "python" "-m" "pytest" "tests")))))) + (native-inputs + `(("rapidjson" ,rapidjson) + ("python-pytest" ,python-pytest) + ("python-pytz" ,python-pytz))) + (home-page "https://github.com/python-rapidjson/python-rapidjson") + (synopsis "Python wrapper around rapidjson") + (description "This package provides a python wrapper around rapidjson.") + (license license:expat))) -- cgit v1.2.3 From 45838753bba25e2e6182a15991e3aeaa84d5c44d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 19 May 2020 16:11:09 +0300 Subject: gnu: python-falcon: Update to 2.0.0. * gnu/packages/python-web.scm (python-falcon): Update to 2.0.0. [source]: Add snippet to remove bundled code. [arguments]: Update custom 'check phase. [propagated-inputs]: Remove python-six. [native-inputs]: Remove python-jsonschema. Add python-mujson, python-pytest-runner, python-rapidjson, python-ujson. [properties]: New field. (python2-falcon)[native-inputs]: Don't add python-rapidjson. --- gnu/packages/python-web.scm | 41 ++++++++++++++++++++++++++++++++--------- 1 file changed, 32 insertions(+), 9 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 9ead80f29d..2cd37c8bcf 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -222,32 +222,50 @@ comes with a SOCKS proxy client.") (define-public python-falcon (package (name "python-falcon") - (version "1.4.1") + (version "2.0.0") (source (origin (method url-fetch) (uri (pypi-uri "falcon" version)) (sha256 (base32 - "1i0vmqsk24z4biirqhpvas9h28wy7nmpy3jvnb6rz2imq04zd09r")))) + "1z6mqfv574x6jiawf67ib52g4kk20c2x7xk7wrn1573b8v7r79gf")) + (modules '((guix build utils))) + (snippet + '(begin + (delete-file-recursively "falcon/vendor") + (substitute* "setup.py" + ((".*falcon\\.vendor\\.mimeparse.*") "")) + (substitute* '("falcon/media/handlers.py" + "falcon/request.py") + (("from falcon\\.vendor ") "")) + (substitute* "falcon.egg-info/SOURCES.txt" + (("falcon/vendor.*") "")) + #t)))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases (replace 'check - (lambda _ - (invoke "pytest")))))) + (lambda* (#:key inputs outputs #:allow-other-keys) + ;; Skip orjson, which requires rust to build. + (substitute* "tests/test_media_handlers.py" + (("== 'CPython") "!= 'CPython")) + (add-installed-pythonpath inputs outputs) + (invoke "pytest" "--ignore" "falcon")))))) (propagated-inputs - `(("python-mimeparse" ,python-mimeparse) - ("python-six" ,python-six))) + `(("python-mimeparse" ,python-mimeparse))) (native-inputs `(("python-cython" ,python-cython) ;for faster binaries + ("python-mujson" ,python-mujson) + ("python-msgpack" ,python-msgpack) ("python-pytest" ,python-pytest) + ("python-pytest-runner" ,python-pytest-runner) ("python-pyyaml" ,python-pyyaml) + ("python-rapidjson" ,python-rapidjson) ("python-requests" ,python-requests) ("python-testtools" ,python-testtools) - ("python-jsonschema" ,python-jsonschema) - ("python-msgpack" ,python-msgpack))) + ("python-ujson" ,python-ujson))) (home-page "https://falconframework.org") (synopsis "Web framework for building APIs and application backends") @@ -267,10 +285,15 @@ classes @item Compatible with both CPython and PyPy @item Cython support for better performance when used with CPython @end itemize") + (properties `((python2-variant . ,(delay python2-falcon)))) (license license:asl2.0))) (define-public python2-falcon - (package-with-python2 python-falcon)) + (let ((falcon (package-with-python2 (strip-python2-variant python-falcon)))) + (package + (inherit falcon) + (native-inputs + (alist-delete "python-rapidjson" (package-native-inputs falcon)))))) (define-public python-falcon-cors (package -- cgit v1.2.3 From cc831310068de54ebad0da9f1b92030aacde3648 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 19 May 2020 14:21:44 +0300 Subject: gnu: python-ujson: Update to 2.0.3. * gnu/packages/python-xyz.scm (python-ujson): Update to 2.0.3. [source]: Remove bundled source. [arguments]: Add phase to link to system double-conversion. Add custom 'check phase. [native-inputs]: Add double-conversion, python-setuptools-scm, python-pytest. [home-page]: Update to new home-page. [description]: Drop reference to python-2 support. (python-ujson-1): New variable. (python2-ujson): Rename to python2-ujson-1. (python-jsonrpc-server)[propagated-inputs]: Replace python-ujson with python-ujson-1. --- gnu/packages/python-xyz.scm | 59 +++++++++++++++++++++++++++++++++++++++------ 1 file changed, 51 insertions(+), 8 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index e8f8d45cb4..7c5b265f96 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3732,7 +3732,7 @@ Language (TOML) configuration files.") (propagated-inputs `(("python-mock" ,python-mock) ("python-pytest" ,python-pytest) - ("python-ujson" ,python-ujson))) + ("python-ujson" ,python-ujson-1))) (home-page "https://github.com/palantir/python-jsonrpc-server") (synopsis "JSON RPC 2.0 server library") @@ -18323,6 +18323,50 @@ services to what you expect in your tests.") (define-public python-ujson (package (name "python-ujson") + (version "2.0.3") + (source + (origin + (method url-fetch) + (uri (pypi-uri "ujson" version)) + (sha256 + (base32 + "18z9gb9ggy1r464b9q1gqs078mqgrkj6dys5a47529rqk3yfybdx")) + (modules '((guix build utils))) + (snippet + '(begin (delete-file-recursively "deps") #t)))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'link-to-system-double-conversion + (lambda* (#:key inputs #:allow-other-keys) + (let ((d-c (assoc-ref inputs "double-conversion"))) + (substitute* "setup.py" + (("./deps/double-conversion/double-conversion\"") + (string-append d-c "/include/double-conversion\"")) + (("-lstdc++" stdc) + (string-append "-L" d-c "/lib\"," + " \"-ldouble-conversion\"," + " \"" stdc))) + #t))) + (replace 'check + (lambda* (#:key inputs outputs #:allow-other-keys) + (add-installed-pythonpath inputs outputs) + (invoke "pytest")))))) + (native-inputs + `(("double-conversion" ,double-conversion) + ("python-setuptools-scm" ,python-setuptools-scm) + ("python-pytest" ,python-pytest))) + (home-page "https://github.com/ultrajson/ultrajson") + (synopsis "Ultra fast JSON encoder and decoder for Python") + (description + "UltraJSON is an ultra fast JSON encoder and decoder written in pure C with +bindings for Python 3.") + (license license:bsd-3))) + +(define-public python-ujson-1 + (package + (inherit python-ujson) (version "1.35") (source (origin @@ -18331,17 +18375,16 @@ services to what you expect in your tests.") (sha256 (base32 "11jz5wi7mbgqcsz52iqhpyykiaasila4lq8cmc2d54bfa3jp6q7n")))) - (build-system python-build-system) + (arguments + '(#:phases %standard-phases)) + (native-inputs '()) (home-page "http://www.esn.me") - (synopsis - "Ultra fast JSON encoder and decoder for Python") (description "UltraJSON is an ultra fast JSON encoder and decoder written in pure C with - bindings for Python 2.5+ and 3.") - (license license:bsd-3))) +bindings for Python 2.5+ and 3."))) -(define-public python2-ujson - (package-with-python2 python-ujson)) +(define-public python2-ujson-1 + (package-with-python2 python-ujson-1)) (define-public python-iocapture ;; The latest release is more than a year older than this commit. -- cgit v1.2.3 From 9593caff8d5dcd8cc369fb8c944885c1d9a14793 Mon Sep 17 00:00:00 2001 From: nikita Date: Tue, 19 May 2020 12:41:58 +0200 Subject: gnu: cwm: Update to 6.6. * gnu/packages/wm.scm (cwm): Update to 6.6. [source, home-page]: Update URLs. Signed-off-by: Leo Famulari --- gnu/packages/wm.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index a29a7d9764..1151b8115d 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2016 Al McElrath ;;; Copyright © 2016 Carlo Zancanaro ;;; Copyright © 2016, 2017, 2018, 2019 Ludovic Courtès -;;; Copyright © 2016, 2017, 2018 Nikita +;;; Copyright © 2016, 2017, 2018, 2020 Nikita ;;; Copyright © 2016 doncatnip ;;; Copyright © 2016 Ivan Vilata i Balaguer ;;; Copyright © 2017 Mekeor Melire @@ -1176,15 +1176,15 @@ It is inspired by Xmonad and dwm. Its major features include: (define-public cwm (package (name "cwm") - (version "6.3") + (version "6.6") (source (origin (method url-fetch) - (uri (string-append "http://chneukirchen.org/releases/cwm-" + (uri (string-append "https://leahneukirchen.org/releases/cwm-" version ".tar.gz")) (sha256 (base32 - "17pdp9cfgh2n3n3905l4rl9qk7b722i8psnarhlc2h98qzx7zmac")))) + "0p350pbfn92m21jiq4i324sdskxhs71p435g0mgz7cmzprnhhg92")))) (build-system gnu-build-system) (arguments `(#:make-flags (list "CC=gcc" @@ -1219,7 +1219,7 @@ It is inspired by Xmonad and dwm. Its major features include: (native-inputs `(("pkg-config" ,pkg-config) ("bison" ,bison))) - (home-page "https://github.com/chneukirchen/cwm") + (home-page "https://github.com/leahneukirchen/cwm") (synopsis "OpenBSD fork of the calmwm window manager") (description "Cwm is a stacking window manager for X11. It is an OpenBSD project derived from the original Calm Window Manager.") -- cgit v1.2.3 From f523eaba7b5460937a230a824550243d75e5f1dc Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Tue, 19 May 2020 20:14:17 +0200 Subject: gnu: docker: Remove references to go. Fixes . * gnu/packages/docker.scm (docker)[arguments]<#:phases>[remove-go-references]: New phase. --- gnu/packages/docker.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index c95ca3f9d7..bf009a792b 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -544,7 +544,9 @@ built-in registry server of Docker.") (install-file (string-append "bundles/dynbinary-daemon/dockerd-" (getenv "VERSION")) out-bin) - #t)))))) + #t))) + (add-after 'install 'remove-go-references + (assoc-ref go:%standard-phases 'remove-go-references))))) (inputs `(("btrfs-progs" ,btrfs-progs) ("containerd" ,containerd) ; for containerd-shim -- cgit v1.2.3 From 0c39013afbf12256e8ca52296a975a683b324be2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 19 May 2020 19:09:06 +0200 Subject: gnu: bs1770gain: Update to 0.6.9. * gnu/packages/audio.scm (bs1770gain): Update to 0.6.9. --- gnu/packages/audio.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 2eeda826b5..e6eefad61b 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -3373,14 +3373,14 @@ with support for HD extensions.") (define-public bs1770gain (package (name "bs1770gain") - (version "0.6.7") + (version "0.6.9") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/bs1770gain/bs1770gain/" version "/bs1770gain-" version ".tar.gz")) (sha256 - (base32 "13hsbqj1dkpz1gbclnjxv50kr7b4gcjai6c1l38g01433h217qjc")) + (base32 "1hcbff3q6xl9rj1pzy3fwy91y6fa99wwrhb31461j9kgc173ls7r")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 147499a469fbf56d52ea45ef1193df3eaa328bb5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 19 May 2020 19:21:07 +0200 Subject: gnu: handbrake: Update to 1.3.2. * gnu/packages/video.scm (handbrake): Update to 1.3.2. --- gnu/packages/video.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index d5034e0d79..bb465c64c9 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2762,14 +2762,15 @@ supported players in addition to this package.") (define-public handbrake (package (name "handbrake") - (version "1.3.1") + (version "1.3.2") (source (origin (method url-fetch) - (uri (string-append "https://download.handbrake.fr/releases/" - version "/HandBrake-" version "-source.tar.bz2")) + (uri (string-append "https://github.com/HandBrake/HandBrake/" + "releases/download/" version "/" + "HandBrake-" version "-source.tar.bz2")) (sha256 (base32 - "09rcrq0kjs1lc1as7w3glbpbfvzldwpx3xv0pfmkn4pl7acxw1f0")) + "0w7jxjrccvxp7g15dv0spildg5apmqp4gwbcqmg58va2gylynvzc")) (modules '((guix build utils))) (snippet ;; Remove "contrib" and source not necessary for -- cgit v1.2.3 From 51fd92cef46fb658becf3a58a99a34b7331a7840 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 19 May 2020 19:30:27 +0200 Subject: gnu: gtkwave: Update to 3.3.104. * gnu/packages/fpga.scm (gtkwave): Update to 3.3.104. --- gnu/packages/fpga.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/fpga.scm b/gnu/packages/fpga.scm index ed5bc14e31..fda5de60c7 100644 --- a/gnu/packages/fpga.scm +++ b/gnu/packages/fpga.scm @@ -340,7 +340,7 @@ FOSS FPGA place and route tool.") (define-public gtkwave (package (name "gtkwave") - (version "3.3.103") + (version "3.3.104") (source (origin (method url-fetch) @@ -350,7 +350,7 @@ FOSS FPGA place and route tool.") (string-append "http://gtkwave.sourceforge.net/" "gtkwave-" version ".tar.gz"))) (sha256 - (base32 "1xzaxqbabj4sb4n10yki5acglx3736pwl3kwlq4k7i96rzvsn9f3")))) + (base32 "0kw9a33gx60kn069yhx5pyk39x1z3pwaj8l1qqwq943v62lx23fj")))) (build-system gnu-build-system) (native-inputs `(("gperf" ,gperf) -- cgit v1.2.3 From 2da5fcfdfade2129b014f3db167bd90178178ae5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 19 May 2020 19:30:32 +0200 Subject: gnu: hevea: Update to 2.34. * gnu/packages/ocaml.scm (hevea): Update to 2.34. --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 916c7fe292..877e841b20 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -582,14 +582,14 @@ concrete syntax of the language (Quotations, Syntax Extensions).") (define-public hevea (package (name "hevea") - (version "2.33") + (version "2.34") (source (origin (method url-fetch) (uri (string-append "http://hevea.inria.fr/old/" "hevea-" version ".tar.gz")) (sha256 (base32 - "0115bn6n6hhb08rmj0m508wjcsn1mggiagqly6s941pq811wxymb")))) + "1pzyszxw90klpcmhjqrjfc8cw6c0gm4w2blim8ydyxb6rq6qml1s")))) (build-system gnu-build-system) (inputs `(("ocaml" ,ocaml))) -- cgit v1.2.3 From 9e8f73c49cf5e8e2e4abc25808dfd77c4afdfd54 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 19 May 2020 21:06:54 +0200 Subject: gnu: librepcb: Update to 0.1.4. * gnu/packages/engineering.scm (librepcb): Update to 0.1.4. [inputs]: Add qtsvg. --- gnu/packages/engineering.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 37b42ca3f5..be86848538 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -2047,17 +2047,18 @@ simulator backends @code{Qucsator}, @code{ngspice} and @code{Xyce}.") (define-public librepcb (package (name "librepcb") - (version "0.1.3") + (version "0.1.4") (source (origin (method url-fetch) (uri (string-append "https://download.librepcb.org/releases/" version "/librepcb-" version "-source.zip")) (sha256 - (base32 "1ich849dsx2hmcwlwbry4mkg374n940l3hy6srh4qms2rm7vd7x0")))) + (base32 "1b5dkanz3q0y5ag80w0l85hn7axrachb5m9zvyv4zvzrfy09wa88")))) (build-system gnu-build-system) (inputs `(("qtbase" ,qtbase) + ("qtsvg" ,qtsvg) ("zlib" ,zlib))) (native-inputs `(("qttools" ,qttools) ; for lrelease -- cgit v1.2.3 From 0645a24b5621e34c39ef27a24789d95934cf40b7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 20 May 2020 00:45:23 +0200 Subject: gnu: python-ply: Update to 3.11. * gnu/packages/python-xyz.scm (python-ply): Update to 3.11. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 7c5b265f96..67e6a6f93b 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11395,14 +11395,14 @@ network support library.") (define-public python-ply (package (name "python-ply") - (version "3.10") + (version "3.11") (source (origin (method url-fetch) (uri (pypi-uri "ply" version)) (sha256 (base32 - "1jxsr1d2f732r6ljhvm827113dckwl6qwakfvpbdhcbhvpvlmscn")))) + "18qx113g9bi1ac4indd5phma82zcdq601lxncp3vjn43m2mc3iq0")))) (build-system python-build-system) (home-page "http://www.dabeaz.com/ply/") (synopsis "Python Lex & Yacc") -- cgit v1.2.3 From 5a4d48af52e28e97eac07c40548764ffe03dd6b4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 20 May 2020 00:45:54 +0200 Subject: gnu: python-ply: Remove Python 2 variant. * gnu/packages/python-xyz.scm (python2-ply): Remove variable. --- gnu/packages/python-xyz.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 67e6a6f93b..1f96ed4391 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11410,9 +11410,6 @@ network support library.") It uses LR parsing and does extensive error checking.") (license license:bsd-3))) -(define-public python2-ply - (package-with-python2 python-ply)) - (define-public python-tabulate (package (name "python-tabulate") -- cgit v1.2.3 From 72faca2c50d1e8a1a39ee334a24333fe09352a6c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 20 May 2020 00:56:19 +0200 Subject: gnu: xonsh: Update to 0.9.18. * gnu/packages/shells.scm (xonsh): Update to 0.9.18. [snippet]: Adapt to more aggressive bundling. --- gnu/packages/shells.scm | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 5c8c4b5d8a..fa3eccabd4 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -493,21 +493,31 @@ ksh, and tcsh.") (define-public xonsh (package (name "xonsh") - (version "0.6.2") + (version "0.9.18") (source (origin (method url-fetch) (uri (pypi-uri "xonsh" version)) (sha256 (base32 - "0c2bbmdg0n10q54vq9k1z5n53l0mh1hb1q5xprfhilvrbr6hlcwr")) + "1h4rrwzwiwkyi9p49sjn97rl39fqq2r23hchzsw0s3fcwa7m8fkj")) (modules '((guix build utils))) (snippet `(begin - ;; Delete bundled ply. + ;; Delete bundled PLY. (delete-file-recursively "xonsh/ply") - (substitute* '("setup.py") - (("'xonsh\\.ply\\.ply',") "")) + (substitute* "setup.py" + (("\"xonsh\\.ply\\.ply\",") "")) + ;; Use our properly packaged PLY instead. + (substitute* (list "setup.py" + "tests/test_lexer.py" + "xonsh/__amalgam__.py" + "xonsh/lexer.py" + "xonsh/parsers/base.py" + "xonsh/xonfig.py") + (("from xonsh\\.ply\\.(.*) import" _ module) + (format #f "from ~a import" module)) + (("from xonsh\\.ply import") "import")) #t)))) (build-system python-build-system) (arguments -- cgit v1.2.3 From 4d9e4801d2e5975702e957d1bb76dbeb90ea0e09 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 20 May 2020 04:27:52 +0200 Subject: gnu: http-parser: Update to 2.9.4. * gnu/packages/web.scm (http-parser): Update to 2.9.4. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 3be0da69f8..285d2b3bf0 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5911,7 +5911,7 @@ into your tests. It automatically starts up a HTTP server in a separate thread (define-public http-parser (package (name "http-parser") - (version "2.9.3") + (version "2.9.4") (home-page "https://github.com/nodejs/http-parser") (source (origin (method git-fetch) @@ -5934,7 +5934,7 @@ into your tests. It automatically starts up a HTTP server in a separate thread "0pbxf2nq9pcn299k2b2ls8ldghaqln9glnp79gi57mamx4iy0f6g"))))) (sha256 (base32 - "189zi61vczqgmqjd2myjcjbbi5icrk7ccs0kn6nj8hxqiv5j3811")))) + "1vda4dp75pjf5fcph73sy0ifm3xrssrmf927qd1x8g3q46z0cv6c")))) (build-system gnu-build-system) (arguments `(#:test-target "test" -- cgit v1.2.3 From abd90f636b884e1980ddb95dfac298fb9d6b6b70 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 20 May 2020 05:56:16 +0200 Subject: gnu: ccls: Update to 0.20190823.6. * gnu/packages/cpp.scm (ccls): Update to 0.20190823.6. --- gnu/packages/cpp.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 7227b8d516..b32f4201c0 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -297,7 +297,7 @@ tools (containers, algorithms) used by other QuantStack packages.") (define-public ccls (package (name "ccls") - (version "0.20190823.5") + (version "0.20190823.6") (source (origin (method git-fetch) @@ -305,11 +305,11 @@ tools (containers, algorithms) used by other QuantStack packages.") (url "https://github.com/MaskRay/ccls") (commit version))) (sha256 - (base32 "0b2pkpzn576b92zcxpwchpkyw2fww6s69818rx4g9z34kzm35zy5")) + (base32 "11h5nwk4qqshf3i8yr4bxpnvmidrhkzd0zxhf1xqv8cv6r08k47f")) (file-name (git-file-name name version)))) (build-system cmake-build-system) (arguments - '(#:tests? #f)) ; no check target. + '(#:tests? #f)) ; no check target (inputs `(("rapidjson" ,rapidjson))) (native-inputs -- cgit v1.2.3 From 4d89e302df210a5e4a9784f06c2151db604e85a0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 20 May 2020 06:05:18 +0200 Subject: gnu: toybox: Update to 0.8.3. * gnu/packages/busybox.scm (toybox): Update to 0.8.3. --- gnu/packages/busybox.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/busybox.scm b/gnu/packages/busybox.scm index 0593b86051..e3431aa31b 100644 --- a/gnu/packages/busybox.scm +++ b/gnu/packages/busybox.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 John Darrington ;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner -;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -113,7 +113,7 @@ any small or embedded system.") (define-public toybox (package (name "toybox") - (version "0.8.2") + (version "0.8.3") (source (origin (method url-fetch) (uri (string-append @@ -121,7 +121,7 @@ any small or embedded system.") version ".tar.gz")) (sha256 (base32 - "1mgya8zxgf30i5w3rhsb3n70kwlhifxbajh6wqdsz6rf8kx609ws")))) + "00aw9d809wj1bqlb2fsssdgz7rj0363ya14py0gfdm0rkp98zcpa")))) (build-system gnu-build-system) (arguments '(#:phases -- cgit v1.2.3 From 712190edeae0d9e1c2e94abaab120676dd5dfa7d Mon Sep 17 00:00:00 2001 From: Holger Peters Date: Wed, 20 May 2020 09:07:03 +0200 Subject: gnu: python-webob: Update to 1.8.6. * gnu/packages/python-web.scm (python-webob): Update to 1.8.6. Signed-off-by: Ricardo Wurmus --- gnu/packages/python-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 2cd37c8bcf..a554f598e2 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1035,14 +1035,14 @@ your Web app.") (define-public python-webob (package (name "python-webob") - (version "1.8.3") + (version "1.8.6") (source (origin (method url-fetch) (uri (pypi-uri "WebOb" version)) (sha256 (base32 - "1cpqskanmvwia8wqlpcr3ykyxysynjdnbl5namvpg8vw6jnkv1dh")))) + "026i3z99nr3px75isa9mbnky5i7rffiv4d124h5kxfjjsxz92fma")))) (build-system python-build-system) (native-inputs `(("python-nose" ,python-nose))) -- cgit v1.2.3 From 44935b2ebbde4b5bc73a06bfb2b544eca7244141 Mon Sep 17 00:00:00 2001 From: Holger Peters Date: Wed, 20 May 2020 09:07:04 +0200 Subject: gnu: Add python-venusian. * gnu/packages/python-web.scm (python-venusian): New variable. Signed-off-by: Ricardo Wurmus --- gnu/packages/python-web.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index a554f598e2..0dff9610bc 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -3836,3 +3836,28 @@ major web browsers.") (synopsis "Python wrapper around rapidjson") (description "This package provides a python wrapper around rapidjson.") (license license:expat))) + +(define-public python-venusian + (package + (name "python-venusian") + (version "3.0.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "venusian" version)) + (sha256 + (base32 "0f7f67dkgxxcjfhpdd5frb9pszkf04lyzzpn5069q0xi89r2p17n")))) + (build-system python-build-system) + (native-inputs + `(("python-pytest" ,python-pytest) + ("python-runner" ,python-pytest-runner) + ("python-pytest-cov" ,python-pytest-cov))) + (arguments '(#:test-target "pytest")) + (home-page "https://docs.pylonsproject.org/projects/venusian") + (synopsis "Library for defering decorator actions") + (description + "Venusian is a library which allows framework authors to defer decorator +actions. Instead of taking actions when a function (or class) decorator is +executed at import time, you can defer the action usually taken by the +decorator until a separate scan phase.") + (license license:repoze))) -- cgit v1.2.3 From a9daf35cb1cda8b8889ec7dc796079266709baec Mon Sep 17 00:00:00 2001 From: Holger Peters Date: Wed, 20 May 2020 09:07:05 +0200 Subject: gnu: Add python-zope-deprecation. * gnu/packages/python-web.scm (python-zope-deprecation): New variable. Signed-off-by: Ricardo Wurmus --- gnu/packages/python-web.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 0dff9610bc..dfdba6636b 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -3861,3 +3861,23 @@ actions. Instead of taking actions when a function (or class) decorator is executed at import time, you can defer the action usually taken by the decorator until a separate scan phase.") (license license:repoze))) + +(define-public python-zope-deprecation + (package + (name "python-zope-deprecation") + (version "4.4.0") + (source (origin + (method url-fetch) + (uri (pypi-uri "zope.deprecation" version)) + (sha256 + (base32 + "1pz2cv7gv9y1r3m0bdv7ks1alagmrn5msm5spwdzkb2by0w36i8d")))) + (build-system python-build-system) + (native-inputs `()) + (propagated-inputs `()) + (home-page "https://zopedeprecation.readthedocs.io/") + (synopsis "Function for marking deprecations") + (description "The @code{zope.deprecation} module provides a function for +marking modules, classes, functions, methods and properties as deprecated, +displaying warnings when usaged in application code.") + (license license:zpl2.1))) -- cgit v1.2.3 From c557ae13f901d0f2e74dd2f29612a03c23704cd6 Mon Sep 17 00:00:00 2001 From: Holger Peters Date: Wed, 20 May 2020 09:07:06 +0200 Subject: gnu: Add python-translationstring. * gnu/packages/python-web.scm (python-translationstring): New variable. Signed-off-by: Ricardo Wurmus --- gnu/packages/python-web.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index dfdba6636b..e7b8b3b198 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -3881,3 +3881,21 @@ decorator until a separate scan phase.") marking modules, classes, functions, methods and properties as deprecated, displaying warnings when usaged in application code.") (license license:zpl2.1))) + +(define-public python-translationstring + (package + (name "python-translationstring") + (version "1.3") + (source (origin + (method url-fetch) + (uri (pypi-uri "translationstring" version)) + (sha256 + (base32 + "0bdpcnd9pv0131dl08h4zbcwmgc45lyvq3pa224xwan5b3x4rr2f")))) + (build-system python-build-system) + (home-page "http://docs.pylonsproject.org/projects/translationstring") + (synopsis "Internationalization tooling for the Pylons project") + (description "This package provides a library used by various Pylons +project packages for internationalization (i18n) duties related to +translation.") + (license license:repoze))) -- cgit v1.2.3 From 79ddf25bc0a26a52ffe88c144d6ce2645462fa05 Mon Sep 17 00:00:00 2001 From: Holger Peters Date: Wed, 20 May 2020 09:07:07 +0200 Subject: gnu: Add python-plaster. * gnu/packages/python-web.scm (python-plaster): New variable. Signed-off-by: Ricardo Wurmus --- gnu/packages/python-web.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index e7b8b3b198..adc68f48c7 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -3899,3 +3899,27 @@ displaying warnings when usaged in application code.") project packages for internationalization (i18n) duties related to translation.") (license license:repoze))) + +(define-public python-plaster + (package + (name "python-plaster") + (version "1.0") + (source (origin + (method url-fetch) + (uri (pypi-uri "plaster" version)) + (sha256 + (base32 + "1hy8k0nv2mxq94y5aysk6hjk9ryb4bsd13g83m60hcyzxz3wflc3")))) + (build-system python-build-system) + (native-inputs + `(("python-pytest" ,python-pytest))) + (home-page "https://docs.pylonsproject.org/projects/plaster/en/latest/") + (synopsis "Configuration loader for multiple config file formats") + (description + "Plaster is a loader interface around multiple config file formats. It +exists to define a common API for applications to use when they wish to load +configuration. The library itself does not aim to handle anything except a +basic API that applications may use to find and load configuration settings. +Any specific constraints should be implemented in a pluggable loader which can +be registered via an entrypoint.") + (license license:repoze))) -- cgit v1.2.3 From 804b7722a5272dffe659368404a3447e509f2cea Mon Sep 17 00:00:00 2001 From: Holger Peters Date: Wed, 20 May 2020 09:07:08 +0200 Subject: gnu: Add python-plaster-pastedeploy. * gnu/packages/python-web.scm (python-plaster-pastedeploy): New variable. Signed-off-by: Ricardo Wurmus --- gnu/packages/python-web.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index adc68f48c7..ddd94c09cb 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -3923,3 +3923,27 @@ basic API that applications may use to find and load configuration settings. Any specific constraints should be implemented in a pluggable loader which can be registered via an entrypoint.") (license license:repoze))) + +(define-public python-plaster-pastedeploy + (package + (name "python-plaster-pastedeploy") + (version "0.7") + (source (origin + (method url-fetch) + (uri (pypi-uri "plaster_pastedeploy" version)) + (sha256 + (base32 + "1zg7gcsvc1kzay1ry5p699rg2qavfsxqwl17mqxzr0gzw6j9679r")))) + (build-system python-build-system) + (native-inputs + `(("python-pytest" ,python-pytest))) + (propagated-inputs + `(("python-plaster" ,python-plaster) + ("python-pastedeploy" ,python-pastedeploy))) + (home-page "https://github.com/Pylons/plaster_pastedeploy") + (synopsis "Plugin for python-plaster adding PasteDeploy syntax") + (description + "This plugin for @code{python-plaster} adds support for PasteDeploy +syntax, it provides a plaster @code{Loader} object that can parse ini files +according to the standard set by PasteDeploy ") + (license license:expat))) -- cgit v1.2.3 From 8bfc0512da448007ae7c0688802d4dc8bf27fa61 Mon Sep 17 00:00:00 2001 From: Holger Peters Date: Wed, 20 May 2020 09:07:09 +0200 Subject: gnu: Add python-hupper. * gnu/packages/python-web.scm (python-hupper): New variable. Signed-off-by: Ricardo Wurmus --- gnu/packages/python-web.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index ddd94c09cb..604c59c083 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -3947,3 +3947,31 @@ be registered via an entrypoint.") syntax, it provides a plaster @code{Loader} object that can parse ini files according to the standard set by PasteDeploy ") (license license:expat))) + +(define-public python-hupper + (package + (name "python-hupper") + (version "1.10.2") + (source (origin + (method url-fetch) + (uri (pypi-uri "hupper" version)) + (sha256 + (base32 + "0am0p6g5cz6xmcaf04xq8q6dzdd9qz0phj6gcmpsckf2mcyza61q")))) + (build-system python-build-system) + (arguments '(#:test-target "pytest")) + (native-inputs + `(("python-pytest" ,python-pytest) + ("python-pytest-runner" ,python-pytest-runner) + ("python-watchdog" ,python-watchdog) + ("python-mock" ,python-mock) + ("python-pytest-cov" ,python-pytest-cov))) + (propagated-inputs + `(("python-pytz" ,python-pytz))) + (home-page "https://readthedocs.org/projects/hupper") + (synopsis "Integrated process monitor tracking changes to imported Python files") + (description + "Hupper is an integrated process monitor that will track changes to any +imported Python files in sys.modules as well as custom paths. When files are +changed the process is restarted.") + (license license:expat))) -- cgit v1.2.3 From 90f44ee4967c6d387e82abf88fd2c39d94415daf Mon Sep 17 00:00:00 2001 From: Holger Peters Date: Wed, 20 May 2020 09:07:10 +0200 Subject: gnu: Add python-pyramid. * gnu/packages/python-web.scm (python-pyramid): New variable. Signed-off-by: Ricardo Wurmus --- gnu/packages/python-web.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 604c59c083..05fd1599a1 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -3975,3 +3975,32 @@ according to the standard set by PasteDeploy ") imported Python files in sys.modules as well as custom paths. When files are changed the process is restarted.") (license license:expat))) + +(define-public python-pyramid + (package + (name "python-pyramid") + (version "1.10.4") + (source (origin + (method url-fetch) + (uri (pypi-uri "pyramid" version)) + (sha256 + (base32 + "0rkxs1ajycg2zh1c94xlmls56mx5m161sn8112skj0amza6cn36q")))) + (build-system python-build-system) + (propagated-inputs + `(("python-hupper" ,python-hupper) + ("python-plaster-pastedeploy" ,python-plaster-pastedeploy) + ("python-translationstring" ,python-translationstring) + ("python-venusian" ,python-venusian) + ("python-webob" ,python-webob) + ("python-zope-deprecation" ,python-zope-deprecation) + ("python-zope-interface" ,python-zope-interface) + ("python-webtest" ,python-webtest) + ("python-zope-component" ,python-zope-component) + ("python-plaster" ,python-plaster))) + (home-page "https://trypyramid.com/") + (synopsis "Python web-framework suitable for small and large sites") + (description + "Pyramid makes it easy to write web applications. From minimal +request/response web apps to larger, grown applications.") + (license license:repoze))) -- cgit v1.2.3 From 42d41d86f38958ebcff370b0e56da5c69165943c Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Tue, 19 May 2020 15:31:21 +0200 Subject: gnu: Add emacs-vcsh. * gnu/packages/emacs-xyz.scm (emacs-vcsh): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 69786f335b..d952e8ea6c 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -14919,6 +14919,29 @@ repository, @code{magit-org-todos} will create a section in your Magit status buffer with each of your todos.") (license license:gpl3+)))) +(define-public emacs-vcsh + (package + (name "emacs-vcsh") + (version "0.4.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/stepnem/vcsh-el.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "183pffdiqb7qqmjq31wxl3fpv8qswqgg99gb716rddiyk15ysri7")))) + (build-system emacs-build-system) + (home-page "https://gitlab.com/stepnem/vcsh-el") + (synopsis "Emacs VCSH integration") + (description + "This library provides basic ``enter'' functionality and a few +convenience commands to initialize a @acronym{VCSH, Version Control System for +$HOME} repository and add files to it. It can be used in conjunction with +Magit.") + (license license:public-domain))) + (define-public emacs-f3 (package (name "emacs-f3") -- cgit v1.2.3 From 76899e9285516ff875114f52f0d45a4c19bd52b2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 20 May 2020 17:21:38 +0200 Subject: gnu: perl-db-file: Update to 1.853. * gnu/packages/databases.scm (perl-db-file): Update to 1.853. --- gnu/packages/databases.scm | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index f563ae8b5d..9caa2384b2 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -2049,17 +2049,14 @@ database.") (define-public perl-db-file (package (name "perl-db-file") - (version "1.852") + (version "1.853") (source (origin (method url-fetch) - (uri (string-append - "mirror://cpan/authors/id/P/PM/PMQS/DB_File-" - version - ".tar.gz")) + (uri (string-append "mirror://cpan/authors/id/P/PM/PMQS/DB_File-" + version ".tar.gz")) (sha256 - (base32 - "14c30xyqx9c1hxw40bqbzls41al8gmklxv5jbk2kknmn4dsrbdrs")))) + (base32 "1y967si45vj0skip1hnhicbv9da29fv6qcfwnsbnvj06n36mkj6h")))) (build-system perl-build-system) (inputs `(("bdb" ,bdb))) (native-inputs `(("perl-test-pod" ,perl-test-pod))) -- cgit v1.2.3 From d0ed680b24e1daa965d3ec3bb0853c3682d21f69 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 20 May 2020 17:21:51 +0200 Subject: gnu: perl-dbi: Update to 1.643. * gnu/packages/databases.scm (perl-dbi): Update to 1.643. --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 9caa2384b2..d86d9b99f1 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1459,7 +1459,7 @@ extremely small.") (define-public perl-dbi (package (name "perl-dbi") - (version "1.642") + (version "1.643") (source (origin (method url-fetch) (uri (string-append @@ -1467,7 +1467,7 @@ extremely small.") version ".tar.gz")) (sha256 (base32 - "0pbzqazrx7pnw4nbyaf27in4b6yddkirbd2ws7mnqa2n7812a81z")))) + "1yinx39960y241vf2sknxj0dfz82a5m9gvklq5rw78k0nlyrjawa")))) (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 26aa1fd2303d6469627f3d3158f4982cbc73d2b1 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 20 May 2020 18:32:54 +0200 Subject: gnu: perl-dbd-sqlite: Update to 1.64. * gnu/packages/databases.scm (perl-dbd-sqlite): Update to 1.64. --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index d86d9b99f1..2489d3bb55 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1703,7 +1703,7 @@ columns, primary keys, unique constraints and relationships.") (define-public perl-dbd-sqlite (package (name "perl-dbd-sqlite") - (version "1.62") + (version "1.64") (source (origin (method url-fetch) (uri (string-append @@ -1711,7 +1711,7 @@ columns, primary keys, unique constraints and relationships.") version ".tar.gz")) (sha256 (base32 - "0p78ri1q6xpc1i98i6mlriv8n66iz8r5r11dlsknjm4y58rfz0mx")))) + "00gz5aw3xrr92lf9nfk0dhmy7a8jzmxhznddd9b0a8w4a1xqzbpl")))) (build-system perl-build-system) (inputs `(("sqlite" ,sqlite))) (propagated-inputs `(("perl-dbi" ,perl-dbi))) -- cgit v1.2.3 From b7dfd579c126104ccaeda1ab04ad4cf3f8021754 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 20 May 2020 18:35:49 +0200 Subject: gnu: python-lmdb: Update to 0.98. * gnu/packages/databases.scm (python-lmdb): Update to 0.98. --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 2489d3bb55..f54a931bf7 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -2379,13 +2379,13 @@ etc., and an SQL engine for performing simple SQL queries.") (define-public python-lmdb (package (name "python-lmdb") - (version "0.95") + (version "0.98") (source (origin (method url-fetch) (uri (pypi-uri "lmdb" version)) (sha256 (base32 - "0nx9f193gzl33r1lbqhb96h1igya7pz8wmahr8m9x5zgc05hal91")) + "027pgbdhhdcbwj53vrzr6a60gjhmz4s75gl3180fd4q8pwlbq986")) (modules '((guix build utils))) (snippet ;; Delete bundled lmdb source files. -- cgit v1.2.3 From 937b08b110e62de78a7d1d1072163cd2f4534677 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 20 May 2020 18:36:41 +0200 Subject: gnu: python-lmdb: Remove Python 2 variant. * gnu/packages/databases.scm (python2-lmdb): Remove variable. --- gnu/packages/databases.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index f54a931bf7..3b1b9ed366 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -2421,9 +2421,6 @@ Memory-Mapped Database} (LMDB), a high-performance key-value store.") ;; but not actually needed on platforms currently supported by Guix. license:bsd-3)))) -(define-public python2-lmdb - (package-with-python2 python-lmdb)) - (define-public python-orator (package (name "python-orator") -- cgit v1.2.3 From 47253d4837f72dc912f08bdbcd657d968e6ef8ce Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 20 May 2020 18:37:31 +0200 Subject: gnu: mame: Update to 0.221. * gnu/packages/emulators.scm (mame): Update to 0.221. --- gnu/packages/emulators.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 85e2016e49..7fad8a775b 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -1274,7 +1274,7 @@ play them on systems for which they were never designed!") (define-public mame (package (name "mame") - (version "0.220") + (version "0.221") (source (origin (method git-fetch) @@ -1283,7 +1283,7 @@ play them on systems for which they were never designed!") (commit (apply string-append "mame" (string-split version #\.))))) (file-name (git-file-name name version)) (sha256 - (base32 "0x3yr195zi7xjr21p1c2l8c0vhg0a0af0mpz4i1w7q7r9krvcvz4")) + (base32 "07fl7alj9zlyb93i8lnn4706ndy3qiv0pjvwnwysk5rqa0r3463y")) (modules '((guix build utils))) (snippet ;; Remove bundled libraries. -- cgit v1.2.3 From 5c30eb61d74034a1b7c188b8d7be7df0b926025f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 20 May 2020 19:08:10 +0200 Subject: gnu: http-parser: Fix build [and guix pull] on armhf-linux. * gnu/packages/web.scm (http-parser)[source]: Add patch. * gnu/packages/patches/http-parser-fix-assertion-on-armhf.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + .../http-parser-fix-assertion-on-armhf.patch | 39 ++++++++++++++++++++++ gnu/packages/web.scm | 24 +++++++------ 3 files changed, 53 insertions(+), 11 deletions(-) create mode 100644 gnu/packages/patches/http-parser-fix-assertion-on-armhf.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 2e12c5a873..8d737f211e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1081,6 +1081,7 @@ dist_patch_DATA = \ %D%/packages/patches/hdf-eos5-remove-gctp.patch \ %D%/packages/patches/hdf-eos5-fix-szip.patch \ %D%/packages/patches/hdf-eos5-fortrantests.patch \ + %D%/packages/patches/http-parser-fix-assertion-on-armhf.patch \ %D%/packages/patches/hubbub-sort-entities.patch \ %D%/packages/patches/hurd-cross.patch \ %D%/packages/patches/hplip-remove-imageprocessor.patch \ diff --git a/gnu/packages/patches/http-parser-fix-assertion-on-armhf.patch b/gnu/packages/patches/http-parser-fix-assertion-on-armhf.patch new file mode 100644 index 0000000000..79bd3e8dbc --- /dev/null +++ b/gnu/packages/patches/http-parser-fix-assertion-on-armhf.patch @@ -0,0 +1,39 @@ +From: Tobias Geerinckx-Rice +Date: Wed, 20 May 2020 19:17:13 +0200 +Subject: [PATCH] gnu: http-client: Fix assertion on armhf-linux. + +Copied verbatim from [0] to fix guix pull[1] on ARM systems. + +[0]: https://github.com/nodejs/http-parser/pull/510 +[1]: https://issues.guix.gnu.org/40604 + +From 0e5868aebb9eb92b078d27bb2774c2154dc167e2 Mon Sep 17 00:00:00 2001 +From: Ben Noordhuis +Date: Thu, 30 Apr 2020 11:22:50 +0200 +Subject: [PATCH] Fix sizeof(http_parser) assert + +The result should be 32 on both 32 bits and 64 bits architectures +because of struct padding. + +Fixes: https://github.com/nodejs/http-parser/issues/507 +--- + test.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/test.c b/test.c +index 7983424..f60a84f 100644 +--- a/test.c ++++ b/test.c +@@ -4220,8 +4220,11 @@ main (void) + patch = version & 255; + printf("http_parser v%u.%u.%u (0x%06lx)\n", major, minor, patch, version); + ++ /* Should be 32 on both 32 bits and 64 bits architectures because of ++ * struct padding, see https://github.com/nodejs/http-parser/issues/507. ++ */ + printf("sizeof(http_parser) = %u\n", (unsigned int)sizeof(http_parser)); +- assert(sizeof(http_parser) == 4 + 4 + 8 + 2 + 2 + 4 + sizeof(void *)); ++ assert(sizeof(http_parser) == 32); + + //// API + test_preserve_data(); diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 285d2b3bf0..1851590628 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5917,24 +5917,26 @@ into your tests. It automatically starts up a HTTP server in a separate thread (method git-fetch) (uri (git-reference (url home-page) (commit (string-append "v" version)))) + (sha256 + (base32 + "1vda4dp75pjf5fcph73sy0ifm3xrssrmf927qd1x8g3q46z0cv6c")) (file-name (git-file-name name version)) (patches - ;; When parsing URLs, treat an empty port (eg - ;; `http://hostname:/`) as if it were unspecified. This patch is - ;; applied to Fedora's http-parser and to libgit2's bundled version. - (list + (cons* (origin + ;; Treat an empty port (e.g. `http://hostname:/`) when parsing + ;; URLs as if no port were specified. This patch is applied + ;; to Fedora's http-parser and to libgit2's bundled version. (method url-fetch) (uri (string-append - "https://src.fedoraproject.org/rpms/http-parser/raw/" - "e89b4c4e2874c19079a5a1a2d2ccc61b551aa289/" - "f/0001-url-treat-empty-port-as-default.patch")) + "https://src.fedoraproject.org/rpms/http-parser/raw/" + "e89b4c4e2874c19079a5a1a2d2ccc61b551aa289/" + "f/0001-url-treat-empty-port-as-default.patch")) (sha256 (base32 - "0pbxf2nq9pcn299k2b2ls8ldghaqln9glnp79gi57mamx4iy0f6g"))))) - (sha256 - (base32 - "1vda4dp75pjf5fcph73sy0ifm3xrssrmf927qd1x8g3q46z0cv6c")))) + "0pbxf2nq9pcn299k2b2ls8ldghaqln9glnp79gi57mamx4iy0f6g"))) + ;; A fix for . + (search-patches "http-parser-fix-assertion-on-armhf.patch"))))) (build-system gnu-build-system) (arguments `(#:test-target "test" -- cgit v1.2.3 From fa876b2cd08ba46e494c6df5abd3caa2ce96dc3e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 20 May 2020 19:25:29 +0200 Subject: gnu: gnu-efi: Update to 3.0.12. * gnu/packages/efi.scm (gnu-efi): Update to 3.0.12. --- gnu/packages/efi.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/efi.scm b/gnu/packages/efi.scm index d986913243..1aaf45f298 100644 --- a/gnu/packages/efi.scm +++ b/gnu/packages/efi.scm @@ -37,14 +37,14 @@ (define-public gnu-efi (package (name "gnu-efi") - (version "3.0.11") + (version "3.0.12") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/gnu-efi/" "gnu-efi-" version ".tar.bz2")) (sha256 - (base32 "1ffnc4xbzfggs37ymrgfx76j56kk2644c081ivhr2bjkla9ag3gj")))) + (base32 "0sbn6am3k5lqafycggh1g964fcwjwnh0i9hhwrk4ncrwzphz55h1")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; none exist -- cgit v1.2.3 From 84c983f1657e1732e1279256489dd3903ce4af33 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 20 May 2020 19:26:59 +0200 Subject: gnu: gnu-efi: Mark up description. * gnu/packages/efi.scm (gnu-efi)[description]: Use @acronym. --- gnu/packages/efi.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/efi.scm b/gnu/packages/efi.scm index 1aaf45f298..da00fdf932 100644 --- a/gnu/packages/efi.scm +++ b/gnu/packages/efi.scm @@ -54,8 +54,8 @@ (modify-phases %standard-phases (delete 'configure)))) (synopsis "EFI toolchain") - (description "This package provides an EFI (Extensible Firmware -Interface) toolchain for building programs that can run in the + (description "This package provides an @acronym{EFI, Extensible Firmware +Interface} toolchain for building programs that can run in the environment presented by Intel's EFI.") (home-page "https://directory.fsf.org/wiki/GNU_EFI") ;; Distribution is allowed only when accepting all those licenses. -- cgit v1.2.3 From 01f15b157eb14dff7e3f574d7d141bd74edf8dce Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 20 May 2020 19:35:21 +0200 Subject: gnu: translate-shell: Update to 0.9.6.12. * gnu/packages/dictionaries.scm (translate-shell): Update to 0.9.6.12. --- gnu/packages/dictionaries.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/dictionaries.scm b/gnu/packages/dictionaries.scm index 06ccfafb40..4f8c35d040 100644 --- a/gnu/packages/dictionaries.scm +++ b/gnu/packages/dictionaries.scm @@ -231,7 +231,7 @@ and a Python library.") (define-public translate-shell (package (name "translate-shell") - (version "0.9.6.11") + (version "0.9.6.12") (source (origin (method git-fetch) @@ -240,7 +240,7 @@ and a Python library.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "137fz3ahzf65hfqcs4k7hhrmfjlhlw7wr3gfsvk88bnyqkyw44sm")))) + (base32 "075vqnha21rhr1b61dim7dqlfwm1yffyzcaa83s36rpk9r5sddzx")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From 6b87881ce72451f5c72f50a1a37cb302f0a97700 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 20 May 2020 20:02:46 +0200 Subject: gnu: libmanette: Update to 0.2.4. * gnu/packages/games.scm (libmanette): Update to 0.2.4. --- gnu/packages/games.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 96726eaa78..111e1e0579 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -6836,7 +6836,7 @@ when packaged in Blorb container files or optionally from individual files.") (define-public libmanette (package (name "libmanette") - (version "0.2.3") + (version "0.2.4") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/libmanette/" @@ -6844,7 +6844,7 @@ when packaged in Blorb container files or optionally from individual files.") "libmanette-" version ".tar.xz")) (sha256 (base32 - "1zxh7jn2zg7hivmal5zxam6fxvjsd1w6hlw0m2kysk76b8anbw60")))) + "1xrc6rh73v5w3kbkflzv1yg8sbxk4wf06hfk95raxhxlssza9q2g")))) (build-system meson-build-system) (native-inputs `(("glib" ,glib "bin") ; for glib-compile-resources -- cgit v1.2.3 From ef91997a197b1e1f922db8f4e749c759ccbcff11 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 20 May 2020 20:57:19 +0200 Subject: gnu: wmbattery: Update to 2.54. * gnu/packages/gnustep.scm (wmbattery): Update to 2.54. [native-inputs]: Remove autoconf & automake. --- gnu/packages/gnustep.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnustep.scm b/gnu/packages/gnustep.scm index ce68fc77ed..7a8a39eee3 100644 --- a/gnu/packages/gnustep.scm +++ b/gnu/packages/gnustep.scm @@ -158,7 +158,7 @@ interface. It is fast, feature rich, easy to configure, and easy to use.") (define-public wmbattery (package (name "wmbattery") - (version "2.51") + (version "2.54") (source (origin (method url-fetch) (uri (string-append @@ -166,7 +166,7 @@ interface. It is fast, feature rich, easy to configure, and easy to use.") version ".orig.tar.gz")) (sha256 (base32 - "084a3irxbmgms4bqaga80mlx9wgvlkx6d2w0ns939yrpfzg87laj")))) + "1r4n58mwkm69y1pjs7l64hg8r1lpndrzyrfl2rdgd4zi6v0jhyyw")))) (build-system gnu-build-system) (arguments '(#:tests? #f)) ; no "check" target (inputs @@ -176,9 +176,7 @@ interface. It is fast, feature rich, easy to configure, and easy to use.") ("libxpm" ,libxpm) ("upower" ,upower))) (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("pkg-config" ,pkg-config))) + `(("pkg-config" ,pkg-config))) (home-page "https://www.dockapps.net/wmbattery") (synopsis "Display laptop battery info") (description -- cgit v1.2.3 From 52c463a9ca0b591ef095c85e421867149135628d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 20 May 2020 21:24:51 +0200 Subject: news: Add ‘nl’ translation. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * etc/news.scm: Add an ‘nl’ ‘translation’. --- etc/news.scm | 11 +++++++++-- gnu/packages/gl.scm | 7 +++---- gnu/packages/xfce.scm | 8 ++++---- 3 files changed, 16 insertions(+), 10 deletions(-) (limited to 'gnu/packages') diff --git a/etc/news.scm b/etc/news.scm index a69140b547..aace3eaa3c 100644 --- a/etc/news.scm +++ b/etc/news.scm @@ -1,6 +1,7 @@ ;; GNU Guix news, for use by 'guix pull'. ;; ;; Copyright © 2019, 2020 Ludovic Courtès +;; Copyright © 2019, 2020 Tobias Geerinckx-Rice ;; Copyright © 2020 Mathieu Othacehe ;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;; Copyright © 2020 Maxim Cournoyer @@ -14,7 +15,8 @@ (entry (commit "b460ba7992a0b4af2ddb5927dcf062784539ef7b") (title (en "Add support to boot from a Btrfs subvolume") - (fr "Ajout du support pour démarrer depuis un sous-volume Btrfs")) + (fr "Ajout du support pour démarrer depuis un sous-volume Btrfs") + (nl "Nieuwe ondersteuning voor het opstarten vanaf een Btrfs-subvolume")) (body (en "The generation of the GRUB configuration file produced from an operating system declaration now takes into account the use of a Btrfs @@ -25,7 +27,12 @@ examples.") partir de la déclaration d'un @code{operating-system} tient maintenant compte de l'utilisation d'un sous-volume Btrfs pour la partition contenant @file{/gnu/store}. Exécutez la commande @command{info\"(guix) Btrfs file -system\"} pour des exemples et plus d'information."))) +system\"} pour des exemples et plus d'information.") + (nl "Het opmaken van het GRUB-configuratiebestand op basis van +een @code{operating-system}-declaratie houdt nu rekening met het gebruik van +een Btrfs-subvolume voor de partitie die @file{/gnu/store} bevat. Voer +@command{info \"(guix) Btrfs file system\"} uit voor meer informatie en +voorbeelden."))) (entry (commit "6456232164890dbf5aa20394ee24637feb4b7b9e") (title (en "@command{guix pack -RR} introduces a new execution diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index e024dd2756..fdc361d761 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -775,7 +775,7 @@ and visualizations.") (define-public gl2ps (package (name "gl2ps") - (version "1.4.0") + (version "1.4.2") (source (origin (method url-fetch) @@ -783,15 +783,14 @@ and visualizations.") "http://geuz.org/gl2ps/src/gl2ps-" version ".tgz")) (sha256 - (base32 - "1qpidkz8x3bxqf69hlhyz1m0jmfi9kq24fxsp7rq6wfqzinmxjq3")))) + (base32 "1sgzv547h7hrskb9qd0x5yp45kmhvibjwj2mfswv95lg070h074d")))) (build-system cmake-build-system) (inputs `(("libpng" ,libpng) ("mesa" ,mesa) ("zlib" ,zlib))) (arguments - `(#:tests? #f)) ;; no tests + `(#:tests? #f)) ; no tests (home-page "http://www.geuz.org/gl2ps/") (synopsis "OpenGL to PostScript printing library") (description "GL2PS is a C library providing high quality vector diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 61b64ef553..f447c4097d 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -120,15 +120,15 @@ Xfce Desktop Environment.") (define-public xfconf (package (name "xfconf") - (version "4.14.1") + (version "4.14.3") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/xfce/" - name "/" (version-major+minor version) "/" - name "-" version ".tar.bz2")) + "xfconf/" (version-major+minor version) "/" + "xfconf-" version ".tar.bz2")) (sha256 (base32 - "0n8d55c98ff7wgwv3qa4g369sv4iasgm1w62zq10kq5f56iy14xq")))) + "00hcb96bw5ylfs9ppblchj8zv9026m3dlf7lnmgiq5f6xyh5542q")))) (build-system gnu-build-system) (arguments '(#:phases -- cgit v1.2.3 From bbac3fff1dbec130479c7eb9a0600bd3d1d1a9c2 Mon Sep 17 00:00:00 2001 From: Alex Griffin Date: Wed, 20 May 2020 16:02:21 -0500 Subject: gnu: git-remote-gcrypt: Update to 1.3. * gnu/packages/version-control.scm (git-remote-gcrypt): Update to 1.3. --- gnu/packages/version-control.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 6f985bf84d..09ffd8f271 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -24,7 +24,7 @@ ;;; Copyright © 2018 Arun Isaac ;;; Copyright © 2019 Jovany Leandro G.C ;;; Copyright © 2019 Kei Kebreau -;;; Copyright © 2019 Alex Griffin +;;; Copyright © 2019, 2020 Alex Griffin ;;; Copyright © 2020 Roel Janssen ;;; Copyright © 2020 Brice Waegeneire ;;; Copyright © 2020 John D. Boy @@ -773,7 +773,7 @@ to lock down your entire repository.") (define-public git-remote-gcrypt (package (name "git-remote-gcrypt") - (version "1.0.3") + (version "1.3") (source (origin (method git-fetch) (uri (git-reference @@ -782,7 +782,7 @@ to lock down your entire repository.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "1vay3204729c7wajgn3nxf0s0hzwpdrw14pl6kd8w2ss25gvw2k1")))) + "0n8fzvr6y0pxrbvkywlky2bd8jvi0ayp4n9hwi84l1ldmv4a40dh")))) (build-system trivial-build-system) (arguments `(#:modules ((guix build utils)) -- cgit v1.2.3 From 72c785f95914c6a06bce4df5d180d129f06adae8 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 20 May 2020 10:21:47 +0200 Subject: gnu: Add ruby-deep-merge. * gnu/packages/ruby.scm (ruby-deep-merge): New public variable. --- gnu/packages/ruby.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 4ce42f90bf..adc5753fb4 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -3502,6 +3502,28 @@ URIs using the normal URI.parse method.") (home-page "https://github.com/dball/data_uri") (license license:expat))) +(define-public ruby-deep-merge + (package + (name "ruby-deep-merge") + (version "1.2.1") + (home-page "https://github.com/danielsdeleo/deep_merge") + ;; The Rubygem source does not contain the gemspec required for tests. + (source (origin + (method git-fetch) + (uri (git-reference (url home-page) (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0c9rk23ilhc0n4489y6lda2wzphpzh6ish6fahlbpjhxn82wb931")))) + (build-system ruby-build-system) + (native-inputs + `(("ruby-minitest" ,ruby-minitest))) + (synopsis "Recursively merge hashes") + (description + "Deep Merge is a set of utility functions for @code{Hash}. It permits +you to merge elements inside a hash together recursively.") + (license license:expat))) + (define-public ruby-git (package (name "ruby-git") -- cgit v1.2.3 From 955981534fecdc7eed133fffff198c7ce6347677 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 20 May 2020 10:33:12 +0200 Subject: gnu: Add ruby-hocon. * gnu/packages/ruby.scm (ruby-hocon): New public variable. --- gnu/packages/ruby.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index adc5753fb4..8f003f8000 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -3560,6 +3560,38 @@ and manipulate Git repositories by wrapping system calls to the git binary.") (home-page "https://github.com/schacon/ruby-git") (license license:expat))) +(define-public ruby-hocon + (package + (name "ruby-hocon") + (version "1.3.0") + (home-page "https://github.com/puppetlabs/ruby-hocon") + (source (origin + (method git-fetch) + (uri (git-reference (url home-page) (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1wz4cswjg3gs1y1bar7j4j88wjimfa9zhvy51jyi177i5dzax416")))) + (build-system ruby-build-system) + (arguments + '(#:phases (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (if tests? + (invoke "rspec") + (format #t "test suite not run~%")) + #t))))) + (native-inputs + `(("bundler" ,bundler) + ("ruby-rspec" ,ruby-rspec))) + (synopsis "HOCON config library") + (description + "This package provides Ruby support for the @acronym{HOCON, +Human-Optimized Config Object Notation} configuration file format. It +supports parsing and modifying HOCON and JSON files, and rendering parsed +objects back to a @code{String}.") + (license license:asl2.0))) + (define-public ruby-slop (package (name "ruby-slop") -- cgit v1.2.3 From e6483f8c65eba0f7348b700cfb810e82f94d129a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 20 May 2020 11:50:25 +0200 Subject: gnu: Add ruby-wwtd. * gnu/packages/ruby.scm (ruby-wwtd): New public variable. --- gnu/packages/ruby.scm | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 8f003f8000..4570a54e7b 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -9150,3 +9150,55 @@ which snapshots to consider and what files to include.") (home-page "https://github.com/hartator/wayback-machine-downloader") (license license:expat))) + +(define-public ruby-wwtd + (package + (name "ruby-wwtd") + (version "1.4.1") + (home-page "http://github.com/grosser/wwtd") + (source (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0gw7vfnbb41cy67yw82zji3jkhfsgmzcgzaszm99ax77y18wclf2")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Remove bundled library. + (delete-file "spec/rake-12.3.0.gem") + #t)))) + (build-system ruby-build-system) + (arguments + '(;; XXX: Tests need multiple versions of ruby, wants to run + ;; `bundle install`, etc. + #:tests? #f + #:phases (modify-phases %standard-phases + (replace 'replace-git-ls-files + (lambda _ + (substitute* "wwtd.gemspec" + (("git ls-files lib/ bin/`") + "find lib/ bin/ -type f |sort`")) + #t)) + (add-before 'check 'remove-version-constraints + (lambda _ + (delete-file "Gemfile.lock") + #t)) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (if tests? + (invoke "rspec" "spec/") + (format #t "test suite not run~%")) + #t))))) + (native-inputs + `(("ruby-bump" ,ruby-bump) + ("ruby-rspec" ,ruby-rspec))) + (synopsis "Run @file{.travis.yml} files locally") + (description + "WWTD is a @dfn{Travis Simulator} that lets you run test matrices +defined in @file{.travis.yml} on your local machine, using @code{rvm}, +@code{rbenv}, or @code{chruby} to test different versions of Ruby.") + (license license:expat))) -- cgit v1.2.3 From def7908a59bbf27f5d660ebf79fe1cc7a0153133 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 20 May 2020 12:38:59 +0200 Subject: gnu: Add ruby-single-cov. * gnu/packages/ruby.scm (ruby-single-cov): New public variable. --- gnu/packages/ruby.scm | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 4570a54e7b..b3e28261e0 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -4077,6 +4077,61 @@ invocation, and source and documentation browsing.") (home-page "https://pryrepl.org") (license license:expat))) +(define-public ruby-single-cov + (package + (name "ruby-single-cov") + (version "1.3.2") + (home-page "https://github.com/grosser/single_cov") + (source (origin + (method git-fetch) + (uri (git-reference (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "05qdzpcai1p23a120gb9bxkfl4y73k9hicx34ch2lsk31lgi9bl7")))) + (build-system ruby-build-system) + (arguments + '(#:test-target "default" + #:phases (modify-phases %standard-phases + (replace 'replace-git-ls-files + (lambda _ + (substitute* "single_cov.gemspec" + (("`git ls-files lib/ bin/ MIT-LICENSE`") + "`find lib/ bin/ MIT-LICENSE -type f | sort`")) + #t)) + (add-before 'check 'remove-version-constraints + (lambda _ + (delete-file "Gemfile.lock") + #t)) + (add-before 'check 'make-files-writable + (lambda _ + ;; Tests need to create local directories and open files + ;; with write permissions. + (for-each make-file-writable + (find-files "specs" #:directories? #t)) + #t)) + (add-before 'check 'disable-failing-test + (lambda _ + ;; XXX: This test copies assets from minitest, but can + ;; not cope with the files being read-only. Just skip + ;; it for now. + (substitute* "specs/single_cov_spec.rb" + (("it \"complains when coverage is bad\"") + "xit \"complains when coverage is bad\"")) + #t))))) + (native-inputs + `(("ruby-bump" ,ruby-bump) + ("ruby-minitest" ,ruby-minitest) + ("ruby-rspec" ,ruby-rspec) + ("ruby-simplecov" ,ruby-simplecov))) + (synopsis "Code coverage reporting tool") + (description + "This package provides actionable code coverage reports for Ruby +projects. It has very little overhead and can be easily integrated with +development tools to catch coverage problems early.") + (license license:expat))) + (define-public ruby-guard (package (name "ruby-guard") -- cgit v1.2.3 From 2fc3cc244a16f641079cdfb758e37c8a3b8e2ed4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 20 May 2020 16:56:00 +0200 Subject: gnu: ruby-mocha: Update to 1.11.2. * gnu/packages/ruby.scm (ruby-mocha): Update to 1.11.2. [arguments]: Remove obsolete phases. Add phase to solve a dependency cycle. [native-inputs]: Remove BUNDLER, RUBY-YARD, RUBY-TEST-UNIT, and RUBY-REDCARPET. * gnu/packages/rails.scm (ruby-web-console)[arguments]: Remove workaround for old Mocha version. --- gnu/packages/rails.scm | 6 ------ gnu/packages/ruby.scm | 48 +++++++++++------------------------------------- 2 files changed, 11 insertions(+), 43 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/rails.scm b/gnu/packages/rails.scm index f77c153197..2fc7f0a113 100644 --- a/gnu/packages/rails.scm +++ b/gnu/packages/rails.scm @@ -555,12 +555,6 @@ application bootup, plugins, generators, and Rake tasks.") ;; tzinfo-data is propagated by ruby-activesupport, but it ;; needs to be in the Gemfile to become available. (("group :test do") "group :test do\n gem 'tzinfo-data'")) - #t)) - (add-after 'unpack 'fix-mocha-minitest-require - (lambda _ - (substitute* "test/test_helper.rb" - ;; This chanegd in recent versions of Mocha - (("mocha/minitest") "mocha/mini_test")) #t))))) (propagated-inputs `(("ruby-actionview" ,ruby-actionview) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index b3e28261e0..5eb75d7c62 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -2990,53 +2990,27 @@ Ruby, but can be used for all programs.") (define-public ruby-mocha (package (name "ruby-mocha") - (version "1.1.0") + (version "1.11.2") (source (origin (method url-fetch) (uri (rubygems-uri "mocha" version)) (sha256 (base32 - "107nmnngbv8lq2g7hbjpn5kplb4v2c8gs9lxrg6vs8gdbddkilzi")))) + "0hxmkm8qxd04vwj8mqnpyrf2dwy7g1k9zipdfhl4y71cw7ijm9n4")))) (build-system ruby-build-system) (arguments `(#:phases (modify-phases %standard-phases - (add-after 'unpack 'add-test-unit-to-search-path - (lambda* (#:key inputs #:allow-other-keys) - (let* ((test-unit (assoc-ref inputs "ruby-test-unit"))) - (substitute* "Rakefile" - (("t\\.libs << 'test'" line) - (string-append line "; t.libs << \"" - test-unit "/lib/ruby/vendor_ruby" - "/gems/test-unit-" - ,(package-version ruby-test-unit) - "/lib\"")))) - #t)) - (add-before 'check 'use-latest-redcarpet - (lambda _ - (substitute* "mocha.gemspec" - ((".freeze, \\[\"~> 1\"\\]") - ".freeze, [\">= 3\"]")) - #t)) - (add-before 'check 'hardcode-version - (lambda _ - ;; Mocha is undefined at build time - (substitute* "Rakefile" - (("#\\{Mocha::VERSION\\}") ,version)) - #t)) - (add-before 'check 'remove-failing-test - ;; FIXME: This test fails for reasons unrelated to Guix packaging. - (lambda _ - (delete-file "test/acceptance/stubbing_nil_test.rb") - #t))))) - (propagated-inputs - `(("ruby-metaclass" ,ruby-metaclass))) + (add-before 'check 'remove-rubocop-dependency + (lambda _ + ;; Disable dependency on Rubocop, which is just a linter, + ;; and would introduce a circular dependency. + (substitute* "mocha.gemspec" + ((".*rubocop.*") + "true\n")) + #t))))) (native-inputs - `(("bundler" ,bundler) - ("ruby-yard" ,ruby-yard) - ("ruby-introspection" ,ruby-introspection) - ("ruby-test-unit" ,ruby-test-unit) - ("ruby-redcarpet" ,ruby-redcarpet))) + `(("ruby-introspection" ,ruby-introspection))) (synopsis "Mocking and stubbing library for Ruby") (description "Mocha is a mocking and stubbing library with JMock/SchMock syntax, which -- cgit v1.2.3 From e3febab58254dfe91995468f2db64121e1c50fa1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 20 May 2020 16:57:49 +0200 Subject: gnu: ruby-mocha: Update license. * gnu/packages/ruby.scm (ruby-mocha)[license]: Add LICENSE:RUBY. --- gnu/packages/ruby.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 5eb75d7c62..207f87b746 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -3016,7 +3016,8 @@ Ruby, but can be used for all programs.") "Mocha is a mocking and stubbing library with JMock/SchMock syntax, which allows mocking and stubbing of methods on real (non-mock) classes.") (home-page "http://gofreerange.com/mocha/docs") - (license license:expat))) + ;; Mocha can be used with either license at the users choice. + (license (list license:expat license:ruby)))) (define-public ruby-mocha-on-bacon (package -- cgit v1.2.3 From 8d85543b6a0df8abf35bd317588deb81c1726602 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 20 May 2020 17:35:53 +0200 Subject: gnu: Add ruby-maxitest. * gnu/packages/ruby.scm (ruby-maxitest): New public variable. --- gnu/packages/ruby.scm | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 207f87b746..36cb42e300 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -2987,6 +2987,59 @@ Ruby, but can be used for all programs.") (home-page "https://github.com/alexch/rerun/") (license license:expat))) +(define-public ruby-maxitest + (package + (name "ruby-maxitest") + (version "3.6.0") + (home-page "https://github.com/grosser/maxitest") + (source (origin + ;; Pull from git because the gem does not contain tests. + (method git-fetch) + (uri (git-reference + (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "07b3j0bv3dx5j42jlvpvl07aaxplyi6wq688y3jl8y528ww2hjz8")))) + (build-system ruby-build-system) + (arguments + '(#:test-target "default" + #:phases (modify-phases %standard-phases + (replace 'replace-git-ls-files + (lambda _ + (substitute* "maxitest.gemspec" + (("`git ls-files lib/ bin/ MIT-LICENSE Readme.md`") + "`find lib/ bin/ MIT-LICENSE Readme.md -type f | sort`")) + #t)) + (add-before 'check 'remove-version-constraints + (lambda _ + ;; Don't use specific versions of dependencies, instead + ;; take whatever is available in Guix. + (delete-file "Gemfile.lock") + #t)) + (add-before 'check 'add-mtest-on-PATH + (lambda _ + ;; Tests use 'mtest' which is not automatically added on + ;; PATH. + (setenv "PATH" (string-append (getcwd) "/bin:" + (getenv "PATH"))) + #t))))) + (native-inputs + `(("ps" ,procps) + ("ruby-bump" ,ruby-bump) + ("ruby-byebug" ,ruby-byebug) + ("ruby-rspec" ,ruby-rspec) + ("ruby-wwtd" ,ruby-wwtd))) + (propagated-inputs + `(("ruby-minitest" ,ruby-minitest))) + (synopsis "Minitest with extra features") + (description + "Maxitest is a wrapper around Minitest with extra functionality such +as timeouts, an @command{mtest} executable that can run tests by line +number, support for interrupted tests, better backtraces, and more.") + (license license:expat))) + (define-public ruby-mocha (package (name "ruby-mocha") -- cgit v1.2.3 From 6623a1512333479107c31137efec412d4d9d4585 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 20 May 2020 17:54:02 +0200 Subject: gnu: Add ruby-fakefs. * gnu/packages/ruby.scm (ruby-fakefs): New public variable. --- gnu/packages/ruby.scm | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 36cb42e300..83dea8d37a 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -1542,6 +1542,50 @@ a Ruby object.") (home-page "https://github.com/rails/execjs") (license license:expat))) +(define-public ruby-fakefs + (package + (name "ruby-fakefs") + (version "1.2.2") + (home-page "https://github.com/fakefs/fakefs") + (source (origin + ;; The Rubygems release does not contain tests. + (method git-fetch) + (uri (git-reference + (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "008dq9knyip2bfbl0mrk8b8r7bv0k3bf128wcfqsgy1rqal4mgwk")))) + (build-system ruby-build-system) + (arguments + '(#:phases (modify-phases %standard-phases + (replace 'replace-git-ls-files + (lambda _ + (substitute* "fakefs.gemspec" + (("`git ls-files lib README.md LICENSE`") + "`find lib README.md LICENSE -type f | sort`")) + #t)) + (add-before 'check 'remove-version-constraints + (lambda _ + ;; Drop hard version requirements for test dependencies. + (substitute* "fakefs.gemspec" + (("(.*add_development_dependency .*), .*" _ dep) + (string-append dep "\n"))) + #t)) + ))) + (native-inputs + `(("ruby-bump" ,ruby-bump) + ("ruby-maxitest" ,ruby-maxitest) + ("ruby-rubocop" ,ruby-rubocop) + ("ruby-rspec" ,ruby-rspec))) + (synopsis "Fake file system for Ruby") + (description + "This package provides a fake file system for use in test suites. It +avoids the need for manually creating temporary directories, or dealing +with platform intricacies in @code{File} and @code{FileUtils}.") + (license license:expat))) + (define-public ruby-orderedhash (package (name "ruby-orderedhash") -- cgit v1.2.3 From 8f85018daaa3548e721c369511a654f5f7753653 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 20 May 2020 18:14:10 +0200 Subject: gnu: Add ruby-gherkin-ruby. * gnu/packages/ruby.scm (ruby-gherkin-ruby): New public variable. --- gnu/packages/ruby.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 83dea8d37a..4eb9d0d696 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5698,6 +5698,25 @@ It is intended be used by all Cucumber implementations to parse (home-page "https://github.com/cucumber-attic/gherkin") (license license:expat))) +(define-public ruby-gherkin-ruby + (package + (name "ruby-gherkin-ruby") + (version "0.3.2") + (home-page "http://github.com/codegram/gherkin-ruby") + (source (origin + (method url-fetch) + (uri (rubygems-uri "gherkin-ruby" version)) + (sha256 + (base32 + "18ay7yiibf4sl9n94k7mbi4k5zj2igl4j71qcmkswv69znyx0sn1")))) + (build-system ruby-build-system) + (synopsis "Pure Ruby Gherkin parser") + (description + "Gherkin-ruby is a Gherkin parser written in pure Ruby and less than +200 lines of code.") + ;; XXX: No license information anywhere but Readme.md. + (license license:expat))) + (define-public ruby-aruba (package (name "ruby-aruba") -- cgit v1.2.3 From 305e9b33ca25f6d6c017fa988d72e08760dc0074 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 20 May 2020 18:41:04 +0200 Subject: gnu: Add ruby-colorize. * gnu/packages/ruby.scm (ruby-colorize): New public variable. --- gnu/packages/ruby.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 4eb9d0d696..248518b957 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -7842,6 +7842,36 @@ is part of Ruby's standard library. It more closely conforms to RFC 3986, RFC 3987, and RFC 6570 (level 4), providing support for IRIs and URI templates.") (license license:asl2.0))) +(define-public ruby-colorize + (package + (name "ruby-colorize") + (version "0.8.1") + (source (origin + (method url-fetch) + (uri (rubygems-uri "colorize" version)) + (sha256 + (base32 + "133rqj85n400qk6g3dhf2bmfws34mak1wqihvh3bgy9jhajw580b")))) + (build-system ruby-build-system) + (arguments + '(#:phases (modify-phases %standard-phases + (add-before 'check 'remove-codeclimate-dependency + (lambda _ + (substitute* "test/test_colorize.rb" + ;; Do not hook the tests into the online CodeClimate + ;; service which is unnecessary for these tests. + (("require 'codeclimate-test-reporter'") + "") + (("CodeClimate.*") "")) + #t))))) + (synopsis "Add color effects to the @code{String} class") + (description + "This package extends the @code{String} class and adds a +@code{ColorizedString} with methods to set text color, background color, +and text effects.") + (home-page "http://github.com/fazibear/colorize") + (license license:gpl2+))) + (define-public ruby-colorator (package (name "ruby-colorator") -- cgit v1.2.3 From c09bc60ded3a50e30f4c1361f6d0a4551dce02e3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 20 May 2020 18:42:08 +0200 Subject: gnu: Add ruby-spinach. * gnu/packages/ruby.scm (ruby-spinach): New public variable. --- gnu/packages/ruby.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 248518b957..3201f9f38a 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -4253,6 +4253,34 @@ file or directories are modified.") (home-page "https://guardgem.org/") (license license:expat))) +(define-public ruby-spinach + (package + (name "ruby-spinach") + (version "0.11.0") + (home-page "http://github.com/codegram/spinach") + (source (origin + (method url-fetch) + (uri (rubygems-uri "spinach" version)) + (sha256 + (base32 + "1mv053mqz9c8ngqa6wp1ymk2fax6j0yqzax6918akrdr7c3fx3c6")))) + (build-system ruby-build-system) + (arguments + ;; FIXME: Disable tests altogether because they depend on 'capybara' + ;; which in turn depends on many other unpackaged gems. Enable once + ;; capybara is available. + '(#:tests? #f)) + (propagated-inputs + `(("ruby-colorize" ,ruby-colorize) + ("ruby-gherkin-ruby" ,ruby-gherkin-ruby) + ("ruby-json" ,ruby-json))) + (synopsis "Gherkin-based BDD framework") + (description + "Spinach is a high-level @acronym{BDD, Behavior-driven development} +framework that leverages the expressive @code{Gherkin} language to help you +define executable specifications of your code.") + (license license:expat))) + (define-public ruby-tilt (package (name "ruby-tilt") -- cgit v1.2.3 From 2156cc9cd60e8adde475e25f45128e324ea9dff3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 20 May 2020 18:42:51 +0200 Subject: gnu: Add ruby-parallel-tests. * gnu/packages/ruby.scm (ruby-parallel-tests): New public variable. --- gnu/packages/ruby.scm | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 3201f9f38a..363ee8546c 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -3993,6 +3993,70 @@ for select languages.") (home-page "http://coderay.rubychan.de") (license license:expat))) +(define-public ruby-parallel-tests + (package + (name "ruby-parallel-tests") + (version "2.32.0") + (home-page "https://github.com/grosser/parallel_tests") + (source (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit (string-append "v" version)))) + (file-name (string-append name version)) + (sha256 + (base32 + "0l2rjz9fnxv7hvz679v7a75mghsh9x9qpvbyapiavqsx21v42l7m")))) + (build-system ruby-build-system) + (arguments + '(#:test-target "default" + #:phases (modify-phases %standard-phases + (add-after 'patch-source-shebangs 'patch-shell-invokations + (lambda _ + (substitute* '("lib/parallel_tests/tasks.rb" + "spec/parallel_tests/tasks_spec.rb") + (("/bin/sh") (which "sh")) + (("/bin/bash") (which "bash"))) + #t)) + (add-before 'check 'remove-version-constraints + (lambda _ + ;; Remove hard coded version constraints, instead just + ;; use whatever versions are available in Guix. + (delete-file "Gemfile.lock") + (substitute* "Gemfile" + (("'minitest',.*") + "'minitest'\n") + (("'cucumber',.*") + "'cucumber'\n")) + #t)) + (add-before 'check 'disable-rails-test + (lambda _ + ;; XXX: This test attempts to download and run the test + ;; suites of multiple Rails versions(!) directly. + (delete-file "spec/rails_spec.rb") + #t)) + (add-before 'check 'set-HOME + (lambda _ + ;; Some tests check the output of Bundler, and fail when + ;; Bundler warns that /homeless-shelter does not exist. + (setenv "HOME" "/tmp") + #t))))) + (native-inputs + `(("ruby-bump" ,ruby-bump) + ("ruby-cucumber" ,ruby-cucumber) + ("ruby-minitest" ,ruby-minitest) + ("ruby-rake" ,ruby-rake) + ("ruby-rspec" ,ruby-rspec) + ("ruby-spinach" ,ruby-spinach))) + (propagated-inputs + `(("ruby-parallel" ,ruby-parallel))) + (synopsis "Run tests in parallel") + (description + "This package can speed up @code{Test::Unit}, @code{RSpec}, +@code{Cucumber}, and @code{Spinach} tests by running them concurrently +across multiple CPU cores.") + (license license:expat))) + (define-public ruby-parser (package (name "ruby-parser") -- cgit v1.2.3 From 96bf7521e0918b055a2e9fa7a09183f04c97165b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 20 May 2020 19:11:16 +0200 Subject: gnu: Add ruby-forking-test-runner. * gnu/packages/ruby.scm (ruby-forking-test-runner): New public variable. --- gnu/packages/ruby.scm | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 363ee8546c..70ed0dfd0f 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -1884,6 +1884,57 @@ libraries such as Libnotify.") (home-page "https://github.com/guard/notiffany") (license license:expat))) +(define-public ruby-forking-test-runner + (package + (name "ruby-forking-test-runner") + (version "1.6.0") + (home-page "https://github.com/grosser/forking_test_runner") + (source (origin + (method git-fetch) + (uri (git-reference (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1mrglzkj2nrgisccf2f30zbfmcs0awv1g3lw994b2az90fl39x8m")))) + (build-system ruby-build-system) + (arguments + '(#:test-target "spec" + ;; FIXME: ActiveRecord depends on sqlite3 1.3.6, but Guix has + ;; 1.4.1, which in turn breaks the tests that use ActiveRecord. + #:tests? #f + #:phases (modify-phases %standard-phases + (replace 'replace-git-ls-files + (lambda _ + (substitute* "forking_test_runner.gemspec" + (("`git ls-files lib/ bin/ MIT-LICENSE`") + "`find lib/ bin/ MIT-LICENSE -type f | sort`")) + #t)) + (add-before 'check 'remove-version-constraints + (lambda _ + ;; Ignore hard coded version constraints for the tests. + (delete-file "Gemfile.lock") + #t)) + (add-before 'check 'set-HOME + (lambda _ + ;; Many tests invoke Bundler, and fails when Bundler + ;; warns that /homeless-shelter does not exist. + (setenv "HOME" "/tmp") + #t))))) + (native-inputs + `(("ruby-activerecord" ,ruby-activerecord) + ("ruby-bump" ,ruby-bump) + ("ruby-rspec" ,ruby-rspec) + ("ruby-sqlite3" ,ruby-sqlite3) + ("ruby-wwtd" ,ruby-wwtd))) + (propagated-inputs + `(("ruby-parallel-tests" ,ruby-parallel-tests))) + (synopsis "Run every test in a fork") + (description + "This package is a wrapper around @code{parallel_tests} that runs every +test in a fork to avoid pollution and get clean output per test.") + (license license:expat))) + (define-public ruby-formatador (package (name "ruby-formatador") -- cgit v1.2.3 From 4a98314da9f308bba230fa3e5117e404f7aedd51 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 20 May 2020 19:45:20 +0200 Subject: gnu: Add ruby-fast-gettext. * gnu/packages/ruby.scm (ruby-fast-gettext): New public variable. --- gnu/packages/ruby.scm | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 70ed0dfd0f..97789c1f40 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -2406,6 +2406,65 @@ interface for Ruby programs.") (home-page "https://github.com/mperham/connection_pool") (license license:expat))) +(define-public ruby-fast-gettext + (package + (name "ruby-fast-gettext") + (version "2.0.2") + (home-page "https://github.com/grosser/fast_gettext") + (source (origin + (method git-fetch) + (uri (git-reference (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1rd48fp89k1sclgn2v26br2glwl3iv7z72mizzzmkdmqalqfn1sa")))) + (build-system ruby-build-system) + (arguments + '(#:test-target "spec" + #:phases (modify-phases %standard-phases + (add-before 'check 'remove-version-constraints + (lambda _ + (delete-file "Gemfile.lock") + #t)) + (add-before 'check 'remove-activerecord-test + (lambda _ + ;; FIXME: This test fails because ActiveRecord depends on + ;; a different version of ruby-sqlite than the currently + ;; available one. + (delete-file + "spec/fast_gettext/translation_repository/db_spec.rb") + #t)) + (add-before 'check 'disable-i18n-test + (lambda _ + ;; XXX: This test checks i18n intricasies with Rails 3 and + ;; automatically disables itself for Rails 4.0, but does + ;; not know about newer versions as it has not been updated + ;; since 2014. Disable for later versions of Rails too. + (substitute* "spec/fast_gettext/vendor/string_spec.rb" + (((string-append "ActiveRecord::VERSION::MAJOR == 4 and " + "ActiveRecord::VERSION::MINOR == 0")) + "ActiveRecord::VERSION::MAJOR >= 4")) + #t))))) + (native-inputs + `(;; For tests. + ("ruby-activerecord" ,ruby-activerecord) + ("ruby-activesupport" ,ruby-activesupport) + ("ruby-bump" ,ruby-bump) + ("ruby-forking-test-runner" ,ruby-forking-test-runner) + ("ruby-i18n" ,ruby-i18n) + ("ruby-rubocop" ,ruby-rubocop) + ("ruby-rspec" ,ruby-rspec) + ("ruby-single-cov" ,ruby-single-cov) + ("ruby-sqlite3" ,ruby-sqlite3) + ("ruby-wwtd" ,ruby-wwtd))) + (synopsis "Fast implementation of @code{GetText}") + (description + "This package provides an alternative implementation of the Ruby +@code{GetText} library that is approximately 12x faster yet thread safe.") + ;; Some parts are covered by the Ruby license, see file headers. + (license (list license:expat license:ruby)))) + (define-public ruby-net-http-persistent (package (name "ruby-net-http-persistent") -- cgit v1.2.3 From 4dd8677f7b0eb282f5e8c9126cd279a26692e231 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 20 May 2020 20:05:54 +0200 Subject: gnu: varnish-modules: Update to 0.16.0. * gnu/packages/web.scm (varnish-modules): Update to 0.16.0. [source](uri): Adjust for new location. --- gnu/packages/web.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 1851590628..5f80a035b2 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5686,15 +5686,15 @@ configuration language.") (package (name "varnish-modules") (home-page "https://github.com/varnish/varnish-modules") - (version "0.15.0") + (version "0.16.0") (source (origin (method url-fetch) - (uri (string-append "https://download.varnish-software.com" - "/varnish-modules/varnish-modules-" - version ".tar.gz")) + (uri (string-append "https://github.com/varnish/varnish-modules" + "/releases/download/varnish-modules-" version + "/varnish-modules-" version ".tar.gz")) (sha256 (base32 - "09li9lqa1kb275w1rby2zldyg8r9cfcl4qyv53qyd9xbzilrz751")))) + "1ph5bplsip4rycql1c2hgbvmrwbgcrgv2ldgfp7saxxbsv5cpcds")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 453e66d7772a2182244e35dd6224a73f97cfc07d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 20 May 2020 20:06:29 +0200 Subject: gnu: varnish-modules: Update description. * gnu/packages/web.scm (varnish-modules)[description]: Use @acronym instead of @dfn. --- gnu/packages/web.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 5f80a035b2..d550e78bad 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5704,7 +5704,7 @@ configuration language.") (synopsis "Collection of Varnish modules") (description "This package provides a collection of modules (@dfn{vmods}) for the Varnish -cache server, extending the @dfn{Varnish Configuration Language} (VCL) with +cache server, extending the @acronym{VCL, Varnish Configuration Language} with additional capabilities.") (license license:bsd-2))) -- cgit v1.2.3 From ab9de8cfb0525ef43668712ac898707f97f9a620 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 17 May 2020 16:23:29 +0200 Subject: gnu: fontconfig: Add replacement with font-dejavu instead of gs-fonts. This fixes , , and . Reported by Pierre Neidhardt, W Knight, Alexandros Theodotou, and others. * gnu/packages/fontutils.scm (fontconfig)[replacement]: New field. (fontconfig/font-dejavu): New variable. --- gnu/packages/fontutils.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index e552ece50b..ab9bd4346f 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -37,6 +37,7 @@ #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages autotools) + #:use-module (gnu packages fonts) #:use-module (gnu packages gettext) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) @@ -292,6 +293,12 @@ fonts to/from the WOFF2 format.") (define-public fontconfig (package (name "fontconfig") + + ;; This replacement is not security-related, but works around the fact + ;; that gs-fonts are not recognized by newer versions of Pango, causing + ;; many applications to fail to find fonts otherwise. + (replacement fontconfig/font-dejavu) + (version "2.13.1") (source (origin (method url-fetch) @@ -348,6 +355,13 @@ high quality, anti-aliased and subpixel rendered text on a display.") "See COPYING in the distribution.")) (home-page "https://www.freedesktop.org/wiki/Software/fontconfig"))) +(define fontconfig/font-dejavu + (package + (inherit fontconfig) + (inputs + ;; XXX: Reuse the name to avoid having to override the configure flags. + `(("gs-fonts" ,font-dejavu))))) + (define-public t1lib (package (name "t1lib") -- cgit v1.2.3 From 1e3cf9de840c6968f73b6b6c515dd870563b05cb Mon Sep 17 00:00:00 2001 From: Edouard Klein Date: Wed, 13 May 2020 09:52:45 +0200 Subject: gnu: Add python-random-user-agent. * gnu/packages/python-web.scm (python-random-user-agent): New variable. Signed-off-by: Marius Bakke --- gnu/packages/python-web.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 05fd1599a1..00caf7f229 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -4004,3 +4004,23 @@ changed the process is restarted.") "Pyramid makes it easy to write web applications. From minimal request/response web apps to larger, grown applications.") (license license:repoze))) + +(define-public python-random-user-agent + (package + (name "python-random-user-agent") + (version "1.0.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "random_user_agent" version)) + (sha256 + (base32 + "04nhzdh2ki7ybhjrmghxci6hcm6i03vvin2q2ynj87fbr1pa534g")))) + (build-system python-build-system) + (home-page "https://github.com/Luqman-Ud-Din/random_user_agent") + (synopsis "List of user agents") + (description + "This package provides a list of user agents, from a collection of more +than 326,000 known user-agents. Users can pick a random one, or select one +based on filters.") + (license license:expat))) -- cgit v1.2.3 From b2bdd7a12919d1af4d1314729fa02d87897be8d4 Mon Sep 17 00:00:00 2001 From: Jack Hill Date: Mon, 18 May 2020 15:28:05 -0400 Subject: gnu: racket-minimal: Fix hash for version 7.7. This is a follow-up to commit 99bf646d8f5acb7958c49143a32de6e95fbde4cf. * gnu/packages/scheme.scm (racket-minimal)[source]: Update hash. Signed-off-by: Marius Bakke --- gnu/packages/scheme.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm index 5b290b9728..4551e57d4a 100644 --- a/gnu/packages/scheme.scm +++ b/gnu/packages/scheme.scm @@ -537,7 +537,7 @@ of libraries.") version "/racket-minimal-" version "-src.tgz"))) (sha256 (base32 - "0id094q9024hj2n3907l7dblp3iix1v5289xzskmh5c26xfygp9y")) + "1lxcd4ix8q3089xql48hwccxvcpkinfxwxnc6fhcjdgzqcyxh3ln")) (patches (search-patches "racket-store-checksum-override.patch")))) (synopsis "Racket without bundled packages such as Dr. Racket") -- cgit v1.2.3 From 9b65cdd902ec39115dbf3e0ad34e49f544ab4267 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Tue, 19 May 2020 09:46:49 +0200 Subject: gnu: python-shouldbe: Python 3.8 compatibility. * gnu/packages/patches/python-shouldbe-0.1.2-cpy3.8.patch: Add compatibility patch. * gnu/local.mk (dist_patch_DATA): Add new file. * gnu/packages/python-xyz.scm (python-shouldbe)[source]: Add patch. Signed-off-by: Marius Bakke --- gnu/local.mk | 1 + .../patches/python-shouldbe-0.1.2-cpy3.8.patch | 82 ++++++++++++++++++++++ gnu/packages/python-xyz.scm | 3 +- 3 files changed, 85 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/python-shouldbe-0.1.2-cpy3.8.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 8d737f211e..91f094ce0f 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1434,6 +1434,7 @@ dist_patch_DATA = \ %D%/packages/patches/python2-pygobject-2-gi-info-type-error-domain.patch \ %D%/packages/patches/python-pygpgme-fix-pinentry-tests.patch \ %D%/packages/patches/python-robotframework-honor-source-date-epoch.patch \ + %D%/packages/patches/python-shouldbe-0.1.2-cpy3.8.patch \ %D%/packages/patches/python-slugify-depend-on-unidecode.patch \ %D%/packages/patches/python2-subprocess32-disable-input-test.patch \ %D%/packages/patches/python-unittest2-python3-compat.patch \ diff --git a/gnu/packages/patches/python-shouldbe-0.1.2-cpy3.8.patch b/gnu/packages/patches/python-shouldbe-0.1.2-cpy3.8.patch new file mode 100644 index 0000000000..f3b56e42d6 --- /dev/null +++ b/gnu/packages/patches/python-shouldbe-0.1.2-cpy3.8.patch @@ -0,0 +1,82 @@ +Fix compatibility with Python 3.8. + +Upstream issue: https://github.com/DirectXMan12/should_be/pull/5 + +diff -x '*.pyc' -Naur shouldbe-0.1.2/should_be/core.py shouldbe-0.1.2.patched/should_be/core.py +--- shouldbe-0.1.2/should_be/core.py 2019-03-06 07:38:22.000000000 +0100 ++++ shouldbe-0.1.2.patched/should_be/core.py 2020-05-18 08:44:24.214664704 +0200 +@@ -103,7 +103,7 @@ + return resf + + +-def buildCode(baseCode, argcount=None, kwonlyargcount=None, ++def buildCode(baseCode, argcount=None, posonlyargcount=None, kwonlyargcount=None, + nlocals=None, stacksize=None, flags=None, + code=None, consts=None, names=None, + varnames=None, filename=None, name=None, +@@ -121,6 +121,24 @@ + nlocals or baseCode.co_nlocals, + stacksize or baseCode.co_stacksize, + flags or baseCode.co_flags, ++ code or baseCode.co_code, ++ consts or baseCode.co_consts, ++ names or baseCode.co_names, ++ varnames or baseCode.co_varnames, ++ filename or baseCode.co_filename, ++ name or baseCode.co_name, ++ firstlineno or baseCode.co_firstlineno, ++ lnotab or baseCode.co_lnotab, ++ freevars or baseCode.co_freevars, ++ cellvars or baseCode.co_cellvars) ++ elif hasattr(baseCode, 'co_posonlyargcount'): ++ # Python 3.8 ++ resc = CodeType(argcount or baseCode.co_argcount, ++ posonlyargcount or baseCode.co_posonlyargcount, ++ kwonlyargcount or baseCode.co_kwonlyargcount, ++ nlocals or baseCode.co_nlocals, ++ stacksize or baseCode.co_stacksize, ++ flags or baseCode.co_flags, + code or baseCode.co_code, + consts or baseCode.co_consts, + names or baseCode.co_names, +diff -x '*.pyc' -Naur shouldbe-0.1.2/should_be/tests/test_container_mixin.py shouldbe-0.1.2.patched/should_be/tests/test_container_mixin.py +--- shouldbe-0.1.2/should_be/tests/test_container_mixin.py 2019-03-01 06:38:16.000000000 +0100 ++++ shouldbe-0.1.2.patched/should_be/tests/test_container_mixin.py 2020-05-18 09:00:51.372531064 +0200 +@@ -7,31 +7,31 @@ + self.lst = [1, 2, 3] + + def test_should_include_iter(self): +- err_msg = (r'[a-zA-Z0-9.]+ should have included \[.+?\]' ++ err_msg = (r'[a-zA-Z0-9.()]+ should have included \[.+?\]' + r', but did not have items .+') +- self.assertRaisesRegexp(AssertionError, err_msg, ++ self.assertRaisesRegex(AssertionError, err_msg, + self.lst.should_include, [4]) + + self.lst.should_include([1, 2, 3]) + + def test_should_include_item(self): +- err_msg = (r'[a-zA-Z0-9.]+ should have included .+?' ++ err_msg = (r'[a-zA-Z0-9.()]+ should have included .+?' + r', but did not') +- self.assertRaisesRegexp(AssertionError, err_msg, ++ self.assertRaisesRegex(AssertionError, err_msg, + self.lst.should_include, 4) + + self.lst.should_include(3) + + def test_shouldnt_include_iter(self): + err_msg = 'should not have included' +- self.assertRaisesRegexp(AssertionError, err_msg, ++ self.assertRaisesRegex(AssertionError, err_msg, + self.lst.shouldnt_include, [2, 3]) + + self.lst.shouldnt_include([4, 5]) + + def test_shouldnt_include_item(self): + err_msg = 'should not have included' +- self.assertRaisesRegexp(AssertionError, err_msg, ++ self.assertRaisesRegex(AssertionError, err_msg, + self.lst.shouldnt_include, 3) + + self.lst.shouldnt_include(4) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 1f96ed4391..a0f44dde8b 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -18788,7 +18788,8 @@ and cuts down boilerplate code when testing libraries for asyncio.") (uri (pypi-uri "shouldbe" version)) (sha256 (base32 - "16zbvjxf71dl4yfbgcr6idyim3mdrfvix1dv8b95p0s9z07372pj")))) + "16zbvjxf71dl4yfbgcr6idyim3mdrfvix1dv8b95p0s9z07372pj")) + (patches (search-patches "python-shouldbe-0.1.2-cpy3.8.patch")))) (build-system python-build-system) (propagated-inputs `(("python-forbiddenfruit" ,python-forbiddenfruit))) -- cgit v1.2.3 From f717cfa84bd67568c2303ffb6ce1699eed0fb6d9 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 20 May 2020 19:11:22 -0400 Subject: gnu: linux-libre@4.4: Update 4.4.224. * gnu/packages/linux.scm (linux-libre-4.4-version): Update 4.4.224. (linux-libre-4.4-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 750111f4e1..7da67911f5 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -409,10 +409,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.9))) -(define-public linux-libre-4.4-version "4.4.223") +(define-public linux-libre-4.4-version "4.4.224") (define-public linux-libre-4.4-pristine-source (let ((version linux-libre-4.4-version) - (hash (base32 "09fln0sdfif2zv2jifp24yiqi0vcyj8fqx2jz91g21zvsxk3x5nd"))) + (hash (base32 "1lb8ypn558vk73bj4a20wq40cig9vmzjn2xzzdws78gfair6hxpg"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.4))) -- cgit v1.2.3 From 79a2cfd858e05630faa147447002bdc094b4fb6b Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 20 May 2020 19:12:22 -0400 Subject: gnu: linux-libre@4.9: Update 4.9.224. * gnu/packages/linux.scm (linux-libre-4.9-version): Update 4.9.224. (linux-libre-4.9-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 7da67911f5..aac125a797 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -401,10 +401,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.14))) -(define-public linux-libre-4.9-version "4.9.223") +(define-public linux-libre-4.9-version "4.9.224") (define-public linux-libre-4.9-pristine-source (let ((version linux-libre-4.9-version) - (hash (base32 "1r9ag1fhy0g429q44qlqh0qkf42qkhzxa04gxlmnrinqypk00lyg"))) + (hash (base32 "0jf92cx0b3wq9fxa3169wk4wqvy58hglfk6lsynszy8kjplhfvfz"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.9))) -- cgit v1.2.3 From 575e32fae85377ca0817395b80e2f2ec28b0c76b Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 20 May 2020 19:12:48 -0400 Subject: gnu: linux-libre@4.14: Update 4.14.181. * gnu/packages/linux.scm (linux-libre-4.14-version): Update 4.14.181. (linux-libre-4.14-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index aac125a797..f35e0fd99b 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -393,10 +393,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.19))) -(define-public linux-libre-4.14-version "4.14.180") +(define-public linux-libre-4.14-version "4.14.181") (define-public linux-libre-4.14-pristine-source (let ((version linux-libre-4.14-version) - (hash (base32 "03pd4wpg526n391jwc0kbmbxi059mvq8d42a9qbym9mnv5rzjkj4"))) + (hash (base32 "0kaasqhmg9in7pf4ldk9z4z1cjgv1c9xdr1ca0pznngygibym6xb"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.14))) -- cgit v1.2.3 From fa0fac06321b688780eb28f7aa7a856036cb7a80 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 20 May 2020 19:13:25 -0400 Subject: gnu: linux-libre@4.19: Update 4.19.124. * gnu/packages/linux.scm (linux-libre-4.19-version): Update 4.19.124. (linux-libre-4.19-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index f35e0fd99b..05ba8f106f 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -385,10 +385,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.4))) -(define-public linux-libre-4.19-version "4.19.123") +(define-public linux-libre-4.19-version "4.19.124") (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "0gwrkbbfy85ajxpg7q6j9mn8mzhmsr1v3wmh5c76p34d3b9i96d7"))) + (hash (base32 "005dznldnj1m03cbkc5pd2q2cv9jj1j6a0x2vh4p79ypg4c01nfm"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -- cgit v1.2.3 From efcdb475018c108b8fea4773577efe3665e89667 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 20 May 2020 19:14:05 -0400 Subject: gnu: linux-libre@5.6: Update 5.6.14. * gnu/packages/linux.scm (linux-libre-5.6-version): Update 5.6.14. (linux-libre-5.6-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 05ba8f106f..ecc30a9255 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -369,10 +369,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (sha256 hash))) -(define-public linux-libre-5.6-version "5.6.13") +(define-public linux-libre-5.6-version "5.6.14") (define-public linux-libre-5.6-pristine-source (let ((version linux-libre-5.6-version) - (hash (base32 "11zriz0jwqizv0pq0laql0svsnspdfnxqykq70v22x39iyfdf9gi"))) + (hash (base32 "18vyxi64i93v4qyky5q62kkasm1da7wmz91xfkx3j7ki84skyxik"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.6))) -- cgit v1.2.3 From 498e2e669d38f5eb4cf2a49ef8e6bc85f99efd5d Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 20 May 2020 19:14:37 -0400 Subject: gnu: linux-libre: Update 5.4.42. * gnu/packages/linux.scm (linux-libre-5.4-version): Update 5.4.42. (linux-libre-5.4-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index ecc30a9255..f6acc086a7 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -377,10 +377,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.6))) -(define-public linux-libre-5.4-version "5.4.41") +(define-public linux-libre-5.4-version "5.4.42") (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "0mxhz3f0ayz0nggndbikp44kx307yxf16qzsv46hni6p8z1ffr0y"))) + (hash (base32 "0cdwazpzfrrb2y5fp87v9yihy7v8mlbqjzxpzmv7p83609y1nhsf"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) -- cgit v1.2.3 From 3da3ec93a373a23e43d70aeabaac8fba681b07f8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 21 May 2020 04:00:02 +0200 Subject: gnu: uhttpmock: Update to 0.5.2. * gnu/packages/web.scm (uhttpmock): Update to 0.5.2. --- gnu/packages/web.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index d550e78bad..baea844e4f 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4671,15 +4671,14 @@ you'd expect.") (define-public uhttpmock (package (name "uhttpmock") - (version "0.5.1") + (version "0.5.2") (source (origin (method url-fetch) (uri (string-append "http://tecnocode.co.uk/downloads/uhttpmock/" name "-" version ".tar.xz")) (sha256 - (base32 - "163py4klka423x7li2b685gmg3a6hjf074mlff2ajhmi3l0lm8x6")))) + (base32 "0glyx07kxc3s3cx5vp30kfgscl9q6bghcq1zysfyxm24r0h6j58p")))) (build-system glib-or-gtk-build-system) (native-inputs `(("gobject-introspection" ,gobject-introspection) -- cgit v1.2.3 From 102fd8c7f428a198fad6f563f0094072b7cd003c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 21 May 2020 04:05:07 +0200 Subject: gnu: criu: Update to 3.14. * gnu/packages/virtualization.scm (criu): Update to 3.14. --- gnu/packages/virtualization.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index c2025c4fbe..27527b4116 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -745,14 +745,14 @@ domains, their live performance and resource utilization statistics.") (define-public criu (package (name "criu") - (version "3.13") + (version "3.14") (source (origin (method url-fetch) (uri (string-append "http://download.openvz.org/criu/criu-" version ".tar.bz2")) (sha256 (base32 - "1yn9ix9lqvqvjrs3a3g6g1wqfniyf9n7giy0mr3jvijmrcm7y0pa")))) + "1jrr3v99g18gc0hriz0avq6ccdvyya0j6wwz888sdsc4icc30gzn")))) (build-system gnu-build-system) (arguments `(#:test-target "test" -- cgit v1.2.3 From 5098b90bf5cb52f80011e023d821dfa8bcb74b32 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 21 May 2020 04:08:49 +0200 Subject: gnu: python-pytest-sugar: Update to 0.9.3. * gnu/packages/check.scm (python-pytest-sugar): Update to 0.9.3. --- gnu/packages/check.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index e8547a5096..12e01795ee 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1703,14 +1703,13 @@ normally the case.") (define-public python-pytest-sugar (package (name "python-pytest-sugar") - (version "0.9.2") + (version "0.9.3") (source (origin (method url-fetch) (uri (pypi-uri "pytest-sugar" version)) (sha256 - (base32 - "1asq7yc4g8bx2sn7yy974mhc9ywvaihasjab4inkirdwn9s7mn7w")))) + (base32 "1i0hv3h49zvl62jbiyjag84carbrp3zprqzxffdr291nxavvac0n")))) (build-system python-build-system) (propagated-inputs `(("python-packaging" ,python-packaging) -- cgit v1.2.3 From 0523ab2cb28c4700620952a451e1aaa61cd7924b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 21 May 2020 04:54:40 +0200 Subject: gnu: python-apipkg: Remove Python 2 variant. * gnu/packages/python-xyz.scm (python2-apipkg): Remove variable. --- gnu/packages/python-xyz.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index a0f44dde8b..02e406e5f5 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -9495,9 +9495,6 @@ pure Python module that works on virtually all Python versions.") (home-page "https://github.com/pytest-dev/apipkg") (license license:expat))) -(define-public python2-apipkg - (package-with-python2 python-apipkg)) - (define-public python-execnet (package (name "python-execnet") -- cgit v1.2.3 From b3200505efd1e77c5b3213d6afd61e30eb5ca691 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 21 May 2020 04:53:44 +0200 Subject: gnu: python-apipkg: Update to 1.5. * gnu/packages/python-xyz.scm (python-apipkg): Update to 1.5. [native-inputs]: Add python-setuptools-scm. --- gnu/packages/python-xyz.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 02e406e5f5..5c0f0bda82 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -9478,16 +9478,17 @@ applications.") (define-public python-apipkg (package (name "python-apipkg") - (version "1.4") + (version "1.5") (source (origin (method url-fetch) (uri (pypi-uri "apipkg" version)) (sha256 (base32 - "1iks5701qnp3dlr3q1d9qm68y2plp2m029irhpz92a44psfkjf1f")))) + "1xhak74yj3lqflvpijg15rnkklrigvsp5q7s4as4h6a157d8q8ip")))) (build-system python-build-system) (native-inputs - `(("python-pytest" ,python-pytest))) + `(("python-pytest" ,python-pytest) + ("python-setuptools-scm" ,python-setuptools-scm))) (synopsis "Namespace control and lazy-import mechanism") (description "With apipkg you can control the exported namespace of a Python package and greatly reduce the number of imports for your users. It is a small -- cgit v1.2.3 From 32cde877ee4c78772989b72a4eb9cdb699cc9541 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 21 May 2020 05:35:00 +0200 Subject: gnu: ganv: Update to 1.6.0. * gnu/packages/gtk.scm (ganv): Update to 1.6.0. [arguments]: Don't override #:python. --- gnu/packages/gtk.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 3e2cb30246..385e4e97e4 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -318,14 +318,14 @@ functions which were removed.") (define-public ganv (package (name "ganv") - (version "1.4.2") + (version "1.6.0") (source (origin (method url-fetch) (uri (string-append "https://download.drobilla.net/ganv-" version ".tar.bz2")) (sha256 (base32 - "0g7s5mp14qgbfjdql0k1s8464r21g47ssn5dws6jazsnw6njhl0l")))) + "0pik2d3995z0rjcjhb4hsj5fsph3m8khg6j10k6mx4j2j727aq6l")))) (build-system waf-build-system) (arguments `(#:phases @@ -337,7 +337,6 @@ functions which were removed.") (string-append "-Wl,-rpath=" (assoc-ref outputs "out") "/lib")) #t))) - #:python ,python-2 ;XXX: The bundled waf fails with Python 3.7.0. #:tests? #f)) ; no check target (inputs `(("gtk" ,gtk+-2) -- cgit v1.2.3 From b91dcefda1507df61b5ebfa821cbf1ea8a47b5f9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 21 May 2020 05:35:12 +0200 Subject: gnu: patchage: Update to 1.0.2. * gnu/packages/audio.scm (patchage): Update to 1.0.2. --- gnu/packages/audio.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index e6eefad61b..35c4001303 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -2191,7 +2191,7 @@ buffers, and audio capture.") (define-public patchage (package (name "patchage") - (version "1.0.0") + (version "1.0.2") (source (origin (method url-fetch) (uri (string-append "https://download.drobilla.net/patchage-" @@ -2199,10 +2199,10 @@ buffers, and audio capture.") ".tar.bz2")) (sha256 (base32 - "1agdpwwi42176l4mxj0c4fsvdiv1ig56bfnnx0msckxmy57df8bb")))) + "0dk3fiac10m83mwss3026yz7ygc47c2iw924cwwnh2fyydc9bsy6")))) (build-system waf-build-system) (arguments - `(#:tests? #f ; no check target + `(#:tests? #f ; no check target #:python ,python-2)) (inputs `(("alsa-lib" ,alsa-lib) -- cgit v1.2.3 From 70f5cabc291b731f8532bb73166e41f7d2739a88 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 21 May 2020 05:40:30 +0200 Subject: gnu: xfwm4: Update to 4.14.2. * gnu/packages/xfce.scm (xfwm4): Update to 4.14.2. --- gnu/packages/xfce.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index f447c4097d..7a6784b928 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -724,7 +724,7 @@ and import the new pictures from your camera.") (define-public xfwm4 (package (name "xfwm4") - (version "4.14.1") + (version "4.14.2") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/xfce/" @@ -732,7 +732,7 @@ and import the new pictures from your camera.") "xfwm4-" version ".tar.bz2")) (sha256 (base32 - "0a0la57jh618qfl7czsn7mspcraqczkm1m616j7jwxkhh2hq21qh")))) + "14pxiymg0hpg3yijbjv5w6259pra4rqq79b7a6mvd8wn4ls40nxi")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From 3cc6412056876cf6b17b368bf982d5c4a7153fd7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 21 May 2020 05:52:12 +0200 Subject: gnu: tuxguitar: Update to 1.5.4. * gnu/packages/music.scm (tuxguitar): Update to 1.5.4. --- gnu/packages/music.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 3736abb353..3d8a3d4321 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1755,7 +1755,7 @@ is subjective.") (define-public tuxguitar (package (name "tuxguitar") - (version "1.5.3") + (version "1.5.4") (source (origin (method url-fetch) (uri (string-append @@ -1763,7 +1763,7 @@ is subjective.") version "/tuxguitar-" version "-src.tar.gz")) (sha256 (base32 - "1qy5kjcsl3c86kdlyvsf6dsfmfl1mv8zg0ln6g3qg3i8f35vlpp6")))) + "0fjhf56lhlhm84v08917xp4yw8y6d0qajm4qiy1gfp8dm74whwwg")))) (build-system ant-build-system) (arguments `(#:build-target "build" -- cgit v1.2.3 From b82a45d804375bc9ccdfa53ad258adfb8dabc896 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 21 May 2020 05:59:35 +0200 Subject: gnu: shotwell: Update to 0.30.9. * gnu/packages/gnome.scm (shotwell): Update to 0.30.9. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index e35ffb7a72..092f9fcb00 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5696,7 +5696,7 @@ metadata in photo and video files of various formats.") (define-public shotwell (package (name "shotwell") - (version "0.30.8") + (version "0.30.9") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/shotwell/" @@ -5704,7 +5704,7 @@ metadata in photo and video files of various formats.") "shotwell-" version ".tar.xz")) (sha256 (base32 - "1f7m007g6w1sz8s60w6x81ghp2rrjmik8phd958b2hy8zz92wbbj")))) + "1y556yyzfya0310v5wqjkf17hy5lhf028iminvvgi2pdfva344id")))) (build-system meson-build-system) (arguments '(#:glib-or-gtk? #t -- cgit v1.2.3 From 8825a01b3953904ced9cf45374a3c3fc9f83a190 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 21 May 2020 06:23:27 +0200 Subject: gnu: ncmpc: Update to 0.38. * gnu/packages/mpd.scm (ncmpc): Update to 0.38. --- gnu/packages/mpd.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index 755fa5d482..543345d9e0 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2014 Ian Denhardt ;;; Copyright © 2015 Paul van der Walt ;;; Copyright © 2016, 2018, 2019, 2020 Leo Famulari -;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2019 Evan Straw ;;; ;;; This file is part of GNU Guix. @@ -183,7 +183,7 @@ player daemon.") (define-public ncmpc (package (name "ncmpc") - (version "0.37") + (version "0.38") (source (origin (method url-fetch) (uri @@ -192,7 +192,7 @@ player daemon.") "/ncmpc-" version ".tar.xz")) (sha256 (base32 - "0p31jpv1vj01bqf1589mnfpv9618cfsv259rlnbqybg1yqkvg3kw")))) + "18i73q33xq89abrxjd3hhl05gjniv6ms76ndjlc168ydm8wamh9b")))) (build-system meson-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From a0828560b58f6b6c8b400caf0ceee396abc7d4c0 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 21 May 2020 11:30:50 +0300 Subject: gnu: boost-for-mysql: Fix building. Co-authored with Jonathan Brielmaier * gnu/packages/boost.scm (boost-for-mysql)[arguments]: Replace inherited 'configure, phase remove references to python and update the substitute regex for boost-1.59. Absorb 'more-bin-sh-patching into 'configure.Adjust make-flags to always pass '--without-python'. [native-inputs]: Remove python. --- gnu/packages/boost.scm | 41 +++++++++++++++++++++++++++++++++++------ 1 file changed, 35 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm index 2f2ca289ab..d28c58d663 100644 --- a/gnu/packages/boost.scm +++ b/gnu/packages/boost.scm @@ -13,6 +13,7 @@ ;;; Copyright © 2019 Mathieu Othacehe ;;; Copyright © 2019, 2020 Giacomo Leidi ;;; Copyright © 2020 Marius Bakke +;;; Copyright © 2020 Jonathan Brielmaier ;;; ;;; This file is part of GNU Guix. ;;; @@ -241,12 +242,40 @@ across a broad spectrum of applications.") (arguments (substitute-keyword-arguments (package-arguments boost) ((#:phases phases) `(modify-phases ,phases - ;; This was removed after boost-1.67. - (add-before 'configure 'more-bin-sh-patching - (lambda _ - (substitute* "tools/build/doc/bjam.qbk" - (("/bin/sh") (which "sh"))))) - (delete 'provide-libboost_python))))) + (replace 'configure + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((icu (assoc-ref inputs "icu4c")) + (out (assoc-ref outputs "out"))) + (substitute* (append + (find-files "tools/build/src/engine/" "execunix\\.c.*") + '("libs/config/configure" + "libs/spirit/classic/phoenix/test/runtest.sh" + "tools/build/doc/bjam.qbk" + "tools/build/src/engine/Jambase")) + (("/bin/sh") (which "sh"))) + + (setenv "SHELL" (which "sh")) + (setenv "CONFIG_SHELL" (which "sh")) + + ,@(if (%current-target-system) + `((call-with-output-file "user-config.jam" + (lambda (port) + (format port + "using gcc : cross : ~a-c++ ;" + ,(%current-target-system))))) + '()) + + (invoke "./bootstrap.sh" + (string-append "--prefix=" out) + ;; Auto-detection looks for ICU only in traditional + ;; install locations. + (string-append "--with-icu=" icu) + "--with-toolset=gcc")))) + (delete 'provide-libboost_python))) + ((#:make-flags make-flags) + `(cons* "--without-python" ,make-flags)))) + (native-inputs + (alist-delete "python" (package-native-inputs boost))) (properties '((hidden? . #t))))) (define-public boost-sync -- cgit v1.2.3 From 09db7f39ba9660f5f5a3f6cfa2e54ee6df8d9dd4 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Thu, 7 May 2020 18:19:34 +0200 Subject: gnu: cl-dexador: Fix build with new sbcl-package->cl-source-package function. * gnu/packages/lisp-xyz.scm (cl-dexador)[arguments]: Remove 'reset-gzip-timestamps phase. --- gnu/packages/lisp-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 60fb4b0487..f0f28ae8f3 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -5867,8 +5867,8 @@ neat APIs and connection-pooling. It is meant to supersede Drakma.") ;; asdf-build-system/source has its own phases and does not inherit ;; from asdf-build-system/sbcl phases. (modify-phases %standard-phases/source - (add-after 'unpack 'fix-permissions - (lambda _ (make-file-writable "t/data/test.gz") #t))))))) + ;; Already done in SBCL package. + (delete 'reset-gzip-timestamps)))))) (define-public ecl-dexador (sbcl-package->ecl-package sbcl-dexador)) -- cgit v1.2.3 From c6201ab9dc7cc9bac6e27739da50727f38a97159 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Thu, 7 May 2020 19:17:41 +0200 Subject: gnu: cl-iolib: Propagate libfixposix or else it won't compile. * gnu/packages/lisp-xyz.scm (cl-iolib)[propagated-inputs]: Add libfixposix. --- gnu/packages/lisp-xyz.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index f0f28ae8f3..7e13beda31 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -5568,7 +5568,13 @@ and @code{kqueue(2)}), a pathname library and file-system utilities.") ((#:asd-system-name _) "iolib"))))) (define-public cl-iolib - (sbcl-package->cl-source-package sbcl-iolib)) + (let ((parent (sbcl-package->cl-source-package sbcl-iolib))) + (package + (inherit parent) + (propagated-inputs + ;; Need header to compile. + `(("libfixposix" ,libfixposix) + ,@(package-propagated-inputs parent)))))) (define-public sbcl-ieee-floats (let ((commit "566b51a005e81ff618554b9b2f0b795d3b29398d") -- cgit v1.2.3 From 0fadc00a1a5bfbb6ca9caf1bfae06e839684843c Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 8 May 2020 11:14:02 +0200 Subject: gnu: cl-cffi-gtk-gobject: Fix build with new sbcl-package->cl-source-package function. * gnu/packages/lisp-xyz.scm (sbcl-cl-cffi-gtk-boot0)[inputs]: Add all inputs. [arguments]: Patch whole source. (sbcl-cl-cffi-gtk-glib)[inputs]: Remove glib. (sbcl-cl-cffi-gtk-glib)[arguments]: Reuse boot0 source. (sbcl-cl-cffi-gtk-gobject)[inputs]: Remove glib. (sbcl-cl-cffi-gtk-gobject)[arguments]: Reuse boot0 source. (sbcl-cl-cffi-gtk-gio)[inputs]: Remove glib. (sbcl-cl-cffi-gtk-gio)[arguments]: Reuse boot0 source. (sbcl-cl-cffi-gtk-cairo)[inputs]: Remove cairo. (sbcl-cl-cffi-gtk-cairo)[arguments]: Reuse boot0 source. (sbcl-cl-cffi-gtk-pango)[inputs]: Remove pango. (sbcl-cl-cffi-gtk-pango)[arguments]: Reuse boot0 source. (sbcl-cl-cffi-gtk-gdk-pixbuf)[inputs]: Remove gdk-pixbuf. (sbcl-cl-cffi-gtk-gdk-pixbuf)[arguments]: Reuse boot0 source. (sbcl-cl-cffi-gtk-gdk-gdk)[inputs]: Remove gtk+. (sbcl-cl-cffi-gtk-gdk-gdk)[arguments]: Reuse boot0 source. (sbcl-cl-cffi-gtk)[arguments]: Reuse boot0 source. --- gnu/packages/lisp-xyz.scm | 341 ++++++++++++++++++++++------------------------ 1 file changed, 165 insertions(+), 176 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 7e13beda31..b78eec7f4d 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -2876,7 +2876,41 @@ Lisp implementations.") (inputs `(("iterate" ,sbcl-iterate) ("cffi" ,sbcl-cffi) - ("trivial-features" ,sbcl-trivial-features))) + ("trivial-features" ,sbcl-trivial-features) + ("glib" ,glib) + ("cairo" ,cairo) + ("pango" ,pango) + ("gdk-pixbuf" ,gdk-pixbuf) + ("gtk" ,gtk+))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "glib/glib.init.lisp" + (("libglib|libgthread" all) + (string-append (assoc-ref inputs "glib") "/lib/" all))) + (substitute* "gobject/gobject.init.lisp" + (("libgobject" all) + (string-append (assoc-ref inputs "glib") "/lib/" all))) + (substitute* "gio/gio.init.lisp" + (("libgio" all) + (string-append (assoc-ref inputs "glib") "/lib/" all))) + (substitute* "cairo/cairo.init.lisp" + (("libcairo" all) + (string-append (assoc-ref inputs "cairo") "/lib/" all))) + (substitute* "pango/pango.init.lisp" + (("libpango" all) + (string-append (assoc-ref inputs "pango") "/lib/" all))) + (substitute* "gdk-pixbuf/gdk-pixbuf.init.lisp" + (("libgdk_pixbuf" all) + (string-append (assoc-ref inputs "gdk-pixbuf") "/lib/" all))) + (substitute* "gdk/gdk.init.lisp" + (("libgdk" all) + (string-append (assoc-ref inputs "gtk") "/lib/" all))) + (substitute* "gdk/gdk.package.lisp" + (("libgtk" all) + (string-append (assoc-ref inputs "gtk") "/lib/" all)))))))) (home-page "https://github.com/Ferada/cl-cffi-gtk/") (synopsis "Common Lisp binding for GTK+3") (description @@ -2889,192 +2923,155 @@ is a library for creating graphical user interfaces.") (inherit sbcl-cl-cffi-gtk-boot0) (name "sbcl-cl-cffi-gtk-glib") (inputs - `(("glib" ,glib) - ("bordeaux-threads" ,sbcl-bordeaux-threads) + `(("bordeaux-threads" ,sbcl-bordeaux-threads) ,@(package-inputs sbcl-cl-cffi-gtk-boot0))) (arguments - `(#:asd-file "glib/cl-cffi-gtk-glib.asd" - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-paths - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "glib/glib.init.lisp" - (("libglib|libgthread" all) - (string-append (assoc-ref inputs "glib") "/lib/" all)))))))))) + (substitute-keyword-arguments (package-arguments sbcl-cl-cffi-gtk-boot0) + ((#:asd-file _ "") "glib/cl-cffi-gtk-glib.asd"))))) (define-public sbcl-cl-cffi-gtk-gobject (package (inherit sbcl-cl-cffi-gtk-boot0) (name "sbcl-cl-cffi-gtk-gobject") (inputs - `(("glib" ,glib) - ("cl-cffi-gtk-glib" ,sbcl-cl-cffi-gtk-glib) + `(("cl-cffi-gtk-glib" ,sbcl-cl-cffi-gtk-glib) ("trivial-garbage" ,sbcl-trivial-garbage) ("bordeaux-threads" ,sbcl-bordeaux-threads) ("closer-mop" ,sbcl-closer-mop) ,@(package-inputs sbcl-cl-cffi-gtk-boot0))) (arguments - `(#:asd-file "gobject/cl-cffi-gtk-gobject.asd" - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-paths - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "gobject/gobject.init.lisp" - (("libgobject" all) (string-append - (assoc-ref inputs "glib") "/lib/" all))))) - (add-after 'install 'link-source - ;; Since source is particularly heavy (16MiB+), let's reuse it - ;; across the different components of cl-ffi-gtk. - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((glib-source (string-append (assoc-ref inputs "cl-cffi-gtk-glib") - "/share/common-lisp/sbcl-source/" - "cl-cffi-gtk-glib")) - (out-source (string-append (assoc-ref outputs "out") - "/share/common-lisp/sbcl-source/" - "cl-cffi-gtk-gobject"))) - (delete-file-recursively out-source) - (symlink glib-source out-source) - #t)))))))) + (substitute-keyword-arguments (package-arguments sbcl-cl-cffi-gtk-boot0) + ((#:asd-file _ "") "gobject/cl-cffi-gtk-gobject.asd") + ((#:phases phases) + `(modify-phases ,phases + (add-after 'install 'link-source + ;; Since source is particularly heavy (16MiB+), let's reuse it + ;; across the different components of cl-ffi-gtk. + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((glib-source (string-append (assoc-ref inputs "cl-cffi-gtk-glib") + "/share/common-lisp/sbcl-source/" + "cl-cffi-gtk-glib")) + (out-source (string-append (assoc-ref outputs "out") + "/share/common-lisp/sbcl-source/" + "cl-cffi-gtk-gobject"))) + (delete-file-recursively out-source) + (symlink glib-source out-source) + #t))))))))) (define-public sbcl-cl-cffi-gtk-gio (package (inherit sbcl-cl-cffi-gtk-boot0) (name "sbcl-cl-cffi-gtk-gio") (inputs - `(("glib" ,glib) - ("cl-cffi-gtk-glib" ,sbcl-cl-cffi-gtk-glib) + `(("cl-cffi-gtk-glib" ,sbcl-cl-cffi-gtk-glib) ("cl-cffi-gtk-gobject" ,sbcl-cl-cffi-gtk-gobject) ,@(package-inputs sbcl-cl-cffi-gtk-boot0))) (arguments - `(#:asd-file "gio/cl-cffi-gtk-gio.asd" - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-paths - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "gio/gio.init.lisp" - (("libgio" all) - (string-append - (assoc-ref inputs "glib") "/lib/" all))))) - (add-after 'install 'link-source - ;; Since source is particularly heavy (16MiB+), let's reuse it - ;; across the different components of cl-ffi-gtk. - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((glib-source (string-append (assoc-ref inputs "cl-cffi-gtk-glib") - "/share/common-lisp/sbcl-source/" - "cl-cffi-gtk-glib")) - (out-source (string-append (assoc-ref outputs "out") - "/share/common-lisp/sbcl-source/" - "cl-cffi-gtk-gio"))) - (delete-file-recursively out-source) - (symlink glib-source out-source) - #t)))))))) + (substitute-keyword-arguments (package-arguments sbcl-cl-cffi-gtk-boot0) + ((#:asd-file _ "") "gio/cl-cffi-gtk-gio.asd") + ((#:phases phases) + `(modify-phases ,phases + (add-after 'install 'link-source + ;; Since source is particularly heavy (16MiB+), let's reuse it + ;; across the different components of cl-ffi-gtk. + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((glib-source (string-append (assoc-ref inputs "cl-cffi-gtk-glib") + "/share/common-lisp/sbcl-source/" + "cl-cffi-gtk-glib")) + (out-source (string-append (assoc-ref outputs "out") + "/share/common-lisp/sbcl-source/" + "cl-cffi-gtk-gio"))) + (delete-file-recursively out-source) + (symlink glib-source out-source) + #t))))))))) (define-public sbcl-cl-cffi-gtk-cairo (package (inherit sbcl-cl-cffi-gtk-boot0) (name "sbcl-cl-cffi-gtk-cairo") (inputs - `(("cairo" ,cairo) - ("cl-cffi-gtk-glib" ,sbcl-cl-cffi-gtk-glib) + `(("cl-cffi-gtk-glib" ,sbcl-cl-cffi-gtk-glib) ,@(package-inputs sbcl-cl-cffi-gtk-boot0))) (arguments - `(#:asd-file "cairo/cl-cffi-gtk-cairo.asd" - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-paths - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "cairo/cairo.init.lisp" - (("libcairo" all) - (string-append - (assoc-ref inputs "cairo") "/lib/" all))))) - (add-after 'install 'link-source - ;; Since source is particularly heavy (16MiB+), let's reuse it - ;; across the different components of cl-ffi-gtk. - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((glib-source (string-append (assoc-ref inputs "cl-cffi-gtk-glib") - "/share/common-lisp/sbcl-source/" - "cl-cffi-gtk-glib")) - (out-source (string-append (assoc-ref outputs "out") - "/share/common-lisp/sbcl-source/" - "cl-cffi-gtk-cairo"))) - (delete-file-recursively out-source) - (symlink glib-source out-source) - #t)))))))) + (substitute-keyword-arguments (package-arguments sbcl-cl-cffi-gtk-boot0) + ((#:asd-file _ "") "cairo/cl-cffi-gtk-cairo.asd") + ((#:phases phases) + `(modify-phases ,phases + (add-after 'install 'link-source + ;; Since source is particularly heavy (16MiB+), let's reuse it + ;; across the different components of cl-ffi-gtk. + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((glib-source (string-append (assoc-ref inputs "cl-cffi-gtk-glib") + "/share/common-lisp/sbcl-source/" + "cl-cffi-gtk-glib")) + (out-source (string-append (assoc-ref outputs "out") + "/share/common-lisp/sbcl-source/" + "cl-cffi-gtk-cairo"))) + (delete-file-recursively out-source) + (symlink glib-source out-source) + #t))))))))) (define-public sbcl-cl-cffi-gtk-pango (package (inherit sbcl-cl-cffi-gtk-boot0) (name "sbcl-cl-cffi-gtk-pango") (inputs - `(("pango" ,pango) - ("cl-cffi-gtk-glib" ,sbcl-cl-cffi-gtk-glib) + `(("cl-cffi-gtk-glib" ,sbcl-cl-cffi-gtk-glib) ("cl-cffi-gtk-gobject" ,sbcl-cl-cffi-gtk-gobject) ("cl-cffi-gtk-cairo" ,sbcl-cl-cffi-gtk-cairo) ,@(package-inputs sbcl-cl-cffi-gtk-boot0))) (arguments - `(#:asd-file "pango/cl-cffi-gtk-pango.asd" - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-paths - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "pango/pango.init.lisp" - (("libpango" all) - (string-append - (assoc-ref inputs "pango") "/lib/" all))))) - (add-after 'install 'link-source - ;; Since source is particularly heavy (16MiB+), let's reuse it - ;; across the different components of cl-ffi-gtk. - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((glib-source (string-append (assoc-ref inputs "cl-cffi-gtk-glib") - "/share/common-lisp/sbcl-source/" - "cl-cffi-gtk-glib")) - (out-source (string-append (assoc-ref outputs "out") - "/share/common-lisp/sbcl-source/" - "cl-cffi-gtk-pango"))) - (delete-file-recursively out-source) - (symlink glib-source out-source) - #t)))))))) + (substitute-keyword-arguments (package-arguments sbcl-cl-cffi-gtk-boot0) + ((#:asd-file _ "") "pango/cl-cffi-gtk-pango.asd") + ((#:phases phases) + `(modify-phases ,phases + (add-after 'install 'link-source + ;; Since source is particularly heavy (16MiB+), let's reuse it + ;; across the different components of cl-ffi-gtk. + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((glib-source (string-append (assoc-ref inputs "cl-cffi-gtk-glib") + "/share/common-lisp/sbcl-source/" + "cl-cffi-gtk-glib")) + (out-source (string-append (assoc-ref outputs "out") + "/share/common-lisp/sbcl-source/" + "cl-cffi-gtk-pango"))) + (delete-file-recursively out-source) + (symlink glib-source out-source) + #t))))))))) (define-public sbcl-cl-cffi-gtk-gdk-pixbuf (package (inherit sbcl-cl-cffi-gtk-boot0) (name "sbcl-cl-cffi-gtk-gdk-pixbuf") (inputs - `(("gdk-pixbuf" ,gdk-pixbuf) - ("cl-cffi-gtk-gobject" ,sbcl-cl-cffi-gtk-gobject) + `(("cl-cffi-gtk-gobject" ,sbcl-cl-cffi-gtk-gobject) ("cl-cffi-gtk-glib" ,sbcl-cl-cffi-gtk-glib) ,@(package-inputs sbcl-cl-cffi-gtk-boot0))) (arguments - `(#:asd-file "gdk-pixbuf/cl-cffi-gtk-gdk-pixbuf.asd" - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-paths - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "gdk-pixbuf/gdk-pixbuf.init.lisp" - (("libgdk_pixbuf" all) - (string-append - (assoc-ref inputs "gdk-pixbuf") "/lib/" all))))) - (add-after 'install 'link-source - ;; Since source is particularly heavy (16MiB+), let's reuse it - ;; across the different components of cl-ffi-gtk. - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((glib-source (string-append (assoc-ref inputs "cl-cffi-gtk-glib") - "/share/common-lisp/sbcl-source/" - "cl-cffi-gtk-glib")) - (out-source (string-append (assoc-ref outputs "out") - "/share/common-lisp/sbcl-source/" - "cl-cffi-gtk-gdk-pixbuf"))) - (delete-file-recursively out-source) - (symlink glib-source out-source) - #t)))))))) + (substitute-keyword-arguments (package-arguments sbcl-cl-cffi-gtk-boot0) + ((#:asd-file _ "") "gdk-pixbuf/cl-cffi-gtk-gdk-pixbuf.asd") + ((#:phases phases) + `(modify-phases ,phases + (add-after 'install 'link-source + ;; Since source is particularly heavy (16MiB+), let's reuse it + ;; across the different components of cl-ffi-gtk. + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((glib-source (string-append (assoc-ref inputs "cl-cffi-gtk-glib") + "/share/common-lisp/sbcl-source/" + "cl-cffi-gtk-glib")) + (out-source (string-append (assoc-ref outputs "out") + "/share/common-lisp/sbcl-source/" + "cl-cffi-gtk-gdk-pixbuf"))) + (delete-file-recursively out-source) + (symlink glib-source out-source) + #t))))))))) (define-public sbcl-cl-cffi-gtk-gdk (package (inherit sbcl-cl-cffi-gtk-boot0) (name "sbcl-cl-cffi-gtk-gdk") (inputs - `(("gtk" ,gtk+) - ("cl-cffi-gtk-glib" ,sbcl-cl-cffi-gtk-glib) + `(("cl-cffi-gtk-glib" ,sbcl-cl-cffi-gtk-glib) ("cl-cffi-gtk-gobject" ,sbcl-cl-cffi-gtk-gobject) ("cl-cffi-gtk-gio" ,sbcl-cl-cffi-gtk-gio) ("cl-cffi-gtk-gdk-pixbuf" ,sbcl-cl-cffi-gtk-gdk-pixbuf) @@ -3082,32 +3079,23 @@ is a library for creating graphical user interfaces.") ("cl-cffi-gtk-pango" ,sbcl-cl-cffi-gtk-pango) ,@(package-inputs sbcl-cl-cffi-gtk-boot0))) (arguments - `(#:asd-file "gdk/cl-cffi-gtk-gdk.asd" - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-paths - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "gdk/gdk.init.lisp" - (("libgdk" all) - (string-append - (assoc-ref inputs "gtk") "/lib/" all))) - (substitute* "gdk/gdk.package.lisp" - (("libgtk" all) - (string-append - (assoc-ref inputs "gtk") "/lib/" all))))) - (add-after 'install 'link-source - ;; Since source is particularly heavy (16MiB+), let's reuse it - ;; across the different components of cl-ffi-gtk. - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((glib-source (string-append (assoc-ref inputs "cl-cffi-gtk-glib") - "/share/common-lisp/sbcl-source/" - "cl-cffi-gtk-glib")) - (out-source (string-append (assoc-ref outputs "out") - "/share/common-lisp/sbcl-source/" - "cl-cffi-gtk-gdk"))) - (delete-file-recursively out-source) - (symlink glib-source out-source) - #t)))))))) + (substitute-keyword-arguments (package-arguments sbcl-cl-cffi-gtk-boot0) + ((#:asd-file _ "") "gdk/cl-cffi-gtk-gdk.asd") + ((#:phases phases) + `(modify-phases ,phases + (add-after 'install 'link-source + ;; Since source is particularly heavy (16MiB+), let's reuse it + ;; across the different components of cl-ffi-gtk. + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((glib-source (string-append (assoc-ref inputs "cl-cffi-gtk-glib") + "/share/common-lisp/sbcl-source/" + "cl-cffi-gtk-glib")) + (out-source (string-append (assoc-ref outputs "out") + "/share/common-lisp/sbcl-source/" + "cl-cffi-gtk-gdk"))) + (delete-file-recursively out-source) + (symlink glib-source out-source) + #t))))))))) (define-public sbcl-cl-cffi-gtk (package @@ -3122,26 +3110,27 @@ is a library for creating graphical user interfaces.") (native-inputs `(("fiveam" ,sbcl-fiveam))) (arguments - `(#:asd-file "gtk/cl-cffi-gtk.asd" - #:test-asd-file "test/cl-cffi-gtk-test.asd" + (substitute-keyword-arguments (package-arguments sbcl-cl-cffi-gtk-boot0) + ((#:asd-file _ "") "gtk/cl-cffi-gtk.asd") + ((#:test-asd-file _ "") "test/cl-cffi-gtk-test.asd") ;; TODO: Tests fail with memory fault. ;; See https://github.com/Ferada/cl-cffi-gtk/issues/24. - #:tests? #f - #:phases - (modify-phases %standard-phases - (add-after 'install 'link-source - ;; Since source is particularly heavy (16MiB+), let's reuse it - ;; across the different components of cl-ffi-gtk. - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((glib-source (string-append (assoc-ref inputs "cl-cffi-gtk-glib") - "/share/common-lisp/sbcl-source/" - "cl-cffi-gtk-glib")) - (out-source (string-append (assoc-ref outputs "out") - "/share/common-lisp/sbcl-source/" - "cl-cffi-gtk"))) - (delete-file-recursively out-source) - (symlink glib-source out-source) - #t)))))))) + ((#:tests? _ #f) #f) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'install 'link-source + ;; Since source is particularly heavy (16MiB+), let's reuse it + ;; across the different components of cl-ffi-gtk. + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((glib-source (string-append (assoc-ref inputs "cl-cffi-gtk-glib") + "/share/common-lisp/sbcl-source/" + "cl-cffi-gtk-glib")) + (out-source (string-append (assoc-ref outputs "out") + "/share/common-lisp/sbcl-source/" + "cl-cffi-gtk"))) + (delete-file-recursively out-source) + (symlink glib-source out-source) + #t))))))))) (define-public cl-cffi-gtk (sbcl-package->cl-source-package sbcl-cl-cffi-gtk)) -- cgit v1.2.3 From cf1518f581fc9ff7dc42a07fb06ebb4273668490 Mon Sep 17 00:00:00 2001 From: Ekaitz Zarraga Date: Wed, 20 May 2020 18:18:23 +0200 Subject: gnu: Add libfreenect. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/openkinect.scm: New file. * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. Signed-off-by: 宋文武 --- gnu/local.mk | 1 + gnu/packages/openkinect.scm | 141 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 142 insertions(+) create mode 100644 gnu/packages/openkinect.scm (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 91f094ce0f..1d9de9a57e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -394,6 +394,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/nvi.scm \ %D%/packages/ocaml.scm \ %D%/packages/ocr.scm \ + %D%/packages/openkinect.scm \ %D%/packages/onc-rpc.scm \ %D%/packages/opencl.scm \ %D%/packages/openbox.scm \ diff --git a/gnu/packages/openkinect.scm b/gnu/packages/openkinect.scm new file mode 100644 index 0000000000..536eb5a6fd --- /dev/null +++ b/gnu/packages/openkinect.scm @@ -0,0 +1,141 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2020 Ekaitz Zarraga +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages openkinect) + #:use-module (guix packages) + #:use-module (guix git-download) + #:use-module (guix build-system cmake) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages libusb) + #:use-module (gnu packages python) + #:use-module (gnu packages python-xyz) + #:use-module (gnu packages gl) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages image-processing)) + +(define-public libfreenect + (let ((version "0.6.1")) + (package + (name "libfreenect") + (version version) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/OpenKinect/libfreenect") + (commit (string-append "v" version)))) + (sha256 + (base32 + "0was1va167rqshmpn382h36yyprpfi9cwillb6ylppmnfdrfrhrr")))) + (build-system cmake-build-system) + (arguments + '(#:tests? #f ; package has no tests + #:configure-flags + '("-DBUILD_FAKENECT=ON" + "-DBUILD_CPP=ON" + "-DBUILD_EXAMPLES=OFF" ; available in libfreenect-examples + "-DBUILD_CV=OFF" ; available in libfreenect-cv + "-DBUILD_PYTHON=OFF" ; available in python-libfreenect + "-DBUILD_C_SYNC=ON") + #:phases + (modify-phases %standard-phases + (add-after 'install 'install-udev-rules + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (rules-out (string-append out "/lib/udev/rules.d"))) + (install-file "../source/platform/linux/udev/51-kinect.rules" + (string-append rules-out "51-kinect.rules")) + #t)))))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("libusb" ,libusb))) + (synopsis "Drivers and libraries for the Xbox Kinect device") + (description "libfreenect is a userspace driver for the Microsoft Kinect. +It supports: RGB and Depth Images, Motors, Accelerometer, LED and Audio.") + (home-page "https://openkinect.org/") + (license license:gpl2+)))) + +;; Library are already compiled in libfreenect, avoid build it again. +(define libfreenect-derived-phases + '(modify-phases %standard-phases + (add-after 'unpack 'patch-CMakeLists.txt + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "CMakeLists.txt" + ((".*libusb.*") "") + (("add_subdirectory \\(src\\)") "") + ((".*libfreenectConfig.cmake.*") "")) + #t)))) + +(define-public libfreenect-examples + (package + (inherit libfreenect) + (name "libfreenect-examples") + (inputs + `(("libfreenect" ,libfreenect) + ("glut" ,freeglut))) + (arguments + `(#:tests? #f ; package has no tests + #:configure-flags '("-DBUILD_EXAMPLES=ON" + "-DBUILD_FAKENECT=OFF" + "-DBUILD_CPP=OFF" + "-DBUILD_C_SYNC=OFF" + "-DBUILD_CV=OFF") + #:phases ,libfreenect-derived-phases)) + (synopsis "Examples for libfreenect, the Xbox Kinect device library"))) + +(define-public libfreenect-opencv + (package + (inherit libfreenect) + (name "libfreenect-opencv") + (inputs + `(("libfreenect" ,libfreenect) + ("opencv" ,opencv))) + (arguments + `(#:tests? #f ; package has no tests + #:configure-flags '("-DBUILD_EXAMPLES=OFF" + "-DBUILD_FAKENECT=OFF" + "-DBUILD_CPP=OFF" + "-DBUILD_C_SYNC=OFF" + "-DBUILD_CV=ON") + #:phases ,libfreenect-derived-phases)) + (synopsis "OpenCV wrapper for libfreenect, the Xbox Kinect device +library"))) + +(define-public python-libfreenect + (package + (inherit libfreenect) + (name "python-libfreenect") + (native-inputs + `(("python-cython" ,python-cython))) + (inputs + `(("libfreenect" ,libfreenect))) + (propagated-inputs + `(("python" ,python) + ("python-numpy" ,python-numpy))) + (arguments + `(#:tests? #f ; package has no tests + #:configure-flags '("-DBUILD_EXAMPLES=OFF" + "-DBUILD_FAKENECT=OFF" + "-DBUILD_CPP=OFF" + "-DBUILD_C_SYNC=OFF" + "-DBUILD_CV=OFF" + "-DBUILD_PYTHON3=ON") + #:phases ,libfreenect-derived-phases)) + (synopsis "Python wrapper for libfreenect, the Xbox Kinect device +library"))) -- cgit v1.2.3 From ab82124f0ea186b1fb054c69085c7c5b7e1dc2ae Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Mon, 18 May 2020 17:52:42 +0100 Subject: gnu: Add perl-test-distribution. * gnu/packages/perl-check.scm (perl-test-distribution): New variable. --- gnu/packages/perl-check.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/perl-check.scm b/gnu/packages/perl-check.scm index 0031b46948..ccd9279f3a 100644 --- a/gnu/packages/perl-check.scm +++ b/gnu/packages/perl-check.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2018 Oleg Pykhalov ;;; Copyright © 2018 Pierre Neidhardt ;;; Copyright © 2018 Kei Kebreau +;;; Copyright © 2020 Paul Garlick ;;; ;;; This file is part of GNU Guix. ;;; @@ -457,6 +458,40 @@ files, as well as to verify that there are no missing or unknown files.") @file{MANIFEST} file matches its distribution.") (license perl-license))) +(define-public perl-test-distribution + (package + (name "perl-test-distribution") + (version "2.00") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://cpan/authors/id/S/SR/SRSHAH/Test-Distribution-" + version ".tar.gz")) + (sha256 + (base32 + "0s1bj459qaw2x1fckklv9irpf3mr8gp2cm9vlyrb5dyanrzx1v2h")))) + (build-system perl-build-system) + (native-inputs + `(("perl-module-build" ,perl-module-build))) + (propagated-inputs + `(("perl-file-find-rule" ,perl-file-find-rule) + ("perl-pod-coverage" ,perl-pod-coverage) + ("perl-test-pod" ,perl-test-pod) + ("perl-test-pod-coverage" ,perl-test-pod-coverage))) + (home-page "https://metacpan.org/release/Test-Distribution") + (synopsis "Perform tests on all modules of a distribution") + (description "When used in a test script @code{Test::Distribution} +goes through all the modules in your distribution, checks their POD, +checks that they compile successfully and checks that they all define +a $VERSION. In addition, this module performs a number of tests on +the distribution itself. It checks that the distributed files match +the SIGNATURE file, if that file exists. It checks that the +distribution is not missing any core description files. It also +checks that the complete set of pre-requisite packages are listed in +the Makefile.PL file.") + (license perl-license))) + (define-public perl-test-eol (package (name "perl-test-eol") -- cgit v1.2.3 From e5082a1e6a3cf54fc1439d350c84210c18ae9557 Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Tue, 19 May 2020 11:48:07 +0100 Subject: gnu: Add perl-datetime-format-iso8601. * gnu/packages/perl.scm (perl-datetime-format-iso8601): New variable. --- gnu/packages/perl.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index d32e7b6ece..220519cde1 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -3079,6 +3079,34 @@ formats, as defined in RFC 2445. It can be used to parse these formats in order to create the appropriate objects.") (license (package-license perl)))) +(define-public perl-datetime-format-iso8601 + (package + (name "perl-datetime-format-iso8601") + (version "0.08") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://cpan/authors/id/J/JH/JHOBLITT/DateTime-Format-ISO8601-" + version ".tar.gz")) + (sha256 + (base32 + "1syccqd5jlwms8v78ksnf68xijzl97jky5vbwhnyhxi5gvgfx8xk")))) + (build-system perl-build-system) + (native-inputs + `(("perl-module-build" ,perl-module-build))) + (propagated-inputs + `(("perl-datetime" ,perl-datetime) + ("perl-datetime-format-builder" ,perl-datetime-format-builder) + ("perl-file-find-rule" ,perl-file-find-rule) + ("perl-test-distribution" ,perl-test-distribution) + ("perl-test-pod" ,perl-test-pod))) + (home-page "https://metacpan.org/release/DateTime-Format-ISO8601") + (synopsis "Parse ISO8601 date and time formats") + (description "@code{DateTime::Format::ISO8601} is a DateTime +extension that parses almost all ISO8601 date and time formats.") + (license perl-license))) + (define-public perl-datetime-format-natural (package (name "perl-datetime-format-natural") -- cgit v1.2.3 From f2a53a4a9cd47ddab00d0e1116acc934a90e8f7e Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Wed, 20 May 2020 10:52:19 +0100 Subject: gnu: perl-xml-feed: Add missing inputs. * gnu/packages/xml.scm (perl-xml-feed)[inputs]: Add perl-datetime-format-flexible, perl-datetime-format-iso8601 and perl-datetime-format-natural. --- gnu/packages/xml.scm | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 51ac6d44d1..417b1fb402 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -22,6 +22,7 @@ ;;; Copyright © 2018 Pierre Neidhardt ;;; Copyright © 2018 Jack Hill ;;; Copyright © 2019 Giacomo Leidi +;;; Copyright © 2020 Paul Garlick ;;; ;;; This file is part of GNU Guix. ;;; @@ -826,7 +827,10 @@ server, collect the answer, and finally decoding the XML to Perl.") (inputs `(("perl-class-errorhandler" ,perl-class-errorhandler) ("perl-datetime" ,perl-datetime) + ("perl-datetime-format-flexible" ,perl-datetime-format-flexible) + ("perl-datetime-format-iso8601" ,perl-datetime-format-iso8601) ("perl-datetime-format-mail" ,perl-datetime-format-mail) + ("perl-datetime-format-natural" ,perl-datetime-format-natural) ("perl-datetime-format-w3cdtf" ,perl-datetime-format-w3cdtf) ("perl-feed-find" ,perl-feed-find) ("perl-html-parser" ,perl-html-parser) -- cgit v1.2.3 From 2ee918777b456bf3d00e62fed1c7c51491ff8a30 Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Wed, 20 May 2020 12:59:11 +0100 Subject: gnu: perl-xml-feed: Enable tests. * gnu/packages/xml.scm (perl-xml-feed)[arguments]: Remove field. --- gnu/packages/xml.scm | 2 -- 1 file changed, 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 417b1fb402..be00981e57 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -818,8 +818,6 @@ server, collect the answer, and finally decoding the XML to Perl.") (base32 "1z1a88bpy64j42bbyl8acbfl3dn9iaz47gx6clkgy5sbn4kr0kgk")))) (build-system perl-build-system) - (arguments - `(#:tests? #f)) ; tests require internet connection (native-inputs `(("perl-module-build" ,perl-module-build) ("perl-uri" ,perl-uri) -- cgit v1.2.3 From 40b793fd51fde559d44b2d9d5a984377946ef944 Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Wed, 20 May 2020 23:42:07 +0100 Subject: gnu: perl-xml-feed: Propagate inputs. * gnu/packages/xml.scm (perl-xml-feed)[inputs]: Move to... [propagated-inputs]: ...here. --- gnu/packages/xml.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index be00981e57..d9efd5264b 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -822,7 +822,7 @@ server, collect the answer, and finally decoding the XML to Perl.") `(("perl-module-build" ,perl-module-build) ("perl-uri" ,perl-uri) ("perl-class-data-inheritable" ,perl-class-data-inheritable))) - (inputs + (propagated-inputs `(("perl-class-errorhandler" ,perl-class-errorhandler) ("perl-datetime" ,perl-datetime) ("perl-datetime-format-flexible" ,perl-datetime-format-flexible) -- cgit v1.2.3 From a7f89f97b73a732b7333b21e95946ed4c794b121 Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Thu, 21 May 2020 13:10:08 +0100 Subject: gnu: ikiwiki: Add missing input. * gnu/packages/web.scm (ikiwiki)[inputs]: Add perl-xml-feed. [arguments]: Add 'pre-check' phase. --- gnu/packages/web.scm | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index baea844e4f..cf9bff8b3b 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4876,6 +4876,13 @@ NetSurf project.") (invoke "find" "doc" "underlays" "-type" "f" "-exec" "touch" "{}" "+") #t)) + (add-before 'check 'pre-check + ;; XDG_DATA_DIRS is needed by the podcast.t test. + (lambda* (#:key inputs #:allow-other-keys) + (setenv "XDG_DATA_DIRS" + (string-append (assoc-ref inputs "shared-mime-info") + "/share")) + #t)) (add-after 'install 'wrap-programs (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -4907,6 +4914,7 @@ NetSurf project.") ("perl-lwpx-paranoidagent" ,perl-lwpx-paranoidagent) ("perl-mail-sendmail" ,perl-mail-sendmail) ("perl-timedate" ,perl-timedate) + ("perl-xml-feed" ,perl-xml-feed) ("perl-xml-sax" ,perl-xml-sax) ("perl-xml-simple" ,perl-xml-simple) ("perl-xml-twig" ,perl-xml-twig) -- cgit v1.2.3 From 1ee8b7192c761136f9d4aa3e32b940360dc888df Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 21 May 2020 04:04:35 +0200 Subject: gnu: criu: Download sources over HTTPS. * gnu/packages/virtualization.scm (criu)[source]: Use HTTPS. --- gnu/packages/virtualization.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 27527b4116..e0b9a21e72 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -748,7 +748,7 @@ domains, their live performance and resource utilization statistics.") (version "3.14") (source (origin (method url-fetch) - (uri (string-append "http://download.openvz.org/criu/criu-" + (uri (string-append "https://download.openvz.org/criu/criu-" version ".tar.bz2")) (sha256 (base32 -- cgit v1.2.3 From c1ab9e881a0a5ba840ddb998dd7c60f6649f0f69 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 21 May 2020 04:00:06 +0200 Subject: gnu: uhttpmock: Don't use NAME in source URI. * gnu/packages/web.scm (uhttpmock)[source]: Hard-code NAME. --- gnu/packages/web.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index cf9bff8b3b..0aaa5e80bb 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4676,7 +4676,7 @@ you'd expect.") (origin (method url-fetch) (uri (string-append "http://tecnocode.co.uk/downloads/uhttpmock/" - name "-" version ".tar.xz")) + "uhttpmock-" version ".tar.xz")) (sha256 (base32 "0glyx07kxc3s3cx5vp30kfgscl9q6bghcq1zysfyxm24r0h6j58p")))) (build-system glib-or-gtk-build-system) -- cgit v1.2.3 From 1476ea0e55f7f644e920e90f48f7d545e24db25a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 21 May 2020 13:59:15 +0200 Subject: gnu: mpop: Update to 1.4.9. * gnu/packages/mail.scm (mpop): Update to 1.4.9. --- gnu/packages/mail.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 63e8d1f91a..e3fd416dd9 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -2166,14 +2166,14 @@ converts them to maildir format directories.") (define-public mpop (package (name "mpop") - (version "1.4.7") + (version "1.4.9") (source (origin (method url-fetch) (uri (string-append "https://marlam.de/mpop/releases/" "mpop-" version ".tar.xz")) (sha256 - (base32 "0c6n5afn9pr4p7gxkv462lysrw52w9fhvavzm99c78dcp9dj5xnk")))) + (base32 "0hinmyd4lipy9wi3grwm72vv6xrpf4m08i9g9nlxzxnwfanw885q")))) (build-system gnu-build-system) (inputs `(("gnutls" ,gnutls))) -- cgit v1.2.3 From f2de892b375d30ad79502509a47a15f0f4d68fee Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 21 May 2020 14:52:01 +0200 Subject: gnu: http-parser: Fix build [and guix pull!] on i686-linux. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This follows up on commit 5c30eb61d74034a1b7c188b8d7be7df0b926025f. * gnu/packages/web.scm (http-parser)[source]: Apply the armhf patch not here… [arguments]: …but in a phase & only on armhf-linux. [native-inputs]: Add it on armhf-linux. --- gnu/packages/web.scm | 62 ++++++++++++++++++++++++++++++++-------------------- 1 file changed, 38 insertions(+), 24 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 0aaa5e80bb..f6fab8f036 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5920,30 +5920,28 @@ into your tests. It automatically starts up a HTTP server in a separate thread (name "http-parser") (version "2.9.4") (home-page "https://github.com/nodejs/http-parser") - (source (origin - (method git-fetch) - (uri (git-reference (url home-page) - (commit (string-append "v" version)))) - (sha256 - (base32 - "1vda4dp75pjf5fcph73sy0ifm3xrssrmf927qd1x8g3q46z0cv6c")) - (file-name (git-file-name name version)) - (patches - (cons* - (origin - ;; Treat an empty port (e.g. `http://hostname:/`) when parsing - ;; URLs as if no port were specified. This patch is applied - ;; to Fedora's http-parser and to libgit2's bundled version. - (method url-fetch) - (uri (string-append - "https://src.fedoraproject.org/rpms/http-parser/raw/" - "e89b4c4e2874c19079a5a1a2d2ccc61b551aa289/" - "f/0001-url-treat-empty-port-as-default.patch")) - (sha256 - (base32 - "0pbxf2nq9pcn299k2b2ls8ldghaqln9glnp79gi57mamx4iy0f6g"))) - ;; A fix for . - (search-patches "http-parser-fix-assertion-on-armhf.patch"))))) + (source + (origin + (method git-fetch) + (uri (git-reference (url home-page) + (commit (string-append "v" version)))) + (sha256 + (base32 "1vda4dp75pjf5fcph73sy0ifm3xrssrmf927qd1x8g3q46z0cv6c")) + (file-name (git-file-name name version)) + (patches + (list + (origin + ;; Treat an empty port (e.g. `http://hostname:/`) when parsing + ;; URLs as if no port were specified. This patch is applied + ;; to Fedora's http-parser and to libgit2's bundled version. + (method url-fetch) + (uri (string-append + "https://src.fedoraproject.org/rpms/http-parser/raw/" + "e89b4c4e2874c19079a5a1a2d2ccc61b551aa289/" + "f/0001-url-treat-empty-port-as-default.patch")) + (sha256 + (base32 + "0pbxf2nq9pcn299k2b2ls8ldghaqln9glnp79gi57mamx4iy0f6g"))))))) (build-system gnu-build-system) (arguments `(#:test-target "test" @@ -5956,6 +5954,14 @@ into your tests. It automatically starts up a HTTP server in a separate thread '("CC=gcc"))) #:phases (modify-phases %standard-phases + ,@(match (%current-system) + ("armhf-linux" + '((add-before 'check 'apply-assertion.patch + (lambda* (#:key inputs #:allow-other-keys) + (let ((patch (assoc-ref inputs "assertion.patch"))) + (invoke "patch" "-p1" "-i" patch) + #t))))) + (_ '())) ,@(if (%current-target-system) '((replace 'configure (lambda* (#:key target #:allow-other-keys) @@ -5966,6 +5972,14 @@ into your tests. It automatically starts up a HTTP server in a separate thread (string-append "AR=" target "-ar\n"))) #t))) '((delete 'configure)))))) + (native-inputs + `(,@(match (%current-system) + ("armhf-linux" + ;; A fix for which in turn + ;; breaks i686-linux builds. + `(("assertion.patch" + ,@(search-patches "http-parser-fix-assertion-on-armhf.patch")))) + (_ '())))) (synopsis "HTTP request/response parser for C") (description "This is a parser for HTTP messages written in C. It parses both requests and responses. The parser is designed to be used in -- cgit v1.2.3 From 276d7115182b5d0ae1d21a7c0c55cf391300eb0d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 21 May 2020 16:00:07 +0300 Subject: gnu: gnuastro: Update to 0.12. * gnu/packages/astronomy.scm (gnuastro): Update to 0.12. --- gnu/packages/astronomy.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 7261c62978..2c97ef08d3 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 John Darrington ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice -;;; Copyright © 2018, 2019 Efraim Flashner +;;; Copyright © 2018, 2019, 2020 Efraim Flashner ;;; Copyright © 2019 by Amar Singh ;;; Copyright © 2020 R Veera Kumar ;;; Copyright © 2020 Guillaume Le Vaillant @@ -128,7 +128,7 @@ header.") (define-public gnuastro (package (name "gnuastro") - (version "0.11") + (version "0.12") (source (origin (method url-fetch) @@ -136,7 +136,7 @@ header.") version ".tar.lz")) (sha256 (base32 - "0c1yc2qb7vrqad96savfn06rn01izlfz0va738signv93qqj5k3v")))) + "0ypk1c72q778cixfa52vjxzbd5m4qc6hfjgnipy16sfa7mnspmyf")))) (inputs `(("cfitsio" ,cfitsio) ("gsl" ,gsl) -- cgit v1.2.3 From c8b8e612dddf6249fafbaa34cedfb459f92a52b6 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 21 May 2020 16:51:38 +0300 Subject: gnu: gnuastro: Don't build static libraries. * gnu/packages/astronomy.scm (gnuastro)[arguments]: Add configure-flag to skip building static libraries. --- gnu/packages/astronomy.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 2c97ef08d3..5b4590945d 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -137,6 +137,9 @@ header.") (sha256 (base32 "0ypk1c72q778cixfa52vjxzbd5m4qc6hfjgnipy16sfa7mnspmyf")))) + (build-system gnu-build-system) + (arguments + '(#:configure-flags '("--disable-static"))) (inputs `(("cfitsio" ,cfitsio) ("gsl" ,gsl) @@ -147,7 +150,6 @@ header.") (native-inputs `(("libtool" ,libtool) ("lzip" ,lzip))) - (build-system gnu-build-system) (home-page "https://www.gnu.org/software/gnuastro/") (synopsis "Astronomy utilities") (description "The GNU Astronomy Utilities (Gnuastro) is a suite of -- cgit v1.2.3 From a011f67b07e463d7da0f790bdbc4ea0d9274f6dc Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 21 May 2020 11:07:14 +0200 Subject: gnu: ruby-fakefs: Fix lonely parens. * gnu/packages/ruby.scm (ruby-fakefs)[arguments]: Move dangling parents up. --- gnu/packages/ruby.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 97789c1f40..94b16957e0 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -1572,8 +1572,7 @@ a Ruby object.") (substitute* "fakefs.gemspec" (("(.*add_development_dependency .*), .*" _ dep) (string-append dep "\n"))) - #t)) - ))) + #t))))) (native-inputs `(("ruby-bump" ,ruby-bump) ("ruby-maxitest" ,ruby-maxitest) -- cgit v1.2.3 From 29f4bb2e91ffe0da8f87832c909a33d51042a3bd Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 21 May 2020 20:11:07 +0200 Subject: gnu: cogl: Update to 1.22.6. * gnu/packages/gnome.scm (cogl): Update to 1.22.6. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 092f9fcb00..c523df50c3 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4440,7 +4440,7 @@ throughout GNOME for API documentation).") (define-public cogl (package (name "cogl") - (version "1.22.4") + (version "1.22.6") (source (origin (method url-fetch) @@ -4448,7 +4448,7 @@ throughout GNOME for API documentation).") (version-major+minor version) "/" "cogl-" version ".tar.xz")) (sha256 - (base32 "1q0drs82a8f6glg1v29bb6g2nf15fw0rvdx3d0rgcgfarfaby5sj")))) + (base32 "0x8v4n61q89qy27v824bqswpz6bmn801403w2q3pa1lcwk9ln4vd")))) ;; NOTE: mutter exports a bundled fork of cogl, so when making changes to ;; cogl, corresponding changes may be appropriate in mutter as well. (build-system gnu-build-system) -- cgit v1.2.3 From b4f04e0efff1fb6112b84dc6d36ea46215c336b2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 21 May 2020 21:03:05 +0200 Subject: gnu: cogl: Enable tests. * gnu/packages/gnome.scm (cogl)[native-inputs]: Add XORG-SERVER-FOR-TESTS. [arguments]: Remove #:tests?. Add #:disallowed-references. Add #:phases to prepare test environment. --- gnu/packages/gnome.scm | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index c523df50c3..938efbcdf3 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4455,7 +4455,7 @@ throughout GNOME for API documentation).") (native-inputs `(("glib:bin" ,glib "bin") ; for glib-mkenums ("gobject-introspection" ,gobject-introspection) - ;;("xorg-server" ,xorg-server) ; for the test suite + ("xorg-server" ,xorg-server-for-tests) ("pkg-config" ,pkg-config))) (propagated-inputs `(("glib" ,glib) @@ -4474,7 +4474,8 @@ throughout GNOME for API documentation).") ("gst-plugins-base" ,gst-plugins-base) ("wayland" ,wayland))) (arguments - `(#:configure-flags (list "--enable-cogl-gst" + `(#:disallowed-references (,xorg-server-for-tests) + #:configure-flags (list "--enable-cogl-gst" "--enable-wayland-egl-platform" "--enable-wayland-egl-server" @@ -4483,19 +4484,18 @@ throughout GNOME for API documentation).") (string-append "--with-gl-libname=" (assoc-ref %build-inputs "mesa") "/lib/libGL.so")) - ;; XXX FIXME: All tests fail, with many warnings printed like this: - ;; _FontTransOpen: Unable to Parse address - ;; ${prefix}/share/fonts/X11/misc/ - #:tests? #f - #; #:phases - #; + #: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 (format #f "~a/bin/Xvfb :1 &" - (assoc-ref inputs "xorg-server"))) - (setenv "DISPLAY" ":1") + (lambda* (#:key tests? inputs #:allow-other-keys) + (if tests? + (begin + ;; The test suite requires a running X server. + (system (format #f "~a/bin/Xvfb :1 +extension GLX &" + (assoc-ref inputs "xorg-server"))) + (setenv "DISPLAY" ":1") + #t) + (format #t "test suite not run~%")) #t))))) (home-page "https://www.cogl3d.org") (synopsis "Object oriented GL/GLES Abstraction/Utility Layer") -- cgit v1.2.3