From b4e97063ba1ba912fecf02104f64960319622504 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 5 Dec 2021 19:17:01 +0100 Subject: gnu: trezor-agent: Fix hash. * gnu/packages/finance.scm (trezor-agent): Update hash. Hash was not updated when committing c7c4f8088195a8e6650904de4e16d71b98776a76. --- gnu/packages/finance.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 268f7ab3a5..4793fe3adf 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -1115,7 +1115,7 @@ (define-public trezor-agent (commit "v0.14.4"))) (file-name (git-file-name name version)) (sha256 - (base32 "0nl44ldfw9s2v3p7g5bldfw3ds2hz9r28j42bpnp8bj0v5na3ivk")) + (base32 "1ksv494xpga27ifrjyn1bkqaya5h769lqb9rx1ng0n4kvmnrqr3l")) (modules '((guix build utils) (ice-9 ftw) -- cgit v1.2.3 From 23e1f3e4f616b52013822fa4f91973280379acc9 Mon Sep 17 00:00:00 2001 From: Aleksandr Vityazev Date: Sun, 5 Dec 2021 18:13:00 +0000 Subject: gnu: emacs-sly: Update to 1.0.43-5.0470c02 * gnu/packages/emacs-xyz.scm (emacs-sly): Update to 1.0.43-5.0470c02. Signed-off-by: Nicolas Goaziou --- 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 9b262a6d66..f75606b3a4 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -11331,12 +11331,12 @@ (define-public emacs-cider (define-public emacs-sly ;; Update together with sbcl-slynk. - (let ((commit "fb84318c08f59bc786e047006fc81e2ace568309")) + (let ((commit "0470c0281498b9de072fcbf3718fc66720eeb3d0")) ;; Versions are not always tagged. Besides, latest master contains ;; important fixes. (package (name "emacs-sly") - (version (git-version "1.0.43" "4" commit)) + (version (git-version "1.0.43" "5" commit)) (source (origin (method git-fetch) @@ -11346,7 +11346,7 @@ (define-public emacs-sly (file-name (git-file-name name version)) (sha256 (base32 - "0z123k9ak7yjb9bxb5qx48f33ma8066rhkqh8xc14z7shk75jybj")))) + "1ws2a9azmdkkg47xnd4jggna45nf0bh54gyp0799b44c4bgjp029")))) (build-system emacs-build-system) (native-inputs `(("texinfo" ,texinfo))) -- cgit v1.2.3 From df4debda05d1d8a0931303b8d0a1a1e193a9a197 Mon Sep 17 00:00:00 2001 From: Aleksandr Vityazev Date: Sun, 5 Dec 2021 18:13:13 +0000 Subject: gnu: sbcl-slynk: Update to 1.0.43-5.0470c02 * gnu/packages/lisp-xyz.scm (sbcl-slynk): Update to 1.0.43-5.0470c02. Signed-off-by: Nicolas Goaziou --- gnu/packages/lisp-xyz.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 32a127dc99..635f8e48cb 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -29,6 +29,7 @@ ;;; Copyright © 2021 Charles Jackson ;;; Copyright © 2021 Foo Chuan Wei ;;; Copyright © 2021 jgart +;;; Copyright © 2021 Aleksandr Vityazev ;;; ;;; This file is part of GNU Guix. ;;; @@ -1019,10 +1020,10 @@ (define-public ecl-clx-truetype (sbcl-package->ecl-package sbcl-clx-truetype)) (define-public sbcl-slynk - (let ((commit "fb84318c08f59bc786e047006fc81e2ace568309")) + (let ((commit "0470c0281498b9de072fcbf3718fc66720eeb3d0")) (package (name "sbcl-slynk") - (version (git-version "1.0.43" "4" commit)) + (version (git-version "1.0.43" "5" commit)) (source (origin (method git-fetch) @@ -1031,7 +1032,7 @@ (define-public sbcl-slynk (url "https://github.com/joaotavora/sly") (commit commit))) (sha256 - (base32 "0z123k9ak7yjb9bxb5qx48f33ma8066rhkqh8xc14z7shk75jybj")) + (base32 "1ws2a9azmdkkg47xnd4jggna45nf0bh54gyp0799b44c4bgjp029")) (file-name (git-file-name "slynk" version)))) (build-system asdf-build-system/sbcl) (outputs '("out" "image")) -- cgit v1.2.3 From c4699914c941969dd979c12579d9f8531dd0c998 Mon Sep 17 00:00:00 2001 From: simendsjo Date: Sun, 5 Dec 2021 10:34:10 +0100 Subject: gnu: font-iosevka: Update to 11.2.0. * gnu/packages/fonts.scm (font-iosevka): Update to 11.2.0 Signed-off-by: Nicolas Goaziou --- gnu/packages/fonts.scm | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index c3ad57f203..0e5904b2f0 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -35,7 +35,7 @@ ;;; Copyright © 2020 Raghav Gururajan ;;; Copyright © 2020, 2021 Julien Lepiller ;;; Copyright © 2020 Zhu Zihao -;;; Copyright © 2020 Simen Endsjø +;;; Copyright © 2020, 2021 Simen Endsjø ;;; Copyright © 2020 Tim Van den Langenbergh ;;; Copyright © 2020 Nicolò Balzarotti ;;; Copyright © 2021 Antoine Côté @@ -1279,7 +1279,7 @@ (define-public font-comic-neue (ice-9 string-fun) (gnu packages fonts)) -(let ((new-version "7.0.3") +(let ((new-version "11.2.0") (iosevka-hashes #nil) (iosevka-fails #nil)) (for-each (lambda (font) @@ -1313,7 +1313,7 @@ (define-public font-comic-neue (define-public font-iosevka (package (name "font-iosevka") - (version "7.0.3") + (version "11.2.0") (source (origin (method url-fetch/zipbomb) @@ -1321,7 +1321,7 @@ (define-public font-iosevka "/releases/download/v" version "/ttc-iosevka-" version ".zip")) (sha256 - (base32 "08n1c2j38vd1qrf18ilgvq6rl7z9yrsyq9ljf037yiw6zlphx4da")))) + (base32 "16a5bbjy9kn62pbrmam6jvcki4xvbakxbqzv72kkpz7p10b10vz7")))) (build-system font-build-system) (home-page "https://be5invis.github.io/Iosevka/") (synopsis "Coders' typeface, built from code") @@ -1344,7 +1344,7 @@ (define-public font-iosevka-slab "/releases/download/v" version "/ttc-iosevka-slab-" version ".zip")) (sha256 - (base32 "1ggrbl8gi2hv8yiw7vw8cajlv7nkz8i975165cayyzppjlrfs3nr")))))) + (base32 "068nd8wph44r9ka3fd7b5jhph505w08ibn3dmd7czdcp1fkr7dhi")))))) (define-public font-iosevka-term (package @@ -1358,7 +1358,7 @@ (define-public font-iosevka-term "/releases/download/v" version "/ttf-iosevka-term-" version ".zip")) (sha256 - (base32 "1jmbp3hni99l92653b356nbmj45kd54kbl6c6ws1k5jxydrjglrh")))) + (base32 "0a22pnr74l87ajprcki3j3fc5cryfr5krpxang0b51grkdb9l724")))) (arguments `(#:phases (modify-phases %standard-phases @@ -1379,7 +1379,7 @@ (define-public font-iosevka-term-slab "releases/download/v" version "/" "ttf-iosevka-term-slab-" version ".zip")) (sha256 - (base32 "19fc6jbkv0aif6ds9ddxaarz2ambzln7y6k2qjsczwlbznr8cf09")))) + (base32 "00nsykwa1r198wrh85d42vbjwpxxsmzdn3i4fighdrd3c99fbv60")))) (arguments `(#:phases (modify-phases %standard-phases @@ -1400,7 +1400,7 @@ (define-public font-iosevka-aile "/releases/download/v" version "/ttc-iosevka-aile-" version ".zip")) (sha256 - (base32 "1bkrk4dqkj45fbaac2n61a5kwxs3bk6sdm5hanw7g2h4xb83fi8d")))))) + (base32 "11xajywv20ah6yg3a0sqv2lp5phg8yv268dw2myz3ciazwnvdpqq")))))) (define-public font-iosevka-curly (package @@ -1414,7 +1414,7 @@ (define-public font-iosevka-curly "releases/download/v" version "/" "ttc-iosevka-curly-" version ".zip")) (sha256 - (base32 "12jdb38dlbwa58q0b0sf9sp1dcafzp9dcf71jf1wrlnn8047vxyx")))))) + (base32 "1ss11pdrk7k0kwbaklllz4mb961j6issjp53jpp7p9pvs4qad8xf")))))) (define-public font-iosevka-curly-slab (package @@ -1428,7 +1428,7 @@ (define-public font-iosevka-curly-slab "releases/download/v" version "/" "ttc-iosevka-curly-slab-" version ".zip")) (sha256 - (base32 "0zn21bxyj0ni4vbdarwam2piixzvkdk769vg3k4fl3h03q56cj24")))))) + (base32 "141jyarpmln5q3cjyq79nw9kfm55vaiy3cin3rlamghrhjw8wg9q")))))) (define-public font-iosevka-etoile (package @@ -1442,7 +1442,7 @@ (define-public font-iosevka-etoile "/releases/download/v" version "/ttc-iosevka-etoile-" version ".zip")) (sha256 - (base32 "0lnpdvv20g2bg6rwl0gv83bkbgfmkbyfxshhpw9vprfs2g8k6lil")))))) + (base32 "097b8acia49fqpsy3w6ldk73k4abn6z9mlkl1p4iw99k26ip1sy7")))))) (define-public font-sarasa-gothic (package -- cgit v1.2.3 From 13f2f2d14d9597e5c49f84f5f903dea75c5177aa Mon Sep 17 00:00:00 2001 From: jgart Date: Sun, 5 Dec 2021 04:53:11 -0500 Subject: gnu: Add rust-no-color-0.1. * gnu/packages/crates-io.scm (rust-no-color-0.1): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/crates-io.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 7d5833ffc0..0a26c11a8e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -32140,6 +32140,26 @@ (define-public rust-nl80211-0.0.2 to nl80211 and receive messages.") (license license:expat))) +(define-public rust-no-color-0.1 + (package + (name "rust-no-color") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "no_color" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1m0x6i5q1jav2jgajkg4irrkfgv4lakpdvmj310b90wswdyy9xdx")))) + (build-system cargo-build-system) + (arguments `(#:skip-build? #t)) + (home-page "https://github.com/sitkevij/no_color") + (synopsis "Library to detect NO_COLOR environment variable") + (description +"@code{no_color} is a rust library for detecting if the @code{NO_COLOR} +environment variable is set.") + (license license:expat))) + (define-public rust-no-panic-0.1 (package (name "rust-no-panic") -- cgit v1.2.3 From a3dea002c1734cf775c8beb1508f6d2ec0396e52 Mon Sep 17 00:00:00 2001 From: jgart Date: Sun, 5 Dec 2021 04:53:12 -0500 Subject: gnu: Add hex. * gnu/packages/rust-apps.scm (hex): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/rust-apps.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index be60f3f376..51075b5448 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -856,6 +856,36 @@ (define-public tectonic of support files.") (license license:expat))) +(define-public hex + (package + (name "hex") + (version "0.4.2") + (source + (origin + ;; crates.io does not provide the test data. + (method git-fetch) + (uri (git-reference + (url "https://github.com/sitkevij/hex") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "03x27nixdlnkkrh85gy4152arp02kpjwq0i9dn9p73lyr24s64lv")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-ansi-term" ,rust-ansi-term-0.12) + ("rust-atty" ,rust-atty-0.2) + ("rust-clap" ,rust-clap-2) + ("rust-no-color" ,rust-no-color-0.1)) + #:cargo-development-inputs + (("rust-assert-cmd" ,rust-assert-cmd-1)))) + (home-page "https://github.com/sitkevij/hex") + (synopsis "Hexadecimal colorized view of a file") + (description + "@command{hx} accepts a file path as input and outputs a hexadecimal +colorized view to stdout.") + (license license:expat))) + (define-public tokei (package (name "tokei") -- cgit v1.2.3 From e0e9aa116e2480a4ee5bead32c869ff777ce1e5d Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 5 Dec 2021 21:22:43 +0100 Subject: gnu: emacs-geiser: Update to 0.19. * gnu/packages/emacs-xyz.scm (emacs-geiser): Update to 0.19. --- 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 f75606b3a4..ecea1d1e07 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -235,7 +235,7 @@ (define-module (gnu packages emacs-xyz) (define-public emacs-geiser (package (name "emacs-geiser") - (version "0.18") + (version "0.19") (source (origin (method git-fetch) @@ -244,7 +244,7 @@ (define-public emacs-geiser (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1dd1jqfnwghqhsm2r5akqq1s4d621rd5rh93rxdqix2xg0nr9yp6")))) + (base32 "1pfdax2wsfyjz4ddfqh54n3lbxhqpg97grj7kgi641lbhppnq02g")))) (build-system emacs-build-system) (arguments '(#:phases -- cgit v1.2.3 From 6a8d2499ae7af242a71e1f215dd4a5038b5e48eb Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 5 Dec 2021 21:32:42 +0100 Subject: gnu: emacs-telega: Update to 0.7.031. * gnu/packages/emacs-xyz.scm (emacs-telega-server): Update to 0.7.031. --- 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 ecea1d1e07..052d4a134b 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -27146,7 +27146,7 @@ (define-public emacs-helm-switch-to-repl (define-public emacs-telega-server (package (name "emacs-telega-server") - (version "0.7.030") + (version "0.7.031") (source (origin (method git-fetch) @@ -27154,7 +27154,7 @@ (define-public emacs-telega-server (url "https://github.com/zevlg/telega.el") (commit (string-append "v" version)))) (sha256 - (base32 "1g29v5fgkqx43wsvh1npx0g3hj00n37lxgvxjvy85fs4h9226gl9")) + (base32 "05j82796s4k3yr0igl6hir3p8qj0cw66vvhbpbcy28d6q9v9vjjz")) (file-name (git-file-name "emacs-telega" version)) (patches (search-patches "emacs-telega-path-placeholder.patch" -- cgit v1.2.3 From 648db3ad2bee9499bed1b7725eca2c2a4aaebe81 Mon Sep 17 00:00:00 2001 From: jgart Date: Thu, 25 Nov 2021 04:52:01 -0500 Subject: gnu: Add litterbox. * gnu/packages/irc.scm (litterbox): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/irc.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm index 2817624437..840c27f5c5 100644 --- a/gnu/packages/irc.scm +++ b/gnu/packages/irc.scm @@ -571,6 +571,39 @@ (define-public epic5 ;; distribute binaries. (license:non-copyleft "http://epicsol.org/copyright"))))) +(define-public litterbox + (package + (name "litterbox") + (version "1.8") + (source + (origin + (method url-fetch) + (uri (string-append "https://git.causal.agency/litterbox/snapshot/litterbox-" + version ".tar.gz")) + (sha256 + (base32 "0ll5d18slngdg2qhaxkvrcq2p1admh0h7sr06wx8347ka0vvrgjl")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; There are no tests. + #:make-flags + (list + (string-append "CC=" ,(cc-for-target)) + (string-append "PREFIX=" %output)))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("universal-ctags" ,universal-ctags))) + (inputs + `(("libressl" ,libressl) + ("sqlite" ,sqlite))) + (home-page "https://code.causal.agency/june/litterbox") + (synopsis "TLS-only IRC logger") + (description +"@command{litterbox} is a TLS-only IRC logger. It logs +events from IRC in a SQLite database, indexing messages for full-text +search. It is intended for use with the IRC bouncer @command{pounce}, +but can also be used independently as a logging bot.") + (license license:gpl3+))) + (define-public inspircd (package (name "inspircd") -- cgit v1.2.3 From f856c8f1b06d0c37accb88ffca39582d12c1ea07 Mon Sep 17 00:00:00 2001 From: Luis Felipe Date: Thu, 2 Dec 2021 15:48:05 -0500 Subject: gnu: Add python-django-svg-image-form-field. * gnu/packages/django.scm (python-django-svg-image-form-field): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/django.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm index d36950dc90..6598577149 100644 --- a/gnu/packages/django.scm +++ b/gnu/packages/django.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2018 Vijayalakshmi Vedantham ;;; Copyright © 2019 Sam ;;; Copyright © 2020, 2021 Marius Bakke +;;; Copyright © 2021 Luis Felipe López Acevedo ;;; ;;; This file is part of GNU Guix. ;;; @@ -1357,3 +1358,28 @@ (define-public python-django-url-filter and also specify the lookup type for each filter (very much like Django's filtering system in ORM).") (license license:expat))) + +(define-public python-django-svg-image-form-field + (package + (name "python-django-svg-image-form-field") + (version "1.0.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/artrey/django-svg-image-form-field") + (commit (string-append version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "131m545khn8l20j4x2bvlvz36dlbnhj9pc98i2dw72s3bw8pgws0")))) + (build-system python-build-system) + (propagated-inputs + `(("python-defusedxml" ,python-defusedxml) + ("python-django" ,python-django) + ("python-pillow" ,python-pillow))) + (home-page "https://github.com/artrey/django-svg-image-form-field") + (synopsis "Form field to validate SVG and other images") + (description "This form field allows users to provide SVG images for +models that use Django's standard @code{ImageField}, in addition to the +image files already supported by it.") + (license license:expat))) -- cgit v1.2.3 From 026ac3c0106bbdd6d149ed7f80f6100fb1fc9604 Mon Sep 17 00:00:00 2001 From: jgart Date: Thu, 25 Nov 2021 04:50:07 -0500 Subject: gnu: Add pounce. * gnu/packages/messaging.scm (pounce): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/messaging.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 2e3afb510e..4856df732e 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -30,6 +30,7 @@ ;;; Copyright © 2020 Giacomo Leidi ;;; Copyright © 2021 Denis 'GNUtoo' Carikli ;;; Copyright © 2021 Vinicius Monego +;;; Copyright © 2021 jgart ;;; ;;; This file is part of GNU Guix. ;;; @@ -59,6 +60,7 @@ (define-module (gnu packages messaging) #:use-module (gnu packages bison) #:use-module (gnu packages boost) #:use-module (gnu packages check) + #:use-module (gnu packages code) #:use-module (gnu packages compression) #:use-module (gnu packages cpp) #:use-module (gnu packages crypto) @@ -3189,6 +3191,37 @@ (define-public matterbridge (home-page "https://github.com/42wim/matterbridge") (license license:asl2.0))) +(define-public pounce + (package + (name "pounce") + (version "3.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://git.causal.agency/pounce/snapshot/pounce-" + version ".tar.gz")) + (sha256 + (base32 "1w4x34bspkqvk9p7bfj0zmvmbzvxb7lxrrr3g6lrfdj9f3qzfxpp")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ;there are no tests + #:make-flags + (list + (string-append "CC=" ,(cc-for-target)) + (string-append "PREFIX=" %output)))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("universal-ctags" ,universal-ctags))) + (inputs + `(("libressl" ,libressl))) + (home-page "https://code.causal.agency/june/pounce") + (synopsis "Simple multi-client TLS-only IRC bouncer") + (description + "@command{pounce} is a multi-client, TLS-only IRC bouncer. It maintains +a persistent connection to an IRC server, acting as a proxy and buffer for +a number of clients.") + (license license:gpl3+))) + (define-public weechat-matrix (package (name "weechat-matrix") -- cgit v1.2.3 From d8401fb508692c80a5048f4acc0cf444a566a010 Mon Sep 17 00:00:00 2001 From: Demis Balbach Date: Tue, 23 Nov 2021 19:55:21 +0100 Subject: gnu: Add phonesim. * gnu/packages/telephony.scm (phonesim): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/telephony.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index a2765ee99f..30b14578b6 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -20,6 +20,7 @@ ;;; Copyright © 2020, 2021 Maxim Cournoyer ;;; Copyright © 2020 Vincent Legoll ;;; Copyright © 2021 LibreMiami +;;; Copyright © 2021 Demis Balbach ;;; ;;; This file is part of GNU Guix. ;;; @@ -87,6 +88,7 @@ (define-module (gnu packages telephony) #:use-module (gnu packages bison) #:use-module (gnu packages flex) #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix utils) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) @@ -94,6 +96,38 @@ (define-module (gnu packages telephony) #:use-module (guix build-system gnu) #:use-module (guix build-system qt)) +(define-public phonesim + (package + (name "phonesim") + (version "1.21") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.kernel.org/pub/scm/network/ofono/phonesim") + (commit "a7c844d45b047b2dae5b0877816c346fce4c47b9"))) + (sha256 + (base32 "0rc1c2vr03dmi1dr3skj57v77ga9c22g29xs1qiphqms4isby9cq")))) + (build-system gnu-build-system) + (arguments + `(#:configure-flags + (list "--enable-maintainer-mode" + "CC=" ,(cc-for-target)))) + (native-inputs + `(("automake" ,automake) + ("autoconf" ,autoconf) + ("pkg-config" ,pkg-config))) + (inputs + `(("qtbase" ,qtbase-5) + ("qtdeclarative" ,qtdeclarative))) + (synopsis "Phone Simulator for modem testing") + (description + "Phonesim is a modem emulator that oFono uses for development and +testing. This allows oFono to be used by any host without requiring special +GSM (or other) hardware.") + (home-page "https://git.kernel.org/pub/scm/network/ofono/phonesim") + (license license:gpl2+))) + (define-public libilbc (package (name "libilbc") -- cgit v1.2.3 From 764be13ee62eff202ee2dd711167d0bfa4d2ec3f Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 5 Dec 2021 23:35:16 -0500 Subject: gnu: isync: Update to 1.4.4 [fixes CVE-2021-{3657,44143}]. * gnu/packages/mail.scm (isync): Update to 1.4.4. --- gnu/packages/mail.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 607f01d888..1d2357a98e 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -2143,14 +2143,14 @@ (define-public dovecot-libsodium-plugin (define-public isync (package (name "isync") - (version "1.4.3") + (version "1.4.4") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/isync/isync/" version "/isync-" version ".tar.gz")) (sha256 (base32 - "024p3glj4p7fhrssw5sr55arls9zna1igxxrspxlfd6sbds21ixl")))) + "1zq0wwvmqsl9y71546dr0aygzn9gjjfiw19hlcq87s929y4p6ckw")))) (build-system gnu-build-system) (native-inputs `(("perl" ,perl))) -- cgit v1.2.3 From cf32c21ecd3d9454e914db0c608d838c0790e1d1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 6 Dec 2021 09:35:44 +0100 Subject: gnu: perl-math-cephes: Build reproducibly. * gnu/packages/perl-maths.scm (perl-math-cephes)[source]: Sort result of readdir. --- gnu/packages/perl-maths.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/perl-maths.scm b/gnu/packages/perl-maths.scm index 4f70c85fcf..b1110f94d2 100644 --- a/gnu/packages/perl-maths.scm +++ b/gnu/packages/perl-maths.scm @@ -35,7 +35,12 @@ (define-public perl-math-cephes version ".tar.gz")) (sha256 (base32 - "18c3xg53d1vv7hlj43601jj7ks119fm6ndpwpv94irr2905806jn")))) + "18c3xg53d1vv7hlj43601jj7ks119fm6ndpwpv94irr2905806jn")) + ;; For reproducibility + (modules '((guix build utils))) + (snippet + '(substitute* "libmd/Makefile.PL" + (("readdir DIR") "sort readdir DIR"))))) (build-system perl-build-system) (home-page "https://metacpan.org/release/Math-Cephes") (synopsis "Perl interface to the Cephes math library") -- cgit v1.2.3 From e050ddad0b1d33c1669aff5cae43f107a56527a9 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 6 Dec 2021 10:07:44 +0200 Subject: gnu: poke: Update metadata. * gnu/packages/engineering.scm (poke)[home-page]: Use GNU home-page. [synopsis]: Use upstream synopsis. [description]: Reflow. --- gnu/packages/engineering.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 20402151cb..b5bc416772 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -2807,12 +2807,12 @@ (define-public poke ;; To build the GUI, add the `--enable-gui' configure flag. ;; To enable the "hyperlink server", add the `--enable-hserver' flag. `(#:configure-flags '("--enable-mi"))) - (home-page "http://jemarch.net/poke.html") - (synopsis "Interactive, extensible editor for binary data") - (description "GNU poke is an interactive, extensible editor for binary - data. Not limited to editing basic entities such as bits and bytes, it - provides a full-fledged procedural, interactive programming language designed - to describe data structures and to operate on them.") + (home-page "https://www.gnu.org/software/poke/#documentation") + (synopsis "Editing of arbitrary binary data") + (description "GNU poke is an interactive, extensible editor for binary data. +Not limited to editing basic entities such as bits and bytes, it provides a +full-fledged procedural, interactive programming language designed to describe +data structures and to operate on them.") (license license:gpl3+))) (define-public pcb2gcode -- cgit v1.2.3 From c70df3c467f86d684967c883e017d76032935880 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 6 Dec 2021 10:47:46 +0200 Subject: gnu: poke: Update to 1.4. * gnu/packages/engineering.scm (poke): Update to 1.4. [native-inputs]: Remove clisp, perl, python-2, and python-3. --- gnu/packages/engineering.scm | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index b5bc416772..9438f4c41f 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -2777,27 +2777,22 @@ (define-public meshlab (define-public poke (package (name "poke") - (version "1.3") + (version "1.4") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/poke/poke-" version ".tar.gz")) (sha256 - (base32 - "06qgry1pal2vampmbmc1lzlhf1qnjkd8py781r5h020v981n6y5s")))) + (base32 "095a0qal1fwnqxnal0xb4mp0n4zy97j3ww1j04ij3jb0jpr4s1ff")))) (build-system gnu-build-system) ;; The GUI, which we elide, requires tcl and tk. (native-inputs `(;; Requires bison 3.6+ but we currently only have 3.5. ;; Bison 3.6 will be available in the next core update. ("bison-3.6" ,bison-3.6) - ("clisp" ,clisp) ("dejagnu" ,dejagnu) ("flex" ,flex) ("libtool" ,libtool) - ("perl" ,perl) - ("pkg-config" ,pkg-config) - ("python-2" ,python-2) - ("python-3" ,python-3))) + ("pkg-config" ,pkg-config))) ;; FIXME: Enable NBD support by adding `libnbd' (currently unpackaged). (inputs `(("json-c" ,json-c) ("libgc" ,libgc) -- cgit v1.2.3 From 96416e4256bbb68cbd717c179890c512b9662b00 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 6 Dec 2021 11:37:48 +0200 Subject: gnu: poke: Remove generated files. * gnu/packages/engineering.scm (poke)[source]: Add snippet to remove generated files. --- gnu/packages/engineering.scm | 44 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 9438f4c41f..08c01905ab 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -2783,7 +2783,49 @@ (define-public poke (uri (string-append "mirror://gnu/poke/poke-" version ".tar.gz")) (sha256 - (base32 "095a0qal1fwnqxnal0xb4mp0n4zy97j3ww1j04ij3jb0jpr4s1ff")))) + (base32 "095a0qal1fwnqxnal0xb4mp0n4zy97j3ww1j04ij3jb0jpr4s1ff")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Delete files generated by Bison. + (delete-file "gl/parse-datetime.c") + (delete-file "gl/parse-datetime-gen.h") + (delete-file "jitter/example-vms/structured/structured-parser.c") + (delete-file "jitter/example-vms/structured/structured-parser.h") + (delete-file "jitter/jitterc/jitterc-parser.c") + (delete-file "jitter/jitterc/jitterc-parser.h") + (delete-file "jitter/jitter/jitter-routine-parser.c") + (delete-file "jitter/jitter/jitter-routine-parser.h") + (delete-file "libpoke/pkl-tab.c") + (delete-file "libpoke/pkl-tab.h") + (delete-file "poke/pk-map-tab.c") + (delete-file "poke/pk-map-tab.h") + ;; Delete files generated by flex. + (delete-file "jitter/example-vms/structured/structured-scanner.c") + (delete-file "jitter/example-vms/structured/structured-scanner.h") + (delete-file "jitter/jitterc/jitterc-scanner.c") + (delete-file "jitter/jitterc/jitterc-scanner.h") + (delete-file "jitter/jitter/jitter-routine-scanner.c") + (delete-file "jitter/jitter/jitter-routine-scanner.h") + (delete-file "libpoke/pkl-lex.c") + (delete-file "libpoke/pkl-lex.h") + (delete-file "poke/pk-map-lex.c") + (delete-file "poke/pk-map-lex.h") + ;; Other generated files: + (delete-file "jitter/example-vms/jitterlisp/jitterlispvm-vm1.c") + (delete-file "jitter/example-vms/jitterlisp/jitterlispvm-vm2.c") + (delete-file "jitter/example-vms/jitterlisp/jitterlispvm-vm.h") + (delete-file "jitter/example-vms/structured/structuredvm-vm1.c") + (delete-file "jitter/example-vms/structured/structuredvm-vm2.c") + (delete-file "jitter/example-vms/structured/structuredvm-vm.h") + (delete-file "jitter/example-vms/structured/structuredvm-vm-main.c") + (delete-file "jitter/example-vms/uninspired/uninspired-vm1.c") + (delete-file "jitter/example-vms/uninspired/uninspired-vm2.c") + (delete-file "jitter/example-vms/uninspired/uninspired-vm.h") + (delete-file "jitter/example-vms/uninspired/uninspired-vm-main.c") + (delete-file "libpoke/pvm-vm.h") + (delete-file "libpoke/pvm-vm1.c") + (delete-file "libpoke/pvm-vm2.c"))))) (build-system gnu-build-system) ;; The GUI, which we elide, requires tcl and tk. (native-inputs `(;; Requires bison 3.6+ but we currently only have 3.5. -- cgit v1.2.3 From 326e5321775fa6b79d5ba27dd1fc72ab2c49bc55 Mon Sep 17 00:00:00 2001 From: jgart Date: Mon, 6 Dec 2021 00:51:32 -0500 Subject: gnu: Add git-absorb. * gnu/packages/rust-apps.scm (git-absorb): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/rust-apps.scm | 51 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index 51075b5448..42846dd36e 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -13,6 +13,7 @@ ;;; Copyright © 2021 Alexandru-Sergiu Marton ;;; Copyright © 2021 Maxim Cournoyer ;;; Copyright © 2021 Petr Hodina +;;; Copyright © 2021 jgart ;;; ;;; This file is part of GNU Guix. ;;; @@ -1234,6 +1235,56 @@ (define-public tealdeer Full featured offline client with caching support.") (license (list license:expat license:asl2.0)))) +(define-public git-absorb + (package + (name "git-absorb") + (version "0.6.6") + (source + (origin + ;; crates.io does not include the manual page. + (method git-fetch) + (uri (git-reference + (url "https://github.com/tummychow/git-absorb") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "04v10bn24acify34vh5ayymsr1flcyb05f3az9k1s2m6nlxy5gb9")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-anyhow" ,rust-anyhow-1) + ("rust-clap" ,rust-clap-2) + ("rust-git2" ,rust-git2-0.13) + ("rust-memchr" ,rust-memchr-2) + ("rust-slog" ,rust-slog-2) + ("rust-slog-async" ,rust-slog-async-2) + ("rust-slog-term" ,rust-slog-term-2)) + #:cargo-development-inputs + (("rust-tempfile" ,rust-tempfile-3)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'relax-version-requirements + (lambda _ + (substitute* "Cargo.toml" + (("2.5") "2") + (("~2.3\"") "2\"") + (("3.1") "3")))) + (add-after 'install 'install-manual-page + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (man (string-append out "/share/man/man1"))) + (install-file "Documentation/git-absorb.1" man))))))) + (inputs + `(("zlib" ,zlib))) + (home-page "https://github.com/tummychow/git-absorb") + (synopsis "Git tool for making automatic fixup commits") + (description + "@code{git absorb} automatically absorbs staged changes into their +current branch. @code{git absorb} will automatically identify which commits +are safe to modify, and which staged changes belong to each of those commits. +It will then write @code{fixup!} commits for each of those changes.") + (license license:bsd-3))) + (define-public zoxide (package (name "zoxide") -- cgit v1.2.3 From 93e9f0bc7fc97db7b9e31477858ef7cb2ce01c90 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 6 Dec 2021 09:48:44 +0100 Subject: ci: Cross-build the 'guix' package. * gnu/ci.scm (%core-packages): Add GUIX. --- gnu/ci.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/ci.scm b/gnu/ci.scm index e1011355db..289e2a98c2 100644 --- a/gnu/ci.scm +++ b/gnu/ci.scm @@ -141,7 +141,7 @@ (define %core-packages ;; chain.) (list gcc-7 gcc-8 gcc-9 gcc-10 glibc binutils gmp mpfr mpc coreutils findutils diffutils patch sed grep - gawk gnu-gettext hello guile-2.0 guile-2.2 zlib gzip xz + gawk gnu-gettext hello guile-2.0 guile-2.2 zlib gzip xz guix %bootstrap-binaries-tarball %binutils-bootstrap-tarball (%glibc-bootstrap-tarball) -- cgit v1.2.3 From 9478a252509a93f3e7f486cbc549631185ba071d Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 6 Dec 2021 10:54:41 +0100 Subject: gnu: openssh: Remove libfido2 dependency on GNU/Hurd. * gnu/packages/ssh.scm (openssh)[inputs]: Remove LIBFIDO2 when 'hurd-target?'. [arguments]: Likewise for "--with-security-key-builtin". --- gnu/packages/ssh.scm | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index 616f6dc915..e8c7a92199 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès +;;; Copyright © 2012-2021 Ludovic Courtès ;;; Copyright © 2013, 2014 Andreas Enge ;;; Copyright © 2014, 2015, 2016 Mark H Weaver ;;; Copyright © 2015, 2016, 2018, 2019, 2020, 2021 Efraim Flashner @@ -200,11 +200,11 @@ (define-public openssh (native-inputs `(("groff" ,groff) ("pkg-config" ,pkg-config))) (inputs `(("libedit" ,libedit) - ("libfido2" ,libfido2) ("openssl" ,openssl) ,@(if (hurd-target?) - '() - `(("pam" ,linux-pam))) + '() + `(("pam" ,linux-pam) + ("libfido2" ,libfido2))) ;fails to build on GNU/Hurd ("mit-krb5" ,mit-krb5) ("zlib" ,zlib) ("xauth" ,xauth))) ; for 'ssh -X' and 'ssh -Y' @@ -229,10 +229,13 @@ (define-public openssh ;; Enable PAM support in sshd. ,,@(if (hurd-target?) '() - '("--with-pam")) + '("--with-pam" + + ;; Support creation and use of ecdsa-sk, + ;; ed25519-sk keys. + "--with-security-key-builtin")) + - ;; supports creation and use of ecdsa-sk, ed25519-sk keys - "--with-security-key-builtin" ;; "make install" runs "install -s" by default, ;; which doesn't work for cross-compiled binaries -- cgit v1.2.3 From b6a726222a8ef3bfe46402a46b15d79c6b19b6d6 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 6 Dec 2021 14:04:30 +0200 Subject: gnu: go-github-com-golang-snappy: Adjust test-suite on 32-bit systems. * gnu/packages/syncthing.scm (go-github-com-golang-snappy)[source]: Add patch to skip a test on 32-bit systems. * gnu/packages/patches/go-github-com-golang-snappy-32bit-test.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. --- gnu/local.mk | 1 + .../go-github-com-golang-snappy-32bit-test.patch | 53 ++++++++++++++++++++++ gnu/packages/syncthing.scm | 3 +- 3 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/go-github-com-golang-snappy-32bit-test.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index e61e825ba3..b91d6eaa62 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1196,6 +1196,7 @@ dist_patch_DATA = \ %D%/packages/patches/gobject-introspection-cc.patch \ %D%/packages/patches/gobject-introspection-girepository.patch \ %D%/packages/patches/go-fix-script-tests.patch \ + %D%/packages/patches/go-github-com-golang-snappy-32bit-test.patch \ %D%/packages/patches/go-github-com-urfave-cli-fix-tests.patch \ %D%/packages/patches/go-github-com-urfave-cli-v2-fix-tests.patch \ %D%/packages/patches/go-skip-gc-test.patch \ diff --git a/gnu/packages/patches/go-github-com-golang-snappy-32bit-test.patch b/gnu/packages/patches/go-github-com-golang-snappy-32bit-test.patch new file mode 100644 index 0000000000..95b5819cdb --- /dev/null +++ b/gnu/packages/patches/go-github-com-golang-snappy-32bit-test.patch @@ -0,0 +1,53 @@ +https://salsa.debian.org/go-team/packages/golang-github-golang-snappy/-/raw/debian/0.0.2-2/debian/patches/0002-Skip-failed-test-on-32bit-system.patch + +From: Shengjing Zhu +Date: Sun, 31 Jan 2021 22:41:42 +0800 +Subject: Skip failed test on 32bit system + +The test doesn't pass on old version too, not a regression. + +Bug: https://github.com/golang/snappy/issues/58 +--- + snappy_test.go | 20 +++++++++++++++----- + 1 file changed, 15 insertions(+), 5 deletions(-) + +diff --git a/snappy_test.go b/snappy_test.go +index d7c3ea6..c310ba1 100644 +--- a/snappy_test.go ++++ b/snappy_test.go +@@ -19,6 +19,7 @@ import ( + "runtime" + "strings" + "testing" ++ "unsafe" + ) + + var ( +@@ -316,13 +317,22 @@ func TestDecode(t *testing.T) { + "\x06" + "\x0cabcd" + "\x07\x03\x00\x00\x00", + "abcdbc", + nil, +- }, { +- `decodedLen=0; tagCopy4, 4 extra length|offset bytes; with msb set (0x93); discovered by go-fuzz`, +- "\x00\xfc000\x93", +- "", +- ErrCorrupt, + }} + ++ if unsafe.Sizeof(int(0)) == 8 { ++ testCases = append(testCases, struct { ++ desc string ++ input string ++ want string ++ wantErr error ++ }{ ++ `decodedLen=0; tagCopy4, 4 extra length|offset bytes; with msb set (0x93); discovered by go-fuzz`, ++ "\x00\xfc000\x93", ++ "", ++ ErrCorrupt, ++ }) ++ } ++ + const ( + // notPresentXxx defines a range of byte values [0xa0, 0xc5) that are + // not present in either the input or the output. It is written to dBuf diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index 4deb60bee2..aa718e5e2d 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -412,7 +412,8 @@ (define-public go-github-com-golang-snappy (file-name (git-file-name name version)) (sha256 (base32 - "004cw699yz3pdpawhjhpa0y94c4w479nw1rf39zj6h6027kpwv2j")))) + "004cw699yz3pdpawhjhpa0y94c4w479nw1rf39zj6h6027kpwv2j")) + (patches (search-patches "go-github-com-golang-snappy-32bit-test.patch")))) (build-system go-build-system) (arguments `(#:import-path "github.com/golang/snappy")) -- cgit v1.2.3 From c569430b6c674509ee501d388802164223434d82 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 6 Dec 2021 14:43:17 +0200 Subject: gnu: go-gopkg-in-yaml-v2: Fix test suite on 32-bit systems. * gnu/packages/golamg.scm (go-gopkg-in-yaml-v2)[source]: Add snippet to no longer cause integer overflow on 32-bit systems during test suite. --- gnu/packages/golang.scm | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 754724aa11..6c578dbdf4 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3885,7 +3885,18 @@ (define-public go-gopkg-in-yaml-v2 (file-name (git-file-name name version)) (sha256 (base32 - "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa")))) + "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa")) + (modules '((guix build utils))) + (snippet + '(begin + ;; https://github.com/go-yaml/yaml/issues/441 and + ;; https://github.com/go-yaml/yaml/pull/442 + ;; Don't assume 64-bit wide integers + (substitute* "decode_test.go" + (("bin: (-0b1000000000000000000000000000000000000000000000000000000000000000)" all number) + (string-append "int64_min_base2: " number)) + (("map\\[string\\]interface\\{\\}\\{\"bin\": -9223372036854775808\\}") + "map[string]int64{\"int64_min_base2\": math.MinInt64}")))))) (build-system go-build-system) (arguments '(#:import-path "gopkg.in/yaml.v2")) -- cgit v1.2.3 From 30c776a6a836413d85ceaf60e6d5f88a8b8778c3 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 6 Dec 2021 14:45:50 +0200 Subject: gnu: go-gopkg-in-yaml-v2: Update to 2.4.0. * gnu/packages/golang.scm (go-gopkg-in-yaml-v2): Update to 2.4.0. --- gnu/packages/golang.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 6c578dbdf4..2ce1f0cd4c 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3875,7 +3875,7 @@ (define-public go-gopkg-in-ini-v1 (define-public go-gopkg-in-yaml-v2 (package (name "go-gopkg-in-yaml-v2") - (version "2.2.2") + (version "2.4.0") (source (origin (method git-fetch) @@ -3885,7 +3885,7 @@ (define-public go-gopkg-in-yaml-v2 (file-name (git-file-name name version)) (sha256 (base32 - "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa")) + "1pbmrpj7gcws34g8vwna4i2nhm9p6235piww36436xhyaa10cldr")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 4e282bc934488b1c9ab9e97c838efe058da9e0bd Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 6 Dec 2021 12:08:55 -0500 Subject: gnu: Syncthing: Update to 1.18.4. * gnu/packages/syncthing.scm (syncthing): Update to 1.18.4. [arguments]: Build with Go 1.17. --- gnu/packages/syncthing.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index aa718e5e2d..8ae3c3d840 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -45,7 +45,7 @@ (define-module (gnu packages syncthing) (define-public syncthing (package (name "syncthing") - (version "1.16.1") + (version "1.18.4") ; XXX After the go-build-system can use "Go modules", stop using bundled ; dependencies for Syncthing. (source (origin @@ -55,7 +55,7 @@ (define-public syncthing "/syncthing-source-v" version ".tar.gz")) (sha256 (base32 - "0m5k37sp3px8acs3y9an5wzy1wbcbdvqq74jy0pwzfk4bjbr999j")))) + "00kw1j2qi5ylbycv43n5177r3a3651qxhds927x6cz0a2b7qac8n")))) (build-system go-build-system) ;; The primary Syncthing executable goes to "out", while the auxiliary ;; server programs and utility tools go to "utils". This reduces the size @@ -65,6 +65,7 @@ (define-public syncthing `(#:modules ((srfi srfi-26) ; for cut (guix build utils) (guix build go-build-system)) + #:go ,go-1.17 #:import-path "github.com/syncthing/syncthing" ;; We don't need to install the source code for end-user applications. #:install-source? #f -- cgit v1.2.3 From e4d8f2fe31970fc90ca5297935917cb3dd829396 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 6 Dec 2021 12:15:59 -0500 Subject: gnu: Go 1.16: Update to 1.16.11. * gnu/packages/golang.scm (go-1.16): Update to 1.16.11. --- gnu/packages/golang.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 2ce1f0cd4c..302606bd46 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -454,7 +454,7 @@ (define-public go-1.16 (package (inherit go-1.14) (name "go") - (version "1.16.8") + (version "1.16.11") (source (origin (method git-fetch) @@ -464,7 +464,7 @@ (define-public go-1.16 (file-name (git-file-name name version)) (sha256 (base32 - "00zv65v09kr2cljxxqypk980r4b4aqjijhbw4ikppn8km68h831n")))) + "1jn45bci9cvkvybvy9ql2rsgj06kg3sl027vhv0h0bavgqa7qk20")))) (arguments (substitute-keyword-arguments (package-arguments go-1.14) ((#:tests? _) #t) -- cgit v1.2.3 From 404f695385a30ebab05ee66b33826f36bd838443 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 6 Dec 2021 12:16:15 -0500 Subject: gnu: Go 1.17: Update to 1.17.4. * gnu/packages/golang.scm (go-1.17): Update to 1.17.4. --- gnu/packages/golang.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 302606bd46..b6d81bdba1 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -613,7 +613,7 @@ (define-public go-1.17 (package (inherit go-1.16) (name "go") - (version "1.17.1") + (version "1.17.4") (source (origin (method git-fetch) @@ -623,7 +623,7 @@ (define-public go-1.17 (file-name (git-file-name name version)) (sha256 (base32 - "0wk99lwpzp4qwrksl932lm9vb70nyf4vgb5lxwh7gzjcbhlqj992")))) + "14c08fmj2c5arcd73ryha2qhl2bawpm22rcbiq47a6x7kvr31hi4")))) (outputs '("out" "tests")) ; 'tests' contains distribution tests. (arguments `(#:modules ((ice-9 match) -- cgit v1.2.3 From 757a2eb97003802e60362297c190bd95a7ffa961 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 6 Dec 2021 21:13:56 +0100 Subject: tests: patchwork: Use the default PostgreSQL. * gnu/tests/web.scm (patchwork-os)[services]: Change from POSTGRESQL-10 to POSTGRESQL. --- gnu/tests/web.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/tests/web.scm b/gnu/tests/web.scm index ccb2f53137..fb0713addc 100644 --- a/gnu/tests/web.scm +++ b/gnu/tests/web.scm @@ -577,7 +577,7 @@ (define (patchwork-os patchwork) (listen '("8080")))))) (service postgresql-service-type (postgresql-configuration - (postgresql postgresql-10))) + (postgresql postgresql))) (service patchwork-service-type (patchwork-configuration (patchwork patchwork) -- cgit v1.2.3 From e21b422f7ff85570c5ff6c9ce98775744f672776 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 6 Dec 2021 22:01:31 +0100 Subject: gnu: emacs-csv-mode: Update to 1.17. * gnu/packages/emacs-xyz.scm (emacs-csv-mode): Update to 1.17. --- 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 052d4a134b..e542da0c26 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -16010,14 +16010,14 @@ (define-public emacs-easy-kill (define-public emacs-csv-mode (package (name "emacs-csv-mode") - (version "1.16") + (version "1.17") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "csv-mode-" version ".tar")) (sha256 - (base32 "1i43b2p31xhrf97xbdi35y550ysp69fasa5gcrhg6iyxw176807p")))) + (base32 "16kv3n70pl4h3jfmmqy9bzflsm4nv7cwvrj7g4mgy8yb76nbyka2")))) (build-system emacs-build-system) (home-page "https://elpa.gnu.org/packages/csv-mode.html") (synopsis "Major mode for editing comma/char separated values") -- cgit v1.2.3 From 05deb26be92c314b6a60ed2ca93596b895515ca6 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Tue, 7 Dec 2021 00:08:40 +0100 Subject: gnu: guile-netlink: Update to 1.1.1. * gnu/packages/guile.scm (guile-netlink): Update to 1.1.1. --- gnu/packages/guile-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 32dc08b0e2..4e8a5920f2 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -4761,7 +4761,7 @@ (define-public guile-fslib (define-public guile-netlink (package (name "guile-netlink") - (version "1.1") + (version "1.1.1") (source (origin (method git-fetch) @@ -4771,7 +4771,7 @@ (define-public guile-netlink (file-name (git-file-name name version)) (sha256 (base32 - "1x1rx6agjdah56r50cfs41vyvycydyjdq0plq3jxgvl1q2dar1gw")))) + "0jcl6mzqy04if5drflmygmggbgzsxa42mlmskqb3cfqmksq0zj0y")))) (build-system gnu-build-system) (arguments `(#:tests? #f)); no tests -- cgit v1.2.3 From 72dbf04b55beacb6951183b476ff254ab17abd99 Mon Sep 17 00:00:00 2001 From: jgart Date: Mon, 6 Dec 2021 04:05:33 -0500 Subject: gnu: Add dutree. * gnu/packages/rust-apps.scm (dutree): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/rust-apps.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index 42846dd36e..fffdcdc9c8 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -191,6 +191,42 @@ (define-public drill Ansible syntax. Benchmark files can be written in YAML.") (license license:gpl3))) +(define-public dutree + (package + (name "dutree") + (version "0.2.18") + (source + (origin + (method url-fetch) + (uri (crate-uri "dutree" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1611h27i8fm3jndscd6w65z8z7w09nnrm61vdgs9kb8ln57gqm8x")))) + (build-system cargo-build-system) + (arguments + `(#:install-source? #f + #:cargo-inputs + (("rust-getopts" ,rust-getopts-0.2) + ("rust-regex" ,rust-regex-1) + ("rust-signal-hook" ,rust-signal-hook-0.1) + ("rust-terminal-size" ,rust-terminal-size-0.1) + ("rust-unicode-segmentation" ,rust-unicode-segmentation-1) + ("rust-unicode-width" ,rust-unicode-width-0.1)))) + (home-page "https://ownyourbits.com/2018/03/25/analyze-disk-usage-with-dutree/") + (synopsis "Command line tool to analyze disk usage") + (description + "@command{dutree} is command line tool to analyze disk usage. +Features include: +@enumerate +@item coloured output, according to the @code{LS_COLORS} environment variable. +@item display the file system tree. +@item ability to aggregate small files. +@item ability to exclude files or directories. +@item ability to compare different directories. +@item fast, written in Rust. +@end enumerate\n") + (license license:gpl3))) + (define-public exa (package (name "exa") -- cgit v1.2.3 From f36f58a564ce373f9d94755526df98f4a5cb729d Mon Sep 17 00:00:00 2001 From: jgart Date: Mon, 6 Dec 2021 04:56:37 -0500 Subject: gnu: Add rust-diffr-lib-0.1. * gnu/packages/crates-io.scm (rust-diffr-lib-0.1): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 0a26c11a8e..b95a41e4d3 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -14768,6 +14768,23 @@ (define-public rust-difflib-0.4 "This crate provides all necessary tools for comparing word sequences.") (license license:expat))) +(define-public rust-diffr-lib-0.1 + (package + (name "rust-diffr-lib") + (version "0.1.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "diffr-lib" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0id3hpblvvcw4ydcd1cc7wgcwqjbh3grlihrmd8zp7k0d2h47i3g")))) + (build-system cargo-build-system) + (home-page "https://github.com/mookid/diffr") + (synopsis "Implementation of Myers diff algorithm") + (description "An implementation of Myers diff algorithm.") + (license license:expat))) + (define-public rust-diffs-0.3 (package (name "rust-diffs") -- cgit v1.2.3 From 51bf893e53c5097f35a440eafc38c0728d6bc38a Mon Sep 17 00:00:00 2001 From: jgart Date: Mon, 6 Dec 2021 04:56:38 -0500 Subject: gnu: Add diffr. * gnu/packages/rust-apps.scm (diffr): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/rust-apps.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index fffdcdc9c8..136885bc23 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -150,6 +150,46 @@ (define-public bat paging.") (license (list license:expat license:asl2.0)))) +(define-public diffr + (package + (name "diffr") + (version "0.1.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "diffr" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1b0mz1ki2ksxni6g49x5l5j9ijpyhc11mywvxr9i9h3nr098nc5l")))) + (build-system cargo-build-system) + (arguments + `(#:install-source? #f + ;; https://github.com/mookid/diffr/issues/79 + #:cargo-test-flags + '("--release" "--" + "--skip=tests::success" + "--skip=test_cli::color_invalid_attribute_name" + "--skip=test_cli::color_invalid_color_not_done" + "--skip=test_cli::color_invalid_color_value_ansi" + "--skip=test_cli::color_invalid_color_value_name" + "--skip=test_cli::color_invalid_color_value_rgb" + "--skip=test_cli::color_invalid_face_name" + "--skip=test_cli::color_ok" + "--skip=test_cli::color_ok_multiple" + "--skip=test_cli::color_only_face_name" + "--skip=test_cli::debug_flag") + #:cargo-inputs + (("rust-atty" ,rust-atty-0.2) + ("rust-clap" ,rust-clap-2) + ("rust-diffr-lib" ,rust-diffr-lib-0.1) + ("rust-termcolor" ,rust-termcolor-1)))) + (home-page "https://github.com/mookid/diffr") + (synopsis "Longest Common Sequence based diff highlighting tool") + (description + "This package provides an @acronym{LCS, longest common sequence} based diff +highlighting tool to ease code review from your terminal.") + (license license:expat))) + (define-public drill (package (name "drill") -- cgit v1.2.3 From 68d15fcf20feddb72f5c2d2ff7d754dcc4f409df Mon Sep 17 00:00:00 2001 From: Sarah Morgensen Date: Tue, 6 Jul 2021 00:30:32 -0700 Subject: gnu: make-gccgo: Override empty GOROOT/GCCGOTOOLDIR gnu/packages/gcc.scm (make-gccgo)[arguments]: Set tool paths (GOROOT and GCCGOTOOLDIR) even if they are already set to "". Signed-off-by: Efraim Flashner --- gnu/packages/gcc.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index 493ff2659f..e7807a4797 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -871,9 +871,9 @@ (define (make-gccgo gcc) (tooldir (dirname (car (find-files exedir "^cgo$"))))) (wrap-program (string-append out "/bin/go") `("GCCGOTOOLDIR" = - (,(string-append "${GCCGOTOOLDIR-" tooldir "}"))) + (,(string-append "${GCCGOTOOLDIR:-" tooldir "}"))) `("GOROOT" = - (,(string-append "${GOROOT-" out "}"))))))) + (,(string-append "${GOROOT:-" out "}"))))))) (add-before 'configure 'fix-gotools-runpath (lambda _ (substitute* "gotools/Makefile.in" -- cgit v1.2.3 From 0a9c946df9686f1610f7684492baabf0719c0164 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 6 Dec 2021 22:39:11 +0100 Subject: gnu: giac: Update to 1.7.0-43. * gnu/packages/algebra.scm (giac): Update to 1.7.0-43. --- gnu/packages/algebra.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index b704d98dde..985120d4e5 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -343,7 +343,7 @@ (define-public cmh (define-public giac (package (name "giac") - (version "1.7.0-39") + (version "1.7.0-43") (source (origin (method url-fetch) @@ -355,7 +355,7 @@ (define-public giac "~parisse/debian/dists/stable/main/source/" "giac_" version ".tar.gz")) (sha256 - (base32 "0mmdzhnahiz6hr7a4brnjdmmm4mcaqkigrh1b6n9z5l46bilaii3")))) + (base32 "0zsa506isvmixwwg0xgvxhlns6i75jsc3qjzcrny4fl11hkj9xw5")))) (build-system gnu-build-system) (arguments `(#:modules ((ice-9 ftw) -- cgit v1.2.3 From 86d8a0460c2a8bdeb89ecdcf2296957d5f862081 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 7 Dec 2021 18:30:54 +0100 Subject: gnu: dovecot: Update to 2.3.17.1. * gnu/packages/mail.scm (dovecot): Update to 2.3.17.1. --- gnu/packages/mail.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 1d2357a98e..e212d11ae6 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1914,7 +1914,7 @@ (define-public dovecot (package (name "dovecot") ;; Also update dovecot-pigeonhole when updating to a new minor version. - (version "2.3.17") + (version "2.3.17.1") (source (origin (method url-fetch) @@ -1922,7 +1922,7 @@ (define-public dovecot (version-major+minor version) "/" "dovecot-" version ".tar.gz")) (sha256 - (base32 "1y9dpn4jgzrfjibp5zrc11bdk0q843d998kxhpxkyfm2fz6i4i12")))) + (base32 "1f525bvpjvi4rnwqjsqaqrbdii08sqmc1v8xq03m19w1vk6cqrqw")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 8775efe8f1adf9fcb67a5c98cb1e5f84dbda9113 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 7 Dec 2021 18:31:02 +0100 Subject: gnu: dovecot-pigeonhole: Update to 0.5.17.1. * gnu/packages/mail.scm (dovecot-pigeonhole): Update to 0.5.17.1. --- gnu/packages/mail.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index e212d11ae6..aad6961f40 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1982,7 +1982,7 @@ (define-public dovecot-pigeonhole (let ((dovecot-version (version-major+minor (package-version dovecot)))) (package (name "dovecot-pigeonhole") - (version "0.5.17") + (version "0.5.17.1") (source (origin (method url-fetch) @@ -1990,7 +1990,7 @@ (define-public dovecot-pigeonhole "https://pigeonhole.dovecot.org/releases/" dovecot-version "/" "dovecot-" dovecot-version "-pigeonhole-" version ".tar.gz")) (sha256 - (base32 "0j6ng173hh5iiqxdkxfb5v9djpn39gxdrv5ki7i22cf5cqwq47h3")) + (base32 "04j5z3y8yyci4ni9j9i7cy0zg1qj2sm9zfarmjcvs9vydpga7i1w")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 9e67f2ad418e9a5a7a83dc2349624572e9dbfc8b Mon Sep 17 00:00:00 2001 From: Denis 'GNUtoo' Carikli Date: Sat, 30 Oct 2021 07:36:31 +0200 Subject: gnu: Add kiwix-tools. * gnu/packages/web.scm (kiwix-tools): New variable. Signed-off-by: Leo Famulari --- gnu/packages/web.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index a3674e9cd3..bc59395733 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -51,6 +51,7 @@ ;;; Copyright © 2021 Matthew James Kraai ;;; Copyright © 2021 Sarah Morgensen ;;; Copyright © 2021 Jack Hill +;;; Copyright © 2021 Denis 'GNUtoo' Carikli ;;; ;;; This file is part of GNU Guix. ;;; @@ -8127,6 +8128,42 @@ (define-public kiwix-desktop offline (such as Wikipedia), without any access to Internet.") (license license:gpl3))) +(define-public kiwix-tools + (package + (name "kiwix-tools") + (version "3.1.2") + (source (origin + (method url-fetch) + (uri (string-append "https://download.kiwix.org/release/" + "kiwix-tools/kiwix-tools-" version ".tar.xz")) + (sha256 + (base32 + "1npf9ddhpkmx97gxmvmwmi8a69md8kh2szimd9rpg6ggd4big03a")))) + (build-system meson-build-system) + (inputs + `(("curl" ,curl) + ("icu4c" ,icu4c) + ("kiwix-lib" ,kiwix-lib) + ("libmicrohttpd" ,libmicrohttpd) + ("libzim" ,libzim) + ("pugixml" ,pugixml) + ("xapian" ,xapian) + ("zlib" ,zlib) + ("zstd" ,zstd "lib"))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (home-page "https://wiki.kiwix.org/wiki/Software") + (synopsis "Kiwix command line tools") + (description "The Kiwix tools are a collection of Kiwix-related command line +tools: +@itemize +@item kiwix-manage: Manage XML based library of ZIM files +@item kiwix-read: Read ZIM file content +@item kiwix-search: Fulltext search in ZIM files +@item kiwix-serve: HTTP daemon serving ZIM files +@end itemize\n") + (license license:gpl3+))) + (define-public uriparser (let ((commit "25dddb16cf044a7df27884e7ad3911baaaca3d7c") (revision "1")) -- cgit v1.2.3 From 906dd9ff6322fd7aaf3ceace95ec8c443d35c1e5 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Tue, 7 Dec 2021 17:15:56 -0500 Subject: gnu: icecat: Update to 91.4.0-guix0-preview1 [security fixes]. Includes fixes for CVE-2021-43536, CVE-2021-43537, CVE-2021-43538, CVE-2021-43539, CVE-2021-43541, CVE-2021-43542, CVE-2021-43543, CVE-2021-43545, CVE-2021-43546, and MOZ-2021-0009. * gnu/packages/gnuzilla.scm (%icecat-version, %icecat-build-id): Update. (icecat-source): Remove icecat-CVE-2021-43527.patch, which is now included in upstream icecat. Update the gnuzilla commit, base version, and hashes. * gnu/packages/patches/icecat-CVE-2021-43527.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/gnuzilla.scm | 13 +- gnu/packages/patches/icecat-CVE-2021-43527.patch | 354 ----------------------- 3 files changed, 6 insertions(+), 362 deletions(-) delete mode 100644 gnu/packages/patches/icecat-CVE-2021-43527.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index b91d6eaa62..d8b9a78949 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1263,7 +1263,6 @@ dist_patch_DATA = \ %D%/packages/patches/hydra-disable-darcs-test.patch \ %D%/packages/patches/icecat-makeicecat.patch \ %D%/packages/patches/icecat-avoid-bundled-libraries.patch \ - %D%/packages/patches/icecat-CVE-2021-43527.patch \ %D%/packages/patches/icecat-use-older-reveal-hidden-html.patch \ %D%/packages/patches/icecat-use-system-graphite2+harfbuzz.patch \ %D%/packages/patches/icecat-use-system-media-libs.patch \ diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 36b8a35efe..bc4ef2ce45 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -697,8 +697,8 @@ (define all-mozilla-locales ;; XXXX: Workaround 'snippet' limitations. (define computed-origin-method (@@ (guix packages) computed-origin-method)) -(define %icecat-version "91.3.0-guix0-preview1") -(define %icecat-build-id "20211102000000") ;must be of the form YYYYMMDDhhmmss +(define %icecat-version "91.4.0-guix0-preview1") +(define %icecat-build-id "20211207000000") ;must be of the form YYYYMMDDhhmmss ;; 'icecat-source' is a "computed" origin that generates an IceCat tarball ;; from the corresponding upstream Firefox ESR tarball, using the 'makeicecat' @@ -720,11 +720,11 @@ (define icecat-source "firefox-" upstream-firefox-version ".source.tar.xz")) (sha256 (base32 - "0v79c435vfbhsx7pqyq4jm5rv8iysig69wwqhvys1n0jy54m72qj")))) + "09xkzk27krzyj1qx8cjjn2zpnws1cncka75828kk7ychnjfq48p7")))) - (upstream-icecat-base-version "91.3.0") ; maybe older than base-version + (upstream-icecat-base-version "91.4.0") ; maybe older than base-version ;;(gnuzilla-commit (string-append "v" upstream-icecat-base-version)) - (gnuzilla-commit "32631cac00953abbac61dc7ab1a0eafbdd59b53a") + (gnuzilla-commit "dd79d69e5dc6e6e751195001f322b30746be6903") (gnuzilla-source (origin (method git-fetch) @@ -736,7 +736,7 @@ (define icecat-source (string-take gnuzilla-commit 8))) (sha256 (base32 - "13ckga49h5azf0c6q3c6b6wcmahzyywryxgwmwr1dahsjgy0wwrw")))) + "1vv97wmgdmkwddh8n30dak5l8akzbw49ca0w6krhq9dnj7n74cxh")))) ;; 'search-patch' returns either a valid file name or #f, so wrap it ;; in 'assume-valid-file-name' to avoid 'local-file' warnings. @@ -750,7 +750,6 @@ (define icecat-source (origin (method computed-origin-method) (file-name (string-append "icecat-" %icecat-version ".tar.xz")) - (patches (search-patches "icecat-CVE-2021-43527.patch")) (sha256 #f) (uri (delay diff --git a/gnu/packages/patches/icecat-CVE-2021-43527.patch b/gnu/packages/patches/icecat-CVE-2021-43527.patch deleted file mode 100644 index 66706ea5e0..0000000000 --- a/gnu/packages/patches/icecat-CVE-2021-43527.patch +++ /dev/null @@ -1,354 +0,0 @@ -Fixes CVE-2021-43527. -Copied from , -but with the file names adjusted to allow easy use within GNU Guix. - -# HG changeset patch -# User Dennis Jackson -# Date 1637577642 0 -# Node ID dea71cbef9e03636f37c6cb120f8deccce6e17dd -# Parent da3d22d708c9cc0a32cff339658aeb627575e371 -Bug 1737470 - Ensure DER encoded signatures are within size limits. r=jschanck,mt,bbeurdouche,rrelyea - -Differential Revision: https://phabricator.services.mozilla.com/D129514 - ---- a/security/nss/lib/cryptohi/secvfy.c -+++ b/security/nss/lib/cryptohi/secvfy.c -@@ -159,58 +159,89 @@ verifyPKCS1DigestInfo(const VFYContext * - SECItem pkcs1DigestInfo; - pkcs1DigestInfo.data = cx->pkcs1RSADigestInfo; - pkcs1DigestInfo.len = cx->pkcs1RSADigestInfoLen; - return _SGN_VerifyPKCS1DigestInfo( - cx->hashAlg, digest, &pkcs1DigestInfo, - PR_FALSE /*XXX: unsafeAllowMissingParameters*/); - } - -+static unsigned int -+checkedSignatureLen(const SECKEYPublicKey *pubk) -+{ -+ unsigned int sigLen = SECKEY_SignatureLen(pubk); -+ if (sigLen == 0) { -+ /* Error set by SECKEY_SignatureLen */ -+ return sigLen; -+ } -+ unsigned int maxSigLen; -+ switch (pubk->keyType) { -+ case rsaKey: -+ case rsaPssKey: -+ maxSigLen = (RSA_MAX_MODULUS_BITS + 7) / 8; -+ break; -+ case dsaKey: -+ maxSigLen = DSA_MAX_SIGNATURE_LEN; -+ break; -+ case ecKey: -+ maxSigLen = 2 * MAX_ECKEY_LEN; -+ break; -+ default: -+ PORT_SetError(SEC_ERROR_UNSUPPORTED_KEYALG); -+ return 0; -+ } -+ if (sigLen > maxSigLen) { -+ PORT_SetError(SEC_ERROR_INVALID_KEY); -+ return 0; -+ } -+ return sigLen; -+} -+ - /* - * decode the ECDSA or DSA signature from it's DER wrapping. - * The unwrapped/raw signature is placed in the buffer pointed - * to by dsig and has enough room for len bytes. - */ - static SECStatus - decodeECorDSASignature(SECOidTag algid, const SECItem *sig, unsigned char *dsig, - unsigned int len) - { - SECItem *dsasig = NULL; /* also used for ECDSA */ -- SECStatus rv = SECSuccess; - -- if ((algid != SEC_OID_ANSIX9_DSA_SIGNATURE) && -- (algid != SEC_OID_ANSIX962_EC_PUBLIC_KEY)) { -- if (sig->len != len) { -- PORT_SetError(SEC_ERROR_BAD_DER); -- return SECFailure; -+ /* Safety: Ensure algId is as expected and that signature size is within maxmimums */ -+ if (algid == SEC_OID_ANSIX9_DSA_SIGNATURE) { -+ if (len > DSA_MAX_SIGNATURE_LEN) { -+ goto loser; - } -- -- PORT_Memcpy(dsig, sig->data, sig->len); -- return SECSuccess; -+ } else if (algid == SEC_OID_ANSIX962_EC_PUBLIC_KEY) { -+ if (len > MAX_ECKEY_LEN * 2) { -+ goto loser; -+ } -+ } else { -+ goto loser; - } - -- if (algid == SEC_OID_ANSIX962_EC_PUBLIC_KEY) { -- if (len > MAX_ECKEY_LEN * 2) { -- PORT_SetError(SEC_ERROR_BAD_DER); -- return SECFailure; -- } -+ /* Decode and pad to length */ -+ dsasig = DSAU_DecodeDerSigToLen((SECItem *)sig, len); -+ if (dsasig == NULL) { -+ goto loser; - } -- dsasig = DSAU_DecodeDerSigToLen((SECItem *)sig, len); -- -- if ((dsasig == NULL) || (dsasig->len != len)) { -- rv = SECFailure; -- } else { -- PORT_Memcpy(dsig, dsasig->data, dsasig->len); -+ if (dsasig->len != len) { -+ SECITEM_FreeItem(dsasig, PR_TRUE); -+ goto loser; - } - -- if (dsasig != NULL) -- SECITEM_FreeItem(dsasig, PR_TRUE); -- if (rv == SECFailure) -- PORT_SetError(SEC_ERROR_BAD_DER); -- return rv; -+ PORT_Memcpy(dsig, dsasig->data, len); -+ SECITEM_FreeItem(dsasig, PR_TRUE); -+ -+ return SECSuccess; -+ -+loser: -+ PORT_SetError(SEC_ERROR_BAD_DER); -+ return SECFailure; - } - - const SEC_ASN1Template hashParameterTemplate[] = - { - { SEC_ASN1_SEQUENCE, 0, NULL, sizeof(SECItem) }, - { SEC_ASN1_OBJECT_ID, 0 }, - { SEC_ASN1_SKIP_REST }, - { 0 } -@@ -276,17 +307,17 @@ sec_GetEncAlgFromSigAlg(SECOidTag sigAlg - * - * Returns: SECSuccess if the algorithm was acceptable, SECFailure if the - * algorithm was not found or was not a signing algorithm. - */ - SECStatus - sec_DecodeSigAlg(const SECKEYPublicKey *key, SECOidTag sigAlg, - const SECItem *param, SECOidTag *encalgp, SECOidTag *hashalg) - { -- int len; -+ unsigned int len; - PLArenaPool *arena; - SECStatus rv; - SECItem oid; - SECOidTag encalg; - - PR_ASSERT(hashalg != NULL); - PR_ASSERT(encalgp != NULL); - -@@ -461,58 +492,62 @@ vfy_CreateContext(const SECKEYPublicKey - cx->wincx = wincx; - cx->hasSignature = (sig != NULL); - cx->encAlg = encAlg; - cx->hashAlg = hashAlg; - cx->key = SECKEY_CopyPublicKey(key); - cx->pkcs1RSADigestInfo = NULL; - rv = SECSuccess; - if (sig) { -- switch (type) { -- case rsaKey: -- rv = recoverPKCS1DigestInfo(hashAlg, &cx->hashAlg, -- &cx->pkcs1RSADigestInfo, -- &cx->pkcs1RSADigestInfoLen, -- cx->key, -- sig, wincx); -- break; -- case rsaPssKey: -- sigLen = SECKEY_SignatureLen(key); -- if (sigLen == 0) { -- /* error set by SECKEY_SignatureLen */ -- rv = SECFailure; -+ rv = SECFailure; -+ if (type == rsaKey) { -+ rv = recoverPKCS1DigestInfo(hashAlg, &cx->hashAlg, -+ &cx->pkcs1RSADigestInfo, -+ &cx->pkcs1RSADigestInfoLen, -+ cx->key, -+ sig, wincx); -+ } else { -+ sigLen = checkedSignatureLen(key); -+ /* Check signature length is within limits */ -+ if (sigLen == 0) { -+ /* error set by checkedSignatureLen */ -+ rv = SECFailure; -+ goto loser; -+ } -+ if (sigLen > sizeof(cx->u)) { -+ PORT_SetError(SEC_ERROR_BAD_SIGNATURE); -+ rv = SECFailure; -+ goto loser; -+ } -+ switch (type) { -+ case rsaPssKey: -+ if (sig->len != sigLen) { -+ PORT_SetError(SEC_ERROR_BAD_SIGNATURE); -+ rv = SECFailure; -+ goto loser; -+ } -+ PORT_Memcpy(cx->u.buffer, sig->data, sigLen); -+ rv = SECSuccess; - break; -- } -- if (sig->len != sigLen) { -- PORT_SetError(SEC_ERROR_BAD_SIGNATURE); -+ case ecKey: -+ case dsaKey: -+ /* decodeECorDSASignature will check sigLen == sig->len after padding */ -+ rv = decodeECorDSASignature(encAlg, sig, cx->u.buffer, sigLen); -+ break; -+ default: -+ /* Unreachable */ - rv = SECFailure; -- break; -- } -- PORT_Memcpy(cx->u.buffer, sig->data, sigLen); -- break; -- case dsaKey: -- case ecKey: -- sigLen = SECKEY_SignatureLen(key); -- if (sigLen == 0) { -- /* error set by SECKEY_SignatureLen */ -- rv = SECFailure; -- break; -- } -- rv = decodeECorDSASignature(encAlg, sig, cx->u.buffer, sigLen); -- break; -- default: -- rv = SECFailure; -- PORT_SetError(SEC_ERROR_UNSUPPORTED_KEYALG); -- break; -+ goto loser; -+ } -+ } -+ if (rv != SECSuccess) { -+ goto loser; - } - } - -- if (rv) -- goto loser; -- - /* check hash alg again, RSA may have changed it.*/ - if (HASH_GetHashTypeByOidTag(cx->hashAlg) == HASH_AlgNULL) { - /* error set by HASH_GetHashTypeByOidTag */ - goto loser; - } - /* check the policy on the hash algorithm. Do this after - * the rsa decode because some uses of this function get hash implicitly - * from the RSA signature itself. */ -@@ -645,21 +680,26 @@ VFY_EndWithSignature(VFYContext *cx, SEC - if (cx->hashcx == NULL) { - PORT_SetError(SEC_ERROR_INVALID_ARGS); - return SECFailure; - } - (*cx->hashobj->end)(cx->hashcx, final, &part, sizeof(final)); - switch (cx->key->keyType) { - case ecKey: - case dsaKey: -- dsasig.data = cx->u.buffer; -- dsasig.len = SECKEY_SignatureLen(cx->key); -+ dsasig.len = checkedSignatureLen(cx->key); - if (dsasig.len == 0) { - return SECFailure; - } -+ if (dsasig.len > sizeof(cx->u)) { -+ PORT_SetError(SEC_ERROR_BAD_SIGNATURE); -+ return SECFailure; -+ } -+ dsasig.data = cx->u.buffer; -+ - if (sig) { - rv = decodeECorDSASignature(cx->encAlg, sig, dsasig.data, - dsasig.len); - if (rv != SECSuccess) { - PORT_SetError(SEC_ERROR_BAD_SIGNATURE); - return SECFailure; - } - } -@@ -681,18 +721,23 @@ VFY_EndWithSignature(VFYContext *cx, SEC - cx->params, - &mech); - PORT_DestroyCheapArena(&tmpArena); - if (rv != SECSuccess) { - return SECFailure; - } - - rsasig.data = cx->u.buffer; -- rsasig.len = SECKEY_SignatureLen(cx->key); -+ rsasig.len = checkedSignatureLen(cx->key); - if (rsasig.len == 0) { -+ /* Error set by checkedSignatureLen */ -+ return SECFailure; -+ } -+ if (rsasig.len > sizeof(cx->u)) { -+ PORT_SetError(SEC_ERROR_BAD_SIGNATURE); - return SECFailure; - } - if (sig) { - if (sig->len != rsasig.len) { - PORT_SetError(SEC_ERROR_BAD_SIGNATURE); - return SECFailure; - } - PORT_Memcpy(rsasig.data, sig->data, rsasig.len); -@@ -744,37 +789,42 @@ VFY_End(VFYContext *cx) - static SECStatus - vfy_VerifyDigest(const SECItem *digest, const SECKEYPublicKey *key, - const SECItem *sig, SECOidTag encAlg, SECOidTag hashAlg, - void *wincx) - { - SECStatus rv; - VFYContext *cx; - SECItem dsasig; /* also used for ECDSA */ -- - rv = SECFailure; - - cx = vfy_CreateContext(key, sig, encAlg, hashAlg, NULL, wincx); - if (cx != NULL) { - switch (key->keyType) { - case rsaKey: - rv = verifyPKCS1DigestInfo(cx, digest); -+ /* Error (if any) set by verifyPKCS1DigestInfo */ - break; -- case dsaKey: - case ecKey: -+ case dsaKey: - dsasig.data = cx->u.buffer; -- dsasig.len = SECKEY_SignatureLen(cx->key); -+ dsasig.len = checkedSignatureLen(cx->key); - if (dsasig.len == 0) { -+ /* Error set by checkedSignatureLen */ -+ rv = SECFailure; - break; - } -- if (PK11_Verify(cx->key, &dsasig, (SECItem *)digest, cx->wincx) != -- SECSuccess) { -+ if (dsasig.len > sizeof(cx->u)) { - PORT_SetError(SEC_ERROR_BAD_SIGNATURE); -- } else { -- rv = SECSuccess; -+ rv = SECFailure; -+ break; -+ } -+ rv = PK11_Verify(cx->key, &dsasig, (SECItem *)digest, cx->wincx); -+ if (rv != SECSuccess) { -+ PORT_SetError(SEC_ERROR_BAD_SIGNATURE); - } - break; - default: - break; - } - VFY_DestroyContext(cx, PR_TRUE); - } - return rv; - -- cgit v1.2.3 From cb8d62bd42f1ba3244ab9fb7693bfe4ddb183113 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 7 Dec 2021 00:22:16 +0100 Subject: gnu: hitch: Update to 1.7.2. * gnu/packages/web.scm (hitch): Update to 1.7.2. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index bc59395733..ca48560077 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5859,14 +5859,14 @@ (define-public goaccess (define-public hitch (package (name "hitch") - (version "1.7.0") + (version "1.7.2") (home-page "https://hitch-tls.org/") (source (origin (method url-fetch) (uri (string-append home-page "source/hitch-" version ".tar.gz")) (sha256 (base32 - "1i75giwyr66ip8xsvk3gg5xdbxnmcabgxz8dqi06c58mw7qzhzn9")))) + "118p3a8wjvr0yhldpd1zm7d2cmgaw4vmyz9ib8m64z18qsz5rmnw")))) (build-system gnu-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From b5e69cf6c1e33eaa9cc7ccf7b8a59a6dca3233f6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 7 Dec 2021 19:39:34 +0100 Subject: gnu: python-django@2.2: Update to 2.2.25 [fixes CVE-2021-4442]. * gnu/packages/django.scm (python-django-2.2): Update to 2.2.25. --- gnu/packages/django.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm index 6598577149..a212fbd9a9 100644 --- a/gnu/packages/django.scm +++ b/gnu/packages/django.scm @@ -144,15 +144,15 @@ (define-public python-django (define-public python-django-2.2 (package (inherit python-django) - (version "2.2.24") + (version "2.2.25") (source (origin (method url-fetch) (uri (pypi-uri "Django" version)) (sha256 (base32 - "1dvx3x85lggm91x7mpvaf9nmpxyz7r97pbpnmr2k1qfy0c7gyf9k")))) + "171ll8m1wp684z1r0lz93l377jc6jyq63q5p7sqx8iqk6ypmxrmi")))) (native-inputs - `(;; XXX: In 2.2 and 3.0, selenium is required for the test suite. + `(;; 2.2 requires Selenium for the test suite. ("python-selenium" ,python-selenium) ,@(package-native-inputs python-django))))) -- cgit v1.2.3 From 6f29d34bb231e5477a35bfa298fa710990be1844 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 7 Dec 2021 19:40:50 +0100 Subject: gnu: python-django: Update to 3.2.10 [fixes CVE-2021-4442]. * gnu/packages/django.scm (python-django): Update to 3.2.10. --- gnu/packages/django.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm index a212fbd9a9..706debfad2 100644 --- a/gnu/packages/django.scm +++ b/gnu/packages/django.scm @@ -49,13 +49,13 @@ (define-module (gnu packages django) (define-public python-django (package (name "python-django") - (version "3.2.9") + (version "3.2.10") (source (origin (method url-fetch) (uri (pypi-uri "Django" version)) (sha256 (base32 - "023ag89799z53034ya71b636gih7ldvgdgfc0zdzqbsjy4046a2i")))) + "1i6my7qrivj0ag9dq22lg0lq6maxapbdqrwy6v1cs2mlnhc8hkh7")))) (build-system python-build-system) (arguments '(#:phases -- cgit v1.2.3 From 2b8b89b7ab77cb578689e5bf18342e5f6b2fc305 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 7 Dec 2021 20:57:02 +0100 Subject: gnu: python-toolz: Update to 0.11.2. * gnu/packages/python-xyz.scm (python-toolz): Update to 0.11.2. --- 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 81b99e1d2e..885f04e1e9 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -22503,14 +22503,14 @@ (define-public python-multiprocess (define-public python-toolz (package (name "python-toolz") - (version "0.11.1") + (version "0.11.2") (source (origin (method url-fetch) (uri (pypi-uri "toolz" version)) (sha256 (base32 - "1grz3zvw5ixwqqlbv0n7j11mlcxb66cirh5i9x9zw8kqy0hpk967")))) + "0cxwlh8dz8gq0l0bzchjnqqwhdp261nfd958ppqm518k2mg2scbb")))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.2.3 From ddcec589bca1d8538df87ec731990ce7da5831d5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 7 Dec 2021 22:12:24 +0100 Subject: gnu: lollypop: Update to 1.4.24. * gnu/packages/gnome.scm (lollypop): Update to 1.4.24. [native-inputs]: Remove INTLTOOL and ITSTOOL. Add GETTEXT-MINIMAL. --- gnu/packages/gnome.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 87d9fec30c..49a67e4e13 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -10342,14 +10342,14 @@ (define-public gnome-planner (define-public lollypop (package (name "lollypop") - (version "1.4.6") + (version "1.4.24") (source (origin (method url-fetch) (uri (string-append "https://adishatz.org/lollypop/" "lollypop-" version ".tar.xz")) (sha256 - (base32 "1hlahr50gsagx1ifcdk4yn43xps6w0vqn0gnd6xckfc7qmg1pgq7")))) + (base32 "10cw3x75siibmnbh4zhfmf2vd08fqjs3lj3l4wpk6zj9h22ncfxw")))) (build-system meson-build-system) (arguments `(#:imported-modules @@ -10373,8 +10373,7 @@ (define-public lollypop (add-after 'install 'wrap-python (assoc-ref python:%standard-phases 'wrap))))) (native-inputs - `(("intltool" ,intltool) - ("itstool" ,itstool) + `(("gettext" ,gettext-minimal) ("glib:bin" ,glib "bin") ; For glib-compile-resources ("gtk+:bin" ,gtk+ "bin") ; For gtk-update-icon-cache ("pkg-config" ,pkg-config))) -- cgit v1.2.3 From f45e304aa45fada9716048ae9cf67854742e8dc5 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 8 Dec 2021 11:51:03 +0200 Subject: gnu: python-dropbox: Update to 11.25.0. * gnu/packages/file-systems.scm (python-dropbox): Update to 11.25.0. [propagated-inputs]: Remove python-certifi, python-chardet, and python-urllib3. --- gnu/packages/file-systems.scm | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index 71bc692f30..7cba71f6a4 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -1507,26 +1507,22 @@ (define-public mergerfs-tools (define-public python-dropbox (package (name "python-dropbox") - (version "11.5.0") + (version "11.25.0") (source (origin (method url-fetch) (uri (pypi-uri "dropbox" version)) (sha256 - (base32 - "16bxx9xqx2s4d9khrw57a0bj4q7nc6kq355wl4pfddn9cqvh9rg2")))) + (base32 "0vq9c2hp2amsxr2ys2mlgqp6a8hxmvrcwav70ri7wjzalfs32gj6")))) (build-system python-build-system) (arguments '(#:tests? #f)) ; Tests require a network connection. (native-inputs `(("python-pytest" ,python-pytest) ("python-pytest-runner" ,python-pytest-runner))) (propagated-inputs - `(("python-certifi" ,python-certifi) - ("python-chardet" ,python-chardet) - ("python-requests" ,python-requests) + `(("python-requests" ,python-requests) ("python-six" ,python-six) - ("python-stone" ,python-stone) - ("python-urllib3" ,python-urllib3))) + ("python-stone" ,python-stone))) (home-page "https://www.dropbox.com/developers") (synopsis "Official Dropbox API Client") (description "This package provides a Python SDK for integrating with the -- cgit v1.2.3 From c9b42242f998430a89fe662bd17637687aca748a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 8 Dec 2021 12:34:13 +0200 Subject: gnu: python-userspacefs: Update to 2.0.4. * gnu/packages/python-xyz.scm (python-userspacefs): Update to 2.0.4. --- 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 885f04e1e9..ae62eea969 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -21738,14 +21738,14 @@ (define-public python-fusepyng (define-public python-userspacefs (package (name "python-userspacefs") - (version "2.0.3") + (version "2.0.4") (source (origin (method url-fetch) (uri (pypi-uri "userspacefs" version)) (sha256 (base32 - "1v6saf62ml3j63adalvlkj4iavxjbsbapl20b21mn73p7kvn4ayf")))) + "06f2gsiypas270nqfjir4wwjlpkjp097pm6zchc7k20ggg32gv1k")))) (build-system python-build-system) (propagated-inputs `(("python-fusepyng" ,python-fusepyng))) -- cgit v1.2.3 From 107481ea0ffb64f040d6a715490a7933338d67dd Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Wed, 8 Dec 2021 11:57:59 +0100 Subject: gnu: monero: Update to 0.17.3.0. * gnu/packages/finance.scm (monero): Update to 0.17.3.0. * gnu/packages/patches/monero-use-system-miniupnpc.patch: Update patch. --- gnu/packages/finance.scm | 4 ++-- gnu/packages/patches/monero-use-system-miniupnpc.patch | 12 +++++++----- 2 files changed, 9 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 4793fe3adf..5004f9230c 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -642,7 +642,7 @@ (define-public monero ;; the system's dynamically linked library. (package (name "monero") - (version "0.17.2.3") + (version "0.17.3.0") (source (origin (method git-fetch) @@ -662,7 +662,7 @@ (define-public monero "external/unbound")) #t)) (sha256 - (base32 "0nax991fshfh51grhh2ryfrwwws35k16gzl1l3niva28zff2xmq6")))) + (base32 "1spsf7m3x4psp9s7mivr6x4886jnbq4i8ll2dl8bv5bsdhcd3pjm")))) (build-system cmake-build-system) (native-inputs `(("doxygen" ,doxygen) diff --git a/gnu/packages/patches/monero-use-system-miniupnpc.patch b/gnu/packages/patches/monero-use-system-miniupnpc.patch index c5d376d793..2bd179946f 100644 --- a/gnu/packages/patches/monero-use-system-miniupnpc.patch +++ b/gnu/packages/patches/monero-use-system-miniupnpc.patch @@ -1,14 +1,16 @@ diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt -index 7553f87e..8e865c6c 100644 +index 5b7f69a56..3a353a0f3 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt -@@ -37,19 +37,7 @@ +@@ -37,21 +37,7 @@ find_package(Miniupnpc REQUIRED) -message(STATUS "Using in-tree miniupnpc") +-set(UPNPC_NO_INSTALL TRUE CACHE BOOL "Disable miniupnp installation" FORCE) -add_subdirectory(miniupnp/miniupnpc) -set_property(TARGET libminiupnpc-static PROPERTY FOLDER "external") +-set_property(TARGET libminiupnpc-static PROPERTY POSITION_INDEPENDENT_CODE ON) -if(MSVC) - set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -wd4244 -wd4267") -elseif(NOT MSVC) @@ -24,12 +26,12 @@ index 7553f87e..8e865c6c 100644 find_package(Unbound) diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl -index 74924e4f..3554dd0d 100644 +index d4b39869c..13071d898 100644 --- a/src/p2p/net_node.inl +++ b/src/p2p/net_node.inl -@@ -49,9 +49,9 @@ - #include "storages/levin_abstract_invoke2.h" +@@ -61,9 +61,9 @@ #include "cryptonote_core/cryptonote_core.h" + #include "net/parse.h" -#include -#include -- cgit v1.2.3 From 3ccf33bbe6c36b14385286dbfe6fd1be26d69e7f Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Wed, 8 Dec 2021 13:17:51 +0100 Subject: gnu: monero-gui: Update to 0.17.3.0. * gnu/packages/finance.scm (monero-gui): Update to 0.17.3.0. --- gnu/packages/finance.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 5004f9230c..f28fbf8809 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -752,7 +752,7 @@ (define-public monero (define-public monero-gui (package (name "monero-gui") - (version "0.17.2.3") + (version "0.17.3.0") (source (origin (method git-fetch) @@ -769,7 +769,7 @@ (define-public monero-gui (delete-file-recursively "monero") #t)) (sha256 - (base32 "0qb746z1sxqrja7q9lqhhbm64v83sn67az4k7gs5q90iaw584qfc")))) + (base32 "0sc3g8g4mlcgz1ys1mqx9klyfl02z17zv2z22clx33jni0l3bqkr")))) (build-system qt-build-system) (native-inputs `(,@(package-native-inputs monero) -- cgit v1.2.3 From ac53cbb368fef080a3e0656794109621bbe036db Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Wed, 8 Dec 2021 13:21:10 +0100 Subject: gnu: monero: Improve check phase. * gnu/packages/finance.scm (monero)[arguments]: Take 'tests?' parameter into consideration in 'check' phase. --- gnu/packages/finance.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index f28fbf8809..1f4dd25f6f 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -716,12 +716,13 @@ (define-public monero #t)) ;; Only try tests that don't need access to network or system (replace 'check - (lambda _ + (lambda* (#:key tests? #:allow-other-keys) ;; Core tests sometimes fail, at least on i686-linux. ;; Let's disable them for now and just try hash tests ;; and unit tests. ;; (invoke "make" "ARGS=-R 'hash|core_tests' --verbose" "test"))) - (invoke "make" "ARGS=-R 'hash' --verbose" "test"))) + (when tests? + (invoke "make" "ARGS=-R 'hash' --verbose" "test")))) (add-after 'check 'unit-tests (lambda _ (let ((excluded-unit-tests -- cgit v1.2.3 From 5573d98f81169802509f8c4573d65fae78137166 Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Wed, 8 Dec 2021 20:10:37 +0800 Subject: gnu: rtl8821ce-linux-module: Update to 0.0.0-4-ca204c6. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes compatibility with linux-libre@5.15: […]/source/core/rtw_br_ext.c:20:11: fatal error: net/ipx.h: No such file or directory #include ^~~~~~~~~~~ compilation terminated. * gnu/packages/linux.scm (rtl8821ce-linux-module): Update to 0.0.0-4-ca204c6. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/linux.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 03e84a0a79..c2aae58bbf 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1323,8 +1323,8 @@ (define-public librem-ec-acpi-linux-module (license license:gpl2))) (define-public rtl8821ce-linux-module - (let ((commit "897e7c4c15dd5a0a569745dc223d969a26ff5bfc") - (revision "3")) + (let ((commit "ca204c60724d23ab10244f920d4e50759ed1affb") + (revision "4")) (package (name "rtl8821ce-linux-module") (version (git-version "0.0.0" revision commit)) @@ -1337,7 +1337,7 @@ (define-public rtl8821ce-linux-module (file-name (git-file-name name version)) (sha256 (base32 - "0935dzz0njxh78wfd17yqah1dxn6b3kaszvzclwwrwwhwcrdp80j")))) + "18ma8a8h1l90dss0k6al7q6plwr57jc9g67p22g9917k1jfbhm97")))) (build-system linux-module-build-system) (arguments `(#:make-flags -- cgit v1.2.3 From 852ad65bd45a81a441a85318badf17a005cad111 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 8 Dec 2021 15:38:29 +0100 Subject: gnu: fastboot: Fix ‘--version’ output. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/android.scm (fastboot)[arguments]: Replace broken ‘git rev-parse’ shell command with the actual package VERSION. Reported by kwjc on #guix. --- gnu/packages/android.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm index 016943e0f0..74d97ab3b6 100644 --- a/gnu/packages/android.scm +++ b/gnu/packages/android.scm @@ -668,7 +668,8 @@ (define-public fastboot (add-after 'enter-source 'patch-source (lambda _ (substitute* "Android.mk" - (("libext4_utils_host") "libext4_utils_host libselinux libpcre")) + (("libext4_utils_host") "libext4_utils_host libselinux libpcre") + (("\\$\\(shell git .*\\)") ,version)) #t)) (replace 'install (lambda* (#:key outputs #:allow-other-keys) -- cgit v1.2.3 From 9bac41c2b8e7be5ab713402591ceeb32c635c214 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 8 Dec 2021 18:12:45 +0100 Subject: gnu: fzf: Wrap with a compliant find(1). MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/terminals.scm (fzf)[inputs]: Add findutils. [arguments]: Wrap the ‘fzf’ executable with its /bin directory in $PATH. Addresses . --- gnu/packages/terminals.scm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 778a592dc6..1b88d3813b 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -61,6 +61,7 @@ (define-module (gnu packages terminals) #:use-module (guix utils) #:use-module (gnu packages) #:use-module (gnu packages autotools) + #:use-module (gnu packages base) #:use-module (gnu packages build-tools) ;for meson-0.55 #:use-module (gnu packages check) #:use-module (gnu packages cmake) @@ -974,9 +975,13 @@ (define-public fzf (string-append out "/bin")))))) (add-after 'copy-binaries 'wrap-programs (lambda* (#:key outputs inputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (ncurses (assoc-ref inputs "ncurses"))) - (wrap-program (string-append out "/bin/fzf-tmux") + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (findutils (assoc-ref inputs "findutils")) + (ncurses (assoc-ref inputs "ncurses"))) + (wrap-program (string-append bin "/fzf") + `("PATH" ":" prefix (,(string-append findutils "/bin")))) + (wrap-program (string-append bin "/fzf-tmux") `("PATH" ":" prefix (,(string-append ncurses "/bin"))))))) (add-after 'install 'install-completions (lambda* (#:key outputs #:allow-other-keys) @@ -997,6 +1002,7 @@ (define-public fzf (string-append zsh-completion "/_fzf")))))))))) (inputs `(,@(package-inputs go-github-com-junegunn-fzf) + ("findutils" ,findutils) ("ncurses" ,ncurses))))) (define-public go-github.com-howeyc-gopass -- cgit v1.2.3 From 93c7a5103d240dfc5ba4b39969faf198e7a350fa Mon Sep 17 00:00:00 2001 From: Sarah Morgensen Date: Sun, 19 Sep 2021 16:18:22 -0700 Subject: gnu: Remove go-gopkg.in-check.v1. This package is a duplicate of go-gopkg-in-check-v1 in golang.scm, has no binaries, and has no dependents, so remove it. * gnu/packages/check.scm (go-gopkg.in-check.v1): Remove variable. Signed-off-by: Leo Famulari --- gnu/packages/check.scm | 26 -------------------------- 1 file changed, 26 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 1f9cc26913..4928f02bfd 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -566,32 +566,6 @@ (define-public doctest has been designed to be fast, light and unintrusive.") (license license:expat))) -(define-public go-gopkg.in-check.v1 - (let ((commit "788fd78401277ebd861206a03c884797c6ec5541") - (revision "1")) - (package - (name "go-gopkg.in-check.v1") - (version (git-version "0.0.0" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/go-check/check") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a")))) - (build-system go-build-system) - (arguments - '(#:import-path "gopkg.in/check.v1")) - (propagated-inputs - `(("go-github-com-kr-pretty" ,go-github-com-kr-pretty))) - (synopsis "Rich testing extension for Go's testing package") - (description - "@code{check} is a rich testing extension for Go's testing package.") - (home-page "https://github.com/go-check/check") - (license license:bsd-2)))) - (define-public go-github.com-smartystreets-gunit (package (name "go-github.com-smartystreets-gunit") -- cgit v1.2.3 From 8ac2d303e4e01fb5a5b22e7fd78f174e0a931afd Mon Sep 17 00:00:00 2001 From: Sarah Morgensen Date: Sun, 19 Sep 2021 16:32:13 -0700 Subject: gnu: go-github-com-alcortesm-tgz: Don't reset gzip timestamps. The tgz files are committed test fixtures, so don't reset their timestamps. * gnu/packages/golang.scm (go-github-com-alcortesm-tgz)[arguments]: Remove 'make-git-checkout-writable' phase. Delete 'reset-gzip-timestamps' phase instead. Signed-off-by: Leo Famulari --- gnu/packages/golang.scm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index b6d81bdba1..d555a92579 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -7622,11 +7622,8 @@ (define-public go-github-com-alcortesm-tgz `(#:import-path "github.com/alcortesm/tgz" #:phases (modify-phases %standard-phases - (add-after 'unpack 'make-git-checkout-writable - (lambda* (#:key outputs #:allow-other-keys) - (for-each make-file-writable (find-files ".")) - (for-each make-file-writable (find-files (assoc-ref outputs "out"))) - #t))))) + ;; Files are test fixtures, not generated. + (delete 'reset-gzip-timestamps)))) (home-page "https://github.com/alcortesm/tgz/") (synopsis "Go library to extract tgz files to temporal directories") (description "This package provides a Go library to extract tgz files to -- cgit v1.2.3 From 0ba4e94e8448e6c27cceb690b085c8d8cf66e577 Mon Sep 17 00:00:00 2001 From: Petr Hodina Date: Wed, 10 Nov 2021 03:53:37 +0100 Subject: gnu: Add realmd. * gnu/packages/admin.scm (realmd): New variable. Signed-off-by: Leo Famulari --- gnu/packages/admin.scm | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index e640149a51..8e55d980e0 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -44,6 +44,7 @@ ;;; Copyright © 2021 Brice Waegeneire ;;; Copyright © 2021 Maxim Cournoyer ;;; Copyright © 2021 Maxime Devos +;;; Copyright © 2021 Petr Hodina ;;; ;;; This file is part of GNU Guix. ;;; @@ -128,6 +129,7 @@ (define-module (gnu packages admin) #:use-module (gnu packages perl) #:use-module (gnu packages perl-check) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages polkit) #:use-module (gnu packages popt) #:use-module (gnu packages python) #:use-module (gnu packages python-crypto) @@ -1531,6 +1533,56 @@ (define-public clusterssh over ssh connections.") (license license:gpl2+))) +(define-public realmd + (package + (name "realmd") + (version "0.17.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/freedesktop/realmd") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1c6q2a86kk2f1akzc36nh52hfwsmmc0mbp6ayyjxj4zsyk9zx5bf")))) + (build-system gnu-build-system) + (arguments + `(#:configure-flags '("--with-systemd-unit-dir=no" + "--with-systemd-journal=no" + "--with-distro=GNU guix" + "--disable-doc") + #:phases + (modify-phases %standard-phases + (add-before 'install 'fix-service + (lambda* (#:key outputs #:allow-other-keys) + ;; GNU Guix does not have service config file, therefore we remove + ;; the line that copies the file. + (substitute* "Makefile" + ((".*/service/realmd-.*") ""))))))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("glib-bin" ,glib "bin") + ("intltool" ,intltool) + ("pkg-config" ,pkg-config) + ("python" ,python))) + (inputs + `(("glib" ,glib) + ("mit-krb5" ,mit-krb5) + ("openldap" ,openldap) + ("polkit" ,polkit))) + (synopsis "DBus service for network authentication") + (description "This package provides an on demand system DBus service. +It allows callers to configure network authentication and domain membership +in a standard way. Realmd discovers information about the domain or realm +automatically and does not require complicated configuration in order to join +a domain or realm. Dbus system service that manages discovery and enrollment in +realms/domains like Active Directory or IPA.") + (home-page "https://www.freedesktop.org/software/realmd/") + (license license:lgpl2.1+))) + (define-public rename (package (name "rename") -- cgit v1.2.3 From e5e307b6768088e35be0c7526f25a3e16d93c242 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 8 Dec 2021 23:22:09 +0100 Subject: Revert "installer: Make LUKS2 the default format for encrypted devices" This reverts commit a82e9f45fd9f7c67123b7064c60065281035c744 at the author's request. We are not quite ready to boot all resulting systems. See . --- gnu/installer/parted.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/installer/parted.scm b/gnu/installer/parted.scm index 616b99c3cb..ad7dd6bf91 100644 --- a/gnu/installer/parted.scm +++ b/gnu/installer/parted.scm @@ -1169,9 +1169,8 @@ (define (luks-format-and-open user-partition) (lambda (key-file) (syslog "formatting and opening LUKS entry ~s at ~s~%" label file-name) - (system* "cryptsetup" "-q" "luksFormat" "--type" "luks2" - "--pbkdf" "pbkdf2" file-name key-file) - (system* "cryptsetup" "open" + (system* "cryptsetup" "-q" "luksFormat" file-name key-file) + (system* "cryptsetup" "open" "--type" "luks" "--key-file" key-file file-name label))))) (define (luks-close user-partition) -- cgit v1.2.3 From 4ca0e9d5f77ec309a5a8a7eba3d97fd3bb4852d5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 9 Dec 2021 01:18:03 +0100 Subject: gnu: bind: Update to 9.16.23 [fixes CVE-2021-25218, CVE-2021-25219]. * gnu/packages/dns.scm (isc-bind): Update to 9.16.23. [source]: Add patch. * gnu/packages/patches/bind-re-add-attr-constructor-priority.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/dns.scm | 20 ++++---- .../bind-re-add-attr-constructor-priority.patch | 57 ++++++++++++++++++++++ 3 files changed, 69 insertions(+), 9 deletions(-) create mode 100644 gnu/packages/patches/bind-re-add-attr-constructor-priority.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index d8b9a78949..2afd025b52 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -879,6 +879,7 @@ dist_patch_DATA = \ %D%/packages/patches/bazaar-CVE-2017-14176.patch \ %D%/packages/patches/bc-fix-cross-compilation.patch \ %D%/packages/patches/bear-disable-preinstall-tests.patch \ + %D%/packages/patches/bind-re-add-attr-constructor-priority.patch \ %D%/packages/patches/brightnessctl-elogind-support.patch \ %D%/packages/patches/bsd-games-2.17-64bit.patch \ %D%/packages/patches/bsd-games-add-configure-config.patch \ diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index 0c2e037b4f..c4c4bd2b3a 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -373,15 +373,17 @@ (define-public isc-bind ;; When updating, check whether isc-dhcp's bundled copy should be as well. ;; The BIND release notes are available here: ;; https://www.isc.org/bind/ - (version "9.16.16") - (source (origin - (method url-fetch) - (uri (string-append - "https://ftp.isc.org/isc/bind9/" version - "/bind-" version ".tar.xz")) - (sha256 - (base32 - "0yqxfq7qc26x7qhk0nkp8h7x9jggzaafm712bvfffy7qml13k4bc")))) + (version "9.16.23") + (source + (origin + (method url-fetch) + (uri (string-append + "https://ftp.isc.org/isc/bind9/" version + "/bind-" version ".tar.xz")) + (sha256 + (base32 "0g0pxzhzcz6nzkiab4cs9sgbjdzqgy44aa477v7akdlwm8kmxnyy")) + (patches + (search-patches "bind-re-add-attr-constructor-priority.patch")))) (build-system gnu-build-system) (outputs `("out" "utils")) (inputs diff --git a/gnu/packages/patches/bind-re-add-attr-constructor-priority.patch b/gnu/packages/patches/bind-re-add-attr-constructor-priority.patch new file mode 100644 index 0000000000..5d6765dd92 --- /dev/null +++ b/gnu/packages/patches/bind-re-add-attr-constructor-priority.patch @@ -0,0 +1,57 @@ +From 6361de07a35f2e9dc1d7201d6b26ca31da93ee69 Mon Sep 17 00:00:00 2001 +From: Tobias Geerinckx-Rice +Date: Thu, 9 Dec 2021 01:07:32 +0100 +Subject: [PATCH] Revert "Remove priority from attribute + constructor/destructor" + +This reverts commit 0340df46ec5897636dd071bc8b5c4272cfa7d7be. It works +around an irrelevant operating system and breaks compilation on Guix: + +mem.c:873: fatal error: RUNTIME_CHECK(((pthread_mutex_lock(((&contextslock))) == 0) ? 0 : 34) == 0) failed +/gnu/store/pwcp239kjf7lnj5i4lkdzcfcxwcfyk72-bash-minimal-5.0.16/bin/bash: line 1: 13768 Aborted ./${fuzzer} + +Let's simply revert it for now---there are securities at stake! +--- + lib/isc/include/isc/util.h | 8 ++++---- + lib/isc/lib.c | 4 ++-- + 2 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/lib/isc/include/isc/util.h b/lib/isc/include/isc/util.h +index f0f7f85fa4..64c26587ac 100644 +--- a/lib/isc/include/isc/util.h ++++ b/lib/isc/include/isc/util.h +@@ -49,11 +49,11 @@ + #endif /* __GNUC__ */ + + #if HAVE_FUNC_ATTRIBUTE_CONSTRUCTOR && HAVE_FUNC_ATTRIBUTE_DESTRUCTOR +-#define ISC_CONSTRUCTOR __attribute__((constructor)) +-#define ISC_DESTRUCTOR __attribute__((destructor)) ++#define ISC_CONSTRUCTOR(priority) __attribute__((constructor(priority))) ++#define ISC_DESTRUCTOR(priority) __attribute__((destructor(priority))) + #elif WIN32 +-#define ISC_CONSTRUCTOR +-#define ISC_DESTRUCTOR ++#define ISC_CONSTRUCTOR(priority) ++#define ISC_DESTRUCTOR(priority) + #endif + + /*% +diff --git a/lib/isc/lib.c b/lib/isc/lib.c +index f3576b2659..2a167fec21 100644 +--- a/lib/isc/lib.c ++++ b/lib/isc/lib.c +@@ -35,9 +35,9 @@ isc_lib_register(void) { + } + + void +-isc__initialize(void) ISC_CONSTRUCTOR; ++isc__initialize(void) ISC_CONSTRUCTOR(101); + void +-isc__shutdown(void) ISC_DESTRUCTOR; ++isc__shutdown(void) ISC_DESTRUCTOR(101); + + void + isc__initialize(void) { +-- +2.34.0 + -- cgit v1.2.3 From 37186ec462dc574477af195aa07fea3fe1ed07a2 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 8 Dec 2021 15:03:26 -0500 Subject: gnu: isc-dhcp: Update bundled BIND to 9.11.36 [fixes CVE-2021-25219]. * gnu/packages/admin.scm (isc-dhcp)[inputs]: Update bundled BIND to 9.11.36. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 8e55d980e0..ce12c01582 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1152,7 +1152,7 @@ (define-public alive (define-public isc-dhcp (let* ((bind-major-version "9") (bind-minor-version "11") - (bind-patch-version "32") + (bind-patch-version "36") (bind-release-type "") ; for patch release, use "-P" (bind-release-version "") ; for patch release, e.g. "6" (bind-version (string-append bind-major-version @@ -1312,7 +1312,7 @@ (define-public isc-dhcp "/bind-" bind-version ".tar.gz")) (sha256 (base32 - "0hhkb4d14hvly2751cxl2s2xyim3bri8qaisgkcm456xfi5wpy6b")))) + "108nh7hha4r0lb5hf1fn7lqaascvhsrghpz6afm5lf9vf2vgqly9")))) ("coreutils*" ,coreutils) ("sed*" ,sed))) -- cgit v1.2.3 From 38ea869b201192a5b2791da3987367a09e1a430b Mon Sep 17 00:00:00 2001 From: terramorpha Date: Sat, 27 Nov 2021 12:42:11 -0500 Subject: gnu: tiramisu: Update to 2.0.20211107. * gnu/packages/gnome-xyz.scm (tiramisu): Update to 2.0.20211107. [native-inputs]: Add vala. Signed-off-by: Leo Famulari --- gnu/packages/gnome-xyz.scm | 74 +++++++++++++++++++++++----------------------- 1 file changed, 37 insertions(+), 37 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index 9d8ec1bdef..d409d15c7a 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -12,6 +12,7 @@ ;;; Copyright © 2020 Stefan Reichör ;;; Copyright © 2021 Vinicius Monego ;;; Copyright © 2021 Songlin Jiang +;;; Copyright © 2021 Justin Veilleux ;;; ;;; This file is part of GNU Guix. ;;; @@ -987,40 +988,39 @@ (define-public nordic-theme (license license:gpl3)))) (define-public tiramisu - (let ((commit "8eb946dae0e2f98d3850d89e1bb535640e8c3266") - (revision "0")) - (package - (name "tiramisu") - (version (git-version "1.0" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/Sweets/tiramisu") - (commit commit))) - (sha256 - (base32 - "0wz2r8369d40vnxswknx0zxzbs03gzv0nc8al4g0ffg972p15j25")) - (file-name (git-file-name name version)))) - (build-system gnu-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (delete 'configure) - (delete 'check) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (install-file "tiramisu" (string-append out "/bin")) - #t)))) - #:make-flags - (list (string-append "CC=" ,(cc-for-target))))) - (inputs - `(("glib" ,glib))) - (native-inputs - `(("pkg-config" ,pkg-config))) - (home-page "https://github.com/Sweets/tiramisu") - (synopsis "Desktop notifications, the UNIX way") - (description "tiramisu is a notification daemon based on dunst that -outputs notifications to STDOUT in order to allow the user to process -notifications any way they prefer.") - (license license:expat)))) + (package + (name "tiramisu") + (version "2.0.20211107") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Sweets/tiramisu") + (commit version))) + (sha256 + (base32 + "1n1x1ybbwbanibw7b90k7v4cadagl41li17hz2l8s2sapacvq3mw")) + (file-name (git-file-name name version)))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (delete 'configure) + (delete 'check) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (install-file "tiramisu" (string-append out "/bin")) + #t)))) + #:make-flags + (list (string-append "CC=" ,(cc-for-target))))) + (inputs + `(("glib" ,glib))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("vala" ,vala))) + (home-page "https://github.com/Sweets/tiramisu") + (synopsis "Desktop notifications, the UNIX way") + (description "tiramisu is a notification daemon based on dunst that outputs +notifications to STDOUT in order to allow the user to process notifications any +way they prefer.") + (license license:expat))) -- cgit v1.2.3 From 479742f195132d48f36d0e5ce5cd2f5d2cf4570e Mon Sep 17 00:00:00 2001 From: Petr Hodina Date: Wed, 8 Dec 2021 00:29:36 +0100 Subject: gnu: valeronoi: Update to 0.1.6. * gnu/packages/engineering.scm (valeronoi): Update to 0.1.6. Signed-off-by: Nicolas Goaziou --- gnu/packages/engineering.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 08c01905ab..dc119f5d63 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -1161,7 +1161,7 @@ (define-public linsmith (define-public valeronoi (package (name "valeronoi") - (version "0.1.4") + (version "0.1.6") (source (origin (method git-fetch) @@ -1171,7 +1171,7 @@ (define-public valeronoi (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1zp653bjqsyixa5j1pp9k12iqsl8dz72yyi38asxmcym1wngsjcd")))) + (base32 "1hpyh4mmjnxgkij7a6rynk2ril5413nkdvf8syn0lqvrmibdg7wv")))) (build-system cmake-build-system) (arguments `(#:phases -- cgit v1.2.3 From 1490e02ea29f4a1b2f5b9453d6f36d5b960964a5 Mon Sep 17 00:00:00 2001 From: Andrew Tropin Date: Thu, 9 Dec 2021 08:59:07 +0300 Subject: gnu: Add emacs-dpd. * gnu/packages/emacs-xyz.scm (emacs-dpd): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index e542da0c26..f093e67dd4 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -21434,6 +21434,32 @@ (define-public emacs-packed package recipes.") (license license:gpl3+))) +(define-public emacs-dpd + ;; XXX: Upstream does not use tag yet. Version is extracted from "dpd.el". + (let ((commit "f53f251a58859f375617ce4f257fecc83c8ca5da") + (revision "0")) + (package + (name "emacs-dpd") + (version (git-version "0.1.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/lilyp/emacs-dpd") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1nislvaxjb53x2ah330szcca4d595npx6zxrrwa5xximj6365wk0")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-packed" ,emacs-packed))) + (home-page "https://gitlab.com/lilyp/emacs-dpd") + (synopsis "Deliver packages to package.el") + (description + "This package provides tools for generating package-desc structures and +feeding them to package.el library.") + (license license:gpl3+)))) + (define-public emacs-picpocket (let ((version "41") (commit "fa3a49f011b5ae139728548fec7375743f61c7c7")) -- cgit v1.2.3 From bfaf6c18016a091f3f36c079c4a58e49a123d9f0 Mon Sep 17 00:00:00 2001 From: jgart via Guix-patches via Date: Tue, 7 Dec 2021 16:04:06 -0500 Subject: gnu: emacs-evil-magit: Remove deprecated package. * gnu/packages/emacs-xyz.scm (emacs-evil-magit): Delete variable. evil-magit has been consolidated into evil-collection. The package has been removed from MELPA since February. See here: . Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 36 ------------------------------------ 1 file changed, 36 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index f093e67dd4..8e89eda77f 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -20781,42 +20781,6 @@ (define-public emacs-zotxt Org-mode file, and citations of Zotero items in Pandoc Markdown files.") (license license:gpl3+))) -(define-public emacs-evil-magit - (let ((commit "98c076fbeb6d2d7d71e02dc204ba3ad5d577abda") - (revision "5")) - (package - (name "emacs-evil-magit") - (version (git-version "0.4.2" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/emacs-evil/evil-magit") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0b4iplxh3rmy8jadhf05pgksv1798d68d1jrhfry93jca8x9crxs")))) - (build-system emacs-build-system) - (propagated-inputs - `(("emacs-evil" ,emacs-evil) - ("magit" ,emacs-magit))) - (arguments - `(#:tests? #t - #:test-command '("emacs" "-Q" "-batch" - "-L" "." - "-l" "evil-magit-tests" - "-f" "ert-run-tests-batch-and-exit"))) - (home-page - "https://github.com/emacs-evil/evil-magit") - (synopsis "Evil-based key bindings for Magit") - (description - "This Emacs library configures Magit and Evil to play well with each other. -For some background see @url{https://github.com/magit/evil-magit/issues/1}. -See the README at @url{https://github.com/justbur/evil-magit} for a table -describing the key binding changes.") - (license license:gpl3+)))) - (define-public emacs-evil-multiedit (package (name "emacs-evil-multiedit") -- cgit v1.2.3 From 4cb5f0daf2c989373cfd426de476a73d67f38047 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 8 Dec 2021 21:57:54 +0100 Subject: gnu: ungoogled-chromium: Update to 96.0.4664.93-1. * gnu/packages/chromium.scm (%chromium-version): Set to 96.0.4664.93. (%ungoogled-origin, ungoogled-chromium): Update hashes. --- gnu/packages/chromium.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm index e51e7e7234..8c37e7b7b1 100644 --- a/gnu/packages/chromium.scm +++ b/gnu/packages/chromium.scm @@ -336,7 +336,7 @@ (define* (debian-patch name hash #:optional (revision %debian-revision)) (string-append "ungoogled-chromium-" category "-" name)))) (sha256 (base32 hash)))) -(define %chromium-version "96.0.4664.45") +(define %chromium-version "96.0.4664.93") (define %ungoogled-revision (string-append %chromium-version "-1")) (define %arch-revision "db2157b84924ce84201a8245e68a02f7d55f6491") (define %debian-revision "debian/90.0.4430.85-1") @@ -367,7 +367,7 @@ (define %ungoogled-origin (file-name (git-file-name "ungoogled-chromium" %ungoogled-revision)) (sha256 (base32 - "1k0kf5ika1sz489bcbn485kmdq1xp7ssa80gbqrpd60xihkhnrm3")))) + "0r8cwriaxbmzy9sxa6mx71h8n1a0x7pdx3kmqc1sg97b2qwmg15r")))) (define %guix-patches (list (local-file @@ -502,7 +502,7 @@ (define-public ungoogled-chromium %chromium-version ".tar.xz")) (sha256 (base32 - "01q4fsf2cbx6g9nnaihvc5jj3ap8jq2gf16pnhf7ixzbhgcnm328")) + "14rlm91pzpdll6x2r1sxdswiv19h1ykxcq0csi9k9g0a9s71yyvw")) (modules '((guix build utils))) (snippet (force ungoogled-chromium-snippet)))) (build-system gnu-build-system) -- cgit v1.2.3 From d974b3f8609d015fc1a5be616610a6638b1eaf8a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 9 Dec 2021 17:38:57 +0100 Subject: gnu: uBlock Origin: Update to 1.39.2. * gnu/packages/browser-extensions.scm (ublock-origin): Update to 1.39.2. --- gnu/packages/browser-extensions.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/browser-extensions.scm b/gnu/packages/browser-extensions.scm index 183b44f2c3..6b2f4ad4a3 100644 --- a/gnu/packages/browser-extensions.scm +++ b/gnu/packages/browser-extensions.scm @@ -51,7 +51,7 @@ (define-public play-to-kodi/chromium (define ublock-origin (package (name "ublock-origin") - (version "1.38.6") + (version "1.39.2") (home-page "https://github.com/gorhill/uBlock") (source (origin (method git-fetch) @@ -60,7 +60,7 @@ (define ublock-origin (file-name (git-file-name name version)) (sha256 (base32 - "1jdi7p537dj0bpxsdnvs722cw8xv5ifh8mjj1ndwjvgasvj18fsd")))) + "12dqn7hm72ha7xclc7cny67l1ndsanhpgbwx1s9d74z0jhdl2iks")))) (build-system gnu-build-system) (outputs '("xpi" "firefox" "chromium")) (arguments -- cgit v1.2.3 From 4709decb453ac21c4602f78ee692cee37346dea2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 6 Dec 2021 13:21:21 +0100 Subject: gnu: r-minimal: Remove extraneous references. * gnu/packages/statistics.scm (r-minimal)[arguments]: Remove references to native build-time tools. --- gnu/packages/statistics.scm | 39 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index cf7a64ec7a..599d6a8fc3 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -403,12 +403,49 @@ (define-public r-minimal (arguments `(#:tests? #f ,@(substitute-keyword-arguments (package-arguments r-with-tests) + ((#:disallowed-references refs '()) + (cons perl refs)) ((#:configure-flags flags) ;; Do not build the recommended packages. The build system creates ;; random temporary directories and embeds their names in some ;; package files. We build these packages with the r-build-system ;; instead. - `(cons "--without-recommended-packages" ,flags))))))) + `(cons "--without-recommended-packages" ,flags)) + ((#:phases phases '%standard-phases) + `(modify-phases ,phases + (add-after 'install 'remove-extraneous-references + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (substitute* (string-append out "/lib/R/etc/Makeconf") + (("^# configure.*") + "# Removed to avoid extraneous references\n")) + (substitute* (string-append out "/lib/R/bin/libtool") + (((string-append + "(-L)?(" + (assoc-ref inputs "bzip2") + "|" + (assoc-ref inputs "perl") + "|" + (assoc-ref inputs "texlive") + "|" + (assoc-ref inputs "texlive-bin") + "|" + (assoc-ref inputs "texinfo") + "|" + (assoc-ref inputs "xz") + "|" + (format #false + "/gnu/store/[^-]+-(~{~a~^|~})-[^/]+" + '("glibc-utf8-locales" + "libselinux" + "libsepol" + "file" + "texlive-bin" + "util-macros" + "graphite2")) + "|" + "/gnu/store/[^-]+-glibc-[^-]+-static" + ")/lib")) "")))))))))))) (define-public rmath-standalone (package (inherit r-minimal) -- cgit v1.2.3 From 0e8826824c6ec3160969117ec87805cb82d74c70 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 8 Dec 2021 16:13:50 +0100 Subject: gnu: python-rich: Remove optional input ipywidgets. * gnu/packages/python-xyz.scm (python-rich)[propagated-inputs]: Remove python-ipywidgets. --- gnu/packages/python-xyz.scm | 1 - 1 file changed, 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index ae62eea969..81b887ccfd 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -14782,7 +14782,6 @@ (define-public python-rich `(("python-attrs" ,python-attrs) ("python-colorama" ,python-colorama) ("python-commonmark" ,python-commonmark) - ("python-ipywidgets" ,python-ipywidgets) ("python-pygments" ,python-pygments) ("python-typing-extensions" ,python-typing-extensions))) (native-inputs -- cgit v1.2.3 From 13bc332ed597ca44c746ddc821910037107ceade Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 9 Dec 2021 18:41:57 +0100 Subject: gnu: mumi: Update to 0.0.1-6.8a45281. * gnu/packages/mail.scm (mumi): Update to 0.0.1-6.8a45281. [arguments]: Remove trailing #T. --- gnu/packages/mail.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index aad6961f40..fbbc038dcb 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -4014,8 +4014,8 @@ (define-public tnef (license license:gpl2+))) (define-public mumi - (let ((commit "9f070bd90adc67064cd8aff4e40f303d5957ef4a") - (revision "5")) + (let ((commit "8a45281801ade7524dbdee423c28b326051719de") + (revision "6")) (package (name "mumi") (version (git-version "0.0.1" revision commit)) @@ -4027,7 +4027,7 @@ (define-public mumi (file-name (git-file-name name version)) (sha256 (base32 - "1ym1j3nzy8qhd1ydadccbgm0nckkmnq3vnz9qh9x8rasx7zg1ldp")))) + "0p1i66j721y5hwbdy97kv4gw892nx7xrdfjrs12fn90cwkl611mp")))) (build-system gnu-build-system) (arguments `(#:modules ((guix build gnu-build-system) @@ -4053,8 +4053,7 @@ (define-public mumi `("GUILE_LOAD_PATH" ":" prefix (,scm ,(getenv "GUILE_LOAD_PATH"))) `("GUILE_LOAD_COMPILED_PATH" ":" prefix - (,go ,(getenv "GUILE_LOAD_COMPILED_PATH")))) - #t)))))) + (,go ,(getenv "GUILE_LOAD_COMPILED_PATH")))))))))) (inputs `(("guile-email" ,guile-email-latest) ("guile-fibers" ,guile-fibers) -- cgit v1.2.3 From 4665e6a73b233e3755ffbba7ecfdbbb53dae87bd Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Thu, 9 Dec 2021 23:58:33 +0100 Subject: gnu: opam: Update to 2.1.2. * gnu/packages/ocaml.scm (opam): Update to 2.1.2. --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index cf815336a7..d5d9a9138b 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -777,7 +777,7 @@ (define-public ocaml-opam-file-format (define-public opam (package (name "opam") - (version "2.1.1") + (version "2.1.2") (source (origin (method git-fetch) (uri (git-reference @@ -786,7 +786,7 @@ (define-public opam (file-name (git-file-name name version)) (sha256 (base32 - "12cxpnkv8n90g66b31c7hsxl2yy537fgf19xhr6zn4n024bh6dh3")))) + "0mdr32mg63yaw89p44zx8b9dxp1167ckmlxkp8svd6fwgb3z49yx")))) (build-system dune-build-system) (arguments `(#:test-target "." -- cgit v1.2.3 From dfdcd375a839f8675fdbfb2ac3ecc27cf1f1febd Mon Sep 17 00:00:00 2001 From: Petr Hodina Date: Tue, 9 Nov 2021 19:34:03 +0100 Subject: gnu: Add rust-argh-shared-0.1. * gnu/packages/crates-io.scm (rust-argh-shared-0.1): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/crates-io.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index b95a41e4d3..b21b51fe11 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2374,6 +2374,24 @@ (define-public rust-arg-enum-proc-macro-0.3 @code{arg_enum}.") (license license:expat))) +(define-public rust-argh-shared-0.1 + (package + (name "rust-argh-shared") + (version "0.1.6") + (source + (origin + (method url-fetch) + (uri (crate-uri "argh_shared" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0crzkzr4mq9gyys3m0idgsfwwrwd4dk70scp7rspvb2fmgd01piq")))) + (build-system cargo-build-system) + (arguments `(#:skip-build? #t)) + (home-page "https://github.com/google/argh") + (synopsis "Derive-based argument parsing optimized for code size") + (description "Derive-based argument parsing optimized for code size") + (license license:bsd-3))) + (define-public rust-argon2rs-0.2 (package (name "rust-argon2rs") -- cgit v1.2.3 From 2e625d0b2de48813387054a824660fdddbf4be20 Mon Sep 17 00:00:00 2001 From: Petr Hodina Date: Tue, 9 Nov 2021 19:36:32 +0100 Subject: gnu: Add rust-argh-derive-0.1. * gnu/packages/crates-io (rust-argh-derive-0.1): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index b21b51fe11..5e9d74f89a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2392,6 +2392,32 @@ (define-public rust-argh-shared-0.1 (description "Derive-based argument parsing optimized for code size") (license license:bsd-3))) +(define-public rust-argh-derive-0.1 + (package + (name "rust-argh-derive") + (version "0.1.6") + (source + (origin + (method url-fetch) + (uri (crate-uri "argh_derive" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "13qz9i9frdjl1v9aqw5b2cs7wn3h34x2xkpsi9wcl1hcpjd23ba8")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? + #t + #:cargo-inputs + (("rust-argh-shared" ,rust-argh-shared-0.1) + ("rust-heck" ,rust-heck-0.3) + ("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-1)))) + (home-page "https://github.com/google/argh") + (synopsis "Derive-based argument parsing optimized for code size") + (description "Derive-based argument parsing optimized for code size") + (license license:bsd-3))) + (define-public rust-argon2rs-0.2 (package (name "rust-argon2rs") -- cgit v1.2.3 From ae01172fb30ab6c1b3b40876885836b7507a687d Mon Sep 17 00:00:00 2001 From: Petr Hodina Date: Tue, 9 Nov 2021 19:37:14 +0100 Subject: gnu: Add rust-argh-0.1. * gnu/packages/crates-io.scm (rust-argh-0.1): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/crates-io.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 5e9d74f89a..ec2e70b118 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2418,6 +2418,27 @@ (define-public rust-argh-derive-0.1 (description "Derive-based argument parsing optimized for code size") (license license:bsd-3))) +(define-public rust-argh-0.1 + (package + (name "rust-argh") + (version "0.1.6") + (source + (origin + (method url-fetch) + (uri (crate-uri "argh" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1gy9y69d38q7f5147kj823swgggc3m30x7z2z1lrjpwpsxncf8zh")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-argh-derive" ,rust-argh-derive-0.1) + ("rust-argh-shared" ,rust-argh-shared-0.1)))) + (home-page "https://github.com/google/argh") + (synopsis "Derive-based argument parser optimized for code size") + (description "Derive-based argument parser optimized for code size") + (license license:bsd-3))) + (define-public rust-argon2rs-0.2 (package (name "rust-argon2rs") -- cgit v1.2.3 From d8c0d955a439478b21b8891638de09483fe8ff1e Mon Sep 17 00:00:00 2001 From: Petr Hodina Date: Tue, 9 Nov 2021 19:38:32 +0100 Subject: gnu: Add rust-tui-0.16. * gnu/packages/crates-io.scm (rust-tui-0.16): New variable. (rust-tui-0.15): Inherit from above. Signed-off-by: Nicolas Goaziou --- gnu/packages/crates-io.scm | 39 ++++++++++++++++++++++++++++++++++----- 1 file changed, 34 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index ec2e70b118..534a8ee151 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -58231,31 +58231,34 @@ (define-public rust-ttf-parser-0.6 parser.") (license (list license:expat license:asl2.0)))) -(define-public rust-tui-0.15 +(define-public rust-tui-0.16 (package (name "rust-tui") - (version "0.15.0") + (version "0.16.0") (source (origin (method url-fetch) (uri (crate-uri "tui" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0w9azg9zj1nnwcwbra9pxrwy47ab0m2bhanbkchydv8lscx8y7c6")))) + (base32 "08qcdjmi8sn2xyh38ilr17i9bn89ic2aaqx3rybyv7h44x7cxj1r")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-bitflags" ,rust-bitflags-1) ("rust-cassowary" ,rust-cassowary-0.3) - ("rust-crossterm" ,rust-crossterm-0.19) + ("rust-crossterm" ,rust-crossterm-0.20) ("rust-easycurses" ,rust-easycurses-0.12) ("rust-pancurses" ,rust-pancurses-0.16) ("rust-rustbox" ,rust-rustbox-0.11) ("rust-serde" ,rust-serde-1) ("rust-termion" ,rust-termion-1) ("rust-unicode-segmentation" ,rust-unicode-segmentation-1) - ("rust-unicode-width" ,rust-unicode-width-0.1)))) + ("rust-unicode-width" ,rust-unicode-width-0.1)) + #:cargo-development-inputs + (("rust-argh" ,rust-argh-0.1) + ("rust-rand" ,rust-rand-0.8)))) (home-page "https://github.com/fdehau/tui-rs") (synopsis "Library to build rich terminal user interfaces or dashboards") (description @@ -58263,6 +58266,32 @@ (define-public rust-tui-0.15 or dashboards.") (license license:expat))) +(define-public rust-tui-0.15 + (package + (inherit rust-tui-0.16) + (name "rust-tui") + (version "0.15.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "tui" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0w9azg9zj1nnwcwbra9pxrwy47ab0m2bhanbkchydv8lscx8y7c6")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-cassowary" ,rust-cassowary-0.3) + ("rust-crossterm" ,rust-crossterm-0.19) + ("rust-easycurses" ,rust-easycurses-0.12) + ("rust-pancurses" ,rust-pancurses-0.16) + ("rust-rustbox" ,rust-rustbox-0.11) + ("rust-serde" ,rust-serde-1) + ("rust-termion" ,rust-termion-1) + ("rust-unicode-segmentation" ,rust-unicode-segmentation-1) + ("rust-unicode-width" ,rust-unicode-width-0.1)))))) + (define-public rust-tui-0.14 (package (inherit rust-tui-0.15) -- cgit v1.2.3 From 39e38804f292ea4aa327e957e1db2cdf5f90d5bd Mon Sep 17 00:00:00 2001 From: Petr Hodina Date: Tue, 9 Nov 2021 19:44:23 +0100 Subject: gnu: Add rust-dotenv-0.13 * gnu/packages/crates-io.scm (rust-dotenv-0.13): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/crates-io.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 534a8ee151..b444183a66 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -15659,6 +15659,28 @@ (define-public rust-dotenv-0.15 Rust.") (license license:expat))) +(define-public rust-dotenv-0.13 + (package + (inherit rust-dotenv-0.15) + (name "rust-dotenv") + (version "0.13.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "dotenv" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "11jdifvvwbn60gf5iq2awyq9fik1d9xk7rhch332nwwnkhks3l60")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-clap" ,rust-clap-2) + ("rust-failure" ,rust-failure-0.1) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-regex" ,rust-regex-1)) + #:cargo-development-inputs + (("rust-tempdir" ,rust-tempdir-0.3)))))) + (define-public rust-dotenv-0.10 (package (inherit rust-dotenv-0.15) -- cgit v1.2.3 From a4d35d0c785c26dfdfe95ca4f026a327c4e12446 Mon Sep 17 00:00:00 2001 From: Petr Hodina Date: Tue, 9 Nov 2021 19:50:49 +0100 Subject: gnu: Add rust-derive-builder-core-0.5. * gnu/packages/crates-io.scm (rust-derive-builder-core-0.5): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/crates-io.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index b444183a66..408aef2e61 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -14281,6 +14281,27 @@ (define-public rust-derive-builder-core-0.9 #:cargo-development-inputs (("rust-pretty-assertions" ,rust-pretty-assertions-0.6)))))) +(define-public rust-derive-builder-core-0.5 + (package + (inherit rust-derive-builder-core-0.9) + (name "rust-derive-builder-core") + (version "0.5.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "derive_builder_core" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0drbjk6n8ywls8cmhp4r8xkyjsja0wk3854cn5mj8g1km4ys5202")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-darling" ,rust-darling-0.9) + ("rust-log" ,rust-log-0.4) + ("rust-proc-macro2" ,rust-proc-macro2-0.4) + ("rust-quote" ,rust-quote-0.6) + ("rust-syn" ,rust-syn-0.15)))))) + (define-public rust-derive-builder-core-0.2 (package (inherit rust-derive-builder-core-0.9) -- cgit v1.2.3 From 76eadbeb890b809c61b8e65ec5a90e9f112100b1 Mon Sep 17 00:00:00 2001 From: Petr Hodina Date: Tue, 9 Nov 2021 19:54:46 +0100 Subject: gnu: Add rust-derive-builder-0.7. * gnu/packages/crates-io.scm (rust-derive-builder-0.7): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 408aef2e61..07c914f90d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -14205,6 +14205,31 @@ (define-public rust-derive-builder-0.9 #:cargo-development-inputs (("rust-pretty-assertions" ,rust-pretty-assertions-0.6)))))) +(define-public rust-derive-builder-0.7 + (package + (inherit rust-derive-builder-0.9) + (name "rust-derive-builder") + (version "0.7.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "derive_builder" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1m34zpj6fw764g7s368r2wgazp154m24d4rshbgn18fdlfk3zi9s")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-compiletest-rs" ,rust-compiletest-rs-0.3) + ("rust-darling" ,rust-darling-0.9) + ("rust-derive-builder-core" ,rust-derive-builder-core-0.5) + ("rust-env-logger" ,rust-env-logger-0.5) + ("rust-log" ,rust-log-0.4) + ("rust-proc-macro2" ,rust-proc-macro2-0.4) + ("rust-quote" ,rust-quote-0.6) + ("rust-skeptic" ,rust-skeptic-0.13) + ("rust-syn" ,rust-syn-0.15)))))) + (define-public rust-derive-builder-0.5 (package (inherit rust-derive-builder-0.9) -- cgit v1.2.3 From 4f38c1f57e8ffb710b668c3c8aeb42cf74f26868 Mon Sep 17 00:00:00 2001 From: Petr Hodina Date: Tue, 9 Nov 2021 19:58:26 +0100 Subject: gnu: Add rust-rspotify-0.10. * gnu/packages/crates-io.scm (rust-rspotify-0.10): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/crates-io.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 07c914f90d..15c42548b3 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -50183,6 +50183,45 @@ (define-public rust-spmc-0.3 (description "Simple SPMC channel") (license (list license:expat license:asl2.0)))) +(define-public rust-rspotify-0.10 + (package + (name "rust-rspotify") + (version "0.10.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "rspotify" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "196wd157l3fn6hlyixgffhl2x516g4fpa3s91arhcikiifsppzgf")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-base64" ,rust-base64-0.10) + ("rust-chrono" ,rust-chrono-0.4) + ("rust-derive-builder" ,rust-derive-builder-0.7) + ("rust-dotenv" ,rust-dotenv-0.13) + ("rust-env-logger" ,rust-env-logger-0.6) + ("rust-failure" ,rust-failure-0.1) + ("rust-itertools" ,rust-itertools-0.8) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-log" ,rust-log-0.4) + ("rust-percent-encoding" ,rust-percent-encoding-1) + ("rust-rand" ,rust-rand-0.6) + ("rust-random" ,rust-random-0.12) + ("rust-reqwest" ,rust-reqwest-0.10) + ("rust-serde" ,rust-serde-1) + ("rust-serde-derive" ,rust-serde-derive-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-url" ,rust-url-1) + ("rust-webbrowser" ,rust-webbrowser-0.5)))) + (home-page "https://github.com/ramsayleung/rspotify") + (synopsis "Spotify API wrapper") + (description "This package provides wrapper API forSpotify streaming +service.") + (license license:expat))) + (define-public rust-spsc-buffer-0.1 (package (name "rust-spsc-buffer") -- cgit v1.2.3 From f6f285270a0db5e500cbfcc6a6c7cf73ca662944 Mon Sep 17 00:00:00 2001 From: Petr Hodina Date: Tue, 9 Nov 2021 20:04:18 +0100 Subject: gnu: Add rust-winapi-wsapoll-0.1. * gnu/packages/crates-io.scm (rust-winapi-wsapoll-0.1): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/crates-io.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 15c42548b3..092dae5fe2 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -61737,6 +61737,27 @@ (define-public rust-winapi-util-0.1 (license (list license:unlicense license:expat)))) +(define-public rust-winapi-wsapoll-0.1 + (package + (name "rust-winapi-wsapoll") + (version "0.1.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "winapi-wsapoll" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0vnzlcm6yrlx0xdx4g7zr41n84aj73h0p8fwh0m60mbiyl873ha4")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-winapi" ,rust-winapi-0.3)))) + (home-page "https://github.com/psychon/winapi-wsapoll") + (synopsis "Safe wrapper around WSAPoll") + (description "This package provides safe wrapper around WSAPoll.") + (license (list license:expat license:asl2.0)))) + (define-public rust-winapi-x86-64-pc-windows-gnu-0.4 (package (name "rust-winapi-x86-64-pc-windows-gnu") -- cgit v1.2.3 From 35cba1790fb71d5f7801cfdb2e3d2d281e637ba4 Mon Sep 17 00:00:00 2001 From: Petr Hodina Date: Tue, 9 Nov 2021 20:06:46 +0100 Subject: gnu: Add rust-x11rb-0.8. * gnu/packages/crates-graphics.scm (rust-x11rb-0.8): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/crates-graphics.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm index e3be9bcdcd..d50056e948 100644 --- a/gnu/packages/crates-graphics.scm +++ b/gnu/packages/crates-graphics.scm @@ -3005,6 +3005,33 @@ (define-public rust-x11-2 (description "This crate provides X11 library bindings for Rust.") (license license:expat))) +(define-public rust-x11rb-0.8 + (package + (name "rust-x11rb") + (version "0.8.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "x11rb" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "068g5ll4l5f35c2v098hj0kj2c9ma0r7v3pbli164q9g7w5hiyvg")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-gethostname" ,rust-gethostname-0.2) + ("rust-libc" ,rust-libc-0.2) + ("rust-libloading" ,rust-libloading-0.7) + ("rust-nix" ,rust-nix-0.20) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-winapi" ,rust-winapi-0.3) + ("rust-winapi-wsapoll" ,rust-winapi-wsapoll-0.1)))) + (home-page "https://github.com/psychon/x11rb") + (synopsis "Rust bindings to X11") + (description "This package provides Rust bindings to X11") + (license (list license:expat license:asl2.0)))) + (define-public rust-x11-clipboard-0.5 (package (name "rust-x11-clipboard") -- cgit v1.2.3 From bff200914969142ccf373e998582533ef3d207a1 Mon Sep 17 00:00:00 2001 From: Petr Hodina Date: Tue, 9 Nov 2021 20:12:39 +0100 Subject: gnu: Add rust-tree-magic-0.2. * gnu/packages/crates-io.scm (rust-tree-magic-0.2): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/crates-io.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 092dae5fe2..14995b4e18 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -57394,6 +57394,38 @@ (define-public rust-trash-1 recycle bin.") (license license:expat))) +(define-public rust-tree-magic-0.2 + (package + (name "rust-tree-magic") + (version "0.2.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "tree_magic" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0adndj775gjcvkf7yxdfj3pl39fcdiibswwgff23lm9yrrkr7ndi")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? + #t + #:cargo-inputs + (("rust-clap" ,rust-clap-2) + ("rust-fnv" ,rust-fnv-1) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-nom" ,rust-nom-3) + ("rust-num-cpus" ,rust-num-cpus-1) + ("rust-parking-lot" ,rust-parking-lot-0.10) + ("rust-petgraph" ,rust-petgraph-0.5) + ("rust-scoped-threadpool" ,rust-scoped-threadpool-0.1) + ("rust-tabwriter" ,rust-tabwriter-1) + ("rust-walkdir" ,rust-walkdir-2)))) + (home-page "https://github.com/aahancoc/tree_magic/") + (synopsis "Determines the MIME type") + (description "This package determines the MIME type of a file by +traversing a filetype tree.") + (license license:expat))) + (define-public rust-treeline-0.1 (package (name "rust-treeline") -- cgit v1.2.3 From 1c7305adffca671837d0a1451c921afe6ba2bf1b Mon Sep 17 00:00:00 2001 From: Petr Hodina Date: Tue, 9 Nov 2021 21:12:54 +0100 Subject: gnu: rust-anyhow-1: Update to 1.0.46. * gnu/packages/crates-io.scm (rust-anyhow-1): Update to 1.0.46. Signed-off-by: Nicolas Goaziou --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 14995b4e18..71b499aecf 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2042,7 +2042,7 @@ (define-public rust-antidote-1 (define-public rust-anyhow-1 (package (name "rust-anyhow") - (version "1.0.37") + (version "1.0.46") (source (origin (method url-fetch) @@ -2051,7 +2051,7 @@ (define-public rust-anyhow-1 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "11kaqp25lchr2ckyc46zm6blzndnw0w2w8qv0sp8z4xcxqgw2rzf")))) + "0w0zm1bqk5kbk834r4xszlzqiln4vw5k1lnlswyjkh24khi2ia1s")))) (build-system cargo-build-system) (arguments `(#:cargo-development-inputs -- cgit v1.2.3 From 149dd92888bef1208f09bcfbdb8279248bff67aa Mon Sep 17 00:00:00 2001 From: Petr Hodina Date: Tue, 9 Nov 2021 21:15:00 +0100 Subject: gnu: Add rust-atty-0.2.11. * gnu/packages/crates-io.scm (rust-atty-0.2.11): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/crates-io.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 71b499aecf..276fac99fb 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4148,6 +4148,26 @@ (define-public rust-atty-0.2 "This package provides a simple interface for querying atty.") (license license:expat))) +(define-public rust-atty-0.2.11 + (package + (inherit rust-atty-0.2) + (name "rust-atty") + (version "0.2.11") + (source + (origin + (method url-fetch) + (uri (crate-uri "atty" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0lln6vaczj521qqjbaqnb81w5p6xk4fjfkg33r0m22cm4f3mnzcs")))) + (arguments + `(#:skip-build? + #t + #:cargo-inputs + (("rust-libc" ,rust-libc-0.2) + ("rust-termion" ,rust-termion-1) + ("rust-winapi" ,rust-winapi-0.3)))))) + (define-public rust-autocfg-1 (package (name "rust-autocfg") -- cgit v1.2.3 From fe8f7651d1444229cebe7bcc3478254f7ecac37b Mon Sep 17 00:00:00 2001 From: Petr Hodina Date: Tue, 9 Nov 2021 21:18:47 +0100 Subject: gnu: Add rust-simple-logger-1. * gnu/packages/crates-io.scm (rust-simple-logger-1): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 276fac99fb..0f79271a1e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -48995,6 +48995,32 @@ (define-public rust-similar-1 (description "This package provides a diff library for Rust.") (license license:asl2.0))) +(define-public rust-simple-logger-1 + (package + (name "rust-simple-logger") + (version "1.13.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "simple-logger" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "01wz5xjpski45xq8v1bg8g05flj5h1sl63aabl2c6kj0hz337pmp")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-atty" ,rust-atty-0.2) + ("rust-chrono" ,rust-chrono-0.4) + ("rust-colored" ,rust-colored-1) + ("rust-log" ,rust-log-0.4) + ("rust-winapi" ,rust-winapi-0.3)))) + (home-page "https://github.com/borntyping/rust-simple_logger") + (synopsis "Logger with a readable output format") + (description + "This package provides a logger that prints all messages with +a readable output format") + (license license:expat))) + (define-public rust-simple-mutex-1 (package (name "rust-simple-mutex") -- cgit v1.2.3 From cbd745912c510c1cfd269debd37fa704ce77f68e Mon Sep 17 00:00:00 2001 From: Petr Hodina Date: Tue, 9 Nov 2021 21:21:25 +0100 Subject: gnu: Add rust-thread-local-0.3.4. * gnu/packages/crates-io.scm (rust-thread-local-0.3.4): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/crates-io.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 0f79271a1e..da5d30f90a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -54444,6 +54444,25 @@ (define-public rust-thread-local-0.3 `(#:skip-build? #t #:cargo-inputs (("rust-lazy-static" ,rust-lazy-static-1)))))) +(define-public rust-thread-local-0.3.4 + (package + (inherit rust-thread-local-0.3) + (name "rust-thread-local") + (version "0.3.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "thread_local" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "055vj0ddb6vh0zaqdlxssfqzzpgs4ll5l5j7nqvabdzfgasw95qn")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-lazy-static" ,rust-lazy-static-0.2) + ("rust-unreachable" ,rust-unreachable-1)))))) + (define-public rust-thread-local-0.2 (package (inherit rust-thread-local-0.3) -- cgit v1.2.3 From cf42c989295d3f769b3f2d4b57d9f7ab9963e659 Mon Sep 17 00:00:00 2001 From: Petr Hodina Date: Tue, 9 Nov 2021 21:20:16 +0100 Subject: gnu: Add rust-stderrlog-0.4. * gnu/packages/crates-io.scm (rust-stderrlog-0.4): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index da5d30f90a..bae06857be 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -50674,6 +50674,32 @@ (define-public rust-std-prelude-0.2 codebase.") (license license:expat))) +(define-public rust-stderrlog-0.4 + (package + (name "rust-stderrlog") + (version "0.4.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "stderrlog" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "09bzvmx2lzyycr1xfcvfwnvqsjg9kb4w22hb19bjqid5j2dyxr9j")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-atty" ,rust-atty-0.2.11) + ("rust-chrono" ,rust-chrono-0.4) + ("rust-log" ,rust-log-0.4) + ("rust-termcolor" ,rust-termcolor-1) + ("rust-thread-local" ,rust-thread-local-0.3.4)))) + (home-page "https://github.com/cardoe/stderrlog-rs") + (synopsis "Logger that logs to stderr") + (description "This package provides logger that logs to stderr based +on verbosity specified") + (license (list license:expat license:asl2.0)))) + (define-public rust-stdweb-0.4 (package (name "rust-stdweb") -- cgit v1.2.3 From 04cb4fcb5e351024b78af62b9d9e2c01c7bd1bfb Mon Sep 17 00:00:00 2001 From: Petr Hodina Date: Tue, 9 Nov 2021 21:23:49 +0100 Subject: gnu: Add rust-wl-clipboard-rs-0.4. * gnu/packages/crates-io.scm (rust-wl-clipboard-rs-0.4): New variable. * gnu/packages/patches/rust-wl-clipboard-rs-newer-wl.patch: New file. * gnu/local.mk: Add patch. Signed-off-by: Nicolas Goaziou --- gnu/packages/crates-io.scm | 38 ++++++++++++++++++++++ .../patches/rust-wl-clipboard-rs-newer-wl.patch | 26 +++++++++++++++ 2 files changed, 64 insertions(+) create mode 100644 gnu/packages/patches/rust-wl-clipboard-rs-newer-wl.patch (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index bae06857be..4d324d2bcb 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -61205,6 +61205,44 @@ (define-public rust-watchexec-1 modifications.") (license license:asl2.0))) +(define-public rust-wl-clipboard-rs-0.4 + (package + (name "rust-wl-clipboard-rs") + (version "0.4.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "wl-clipboard-rs" version)) + (file-name (string-append name "-" version ".tar.gz")) + (patches (search-patches "rust-wl-clipboard-rs-newer-wl.patch")) + (sha256 + (base32 "1252cm67pkrr6ik5ys2cdyfr2zzw6ds7v351i1cmyi94yiv01l13")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-derive-new" ,rust-derive-new-0.5) + ("rust-derive-more" ,rust-derive-more-0.99) + ("rust-exitfailure" ,rust-exitfailure-0.5) + ("rust-failure" ,rust-failure-0.1) + ("rust-libc" ,rust-libc-0.2) + ("rust-log" ,rust-log-0.4) + ("rust-mime-guess" ,rust-mime-guess-2) + ("rust-nix" ,rust-nix-0.18) + ("rust-os-pipe" ,rust-os-pipe-0.9) + ("rust-stderrlog" ,rust-stderrlog-0.4) + ("rust-structopt" ,rust-structopt-0.3) + ("rust-tempfile" ,rust-tempfile-3) + ("rust-tree-magic" ,rust-tree-magic-0.2) + ("rust-wayland-client" ,rust-wayland-client-0.28) + ("rust-wayland-commons" ,rust-wayland-commons-0.28) + ("rust-wayland-protocols" ,rust-wayland-protocols-0.28)))) + (home-page "https://github.com/YaLTeR/wl-clipboard-rs") + (synopsis "Access to the Wayland clipboard") + (description "This package provides access to the Wayland clipboard +for terminal and other window-less applications.") + (license (list license:expat license:asl2.0)))) + (define-public rust-web-sys-0.3 (package (name "rust-web-sys") diff --git a/gnu/packages/patches/rust-wl-clipboard-rs-newer-wl.patch b/gnu/packages/patches/rust-wl-clipboard-rs-newer-wl.patch new file mode 100644 index 0000000000..9fb692e9a6 --- /dev/null +++ b/gnu/packages/patches/rust-wl-clipboard-rs-newer-wl.patch @@ -0,0 +1,26 @@ +diff --git a/Cargo.toml b/Cargo.toml +index 7b975e0..313cb63 100644 +--- a/Cargo.toml ++++ b/Cargo.toml.new +@@ -75,17 +75,17 @@ version = "3" + version = "0.2" + + [dependencies.wayland-client] +-version = "0.27" ++version = "0.28" + + [dependencies.wayland-protocols] +-version = "0.27" ++version = "0.28" + features = ["client", "unstable_protocols"] + [dev-dependencies.wayland-protocols] +-version = "0.27" ++version = "0.28" + features = ["server", "unstable_protocols"] + + [dev-dependencies.wayland-server] +-version = "0.27" ++version = "0.28" + + [features] + dlopen = ["native_lib", "wayland-client/dlopen", "wayland-server/dlopen"] -- cgit v1.2.3 From f15b6ae03a06a8ea73142e34f87ef3e925cbf851 Mon Sep 17 00:00:00 2001 From: Petr Hodina Date: Tue, 9 Nov 2021 21:32:22 +0100 Subject: gnu: rust-arboard-1: Update to 1.2.1. * gnu/packages/crates-io.scm (rust-arboard-1): Update to 1.2.1. [arguments](cargo-inputs): Add rust-env-logger-0.8, rust-simple-logger-1, rust-wl-clipboard-rs-0.4 and rust-x11rb-0.8. Remove rust-xcb-0.9. Signed-off-by: Nicolas Goaziou --- gnu/packages/crates-io.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 4d324d2bcb..e95995a781 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2266,20 +2266,21 @@ (define-public rust-arbitrary-0.2 (define-public rust-arboard-1 (package (name "rust-arboard") - (version "1.1.0") + (version "1.2.1") (source (origin (method url-fetch) (uri (crate-uri "arboard" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0wpyv732fxkplmiwik1sbgdlnbk748w1aqpkc71gn5lm2ns9w545")))) + (base32 "1a5qfmpzcf5rwlwsligf9z1gzndpvj0jncc4s3k3z5g214c4l127")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-clipboard-win" ,rust-clipboard-win-4) ("rust-core-graphics" ,rust-core-graphics-0.21) + ("rust-env-logger" ,rust-env-logger-0.8) ("rust-image" ,rust-image-0.23) ("rust-lazy-static" ,rust-lazy-static-1) ("rust-libc" ,rust-libc-0.2) @@ -2287,9 +2288,11 @@ (define-public rust-arboard-1 ("rust-objc-foundation" ,rust-objc-foundation-0.1) ("rust-objc-id" ,rust-objc-id-0.1) ("rust-scopeguard" ,rust-scopeguard-1) + ("rust-simple-logger" ,rust-simple-logger-1) ("rust-thiserror" ,rust-thiserror-1) ("rust-winapi" ,rust-winapi-0.3) - ("rust-xcb" ,rust-xcb-0.9)))) + ("rust-wl-clipboard-rs" ,rust-wl-clipboard-rs-0.4) + ("rust-x11rb" ,rust-x11rb-0.8)))) (home-page "https://github.com/ArturKovacs/arboard") (synopsis "Image and text handling for the OS clipboard") (description -- cgit v1.2.3 From 2f2b4a0f81a2c5aba748d694e456120e469c1848 Mon Sep 17 00:00:00 2001 From: Petr Hodina Date: Tue, 9 Nov 2021 21:24:34 +0100 Subject: gnu: Add rust-spotify-tui-0.25. * gnu/packages/crates-io.scm (rust-spotify-tui-0.25): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/rust-apps.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index 136885bc23..3420a0fde0 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -855,6 +855,41 @@ (define-public sniffglue of the project is to be runnable on untrusted networks without crashing.") (license license:gpl3))) +(define-public spotify-tui-0.25 + (package + (name "spotify-tui") + (version "0.25.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "spotify-tui" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "08bpihkdv3rmcksnxp4cz04kawjs6spmwa3wr2k27b30x3q9cd4r")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-anyhow" ,rust-anyhow-1) + ("rust-arboard" ,rust-arboard-1) + ("rust-backtrace" ,rust-backtrace-0.3) + ("rust-clap" ,rust-clap-2) + ("rust-crossterm" ,rust-crossterm-0.20) + ("rust-dirs" ,rust-dirs-3) + ("rust-rand" ,rust-rand-0.8) + ("rust-rspotify" ,rust-rspotify-0.10) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-serde-yaml" ,rust-serde-yaml-0.8) + ("rust-tokio" ,rust-tokio-0.2) + ("rust-tui" ,rust-tui-0.16) + ("rust-unicode-width" ,rust-unicode-width-0.1)))) + (native-inputs `(("pkg-config" ,pkg-config))) + (inputs `(("openssl" ,openssl))) + (home-page "https://github.com/Rigellute/spotify-tui") + (synopsis "Terminal user interface for Spotify") + (description "This package provides a terminal user interface for Spotify") + (license (list license:expat license:asl2.0)))) + (define-public tectonic (package (name "tectonic") -- cgit v1.2.3 From a3cb34f7c55d40076cfb6121691f0e3ed69515f3 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 10 Dec 2021 00:28:45 +0100 Subject: gnu: pyzo: Update to 4.11.7. * gnu/packages/python-xyz.scm (pyzo): Update to 4.11.7. --- 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 81b887ccfd..db2ab8e5f0 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -25671,13 +25671,13 @@ (define-public python-dictdiffer (define-public pyzo (package (name "pyzo") - (version "4.11.4") + (version "4.11.7") (source (origin (method url-fetch) (uri (pypi-uri "pyzo" version)) (sha256 - (base32 "18djnzx9wwlhxk0v2gcpmwnn3iw572n7gkdyh7ghh92yxck6qqkl")))) + (base32 "1qa007nw464r7jw8y8fqf17jx473q55p5ay5bh8kq55v0zyi27yn")))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.2.3 From 3d90a81313c27c0ff2a450b76c1bb2570a56e5f0 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 10 Dec 2021 00:32:12 +0100 Subject: gnu: rosegarden: Update to 21.12. * gnu/packages/music.scm (rosegarden): Update to 21.12. --- gnu/packages/music.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 60cff2cc28..9d2fad853e 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -5214,7 +5214,7 @@ (define-public dssi (define-public rosegarden (package (name "rosegarden") - (version "21.06.1") + (version "21.12") (source (origin (method url-fetch) @@ -5222,7 +5222,7 @@ (define-public rosegarden (version-major+minor version) "/" "rosegarden-" version ".tar.bz2")) (sha256 - (base32 "0yir279gxc5b298sr0fg9jxgdi75bb1gvvy4mh3pxqjsnp00sxc7")))) + (base32 "02984qff9rc2r83a5a5zgwawfgd583gnj2w3zvllsxaf0vdx6gnw")))) (build-system cmake-build-system) (arguments `(#:configure-flags '("-DCMAKE_BUILD_TYPE=Release") -- cgit v1.2.3 From 603d51829fb78d586b8821daf0f018c2841c1f31 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 10 Dec 2021 00:33:53 +0100 Subject: gnu: emacs-parsebib: Update to 3.1. * gnu/packages/emacs-xyz.scm (emacs-parsebib): Update to 3.1. --- 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 8e89eda77f..d067a2557d 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -17869,7 +17869,7 @@ (define-public emacs-org-auto-expand (define-public emacs-parsebib (package (name "emacs-parsebib") - (version "3.0.1") + (version "3.1") (source (origin (method git-fetch) @@ -17878,7 +17878,7 @@ (define-public emacs-parsebib (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1hd6izpb4irinjmfy7zxy8fqnr1fm4iw2sipvl9261nm68dzha6z")))) + (base32 "08vrkadjxaw1w1bx8dg12kxxkvgl65p0d7gkpfhwpvv35k0d9z3y")))) (build-system emacs-build-system) (home-page "https://github.com/joostkremers/parsebib") (synopsis "Library for parsing @file{.bib} files") -- cgit v1.2.3 From 2fa1bcd971ee8a331f758e459a5c3b3bac7774b5 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Fri, 10 Dec 2021 02:29:03 +0300 Subject: gnu: nnn: Update to 4.4. * gnu/packages/admin.scm (nnn): Update to 4.4. Signed-off-by: Nicolas Goaziou --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index ce12c01582..0e3d5944da 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -3788,14 +3788,14 @@ (define-public pfetch (define-public nnn (package (name "nnn") - (version "4.1.1") + (version "4.4") (source (origin (method url-fetch) (uri (string-append "https://github.com/jarun/nnn/releases/download/v" version "/nnn-v" version ".tar.gz")) (sha256 - (base32 "1fnf35s3b2nfp18s712n5vhg6idx4rfgwdfv74nc2933v9l2dq7h")))) + (base32 "0lqn7pyy8c1vy29vn8ad4x23cw67cy1d21ghns6f3w9a1h7kyjp0")))) (build-system gnu-build-system) (inputs `(("ncurses" ,ncurses) -- cgit v1.2.3 From 1825e4548493051070316e2a12802797e8c72b84 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Fri, 10 Dec 2021 01:33:46 +0300 Subject: gnu: gpxsee: Update to 10.0. * gnu/packages/gps.scm (gpxsee): Update to 10.0. Signed-off-by: Nicolas Goaziou --- gnu/packages/gps.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gps.scm b/gnu/packages/gps.scm index de8ff13828..9ffa80fc01 100644 --- a/gnu/packages/gps.scm +++ b/gnu/packages/gps.scm @@ -182,7 +182,7 @@ (define-public gama (define-public gpxsee (package (name "gpxsee") - (version "7.37") + (version "10.0") (source (origin (method git-fetch) (uri (git-reference @@ -191,7 +191,7 @@ (define-public gpxsee (file-name (git-file-name name version)) (sha256 (base32 - "0fpb43smh0kwic5pdxs46c0hkqj8g084h72pa024x1my6w12y9b8")))) + "0kj7130imhppb0bam34a1xr2lxk76fyida31idzvfk3m7z39w02w")))) (build-system gnu-build-system) (arguments '(#:phases @@ -206,7 +206,8 @@ (define-public gpxsee (string-append "PREFIX=" (assoc-ref outputs "out")))))))) (inputs - `(("qtbase" ,qtbase-5))) + `(("qtbase" ,qtbase-5) + ("qtlocation" ,qtlocation))) (native-inputs `(("qttools" ,qttools))) (home-page "https://www.gpxsee.org") -- cgit v1.2.3 From 4bf8348ff388246378e374db5fd2450c4cfb9fe5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 10 Dec 2021 04:46:29 +0100 Subject: gnu: gajim: Restore 'disable-failing-tests phase. Gajim consistently builds on my machines & bayfront, whilst raghavgururajan reports the exact same derivation consistently failing with the commented error. Odd. * gnu/packages/messaging.scm (gajim)[arguments]: Restore the old 'disable-failing-tests phase. --- gnu/packages/messaging.scm | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 4856df732e..3509327427 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1209,6 +1209,13 @@ (define-public gajim (guix build utils)) #:phases (modify-phases %standard-phases + (add-after 'unpack 'disable-failing-tests + (lambda _ + ;; XXX Gajim builds fine on some (my) machines but fails elsewhere: + ;; ModuleNotFoundError: No module named 'gajim.gui.emoji_data' + ;; https://dev.gajim.org/gajim/gajim/-/issues/10478 + (delete-file "test/lib/gajim_mocks.py") + (delete-file "test/unit/test_gui_interface.py") (replace 'check (lambda _ ;; Tests require a running X server. -- cgit v1.2.3 From e1973ae74beb2880c11593155849f43e23ef620c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 10 Dec 2021 04:53:08 +0100 Subject: gnu: gajim: Fix typo. * gnu/packages/messaging.scm (gajim)[arguments]: Add missing brackets. All typos are my own. --- gnu/packages/messaging.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 3509327427..86a61cf41e 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1215,7 +1215,7 @@ (define-public gajim ;; ModuleNotFoundError: No module named 'gajim.gui.emoji_data' ;; https://dev.gajim.org/gajim/gajim/-/issues/10478 (delete-file "test/lib/gajim_mocks.py") - (delete-file "test/unit/test_gui_interface.py") + (delete-file "test/unit/test_gui_interface.py"))) (replace 'check (lambda _ ;; Tests require a running X server. -- cgit v1.2.3 From 4199725ac8148ccdfd52c4e3da1b44e67fe54841 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 10 Dec 2021 08:54:21 +0100 Subject: gnu: emacs-ebib: Update to 2.34. * gnu/packages/emacs-xyz.scm (emacs-ebib): Update to 2.34. --- 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 d067a2557d..99db0056ab 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -17889,7 +17889,7 @@ (define-public emacs-parsebib (define-public emacs-ebib (package (name "emacs-ebib") - (version "2.33") + (version "2.34") (source (origin (method git-fetch) @@ -17898,7 +17898,7 @@ (define-public emacs-ebib (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "18gvmymkpzws8s4zjcm1kijyr55dgfcq201z3w1jzhkhcs01bfsc")))) + (base32 "0al846i1dn5wrx3r0ak63m80g9j9xk2q5cpcpk63lq0l0gfdff2m")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-biblio" ,emacs-biblio) -- cgit v1.2.3 From c0b603624746e95f3a113d8302d90e74640d168d Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 10 Dec 2021 08:55:50 +0100 Subject: gnu: emacs-which-key: Update to 3.5.4. * gnu/packages/emacs-xyz.scm (emacs-which-key): Update to 3.5.4. --- 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 99db0056ab..24d0effd6a 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -15060,7 +15060,7 @@ (define-public emacs-dired-sidebar (define-public emacs-which-key (package (name "emacs-which-key") - (version "3.5.3") + (version "3.5.4") (source (origin (method git-fetch) @@ -15069,7 +15069,7 @@ (define-public emacs-which-key (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "144i3hkgm36wnfmqk5vq390snziy3zhwifbh6q6dzs99ic77d5g6")))) + (base32 "0wz3bb7vzxqi3wqpn46z6ps00m9wjcpv9cfvqi7lyvm920sxzlv7")))) (build-system emacs-build-system) (arguments `(#:tests? #t -- cgit v1.2.3 From 549aa66e468ae2a3e4e033c256c05d23c62de80e Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 10 Dec 2021 09:01:59 +0100 Subject: gnu: notmuch: Update to 0.34.2. * gnu/packages/mail.scm (notmuch): Update to 0.34.2. --- gnu/packages/mail.scm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index fbbc038dcb..83ffb57645 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1350,14 +1350,14 @@ (define-public notifymuch (define-public notmuch (package (name "notmuch") - (version "0.34.1") - (source (origin - (method url-fetch) - (uri (string-append "https://notmuchmail.org/releases/notmuch-" - version ".tar.xz")) - (sha256 - (base32 - "05nq64gp8vnrwrl22d60v7ixgdhm9339ajhcdfkq0ll1qiycyyj5")))) + (version "0.34.2") + (source + (origin + (method url-fetch) + (uri (string-append "https://notmuchmail.org/releases/notmuch-" + version ".tar.xz")) + (sha256 + (base32 "1ls7dbgqhvyn9arf1r1jijfllypylgr5l86p489732gn8zpcxwn1")))) (build-system gnu-build-system) (arguments `(#:make-flags -- cgit v1.2.3 From af5fa4d202c7891dbb4699e2c300dead3eb8044e Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Thu, 25 Nov 2021 11:14:38 +0530 Subject: gnu: Add ccwl. * gnu/packages/bioinformatics.scm (ccwl): New variable. --- gnu/packages/bioinformatics.scm | 54 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 45a06e6273..259b72b5f4 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -142,6 +142,7 @@ (define-module (gnu packages bioinformatics) #:use-module (gnu packages ruby) #:use-module (gnu packages serialization) #:use-module (gnu packages shells) + #:use-module (gnu packages skribilo) #:use-module (gnu packages sphinx) #:use-module (gnu packages sqlite) #:use-module (gnu packages statistics) @@ -15920,3 +15921,56 @@ (define-public r-cytonorm control samples and applying quantile normalization on all markers of interest.") (license license:gpl2+)))) + +(define-public ccwl + (package + (name "ccwl") + (version "0.2.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://ccwl.systemreboot.net/releases/ccwl-" + version ".tar.lz")) + (sha256 + (base32 + "1ar8rfz3zrksgygrv67zv77y8gfvvz54zcs546jn6j28y20basla")))) + (build-system gnu-build-system) + (arguments + `(#:make-flags '("GUILE_AUTO_COMPILE=0") ; to prevent guild warnings + #:modules (((guix build guile-build-system) + #:select (target-guile-effective-version)) + ,@%gnu-build-system-modules) + #:imported-modules ((guix build guile-build-system) + ,@%gnu-build-system-modules) + #:phases + (modify-phases %standard-phases + (add-after 'install 'wrap + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (effective-version (target-guile-effective-version))) + (wrap-program (string-append out "/bin/ccwl") + `("GUILE_LOAD_PATH" prefix + (,(string-append out "/share/guile/site/" effective-version) + ,(getenv "GUILE_LOAD_PATH"))) + `("GUILE_LOAD_COMPILED_PATH" prefix + (,(string-append out "/lib/guile/" effective-version "/site-ccache") + ,(getenv "GUILE_LOAD_COMPILED_PATH")))))))))) + (inputs + `(("bash" ,bash-minimal) + ("guile" ,guile-3.0) + ("guile-libyaml" ,guile-libyaml))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("lzip" ,lzip) + ;; To build documentation + ("cwltool" ,cwltool) + ("graphviz" ,graphviz) + ("skribilo" ,skribilo))) + (home-page "https://ccwl.systemreboot.net") + (synopsis "Concise common workflow language") + (description "The @acronym{ccwl, Concise Common Workflow Language} is a +concise syntax to express CWL workflows. ccwl is a compiler to generate CWL +workflows from concise descriptions in ccwl. It is implemented as an +@acronym{EDSL, Embedded Domain Specific Language} in the Scheme programming +language.") + (license license:gpl3+))) -- cgit v1.2.3 From 5ad2dcecdc39e62c015fa235bbb413f4ee25ba5a Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 10 Dec 2021 02:16:10 +0100 Subject: gnu: ocaml-fix: Update to 20211125. --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index d5d9a9138b..891b4ab981 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -7437,7 +7437,7 @@ (define-public ocaml-uuseg (define-public ocaml-fix (package (name "ocaml-fix") - (version "20201120") + (version "20211125") (source (origin (method git-fetch) @@ -7447,7 +7447,7 @@ (define-public ocaml-fix (file-name (git-file-name name version)) (sha256 (base32 - "1j40mg1gy03c0djzx3nzmpvnl984s14n04zwcmp2xnlidq48kvs4")))) + "00vq2das1l8xca013z7z7jy5622fsy3jha2cj72psp22wx9199l1")))) (build-system dune-build-system) (arguments ;; No tests. -- cgit v1.2.3 From af365f00017cc5350c0184d94c949e37176fc575 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 10 Dec 2021 02:21:40 +0100 Subject: gnu: Add ocaml-either. * gnu/packages/ocaml.scm (ocaml-either): New variable. --- gnu/packages/ocaml.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 891b4ab981..7406213cfe 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -7476,6 +7476,29 @@ (define-public ocaml-dune-build-info reporting the version from the version control system during development to get an precise reference of when the executable was built."))) +(define-public ocaml-either + (package + (name "ocaml-either") + (version "1.0.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mirage/either") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "099p1m24vz5i0043zcfp88krzjsa2qbrphrm4bnx84gif5vgkxwm")))) + (build-system dune-build-system) + (arguments + ;; no tests + `(#:tests? #f)) + (home-page "https://github.com/mirage/either") + (synopsis "Compatibility Either module") + (description "This library is a compatibility module for the Either module +defined in OCaml 4.12.0.") + (license license:expat))) + (define-public ocamlformat (package (name "ocamlformat") -- cgit v1.2.3 From 6e06846c9d2b1f7ef726914ac8d11d3ed1300248 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 10 Dec 2021 02:24:31 +0100 Subject: gnu: ocamlformat: Update to 0.20.0. * gnu/packages/ocaml.scm (ocamlformat): Update to 0.20.0. --- gnu/packages/ocaml.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 7406213cfe..e293c33e84 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -7502,7 +7502,7 @@ (define-public ocaml-either (define-public ocamlformat (package (name "ocamlformat") - (version "0.19.0") + (version "0.20.0") (source (origin (method git-fetch) @@ -7512,7 +7512,7 @@ (define-public ocamlformat (file-name (git-file-name name version)) (sha256 (base32 - "0dp4pkznz9yvqx9gxwbid1z2b8ajkr8i27zay9ghx69624hz3i4z")))) + "0zhvhb8ky0danmfvp4vvbh0pg89d7r7ka6m3q81vlyvb7gk08r6r")))) (build-system dune-build-system) (arguments '(#:package "ocamlformat" @@ -7524,6 +7524,7 @@ (define-public ocamlformat ("ocaml-base" ,ocaml-base) ("ocaml-cmdliner" ,ocaml-cmdliner) ("ocaml-dune-build-info" ,ocaml-dune-build-info) + ("ocaml-either" ,ocaml-either) ("ocaml-fix" ,ocaml-fix) ("ocaml-fpath" ,ocaml-fpath) ("ocaml-menhir" ,ocaml-menhir) -- cgit v1.2.3 From 94226686fe93d6a3cdd2000df00f6efe347d37f5 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 10 Dec 2021 02:33:15 +0100 Subject: gnu: ocaml-migrate-parsetree: Update to 2.3.0. * gnu/packages/ocaml.scm (ocaml-migrate-parsetree): Update to 2.3.0. --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index e293c33e84..0aea796a1e 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1819,7 +1819,7 @@ (define-public ocaml4.09-csexp (define-public ocaml-migrate-parsetree (package (name "ocaml-migrate-parsetree") - (version "2.2.0") + (version "2.3.0") (home-page "https://github.com/ocaml-ppx/ocaml-migrate-parsetree") (source (origin @@ -1830,7 +1830,7 @@ (define-public ocaml-migrate-parsetree (file-name (git-file-name name version)) (sha256 (base32 - "0midpqjw53b5gx2zbkxs2hqrvh12y8n5681indficp9h3zr822l6")))) + "1nqmhsc72xmgm865nn8q0hngklhvqav281hgnx1gf5ns49a0n3ig")))) (build-system dune-build-system) (arguments `(#:tests? #f)) (propagated-inputs -- cgit v1.2.3 From 18c406df973d24fa8adb9cdaf58d73769da44937 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 10 Dec 2021 12:50:14 +0100 Subject: gnu: ocaml-ppx-expect: Update to 0.14.2. * gnu/packages/ocaml.scm (ocaml-ppx-expect): Update to 0.14.2. --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 0aea796a1e..c1912d49b7 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6212,7 +6212,7 @@ (define-public ocaml4.07-ppx-assert (define-public ocaml-ppx-expect (package (name "ocaml-ppx-expect") - (version "0.14.1") + (version "0.14.2") (source (origin (method git-fetch) @@ -6222,7 +6222,7 @@ (define-public ocaml-ppx-expect (file-name (git-file-name name version)) (sha256 (base32 - "0vbbnjrzpyk5p0js21lafr6fcp2wqka89p1876rdf472cmg0l7fv")))) + "1v886rsl93wdmaw61z10q8nqshf8hvlznj9gym2ljrjz4cqyjsa4")))) (build-system dune-build-system) (propagated-inputs `(("ocaml-base" ,ocaml-base) -- cgit v1.2.3 From f0adb870ac0ea70bf6fb7a68f8782833017342cd Mon Sep 17 00:00:00 2001 From: Foo Chuan Wei Date: Wed, 10 Nov 2021 09:05:59 +0000 Subject: gnu: Add smlnj. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/sml.scm (smlnj): New variable. Co-authored-by: Brett Gilio Signed-off-by: Ludovic Courtès --- gnu/packages/sml.scm | 261 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 260 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/sml.scm b/gnu/packages/sml.scm index b7e96f028c..c7e8da35e2 100644 --- a/gnu/packages/sml.scm +++ b/gnu/packages/sml.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2017, 2021 Tobias Geerinckx-Rice ;;; Copyright © 2018 Ricardo Wurmus ;;; Copyright © 2019, 2020 Brett Gilio +;;; Copyright © 2021 Foo Chuan Wei ;;; ;;; This file is part of GNU Guix. ;;; @@ -28,7 +29,8 @@ (define-module (gnu packages sml) #:use-module (guix download) #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) - #:use-module (guix packages)) + #:use-module (guix packages) + #:use-module (guix utils)) (define-public polyml (package @@ -75,3 +77,260 @@ (define flags (license (list license:lgpl2.1 license:lgpl2.1+)))) + +(define (smlnj-file version filename hash) + (origin + (method url-fetch) + (uri (string-append "http://smlnj.cs.uchicago.edu/dist/working/" + version "/" filename)) + (sha256 (base32 hash)))) + +(define-public smlnj + (package + (name "smlnj") + (version "110.99.2") + (source #f) ; Sources are passed as native-inputs. + (supported-systems '("x86_64-linux" "i686-linux")) + (build-system gnu-build-system) + (outputs '("out" "doc")) + (arguments + `(#:tests? #f + #:phases + (modify-phases %standard-phases + (replace 'unpack + (lambda* (#:key inputs #:allow-other-keys) + (for-each + (lambda (file) + (invoke "tar" "xvf" (assoc-ref inputs file))) + (list (if (string=? "i686-linux" ,(%current-system)) + "boot.x86-unix" + "boot.amd64-unix") + "config" + "cm" + "compiler" + "runtime" + "system" + "MLRISC" + "smlnj-lib" + "old-basis" + "ckit" + "nlffi" + "cml" + "eXene" + "ml-lpt" + "ml-lex" + "ml-yacc" + "ml-burg" + "pgraph" + "trace-debug-profile" + "heap2asm" + "smlnj-c" + "doc" + "asdl")) + ;; Same directory structure as what the config/unpack script + ;; would produce. + (mkdir "base") + (rename-file "runtime" "base/runtime") + (rename-file "compiler" "base/compiler") + (rename-file "cm" "base/cm") + (rename-file "old-basis" "base/old-basis") + (rename-file "system" "base/system") + #t)) + (delete 'configure) + (replace 'patch-source-shebangs + (lambda _ + ;; Fix paths to /bin/sh. + (substitute* (list "config/install.sh" + (if (string=? "i686-linux" ,(%current-system)) + "base/runtime/objs/mk.x86-linux" + "base/runtime/objs/mk.amd64-linux") + "asdl/configure" + "asdl/src/asdlgen/Makefile.in") + (("^SHELL[[:space:]]*=[[:space:]]*/bin/sh") + (string-append "SHELL=" (which "sh")))) + (substitute* "asdl/configure" + (("^SHELL=\\$\\{CONFIG_SHELL-/bin/sh\\}") + (string-append "SHELL=" (which "sh")))) + (substitute* (list "asdl/src/gen/fragments/mkfrags_sh.in" + "asdl/src/gen/fragments/mkmk_sh.in") + (("^#!/bin/sh") + (string-append "#!" (which "sh")))) + #t)) + (replace 'build + (lambda* (#:key inputs outputs #:allow-other-keys) + (substitute* "config/chk-global-names.sh" + (("^CC=.*") + (string-append "CC=" ,(cc-for-target)))) + + ;; /bin and /usr/bin do not exist in the build environment. + (substitute* "config/_arch-n-opsys" + (("^export PATH") "") + (("^PATH=\"/bin:/usr/bin\"") "") + (("uname") (which "uname"))) + (substitute* "base/runtime/config/gen-posix-names.sh" + (("^PATH=/bin:/usr/bin") "")) + + ;; The build process uses an SML Basis Library function + ;; `OS.Process.system`, which uses "/bin/sh" (this is hardcoded). + ;; However, /bin/sh does not exist in the Guix build environment. + ;; Solution: binary patch — replace "/bin/sh" with "/tmp/sh". + (symlink (which "sh") "/tmp/sh") + (invoke "sed" "-i" "s,/bin/sh,/tmp/sh," + (if (string=? "i686-linux" ,(%current-system)) + "sml.boot.x86-unix/SMLNJ-BASIS/.cm/x86-unix/basis-common.cm" + "sml.boot.amd64-unix/SMLNJ-BASIS/.cm/amd64-unix/basis-common.cm")) + + ;; Build. + (invoke "./config/install.sh" "-default" + (if (string=? "i686-linux" ,(%current-system)) + "32" + "64")) + + ;; Undo the binary patch. + (for-each + (lambda (file) + (invoke "sed" "-i" "s,/tmp/sh,/bin/sh," file)) + (if (string=? "i686-linux" ,(%current-system)) + '("bin/.heap/sml.x86-linux" + "lib/SMLNJ-BASIS/.cm/x86-unix/basis-common.cm") + '("bin/.heap/sml.amd64-linux" + "lib/SMLNJ-BASIS/.cm/amd64-unix/basis-common.cm"))) + + ;; Set SMLNJ_HOME in the bin/ files, so that `sml` is able to find + ;; the SML/NJ Library. + (let ((out (assoc-ref outputs "out"))) + (for-each + (lambda (file) + (invoke "sed" "-i" + (string-append "2iSMLNJ_HOME=${SMLNJ_HOME:-" out "}") + file)) + '("bin/.link-sml" + "bin/.run-sml" + "bin/ml-build" + "bin/ml-makedepend"))))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (out-bin (string-append out "/bin/")) + (out-lib (string-append out "/lib/")) + (out-man (string-append out "/share/man/"))) + (copy-recursively "bin" out-bin) + (copy-recursively "lib" out-lib) + (copy-recursively "doc/man" out-man)) + #t)) + (add-after 'install 'install-doc + (lambda* (#:key outputs #:allow-other-keys) + (let ((doc (string-append (assoc-ref outputs "doc") + "/share/doc/smlnj"))) + (mkdir-p doc) + (copy-recursively "doc" doc)) + #t))))) + (native-inputs + `(,(if (string=? "i686-linux" (%current-system)) + `("boot.x86-unix" + ,(smlnj-file version + "boot.x86-unix.tgz" + "117dq1g387vcy1105dlpw770gzrg423jng89ynraiy6kiaalvbcq")) + `("boot.amd64-unix" + ,(smlnj-file version + "boot.amd64-unix.tgz" + "0cbaz8sxp30y2a4blm0pzk9aa1g9jj65d6d7kydvn0w7m22rjjff"))) + ("config" + ,(smlnj-file version + "config.tgz" + "1sq60frd66kv807bahsyxda355qq67zvvb4sr1d72cv6capv5nsg")) + ("cm" + ,(smlnj-file version + "cm.tgz" + "087yy9k9vyyvhb24rni6js7s8iqbs8vjm9kjd9s311swjd66qhjc")) + ("compiler" + ,(smlnj-file version + "compiler.tgz" + "149vrmiba0dqggr15axqqzzfmd0kx7kchlr49gii6hw5dal6vqnn")) + ("runtime" + ,(smlnj-file version + "runtime.tgz" + "0c3q7qr2i3r91sx9p3z1ar7gvyk6qsm5gcbpbyj6l67qzn192yc3")) + ("system" + ,(smlnj-file version + "system.tgz" + "0aflnqh9zi9f8vs9pjlxysxplrwl98aiaxx4n41sba4m1r30n0za")) + ("MLRISC" + ,(smlnj-file version + "MLRISC.tgz" + "1kkga7r7qnw09s8yhqbhrq8gxf6c8x0fiwsbwkr8ls6xwv48sp74")) + ("smlnj-lib" + ,(smlnj-file version + "smlnj-lib.tgz" + "14fvqgn580k3ylvfhbkwv4cw87ipggq548r7jzp8fzfn2h6wdl01")) + ("old-basis" + ,(smlnj-file version + "old-basis.tgz" + "11j7a0sxyd1kwxjvxnarab5vc3x43gl90m07wxm37fd4jbfd1fn1")) + ("ckit" + ,(smlnj-file version + "ckit.tgz" + "1fbfjb2fhr6zkcz5jhqh3888zska6vffndyqwvk6rpbcl7an8niq")) + ("nlffi" + ,(smlnj-file version + "nlffi.tgz" + "0p5z77x295xfh71481kbd5pwis52kv03vxpad4pzkpk0l6smcgmj")) + ("cml" + ,(smlnj-file version + "cml.tgz" + "13xchaamwanxhwklsgkn1rmkr044h9qsj0rbr9c7pm903yivdwcn")) + ("eXene" + ,(smlnj-file version + "eXene.tgz" + "0p4snql0a1a952h98ma9ybmp7z1q305mz859b0mxhsg3jdrzl9wb")) + ("ml-lpt" + ,(smlnj-file version + "ml-lpt.tgz" + "0m00vglg95apdpzsy6qv88izj5ai4ibylxni01an75xpnxyy5qbg")) + ("ml-lex" + ,(smlnj-file version + "ml-lex.tgz" + "1pmi5qwjcf1h5nfi7d4vvm7cf90g6dlk2mqikj0y9c464ia1l2jc")) + ("ml-yacc" + ,(smlnj-file version + "ml-yacc.tgz" + "1zla2m1rn8r8k85ps9r2mw38xkh276j7aqv9f69v55102hchx13p")) + ("ml-burg" + ,(smlnj-file version + "ml-burg.tgz" + "14cqasasa273x09phykzjgk1wl6vrkdcwrdi39hnacp443cilz7x")) + ("pgraph" + ,(smlnj-file version + "pgraph.tgz" + "183fv61xlac5kpxn5m4iqgdvc2xb1chlxy5ip4i25x589bh4b5k9")) + ("trace-debug-profile" + ,(smlnj-file version + "trace-debug-profile.tgz" + "1k0w581kr43mpjzm7778xgx1rpz45aq1h80jdr6jls5vz3k8ia18")) + ("heap2asm" + ,(smlnj-file version + "heap2asm.tgz" + "0p9s42acngxh0401wm6fqs3im3rzzw9sh448x38zhdi47h8h1m9n")) + ("smlnj-c" + ,(smlnj-file version + "smlnj-c.tgz" + "054b1nhg5yk2jj01p11k08qzq8zc9jzg4mbgkcmcqaq7axp1rnxm")) + ("doc" + ,(smlnj-file version + "doc.tgz" + "0s35zrxdj76wzdz7c1i8ij00n6lfll4vjnypsy2j17q1maw7fq8j")) + ("asdl" + ,(smlnj-file version + "asdl.tgz" + "0mad2df5pmkdsb69gflxma6m6i3gla6hdmjjnkzk76pagpr8zb0m")))) + (home-page "http://www.smlnj.org") + (synopsis "Standard ML of New Jersey interactive compiler") + (description + "SML/NJ is an implementation of the Standard ML programming language. +Standard ML has many features, including type safety, polymorphism, algebraic +data types with pattern matching, higher-order functions, and a sophisticated +module system. It is especially well-suited for writing compilers and other +language processors.") + (license (license:fsf-free + "https://www.smlnj.org/license.html" + "https://www.gnu.org/licenses/license-list#StandardMLofNJ")))) -- cgit v1.2.3 From 5cf2c889c9a6171451bc7aa8745076283653ab98 Mon Sep 17 00:00:00 2001 From: Philip McGrath Date: Sat, 20 Nov 2021 00:43:52 -0500 Subject: gnu: sendgmail: Rename package to match command. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Suggested by Ludo’ in . * gnu/packages/golang.scm (go-github-com-google-gmail-oauth2-tools-go-sendgmail): Move to ... * gnu/packages/mail.scm (sendgmail): ... this variable. Change `propagated-inputs` to `inputs`. Signed-off-by: Ludovic Courtès --- gnu/packages/golang.scm | 36 +----------------------------------- gnu/packages/mail.scm | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 35 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index d555a92579..70731e2720 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -31,6 +31,7 @@ ;;; Copyright © 2021 jgart ;;; Copyright © 2021 Bonface Munyoki Kilyungi ;;; Copyright © 2021 Chadwain Holness +;;; Copyright © 2021 Philip McGrath ;;; ;;; This file is part of GNU Guix. ;;; @@ -3036,41 +3037,6 @@ (define-public go-cloud-google-com-go-compute-metadata API service accounts for Go.") (license license:asl2.0))) -(define-public go-github-com-google-gmail-oauth2-tools-go-sendgmail - (let ((commit "e3229155a4037267ce40f1a3a681f53221aa4d8d") - (revision "0")) - (package - (name "go-github-com-google-gmail-oauth2-tools-go-sendgmail") - (version (git-version "0.0.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/google/gmail-oauth2-tools") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1cxpkiaajhq1gjsg47r2b5xgck0r63pvkyrkm7af8c8dw7fyn64f")))) - (propagated-inputs - `(("go-golang-org-x-oauth2" ,go-golang-org-x-oauth2) - ("go-cloud-google-com-go-compute-metadata" - ,go-cloud-google-com-go-compute-metadata))) - (build-system go-build-system) - (arguments - '(#:unpack-path "github.com/google/gmail-oauth2-tools" - #:import-path "github.com/google/gmail-oauth2-tools/go/sendgmail")) - (home-page - "https://github.com/google/gmail-oauth2-tools/tree/master/go/sendgmail") - (synopsis - "Sendmail-compatible tool for using Gmail with @code{git send-email}") - (description - "The @command{sendgmail} command provides a minimal sendmail-compatible -front-end that connects to Gmail using OAuth2. It is specifically designed -for use with @code{git send-email}. The command needs a Gmail API key to -function.") - (license license:asl2.0)))) - (define-public go-github-com-google-cadvisor (let ((commit "2ed7198f77395ee9a172878a0a7ab92ab59a2cfd") (revision "0")) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 83ffb57645..b75c1a0965 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -43,6 +43,7 @@ ;;; Copyright © 2021 Xinglu Chen ;;; Copyright © 2021 Benoit Joly ;;; Copyright © 2021 Morgan Smith +;;; Copyright © 2021 Philip McGrath ;;; ;;; This file is part of GNU Guix. ;;; @@ -4657,3 +4658,38 @@ (define-public rss2email ;; GPL version 2 or 3. NOT 2+. (license (list license:gpl2 license:gpl3)))) + +(define-public sendgmail + (let ((commit "e3229155a4037267ce40f1a3a681f53221aa4d8d") + (revision "0")) + (package + (name "sendgmail") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/google/gmail-oauth2-tools") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1cxpkiaajhq1gjsg47r2b5xgck0r63pvkyrkm7af8c8dw7fyn64f")))) + (inputs + `(("go-golang-org-x-oauth2" ,go-golang-org-x-oauth2) + ("go-cloud-google-com-go-compute-metadata" + ,go-cloud-google-com-go-compute-metadata))) + (build-system go-build-system) + (arguments + '(#:unpack-path "github.com/google/gmail-oauth2-tools" + #:import-path "github.com/google/gmail-oauth2-tools/go/sendgmail")) + (home-page + "https://github.com/google/gmail-oauth2-tools/tree/master/go/sendgmail") + (synopsis + "Sendmail-compatible tool for using Gmail with @code{git send-email}") + (description + "The @command{sendgmail} command provides a minimal sendmail-compatible +front-end that connects to Gmail using OAuth2. It is specifically designed +for use with @code{git send-email}. The command needs a Gmail API key to +function.") + (license license:asl2.0)))) -- cgit v1.2.3 From 7c2d84df1c05d41ba9eafb6f64abd694166e55c3 Mon Sep 17 00:00:00 2001 From: Philip McGrath Date: Sat, 20 Nov 2021 00:43:53 -0500 Subject: gnu: sendgmail: Don't limit domain name of sender. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit There are three open pull requests adding this functionality: - https://github.com/google/gmail-oauth2-tools/pull/17 (October 2019) - https://github.com/google/gmail-oauth2-tools/pull/26 (May 2020) - https://github.com/google/gmail-oauth2-tools/pull/37 (May 2021) (The patch here is identical to #26, so I just closed this one.) Meanwhile, the most recent commit to the upstream repository was in May 2019: that was the commit that first added `sendgmail`. This commit adjusts Guix's `sendgmail`, following Postel's advice, to make the command "liberal in its receiving behavior" (RFC 760): it always accepts email addresses with any domain name, as in #26, and it accepts (and ignores) the `-gsuite` flag used in #17. * gnu/packages/patches/sendgmail-remove-domain-restriction.patch: New file. This is the patch from #26. * gnu/packages/patches/sendgmail-accept-ignored-gsuite-flag.patch: New file, based on #17. * gnu/local.mk (dist_patch_DATA): Add the new patches. * gnu/packages/mail.scm (sendgmail)[source]: Apply the new patches. Increment the "revision" argument to `git-version` from 0 to 1. Signed-off-by: Ludovic Courtès --- gnu/local.mk | 2 ++ gnu/packages/mail.scm | 11 ++++-- .../sendgmail-accept-ignored-gsuite-flag.patch | 39 ++++++++++++++++++++++ .../sendgmail-remove-domain-restriction.patch | 34 +++++++++++++++++++ 4 files changed, 84 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/sendgmail-accept-ignored-gsuite-flag.patch create mode 100644 gnu/packages/patches/sendgmail-remove-domain-restriction.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 2afd025b52..223055c3e2 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1760,6 +1760,8 @@ dist_patch_DATA = \ %D%/packages/patches/screen-hurd-path-max.patch \ %D%/packages/patches/sdl-libx11-1.6.patch \ %D%/packages/patches/seed-webkit.patch \ + %D%/packages/patches/sendgmail-accept-ignored-gsuite-flag.patch \ + %D%/packages/patches/sendgmail-remove-domain-restriction.patch \ %D%/packages/patches/seq24-rename-mutex.patch \ %D%/packages/patches/serf-python3.patch \ %D%/packages/patches/shakespeare-spl-fix-grammar.patch \ diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index b75c1a0965..e52b48a2d6 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -4661,7 +4661,7 @@ (define-public rss2email (define-public sendgmail (let ((commit "e3229155a4037267ce40f1a3a681f53221aa4d8d") - (revision "0")) + (revision "1")) (package (name "sendgmail") (version (git-version "0.0.0" revision commit)) @@ -4672,6 +4672,9 @@ (define-public sendgmail (url "https://github.com/google/gmail-oauth2-tools") (commit commit))) (file-name (git-file-name name version)) + (patches (search-patches + "sendgmail-remove-domain-restriction.patch" + "sendgmail-accept-ignored-gsuite-flag.patch")) (sha256 (base32 "1cxpkiaajhq1gjsg47r2b5xgck0r63pvkyrkm7af8c8dw7fyn64f")))) @@ -4691,5 +4694,9 @@ (define-public sendgmail "The @command{sendgmail} command provides a minimal sendmail-compatible front-end that connects to Gmail using OAuth2. It is specifically designed for use with @code{git send-email}. The command needs a Gmail API key to -function.") +function. + +Guix's version of @command{sendgmail} has been patched for compatibility with +all known forks, including support for non-@code{@@gmail.com} email +addresses.") (license license:asl2.0)))) diff --git a/gnu/packages/patches/sendgmail-accept-ignored-gsuite-flag.patch b/gnu/packages/patches/sendgmail-accept-ignored-gsuite-flag.patch new file mode 100644 index 0000000000..8405ff4e42 --- /dev/null +++ b/gnu/packages/patches/sendgmail-accept-ignored-gsuite-flag.patch @@ -0,0 +1,39 @@ +From 854490dc4a8a6a661b4750730c3ff749519f6e36 Mon Sep 17 00:00:00 2001 +From: Philip McGrath +Date: Sun, 14 Nov 2021 10:14:24 -0500 +Subject: [PATCH] sendgmail: accept and ignore a "-gsuite" flag + +Accepting a "-gsuite" flag provides compatability with +https://github.com/Flameeyes/gmail-oauth2-tools/commit/eabb456 +so users do not have to change their scripts or config files. + +Full hash of original: eabb45608ff4ce04045ff4ea92d05450e789ac81 + +Related to https://github.com/google/gmail-oauth2-tools/pull/17 +--- + go/sendgmail/main.go | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/go/sendgmail/main.go b/go/sendgmail/main.go +index 405aa1b..5cfd0c1 100644 +--- a/go/sendgmail/main.go ++++ b/go/sendgmail/main.go +@@ -40,6 +40,7 @@ var ( + setUp bool + dummyF string + dummyI bool ++ gsuite bool + ) + + func init() { +@@ -47,6 +48,7 @@ func init() { + flag.BoolVar(&setUp, "setup", false, "If true, sendgmail sets up the sender's OAuth2 token and then exits.") + flag.StringVar(&dummyF, "f", "", "Dummy flag for compatibility with sendmail.") + flag.BoolVar(&dummyI, "i", true, "Dummy flag for compatibility with sendmail.") ++ flag.BoolVar(&gsuite, "gsuite", true, "Dummy flag for compatibility with other forks of sendgmail.") + } + + func main() { +-- +2.32.0 + diff --git a/gnu/packages/patches/sendgmail-remove-domain-restriction.patch b/gnu/packages/patches/sendgmail-remove-domain-restriction.patch new file mode 100644 index 0000000000..d23af33375 --- /dev/null +++ b/gnu/packages/patches/sendgmail-remove-domain-restriction.patch @@ -0,0 +1,34 @@ +From a5ecd1b2302d0def2f6f8349747022a615a9f017 Mon Sep 17 00:00:00 2001 +From: Tamas K Lengyel +Date: Tue, 26 May 2020 13:27:50 -0600 +Subject: [PATCH] Don't limit to email with @gmail.com + +--- + go/sendgmail/main.go | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/go/sendgmail/main.go b/go/sendgmail/main.go +index b35ef23..405aa1b 100644 +--- a/go/sendgmail/main.go ++++ b/go/sendgmail/main.go +@@ -30,7 +30,6 @@ import ( + "log" + "net/smtp" + "os" +- "strings" + + "golang.org/x/oauth2" + googleOAuth2 "golang.org/x/oauth2/google" +@@ -52,9 +51,6 @@ func init() { + + func main() { + flag.Parse() +- if atDomain := "@gmail.com"; !strings.HasSuffix(sender, atDomain) { +- log.Fatalf("-sender must specify an %v email address.", atDomain) +- } + config := getConfig() + tokenPath := fmt.Sprintf("%v/.sendgmail.%v.json", os.Getenv("HOME"), sender) + if setUp { +-- +2.32.0 + -- cgit v1.2.3 From dc5ace95d3cab2a81ecf16338342a069f8ce7705 Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Mon, 15 Nov 2021 04:35:40 +0000 Subject: gnu: Add python-sphinx-prompt. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/sphinx.scm (python-sphinx-prompt): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/sphinx.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm index a7a3443707..86b867871a 100644 --- a/gnu/packages/sphinx.scm +++ b/gnu/packages/sphinx.scm @@ -502,6 +502,37 @@ (define-public python-sphinx-repoze-autointerface (define-public python2-sphinx-repoze-autointerface (package-with-python2 python-sphinx-repoze-autointerface)) +(define-public python-sphinx-prompt + (package + (name "python-sphinx-prompt") + (version "1.5.0") + (source + (origin + (method git-fetch) ; no source release in PyPI + (uri (git-reference + (url "https://github.com/sbrunner/sphinx-prompt") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0x9wmgf04rzivbzp7jv1b7fkhkpi02lpk5w1qf4i7bcgih00ym8a")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key inputs outputs tests? #:allow-other-keys) + (when tests? + (add-installed-pythonpath inputs outputs) + (invoke "python" "-m" "pytest"))))))) + (native-inputs + `(("python-pytest" ,python-pytest) + ("python-sphinx" ,python-sphinx))) + (home-page "https://github.com/sbrunner/sphinx-prompt") + (synopsis "Sphinx directive to add unselectable prompt") + (description + "This package provides a Sphinx directive to add unselectable prompt.") + (license license:bsd-3))) + (define-public python-sphinx-alabaster-theme (package (name "python-sphinx-alabaster-theme") -- cgit v1.2.3 From 6a887e4909d4973c942d8cd62cd11a5c1070c254 Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Mon, 15 Nov 2021 04:37:46 +0000 Subject: gnu: Add python-sphinxext-opengraph. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/sphinx.scm (python-sphinxext-opengraph): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/sphinx.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm index 86b867871a..9aafcb9213 100644 --- a/gnu/packages/sphinx.scm +++ b/gnu/packages/sphinx.scm @@ -693,6 +693,38 @@ (define-public python-sphinx-intl translate and to apply translation to Sphinx generated document.") (license license:bsd-2))) +(define-public python-sphinxext-opengraph + (package + (name "python-sphinxext-opengraph") + (version "0.4.2") + (source + (origin + (method git-fetch) ; no tests in PyPI release + (uri (git-reference + (url "https://github.com/wpilibsuite/sphinxext-opengraph") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0dka44wri7agcr1jd641hq6j7qlbycligp80ngf32l5asqz1mgzp")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key inputs outputs tests? #:allow-other-keys) + (when tests? + (add-installed-pythonpath inputs outputs) + (invoke "python" "-m" "pytest"))))))) + (native-inputs + `(("python-beautifulsoup4" ,python-beautifulsoup4) + ("python-pytest" ,python-pytest) + ("python-sphinx" ,python-sphinx))) + (home-page "https://github.com/wpilibsuite/sphinxext-opengraph") + (synopsis "Sphinx Extension to enable OpenGraph support") + (description + "This package provides a Sphinx Extension to generate OG metadata.") + (license license:bsd-3))) + (define-public python-sphinx-autobuild (package (name "python-sphinx-autobuild") -- cgit v1.2.3 From 6cb805dcceeaa82a229c95d84f55b80e0f07a01f Mon Sep 17 00:00:00 2001 From: phodina Date: Wed, 17 Nov 2021 11:23:31 +0000 Subject: gnu: Add eg25-manager. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/firmware.scm (eg25-manager): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/firmware.scm | 36 +++++++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index aefc0a8b69..3ce4b0306e 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2018 Vagrant Cascadian ;;; Copyright © 2019 Mathieu Othacehe ;;; Copyright © 2020 Marius Bakke +;;; Copyright © 2021 Petr Hodina ;;; ;;; This file is part of GNU Guix. ;;; @@ -30,18 +31,24 @@ (define-module (gnu packages firmware) #:use-module (guix utils) #:use-module (guix git-download) #:use-module (guix build-system gnu) + #:use-module (guix build-system meson) #:use-module (gnu packages) #:use-module (gnu packages admin) #:use-module (gnu packages assembly) #:use-module (gnu packages base) #:use-module (gnu packages bison) #:use-module (gnu packages cmake) + #:use-module (gnu packages curl) #:use-module (gnu packages cross-base) #:use-module (gnu packages flex) #:use-module (gnu packages gcc) + #:use-module (gnu packages glib) + #:use-module (gnu packages gnome) + #:use-module (gnu packages libusb) #:use-module (gnu packages linux) #:use-module (gnu packages perl) - #:use-module (gnu packages python)) + #:use-module (gnu packages python) + #:use-module (gnu packages pkg-config)) (define-public ath9k-htc-firmware (package @@ -190,6 +197,33 @@ (define-public openfwwf-firmware by the b43-open driver of Linux-libre.") (license license:gpl2))) +(define-public eg25-manager + (package + (name "eg25-manager") + (version "0.4.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/mobian1/devices/eg25-manager") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1h4c4ndcnh88jn65h1kycxkjrydwwwh3irkxvpaxb6ry4wpc45r0")))) + (build-system meson-build-system) + (native-inputs `(("curl" ,curl) + ("glib" ,glib "bin") + ("pkg-config" ,pkg-config))) + (inputs `(("libgpiod" ,libgpiod) + ("libgudev" ,libgudev) + ("libusb" ,libusb))) + (synopsis "Manager daemon for the Quectel EG25 mobile broadband modem") + (description + "This package provides a manager daemon for the Quectel EG25 mobile +broadband modem as found, for example, on PinePhone.") + (home-page "https://gitlab.com/mobian1/devices/eg25-manager") + (license license:gpl3+))) + (define* (make-opensbi-package platform name #:optional (arch "riscv64")) (package (name name) -- cgit v1.2.3 From 53d69a60e72e2c1722ac6281bb923183fd051fcf Mon Sep 17 00:00:00 2001 From: Andy Tai Date: Thu, 9 Dec 2021 15:08:33 -0800 Subject: gnu: superstarfighter: Update to 0.6.5. * gnu/packages/games.scm (superstarfighter): Update to 0.6.5. Signed-off-by: Leo Famulari --- gnu/packages/games.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 819a832baf..4d8e0752c5 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -2584,16 +2584,18 @@ (define-public solarus-quest-editor (define-public superstarfighter (package (name "superstarfighter") - (version "0.6.4") + (version "0.6.5") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/notapixelstudio/superstarfighter") - (commit (string-append "v" version)))) + ;; The commit is not tagged upstream: + ;; https://github.com/notapixelstudio/superstarfighter/commit/350605bf5454c26ebe2c57d8217edd03689c0573 + (commit "32521f467616bb390e3929d07e1936ff43fe64da"))) (file-name (git-file-name name version)) (sha256 - (base32 "1fly63yf5ls1xwm15if4lxwy67wi84k4gvjllljpykrl18vw2y0y")))) + (base32 "1ckghzrfgvk9z1n5f4ivnamm6s8h9sbv0a3aq9pp4a3yrhkgld0k")))) (build-system gnu-build-system) (arguments `(#:tests? #f ;there are no tests -- cgit v1.2.3 From af067eaff4220ea1e86099894087b619606010b2 Mon Sep 17 00:00:00 2001 From: Andy Tai Date: Sun, 5 Dec 2021 23:19:31 -0800 Subject: gnu: godot: Update to 3.4. * gnu/packages/game-development.scm (godot): Update to 3.4. Signed-off-by: Leo Famulari --- gnu/packages/game-development.scm | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index a060dc94dc..ed733e317f 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1846,7 +1846,7 @@ (define-public openmw (define-public godot (package (name "godot") - (version "3.2.3") + (version "3.4") (source (origin (method git-fetch) (uri (git-reference @@ -1855,7 +1855,7 @@ (define-public godot (file-name (git-file-name name version)) (sha256 (base32 - "19vrp5lhyvxbm6wjxzn28sn3i0s8j08ca7nani8l1nrhvlc8wi0v")) + "0y542zla6msgxf31rd0349d9j3ya7f3njnwmmrh8lmzfgxx86qbx")) (modules '((guix build utils) (ice-9 ftw) (srfi srfi-1))) @@ -1870,19 +1870,23 @@ (define-public godot "assimp" "certs" "cvtt" + "embree" "enet" "etc2comp" "fonts" "glad" "jpeg-compressor" "libsimplewebm" + "minimp3" "miniupnpc" "minizip" "misc" "nanosvg" + "oidn" "pvrtccompressor" "recastnavigation" "squish" + "stb_rect_pack" "tinyexr" "vhacd" "xatlas"))) @@ -1950,6 +1954,19 @@ (define-public godot (wrap-program (string-append out "/bin/godot") `("PATH" ":" prefix (,(string-append zenity "/bin"))))) #t)) + (add-after 'install 'wrap + (lambda* (#:key inputs outputs #:allow-other-keys) + ;; FIXME: Mesa tries to dlopen libudev.so.0 and fails. Pending a + ;; fix of the mesa package we wrap the pcb executable such that + ;; Mesa can find libudev.so.0 through LD_LIBRARY_PATH. + ;; also append ld path for pulseaudio and alsa-lib + (let* ((out (assoc-ref outputs "out")) + (udev_path (string-append (assoc-ref inputs "udev") "/lib")) + (pulseaudio_path (string-append (assoc-ref inputs "pulseaudio") "/lib")) + (alas_lib_path (string-append (assoc-ref inputs "alsa-lib") "/lib"))) + (wrap-program (string-append out "/bin/godot") + `("LD_LIBRARY_PATH" ":" prefix (,udev_path ,pulseaudio_path ,alas_lib_path)))) + #t)) (add-after 'install 'install-godot-desktop (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -1986,6 +2003,7 @@ (define-public godot ("opusfile" ,opusfile) ("pcre2" ,pcre2) ("pulseaudio" ,pulseaudio) + ("udev" ,eudev) ;FIXME: required by mesa ("wslay" ,wslay) ("zenity" ,zenity) ("zstd" ,zstd "lib"))) -- cgit v1.2.3 From e1e32303129c5aedc7236d5cc854d6b72ad35daf Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 10 Dec 2021 18:30:33 +0100 Subject: gnu: privoxy: Update to 3.0.33. * gnu/packages/tor.scm (privoxy): Update to 3.0.33. [arguments]: Don't explicitly return #t from phases. --- gnu/packages/tor.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm index 2507f80c74..a881e68241 100644 --- a/gnu/packages/tor.scm +++ b/gnu/packages/tor.scm @@ -165,7 +165,7 @@ (define-public torsocks (define-public privoxy (package (name "privoxy") - (version "3.0.32") + (version "3.0.33") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/ijbswa/Sources/" @@ -173,7 +173,7 @@ (define-public privoxy version "-stable-src.tar.gz")) (sha256 (base32 - "1mzfxwnvnf1jkvfcrsivm6mjwdzjrc3h89qziz0mwi32ih0f87f6")))) + "1bhzi2ddv3g1z9h7lhxy7p0wibqg4m5nh46ikldmcqdc1pkh9c84")))) (build-system gnu-build-system) (arguments '(;; The default 'sysconfdir' is $out/etc; change that to @@ -202,8 +202,7 @@ (define-public privoxy ;; non-root users using it as is. (substitute* "config" (("^logdir") "#logdir") - (("^logfile") "#logfile"))) - #t))))) + (("^logfile") "#logfile")))))))) (inputs `(("brotli" ,brotli) ("openssl" ,openssl) -- cgit v1.2.3