From 515ca4794b26d48901611e46f0e7c6c5ee3b64d7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 11 Apr 2020 00:06:57 +0200 Subject: gnu: thunar: Update to 1.8.14. * gnu/packages/xfce.scm (thunar): Update to 1.8.14. --- gnu/packages/xfce.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index ae2f0f2dab..4b88e97095 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -647,7 +647,7 @@ like appearance, display, keyboard and mouse settings.") (define-public thunar (package (name "thunar") - (version "1.8.12") + (version "1.8.14") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/xfce/" @@ -655,7 +655,7 @@ like appearance, display, keyboard and mouse settings.") "thunar-" version ".tar.bz2")) (sha256 (base32 - "1y1548jrx93c9v8ks60mkd9sx5xl69fmwh1pbr9gsnqz1gp5na99")))) + "17r1z8cyp709lz38w7b5vqi1zbgm2i3sqvdvicsbvma2b0gppica")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From fd13a65cda0fb50877d7bbe10acbf05f5a16cce6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 11 Apr 2020 00:18:05 +0200 Subject: gnu: libdca: Update to 0.0.7. * gnu/packages/video.scm (libdca): Update to 0.0.7. [native-inputs]: Add autoconf, automake, and libtool. --- gnu/packages/video.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index a1700cb392..ba1fb66a48 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -758,7 +758,7 @@ canvas operations.") (define-public libdca (package (name "libdca") - (version "0.0.6") + (version "0.0.7") (source (origin (method url-fetch) (uri (string-append @@ -766,8 +766,12 @@ canvas operations.") version "/libdca-" version ".tar.bz2")) (sha256 (base32 - "0h0zvcn97i9kyljdpifzi8in9xnw31fx3b3ggj96p8h0l2d8mycq")))) + "0sjz0s0nrv7jcpvh1i432x3jza0y5yycmzw84cfncb2qby0i62rs")))) (build-system gnu-build-system) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool))) (home-page "https://www.videolan.org/developers/libdca.html") (synopsis "DTS Coherent Acoustics decoder") (description "libdca is a library for decoding DTS Coherent Acoustics -- cgit v1.2.3 From 9a71213e3344383bc937ccfdd4efe965b5935821 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 11 Apr 2020 03:18:26 +0200 Subject: gnu: dbacl: Update to 1.14.1. * gnu/packages/textutils.scm (dbacl): Update to 1.14.1. [source]: Add patch to fix build with current glibc. [arguments]: (Try to) bootstrap only once. * gnu/packages/patches/dbacl-include-locale.h.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/patches/dbacl-include-locale.h.patch | 36 +++++++++++++++++++++++ gnu/packages/textutils.scm | 20 ++++++------- 3 files changed, 47 insertions(+), 10 deletions(-) create mode 100644 gnu/packages/patches/dbacl-include-locale.h.patch diff --git a/gnu/local.mk b/gnu/local.mk index 73f9d5d69c..aba58ae03a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -824,6 +824,7 @@ dist_patch_DATA = \ %D%/packages/patches/cvs-CVE-2017-12836.patch \ %D%/packages/patches/date-output-pkg-config-files.patch \ %D%/packages/patches/darkice-workaround-fpermissive-error.patch \ + %D%/packages/patches/dbacl-include-locale.h.patch \ %D%/packages/patches/dbus-helper-search-path.patch \ %D%/packages/patches/dbus-c++-gcc-compat.patch \ %D%/packages/patches/dbus-c++-threading-mutex.patch \ diff --git a/gnu/packages/patches/dbacl-include-locale.h.patch b/gnu/packages/patches/dbacl-include-locale.h.patch new file mode 100644 index 0000000000..40d5d0aa44 --- /dev/null +++ b/gnu/packages/patches/dbacl-include-locale.h.patch @@ -0,0 +1,36 @@ +From: Tobias Geerinckx-Rice +Date: Sat, 11 Apr 2020 03:02:04 +0200 +Subject: [PATCH] gnu: dbacl: Include in dbacl.h. + +Copied verbatim[0] from Debian. + +[0]: https://sources.debian.org/data/main/d/dbacl/1.14.1-2/debian/patches/05-locale-h.patch + +Description: Add missing include in dbacl.h +Author: Fabian Wolff +Bug-Debian: https://bugs.debian.org/916182 +Last-Update: 2019-08-25 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/src/dbacl.h ++++ b/src/dbacl.h +@@ -21,6 +21,8 @@ + #ifndef DBACL_H + #define DBACL_H + ++#include ++ + #ifdef HAVE_CONFIG_H + #undef HAVE_CONFIG_H + #include "config.h" +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -28,7 +28,7 @@ + # stuff_SOURCES = stuff.c stuff.h fram.c stuff-lexer.l stuff-parser.y stuff-parser.h probs.c util.c util.h $(PUBDOM) + # stuff_LDADD = @LEXLIB@ + +-AM_CFLAGS = -funsigned-char -std=c99 -Wall -pedantic $(CFLAGSIEEE) -O3 ++AM_CFLAGS = -funsigned-char -std=c99 -D_XOPEN_SOURCE=700 -Wall -pedantic $(CFLAGSIEEE) -O3 + AM_YFLAGS = -d + + CLEANFILES = mailcross mailtoe mailfoot diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index 8510c6d1d0..62988ec574 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -13,7 +13,7 @@ ;;; Copyright © 2017,2019 Hartmut Goebel ;;; Copyright © 2017 Kei Kebreau ;;; Copyright © 2017 Alex Vong -;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018 Pierre Neidhardt ;;; Copyright © 2018 Meiyo Peng ;;; Copyright © 2019 Yoshinori Arai @@ -612,15 +612,15 @@ in a portable way.") (define-public dbacl (package (name "dbacl") - (version "1.14") + (version "1.14.1") (source (origin (method url-fetch) - (uri (string-append "http://www.lbreyer.com/gpl/" + (uri (string-append "mirror://sourceforge/dbacl/dbacl/" version "/" "dbacl-" version ".tar.gz")) (sha256 - (base32 - "0224g6x71hyvy7jikfxmgcwww1r5lvk0jx36cva319cb9nmrbrq7")))) + (base32 "1gas0112wqjvwn9qg3hxnawk7h3prr0w9b2h68f3p1ifd1kzn3gz")) + (patches (search-patches "dbacl-include-locale.h.patch")))) (build-system gnu-build-system) (arguments `(#:make-flags @@ -648,10 +648,6 @@ in a portable way.") (lambda _ (delete-file "src/tests/dbacl-jap.shin") #t)) - (add-after 'delete-sample6-and-japanese 'autoreconf - (lambda _ - (invoke "autoreconf" "-vif") - #t)) (add-after 'unpack 'fix-test-files (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -661,7 +657,11 @@ in a portable way.") "#PATH=/bin:/usr/bin") (("diff") (string-append (which "diff"))) (("tr") (string-append (which "tr")))) - #t)))))) + #t))) + (replace 'bootstrap + (lambda _ + (invoke "autoreconf" "-vif") + #t))))) (inputs `(("ncurses" ,ncurses) ("perl" ,perl) -- cgit v1.2.3 From b10bf8e31f430b38a547cc6317a537f467948db7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 11 Apr 2020 03:28:13 +0200 Subject: gnu: tig: Update to 2.5.1. * gnu/packages/version-control.scm (tig): Update to 2.5.1. [arguments]: #:test-target is correct even if all #:tests? can't run. --- gnu/packages/version-control.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index fdbfab2fa4..5b75aee366 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1934,7 +1934,7 @@ from Subversion to any supported Distributed Version Control System (DVCS).") (define-public tig (package (name "tig") - (version "2.5.0") + (version "2.5.1") (source (origin (method url-fetch) (uri (string-append @@ -1942,7 +1942,7 @@ from Subversion to any supported Distributed Version Control System (DVCS).") version "/tig-" version ".tar.gz")) (sha256 (base32 - "1x5famvvs93ih7sr11x7m33dksb1k7zs1s3c4zkyf0cjmxkpqlzz")))) + "0r4y9hyvpkplaxrzslws3asz652d83qh3bjwvmp8assga8s5s3ah")))) (build-system gnu-build-system) (native-inputs `(("asciidoc" ,asciidoc) @@ -1956,8 +1956,8 @@ from Subversion to any supported Distributed Version Control System (DVCS).") (add-after 'install 'install-doc (lambda _ (invoke "make" "install-doc")))) - #:tests? #f)) ; tests require access to /dev/tty - ;; #:test-target "test")) + #:test-target "test" + #:tests? #f)) ; tests require access to /dev/tty (home-page "https://jonas.github.io/tig/") (synopsis "Ncurses-based text user interface for Git") (description -- cgit v1.2.3 From 59357790443eccf93bec33c4a13cd54712793d5f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 11 Apr 2020 04:00:41 +0200 Subject: gnu: syncthing: Update to 1.4.2. * gnu/packages/syncthing.scm (syncthing): Update to 1.4.2. --- gnu/packages/syncthing.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index 14aee33524..ae344541ea 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 Petter ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Leo Famulari +;;; Copyright © 2020 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -30,7 +31,7 @@ (define-public syncthing (package (name "syncthing") - (version "1.4.1") + (version "1.4.2") (source (origin (method url-fetch) (uri (string-append "https://github.com/syncthing/syncthing" @@ -38,7 +39,7 @@ "/syncthing-source-v" version ".tar.gz")) (sha256 (base32 - "0p1855n29rin2y8bjvmr7gkm18xd2j7js15l8nqcmyd33d60568z")) + "16dqpbn4saxmmmqd5ya8zdkwvxzz4nim1p4w954zkkdz3cyg86h6")) (modules '((guix build utils))) ;; Delete bundled ("vendored") free software source code. (snippet '(begin @@ -97,7 +98,7 @@ ("go-github-com-lucas-clemente-quic-go" ,go-github-com-lucas-clemente-quic-go) ("go-github-com-willf-bloom" ,go-github-com-willf-bloom) - ;; For tests + ;; For tests. ("go-github-com-d4l3k-messagediff" ,go-github-com-d4l3k-messagediff))) (arguments -- cgit v1.2.3 From 827813b5816930481e4781dee0316c2cdc16abdb Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 11 Apr 2020 04:13:59 +0200 Subject: gnu: supertux: Update to 0.6.1.1. * gnu/packages/games.scm (supertux): Update to 0.6.1.1. --- gnu/packages/games.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 45c5955644..4f5bca866e 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -4018,7 +4018,7 @@ with the \"Stamp\" tool within Tux Paint.") (define-public supertux (package (name "supertux") - (version "0.6.1") + (version "0.6.1.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/SuperTux/supertux/" @@ -4027,7 +4027,7 @@ with the \"Stamp\" tool within Tux Paint.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0lqch5gcq6ccnspy93z9r13bp8w2j1vrd8jhvk5kp4qhrd1f069s")) + "0n36qxwjlkdlksximz4s729az6pry2sdjavwgm7m65vfgdiz139f")) (patches (search-patches "supertux-unbundle-squirrel.patch")))) (arguments -- cgit v1.2.3 From a5ab71c73f595f690839f9027c507b50899776f4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 10 Apr 2020 23:40:24 +0200 Subject: gnu: openconnect: Update to 8.08. * gnu/packages/vpn.scm (openconnect): Update to 8.08. [propagated-inputs]: Use gnutls-3.6.13. * gnu/packages/tls.scm (gnutls-3.6.13): Export it. --- gnu/packages/tls.scm | 2 +- gnu/packages/vpn.scm | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index e8b3d88944..3eb32fc27a 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -245,7 +245,7 @@ required structures.") (properties '((ftp-server . "ftp.gnutls.org") (ftp-directory . "/gcrypt/gnutls"))))) -(define gnutls-3.6.13 +(define-public gnutls-3.6.13 (package (inherit gnutls) (version "3.6.A") diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index 444fb6a32b..739522959c 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -243,17 +243,17 @@ the user specifically asks to proxy, so the @dfn{VPN} interface no longer (define-public openconnect (package (name "openconnect") - (version "8.05") + (version "8.08") (source (origin (method url-fetch) (uri (string-append "ftp://ftp.infradead.org/pub/openconnect/" "openconnect-" version ".tar.gz")) (sha256 - (base32 "14i9q727c2zc9xhzp1a9hz3gzb5lwgsslbhircm84dnbs192jp1k")))) + (base32 "1s3rjdazx1n5izpcgz05p1sirm7kf4z3gh26dq2h2j5xmgmk0jxp")))) (build-system gnu-build-system) (propagated-inputs `(("libxml2" ,libxml2) - ("gnutls" ,gnutls) + ("gnutls" ,gnutls-3.6.13) ("zlib" ,zlib))) (inputs `(("vpnc-scripts" ,vpnc-scripts))) -- cgit v1.2.3 From 406130550912ee1254198b6349d7d7892e59217b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 10 Apr 2020 23:45:03 +0200 Subject: gnu: bubblewrap: Update to 0.4.1 [fixes CVE-2020-5291]. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Relevant only ‘[i]f bubblewrap is installed in setuid mode and the kernel supports unprivileged user namespaces’. Bubblewrap is not setuid by default on Guix System. * gnu/packages/virtualization.scm (bubblewrap): Update to 0.4.1. --- gnu/packages/virtualization.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 5bee79cbb4..0fded11f3a 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1083,7 +1083,7 @@ virtual machines.") (define-public bubblewrap (package (name "bubblewrap") - (version "0.4.0") + (version "0.4.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/containers/bubblewrap/" @@ -1091,7 +1091,7 @@ virtual machines.") version ".tar.xz")) (sha256 (base32 - "08r0f4c3fjkb4zjrb4kkax1zfcgcgic702vb62sjjw5xfhppvzp5")))) + "00ycgi6q2yngh06bnz50wkvar6r2jnjf3j158grhi9k13jdrpimr")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From 0493ead644196bb1c933719d4c0e63e665fd102d Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 10 Apr 2020 09:27:00 +0200 Subject: gnu: Merge ham-radio and sdr modules into radio module. * gnu/packages/ham-radio.scm: Rename to 'radio.scm'. * gnu/packages/sdr.scm: Remove file. (liquid-dsp): Move to ... * gnu/packages/radio.scm (liquid-dsp): ... here. * gnu/local.mk (GNU_SYSTEM_MODULES): Remove 'ham-radio.scm' and 'sdr.scm'. Add 'radio.scm'. --- gnu/local.mk | 3 +- gnu/packages/ham-radio.scm | 484 ------------------------------------------ gnu/packages/radio.scm | 514 +++++++++++++++++++++++++++++++++++++++++++++ gnu/packages/sdr.scm | 57 ----- 4 files changed, 515 insertions(+), 543 deletions(-) delete mode 100644 gnu/packages/ham-radio.scm create mode 100644 gnu/packages/radio.scm delete mode 100644 gnu/packages/sdr.scm diff --git a/gnu/local.mk b/gnu/local.mk index aba58ae03a..ac5fb0cfd1 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -256,7 +256,6 @@ GNU_SYSTEM_MODULES = \ %D%/packages/haskell-crypto.scm \ %D%/packages/haskell-web.scm \ %D%/packages/haskell-xyz.scm \ - %D%/packages/ham-radio.scm \ %D%/packages/hexedit.scm \ %D%/packages/hugs.scm \ %D%/packages/hurd.scm \ @@ -435,6 +434,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/toys.scm \ %D%/packages/tryton.scm \ %D%/packages/qt.scm \ + %D%/packages/radio.scm \ %D%/packages/ragel.scm \ %D%/packages/rails.scm \ %D%/packages/ratpoison.scm \ @@ -463,7 +463,6 @@ GNU_SYSTEM_MODULES = \ %D%/packages/scsi.scm \ %D%/packages/sdcc.scm \ %D%/packages/sdl.scm \ - %D%/packages/sdr.scm \ %D%/packages/search.scm \ %D%/packages/security-token.scm \ %D%/packages/selinux.scm \ diff --git a/gnu/packages/ham-radio.scm b/gnu/packages/ham-radio.scm deleted file mode 100644 index 56a9719414..0000000000 --- a/gnu/packages/ham-radio.scm +++ /dev/null @@ -1,484 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2017, 2018, 2019 Arun Isaac -;;; Copyright © 2019, 2020 Evan Straw -;;; Copyright © 2020 Guillaume Le Vaillant -;;; Copyright © 2020 Danny Milosavljevic -;;; Copyright © 2020 Charlie Ritter -;;; -;;; 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 ham-radio) - #:use-module ((guix licenses) #:prefix license:) - #:use-module (guix packages) - #:use-module (guix download) - #:use-module (guix git-download) - #:use-module (gnu packages algebra) - #:use-module (gnu packages audio) - #:use-module (gnu packages autotools) - #:use-module (gnu packages base) - #:use-module (gnu packages bash) - #:use-module (gnu packages boost) - #:use-module (gnu packages check) - #:use-module (gnu packages documentation) - #:use-module (gnu packages ghostscript) - #:use-module (gnu packages glib) - #:use-module (gnu packages gstreamer) - #:use-module (gnu packages gtk) - #:use-module (gnu packages image) - #:use-module (gnu packages libusb) - #:use-module (gnu packages linux) - #:use-module (gnu packages logging) - #:use-module (gnu packages maths) - #:use-module (gnu packages multiprecision) - #:use-module (gnu packages networking) - #:use-module (gnu packages pkg-config) - #:use-module (gnu packages pulseaudio) - #:use-module (gnu packages python) - #:use-module (gnu packages python-science) - #:use-module (gnu packages python-xyz) - #:use-module (gnu packages qt) - #:use-module (gnu packages sdr) - #:use-module (gnu packages sphinx) - #:use-module (gnu packages swig) - #:use-module (gnu packages tex) - #:use-module (gnu packages version-control) - #:use-module (gnu packages xml) - #:use-module (gnu packages xorg) - #:use-module (guix build-system cmake) - #:use-module (guix build-system glib-or-gtk) - #:use-module (guix build-system gnu) - #:use-module (guix build-system python) - #:use-module (guix build-system qt)) - -(define-public rtl-sdr - (package - (name "rtl-sdr") - (version "0.6.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "git://git.osmocom.org/rtl-sdr.git") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0lmvsnb4xw4hmz6zs0z5ilsah5hjz29g1s0050n59fllskqr3b8k")))) - (build-system cmake-build-system) - (inputs - `(("libusb" ,libusb))) - (native-inputs - `(("pkg-config" ,pkg-config))) - (arguments - `(#:configure-flags '("-DDETACH_KERNEL_DRIVER=ON") - #:tests? #f)) ; No tests - (home-page "https://osmocom.org/projects/sdr/wiki/rtl-sdr") - (synopsis "Software defined radio driver for Realtek RTL2832U") - (description "DVB-T dongles based on the Realtek RTL2832U can be used as a -cheap software defined radio, since the chip allows transferring the raw I/Q -samples to the host. @code{rtl-sdr} provides drivers for this purpose.") - (license license:gpl2+))) - -(define-public chirp - (package - (name "chirp") - (version "20181205") - (source - (origin - (method url-fetch) - (uri (string-append "https://trac.chirp.danplanet.com/chirp_daily/daily-" - version "/chirp-daily-" version ".tar.gz")) - (sha256 - (base32 - "1cp280b95j39xaxs50zn55jigg7pyfpm9n098hmsyxrplqn8z43c")))) - (build-system python-build-system) - (inputs - `(("python2-libxml2" ,python2-libxml2) - ("python2-pygtk" ,python2-pygtk) - ("python2-pyserial" ,python2-pyserial))) - (arguments - `(#:python ,python-2)) - (home-page "https://chirp.danplanet.com") - (synopsis "Cross-radio programming tool") - (description "Chirp is a cross-radio programming tool. It supports a -growing list of radios across several manufacturers and allows transferring of -memory contents between them.") - (license (list license:gpl3+ - license:lgpl3+)))) ; chirp/elib_intl.py - -(define-public aptdec - (package - (name "aptdec") - (version "1.7") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/csete/aptdec") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1hf0zb51qc6fyhdjxyij1n3vgwnw3cwksc3r11szbhkml14qjnzk")))) - (build-system gnu-build-system) - (inputs - `(("libpng" ,libpng) - ("libsndfile" ,libsndfile))) - (arguments - `(#:make-flags (list "CC=gcc") - #:tests? #f ; no tests - #:phases - (modify-phases %standard-phases - (delete 'configure) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (install-file "atpdec" (string-append out "/bin"))) - #t))))) - (home-page "https://github.com/csete/aptdec") - (synopsis "NOAA Automatic Picture Transmission (APT) decoder") - (description "Aptdec decodes Automatic Picture Transmission (APT) images. -These are medium resolution images of the Earth transmitted by, among other -satellites, the POES NOAA weather satellite series. These transmissions are -on a frequency of 137 MHz. They can be received using an inexpensive antenna -and a dedicated receiver.") - (license license:gpl2+))) - -(define-public redsea - (package - (name "redsea") - (version "0.18") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/windytan/redsea") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1y96g0ra2krjb2kypm8s5gdfia45yci4f36klsvyzg8d53v5cwhn")))) - (build-system gnu-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - ;; The configure.ac file does not explicitly link against libiconv - ;; except on Mac OS, causing the build to fail. This phase comments - ;; out the original AC_SUBST macro (located inside a conditional) and - ;; adds an explicit use of it underneath, so that libiconv is always - ;; linked against. - (add-after 'unpack 'patch-libiconv - (lambda _ - (substitute* "configure.ac" - (("^ +AC_SUBST") - "# AC_SUBST") - (("esac") - "esac\nAC_SUBST([ICONV], [\"-liconv\"])")) - #t))))) - (inputs - `(("libiconv" ,libiconv) - ("libsndfile" ,libsndfile) - ("liquid-dsp" ,liquid-dsp))) - (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake))) - (home-page "https://github.com/windytan/redsea") - (synopsis "Lightweight RDS to JSON decoder") - (description "redsea is a lightweight command-line @dfn{FM Radio Data -System} (FM-RDS) decoder. Redsea can be used with any RTL-SDR USB radio stick -with the rtl_fm tool, or any other @dfn{software-defined radio} (SDR) via -csdr, for example. It can also decode raw ASCII bitstream, the hex format -used by RDS Spy, and audio files containing @dfn{multiplex} signals (MPX).") - (license license:expat))) - -(define-public gnuradio - (package - (name "gnuradio") - (version "3.8.0.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://www.gnuradio.org/releases/gnuradio/" - "gnuradio-" version ".tar.xz")) - (sha256 - (base32 "0aw55gf5549b0fz2qdi7vplcmaf92bj34h40s34b2ycnqasv900r")))) - (build-system cmake-build-system) - (native-inputs - `(("doxygen" ,doxygen) - ("git" ,git-minimal) - ("ghostscript" ,ghostscript) - ("orc" ,orc) - ("pkg-config" ,pkg-config) - ("python" ,python) - ("python-cheetah" ,python-cheetah) - ("python-mako" ,python-mako) - ("python-pyzmq" ,python-pyzmq) - ("python-scipy" ,python-scipy) - ("python-sphinx" ,python-sphinx) - ("swig" ,swig) - ("texlive" ,(texlive-union (list texlive-amsfonts - texlive-latex-amsmath - ;; TODO: Add newunicodechar. - texlive-latex-graphics))) - ("xorg-server" ,xorg-server-for-tests))) - (inputs - `(("alsa-lib" ,alsa-lib) - ("boost" ,boost) - ("cairo" ,cairo) - ("codec2" ,codec2) - ("cppzmq" ,cppzmq) - ("fftwf" ,fftwf) - ("gmp" ,gmp) - ("gsl" ,gsl) - ("gsm" ,gsm) - ("gtk+" ,gtk+) - ("jack" ,jack-1) - ("log4cpp" ,log4cpp) - ("pango" ,pango) - ("portaudio" ,portaudio) - ("python-click" ,python-click) - ("python-click-plugins" ,python-click-plugins) - ("python-lxml" ,python-lxml) - ("python-numpy" ,python-numpy) - ("python-pycairo" ,python-pycairo) - ("python-pygobject" ,python-pygobject) - ("python-pyqt" ,python-pyqt) - ("python-pyyaml" ,python-pyyaml) - ("qtbase" ,qtbase) - ("qwt" ,qwt) - ("zeromq" ,zeromq))) - (arguments - `(#:modules ((guix build cmake-build-system) - ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:) - ((guix build python-build-system) #:prefix python:) - (guix build utils) - (ice-9 match)) - #:imported-modules (,@%cmake-build-system-modules - (guix build glib-or-gtk-build-system) - (guix build python-build-system)) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-paths - (lambda* (#:key inputs #:allow-other-keys) - (let ((qwt (assoc-ref inputs "qwt"))) - (substitute* "cmake/Modules/FindQwt.cmake" - (("/usr/include") - (string-append qwt "/include")) - (("/usr/lib") - (string-append qwt "/lib")) - (("qwt6-\\$\\{QWT_QT_VERSION\\}") - "qwt"))) - (substitute* "cmake/Modules/GrPython.cmake" - (("dist-packages") - "site-packages")) - (substitute* '("gr-vocoder/swig/vocoder_swig.i" - "gr-vocoder/include/gnuradio/vocoder/codec2.h" - "gr-vocoder/include/gnuradio/vocoder/freedv_api.h") - ((" +;;; Copyright © 2019 Christopher Howard +;;; Copyright © 2019, 2020 Evan Straw +;;; Copyright © 2020 Guillaume Le Vaillant +;;; Copyright © 2020 Danny Milosavljevic +;;; Copyright © 2020 Charlie Ritter +;;; +;;; 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 radio) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix git-download) + #:use-module (gnu packages algebra) + #:use-module (gnu packages audio) + #:use-module (gnu packages autotools) + #:use-module (gnu packages base) + #:use-module (gnu packages bash) + #:use-module (gnu packages boost) + #:use-module (gnu packages check) + #:use-module (gnu packages documentation) + #:use-module (gnu packages ghostscript) + #:use-module (gnu packages glib) + #:use-module (gnu packages gstreamer) + #:use-module (gnu packages gtk) + #:use-module (gnu packages image) + #:use-module (gnu packages libusb) + #:use-module (gnu packages linux) + #:use-module (gnu packages logging) + #:use-module (gnu packages maths) + #:use-module (gnu packages multiprecision) + #:use-module (gnu packages networking) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages pulseaudio) + #:use-module (gnu packages python) + #:use-module (gnu packages python-science) + #:use-module (gnu packages python-xyz) + #:use-module (gnu packages qt) + #:use-module (gnu packages sphinx) + #:use-module (gnu packages swig) + #:use-module (gnu packages tex) + #:use-module (gnu packages version-control) + #:use-module (gnu packages xml) + #:use-module (gnu packages xorg) + #:use-module (guix build-system cmake) + #:use-module (guix build-system glib-or-gtk) + #:use-module (guix build-system gnu) + #:use-module (guix build-system python) + #:use-module (guix build-system qt)) + +(define-public liquid-dsp + (package + (name "liquid-dsp") + (version "1.3.2") + (source + (origin (method git-fetch) + (uri (git-reference + (url "https://github.com/jgaeddert/liquid-dsp.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1n6dbg13q8ga5qhg1yiszwly4jj0rxqr6f1xwm9waaly5z493xsd")))) + (build-system gnu-build-system) + (native-inputs + `(("autoconf" ,autoconf))) + (inputs + `(("fftw" ,fftw) + ("fftwf" ,fftwf))) + (home-page "https://liquidsdr.org") + (synopsis "Signal processing library for software-defined radios") + (description + "Liquid DSP is a @dfn{digital signal processing} (DSP) library designed +specifically for software-defined radios on embedded platforms. The aim is to +provide a lightweight DSP library that does not rely on a myriad of external +dependencies or proprietary and otherwise cumbersome frameworks. All signal +processing elements are designed to be flexible, scalable, and dynamic, +including filters, filter design, oscillators, modems, synchronizers, complex +mathematical operations, and much more.") + (license license:expat))) + +(define-public rtl-sdr + (package + (name "rtl-sdr") + (version "0.6.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "git://git.osmocom.org/rtl-sdr.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0lmvsnb4xw4hmz6zs0z5ilsah5hjz29g1s0050n59fllskqr3b8k")))) + (build-system cmake-build-system) + (inputs + `(("libusb" ,libusb))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (arguments + `(#:configure-flags '("-DDETACH_KERNEL_DRIVER=ON") + #:tests? #f)) ; No tests + (home-page "https://osmocom.org/projects/sdr/wiki/rtl-sdr") + (synopsis "Software defined radio driver for Realtek RTL2832U") + (description "DVB-T dongles based on the Realtek RTL2832U can be used as a +cheap software defined radio, since the chip allows transferring the raw I/Q +samples to the host. @code{rtl-sdr} provides drivers for this purpose.") + (license license:gpl2+))) + +(define-public chirp + (package + (name "chirp") + (version "20181205") + (source + (origin + (method url-fetch) + (uri (string-append "https://trac.chirp.danplanet.com/chirp_daily/daily-" + version "/chirp-daily-" version ".tar.gz")) + (sha256 + (base32 + "1cp280b95j39xaxs50zn55jigg7pyfpm9n098hmsyxrplqn8z43c")))) + (build-system python-build-system) + (inputs + `(("python2-libxml2" ,python2-libxml2) + ("python2-pygtk" ,python2-pygtk) + ("python2-pyserial" ,python2-pyserial))) + (arguments + `(#:python ,python-2)) + (home-page "https://chirp.danplanet.com") + (synopsis "Cross-radio programming tool") + (description "Chirp is a cross-radio programming tool. It supports a +growing list of radios across several manufacturers and allows transferring of +memory contents between them.") + (license (list license:gpl3+ + license:lgpl3+)))) ; chirp/elib_intl.py + +(define-public aptdec + (package + (name "aptdec") + (version "1.7") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/csete/aptdec") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1hf0zb51qc6fyhdjxyij1n3vgwnw3cwksc3r11szbhkml14qjnzk")))) + (build-system gnu-build-system) + (inputs + `(("libpng" ,libpng) + ("libsndfile" ,libsndfile))) + (arguments + `(#:make-flags (list "CC=gcc") + #:tests? #f ; no tests + #:phases + (modify-phases %standard-phases + (delete 'configure) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (install-file "atpdec" (string-append out "/bin"))) + #t))))) + (home-page "https://github.com/csete/aptdec") + (synopsis "NOAA Automatic Picture Transmission (APT) decoder") + (description "Aptdec decodes Automatic Picture Transmission (APT) images. +These are medium resolution images of the Earth transmitted by, among other +satellites, the POES NOAA weather satellite series. These transmissions are +on a frequency of 137 MHz. They can be received using an inexpensive antenna +and a dedicated receiver.") + (license license:gpl2+))) + +(define-public redsea + (package + (name "redsea") + (version "0.18") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/windytan/redsea") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1y96g0ra2krjb2kypm8s5gdfia45yci4f36klsvyzg8d53v5cwhn")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; The configure.ac file does not explicitly link against libiconv + ;; except on Mac OS, causing the build to fail. This phase comments + ;; out the original AC_SUBST macro (located inside a conditional) and + ;; adds an explicit use of it underneath, so that libiconv is always + ;; linked against. + (add-after 'unpack 'patch-libiconv + (lambda _ + (substitute* "configure.ac" + (("^ +AC_SUBST") + "# AC_SUBST") + (("esac") + "esac\nAC_SUBST([ICONV], [\"-liconv\"])")) + #t))))) + (inputs + `(("libiconv" ,libiconv) + ("libsndfile" ,libsndfile) + ("liquid-dsp" ,liquid-dsp))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake))) + (home-page "https://github.com/windytan/redsea") + (synopsis "Lightweight RDS to JSON decoder") + (description "redsea is a lightweight command-line @dfn{FM Radio Data +System} (FM-RDS) decoder. Redsea can be used with any RTL-SDR USB radio stick +with the rtl_fm tool, or any other @dfn{software-defined radio} (SDR) via +csdr, for example. It can also decode raw ASCII bitstream, the hex format +used by RDS Spy, and audio files containing @dfn{multiplex} signals (MPX).") + (license license:expat))) + +(define-public gnuradio + (package + (name "gnuradio") + (version "3.8.0.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://www.gnuradio.org/releases/gnuradio/" + "gnuradio-" version ".tar.xz")) + (sha256 + (base32 "0aw55gf5549b0fz2qdi7vplcmaf92bj34h40s34b2ycnqasv900r")))) + (build-system cmake-build-system) + (native-inputs + `(("doxygen" ,doxygen) + ("git" ,git-minimal) + ("ghostscript" ,ghostscript) + ("orc" ,orc) + ("pkg-config" ,pkg-config) + ("python" ,python) + ("python-cheetah" ,python-cheetah) + ("python-mako" ,python-mako) + ("python-pyzmq" ,python-pyzmq) + ("python-scipy" ,python-scipy) + ("python-sphinx" ,python-sphinx) + ("swig" ,swig) + ("texlive" ,(texlive-union (list texlive-amsfonts + texlive-latex-amsmath + ;; TODO: Add newunicodechar. + texlive-latex-graphics))) + ("xorg-server" ,xorg-server-for-tests))) + (inputs + `(("alsa-lib" ,alsa-lib) + ("boost" ,boost) + ("cairo" ,cairo) + ("codec2" ,codec2) + ("cppzmq" ,cppzmq) + ("fftwf" ,fftwf) + ("gmp" ,gmp) + ("gsl" ,gsl) + ("gsm" ,gsm) + ("gtk+" ,gtk+) + ("jack" ,jack-1) + ("log4cpp" ,log4cpp) + ("pango" ,pango) + ("portaudio" ,portaudio) + ("python-click" ,python-click) + ("python-click-plugins" ,python-click-plugins) + ("python-lxml" ,python-lxml) + ("python-numpy" ,python-numpy) + ("python-pycairo" ,python-pycairo) + ("python-pygobject" ,python-pygobject) + ("python-pyqt" ,python-pyqt) + ("python-pyyaml" ,python-pyyaml) + ("qtbase" ,qtbase) + ("qwt" ,qwt) + ("zeromq" ,zeromq))) + (arguments + `(#:modules ((guix build cmake-build-system) + ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:) + ((guix build python-build-system) #:prefix python:) + (guix build utils) + (ice-9 match)) + #:imported-modules (,@%cmake-build-system-modules + (guix build glib-or-gtk-build-system) + (guix build python-build-system)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-paths + (lambda* (#:key inputs #:allow-other-keys) + (let ((qwt (assoc-ref inputs "qwt"))) + (substitute* "cmake/Modules/FindQwt.cmake" + (("/usr/include") + (string-append qwt "/include")) + (("/usr/lib") + (string-append qwt "/lib")) + (("qwt6-\\$\\{QWT_QT_VERSION\\}") + "qwt"))) + (substitute* "cmake/Modules/GrPython.cmake" + (("dist-packages") + "site-packages")) + (substitute* '("gr-vocoder/swig/vocoder_swig.i" + "gr-vocoder/include/gnuradio/vocoder/codec2.h" + "gr-vocoder/include/gnuradio/vocoder/freedv_api.h") + ((" -;;; Copyright © 2019, 2020 Evan Straw -;;; -;;; 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 sdr) - #: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 (gnu packages algebra) - #:use-module (gnu packages autotools)) - -(define-public liquid-dsp - (package - (name "liquid-dsp") - (version "1.3.2") - (source - (origin (method git-fetch) - (uri (git-reference - (url "https://github.com/jgaeddert/liquid-dsp.git") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1n6dbg13q8ga5qhg1yiszwly4jj0rxqr6f1xwm9waaly5z493xsd")))) - (build-system gnu-build-system) - (native-inputs - `(("autoconf" ,autoconf))) - (inputs - `(("fftw" ,fftw) - ("fftwf" ,fftwf))) - (home-page "https://liquidsdr.org") - (synopsis "Signal processing library for software-defined radios") - (description - "Liquid DSP is a @dfn{digital signal processing} (DSP) library designed -specifically for software-defined radios on embedded platforms. The aim is to -provide a lightweight DSP library that does not rely on a myriad of external -dependencies or proprietary and otherwise cumbersome frameworks. All signal -processing elements are designed to be flexible, scalable, and dynamic, -including filters, filter design, oscillators, modems, synchronizers, complex -mathematical operations, and much more.") - (license license:expat))) -- cgit v1.2.3 From 5258c41699222ae6c4d888fe430d887dc15b2e9a Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 11 Apr 2020 14:20:29 +0200 Subject: gnu: Add tennix. * gnu/packages/games.scm (tennix): New variable. --- gnu/packages/games.scm | 65 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 64 insertions(+), 1 deletion(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 4f5bca866e..31e1936795 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -3716,6 +3716,69 @@ fullscreen, use F5 or Alt+Enter.") ;; Code mainly BSD-2, some parts under Boost 1.0. All assets are WTFPL2. (license (list license:bsd-2 license:boost1.0 license:wtfpl2)))) +(define-public tennix + (package + (name "tennix") + (version "1.3.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://repo.or.cz/tennix.git") + (commit (string-append "tennix-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "02cj4lrdrisal5s9pnbf2smx7qz9czczjzndfkhfx0qy67b957sk")) + ;; Remove non-free images. + (modules '((guix build utils))) + (snippet + '(begin + (for-each delete-file + '("data/loc_training_camp.png" + "data/loc_austrian_open.png" + "data/loc_olympic_green_tennis.png")) + #t)))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ;no test + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-include + (lambda _ + (substitute* '("src/graphics.h" "src/sound.h") + (("#include \"(SDL_(image|ttf|mixer)\\.h)\"" _ header) + (string-append "#include \"SDL/" header "\""))) + (substitute* '("src/tennix.h" "src/network.h" "src/SDL_rotozoom.h") + (("#include ") "#include ") + (("#include ") "#include ")) + #t)) + (add-after 'unpack 'locate-install + ;; Build process cannot expand "$(INSTALL)" in Makefile. + (lambda _ + (substitute* "makefile" + (("^CONFIGURE_OUTPUT :=.*" all) + (string-append "INSTALL := install -c\n" all))) + #t)) + (replace 'configure + ;; The "configure" script is picky about the arguments it + ;; gets. Call it ourselves. + (lambda _ + (invoke "./configure" "--prefix" (assoc-ref %outputs "out"))))))) + (native-inputs + `(("which" ,which))) + (inputs + `(("python" ,python-wrapper) + ("sdl" ,(sdl-union (list sdl sdl-image sdl-mixer sdl-ttf sdl-net))))) + (home-page "http://icculus.org/tennix/") + (synopsis "Play tennis against the computer or a friend") + (description "Tennix is a 2D tennis game. You can play against the +computer or against another player using the keyboard. The game runs +in-window at 640x480 resolution or fullscreen.") + ;; Project is licensed under GPL2+ terms. It includes images + ;; released under Public Domain terms, and SDL_rotozoom, released + ;; under LGPL2.1 terms. + (license (list license:gpl2+ license:public-domain license:lgpl2.1)))) + (define-public warzone2100 (package (name "warzone2100") @@ -3772,7 +3835,7 @@ fullscreen, use F5 or Alt+Enter.") modes. An extensive tech tree with over 400 different technologies, combined with the unit design system, allows for a wide variety of possible units and tactics.") - ; Everything is GPLv2+ unless otherwise specified in COPYING.NONGPL + ; Everything is GPLv2+ unless otherwise specified in COPYING.NONGPL (license (list license:bsd-3 license:cc0 license:cc-by-sa3.0 -- cgit v1.2.3 From fbfaba8a7c4519298879df2789d1900314486cae Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 11 Apr 2020 14:29:35 +0200 Subject: gnu: python-duniterpy: Update to 0.57.0. * gnu/packages/finance.scm (python-duniterpy): Update to 0.57.0. --- gnu/packages/finance.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index c639a9a562..827a7651d2 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -1049,13 +1049,13 @@ Luhn and family of ISO/IEC 7064 check digit algorithms. ") (define-public python-duniterpy (package (name "python-duniterpy") - (version "0.56.0") + (version "0.57.0") (source (origin (method url-fetch) (uri (pypi-uri "duniterpy" version)) (sha256 - (base32 "1h8d8cnr6k5sw4cqy8r82zy4ldzpvn4nlk2221lz2haqq7xm4s5z")))) + (base32 "0rw2c7r9gcqhymp82gbk1ky45zqbypsi2q5x4vdwjc6g00kh7h6l")))) (build-system python-build-system) (arguments ;; FIXME: Tests fail with: "ModuleNotFoundError: No module named -- cgit v1.2.3 From 67950de7e8a1ef6e142bb1a05cdff9155b85e227 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 11 Apr 2020 15:16:46 +0200 Subject: gnu: python-pyqtwebengine: Use 'python-version'. * gnu/packages/qt.scm (python-pyqtwebengine)[arguments]: Add (guix build python-build-system) to #:modules. Adjust #:imported-modules accordingly. Rewrite #:phases to use it instead of rolling their own, or hard-coding. --- gnu/packages/qt.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 8696dc4bb6..9c517d0acf 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -2040,7 +2040,10 @@ contain over 620 classes.") ("qtwebengine" ,qtwebengine))) (arguments `(#:modules ((srfi srfi-1) + ((guix build python-build-system) #:select (python-version)) ,@%gnu-build-system-modules) + #:imported-modules ((guix build python-build-system) + ,@%gnu-build-system-modules) #:phases (modify-phases %standard-phases (replace 'configure @@ -2050,13 +2053,8 @@ contain over 620 classes.") (pyqt-sipdir (string-append (assoc-ref inputs "python-pyqt") "/share/sip")) (python (assoc-ref inputs "python")) - (python-version - (last (string-split python #\-))) - (python-major+minor - (string-join - (take (string-split python-version #\.) 2) ".")) (lib (string-append out "/lib/python" - python-major+minor + (python-version python) "/site-packages/PyQt5")) (stubs (string-append lib "/PyQt5"))) @@ -2075,7 +2073,9 @@ contain over 620 classes.") (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((__init__.py (string-append (assoc-ref outputs "out") - "/lib/python3.7/site-packages/PyQt5/__init__.py"))) + "/lib/python" + (python-version (assoc-ref inputs "python")) + "/site-packages/PyQt5/__init__.py"))) (with-output-to-file __init__.py (lambda _ (display " from pkgutil import extend_path -- cgit v1.2.3 From 839fa4cd5e04b7c5e86cf8824f5694a5a25a4b98 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 11 Apr 2020 15:18:57 +0200 Subject: gnu: sbcl-burgled-batteries3: Update to 0.0.0-2.f65f454. * gnu/packages/lisp-xyz.scm (sbcl-burgled-batteries3): Update to 0.0.0-2.f65f454. [arguments]: Rewrite phases to use the new BB_PYTHON3_* variables. Add #:modules and #:imported-modules. --- gnu/packages/lisp-xyz.scm | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 6085ec18d1..a577c6f492 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -5076,8 +5076,8 @@ high-level way. This library provides such operators.") (sbcl-package->ecl-package sbcl-cl-quickcheck)) (define-public sbcl-burgled-batteries3 - (let ((commit "9c0f6667e1a71ddf77e21793a0bea524710fef6e") - (revision "1")) + (let ((commit "f65f454d13bb6c40e17e9ec62e41eb5069e09760") + (revision "2")) (package (name "sbcl-burgled-batteries3") (version (git-version "0.0.0" revision commit)) @@ -5090,26 +5090,26 @@ high-level way. This library provides such operators.") (file-name (git-file-name name version)) (sha256 (base32 - "0b726kz2xxcg5l930gz035rsdvhxrzmp05iwfwympnb4z4ammicb")))) + "1nzn7jawrfajyzwfnzrg2cmn9xxadcqh4szbpg0jggkhdkdzz4wa")))) (build-system asdf-build-system/sbcl) (arguments - '(#:tests? #f + `(#:tests? #f + #:modules (((guix build python-build-system) #:select (python-version)) + ,@%asdf-build-system-modules) + #:imported-modules ((guix build python-build-system) + ,@%asdf-build-system-modules) #:phases - (modify-phases %standard-phases + (modify-phases (@ (guix build asdf-build-system) %standard-phases) (add-after 'unpack 'set-*cpython-include-dir*-var (lambda* (#:key inputs #:allow-other-keys) - (substitute* "grovel-include-dir.lisp" - (("\\(defparameter \\*cpython-include-dir\\* \\(detect-python\\)\\)") - (string-append - "(defparameter *cpython-include-dir* \"" - (assoc-ref inputs "python") - "/include/python3.7m" - "\")"))) - (substitute* "ffi-interface.lisp" - (("\\*cpython-lib\\*") - (format #f "'(\"~a/lib/libpython3.so\")" - (assoc-ref inputs "python")))) - #t))))) + (let ((python (assoc-ref inputs "python"))) + (setenv "BB_PYTHON3_INCLUDE_DIR" + (string-append python "/include/python" + (python-version python) + "m")) + (setenv "BB_PYTHON3_DYLIB" + (string-append python "/lib/libpython3.so")) + #t)))))) (native-inputs `(("python" ,python) ("sbcl-cl-fad" ,sbcl-cl-fad) @@ -5126,7 +5126,6 @@ high-level way. This library provides such operators.") "This package provides a shim between Python3 (specifically, the CPython implementation of Python) and Common Lisp.") (home-page "https://github.com/snmsts/burgled-batteries3") - ;; MIT (license license:expat)))) (define-public cl-burgled-batteries3 -- cgit v1.2.3 From 3d280dae09758954df537d22adae754897f4cf1c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 11 Apr 2020 15:19:48 +0200 Subject: gnu: sbcl-burgled-batteries3: Python is a runtime dependency. * gnu/packages/lisp-xyz.scm (sbcl-burgled-batteries3)[native-inputs]: Move PYTHON ... [inputs]: ... here. --- gnu/packages/lisp-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index a577c6f492..7edaf6bd1e 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -5111,12 +5111,12 @@ high-level way. This library provides such operators.") (string-append python "/lib/libpython3.so")) #t)))))) (native-inputs - `(("python" ,python) - ("sbcl-cl-fad" ,sbcl-cl-fad) + `(("sbcl-cl-fad" ,sbcl-cl-fad) ("sbcl-lift" ,sbcl-lift) ("sbcl-cl-quickcheck" ,sbcl-cl-quickcheck))) (inputs - `(("sbcl-cffi" ,sbcl-cffi) + `(("python" ,python) + ("sbcl-cffi" ,sbcl-cffi) ("sbcl-cffi-grovel" ,sbcl-cffi-grovel) ("sbcl-alexandria" , sbcl-alexandria) ("sbcl-parse-declarations-1.0" ,sbcl-parse-declarations) -- cgit v1.2.3 From 67dbc06de1715bd1f04069291ab9fe31d9e8dc8e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 11 Apr 2020 15:21:25 +0200 Subject: gnu: python-flask: Update to 1.1.2. * gnu/packages/python-web.scm (python-flask): Update to 1.1.2. --- gnu/packages/python-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 3686432a1d..a9a22f565d 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1774,13 +1774,13 @@ minimum of WSGI.") (define-public python-flask (package (name "python-flask") - (version "1.1.1") + (version "1.1.2") (source (origin (method url-fetch) (uri (pypi-uri "Flask" version)) (sha256 (base32 - "0ljdjgyjn7vh8ic1n1dc2l1cl421i6pr3kx5sz2w5irhyfbg3y8k")))) + "0q3h295izcil7lswkzfnyg3k5gq4hpmqmpl6i7s5m1n9szi1myjf")))) (build-system python-build-system) (arguments '(#:phases -- cgit v1.2.3 From 892918bc46613fb72305d32afa78420b8068cd5d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 11 Apr 2020 15:31:19 +0200 Subject: gnu: python-dnspython: Update to 1.16.0. * gnu/packages/python-xyz.scm (python-dnspython): Update to 1.16.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 64aa7da41e..2ecf7115ab 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11674,14 +11674,14 @@ until the object is actually required, and caches the result of said call.") (define-public python-dnspython (package (name "python-dnspython") - (version "1.15.0") + (version "1.16.0") (source (origin (method url-fetch) (uri (string-append "http://www.dnspython.org/kits/" version "/dnspython-" version ".tar.gz")) (sha256 (base32 - "0jr4v2pd90i6l1xxbss2m05psbjaxvyvvvpq44wycijpfgjqln8i")))) + "1yaw7irazy42n0kdhlk7wyg8ki34rxcnc5xbc1wfwy245b0wbxab")))) (build-system python-build-system) (arguments '(#:tests? #f)) ; XXX: requires internet access (home-page "http://www.dnspython.org") -- cgit v1.2.3 From 658505d7a92f0518e1fc4c965bdaa389a6e83f2c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 11 Apr 2020 16:35:29 +0200 Subject: gnu: python-genshi: Update to 0.7.3. * gnu/packages/python-web.scm (python-genshi): Update to 0.7.3. --- gnu/packages/python-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index a9a22f565d..1d99239dbb 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -2672,7 +2672,7 @@ for Flask programs that are using @code{python-alembic}.") (define-public python-genshi (package (name "python-genshi") - (version "0.7.2") + (version "0.7.3") (source (origin (method git-fetch) @@ -2681,7 +2681,7 @@ for Flask programs that are using @code{python-alembic}.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "06rch30x10l105k5b6rahd839lkhmgrzn6691wbci0cb2fzps32w")))) + (base32 "04bw7nd4wyn8ixnhik57hny2xpjjpn80k5hp6691inix5gc6rxaf")))) (build-system python-build-system) (home-page "https://genshi.edgewall.org/") (synopsis "Toolkit for generation of output for the web") -- cgit v1.2.3