From 6ffb0b4f6a99f6f1d601418af6e87566957c0031 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 11 Dec 2019 23:23:30 +0100 Subject: gnu: Add emacs-modus-themes. * gnu/packages/emacs-xyz.scm (emacs-modus-themes): New variable. --- gnu/packages/emacs-xyz.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index c7da8b9556..1a49ff4172 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -19816,6 +19816,33 @@ (define-public emacs-doom-themes (home-page "https://github.com/hlissner/emacs-doom-themes") (license license:expat))) +(define-public emacs-modus-themes + (package + (name "emacs-modus-themes") + (version "0.1.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/protesilaos/modus-themes.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "15g63675c5df2p0kk2sqj2c8qriyh69lcbggknqlaxapr13giz4x")))) + (build-system emacs-build-system) + (home-page "https://gitlab.com/protesilaos/modus-themes") + (synopsis "Emacs themes designed for colour-contrast accessibility") + (description + "This is a set of accessible themes for GNU Emacs. The contrast ratio +between foreground and background values should always be >= 7:1, which +conforms with the WCAG AAA accessibility standard. + +The Modus themes project consists of two standalone items, one where dark text +is cast on a light backdrop (Modus Operandi) and another where light text is +displayed against a dark background (Modus Vivendi).") + (license license:gpl3+))) + (define-public emacs-elixir-mode (package (name "emacs-elixir-mode") -- cgit v1.2.3 From e3ce8fbfd36b85f7baa3a5a1ee29e9ab89b6f413 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 3 Dec 2019 19:46:13 +0100 Subject: gnu: remind: Update to 3.1.17. * gnu/packages/calendar.scm (remind): Update to 3.1.17. --- gnu/packages/calendar.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/calendar.scm b/gnu/packages/calendar.scm index 6c60008ec7..5e7ac66260 100644 --- a/gnu/packages/calendar.scm +++ b/gnu/packages/calendar.scm @@ -155,7 +155,7 @@ (define-public khal (define-public remind (package (name "remind") - (version "3.1.16") + (version "3.1.17") (source (origin (method url-fetch) @@ -166,7 +166,7 @@ (define-public remind ".") ".tar.gz")) (sha256 - (base32 "14yavwqmimba8rdpwx3wlav9sfb0v5rcd1iyzqrs08wx07a9pdzf")))) + (base32 "0lgyc2j69aqqk4knywr8inz4fsnni0zq54dgqh7p4s6kzybc2mf9")))) (build-system gnu-build-system) (arguments '(#:tests? #f)) ; no "check" target -- cgit v1.2.3 From 58ec1e4bb8a3539975a0d9a0ccc953101e0f9af3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 3 Dec 2019 22:04:58 +0100 Subject: gnu: libcdio-paranoia: Update to 10.2+2.0.1. * gnu/packages/cdrom.scm (libcdio-paranoia): Update to 10.2+2.0.1. --- gnu/packages/cdrom.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm index dcbf4c5f0b..b13b4b3a66 100644 --- a/gnu/packages/cdrom.scm +++ b/gnu/packages/cdrom.scm @@ -134,14 +134,14 @@ (define-public libcdio (define-public libcdio-paranoia (package (name "libcdio-paranoia") - (version "10.2+2.0.0") + (version "10.2+2.0.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/libcdio/libcdio-paranoia-" version ".tar.bz2")) (sha256 (base32 - "1h8k8z9r75h3p697f77z9j1blwb6gf2d5rik6z2q6420my6c2ra5")))) + "12hfnrq7amv9qjzc92cr265m7kh0a1hpasck8cxx1gygbhqczc9k")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) (propagated-inputs `(("libcdio" ,libcdio))) -- cgit v1.2.3 From 3190e967c6c06fbbb24836c045691c496eea739b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 4 Dec 2019 01:55:26 +0100 Subject: gnu: gx: Update to 0.14.2. * gnu/packages/ipfs.scm (gx): Update to 0.14.2. --- gnu/packages/ipfs.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ipfs.scm b/gnu/packages/ipfs.scm index 39c22262c1..49612425fb 100644 --- a/gnu/packages/ipfs.scm +++ b/gnu/packages/ipfs.scm @@ -104,7 +104,7 @@ (define-public go-github-com-ipfs-go-ipfs-api (define-public gx (package (name "gx") - (version "0.14.1") + (version "0.14.2") (source (origin (method git-fetch) @@ -113,8 +113,7 @@ (define-public gx (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 - "0pfx2p59xdbmqzfbgaf8xvlnzh8m05hkg596glq5kvl8ib65i4ha")))) + (base32 "048bx6khzcwxnvz3lf7kgp6fkg8mxqcqchxh0jxm9fg2iwizsi0k")))) (build-system go-build-system) (arguments '(#:import-path "github.com/whyrusleeping/gx")) -- cgit v1.2.3 From 8d73e6a2448d43a7f10d56289fc901d500300dbf Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 4 Dec 2019 01:55:47 +0100 Subject: gnu: graphicsmagick: Update to 1.3.33. * gnu/packages/imagemagick.scm (graphicsmagick): Update to 1.3.33. --- gnu/packages/imagemagick.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/imagemagick.scm b/gnu/packages/imagemagick.scm index 74fbf9158a..b8189c8ca8 100644 --- a/gnu/packages/imagemagick.scm +++ b/gnu/packages/imagemagick.scm @@ -170,7 +170,7 @@ (define-public perl-image-magick (define-public graphicsmagick (package (name "graphicsmagick") - (version "1.3.32") + (version "1.3.33") (source (origin (method url-fetch) @@ -182,8 +182,7 @@ (define-public graphicsmagick "GraphicsMagick/" (version-major+minor version) "/GraphicsMagick-" version ".tar.xz"))) (sha256 - (base32 - "1qclp9i31idpcbbqswmnq2q11lmv0a7cvdb1y72xcky8sshaahmq")))) + (base32 "0y67dl6xbk1pxndppa93hhlq9i6bpcjw39gb4i8hnn1klqqb630k")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From 2665ff41e9875b13258827c43e971e099102b607 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 4 Dec 2019 05:10:53 +0100 Subject: gnu: bogofilter: Update to 1.2.5. * gnu/packages/mail.scm (bogofilter): Update to 1.2.5. [license]: Upgrade to GPL3+. --- gnu/packages/mail.scm | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 555fe70de4..4450e9676b 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -555,15 +555,14 @@ (define-public gmime-2.6 (define-public bogofilter (package (name "bogofilter") - (version "1.2.4") - (source (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/bogofilter/bogofilter-" - version "/bogofilter-" - version ".tar.bz2")) - (sha256 - (base32 - "1d56n2m9inm8gnzm88aa27xl2a7sp7aff3484vmflpqkinjqf0p1")))) + (version "1.2.5") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/bogofilter/bogofilter-stable/" + "bogofilter-" version ".tar.xz")) + (sha256 + (base32 "1sl9xrnnlk2sn8gmibhn8li09vnansjbxb9l1182qmgz7cvs2j1j")))) (build-system gnu-build-system) (arguments '(#:phases @@ -583,7 +582,7 @@ (define-public bogofilter (non-spam) by a statistical analysis of the message's header and content (body). The program is able to learn from the user's classifications and corrections. It is based on a Bayesian filter.") - (license gpl2))) + (license gpl3+))) (define-public offlineimap (package -- cgit v1.2.3 From 0ba5755868894d298fc521da9c500389fa5aa24a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 4 Dec 2019 05:11:26 +0100 Subject: gnu: bogofilter: Use HTTPS home page. * gnu/packages/mail.scm (bogofilter)[home-page]: Use HTTPS. --- gnu/packages/mail.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 4450e9676b..1dcc013a7a 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -575,7 +575,7 @@ (define-public bogofilter #t))))) (native-inputs `(("flex" ,flex))) (inputs `(("bdb" ,bdb))) - (home-page "http://bogofilter.sourceforge.net/") + (home-page "https://bogofilter.sourceforge.io/") (synopsis "Mail classifier based on a Bayesian filter") (description "Bogofilter is a mail filter that classifies mail as spam or ham -- cgit v1.2.3 From 0b223139a8eb265ee4209742c9b19bf8b25b95ef Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 4 Dec 2019 05:26:53 +0100 Subject: gnu: libwpd: Update to 0.10.3. * gnu/packages/libreoffice.scm (libwpd): Update to 0.10.3. --- gnu/packages/libreoffice.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 4476e5a4ad..761e75072d 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -174,14 +174,14 @@ (define-public librevenge (define-public libwpd (package (name "libwpd") - (version "0.10.2") + (version "0.10.3") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/libwpd/libwpd/" "libwpd-" version "/libwpd-" version ".tar.xz")) (sha256 (base32 - "0436gnidx45a9vx114hhh216jrh57mqb9zyssyjfadagmyz6hgrj")))) + "02fx8bngslcj7i5g1gx2kiign4vp09wrmp5wpvix9igxcavb0r94")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--disable-werror"))) -- cgit v1.2.3 From 78fee44e32ddb4d5bd88e733af1b89460cede378 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 4 Dec 2019 13:15:14 +0100 Subject: gnu: muse-sequencer: Don't use NAME in source URI. * gnu/packages/music.scm (muse-sequencer)[source]: Hard-code NAME. --- gnu/packages/music.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 54f2638f57..134fe7ed51 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -3924,7 +3924,7 @@ (define-public muse-sequencer (string-map (lambda (c) (if (char=? c #\.) #\_ c)) version))))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "1nninz8qyqlxxjdnrm79y3gr3056pga9l2fsqh674jd3cjvafya3")))) -- cgit v1.2.3 From 00d3c3e9b8d27a39922245a9fe9d02d610ff1ce8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 7 Dec 2019 05:19:08 +0100 Subject: gnu: fio: Update to 3.16. * gnu/packages/benchmark.scm (fio): Update to 3.16. --- gnu/packages/benchmark.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/benchmark.scm b/gnu/packages/benchmark.scm index 8e347879dd..7f8e4580dc 100644 --- a/gnu/packages/benchmark.scm +++ b/gnu/packages/benchmark.scm @@ -43,14 +43,14 @@ (define-module (gnu packages benchmark) (define-public fio (package (name "fio") - (version "3.14") + (version "3.16") (source (origin (method url-fetch) (uri (string-append "http://brick.kernel.dk/snaps/" "fio-" version ".tar.bz2")) (sha256 (base32 - "047y53nyhnmnxcrsfbsf0gcpxw7bli3n19ycscpxy9974j0fck0v")))) + "17hi6cd4wahghh7kgvxcvmrhcqlmqag3a07id90hhzwd3zhvdxbp")))) (build-system gnu-build-system) (arguments '(#:test-target "test" -- cgit v1.2.3 From 2dffd9c6731870cb9ea01a9617d2ca8e87da322b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 7 Dec 2019 05:19:39 +0100 Subject: gnu: fio: Download over HTTPS. * gnu/packages/benchmark.scm (fio)[source]: Use HTTPS. --- gnu/packages/benchmark.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/benchmark.scm b/gnu/packages/benchmark.scm index 7f8e4580dc..f9e819460e 100644 --- a/gnu/packages/benchmark.scm +++ b/gnu/packages/benchmark.scm @@ -46,7 +46,7 @@ (define-public fio (version "3.16") (source (origin (method url-fetch) - (uri (string-append "http://brick.kernel.dk/snaps/" + (uri (string-append "https://brick.kernel.dk/snaps/" "fio-" version ".tar.bz2")) (sha256 (base32 -- cgit v1.2.3 From 4a27b0f1cf5ac7164113d44bad6c549d11fd170a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 10 Dec 2019 15:43:20 +0100 Subject: gnu: nftables: Use HTTPS for www.nftables.org. * gnu/packages/linux.scm (nftables)[source, home-page]: Use HTTPS. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 383698b400..8b5969c4fa 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -5257,7 +5257,7 @@ (define-public nftables (source (origin (method url-fetch) - (uri (string-append "http://www.nftables.org/projects/nftables" + (uri (string-append "https://www.nftables.org/projects/nftables" "/files/nftables-" version ".tar.bz2")) (sha256 (base32 @@ -5272,7 +5272,7 @@ (define-public nftables ("libnftnl" ,libnftnl) ("readline" ,readline))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.nftables.org") + (home-page "https://www.nftables.org") (synopsis "Userspace utility for Linux packet filtering") (description "nftables is the project that aims to replace the existing {ip,ip6,arp,eb}tables framework. Basically, this project provides a new packet -- cgit v1.2.3 From 79a392535591fc4224280ade6a87910793ca6688 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 10 Dec 2019 16:28:42 +0100 Subject: gnu: libnftnl: Update to 1.1.5. * gnu/packages/linux.scm (libnftnl): Update to 1.1.5. [source]: Add patch. * gnu/packages/patches/libnftnl-dont-check-NFTNL_FLOWTABLE_SIZE.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/linux.scm | 6 ++- .../libnftnl-dont-check-NFTNL_FLOWTABLE_SIZE.patch | 47 ++++++++++++++++++++++ 3 files changed, 52 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/libnftnl-dont-check-NFTNL_FLOWTABLE_SIZE.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 00ff3b8d61..7f8715235d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1012,6 +1012,7 @@ dist_patch_DATA = \ %D%/packages/patches/java-xerces-xjavac_taskdef.patch \ %D%/packages/patches/jbig2dec-ignore-testtest.patch \ %D%/packages/patches/kdbusaddons-kinit-file-name.patch \ + %D%/packages/patches/libnftnl-dont-check-NFTNL_FLOWTABLE_SIZE.patch \ %D%/packages/patches/libvirt-create-machine-cgroup.patch \ %D%/packages/patches/libziparchive-add-includes.patch \ %D%/packages/patches/localed-xorg-keyboard.patch \ diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 8b5969c4fa..024c6e5617 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -5229,14 +5229,16 @@ (define-public libmnl (define-public libnftnl (package (name "libnftnl") - (version "1.1.4") + (version "1.1.5") (source (origin (method url-fetch) (uri (string-append "mirror://netfilter.org/libnftnl/" "libnftnl-" version ".tar.bz2")) (sha256 - (base32 "087dfc2n4saf2k68hyi4byvgz5grwpw5kfjvmkpn3wmd8y1riiy8")))) + (base32 "1wqlxf76bkqf3qhka9sw32qhb2ni20q1k6rn3iril2kw482lvpk6")) + (patches + (search-patches "libnftnl-dont-check-NFTNL_FLOWTABLE_SIZE.patch")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) diff --git a/gnu/packages/patches/libnftnl-dont-check-NFTNL_FLOWTABLE_SIZE.patch b/gnu/packages/patches/libnftnl-dont-check-NFTNL_FLOWTABLE_SIZE.patch new file mode 100644 index 0000000000..df0571bf2b --- /dev/null +++ b/gnu/packages/patches/libnftnl-dont-check-NFTNL_FLOWTABLE_SIZE.patch @@ -0,0 +1,47 @@ +From: Tobias Geerinckx-Rice +Date: Tue, 10 Dec 2019 16:20:40 +0100 +Subject: gnu: libnftnl: Don't check NFTNL_FLOWTABLE_SIZE. + +Taken verbatim from the upstream commit[0] directly following the 1.1.5 +release. + +[0]: https://git.netfilter.org/libnftnl/commit/?id=b2388765e0c4405442faa13845419f6a35d0134c + +From b2388765e0c4405442faa13845419f6a35d0134c Mon Sep 17 00:00:00 2001 +From: Phil Sutter +Date: Mon, 2 Dec 2019 18:29:56 +0100 +Subject: tests: flowtable: Don't check NFTNL_FLOWTABLE_SIZE + +Marshalling code around that attribute has been dropped by commit +d1c4b98c733a5 ("flowtable: remove NFTA_FLOWTABLE_SIZE") so it's value is +lost during the test. + +Assuming that NFTNL_FLOWTABLE_SIZE will receive kernel support at a +later point, leave the test code in place but just comment it out. + +Fixes: d1c4b98c733a5 ("flowtable: remove NFTA_FLOWTABLE_SIZE") +Signed-off-by: Phil Sutter +Acked-by: Pablo Neira Ayuso +--- + tests/nft-flowtable-test.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/tests/nft-flowtable-test.c b/tests/nft-flowtable-test.c +index 3edb00d..8ab8d4c 100644 +--- a/tests/nft-flowtable-test.c ++++ b/tests/nft-flowtable-test.c +@@ -33,9 +33,11 @@ static void cmp_nftnl_flowtable(struct nftnl_flowtable *a, struct nftnl_flowtabl + if (nftnl_flowtable_get_u32(a, NFTNL_FLOWTABLE_USE) != + nftnl_flowtable_get_u32(b, NFTNL_FLOWTABLE_USE)) + print_err("Flowtable use mismatches"); ++#if 0 + if (nftnl_flowtable_get_u32(a, NFTNL_FLOWTABLE_SIZE) != + nftnl_flowtable_get_u32(b, NFTNL_FLOWTABLE_SIZE)) + print_err("Flowtable size mismatches"); ++#endif + if (nftnl_flowtable_get_u32(a, NFTNL_FLOWTABLE_FLAGS) != + nftnl_flowtable_get_u32(b, NFTNL_FLOWTABLE_FLAGS)) + print_err("Flowtable flags mismatches"); +-- +cgit v1.2.1 + -- cgit v1.2.3 From e221e9a7bce12789214066075bda2910106b6c32 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 10 Dec 2019 16:31:35 +0100 Subject: gnu: nftables: Prefer mirror://netfilter sources. * gnu/packages/linux.scm (nftables)[source]: Add a mirror:// URI. --- gnu/packages/linux.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 024c6e5617..97cb6fffbf 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -5259,8 +5259,10 @@ (define-public nftables (source (origin (method url-fetch) - (uri (string-append "https://www.nftables.org/projects/nftables" - "/files/nftables-" version ".tar.bz2")) + (uri (list (string-append "mirror://netfilter.org/nftables/nftables-" + version ".tar.bz2") + (string-append "https://www.nftables.org/projects/nftables" + "/files/nftables-" version ".tar.bz2"))) (sha256 (base32 "1x8kalbggjq44j4916i6vyv1rb20dlh1dcsf9xvzqsry2j063djw")))) -- cgit v1.2.3 From 31e6ef05156b2e952d2b2f86433f7e39e1ef71e0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 10 Dec 2019 16:31:44 +0100 Subject: gnu: nftables: Update to 0.9.3. * gnu/packages/linux.scm (nftables): Update to 0.9.3. --- gnu/packages/linux.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 97cb6fffbf..48c8448a9d 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -5255,7 +5255,7 @@ (define-public libnftnl (define-public nftables (package (name "nftables") - (version "0.9.2") + (version "0.9.3") (source (origin (method url-fetch) @@ -5264,8 +5264,7 @@ (define-public nftables (string-append "https://www.nftables.org/projects/nftables" "/files/nftables-" version ".tar.bz2"))) (sha256 - (base32 - "1x8kalbggjq44j4916i6vyv1rb20dlh1dcsf9xvzqsry2j063djw")))) + (base32 "0y6vbqp6x8w165q65h4n9sba1406gaz0d4744gqszbm7w9f92swm")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--disable-man-doc"))) ; FIXME: Needs docbook2x. -- cgit v1.2.3 From 968dd994474d83354f43947a2666b7f4d8f2793b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 10 Dec 2019 20:49:27 +0100 Subject: gnu: iptables: Update to 1.8.4. * gnu/packages/linux.scm (iptables): Update to 1.8.4. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 48c8448a9d..0a3f7957c5 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1674,7 +1674,7 @@ (define-public alsa-plugins (define-public iptables (package (name "iptables") - (version "1.6.2") + (version "1.8.4") (source (origin (method url-fetch) (uri (string-append @@ -1682,7 +1682,7 @@ (define-public iptables version ".tar.bz2")) (sha256 (base32 - "0crp0lvh5m2f15pr8cw97h8yb8zjj10x95zj06j46cr68vx2vl2m")))) + "0z0mgs1ghvn3slc868mgbf2g26njgrzcy5ggyb5w4i55j1a3lflr")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From 336afa17e37a4ef2ab13efa24a25805d37a11cc8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 12 Dec 2019 14:29:47 +0100 Subject: gnu: wireguard: Update to 0.0.20191212. * gnu/packages/vpn.scm (wireguard): Update to 0.0.20191212. --- gnu/packages/vpn.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index 1c2228c426..6d780dc8cd 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -456,14 +456,14 @@ (define-public badvpn (define-public wireguard (package (name "wireguard") - (version "0.0.20191127") + (version "0.0.20191212") (source (origin (method url-fetch) (uri (string-append "https://git.zx2c4.com/WireGuard/snapshot/" "WireGuard-" version ".tar.xz")) (sha256 (base32 - "01ixdhbvx5yiq07msd60f98685wdksss4pfhdn1d8r25z2k80kkx")))) + "0wdhl7i4zkb7yf0jj03ig2ks7bsfz9if8x9dy6r2523s1ww1imxh")))) (build-system gnu-build-system) (outputs '("out" ; The WireGuard userspace tools "kernel-patch")) ; A patch to build Linux with WireGuard support -- cgit v1.2.3 From 55e21617d68073077fdc9f35307e94859ec7a6c4 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Mon, 2 Dec 2019 21:15:50 +0100 Subject: linux-boot: Don't ignore flags when mounting root file system. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/build/linux-boot.scm (mount-root-file-system): Add the 'flags' keyword argument and use it when mounting the root file system. (boot-system): Pass the root file system flags to 'mount-root-file-system'. Signed-off-by: Ludovic Courtès --- gnu/build/linux-boot.scm | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/build/linux-boot.scm b/gnu/build/linux-boot.scm index 950a3507f2..3d40a7d05d 100644 --- a/gnu/build/linux-boot.scm +++ b/gnu/build/linux-boot.scm @@ -358,10 +358,10 @@ (define (pidof program) (filter-map string->number (scandir "/proc"))))) (define* (mount-root-file-system root type - #:key volatile-root? options) - "Mount the root file system of type TYPE at device ROOT. If VOLATILE-ROOT? -is true, mount ROOT read-only and make it an overlay with a writable tmpfs -using the kernel built-in overlayfs. OPTIONS indicates the options to use + #:key volatile-root? (flags 0) options) + "Mount the root file system of type TYPE at device ROOT. If VOLATILE-ROOT? is +true, mount ROOT read-only and make it an overlay with a writable tmpfs using +the kernel built-in overlayfs. FLAGS and OPTIONS indicates the options to use to mount ROOT." (if volatile-root? @@ -384,7 +384,7 @@ (define* (mount-root-file-system root type "lowerdir=/real-root,upperdir=/rw-root/upper,workdir=/rw-root/work")) (begin (check-file-system root type) - (mount root "/root" type 0 options))) + (mount root "/root" type flags options))) ;; Make sure /root/etc/mtab is a symlink to /proc/self/mounts. (false-if-exception @@ -474,6 +474,13 @@ (define root-fs-type mounts) "ext4")) + (define root-fs-flags + (mount-flags->bit-mask (or (any (lambda (fs) + (and (root-mount-point? fs) + (file-system-flags fs))) + mounts) + '()))) + (define root-fs-options (any (lambda (fs) (and (root-mount-point? fs) @@ -533,6 +540,7 @@ (define root-fs-options (mount-root-file-system (canonicalize-device-spec root) root-fs-type #:volatile-root? volatile-root? + #:flags root-fs-flags #:options root-fs-options)) (mount "none" "/root" "tmpfs")) -- cgit v1.2.3 From 4d6d88bb7e7c8fd1a406c063eb7771343a18ad4a Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Thu, 12 Dec 2019 19:38:09 +0100 Subject: gnu: coq: Split coqide. * gnu/packages/coq.scm (coq)[outputs]: Add "ide" output. --- gnu/packages/coq.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm index 75b9831d39..7b2cdfec5d 100644 --- a/gnu/packages/coq.scm +++ b/gnu/packages/coq.scm @@ -58,6 +58,7 @@ (define-public coq (variable "COQPATH") (files (list "lib/coq/user-contrib"))))) (build-system ocaml-build-system) + (outputs '("out" "ide")) (inputs `(("lablgtk" ,lablgtk) ("python" ,python-2) @@ -72,6 +73,13 @@ (define-public coq (lambda _ (for-each make-file-writable (find-files ".")) #t)) + (add-after 'unpack 'remove-lablgtk-references + (lambda _ + ;; This is not used anywhere, but creates a reference to lablgtk in + ;; every binary + (substitute* '("config/coq_config.mli" "configure.ml") + ((".*coqideincl.*") "")) + #t)) (replace 'configure (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -88,6 +96,23 @@ (define-public coq "-j" (number->string (parallel-job-count)) "world"))) (delete 'check) + (add-after 'install 'remove-duplicate + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin"))) + ;; These are exact copies of the version without the .opt suffix. + ;; Remove them to save 35 MiB in the result + (delete-file (string-append bin "/coqtop.opt")) + (delete-file (string-append bin "/coqidetop.opt"))) + #t)) + (add-after 'install 'install-ide + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (ide (assoc-ref outputs "ide"))) + (mkdir-p (string-append ide "/bin")) + (rename-file (string-append out "/bin/coqide") + (string-append ide "/bin/coqide"))) + #t)) (add-after 'install 'check (lambda _ (with-directory-excursion "test-suite" -- cgit v1.2.3 From 9705e40071e4f7f3e97a434ee65985a3716834f2 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Thu, 12 Dec 2019 22:11:37 +0000 Subject: gnu: guix-data-service: Update to 0.0.1-7.156b7ee. * gnu/packages/web.scm (guix-data-service): Update to 0.0.1-7.156b7ee. [arguments]: Add guix-data-service-manage-build-servers to the list of scripts. --- gnu/packages/web.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 1fbd3dcb7a..749bc06fa9 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4194,8 +4194,8 @@ (define-public python2-feedparser (package-with-python2 python-feedparser)) (define-public guix-data-service - (let ((commit "af1324855e1ecaf9b1dd7afcc714d09aaa38f081") - (revision "6")) + (let ((commit "156b7eea7e7d538e332d8cfcf482c5ebec0a25c0") + (revision "7")) (package (name "guix-data-service") (version (string-append "0.0.1-" revision "." (string-take commit 7))) @@ -4207,7 +4207,7 @@ (define-public guix-data-service (file-name (git-file-name name version)) (sha256 (base32 - "1qxs1sbyx894njw4f898wzc5shjj85h9kgz95p8mq1acmazhlhkv")))) + "1cg7jzk7pabfp3mgnkpycasv7fs522xp3nqdvna1y76aif3pd3zh")))) (build-system gnu-build-system) (arguments '(#:modules ((guix build utils) @@ -4251,6 +4251,7 @@ (define-public guix-data-service "guix-data-service-process-branch-updated-mbox" "guix-data-service-process-job" "guix-data-service-process-jobs" + "guix-data-service-manage-build-servers" "guix-data-service-query-build-servers")) #t))) (delete 'strip)))) ; As the .go files aren't compatible -- cgit v1.2.3 From d057c52f951d92460a987770fef0881a300c07cf Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Thu, 12 Dec 2019 18:41:17 -0600 Subject: gnu: emacs-telega: Update to 0.5.2. * gnu/packages/emacs-xyz.scm (emacs-telega): Update to 0.5.2. --- gnu/packages/emacs-xyz.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 1a49ff4172..2b8c143d4a 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -20073,9 +20073,9 @@ (define-public emacs-helm-fish-completion (license license:gpl3+)))) (define-public emacs-telega - (let ((commit "56aef884921d99e5170d5425dbe0fce645620511") - (revision "2") - (version "0.4.4")) + (let ((commit "57fb6089aac3c7bd84fd9a2d9ccb1937c9836275") + (revision "1") + (version "0.5.2")) (package (name "emacs-telega") (version (git-version version revision commit)) @@ -20087,7 +20087,7 @@ (define-public emacs-telega (commit commit))) (sha256 (base32 - "0a8k3j20nz4xwswg9qp9xpaakk3q3ibiz8mkryk92zmrdmaah5mi")) + "0v46jnkphsd7glndcxz05b3xbgyw0i8zl0ybzbrjx24764svn69f")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From b45af175b1671eaaeb9519a1b069e0a256da2a7d Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Thu, 12 Dec 2019 20:51:28 -0600 Subject: gnu: emacs-telega: Add sticker support. * gnu/packages/emacs-xyz.scm (emacs-telega)[propagated-inputs]: Add libwebp to the propagated-inputs in order to emit stickers properly. --- gnu/packages/emacs-xyz.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 2b8c143d4a..0f3bc2a868 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -20169,7 +20169,8 @@ (define-public emacs-telega (add-after 'emacs-build 'emacs-make-autoloads (assoc-ref emacs:%standard-phases 'make-autoloads))))) (propagated-inputs - `(("emacs-visual-fill-column" ,emacs-visual-fill-column))) + `(("emacs-visual-fill-column" ,emacs-visual-fill-column) + ("libwebp" ,libwebp))) ; sticker support. (native-inputs `(("tdlib" ,tdlib) ("emacs" ,emacs-minimal) -- cgit v1.2.3 From 7afb0b25df649e814ded611bdb656d802b821a73 Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Thu, 12 Dec 2019 20:55:16 -0600 Subject: gnu: emacs-telega: Modify description. * gnu/packages/emacs-xyz.scm (emacs-telega)[description]: Modify the description to be easier to read. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 0f3bc2a868..487e0f3e83 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -20177,8 +20177,8 @@ (define-public emacs-telega ("python" ,python))) (synopsis "GNU Emacs client for the Telegram messenger") (description - "Telega is full-featured, unofficial client for the Telegram messaging -platform for GNU Emacs.") + "Telega is a full-featured, unofficial GNU Emacs-based client for the +Telegram messaging platform.") (home-page "https://github.com/zevlg/telega.el") (license license:gpl3+)))) -- cgit v1.2.3 From f85c0f1878e08a08f5e4fcea2aeb7add24cbe3e3 Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Thu, 12 Dec 2019 20:55:59 -0600 Subject: gnu: emacs-telega: Update to 0.5.2-2. * gnu/packages/emacs-xyz.scm (emacs-telega): Update to 0.5.2-2. Adds support for I18N. --- gnu/packages/emacs-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 487e0f3e83..668a34b3b8 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -20073,8 +20073,8 @@ (define-public emacs-helm-fish-completion (license license:gpl3+)))) (define-public emacs-telega - (let ((commit "57fb6089aac3c7bd84fd9a2d9ccb1937c9836275") - (revision "1") + (let ((commit "6184e76990db395bea02f7b5d3169e746111e1ad") + (revision "2") (version "0.5.2")) (package (name "emacs-telega") @@ -20087,7 +20087,7 @@ (define-public emacs-telega (commit commit))) (sha256 (base32 - "0v46jnkphsd7glndcxz05b3xbgyw0i8zl0ybzbrjx24764svn69f")) + "1kfmmfc9dv3r2wxm1njflgas51qm0j8sj7yr7vfvwaz5sz7p121b")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From eb8aad6a23442cf7b23e0df88b89b4cd030dfbf5 Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Thu, 12 Dec 2019 21:24:54 -0600 Subject: gnu: emacs-telega: Add MP4/GIF support. * gnu/packages/emacs-xyz.scm (emacs-telega)[propagated-inputs]: Pass ffmpeg in propagated-inputs to support playback of inline MP4 and GIF files. --- gnu/packages/emacs-xyz.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 668a34b3b8..ae7e7a64cc 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -20170,6 +20170,7 @@ (define-public emacs-telega (assoc-ref emacs:%standard-phases 'make-autoloads))))) (propagated-inputs `(("emacs-visual-fill-column" ,emacs-visual-fill-column) + ("ffmpeg" ,ffmpeg) ; mp4/gif support. ("libwebp" ,libwebp))) ; sticker support. (native-inputs `(("tdlib" ,tdlib) -- cgit v1.2.3 From 9e6794a7f46d83cdd3a9f2ba1634ea2bf29ee9ec Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Fri, 13 Dec 2019 06:46:11 -0600 Subject: gnu: python-acme: Update to 1.0.0. * gnu/packages/tls.scm (python-acme): Update to 1.0.0. --- gnu/packages/tls.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 6d91989b19..e95069da95 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -553,13 +553,13 @@ (define-public python-acme (package (name "python-acme") ;; Remember to update the hash of certbot when updating python-acme. - (version "0.40.1") + (version "1.0.0") (source (origin (method url-fetch) (uri (pypi-uri "acme" version)) (sha256 (base32 - "1z2zibs9lyxi5gxw9bny1127bjliwsp476kai1wnnnwd8238dgrk")))) + "1hl62dnh8zsipa5azzpy5kwgjgb5vflinhna1fsn7rcchhpz223a")))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.2.3 From c08dc8d593b6d14443205c15fb2e55cd6fabbe3d Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Fri, 13 Dec 2019 06:47:03 -0600 Subject: gnu: certbot: Update to 1.0.0. * gnu/packages/tls.scm (certbot): Update to 1.0.0. --- gnu/packages/tls.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index e95069da95..10d864348c 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -610,7 +610,7 @@ (define-public certbot (uri (pypi-uri "certbot" version)) (sha256 (base32 - "1l8h7ggq75h59246mmzigmjr5jvzi29hihrnz9aiqh6g8hq1pj4d")))) + "0aih7sir5byy8ah9lrgzwcaga7hjw98qj8bb1pxzzzqrvcqjvf46")))) (build-system python-build-system) (arguments `(,@(substitute-keyword-arguments (package-arguments python-acme) -- cgit v1.2.3 From 594280b103479bfcb6189d17dd89db40e3ed602e Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Fri, 13 Dec 2019 06:54:05 -0600 Subject: gnu: python-semver: Update to 2.9.0. * gnu/packages/python-xyz.scm (python-semver): Update to 2.9.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 03dddcde43..3705e81d3d 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -14327,14 +14327,14 @@ (define-public python2-activepapers (define-public python-semver (package (name "python-semver") - (version "2.7.9") + (version "2.9.0") (source (origin (method url-fetch) (uri (pypi-uri "semver" version)) (sha256 (base32 - "0hhgqppchv59rqj0yzi1prdg2nfsywqmjsqy2rycyxm0hvxmbyqz")))) + "183kg1rhzz3hqizvphkd8hlbf1zxfx8737zhfkmqzxi71jmdw7pd")))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.2.3 From c587482dcb513f9800db27cb8de21ec21adee399 Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Fri, 13 Dec 2019 06:54:23 -0600 Subject: gnu: python-semver: Do not patch virtualenv for tests. * gnu/packages/python-xyz.scm (python-semver)[arguments]: The substitution case for patching virtualenv versioning is no longer requireed. --- gnu/packages/python-xyz.scm | 9 --------- 1 file changed, 9 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 3705e81d3d..a66b1bbe5b 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -14336,15 +14336,6 @@ (define-public python-semver (base32 "183kg1rhzz3hqizvphkd8hlbf1zxfx8737zhfkmqzxi71jmdw7pd")))) (build-system python-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-test-requirements - (lambda _ - (substitute* "setup.py" - ;; Our Python is new enough. - (("'virtualenv<14\\.0\\.0'") "'virtualenv'")) - #t))))) (native-inputs `(("python-tox" ,python-tox) ("python-virtualenv" ,python-virtualenv))) -- cgit v1.2.3 From 2ecbba24082c6cf9e8ea40563433fe94f905ad07 Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Fri, 13 Dec 2019 06:56:12 -0600 Subject: gnu: python-semver: Adjust indentation. * gnu/packages/python-xyz.scm (python-semver): Adjust indentation. --- gnu/packages/python-xyz.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index a66b1bbe5b..3d1f8c0e01 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -14329,12 +14329,12 @@ (define-public python-semver (name "python-semver") (version "2.9.0") (source - (origin - (method url-fetch) - (uri (pypi-uri "semver" version)) - (sha256 - (base32 - "183kg1rhzz3hqizvphkd8hlbf1zxfx8737zhfkmqzxi71jmdw7pd")))) + (origin + (method url-fetch) + (uri (pypi-uri "semver" version)) + (sha256 + (base32 + "183kg1rhzz3hqizvphkd8hlbf1zxfx8737zhfkmqzxi71jmdw7pd")))) (build-system python-build-system) (native-inputs `(("python-tox" ,python-tox) -- cgit v1.2.3 From 5076c13b490bc798294119609688e8f2bf0e0cf5 Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Fri, 13 Dec 2019 07:06:27 -0600 Subject: gnu: python-blessings: Update to 1.7. * gnu/packages/terminals.scm (python-blessings): Update to 1.7. --- gnu/packages/terminals.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 75c0092064..e1f3307ba4 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -16,6 +16,7 @@ ;;; Copyright © 2018, 2019 Eric Bavier ;;; Copyright © 2019 Julien Lepiller ;;; Copyright © 2019 Pierre Langlois +;;; Copyright © 2019 Brett Gilio ;;; ;;; This file is part of GNU Guix. ;;; @@ -828,14 +829,14 @@ (define-public python2-pyte (define-public python-blessings (package (name "python-blessings") - (version "1.6.1") + (version "1.7") (source (origin (method url-fetch) (uri (pypi-uri "blessings" version)) (sha256 (base32 - "1smngy65p8mi62lgm04icasx22v976szhs2aq95y2ljmi1srb4bl")))) + "0z8mgkbmisxs10rz88qg46l1c9a8n08k8cy2iassal2zh16qbrcq")))) (build-system python-build-system) (arguments ;; TODO: For py3, 2to2 is used to convert the code, but test-suite fails -- cgit v1.2.3 From d1efb11a0cfeb4cd18b8dca14683a6ebaf2c52ea Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Fri, 13 Dec 2019 07:06:39 -0600 Subject: gnu: python-blessings: Update comment on test suite. * gnu/packages/terminals.scm (python-blessings): Test suite has been revised. [arguments]: Change comment to reflect change in test suite regarding TTY. [native-inputs]: Pass python-six, which is required for test suite. --- gnu/packages/terminals.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index e1f3307ba4..a385e62630 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -839,10 +839,11 @@ (define-public python-blessings "0z8mgkbmisxs10rz88qg46l1c9a8n08k8cy2iassal2zh16qbrcq")))) (build-system python-build-system) (arguments - ;; TODO: For py3, 2to2 is used to convert the code, but test-suite fails + ;; FIXME: Test suite is unable to detect TTY conditions. `(#:tests? #f)) (native-inputs - `(("python-nose" ,python-nose))) + `(("python-nose" ,python-nose) + ("python-six" ,python-six))) (home-page "https://github.com/erikrose/blessings") (synopsis "Python module to manage terminal color, styling, and positioning") -- cgit v1.2.3 From 19ba75dc02c4ff072f96296543a00737bcf24bf9 Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Fri, 13 Dec 2019 07:30:13 -0600 Subject: gnu: python-yapf: Update to 0.29.0. * gnu/packages/python-xyz.scm (python-yapf): Update to 0.29.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 3d1f8c0e01..9fac87648a 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -14555,14 +14555,14 @@ (define-public python2-send2trash (define-public python-yapf (package (name "python-yapf") - (version "0.24.0") + (version "0.29.0") (source (origin (method url-fetch) (uri (pypi-uri "yapf" version)) (sha256 (base32 - "0anwby0ydmyzcsgjc5dn1ryddwvii4dq61vck447q0n96npnzfyf")))) + "1pj3xzblmbssshi889b6n9hwqbjpabw6j0fimlng2sshd3226bki")))) (build-system python-build-system) (home-page "https://github.com/google/yapf") (synopsis "Formatter for Python code") -- cgit v1.2.3