From a76cb08d0da2da7e01214fa25f56ab9a37e6ddea Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 12 Aug 2022 05:15:22 +0300 Subject: gnu: mutt: Update to 2.2.7. * gnu/packages/mail.scm (mutt): Update to 2.2.7. --- gnu/packages/mail.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 33dcc48e04..b6712cb668 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -558,7 +558,7 @@ aliasing facilities to work just as they would on normal mail.") (define-public mutt (package (name "mutt") - (version "2.2.6") + (version "2.2.7") (source (origin (method url-fetch) (uri (list @@ -568,7 +568,7 @@ aliasing facilities to work just as they would on normal mail.") version ".tar.gz"))) (sha256 (base32 - "1lw8111wbsw4hkvrlfsd2cf2l1j25vqwbzys07z0ding2wsxk8pz")) + "1wbdsgx5x7h4alsfmjqac46xvbbakc7djlpngd3rydmvb27qa4zb")) (patches (search-patches "mutt-store-references.patch")))) (build-system gnu-build-system) (inputs -- cgit 1.4.1 From 4230b47c08ad62957ed432cbd09e0affae8a1754 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 12 Aug 2022 05:55:07 +0300 Subject: gnu: packcc: Update to 1.8.0. * gnu/packages/c.scm (packcc): Update to 1.8.0. --- gnu/packages/c.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm index 39f048e993..d7d649488b 100644 --- a/gnu/packages/c.scm +++ b/gnu/packages/c.scm @@ -463,7 +463,7 @@ as dictionaries, skip lists, and memory pools.") (define-public packcc (package (name "packcc") - (version "1.7.2") + (version "1.8.0") (home-page "https://github.com/arithy/packcc") (source (origin (method git-fetch) @@ -473,7 +473,7 @@ as dictionaries, skip lists, and memory pools.") (file-name (git-file-name name version)) (sha256 (base32 - "1mb6ys5ylvjz0xpq6769ir98s80p98s9ahd0c9k8p2ra1w20vz33")))) + "0b25p7ri1l2l20awyknljfnj7r4rg7cf2x3bljijx5q6j8rxdcsg")))) (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases -- cgit 1.4.1 From 317be8c8ebcf21c3c4fdcfd93a09c8194b43b1fc Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 12 Aug 2022 05:55:13 +0300 Subject: gnu: universal-ctags: Update to 5.9.20220807.0. * gnu/packages/code.scm (universal-ctags): Update to 5.9.20220807.0. --- gnu/packages/code.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm index 96736aac84..f4855e12e9 100644 --- a/gnu/packages/code.scm +++ b/gnu/packages/code.scm @@ -390,7 +390,7 @@ features that are not supported by the standard @code{stdio} implementation.") (define-public universal-ctags (package (name "universal-ctags") - (version "5.9.20220626.0") + (version "5.9.20220807.0") (source (origin (method git-fetch) @@ -400,7 +400,7 @@ features that are not supported by the standard @code{stdio} implementation.") (file-name (git-file-name name version)) (sha256 (base32 - "1x5kqqznlbndwln8g0kcxnla6b94i7x7cd63ba2sj0fzzms5gx24")) + "1wjj6hlda7xyjm8yrl2zz74ks7azymm9yyrpz36zxxpx2scf6lsk")) (modules '((guix build utils))) (snippet '(begin -- cgit 1.4.1 From d4284e3fd2c4c90a8654174a2fc5f25a8f6806b2 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 12 Aug 2022 06:17:41 +0300 Subject: gnu: python-setproctitle: Update to 1.3.2. * gnu/packages/python-xyz.scm (python-setproctitle): Update to 1.3.2. [arguments]: Adjust custom 'check phase for changes in source code. Honor #:tests? flag. [native-inputs]: Add python-pytest. [description]: Reflow. --- gnu/packages/python-xyz.scm | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index d262cf37fc..184e5c2620 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -18315,40 +18315,40 @@ JSON) codec.") (define-public python-setproctitle (package (name "python-setproctitle") - (version "1.1.10") + (version "1.3.2") (source (origin (method url-fetch) (uri (pypi-uri "setproctitle" version)) (sha256 (base32 - "163kplw9dcrw0lffq1bvli5yws3rngpnvrxrzdw89pbphjjvg0v2")))) + "1zbp6kyzfbrmbh9j3idai0mnpa28zn5db3k5l07jc3c3gj89gyxr")))) (build-system python-build-system) (arguments '(#:phases (modify-phases %standard-phases (replace 'check - (lambda _ + (lambda* (#:key tests? #:allow-other-keys) (setenv "PYTHON" (or (which "python3") (which "python"))) (setenv "PYCONFIG" (if (which "python3-config") "python3-config --embed" "python-config")) - (setenv "CC" "gcc") - ;; No need to extend PYTHONPATH to find the built package, since - ;; the Makefile will build anyway - (invoke "make" "check")))))) + (substitute* "tests/conftest.py" + (("cc") "gcc")) + (when tests? + (invoke "pytest" "tests/"))))))) (native-inputs - (list procps)) ; required for tests + (list procps python-pytest)) ; required for tests (home-page "https://github.com/dvarrazzo/py-setproctitle") (synopsis "Setproctitle implementation for Python to customize the process title") (description "The library allows a process to change its title (as displayed - by system tools such as ps and top). +by system tools such as @code{ps} and @code{top}). - Changing the title is mostly useful in multi-process systems, for - example when a master process is forked: changing the children's title - allows identifying the task each process is busy with. The technique - is used by PostgreSQL and the OpenSSH Server for example.") +Changing the title is mostly useful in multi-process systems, for example when a +master process is forked: changing the children's title allows identifying the +task each process is busy with. The technique is used by PostgreSQL and the +OpenSSH Server for example.") (license license:bsd-3))) (define-public python-validictory -- cgit 1.4.1 From 190e285958b1d6594d02460215c9e14916e1791b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 12 Aug 2022 06:21:59 +0300 Subject: gnu: python-icalendar: Update to 4.1.0. * gnu/packages/python-xyz.scm (python-icalendar): Update to 4.1.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 184e5c2620..3f87eabcb3 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -14133,13 +14133,13 @@ minimal and fast API targeting the following uses: (define-public python-icalendar (package (name "python-icalendar") - (version "4.0.7") + (version "4.1.0") (source (origin (method url-fetch) (uri (pypi-uri "icalendar" version)) (sha256 (base32 - "19574j3jwssm2dkqykih4568xqfgjsa3hcd79yl5s2vfys3qvh8g")))) + "15dkq42rkqjdi17rpvmd1plnbwn4daby0nk1s1c3xi7w5v0bfj4p")))) (build-system python-build-system) (propagated-inputs (list python-dateutil python-pytz)) -- cgit 1.4.1 From 887dbf4d802d1061e08eb47026f1adab2c43d791 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 11 Aug 2022 16:07:59 -0400 Subject: gnu: ocrad: Update to 0.28. * gnu/packages/ocr.scm (ocrad): Update to 0.28. --- gnu/packages/ocr.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ocr.scm b/gnu/packages/ocr.scm index cc0f84d55c..11595e87e5 100644 --- a/gnu/packages/ocr.scm +++ b/gnu/packages/ocr.scm @@ -55,16 +55,16 @@ (define-public ocrad (package (name "ocrad") - (version "0.27") + (version "0.28") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/ocrad/ocrad-" version ".tar.lz")) (sha256 (base32 - "0divffvcaim89g4pvqs8kslbcxi475bcl3b4ynphf284k9zfdgx9")))) + "0bmzpcv7sjf8f5pvd9wwh9yp6s7zqd226876g5csmbdxdmbymk1l")))) (build-system gnu-build-system) - (native-inputs (list lzip)) + (native-inputs (list libpng lzip)) (home-page "https://www.gnu.org/software/ocrad/") (synopsis "Optical character recognition based on feature extraction") (description -- cgit 1.4.1 From f7c027617da44ed684bbb9b35c603b790365fdbf Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 11 Aug 2022 17:53:21 -0400 Subject: gnu: tesseract-ocr: Update to 5.2.0. * gnu/packages/ocr.scm (tesseract-ocr): Update to 5.2.0. [inputs, native-inputs]: Move after arguments. Use new style inputs. [arguments]: Use gexps. [configure-flags]: Add --disable-static. [phases]{fix-docbook}: Replace phase with... {do-not-override-xml-catalog-files}: ... this new phase. {build-training}: Move after build phase. Enable parallel build. {trailing-install}: Move after install phase. [native-inputs]: Add libxml2. --- gnu/packages/ocr.scm | 124 ++++++++++++++++++++++++++------------------------- 1 file changed, 63 insertions(+), 61 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ocr.scm b/gnu/packages/ocr.scm index 11595e87e5..e28bd17668 100644 --- a/gnu/packages/ocr.scm +++ b/gnu/packages/ocr.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2019 Alex Vong ;;; Copyright © 2021 Andy Tai ;;; Copyright © 2021, 2022 Nicolas Goaziou +;;; Copyright © 2022 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -74,71 +75,72 @@ it produces text in 8-bit or UTF-8 formats.") (license license:gpl3+))) (define-public tesseract-ocr - ;; There are useful commits beyond the last official stable release. - (let ((commit "97079fa353557af6df86fd20b5d2e0dff5d8d5df") - (revision "1")) - (package - (name "tesseract-ocr") - (version (git-version "4.1.1" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/tesseract-ocr/tesseract") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "11137a4aaay7qp64vdjd83hz1l089nzi5a0ql0qgk8gn79pyhi98")))) - (build-system gnu-build-system) - (inputs - `(("cairo" ,cairo) - ("icu" ,icu4c) - ("leptonica" ,leptonica) - ("pango" ,pango) - ("python-wrapper" ,python-wrapper))) - (native-inputs - `(("asciidoc" ,asciidoc) - ("autoconf" ,autoconf) - ("automake" ,automake) - ("docbook-xsl" ,docbook-xsl) - ("libarchive" ,libarchive) - ("libcurl" ,curl) - ("libtool" ,libtool) - ("libtiff" ,libtiff) - ("pkg-config" ,pkg-config) - ("xsltproc" ,libxslt))) - (arguments - `(#:configure-flags - (let ((leptonica (assoc-ref %build-inputs "leptonica"))) - (list (string-append "LIBLEPT_HEADERSDIR=" leptonica "/include"))) - #:tests? #f ; Tests currently result in a segfault - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-docbook - (lambda* (#:key inputs #:allow-other-keys) - ;; Don't attempt to download XSL schema. - (substitute* "doc/Makefile.am" - (("http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl") - (string-append (assoc-ref inputs "docbook-xsl") - "/xml/xsl/docbook-xsl-" - ,(package-version docbook-xsl) - "/manpages/docbook.xsl"))))) - (add-after 'install 'build-training - (lambda _ - (invoke "make" "training"))) - (add-after 'build-training 'install-training - (lambda _ - (invoke "make" "training-install")))))) - (home-page "https://github.com/tesseract-ocr/tesseract") - (synopsis "Optical character recognition engine") - (description - "Tesseract is an optical character recognition (OCR) engine with very + (package + (name "tesseract-ocr") + (version "5.2.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tesseract-ocr/tesseract") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0dai539h07lqj8lyhznd3wbwdpqr78qrsczq78rsmsryqvmdbyaa")))) + (build-system gnu-build-system) + (arguments + (list + #:configure-flags + #~(list (string-append "LIBLEPT_HEADERSDIR=" + #$(this-package-input "leptonica") "/include") + "--disable-static") ;avoid 6 MiB static archive + ;; The unit tests are disabled because they require building bundled + ;; third party libraries. + #:tests? #f + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'do-not-override-xml-catalog-files + (lambda _ + (substitute* "configure.ac" + (("AC_SUBST\\(\\[XML_CATALOG_FILES])") + "")))) + (add-after 'build 'build-training + (lambda* (#:key parallel-build? #:allow-other-keys) + (define n (if parallel-build? (number->string + (parallel-job-count)) + "1")) + (invoke "make" "-j" n "training"))) + (add-after 'install 'install-training + (lambda _ + (invoke "make" "training-install")))))) + (native-inputs + (list asciidoc + autoconf + automake + curl + docbook-xsl + libarchive + libtiff + libtool + libxml2 ;for XML_CATALOG_FILES + libxslt + pkg-config)) + (inputs + (list cairo + icu4c + leptonica + pango + python-wrapper)) + (home-page "https://github.com/tesseract-ocr/tesseract") + (synopsis "Optical character recognition engine") + (description + "Tesseract is an optical character recognition (OCR) engine with very high accuracy. It supports many languages, output text formatting, hOCR positional information and page layout analysis. Several image formats are supported through the Leptonica library. It can also detect whether text is monospaced or proportional.") - (license license:asl2.0)))) + (license license:asl2.0))) (define-public gimagereader (package -- cgit 1.4.1 From 2e821717d34a24fec2422913f0c4fb975b86b0f4 Mon Sep 17 00:00:00 2001 From: vicvbcun Date: Mon, 8 Aug 2022 17:45:37 +0200 Subject: gnu: edge-addition-planarity-suite: Update to 3.0.2.0. * gnu/packages/graph.scm (edge-addition-planarity-suite): Update to 3.0.2.0. Signed-off-by: Andreas Enge --- gnu/packages/graph.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/graph.scm b/gnu/packages/graph.scm index 9aadab45e6..109ba68675 100644 --- a/gnu/packages/graph.scm +++ b/gnu/packages/graph.scm @@ -537,7 +537,7 @@ of the Louvain algorithm, for a number of different methods.") (define-public edge-addition-planarity-suite (package (name "edge-addition-planarity-suite") - (version "3.0.0.5") + (version "3.0.2.0") (source (origin (method git-fetch) @@ -548,7 +548,7 @@ of the Louvain algorithm, for a number of different methods.") (file-name (git-file-name name version)) (sha256 (base32 - "01cm7ay1njkfsdnmnvh5zwc7wg7x189hq1vbfhh9p3ihrbnmqzh8")))) + "1c7bnxgiz28mqsq3a3msznmjq629w0qqjynm2rqnnjn2qpc22h3i")))) (build-system gnu-build-system) (native-inputs (list autoconf automake libtool)) -- cgit 1.4.1 From d5a641dc2e28c0c944d5c4769d8171f79a187541 Mon Sep 17 00:00:00 2001 From: vicvbcun Date: Mon, 8 Aug 2022 17:45:40 +0200 Subject: gnu: lcalc: Update to 2.0.5. * gnu/packages/sagemath.scm (lcalc): Update to 2.0.5. * gnu/packages/patches/lcalc-default-parameters-1.patch, gnu/packages/patches/lcalc-default-parameters-2.patch, gnu/packages/patches/lcalc-lcommon-h.patch, gnu/packages/patches/lcalc-using-namespace-std.patch: Delete files. * gnu/local.mk (dist_patch_DATA): Unregister files. Signed-off-by: Andreas Enge --- gnu/local.mk | 4 -- .../patches/lcalc-default-parameters-1.patch | 26 -------- .../patches/lcalc-default-parameters-2.patch | 58 ----------------- gnu/packages/patches/lcalc-lcommon-h.patch | 13 ---- .../patches/lcalc-using-namespace-std.patch | 43 ------------- gnu/packages/sagemath.scm | 72 +++++++--------------- 6 files changed, 21 insertions(+), 195 deletions(-) delete mode 100644 gnu/packages/patches/lcalc-default-parameters-1.patch delete mode 100644 gnu/packages/patches/lcalc-default-parameters-2.patch delete mode 100644 gnu/packages/patches/lcalc-lcommon-h.patch delete mode 100644 gnu/packages/patches/lcalc-using-namespace-std.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 1bd791fb0c..bbc06326b8 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1381,10 +1381,6 @@ dist_patch_DATA = \ %D%/packages/patches/kodi-set-libcurl-ssl-parameters.patch \ %D%/packages/patches/kodi-skip-test-449.patch \ %D%/packages/patches/laby-make-install.patch \ - %D%/packages/patches/lcalc-default-parameters-1.patch \ - %D%/packages/patches/lcalc-default-parameters-2.patch \ - %D%/packages/patches/lcalc-lcommon-h.patch \ - %D%/packages/patches/lcalc-using-namespace-std.patch \ %D%/packages/patches/ldns-drill-examples.patch \ %D%/packages/patches/leela-zero-gtest.patch \ %D%/packages/patches/less-hurd-path-max.patch \ diff --git a/gnu/packages/patches/lcalc-default-parameters-1.patch b/gnu/packages/patches/lcalc-default-parameters-1.patch deleted file mode 100644 index 19b0776320..0000000000 --- a/gnu/packages/patches/lcalc-default-parameters-1.patch +++ /dev/null @@ -1,26 +0,0 @@ -Patch taken from the Sage packaging system. - -diff -Naur lcalc-1.23-vanilla/include/Ldirichlet_series.h lcalc-1.23-fixed-gcc.4.9/include/Ldirichlet_series.h ---- lcalc-1.23-vanilla/include/Ldirichlet_series.h 2012-08-08 23:21:55.000000000 +0200 -+++ lcalc-1.23-fixed-gcc.4.9/include/Ldirichlet_series.h 2014-04-21 14:37:59.027464849 +0200 -@@ -43,7 +43,7 @@ - //XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - template - Complex L_function :: --dirichlet_series(Complex s, long long N=-1) -+dirichlet_series(Complex s, long long N) - { - Complex z=0.; - long long m,n; -diff -Naur lcalc-1.23-vanilla/include/L.h lcalc-1.23-fixed-gcc.4.9/include/L.h ---- lcalc-1.23-vanilla/include/L.h 2012-08-08 23:21:55.000000000 +0200 -+++ lcalc-1.23-fixed-gcc.4.9/include/L.h 2014-04-21 14:32:04.003467348 +0200 -@@ -491,7 +491,7 @@ - - //#include "Ldirichlet_series.h" //for computing Dirichlet series - Complex partial_dirichlet_series(Complex s, long long N1, long long N2); -- Complex dirichlet_series(Complex s, long long N); -+ Complex dirichlet_series(Complex s, long long N=-1LL); - - //#include "Ltaylor_series.h" //for computing taylor series for Dirichlet series - //void compute_taylor_series(int N, int K, Complex s_0, Complex *series); diff --git a/gnu/packages/patches/lcalc-default-parameters-2.patch b/gnu/packages/patches/lcalc-default-parameters-2.patch deleted file mode 100644 index 1d881ee0c4..0000000000 --- a/gnu/packages/patches/lcalc-default-parameters-2.patch +++ /dev/null @@ -1,58 +0,0 @@ -Patch taken from the Sage packaging system. - ---- lcalc-1.23/include/Lgamma.h 2012-08-08 23:21:55.000000000 +0200 -+++ lcalc-1.23/include/Lgamma.h 2014-05-18 21:15:27.786889718 +0200 -@@ -77,7 +77,7 @@ - //n=0 should just give log_GAMMA(z)... thus making log_GAMMA - //code obsolete. But leave log_GAMMA intact anyways. - template --precise(ttype) log_GAMMA (ttype z,int n=0) -+precise(ttype) log_GAMMA (ttype z,int n) - { - int M; - precise(ttype) log_G,r,r2,y; -@@ -230,7 +230,7 @@ - //value exp_w which holds exp(-w) - //computes G(z,w), so there's an extra w^(-z) factor. - template --Complex inc_GAMMA (ttype z,ttype w, const char *method="temme", ttype exp_w = 0, bool recycle=false) -+Complex inc_GAMMA (ttype z,ttype w, const char *method, ttype exp_w, bool recycle) - { - - Complex G; -@@ -334,7 +334,7 @@ - - - template --ttype cfrac_GAMMA (ttype z,ttype w, ttype exp_w=0, bool recycle=false) //computes G(z,w) via continued fraction -+ttype cfrac_GAMMA (ttype z,ttype w, ttype exp_w, bool recycle) //computes G(z,w) via continued fraction - { - - ttype G; -@@ -424,7 +424,7 @@ - } - - template --ttype asympt_GAMMA (ttype z,ttype w, ttype exp_w = 0, bool recycle=false) //computes G(z,w) via asymptotic series -+ttype asympt_GAMMA (ttype z,ttype w, ttype exp_w, bool recycle) //computes G(z,w) via asymptotic series - { - - if(my_verbose>3) cout << "called asympt_GAMMA("< --ttype comp_inc_GAMMA (ttype z,ttype w,ttype exp_w = 0, bool recycle=false) //computes g(z,w) -+ttype comp_inc_GAMMA (ttype z,ttype w,ttype exp_w, bool recycle) //computes g(z,w) - { - - ttype g; -@@ -604,7 +604,7 @@ - } - - template --Complex gamma_sum(Complex s, int what_type, ttype *coeff, int N, Double g, Complex l, Double Q, Long Period, Complex delta=1, const char *method="temme") -+Complex gamma_sum(Complex s, int what_type, ttype *coeff, int N, Double g, Complex l, Double Q, Long Period, Complex delta, const char *method) - { - Complex SUM=0; - diff --git a/gnu/packages/patches/lcalc-lcommon-h.patch b/gnu/packages/patches/lcalc-lcommon-h.patch deleted file mode 100644 index 897956de64..0000000000 --- a/gnu/packages/patches/lcalc-lcommon-h.patch +++ /dev/null @@ -1,13 +0,0 @@ -Patch taken from the Sage packaging system. - ---- src/include/Lcommon.h 2010-01-31 15:16:45.000000000 +0000 -+++ src/include/Lcommon.h 2011-03-08 21:19:11.849443238 +0000 -@@ -25,7 +25,7 @@ - #ifdef USE_MPFR - inline double lcalc_to_double(const double& x) { return x; } - #endif --//inline double lcalc_to_double(const long double& x) { return x; } -+inline double lcalc_to_double(const long double& x) { return x; } - inline double lcalc_to_double(const int& x) { return x; } - inline double lcalc_to_double(const long long& x) { return x; } - inline double lcalc_to_double(const short& x) { return x; } diff --git a/gnu/packages/patches/lcalc-using-namespace-std.patch b/gnu/packages/patches/lcalc-using-namespace-std.patch deleted file mode 100644 index 6e0075fdc8..0000000000 --- a/gnu/packages/patches/lcalc-using-namespace-std.patch +++ /dev/null @@ -1,43 +0,0 @@ -Patch taken from the Sage packaging system. - -diff --git a/include/Lcommon.h b/include/Lcommon.h -index 1b3be43..bf40532 100644 ---- a/include/Lcommon.h -+++ b/include/Lcommon.h -@@ -48,7 +48,7 @@ const bool outputSeries=true; // Whether to output the coefficients or just th - - // Loop i from m to n - // Useful in tidying up most for loops --#define loop(i,m,n) for(typeof(m) i=(m); i!=(n); i++) -+#define loop(i,m,n) for(auto i=(m); i!=(n); i++) - - // A class for calculations involving polynomials of small degree - // Not efficient enough for huge polynomials -diff --git a/include/Lcommon_ld.h b/include/Lcommon_ld.h -index 86ae4df..33c560c 100644 ---- a/include/Lcommon_ld.h -+++ b/include/Lcommon_ld.h -@@ -53,7 +53,7 @@ const bool outputSeries=true; // Whether to output the coefficients or just th - - // Loop i from m to n - // Useful in tidying up most for loops --#define loop(i,m,n) for(typeof(m) i=(m); i!=(n); i++) -+#define loop(i,m,n) for(auto i=(m); i!=(n); i++) - - // A class for calculations involving polynomials of small degree - // Not efficient enough for huge polynomials -diff --git a/include/Lglobals.h b/include/Lglobals.h -index 60002e4..ca2606c 100644 ---- a/include/Lglobals.h -+++ b/include/Lglobals.h -@@ -24,9 +24,9 @@ - #ifndef Lglobals_H - #define Lglobals_H - -+#include - using namespace std; - --#include - #ifdef USE_MPFR - #include "Lgmpfrxx.h" - typedef mpfr_class Double; diff --git a/gnu/packages/sagemath.scm b/gnu/packages/sagemath.scm index bb80ff4db5..4542bc1c88 100644 --- a/gnu/packages/sagemath.scm +++ b/gnu/packages/sagemath.scm @@ -38,6 +38,7 @@ #:use-module (gnu packages lisp) #:use-module (gnu packages multiprecision) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages popt) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz)) @@ -309,59 +310,28 @@ used as internal storage type for polynomial structures.") (define-public lcalc (package (name "lcalc") - (version "1.23") - ;; The original home page of the project has disappeared, as well as - ;; code hosted by the original author on Google Code. The latter has - ;; been copied to gitlab.com/sagemath and purportedly contains patches - ;; for a never released version 1.3, that supposedly follows 1.23. - ;; We use the tarball as well as the patches hosted inside the sage - ;; package system distributed with the sage tarball. - (source - (origin - (method url-fetch) - (uri (string-append "ftp://ftp.fu-berlin.de/unix/misc/sage/spkg/" - "upstream/lcalc/lcalc-1.23.tar.bz2")) - (sha256 - (base32 - "1c6dsdshgxhqppjxvxhp8yhpxaqvnz3d1mlh26r571gkq8z2bm43")) - (patches (search-patches "lcalc-lcommon-h.patch" - "lcalc-default-parameters-1.patch" - "lcalc-default-parameters-2.patch" - "lcalc-using-namespace-std.patch")))) + (version "2.0.5") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/sagemath/lcalc") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1rwyx292y3jbsp88wagn9nhl9z7wsnl2yrs5imxkbxq87pnrj5a7")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ;no tests - #:phases - (modify-phases %standard-phases - (delete 'configure) - (add-before 'build 'prepare-build - (lambda* (#:key outputs #:allow-other-keys) - (chdir "src") - (let ((out (assoc-ref outputs "out"))) - (substitute* "Makefile" - (("^INSTALL_DIR= /usr/local") - (string-append "INSTALL_DIR=" out)))) - #t)) - (add-before 'install 'make-output-dirs - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin")) - (lib (string-append out "/lib")) - (include (string-append out "/include"))) - (mkdir-p bin) - (mkdir-p lib) - (mkdir-p include)) - #t))))) - ;; FIXME: - ;; We need to add pari-gp and probably pari related patches from the - ;; sage project, as well as uncomment the line setting PARI_DEFINE in - ;; the Makefile to get the full functionality of this package. - ;; For the time being, we hope that sage can be compiled without. - (synopsis "C++ library for L-functions") - (description "Lcalc computes L-functions, in particular the Riemann -zeta function and its twists by quadratic characters.") - (license license:gpl2+) - (home-page "https://gitlab.com/sagemath/sage"))) + (list #:configure-flags '(list "--with-pari"))) + (inputs (list pari-gp)) + (native-inputs (list autoconf automake libtool pkg-config gengetopt)) + (home-page "https://gitlab.com/sagemath/lcalc") + (synopsis "C++ library for computing with L-functions") + (description + "Lcalc computes L-functions, in particular the Riemann zeta function, +Dirichlet L-functions and L-functions attached to elliptic curves and +modular forms.") + (license license:gpl2+))) (define-public ratpoints (package -- cgit 1.4.1 From 2b34eccbf3bb4fd9b7490954f8d9a6f2e1132b4c Mon Sep 17 00:00:00 2001 From: vicvbcun Date: Mon, 8 Aug 2022 17:45:43 +0200 Subject: gnu: lrcalc: Update to 2.1. * gnu/packages/algebra.scm (lrcalc): Update to 2.1. [source]: Remove patch. * gnu/packages/patches/lrcalc-includes.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Unregister file. Signed-off-by: Andreas Enge --- gnu/local.mk | 1 - gnu/packages/algebra.scm | 12 +--- gnu/packages/patches/lrcalc-includes.patch | 92 ------------------------------ 3 files changed, 2 insertions(+), 103 deletions(-) delete mode 100644 gnu/packages/patches/lrcalc-includes.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index bbc06326b8..2d32d85d47 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1469,7 +1469,6 @@ dist_patch_DATA = \ %D%/packages/patches/llvm-roc-4.0.0-remove-isystem-usr-include.patch \ %D%/packages/patches/llvm-roc-5.0.0-linkdl.patch \ %D%/packages/patches/lm-sensors-hwmon-attrs.patch \ - %D%/packages/patches/lrcalc-includes.patch \ %D%/packages/patches/lsh-fix-x11-forwarding.patch \ %D%/packages/patches/lsof-fatal-test-failures.patch \ %D%/packages/patches/lua-CVE-2014-5461.patch \ diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index b3f0823daf..8ccb44c434 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -1628,7 +1628,7 @@ John Cremona to compute his elliptic curve database.") (define-public lrcalc (package (name "lrcalc") - (version "1.2") + (version "2.1") (source (origin (method git-fetch) (uri (git-reference @@ -1637,18 +1637,10 @@ John Cremona to compute his elliptic curve database.") (file-name (git-file-name name version)) (sha256 (base32 - "1c12d04jdyxkkav4ak8d1aqrv594gzihwhpxvc6p9js0ry1fahss")) - (patches (search-patches "lrcalc-includes.patch")))) + "0s3amf3z75hnrjyszdndrvk4wp5p630dcgyj341i6l57h43d1p4k")))) (build-system gnu-build-system) (native-inputs (list autoconf automake libtool)) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'build 'fix-permission - (lambda _ - (chmod "lrcalc.maple.src" #o644) - #t))))) (synopsis "Littlewood-Richardson calculator in algebraic combinatorics") (description "The Littlewood-Richardson Calculator (lrcalc) is a program designed to compute Littlewood-Richardson coefficients. It computes diff --git a/gnu/packages/patches/lrcalc-includes.patch b/gnu/packages/patches/lrcalc-includes.patch deleted file mode 100644 index e15286905b..0000000000 --- a/gnu/packages/patches/lrcalc-includes.patch +++ /dev/null @@ -1,92 +0,0 @@ -Patch taken from the Sage packaging system. - -From 4a5e1c8c3c11efdb1cbb4239825a6bf4bf1c52f8 Mon Sep 17 00:00:00 2001 -From: Anders Skovsted Buch -Date: Sun, 29 Nov 2015 16:25:56 -0500 -Subject: [PATCH] Patch by Jeroen Demeyer to change include to - "vector.h", plus similar cases. - ---- - src/lrcalc.c | 2 +- - src/maple.c | 4 ++-- - src/schublib.h | 2 +- - src/symfcn.c | 6 +++--- - src/symfcn.h | 4 ++-- - 5 files changed, 9 insertions(+), 9 deletions(-) - -diff --git a/src/lrcalc.c b/src/lrcalc.c -index aff3f75..60df49e 100644 ---- a/src/lrcalc.c -+++ b/src/lrcalc.c -@@ -8,7 +8,7 @@ - #include - extern char *optarg; - --#include -+#include "vectarg.h" - - #include "symfcn.h" - #include "maple.h" -diff --git a/src/maple.c b/src/maple.c -index fdc0768..a5f4d14 100644 ---- a/src/maple.c -+++ b/src/maple.c -@@ -4,8 +4,8 @@ - */ - - #include --#include --#include -+#include "vector.h" -+#include "hashtab.h" - #include "maple.h" - - -diff --git a/src/schublib.h b/src/schublib.h -index a8e8511..864850c 100644 ---- a/src/schublib.h -+++ b/src/schublib.h -@@ -1,7 +1,7 @@ - #ifndef _SCHUBLIB_H - #define _SCHUBLIB_H - --#include -+#include "hashtab.h" - - hashtab *trans(vector *w, int vars, hashtab *res); - hashtab *monk(int i, hashtab *slc, int rank); -diff --git a/src/symfcn.c b/src/symfcn.c -index 4ffbe4b..fd5df5d 100644 ---- a/src/symfcn.c -+++ b/src/symfcn.c -@@ -5,9 +5,9 @@ - - #include - --#include --#include --#include -+#include "alloc.h" -+#include "vector.h" -+#include "hashtab.h" - - #include "symfcn.h" - -diff --git a/src/symfcn.h b/src/symfcn.h -index b8543b1..29bb00d 100644 ---- a/src/symfcn.h -+++ b/src/symfcn.h -@@ -1,8 +1,8 @@ - #ifndef _SYMFCN_H - #define _SYMFCN_H - --#include --#include -+#include "hashtab.h" -+#include "vector.h" - - int part_itr_sz(vector *part); - int part_itr_sub(vector *part, vector *outer); --- -2.1.1.1.g1fb337f - -- cgit 1.4.1 From 3ceb985e756ac9fcf0633fb556c8905df7602e7d Mon Sep 17 00:00:00 2001 From: Tanguy Le Carrour Date: Wed, 10 Aug 2022 10:12:53 +0200 Subject: gnu: python-typer: Update to 0.6.1. * gnu/packages/python-xyz.scm (python-typer): Update to 0.6.1. [source]: Use GIT-FETCH. [arguments]: Build from source with flit. [native-inputs]: Add python-flit and python-rich. Signed-off-by: Mathieu Othacehe --- gnu/packages/python-xyz.scm | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 3f87eabcb3..d7f8902bff 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -21513,15 +21513,16 @@ based on the CPython 2.7 and 3.7 parsers.") (define-public python-typer (package (name "python-typer") - (version "0.3.2") + (version "0.6.1") (source (origin - ;; Building `python-typer` from the git repository requires the `flit-core` - ;; Python package that is not installed by `python-flit`. - (method url-fetch) - (uri (pypi-uri "typer" version)) + (method git-fetch) + (uri (git-reference + (url "https://github.com/tiangolo/typer") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 "00v3h63dq8yxahp9vg3yb9r27l2niwv8gv0dbds9dzrc298dfmal")))) + (base32 "1knv353qhkl2imav3jfp6bgq47m8wkkqhq1dzmqg2sv8rsy7zgl7")))) (build-system python-build-system) (arguments `(#:phases @@ -21533,6 +21534,18 @@ based on the CPython 2.7 and 3.7 parsers.") (substitute* "tests/test_completion/test_completion.py" (("\"bash\"") (string-append "\"" (which "bash") "\"")) (("\"/bin/bash\"") (string-append "\"" (which "bash") "\""))))) + (replace 'build + (lambda _ + (invoke "flit" "build"))) + (replace 'install + (lambda* (#:key inputs outputs #:allow-other-keys) + (add-installed-pythonpath inputs outputs) + (let ((out (assoc-ref outputs "out"))) + (for-each (lambda (wheel) + (format #true wheel) + (invoke "python" "-m" "pip" "install" + wheel (string-append "--prefix=" out))) + (find-files "dist" "\\.whl$"))))) (replace 'check (lambda* (#:key tests? #:allow-other-keys) (when tests? @@ -21554,7 +21567,8 @@ based on the CPython 2.7 and 3.7 parsers.") (propagated-inputs (list python-click)) (native-inputs - (list python-coverage python-pytest python-shellingham)) + (list python-coverage python-flit python-pytest python-rich + python-shellingham)) (home-page "https://github.com/tiangolo/typer") (synopsis "Typer builds CLI based on Python type hints") -- cgit 1.4.1 From 1385ef76d7a9ed07f0f0d0cc94ef457130662cc8 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Fri, 12 Aug 2022 10:35:32 +0200 Subject: gnu: python-typer: Introduce gexps. * gnu/packages/python-xyz.scm (python-typer)[arguments]: Switch to gexps. [synopsis, description]: Fix indentation. --- gnu/packages/python-xyz.scm | 82 +++++++++++++++++++++++---------------------- 1 file changed, 42 insertions(+), 40 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index d7f8902bff..d39c6c2ceb 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -21526,44 +21526,46 @@ based on the CPython 2.7 and 3.7 parsers.") (build-system python-build-system) (arguments `(#:phases - (modify-phases %standard-phases - ;; Unfortunately, this doesn't seem to be enough to fix these two - ;; tests, but we'll patch this anyway. - (add-after 'unpack 'patch-shell-reference - (lambda _ - (substitute* "tests/test_completion/test_completion.py" - (("\"bash\"") (string-append "\"" (which "bash") "\"")) - (("\"/bin/bash\"") (string-append "\"" (which "bash") "\""))))) - (replace 'build - (lambda _ - (invoke "flit" "build"))) - (replace 'install - (lambda* (#:key inputs outputs #:allow-other-keys) - (add-installed-pythonpath inputs outputs) - (let ((out (assoc-ref outputs "out"))) - (for-each (lambda (wheel) - (format #true wheel) - (invoke "python" "-m" "pip" "install" - wheel (string-append "--prefix=" out))) - (find-files "dist" "\\.whl$"))))) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (setenv "HOME" "/tmp") ; some tests need it - - ;; This is for completion tests - (with-output-to-file "/tmp/.bashrc" (lambda _ (display "# dummy"))) - - (setenv "GUIX_PYTHONPATH" - (string-append (getcwd) ":" - (getenv "GUIX_PYTHONPATH"))) - (let ((disabled-tests (list "test_show_completion" - "test_install_completion"))) - (invoke "python" "-m" "pytest" "tests/" - "-k" - (string-append "not " - (string-join disabled-tests - " and not ")))))))))) + ,#~(modify-phases %standard-phases + ;; Unfortunately, this doesn't seem to be enough to fix these two + ;; tests, but we'll patch this anyway. + (add-after 'unpack 'patch-shell-reference + (lambda _ + (substitute* "tests/test_completion/test_completion.py" + (("\"bash\"") (string-append "\"" (which "bash") "\"")) + (("\"/bin/bash\"") + (string-append "\"" (which "bash") "\""))))) + (replace 'build + (lambda _ + (invoke "flit" "build"))) + (replace 'install + (lambda* (#:key inputs outputs #:allow-other-keys) + (add-installed-pythonpath inputs outputs) + (for-each + (lambda (wheel) + (format #true wheel) + (invoke "python" "-m" "pip" "install" + wheel (string-append "--prefix=" #$output))) + (find-files "dist" "\\.whl$")))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (setenv "HOME" "/tmp") ; some tests need it + + ;; This is for completion tests + (with-output-to-file "/tmp/.bashrc" + (lambda _ (display "# dummy"))) + + (setenv "GUIX_PYTHONPATH" + (string-append (getcwd) ":" + (getenv "GUIX_PYTHONPATH"))) + (let ((disabled-tests (list "test_show_completion" + "test_install_completion"))) + (invoke "python" "-m" "pytest" "tests/" + "-k" + (string-append "not " + (string-join disabled-tests + " and not ")))))))))) (propagated-inputs (list python-click)) (native-inputs @@ -21571,9 +21573,9 @@ based on the CPython 2.7 and 3.7 parsers.") python-shellingham)) (home-page "https://github.com/tiangolo/typer") (synopsis - "Typer builds CLI based on Python type hints") + "Typer builds CLI based on Python type hints") (description - "Typer is a library for building CLI applications. It's based on + "Typer is a library for building CLI applications. It's based on Python 3.6+ type hints.") ;; MIT license (license license:expat))) -- cgit 1.4.1 From 67fcc6e339250ba6deea846bcaffed374a65a1f3 Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Mon, 8 Aug 2022 16:31:27 +0800 Subject: gnu: Add python-misskey. * gnu/packages/python-xyz.scm (python-misskey): New variable. Signed-off-by: Mathieu Othacehe --- gnu/packages/python-xyz.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index d39c6c2ceb..9422bf2866 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -30521,3 +30521,26 @@ both.") package. It can be used by type-checking tools like mypy, PyCharm, pytype etc. to check code that uses @code{orjson}.") (license license:asl2.0))) + +(define-public python-misskey + (package + (name "python-misskey") + (version "4.1.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/YuzuRyo61/Misskey.py") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0rma8pdsjsy00cg76q6q4qki4xpldykmz1m6dl3w2bjjxfhlbaz5")))) + (build-system python-build-system) + (arguments (list #:tests? #f)) ;needs network + (propagated-inputs (list python-requests)) + (home-page "https://misskeypy.readthedocs.io") + (synopsis "Python bindings for Misskey's API") + (description + "This package provides access to Misskey's API. Misskey is a SNS +platform using the ActivityPub protocol.") + (license license:expat))) -- cgit 1.4.1 From 6d69f093d0806721b83a72b7ce010bb9c3e9bf53 Mon Sep 17 00:00:00 2001 From: "(" Date: Sun, 7 Aug 2022 12:29:03 +0100 Subject: gnu: Add spng. * gnu/packages/image.scm (spng): New variable. Signed-off-by: Mathieu Othacehe --- gnu/packages/image.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 0b0452664b..d0ac192774 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -33,6 +33,7 @@ ;;; Copyright © 2021 Nicolò Balzarotti ;;; Copyright © 2021 Alexandr Vityazev ;;; Copyright © 2022 Jai Vetrivelan +;;; Copyright © 2022 ( ;;; ;;; This file is part of GNU Guix. ;;; @@ -2446,3 +2447,28 @@ month and day. All files which are not images or videos or those which do not have creation date information will be placed in a folder called @file{unknown}.") (license license:expat))) + +(define-public spng + (package + (name "spng") + (version "0.7.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/randy408/libspng") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0src9ii9w9afz2vgridn9r38pa6888myk28x2bjw0ynw5xcd62hs")))) + (build-system meson-build-system) + (inputs (list zlib)) + (native-inputs (list libpng)) + (home-page "https://libspng.org") + (synopsis "Simple PNG loading library") + (description + "@code{libspng} is a simple C library for loading Portable Network +Graphics (PNGs), intended as an easy-to-use replacement for @code{libpng}.") + (license license:bsd-2) + ;; Supports SSE on x86-64 and NEON on AArch64. + (properties '((tunable? . #t))))) -- cgit 1.4.1 From a3a25daeee48e2ed9dcfb744a2650ef46e7666f4 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 12 Aug 2022 11:11:05 +0200 Subject: gnu: monero: Update to 0.18.1.0. * gnu/packages/finance.scm (monero): Update to 0.18.1.0. --- gnu/packages/finance.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 4b5ab2924b..de493ee177 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -671,7 +671,7 @@ blockchain.") ;; the system's dynamically linked library. (package (name "monero") - (version "0.18.0.0") + (version "0.18.1.0") (source (origin (method git-fetch) @@ -689,7 +689,7 @@ blockchain.") delete-file-recursively '("external/miniupnp" "external/rapidjson")))) (sha256 - (base32 "1jq2v2dg50gl3cf9s61jssny5rraclxqj4cc4y0sl00ip8icj08v")))) + (base32 "18yj44pki7x8ir6wg02g1h6yxp1hnqb0nrx9x5dvv94rda48cy66")))) (build-system cmake-build-system) (native-inputs (list doxygen -- cgit 1.4.1 From e8e9472af5b758b3f30fe499571bf6f634a4b19b Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 12 Aug 2022 11:34:55 +0200 Subject: gnu: monero-gui: Update to 0.18.1.0. * gnu/packages/finance.scm (monero-gui): Update to 0.18.1.0. --- gnu/packages/finance.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index de493ee177..0984967dc8 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -776,7 +776,7 @@ the Monero command line client and daemon.") (define-public monero-gui (package (name "monero-gui") - (version "0.18.0.0") + (version "0.18.1.0") (source (origin (method git-fetch) @@ -792,7 +792,7 @@ the Monero command line client and daemon.") ;; See the 'extract-monero-sources' phase. (delete-file-recursively "monero"))) (sha256 - (base32 "14rbw9803h3g7ld3d24vc3i9n55n09x13frkmd128xx5jw17v5sr")))) + (base32 "1z627jy9n6cwc9yv0w58fbhix4qnllk0q42ga75mhlawaz68j0qi")))) (build-system qt-build-system) (native-inputs `(,@(package-native-inputs monero) -- cgit 1.4.1 From ff2c97a803fba1e94c1477e26a917a5d0cb2a56e Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 12 Aug 2022 11:47:52 +0200 Subject: gnu: txr: Update to 280. * gnu/packages/lisp.scm (txr): Update to 280. --- gnu/packages/lisp.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 8e59ec956b..8a1be073ad 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -984,7 +984,7 @@ the HTML documentation of TXR.") (define-public txr (package (name "txr") - (version "278") + (version "280") (source (origin (method git-fetch) @@ -993,7 +993,7 @@ the HTML documentation of TXR.") (commit (string-append "txr-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "08jmqv245vnvl4xx6x5a5hxlnhdcipfdbja54dvsi6wkiks2fif7")))) + (base32 "1ni2yb9dggldgizfp13mvrw5vzk13pg74dpk2lyn9dijqvs293s4")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit 1.4.1 From e05e5342a0baa8a72d3e1b1e3a5d57da13f764b3 Mon Sep 17 00:00:00 2001 From: Antero Mejr Date: Thu, 11 Aug 2022 15:11:05 -0400 Subject: gnu: Add pn. * gnu/packages/messaging.scm (pn): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/messaging.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 47798c3586..a2695370e3 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -3446,4 +3446,35 @@ Discord.") (home-page "https://github.com/taylordotfish/harmony") (license license:gpl3+))) +(define-public pn + (package + (name "pn") + (version "0.9.0") + (home-page "https://github.com/Orange-OpenSource/pn") + (source (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1lvzb0yixj7wmmqzsri20k9nn3gf06j0yjvmg2mi1zihywq7s4dx")))) + (build-system cmake-build-system) + (arguments + (list #:tests? #f ;no tests + #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'set-lib-destination + (lambda _ + (substitute* "CMakeLists.txt" + (("DESTINATION \\$\\{AWKLIBPATH\\}") + "DESTINATION lib"))))))) + (inputs (list icu4c libphonenumber protobuf)) + (synopsis "Command-line validation tool for phone numbers") + (description + "@code{pn} provides a command line tool that allows users to operate on +phone numbers (get validity information, reformat them, or extract numbers from +a text snippet), using @code{libphonenumber}.") + (license license:asl2.0))) + ;;; messaging.scm ends here -- cgit 1.4.1 From 3650425b4689ff716ad244cb48283c9daf8df148 Mon Sep 17 00:00:00 2001 From: "Collin J. Doering via Guix-patches via" Date: Thu, 7 Apr 2022 12:54:43 -0400 Subject: gnu: Add emacs-hledger-mode * gnu/packages/finance.scm (emacs-hledger-mode): New variable --- gnu/packages/finance.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 0984967dc8..f73dc052ed 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -30,6 +30,7 @@ ;;; Copyright © 2022 Aleksandr Vityazev ;;; Copyright © 2022 Maxim Cournoyer ;;; Copyright © 2022 Philip McGrath +;;; Copyright © 2022 Collin J. Doering ;;; ;;; This file is part of GNU Guix. ;;; @@ -78,6 +79,7 @@ #:use-module (gnu packages documentation) #:use-module (gnu packages dns) #:use-module (gnu packages emacs) + #:use-module (gnu packages emacs-xyz) #:use-module (gnu packages dbm) #:use-module (gnu packages gettext) #:use-module (gnu packages gnome) @@ -462,6 +464,37 @@ in ability, and easy to use. This package provides the Emacs mode.") (license license:gpl2+)))) +(define-public emacs-hledger-mode + (let ((commit "400bde42a8d2712af80cd7c773c9cdfbb63a515a") + (revision "1")) + (package + (name "emacs-hledger-mode") + (version (git-version "20220515" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/narendraj9/hledger-mode") + (commit commit))) + (sha256 + (base32 + "0xmcfpr3rxli1adwypg18npl8hb8ak5rg6a6i26inzzqja6vr897")))) + (build-system emacs-build-system) + (propagated-inputs + (list emacs-popup + emacs-async + emacs-htmlize)) + (arguments + '(#:include '("^[^/]+.el$") + #:exclude '())) + (home-page "https://github.com/narendraj9/hledger-mode") + (synopsis "Mode for writing journal entries for hledger") + (description + "This major mode for Emacs enables writing and managing hledger +journal files. It generates some useful reports along with some financial +ratios that can help you keep a check on your financial health for users of +the plaintext accounting system hledger.") + (license license:gpl3)))) + (define-public geierlein (package (name "geierlein") -- cgit 1.4.1 From ed4a3f17bf73d6a7e1d282924233498db79f7038 Mon Sep 17 00:00:00 2001 From: Justin Veilleux Date: Fri, 12 Aug 2022 13:38:43 +0200 Subject: gnu: Add xmrig. * gnu/packages/finance.scm (xmrig): New variable. Co-authored-by: Guillaume Le Vaillant --- gnu/packages/finance.scm | 58 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index f73dc052ed..9a5b8b1c20 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -31,6 +31,7 @@ ;;; Copyright © 2022 Maxim Cournoyer ;;; Copyright © 2022 Philip McGrath ;;; Copyright © 2022 Collin J. Doering +;;; Copyright © 2022 Justin Veilleux ;;; ;;; This file is part of GNU Guix. ;;; @@ -100,6 +101,7 @@ #:use-module (gnu packages linux) #:use-module (gnu packages man) #:use-module (gnu packages maths) + #:use-module (gnu packages mpi) #:use-module (gnu packages multiprecision) #:use-module (gnu packages ncurses) #:use-module (gnu packages networking) @@ -2114,3 +2116,59 @@ analysis of financial market data.") format used by SWIFT. It returns smart Python collections for statistics and manipulation.") (license license:bsd-3))) + +(define-public xmrig + (package + (name "xmrig") + (version "6.18.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/xmrig/xmrig") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 (base32 "1ncnfjpjwjdv29plyiam2nh01bfni49sgfi3qkijygi1450w71dx")) + (modules '((guix build utils))) + (snippet + ;; TODO: Try to use system libraries instead of bundled ones in + ;; "src/3rdparty/". It requires changes to some "cmake/..." scripts + ;; and to some source files. + #~(substitute* "src/donate.h" + (("constexpr const int kDefaultDonateLevel = 1;") + "constexpr const int kDefaultDonateLevel = 0;") + (("constexpr const int kMinimumDonateLevel = 1;") + "constexpr const int kMinimumDonateLevel = 0;"))))) + (build-system cmake-build-system) + (inputs + (list + `(,hwloc "lib") + libuv + openssl)) + (arguments + (list + ;; There are no tests. + #:tests? #f + #:phases + #~(modify-phases + %standard-phases + (replace 'install + ;; There is no 'install' target, we must install xmrig manually + (lambda* (#:key #:allow-other-keys) + (install-file "xmrig" + (string-append #$output "/bin"))))))) + (home-page "https://xmrig.com/") + (synopsis "Monero miner") + (description + "XMRig is a high performance, cross platform RandomX, KawPow, +CryptoNight, AstroBWT and GhostRider unified CPU/GPU miner and RandomX +benchmark. + +Warning: upstream, by default, receives a percentage of the mining time. This +anti-functionality has been neutralised in Guix, but possibly not in all other +distributions. + +Warning: this software, because of it's nature, has high energy consumption. +Also, the energy expenses might be higher that the cryptocurrency gained by +mining.") + (license license:gpl3+))) -- cgit 1.4.1 From fc408acd61022d1db366bd1cec9ba1537773dfa1 Mon Sep 17 00:00:00 2001 From: Justin Veilleux Date: Fri, 12 Aug 2022 14:59:42 +0200 Subject: gnu: Add p2pool. * gnu/packages/finance.scm (p2pool): New variable. Co-authored-by: Guillaume Le Vaillant --- gnu/packages/finance.scm | 46 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 44 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 9a5b8b1c20..55a2dd9580 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -83,12 +83,13 @@ #:use-module (gnu packages emacs-xyz) #:use-module (gnu packages dbm) #:use-module (gnu packages gettext) - #:use-module (gnu packages gnome) - #:use-module (gnu packages golang) #:use-module (gnu packages glib) + #:use-module (gnu packages gnome) #:use-module (gnu packages gnupg) + #:use-module (gnu packages golang) #:use-module (gnu packages graphviz) #:use-module (gnu packages groff) + #:use-module (gnu packages gsasl) #:use-module (gnu packages gtk) #:use-module (gnu packages haskell-check) #:use-module (gnu packages haskell-web) @@ -2172,3 +2173,44 @@ Warning: this software, because of it's nature, has high energy consumption. Also, the energy expenses might be higher that the cryptocurrency gained by mining.") (license license:gpl3+))) + +(define-public p2pool + (package + (name "p2pool") + (version "2.2.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/SChernykh/p2pool") + (commit (string-append "v" version)) + (recursive? #t))) + (file-name (git-file-name name version)) + (sha256 (base32 "19pn7axj96yvza2x7678rs79c2vgmhl8d7f9ki72v2n6l2630fw8")) + (modules '((guix build utils))) + (snippet + #~(for-each delete-file-recursively + '("external/lib" + "external/src/cppzmq" + "external/src/curl" + "external/src/libuv" + "external/src/libzmq" + "external/src/rapidjson"))))) + (build-system cmake-build-system) + (inputs + (list cppzmq curl gss libuv rapidjson zeromq)) + (arguments + (list + #:tests? #f + #:phases + #~(modify-phases %standard-phases + (replace 'install + (lambda _ + (install-file "p2pool" (string-append #$output "/bin"))))))) + (home-page "https://p2pool.io/") + (synopsis "Decentralized Monero mining pool") + (description "Monero P2Pool is a peer-to-peer Monero mining pool. P2Pool +combines the advantages of pool and solo mining; you still fully control your +Monero node and what it mines, but you get frequent payouts like on a regular +pool.") + (license license:gpl3))) -- cgit 1.4.1 From eecb5efad92b8f7cb5bbea0be66c4707a749512c Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 12 Aug 2022 17:33:00 +0200 Subject: gnu: monero-gui: Fix path to p2pool. Fixes . * gnu/packages/finance.scm (monero-gui)[inputs]: Add p2pool. [arguments]: Add 'fix-p2pool-path' phase. --- gnu/packages/finance.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 55a2dd9580..c72d7a1429 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -837,6 +837,7 @@ the Monero command line client and daemon.") (modify-inputs (package-inputs monero) (append libgcrypt monero + p2pool qtbase-5 qtdeclarative-5 qtgraphicaleffects @@ -870,6 +871,17 @@ the Monero command line client and daemon.") (string-append "set(CMAKE_C_FLAGS \"${CMAKE_C_FLAGS} -fPIC\")\n" all))))) + (add-after 'unpack 'fix-p2pool-path + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "src/p2pool/P2PoolManager.cpp" + ;; Location for files created by P2Pool + (("m_p2poolPath = QApplication::applicationDirPath\\(\\);") + "m_p2poolPath = QStandardPaths::writableLocation(QStandardPaths::CacheLocation);") + ;; Location of p2pool program + (("m_p2pool = m_p2poolPath \\+ \"/p2pool\";") + (string-append "m_p2pool = \"" + (search-input-file inputs "/bin/p2pool") + "\";"))))) (replace 'install (lambda _ (let ((bin (string-append #$output "/bin"))) -- cgit 1.4.1 From ecc2587f1f2c4bd693f1f08a9f681a3d829d0289 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 7 Aug 2022 02:00:00 +0200 Subject: gnu: tor: Update to 0.4.7.10. * gnu/packages/tor.scm (tor): Update to 0.4.7.10. --- gnu/packages/tor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm index a6a1f4edfb..8648447ee2 100644 --- a/gnu/packages/tor.scm +++ b/gnu/packages/tor.scm @@ -60,14 +60,14 @@ (define-public tor (package (name "tor") - (version "0.4.7.9") + (version "0.4.7.10") (source (origin (method url-fetch) (uri (string-append "https://dist.torproject.org/tor-" version ".tar.gz")) (sha256 (base32 - "08lva4jrash1fhq8vim56alria5kfganmp3y3lhddx08h9cki7fk")))) + "0nss8g6hx42nqiir6l03dj15r433fvygq9r00nmnv8wylpgmczk4")))) (build-system gnu-build-system) (arguments (list #:configure-flags -- cgit 1.4.1 From a6b6b0e89e6a3aefa0241de9f171424ad99be30c Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 11 Aug 2022 22:59:45 -0400 Subject: gnu: Add tesseract-ocr-tessdata-fast. * gnu/packages/ocr.scm (tesseract-ocr-tessdata-fast): New variable. --- gnu/packages/ocr.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ocr.scm b/gnu/packages/ocr.scm index e28bd17668..e2c9f561cc 100644 --- a/gnu/packages/ocr.scm +++ b/gnu/packages/ocr.scm @@ -29,6 +29,7 @@ #:use-module (guix gexp) #:use-module (guix git-download) #:use-module (guix build-system cmake) + #:use-module (guix build-system copy) #:use-module (guix build-system gnu) #:use-module (guix build-system python) #:use-module (gnu packages) @@ -74,6 +75,32 @@ feature extraction method. It can read images in PBM, PGM or PPM formats and it produces text in 8-bit or UTF-8 formats.") (license license:gpl3+))) +(define-public tesseract-ocr-tessdata-fast + (package + (name "tesseract-ocr-tessdata-fast") + (version "4.1.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tesseract-ocr/tessdata_fast") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1m310cpb87xx8l8q7jy9fvzf6a0m8rm0dmjpbiwhc2mi6w4gn084")))) + (build-system copy-build-system) + (arguments (list #:install-plan #~'(("." "share/tesseract-ocr/tessdata")) + #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'delete-broken-links + (lambda _ + (delete-file "configs") + (delete-file "pdf.ttf")))))) + (home-page "https://github.com/tesseract-ocr/tessdata_fast") + (synopsis "Fast integer versions of trained LSTM models") + (description "This repository contains fast integer versions of trained +models for the Tesseract OCR Engine.") + (license license:asl2.0))) + (define-public tesseract-ocr (package (name "tesseract-ocr") -- cgit 1.4.1 From ff0600c5efb519925c270e9f54f43ecf096e564e Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 11 Aug 2022 23:58:24 -0400 Subject: gnu: tesseract-ocr: Make the default install minimally useful. Fixes . * gnu/packages/ocr.scm (tesseract-ocr) [phases]{adjust-TESSDATA_PREFIX-macro}: New phase. {install-minimal-tessdata}: New phase. [native-inputs]: Add tesseract-ocr-tessdata-fast. [search-paths]: New field. [description]: Mention how to add support for more languages. --- gnu/packages/ocr.scm | 33 ++++++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ocr.scm b/gnu/packages/ocr.scm index e2c9f561cc..21d257ef24 100644 --- a/gnu/packages/ocr.scm +++ b/gnu/packages/ocr.scm @@ -132,6 +132,15 @@ models for the Tesseract OCR Engine.") (substitute* "configure.ac" (("AC_SUBST\\(\\[XML_CATALOG_FILES])") "")))) + (add-after 'unpack 'adjust-TESSDATA_PREFIX-macro + (lambda _ + ;; Use a deeper TESSDATA_PREFIX hierarchy so that a more + ;; specific search-path than '/share' can be specified. The + ;; build system uses CPPFLAGS for itself, so we can't simply set + ;; a make flag. + (substitute* "Makefile.am" + (("-DTESSDATA_PREFIX='\"@datadir@\"'") + "-DTESSDATA_PREFIX='\"@datadir@/tesseract-ocr\"'")))) (add-after 'build 'build-training (lambda* (#:key parallel-build? #:allow-other-keys) (define n (if parallel-build? (number->string @@ -140,7 +149,18 @@ models for the Tesseract OCR Engine.") (invoke "make" "-j" n "training"))) (add-after 'install 'install-training (lambda _ - (invoke "make" "training-install")))))) + (invoke "make" "training-install"))) + (add-after 'install 'install-minimal-tessdata + ;; tesseract-ocr cannot be used without its trained models data; + ;; install the English language as a minimal base which can be + ;; extended via TESSDATA_PREFIX. + (lambda* (#:key native-inputs inputs #:allow-other-keys) + (define eng.traineddata + "/share/tesseract-ocr/tessdata/eng.traineddata") + (install-file (search-input-file (or native-inputs inputs) + eng.traineddata) + (dirname (string-append #$output + eng.traineddata)))))))) (native-inputs (list asciidoc autoconf @@ -152,13 +172,18 @@ models for the Tesseract OCR Engine.") libtool libxml2 ;for XML_CATALOG_FILES libxslt - pkg-config)) + pkg-config + tesseract-ocr-tessdata-fast)) (inputs (list cairo icu4c leptonica pango python-wrapper)) + (native-search-paths (list (search-path-specification + (variable "TESSDATA_PREFIX") + (files (list "share/tesseract-ocr/tessdata")) + (separator #f)))) ;single value (home-page "https://github.com/tesseract-ocr/tesseract") (synopsis "Optical character recognition engine") (description @@ -166,7 +191,9 @@ models for the Tesseract OCR Engine.") high accuracy. It supports many languages, output text formatting, hOCR positional information and page layout analysis. Several image formats are supported through the Leptonica library. It can also detect whether text is -monospaced or proportional.") +monospaced or proportional. Support for the English language is included by +default. To add support for more languages, the +@code{tesseract-ocr-tessdata-fast} package should be installed.") (license license:asl2.0))) (define-public gimagereader -- cgit 1.4.1 From 247c02485bf3f2548b91f7f3fa1c85ece7103118 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 12 Aug 2022 21:45:06 +0300 Subject: gnu: libfido2: Use https for source uri. * gnu/packages/security-token.scm (libfido2)[source]: Rewrite using https. --- gnu/packages/security-token.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm index ef7085d35e..19ef486eac 100644 --- a/gnu/packages/security-token.scm +++ b/gnu/packages/security-token.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014, 2021 Ludovic Courtès -;;; Copyright © 2016, 2021 Efraim Flashner +;;; Copyright © 2016, 2021, 2022 Efraim Flashner ;;; Copyright © 2016 Mike Gerwitz ;;; Copyright © 2016 Marius Bakke ;;; Copyright © 2017 Thomas Danckaert @@ -896,7 +896,7 @@ phone is required.") (origin (method git-fetch) (uri (git-reference - (url "git://github.com/Yubico/libfido2") + (url "https://github.com/Yubico/libfido2") (commit version))) (file-name (git-file-name name version)) (sha256 (base32 "12zy4cnlcffcb64lsx8198y09j1dwi0bcn9rr82q6i1k950yzd3p")))) -- cgit 1.4.1 From f0e5d0329b32d8c74208c4958a2f8649f39457a7 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 12 Aug 2022 21:48:19 +0300 Subject: gnu: libfido2: Update to 1.11.0. * gnu/packages/security-token.scm (libfido2): Update to 1.11.0. --- gnu/packages/security-token.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm index 19ef486eac..2db387b0aa 100644 --- a/gnu/packages/security-token.scm +++ b/gnu/packages/security-token.scm @@ -891,7 +891,7 @@ phone is required.") (define-public libfido2 (package (name "libfido2") - (version "1.9.0") + (version "1.11.0") (source (origin (method git-fetch) @@ -899,7 +899,7 @@ phone is required.") (url "https://github.com/Yubico/libfido2") (commit version))) (file-name (git-file-name name version)) - (sha256 (base32 "12zy4cnlcffcb64lsx8198y09j1dwi0bcn9rr82q6i1k950yzd3p")))) + (sha256 (base32 "1nk4irmdg36930lgc892qmlmd4whz4fq37wknkdx5ap57i5x18i6")))) (native-inputs (list pkg-config)) (inputs (list eudev libcbor openssl zlib)) (build-system cmake-build-system) -- cgit 1.4.1 From ca62b08cfa8f1363389c1400cd2ed9cbdf67b4c4 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 12 Aug 2022 23:30:46 +0300 Subject: gnu: perl-file-listing: Update to 6.15. * gnu/packages/web.scm (perl-file-listing): Update to 6.15. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 8b41477014..7eeff4349b 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -3101,7 +3101,7 @@ RSS 0.91, RSS 1.0, RSS 2.0, Atom.") (define-public perl-file-listing (package (name "perl-file-listing") - (version "6.11") + (version "6.15") (source (origin (method url-fetch) (uri (string-append @@ -3109,7 +3109,7 @@ RSS 0.91, RSS 1.0, RSS 2.0, Atom.") version ".tar.gz")) (sha256 (base32 - "0vmzw1mhv580flzkla80gvwfpficnhlbqr1dnlf9x50bw7n18k62")))) + "033p2ckkjbxrl390x8aq4wq4fpj5aidsazkbw82mhqxrksgzpi26")))) (build-system perl-build-system) (propagated-inputs (list perl-http-date)) -- cgit 1.4.1 From e1168cadcc0a7763b0a7bb3749a60e42090219af Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 12 Aug 2022 23:30:46 +0300 Subject: gnu: perl-http-cookies: Update to 6.10. * gnu/packages/web.scm (perl-http-cookies): Update to 6.10. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 7eeff4349b..177b0175ae 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -3435,7 +3435,7 @@ jar in conformance with RFC 6265 .") (define-public perl-http-cookies (package (name "perl-http-cookies") - (version "6.06") + (version "6.10") (source (origin (method url-fetch) (uri (string-append @@ -3443,7 +3443,7 @@ jar in conformance with RFC 6265 .") version ".tar.gz")) (sha256 (base32 - "13rnz3233vbsfariya4njiyfaj6k94j6bvlyh3dmfmh24hpqgx77")))) + "01vhppq18g6ppn3z9mvdfghfzibwg1sczzvnp3jbbrjw7iikcvz3")))) (build-system perl-build-system) (propagated-inputs (list perl-http-message)) -- cgit 1.4.1 From 7e048358f5c2c05152c06f02e2d53af5af623a9f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 12 Aug 2022 23:30:47 +0300 Subject: gnu: perl-libwww: Update to 6.67. * gnu/packages/web.scm (perl-libwww): Update to 6.67. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 177b0175ae..c00447388e 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -3795,7 +3795,7 @@ select or poll.") (define-public perl-libwww (package (name "perl-libwww") - (version "6.55") + (version "6.67") (source (origin (method url-fetch) (uri (string-append @@ -3803,7 +3803,7 @@ select or poll.") version ".tar.gz")) (sha256 (base32 - "0869hn711d6fd6yil8p88wij6p1zdrbnycy7p9p176q39ajd7l61")))) + "08xp4q90nkvpwnks2qfqjhqgff6447myayqi6kc1panh7w5c9vln")))) (build-system perl-build-system) (native-inputs (list perl-test-fatal perl-test-needs perl-test-requiresinternet)) -- cgit 1.4.1 From 4331497e1938e76eb7d035754d18561da47d8c2f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 12 Aug 2022 23:30:47 +0300 Subject: gnu: perl-net-http: Update to 6.22. * gnu/packages/web.scm (perl-net-http): Update to 6.22. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index c00447388e..a05df8a3bf 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4024,7 +4024,7 @@ is limited to http and https.") (define-public perl-net-http (package (name "perl-net-http") - (version "6.21") + (version "6.22") (source (origin (method url-fetch) (uri (string-append @@ -4032,7 +4032,7 @@ is limited to http and https.") "Net-HTTP-" version ".tar.gz")) (sha256 (base32 - "1i7fk6q1iaxzgf82mjd5hg77hvy7dbb79488cijg16dyfrds6nip")))) + "18m1b1274wmsl3cdfwg27pm7s1fgrrlhwy4gw4zl8da2p2jzkyk2")))) (build-system perl-build-system) (propagated-inputs (list perl-io-socket-ssl perl-uri)) -- cgit 1.4.1 From c20a61a8aba3e1de1af7590ee321f22bcd715ed0 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 12 Aug 2022 23:35:46 +0300 Subject: gnu: perl-test-simple: Update to 1.302191. * gnu/packages/perl-check.scm (perl-test-simple): Update to 1.302191. --- gnu/packages/perl-check.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/perl-check.scm b/gnu/packages/perl-check.scm index bde3079bef..6562390d20 100644 --- a/gnu/packages/perl-check.scm +++ b/gnu/packages/perl-check.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2016 Ben Woodcroft ;;; Copyright © 2016 Ricardo Wurmus ;;; Copyright © 2016 Nikita -;;; Copyright © 2016, 2017, 2019, 2021 Efraim Flashner +;;; Copyright © 2016, 2017, 2019, 2021, 2022 Efraim Flashner ;;; Copyright © 2016, 2017 Alex Sassmannshausen ;;; Copyright © 2016, 2017 Marius Bakke ;;; Copyright © 2017 Leo Famulari @@ -1288,14 +1288,14 @@ makes fork(2) safe to use in test cases.") (define-public perl-test-simple (package (name "perl-test-simple") - (version "1.302183") + (version "1.302191") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/E/EX/EXODIST/" "Test-Simple-" version ".tar.gz")) (sha256 (base32 - "1zq6841yrwxmrmhgzmzx0njlymsv9mzl6l5njabfl2j2xjjvs0ws")))) + "1ax7qlmkgy5b78vap8k6c0w3ajljz304zl4rmvf1vvzjqhmnabx8")))) (build-system perl-build-system) (synopsis "Basic utilities for writing tests") (description -- cgit 1.4.1 From b1ff8f33db27c081408451c5d74eee7df5853def Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 12 Aug 2022 23:36:50 +0300 Subject: gnu: perl-data-optlist: Update to 0.112. * gnu/packages/perl.scm (perl-data-optlist): Update to 0.112. --- gnu/packages/perl.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index a152f7de6f..f9a95e818d 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2015 Eric Dvorsak ;;; Copyright © 2016, 2018 Mark H Weaver ;;; Copyright © 2016 Jochem Raat -;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Efraim Flashner +;;; Copyright © 2016-2022 Efraim Flashner ;;; Copyright © 2016 Nikita ;;; Copyright © 2016 Alex Sassmannshausen ;;; Copyright © 2016, 2018, 2020, 2021 Roel Janssen @@ -2687,7 +2687,7 @@ point values at a low level.") (define-public perl-data-optlist (package (name "perl-data-optlist") - (version "0.110") + (version "0.112") (source (origin (method url-fetch) @@ -2696,7 +2696,7 @@ point values at a low level.") version ".tar.gz")) (sha256 (base32 - "1hzmgr2imdg1fc3hmwx0d56fhsdfyrgmgx7jb4jkyiv6575ifq9n")))) + "1arv203h6c4b3y5q49xzmn2cz21kn108kk3bwfd37mc8mv50rik2")))) (build-system perl-build-system) (propagated-inputs (list perl-sub-install perl-params-util)) -- cgit 1.4.1 From bf35cded1837a97be93524046e4c9cc63f3b85f5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 7 Aug 2022 02:00:01 +0200 Subject: gnu: mu: Update to 1.8.8. * gnu/packages/mail.scm (mu): Update to 1.8.8. --- gnu/packages/mail.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index b6712cb668..9b2fe87fa4 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1160,7 +1160,7 @@ security functionality including PGP, S/MIME, SSH, and SSL.") (define-public mu (package (name "mu") - (version "1.8.7") + (version "1.8.8") (source (origin (method git-fetch) (uri (git-reference @@ -1169,7 +1169,7 @@ security functionality including PGP, S/MIME, SSH, and SSL.") (file-name (git-file-name name version)) (sha256 (base32 - "0yfbw234yqnqfnsn5bj1hqwpy78pkxn05vl18z8nvsqdmpzal4gx")))) + "1wfvssfd3fqgncs9jrysr4gsflb6l5m819imijj49k1s0dwj82wj")))) (build-system meson-build-system) (native-inputs (list pkg-config -- cgit 1.4.1 From 42efa9fc7a3c15a5d2b4a7f3a80a68faaa571001 Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Thu, 7 Jul 2022 13:43:47 -0300 Subject: gnu: homebank: Update to 5.5.6. * gnu/packages/finance.scm (homebank): Update to 5.5.6. --- gnu/packages/finance.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index c72d7a1429..bc886d9914 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -283,14 +283,14 @@ Accounting.") (define-public homebank (package (name "homebank") - (version "5.5.5") + (version "5.5.6") (source (origin (method url-fetch) (uri (string-append "http://homebank.free.fr/public/homebank-" version ".tar.gz")) (sha256 (base32 - "0rwykjpv4w7bffyvx2j6py17nxw9jcbml7ma4is194i3npn0bkmy")))) + "1nn75wzk9h82zsakxng1v94nlg7hq3ssicvskl1m5hg4fa68w3j6")))) (build-system glib-or-gtk-build-system) (native-inputs (list pkg-config intltool)) -- cgit 1.4.1 From d32737f7f04b1b7bb4bff2639fc1fc1abb449825 Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Thu, 7 Jul 2022 13:44:19 -0300 Subject: gnu: openxr: Update to 1.0.24. * gnu/packages/graphics.scm (openxr): Update to 1.0.24. --- gnu/packages/graphics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 4e0961b9e4..51177dc966 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -2045,7 +2045,7 @@ Some feature highlights: (define-public openxr (package (name "openxr") - (version "1.0.23") + (version "1.0.24") (source (origin (method git-fetch) @@ -2059,7 +2059,7 @@ Some feature highlights: ;; Delete bundled jsoncpp. (delete-file-recursively "src/external/jsoncpp"))) (sha256 - (base32 "11w5a2ny30r8jghd5jwdxi5b2c84m21fmkp0lhpicbrwr98xgpj3")))) + (base32 "1lkbw03hpwnqcbn0fmxs4cnp5m04hc0ys6y111n7vlrg11sjdpq5")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) ; there are no tests -- cgit 1.4.1 From b2ba54d007ecaf05824f60d8e8f2b98e9a927641 Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Thu, 7 Jul 2022 13:45:20 -0300 Subject: gnu: mixxx: Update to 2.3.3. * gnu/packages/music.scm (mixxx): Update to 2.3.3. --- gnu/packages/music.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index dcc1a43d2d..4245401740 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2181,7 +2181,7 @@ users to select LV2 plugins and run them with jalv.") (define-public mixxx (package (name "mixxx") - (version "2.3.2") + (version "2.3.3") (source (origin (method git-fetch) @@ -2193,7 +2193,7 @@ users to select LV2 plugins and run them with jalv.") (search-patches "mixxx-link-qtscriptbytearray-qtscript.patch" "mixxx-system-googletest-benchmark.patch")) (sha256 - (base32 "1h26vpf60rk56fsw1nvmxihg7ammlj8q4zgim49q4s4ww7j8wwqj")) + (base32 "0zrmy97lk0xdfnlvygshr8vradypmnypki3s1mhc296xhq96n6rm")) (modules '((guix build utils))) (snippet ;; Delete libraries that we already have or don't need. -- cgit 1.4.1 From 4b88fe049f3a194726dd8f303112efebf2d41f56 Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Mon, 18 Jul 2022 12:40:47 -0300 Subject: gnu: python-wand: Update to 0.6.9. * gnu/packages/python-xyz.scm (python-wand): Update to 0.6.9. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 9422bf2866..ffa71d1330 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1792,13 +1792,13 @@ conventions and aliases in the same expression.") (define-public python-wand (package (name "python-wand") - (version "0.6.7") + (version "0.6.9") (source (origin (method url-fetch) (uri (pypi-uri "Wand" version)) (sha256 - (base32 "1nxn7zvbnfgk4kkxajbzglcjpbgr84ilhnxm990nifjxqb61ph7b")))) + (base32 "1g5midlhff2yy64ppiq7mvmy5dssg82mi3rjpvym7nx85644w9s0")))) (build-system python-build-system) (arguments `(#:phases -- cgit 1.4.1 From ab959f8a117b7d041e6c89fa2ab989412c4aef74 Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Sun, 10 Jul 2022 17:46:22 -0300 Subject: gnu: mlt: Update to 7.8.0. * gnu/packages/video.scm (mlt): Update to 7.8.0. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 6d0b5ccb58..dcd58d5e02 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -3150,7 +3150,7 @@ from sites like Twitch.tv and pipes them into a video player of choice.") (define-public mlt (package (name "mlt") - (version "7.6.0") + (version "7.8.0") (source (origin (method git-fetch) @@ -3159,7 +3159,7 @@ from sites like Twitch.tv and pipes them into a video player of choice.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1dj7jb5nk0qy28mlw0pcmj4nd607mgx229nhf14gjc0fq9gx71sd")))) + (base32 "01589xpx1vgx1l1zjg553nbjks5wy31rdvyq1sjnbp9w7p7nzjdg")))) (build-system cmake-build-system) (arguments (list -- cgit 1.4.1 From c7f3cdb78e800f17d9bb04cc01b3e62202ca6720 Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Mon, 18 Jul 2022 12:50:42 -0300 Subject: gnu: shotcut: Update to 22.06.23. * gnu/packages/video.scm (shotcut): Update to 22.06.23. [arguments]: Do not replace the 'configure phase as Shotcut switched to the CMake build system in this version. [inputs]: Add fftw. --- gnu/packages/video.scm | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index dcd58d5e02..68f129dee7 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -4804,7 +4804,7 @@ transitions, and effects and then export your film to many common formats.") (define-public shotcut (package (name "shotcut") - (version "22.04.25") + (version "22.06.23") (source (origin (method git-fetch) @@ -4813,7 +4813,7 @@ transitions, and effects and then export your film to many common formats.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0ccbx2crqrnhl19d7267xc40vs0cjmps2cnhi1g1l6bqxbi7k88x")))) + (base32 "1kvhcblzjdjiv3jggdx41djq9pz6a9hg4ilgcwin13gb19ir7dcc")))) (build-system qt-build-system) (arguments `(#:tests? #f ;there are no tests @@ -4830,14 +4830,6 @@ transitions, and effects and then export your film to many common formats.") (substitute* "src/jobs/meltjob.cpp" (("\"melt\"") (string-append "\"" mlt "/bin/melt\"")) (("\"melt-7\"") (string-append "\"" mlt "/bin/melt-7\"")))))) - (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out"))) - (invoke "qmake" - (string-append "PREFIX=" out) - "QMAKE_LRELEASE=lrelease" - "QMAKE_LUPDATE=lupdate" - "shotcut.pro")))) (add-after 'install 'wrap-executable (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -4862,6 +4854,7 @@ transitions, and effects and then export your film to many common formats.") (inputs (list bash-minimal ffmpeg + fftw frei0r-plugins jack-1 ladspa -- cgit 1.4.1 From 0fc2027e16ac23934e70955730df441c08c46d60 Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Fri, 12 Aug 2022 07:26:06 -0300 Subject: gnu: freecad: Update to 0.20.1. * gnu/packages/engineering.scm (freecad): Update to 0.20.1. --- gnu/packages/engineering.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index ed87cd8d6a..f350da0042 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -2438,7 +2438,7 @@ comments."))) (define-public freecad (package (name "freecad") - (version "0.20") + (version "0.20.1") (source (origin (method git-fetch) @@ -2447,7 +2447,7 @@ comments."))) (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "14bn75bjh93f8k3hinqw913z1q0ywq7niklwbbd99hf5n342hsv4")))) + (base32 "1pgkjlahisqjvi3dd7ywj1zwhsl3wn3p15sifbmrdfdmw9is3z2b")))) (build-system qt-build-system) (native-inputs (list doxygen -- cgit 1.4.1 From 887a5fd5a36172b9d996d2118753cc3a50e6d4b0 Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Sat, 13 Aug 2022 01:28:16 -0300 Subject: gnu: pre-commit: Update to 2.20.0. * gnu/packages/version-control.scm (pre-commit): Update to 2.20.0. --- gnu/packages/version-control.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 9bf5ac76df..294a35ad40 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1657,7 +1657,7 @@ visualize your public Git repositories on a web interface.") (define-public pre-commit (package (name "pre-commit") - (version "2.19.0") + (version "2.20.0") (source (origin (method git-fetch) ; no tests in PyPI release @@ -1666,7 +1666,7 @@ visualize your public Git repositories on a web interface.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "102z1n6wjrmk5h4p59l929bi0r91bl3vz62j4k6sz2j7k0a791g5")))) + (base32 "19jcg6nfnscp87h4wmbpw6r3lc8c75zkvb6wqgavq5dh7wkyg6pq")))) (build-system python-build-system) (arguments `(#:phases -- cgit 1.4.1 From a491f25166ddf28c831a160ba8b864f77e3b8dea Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Sat, 13 Aug 2022 16:45:33 +0530 Subject: gnu: Add cpp-mustache. * gnu/packages/cpp.scm (cpp-mustache): New variable. --- gnu/packages/cpp.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 1c9e57fb1c..e6d734010d 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -1871,3 +1871,37 @@ std::filesystem compatible helper library, based on the C++17 and C++20 specs, but implemented for C++11, C++14, C++17 or C++20.") (home-page "https://github.com/gulrak/filesystem") (license license:expat))) + +(define-public cpp-mustache + (package + (name "cpp-mustache") + (version "4.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/kainjow/Mustache") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0r9rbk6v1wpld2ismfsk2lkhbyv3dkf0p03hkjivbj05qkfhvlbb")))) + (build-system cmake-build-system) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "./mustache")))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (install-file "../source/mustache.hpp" + (string-append (assoc-ref outputs "out") + "/include"))))))) + (home-page "https://github.com/kainjow/Mustache") + (synopsis "Mustache text templates for modern C++") + (description "@code{cpp-mustache} is a Mustache implementation for C++ 11 +and above. It is header only and has zero dependencies. It provides a +templated string type for compatibility with any STL-like string (std::string, +std::wstring, etc).") + (license license:boost1.0))) -- cgit 1.4.1 From 1e51cb37fb15c5d66a536dea7981c982915400b6 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Sat, 13 Aug 2022 16:46:22 +0530 Subject: gnu: libzim: Update to 8.0.0. * gnu/packages/web.scm (libzim): Update to 8.0.0. [inputs]: Remove labels. Sort. --- gnu/packages/web.scm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index a05df8a3bf..c4eac670e8 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -7952,7 +7952,7 @@ concurrency, and return status.") (define-public libzim (package (name "libzim") - (version "6.3.2") + (version "8.0.0") (source (origin (method git-fetch) (uri (git-reference @@ -7960,19 +7960,19 @@ concurrency, and return status.") (commit version))) (sha256 (base32 - "00kc4qc0a69jh1jwk5xhi567b7ffpc3p38ffrf2xaax4hvpjwmn6")) + "1a7wj8kmpx5aqx0wsfcnaqlfsf1gr66iqxyn24cgjnk4d1rjsahm")) (file-name (git-file-name name version)))) (build-system meson-build-system) (arguments ;; TODO: Find out why tests fail. '(#:tests? #f)) (inputs - `(("icu4c" ,icu4c) - ("liblzma" ,xz) - ("libuuid" ,util-linux "lib") - ("python" ,python-wrapper) ;for libzim-compile-resources - ("xapian" ,xapian) - ("zstd" ,zstd "lib"))) + (list icu4c + python-wrapper ; for libzim-compile-resources + xapian + xz + (list util-linux "lib") + (list zstd "lib"))) (native-inputs (list pkg-config googletest)) (home-page "https://wiki.openzim.org/wiki/Main_Page") -- cgit 1.4.1 From ff564de64cdd4bd3d6d578b0beeefef1d062e68f Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Sat, 13 Aug 2022 16:47:31 +0530 Subject: gnu: kiwix-lib: Update to 11.0.0. * gnu/packages/web.scm (kiwix-lib): Update to 11.0.0. [arguments]: Do not explicitly pass mustache path to CPPFLAGS. Do not return #t from phases. Use search-input-file. [native-inputs]: Remove labels. Use cpp-mustache package instead of its source. --- gnu/packages/web.scm | 28 +++++++++------------------- 1 file changed, 9 insertions(+), 19 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index c4eac670e8..8c7df5af1e 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -109,6 +109,7 @@ #:use-module (gnu packages boost) #:use-module (gnu packages check) #:use-module (gnu packages compression) + #:use-module (gnu packages cpp) #:use-module (gnu packages crates-gtk) #:use-module (gnu packages crates-io) #:use-module (gnu packages curl) @@ -7986,7 +7987,7 @@ for ZIM files.") (define-public kiwix-lib (package (name "kiwix-lib") - (version "9.4.1") + (version "11.0.0") (home-page "https://github.com/kiwix/kiwix-lib/") (source (origin (method git-fetch) @@ -7995,7 +7996,7 @@ for ZIM files.") (commit version))) (sha256 (base32 - "034nk6l623v78clrs2d0k1vg69sbzrd8c0q79qiqmlkinck1nkxw")) + "1w5dabzvd3cnhw064qf9166476fszkkxjcml21x35av0dcd1vlk6")) (file-name (git-file-name name version)))) (build-system meson-build-system) (arguments @@ -8003,13 +8004,11 @@ for ZIM files.") (modify-phases %standard-phases (add-before 'configure 'fix-paths-and-includes (lambda* (#:key inputs #:allow-other-keys) - (setenv "CPPFLAGS" (string-append "-I" (assoc-ref inputs "mustache"))) (substitute* "src/aria2.cpp" (("ARIA2_CMD \"aria2c\"") (string-append "ARIA2_CMD \"" - (assoc-ref inputs "aria2") - "/bin/aria2c\""))) - #t))))) + (search-input-file inputs "/bin/aria2c") + "\"")))))))) (inputs (list aria2 curl @@ -8021,19 +8020,10 @@ for ZIM files.") zlib `(,zstd "lib"))) (native-inputs - `(("mustache" ,(origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/kainjow/Mustache") - ;; XXX: Readme says to use version 3. Can we use 3.2.1? - (commit "v4.1"))) - (file-name (git-file-name "mustache" "4.1")) - (sha256 - (base32 - "0r9rbk6v1wpld2ismfsk2lkhbyv3dkf0p03hkjivbj05qkfhvlbb")))) - ("pkg-config" ,pkg-config) - ;; for kiwix-compile-resources - ("python" ,python-wrapper))) + (list cpp-mustache + pkg-config + ;; for kiwix-compile-resources + python-wrapper)) (synopsis "Common code base for all Kiwix ports") (description "The Kiwix library provides the Kiwix software suite core. It contains the code shared by all Kiwix ports.") -- cgit 1.4.1 From 93d8523487ee869dc4950fdab06659f6dc919ec2 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Sat, 13 Aug 2022 16:50:53 +0530 Subject: gnu: kiwix-desktop: Update to 2.2.2. * gnu/packages/web.scm (kiwix-desktop): Update to 2.2.2. [arguments]: Delete enable-print-support and substitute-source phases. Use search-input-file. Do not return #t from phases. [native-inputs]: Remove labels. --- gnu/packages/web.scm | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 8c7df5af1e..6f506dc490 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -8032,7 +8032,7 @@ It contains the code shared by all Kiwix ports.") (define-public kiwix-desktop (package (name "kiwix-desktop") - (version "2.0.5") + (version "2.2.2") (source (origin (method url-fetch) (uri (string-append @@ -8041,7 +8041,7 @@ It contains the code shared by all Kiwix ports.") ".tar.gz")) (sha256 (base32 - "1a9h4qmh6fkfscyp6lax0ri07dvvzw2wp4kr1sm86n0bdk3cwwha")))) + "0ani12d91azcwwys499848ws7rx0m7c23nalcm5fanjak76bg6n6")))) (build-system gnu-build-system) (arguments `(#:phases @@ -8051,28 +8051,14 @@ It contains the code shared by all Kiwix ports.") (invoke "qmake" (string-append "PREFIX=" (assoc-ref outputs "out"))))) - (add-before 'configure 'enable-print-support - (lambda _ - (substitute* "kiwix-desktop.pro" - (("webenginewidgets") "webenginewidgets printsupport")) - #t)) - (add-before 'configure 'substitute-source - ;; Looks like .pro file is missing a feature. - ;; See https://github.com/kiwix/kiwix-desktop/issues/556. - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "kiwix-desktop.pro" - (("webenginewidgets" all) (string-append all " printsupport"))) - #t)) (add-after 'install 'wrap-qt-process-path (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (bin (string-append out "/bin/kiwix-desktop")) - (qt-process-path (string-append - (assoc-ref inputs "qtwebengine-5") - "/lib/qt5/libexec/QtWebEngineProcess"))) + (qt-process-path (search-input-file + inputs "/lib/qt5/libexec/QtWebEngineProcess"))) (wrap-program bin - `("QTWEBENGINEPROCESS_PATH" = (,qt-process-path))) - #t)))))) + `("QTWEBENGINEPROCESS_PATH" = (,qt-process-path))))))))) (inputs (list curl icu4c @@ -8088,8 +8074,8 @@ It contains the code shared by all Kiwix ports.") zlib `(,zstd "lib"))) (native-inputs - `(("pkg-config" ,pkg-config) - ("qmake" ,qtbase-5))) + (list pkg-config + qtbase-5)) (home-page "https://wiki.kiwix.org/wiki/Software") (synopsis "Viewer and manager of ZIM files") (description "Kiwix Desktop allows you to enjoy a lot of different content -- cgit 1.4.1 From 2691bac7fdfb7689cec97b200b61a66ddca8d523 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Sat, 13 Aug 2022 16:52:25 +0530 Subject: gnu: kiwix-tools: Update to 3.3.0. * gnu/packages/web.scm (kiwix-tools): Update to 3.3.0. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 6f506dc490..9c2b6d8d41 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -8085,14 +8085,14 @@ offline (such as Wikipedia), without any access to Internet.") (define-public kiwix-tools (package (name "kiwix-tools") - (version "3.1.2") + (version "3.3.0") (source (origin (method url-fetch) (uri (string-append "https://download.kiwix.org/release/" "kiwix-tools/kiwix-tools-" version ".tar.xz")) (sha256 (base32 - "1npf9ddhpkmx97gxmvmwmi8a69md8kh2szimd9rpg6ggd4big03a")))) + "07mj0lrznydhdbirybdyxswypr7hy290mjdv7lkjr6gxgdp29d37")))) (build-system meson-build-system) (inputs (list curl -- cgit 1.4.1 From e05d5d82513818a49e144d3aa61653186a359ed9 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Sat, 13 Aug 2022 17:20:53 +0530 Subject: gnu: kiwix-desktop: Add bash-minimal to inputs. * gnu/packages/web.scm (kiwix-desktop)[inputs]: Add bash-minimal. --- gnu/packages/web.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 9c2b6d8d41..80d18717dc 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -8060,7 +8060,8 @@ It contains the code shared by all Kiwix ports.") (wrap-program bin `("QTWEBENGINEPROCESS_PATH" = (,qt-process-path))))))))) (inputs - (list curl + (list bash-minimal + curl icu4c kiwix-lib libmicrohttpd -- cgit 1.4.1 From 22c91ab5d320e482e9c51fa7829b5b12c859d4d6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 7 Aug 2022 02:00:01 +0200 Subject: gnu: dvdisaster: Remove input labels. * gnu/packages/cdrom.scm (dvdisaster)[native-inputs]: Remove input labels. --- gnu/packages/cdrom.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm index 56a4ab8a10..aac6f2798e 100644 --- a/gnu/packages/cdrom.scm +++ b/gnu/packages/cdrom.scm @@ -420,9 +420,7 @@ or @command{xorrisofs} to create ISO 9660 images.") (inputs (list gtk+-2)) (native-inputs - `(("gettext" ,gettext-minimal) - ("pkg-config" ,pkg-config) - ("which" ,which))) + (list gettext-minimal pkg-config which)) (arguments `(;; Parallel builds appear to be unsafe, see ;; . -- cgit 1.4.1 From ced32e953db137fff64bddbc41bacd300d13c79b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 7 Aug 2022 02:00:00 +0200 Subject: gnu: dvdisaster: Update to 0.79.10. * gnu/packages/cdrom.scm (dvdisaster): Update to 0.79.10. --- gnu/packages/cdrom.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm index aac6f2798e..015b6797ce 100644 --- a/gnu/packages/cdrom.scm +++ b/gnu/packages/cdrom.scm @@ -408,14 +408,14 @@ or @command{xorrisofs} to create ISO 9660 images.") (define-public dvdisaster (package (name "dvdisaster") - (version "0.79.9") + (version "0.79.10") (source (origin (method url-fetch) (uri (string-append "https://dvdisaster.jcea.es/downloads/dvdisaster-" version ".tar.bz2")) (sha256 - (base32 "1hz3fvqfdrwb7dn6ggqkpcgyjag37ivm1layw27ncjz9glklxjbr")))) + (base32 "1s3z4098ixdjr3gjs36fg7rykqs0zz1rnvz2v9rvyj0s5zv9y2nx")))) (build-system gnu-build-system) (inputs (list gtk+-2)) -- cgit 1.4.1 From dda3a760ab4b1e8dce9797cecd09fefa9c25cb68 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 7 Aug 2022 02:00:01 +0200 Subject: gnu: dvdisaster: Use G-expressions. * gnu/packages/cdrom.scm (dvdisaster)[arguments]: Rewrite as G-expressions. --- gnu/packages/cdrom.scm | 75 ++++++++++++++++++++++++++------------------------ 1 file changed, 39 insertions(+), 36 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm index 015b6797ce..6391bd6fec 100644 --- a/gnu/packages/cdrom.scm +++ b/gnu/packages/cdrom.scm @@ -422,42 +422,45 @@ or @command{xorrisofs} to create ISO 9660 images.") (native-inputs (list gettext-minimal pkg-config which)) (arguments - `(;; Parallel builds appear to be unsafe, see - ;; . - #:parallel-build? #f - #:phases - (modify-phases %standard-phases - (replace 'check - (lambda _ - (with-directory-excursion "regtest" - (substitute* "common.bash" - (("ISODIR=/var/tmp/regtest") "ISODIR=/tmp")) - (for-each invoke (find-files "." "rs.*\\.bash"))))) - (add-after 'install 'install-desktop - (lambda* (#:key outputs #:allow-other-keys) - (let* ((datadir (string-append (assoc-ref outputs "out") "/share"))) - (substitute* "contrib/dvdisaster.desktop" - (("dvdisaster48.png") "dvdisaster.png")) - (install-file "contrib/dvdisaster.desktop" - (string-append datadir "/applications")) - (for-each - (lambda (png) - (let* ((size (substring png - (string-index png char-set:digit) - (string-rindex png #\.))) - (icondir (string-append datadir "/icons/" - size "x" size "/apps"))) - (mkdir-p icondir) - (copy-file png (string-append icondir "/dvdisaster.png")))) - (find-files "contrib" "dvdisaster[0-9]*\\.png")) - (mkdir-p (string-append datadir "/pixmaps")) - (copy-file "contrib/dvdisaster48.xpm" - (string-append datadir "/pixmaps/dvdisaster.xpm"))))) - (add-after 'install 'remove-uninstall-script - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out"))) - (delete-file - (string-append out "/bin/dvdisaster-uninstall.sh")))))))) + (list #:parallel-build? #f ; http://hydra.gnu.org/build/49331/nixlog/1/raw + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda _ + (with-directory-excursion "regtest" + (substitute* "common.bash" + (("ISODIR=/var/tmp/regtest") "ISODIR=/tmp")) + (for-each invoke (find-files "." "rs.*\\.bash"))))) + (add-after 'install 'install-desktop + (lambda* (#:key outputs #:allow-other-keys) + (let* ((datadir (string-append (assoc-ref outputs "out") + "/share"))) + (substitute* "contrib/dvdisaster.desktop" + (("dvdisaster48.png") "dvdisaster.png")) + (install-file "contrib/dvdisaster.desktop" + (string-append datadir "/applications")) + (for-each + (lambda (png) + (let* ((size (substring + png + (string-index png char-set:digit) + (string-rindex png #\.))) + (icondir (string-append datadir "/icons/" + size "x" size "/apps"))) + (mkdir-p icondir) + (copy-file png + (string-append icondir + "/dvdisaster.png")))) + (find-files "contrib" "dvdisaster[0-9]*\\.png")) + (mkdir-p (string-append datadir "/pixmaps")) + (copy-file "contrib/dvdisaster48.xpm" + (string-append datadir + "/pixmaps/dvdisaster.xpm"))))) + (add-after 'install 'remove-uninstall-script + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out"))) + (delete-file + (string-append out "/bin/dvdisaster-uninstall.sh")))))))) (home-page "https://dvdisaster.jcea.es/") (synopsis "Error correcting codes for optical media images") (description "Optical media (CD,DVD,BD) keep their data only for a -- cgit 1.4.1 From fa0c9b086ce2826a9724b1b71d675daa94b35f50 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 7 Aug 2022 02:00:01 +0200 Subject: gnu: Add fstransform. * gnu/packages/file-systems.scm (fstransform): New public variable. --- gnu/packages/file-systems.scm | 44 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index c6063c42c4..d326b9cc3d 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2017, 2018, 2020, 2021 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018, 2020–2022 Tobias Geerinckx-Rice ;;; Copyright © 2017 Gábor Boskovits ;;; Copyright © 2017, 2018, 2021 Ricardo Wurmus ;;; Copyright © 2018 Leo Famulari @@ -380,6 +380,48 @@ is corrupted you'll lose the affected file(s) but not the whole back-up.") (home-page "https://www.fsarchiver.org/") (license license:gpl2))) +(define-public fstransform + (package + (name "fstransform") + (version "0.9.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/cosmos72/fstransform") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0vhypb6pbghja95av62ds4mhldbg0h8g4yg94k9r7lsxm7bgpfr3")))) + (build-system gnu-build-system) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (add-after 'install 'install-README + ;; There are no man pages. Install a poor substitute. + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (doc (string-append out "/share/doc/" #$name))) + (install-file "README" doc))))))) + (inputs (list e2fsprogs)) + (home-page "https://github.com/cosmos72/fstransform") + (synopsis "Convert file system types in place without copying all data") + (description + "This package provides several command-line tools to transform a supported +file system, such as XFS, into one of a different supported type, such as ext4. +All existing file contents, names, and directories are preserved. + +The conversion happens @dfn{in place}, without the need to create a complete +copy of the original data. This lets you transform almost full file systems on +systems where adding (sufficient) additional storage space is not an option. + +Do @emph{not} use this package when you could simply create an empty file system +from scratch and restore from a back-up. Transformation is limited, slow, and +significantly increases the risk of irreversible data loss!") + ;; Please follow . + (license (list license:gpl2 ; fsattr/src/e4attr.* → sbin/fsattr + license:gpl3+)))) ; the rest + (define-public gphotofs (package (name "gphotofs") -- cgit 1.4.1 From a6fb2d27608933f3dbf8d8543b424bac12552254 Mon Sep 17 00:00:00 2001 From: pinoaffe Date: Sat, 13 Aug 2022 04:39:49 -0700 Subject: gnu: yt-dlp: Update to 2022.08.08. * gnu/packages/video.scm (yt-dlp): Update to 2022.08.08. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 68f129dee7..4b438a08c8 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2486,7 +2486,7 @@ YouTube.com and many more sites.") (define-public yt-dlp (package/inherit youtube-dl (name "yt-dlp") - (version "2022.07.18") + (version "2022.08.08") (source (origin (method url-fetch) (uri (string-append "https://github.com/yt-dlp/yt-dlp/" @@ -2494,7 +2494,7 @@ YouTube.com and many more sites.") version "/yt-dlp.tar.gz")) (sha256 (base32 - "1wmzfqhysx1mqdba4ikvm6nbahasihi4xgqwqad20y3vs701slyj")) + "0vrmdk3znncph3a4b1y83pxnzhkv1b210b0ncb5daghgsz0jwv1k")) (snippet #~(begin ;; Delete the pre-generated files, except for the man page -- cgit 1.4.1 From c2481b1bea56f2885110d5af0a6cff36a3d95933 Mon Sep 17 00:00:00 2001 From: raingloom Date: Sat, 13 Aug 2022 15:53:01 +0200 Subject: gnu: yt-dlp: Build from Git. * gnu/packages/video.scm (yt-dlp)[source]: Use GIT-FETCH and GIT-FILE-NAME. Remove the snippet. [arguments]: Build the man page in the 'build-generated-files phase. [native-inputs]: Add pandoc. Co-authored-by: Tobias Geerinckx-Rice --- gnu/packages/video.scm | 38 ++++++++++++++++---------------------- 1 file changed, 16 insertions(+), 22 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 4b438a08c8..1fec5da40d 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -143,6 +143,7 @@ #:use-module (gnu packages gnupg) #:use-module (gnu packages gstreamer) #:use-module (gnu packages gtk) + #:use-module (gnu packages haskell-xyz) #:use-module (gnu packages image) #:use-module (gnu packages imagemagick) #:use-module (gnu packages iso-codes) @@ -2487,25 +2488,15 @@ YouTube.com and many more sites.") (package/inherit youtube-dl (name "yt-dlp") (version "2022.08.08") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/yt-dlp/yt-dlp/" - "releases/download/" - version "/yt-dlp.tar.gz")) - (sha256 - (base32 - "0vrmdk3znncph3a4b1y83pxnzhkv1b210b0ncb5daghgsz0jwv1k")) - (snippet - #~(begin - ;; Delete the pre-generated files, except for the man page - ;; which requires 'pandoc' to build. - (for-each delete-file - (list "yt-dlp" - ;;pandoc is needed to generate - ;;"yt-dlp.1" - "completions/bash/yt-dlp" - "completions/fish/yt-dlp.fish" - "completions/zsh/_yt-dlp")))))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/yt-dlp/yt-dlp/") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "07qz1zdndlpki0asw35zk5hdjcwpl3n1g54nxg4yb1iykbyv7rll")))) (arguments (substitute-keyword-arguments (package-arguments youtube-dl) ((#:tests? _) #t) @@ -2519,8 +2510,11 @@ YouTube.com and many more sites.") (format #f "~a or '~a'" match (which "ffmpeg")))))) (replace 'build-generated-files (lambda _ - ;; Avoid the yt-dlp.1 target, which requires pandoc. - (invoke "make" "PYTHON=python" "yt-dlp" "completions"))) + (invoke "make" + "PYTHON=python" + "yt-dlp" + "yt-dlp.1" + "completions"))) (replace 'fix-the-data-directories (lambda* (#:key outputs #:allow-other-keys) (let ((prefix (assoc-ref outputs "out"))) @@ -2541,7 +2535,7 @@ YouTube.com and many more sites.") python-pycryptodomex python-websockets))) (native-inputs (modify-inputs (package-native-inputs youtube-dl) - (append python-pytest))) + (append pandoc python-pytest))) (description "yt-dlp is a small command-line program to download videos from YouTube.com and many more sites. It is a fork of youtube-dl with a -- cgit 1.4.1 From bea916aea7aea82eb7ffc8eb64a6026b1d07d992 Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Sat, 13 Aug 2022 03:05:38 -0300 Subject: gnu: gsequencer: Update to 4.3.4. * gnu/packages/music.scm (gsequencer): Update to 4.3.4. [inputs]: Replace gtk+ with gtk, libsoup-minimal-2 with libsoup, webkitgtk-with-libsoup-2 with webkitgtk. --- gnu/packages/music.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 4245401740..53b6252bcb 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -4849,7 +4849,7 @@ studio.") (define-public gsequencer (package (name "gsequencer") - (version "3.18.2") + (version "4.3.4") (source (origin (method git-fetch) @@ -4858,7 +4858,7 @@ studio.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1lkn7rfrjvmds62i69igcgmic2snscgb9f6gdg5nzyfkis1fq5iz")))) + (base32 "10rf9li9kr6qdzkqv66wlg7gw2il18n7kd4fhk848hh5dcmg1icv")))) (build-system glib-or-gtk-build-system) (arguments `(#:phases @@ -4884,18 +4884,18 @@ studio.") fftw gst-plugins-base gstreamer - gtk+ + gtk jack-1 ladspa libinstpatch libsamplerate libsndfile - libsoup-minimal-2 + libsoup libxml2 lv2 pulseaudio `(,util-linux "lib") - webkitgtk-with-libsoup2)) + webkitgtk)) (home-page "https://nongnu.org/gsequencer/") (synopsis "Advanced Gtk+ Sequencer") (description -- cgit 1.4.1 From 91d8e1c5cd2b00e1d675ff5a8b36503f2ea0814a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 28 Jul 2022 19:03:58 +0200 Subject: gnu: graphviz: Add release-monitoring-url. * gnu/packages/graphviz.scm (graphviz)[properties]: New field. --- gnu/packages/graphviz.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/graphviz.scm b/gnu/packages/graphviz.scm index a49fe348e8..51c1de3932 100644 --- a/gnu/packages/graphviz.scm +++ b/gnu/packages/graphviz.scm @@ -128,6 +128,8 @@ way of representing structural information as diagrams of abstract graphs and networks. It has important applications in networking, bioinformatics, software engineering, database and web design, machine learning, and in visual interfaces for other technical domains.") + (properties + '((release-monitoring-url . "https://graphviz.org/download/source/"))) (license license:epl1.0))) ;; Older Graphviz needed for pygraphviz. See -- cgit 1.4.1 From 9d72feb4927e43fe98623bf116f9cb768f51a602 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 12 Aug 2022 20:08:18 +0200 Subject: gnu: python-pyaml: Update to 21.10.1. * gnu/packages/python-xyz.scm (python-pyaml): Update to 21.10.1. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index ffa71d1330..9f56ea30b3 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -17229,13 +17229,13 @@ addresses, and phone numbers.") (define-public python-pyaml (package (name "python-pyaml") - (version "18.11.0") + (version "21.10.1") (source (origin (method url-fetch) (uri (pypi-uri "pyaml" version)) (sha256 (base32 - "0fi604ix8lbpj1266q7js6szm771saprdzzcdwmj43wy83694qmr")))) + "10w3frzqir5sbpglc9bwb8w414dsivmcvji07yxy61mz2gp9ylf6")))) (build-system python-build-system) (native-inputs (list python-unidecode)) -- cgit 1.4.1 From 945fdf8cf0dbcc435f1b47373ac47953e83736eb Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 12 Aug 2022 22:27:43 +0200 Subject: gnu: python-numpy: Add 'upstream-name' property. * gnu/packages/python-xyz.scm (python-numpy)[properties]: New field. --- gnu/packages/python-xyz.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 9f56ea30b3..dd07f55e09 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5643,6 +5643,8 @@ with Python. It contains among other things: a powerful N-dimensional array object, sophisticated (broadcasting) functions, tools for integrating C/C++ and Fortran code, useful linear algebra, Fourier transform, and random number capabilities.") + (properties + '((upstream-name . "numpy"))) (license license:bsd-3))) (define-public python-numpy-next -- cgit 1.4.1 From c87700e691b80b2a6c6b231e426dec0d43face50 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 12 Aug 2022 22:50:27 +0200 Subject: gnu: python-pre-commit: Remove unnecessary dependency. * gnu/packages/python-xyz.scm (python-pre-commit)[propagated-inputs]: Remove PYTHON-IMPORTLIB-RESOURCES, which is part of the stdlib nowadays. --- gnu/packages/python-xyz.scm | 1 - 1 file changed, 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index dd07f55e09..42e2b00d48 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -23373,7 +23373,6 @@ Features: (list python-cfgv python-identify python-importlib-metadata - python-importlib-resources python-nodeenv python-pyyaml python-toml -- cgit 1.4.1 From 06db41651c521dd9feb58953e98d690ae17298bf Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 12 Aug 2022 23:39:13 +0200 Subject: gnu: python-m2r: Adjust for Python 3.10. * gnu/packages/python-xyz.scm (python-m2r)[source](modules, snippet): New fields. --- gnu/packages/python-xyz.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 42e2b00d48..22f1c4043a 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -19093,7 +19093,15 @@ from the header, as well as section details and data available.") (uri (pypi-uri "m2r" version)) (sha256 (base32 - "16gdm8i06jjmlpvckpfmlkr4693dh0vs192vgsqn84fsdkbbm45z")))) + "16gdm8i06jjmlpvckpfmlkr4693dh0vs192vgsqn84fsdkbbm45z")) + (modules '((guix build utils))) + (snippet + ;; Adjust test regex for Python 3.10 compatibility. + ;; Taken from upstream pull request: + ;; https://github.com/miyakogi/m2r/pull/62 + '(substitute* "tests/test_cli.py" + (("self.assertIn\\('optional arguments:', message\\)") + "self.assertRegex(message, r'option(s|al arguments):')"))))) (build-system python-build-system) (propagated-inputs (list python-docutils python-mistune)) -- cgit 1.4.1 From dfd44744614c2a59cdd6c229537e0b52c1caa80a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 13 Aug 2022 01:26:47 +0200 Subject: gnu: qtractor: Fix build. This is a follow-up to commit 1ef04fb2288dade3ad2883026ae286a68ef13a1e. * gnu/packages/music.scm (qtractor)[inputs]: Change from QTSVG to QTSVG-5. --- gnu/packages/music.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 53b6252bcb..8f383358d8 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -3310,7 +3310,7 @@ from the command line.") lilv lv2 qtbase-5 - qtsvg + qtsvg-5 qtx11extras rubberband suil -- cgit 1.4.1 From ca6078e1e92ee19341bfdcedcc2fde630fbcd3bb Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 13 Aug 2022 01:31:54 +0200 Subject: gnu: serf: Add release-monitoring-url. * gnu/packages/web.scm (serf)[properties]: New field. --- gnu/packages/web.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 80d18717dc..29b9da0096 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -1997,6 +1997,8 @@ communication asynchronously. Memory copies and transformations are kept to a minimum to provide high performance operation.") ;; Most of the code is covered by the Apache License, Version 2.0, but the ;; bundled CuTest framework uses a different non-copyleft license. + (properties + '((release-monitoring-url . "https://serf.apache.org/download"))) (license (list license:asl2.0 (license:non-copyleft "file://test/CuTest-README.txt"))))) (define-public libsass -- cgit 1.4.1 From 0d79288fb6d8b27b235693374c6eaea4cdd38c80 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 13 Aug 2022 13:33:19 +0200 Subject: gnu: SELinux: Update to 3.4. * gnu/packages/selinux.scm (libsepol): Update to 3.4. (libselinux)[propagated-inputs]: Replace PCRE with PCRE2. --- gnu/packages/selinux.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/selinux.scm b/gnu/packages/selinux.scm index 0000bc7bc9..fd1c79a9ab 100644 --- a/gnu/packages/selinux.scm +++ b/gnu/packages/selinux.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016, 2017, 2018 Ricardo Wurmus ;;; Copyright © 2018 Tobias Geerinckx-Rice -;;; Copyright © 2019, 2020 Marius Bakke +;;; Copyright © 2019, 2020, 2022 Marius Bakke ;;; Copyright © 2021 Efraim Flashner ;;; Copyright © 2021 Guillaume Le Vaillant ;;; @@ -49,7 +49,7 @@ (define-public libsepol (package (name "libsepol") - (version "3.2") + (version "3.4") (source (origin (method git-fetch) (uri (git-reference @@ -58,7 +58,7 @@ (file-name (git-file-name "selinux" version)) (sha256 (base32 - "03p3lmvrvkcvsmiczsjzhyfgxlxdkdyq0p8igv3s3hdak5n92jjn")))) + "1lcmgmfr0q7g5cwg6b7jm6ncw8cw6c1jblkm93v1g37bfhcgrqc0")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; tests require checkpolicy, which requires libsepol @@ -161,12 +161,11 @@ module into a binary representation.") (substitute* "src/Makefile" (("--prefix=\\$\\(PREFIX\\)") (string-append "--prefix=" (assoc-ref outputs "python")))) - (apply invoke "make" "install-pywrap" make-flags))))))) ;; These libraries are in "Requires.private" in libselinux.pc. (propagated-inputs `(("libsepol" ,libsepol) - ("pcre" ,pcre))) + ("pcre2" ,pcre2))) ;; For pywrap phase (inputs `(("python" ,python-wrapper))) -- cgit 1.4.1 From 86084aa4c8ecbedbb946bca97df17de2c1995970 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 13 Aug 2022 13:37:33 +0200 Subject: gnu: checkpolicy: Remove input labels. * gnu/packages/selinux.scm (checkpolicy)[arguments]: Use G-expression & SERACH-INPUT-FILE. [native-inputs, inputs]: Remove labels. --- gnu/packages/selinux.scm | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/selinux.scm b/gnu/packages/selinux.scm index fd1c79a9ab..18422ffe2e 100644 --- a/gnu/packages/selinux.scm +++ b/gnu/packages/selinux.scm @@ -23,6 +23,7 @@ (define-module (gnu packages selinux) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) + #:use-module (guix gexp) #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix utils) @@ -100,25 +101,24 @@ boolean settings).") (package/inherit libsepol (name "checkpolicy") (arguments - `(#:tests? #f ; there is no check target - #:make-flags - (let ((out (assoc-ref %outputs "out"))) - (list (string-append "PREFIX=" out) - (string-append "LIBSEPOLA=" - (assoc-ref %build-inputs "libsepol") - "/lib/libsepol.a") - (string-append "CC=" ,(cc-for-target)))) - #:phases - (modify-phases %standard-phases - (delete 'configure) - (delete 'portability) - (add-after 'unpack 'enter-dir - (lambda _ (chdir ,name)))))) + (list + #:tests? #f ; there is no check target + #:make-flags + #~(list (string-append "PREFIX=" #$output) + (string-append "LIBSEPOLA=" + (search-input-file %build-inputs + "/lib/libsepol.a")) + (string-append "CC=" #$(cc-for-target))) + #:phases + #~(modify-phases %standard-phases + (delete 'configure) + (delete 'portability) + (add-after 'unpack 'enter-dir + (lambda _ (chdir #$name)))))) (inputs - `(("libsepol" ,libsepol))) + (list libsepol)) (native-inputs - `(("bison" ,bison) - ("flex" ,flex))) + (list bison flex)) (synopsis "Check SELinux security policy configurations and modules") (description "This package provides the tools \"checkpolicy\" and \"checkmodule\". -- cgit 1.4.1 From 54f14833a93eab22d0c4f95e3fc38106e150f3d0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 13 Aug 2022 13:42:39 +0200 Subject: gnu: libselinux: Remove input labels. * gnu/packages/selinux.scm (libselinux)[arguments]: Use G-expression. [native-inputs, inputs, propagated-inputs]: Remove labels. --- gnu/packages/selinux.scm | 59 ++++++++++++++++++++++++------------------------ 1 file changed, 29 insertions(+), 30 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/selinux.scm b/gnu/packages/selinux.scm index 18422ffe2e..93c256371a 100644 --- a/gnu/packages/selinux.scm +++ b/gnu/packages/selinux.scm @@ -136,43 +136,42 @@ module into a binary representation.") (arguments (substitute-keyword-arguments (package-arguments libsepol) ((#:make-flags flags) - `(cons* "PYTHON=python3" - (string-append "LIBSEPOLA=" - (assoc-ref %build-inputs "libsepol") - "/lib/libsepol.a") - (string-append "PYTHONLIBDIR=" - (assoc-ref %outputs "python") - "/lib/python" - ,(version-major+minor (package-version python)) - "/site-packages/") - ,flags)) + #~(cons* "PYTHON=python3" + (string-append "LIBSEPOLA=" + (search-input-file %build-inputs + "/lib/libsepol.a")) + (string-append "PYTHONLIBDIR=" + #$output:python + "/lib/python" + #$(version-major+minor (package-version python)) + "/site-packages/") + #$flags)) ((#:phases phases) - `(modify-phases ,phases - (delete 'portability) - (replace 'enter-dir - (lambda _ (chdir ,name))) - (add-after 'build 'pywrap - (lambda* (#:key make-flags #:allow-other-keys) - (apply invoke "make" "pywrap" make-flags))) - (add-after 'install 'install-pywrap - (lambda* (#:key make-flags outputs #:allow-other-keys) - ;; The build system uses "python setup.py install" to install - ;; Python bindings. Instruct it to use the correct output. - (substitute* "src/Makefile" - (("--prefix=\\$\\(PREFIX\\)") - (string-append "--prefix=" (assoc-ref outputs "python")))) - (apply invoke "make" "install-pywrap" make-flags))))))) + #~(modify-phases #$phases + (delete 'portability) + (replace 'enter-dir + (lambda _ (chdir #$name))) + (add-after 'build 'pywrap + (lambda* (#:key make-flags #:allow-other-keys) + (apply invoke "make" "pywrap" make-flags))) + (add-after 'install 'install-pywrap + (lambda* (#:key make-flags #:allow-other-keys) + ;; The build system uses "python setup.py install" to install + ;; Python bindings. Instruct it to use the correct output. + (substitute* "src/Makefile" + (("--prefix=\\$\\(PREFIX\\)") + (string-append "--prefix=" #$output:python))) + + (apply invoke "make" "install-pywrap" make-flags))))))) ;; These libraries are in "Requires.private" in libselinux.pc. (propagated-inputs - `(("libsepol" ,libsepol) - ("pcre2" ,pcre2))) + (list libsepol pcre2)) ;; For pywrap phase (inputs - `(("python" ,python-wrapper))) + (list python-wrapper)) ;; These inputs are only needed for the pywrap phase. (native-inputs - `(("swig" ,swig) - ("pkg-config" ,pkg-config))) + (list pkg-config swig)) (synopsis "SELinux core libraries and utilities") (description "The libselinux library provides an API for SELinux applications to get -- cgit 1.4.1 From 9bfdd1e7cb4596e3aee68c21a4ad39e0540a8c3a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 13 Aug 2022 13:46:01 +0200 Subject: gnu: libsemanage: Remove input labels. * gnu/packages/selinux.scm (libsemanage)[arguments]: Use G-expression. [native-inputs, inputs]: Remove labels. --- gnu/packages/selinux.scm | 56 +++++++++++++++++++++--------------------------- 1 file changed, 24 insertions(+), 32 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/selinux.scm b/gnu/packages/selinux.scm index 93c256371a..3e7d55ff67 100644 --- a/gnu/packages/selinux.scm +++ b/gnu/packages/selinux.scm @@ -187,41 +187,33 @@ the core SELinux management utilities.") (arguments (substitute-keyword-arguments (package-arguments libsepol) ((#:make-flags flags) - `(cons* "PYTHON=python3" - (string-append "PYTHONLIBDIR=" - (assoc-ref %outputs "out") - "/lib/python" - ,(version-major+minor (package-version python)) - "/site-packages/") - ,flags)) + #~(cons* "PYTHON=python3" + (string-append "PYTHONLIBDIR=" + #$output + "/lib/python" + #$(version-major+minor (package-version python)) + "/site-packages/") + #$flags)) ((#:phases phases) - `(modify-phases ,phases - (delete 'portability) - (replace 'enter-dir - (lambda _ (chdir ,name))) - (add-before 'install 'adjust-semanage-conf-location - (lambda _ - (substitute* "src/Makefile" - (("DEFAULT_SEMANAGE_CONF_LOCATION=/etc") - "DEFAULT_SEMANAGE_CONF_LOCATION=$(PREFIX)/etc")))) - (add-after 'build 'pywrap - (lambda* (#:key make-flags #:allow-other-keys) - (apply invoke "make" "pywrap" make-flags))) - (add-after 'install 'install-pywrap - (lambda* (#:key make-flags #:allow-other-keys) - (apply invoke "make" "install-pywrap" make-flags))))))) + #~(modify-phases #$phases + (delete 'portability) + (replace 'enter-dir + (lambda _ (chdir #$name))) + (add-before 'install 'adjust-semanage-conf-location + (lambda _ + (substitute* "src/Makefile" + (("DEFAULT_SEMANAGE_CONF_LOCATION=/etc") + "DEFAULT_SEMANAGE_CONF_LOCATION=$(PREFIX)/etc")))) + (add-after 'build 'pywrap + (lambda* (#:key make-flags #:allow-other-keys) + (apply invoke "make" "pywrap" make-flags))) + (add-after 'install 'install-pywrap + (lambda* (#:key make-flags #:allow-other-keys) + (apply invoke "make" "install-pywrap" make-flags))))))) (inputs - `(("libsepol" ,libsepol) - ("libselinux" ,libselinux) - ("audit" ,audit) - ;; For pywrap phase - ("python" ,python-wrapper))) + (list audit libsepol libselinux python-wrapper)) (native-inputs - `(("bison" ,bison) - ("flex" ,flex) - ;; For pywrap phase - ("swig" ,swig) - ("pkg-config" ,pkg-config))) + (list bison flex pkg-config swig)) (synopsis "SELinux policy management libraries") (description "The libsemanage library provides an API for the manipulation of SELinux -- cgit 1.4.1 From 71d07d821dec93bdb6a308f53bd3b38a627a33a7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 13 Aug 2022 13:49:30 +0200 Subject: gnu: secilc: Remove input labels. * gnu/packages/selinux.scm (secilc)[arguments]: Use G-expression and SEARCH-INPUT-DIRECTORY. [inputs, native-inputs]: Remove labels. --- gnu/packages/selinux.scm | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/selinux.scm b/gnu/packages/selinux.scm index 3e7d55ff67..d1243de00e 100644 --- a/gnu/packages/selinux.scm +++ b/gnu/packages/selinux.scm @@ -226,22 +226,22 @@ binary policies.") (arguments (substitute-keyword-arguments (package-arguments libsepol) ((#:make-flags flags) - `(let ((docbook (assoc-ref %build-inputs "docbook-xsl"))) - (cons (string-append "XMLTO=xmlto --skip-validation -x " - docbook "/xml/xsl/docbook-xsl-" - ,(package-version docbook-xsl) - "/manpages/docbook.xsl") - ,flags))) + #~(let ((xsl (search-input-directory %build-inputs "xml/xsl"))) + (cons (string-append "XMLTO=xmlto --skip-validation -x " + xsl "/docbook-xsl-" + #$(package-version + (this-package-native-input "docbook-xsl")) + "/manpages/docbook.xsl") + #$flags))) ((#:phases phases) - `(modify-phases ,phases - (delete 'portability) - (replace 'enter-dir - (lambda _ (chdir ,name))))))) + #~(modify-phases #$phases + (delete 'portability) + (replace 'enter-dir + (lambda _ (chdir #$name))))))) (inputs - `(("libsepol" ,libsepol))) + (list libsepol)) (native-inputs - `(("xmlto" ,xmlto) - ("docbook-xsl" ,docbook-xsl))) + (list xmlto docbook-xsl)) (synopsis "SELinux common intermediate language (CIL) compiler") (description "The SELinux CIL compiler is a compiler that converts the @dfn{common intermediate language} (CIL) into a kernel binary policy file.") -- cgit 1.4.1 From 46bb84bb577711140c31fedebd3a01920a5c331f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 13 Aug 2022 13:57:55 +0200 Subject: gnu: python-sepolgen: Use G-expression and remove labels. * gnu/packages/selinux.scm (python-sepolgen)[arguments]: Convert to G-expression. Don't refer to python by label. [inputs]: Remove labels. --- gnu/packages/selinux.scm | 66 +++++++++++++++++++++++++----------------------- 1 file changed, 34 insertions(+), 32 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/selinux.scm b/gnu/packages/selinux.scm index d1243de00e..cb17a3e659 100644 --- a/gnu/packages/selinux.scm +++ b/gnu/packages/selinux.scm @@ -251,39 +251,41 @@ binary policies.") (package/inherit libsepol (name "python-sepolgen") (arguments - `(#:modules ((srfi srfi-1) - (guix build gnu-build-system) - (guix build utils)) - ,@(substitute-keyword-arguments (package-arguments libsepol) - ((#:phases phases) - `(modify-phases ,phases - (delete 'portability) - (replace 'enter-dir - (lambda _ (chdir "python/sepolgen"))) - ;; By default all Python files would be installed to - ;; $out/gnu/store/...-python-.../, so we override the - ;; PACKAGEDIR to fix this. - (add-after 'enter-dir 'fix-target-path - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((get-python-version - ;; FIXME: copied from python-build-system - (lambda (python) - (let* ((version (last (string-split python #\-))) - (components (string-split version #\.)) - (major+minor (take components 2))) - (string-join major+minor "."))))) - (substitute* "src/sepolgen/Makefile" - (("^PACKAGEDIR.*") - (string-append "PACKAGEDIR=" - (assoc-ref outputs "out") - "/lib/python" - (get-python-version - (assoc-ref inputs "python")) - "/site-packages/sepolgen"))) - (substitute* "src/share/Makefile" - (("\\$\\(DESTDIR\\)") (assoc-ref outputs "out"))))))))))) + (substitute-keyword-arguments (package-arguments libsepol) + ((#:modules _ #~%gnu-build-system-modules) + '((srfi srfi-1) + (guix build gnu-build-system) + (guix build utils))) + ((#:phases phases) + #~(modify-phases #$phases + (delete 'portability) + (replace 'enter-dir + (lambda _ (chdir "python/sepolgen"))) + ;; By default all Python files would be installed to + ;; $out/gnu/store/...-python-.../, so we override the + ;; PACKAGEDIR to fix this. + (add-after 'enter-dir 'fix-target-path + (lambda* (#:key inputs #:allow-other-keys) + (let ((get-python-version + ;; FIXME: copied from python-build-system + (lambda (python) + (let* ((version (last (string-split python #\-))) + (components (string-split version #\.)) + (major+minor (take components 2))) + (string-join major+minor ".")))) + (python (dirname (dirname (search-input-file + inputs "bin/python3"))))) + (substitute* "src/sepolgen/Makefile" + (("^PACKAGEDIR.*") + (string-append "PACKAGEDIR=" + #$output + "/lib/python" + (get-python-version python) + "/site-packages/sepolgen"))) + (substitute* "src/share/Makefile" + (("\\$\\(DESTDIR\\)") #$output))))))))) (inputs - `(("python" ,python-wrapper))) + (list python-wrapper)) (native-inputs '()) (synopsis "Python module for generating SELinux policies") (description -- cgit 1.4.1 From c6e3f4eb5adaab3701d42dbc4df88b7179a3b07a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 13 Aug 2022 14:00:06 +0200 Subject: gnu: policycoreutils: Remove input labels. * gnu/packages/selinux.scm (policycoreutils)[native-inputs, inputs]: Remove labels. --- gnu/packages/selinux.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/selinux.scm b/gnu/packages/selinux.scm index cb17a3e659..7686db7421 100644 --- a/gnu/packages/selinux.scm +++ b/gnu/packages/selinux.scm @@ -391,13 +391,13 @@ tools, and libraries designed to facilitate SELinux policy analysis.") (("/usr(/include/libaudit.h)" _ file) (search-input-file inputs file)))))))) (inputs - `(("audit" ,audit) - ("pam" ,linux-pam) - ("libsepol" ,libsepol) - ("libselinux" ,libselinux) - ("libsemanage" ,libsemanage))) + (list audit + linux-pam + libsepol + libselinux + libsemanage)) (native-inputs - `(("gettext" ,gettext-minimal))) + (list gettext-minimal)) (synopsis "SELinux core utilities") (description "The policycoreutils package contains the core utilities that are required for the basic operation of an SELinux-enabled GNU system and its -- cgit 1.4.1 From d7278e4020cb3197d6f4d18e3347137e5f710774 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 13 Aug 2022 14:11:36 +0200 Subject: gnu: libsepol: Use G-expression. * gnu/packages/selinux.scm (libsepol)[arguments]: Convert to gexp. --- gnu/packages/selinux.scm | 51 ++++++++++++++++++++++++------------------------ 1 file changed, 26 insertions(+), 25 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/selinux.scm b/gnu/packages/selinux.scm index 7686db7421..e4c57f4747 100644 --- a/gnu/packages/selinux.scm +++ b/gnu/packages/selinux.scm @@ -54,37 +54,38 @@ (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/SELinuxProject/selinux") - (commit version))) + (url "https://github.com/SELinuxProject/selinux") + (commit version))) (file-name (git-file-name "selinux" version)) (sha256 (base32 "1lcmgmfr0q7g5cwg6b7jm6ncw8cw6c1jblkm93v1g37bfhcgrqc0")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; tests require checkpolicy, which requires libsepol - #:test-target "test" - #:make-flags - (let ((out (assoc-ref %outputs "out"))) - (list (string-append "PREFIX=" out) - (string-append "SHLIBDIR=" out "/lib") - (string-append "MAN3DIR=" out "/share/man/man3") - (string-append "MAN5DIR=" out "/share/man/man5") - (string-append "MAN8DIR=" out "/share/man/man8") - (string-append "CFLAGS=-Wno-error") - (string-append "LDFLAGS=-Wl,-rpath=" out "/lib") - (string-append "CC=" ,(cc-for-target)))) - #:phases - (modify-phases %standard-phases - (delete 'configure) - (add-after 'unpack 'enter-dir - (lambda _ (chdir ,name))) - (add-after 'enter-dir 'portability - (lambda _ - (substitute* "src/ibpkeys.c" - (("#include \"ibpkey_internal.h\"" line) - (string-append line "\n#include \n")) - (("%#lx") "%#\" PRIx64 \""))))))) + (list + #:tests? #f ; tests require checkpolicy, which requires libsepol + #:test-target "test" + #:make-flags + #~(let ((out #$output)) + (list (string-append "PREFIX=" out) + (string-append "SHLIBDIR=" out "/lib") + (string-append "MAN3DIR=" out "/share/man/man3") + (string-append "MAN5DIR=" out "/share/man/man5") + (string-append "MAN8DIR=" out "/share/man/man8") + (string-append "CFLAGS=-Wno-error") + (string-append "LDFLAGS=-Wl,-rpath=" out "/lib") + (string-append "CC=" #$(cc-for-target)))) + #:phases + #~(modify-phases %standard-phases + (delete 'configure) + (add-after 'unpack 'enter-dir + (lambda _ (chdir #$name))) + (add-after 'enter-dir 'portability + (lambda _ + (substitute* "src/ibpkeys.c" + (("#include \"ibpkey_internal.h\"" line) + (string-append line "\n#include \n")) + (("%#lx") "%#\" PRIx64 \""))))))) (native-inputs (list flex)) (home-page "https://selinuxproject.org/") -- cgit 1.4.1 From e015fc174e13759aa9c96dc19bf534efd1be7d72 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 13 Aug 2022 14:13:10 +0200 Subject: gnu: policycoreutils: Use G-expression. * gnu/packages/selinux.scm (policycoreutils)[arguments]: Convert to gexp. --- gnu/packages/selinux.scm | 75 ++++++++++++++++++++++++------------------------ 1 file changed, 38 insertions(+), 37 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/selinux.scm b/gnu/packages/selinux.scm index e4c57f4747..b4f074b695 100644 --- a/gnu/packages/selinux.scm +++ b/gnu/packages/selinux.scm @@ -354,43 +354,44 @@ tools, and libraries designed to facilitate SELinux policy analysis.") (package/inherit libsepol (name "policycoreutils") (arguments - `(#:test-target "test" - #:make-flags - (let ((out (assoc-ref %outputs "out"))) - (list (string-append "CC=" ,(cc-for-target)) - (string-append "PREFIX=" out) - (string-append "LOCALEDIR=" out "/share/locale") - (string-append "BASHCOMPLETIONDIR=" out - "/share/bash-completion/completions") - "INSTALL=install -c -p" - "INSTALL_DIR=install -d" - ;; These ones are needed because some Makefiles define the - ;; directories relative to DESTDIR, not relative to PREFIX. - (string-append "SBINDIR=" out "/sbin") - (string-append "ETCDIR=" out "/etc") - (string-append "SYSCONFDIR=" out "/etc/sysconfig") - (string-append "MAN5DIR=" out "/share/man/man5") - (string-append "INSTALL_NLS_DIR=" out "/share/locale") - (string-append "AUTOSTARTDIR=" out "/etc/xdg/autostart") - (string-append "DBUSSERVICEDIR=" out "/share/dbus-1/services") - (string-append "SYSTEMDDIR=" out "/lib/systemd") - (string-append "INITDIR=" out "/etc/rc.d/init.d") - (string-append "SELINUXDIR=" out "/etc/selinux"))) - #:phases - (modify-phases %standard-phases - (delete 'configure) - (add-after 'unpack 'enter-dir - (lambda _ (chdir ,name))) - (add-after 'enter-dir 'ignore-/usr-tests - (lambda* (#:key inputs #:allow-other-keys) - ;; Rewrite lookup paths for header files. - (substitute* '("newrole/Makefile" - "setfiles/Makefile" - "run_init/Makefile") - (("/usr(/include/security/pam_appl.h)" _ file) - (search-input-file inputs file)) - (("/usr(/include/libaudit.h)" _ file) - (search-input-file inputs file)))))))) + (list + #:test-target "test" + #:make-flags + #~(let ((out #$output)) + (list (string-append "CC=" #$(cc-for-target)) + (string-append "PREFIX=" out) + (string-append "LOCALEDIR=" out "/share/locale") + (string-append "BASHCOMPLETIONDIR=" out + "/share/bash-completion/completions") + "INSTALL=install -c -p" + "INSTALL_DIR=install -d" + ;; These ones are needed because some Makefiles define the + ;; directories relative to DESTDIR, not relative to PREFIX. + (string-append "SBINDIR=" out "/sbin") + (string-append "ETCDIR=" out "/etc") + (string-append "SYSCONFDIR=" out "/etc/sysconfig") + (string-append "MAN5DIR=" out "/share/man/man5") + (string-append "INSTALL_NLS_DIR=" out "/share/locale") + (string-append "AUTOSTARTDIR=" out "/etc/xdg/autostart") + (string-append "DBUSSERVICEDIR=" out "/share/dbus-1/services") + (string-append "SYSTEMDDIR=" out "/lib/systemd") + (string-append "INITDIR=" out "/etc/rc.d/init.d") + (string-append "SELINUXDIR=" out "/etc/selinux"))) + #:phases + #~(modify-phases %standard-phases + (delete 'configure) + (add-after 'unpack 'enter-dir + (lambda _ (chdir #$name))) + (add-after 'enter-dir 'ignore-/usr-tests + (lambda* (#:key inputs #:allow-other-keys) + ;; Rewrite lookup paths for header files. + (substitute* '("newrole/Makefile" + "setfiles/Makefile" + "run_init/Makefile") + (("/usr(/include/security/pam_appl.h)" _ file) + (search-input-file inputs file)) + (("/usr(/include/libaudit.h)" _ file) + (search-input-file inputs file)))))))) (inputs (list audit linux-pam -- cgit 1.4.1 From 33d5141239ab4c7832d2097ba427b4d0c0e73a93 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 13 Aug 2022 14:53:23 +0200 Subject: gnu: python-setuptools: Update to 64.0.3. * gnu/packages/python-xyz.scm (python-setuptools): Update to 64.0.3. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 22f1c4043a..13ab2f2c8b 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1935,14 +1935,14 @@ other machines, such as over the network.") (define-public python-setuptools (package (name "python-setuptools") - (version "62.0.0") + (version "64.0.3") (source (origin (method url-fetch) (uri (pypi-uri "setuptools" version)) (sha256 (base32 - "0sm8n6y6q640cpac9wjyggidbgi4n9la7vs7pwriyvhvgzccp6br")) + "1sllqf0bhsl2yilf1w0xnlz0r4yaksmwaj0ap91zdc6kgbigdjiv")) (modules '((guix build utils))) (snippet ;; Remove included binaries which are used to build self-extracting -- cgit 1.4.1 From 7034824dcbf3afcd71e0123b339f88e1a9f59720 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 13 Aug 2022 17:30:47 +0200 Subject: gnu: ocaml-zed: Update to 3.2.0. Because of an incompatible change in ocaml-zed, some of its dependents need to be updated at the same time to prevent breakage. * gnu/packages/ocaml.scm (ocaml-zed): Update to 3.2.0. (ocaml-lambda-term): Update to 3.3.1. (ocaml-utop): Update to 2.10.0. --- gnu/packages/ocaml.scm | 48 ++++++++++++++++++++++++++++++------------------ 1 file changed, 30 insertions(+), 18 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 6d4f8c8836..5e2a7d023a 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -4293,7 +4293,7 @@ function that follows the prototype of POSIX's wcwidth.") (define-public ocaml-zed (package (name "ocaml-zed") - (version "3.1.0") + (version "3.2.0") (home-page "https://github.com/ocaml-community/zed") (source (origin @@ -4303,14 +4303,18 @@ function that follows the prototype of POSIX's wcwidth.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "04vr1a94imsghm98iigc35rhifsz0rh3qz2qm0wam2wvp6vmrx0p")))) + (base32 "1g171kk5wxnk66d4vwz2crh5i19vhqghp78iybl5am17gl9qf8pb")))) (build-system dune-build-system) + (propagated-inputs + (list ocaml-react + ocaml-result + ocaml-uchar + ocaml-uutf + ocaml-uucp + ocaml-uuseg + ocaml-odoc)) (arguments `(#:test-target ".")) - (propagated-inputs - `(("ocaml-charInfo-width" ,ocaml-charinfo-width) - ("ocaml-camomile" ,ocaml-camomile) - ("ocaml-react" ,ocaml-react))) (properties `((ocaml4.07-variant . ,(delay ocaml4.07-zed)))) (synopsis "Abstract engine for text edition in OCaml") (description @@ -4337,12 +4341,16 @@ capabilities, Zed provides macro recording and cursor management facilities.") (sha256 (base32 "0pa9awinqr0plp4b2az78dwpvh01pwaljnn5ydg8mc6hi7rmir55")))) + (propagated-inputs + `(("ocaml-charInfo-width" ,ocaml-charinfo-width) + ("ocaml-camomile" ,ocaml-camomile) + ("ocaml-react" ,ocaml-react))) (properties '())))) (define-public ocaml-lambda-term (package (name "ocaml-lambda-term") - (version "3.2.0") + (version "3.3.1") (home-page "https://github.com/ocaml-community/lambda-term") (source (origin (method git-fetch) @@ -4352,18 +4360,18 @@ capabilities, Zed provides macro recording and cursor management facilities.") (file-name (git-file-name name version)) (sha256 (base32 - "048k26644wq5wlwk0j179dxrxyz9nxqqq4vvhyh6pqpgxdajd44i")))) + "1pkamblc6h0rsbk901cqn3xr9gqa3g8wrwyx5zryaqvb2xpbhp8b")))) (build-system dune-build-system) (arguments `(#:test-target ".")) (propagated-inputs - (list ocaml-lwt - ocaml-lwt-log - ocaml-react - ocaml-zed - ocaml-camomile + (list ocaml-logs + ocaml-lwt ocaml-lwt-react - ocaml-mew-vi)) + ocaml-mew-vi + ocaml-odoc + ocaml-react + ocaml-zed)) (properties `((ocaml4.07-variant . ,(delay ocaml4.07-lambda-term)))) (synopsis "Terminal manipulation library for OCaml") (description "Lambda-Term is a cross-platform library for manipulating the @@ -4398,7 +4406,7 @@ instead of bindings to a C library.") (define-public ocaml-utop (package (name "ocaml-utop") - (version "2.9.2") + (version "2.10.0") (source (origin (method git-fetch) @@ -4407,15 +4415,19 @@ instead of bindings to a C library.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0z5anakgbndhyzbi570pfs2fy69bnmgq9jflgfbly2rhbhwa7wgj")))) + (base32 "1pcix3h9f7is06581iax4i08zkd6sv8y5hy1vvxhqhcsd9z0qfl3")))) (build-system dune-build-system) (arguments `(#:test-target ".")) (native-inputs (list ocaml-cppo)) (propagated-inputs - (list ocaml-lambda-term ocaml-lwt ocaml-lwt-react ocaml-camomile - ocaml-react)) + (list ocaml-lambda-term + ocaml-logs + ocaml-lwt + ocaml-lwt-react + ocaml-react + ocaml-zed)) (properties `((ocaml4.07-variant . ,(delay ocaml4.07-utop)))) (home-page "https://github.com/ocaml-community/utop") (synopsis "Improved interface to the OCaml toplevel") -- cgit 1.4.1 From 07dcba54372eaae2364be47f21f554ab5b2cb9ab Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 13 Aug 2022 17:42:09 +0200 Subject: gnu: ocaml-yojson: Update to 2.0.2. merlin also needs to be updated at the same time because of incompatibilities between the two versions. * gnu/packages/ocaml.scm (ocaml-merlin-lib): New variable. (ocaml-dot-merlin-reader): Inherit from it and update inputs. (ocaml-merlin): Update inputs. (ocaml-yojson): Update to 2.0.2. (ocaml-odoc): Disable tests. --- gnu/packages/ocaml.scm | 47 ++++++++++++++++++++++++++++------------------- 1 file changed, 28 insertions(+), 19 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 5e2a7d023a..34c1f69afe 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -4987,7 +4987,7 @@ than yojson), with 25-35% space savings.") (define-public ocaml-yojson (package (name "ocaml-yojson") - (version "1.7.0") + (version "2.0.2") (home-page "https://github.com/ocaml-community/yojson") (source (origin @@ -4998,14 +4998,13 @@ than yojson), with 25-35% space savings.") (file-name (git-file-name name version)) (sha256 (base32 - "0zncsw8bgbkh1pfvfc7nh628hfj84lgx6jwhp9ashj3z1z0w3xjn")))) + "1habsh00ihjhk1g1csxqg3hj8izk5zvgc7wm579wyjw35vzcmwr1")))) (build-system dune-build-system) (arguments - `(#:test-target ".")) - (propagated-inputs - (list ocaml-biniou ocaml-easy-format)) - (native-inputs - (list ocaml-alcotest ocaml-cppo)) + `(#:test-target "." + #:package "yojson")) + (propagated-inputs (list ocaml-seq)) + (native-inputs (list ocaml-alcotest ocaml-cppo)) (synopsis "Low-level JSON library for OCaml") (description "Yojson is an optimized parsing and printing library for the JSON format. It addresses a few shortcomings of json-wheel including 2x @@ -5048,10 +5047,10 @@ Mercurial's @code{https://www.selenic.com/blog/?p=663, unified test format}. @code{craml} is released as a single binary (called @code{craml}).") (license license:isc))) -(define-public ocaml-dot-merlin-reader +(define-public ocaml-merlin-lib (package - (name "ocaml-dot-merlin-reader") - (version "4.5-414") + (name "ocaml-merlin-lib") + (version "4.6-414") (source (origin (method git-fetch) @@ -5061,17 +5060,27 @@ format}. @code{craml} is released as a single binary (called @code{craml}).") (file-name (git-file-name name version)) (sha256 (base32 - "125gyk63fg9plqkyrkl3wvpr3czjxgvshf4496fc4swldl7z587c")))) + "1cpa9x45w54l4mqqmc8z3s5gscggw37gb6z9i7wwss86fj1wgclh")))) (build-system dune-build-system) - (arguments '(#:package "dot-merlin-reader" + (arguments '(#:package "merlin-lib" #:tests? #f)) ; no tests - (inputs - (list ocaml-yojson ocaml-csexp ocaml-result)) + (propagated-inputs (list ocaml-csexp ocaml-menhir)) (home-page "https://ocaml.github.io/merlin/") + (synopsis "Merlin libraries") + (description "These libraries provides access to low-level compiler +interfaces and the standard higher-level merlin protocol.") + (license license:expat))) + +(define-public ocaml-dot-merlin-reader + (package + (inherit ocaml-merlin-lib) + (name "ocaml-dot-merlin-reader") + (arguments '(#:package "dot-merlin-reader" + #:tests? #f)) ; no tests + (propagated-inputs (list ocaml-merlin-lib)) (synopsis "Reads config files for @code{ocaml-merlin}") (description "@code{ocaml-dot-merlin-reader} is an external reader for -@code{ocaml-merlin} configurations.") - (license license:expat))) +@code{ocaml-merlin} configurations."))) (define-public ocaml-merlin (package @@ -5085,8 +5094,7 @@ format}. @code{craml} is released as a single binary (called @code{craml}).") (lambda* (#:key tests? #:allow-other-keys) (when tests? (invoke "dune" "runtest" "-p" "merlin,dot-merlin-reader"))))))) - (inputs - (list ocaml-yojson ocaml-csexp ocaml-result)) + (propagated-inputs (list ocaml-merlin-lib ocaml-yojson)) (native-inputs (list ocaml-dot-merlin-reader ; required for tests ocaml-mdx jq)) @@ -7644,7 +7652,8 @@ then run the Bisect_ppx report tool on the generated visitation files.") (base32 "07zjkk455l51i29lcayzrc1q8j5bvbv97sscv8yhcj7x6h6q2nag")))) (build-system dune-build-system) (arguments - `(#:phases + `(#:tests? #f; not compatible with current version of ocaml-yojson + #:phases (modify-phases %standard-phases (add-after 'unpack 'fix-test (lambda _ -- cgit 1.4.1 From b4d97ef2dee113eec1307207874253c4a2e39e39 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 13 Aug 2022 18:02:16 +0200 Subject: gnu: ocaml-piqi: Update to 0.7.8. * gnu/packages/ocaml.scm (ocaml-piqi): Update to 0.7.8. --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 34c1f69afe..63fa716c27 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -4074,7 +4074,7 @@ and 4 (random based) according to RFC 4122.") (define-public ocaml-piqi (package (name "ocaml-piqi") - (version "0.7.7") + (version "0.7.8") (source (origin (method git-fetch) (uri (git-reference @@ -4083,7 +4083,7 @@ and 4 (random based) according to RFC 4122.") (file-name (git-file-name name version)) (sha256 (base32 - "1913jpsb8mvqi8609j4g4sm5jhg50dq0xqxgy8nmvknfryyc89nm")))) + "12m9vxir0cs2155nxs0a3m3npf3w79kyxf9a5lmf18qvvgismfz8")))) (build-system ocaml-build-system) (arguments `(#:make-flags -- cgit 1.4.1 From 42d5f769fb940912b2a64e8d0b2528e492684ef5 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 13 Aug 2022 18:28:15 +0200 Subject: gnu: dune: Update to 4.4.1. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/ocaml.scm (dune): Update to 4.4.1. * gnu/packages/coq.scm (coq-stdlib): Fix for new dune. --- gnu/packages/coq.scm | 13 ++++++++++++- gnu/packages/ocaml.scm | 4 ++-- 2 files changed, 14 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm index bbb6c4d435..bbb34df27d 100644 --- a/gnu/packages/coq.scm +++ b/gnu/packages/coq.scm @@ -101,7 +101,18 @@ It is developed using Objective Caml and Camlp5.") (name "coq-stdlib") (arguments `(#:package "coq-stdlib" - #:test-target ".")) + #:test-target "." + #:phases + (modify-phases %standard-phases + (add-before 'build 'fix-dune + (lambda _ + (substitute* "user-contrib/Ltac2/dune" + (("coq-core.plugins.ltac2") + (string-join + (map (lambda (plugin) (string-append "coq-core.plugins." plugin)) + '("ltac2" "number_string_notation" "tauto" "cc" + "firstorder")) + " ")))))))) (inputs (list coq-core gmp ocaml-zarith)) (native-inputs '()))) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 63fa716c27..9968771bfc 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1705,7 +1705,7 @@ full_split, cut, rcut, etc..") (define dune-bootstrap (package (name "dune") - (version "3.3.1") + (version "3.4.1") (source (origin (method git-fetch) (uri (git-reference @@ -1714,7 +1714,7 @@ full_split, cut, rcut, etc..") (file-name (git-file-name name version)) (sha256 (base32 - "0wdja70l7y1cj1d0sijm0q0cbics8xd9wqka7zyb29y1cc57pasa")))) + "02zn79l7y7rvy7b6bimlf5qymrvzc43w8q7l4jx3k8wzn2g5326z")))) (build-system ocaml-build-system) (arguments `(#:tests? #f; require odoc -- cgit 1.4.1 From b7b2c922741e0edcb6fc0e913a821eba6684dc9d Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 13 Aug 2022 19:37:34 +0200 Subject: gnu: ocaml-ssl: Update to 0.5.12. * gnu/packages/ocaml.scm (ocaml-ssl): Update to 0.5.12. --- gnu/packages/ocaml.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 9968771bfc..6deb17d705 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2550,21 +2550,21 @@ lets the client choose the concrete timeline.") (define-public ocaml-ssl (package (name "ocaml-ssl") - (version "0.5.10") + (version "0.5.12") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/savonet/ocaml-ssl") - (commit (string-append "v" version)))) + (commit version))) (file-name (git-file-name name version)) (sha256 (base32 - "1rszqiqayh67xlwd5411k8vib47x9kapdr037z1majd2c14z3kcb")))) + "1dr7yghbv0wncvggd2105bj097msgrdzxd9wjkw1xxf2vvp0j1bi")))) (build-system dune-build-system) (arguments `(#:test-target ".")) (native-inputs - (list autoconf automake which)) + (list autoconf automake ocaml-alcotest which)) (propagated-inputs (list openssl)) (home-page "https://github.com/savonet/ocaml-ssl/") (synopsis "OCaml bindings for OpenSSL") -- cgit 1.4.1 From 96b3449823089ad86db7ca9d026b9d00645ae5fa Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 13 Aug 2022 19:39:07 +0200 Subject: gnu: ocaml-piqilib: Update to 0.6.16. * gnu/packages/ocaml.scm (ocaml-piqilib): Update to 0.6.16. --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 6deb17d705..75a8c25bfa 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3946,7 +3946,7 @@ Format module of the OCaml standard library.") (define-public ocaml-piqilib (package (name "ocaml-piqilib") - (version "0.6.15") + (version "0.6.16") (source (origin (method git-fetch) @@ -3955,7 +3955,7 @@ Format module of the OCaml standard library.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0v04hs85xv6d4ysqxyv1dik34dx49yab9shpi4x7iv19qlzl7csb")))) + (base32 "0mbhfrfrik3jlzx9zz680g0qdvv0b7cbjz28cgdlryp7nk4v4kx8")))) (build-system ocaml-build-system) (arguments `(#:phases -- cgit 1.4.1 From d75210a871b13b3fc5a3c2a5e065baff9b84638d Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 13 Aug 2022 19:45:00 +0200 Subject: gnu: ocaml-odoc-parser: Update to 2.0.0. * gnu/packages/ocaml.scm (ocaml-odoc-parser): Update to 2.0.0. (ocamlformat): Update to 0.24.1. --- gnu/packages/ocaml.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 75a8c25bfa..a4c76ea5e1 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -7698,7 +7698,7 @@ complexity of the OCaml module system.") (define-public ocaml-odoc-parser (package (name "ocaml-odoc-parser") - (version "1.0.0") + (version "2.0.0") (source (origin (method git-fetch) @@ -7708,10 +7708,10 @@ complexity of the OCaml module system.") (file-name (git-file-name name version)) (sha256 (base32 - "0mvwbnla0wd29bc7ckwpb494qv7p616cx8hnm0zg36np7v3zwy4w")))) + "1x48kf051xs98rd6cri591bk1ccp9hyp93n1rlf6qnxic55jw683")))) (build-system dune-build-system) (propagated-inputs - (list ocaml-astring ocaml-result)) + (list ocaml-astring ocaml-camlp-streams ocaml-result)) (native-inputs (list ocaml-ppx-expect)) (home-page "https://github.com/ocaml-doc/odoc-parser") @@ -8227,7 +8227,7 @@ defined in OCaml 4.12.0.") (define-public ocamlformat (package (name "ocamlformat") - (version "0.22.4") + (version "0.24.1") (source (origin (method git-fetch) @@ -8237,7 +8237,7 @@ defined in OCaml 4.12.0.") (file-name (git-file-name name version)) (sha256 (base32 - "171lq3vx4y8xj4by5zy93isx8nhg6ysxg1hxmkqkq16fdaiz8mnc")))) + "0y1j5mwwrliy6a78cmpi6j8gw425shghqg9ylyl3qw5fx4b088pp")))) (build-system dune-build-system) (arguments '(#:package "ocamlformat" -- cgit 1.4.1 From 7b95125bad3c584af450b4ccdb548eaee4f0639b Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 13 Aug 2022 20:44:39 +0200 Subject: gnu: ocaml-alcotest: Update to 1.6.0. * gnu/packages/ocaml.scm (ocaml-alcotest): Update to 1.6.0. --- gnu/packages/ocaml.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index a4c76ea5e1..aa3a59d15b 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2428,7 +2428,7 @@ immutability.") (define-public ocaml-alcotest (package (name "ocaml-alcotest") - (version "1.5.0") + (version "1.6.0") (source (origin (method git-fetch) (uri (git-reference @@ -2437,7 +2437,7 @@ immutability.") (file-name (git-file-name name version)) (sha256 (base32 - "1lgadc7p56677fi5gwl7r9bml4z87rzh50khhqaij7bwp37zrmpi")))) + "195612n7p8y5ba6n19glql7qffl8n3aqkl9nrlln5lb9739gpv4w")))) (build-system dune-build-system) (arguments `(#:package "alcotest" @@ -2449,7 +2449,6 @@ immutability.") ;; cmdliner changed the format and the tests fail (substitute* "test/e2e/alcotest/failing/unknown_option.expected" (("`") "'") - (("COMMAND") "[COMMAND]") (("\\.\\.\\.") "…"))))))) (native-inputs (list ocamlbuild)) -- cgit 1.4.1 From 628713ea73389b641e17b9849388be7561542ffe Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 13 Aug 2022 20:45:55 +0200 Subject: gnu: ocaml-version: Update to 3.5.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/ocaml.scm (ocaml-version): Update to 3.5.0. --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index aa3a59d15b..19e9bb2536 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -7851,7 +7851,7 @@ and SVG file output.") (define-public ocaml-version (package (name "ocaml-version") - (version "3.4.0") + (version "3.5.0") (source (origin (method git-fetch) @@ -7861,7 +7861,7 @@ and SVG file output.") (file-name (git-file-name name version)) (sha256 (base32 - "1c13zk1qna59m5z9jx7da3p7cxd48scpyk7zg7gi6gc6hx5hhjx8")))) + "1pnw2ym021j48zknhbi1kdiyfv9si8p2l04rdzbv4g51fclsqs92")))) (build-system dune-build-system) (arguments `(#:tests? #f)) ; no tests (properties '((upstream-name . "ocaml-version"))) -- cgit 1.4.1 From 3d065a81a796f4d7700541e53342056b4936c6f6 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 13 Aug 2022 20:47:39 +0200 Subject: gnu: ocaml-cstruct: Update to 6.1.1. * gnu/packages/ocaml.scm (ocaml-cstruct): Update to 6.1.1. --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 19e9bb2536..de23605704 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3752,7 +3752,7 @@ big- and little-endian, with their unsafe counter-parts.") (define-public ocaml-cstruct (package (name "ocaml-cstruct") - (version "6.1.0") + (version "6.1.1") (source (origin (method git-fetch) (uri (git-reference @@ -3761,7 +3761,7 @@ big- and little-endian, with their unsafe counter-parts.") (file-name (git-file-name name version)) (sha256 (base32 - "1pwfkfs8zzr88slnvl5b28lx6w2k149ybgvrs6diay3qvwcmkhx5")))) + "0dpbirs6lzp0bclr3wcw407jjspll7iy66z18zks3mjccvlxd21w")))) (build-system dune-build-system) (arguments `(#:package "cstruct" -- cgit 1.4.1 From 893299b3ee64d6055ff311f96b1bf792cbf83012 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 13 Aug 2022 20:49:23 +0200 Subject: gnu: ocaml-biniou: Update to 1.2.2. * gnu/packages/ocaml.scm (ocaml-biniou): Update to 1.2.2. --- gnu/packages/ocaml.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index de23605704..b34b73cf87 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -4952,7 +4952,7 @@ than the first one.") (define-public ocaml-biniou (package (name "ocaml-biniou") - (version "1.2.1") + (version "1.2.2") (home-page "https://github.com/mjambon/biniou") (source (origin @@ -4963,7 +4963,7 @@ than the first one.") (file-name (git-file-name name version)) (sha256 (base32 - "0x2kiy809n1j0yf32l7hj102y628jp5jdrkbi3z7ld8jq04h1790")))) + "1gd4nqffm9h7dzxyvpfpww24l61fqgazyh3p5f7k9jvgyv9y4vcn")))) (build-system dune-build-system) (arguments `(#:phases @@ -4971,7 +4971,7 @@ than the first one.") (add-before 'build 'make-writable (lambda _ (for-each make-file-writable (find-files "." "."))))))) (inputs - (list ocaml-easy-format)) + (list ocaml-easy-format ocaml-camlp-streams)) (native-inputs (list which)) (synopsis "Data format designed for speed, safety, ease of use and backward -- cgit 1.4.1 From 07fecda3ddf78847ca4a51d9d11d5b48553037b5 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 13 Aug 2022 20:51:42 +0200 Subject: gnu: ocaml-timed: Update to 1.1. * gnu/packages/ocaml.scm (ocaml-timed): Update to 1.1. --- gnu/packages/ocaml.scm | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index b34b73cf87..576e0525f3 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -4911,31 +4911,20 @@ is also support for writing OCaml syntax extensions in a camlp4 style.") (define-public ocaml-timed (package (name "ocaml-timed") - (version "1.0") + (version "1.1") (home-page "https://github.com/rlepigre/ocaml-timed") (source (origin (method git-fetch) (uri (git-reference (url (string-append home-page ".git")) - (commit (string-append name "_" version)))) + (commit version))) (sha256 (base32 - "0hfxz710faxy5yk97bkfnw87r732jcxxhmjppwrbfdb6pd0wks96")) + "1aqmkpjv5jk95lc2m3qyyrhw8ra7n9wj8pv3bfc83l737zv0hjn1")) (file-name (git-file-name name version)))) - (build-system ocaml-build-system) + (build-system dune-build-system) (arguments - '(#:phases - (modify-phases %standard-phases - (delete 'configure) - (replace 'build - (lambda _ - (invoke "make"))) - (replace 'install - (lambda _ - (invoke "make" "install"))) - (replace 'check - (lambda _ - (invoke "make" "tests")))))) + '(#:test-target ".")) (synopsis "Timed references for imperative state") (description "Timed references for imperative state. This module provides an alternative type for references (or mutable cells) supporting undo/redo -- cgit 1.4.1 From 9062bb56c8720366955035b7c00f8426c9854094 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 13 Aug 2022 20:56:42 +0200 Subject: gnu: ocaml-sexplib: Update to 0.15.1. * gnu/packages/ocaml.scm (ocaml-sexplib): Update to 0.15.1. --- gnu/packages/ocaml.scm | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 576e0525f3..7ab41a802b 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5307,11 +5307,17 @@ parsexp_io.") (define-public ocaml-sexplib (package (name "ocaml-sexplib") - (version "0.15.0") + (version "0.15.1") (home-page "https://github.com/janestreet/sexplib") - (source - (janestreet-origin "sexplib" version - "1xs55f11yhscnfrzpvy1vn05j6xi9kxy097465624l615j7k8qm5")) + (source (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1gcvcc0jw6pb69wwfjnaqz1jk5simap2kdb7g43v7v7mksg8sh9f")))) (build-system dune-build-system) (propagated-inputs (list ocaml-base ocaml-num ocaml-parsexp ocaml-sexplib0)) -- cgit 1.4.1 From 82ea33d295ce7f2f351c662fc9d8eece024ab2ab Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 13 Aug 2022 21:18:25 +0200 Subject: gnu: ocaml-cudf: Update to 0.10. * gnu/packages/ocaml.scm (ocaml-cudf): Update to 0.10. --- gnu/packages/ocaml.scm | 33 ++++++++++++++------------------- 1 file changed, 14 insertions(+), 19 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 7ab41a802b..3f123219f7 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -591,26 +591,21 @@ for day to day programming.") (define-public ocaml-cudf (package (name "ocaml-cudf") - (version "0.9") - (source - (origin - (method url-fetch) - (uri "https://gforge.inria.fr/frs/download.php/36602/cudf-0.9.tar.gz") - (sha256 - (base32 - "0771lwljqwwn3cryl0plny5a5dyyrj4z6bw66ha5n8yfbpcy8clr")))) - (build-system ocaml-build-system) - (propagated-inputs (list ocaml-extlib)) - (native-inputs - (list perl ocamlbuild ocaml-ounit)) + (version "0.10") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/irill/cudf") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1lvrmpscbk1kjv5ag5bzlzv520xk5zw2haf6q7chvz98gcm9g0hk")))) + (build-system dune-build-system) (arguments - `(#:make-flags - ,#~(list - "all" "opt" - (string-append "BINDIR=" #$output "/bin")) - #:phases - (modify-phases %standard-phases - (delete 'configure)))) + '(#:test-target ".")) + (propagated-inputs (list ocaml-extlib)) + (native-inputs (list ocaml-ounit2)) (home-page "https://www.mancoosi.org/cudf/") (synopsis "CUDF library (part of the Mancoosi tools)") (description "CUDF (for Common Upgradeability Description Format) is a -- cgit 1.4.1 From ad871dae88869616b2f44f0f9526b3046ebf7c47 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 7 Aug 2022 02:00:04 +0200 Subject: gnu: xonotic: Update to 0.8.5. * gnu/packages/games.scm (xonotic): Update to 0.8.5. [source]: Use HTTPS. [arguments]: Don't explicitly return #t from phases. --- gnu/packages/games.scm | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 99eccca04d..7771bd15cc 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -7801,16 +7801,15 @@ quotation from a collection of quotes.") (define-public xonotic (package (name "xonotic") - (version "0.8.2") + (version "0.8.5") (source (origin (method url-fetch) - (uri (string-append "http://dl.xonotic.org/xonotic-" + (uri (string-append "https://dl.xonotic.org/xonotic-" version "-source.zip")) (file-name (string-append name "-" version ".zip")) (sha256 - (base32 - "0axxw04fyz6jlfqd0kp7hdrqa0li31sx1pbipf2j5qp9wvqicsay")))) + (base32 "0pgahai0gk8bjmvkwx948bl50l9f9dhmjzwffl4vyldibajipa51")))) (build-system gnu-build-system) (arguments `(#:configure-flags (list (string-append "--prefix=" @@ -7894,8 +7893,7 @@ quotation from a collection of quotes.") Icon=xonotic~@ Categories=Game~@ Type=Application~%" - output))) - #t))) + output)))))) (add-after 'install-desktop-entry 'install-icons (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) @@ -7926,15 +7924,13 @@ quotation from a collection of quotes.") "/bin/xonotic-sdl") ;; Provide a default xonotic executable, defaulting to SDL. (symlink (string-append out "/bin/xonotic-sdl") - (string-append out "/bin/xonotic")) - #t))) + (string-append out "/bin/xonotic"))))) (add-after 'install-binaries 'install-data (lambda* (#:key outputs inputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (data (assoc-ref inputs "xonotic-data"))) (symlink (string-append data "/share/xonotic") - (string-append out "/share/xonotic")) - #t))) + (string-append out "/share/xonotic"))))) (add-after 'install-binaries 'wrap-binaries (lambda* (#:key outputs inputs #:allow-other-keys) ;; Curl and libvorbis need to be wrapped so that we get @@ -7957,8 +7953,7 @@ quotation from a collection of quotes.") (,(string-append curl "/lib:" vorbis "/lib")))) (wrap-program bin-dedicated `("LD_LIBRARY_PATH" ":" prefix - (,(string-append curl "/lib:" vorbis "/lib")))) - #t)))))) + (,(string-append curl "/lib:" vorbis "/lib")))))))))) (inputs `(("xonotic-data" ,xonotic-data) ("alsa-lib" ,alsa-lib) -- cgit 1.4.1 From 12b0258d752b57efb8aaa43a0865d56c04bd9dd4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 7 Aug 2022 02:00:01 +0200 Subject: gnu: xonotic-data: Update to 0.8.5. * gnu/packages/games.scm (xonotic-data): Update to 0.8.5. [source]: Use HTTPS. --- gnu/packages/games.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 7771bd15cc..df52626650 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -7759,16 +7759,15 @@ quotation from a collection of quotes.") (define xonotic-data (package (name "xonotic-data") - (version "0.8.2") + (version "0.8.5") (source (origin (method url-fetch) - (uri (string-append "http://dl.xonotic.org/xonotic-" + (uri (string-append "https://dl.xonotic.org/xonotic-" version ".zip")) (file-name (string-append name "-" version ".zip")) (sha256 - (base32 - "1mcs6l4clvn7ibfq3q69k2p0z6ww75rxvnngamdq5ic6yhq74bx2")))) + (base32 "1r9pdrrki7mkdw99zh9m7911fqldsfdnl0nrp5cv1bk2hcism4hg")))) (build-system trivial-build-system) (native-inputs `(("unzip" ,unzip))) -- cgit 1.4.1 From 3ec40d007410c532a3409a5940a18e20d4c2757c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 7 Aug 2022 02:00:03 +0200 Subject: gnu: xonotic-data: Remove input labels. * gnu/packages/games.scm (xonotic-data)[native-inputs]: Remove input labels. --- gnu/packages/games.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index df52626650..df6432da11 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -7769,8 +7769,7 @@ quotation from a collection of quotes.") (sha256 (base32 "1r9pdrrki7mkdw99zh9m7911fqldsfdnl0nrp5cv1bk2hcism4hg")))) (build-system trivial-build-system) - (native-inputs - `(("unzip" ,unzip))) + (native-inputs (list unzip)) (arguments `(#:modules ((guix build utils)) #:builder -- cgit 1.4.1 From 501d4b3bb418c39fdea420ae1b8a1723af6ee3ab Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 7 Aug 2022 02:00:01 +0200 Subject: gnu: xonotic: Remove input labels. * gnu/packages/games.scm (xonotic)[inputs, native-inputs]: Remove input labels. --- gnu/packages/games.scm | 50 +++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index df6432da11..1dcc6483b7 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -7952,34 +7952,34 @@ quotation from a collection of quotes.") (wrap-program bin-dedicated `("LD_LIBRARY_PATH" ":" prefix (,(string-append curl "/lib:" vorbis "/lib")))))))))) - (inputs - `(("xonotic-data" ,xonotic-data) - ("alsa-lib" ,alsa-lib) - ("curl" ,curl) - ("libjpeg" ,libjpeg-turbo) - ("libmodplug" ,libmodplug) - ("libvorbis" ,libvorbis) - ("libogg" ,libogg) - ("libxpm" ,libxpm) - ("libxxf86dga" ,libxxf86dga) - ("libxxf86vm" ,libxxf86vm) - ("libx11" ,libx11) - ("libxext" ,libxext) - ("libxau" ,libxau) - ("libxdmcp" ,libxdmcp) - ("mesa" ,mesa) - ("glu" ,glu) - ("freetype" ,freetype) - ("sdl2" ,sdl2) - ("libpng" ,libpng) - ("hicolor-icon-theme" ,hicolor-icon-theme))) (native-inputs - (list unzip - autoconf + (list autoconf automake - pkg-config + gmp libtool - gmp)) + pkg-config + unzip)) + (inputs + (list alsa-lib + curl + libjpeg-turbo + libmodplug + libvorbis + libogg + libpng + libx11 + libxpm + libxxf86dga + libxxf86vm + libxext + libxau + libxdmcp + mesa + glu + freetype + sdl2 + hicolor-icon-theme + xonotic-data)) (home-page "https://xonotic.org") (synopsis "Fast-paced first-person shooter game") (description -- cgit 1.4.1 From 33ae2fb39824fbcdbd8f39a7a2936d3186df4513 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 7 Aug 2022 02:00:00 +0200 Subject: gnu: xonotic-data: Use G-expressions. * gnu/packages/games.scm (xonotic-data)[arguments]: Rewrite as G-expressions. --- gnu/packages/games.scm | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 1dcc6483b7..055c9ba9b7 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -7771,24 +7771,22 @@ quotation from a collection of quotes.") (build-system trivial-build-system) (native-inputs (list unzip)) (arguments - `(#:modules ((guix build utils)) - #:builder - (begin - (use-modules (guix build utils)) - (let* ((out (assoc-ref %outputs "out")) - (xonotic (string-append out "/share/xonotic")) - (source (assoc-ref %build-inputs "source")) - (unzip (search-input-file %build-inputs "/bin/unzip"))) - (copy-file source (string-append ,name "-" ,version ".zip")) - (invoke unzip (string-append ,name "-" ,version ".zip")) - (mkdir-p out) - (mkdir-p xonotic) - (chdir "Xonotic") - (copy-recursively "data" - (string-append xonotic "/data")) - (copy-recursively "server" - (string-append xonotic "/server")) - (install-file "key_0.d0pk" xonotic))))) + (list #:modules '((guix build utils)) + #:builder + #~(begin + (use-modules (guix build utils)) + (let* ((out (assoc-ref %outputs "out")) + (xonotic (string-append out "/share/xonotic")) + (source (assoc-ref %build-inputs "source")) + (unzip (search-input-file %build-inputs "/bin/unzip"))) + (copy-file source (string-append #$name "-" #$version ".zip")) + (invoke unzip (string-append #$name "-" #$version ".zip")) + (chdir "Xonotic") + (install-file "key_0.d0pk" xonotic) + (copy-recursively "data" + (string-append xonotic "/data")) + (copy-recursively "server" + (string-append xonotic "/server")))))) (home-page "http://xonotic.org") (synopsis "Data files for Xonotic") (description -- cgit 1.4.1 From d21ddfc9d884f045afa6db581e852c525c67ef35 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 7 Aug 2022 02:00:00 +0200 Subject: gnu: xonotic-data: Don't copy 1.2-GiB file to build directory. * gnu/packages/games.scm (xonotic-data)[arguments]: Extract SOURCE directly from the store. --- gnu/packages/games.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 055c9ba9b7..19bc495b00 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -7779,8 +7779,7 @@ quotation from a collection of quotes.") (xonotic (string-append out "/share/xonotic")) (source (assoc-ref %build-inputs "source")) (unzip (search-input-file %build-inputs "/bin/unzip"))) - (copy-file source (string-append #$name "-" #$version ".zip")) - (invoke unzip (string-append #$name "-" #$version ".zip")) + (invoke unzip source) (chdir "Xonotic") (install-file "key_0.d0pk" xonotic) (copy-recursively "data" -- cgit 1.4.1 From 3dc16fe0dca3bb88d97a2190be9809ea4e6222c8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 7 Aug 2022 02:00:01 +0200 Subject: gnu: xonotic: Use G-expressions. * gnu/packages/games.scm (xonotic)[arguments]: Rewrite as G-expressions. --- gnu/packages/games.scm | 282 ++++++++++++++++++++++++------------------------- 1 file changed, 141 insertions(+), 141 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 19bc495b00..487f6571a6 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -7807,148 +7807,148 @@ quotation from a collection of quotes.") (base32 "0pgahai0gk8bjmvkwx948bl50l9f9dhmjzwffl4vyldibajipa51")))) (build-system gnu-build-system) (arguments - `(#:configure-flags (list (string-append "--prefix=" - (assoc-ref %outputs "out")) - "--disable-rijndael") - #:phases - (modify-phases %standard-phases - (add-before 'configure 'make-darkplaces - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (sharedir (string-append out "/share/xonotic/"))) - (invoke "make" "-C" "source/darkplaces" - (string-append "DP_FS_BASEDIR=" - sharedir) - "DP_LINK_TO_LIBJPEG=1" - "DP_SOUND_API=ALSA" - "CC=gcc" - "-f" "makefile" - "cl-release") - (invoke "make" "-C" "source/darkplaces" - (string-append "DP_FS_BASEDIR=" - sharedir) - "DP_LINK_TO_LIBJPEG=1" - "DP_SOUND_API=ALSA" - "CC=gcc" - "-f" "makefile" - "sdl-release") - (invoke "make" "-C" "source/darkplaces" - (string-append "DP_FS_BASEDIR=" - sharedir) - "DP_LINK_TO_LIBJPEG=1" - "DP_SOUND_API=ALSA" - "CC=gcc" - "-f" "makefile" - "sv-release")))) - (add-before 'configure 'bootstrap - (lambda _ - (chdir "source/d0_blind_id") - (invoke "sh" "autogen.sh"))) - (add-after 'build 'install-desktop-entry - (lambda* (#:key outputs #:allow-other-keys) - ;; Add .desktop files for the 2 variants and the symlink - (let* ((output (assoc-ref outputs "out")) - (apps (string-append output "/share/applications"))) - (mkdir-p apps) - (with-output-to-file - (string-append apps "/xonotic-glx.desktop") - (lambda _ - (format #t - "[Desktop Entry]~@ - Name=xonotic-glx~@ - Comment=Xonotic glx~@ - Exec=~a/bin/xonotic-glx~@ - TryExec=~@*~a/bin/xonotic-glx~@ - Icon=xonotic~@ - Categories=Game~@ - Type=Application~%" - output))) - (with-output-to-file - (string-append apps "/xonotic-sdl.desktop") - (lambda _ - (format #t - "[Desktop Entry]~@ - Name=xonotic-sdl~@ - Comment=Xonotic sdl~@ - Exec=~a/bin/xonotic-sdl~@ - TryExec=~@*~a/bin/xonotic-sdl~@ - Icon=xonotic~@ - Categories=Game~@ - Type=Application~%" - output))) - (with-output-to-file - (string-append apps "/xonotic.desktop") + (list #:configure-flags + #~(list (string-append "--prefix=" #$output) + "--disable-rijndael") + #:phases + #~(modify-phases %standard-phases + (add-before 'configure 'make-darkplaces + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (share (string-append out "/share/xonotic/"))) + (invoke "make" "-C" "source/darkplaces" + (string-append "DP_FS_BASEDIR=" + share) + "DP_LINK_TO_LIBJPEG=1" + "DP_SOUND_API=ALSA" + "CC=gcc" + "-f" "makefile" + "cl-release") + (invoke "make" "-C" "source/darkplaces" + (string-append "DP_FS_BASEDIR=" + share) + "DP_LINK_TO_LIBJPEG=1" + "DP_SOUND_API=ALSA" + "CC=gcc" + "-f" "makefile" + "sdl-release") + (invoke "make" "-C" "source/darkplaces" + (string-append "DP_FS_BASEDIR=" + share) + "DP_LINK_TO_LIBJPEG=1" + "DP_SOUND_API=ALSA" + "CC=gcc" + "-f" "makefile" + "sv-release")))) + (add-before 'configure 'bootstrap (lambda _ - (format #t - "[Desktop Entry]~@ - Name=xonotic~@ - Comment=Xonotic~@ - Exec=~a/bin/xonotic-glx~@ - TryExec=~@*~a/bin/xonotic~@ - Icon=xonotic~@ - Categories=Game~@ - Type=Application~%" - output)))))) - (add-after 'install-desktop-entry 'install-icons - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (with-directory-excursion "../../misc/logos/icons_png/" - (for-each - (lambda (file) - (let* ((size (string-filter char-numeric? file)) - (icons (string-append out "/share/icons/hicolor/" - size "x" size "/apps"))) - (mkdir-p icons) - (copy-file file (string-append icons "/xonotic.png")))) - '("xonotic_16.png" "xonotic_22.png" "xonotic_24.png" - "xonotic_32.png" "xonotic_48.png" "xonotic_64.png" - "xonotic_128.png" "xonotic_256.png" "xonotic_512.png")))))) - (add-after 'install-icons 'install-binaries - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (define (install src dst) - (let ((dst (string-append out dst))) - (mkdir-p (dirname dst)) - (copy-file src dst))) - (mkdir-p (string-append out "/bin")) - (install "../darkplaces/darkplaces-dedicated" - "/bin/xonotic-dedicated") - (install "../darkplaces/darkplaces-glx" - "/bin/xonotic-glx") - (install "../darkplaces/darkplaces-sdl" - "/bin/xonotic-sdl") - ;; Provide a default xonotic executable, defaulting to SDL. - (symlink (string-append out "/bin/xonotic-sdl") - (string-append out "/bin/xonotic"))))) - (add-after 'install-binaries 'install-data - (lambda* (#:key outputs inputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (data (assoc-ref inputs "xonotic-data"))) - (symlink (string-append data "/share/xonotic") - (string-append out "/share/xonotic"))))) - (add-after 'install-binaries 'wrap-binaries - (lambda* (#:key outputs inputs #:allow-other-keys) - ;; Curl and libvorbis need to be wrapped so that we get - ;; sound and networking. - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin/xonotic")) - (bin-sdl (string-append out "/bin/xonotic-sdl")) - (bin-glx (string-append out "/bin/xonotic-glx")) - (bin-dedicated (string-append out "/bin/xonotic-dedicated")) - (curl (assoc-ref inputs "curl")) - (vorbis (assoc-ref inputs "libvorbis"))) - (wrap-program bin - `("LD_LIBRARY_PATH" ":" prefix - (,(string-append curl "/lib:" vorbis "/lib")))) - (wrap-program bin-sdl - `("LD_LIBRARY_PATH" ":" prefix - (,(string-append curl "/lib:" vorbis "/lib")))) - (wrap-program bin-glx - `("LD_LIBRARY_PATH" ":" prefix - (,(string-append curl "/lib:" vorbis "/lib")))) - (wrap-program bin-dedicated - `("LD_LIBRARY_PATH" ":" prefix - (,(string-append curl "/lib:" vorbis "/lib")))))))))) + (chdir "source/d0_blind_id") + (invoke "sh" "autogen.sh"))) + (add-after 'install 'symlink-data + (lambda* (#:key outputs inputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (data (assoc-ref inputs "xonotic-data"))) + (symlink (string-append data "/share/xonotic") + (string-append out "/share/xonotic"))))) + (add-after 'install 'install-desktop-entry + (lambda* (#:key outputs #:allow-other-keys) + ;; Add .desktop files for the 2 variants and the symlink. + (let* ((output (assoc-ref outputs "out")) + (apps (string-append output "/share/applications"))) + (mkdir-p apps) + (with-output-to-file + (string-append apps "/xonotic-glx.desktop") + (lambda _ + (format #t + "[Desktop Entry]~@ + Name=xonotic-glx~@ + Comment=Xonotic glx~@ + Exec=~a/bin/xonotic-glx~@ + TryExec=~@*~a/bin/xonotic-glx~@ + Icon=xonotic~@ + Categories=Game~@ + Type=Application~%" + output))) + (with-output-to-file + (string-append apps "/xonotic-sdl.desktop") + (lambda _ + (format #t + "[Desktop Entry]~@ + Name=xonotic-sdl~@ + Comment=Xonotic sdl~@ + Exec=~a/bin/xonotic-sdl~@ + TryExec=~@*~a/bin/xonotic-sdl~@ + Icon=xonotic~@ + Categories=Game~@ + Type=Application~%" + output))) + (with-output-to-file + (string-append apps "/xonotic.desktop") + (lambda _ + (format #t + "[Desktop Entry]~@ + Name=xonotic~@ + Comment=Xonotic~@ + Exec=~a/bin/xonotic-glx~@ + TryExec=~@*~a/bin/xonotic~@ + Icon=xonotic~@ + Categories=Game~@ + Type=Application~%" + output)))))) + (add-after 'install 'install-icons + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (with-directory-excursion "../../misc/logos/icons_png/" + (for-each + (lambda (file) + (let* ((size (string-filter char-numeric? file)) + (icons (string-append out "/share/icons/hicolor/" + size "x" size "/apps"))) + (mkdir-p icons) + (copy-file file (string-append icons "/xonotic.png")))) + '("xonotic_16.png" "xonotic_22.png" "xonotic_24.png" + "xonotic_32.png" "xonotic_48.png" "xonotic_64.png" + "xonotic_128.png" "xonotic_256.png" "xonotic_512.png")))))) + (add-after 'install 'install-binaries + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (define (install src dst) + (let ((dst (string-append out dst))) + (mkdir-p (dirname dst)) + (copy-file src dst))) + (mkdir-p (string-append out "/bin")) + (install "../darkplaces/darkplaces-dedicated" + "/bin/xonotic-dedicated") + (install "../darkplaces/darkplaces-glx" + "/bin/xonotic-glx") + (install "../darkplaces/darkplaces-sdl" + "/bin/xonotic-sdl") + ;; Provide a default xonotic executable, defaulting to SDL. + (symlink (string-append out "/bin/xonotic-sdl") + (string-append out "/bin/xonotic"))))) + (add-after 'install-binaries 'wrap + (lambda* (#:key outputs inputs #:allow-other-keys) + ;; Curl and libvorbis need to be wrapped so that we get + ;; sound and networking. + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin/xonotic")) + (bin-sdl (string-append out "/bin/xonotic-sdl")) + (bin-glx (string-append out "/bin/xonotic-glx")) + (bin-dedicated (string-append out "/bin/xonotic-dedicated")) + (curl (assoc-ref inputs "curl")) + (vorbis (assoc-ref inputs "libvorbis"))) + (wrap-program bin + `("LD_LIBRARY_PATH" ":" prefix + (,(string-append curl "/lib:" vorbis "/lib")))) + (wrap-program bin-sdl + `("LD_LIBRARY_PATH" ":" prefix + (,(string-append curl "/lib:" vorbis "/lib")))) + (wrap-program bin-glx + `("LD_LIBRARY_PATH" ":" prefix + (,(string-append curl "/lib:" vorbis "/lib")))) + (wrap-program bin-dedicated + `("LD_LIBRARY_PATH" ":" prefix + (,(string-append curl "/lib:" vorbis "/lib")))))))))) (native-inputs (list autoconf automake -- cgit 1.4.1 From 22f865b7e643ec2b1fc4f0238127cc881ef41e49 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 7 Aug 2022 02:00:00 +0200 Subject: gnu: xonotic: Normalise building Darkplaces. * gnu/packages/games.scm (xonotic)[arguments]: Build Darkplaces in a single pass. Honour MAKE-FLAGS, PARALLEL-BUILD?, and CC-FOR-TARGET. --- gnu/packages/games.scm | 43 +++++++++++++++++-------------------------- 1 file changed, 17 insertions(+), 26 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 487f6571a6..6b5ab89dcd 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -7812,34 +7812,25 @@ quotation from a collection of quotes.") "--disable-rijndael") #:phases #~(modify-phases %standard-phases - (add-before 'configure 'make-darkplaces - (lambda* (#:key outputs #:allow-other-keys) + (add-before 'configure 'build-darkplaces + (lambda* (#:key make-flags parallel-build? outputs + #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (share (string-append out "/share/xonotic/"))) - (invoke "make" "-C" "source/darkplaces" - (string-append "DP_FS_BASEDIR=" - share) - "DP_LINK_TO_LIBJPEG=1" - "DP_SOUND_API=ALSA" - "CC=gcc" - "-f" "makefile" - "cl-release") - (invoke "make" "-C" "source/darkplaces" - (string-append "DP_FS_BASEDIR=" - share) - "DP_LINK_TO_LIBJPEG=1" - "DP_SOUND_API=ALSA" - "CC=gcc" - "-f" "makefile" - "sdl-release") - (invoke "make" "-C" "source/darkplaces" - (string-append "DP_FS_BASEDIR=" - share) - "DP_LINK_TO_LIBJPEG=1" - "DP_SOUND_API=ALSA" - "CC=gcc" - "-f" "makefile" - "sv-release")))) + (apply invoke "make" + "-C" "source/darkplaces" + "-f" "makefile" + "-j" (if parallel-build? + (number->string (parallel-job-count)) + "1") + (string-append "CC=" #$(cc-for-target)) + (string-append "DP_FS_BASEDIR=" share) + "DP_LINK_TO_LIBJPEG=1" + "DP_SOUND_API=ALSA" + "cl-release" + "sdl-release" + "sv-release" + make-flags)))) (add-before 'configure 'bootstrap (lambda _ (chdir "source/d0_blind_id") -- cgit 1.4.1 From 642a3e3d7abd3f53987c49edf5ec0f50dbbff30d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 7 Aug 2022 02:00:02 +0200 Subject: gnu: xonotic: Rename misleading 'bootstrap phase. * gnu/packages/games.scm (xonotic)[arguments]: Rename (second! stateful!) 'bootstrap phase to 'preconfigure. --- gnu/packages/games.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 6b5ab89dcd..b55fe92d9b 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -7831,7 +7831,7 @@ quotation from a collection of quotes.") "sdl-release" "sv-release" make-flags)))) - (add-before 'configure 'bootstrap + (add-before 'configure 'preconfigure (lambda _ (chdir "source/d0_blind_id") (invoke "sh" "autogen.sh"))) -- cgit 1.4.1 From 5dee2fdae70aec405722dc2a7399e1871253efc5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 7 Aug 2022 02:00:00 +0200 Subject: gnu: xonotic: Further explore the concept of iteration. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/games.scm (xonotic)[arguments]: Use FOR-EACH in the 'install-binaries and renamed 'install-desktop-entries phases. Use FIND-FILES in the 'install-icons phase. Use both in 'wrap-binaries for brevity (and SRFI-26 for fun). Symlink ‘xonotic’ after wrapping, so we don't double-wrap it. --- gnu/packages/games.scm | 142 ++++++++++++++++++------------------------------- 1 file changed, 53 insertions(+), 89 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index b55fe92d9b..37274781db 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -7810,6 +7810,9 @@ quotation from a collection of quotes.") (list #:configure-flags #~(list (string-append "--prefix=" #$output) "--disable-rijndael") + #:modules '((guix build gnu-build-system) + (guix build utils) + (srfi srfi-26)) #:phases #~(modify-phases %standard-phases (add-before 'configure 'build-darkplaces @@ -7841,105 +7844,66 @@ quotation from a collection of quotes.") (data (assoc-ref inputs "xonotic-data"))) (symlink (string-append data "/share/xonotic") (string-append out "/share/xonotic"))))) - (add-after 'install 'install-desktop-entry + (add-after 'install 'install-desktop-entries (lambda* (#:key outputs #:allow-other-keys) - ;; Add .desktop files for the 2 variants and the symlink. - (let* ((output (assoc-ref outputs "out")) - (apps (string-append output "/share/applications"))) - (mkdir-p apps) - (with-output-to-file - (string-append apps "/xonotic-glx.desktop") - (lambda _ - (format #t - "[Desktop Entry]~@ - Name=xonotic-glx~@ - Comment=Xonotic glx~@ - Exec=~a/bin/xonotic-glx~@ - TryExec=~@*~a/bin/xonotic-glx~@ - Icon=xonotic~@ - Categories=Game~@ - Type=Application~%" - output))) - (with-output-to-file - (string-append apps "/xonotic-sdl.desktop") - (lambda _ - (format #t - "[Desktop Entry]~@ - Name=xonotic-sdl~@ - Comment=Xonotic sdl~@ - Exec=~a/bin/xonotic-sdl~@ - TryExec=~@*~a/bin/xonotic-sdl~@ - Icon=xonotic~@ - Categories=Game~@ - Type=Application~%" - output))) - (with-output-to-file - (string-append apps "/xonotic.desktop") - (lambda _ - (format #t - "[Desktop Entry]~@ - Name=xonotic~@ - Comment=Xonotic~@ - Exec=~a/bin/xonotic-glx~@ - TryExec=~@*~a/bin/xonotic~@ - Icon=xonotic~@ - Categories=Game~@ - Type=Application~%" - output)))))) + (let* ((out (assoc-ref outputs "out")) + (app (string-append out "/share/applications"))) + ;; Add .desktop files for the 2 variants and the symlink. + (for-each + (lambda (variant) + (let* ((file (if variant + (format #f "xonotic-~(~a~)" variant) + "xonotic")) + (name (if variant + (format #f "Xonotic (~a)" variant) + "Xonotic")) + (exec (string-append out "/bin/" file))) + (make-desktop-entry-file + (string-append app "/" file ".desktop") + #:name name + #:comment `((#f #$(package-synopsis this-package))) + #:exec exec + #:try-exec exec + #:icon "xonotic" + #:categories '("Game")))) + (list #f "GLX" "SDL"))))) (add-after 'install 'install-icons (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) - (with-directory-excursion "../../misc/logos/icons_png/" - (for-each - (lambda (file) - (let* ((size (string-filter char-numeric? file)) - (icons (string-append out "/share/icons/hicolor/" - size "x" size "/apps"))) - (mkdir-p icons) - (copy-file file (string-append icons "/xonotic.png")))) - '("xonotic_16.png" "xonotic_22.png" "xonotic_24.png" - "xonotic_32.png" "xonotic_48.png" "xonotic_64.png" - "xonotic_128.png" "xonotic_256.png" "xonotic_512.png")))))) + (for-each + (lambda (file) + (let* ((size (string-filter char-numeric? file)) + (icons (string-append out "/share/icons/hicolor/" + size "x" size "/apps"))) + (mkdir-p icons) + (copy-file file (string-append icons "/xonotic.png")))) + (find-files "../../misc/logos/icons_png" + "^xonotic_[0-9]+\\.png$"))))) (add-after 'install 'install-binaries (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (define (install src dst) - (let ((dst (string-append out dst))) - (mkdir-p (dirname dst)) - (copy-file src dst))) - (mkdir-p (string-append out "/bin")) - (install "../darkplaces/darkplaces-dedicated" - "/bin/xonotic-dedicated") - (install "../darkplaces/darkplaces-glx" - "/bin/xonotic-glx") - (install "../darkplaces/darkplaces-sdl" - "/bin/xonotic-sdl") - ;; Provide a default xonotic executable, defaulting to SDL. - (symlink (string-append out "/bin/xonotic-sdl") - (string-append out "/bin/xonotic"))))) - (add-after 'install-binaries 'wrap + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin"))) + (for-each + (lambda (variant) + (copy-file + (string-append "../darkplaces/darkplaces-" variant) + (string-append bin "/xonotic-" variant))) + (list "dedicated" "glx" "sdl"))))) + (add-after 'install-binaries 'wrap-binaries (lambda* (#:key outputs inputs #:allow-other-keys) - ;; Curl and libvorbis need to be wrapped so that we get - ;; sound and networking. + ;; All games must be wrapped to get sound and networking. (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin/xonotic")) - (bin-sdl (string-append out "/bin/xonotic-sdl")) - (bin-glx (string-append out "/bin/xonotic-glx")) - (bin-dedicated (string-append out "/bin/xonotic-dedicated")) + (bin (string-append out "/bin")) (curl (assoc-ref inputs "curl")) (vorbis (assoc-ref inputs "libvorbis"))) - (wrap-program bin - `("LD_LIBRARY_PATH" ":" prefix - (,(string-append curl "/lib:" vorbis "/lib")))) - (wrap-program bin-sdl - `("LD_LIBRARY_PATH" ":" prefix - (,(string-append curl "/lib:" vorbis "/lib")))) - (wrap-program bin-glx - `("LD_LIBRARY_PATH" ":" prefix - (,(string-append curl "/lib:" vorbis "/lib")))) - (wrap-program bin-dedicated - `("LD_LIBRARY_PATH" ":" prefix - (,(string-append curl "/lib:" vorbis "/lib")))))))))) + (for-each (cut wrap-program <> + `("LD_LIBRARY_PATH" ":" prefix + (,(string-append curl "/lib:" + vorbis "/lib")))) + (find-files bin "^xonotic")) + + ;; Provide a default xonotic executable, defaulting to SDL. + (symlink "xonotic-sdl" (string-append bin "/xonotic")))))))) (native-inputs (list autoconf automake -- cgit 1.4.1 From b0647ac27348a21287561655bc93cd56c494980d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 7 Aug 2022 02:00:01 +0200 Subject: gnu: git: Update to 2.37.2. * gnu/packages/version-control.scm (git): Update to 2.37.2. --- gnu/packages/version-control.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 294a35ad40..277ea2835b 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -221,14 +221,14 @@ Python 3.3 and later, rather than on Python 2.") (define-public git (package (name "git") - (version "2.37.1") + (version "2.37.2") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/software/scm/git/git-" version ".tar.xz")) (sha256 (base32 - "001m3gnal902hv22gp1m44c6247357pb80db0svms74gidmjq5n8")))) + "00xhdm086bxm4v2p8m7ra7vf9kwdppw4l2n3vakfff253j19qg8w")))) (build-system gnu-build-system) (native-inputs `(("native-perl" ,perl) @@ -248,7 +248,7 @@ Python 3.3 and later, rather than on Python 2.") version ".tar.xz")) (sha256 (base32 - "098yz8kzvzmmrkyiv8j79s5nryws302pnq6jcbrqbidrziwcxkjd")))) + "1zhn91fzyyz890a5hm0bvs0vnhy8c81q1fhsk2gfwbbh73z161nz")))) ;; For subtree documentation. ("asciidoc" ,asciidoc) ("docbook-xsl" ,docbook-xsl) -- cgit 1.4.1 From 3746b4ab86e72871bd77ad993ea1d4c83a59088a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 7 Aug 2022 02:00:01 +0200 Subject: gnu: cups-pk-helper: Update to 0.2.7. * gnu/packages/cups.scm (cups-pk-helper): Update to 0.2.7. [build-system]: Switch to Meson. [arguments]: Explicitly disable tests. [native-inputs]: Remove unused intltool and add glib:bin. --- gnu/packages/cups.scm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index 005ec15f11..09c5eadf50 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -50,6 +50,7 @@ #:use-module (gnu packages tls) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) + #:use-module (guix build-system meson) #:use-module (guix build-system python) #:use-module (guix download) #:use-module (guix git-download) @@ -465,17 +466,20 @@ device-specific programs to convert and print many types of files.") (define-public cups-pk-helper (package (name "cups-pk-helper") - (version "0.2.6") + (version "0.2.7") (source (origin (method url-fetch) (uri (string-append "https://freedesktop.org/software/" name "/releases/" name "-" version ".tar.xz")) (sha256 (base32 - "0a52jw6rm7lr5nbyksiia0rn7sasyb5cjqcb95z1wxm2yprgi6lm")))) - (build-system gnu-build-system) + "0cg8wbxpkz9bkpasz973cdazi02svqpbw9mafvpgrscg8kdhs1v6")))) + (build-system meson-build-system) + (arguments + ;; XXX The tests require a running D-Bus and CUPS daemon, of course. + (list #:tests? #f)) (native-inputs - (list intltool pkg-config glib polkit cups)) + (list pkg-config `(,glib "bin") polkit cups)) (home-page "https://www.freedesktop.org/wiki/Software/cups-pk-helper/") (synopsis "PolicyKit helper to configure CUPS with fine-grained privileges") (description -- cgit 1.4.1 From a8bd13c3993810428fc2e207791465bd8b297a17 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 7 Aug 2022 02:00:00 +0200 Subject: gnu: cups-pk-helper: Make references non-native. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/cups.scm (cups-pk-helper)[native-inputs]: Move cups & polkit from here… [inputs]: …to here. Make cups-minimal. Add glib. --- gnu/packages/cups.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index 09c5eadf50..3ff750cfa8 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -479,7 +479,9 @@ device-specific programs to convert and print many types of files.") ;; XXX The tests require a running D-Bus and CUPS daemon, of course. (list #:tests? #f)) (native-inputs - (list pkg-config `(,glib "bin") polkit cups)) + (list pkg-config `(,glib "bin"))) + (inputs + (list glib polkit cups-minimal)) (home-page "https://www.freedesktop.org/wiki/Software/cups-pk-helper/") (synopsis "PolicyKit helper to configure CUPS with fine-grained privileges") (description -- cgit 1.4.1 From 0831f91f5537f417df69be7eb54d285e4402a636 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 7 Aug 2022 02:00:01 +0200 Subject: gnu: epson-inkjet-printer-escpr: Update to 1.7.21. * gnu/packages/cups.scm (epson-inkjet-printer-escpr): Update to 1.7.21. --- gnu/packages/cups.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index 3ff750cfa8..5070ab6693 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -860,7 +860,7 @@ HP@tie{}LaserJet, and possibly other printers. See @file{README} for details.") (define-public epson-inkjet-printer-escpr (package (name "epson-inkjet-printer-escpr") - (version "1.7.18") + (version "1.7.21") ;; XXX: This currently works. But it will break as soon as a newer ;; version is available since the URLs for older versions are not ;; preserved. An alternative source will be added as soon as @@ -868,11 +868,11 @@ HP@tie{}LaserJet, and possibly other printers. See @file{README} for details.") (source (origin (method url-fetch) - (uri (string-append "https://download3.ebz.epson.net/dsc/f/03/00/13/43/" - "81/cbdd80826424935cef20d16be8ee5851388977a7/" - "epson-inkjet-printer-escpr-1.7.18-1lsb3.2.tar.gz")) + (uri (string-append "https://download3.ebz.epson.net/dsc/f/03/00/13/77/" + "93/e85dc2dc266e96fdc242bd95758bd88d1a51963e/" + "epson-inkjet-printer-escpr-1.7.21-1lsb3.2.tar.gz")) (sha256 - (base32 "06pa47rl1gy19bg3fsp4a4y9vdy4ya2maajm14n791ivhf2hcwyh")))) + (base32 "0z1x9p58321plf2swfxgl72wn7ls8bfbyjwd9l9c8jxfr1v2skkz")))) (build-system gnu-build-system) (arguments (list #:modules -- cgit 1.4.1 From 56b55a13f659be21c78d33c839485e6d0ba9e22a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 7 Aug 2022 02:00:00 +0200 Subject: gnu: haproxy: Remove ‘free’ & fluff. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/networking.scm (haproxy)[description]: Remove the redundant ‘free’ qualifier and some overly gushing other ones. --- gnu/packages/networking.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 21c9014cfe..a65416759e 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -4149,11 +4149,11 @@ cables.") (list lua openssl pcre2 zlib)) (home-page "https://www.haproxy.org/") (synopsis "Reliable, high performance TCP/HTTP load balancer") - (description "HAProxy is a free, very fast and reliable solution offering -high availability, load balancing, and proxying for TCP and HTTP-based -applications. It is particularly suited for web sites crawling under very -high loads while needing persistence or Layer7 processing. Supporting tens of -thousands of connections is clearly realistic with today's hardware.") + (description "HAProxy offers @acronym{HA, high availability}, load +balancing, and proxying for TCP and HTTP-based applications. It is particularly +suited to Web sites crawling under very high loads while needing persistence or +Layer 7 processing. Supporting tens of thousands of connections is clearly +realistic with today's hardware.") (license (list license:gpl2+ license:lgpl2.1 license:lgpl2.1+)))) -- cgit 1.4.1 From e315d9a8024e8964f6bd066b4a2ac8d626754e80 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 7 Aug 2022 02:00:01 +0200 Subject: gnu: cups-pk-helper: Add etc/dbus-1 compatibility symlink. * gnu/packages/cups.scm (cups-pk-helper)[arguments]: Add an 'install-compatibility-symlink phase. --- gnu/packages/cups.scm | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index 5070ab6693..3de9ddbf22 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -477,9 +477,20 @@ device-specific programs to convert and print many types of files.") (build-system meson-build-system) (arguments ;; XXX The tests require a running D-Bus and CUPS daemon, of course. - (list #:tests? #f)) + (list #:tests? #f + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'install-compatibility-symlink + ;; XXX Upstream (and, presumably, the world) has moved to + ;; /share/dbus-1 over /etc/dbus-1, but Guix System's + ;; dbus-configuration-directory has yet to catch up. + ;; TODO It should be properly fixed and this phase removed. + (lambda* (#:key outputs #:allow-other-keys) + (with-directory-excursion (assoc-ref outputs "out") + (mkdir-p "etc") + (symlink "../share/dbus-1" "etc/dbus-1"))))))) (native-inputs - (list pkg-config `(,glib "bin"))) + (list intltool pkg-config `(,glib "bin"))) (inputs (list glib polkit cups-minimal)) (home-page "https://www.freedesktop.org/wiki/Software/cups-pk-helper/") -- cgit 1.4.1 From 64595d9f9582bef7ebd62d1e431e483228bf3e01 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 7 Aug 2022 02:00:01 +0200 Subject: gnu: inxi-minimal: Update to 3.3.20-1. * gnu/packages/admin.scm (inxi-minimal): Update to 3.3.20-1. --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 4e8da94b5d..d02f055fc8 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -4193,7 +4193,7 @@ Python loading in HPC environments.") (let ((real-name "inxi")) (package (name "inxi-minimal") - (version "3.3.19-1") + (version "3.3.20-1") (source (origin (method git-fetch) @@ -4202,7 +4202,7 @@ Python loading in HPC environments.") (commit version))) (file-name (git-file-name real-name version)) (sha256 - (base32 "0g5m43cj4534gb181zy1hwjz5il88xibf8psxw8a4s6jnaq1zdlk")))) + (base32 "182lczpa217gpzn58nfdzjbbinp3bw9lbm1x9lck1mkdmqklgl2a")))) (build-system trivial-build-system) (inputs `(("bash" ,bash-minimal) -- cgit 1.4.1 From 43decd1f7ea4ebd911199ad10c0ca555d0dffbd6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 7 Aug 2022 02:00:01 +0200 Subject: gnu: knot: Update to 3.1.9. * gnu/packages/dns.scm (knot): Update to 3.1.9. --- gnu/packages/dns.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index a6521eafb5..673723369a 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -871,7 +871,7 @@ Extensions} (DNSSEC).") (define-public knot (package (name "knot") - (version "3.1.8") + (version "3.1.9") (source (origin (method git-fetch) @@ -880,7 +880,7 @@ Extensions} (DNSSEC).") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0v3rh27qnyihdqp5nm8bnn9xd5rl2fbwhj4cmdpc8ik4qs21xyf4")) + (base32 "0w3jyz9qgkb34gkv2lr71phk5ad3rycn86qyw7n88ryhdsk45j73")) (modules '((guix build utils))) (snippet '(begin -- cgit 1.4.1 From d521ad06e0fa7743a25a37f92059e8d4f607a8d9 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 14 Aug 2022 16:55:20 +0300 Subject: gnu: yt-dlp: Only build with pandoc on supported systems. * gnu/packages/video.scm (yt-dlp)[arguments]: Adjust custom 'build-generated-files phase to adjust to the presence of pandoc. [native-inputs]: Make explicit list. Only include pandoc on supported systems. --- gnu/packages/video.scm | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 1fec5da40d..0016877033 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2509,12 +2509,17 @@ YouTube.com and many more sites.") (("\\.get_param\\('ffmpeg_location'\\)" match) (format #f "~a or '~a'" match (which "ffmpeg")))))) (replace 'build-generated-files - (lambda _ - (invoke "make" - "PYTHON=python" - "yt-dlp" - "yt-dlp.1" - "completions"))) + (lambda* (#:key inputs #:allow-other-keys) + (if (assoc-ref inputs "pandoc") + (invoke "make" + "PYTHON=python" + "yt-dlp" + "yt-dlp.1" + "completions") + (invoke "make" + "PYTHON=python" + "yt-dlp" + "completions")))) (replace 'fix-the-data-directories (lambda* (#:key outputs #:allow-other-keys) (let ((prefix (assoc-ref outputs "out"))) @@ -2534,8 +2539,14 @@ YouTube.com and many more sites.") python-mutagen python-pycryptodomex python-websockets))) - (native-inputs (modify-inputs (package-native-inputs youtube-dl) - (append pandoc python-pytest))) + (native-inputs + (append + ;; To generate the manpage. + (if (member (%current-system) + (package-transitive-supported-systems pandoc)) + (list pandoc) + '()) + (list python-pytest zip))) (description "yt-dlp is a small command-line program to download videos from YouTube.com and many more sites. It is a fork of youtube-dl with a -- cgit 1.4.1 From f9666e40d3d003b2c8d3f4f70d64069c1752704e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 14 Aug 2022 17:50:54 +0300 Subject: gnu: pies: Update to 1.8. * gnu/packages/admin.scm (pies): Update to 1.8. --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index d02f055fc8..10d4883af2 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -784,7 +784,7 @@ memory, disks, network and processes. It's a Python port and continuation of (define-public pies (package (name "pies") - (version "1.7") + (version "1.8") (source (origin (method url-fetch) @@ -792,7 +792,7 @@ memory, disks, network and processes. It's a Python port and continuation of version ".tar.bz2")) (sha256 (base32 - "0ajcah2y6n55qc0ckspcx0hfpm1yb2xa1apcyij7mclic4q2y330")))) + "0v0xcq0mfil440xq2pa5mjkyva5c9ahqda54z5w2ksl2d78v8a35")))) (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases -- cgit 1.4.1 From 360bf760bdf8dc04918e7962d6a2c3797989ae4b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 14 Aug 2022 17:52:01 +0300 Subject: gnu: pies: Remove pre-generated files. * gnu/packages/admin.scm (pies)[source]: Add snippet to remove pre-generated files. [native-inputs]: Add bison, flex. --- gnu/packages/admin.scm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 10d4883af2..35d3b53f24 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -792,7 +792,16 @@ memory, disks, network and processes. It's a Python port and continuation of version ".tar.bz2")) (sha256 (base32 - "0v0xcq0mfil440xq2pa5mjkyva5c9ahqda54z5w2ksl2d78v8a35")))) + "0v0xcq0mfil440xq2pa5mjkyva5c9ahqda54z5w2ksl2d78v8a35")) + (snippet + #~(begin + (use-modules (guix build utils)) + (for-each delete-file + (append + ;; Generated by flex. + (find-files "gres/src" "lex\\.c$") + ;; Generated by bison. + (find-files "gres/src" "-gram\\.[ch]$"))))))) (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases @@ -804,6 +813,7 @@ memory, disks, network and processes. It's a Python port and continuation of (substitute* '("src/progman.c" "src/comp.c") (("\"/bin/sh\"") (string-append "\"" bash "/bin/sh\""))))))))) + (native-inputs (list bison flex)) (home-page "https://www.gnu.org.ua/software/pies/") (synopsis "Program invocation and execution supervisor") (description -- cgit 1.4.1 From 53b2fda6fe7f28ccc875c60e79ada038f2dfe5f8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 7 Aug 2022 02:00:01 +0200 Subject: gnu: mcelog: Update to 187. * gnu/packages/linux.scm (mcelog): Update to 187. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index cc961b1e9b..f936dde55a 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -6708,7 +6708,7 @@ the @code{mce-inject} module loaded if it exists.") (define-public mcelog (package (name "mcelog") - (version "181") + (version "187") (source (origin (method git-fetch) @@ -6717,7 +6717,7 @@ the @code{mce-inject} module loaded if it exists.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0c9zdivv86xd8dmwia0k9fbr52zrafbyzn7ss53mh17sry5gm716")) + (base32 "0zdlwbdqs4s72yrpz4irhp12c1wqzy8kmf4hxahk13dmafd6dbnj")) (modules '((guix build utils))) (snippet `(begin -- cgit 1.4.1 From 9b176a05f98206a1e5cfff7ae8a8ead90e252e9c Mon Sep 17 00:00:00 2001 From: kiasoc5 via Guix-patches via Date: Sun, 14 Aug 2022 09:03:29 -0400 Subject: gnu: usbguard: Use new package style. Use G-exps and #$output while we're at it. * gnu/packages/hardware.scm (usbguard)[arguments]: Use G-expressions. <#:phases>: Use '#$output' instead of 'assoc-ref' Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/hardware.scm | 84 +++++++++++++++++++++++------------------------ 1 file changed, 42 insertions(+), 42 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm index 68c4667662..bc44dbe6ea 100644 --- a/gnu/packages/hardware.scm +++ b/gnu/packages/hardware.scm @@ -1160,48 +1160,48 @@ applications.") (base32 "0rc0213qsfap3sgx9m3m1kppxbjl2fdwmzlbn5rbmn1i33125dfi")))) (build-system gnu-build-system) (arguments - '(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-bootstrap-script - (lambda _ - ;; Don't attempt to fetch git submodules. - (substitute* "autogen.sh" - (("^git submodule.*") - "")))) - (add-after 'bootstrap 'patch-build-scripts - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "configure" - (("/usr/include/catch") - (dirname (search-input-file inputs "include/catch.hpp")))) - ;; Do not create log directory. - (substitute* "Makefile.in" ((".*/log/usbguard.*") "")) - ;; Disable LDAP tests: they use 'sudo'. - (substitute* "src/Tests/Makefile.in" - (("\\$\\(am__append_2\\)") "")))) - (add-after 'install 'delete-static-library - (lambda* (#:key outputs #:allow-other-keys) - ;; It can't be direclty disabled since it's needed for the tests. - (delete-file (string-append (assoc-ref outputs "out") - "/lib/libusbguard.a")))) - (add-after 'install 'install-zsh-completion - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (site-functions - (string-append out "/share/zsh/site-functions"))) - (mkdir-p site-functions) - (copy-file "scripts/usbguard-zsh-completion" - (string-append site-functions "/_usbguard")))))) - #:make-flags - (list (string-append "BASH_COMPLETION_DIR=" - (assoc-ref %outputs "out") - "/etc/bash_completion.d")) - #:configure-flags - (list - "--localstatedir=/var" - "--enable-systemd=no" - "--with-ldap" - "--with-dbus" - "--with-polkit"))) + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-bootstrap-script + (lambda _ + ;; Don't attempt to fetch git submodules. + (substitute* "autogen.sh" + (("^git submodule.*") + "")))) + (add-after 'bootstrap 'patch-build-scripts + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "configure" + (("/usr/include/catch") + (dirname (search-input-file inputs "include/catch.hpp")))) + ;; Do not create log directory. + (substitute* "Makefile.in" ((".*/log/usbguard.*") "")) + ;; Disable LDAP tests: they use 'sudo'. + (substitute* "src/Tests/Makefile.in" + (("\\$\\(am__append_2\\)") "")))) + (add-after 'install 'delete-static-library + (lambda args + ;; It can't be directly disabled since it's needed for the tests. + (delete-file (string-append #$output + "/lib/libusbguard.a")))) + (add-after 'install 'install-zsh-completion + (lambda args + (let ((site-functions + (string-append #$output "/share/zsh/site-functions"))) + (mkdir-p site-functions) + (copy-file "scripts/usbguard-zsh-completion" + (string-append site-functions "/_usbguard")))))) + #:make-flags + #~(list (string-append "BASH_COMPLETION_DIR=" + #$output + "/etc/bash_completion.d")) + #:configure-flags + #~(list + "--localstatedir=/var" + "--enable-systemd=no" + "--with-ldap" + "--with-dbus" + "--with-polkit"))) (inputs (list audit catch-framework -- cgit 1.4.1 From ca4ab89ddd4bbc46c54bcac160fd5a28b979edc3 Mon Sep 17 00:00:00 2001 From: kiasoc5 via Guix-patches via Date: Sun, 14 Aug 2022 00:36:57 -0400 Subject: gnu: usbguard: Update to 1.1.1 [fixes CVE-2019-25058]. * gnu/packages/hardware.scm (usbguard): Update to 1.1.1. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/hardware.scm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm index bc44dbe6ea..d47be7a55d 100644 --- a/gnu/packages/hardware.scm +++ b/gnu/packages/hardware.scm @@ -1147,9 +1147,7 @@ applications.") (define-public usbguard (package (name "usbguard") - ;; Note: Use a recent snapshot to get compatibility with newer system - ;; libraries. - (version "1.0.0-55-g466f1f0") + (version "1.1.1") (source (origin (method git-fetch) (uri (git-reference @@ -1157,7 +1155,7 @@ applications.") (commit (string-append "usbguard-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0rc0213qsfap3sgx9m3m1kppxbjl2fdwmzlbn5rbmn1i33125dfi")))) + (base32 "0lpyhkz5nr0c9mq57mgcvam5c8qfqqwjc4xd46n2ldqc9vhfsask")))) (build-system gnu-build-system) (arguments (list -- cgit 1.4.1 From 2a24c4a13807f9184dc0025353a73345b18c5264 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 7 Aug 2022 02:00:00 +0200 Subject: gnu: moe: Update to 1.12. * gnu/packages/moe.scm (moe): Update to 1.12. --- gnu/packages/moe.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/moe.scm b/gnu/packages/moe.scm index 819a6298e3..82db1621db 100644 --- a/gnu/packages/moe.scm +++ b/gnu/packages/moe.scm @@ -28,15 +28,14 @@ (define-public moe (package (name "moe") - (version "1.11") + (version "1.12") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/moe/moe-" version ".tar.lz")) (sha256 - (base32 - "1yg2ln2mm6gzv61cxnv60dw1cr5bl2dhkjy685jrd3aabb7wpyqf")))) + (base32 "1s51swk8h5k32r2z4i1pla2l15b0v0mh35lwsd5f1y16whmmz24a")))) (build-system gnu-build-system) (native-inputs (list lzip)) (inputs (list ncurses)) -- cgit 1.4.1 From b9a3083db380671b3f034ca5c230804f4d4a84da Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 12 Aug 2022 13:19:30 +0200 Subject: gnu: qtscxml: Fix build failure. This fixes a faulty conflict resolution from the merge in commit b50eaa67642ebc25e9c896f2e700c08610e0a5da. * gnu/packages/qt.scm (qtscxml)[arguments]: Substitute arguments from QTSVG-5, not QTSVG. --- gnu/packages/qt.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 2e0ade2376..f8d7d5e428 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1887,7 +1887,7 @@ and mobile applications targeting TV-like form factors."))) (substitute* "tests/auto/auto.pro" (("scion") "#")))))) (arguments - (substitute-keyword-arguments (package-arguments qtsvg) + (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:tests? _ #f) #f))) ; TODO: Enable the tests (inputs (list qtbase-5 qtdeclarative-5)) -- cgit 1.4.1 From f561830a5bc6d7df07fbf3cd8af37e4f83f33620 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 12 Aug 2022 20:20:48 +0200 Subject: gnu: python-pympler: Update to 1.0.1. * gnu/packages/python-xyz.scm (python-pympler): Update to 1.0.1. [arguments]: Remove. --- gnu/packages/python-xyz.scm | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 7c7224fdae..e76d944025 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3850,21 +3850,14 @@ JavaScript-like message boxes. Types of dialog boxes include: (package (name "python-pympler") (home-page "https://pythonhosted.org/Pympler/") - (version "0.9") + (version "1.0.1") (source (origin (method url-fetch) (uri (pypi-uri "Pympler" version)) (sha256 (base32 - "0ivfw2k86nbw9ck9swidl4422w7bhjldxwj90a4sy5r1cbgygjzj")))) + "1ynkqpv2akldmvkll5vh5zhwj433s1d59iv0f76lygyak4silgwr")))) (build-system python-build-system) - (arguments - `(#:phases (modify-phases %standard-phases - (delete 'check) - (add-after 'install 'check - (lambda* (#:key inputs outputs #:allow-other-keys) - (add-installed-pythonpath inputs outputs) - (invoke "python" "setup.py" "test")))))) (synopsis "Measure, monitor and analyze memory behavior") (description "Pympler is a development tool to measure, monitor and analyze -- cgit 1.4.1 From 431df1214e5c5819ca22157a8a6d94d1e066a56b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 12 Aug 2022 20:45:18 +0200 Subject: gnu: python-dateutil: Adjust tests for Pytest 7. * gnu/packages/patches/python-dateutil-pytest-compat.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/time.scm (python-dateutil)[source](patches): New field. --- gnu/local.mk | 1 + .../patches/python-dateutil-pytest-compat.patch | 43 ++++++++++++++++++++++ gnu/packages/time.scm | 1 + 3 files changed, 45 insertions(+) create mode 100644 gnu/packages/patches/python-dateutil-pytest-compat.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 0ee0a4d8b6..f0c1f60c8a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1692,6 +1692,7 @@ dist_patch_DATA = \ %D%/packages/patches/python-argcomplete-1.11.1-fish31.patch \ %D%/packages/patches/python-cross-compile.patch \ %D%/packages/patches/python-configobj-setuptools.patch \ + %D%/packages/patches/python-dateutil-pytest-compat.patch \ %D%/packages/patches/python-debugpy-unbundle-pydevd.patch \ %D%/packages/patches/python-docopt-pytest6-compat.patch \ %D%/packages/patches/python-execnet-read-only-fix.patch \ diff --git a/gnu/packages/patches/python-dateutil-pytest-compat.patch b/gnu/packages/patches/python-dateutil-pytest-compat.patch new file mode 100644 index 0000000000..5cff57e94c --- /dev/null +++ b/gnu/packages/patches/python-dateutil-pytest-compat.patch @@ -0,0 +1,43 @@ +Add compatibility with newer versions of pytest. + +Taken from upstream: + + https://github.com/dateutil/dateutil/commit/2bdd63158b7f981fc6d70a869680451bdfd8d848 + +diff --git a/dateutil/test/test_internals.py b/dateutil/test/test_internals.py +index 53081314..b32e6723 100644 +--- a/dateutil/test/test_internals.py ++++ b/dateutil/test/test_internals.py +@@ -9,6 +9,7 @@ + + import sys + import pytest ++import warnings + + from dateutil.parser._parser import _ymd + from dateutil import tz +@@ -65,18 +66,17 @@ def test_parser_parser_private_not_warns(): + from dateutil.parser._parser import _timelex, _tzparser + from dateutil.parser._parser import _parsetz + +- with pytest.warns(None) as recorder: ++ with warnings.catch_warnings(): ++ warnings.simplefilter("error") + _tzparser() +- assert len(recorder) == 0 + +- with pytest.warns(None) as recorder: ++ with warnings.catch_warnings(): ++ warnings.simplefilter("error") + _timelex('2014-03-03') + +- assert len(recorder) == 0 +- +- with pytest.warns(None) as recorder: ++ with warnings.catch_warnings(): ++ warnings.simplefilter("error") + _parsetz('+05:00') +- assert len(recorder) == 0 + + + @pytest.mark.tzstr diff --git a/gnu/packages/time.scm b/gnu/packages/time.scm index fea9ff25f7..9128056f78 100644 --- a/gnu/packages/time.scm +++ b/gnu/packages/time.scm @@ -196,6 +196,7 @@ Pendulum instances.") (origin (method url-fetch) (uri (pypi-uri "python-dateutil" version)) + (patches (search-patches "python-dateutil-pytest-compat.patch")) (sha256 (base32 "11iy7m4bp2lgfkcl0r6xzf34bvk7ppjmsyn2ygfikbi72v6cl8q1")))) -- cgit 1.4.1 From 30ac875bd85e3da141961ed2225092fdc37729e4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 12 Aug 2022 21:03:40 +0200 Subject: gnu: python-sphinx: Update to 5.1.1. * gnu/packages/sphinx.scm (python-sphinx): Update to 5.1.1. --- gnu/packages/sphinx.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm index c68cc9c1b7..b6e7d94462 100644 --- a/gnu/packages/sphinx.scm +++ b/gnu/packages/sphinx.scm @@ -62,14 +62,14 @@ (define-public python-sphinx (package (name "python-sphinx") - (version "5.0.2") + (version "5.1.1") (source (origin (method url-fetch) (uri (pypi-uri "Sphinx" version)) (sha256 (base32 - "1c67w48509k07pa1q3rp93lpchy8hp6h5iqrc3r20msnly79g3mi")))) + "12cdy3m5c09lpf2bbxzbhm5v5y9fk7jgm94qrzggpq86waj28cms")))) (build-system python-build-system) (arguments '(#:phases -- cgit 1.4.1 From a20a93408153254898638a968e1894efb0945a04 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 12 Aug 2022 22:39:33 +0200 Subject: gnu: python-freezegun: Update to 1.2.2. * gnu/packages/check.scm (python-freezegun): Update to 1.2.2. [native-inputs]: Remove PYTHON-MOCK. [propagated-inputs]: Remove PYTHON-SIX. --- gnu/packages/check.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 75bd20cff9..e521c92b2b 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -2711,18 +2711,18 @@ create data based on random numbers and yet remain repeatable.") (define-public python-freezegun (package (name "python-freezegun") - (version "0.3.14") + (version "1.2.2") (source (origin (method url-fetch) (uri (pypi-uri "freezegun" version)) (sha256 - (base32 "0al75mk829j1izxi760b7yjnknjihyfhp2mvi5qiyrxb9cpxwqk2")))) + (base32 "0ijlq32qvpm5zprfzbyzawpl9qjsknlxhryr1i0q84wl0sxd28nd")))) (build-system python-build-system) (native-inputs - (list python-mock python-pytest)) + (list python-pytest)) (propagated-inputs - (list python-six python-dateutil)) + (list python-dateutil)) (arguments `(#:phases (modify-phases %standard-phases -- cgit 1.4.1 From c5860b97e9b9acb1e791db67cfe425e4cbc8dff0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 12 Aug 2022 22:44:35 +0200 Subject: gnu: python-freezegun: Adjust for Python 3.10. * gnu/packages/check.scm (python-freezegun)[source](modules, snippet): New fields. --- gnu/packages/check.scm | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index e521c92b2b..b57bfa30d8 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -2717,7 +2717,18 @@ create data based on random numbers and yet remain repeatable.") (method url-fetch) (uri (pypi-uri "freezegun" version)) (sha256 - (base32 "0ijlq32qvpm5zprfzbyzawpl9qjsknlxhryr1i0q84wl0sxd28nd")))) + (base32 "0ijlq32qvpm5zprfzbyzawpl9qjsknlxhryr1i0q84wl0sxd28nd")) + (modules '((guix build utils))) + (snippet + ;; Add an explicit case for static methods as they are callable + ;; in Python 3.10, breaking this conditional. + ;; XXX Taken from upstream pull request: + ;; https://github.com/spulec/freezegun/pull/397 + '(substitute* "freezegun/api.py" + (("if not callable\\(attr_value\\) or \ +inspect\\.isclass\\(attr_value\\):") + "if (not callable(attr_value) or inspect.isclass(attr_value)\ +or isinstance(attr_value, staticmethod)):"))))) (build-system python-build-system) (native-inputs (list python-pytest)) -- cgit 1.4.1 From 625bfd4257c42783016ea0a6730a74893bb87f74 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 12 Aug 2022 23:19:25 +0200 Subject: gnu: gtk-doc: Remove unused input. * gnu/packages/gtk.scm (gtk-doc)[inputs]: Remove PYTHON-UNITTEST2. --- gnu/packages/gtk.scm | 1 - 1 file changed, 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index cc25fac2aa..71e47bfc51 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -2264,7 +2264,6 @@ information.") python-lxml python-parameterized python-pygments - python-unittest2 source-highlight yelp-tools)) (home-page "https://wiki.gnome.org/DocumentationProject/GtkDoc") -- cgit 1.4.1 From fd01278236f2f96e9ded786c47ca5b0b18ebed6d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 12 Aug 2022 23:19:53 +0200 Subject: gnu: gtk-doc: Remove input labels. * gnu/packages/gtk.scm (gtk-doc)[native-inputs]: Remove labels. --- gnu/packages/gtk.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 71e47bfc51..391a83d076 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -2244,13 +2244,13 @@ information.") `("GUIX_PYTHONPATH" ":" prefix (,(getenv "GUIX_PYTHONPATH"))))) (find-files (string-append out "/bin"))))))))) (native-inputs - `(("gettext" ,gettext-minimal) - ("glib:bin" ,glib "bin") - ("gobject-introspection" ,gobject-introspection) - ("itstool" ,itstool) - ("perl" ,perl) - ("pkg-config" ,pkg-config) - ("python-wrapper" ,python-wrapper))) + (list gettext-minimal + `(,glib "bin") + gobject-introspection + itstool + perl + pkg-config + python-wrapper)) (inputs (list bc dblatex -- cgit 1.4.1 From be5965b1962536bebb2b3c6e2cc27b0d19da54f9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 12 Aug 2022 23:27:13 +0200 Subject: gnu: gtk-doc/stable: Use 'modify-inputs'. * gnu/packages/gtk.scm (gtk-doc/stable)[inputs]: Use MODIFY-INPUTS. --- gnu/packages/gtk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 391a83d076..5eda60aa30 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -2288,8 +2288,8 @@ with some extra work.") (define-public gtk-doc/stable (hidden-package (package/inherit gtk-doc - (inputs (alist-replace "dblatex" `(,dblatex/stable) - (package-inputs gtk-doc)))))) + (inputs (modify-inputs (package-inputs gtk-doc) + (replace "dblatex" dblatex/stable)))))) (define-public gtk-engines (package -- cgit 1.4.1 From 00e78042b7e1e740bacb42008781548cf763d167 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 13 Aug 2022 11:55:51 +0200 Subject: gnu: python-sphinx: Add 4.5.0. * gnu/packages/sphinx.scm (python-sphinx-4): New variable. --- gnu/packages/sphinx.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm index b6e7d94462..036950e8cf 100644 --- a/gnu/packages/sphinx.scm +++ b/gnu/packages/sphinx.scm @@ -148,6 +148,18 @@ for Python projects or other documents consisting of multiple reStructuredText sources.") (license license:bsd-2))) +;; Some packages do not support Sphinx 5 yet. Remove when unused. +(define-public python-sphinx-4 + (package + (inherit python-sphinx) + (version "4.5.0") + (source (origin + (method url-fetch) + (uri (pypi-uri "Sphinx" version)) + (sha256 + (base32 + "1rp28jryxwy24y8vpacclqihbizyi6b1s6id86pibvm46ybcmy3v")))))) + (define-public python-sphinxcontrib-apidoc (package (name "python-sphinxcontrib-apidoc") -- cgit 1.4.1 From 27555b05661931f7087b735db7be715ab9ac8f27 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 13 Aug 2022 11:58:08 +0200 Subject: gnu: python-sphinx-panels: Use python-sphinx@4. ...also add deprecation notice, and change its users accordingly. * gnu/packages/sphinx.scm (python-sphinx-panels)[propagated-inputs]: Change from PYTHON-SPHINX to PYTHON-SPHINX-4. [description]: Mention that it is unmaintained. * gnu/packages/python-science.scm (python-scipy)[native-inputs]: Likewise. * gnu/packages/python-xyz.scm (python-numpy-documentation)[native-inputs]: Likewise. --- gnu/packages/python-science.scm | 2 +- gnu/packages/python-xyz.scm | 2 +- gnu/packages/sphinx.scm | 6 ++++-- 3 files changed, 6 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-science.scm b/gnu/packages/python-science.scm index 95f60aae7b..ce0ba4b6d2 100644 --- a/gnu/packages/python-science.scm +++ b/gnu/packages/python-science.scm @@ -146,7 +146,7 @@ atlas_libs = openblas~%" #$(this-package-input "openblas")))))) python-pydata-sphinx-theme python-pytest python-pytest-xdist - python-sphinx + python-sphinx-4 python-sphinx-panels python-threadpoolctl which)) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index e76d944025..85f8c3c00b 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5731,7 +5731,7 @@ capabilities.") python-pandas python-pydata-sphinx-theme python-scipy ;used by matplotlib - python-sphinx + python-sphinx-4 python-sphinx-panels texinfo texlive-bin diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm index 036950e8cf..1e628a0e75 100644 --- a/gnu/packages/sphinx.scm +++ b/gnu/packages/sphinx.scm @@ -377,14 +377,16 @@ Blog, News or Announcements section to a Sphinx website.") (lambda* (#:key tests? #:allow-other-keys) (when tests? (invoke "pytest"))))))) - (propagated-inputs (list python-docutils python-sphinx)) + (propagated-inputs (list python-docutils python-sphinx-4)) (native-inputs (list python-pytest python-pytest-regressions)) (home-page "https://github.com/executablebooks/sphinx-panels") (synopsis "Sphinx extension for creating panels in a grid layout") (description - "This package provides a sphinx extension for creating panels in a grid layout.") + "This package provides a sphinx extension for creating panels in a +grid layout. It is no longer maintained and users are encouraged to use +@code{sphinx-design} instead.") (license license:expat))) (define-public python-sphinxcontrib-programoutput -- cgit 1.4.1 From 213c60f332a8531f6bbafc02365f9dd6d8e01e98 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 13 Aug 2022 12:04:53 +0200 Subject: gnu: texlive-hyperref: Propagate more inputs. * gnu/packages/tex.scm (texlive-hyperref)[propagated-inputs]: Add TEXLIVE-CM, TEXLIVE-LATEX-GRAPHICS, TEXLIVE-STRINGENC, and TEXLIVE-ZAPFDING. * gnu/packages/sphinx.scm (python-sphinx)[propagated-inputs]: Remove TEXLIVE-STRINGENC and TEXLIVE-ZAPFDING. --- gnu/packages/sphinx.scm | 4 ---- gnu/packages/tex.scm | 10 ++++------ 2 files changed, 4 insertions(+), 10 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm index 1e628a0e75..cded866c90 100644 --- a/gnu/packages/sphinx.scm +++ b/gnu/packages/sphinx.scm @@ -111,10 +111,6 @@ texlive-etoolbox texlive-generic-ltxcmds texlive-hyperref - ;; TODO: Remove texlive-stringenc and texlive-zapfding after - ;; propagating them in texlive-hyperref in next rebuild cycle. - texlive-stringenc - texlive-zapfding texlive-latex-base ;alltt, atbegshi, makeidx, textcomp texlive-latex-cmap texlive-latex-fancyhdr diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 1a5ffdcdc3..3f44c6239d 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -3429,12 +3429,10 @@ XML, using UTF-8 or a suitable 8-bit encoding.") texlive-latex-refcount texlive-latex-rerunfilecheck texlive-url - ;; TODO: Add this in next rebuild cycle. - ;;texlive-cm - ;;texlive-latex-graphics ;for keyval - ;;texlive-stringenc - ;;texlive-zapfding - )) + texlive-cm + texlive-latex-graphics ;for keyval + texlive-stringenc + texlive-zapfding)) (home-page "https://www.ctan.org/pkg/hyperref") (synopsis "Extensive support for hypertext in LaTeX") (description -- cgit 1.4.1 From 833778772092639f50da08b510e95eec5437f749 Mon Sep 17 00:00:00 2001 From: Christine Lemmer-Webber Date: Sun, 14 Aug 2022 13:43:07 -0400 Subject: Update copyright/name notices for Christine Lemmer-Webber. * gnu/packages/games.scm: Update copyright/name notices for Christine Lemmer-Webber. --- gnu/packages/games.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 37274781db..283382ac2b 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -10,7 +10,7 @@ ;;; Copyright © 2014, 2015, 2019 Mark H Weaver ;;; Copyright © 2015, 2016 Andreas Enge ;;; Copyright © 2015 David Hashe -;;; Copyright © 2015, 2017, 2018, 2021 Chris Lemmer Webber +;;; Copyright © 2015, 2017, 2018, 2021 Christine Lemmer-Webber ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2021 Ricardo Wurmus ;;; Copyright © 2015, 2016, 2017 Alex Kost ;;; Copyright © 2015 Paul van der Walt -- cgit 1.4.1 From 8e87bbde1358a00bfe19c73c366cb620899a4119 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 14 Aug 2022 20:24:56 +0200 Subject: gnu: r-lpsymphony: Build reproducibly. * gnu/packages/bioconductor.scm (r-lpsymphony)[arguments]: Add build phase 'make-build-order-reproducible. --- gnu/packages/bioconductor.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 94c92abefa..07440dff69 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -7917,6 +7917,16 @@ coordinates.") (base32 "0kc708ss5byzw8qh439mb4nq6hsfmz73gfamiznw3lv352brd33g")))) (build-system r-build-system) + (arguments + (list + #:phases + '(modify-phases %standard-phases + (add-after 'unpack 'make-build-order-reproducible + (lambda _ + (substitute* '("src/SYMPHONY/Cgl/configure.ac" + "src/SYMPHONY/Cgl/configure") + (("for file in `ls \\*/Makefile.in`") + "for file in `ls */Makefile.in | sort`"))))))) (inputs (list zlib)) (native-inputs -- cgit 1.4.1 From 593327ef5b506f031d75349fdcda1ad04e6684ed Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 14 Aug 2022 20:39:31 +0200 Subject: gnu: r-bgx: Build without CPU tuning. Fixes . * gnu/packages/bioconductor.scm (r-bgx)[arguments]: Add phase 'do-not-tune-cflags-for-reproducibility to patch configure.ac. [inputs]: Add boost. [native-inputs]: Add autoconf and automake. --- gnu/packages/bioconductor.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 07440dff69..111bd65823 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -35,6 +35,7 @@ #:use-module (guix git-download) #:use-module (guix build-system r) #:use-module (gnu packages) + #:use-module (gnu packages autotools) #:use-module (gnu packages base) #:use-module (gnu packages bioinformatics) #:use-module (gnu packages boost) @@ -12995,8 +12996,22 @@ gene expression.") "0q2y4n6bcc9pvz5sgfkw1lrb00rrp7q29i1vh7srdfmfhgpyz6bk")))) (properties `((upstream-name . "bgx"))) (build-system r-build-system) + (arguments + (list + #:phases + '(modify-phases %standard-phases + (add-after 'unpack 'do-not-tune-cflags-for-reproducibility + (lambda _ + (substitute* "configure.ac" + (("AX_GCC_ARCHFLAG.*") "")) + (delete-file "configure") + (invoke "autoreconf" "-vif")))))) + (inputs + (list boost)) (propagated-inputs (list r-affy r-biobase r-gcrma r-rcpp)) + (native-inputs + (list autoconf automake)) (home-page "https://bioconductor.org/packages/bgx/") (synopsis "Bayesian gene expression") (description -- cgit 1.4.1 From a5f199732ba918b9486852308c5e19a73c8b48ff Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 14 Aug 2022 20:57:55 +0200 Subject: gnu: r-reticulate: Build reproducibly. * gnu/packages/cran.scm (r-reticulate)[arguments]: Add build phase 'build-reproducibly to ensure that pyc files are built reproducibly. --- gnu/packages/cran.scm | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 4ad1bfa760..f76f50b68d 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -9216,6 +9216,14 @@ always locate the files relative to your project root.") (base32 "0b1szzsqyc8wcfpkn5517bb1ds064vs2hky71my3p74kfngay991")))) (build-system r-build-system) + (arguments + (list + #:phases + '(modify-phases %standard-phases + (add-after 'unpack 'build-reproducibly + (lambda _ + (setenv "PYTHONHASHSEED" "0") + (setenv "PYTHONDONTWRITEBYTECODE" "1")))))) (inputs (list python)) (propagated-inputs (list r-here -- cgit 1.4.1 From 51f978f4ad796e8e44a0a19ee5ab468b4b8a3958 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 14 Aug 2022 21:07:10 +0200 Subject: gnu: r-rcppparallel: Do not use bundled tbb. * gnu/packages/cran.scm (r-rcppparallel)[inputs]: Add tbb-2020. [arguments]: Add build phase 'use-system-tbb to set TBB_ROOT. [source]: Add snippet to remove bundled tbb. --- gnu/packages/cran.scm | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index f76f50b68d..eb772ce5ae 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -104,6 +104,7 @@ #:use-module (gnu packages python-xyz) #:use-module (gnu packages sqlite) #:use-module (gnu packages statistics) + #:use-module (gnu packages tbb) #:use-module (gnu packages tcl) #:use-module (gnu packages tex) #:use-module (gnu packages textutils) @@ -13665,9 +13666,20 @@ package provides a minimal R interface by relying on the Rcpp package.") (uri (cran-uri "RcppParallel" version)) (sha256 (base32 - "1sn211ajlb1p12sglxqns175rg078yvww268m8cp0vvd7cmk55k3")))) + "1sn211ajlb1p12sglxqns175rg078yvww268m8cp0vvd7cmk55k3")) + (modules '((guix build utils))) + (snippet + '(delete-file-recursively "src/tbb/")))) (properties `((upstream-name . "RcppParallel"))) (build-system r-build-system) + (arguments + (list + #:phases + '(modify-phases %standard-phases + (add-after 'unpack 'use-system-tbb + (lambda* (#:key inputs #:allow-other-keys) + (setenv "TBB_ROOT" (assoc-ref inputs "tbb"))))))) + (inputs (list tbb-2020)) (home-page "https://rcppcore.github.io/RcppParallel/") (synopsis "Parallel programming tools for Rcpp") (description -- cgit 1.4.1 From b30614b28cdc4eb893eeea4523109769f913499e Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 14 Aug 2022 15:05:49 -0700 Subject: gnu: itpp: Remove non-deterministic log file. * gnu/packages/maths.scm (itpp)[arguments]: Add 'delete-formulas-log phase. --- gnu/packages/maths.scm | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index c79058ab42..b82987e7a2 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -1824,6 +1824,12 @@ the resulting text.") (arguments `(#:tests? #f ; Tests require googletest *sources* #:phases (modify-phases %standard-phases + (add-after 'install 'delete-formulas-log + ;; Contains date and timing information which is unreproducible, + ;; and should not be needed when using the package + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (delete-file (string-append out "/share/doc/itpp/html/_formulas.log"))))) (add-after 'unpack 'set-man-page-date (lambda _ (substitute* "itpp-config.1.cmake.in" -- cgit 1.4.1 From 6097e97b2d7ac8b92fb30004883626f2394d8155 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 15 Aug 2022 00:01:57 +0200 Subject: gnu: emacs-debbugs: Update to 0.33. * gnu/packages/emacs-xyz.scm (emacs-debbugs): Update to 0.33. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 3c1d322db3..2d4bd78389 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -6629,14 +6629,14 @@ src blocks.") (define-public emacs-debbugs (package (name "emacs-debbugs") - (version "0.32") + (version "0.33") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/debbugs-" version ".tar")) (sha256 - (base32 "1xp3mj3ndaljma0g7x9abziphgi2a6j8k1v52sb8xwgn4p5gdvby")))) + (base32 "1s4p3jf9yrm8pn5pljpkrw05n2p9v6fpl141rh1df7f7l0w80qbk")))) (build-system emacs-build-system) (arguments '(#:include '("\\.el$" "\\.wsdl$" "\\.info$"))) (propagated-inputs -- cgit 1.4.1 From f5b51a621238ff325794e79019d2dbfc018e63bf Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 15 Aug 2022 00:05:21 +0200 Subject: gnu: emacs-buttercup: Update to 1.26. * gnu/packages/emacs-xyz.scm (emacs-buttercup): Update to 1.26. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 2d4bd78389..548481965e 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -23999,7 +23999,7 @@ targets the Emacs based IDEs (CIDER, ESS, Geiser, Robe, SLIME etc.)") (define-public emacs-buttercup (package (name "emacs-buttercup") - (version "1.25") + (version "1.26") (source (origin (method git-fetch) @@ -24009,7 +24009,7 @@ targets the Emacs based IDEs (CIDER, ESS, Geiser, Robe, SLIME etc.)") (file-name (git-file-name name version)) (sha256 (base32 - "0fsysvsypda6b7azc15bpaprq3bwx4gb6rlq2mj6f8rgwdqc8153")))) + "1zr9lczdr9dfh99n079d5advxm9p32a8f984dx14f3jn5mx750b1")))) (build-system emacs-build-system) (arguments `(#:tests? #t -- cgit 1.4.1 From bf0b51260eb16d920d055ecd36bf23c572ddd77a Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 15 Aug 2022 00:06:29 +0200 Subject: gnu: emacs-buttercup: Improve package style. * gnu/packages/emacs-xyz.scm (emacs-buttercup)[arguments]: Use G-expressions. Remove trailing #T from phases. --- gnu/packages/emacs-xyz.scm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 548481965e..7df24dda5d 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -24012,15 +24012,15 @@ targets the Emacs based IDEs (CIDER, ESS, Geiser, Robe, SLIME etc.)") "1zr9lczdr9dfh99n079d5advxm9p32a8f984dx14f3jn5mx750b1")))) (build-system emacs-build-system) (arguments - `(#:tests? #t - #:test-command '("make" "test") - #:phases - (modify-phases %standard-phases - (add-after 'install 'install-bin - (lambda* (#:key outputs #:allow-other-keys) - (install-file "bin/buttercup" - (string-append (assoc-ref outputs "out") "/bin")) - #t))))) + (list + #:tests? #t + #:test-command #~(list "make" "test") + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'install-bin + (lambda _ + (install-file "bin/buttercup" + (string-append #$output "/bin"))))))) (home-page "https://github.com/jorgenschaefer/emacs-buttercup") (synopsis "Behavior driven emacs lisp testing framework") (description "Buttercup is a behavior-driven development framework for -- cgit 1.4.1 From 40105da3f8df8c0b9cd756f180c86662faf07fb3 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 15 Aug 2022 00:15:05 +0200 Subject: gnu: emacs-citeproc-el: Update to 0.9.1. * gnu/packages/emacs-xyz.scm (emacs-citeproc-el): Update to 0.9.1. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 7df24dda5d..68e4f1c7cd 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -3162,7 +3162,7 @@ Its features are: (define-public emacs-citeproc-el (package (name "emacs-citeproc-el") - (version "0.9") + (version "0.9.1") (source (origin (method git-fetch) @@ -3171,7 +3171,7 @@ Its features are: (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1m5j1abyk68f3d1v781yrx2xkg42vyfgfckbj2yk2lgk6d7rz0p1")))) + (base32 "0rkwqn9pcimfcyq19wlrcij0kcjyhbwisla7vwbhjj8ang0bq9rm")))) (build-system emacs-build-system) (arguments `(#:emacs ,emacs)) ;need libxml support -- cgit 1.4.1 From fa30df8a6570c3635566d9f18cd60e69fe82a057 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 15 Aug 2022 00:09:48 +0200 Subject: gnu: emacs-citar: Update to 1.0. * gnu/packages/emacs-xyz.scm (emacs-citar): Update to 1.0. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 68e4f1c7cd..c125452841 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -18942,7 +18942,7 @@ automatically fetched from well-curated sources, and formatted as BibTeX.") (define-public emacs-citar (package (name "emacs-citar") - (version "0.9.7") + (version "1.0") (source (origin (method git-fetch) (uri (git-reference @@ -18951,7 +18951,7 @@ automatically fetched from well-curated sources, and formatted as BibTeX.") (file-name (git-file-name name version)) (sha256 (base32 - "1f49l1zmy4fnz75b0m2rav5jm8yp6hry44bv9xasiszyy3bn0hv8")))) + "1n69lkp7298gasm9hlbx9nhgp9ggh8w8ffyvi1rmbj96lcnpsyi9")))) (build-system emacs-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit 1.4.1 From 06d8d629c7582a5b6da17bf40ba7370ecfbf6170 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 15 Aug 2022 00:15:11 +0200 Subject: gnu: emacs-autothemer: Update to 0.2.5. * gnu/packages/emacs-xyz.scm (emacs-autothemer): Update to 0.2.5. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index c125452841..de98c83fd9 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -2961,7 +2961,7 @@ or XEmacs.") (define-public emacs-autothemer (package (name "emacs-autothemer") - (version "0.2.2") + (version "0.2.5") (source (origin (method git-fetch) @@ -2971,7 +2971,7 @@ or XEmacs.") (file-name (git-file-name name version)) (sha256 (base32 - "0cd2pqh6k32sjidkcd8682y4l6mx52xw4a05f38kk8nsrk28m74k")))) + "1rwz8hdmycmvak1w5sriwf1pwahham77vyab6jngdw8x9ngxabnx")))) (build-system emacs-build-system) (propagated-inputs (list emacs-dash)) -- cgit 1.4.1 From ab338804ba82a9f2e2277308c89fcd4d61084237 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 15 Aug 2022 00:16:56 +0200 Subject: gnu: emacs-gruvbox-theme: Update to 1.30.0. * gnu/packages/emacs-xyz.scm (emacs-gruvbox-theme): Update to 1.30.0. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index de98c83fd9..f1e2780e1a 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -8708,7 +8708,7 @@ built-in custom themes.") (define-public emacs-gruvbox-theme (package (name "emacs-gruvbox-theme") - (version "1.29.0") + (version "1.30.0") (source (origin (method git-fetch) (uri (git-reference @@ -8717,7 +8717,7 @@ built-in custom themes.") (file-name (git-file-name name version)) (sha256 (base32 - "0ydwr2l3jhqbs3gk5qajirl54vfb8i65qrlzrs04jnsj1pkzq5xa")))) + "1dzaivis9cpqzb53qmkmhijr5l4hl2l3yr2412jxrz2jmqi3q4c5")))) (build-system emacs-build-system) (propagated-inputs (list emacs-autothemer)) -- cgit 1.4.1 From 20d8081eda4351aec5637f70ce02e0613a51975b Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 15 Aug 2022 00:19:35 +0200 Subject: gnu: emacs-reverse-im: Update to 0.0.8. * gnu/packages/emacs-xyz.scm (emacs-reverse-im): Update to 0.0.8. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index f1e2780e1a..fc23c896e2 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -14944,7 +14944,7 @@ letter of Pinyin to Simplified/Traditional Chinese characters.") (define-public emacs-reverse-im (package (name "emacs-reverse-im") - (version "0.0.7") + (version "0.0.8") (source (origin (method git-fetch) @@ -14953,7 +14953,7 @@ letter of Pinyin to Simplified/Traditional Chinese characters.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "05k2zp2hldzq5h6nl8gx79dd8lvfn507ad4x3naichdqgn2013nn")))) + (base32 "1h4gpyqir0kqf6a7ni8dbqwd4mr33imay0fmprrpfpfqxj0lj7c1")))) (build-system emacs-build-system) (home-page "https://github.com/a13/reverse-im.el") (synopsis "Reverse mapping for non-default system layouts") -- cgit 1.4.1 From 76ef73f81fb2e9535477dc33b8f7ab1728d2e6f9 Mon Sep 17 00:00:00 2001 From: gyara Date: Sun, 14 Aug 2022 20:58:01 +0900 Subject: gnu: dunst: Update to 1.9.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/dunst.scm (dunst): Update to 1.9.0. Signed-off-by: 宋文武 --- gnu/packages/dunst.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/dunst.scm b/gnu/packages/dunst.scm index 35df682d46..0855e45084 100644 --- a/gnu/packages/dunst.scm +++ b/gnu/packages/dunst.scm @@ -41,7 +41,7 @@ (define-public dunst (package (name "dunst") - (version "1.8.1") + (version "1.9.0") (source (origin (method git-fetch) (uri (git-reference @@ -50,7 +50,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "19bh5789whlc0n5wbyx3yx8px93hccn42f1p6i1dz96hdkk5mjb8")))) + "1nfxf2rahngxpy606yrizrz16d0pswl5sa9jfzpv7h19x6xy24vx")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no check target -- cgit 1.4.1 From bd8fdbe0105c3d87de9baa84917eb466ea623838 Mon Sep 17 00:00:00 2001 From: jgart Date: Sat, 13 Aug 2022 21:54:44 -0500 Subject: gnu: emacs-org-auto-tangle: Update to 0.6.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/emacs-xyz.scm (emacs-org-auto-tangle): Update to 0.6.0. Signed-off-by: 宋文武 --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index fc23c896e2..dde1d6237c 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -18820,7 +18820,7 @@ Chinese to English.") (define-public emacs-org-auto-tangle (package (name "emacs-org-auto-tangle") - (version "0.4.1") + (version "0.6.0") (source (origin (method git-fetch) (uri (git-reference @@ -18829,7 +18829,7 @@ Chinese to English.") (file-name (git-file-name name version)) (sha256 (base32 - "1zb7vcmhmjiqpbbhqrqci689rnpn10p985cs5jk9sgg66xsbrgs3")))) + "1kn1jsbv97ps280lcdx19d6hs7pvz7q9ng67xlb1kwjb680pa7rl")))) (build-system emacs-build-system) (propagated-inputs (list emacs-async)) (home-page "https://github.com/yilkalargaw/org-auto-tangle") -- cgit 1.4.1 From 94dc157ae4dff84f767772d0401824fdc50b28e0 Mon Sep 17 00:00:00 2001 From: jgart Date: Sun, 14 Aug 2022 21:05:53 -0500 Subject: gnu: Add python-nanoid. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-nanoid): New variable. Signed-off-by: 宋文武 --- gnu/packages/python-xyz.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 13ab2f2c8b..5d492d073c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -30531,6 +30531,39 @@ package. It can be used by type-checking tools like mypy, PyCharm, pytype etc. to check code that uses @code{orjson}.") (license license:asl2.0))) +(define-public python-nanoid + ;; There are no tests on PyPi. + (let ((commit "061f9a598f310b0e2e91b9ed6ce725a22770da64") + (revision "0")) + (package + (name "python-nanoid") + (version "2.0.0") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/puyuan/py-nanoid") + (commit commit))) + (file-name (git-file-name name commit)) + (sha256 + (base32 "0y1bcw0h27g8rkqq7cp33ywn0i0lp0q3rjixzkh4191y1dp9yf8s")))) + (build-system python-build-system) + (native-inputs (list python-pytest)) + (arguments + '(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? inputs outputs #:allow-other-keys) + (when tests? + (invoke "pytest"))))))) + (home-page "https://github.com/puyuan/py-nanoid") + (synopsis "Unique string ID generator") + (description + "This package provides a tiny, secure, URL-friendly, unique string ID +generator for Python.") + (license license:expat)))) + (define-public python-misskey (package (name "python-misskey") -- cgit 1.4.1 From f0694d4e0102c9b18c8efee8e8b0ae1880f6faf6 Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Sat, 13 Aug 2022 13:39:54 +0800 Subject: gnu: guile-hashing: Use source from Gitlab. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/guile-xyz.scm (guile-hashing)[home-page]: Use source from Gitlab. [source]: Replace missing git tag with commit. Signed-off-by: 宋文武 --- gnu/packages/guile-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 8e8a73ad30..fa6230b81c 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -3703,12 +3703,12 @@ the style of the Node Package Manager (NPM).") (package (name "guile-hashing") (version "1.2.0") - (home-page "https://github.com/weinholt/hashing") + (home-page "https://gitlab.com/weinholt/hashing") (source (origin (method git-fetch) (uri (git-reference (url home-page) - (commit (string-append "v" version)))) + (commit "f138deaec38d54ddb621c082764ece276deebe7f"))) (file-name (git-file-name name version)) (sha256 (base32 -- cgit 1.4.1 From 5c6b020c73b857fc170dbae42ace48ca3409ab18 Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Sat, 13 Aug 2022 13:41:04 +0800 Subject: gnu: guile-packrat: Use source from Gitlab. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/guile-xyz.scm (guile-packrat)[home-page]: Use source from Gitlab. [source]: Replace missing git tag with commit. Signed-off-by: 宋文武 --- gnu/packages/guile-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index fa6230b81c..7812cc9003 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -3761,12 +3761,12 @@ SHA-512).") (package (name "guile-packrat") (version "0.1.1") - (home-page "https://github.com/weinholt/packrat") + (home-page "https://gitlab.com/weinholt/packrat") (source (origin (method git-fetch) (uri (git-reference (url home-page) - (commit (string-append "v" version)))) + (commit "4201ebe741b605db58a21d70195cfb7db3c38eae"))) (file-name (git-file-name name version)) (sha256 (base32 -- cgit 1.4.1 From 89cf75b8c6f2bfc7ae395ce93669080ed846c3b5 Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Sat, 13 Aug 2022 13:41:21 +0800 Subject: gnu: guile-struct-pack: Use source from Gitlab. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/guile-xyz.scm (guile-struct-pack) [source]: Use source from Gitlab. Replace missing git tag with commit. [home-page]: Use source from Gitlab. Signed-off-by: 宋文武 --- gnu/packages/guile-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 7812cc9003..c7724607a5 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -4176,8 +4176,8 @@ more objects or strings, represented by a Json object or an IRI.") (origin (method git-fetch) (uri (git-reference - (url "https://github.com/weinholt/struct-pack") - (commit (string-append "v" version)))) + (url "https://gitlab.com/weinholt/struct-pack") + (commit "11b71963793ed4a3bf761efdd83cf2fe123239ee"))) (file-name (git-file-name name version)) (sha256 (base32 "0hd72m821pahjphzyjn26i55542v8makr55xzjll2cycja4wsbc1")))) @@ -4205,7 +4205,7 @@ more objects or strings, represented by a Json object or an IRI.") #t))))) (native-inputs (list guile-3.0)) - (home-page "https://github.com/weinholt/struct-pack") + (home-page "https://gitlab.com/weinholt/struct-pack") (synopsis "R6RS library for working with packed byte structures") (description "This is an R6RS library for working with packed byte structures. It is -- cgit 1.4.1 From 6a06ddd247526f7e8425d9f052549072b78466f5 Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Sat, 13 Aug 2022 13:42:38 +0800 Subject: gnu: guile-machine-code: Use source from Gitlab. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/guile-xyz.scm (guile-machine-code) [source]: Use source from Gitlab. [home-page]: Use source from Gitlab. Signed-off-by: 宋文武 --- gnu/packages/guile-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index c7724607a5..c058bef116 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -4220,7 +4220,7 @@ similar to struct in Python or pack and unpack in Perl.") (origin (method git-fetch) (uri (git-reference - (url "https://github.com/weinholt/machine-code") + (url "https://gitlab.com/weinholt/machine-code") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -4251,7 +4251,7 @@ similar to struct in Python or pack and unpack in Perl.") (list guile-3.0)) (propagated-inputs (list guile-struct-pack)) - (home-page "https://github.com/weinholt/machine-code") + (home-page "https://gitlab.com/weinholt/machine-code") (synopsis "Tools that relate to machine code and object formats") (description "This project is about the development of tools that relate to machine -- cgit 1.4.1 From ae5ea1ec1cb1d9cff3e8f896751976f2c2f722ff Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Sat, 13 Aug 2022 13:42:51 +0800 Subject: gnu: guile-laesare: Use source from Gitlab. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/guile-xyz.scm (guile-laesare) [source]: Use source from Gitlab. [home-page]: Use source from Gitlab. Signed-off-by: 宋文武 --- gnu/packages/guile-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index c058bef116..4498255c89 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -4268,7 +4268,7 @@ object formats and related areas.") (origin (method git-fetch) (uri (git-reference - (url "https://github.com/weinholt/laesare") + (url "https://gitlab.com/weinholt/laesare") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -4297,7 +4297,7 @@ object formats and related areas.") #t))))) (native-inputs (list guile-3.0)) - (home-page "https://github.com/weinholt/laesare") + (home-page "https://gitlab.com/weinholt/laesare") (synopsis "R6RS Scheme library that provides a reader") (description "This is an R6RS Scheme library that provides a reader with some extra -- cgit 1.4.1 From 8fce5f0f0f644981e262ed0f848ede8fa0c14170 Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Sat, 13 Aug 2022 19:59:41 +0800 Subject: gnu: guile-machine-code: Update to 2.2.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/guile-xyz.scm (guile-machine-code): Update to 2.2.0. Signed-off-by: 宋文武 --- gnu/packages/guile-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 4498255c89..fc6fa37f73 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -4215,7 +4215,7 @@ similar to struct in Python or pack and unpack in Perl.") (define-public guile-machine-code (package (name "guile-machine-code") - (version "2.1.0") + (version "2.2.0") (source (origin (method git-fetch) @@ -4224,7 +4224,7 @@ similar to struct in Python or pack and unpack in Perl.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0wzj3caj2jypzyjqfkfqkvr3kkbjabsnhldv9kvnx9w9qnria5yd")))) + (base32 "1yjzpg5p082kg4vaqlwbwddrrhxyxar6gsx9ql72hpwah4ka82h5")))) (build-system guile-build-system) (arguments `(#:compile-flags '("--r6rs" "-Wunbound-variable" "-Warity-mismatch") -- cgit 1.4.1 From 18ae404690e8b96c5a97886b506e75c4c1b21b6d Mon Sep 17 00:00:00 2001 From: Nicolas Graves via Guix-patches via Date: Sun, 14 Aug 2022 18:35:58 +0200 Subject: gnu: Add python-whatthepatch. * gnu/packages/python-web.scm (python-whatthepatch): New variable. Signed-off-by: Mathieu Othacehe --- gnu/packages/python-web.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 896e60aba2..59a3ee516d 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -53,6 +53,7 @@ ;;; Copyright © 2022 Peter Polidoro ;;; Copyright © 2022 Antero Mejr ;;; Copyright © 2022 Luis Henrique Gomes Higino +;;; Copyright © 2022 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -7761,3 +7762,20 @@ admin section of stores using an ActiveResource-like interface similar the ruby Shopify API gem. The library makes HTTP requests to Shopify in order to list, create, update, or delete resources (e.g. Order, Product, Collection).") (license license:expat))) + +(define-public python-whatthepatch + (package + (name "python-whatthepatch") + (version "1.0.2") + (source (origin + (method url-fetch) + (uri (pypi-uri "whatthepatch" version)) + (sha256 + (base32 + "17zspm5sxhvggkdhwq4s0fzf4mkc825xshn734g2j2iy2xcylh65")))) + (build-system python-build-system) + (home-page "https://github.com/cscorley/whatthepatch") + (synopsis "Patch parsing and application") + (description + "This package provides a library to parse and apply patches.") + (license license:expat))) -- cgit 1.4.1 From 07f807f12c0949e9deeee09b4a28bb1f810b26ca Mon Sep 17 00:00:00 2001 From: Nicolas Graves via Guix-patches via Date: Sun, 14 Aug 2022 18:36:00 +0200 Subject: gnu: python-lsp-server: Update to 1.5.0. * gnu/packages/python-xyz.scm (python-lsp-server): Update to 1.5.0. [arguments]{set-HOME}: Remove this phase because tests do not require it anymore. {check}: Do not replace it as test_pyqt_completion is not longer failing. [propagated-inputs]: Remove python-future. [native-inputs]: Remove python-mock, python-versioneer and add python-whatthepatch. Signed-off-by: Mathieu Othacehe --- gnu/packages/python-xyz.scm | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 5d492d073c..5e8a3654ab 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5273,30 +5273,19 @@ Server (PLS).") (define-public python-lsp-server (package (name "python-lsp-server") - (version "1.3.3") + (version "1.5.0") (source (origin (method url-fetch) (uri (pypi-uri "python-lsp-server" version)) (sha256 (base32 - "0h6wxzmm6qjfwkkn3mnzn1fpmcp23fpbk74bi8p540q1nzccqj0v")))) + "039qi5x9sa1mjzinimxhiwzj8lxn5d5l33q6qhkjl0i5k70r9h75")))) (build-system python-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'check 'set-HOME - (lambda _ (setenv "HOME" "/tmp"))) - (replace 'check - (lambda _ - ;; Disable failing test. - (invoke "python" "-m" "pytest" "-k" - "not test_pyqt_completion")))))) (propagated-inputs (list python-autopep8 python-pydocstyle python-flake8 - python-future python-jedi python-lsp-jsonrpc python-pluggy @@ -5309,13 +5298,12 @@ Server (PLS).") (list python-coverage python-flaky python-matplotlib - python-mock python-numpy python-pandas python-pylint python-pytest python-pytest-cov - python-versioneer)) + python-whatthepatch)) (home-page "https://github.com/python-lsp/python-lsp-server") (synopsis "Python implementation of the Language Server Protocol") (description -- cgit 1.4.1 From 9641e64b434fee1d2538cbf8224b84bd4a186750 Mon Sep 17 00:00:00 2001 From: Olivier Dion Date: Fri, 12 Aug 2022 19:24:12 -0400 Subject: gnu: Add lttng-modules. * gnu/packages/instrumentation.scm (lttng-modules): New variable. Signed-off-by: Mathieu Othacehe --- gnu/packages/instrumentation.scm | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/instrumentation.scm b/gnu/packages/instrumentation.scm index f52cf11505..2c0b435075 100644 --- a/gnu/packages/instrumentation.scm +++ b/gnu/packages/instrumentation.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2021 Olivier Dion +;;; Copyright © 2021, 2022 Olivier Dion ;;; ;;; This file is part of GNU Guix. ;;; @@ -50,6 +50,7 @@ #:use-module (guix build-system cmake) #:use-module (guix build-system copy) #:use-module (guix build-system gnu) + #:use-module (guix build-system linux-module) #:use-module (guix download) #:use-module (guix gexp) #:use-module (guix git-download) @@ -206,6 +207,30 @@ interactive SVGs out of traces genated from various tracing tools. It comes with the script @command{flamegraph.pl} and many stackcollapse scripts.") (license license:cddl1.0)))) +(define-public lttng-modules + (package + (name "lttng-modules") + (version "2.13.4") + (source (origin + (method url-fetch) + (uri (string-append "https://lttng.org/files/lttng-modules/" + "lttng-modules-" version ".tar.bz2")) + (sha256 + (base32 + "1vm9nnjvid7acsvgwnjyxd60ih9rmbhnfjldxip58n8x9q7d0nb1")))) + (build-system linux-module-build-system) + (arguments + `(#:tests? #f ; no tests + #:make-flags (list "CONFIG_LTTNG=m" + "CONFIG_LTTNG_CLOCK_PLUGIN_TEST=m"))) + (home-page "https://lttng.org/") + (synopsis "LTTng kernel modules for the LTTng tracer toolset") + (description + "LTTng kernel modules are Linux kernel modules which make +LTTng kernel tracing possible. They include essential control modules and +many probes which instrument numerous interesting parts of Linux.") + (license (list license:lgpl2.1 license:gpl2 license:expat)))) + (define-public lttng-ust (package (name "lttng-ust") -- cgit 1.4.1 From eca0227239c7ca52a2a3f4eed82b546899d57fec Mon Sep 17 00:00:00 2001 From: Olivier Dion Date: Fri, 12 Aug 2022 18:40:19 -0400 Subject: gnu: lttng-ust: Update to 2.13.3. * gnu/packages/instrumentation.scm (lttng-ust): Update to 2.13.3. Signed-off-by: Mathieu Othacehe --- gnu/packages/instrumentation.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/instrumentation.scm b/gnu/packages/instrumentation.scm index 2c0b435075..08c094e5e7 100644 --- a/gnu/packages/instrumentation.scm +++ b/gnu/packages/instrumentation.scm @@ -234,7 +234,7 @@ many probes which instrument numerous interesting parts of Linux.") (define-public lttng-ust (package (name "lttng-ust") - (version "2.13.1") + (version "2.13.3") (source (origin (method url-fetch) (uri (string-append "https://lttng.org/files/lttng-ust/" -- cgit 1.4.1 From c53a5e7dc3153443cab5ac8ce7ff9d935785fe44 Mon Sep 17 00:00:00 2001 From: Olivier Dion Date: Fri, 12 Aug 2022 18:40:38 -0400 Subject: gnu: lttng-tools: Update to 2.13.7. * gnu/packages/instrumentation.scm (lttng-tools): Update to 2.13.7. Signed-off-by: Mathieu Othacehe --- gnu/packages/instrumentation.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/instrumentation.scm b/gnu/packages/instrumentation.scm index 08c094e5e7..f7f6ab7ba7 100644 --- a/gnu/packages/instrumentation.scm +++ b/gnu/packages/instrumentation.scm @@ -260,7 +260,7 @@ to ring buffers shared with a consumer daemon.") (define-public lttng-tools (package (name "lttng-tools") - (version "2.13.2") + (version "2.13.7") (source (origin (method url-fetch) (uri (string-append "https://lttng.org/files/lttng-tools/" -- cgit 1.4.1 From eb38d49b04d946c96dbd4ea6adc6ffd394711a13 Mon Sep 17 00:00:00 2001 From: Ekaitz Zarraga Date: Fri, 12 Aug 2022 12:47:51 +0200 Subject: gnu: rgbds: Update to 0.5.2. * gnu/packages/assembly.scm (rgbds): Update to 0.5.2. [arguments]: Remove a trailing #t. Signed-off-by: Mathieu Othacehe --- gnu/packages/assembly.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/assembly.scm b/gnu/packages/assembly.scm index ca50b00a06..df6587385f 100644 --- a/gnu/packages/assembly.scm +++ b/gnu/packages/assembly.scm @@ -291,7 +291,7 @@ runtime") (define-public rgbds (package (name "rgbds") - (version "0.4.2") + (version "0.5.2") (source (origin (method git-fetch) (uri (git-reference @@ -300,7 +300,7 @@ runtime") (file-name (git-file-name name version)) (sha256 (base32 - "0lygj7jzjlq4w0mkiir7ycysrd1p1akyvzrppjcchja05mi8wy9p")))) + "13zy05xzh2yxyvzf78a5h59pabwrfr6qs5m453pfbdyd3msg2s7w")))) (build-system gnu-build-system) (arguments `(#:phases @@ -312,8 +312,7 @@ runtime") (("pkg-config") (or (which "pkg-config") (string-append ,(%current-target-system) - "-pkg-config")))) - #t)) + "-pkg-config")))))) (replace 'check (lambda _ (with-directory-excursion "test/asm" -- cgit 1.4.1 From 81d3bc3c8b70e6f1f51e9a3022b787f924f0a774 Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Fri, 12 Aug 2022 15:56:43 +0200 Subject: gnu: xfce4-screenshooter: Update to 1.9.11. * gnu/packages/xfce.scm (xfce4-screenshooter): Update to 1.9.11. Signed-off-by: Mathieu Othacehe --- gnu/packages/xfce.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 12c490f622..efc402f5a9 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -1348,7 +1348,7 @@ of data to either CD/DVD/BD.") (define-public xfce4-screenshooter (package (name "xfce4-screenshooter") - (version "1.9.10") + (version "1.9.11") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/apps/" @@ -1358,7 +1358,7 @@ of data to either CD/DVD/BD.") version ".tar.bz2")) (sha256 (base32 - "1mwjhakbjv9g6ffn6c55cbrfsrqhb2apwhmffvz8rfgm4y2igd04")))) + "1d7qyc2w4962crmkz5n0mma2qmyp9hhq455karyzacjbb6z0cgg7")))) (build-system gnu-build-system) (native-inputs (list pkg-config intltool -- cgit 1.4.1 From a751d90c8820c2d4794dc4898c35cd9cb179e4f2 Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Fri, 12 Aug 2022 16:11:12 +0200 Subject: gnu: tumbler: Update to 4.16.1. * gnu/packages/xfce.scm (tumbler): Update to 4.16.1. Signed-off-by: Mathieu Othacehe --- gnu/packages/xfce.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index efc402f5a9..02c9b6541c 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -359,7 +359,7 @@ merging features essential for loading menus modified with menu editors.") (define-public tumbler (package (name "tumbler") - (version "4.16.0") + (version "4.16.1") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/xfce/" @@ -367,7 +367,7 @@ merging features essential for loading menus modified with menu editors.") "tumbler-" version ".tar.bz2")) (sha256 (base32 - "0rmga1l7da0pjrs6jlyq1nfn513r543v7cchshrif1341knpy2wv")))) + "0gi77675gi1bbhrrg0p60dy06clf24xa0hz2jb74hnzk2gxbyaw5")))) (build-system gnu-build-system) (native-inputs (list pkg-config intltool -- cgit 1.4.1 From 82fbb542074548911a18c2a4187e520778cf31cb Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 15 Aug 2022 10:29:16 +0200 Subject: gnu: asymptote: Update to 2.82. * gnu/packages/plotutils.scm (asymptote): Update to 2.82. --- gnu/packages/plotutils.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm index 56d3c4e282..a5e1a1ad55 100644 --- a/gnu/packages/plotutils.scm +++ b/gnu/packages/plotutils.scm @@ -269,14 +269,14 @@ colors, styles, options and details.") (define-public asymptote (package (name "asymptote") - (version "2.81") + (version "2.82") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/asymptote/" version "/asymptote-" version ".src.tgz")) (sha256 - (base32 "0wq0xnkxb8rsphmgls5f38ll61j8i0plh7cr1n0kldvpr14bm3kn")) + (base32 "13blmsapbai4hqynyj1r1sjpypdv6frfassl2f2x7j2ql1dbqvsg")) (modules '((guix build utils))) (snippet ;; Remove bundled RapidJSON. -- cgit 1.4.1 From f6709ee23487ce476d8145b2c8f793d9ed1f4c87 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 15 Aug 2022 10:32:18 +0200 Subject: gnu: emacs-org-re-reveal: Update to 3.15.0. * gnu/packages/emacs-xyz.scm (emacs-org-re-reveal): Update to 3.15.0. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index dde1d6237c..14904aa5aa 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -20309,7 +20309,7 @@ powerful Org contents.") (define-public emacs-org-re-reveal (package (name "emacs-org-re-reveal") - (version "3.14.1") + (version "3.15.0") (source (origin (method git-fetch) @@ -20318,7 +20318,7 @@ powerful Org contents.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "180dn5iywarljbmx8lm61y30n2d800kg96psrvc8ghfglnvp6964")))) + (base32 "0mn7qn80289gizvnxyjjs00b7qmlf0692kai7qgzgfj6i87pjc38")))) (build-system emacs-build-system) (propagated-inputs (list emacs-htmlize emacs-org)) -- cgit 1.4.1 From 2e88164023cad397fecac023cc7855b3ad1d84b6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 15 Aug 2022 10:59:45 +0200 Subject: gnu: r-tweenr: Build reproducibly. * gnu/packages/cran.scm (r-tweenr)[arguments]: Add phase 'build-reproducibly to avoid embedding random time difference. --- gnu/packages/cran.scm | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index eb772ce5ae..e03b707162 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -19060,6 +19060,15 @@ packages with Rcpp.") (base32 "17znizh4yabh2zs9mzyr0sl6p0pw49961i61br7cl1b7v9sza18q")))) (build-system r-build-system) + (arguments + (list + #:phases + '(modify-phases %standard-phases + (add-after 'unpack 'build-reproducibly + (lambda _ + (substitute* "R/aaa.R" + (("BASEDATETIME <- Sys.time.*") + "BASEDATETIME <- structure(0, class = c(\"POSIXct\", \"POSIXt\"))\n"))))))) (propagated-inputs (list r-farver r-magrittr r-rcpp r-rlang)) (home-page "https://github.com/thomasp85/tweenr") -- cgit 1.4.1 From 6b2d29a6f53a9fe0be72953611f9f910b871d9af Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Mon, 15 Aug 2022 11:06:53 +0200 Subject: Revert "gnu: python-lsp-server: Update to 1.5.0." This reverts commit 07f807f12c0949e9deeee09b4a28bb1f810b26ca because it requires a python-pluggy update which seems to cause some issues. --- gnu/packages/python-xyz.scm | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 5e8a3654ab..5d492d073c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5273,19 +5273,30 @@ Server (PLS).") (define-public python-lsp-server (package (name "python-lsp-server") - (version "1.5.0") + (version "1.3.3") (source (origin (method url-fetch) (uri (pypi-uri "python-lsp-server" version)) (sha256 (base32 - "039qi5x9sa1mjzinimxhiwzj8lxn5d5l33q6qhkjl0i5k70r9h75")))) + "0h6wxzmm6qjfwkkn3mnzn1fpmcp23fpbk74bi8p540q1nzccqj0v")))) (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'check 'set-HOME + (lambda _ (setenv "HOME" "/tmp"))) + (replace 'check + (lambda _ + ;; Disable failing test. + (invoke "python" "-m" "pytest" "-k" + "not test_pyqt_completion")))))) (propagated-inputs (list python-autopep8 python-pydocstyle python-flake8 + python-future python-jedi python-lsp-jsonrpc python-pluggy @@ -5298,12 +5309,13 @@ Server (PLS).") (list python-coverage python-flaky python-matplotlib + python-mock python-numpy python-pandas python-pylint python-pytest python-pytest-cov - python-whatthepatch)) + python-versioneer)) (home-page "https://github.com/python-lsp/python-lsp-server") (synopsis "Python implementation of the Language Server Protocol") (description -- cgit 1.4.1 From ae549cf48f14efc61a5bf7cec6203708dbb55068 Mon Sep 17 00:00:00 2001 From: Jim Newsome Date: Tue, 9 Aug 2022 09:38:40 -0500 Subject: gnu: torsocks: Update to 2.4.0. * gnu/packages/tor.scm (torsocks): Update to 2.4.0. [native-inputs]: Add autoconf, automake, libtool because torsocks releases no longer pre-run autogen.sh. [synopsis, description]: Clarify that applications do not need to be socks-aware to be used with torsocks. Signed-off-by: Mathieu Othacehe --- gnu/packages/tor.scm | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm index 8648447ee2..d71374542b 100644 --- a/gnu/packages/tor.scm +++ b/gnu/packages/tor.scm @@ -12,6 +12,7 @@ ;;; Copyright © 2020 André Batista ;;; Copyright © 2021-2022 Danial Behzadi ;;; Copyright © 2022 Maxim Cournoyer +;;; Copyright © 2022 Jim Newsome ;;; ;;; This file is part of GNU Guix. ;;; @@ -160,17 +161,19 @@ This package only provides a client to the Tor Network."))) (define-public torsocks (package (name "torsocks") - (version "2.3.0") + (version "2.4.0") (source (origin (method url-fetch) - (uri (string-append "https://people.torproject.org/~dgoulet/" - "torsocks/torsocks-" version ".tar.xz")) + (uri (string-append "https://gitlab.torproject.org/tpo/core/torsocks/-/archive/v" + version "/torsocks-v" version ".tar.bz2")) (sha256 (base32 - "08inrkap29gikb6sdmb58z43hw4abwrfw7ny40c4xzdkss0vkwdr")))) + "1a7k3njdhp7dz603knhisna1zvxw35j3g213p6dvczv9bcjy7cjl")))) (build-system gnu-build-system) (inputs (list libcap)) + (native-inputs + (list autoconf automake libtool)) (arguments `(#:phases (modify-phases %standard-phases (add-after 'build 'absolutize @@ -180,11 +183,11 @@ This package only provides a client to the Tor Network."))) (string-append "getcap=" (which "getcap") "\n"))) #t))))) (home-page "https://www.torproject.org/") - (synopsis "Use socks-friendly applications with Tor") + (synopsis "Transparently route an application's traffic through Tor.") (description - "Torsocks allows you to use most socks-friendly applications in a safe -way with Tor. It ensures that DNS requests are handled safely and explicitly -rejects UDP traffic from the application you're using.") + "Torsocks allows you to use most applications in a safe way with Tor. It +ensures that DNS requests are handled safely and explicitly rejects UDP +traffic from the application you're using.") ;; All the files explicitly say "version 2 only". (license license:gpl2))) -- cgit 1.4.1 From 0e53328a8a6e78687436658bb96c0da9802dfaac Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Mon, 15 Aug 2022 11:21:22 +0200 Subject: gnu: torsocks: Wrap lines. * gnu/packages/tor.scm (torsocks)[source, arguments]: Wrap long lines and remove a trailing #t. --- gnu/packages/tor.scm | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm index d71374542b..36ad5e765a 100644 --- a/gnu/packages/tor.scm +++ b/gnu/packages/tor.scm @@ -162,26 +162,28 @@ This package only provides a client to the Tor Network."))) (package (name "torsocks") (version "2.4.0") - (source (origin - (method url-fetch) - (uri (string-append "https://gitlab.torproject.org/tpo/core/torsocks/-/archive/v" - version "/torsocks-v" version ".tar.bz2")) - (sha256 - (base32 - "1a7k3njdhp7dz603knhisna1zvxw35j3g213p6dvczv9bcjy7cjl")))) + (source + (origin + (method url-fetch) + (uri (string-append + "https://gitlab.torproject.org/tpo/core/torsocks/-/archive/v" + version "/torsocks-v" version ".tar.bz2")) + (sha256 + (base32 + "1a7k3njdhp7dz603knhisna1zvxw35j3g213p6dvczv9bcjy7cjl")))) (build-system gnu-build-system) (inputs (list libcap)) (native-inputs (list autoconf automake libtool)) (arguments - `(#:phases (modify-phases %standard-phases - (add-after 'build 'absolutize - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "src/bin/torsocks" - (("getcap=.*") - (string-append "getcap=" (which "getcap") "\n"))) - #t))))) + `(#:phases + (modify-phases %standard-phases + (add-after 'build 'absolutize + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "src/bin/torsocks" + (("getcap=.*") + (string-append "getcap=" (which "getcap") "\n")))))))) (home-page "https://www.torproject.org/") (synopsis "Transparently route an application's traffic through Tor.") (description -- cgit 1.4.1 From 21f1a47097f61764463289f8d305a8f860f0f224 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 15 Aug 2022 08:10:46 -0400 Subject: gnu: Add python-sshtunnel. * gnu/packages/python-xyz.scm (python-sshtunnel): New variable. --- gnu/packages/python-xyz.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 5d492d073c..9ab75507e5 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -4873,6 +4873,31 @@ utility, a static analysis tool (linter) for Robot Framework source files.") (description "Pabot is a parallel executor for Robot Framework tests.") (license license:asl2.0))) +(define-public python-sshtunnel + (package + (name "python-sshtunnel") + (version "0.4.0") + (source (origin + (method url-fetch) + (uri (pypi-uri "sshtunnel" version)) + (sha256 + (base32 + "1z7rdgpp9m36ysh9pfzrn3vyiaj05bkjvcjdhj8vz0fvfjkhxjz7")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? (invoke "pytest" "-vv" "tests"))))))) + (propagated-inputs (list python-paramiko)) + (native-inputs (list openssh python-pytest)) + (home-page "https://github.com/pahaz/sshtunnel") + (synopsis "Python SSH tunnels library") + (description "@code{sshtunnel} is a Python module for easily creating SSH +tunnels in the background, using Python.") + (license license:expat))) + (define-public python-robotframework-stacktrace (package (name "python-robotframework-stacktrace") -- cgit 1.4.1 From d8537c68d09daaa3e8db35022ac45b5f2fe8ffda Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 15 Aug 2022 08:26:08 -0400 Subject: gnu: Add python-robotframework-sshtunnellibrary. * gnu/packages/python-xyz.scm (python-robotframework-sshtunnellibrary): New variable. --- gnu/packages/python-xyz.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 9ab75507e5..95507971b2 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -4898,6 +4898,35 @@ utility, a static analysis tool (linter) for Robot Framework source files.") tunnels in the background, using Python.") (license license:expat))) +(define-public python-robotframework-sshtunnellibrary + (package + (name "python-robotframework-sshtunnellibrary") + (version "1.0.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/C-Squad/robotframework-sshtunnellibrary") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1vkkmkb8iql13xpbyj4hvnnmfgzqlr8rffgryp2082cadb3w7xrd")))) + (build-system python-build-system) + (arguments + (list #:phases #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "python" "-m" "unittest" + "discover" "-s" "test"))))))) + (propagated-inputs (list python-robotframework python-sshtunnel)) + (home-page "https://github.com/C-Squad/robotframework-sshtunnellibrary") + (synopsis "Alternative RobotFramework library for SSH tunnels") + (description "SSHTunnelLibrary is an alternative RobotFramework +library (to the more official one that comes from the +@code{robotframework-sshlibrary} package) to support SSH tunnels.") + (license license:asl2.0))) + (define-public python-robotframework-stacktrace (package (name "python-robotframework-stacktrace") -- cgit 1.4.1 From 2365e8435a13c3aa4308e88773de0a0e7b9ffef9 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Mon, 15 Aug 2022 14:10:13 +0200 Subject: gnu: python-lxml: Update to 4.6.5. * gnu/packages/xml.scm (python-lxml): Update to 4.6.5. --- gnu/packages/xml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index c3213b8f36..d8c9147c57 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -2500,13 +2500,13 @@ because lxml.etree already has its own implementation of XPath 1.0.") (define-public python-lxml (package (name "python-lxml") - (version "4.6.3") + (version "4.6.5") (source (origin (method url-fetch) (uri (pypi-uri "lxml" version)) (sha256 - (base32 "0s14r1w2x9sdlcsw8mxiqgw4rz5zs5lpqpxrfyn4a1mkndqqbdrr")) + (base32 "1jn4gbd1qxrbdli6x0bihi5rkm1h4qmfxqny9pa90bx8qgnfv13f")) ;; Adapt a test to libxml2 2.9.12, taken from this commit: ;; https://github.com/lxml/lxml/commit/852ed1092bd80b6b9a51db24371047e (modules '((guix build utils))) -- cgit 1.4.1 From 9ddd37d6ab59e2519bbcefad15ce62561128f0ee Mon Sep 17 00:00:00 2001 From: Maximilian Heisinger Date: Sun, 14 Aug 2022 21:09:59 +0200 Subject: gnu: Add kissat. * gnu/packages/maths.scm (kissat): New variable. Signed-off-by: Liliana Marie Prikler --- gnu/packages/maths.scm | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index b82987e7a2..72d5e9a83a 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -7317,6 +7317,64 @@ researchers and developers alike to get started on SAT.") "http://minisat.se/MiniSat.html") (license license:expat)))) +(define-public kissat + (package + (name "kissat") + (version "3.0.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/arminbiere/kissat") + (commit (string-append "rel-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "04x4w760srbdi4zci0s747qxk717x5d2x59ixraxh5104s9nyn8b")))) + (build-system gnu-build-system) + (inputs (list xz gzip lzip bzip2 p7zip)) + (arguments + (list + #:test-target "test" + #:configure-flags #~(list "-shared") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-source + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "src/file.c" + (("(bzip2|gzip|lzma|xz) -c" all cmd) + (string-append (search-input-file inputs + (string-append "bin/" cmd)) + " -c")) + (("7z ([ax])" all mode) + (string-append (search-input-file inputs "bin/7z") + " " mode)) + ;; Since we hard-coded the paths, we no longer need to find + ;; them. + (("bool found = kissat_find_executable \\(name\\);") + "bool found = true;")) + (substitute* "test/testmain.c" + ;; SIGINT is ignored inside invoke. + (("^SIGNAL\\(SIGINT\\)") "")))) + (replace 'configure + (lambda* (#:key configure-flags #:allow-other-keys) + ;; The configure script does not support standard GNU options. + (apply invoke "./configure" configure-flags))) + (replace 'install + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (install-file "build/kissat" (string-append out "/bin")) + (install-file "build/libkissat.so" (string-append out "/lib")) + (install-file "src/kissat.h" + (string-append out "/include")))))))) + (home-page "https://github.com/arminbiere/kissat") + (synopsis "Bare-metal SAT solver") + (description + "Kissat is a bare-metal SAT-solver written in C. It is a port of CaDiCaL +back to C with improved data structures, better scheduling of inprocessing and +optimized algorithms and implementation.") + (license license:expat))) + (define-public libqalculate (package (name "libqalculate") -- cgit 1.4.1 From 3084fc28fdd7c904f334b67ef0f8955054f56246 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Mon, 15 Aug 2022 15:45:46 +0200 Subject: Revert "gnu: python-lxml: Update to 4.6.5." This reverts commit 2365e8435a13c3aa4308e88773de0a0e7b9ffef9 as it triggers >15k rebuilds: https://ci.guix.gnu.org/eval/543158. --- gnu/packages/xml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index d8c9147c57..c3213b8f36 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -2500,13 +2500,13 @@ because lxml.etree already has its own implementation of XPath 1.0.") (define-public python-lxml (package (name "python-lxml") - (version "4.6.5") + (version "4.6.3") (source (origin (method url-fetch) (uri (pypi-uri "lxml" version)) (sha256 - (base32 "1jn4gbd1qxrbdli6x0bihi5rkm1h4qmfxqny9pa90bx8qgnfv13f")) + (base32 "0s14r1w2x9sdlcsw8mxiqgw4rz5zs5lpqpxrfyn4a1mkndqqbdrr")) ;; Adapt a test to libxml2 2.9.12, taken from this commit: ;; https://github.com/lxml/lxml/commit/852ed1092bd80b6b9a51db24371047e (modules '((guix build utils))) -- cgit 1.4.1 From de29a260082bb35881a6eec2260bb4c8a2d538b3 Mon Sep 17 00:00:00 2001 From: Maxime Devos Date: Sat, 23 Jul 2022 21:08:23 +0200 Subject: guile-fibers: Backport the ‘epoll instance is dead’ bugfix. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes some indeterministic test failures for gnunet-scheme observed while developing gnunet-scheme. The following checks were made: All dependents compile for x86_64: $ ./pre-inst-env guix build shepherd gnunet-scheme guix-build-coordinator nar-herder guix-data-service guile-fibers --system=x86_64-linux Everything except guix-build-coordinator (which depends on the non-cross-compilable sqitch) cross-compile from x86_64 to aarch64-linux-gnu: $ ./pre-inst-env guix build shepherd gnunet-scheme nar-herder guile-fibers --system=x86_64-linux --target=aarch64-linux-gnu I tried testing for reproducibility but the check phase took to long. However, you can compare the hash you get against the hash I got: $ ./pre-inst-env guix hash --serializer=nar $(./pre-inst-env guix build guile-fibers --no-grafts --system=x86_64-linux) 0qsaqx27b6q2s22h7y93417ijpkwl6gc1fhhck8aha6bvmawk5h0 I tried an emulated build for another architecture, but there the tests took overly long. There were no lint warnings for guile-fibers. * gnu/packages/patches/guile-fibers-epoll-instance-is-dead.patch: New patch. * gnu/local.mk (dist_patch_DATA): Register the patch. * gnu/packages/guile-xyz.scm (guile-fibers)[source]{patches}: Use the patch. Signed-off-by: Mathieu Othacehe --- gnu/local.mk | 1 + gnu/packages/guile-xyz.scm | 3 +- .../guile-fibers-epoll-instance-is-dead.patch | 99 ++++++++++++++++++++++ 3 files changed, 102 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/guile-fibers-epoll-instance-is-dead.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 2d32d85d47..882b13420b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1254,6 +1254,7 @@ dist_patch_DATA = \ %D%/packages/patches/guile-ac-d-bus-fix-tests.patch \ %D%/packages/patches/guile-cross-compilation.patch \ %D%/packages/patches/guile-fibers-destroy-peer-schedulers.patch \ + %D%/packages/patches/guile-fibers-epoll-instance-is-dead.patch \ %D%/packages/patches/guile-fibers-wait-for-io-readiness.patch \ %D%/packages/patches/guile-gdbm-ffi-support-gdbm-1.14.patch \ %D%/packages/patches/guile-git-adjust-for-libgit2-1.2.0.patch \ diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index fc6fa37f73..72b4b87d44 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -621,7 +621,8 @@ Unix-style DSV format and RFC 4180 format.") (base32 "0ll63d7202clapg1k4bilbnlmfa4qvpjnsd7chbkka4kxf5klilc")) (patches - (search-patches "guile-fibers-wait-for-io-readiness.patch")))) + (search-patches "guile-fibers-wait-for-io-readiness.patch" + "guile-fibers-epoll-instance-is-dead.patch")))) (build-system gnu-build-system) (native-inputs (list texinfo pkg-config autoconf automake libtool diff --git a/gnu/packages/patches/guile-fibers-epoll-instance-is-dead.patch b/gnu/packages/patches/guile-fibers-epoll-instance-is-dead.patch new file mode 100644 index 0000000000..ba191f765d --- /dev/null +++ b/gnu/packages/patches/guile-fibers-epoll-instance-is-dead.patch @@ -0,0 +1,99 @@ +From 5db4077e9f5166033637d2af9532ec6144b85646 Mon Sep 17 00:00:00 2001 +From: Maxime Devos +Date: Thu, 30 Jun 2022 14:21:47 +0000 +Subject: [PATCH 1/2] Fix behaviour of 'epoll-wake!' after 'run-fibers'. + +This avoids the "epoll instance is dead" error noticed in +GNUnet-Scheme's test suite, as reported at +. +A test is added in the next commit. + +This patch has been applied upstream, but there hasn't been +a new release yet at time of writing. + +* fibers/epoll.scm (epoll-wake!)[dead]: Instead of throwing an error, +just return #t. +--- + fibers/epoll.scm | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/fibers/epoll.scm b/fibers/epoll.scm +index d26db4d..eb63242 100644 +--- a/fibers/epoll.scm ++++ b/fibers/epoll.scm +@@ -1,6 +1,7 @@ + ;; epoll + + ;;;; Copyright (C) 2016 Andy Wingo ++;;;; Copyright (C) 2022 Maxime Devos + ;;;; + ;;;; This library is free software; you can redistribute it and/or + ;;;; modify it under the terms of the GNU Lesser General Public +@@ -135,7 +136,12 @@ epoll wait (if appropriate)." + ('waiting + (primitive-epoll-wake (fileno (epoll-wake-write-pipe epoll)))) + ('not-waiting #t) +- ('dead (error "epoll instance is dead")))) ++ ;; This can happen if a fiber was waiting on a condition and ++ ;; run-fibers completes before the fiber completes and afterwards ++ ;; the condition is signalled. In that case, we don't have to ++ ;; resurrect the fiber or something, we can just do nothing. ++ ;; (Bug report: https://github.com/wingo/fibers/issues/61) ++ ('dead #t))) + + (define (epoll-default-folder fd events seed) + (acons fd events seed)) + +From c01d3853eb56ea4adacc31f51f6e917f8c0abe1c Mon Sep 17 00:00:00 2001 +From: Maxime Devos +Date: Thu, 30 Jun 2022 14:18:36 +0000 +Subject: [PATCH 2/2] Test for issue #61. + +* tests/conditions.scm: Add a test. +--- + tests/conditions.scm | 20 ++++++++++++++++++++ + 1 file changed, 20 insertions(+) + +diff --git a/tests/conditions.scm b/tests/conditions.scm +index 505c42a..179605a 100644 +--- a/tests/conditions.scm ++++ b/tests/conditions.scm +@@ -1,6 +1,7 @@ + ;; Fibers: cooperative, event-driven user-space threads. + + ;;;; Copyright (C) 2016 Free Software Foundation, Inc. ++;;;; Copyright (C) 2022 Maxime Devos + ;;;; + ;;;; This library is free software; you can redistribute it and/or + ;;;; modify it under the terms of the GNU Lesser General Public +@@ -21,6 +22,7 @@ + #:use-module (fibers) + #:use-module (fibers conditions) + #:use-module (fibers operations) ++ #:use-module (fibers scheduler) + #:use-module (fibers timers)) + + (define failed? #f) +@@ -78,4 +80,22 @@ + (wait cv) + #t)) + ++;; Make a condition, wait for it inside a fiber, let the fiber abruptly ++;; terminate and signal the condition afterwards. This tests for the bug ++;; noticed at . ++(assert-equal #t ++ (let ((cv (make-condition))) ++ (run-fibers ++ (lambda () ++ (spawn-fiber (lambda () (wait cv))) ++ (yield-current-task)) ; let the other fiber wait forever ++ ;; This test relies on not draining -- this is the default, ++ ;; but let's make this explicit. ++ #:drain? #false ; ++ ;; For simplicity, disable concurrency and preemption. ++ ;; That way, we can use 'yield-current-task' instead of an ++ ;; arbitrary sleep time. ++ #:hz 0 #:parallelism 1) ++ (signal-condition! cv))) ++ + (exit (if failed? 1 0)) -- cgit 1.4.1 From 25e9bb05da2fdc32dd7b4eec7bf4e4a7c451af8b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 14 Aug 2022 02:00:01 +0200 Subject: gnu: os-prober: Update to 1.81. * gnu/packages/bootloaders.scm (os-prober): Update to 1.81. --- gnu/packages/bootloaders.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index d19cf55bc4..b521b57ecd 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2016, 2017 Danny Milosavljevic ;;; Copyright © 2016, 2017 David Craven ;;; Copyright © 2017, 2018, 2020, 2021, 2022 Efraim Flashner -;;; Copyright © 2018, 2019, 2020, 2021 Tobias Geerinckx-Rice +;;; Copyright © 2018–2022 Tobias Geerinckx-Rice ;;; Copyright © 2019 nee ;;; Copyright © 2019 Mathieu Othacehe ;;; Copyright © 2020 Björn Höfling @@ -1157,14 +1157,14 @@ tools, and more.") (define-public os-prober (package (name "os-prober") - (version "1.80") + (version "1.81") (source (origin (method url-fetch) (uri (string-append "mirror://debian/pool/main/o/os-prober/os-prober_" version ".tar.xz")) (sha256 - (base32 "13z3rshgz5xj0328a80wavdimjw925yha9s1ks398sq0kn5w6qw0")))) + (base32 "10w8jz6mqhp0skdcam9mpgv79vx1sv7lkpra3rqjg0jkhvn2in9g")))) (build-system gnu-build-system) (arguments `(#:modules ((guix build gnu-build-system) -- cgit 1.4.1 From 367b045c5551a11d38ceb816bdee5155b78baea8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 14 Aug 2022 02:00:00 +0200 Subject: gnu: libupnp: Update to 1.14.13. * gnu/packages/upnp.scm (libupnp): Update to 1.14.13. --- gnu/packages/upnp.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/upnp.scm b/gnu/packages/upnp.scm index 5718235109..ba2eb5b416 100644 --- a/gnu/packages/upnp.scm +++ b/gnu/packages/upnp.scm @@ -96,14 +96,14 @@ over IRC, instant messaging, network games, and most server software.") (define-public libupnp (package (name "libupnp") - (version "1.14.12") + (version "1.14.13") (source (origin (method url-fetch) (uri (string-append "https://github.com/pupnp/pupnp/releases/download" "/release-" version "/libupnp-" version".tar.bz2")) (sha256 - (base32 "1b5mnn01cx840paggxrajg63gqzmw8mi4p14jhi9r4qyvam80709")))) + (base32 "0klag10gwrr6yx41v72w1jmyz87wzj1qpdcwv45qzjn53bp7lp82")))) (native-inputs (list pkg-config)) (build-system gnu-build-system) -- cgit 1.4.1 From 3ee8a17effd726d00efb7a2bd28afad1dd14372f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 14 Aug 2022 02:00:01 +0200 Subject: gnu: catfish: Update to 4.16.4. * gnu/packages/xfce.scm (catfish): Update to 4.16.4. --- gnu/packages/xfce.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 02c9b6541c..4f48fb35ba 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2017, 2019 Ricardo Wurmus ;;; Copyright © 2017 Petter ;;; Copyright © 2017 Nikita -;;; Copyright © 2018–2021 Tobias Geerinckx-Rice +;;; Copyright © 2018–2022 Tobias Geerinckx-Rice ;;; Copyright © 2019 Pkill -9 ;;; Copyright © 2019 L p R n d n ;;; Copyright © 2019 Ingo Ruhnke @@ -218,7 +218,7 @@ to share commonly used Xfce widgets among the Xfce applications.") (define-public catfish (package (name "catfish") - (version "4.16.3") + (version "4.16.4") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/apps/" @@ -226,7 +226,7 @@ to share commonly used Xfce widgets among the Xfce applications.") "/catfish-" version ".tar.bz2")) (sha256 (base32 - "1nng7mklrfihgppyxldpssdscl1dzb5z6hyx10akk089s5i9mag9")))) + "1z5m9f4cj473n68rrhhbkq3x5df5k394qp4n27lqqyny6k2h2p3f")))) (build-system python-build-system) (arguments '(#:phases -- cgit 1.4.1 From ab34425e53420c724b7ed1198c76a04198f09eb7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 7 Aug 2022 02:00:00 +0200 Subject: gnu: bird: Update to 2.0.10. * gnu/packages/networking.scm (bird): Update to 2.0.10. --- gnu/packages/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index a65416759e..f088b88c73 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -3756,14 +3756,14 @@ protocol daemons for BGP, IS-IS, LDP, OSPF, PIM, and RIP.") (define-public bird (package (name "bird") - (version "2.0.8") + (version "2.0.10") (source (origin (method url-fetch) (uri (string-append "ftp://bird.network.cz/pub/bird/bird-" version ".tar.gz")) (sha256 (base32 - "1xp7f0im1v8pqqx3xqyfkd1nsxk8vnbqgrdrwnwhg8r5xs1xxlhr")))) + "0npx3zgbjnhm4905zmj2qkz3d13s8hakassq6sbzm1ywv3fl3lvy")))) (inputs (list libssh readline)) (native-inputs -- cgit 1.4.1 From 4985043c7cf8926d7b0b4394ba5e8c7a6f6e545a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 7 Aug 2022 02:00:01 +0200 Subject: gnu: libnftnl: Update to 1.2.3. * gnu/packages/linux.scm (libnftnl): Update to 1.2.3. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index f936dde55a..2c92ade3fa 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -7330,14 +7330,14 @@ re-use code and to avoid re-inventing the wheel.") (define-public libnftnl (package (name "libnftnl") - (version "1.2.2") + (version "1.2.3") (source (origin (method url-fetch) (uri (string-append "mirror://netfilter.org/libnftnl/" "libnftnl-" version ".tar.bz2")) (sha256 - (base32 "02kdxp4l1ds5lpkw6rxv6f7icc70am6ik3p9z5l8v48mkm7h1z4y")))) + (base32 "0m82bmh8i24hwxmz7rxwxjll4904ghd2b1x1p5h8algrg6dyl5p9")))) (build-system gnu-build-system) (native-inputs (list pkg-config)) -- cgit 1.4.1 From 0d92088d5c6477b22b88aad67c2ce1300bb130f0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 7 Aug 2022 02:00:01 +0200 Subject: gnu: nftables: Update to 1.0.5. * gnu/packages/linux.scm (nftables): Update to 1.0.5. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 2c92ade3fa..0a86bc0b43 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -7372,7 +7372,7 @@ used by nftables.") (define-public nftables (package (name "nftables") - (version "1.0.4") + (version "1.0.5") (source (origin (method url-fetch) @@ -7381,7 +7381,7 @@ used by nftables.") (string-append "https://www.nftables.org/projects/nftables" "/files/nftables-" version ".tar.bz2"))) (sha256 - (base32 "0ddsdj6zs78hndffl3iikpa1wzjxcpmr3xqcq4la71gnl7zb2zwj")))) + (base32 "02p59m773l2xqcb7ib7cprlpjfdnp792bahbs6c3dx1s74c4n6wd")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--disable-static" -- cgit 1.4.1 From 39b77ed3aa71a549cb7cb85da4a6cb1426936d8d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 7 Aug 2022 02:00:01 +0200 Subject: gnu: openvpn: Update to 2.5.7. * gnu/packages/vpn.scm (openvpn): Update to 2.5.7. --- gnu/packages/vpn.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index c4e0287bf8..1ec619b0c2 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2014 Eric Bavier ;;; Copyright © 2015 Jeff Mickey ;;; Copyright © 2016, 2017, 2019, 2021, 2022 Efraim Flashner -;;; Copyright © 2016–2021 Tobias Geerinckx-Rice +;;; Copyright © 2016–2022 Tobias Geerinckx-Rice ;;; Copyright © 2017 Julien Lepiller ;;; Copyright © 2018, 2020 Pierre Langlois ;;; Copyright © 2018 Meiyo Peng @@ -794,7 +794,7 @@ this process. It is compatible with Fortinet VPNs.") (define-public openvpn (package (name "openvpn") - (version "2.5.6") + (version "2.5.7") (source (origin (method url-fetch) (uri (string-append @@ -802,7 +802,7 @@ this process. It is compatible with Fortinet VPNs.") version ".tar.gz")) (sha256 (base32 - "0gdd88rcan9vfiwkzsqn6fxxdim7kb1bsxrcra59c5xksprpwfik")))) + "0s1yq530j4i4kicgvsxgl532vyn03gfhlxfdnsb43j05k4w0ld08")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--enable-iproute2=yes"))) -- cgit 1.4.1 From 8e82a70a4f28e1c7df6f1342c54cfff60e69e962 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 7 Aug 2022 02:00:01 +0200 Subject: gnu: noisetorch: Update to 0.12.2. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/pulseaudio.scm (noisetorch): Update to 0.12.2. [source]: Switch to maintained fork. [arguments]: Update all ‘paths’ accordingly. Rename 'symlink-rnnoise phase to 'copy-rnnoise-library and do so. Remove 'gen-version.go phase. Don't explicitly return #f from phases. [home-page]: Update to match SOURCE. --- gnu/packages/pulseaudio.scm | 42 ++++++++++++++++-------------------------- 1 file changed, 16 insertions(+), 26 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/pulseaudio.scm b/gnu/packages/pulseaudio.scm index 1fb64fd8a6..1f2dea5a8c 100644 --- a/gnu/packages/pulseaudio.scm +++ b/gnu/packages/pulseaudio.scm @@ -486,53 +486,43 @@ The plugin is made to work with 1 or 2 channels (ladspa plugin), (define-public noisetorch (package (name "noisetorch") - (version "0.8.3") + (version "0.12.2") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/lawl/NoiseTorch") - (commit version))) + (url "https://github.com/noisetorch/NoiseTorch") + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "115sq4waq048bv82lnq5sblf62m50yvyakx7x06qq359v7qf5ji1")))) + (base32 "1qwzqv4rww9xywkfnjr79489d35cypa1zm9rgm966g51zzwhxrck")))) (build-system go-build-system) (arguments - `(#:import-path "github.com/lawl/NoiseTorch" + `(#:import-path "github.com/noisetorch/NoiseTorch" #:install-source? #f #:phases (modify-phases %standard-phases - (add-after 'unpack 'symlink-rnnoise + (add-after 'unpack 'copy-rnnoise-library (lambda* (#:key inputs #:allow-other-keys) - (with-directory-excursion "src/github.com/lawl/NoiseTorch" - (let ((dir "librnnoise_ladspa/bin/ladspa") - (rnnoise (assoc-ref inputs "rnnoise"))) + (with-directory-excursion "src/github.com/noisetorch/NoiseTorch" + (let ((lib (search-input-file inputs + "lib/ladspa/librnnoise_ladspa.so")) + (dir "c/ladspa")) (mkdir-p dir) - (symlink (string-append rnnoise "/lib/ladspa/librnnoise_ladspa.so") - (string-append dir "/librnnoise_ladspa.so")))) - #t)) - (add-after 'unpack 'gen-version.go - (lambda _ - (with-directory-excursion "src/github.com/lawl/NoiseTorch" - (substitute* "main.go" - (("//go:generate go run scripts/embedversion\\.go") "")) - (with-output-to-file "version.go" - (lambda () - (format #t "package main~%~%var version=~s~&" ,version)))) - #t)) + ;; Symlinking won't work: ‘cannot embed irregular file’! + (copy-file lib (string-append dir "/rnnoise_ladspa.so")))))) (add-after 'unpack 'disable-update-check.go (lambda _ - (with-directory-excursion "src/github.com/lawl/NoiseTorch" + (with-directory-excursion "src/github.com/noisetorch/NoiseTorch" (substitute* "main.go" - ((".*updateCheck.*") ""))) - #t)) + ((".*updateCheck.*") ""))))) (add-before 'build 'go-generate (lambda _ - (with-directory-excursion "src/github.com/lawl/NoiseTorch" + (with-directory-excursion "src/github.com/noisetorch/NoiseTorch" (invoke "go" "generate"))))))) (inputs (list rnnoise)) - (home-page "https://github.com/lawl/NoiseTorch") + (home-page "https://github.com/noisetorch/NoiseTorch") (synopsis "Real-time microphone noise suppression") (description "NoiseTorch creates a virtual PulseAudio microphone that suppresses noise, in any application. Use whichever conferencing or VOIP -- cgit 1.4.1 From 2790d118b2f68e9d3599ccbe5712ddbd1dde3fa4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 7 Aug 2022 02:00:00 +0200 Subject: gnu: noise-suppression-for-voice: Rename from ‘rnnoise’. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is a set of plug-ins *based on* Xiph's rnnoise package (also in Guix). * gnu/packages/pulseaudio.scm (rnnoise): Rename this variable… (noise-suppression-for-voice): …to this. [noisetorch](inputs): Adjust its only user. --- gnu/packages/pulseaudio.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/pulseaudio.scm b/gnu/packages/pulseaudio.scm index 1f2dea5a8c..96ba13d484 100644 --- a/gnu/packages/pulseaudio.scm +++ b/gnu/packages/pulseaudio.scm @@ -450,9 +450,9 @@ only configure local servers, and requires that a special module module-gsettings is loaded in the sound server.") (license l:gpl2))) -(define-public rnnoise +(define-public noise-suppression-for-voice (package - (name "rnnoise") + (name "noise-suppression-for-voice") (version "0.91") (source (origin @@ -472,14 +472,15 @@ module-gsettings is loaded in the sound server.") pulseaudio)) (home-page "https://github.com/werman/noise-suppression-for-voice") (synopsis "Real-time Noise suppression plugin based on Xiph's RNNoise") - (description "The plugin is meant to suppress a wide range of noise -origins: computer fans, office, crowd, airplane, car, train, construction. + (description "This plug-in is meant to suppress a wide range of noise +origins: computer fans, offices, crowds, airplanes, cars, trains, +construction, and more. Mild background noise is always suppressed, loud sounds, like clicking of mechanical keyboard, are suppressed while there is no voice however they are only reduced in volume when voice is present. -The plugin is made to work with 1 or 2 channels (ladspa plugin), +The plug-in is made to work with 1 or 2 channels (LADSPA plugin), 16 bit, 48000 Hz audio input.") (license l:gpl3))) @@ -521,7 +522,7 @@ The plugin is made to work with 1 or 2 channels (ladspa plugin), (with-directory-excursion "src/github.com/noisetorch/NoiseTorch" (invoke "go" "generate"))))))) (inputs - (list rnnoise)) + (list noise-suppression-for-voice)) (home-page "https://github.com/noisetorch/NoiseTorch") (synopsis "Real-time microphone noise suppression") (description "NoiseTorch creates a virtual PulseAudio microphone that -- cgit 1.4.1 From 2388d2d3f7e43d73b0a8a6c1282be16bafb918a7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 7 Aug 2022 02:00:01 +0200 Subject: gnu: rnnoise: Unhide and rename variable. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/xiph.scm (xiph-rnnoise): Rename to… (rnnoise): …this. Adjust all users. [properties]: Remove HIDDEN? property as it is no longer ambiguous. --- gnu/packages/telegram.scm | 2 +- gnu/packages/telephony.scm | 2 +- gnu/packages/xiph.scm | 8 ++------ 3 files changed, 4 insertions(+), 8 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 873ff6246b..4976acbc0c 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -572,7 +572,7 @@ Telegram project, for its use in telegram desktop client.") ("qtwayland" ,qtwayland) ("range-v3" ,range-v3) ("rlottie" ,rlottie-for-telegram-desktop) - ("rnnoise" ,xiph-rnnoise) + ("rnnoise" ,rnnoise) ("tgcalls-source" ,(origin (method git-fetch) diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index 14c7087125..0c12341771 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -650,7 +650,7 @@ address of one of the participants.") speech-dispatcher speex ; avoid bundled speexdsp ; avoid bundled - ;; xiph-rnnoise ; TODO: unbundle rnnoise + ;; rnnoise ; TODO: unbundle rnnoise )) (native-inputs (list pkg-config python qttools-5)) diff --git a/gnu/packages/xiph.scm b/gnu/packages/xiph.scm index aa513d76b0..8bc9c9b087 100644 --- a/gnu/packages/xiph.scm +++ b/gnu/packages/xiph.scm @@ -499,7 +499,7 @@ icecast server. It handles the socket connection, the timing of the data, and prevents bad data from getting to the icecast server.") (license license:gpl2+))) -(define-public xiph-rnnoise +(define-public rnnoise ;; No upstream release (let ((commit "7f449bf8bd3b933891d12c30112268c4090e4d59") (revision "0")) @@ -526,8 +526,4 @@ and prevents bad data from getting to the icecast server.") neural network. The algorithm is described in Jean-Marc Valin's paper @cite{A Hybrid DSP/Deep Learning Approach to Real-Time Full-Band Speech Enhancement}.") - (license license:bsd-3) - (properties - ;; There's no public release and a conflicting package, so hide it for - ;; now. - `((hidden? . #t)))))) + (license license:bsd-3)))) -- cgit 1.4.1 From d248d8b5198076e47915f83acdc21eb76dcbdb62 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 7 Aug 2022 02:00:00 +0200 Subject: gnu: rnnoise: Remove input labels. * gnu/packages/xiph.scm (rnnoise)[native-inputs]: Remove input labels. --- gnu/packages/xiph.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xiph.scm b/gnu/packages/xiph.scm index 8bc9c9b087..dffad299e9 100644 --- a/gnu/packages/xiph.scm +++ b/gnu/packages/xiph.scm @@ -517,9 +517,7 @@ and prevents bad data from getting to the icecast server.") "0y8jdvxd9namw4f9hcmcmm2q0f32mnhfyjap8906hl308cws3rkj")))) (build-system gnu-build-system) (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("libtool" ,libtool))) + (list autoconf automake libtool)) (home-page "https://gitlab.xiph.org/xiph/rnnoise") (synopsis "Real-time noise suppression") (description "RNNoise is a noise suppression library based on a recurrent -- cgit 1.4.1 From c3c2dfdb5e8e4210382c8e822e392044ade2ee63 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 15 Aug 2022 17:52:58 +0200 Subject: gnu: plink-ng: Build sources from 2.0 directory * gnu/packages/bioinformatics.scm (plink-ng)[arguments]: Disable tests; adjust make flags; enter 2.0 directory in 'chdir phase; replace 'install phase. [inputs]: Add zstd:lib. --- gnu/packages/bioinformatics.scm | 51 +++++++++++++++++++++-------------------- 1 file changed, 26 insertions(+), 25 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 801c9e1642..38b9fe6cf6 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -6276,36 +6276,37 @@ subsequent visualization, annotation and storage of results.") (base32 "0m8wkyvbgvcr5kzc284w8fbhpxwglh2c1xq0yc3yv00a53gs7rv0")))) (build-system gnu-build-system) (arguments - `(#:make-flags - ,#~(list "BLASFLAGS=-llapack -lopenblas" - (string-append "CFLAGS=-Wall -O2 -DDYNAMIC_ZLIB=1" - " -I" (search-input-directory - %build-inputs "include/simde")) - "ZLIB=-lz" - "BIN=plink prettify" - (string-append "CC=" #$(cc-for-target)) - (string-append "PREFIX=" #$output) - "DESTDIR=") - #:phases - (modify-phases %standard-phases + (list + #:tests? #false ;TEST_EXTRACT_CHR doesn't produce expected files + #:make-flags + #~(list "BLASFLAGS=-llapack -lopenblas" + "NO_SSE42=1" + "NO_AVX2=1" + "STATIC_ZSTD=" + (string-append "CC=" #$(cc-for-target)) + (string-append "PREFIX=" #$output) + "DESTDIR=") + #:phases + '(modify-phases %standard-phases (add-after 'unpack 'chdir - (lambda _ (chdir "1.9"))) - (delete 'configure) ; no "configure" script + (lambda _ (chdir "2.0/build_dynamic"))) + (delete 'configure) ; no "configure" script (replace 'check (lambda* (#:key tests? inputs #:allow-other-keys) (when tests? - (symlink "plink" "plink19") - (symlink (search-input-file inputs "/bin/plink") "plink107") (setenv "PATH" (string-append (getcwd) ":" (getenv "PATH"))) - (with-directory-excursion "tests" - ;; The model test fails because of a 0.0001 difference. - (substitute* "tests.py" - (("diff -q test1.model test2.model") - "echo yes")) - (invoke "bash" "test_setup.sh") - (invoke "python3" "tests.py")))))))) - (inputs - (list lapack openblas zlib)) + (with-directory-excursion "../Tests" + (substitute* "run_tests.sh" + (("^./run_tests" m) + (string-append (which "bash") " " m))) + (invoke "bash" "run_tests.sh"))))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (install-file "plink2" + (string-append + (assoc-ref outputs "out") "/bin"))))))) + (inputs + (list lapack openblas zlib `(,zstd "lib"))) (native-inputs (list diffutils plink python simde)) ; for tests (home-page "https://www.cog-genomics.org/plink/") -- cgit 1.4.1 From 73eca39df7cc14a9fd078b9117769ebe2f224ab7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 14 Aug 2022 02:00:01 +0200 Subject: gnu: mu: Update to 1.8.9. * gnu/packages/mail.scm (mu): Update to 1.8.9. [arguments]: Adjust the 'patch-bin-references phase accordingly. --- gnu/packages/mail.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 9b2fe87fa4..b4b3162fff 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1160,7 +1160,7 @@ security functionality including PGP, S/MIME, SSH, and SSL.") (define-public mu (package (name "mu") - (version "1.8.8") + (version "1.8.9") (source (origin (method git-fetch) (uri (git-reference @@ -1169,7 +1169,7 @@ security functionality including PGP, S/MIME, SSH, and SSL.") (file-name (git-file-name name version)) (sha256 (base32 - "1wfvssfd3fqgncs9jrysr4gsflb6l5m819imijj49k1s0dwj82wj")))) + "1anpv49242qpayziz111rzznkmfgkd2a9y5xda6xhmzhqdhx79h2")))) (build-system meson-build-system) (native-inputs (list pkg-config @@ -1194,7 +1194,7 @@ security functionality including PGP, S/MIME, SSH, and SSL.") "mu/tests/test-mu-query.cc") (("/bin/sh") (which "sh"))) (substitute* '("lib/tests/bench-indexer.cc" - "lib/utils/mu-utils.cc") + "lib/utils/mu-test-utils.cc") (("/bin/rm") (which "rm"))))) (add-after 'install 'install-emacs-autoloads (lambda* (#:key outputs #:allow-other-keys) -- cgit 1.4.1 From 97386910fb0cc5e63e7f7d55d7f50a315884ab60 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 14 Aug 2022 02:00:00 +0200 Subject: gnu: encodings: Update to 1.0.6. * gnu/packages/xorg.scm (encodings): Update to 1.0.6. --- gnu/packages/xorg.scm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index ea89d87fe0..32289e0f57 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -450,16 +450,14 @@ Resources file.") (define-public encodings (package (name "encodings") - (version "1.0.5") + (version "1.0.6") (source (origin (method url-fetch) - (uri (string-append - "mirror://xorg/individual/font/encodings-" - version - ".tar.bz2")) + (uri (string-append "mirror://xorg/individual/font/encodings-" + version ".tar.xz")) (sha256 - (base32 "0caafx0yqqnqyvbalxhh3mb0r9v36xmcy5zjhygb2i508dhy35mx")))) + (base32 "09pwhj8arm9hx0819m1yykaw9n77lxavaq4gn4iacd8zcvg03qvp")))) (build-system gnu-build-system) (inputs (list mkfontscale)) -- cgit 1.4.1 From 1e969dafb7d004ae3405cc2de3669e1c97000ce0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 15 Aug 2022 16:44:09 +0200 Subject: gnu: libreoffice: Remove obsolete workaround. * gnu/packages/libreoffice.scm (libreoffice)[arguments]: Don't pass LDFLAGS. --- gnu/packages/libreoffice.scm | 2 -- 1 file changed, 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index aeefba732b..54ee4b4ca8 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -1253,8 +1253,6 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.") (dirname (search-input-file %build-inputs "lib/libboost_system.so"))) - ;; Avoid undefined symbols required by boost::spirit - "LDFLAGS=-lboost_system" ;; Avoid a dependency on ucpp. "--with-idlc-cpp=cpp" ;; The fonts require an external tarball (crosextrafonts). -- cgit 1.4.1 From 7e0116740b8d93ccd0d6d760dc89cbdc65598119 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 15 Aug 2022 22:13:53 +0200 Subject: gnu: python-mypy: Update to 0.971. * gnu/packages/patches/python-mypy-12332.patch, gnu/packages/patches/python-mypy-use-sys-path.patch: Delete files. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/python-check.scm (python-mypy): Update to 0.971. [source](patches): Remove. [arguments]: Skip one test. --- gnu/local.mk | 2 - gnu/packages/patches/python-mypy-12332.patch | 68 ----------- .../patches/python-mypy-use-sys-path.patch | 130 --------------------- gnu/packages/python-check.scm | 12 +- 4 files changed, 6 insertions(+), 206 deletions(-) delete mode 100644 gnu/packages/patches/python-mypy-12332.patch delete mode 100644 gnu/packages/patches/python-mypy-use-sys-path.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 882b13420b..4e4ad908ce 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1731,8 +1731,6 @@ dist_patch_DATA = \ %D%/packages/patches/python-versioneer-guix-support.patch \ %D%/packages/patches/python-waitress-fix-tests.patch \ %D%/packages/patches/python-werkzeug-tests.patch \ - %D%/packages/patches/python-mypy-12332.patch \ - %D%/packages/patches/python-mypy-use-sys-path.patch \ %D%/packages/patches/python-zeep-Fix-pytest_httpx-test-cases.patch \ %D%/packages/patches/qemu-build-info-manual.patch \ %D%/packages/patches/qemu-glibc-2.27.patch \ diff --git a/gnu/packages/patches/python-mypy-12332.patch b/gnu/packages/patches/python-mypy-12332.patch deleted file mode 100644 index d43cf42ed1..0000000000 --- a/gnu/packages/patches/python-mypy-12332.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 518c864805dd93e62d59439e665a0ce9d6778419 Mon Sep 17 00:00:00 2001 -From: Ekin Dursun -Date: Thu, 10 Mar 2022 22:06:48 +0300 -Subject: [PATCH] mypyc: Fix overflow in id function (CPyTagged_Id) - -In CPython, the id of an object is its address. It's computed by -converting the pointer to an unsigned integer (PyLong_FromVoidPtr). A -similar logic is present here, pointer is converted to a Py_ssize_t and -CPyTagged_FromSsize_t is called with that integer. - -There is a problem with that approach: Py_ssize_t cannot hold every -pointer value. Sometimes overflow happens and CPyTagged_FromSsize_t is -called with a negative integer. - -With the new approach, the number is checked: If it fits in a -Py_ssize_t, CPyTagged_FromSsize_t is called. If not, it is directly -converted to a PyObject using PyLong_FromVoidPtr. ---- - mypyc/lib-rt/CPy.h | 1 + - mypyc/lib-rt/int_ops.c | 9 +++++++++ - mypyc/lib-rt/misc_ops.c | 2 +- - 3 files changed, 11 insertions(+), 1 deletion(-) - -diff --git a/mypyc/lib-rt/CPy.h b/mypyc/lib-rt/CPy.h -index 987819154ab..9f5ae52d4e4 100644 ---- a/mypyc/lib-rt/CPy.h -+++ b/mypyc/lib-rt/CPy.h -@@ -121,6 +121,7 @@ static inline size_t CPy_FindAttrOffset(PyTypeObject *trait, CPyVTableItem *vtab - - - CPyTagged CPyTagged_FromSsize_t(Py_ssize_t value); -+CPyTagged CPyTagged_FromVoidPtr(void *ptr); - CPyTagged CPyTagged_FromObject(PyObject *object); - CPyTagged CPyTagged_StealFromObject(PyObject *object); - CPyTagged CPyTagged_BorrowFromObject(PyObject *object); -diff --git a/mypyc/lib-rt/int_ops.c b/mypyc/lib-rt/int_ops.c -index 1275f2c1057..edf06314161 100644 ---- a/mypyc/lib-rt/int_ops.c -+++ b/mypyc/lib-rt/int_ops.c -@@ -26,6 +26,15 @@ CPyTagged CPyTagged_FromSsize_t(Py_ssize_t value) { - } - } - -+CPyTagged CPyTagged_FromVoidPtr(void *ptr) { -+ if ((uintptr_t)ptr > PY_SSIZE_T_MAX) { -+ PyObject *object = PyLong_FromVoidPtr(ptr); -+ return ((CPyTagged)object) | CPY_INT_TAG; -+ } else { -+ return CPyTagged_FromSsize_t((Py_ssize_t)ptr); -+ } -+} -+ - CPyTagged CPyTagged_FromObject(PyObject *object) { - int overflow; - // The overflow check knows about CPyTagged's width -diff --git a/mypyc/lib-rt/misc_ops.c b/mypyc/lib-rt/misc_ops.c -index cebd1cf997f..dcce89d9072 100644 ---- a/mypyc/lib-rt/misc_ops.c -+++ b/mypyc/lib-rt/misc_ops.c -@@ -437,7 +437,7 @@ CPyPickle_GetState(PyObject *obj) - } - - CPyTagged CPyTagged_Id(PyObject *o) { -- return CPyTagged_FromSsize_t((Py_ssize_t)o); -+ return CPyTagged_FromVoidPtr(o); - } - - #define MAX_INT_CHARS 22 diff --git a/gnu/packages/patches/python-mypy-use-sys-path.patch b/gnu/packages/patches/python-mypy-use-sys-path.patch deleted file mode 100644 index 1b12526456..0000000000 --- a/gnu/packages/patches/python-mypy-use-sys-path.patch +++ /dev/null @@ -1,130 +0,0 @@ -This patch fixes the annotation files search of mypy on non-FHS distributions. - -Submitted upstream: https://github.com/python/mypy/pull/12530 - -diff --git a/mypy/main.py b/mypy/main.py -index 3d9836587..f9b0cbd39 100644 ---- a/mypy/main.py -+++ b/mypy/main.py -@@ -1033,10 +1033,10 @@ def process_options(args: List[str], - # Set target. - if special_opts.modules + special_opts.packages: - options.build_type = BuildType.MODULE -- egg_dirs, site_packages = get_site_packages_dirs(options.python_executable) -+ site_packages = get_site_packages_dirs(options.python_executable) - search_paths = SearchPaths((os.getcwd(),), - tuple(mypy_path() + options.mypy_path), -- tuple(egg_dirs + site_packages), -+ tuple(site_packages), - ()) - targets = [] - # TODO: use the same cache that the BuildManager will -diff --git a/mypy/modulefinder.py b/mypy/modulefinder.py -index 94d2dd34c..337a2d59b 100644 ---- a/mypy/modulefinder.py -+++ b/mypy/modulefinder.py -@@ -629,7 +629,7 @@ def get_prefixes(python_executable: Optional[str]) -> Tuple[str, str]: - - - @functools.lru_cache(maxsize=None) --def get_site_packages_dirs(python_executable: Optional[str]) -> Tuple[List[str], List[str]]: -+def get_site_packages_dirs(python_executable: Optional[str]) -> List[str]: - """Find package directories for given python. - - This runs a subprocess call, which generates a list of the egg directories, and the site -@@ -648,51 +648,7 @@ def get_site_packages_dirs(python_executable: Optional[str]) -> Tuple[List[str], - site_packages = ast.literal_eval( - subprocess.check_output([python_executable, pyinfo.__file__, 'getsitepackages'], - stderr=subprocess.PIPE).decode()) -- return expand_site_packages(site_packages) -- -- --def expand_site_packages(site_packages: List[str]) -> Tuple[List[str], List[str]]: -- """Expands .pth imports in site-packages directories""" -- egg_dirs: List[str] = [] -- for dir in site_packages: -- if not os.path.isdir(dir): -- continue -- pth_filenames = sorted(name for name in os.listdir(dir) if name.endswith(".pth")) -- for pth_filename in pth_filenames: -- egg_dirs.extend(_parse_pth_file(dir, pth_filename)) -- -- return egg_dirs, site_packages -- -- --def _parse_pth_file(dir: str, pth_filename: str) -> Iterator[str]: -- """ -- Mimics a subset of .pth import hook from Lib/site.py -- See https://github.com/python/cpython/blob/3.5/Lib/site.py#L146-L185 -- """ -- -- pth_file = os.path.join(dir, pth_filename) -- try: -- f = open(pth_file, "r") -- except OSError: -- return -- with f: -- for line in f.readlines(): -- if line.startswith("#"): -- # Skip comment lines -- continue -- if line.startswith(("import ", "import\t")): -- # import statements in .pth files are not supported -- continue -- -- yield _make_abspath(line.rstrip(), dir) -- -- --def _make_abspath(path: str, root: str) -> str: -- """Take a path and make it absolute relative to root if not already absolute.""" -- if os.path.isabs(path): -- return os.path.normpath(path) -- else: -- return os.path.join(root, os.path.normpath(path)) -+ return site_packages - - - def add_py2_mypypath_entries(mypypath: List[str]) -> List[str]: -@@ -781,7 +737,7 @@ def compute_search_paths(sources: List[BuildSource], - if options.python_version[0] == 2: - mypypath = add_py2_mypypath_entries(mypypath) - -- egg_dirs, site_packages = get_site_packages_dirs(options.python_executable) -+ site_packages = get_site_packages_dirs(options.python_executable) - base_prefix, prefix = get_prefixes(options.python_executable) - is_venv = base_prefix != prefix - for site_dir in site_packages: -@@ -801,7 +757,7 @@ def compute_search_paths(sources: List[BuildSource], - - return SearchPaths(python_path=tuple(reversed(python_path)), - mypy_path=tuple(mypypath), -- package_path=tuple(egg_dirs + site_packages), -+ package_path=tuple(site_packages), - typeshed_path=tuple(lib_path)) - - -diff --git a/mypy/pyinfo.py b/mypy/pyinfo.py -index ab2d3286b..9fb0501a1 100644 ---- a/mypy/pyinfo.py -+++ b/mypy/pyinfo.py -@@ -24,16 +24,11 @@ def getprefixes(): - - def getsitepackages(): - # type: () -> List[str] -- res = [] -- if hasattr(site, 'getsitepackages'): -- res.extend(site.getsitepackages()) - -- if hasattr(site, 'getusersitepackages') and site.ENABLE_USER_SITE: -- res.insert(0, site.getusersitepackages()) -- else: -- from distutils.sysconfig import get_python_lib -- res = [get_python_lib()] -- return res -+ # Simply return sys.path, which has already been expanded -+ # correctly via Python's site.py module, which takes care of .pth, -+ # sitecustomize.py files, etc. -+ return sys.path - - - if __name__ == '__main__': diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm index e196f2eccb..7cc266fbce 100644 --- a/gnu/packages/python-check.scm +++ b/gnu/packages/python-check.scm @@ -1771,7 +1771,7 @@ supported by the MyPy typechecker.") (define-public python-mypy (package (name "python-mypy") - (version "0.942") + (version "0.971") (source (origin ;; Because of https://github.com/python/mypy/issues/9584, the @@ -1788,10 +1788,7 @@ supported by the MyPy typechecker.") (file-name (git-file-name name version)) (sha256 (base32 - "0hxnrqhvskiclwfj2s4gyfclzjas1dvpfxhyng8v7mq38rqps1j5")) - (patches - (search-patches "python-mypy-12332.patch" - "python-mypy-use-sys-path.patch")))) + "0i8swdynms1wpiprgqn24za6mx8rlgxr2jash3cb5xi8jyf58n97")))) (build-system python-build-system) (arguments `(#:phases @@ -1799,7 +1796,10 @@ supported by the MyPy typechecker.") (replace 'check (lambda* (#:key tests? #:allow-other-keys) (when tests? - (invoke "pytest" "mypyc"))))))) + (invoke "pytest" "-vv" "mypyc" + ;; XXX: This test gets an unexpected DeprecationWarning + ;; from recent versions of setuptools. Ignore for now. + "-k" "not testImports"))))))) (native-inputs (list python-attrs python-lxml -- cgit 1.4.1 From 389ae75a37b4238c8efa8577cd860e37e35a961e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 15 Aug 2022 22:23:13 +0200 Subject: gnu: python-lz4: Update to 4.0.2. * gnu/packages/python-compression.scm (python-lz4): Update to 4.0.2. [native-inputs]: Remove PYTHON-NOSE. Add PYTHON-PKGCONFIG and PYTHON-PSUTIL. [arguments]: Override check phase. --- gnu/packages/python-compression.scm | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-compression.scm b/gnu/packages/python-compression.scm index edfa974a71..12c172c0bc 100644 --- a/gnu/packages/python-compression.scm +++ b/gnu/packages/python-compression.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2017 Julien Lepiller ;;; Copyright © 2018, 2019, 2020 Efraim Flashner ;;; Copyright © 2020 Nicolas Goaziou -;;; Copyright © 2020 Marius Bakke +;;; Copyright © 2020, 2022 Marius Bakke ;;; Copyright © 2021 Brendan Tildesley ;;; ;;; This file is part of GNU Guix. @@ -230,14 +230,14 @@ Python strings.") (define-public python-lz4 (package (name "python-lz4") - (version "0.10.1") + (version "4.0.2") (source (origin (method url-fetch) (uri (pypi-uri "lz4" version)) (sha256 (base32 - "0ghv1xbaq693kgww1x9c22bplz479ls9szjsaa4ig778ls834hm0")) + "16vj2bnhhdkcz2a2ai2mx2kf9ngx1cjr18636yp1514kq9r72fq8")) (modules '((guix build utils))) (snippet '(begin @@ -245,8 +245,18 @@ Python strings.") (delete-file-recursively "lz4libs") #t)))) (build-system python-build-system) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + ;; Taken from tox.ini (excludes experimental tests). + (invoke "pytest" "-vv" "tests/block" "tests/frame"))))))) (native-inputs - (list pkg-config python-nose python-setuptools-scm)) + (list pkg-config python-pytest python-pkgconfig python-setuptools-scm + ;; For tests. + python-psutil)) (inputs (list lz4)) (home-page "https://github.com/python-lz4/python-lz4") -- cgit 1.4.1 From 46cb02c7cbd4ab1b89f24844d7889ab8a30d9e38 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 15 Aug 2022 23:24:11 +0200 Subject: gnu: python-radon: Permit newer versions of mando. * gnu/packages/python-xyz.scm (python-radon)[arguments]: Add setup.py substitution. --- gnu/packages/python-xyz.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 95507971b2..85dfc3c3e0 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -19837,6 +19837,8 @@ while only declaring the test-specific fields.") (substitute* "setup.py" ((".*'future'.*") "") + (("mando>=0\\.6,<0\\.7") + "mando>=0.6") (("colorama==0.4.1") "colorama>=0.4.1")))) (replace 'check -- cgit 1.4.1 From faea55669fd5f9a680190e8c630ea54bc6d9732b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 15 Aug 2022 23:17:04 +0200 Subject: gnu: python-mando: Update to 0.7.1. * gnu/packages/python-xyz.scm (python-mando): Update to 0.7.1. [arguments]: Override check phase. --- gnu/packages/python-xyz.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 85dfc3c3e0..d183196e10 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -19503,14 +19503,21 @@ builds partial trees by inspecting living objects.") (define-public python-mando (package (name "python-mando") - (version "0.6.4") + (version "0.7.1") (source (origin (method url-fetch) (uri (pypi-uri "mando" version)) (sha256 (base32 - "0q6rl085q1hw1wic52pqfndr0x3nirbxnhqj9akdm5zhq2fv3zkr")))) + "001mikga36i811pbc95rb45m2kzivkx4xb0fn3pzl4xnnjcskfhq")))) (build-system python-build-system) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "pytest" "-vv"))))))) (propagated-inputs (list python-rst2ansi python-six)) (native-inputs -- cgit 1.4.1 From a038bfc48140ecf58e592540dbf7b567e7051c23 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 15 Aug 2022 23:35:07 +0200 Subject: gnu: python-booleanoperations: Add missing input. * gnu/packages/graphics.scm (python-booleanoperations)[native-inputs]: Add PYTHON-SETUPTOOLS-SCM. --- gnu/packages/graphics.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages') diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 51177dc966..1d6dd28c5c 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -879,6 +879,7 @@ basic geometries.") (native-inputs (list python-defcon-bootstrap python-fontpens-bootstrap + python-setuptools-scm python-pytest python-wheel unzip)) -- cgit 1.4.1 From 5f2c529a592725df5a314cc9724869c658a3e6bc Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 16 Aug 2022 00:16:13 +0200 Subject: gnu: python-fontparts: Add missing input. * gnu/packages/fontutils.scm (python-fontparts-bootstrap)[native-inputs]: Add PYTHON-SETUPTOOLS-SCM. --- gnu/packages/fontutils.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index ce4709773d..f9742d024f 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -497,7 +497,7 @@ implementing the pen protocol for manipulating glyphs.") python-defcon-bootstrap python-fontmath python-fonttools)) - (native-inputs (list unzip)) + (native-inputs (list python-setuptools-scm unzip)) (home-page "https://github.com/robotools/fontParts") (synopsis "Library for interacting with font parts") (description "FontParts is an @acronym{API, Application Programming -- cgit 1.4.1 From b74744fee605393608f8798bf1bceecce78540d2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 16 Aug 2022 00:18:53 +0200 Subject: gnu: python-ufoprocessor: Add missing input. * gnu/packages/fontutils.scm (python-ufoprocessor)[native-inputs]: Add PYTHON-SETUPTOOLS-SCM. --- gnu/packages/fontutils.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index f9742d024f..78f23dae5f 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -734,7 +734,7 @@ paths (intersection, union, difference, xor).") python-fontparts python-fonttools python-mutatormath)) - (native-inputs (list unzip)) + (native-inputs (list python-setuptools-scm unzip)) (home-page "https://github.com/LettError/ufoProcessor") (synopsis "Process and generate @acronym{UFO, Unified Font Object} files") (description "This Python package processes and generates instances for -- cgit 1.4.1 From 46b3fb82f8e585ad2f80e25b3ceb581a5fbe8b9a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 16 Aug 2022 00:22:01 +0200 Subject: gnu: python-afdko: Add missing input. * gnu/packages/fontutils.scm (python-afdko)[native-inputs]: Add PYTHON-SETUPTOOLS-SCM. --- gnu/packages/fontutils.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index 78f23dae5f..d03703b2fc 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -195,7 +195,8 @@ them as it goes.") `("PATH" prefix (,bindir)))) commands))))))) (native-inputs - (list ninja python-pytest python-scikit-build python-wheel)) + (list ninja python-pytest python-scikit-build python-setuptools-scm + python-wheel)) (inputs (list java-antlr4-runtime-cpp `(,util-linux "lib"))) (propagated-inputs (list psautohint -- cgit 1.4.1 From 90ec03cae3866fc531da5b390b3ad47ccdc4514f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 16 Aug 2022 00:28:11 +0200 Subject: gnu: python-ufo2ft: Add missing input. * gnu/packages/fontutils.scm (python-ufo2ft)[native-inputs]: Add PYTHON-SETUPTOOLS-SCM. --- gnu/packages/fontutils.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index d03703b2fc..da324a6a9d 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -390,7 +390,8 @@ converts any cubic curves to quadratic. The most useful function is probably (sha256 (base32 "0a6iq5g6qdxj7nvip8nnf0mf8y5wmpd3wwq0dv7d4nm9bjrh0r6m")))) (build-system python-build-system) - (native-inputs (list python-pytest python-pytest-runner)) + (native-inputs + (list python-pytest python-pytest-runner python-setuptools-scm)) (propagated-inputs (list python-booleanoperations python-cffsubr -- cgit 1.4.1 From 715a5efc4993450a36950f739144c210b56659bd Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 15 Aug 2022 23:30:59 +0200 Subject: gnu: python-pyclipper: Update to 1.3.0.post3. * gnu/packages/python-xyz.scm (python-pyclipper): Update to 1.3.0.post3. [source](uri): Use tarball instead of zipball. [source](snippet): Adjust for renamed file. [arguments]: Likewise. [propagated-inputs]: Remove. [native-inputs]: Remove PYTHON-UNITTEST2 and UNZIP. Add PYTHON-SETUPTOOLS-SCM. --- gnu/packages/python-xyz.scm | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index d183196e10..71c9614242 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -20922,31 +20922,29 @@ Rust Python extensions implemented with @code{PyO3} or @code{rust-cpython}.") (define-public python-pyclipper (package (name "python-pyclipper") - (version "1.1.0.post3") + (version "1.3.0.post3") (source (origin (method url-fetch) - (uri (pypi-uri "pyclipper" version ".zip")) + (uri (pypi-uri "pyclipper" version)) (sha256 - (base32 "164yksvqwqvwzh8f8lq92asg87hd8rvcy2xb5vm4y4ccvd5xgb7i")) + (base32 "0vqzbmq2di1jaj6230m5i1ld0mg6wdb1c6r6i5zli54varavr7v3")) (modules '((guix build utils))) (snippet '(begin ;; This file is generated by Cython. - (delete-file "pyclipper/pyclipper.cpp") #t)))) + (delete-file "src/pyclipper/_pyclipper.cpp") #t)))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases (add-before 'build 'cythonize-sources (lambda _ - (with-directory-excursion "pyclipper" - (invoke "cython" "--cplus" "pyclipper.pyx"))))))) - (propagated-inputs - (list python-setuptools-scm-git-archive)) + (with-directory-excursion "src/pyclipper" + (invoke "cython" "--cplus" "_pyclipper.pyx"))))))) (native-inputs - (list python-cython python-pytest python-pytest-runner - python-unittest2 unzip)) + (list python-cython python-setuptools-scm + python-pytest python-pytest-runner)) (home-page "https://github.com/greginvm/pyclipper") (synopsis "Wrapper for Angus Johnson's Clipper library") (description -- cgit 1.4.1 From 24834c27227866e895076d448f375ddfe5318e20 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 15 Aug 2022 23:40:29 +0200 Subject: gnu: python-pymysql: Remove unused input. * gnu/packages/databases.scm (python-pymysql)[native-inputs]: Remove PYTHON-UNITTEST2. --- gnu/packages/databases.scm | 2 -- 1 file changed, 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 7e9a1400c2..cb76752639 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1517,8 +1517,6 @@ CSV, DB3, iXF, SQLite, MS-SQL or MySQL to PostgreSQL.") (sha256 (base32 "1ry8lxgdc1p3k7gbw20r405jqi5lvhi5wk83kxdbiv8xv3f5kh6q")))) (build-system python-build-system) - (native-inputs - (list python-unittest2)) (inputs (list python-cryptography)) (arguments -- cgit 1.4.1 From d23a04e52e390f5e666b7e8204f92220d4d05f6f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 15 Aug 2022 23:41:35 +0200 Subject: gnu: python-pyu2f: Remove unused inputs. * gnu/packages/python-crypto.scm (python-pyu2f)[native-inputs]: Remove. --- gnu/packages/python-crypto.scm | 5 ----- 1 file changed, 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index f4e01198f5..5569f54841 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -1610,11 +1610,6 @@ can also encrypt and decrypt messages using RSA and ECDH.") (build-system python-build-system) (arguments '(#:tests? #f)) ;none included (propagated-inputs (list python-six)) - (native-inputs - (list python-mock - python-pyfakefs - python-pytest - python-unittest2)) (home-page "https://github.com/google/pyu2f/") (synopsis "U2F host library for interacting with a U2F device over USB") (description -- cgit 1.4.1 From afdcd036898aae9a8012d94ad7ec8bf376cb4ab5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 15 Aug 2022 23:43:19 +0200 Subject: gnu: python-posix-ipc: Remove unused input. * gnu/packages/python-xyz.scm (python-posix-ipc)[native-inputs]: Remove. --- gnu/packages/python-xyz.scm | 2 -- 1 file changed, 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 71c9614242..51df69c8a3 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -29826,8 +29826,6 @@ fashion.") (substitute* "prober.py" (("cmd = .cc") (string-append "cmd = \"" #$(cc-for-target))))))))) - (native-inputs - (list python-unittest2)) (home-page "http://semanchuk.com/philip/posix_ipc/") (synopsis "POSIX IPC primitives for Python") (description -- cgit 1.4.1 From b38df69c2c3352feacebbf5dd2c63a0fb3b4f9f9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 15 Aug 2022 23:45:10 +0200 Subject: gnu: python-case: Remove unused input. * gnu/packages/python-xyz.scm (python-case)[propagated-inputs]: Remove PYTHON-UNITTEST2. --- gnu/packages/python-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 51df69c8a3..9f0deb99d8 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -2414,7 +2414,7 @@ for additional processing.") "1cagg06vfph864s6l5jb0zqliwxh647bki8j6lf4a4qrv40jnhs8")))) (build-system python-build-system) (propagated-inputs - (list python-mock python-nose python-six python-unittest2)) + (list python-mock python-nose python-six)) (native-inputs (list python-coverage)) (home-page "https://github.com/celery/case") -- cgit 1.4.1 From 302b3cdca348ab2fed7a5abe17a48cb7ade94ce1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 15 Aug 2022 23:49:39 +0200 Subject: gnu: python-daemon: Remove unused input. * gnu/packages/python-xyz.scm (python-daemon)[native-inputs]: Remove PYTHON-UNITTEST2. --- gnu/packages/python-xyz.scm | 1 - 1 file changed, 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 9f0deb99d8..3259f46881 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -4232,7 +4232,6 @@ logging and tracing of the execution.") (list python-lockfile)) (native-inputs (list python-coverage - python-unittest2 python-testtools python-testscenarios python-twine -- cgit 1.4.1 From ace7b5babe118adb9caf116eb8273f7db6e7f152 Mon Sep 17 00:00:00 2001 From: "(" Date: Sat, 6 Aug 2022 10:13:31 +0100 Subject: gnu: terminals: Deprecate wterm. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit `wterm` no longer works with modern Wayland, and has been unmaintained since early 2021. See issue #52029. * gnu/packages/terminals.scm (wterm): Deprecate in favour of `foot`. Signed-off-by: 宋文武 --- gnu/packages/terminals.scm | 56 ++-------------------------------------------- 1 file changed, 2 insertions(+), 54 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 1b08ec4979..7f9764fa75 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -31,6 +31,7 @@ ;;; Copyright © 2021 Solene Rapenne ;;; Copyright © 2021 Petr Hodina ;;; Copyright © 2022 Felipe Balbi +;;; Copyright © 2022 ( ;;; ;;; This file is part of GNU Guix. ;;; @@ -1303,60 +1304,7 @@ while also supporting native scrolling and @command{tmux} control mode (license license:asl2.0))) (define-public wterm - (package - (name "wterm") - (version "0.7") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/majestrate/wterm") - (commit "0ae42717c08a85a6509214e881422c7fbe7ecc45"))) - (sha256 - (base32 - "0g4lzmc1w6na81i6hny32xds4xfig4xzswzfijyi6p93a1226dv0")) - (file-name (git-file-name name version)))) - (build-system gnu-build-system) - (native-inputs - (list pkg-config)) - (inputs - `(("fontconfig" ,fontconfig) - ("freetype" ,freetype) - ("libdrm" ,libdrm) - ("libxkbcommon" ,libxkbcommon) - ("ncurses" ,ncurses) - ("pixman" ,pixman) - ("wayland" ,wayland))) - (arguments - '(#:tests? #f - - ;; Without -j1 it fails to find file libwld.a. - #:parallel-build? #f - - #:make-flags (list "CC=gcc" - (string-append "PREFIX=" %output) - (string-append "TERMINFO=" - (assoc-ref %outputs "out") - "/share/terminfo")) - #:phases - (modify-phases %standard-phases - (delete 'configure) - (add-after 'unpack 'terminfo-fix - (lambda _ - (substitute* "Makefile" - (("\ttic .*") "\tmkdir -p $(SHARE_PREFIX)/share/terminfo -\ttic -o $(SHARE_PREFIX)/share/terminfo -s wterm.info\n")) - #t))))) - (native-search-paths - (list (search-path-specification - (variable "TERMINFO_DIRS") - (files '("share/terminfo"))))) - (home-page "https://github.com/majestrate/wterm") - (synopsis "Terminal emulator for Wayland") - (description "wterm is a native Wayland terminal emulator based on -an st fork using wld. st is a simple terminal emulator for X originally -made by suckless.") - (license license:x11))) + (deprecated-package "wterm" foot)) (define-public tio (package -- cgit 1.4.1 From 0598b5d14370fc9e015a3c45effb07758179aa3f Mon Sep 17 00:00:00 2001 From: Andrew Tropin Date: Sat, 6 Aug 2022 17:04:40 +0300 Subject: gnu: emacs-geiser-guile: Update guile input to guile-3.0-latest. * gnu/packages/emacs-xyz.scm (emacs-geiser-guile)[inputs]: Update guile to guile-3.0-latest. --- gnu/packages/emacs-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 14904aa5aa..811e293c1d 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -328,7 +328,7 @@ e.g. emacs-geiser-guile for Guile.") (("\\(geiser-activate-implementation .*\\)" all) (string-append "(eval-after-load 'geiser-impl '" all ")")))))))) - (inputs (list guile-3.0)) + (inputs (list guile-3.0-latest)) (propagated-inputs (list emacs-geiser)) (home-page "https://www.nongnu.org/geiser/") (synopsis "Guile Scheme support for Geiser") -- cgit 1.4.1 From 752be79bf3b0f8de886304f8280e68b9584cafa7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 16 Aug 2022 10:22:34 +0200 Subject: gnu: htseq: Update to 2.0.2. * gnu/packages/bioinformatics.scm (htseq): Update to 2.0.2. [source]: Fetch from git repository. [arguments]: Delete 'build phase; run tests with pytest in 'check phase. [propagated-inputs]: Add python-matplotlib and python-pysam. [inputs]: Remove python-matplotlib and python-pysam. [native-inputs]: Add python-pandas, python-pytest, python-scipy, and swig. [synopsis]: Update. [description]: Update. --- gnu/packages/bioinformatics.scm | 46 ++++++++++++++++++++++++++++------------- 1 file changed, 32 insertions(+), 14 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 38b9fe6cf6..9c18737ade 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -3985,26 +3985,44 @@ HMMs).") (define-public htseq (package (name "htseq") - (version "0.12.3") + (version "2.0.2") + ;; Sources on pypi do not include everything needed to run the tests. (source (origin - (method url-fetch) - (uri (pypi-uri "HTSeq" version)) + (method git-fetch) + (uri (git-reference + (url "https://github.com/htseq/htseq") + (commit (string-append "release_" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "0pk41vkzxsbb5nv644325mh8akmz4zdply9r2s80dgg5b21pgp0b")))) + "1kbr4ydjjhizz6r5m3xd4f0wj7qnn8zs0vnzghhgaa0yhbya5r19")))) (build-system python-build-system) - (native-inputs - (list python-cython)) - ;; Numpy needs to be propagated when htseq is used as a Python library. + (arguments + (list + #:phases + '(modify-phases %standard-phases + ;; Avoid rebuilding the extension. Everything is built during the + ;; 'install phase anyway. + (delete 'build) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "pytest" "-v"))))))) (propagated-inputs - (list python-numpy)) - (inputs - (list python-pysam python-matplotlib)) - (home-page "https://htseq.readthedocs.io/") - (synopsis "Analysing high-throughput sequencing data with Python") + (list python-matplotlib + python-numpy + python-pysam)) + (native-inputs + (list python-cython + python-pandas + python-pytest + python-scipy + swig)) + (home-page "https://github.com/htseq") + (synopsis "Framework for analyzing high-throughput sequencing data") (description - "HTSeq is a Python package that provides infrastructure to process data -from high-throughput sequencing assays.") + "This package provides a framework to process and analyze data from +high-throughput sequencing (HTS) assays") (license license:gpl3+))) (define-public java-htsjdk -- cgit 1.4.1 From a60412019e532dcdf1c74d17ac614ef9e074a5ce Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 16 Aug 2022 11:06:19 +0200 Subject: gnu: Add python-sqlitedict. * gnu/packages/databases.scm (python-sqlitedict): New variable. --- gnu/packages/databases.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index cb76752639..837d31f946 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -699,6 +699,38 @@ auto-completion and syntax highlighting.") \"special\", or \"backslash commands\") on PostgreSQL.") (license license:bsd-3))) +(define-public python-sqlitedict + (package + (name "python-sqlitedict") + (version "2.0.0") + (source (origin + (method url-fetch) + (uri (pypi-uri "sqlitedict" version)) + (sha256 + (base32 + "05sxy016k3p5sjjhdg0ad9z15i6vm3rq4cr9m8nrc7jfdx0p18r3")))) + (build-system python-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "pytest" "-vv" + "-k" + ;; No idea why these fail. + (string-append "not test_py24_error" + " and not test_tablenames")))))))) + (native-inputs (list python-pytest)) + (home-page "https://github.com/piskvorky/sqlitedict") + (synopsis "Persistent dict backed up by sqlite3 and pickle") + (description + "This package provides a lightweight wrapper around the sqlite3 database +with a simple, Pythonic @code{dict}-like interface and support for +multi-thread access.") + (license license:asl2.0))) + (define-public pgcli (package (name "pgcli") -- cgit 1.4.1 From 9c2400c28272b7354608f0c727e1f483db190719 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 16 Aug 2022 15:06:53 +0200 Subject: gnu: Add python-taggd. * gnu/packages/bioinformatics.scm (python-taggd): New variable. --- gnu/packages/bioinformatics.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 9c18737ade..518a904922 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -6449,6 +6449,43 @@ Values such as sequence name, sequence description, sequence quality and the sequence itself can be retrieved from these databases.") (license license:bsd-3))) +(define-public python-taggd + (package + (name "python-taggd") + (version "0.3.6") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/SpatialTranscriptomicsResearch/taggd") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0j19ah81z7aqrdljah9hyarp91gvgbk63pz6fz3pdpksy1yqyi6k")) + (modules '((guix build utils))) + (snippet + '(for-each delete-file + (find-files "taggd" "\\.c$"))))) + (build-system python-build-system) + (arguments + (list + #:phases + '(modify-phases %standard-phases + (add-after 'unpack 'disable-broken-tests + (lambda _ + (substitute* "tests/taggd_demultiplex_test.py" + (("def test_normal_bam_run") + "def _disabled_test_normal_bam_run"))))))) + (propagated-inputs + (list python-numpy python-pysam python-setuptools)) + (native-inputs + (list python-cython)) + (home-page "https://github.com/SpatialTranscriptomicsResearch/taggd") + (synopsis "Genetic barcode demultiplexing") + (description "This package provides TagGD barcode demultiplexing utilities +for Spatial Transcriptomics data.") + (license license:bsd-3))) + (define-public sra-tools (package (name "sra-tools") -- cgit 1.4.1 From 872e17ddc1308e26c3e7216000f456196520e000 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 16 Aug 2022 15:20:36 +0200 Subject: gnu: Add stpipeline. * gnu/packages/bioinformatics.scm (stpipeline): New variable. --- gnu/packages/bioinformatics.scm | 43 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 518a904922..86c35f8177 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -6486,6 +6486,49 @@ sequence itself can be retrieved from these databases.") for Spatial Transcriptomics data.") (license license:bsd-3))) +(define-public stpipeline + (package + (name "stpipeline") + (version "1.8.1") + (source (origin + (method url-fetch) + (uri (pypi-uri "stpipeline" version)) + (sha256 + (base32 + "0har2g42fvaqpiz66lincy86aj1hvwzds26kxhxfamvyvv4721wk")))) + (build-system python-build-system) + (arguments + (list + #:phases + '(modify-phases %standard-phases + (add-after 'unpack 'relax-requirements + (lambda _ + (substitute* "requirements.txt" + (("argparse.*") ""))))))) + (propagated-inputs + (list htseq + python-cython + python-invoke + python-numpy + python-pandas + python-pympler + python-pysam + python-regex + python-scikit-learn + python-scipy + python-seaborn + python-setuptools + python-sqlitedict + python-taggd + samtools + star)) + (home-page "https://github.com/SpatialTranscriptomicsResearch/st_pipeline") + (synopsis "Pipeline for spatial mapping of unique transcripts") + (description + "This package provides an automated pipeline for spatial mapping of +unique transcripts.") + (license license:expat))) + (define-public sra-tools (package (name "sra-tools") -- cgit 1.4.1 From 2b4dcc477b0046e741bb0735a62370c05aaf9254 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 16 Aug 2022 16:09:54 +0200 Subject: gnu: Add go-github-com-biogo-graph. * gnu/packages/bioinformatics.scm (go-github-com-biogo-graph): New variable. --- gnu/packages/bioinformatics.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 86c35f8177..5eefb2a807 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -16429,3 +16429,28 @@ alignment algorithm. It completes MashMap with a high-performance alignment module capable of computing base-level alignments for very large sequences.") (home-page "https://github.com/ekg/wfmash") (license license:expat))) + +(define-public go-github-com-biogo-graph + (package + (name "go-github-com-biogo-graph") + (version "0.0.0-20150317020928-057c1989faed") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/biogo/graph") + (commit (go-version->git-ref version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1kpzs5dfd5dsk4mg1g2qjz1prqd84ixhrcxxnf90hq25vxcnk7lh")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/biogo/graph" + #:tests? #false)) ;TODO: one of 13 tests fails for unknown reasons + (propagated-inputs + (list go-gopkg-in-check-v1)) + (home-page "https://github.com/biogo/graph") + (synopsis "Undirected graph analysis for biogo") + (description "The package @code{graph} implements graph manipulation +functions.") + (license license:bsd-3))) -- cgit 1.4.1 From a33ee9bd51c16bac2dceb7b17e258c5f3c3c89e5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 16 Aug 2022 16:18:31 +0200 Subject: gnu: Add go-github-com-biogo-store-interval. * gnu/packages/bioinformatics.scm (go-github-com-biogo-store-interval): New variable. --- gnu/packages/bioinformatics.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 5eefb2a807..8d29f8d55c 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -16454,3 +16454,30 @@ module capable of computing base-level alignments for very large sequences.") (description "The package @code{graph} implements graph manipulation functions.") (license license:bsd-3))) + +(define-public go-github-com-biogo-store-interval + (package + (name "go-github-com-biogo-store-interval") + (version "0.0.0-20201120204734-aad293a2328f") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/biogo/store") + (commit (go-version->git-ref version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0skizrp1j6vgbl0g1kmh73picagqlvwckaqs0gkl6rai5lckxj8a")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/biogo/store/interval" + #:unpack-path "github.com/biogo/store")) + (propagated-inputs + (list go-gopkg-in-check-v1 + go-github-com-kr-pretty)) + (home-page "https://github.com/biogo/store") + (synopsis "Interval store type for biogo") + (description + "The @code{store} package provides a number of data store types that are +useful for bioinformatic analysis.") + (license license:bsd-3))) -- cgit 1.4.1 From 5fae9e158d26e133ff4ec8b224636a312fc3eff1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 16 Aug 2022 16:18:40 +0200 Subject: gnu: Add go-github-com-biogo-store-kdtree. * gnu/packages/bioinformatics.scm (go-github-com-biogo-store-kdtree): New variable. --- gnu/packages/bioinformatics.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 8d29f8d55c..aab17152dd 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -16481,3 +16481,15 @@ functions.") "The @code{store} package provides a number of data store types that are useful for bioinformatic analysis.") (license license:bsd-3))) + +(define-public go-github-com-biogo-store-kdtree + (package + (inherit go-github-com-biogo-store-interval) + (name "go-github-com-biogo-store-kdtree") + (arguments + '(#:import-path "github.com/biogo/store/kdtree" + #:unpack-path "github.com/biogo/store")) + (propagated-inputs + (list go-gopkg-in-check-v1 + go-github-com-kr-pretty)) + (synopsis "kdtree store type for biogo"))) -- cgit 1.4.1 From c42745ba39840f73ca363b38a3ab5e9ba9488560 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 16 Aug 2022 16:18:48 +0200 Subject: gnu: Add go-github-com-biogo-store-llrb. * gnu/packages/bioinformatics.scm (go-github-com-biogo-store-llrb): New variable. --- gnu/packages/bioinformatics.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index aab17152dd..8b11969de1 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -16493,3 +16493,15 @@ useful for bioinformatic analysis.") (list go-gopkg-in-check-v1 go-github-com-kr-pretty)) (synopsis "kdtree store type for biogo"))) + +(define-public go-github-com-biogo-store-llrb + (package + (inherit go-github-com-biogo-store-interval) + (name "go-github-com-biogo-store-llrb") + (arguments + '(#:import-path "github.com/biogo/store/llrb" + #:unpack-path "github.com/biogo/store")) + (propagated-inputs + (list go-gopkg-in-check-v1 + go-github-com-kr-pretty)) + (synopsis "LLRB store for biogo"))) -- cgit 1.4.1 From 2345cd49de2592e87a0bc700654b47fde3cc52d0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 16 Aug 2022 16:18:57 +0200 Subject: gnu: Add go-github-com-biogo-store-step. * gnu/packages/bioinformatics.scm (go-github-com-biogo-store-step): New variable. --- gnu/packages/bioinformatics.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 8b11969de1..d4fc46b95b 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -16505,3 +16505,15 @@ useful for bioinformatic analysis.") (list go-gopkg-in-check-v1 go-github-com-kr-pretty)) (synopsis "LLRB store for biogo"))) + +(define-public go-github-com-biogo-store-step + (package + (inherit go-github-com-biogo-store-interval) + (name "go-github-com-biogo-store-step") + (arguments + '(#:import-path "github.com/biogo/store/step" + #:unpack-path "github.com/biogo/store")) + (propagated-inputs + (list go-gopkg-in-check-v1 + go-github-com-kr-pretty)) + (synopsis "Step store for biogo"))) -- cgit 1.4.1 From b986325b13619f1e9b98e3ecf042bff71852b2b3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 16 Aug 2022 16:23:04 +0200 Subject: gnu: Add go-github-com-biogo-hts-bam. * gnu/packages/bioinformatics.scm (go-github-com-biogo-hts-bam): New variable. --- gnu/packages/bioinformatics.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index d4fc46b95b..a551fc8fd1 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -16517,3 +16517,27 @@ useful for bioinformatic analysis.") (list go-gopkg-in-check-v1 go-github-com-kr-pretty)) (synopsis "Step store for biogo"))) + +(define-public go-github-com-biogo-hts-bam + (package + (name "go-github-com-biogo-hts-bam") + (version "1.4.3") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/biogo/hts") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "013ga6ilc4m3hyfr3yyiva9g4vs81afhj73v2sy7r75b5zxw7lx1")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/biogo/hts/bam" + #:unpack-path "github.com/biogo/hts")) + (propagated-inputs + (list go-gopkg-in-check-v1)) + (home-page "https://github.com/biogo/hts") + (synopsis "HTS BAM module for biogo") + (description "This package provides tools for handling BAM files.") + (license license:bsd-3))) -- cgit 1.4.1 From 4645a5d3f6d542b55e3687581730f687c2c8dfdd Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 16 Aug 2022 16:23:56 +0200 Subject: gnu: Add go-github-com-biogo-hts-sam. * gnu/packages/bioinformatics.scm (go-github-com-biogo-hts-sam): New variable. --- gnu/packages/bioinformatics.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index a551fc8fd1..3918a4f0a9 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -16541,3 +16541,15 @@ useful for bioinformatic analysis.") (synopsis "HTS BAM module for biogo") (description "This package provides tools for handling BAM files.") (license license:bsd-3))) + +(define-public go-github-com-biogo-hts-sam + (package + (inherit go-github-com-biogo-hts-bam) + (name "go-github-com-biogo-hts-sam") + (arguments + '(#:import-path "github.com/biogo/hts/sam" + #:unpack-path "github.com/biogo/hts")) + (propagated-inputs + (list go-gopkg-in-check-v1)) + (synopsis "HTS SAM module for biogo") + (description "This package provides tools for handling SAM files."))) -- cgit 1.4.1 From bb162a51036a4c1d13a94ae248f62f6ef4956978 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 16 Aug 2022 16:25:09 +0200 Subject: gnu: Add go-github-com-biogo-hts-tabix. * gnu/packages/bioinformatics.scm (go-github-com-biogo-hts-tabix): New variable. --- gnu/packages/bioinformatics.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 3918a4f0a9..3ec3adb393 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -16553,3 +16553,15 @@ useful for bioinformatic analysis.") (list go-gopkg-in-check-v1)) (synopsis "HTS SAM module for biogo") (description "This package provides tools for handling SAM files."))) + +(define-public go-github-com-biogo-hts-tabix + (package + (inherit go-github-com-biogo-hts-bam) + (name "go-github-com-biogo-hts-tabix") + (arguments + '(#:import-path "github.com/biogo/hts/tabix" + #:unpack-path "github.com/biogo/hts")) + (propagated-inputs + (list go-gopkg-in-check-v1)) + (synopsis "HTS Tabix module for biogo") + (description "This package provides tools for handling Tabix files."))) -- cgit 1.4.1 From e9bec5bd40865b377b1961ef2ee3b498a7c4752f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 16 Aug 2022 16:28:33 +0200 Subject: gnu: Add go-github-com-biogo-hts-bgzf. * gnu/packages/bioinformatics.scm (go-github-com-biogo-hts-bgzf): New variable. --- gnu/packages/bioinformatics.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 3ec3adb393..9c34f4a721 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -16565,3 +16565,15 @@ useful for bioinformatic analysis.") (list go-gopkg-in-check-v1)) (synopsis "HTS Tabix module for biogo") (description "This package provides tools for handling Tabix files."))) + +(define-public go-github-com-biogo-hts-bgzf + (package + (inherit go-github-com-biogo-hts-bam) + (name "go-github-com-biogo-hts-bgzf") + (arguments + '(#:import-path "github.com/biogo/hts/bgzf" + #:unpack-path "github.com/biogo/hts")) + (propagated-inputs + (list go-gopkg-in-check-v1)) + (synopsis "HTS bgzf module for biogo") + (description "This package provides tools for handling bgzf files."))) -- cgit 1.4.1 From ecb7dedaed49b57ad5a6e53f5a0c4f6b4000fa51 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 16 Aug 2022 16:44:42 +0200 Subject: gnu: Add go-github-com-kortschak-utter. * gnu/packages/golang.scm (go-github-com-kortschak-utter): New variable. --- gnu/packages/golang.scm | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 1ce55875d8..d2f3dc39df 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -23,7 +23,7 @@ ;;; Copyright © 2020 Marius Bakke ;;; Copyright © 2020 raingloom ;;; Copyright © 2020 Martin Becze -;;; Copyright © 2021 Ricardo Wurmus +;;; Copyright © 2021, 2022 Ricardo Wurmus ;;; Copyright © 2021 Guillaume Le Vaillant ;;; Copyright © 2021 Sharlatan Hellseher ;;; Copyright © 2021 Sarah Morgensen @@ -1142,6 +1142,29 @@ different output targets. Supports colors and text decoration to all popular terminals.") (license license:bsd-3))) +(define-public go-github-com-kortschak-utter + (package + (name "go-github-com-kortschak-utter") + (version "1.5.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/kortschak/utter") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "13lg8gzvgjnljf1lz8qsfz3qcmbvrsxp3ip7mp2kscfz07r69dyw")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/kortschak/utter")) + (home-page "https://github.com/kortschak/utter") + (synopsis "Deep pretty printer") + (description + "This package implements a deep pretty printer for Go data structures to +aid data snapshotting.") + (license license:isc))) + (define-public go-github-com-shadowsocks-go-shadowsocks2 (package (name "go-github-com-shadowsocks-go-shadowsocks2") -- cgit 1.4.1 From b4f389e1b9a3b994b4442aae46f9daa151eeadba Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 16 Aug 2022 16:44:58 +0200 Subject: gnu: Add go-github-com-biogo-hts-cram. * gnu/packages/bioinformatics.scm (go-github-com-biogo-hts-cram): New variable. --- gnu/packages/bioinformatics.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 9c34f4a721..14ca65f875 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -16577,3 +16577,18 @@ useful for bioinformatic analysis.") (list go-gopkg-in-check-v1)) (synopsis "HTS bgzf module for biogo") (description "This package provides tools for handling bgzf files."))) + +(define-public go-github-com-biogo-hts-cram + (package + (inherit go-github-com-biogo-hts-bam) + (name "go-github-com-biogo-hts-cram") + (arguments + '(#:import-path "github.com/biogo/hts/cram" + #:unpack-path "github.com/biogo/hts" + #:tests? #false)) ;require network access + (propagated-inputs + (list go-gopkg-in-check-v1 + go-github.com-ulikunitz-xz + go-github-com-kortschak-utter)) + (synopsis "HTS CRAM module for biogo") + (description "This package provides tools for handling CRAM files."))) -- cgit 1.4.1 From 31e0ac6dcfa2749223a1354acd088c5567ec3a01 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 16 Aug 2022 16:50:01 +0200 Subject: gnu: Add go-github-com-biogo-hts-csi. * gnu/packages/bioinformatics.scm (go-github-com-biogo-hts-csi): New variable. --- gnu/packages/bioinformatics.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 14ca65f875..3b3266f96a 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -16592,3 +16592,16 @@ useful for bioinformatic analysis.") go-github-com-kortschak-utter)) (synopsis "HTS CRAM module for biogo") (description "This package provides tools for handling CRAM files."))) + +(define-public go-github-com-biogo-hts-csi + (package + (inherit go-github-com-biogo-hts-bam) + (name "go-github-com-biogo-hts-csi") + (arguments + '(#:import-path "github.com/biogo/hts/csi" + #:unpack-path "github.com/biogo/hts")) + (propagated-inputs + (list go-gopkg-in-check-v1)) + (synopsis "Coordinate sorted indexing for biogo") + (description "This package implements CSIv1 and CSIv2 coordinate sorted +indexing."))) -- cgit 1.4.1 From 2407416d0fd430beb72b6a2ca2a59aa15ab00d9e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 16 Aug 2022 16:50:16 +0200 Subject: gnu: Add go-github-com-biogo-hts-fai. * gnu/packages/bioinformatics.scm (go-github-com-biogo-hts-fai): New variable. --- gnu/packages/bioinformatics.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 3b3266f96a..d34be4cb6b 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -16605,3 +16605,16 @@ useful for bioinformatic analysis.") (synopsis "Coordinate sorted indexing for biogo") (description "This package implements CSIv1 and CSIv2 coordinate sorted indexing."))) + +(define-public go-github-com-biogo-hts-fai + (package + (inherit go-github-com-biogo-hts-bam) + (name "go-github-com-biogo-hts-fai") + (arguments + '(#:import-path "github.com/biogo/hts/fai" + #:unpack-path "github.com/biogo/hts")) + (propagated-inputs + (list go-gopkg-in-check-v1)) + (synopsis "Fasta sequence file index handling for biogo") + (description "This package implements FAI fasta sequence file index +handling."))) -- cgit 1.4.1 From 8aab1f7c73c3a6e204b1257e687120c009c88604 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 16 Aug 2022 16:52:15 +0200 Subject: gnu: Add go-github-com-biogo-biogo. * gnu/packages/bioinformatics.scm (go-github-com-biogo-biogo): New variable. --- gnu/packages/bioinformatics.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index d34be4cb6b..e29c3b6372 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -16618,3 +16618,33 @@ indexing."))) (synopsis "Fasta sequence file index handling for biogo") (description "This package implements FAI fasta sequence file index handling."))) + +(define-public go-github-com-biogo-biogo + (package + (name "go-github-com-biogo-biogo") + (version "1.0.4") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/biogo/biogo") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0ali1mqf3dc26myv6l7wmqfr8i25461rbq3qdad8s0wi29622199")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/biogo/biogo")) + (propagated-inputs + (list go-gopkg-in-check-v1 + go-github-com-biogo-store-interval + go-github-com-biogo-store-kdtree + go-github-com-biogo-store-llrb + go-github-com-biogo-store-step + go-github-com-biogo-hts-bam + go-github-com-biogo-graph)) + (home-page "https://github.com/biogo/biogo") + (synopsis "Bioinformatics library for Go") + (description + "Bíogo is a bioinformatics library for the Go language.") + (license license:bsd-3))) -- cgit 1.4.1 From f41d75b75cc6bc11c21a6240c288e63ad6fe2dbd Mon Sep 17 00:00:00 2001 From: Pierre-Henry Fröhring Date: Mon, 8 Aug 2022 10:24:05 +0200 Subject: gnu: Add emacs-mini-frame. * gnu/packages/emacs-xyz.scm (emacs-mini-frame): New variable. Signed-off-by: Liliana Marie Prikler --- gnu/packages/emacs-xyz.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 811e293c1d..4462805ddd 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -14962,6 +14962,31 @@ letter of Pinyin to Simplified/Traditional Chinese characters.") methods from a given list.") (license license:gpl3+))) +(define-public emacs-mini-frame + (let ((commit "60838f3cab438dcbda8eaa15ab3e5d1af88910e9") + (revision "0")) + (package + (name "emacs-mini-frame") + (version (git-version "1.19" revision commit)) + (source + (origin + (uri (git-reference + (url "https://github.com/muffinmad/emacs-mini-frame.git") + (commit commit))) + (method git-fetch) + (sha256 + (base32 "0q01iymz657bg3mcmq7vcl8r0ypsa1pqj1p6gxs7ywx1d33lan4d")) + (file-name (git-file-name name version)))) + (build-system emacs-build-system) + (home-page "https://github.com/muffinmad/emacs-mini-frame") + (synopsis "Show minibuffer in child frame") + (description + "@dfn{mini-frame-mode} adds an advice around @code{read-from-minibuffer} +to show the minibuffer as a child frame on top of the current frame. +@code{find-file} and similar functions associated mini-buffers may appear at +the center of the screen and not at the bottom.") + (license license:gpl3+)))) + (define-public emacs-posframe (package (name "emacs-posframe") -- cgit 1.4.1 From 0193f9dd0304b90b4dfaebc0eb775187258e6fab Mon Sep 17 00:00:00 2001 From: jgart Date: Wed, 20 Jul 2022 00:12:27 -0500 Subject: gnu: Add cl-string-pokemonize. * gnu/packages/lisp-xyz.scm (cl-string-pokemonize): New variable. Signed-off-by: Liliana Marie Prikler --- gnu/packages/lisp-xyz.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 03e474831d..cdd4d479ac 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -22665,6 +22665,38 @@ the Processing language and shares some of the API.") (define-public ecl-sketch (sbcl-package->ecl-package sbcl-sketch)) +(define-public sbcl-string-pokemonize + (let ((commit "2dc01643defb497e4d1eb833def71dfc1e8d5da6") + (revision "0")) + (package + (name "sbcl-string-pokemonize") + (version (git-version "20210503" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/phoe/string-pokemonize") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1zk5klc94pxv7mhx6qrp93rk4ypwd6wfijap7gf9l0wpphg90r9x")))) + (build-system asdf-build-system/sbcl) + (arguments + `(#:tests? #f ; There are no tests. + #:asd-systems '("string-pokemonize"))) + (synopsis "Alternate upper- and lowercase") + (description + "@code{string-pokemonize} provides a function that alternates uppercase +and lowercase characters for a given string.") + (home-page "https://github.com/phoe/string-pokemonize") + (license license:expat)))) + +(define-public cl-string-pokemonize + (sbcl-package->cl-source-package sbcl-string-pokemonize)) + +(define-public ecl-string-pokemonize + (sbcl-package->ecl-package sbcl-string-pokemonize)) + (define-public sbcl-binary-types (let ((commit "9ec42042a50403961c08179a892ae3de725b1d7a")) (package -- cgit 1.4.1 From 195567304a56f11efbb2663ddc71f7fd406cb9d1 Mon Sep 17 00:00:00 2001 From: Jonathan Brielmaier Date: Tue, 16 Aug 2022 23:02:20 +0200 Subject: gnu: lttng-ust: Update source hash. This was forgotten in eca0227239c7ca52a2a3f4eed82b546899d57fec. * gnu/packages/instrumentation.scm (lttng-ust)[source]: Correct the hash. --- gnu/packages/instrumentation.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/instrumentation.scm b/gnu/packages/instrumentation.scm index f7f6ab7ba7..4bdded26bf 100644 --- a/gnu/packages/instrumentation.scm +++ b/gnu/packages/instrumentation.scm @@ -241,7 +241,7 @@ many probes which instrument numerous interesting parts of Linux.") "lttng-ust-" version ".tar.bz2")) (sha256 (base32 - "1p7d94r275yvby6zqfxaswdl1q46zxbc8x5rkhnjxrp1d41byrsn")))) + "0vwgxp027pgwm0a4xr6bdibday7xjlnv6wmbqh546l2h2i8jzi1c")))) (build-system gnu-build-system) (inputs (list numactl)) -- cgit 1.4.1 From e6a75d013d61e52b075ead7de0a30634e0ff0683 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Tue, 16 Aug 2022 23:57:21 +0200 Subject: gnu: lttng-tools: Update the hash. This is a follow-up of c53a5e7dc3153443cab5ac8ce7ff9d935785fe44. * gnu/packages/instrumentation.scm (lttng-tools)[source]: Update it. --- gnu/packages/instrumentation.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/instrumentation.scm b/gnu/packages/instrumentation.scm index 4bdded26bf..2d2f53225c 100644 --- a/gnu/packages/instrumentation.scm +++ b/gnu/packages/instrumentation.scm @@ -267,7 +267,7 @@ to ring buffers shared with a consumer daemon.") "lttng-tools-" version ".tar.bz2")) (sha256 (base32 - "1gfp9y24lpaiz4lcmbp30yd400jmh99mlay9gb8pz9qd080bmlnf")))) + "13gh4bvlgbh82h9vb80aw8l1cfmdj3xyvjg30cscz9vqy7l04yni")))) (build-system gnu-build-system) (arguments `( ;; FIXME - Currently there's a segmentation fault by swig when enabling -- cgit 1.4.1 From cee96b6c4127b26ea4d4ce1068ff815e7fb9b445 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 14 Aug 2022 02:00:01 +0200 Subject: gnu: cpuid: Update to 20220812. * gnu/packages/linux.scm (cpuid): Update to 20220812. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 0a86bc0b43..fb8b4fa5a8 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -7884,14 +7884,14 @@ available in the kernel Linux.") (define-public cpuid (package (name "cpuid") - (version "20220620") + (version "20220812") (source (origin (method url-fetch) (uri (string-append "http://www.etallen.com/cpuid/cpuid-" version ".src.tar.gz")) (sha256 (base32 - "06nb69vlv1szdzq1dp784pgbr9z2py050v1hlrn4rr56jp0a2nci")))) + "1gss85szv4b48d93d6hzkkzggicdvw8dijiwfs84ywclgnwqzxiv")))) (build-system gnu-build-system) (arguments (list #:make-flags -- cgit 1.4.1 From 8bd30dd207eeb49054ceef09245ee790ca9470b0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 14 Aug 2022 02:00:01 +0200 Subject: gnu: ldns: Update to 1.8.3. * gnu/packages/dns.scm (ldns): Update to 1.8.3. --- gnu/packages/dns.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index 673723369a..50068c8c35 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -140,7 +140,7 @@ protocol.") (define-public ldns (package (name "ldns") - (version "1.8.1") + (version "1.8.3") (source (origin (method url-fetch) @@ -148,7 +148,7 @@ protocol.") (string-append "https://www.nlnetlabs.nl/downloads/" "ldns/ldns-" version ".tar.gz")) (sha256 - (base32 "18vzdmyg9bm45janw602d4hifjsncrv143awlwcslfjdrsmjk0lm")) + (base32 "0q3q1svyxpj2g5wdkfy1ndb14m9fzffwyskflpihfabb0g8jvxy3")) (patches (search-patches ;; To create make-flag variables, -- cgit 1.4.1 From dbfadac3618f655b8352532b7f903445fc7e8f56 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 14 Aug 2022 02:00:00 +0200 Subject: gnu: fio: Update to 3.31. * gnu/packages/benchmark.scm (fio): Update to 3.31. --- gnu/packages/benchmark.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/benchmark.scm b/gnu/packages/benchmark.scm index 7be932f528..1b036e9bd4 100644 --- a/gnu/packages/benchmark.scm +++ b/gnu/packages/benchmark.scm @@ -72,14 +72,14 @@ (define-public fio (package (name "fio") - (version "3.30") + (version "3.31") (source (origin (method url-fetch) (uri (string-append "https://brick.kernel.dk/snaps/" "fio-" version ".tar.bz2")) (sha256 (base32 - "1qjivkisn7dxk8irrb0rglmmdpbnai6n7vindf18ln0j24cc1x56")))) + "03x0n18f2wsyjh6qv57kvgqcwga54rzngwzr6fzlrjsalqw7mxlp")))) (build-system gnu-build-system) (arguments (list #:modules -- cgit 1.4.1 From ed0266fcaeb120155950eacbf264c389de187a37 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 14 Aug 2022 02:00:02 +0200 Subject: gnu: font-gnu-unifont: Update to 14.0.04. * gnu/packages/fonts.scm (font-gnu-unifont): Update to 14.0.04. --- gnu/packages/fonts.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 20b55bce96..18ec0814bd 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -821,7 +821,7 @@ for use at smaller text sizes"))) (define-public font-gnu-unifont (package (name "font-gnu-unifont") - (version "14.0.03") + (version "14.0.04") (source (origin (method url-fetch) @@ -831,7 +831,7 @@ for use at smaller text sizes"))) (string-append "mirror://gnu/unifont/unifont-" version "/unifont-" version ".tar.gz"))) (sha256 - (base32 "1swzwh355ipqhm3vvy7005fqawydlcdbkxm3h04vhicahp8hl06l")))) + (base32 "1fzycjxmgnq77r2s5914w1phg3qdwwnwa6p3zyfa1cscrxy52phz")))) (build-system gnu-build-system) (outputs '("out" ; TrueType version "pcf" ; PCF (bitmap) version -- cgit 1.4.1 From 160de94418f255b217670a58eee4350e0f73848d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 14 Aug 2022 02:00:02 +0200 Subject: gnu: dhewm3: Update to 1.5.2. * gnu/packages/game-development.scm (dhewm3): Update to 1.5.2. [arguments]: Don't explicitly return #t from phases. [inputs]: Remove libjpeg-turbo, libogg, and libvorbis. --- gnu/packages/game-development.scm | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 3e0301a199..1c94480092 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -2651,7 +2651,7 @@ game engine. id Tech 2 is the engine originally behind Quake 2.") (define-public dhewm3 (package (name "dhewm3") - (version "1.5.1") + (version "1.5.2") (source (origin (method url-fetch) (uri (string-append @@ -2659,7 +2659,7 @@ game engine. id Tech 2 is the engine originally behind Quake 2.") version "/dhewm3-" version "-src.tar.xz")) (sha256 (base32 - "0s2brx6wyljhjbpli97iy4lc4fqqsvdc09raz8njg0vgzcsiyrri")))) + "10p0w1x5wx9b7d8mzvb6yqjia9prhkjwz04vbvphy8p383r33am6")))) (build-system cmake-build-system) (arguments `(#:tests? #f ; No tests. @@ -2667,13 +2667,9 @@ game engine. id Tech 2 is the engine originally behind Quake 2.") (modify-phases %standard-phases (add-after 'unpack 'change-to-build-dir (lambda _ - (chdir "neo") - #t))))) + (chdir "neo")))))) (inputs `(("curl" ,curl) - ("libjpeg" ,libjpeg-turbo) - ("libogg" ,libogg) - ("libvorbis" ,libvorbis) ("libx11" ,libx11) ("openal" ,openal) ("sdl2" ,sdl2) -- cgit 1.4.1 From 05377d567660c21ad4cdcd9a454f7acef8218381 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 14 Aug 2022 02:00:00 +0200 Subject: gnu: dhewm3: Remove input labels. * gnu/packages/game-development.scm (dhewm3)[inputs]: Remove input labels. --- gnu/packages/game-development.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 1c94480092..7f05d8ed06 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -2669,11 +2669,11 @@ game engine. id Tech 2 is the engine originally behind Quake 2.") (lambda _ (chdir "neo")))))) (inputs - `(("curl" ,curl) - ("libx11" ,libx11) - ("openal" ,openal) - ("sdl2" ,sdl2) - ("zlib" ,zlib))) + (list curl + libx11 + openal + sdl2 + zlib)) (home-page "https://dhewm3.org/") (synopsis "Port of the original Doom 3 engine") (description -- cgit 1.4.1 From 9544553c8bb575a97408d2e26c9159c3519f46f2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 14 Aug 2022 02:00:00 +0200 Subject: gnu: arx-libertatis: Update to 1.2.1. * gnu/packages/games.scm (arx-libertatis): Update to 1.2.1. --- gnu/packages/games.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 283382ac2b..a3278b8918 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -8717,15 +8717,14 @@ game field is extended to 4D space, which has to filled up by the gamer with (define-public arx-libertatis (package (name "arx-libertatis") - (version "1.2") + (version "1.2.1") (source (origin (method url-fetch) (uri (string-append "http://arx-libertatis.org/files/arx-libertatis-" version ".tar.xz")) (sha256 - (base32 - "035dflxffa98bxmxkrqfizmhvnr09wyhhmzaqxk92772qil7gkxs")))) + (base32 "1pxf86sgwvy3785sq2wb4jvz6bdxm81ilrxd8xv7s61dxqqqizda")))) (build-system cmake-build-system) (outputs '("out" "installer")) (arguments -- cgit 1.4.1 From 96e862f8876349a2e6c6fcb2e111f8b395c22f9e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 14 Aug 2022 02:00:02 +0200 Subject: gnu: font-util: Update to 1.3.3. * gnu/packages/xorg.scm (font-util): Update to 1.3.3. --- gnu/packages/xorg.scm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 32289e0f57..ed06cb3925 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -823,16 +823,14 @@ For example: @code{6x10}, @code{9x15bold}, etc.") (define-public font-util (package (name "font-util") - (version "1.3.2") + (version "1.3.3") (source (origin (method url-fetch) - (uri (string-append - "mirror://xorg/individual/font/font-util-" - version - ".tar.bz2")) + (uri (string-append "mirror://xorg/individual/font/font-util-" + version ".tar.xz")) (sha256 - (base32 "10i2a8b3d1h3w7klsqf31iz7zbd6l8wglil54fkhdb1385281n1s")))) + (base32 "1lpb5qd2drilql4wl644m682hvmv67hdbbisnrm0ah4wfy8ci4g7")))) (build-system gnu-build-system) (native-inputs (list pkg-config)) (home-page "https://www.x.org/wiki/") -- cgit 1.4.1 From 3eb3e198b96928b0de26145d67951d8d3d213dc7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 14 Aug 2022 02:00:01 +0200 Subject: gnu: plocate: Update to 1.1.16. * gnu/packages/search.scm (plocate): Update to 1.1.16. --- gnu/packages/search.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/search.scm b/gnu/packages/search.scm index 2d652f5789..0fd03541f8 100644 --- a/gnu/packages/search.scm +++ b/gnu/packages/search.scm @@ -506,14 +506,14 @@ conflict with slocate compatibility.") (define-public plocate (package (name "plocate") - (version "1.1.15") + (version "1.1.16") (source (origin (method url-fetch) (uri (string-append "https://plocate.sesse.net/download/" "plocate-" version ".tar.gz")) (sha256 - (base32 "0l7igd81acsha5l5mv2rv7n9j1bc4f6ys4hfvs3ii0cbv9a5k1fi")))) + (base32 "0ccn785yi069dgwp4j3g23zvvivzsf5chadbdr357qphkmpxy125")))) (build-system meson-build-system) (arguments `(#:configure-flags -- cgit 1.4.1 From 3bdc0ef2cd9cd9cbcc1aadef7d8fdf6d182e857d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 14 Aug 2022 02:00:01 +0200 Subject: gnu: rsync: Update to 3.2.5 [fixes CVE-2022-29154]. * gnu/packages/rsync.scm (rsync): Update to 3.2.5. --- gnu/packages/rsync.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/rsync.scm b/gnu/packages/rsync.scm index 2b3673c90c..5f549ef234 100644 --- a/gnu/packages/rsync.scm +++ b/gnu/packages/rsync.scm @@ -39,14 +39,14 @@ (define-public rsync (package (name "rsync") - (version "3.2.4") + (version "3.2.5") (source (origin (method url-fetch) (uri (string-append "https://rsync.samba.org/ftp/rsync/src/rsync-" version ".tar.gz")) (sha256 (base32 - "1lgslprbfirl9p9ca16syh0pzr4kgmrzdxwwayvb0ll0s0w1hxkg")))) + "1flsqq01dmbz0m2vwn4sj46zb9yxlrfc6xy3gf393xyd6lbd5i1a")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit 1.4.1 From 11636ee9c0754f9b1b119aabc55c99aff103ec9d Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Wed, 17 Aug 2022 08:41:42 +0800 Subject: gnu: emacs-straight-el: Update to fed2153. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/emacs-xyz.scm (emacs-straight-el): Update to fed215348076ba9182f634e0770a175220474b5a. Signed-off-by: 宋文武 --- gnu/packages/emacs-xyz.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 4462805ddd..0aacd4846a 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -31787,7 +31787,7 @@ headlines, keywords, tables and source blocks.") (license license:gpl3+)))) ; License is in pyimport.el (define-public emacs-straight-el - (let ((commit "4517e118ee43f849f708025dbb2cf4f281793121") + (let ((commit "fed215348076ba9182f634e0770a175220474b5a") (revision "0")) (package (name "emacs-straight-el") @@ -31797,11 +31797,11 @@ headlines, keywords, tables and source blocks.") (method git-fetch) (uri (git-reference - (url "https://github.com/raxod502/straight.el") + (url "https://github.com/radian-software/straight.el") (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "0idhgh203rac9c046286gir9rq0lgnlllzj4b4hrjpd3idg9v0r8")))) + (base32 "0z0j670s18mp1bhrsnng0mybcbnlywarhlz7zmrf9399rr513z1x")))) (build-system emacs-build-system) (arguments (list @@ -31833,7 +31833,7 @@ headlines, keywords, tables and source blocks.") (list git)) (propagated-inputs (list emacs-magit)) - (home-page "https://github.com/raxod502/straight.el/") + (home-page "https://github.com/radian-software/straight.el/") (synopsis "Purely functional package manager for the Emacs hacker") (description "@code{emacs-straight-el} is a purely functional package manager for the Emacs -- cgit 1.4.1 From 3220edac2a5ac816328bd65489513ae8d33fbe23 Mon Sep 17 00:00:00 2001 From: Denis 'GNUtoo' Carikli Date: Wed, 17 Aug 2022 01:46:01 +0200 Subject: gnu: greybird-gtk-theme: Build with librsvg-for-system. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gnome-xyz.scm (greybird-gtk-theme)[inputs]: Replace librsvg with librsvg-for-system. Signed-off-by: 宋文武 --- gnu/packages/gnome-xyz.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index c37ae27cc5..beab5429bf 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -18,6 +18,7 @@ ;;; Copyright © 2021 Charles Jackson ;;; Copyright © 2022 Eric Bavier ;;; Copyright © 2022 Sughosha +;;; Copyright © 2022 Denis 'GNUtoo' Carikli ;;; ;;; This file is part of GNU Guix. ;;; @@ -1137,7 +1138,7 @@ like GNOME, Unity, Budgie, Pantheon, XFCE, Mate, etc.") (native-inputs (list gtk+ `(,glib "bin") ; for "glib-compile-resources" - librsvg + (librsvg-for-system) pkg-config ruby-sass sassc)) -- cgit 1.4.1 From 4e562883d156bf6c3a3bb6d1719c22e81623c03b Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Wed, 17 Aug 2022 13:53:39 +0800 Subject: gnu: icestorm: Update to 0.0-4.2bc5417. * gnu/packages/fpga.scm (icestorm): Update to commit 2bc541743ada3542c6da36a50e66303b9cbd2059. --- gnu/packages/fpga.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/fpga.scm b/gnu/packages/fpga.scm index b8f98ca63e..06d4a10e7e 100644 --- a/gnu/packages/fpga.scm +++ b/gnu/packages/fpga.scm @@ -226,8 +226,8 @@ For synthesis, the compiler generates netlists in the desired format.") (license license:isc))) (define-public icestorm - (let ((commit "0ec00d892a91cc68e45479b46161f649caea2933") - (revision "3")) + (let ((commit "2bc541743ada3542c6da36a50e66303b9cbd2059") + (revision "4")) (package (name "icestorm") (version (git-version "0.0" revision commit)) @@ -239,7 +239,7 @@ For synthesis, the compiler generates netlists in the desired format.") (file-name (git-file-name name version)) (sha256 (base32 - "1qlh99fafb7xga702k64fmc9m700nsddrfgcq4x8qn8fplsb64f1")))) + "0d0ibdq3rzmjcbv97h4b9wgq8ikvgwlfw60spi2w81mis317lis8")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no unit tests that don't need an FPGA exist. -- cgit 1.4.1 From 7df39e6b2d28b5a9adc2d9f46110aaf83799a275 Mon Sep 17 00:00:00 2001 From: Mike Jones Date: Tue, 16 Aug 2022 19:35:00 +0100 Subject: gnu: fish: Update to 3.5.1. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/shells.scm (fish): Update to 3.5.1. Signed-off-by: 宋文武 --- gnu/packages/shells.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 1a5f8fca9f..cb983fb148 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -119,7 +119,7 @@ direct descendant of NetBSD's Almquist Shell (@command{ash}).") (define-public fish (package (name "fish") - (version "3.3.1") + (version "3.5.1") (source (origin (method url-fetch) @@ -127,7 +127,7 @@ direct descendant of NetBSD's Almquist Shell (@command{ash}).") "releases/download/" version "/" "fish-" version ".tar.xz")) (sha256 - (base32 "12dfkyqv5vm52i1fifz91h8f8xg60xjvv94kx6xjqxk9a8dfxd5m")) + (base32 "0a39vf0wqq6asw5xcrwgdsc67h5bxkgxzy77f8bx6pd4qlympm56")) (modules '((guix build utils))) (snippet '(begin -- cgit 1.4.1 From b74386efeaacaed95091b3e3390cc7580161cb28 Mon Sep 17 00:00:00 2001 From: Mike Jones Date: Tue, 16 Aug 2022 19:08:00 +0100 Subject: gnu: neovim: Update to 0.7.2. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/vim.scm (neovim): Update to 0.7.2. Signed-off-by: 宋文武 --- gnu/packages/vim.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index 945c7f3863..bd25ae0be4 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -659,7 +659,7 @@ are detected, the user is notified."))) (define-public neovim (package (name "neovim") - (version "0.7.0") + (version "0.7.2") (source (origin (method git-fetch) (uri (git-reference @@ -668,7 +668,7 @@ are detected, the user is notified."))) (file-name (git-file-name name version)) (sha256 (base32 - "1m7xmry66pn27gvk7qj9di83xa1h7zjp4c6ygnf218pqhr08x06g")))) + "1jn4i4ral79ys06i50bimylm515sfh41z503gj50a74h1ylg0z4w")))) (build-system cmake-build-system) (arguments (list #:modules -- cgit 1.4.1 From e4aca1cc3f8f9abf20043e0fc12f495d04c47db8 Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Tue, 16 Aug 2022 21:30:32 +0800 Subject: gnu: Add python-lief. From c865b31b702d0e5f86faaadcb306cea269ae1109 Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Tue, 16 Aug 2022 21:26:33 +0800 Subject: [PATCH v3] gnu: Add python-lief. * gnu/packages/python-xyz.scm (python-lief): New variable. Signed-off-by: Mathieu Othacehe --- gnu/packages/python-xyz.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 3259f46881..a08a0b7304 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -30644,3 +30644,35 @@ generator for Python.") "This package provides access to Misskey's API. Misskey is a SNS platform using the ActivityPub protocol.") (license license:expat))) + +(define-public python-lief + (package + (name "python-lief") + (version "0.12.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/lief-project/LIEF") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1xzbh3bxy4rw1yamnx68da1v5s56ay4g081cyamv67256g0qy2i1")))) + (build-system python-build-system) + (native-inputs (list cmake)) + (arguments + (list + #:tests? #f ;needs network + #:phases #~(modify-phases %standard-phases + (replace 'build + (lambda _ + (invoke + "python" "setup.py" "--sdk" "build" + (string-append + "-j" (number->string (parallel-job-count))))))))) + (home-page "https://github.com/lief-project/LIEF") + (synopsis "Library to instrument executable formats") + (description + "@code{python-lief} is a cross platform library which can parse, modify +and abstract ELF, PE and MachO formats.") + (license license:asl2.0))) -- cgit 1.4.1 From 0b69ed70eca72aef6364be650d9e2f7e8c97ac0c Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Tue, 16 Aug 2022 02:38:30 +0300 Subject: gnu: osm2pgsql: Update to 1.7.0. * gnu/packages/geo.scm (osm2pgsql): Update to 1.7.0. [source]: Update snippet. [inputs]: Add fmt and rapidjson. [arguments]: Update 'configure-flags'. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/geo.scm | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index fe2174b106..4dad2418ad 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -17,7 +17,7 @@ ;;; Copyright © 2021 Sharlatan Hellseher ;;; Copyright © 2021 Vinicius Monego ;;; Copyright © 2021 Clément Lassieur -;;; Copyright © 2021 Nikolay Korotkiy +;;; Copyright © 2021, 2022 Nikolay Korotkiy ;;; Copyright © 2022 Roman Scherer ;;; ;;; This file is part of GNU Guix. @@ -100,6 +100,7 @@ #:use-module (gnu packages perl) #:use-module (gnu packages photo) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages pretty-print) #:use-module (gnu packages protobuf) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) @@ -1322,7 +1323,7 @@ based on the Osmium library.") (define-public osm2pgsql (package (name "osm2pgsql") - (version "1.5.1") + (version "1.7.0") (source (origin (method git-fetch) @@ -1331,32 +1332,30 @@ based on the Osmium library.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0i18mskcs087dn3f3h9n7j0wafn8502m0h13mrjwin38xsz0crfj")) + (base32 "15fxr4xq7siy237763l7nswx7v0swr3qzs2h3zkjzgvajw4p6qii")) (modules '((guix build utils))) (snippet - '(begin - (delete-file-recursively "contrib/protozero") - (delete-file-recursively "contrib/libosmium") - #t)))) + ;; Remove bundled libraries. + '(delete-file-recursively "contrib")))) (build-system cmake-build-system) (arguments `(#:tests? #f; tests fail because we need to setup a database #:configure-flags - (list (string-append "-DOSMIUM_INCLUDE_DIR=" - (assoc-ref %build-inputs "libosmium") - "/include") - (string-append "-DPROTOZERO_INCLUDE_DIR=" - (assoc-ref %build-inputs "protozero") - "/include")))) + (list "-DEXTERNAL_LIBOSMIUM=ON" + "-DEXTERNAL_PROTOZERO=ON" + "-DEXTERNAL_FMT=ON" + "-DEXTERNAL_RAPIDJSON=ON"))) (inputs (list boost bzip2 expat + fmt libosmium lua postgresql proj protozero + rapidjson zlib)) (native-inputs (list python python-psycopg2)) -- cgit 1.4.1 From 013efb8a12838c64eecc698b907c2cc4f1b5dace Mon Sep 17 00:00:00 2001 From: Trevor Richards Date: Tue, 16 Aug 2022 15:39:05 -0700 Subject: gnu: stumpwm-contrib: Update to 0.0.1-4.d0c0507. * gnu/packages/wm.scm (stumpwm-contrib): Update to 0.0.1-4.d0c0507. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/wm.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index f4dcbf742e..507c5db92a 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1931,8 +1931,8 @@ productive, customizable lisp based systems.") (delete 'cleanup))))))) (define stumpwm-contrib - (let ((commit "a7dc1c663d04e6c73a4772c8a6ad56a34381096a") - (revision "3")) + (let ((commit "d0c05077eca5257d33083de949c10bca4aac4242") + (revision "4")) (package (name "stumpwm-contrib") (version (git-version "0.0.1" revision commit)) ;no upstream release @@ -1944,7 +1944,7 @@ productive, customizable lisp based systems.") (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "09akdaaya7lga5lzbq1aj1filsyjwvflghkidpmr0nk0jz5xx1g7")))) + (base32 "0zxhqh9wjfk7zas67kmwfx0a47y8rxmh8f1a5rcs300bv1083lkb")))) (build-system asdf-build-system/sbcl) (inputs `(("stumpwm" ,stumpwm "lib"))) -- cgit 1.4.1 From 6ca41feda895cfed4f43d93face37f2eeee0db40 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Wed, 17 Aug 2022 10:15:40 +0200 Subject: gnu: stumpwm-contrib: Fix description. * gnu/packages/wm.scm (stumpwm-contrib)[synopsis, description]: Fix them. --- gnu/packages/wm.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 507c5db92a..7ea6840689 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1949,8 +1949,8 @@ productive, customizable lisp based systems.") (inputs `(("stumpwm" ,stumpwm "lib"))) (home-page "https://github.com/stumpwm/stumpwm-contrib") - (synopsis "StumpWM interactive shell") - (description "This package provides a StumpWM interactive shell.") + (synopsis "StumpWM extra modules") + (description "This package provides extra modules for StumpWM.") (license (list license:gpl2+ license:gpl3+ license:bsd-2))))) (define-public stumpish -- cgit 1.4.1 From 0236b036a4c08d64e04e5143c545dabb38f9689d Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Wed, 17 Aug 2022 11:01:16 +0200 Subject: gnu: sdrangel: Update to 7.6.2. * gnu/packages/radio.scm (sdrangel): Update to 7.6.2. [inputs]: Add qtwebchannel-5 and qtwebengine-5. --- gnu/packages/radio.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index 9cd64999a1..9545cc1f7b 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -2126,7 +2126,7 @@ voice formats.") (define-public sdrangel (package (name "sdrangel") - (version "6.18.1") + (version "7.6.2") (source (origin (method git-fetch) @@ -2135,7 +2135,7 @@ voice formats.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "17lakqy55p481fa5w6ylh79xbd4rdiqk9y21vmi4m2r4wx893zw1")))) + (base32 "193iwwb4mbr29mlgaqb67j8214k10k2q0ky9fcl1ja52vmdzz71b")))) (build-system qt-build-system) (native-inputs (list doxygen graphviz pkg-config)) @@ -2165,6 +2165,8 @@ voice formats.") qtquickcontrols2-5 qtserialport qtspeech + qtwebchannel-5 + qtwebengine-5 qtwebsockets-5 rtl-sdr serialdv -- cgit 1.4.1 From a944fd6c4ebe832b46e45b09bd69249c41aae248 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Wed, 17 Aug 2022 11:09:37 +0200 Subject: gnu: xnec2c: Update to 4.4.11. * gnu/packages/radio.scm (xnec2c): Update to 4.4.11. --- gnu/packages/radio.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index 9545cc1f7b..bc2c13b847 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -1415,14 +1415,14 @@ operators.") (define-public xnec2c (package (name "xnec2c") - (version "4.4.5") + (version "4.4.11") (source (origin (method url-fetch) (uri (string-append "https://www.xnec2c.org/releases/xnec2c-v" version ".tar.gz")) (sha256 - (base32 "0v3qr16d42jri2vwwgrhhknaypdcjyn6ccdjpqfzr8zzr33z5pca")))) + (base32 "13ybnb1v1y9wjmj49s8ir2rpfsz7h8r9jwv0qd4if9wsn44jg29k")))) (build-system gnu-build-system) (native-inputs (list autoconf -- cgit 1.4.1 From 9f73df807122214f3318676db24bfc898cba837e Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 17 Aug 2022 11:20:21 +0200 Subject: gnu: emacs-crdt: Update to 0.3.1. * gnu/packages/emacs-xyz.scm (emacs-crdt): Update to 0.3.1. --- gnu/packages/emacs-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 0aacd4846a..ab5cfefa84 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -19545,8 +19545,8 @@ never confused by comments or @code{foo-bar} matching @code{foo}.") (define-public emacs-crdt ;; XXX: Upstream does not always tag new releases. The commit below ;; corresponds exactly to latest version bump. - (let ((commit "77be6cded0e2d24fc9c132032ae3bf7ae8ed2cf9") - (version "0.3.0")) + (let ((commit "7d8a6b13c2127c4302196030114fd6cd95fd6f49") + (version "0.3.1")) (package (name "emacs-crdt") (version version) @@ -19558,7 +19558,7 @@ never confused by comments or @code{foo-bar} matching @code{foo}.") (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "0irf2allz7bp696nqlgg70ma6n336bspz8794bff1s1pramrzlhz")))) + (base32 "0qs1pbv7skkgz9pdfq0k7sbdran1pal5ask29xf3kxdgx5qlv3x8")))) (build-system emacs-build-system) (home-page "https://code.librehq.com/qhong/crdt.el") (synopsis "Real-time collaborative editing environment") -- cgit 1.4.1 From 08b81199d18a4dccdb5d4f10cbe354133c48c474 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 17 Aug 2022 11:25:14 +0200 Subject: gnu: emacs-eldev: Update to 1.2. * gnu/packages/emacs-xyz.scm (emacs-eldev): Update to 1.2. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index ab5cfefa84..cfea0cf533 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -18698,7 +18698,7 @@ according to a parsing expression grammar.") (define-public emacs-eldev (package (name "emacs-eldev") - (version "1.1.3") + (version "1.2") (source (origin (method git-fetch) @@ -18707,7 +18707,7 @@ according to a parsing expression grammar.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1dgbwaar8l8nl79mlzf5g1n49f1j9yj4772yfmim9vv8ppxnzbqk")))) + (base32 "1dmi05ry62nszy9w6zyvzh2q5ii57vdyc7mwv3dyfhwx4hqbngs4")))) (build-system emacs-build-system) (arguments (list -- cgit 1.4.1 From fec225aa4720bfdb34919da73e68eadab03c123e Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 17 Aug 2022 11:38:56 +0200 Subject: gnu: fsearch: Update to 0.2. * gnu/packages/search.scm (fsearch): Update to 0.2. [inputs]: Replace PCRE with PCRE2. --- gnu/packages/search.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/search.scm b/gnu/packages/search.scm index 0fd03541f8..bc5bb9fa83 100644 --- a/gnu/packages/search.scm +++ b/gnu/packages/search.scm @@ -330,7 +330,7 @@ for parsing HTML files.") (define-public fsearch (package (name "fsearch") - (version "0.1.4") + (version "0.2") (source (origin (method git-fetch) @@ -339,7 +339,7 @@ for parsing HTML files.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1lc6fhz4zhjbs29xn53v97dqrxwmqaplhky8sm9776ws6fyifwd7")))) + (base32 "1cf5bzacf1xfg8b8yvh5wrmmqqpdpnp6q39fwja71x8x9s92ir1w")))) (build-system meson-build-system) (native-inputs (list autoconf @@ -350,7 +350,7 @@ for parsing HTML files.") libtool pkg-config)) (inputs - (list gtk+ icu4c pcre)) + (list gtk+ icu4c pcre2)) (home-page "https://github.com/cboxdoerfer/fsearch") (synopsis "Fast file search utility") (description -- cgit 1.4.1 From a0d3412468edd109f2f73adcacbe4d0a4ba7260f Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 17 Aug 2022 14:50:17 +0200 Subject: gnu: scintilla: Update to 5.2.4. * gnu/packages/text-editors.scm (scintilla): Update to 5.2.4. --- gnu/packages/text-editors.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index 485661fe6b..839f812733 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -899,14 +899,14 @@ Octave. TeXmacs is completely extensible via Guile.") (define-public scintilla (package (name "scintilla") - (version "5.2.1") + (version "5.2.4") (source (origin (method url-fetch) (uri (let ((v (apply string-append (string-split version #\.)))) (string-append "https://www.scintilla.org/scintilla" v ".tgz"))) (sha256 - (base32 "1q6z8v2anbdwcxqfqjs0mwl2z4cdzarj0hqxj86fvvdxsr25649r")))) + (base32 "0rncbac9r9ahkxgmv7faj4dms4wy0ik2axmb0lp1ffx4r6419vsa")))) (build-system gnu-build-system) (arguments (list -- cgit 1.4.1 From 94528ffacd4027816cc39cceacdea766a5585dce Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Wed, 17 Aug 2022 12:23:43 +0300 Subject: gnu: geos: Update to 3.11.0. * gnu/packages/geo.scm (geos): Update to 3.11.0. Signed-off-by: Mathieu Othacehe --- gnu/packages/geo.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 4dad2418ad..669a807b50 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -217,7 +217,7 @@ OpenStreetMap written in C using eXpat, Cairo and GLib.") (define-public geos (package (name "geos") - (version "3.10.2") + (version "3.11.0") (source (origin (method url-fetch) (uri (string-append "http://download.osgeo.org/geos/geos-" @@ -225,7 +225,7 @@ OpenStreetMap written in C using eXpat, Cairo and GLib.") ".tar.bz2")) (sha256 (base32 - "05apyh6dvv15fax4xvxa0kr622h4y08w9p3274mlqsrqmjcwbfsh")))) + "12l59pxawyizmc4wn20dvjn7aifqwkim4ysmc78h91mayjmqravr")))) (build-system cmake-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit 1.4.1 From 2eba49db921771c8008a9f0a55f8fcd0f9936594 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Tue, 16 Aug 2022 16:49:20 +0300 Subject: gnu: libmaxminddb: Update to 1.6.0. * gnu/packages/geo.scm (libmaxminddb): Update to 1.6.0. Signed-off-by: Mathieu Othacehe --- gnu/packages/geo.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 669a807b50..52e7109a4c 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -1827,7 +1827,7 @@ ways, and relations) and their metadata tags.") (define-public libmaxminddb (package (name "libmaxminddb") - (version "1.4.3") + (version "1.6.0") (source (origin (method url-fetch) @@ -1835,7 +1835,7 @@ ways, and relations) and their metadata tags.") "/releases/download/" version "/" "/libmaxminddb-" version ".tar.gz")) (sha256 - (base32 "0fd4a4sxiiwzbd5h74wl1ijnb7xybjyybb7q41vdq3w8nk3zdzd5")))) + (base32 "0rw2z7rx8jzgdcgqlmc4wqrsjmiwd8vm5wvvrldy472rghcaq83n")))) (build-system gnu-build-system) (arguments `(#:make-flags -- cgit 1.4.1 From 359fd26fc4a2b7211cd60d76b4a890386dfa8dad Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Tue, 16 Aug 2022 16:52:45 +0300 Subject: gnu: python-maxminddb: Update to 2.2.0. * gnu/packages/geo.scm (python-maxminddb): Update to 2.2.0. Signed-off-by: Mathieu Othacehe --- gnu/packages/geo.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 52e7109a4c..1b4abdd87e 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -1854,14 +1854,14 @@ associated with an address.") (define-public python-maxminddb (package (name "python-maxminddb") - (version "1.5.1") + (version "2.2.0") (source (origin (method url-fetch) (uri (pypi-uri "maxminddb" version)) (sha256 (base32 - "0y9giw81k4wdmpryr4k42w50z292mf364a6vs1vxf83ksc9ig6j4")))) + "1rc4a403r3b4vhmhb03gidd0fmsbvfpbf3qfcw25h4db9zn0fxz3")))) (build-system python-build-system) (arguments `(#:tests? #f)) ;; Tests require a copy of the maxmind database -- cgit 1.4.1 From 800393bf14026282e60551e9e836e90c3fd32c92 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Tue, 16 Aug 2022 12:20:52 +0300 Subject: gnu: gdal: Update to 3.5.1. * gnu/packages/geo.scm (gdal): Update to 3.5.1. Signed-off-by: Mathieu Othacehe --- gnu/packages/geo.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 1b4abdd87e..66c97d3d6a 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -941,7 +941,7 @@ development.") (define-public gdal (package (name "gdal") - (version "3.5.0") + (version "3.5.1") (source (origin (method url-fetch) (uri (string-append @@ -949,7 +949,7 @@ development.") version ".tar.gz")) (sha256 (base32 - "0h7dgjx8nk3dd17wwqm2yjnaqciyrd2mz9gcjswpcnmap09wbzrs")) + "1l93q7xf6qx9ck5axfkf3ygmvclxkvrjd8x00ckn7j0d0750ci3w")) (modules '((guix build utils))) (snippet `(begin -- cgit 1.4.1 From a08f6e1c51d23c701d2ec68e82a93f49d84d223e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 14 Aug 2022 02:00:00 +0200 Subject: gnu: bind: Update to 9.16.32. * gnu/packages/dns.scm (isc-bind): Update to 9.16.32. --- gnu/packages/dns.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index 50068c8c35..e4dd8365f8 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -333,14 +333,14 @@ and BOOTP/TFTP for network booting of diskless machines.") ;; 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.31") + (version "9.16.32") (source (origin (method url-fetch) (uri (string-append "https://ftp.isc.org/isc/bind9/" version "/bind-" version ".tar.xz")) (sha256 - (base32 "1yvwdvcyy996p50j7nr4b010w16jjj5czw15g87wf1dn6xncp8lc")) + (base32 "0w2rcjxqnbhwzgsdsas36dadjq0qn6s1xjx4g4qk0ph2nvf4gj9j")) (patches (search-patches "bind-re-add-attr-constructor-priority.patch")))) (build-system gnu-build-system) -- cgit 1.4.1 From e635167dc0aa644a355aefcbf35a25abfc7f1bef Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 17 Aug 2022 14:32:35 -0400 Subject: gnu: openjdk: Add a variable tracking the latest openjdk package. * gnu/packages/java.scm (openjdk): New variable. --- gnu/packages/java.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 14fef6986c..73898d120c 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2284,6 +2284,9 @@ new Date();")) (("^#!.*") "#! java BlockedCertsConverter SHA-256\n")))))))) (home-page "https://openjdk.java.net/projects/jdk/17"))) +;;; Convenience alias to point to the latest version of OpenJDK. +(define-public openjdk openjdk17) + (define-public icedtea icedtea-8) -- cgit 1.4.1 From 351bf8f6fb9aece5a345bfaf1c8a75e743fe6db8 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 17 Aug 2022 21:20:23 -0400 Subject: gnu: libfm: Build with GTK 3. * gnu/packages/lxde.scm (libfm) [arguments]: New field. [inputs]: Replace gtk+2 with gtk+. --- gnu/packages/lxde.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lxde.scm b/gnu/packages/lxde.scm index 55deae26ea..955dc2ffeb 100644 --- a/gnu/packages/lxde.scm +++ b/gnu/packages/lxde.scm @@ -59,6 +59,7 @@ #:use-module (guix build-system gnu) #:use-module (guix build-system trivial) #:use-module (guix download) + #:use-module (guix gexp) #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) @@ -77,7 +78,8 @@ (base32 "1rfira3lx8v6scz1aq69925j4vslpp36bmgrrzcfby2c60q2c155")))) (build-system gnu-build-system) - (inputs (list glib gtk+-2)) + (arguments (list #:configure-flags #~(list "--with-gtk=3"))) + (inputs (list glib gtk+)) (native-inputs (list intltool `(,glib "bin") ; for gtester libtool -- cgit 1.4.1 From b1b801f5f340a3f4654c8f190b8160c4af4e9e79 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 17 Aug 2022 21:26:36 -0400 Subject: gnu: pcmanfm: Build with GTK 3. * gnu/packages/lxde.scm (pcmanfm)[arguments]: New field. [inputs]: Replace gtk+2 with gtk+. --- gnu/packages/lxde.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lxde.scm b/gnu/packages/lxde.scm index 955dc2ffeb..a0879dd229 100644 --- a/gnu/packages/lxde.scm +++ b/gnu/packages/lxde.scm @@ -241,11 +241,12 @@ speed up the access to freedesktop.org defined application menus.") (base32 "1xqc2k2jh165mm81xg0ghxx0ml1s3rhh4ndvbzkcri4kfhj7pjql")))) (build-system gnu-build-system) - (inputs (list gtk+-2 gvfs ; for trash and mount support + (arguments (list #:configure-flags #~(list "--with-gtk=3"))) + (inputs (list gtk+ gvfs ;for trash and mount support libfm libx11)) (native-inputs (list intltool libtool pkg-config)) (propagated-inputs - (list lxmenu-data)) ; for "Open With..." application list + (list lxmenu-data)) ;for "Open With..." application list (synopsis "LXDE file manager") (description "PCMan is a lightweight GTK+ based file manager, compliant with freedesktop.org standard.") -- cgit 1.4.1 From ee0c9557c19649d518cfc67d6753186e2928f2b4 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 17 Aug 2022 21:53:19 -0400 Subject: gnu: lxpanel: Build with GTK 3, use gexps and new style inputs. * gnu/packages/lxde.scm (lxpanel)[source]: Use mirror URI. [configure-flags]: Add --enable-gtk3. [phases]{wrap}: Use search-input-file and this-package-input. [inputs]: Use new style inputs. Replace gtk+-2 with gtk+. Remove libindicator comment; it seems to expect an old incompatible version. Sort in lexical order. Add bash-minimal. [native-inputs]: Use new style inputs. Sort in lexical order. [propagated-inputs]: Likewise. --- gnu/packages/lxde.scm | 61 +++++++++++++++++++++++++++++---------------------- 1 file changed, 35 insertions(+), 26 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lxde.scm b/gnu/packages/lxde.scm index a0879dd229..ccb8efd671 100644 --- a/gnu/packages/lxde.scm +++ b/gnu/packages/lxde.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2018 Ricardo Wurmus ;;; Copyright © 2019 Meiyo Peng ;;; Copyright © 2021 Guillaume Le Vaillant +;;; Copyright © 2022 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -573,39 +574,47 @@ in LXDE.") (source (origin (method url-fetch) - (uri (string-append "https://downloads.sourceforge.net/lxde/" - "lxpanel-" version ".tar.xz")) + (uri (string-append "mirror://sourceforge/lxde/" + "LXPanel%20%28desktop%20panel%29/" + "LXPanel%200.10.x/lxpanel-" + version ".tar.xz")) (sha256 (base32 "1s0y8jjkw6qz0r8l90618b8xly0c8g906kah7b162sz3sxbqyc8y")))) (build-system gnu-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'install 'wrap - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (menu (assoc-ref inputs "lxmenu-data"))) - (wrap-program (string-append out "/bin/lxpanel") - `("XDG_DATA_DIRS" ":" prefix - (,(string-append menu "/share")))) - #t)))))) + (list + #:configure-flags #~(list "--enable-gtk3") + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'wrap + (lambda* (#:key inputs outputs #:allow-other-keys) + (wrap-program (search-input-file outputs "bin/lxpanel") + `("XDG_DATA_DIRS" ":" prefix + (,(string-append #$(this-package-input "lxmenu-data") + "/share"))))))))) (inputs - ;; TODO: libindicator-0.3.0 - `(("curl" ,curl) - ("gtk+-2" ,gtk+-2) - ("alsa-lib" ,alsa-lib) - ("libwnck-2" ,libwnck-2) - ("keybinder" ,keybinder) - ("libxmu" ,libxmu) - ("libxpm" ,libxpm) - ("libxml2" ,libxml2) - ("cairo" ,cairo) - ("libx11" ,libx11) - ("wireless-tools" ,wireless-tools))) + (list alsa-lib + bash-minimal ;for wrap-program + cairo + curl + gtk+ + keybinder + libindicator + libwnck + libx11 + libxml2 + libxmu + libxpm + wireless-tools)) (native-inputs - (list pkg-config intltool docbook-xml gettext-minimal)) + (list docbook-xml + gettext-minimal + intltool + pkg-config)) (propagated-inputs - (list lxmenu-data libfm menu-cache)) + (list libfm + lxmenu-data + menu-cache)) (synopsis "X11 Desktop panel for LXDE") (description "Lxpanel provides an X11 desktop panel for LXDE.") -- cgit 1.4.1 From e3af0324bce0b1f1ba0732e2d571db9e61154f75 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 17 Aug 2022 22:01:43 -0400 Subject: gnu: gpicview: Build with GTK 3. * gnu/packages/lxde.scm (pcmanfm)[arguments]: New field. [inputs]: Replace gtk+-2 with gtk+. --- gnu/packages/image-viewers.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index 88dbba866b..3ab450dec6 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -287,7 +287,8 @@ collection. Geeqie was initially based on GQview.") (base32 "0hi9v0rdx47nys0wvm9xasdrafa34r5kq6crb074a0ipwmc60iiq")))) (build-system gnu-build-system) - (inputs (list gtk+-2 libjpeg-turbo)) + (arguments (list #:configure-flags #~(list "--enable-gtk3"))) + (inputs (list gtk+ libjpeg-turbo)) (native-inputs (list intltool pkg-config)) (synopsis "Simple and fast image viewer for X") (description "gpicview is a lightweight GTK+ 2.x based image viewer. -- cgit 1.4.1 From 8d60951864aea62440fb0de70ec6739bd3dcc594 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 17 Aug 2022 22:04:20 -0400 Subject: gnu: viewnior: Use new style inputs and fix indentation. * gnu/packages/image-viewers.scm (viewnior)[phases]: Delete trailing #t. [native-inputs, inputs]: Remove labels. --- gnu/packages/image-viewers.scm | 47 +++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 24 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index 3ab450dec6..52c9584f67 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -24,6 +24,7 @@ ;;; Copyright © 2021 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2021 dissent ;;; Copyright © 2022 Michael Rohleder +;;; Copyright © 2022 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -412,34 +413,32 @@ needs.") (name "viewnior") (version "1.8") (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/hellosiyan/Viewnior") - (commit (string-append name "-" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "14qvx1wajncd5ab0207274cwk32f4ipfnlaci6phmah0cwra2did")))) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/hellosiyan/Viewnior") + (commit (string-append name "-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "14qvx1wajncd5ab0207274cwk32f4ipfnlaci6phmah0cwra2did")))) (build-system meson-build-system) (arguments - '(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-source - (lambda _ - ;; Don't create 'icon-theme.cache' - (substitute* "meson.build" - (("meson.add_install_script*") "")) - #t))) - #:tests? #f)) ; no tests + '(#:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-source + (lambda _ + ;; Don't create 'icon-theme.cache' + (substitute* "meson.build" + (("meson.add_install_script*") ""))))) + #:tests? #f)) ;no tests (native-inputs - `(("gettext" ,gettext-minimal) - ("glib" ,glib "bin") ; glib-genmarshal - ("pkg-config" ,pkg-config) - ("shared-mime-info" ,shared-mime-info))) + (list gettext-minimal + `(,glib "bin") ;glib-genmarshal + pkg-config + shared-mime-info)) (inputs - `(("exiv2" ,exiv2) - ("gdk-pixbuf" ,gdk-pixbuf) - ("gtk+-2" ,gtk+-2))) + (list exiv2 + gdk-pixbuf + gtk+-2)) (home-page "https://siyanpanayotov.com/project/viewnior") (synopsis "Simple, fast and elegant image viewer") (description "Viewnior is an image viewer program. Created to be simple, -- cgit 1.4.1 From 50ece0e14c4f7101cebb116b4d9a8a038b8d9edd Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 17 Aug 2022 22:10:52 -0400 Subject: gnu: lxappearance: Build with GTK 3. * gnu/packages/lxde.scm (lxappearance): [arguments]: New field. [inputs]: Replace gtk+-2 with gtk+. --- gnu/packages/lxde.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lxde.scm b/gnu/packages/lxde.scm index ccb8efd671..dee8a5aa5e 100644 --- a/gnu/packages/lxde.scm +++ b/gnu/packages/lxde.scm @@ -115,7 +115,8 @@ libFM file management library."))) (sha256 (base32 "0f4bjaamfxxdr9civvy55pa6vv9dx1hjs522gjbbgx7yp1cdh8kj")))) (build-system gnu-build-system) - (inputs (list gtk+-2)) + (arguments (list #:configure-flags #~(list "--enable-gtk3"))) + (inputs (list gtk+)) (native-inputs (list intltool pkg-config)) (synopsis "LXDE GTK+ theme switcher") (description "LXAppearance is a desktop-independent GTK+ theme switcher -- cgit 1.4.1 From 15badf7b1eb7b9bf44977d07845154bc3baaeb2c Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 17 Aug 2022 22:14:16 -0400 Subject: gnu: lxsession: Build with GTK 3. * gnu/packages/lxde.scm (lxsession)[snippet]: Delete trailing #t. [configure-flags]: New argument. [phases]: Delete trailing #t. [inputs]: Remove labels. --- gnu/packages/lxde.scm | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lxde.scm b/gnu/packages/lxde.scm index dee8a5aa5e..9fcd6e1414 100644 --- a/gnu/packages/lxde.scm +++ b/gnu/packages/lxde.scm @@ -539,21 +539,20 @@ in LXDE.") (and (string-suffix? ".c" file) (file-exists? (c->vala file)))))) (for-each delete-file - (find-files "." generated-c-file?)) - #t)))) + (find-files "." generated-c-file?)))))) (build-system gnu-build-system) (arguments - `(#:phases + `(#:configure-flags (list "--enable-gtk3") + #:phases (modify-phases %standard-phases (add-after 'unpack 'rm-stamp (lambda _ (for-each delete-file (find-files "." "\\.stamp$")) ;; Force regeneration of configure script. - (delete-file "configure") - #t))))) + (delete-file "configure")))))) (inputs - `(("gtk+-2" ,gtk+-2) - ("polkit" ,polkit))) + (list gtk+ + polkit)) (native-inputs (list pkg-config intltool -- cgit 1.4.1 From e8ab1ba7c2d842c53d42f94d0ab5c2550d7e0e9d Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 17 Aug 2022 22:17:55 -0400 Subject: gnu: lxrandr: Build with GTK 3. * gnu/packages/lxde.scm (lxrandr)[configure-flags]: New argument. [inputs]: Remove labels. Replace gtk+-2 with gtk+. --- gnu/packages/lxde.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lxde.scm b/gnu/packages/lxde.scm index 9fcd6e1414..e840f1c969 100644 --- a/gnu/packages/lxde.scm +++ b/gnu/packages/lxde.scm @@ -139,7 +139,8 @@ able to change themes, icons, and fonts used by GTK+ applications.") "04n3vgh3ix12p8jfs4w0dyfq3anbjy33h7g53wbbqqc0f74xyplb")))) (build-system gnu-build-system) (arguments - `(#:phases + `(#:configure-flags (list "--enable-gtk3") + #:phases (modify-phases %standard-phases (add-after 'unpack 'xrandr-absolutely ;; lxrandr is useless without xrandr and gives an unhelpful error @@ -147,9 +148,8 @@ able to change themes, icons, and fonts used by GTK+ applications.") (lambda* (#:key input #:allow-other-keys) (substitute* "src/lxrandr.c" (("(\"|')xrandr\"" _ match) - (string-append match (which "xrandr") "\""))) - #t))))) - (inputs (list gtk+-2 xrandr)) + (string-append match (which "xrandr") "\"")))))))) + (inputs (list gtk+ xrandr)) (native-inputs (list intltool pkg-config)) (synopsis "LXDE monitor configuration tool") (description "LXRandR is a very basic monitor configuration tool. It -- cgit 1.4.1 From f5d7526477a59e207f5e21a784aaf4ba4417911e Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 17 Aug 2022 22:18:37 -0400 Subject: gnu: lxtask: Build with GTK 3. * gnu/packages/lxde.scm (lxtask)[arguments]: New field. [inputs]: Replace gtk+-2 with gtk+. --- gnu/packages/lxde.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lxde.scm b/gnu/packages/lxde.scm index e840f1c969..3c816d3cbb 100644 --- a/gnu/packages/lxde.scm +++ b/gnu/packages/lxde.scm @@ -174,7 +174,8 @@ or external monitor.") (base32 "0b2fxg8jjjpk219gh7qa18g45365598nd2bq7rrq0bdvqjdxy5i2")))) (build-system gnu-build-system) - (inputs (list gtk+-2)) + (arguments (list #:configure-flags #~(list "--enable-gtk3"))) + (inputs (list gtk+)) (native-inputs (list intltool pkg-config)) (synopsis "LXDE task manager") (description "LXTask is a lightweight task manager derived from Xfce task -- cgit 1.4.1 From b6c93e3ba0ff1cda454ee043f089ab916a00df89 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 17 Aug 2022 22:20:07 -0400 Subject: gnu: lxinput: Build with GTK 3. * gnu/packages/lxde.scm (lxinput)[arguments]: New field. [inputs]: Replace gtk+-2 with gtk+. --- gnu/packages/lxde.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lxde.scm b/gnu/packages/lxde.scm index 3c816d3cbb..e775d3dec8 100644 --- a/gnu/packages/lxde.scm +++ b/gnu/packages/lxde.scm @@ -506,8 +506,9 @@ menu spec-compliant desktop menus for LXDE.") (base32 "123f3yn4rp1w5b3n5aj3ad9snkxab29qkrs7bcvf5bx4cn57g3sf")))) (build-system gnu-build-system) + (arguments (list #:configure-flags #~(list "--enable-gtk3"))) (inputs - (list gtk+-2)) + (list gtk+)) (native-inputs (list pkg-config intltool)) (synopsis "Tool for mouse and keyboard configuration in LXDE") -- cgit 1.4.1 From 8d0e6f24ef43a73f505196961be5cea6c799eb21 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 17 Aug 2022 22:22:24 -0400 Subject: gnu: lxterminal: Build with GTK 3. * gnu/packages/lxde.scm (lxterminal)[arguments]: New field. [inputs]: Replace gtk+-2 with gtk+. Replace vte/gtk+-2 with vte. --- gnu/packages/lxde.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lxde.scm b/gnu/packages/lxde.scm index e775d3dec8..5f6d1b3c47 100644 --- a/gnu/packages/lxde.scm +++ b/gnu/packages/lxde.scm @@ -197,7 +197,8 @@ toolkit. It allows users to monitor and control of running processes.") (base32 "1124pghrhnx6q4391ri8nvi6bsmvbj1dx81an08mird8jf2b2rii")))) (build-system gnu-build-system) - (inputs (list gtk+-2 vte/gtk+-2)) + (arguments (list #:configure-flags #~(list "--enable-gtk3"))) + (inputs (list gtk+ vte)) (native-inputs (list intltool pkg-config)) (synopsis "LXDE terminal emulator") (description "LXTerminal is a VTE-based terminal emulator. It supports -- cgit 1.4.1 From 6eccbb7a81acc068da7e5a01cd72c3a293ec6c51 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 17 Aug 2022 22:27:59 -0400 Subject: gnu: Update LXDE packages home page. Automated via: $ git grep -l 'https://lxde.github.io' | \ xargs sed 's,https://lxde.github.io,https://www.lxde.org/,' -i --- gnu/packages/lxde.scm | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lxde.scm b/gnu/packages/lxde.scm index 5f6d1b3c47..c6d5f4060c 100644 --- a/gnu/packages/lxde.scm +++ b/gnu/packages/lxde.scm @@ -90,7 +90,7 @@ (synopsis "File management support (core library)") (description "LibFM provides file management functions built on top of Glib/GIO giving a higher-level API.") - (home-page "https://lxde.github.io") + (home-page "https://www.lxde.org/") (license license:gpl2+))) (define-public libfm-extra @@ -121,7 +121,7 @@ libFM file management library."))) (synopsis "LXDE GTK+ theme switcher") (description "LXAppearance is a desktop-independent GTK+ theme switcher able to change themes, icons, and fonts used by GTK+ applications.") - (home-page "https://lxde.github.io") + (home-page "https://www.lxde.org/") (license license:gpl2+))) (define-public lxrandr @@ -157,7 +157,7 @@ relies on the X11 resize-and-rotate (RandR) extension but doesn't aim to be a full frontend of it. LXRandR only gives you some easy and quick options which are intuitive. It's suitable for laptop users who frequently uses projectors or external monitor.") - (home-page "https://lxde.github.io") + (home-page "https://www.lxde.org/") (license license:gpl2+))) (define-public lxtask @@ -181,7 +181,7 @@ or external monitor.") (description "LXTask is a lightweight task manager derived from Xfce task manager with all dependencies on Xfce removed. LXTask is based on the GTK+ toolkit. It allows users to monitor and control of running processes.") - (home-page "https://lxde.github.io") + (home-page "https://www.lxde.org/") (license license:gpl2+))) (define-public lxterminal @@ -205,7 +205,7 @@ toolkit. It allows users to monitor and control of running processes.") multiple tabs and has only minimal dependencies thus being completely desktop-independent. In order to reduce memory usage and increase the performance, all instances of the terminal are sharing a single process.") - (home-page "https://lxde.github.io") + (home-page "https://www.lxde.org/") (license license:gpl2+))) (define-public menu-cache @@ -229,7 +229,7 @@ performance, all instances of the terminal are sharing a single process.") (synopsis "LXDE implementation of the freedesktop menu's cache") (description "Menu-cache is a library creating and utilizing caches to speed up the access to freedesktop.org defined application menus.") - (home-page "https://lxde.github.io") + (home-page "https://www.lxde.org/") (license license:lgpl2.1+))) (define-public pcmanfm @@ -254,7 +254,7 @@ speed up the access to freedesktop.org defined application menus.") (synopsis "LXDE file manager") (description "PCMan is a lightweight GTK+ based file manager, compliant with freedesktop.org standard.") - (home-page "https://lxde.github.io") + (home-page "https://www.lxde.org/") (license license:gpl2+))) (define-public spacefm @@ -434,7 +434,7 @@ customizable menu system, and Bash integration.") (description "Lxmenu-data provides files required to build freedesktop.org menu spec-compliant desktop menus for LXDE.") - (home-page "https://lxde.github.io") + (home-page "https://www.lxde.org/") (license license:lgpl2.1+))) (define-public lxde-icon-theme @@ -455,7 +455,7 @@ menu spec-compliant desktop menus for LXDE.") (synopsis "LXDE default icon theme based on nuoveXT2") (description "Lxde-icon-theme provides an default icon theme for LXDE.") - (home-page "https://lxde.github.io") + (home-page "https://www.lxde.org/") (license license:lgpl3))) (define-public lxde-common @@ -491,7 +491,7 @@ menu spec-compliant desktop menus for LXDE.") (synopsis "Common files of the LXDE Desktop") (description "Lxde-common provides common files of the LXDE Desktop.") - (home-page "https://lxde.github.io") + (home-page "https://www.lxde.org/") (license license:gpl2+))) (define-public lxinput @@ -516,7 +516,7 @@ menu spec-compliant desktop menus for LXDE.") (description "Lxinput provides a small program to configure keyboard and mouse in LXDE.") - (home-page "https://lxde.github.io") + (home-page "https://www.lxde.org/") (license license:gpl2+))) (define-public lxsession @@ -567,7 +567,7 @@ in LXDE.") (synopsis "Lightweight X11 session manager") (description "Lxsession provides an lightweight X11 session manager.") - (home-page "https://lxde.github.io") + (home-page "https://www.lxde.org/") (license license:gpl2+))) (define-public lxpanel @@ -621,7 +621,7 @@ in LXDE.") (synopsis "X11 Desktop panel for LXDE") (description "Lxpanel provides an X11 desktop panel for LXDE.") - (home-page "https://lxde.github.io") + (home-page "https://www.lxde.org/") (license license:gpl2+))) (define-public lxde @@ -660,7 +660,7 @@ user friendly and slim, while keeping the resource usage low. LXDE uses less RAM and less CPU while being a feature rich desktop environment. Unlike other tightly integrated desktops LXDE strives to be modular, so each component can be used independently with few dependencies.") - (home-page "https://lxde.github.io") + (home-page "https://www.lxde.org/") (license license:gpl2+))) ; And others. ;;; lxde.scm ends here -- cgit 1.4.1 From ad2bc3743d07619030d03ff4d0652b7a3641189b Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 17 Aug 2022 22:39:38 -0400 Subject: gnu: lxmenu-data: Use a mirror:// URI. * gnu/packages/lxde.scm (lxmenu-data)[source]: Use a mirror URI. --- gnu/packages/lxde.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lxde.scm b/gnu/packages/lxde.scm index c6d5f4060c..b113715bb9 100644 --- a/gnu/packages/lxde.scm +++ b/gnu/packages/lxde.scm @@ -422,7 +422,8 @@ customizable menu system, and Bash integration.") (source (origin (method url-fetch) - (uri (string-append "https://downloads.sourceforge.net/lxde/" + (uri (string-append "mirror://sourceforge//lxde/" + "lxmenu-data%20%28desktop%20menu%29/" name "-" version ".tar.xz")) (sha256 (base32 -- cgit 1.4.1 From 3545740de26b80d2f1633fbab6d66a75a157ce09 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 17 Aug 2022 22:41:55 -0400 Subject: gnu: lxde-icon-theme: Use a mirror:// URI. * gnu/packages/lxde.scm (lxde-icon-theme)[source]: Use a mirror URI. --- gnu/packages/lxde.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lxde.scm b/gnu/packages/lxde.scm index b113715bb9..283cdbf824 100644 --- a/gnu/packages/lxde.scm +++ b/gnu/packages/lxde.scm @@ -445,7 +445,8 @@ menu spec-compliant desktop menus for LXDE.") (source (origin (method url-fetch) - (uri (string-append "https://downloads.sourceforge.net/lxde/" + (uri (string-append "mirror://sourceforge/lxde/LXDE%20Icon%20Theme/" + "lxde-icon-theme-" version "/" name "-" version ".tar.xz")) (sha256 (base32 -- cgit 1.4.1 From 6592a8753cdd62f13916cdd170a445ec9dab6772 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 17 Aug 2022 22:48:08 -0400 Subject: gnu: lxde-common: Use a mirror:// URI. * gnu/packages/lxde.scm (lxde-common)[source]: Use a mirror URI. --- gnu/packages/lxde.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lxde.scm b/gnu/packages/lxde.scm index 283cdbf824..6c9e36f6cc 100644 --- a/gnu/packages/lxde.scm +++ b/gnu/packages/lxde.scm @@ -467,7 +467,9 @@ menu spec-compliant desktop menus for LXDE.") (source (origin (method url-fetch) - (uri (string-append "https://downloads.sourceforge.net/lxde/" + (uri (string-append "mirror://sourceforge/lxde/" + "lxde-common%20%28default%20config%29/" + "lxde-common%20" (version-major+minor version) "/" name "-" version ".tar.xz")) (sha256 (base32 -- cgit 1.4.1 From 5c4d7a4a891c0659f95c4130b6510f0e4e981b6b Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 17 Aug 2022 22:50:00 -0400 Subject: gnu: lxinput: Use a mirror:// URI. * gnu/packages/lxde.scm (lxinput)[source]: Use a mirror URI. --- gnu/packages/lxde.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lxde.scm b/gnu/packages/lxde.scm index 6c9e36f6cc..72c0222f19 100644 --- a/gnu/packages/lxde.scm +++ b/gnu/packages/lxde.scm @@ -505,8 +505,9 @@ menu spec-compliant desktop menus for LXDE.") (source (origin (method url-fetch) - (uri (string-append "https://downloads.sourceforge.net/lxde/" - name "-" version ".tar.xz")) + (uri (string-append "mirror://sourceforge/lxde/" + "LXInput%20%28Kbd%20and%20amp_%20mouse%20config%29/" + "LXInput%200.3.x/" name "-" version ".tar.xz")) (sha256 (base32 "123f3yn4rp1w5b3n5aj3ad9snkxab29qkrs7bcvf5bx4cn57g3sf")))) -- cgit 1.4.1 From 741c8efd6a85150359578610e492c6731fd34a03 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 17 Aug 2022 22:51:47 -0400 Subject: gnu: lxsession: Use a mirror:// URI. * gnu/packages/lxde.scm (lxsession)[source]: Use a mirror URI. --- gnu/packages/lxde.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lxde.scm b/gnu/packages/lxde.scm index 72c0222f19..0291f50302 100644 --- a/gnu/packages/lxde.scm +++ b/gnu/packages/lxde.scm @@ -531,7 +531,9 @@ in LXDE.") (source (origin (method url-fetch) - (uri (string-append "https://downloads.sourceforge.net/lxde/" + (uri (string-append "mirror://sourceforge/lxde/" + "LXSession%20%28session%20manager%29/" + "LXSession%200.5.x/" "lxsession-" version ".tar.xz")) (sha256 (base32 "0imv9nysip1j9lrb2z96kl05isjgp312323wnnd5b59h0ff0sgp4")) -- cgit 1.4.1 From f3a7d43281ffed7c7d06fcc00b40af8eff9b87b7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 18 Aug 2022 12:20:40 +0200 Subject: gnu: Add r-kbet. * gnu/packages/bioinformatics.scm (r-kbet): New variable. --- gnu/packages/bioinformatics.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index e29c3b6372..0e08a951a6 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -16196,6 +16196,32 @@ control samples and applying quantile normalization on all markers of interest.") (license license:gpl2+)))) +(define-public r-kbet + (let ((commit "f35171dfb04c7951b8a09ac778faf7424c4b6bc0") + (revision "1")) + (package + (name "r-kbet") + (version (git-version "0.99.6" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/theislab/kBET") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1r91prl2kki3zk694vhlmxdlqh0ixlhs8jfcqw6wc7cdsa0nv67k")))) + (properties `((upstream-name . "kBET"))) + (build-system r-build-system) + (propagated-inputs (list r-cluster r-fnn r-ggplot2 r-mass r-rcolorbrewer)) + (native-inputs (list r-knitr)) + (home-page "https://github.com/theislab/kBET") + (synopsis "k-nearest neighbour batch effect test") + (description + "This tool detects batch effects in high-dimensional data based on chi^2-test.") + ;; Any version of the GPL + (license license:gpl3+)))) + (define-public ccwl (package (name "ccwl") -- cgit 1.4.1 From d53201ba6575e8eb0c83ca42d0121ec43957198b Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 18 Aug 2022 12:22:53 +0200 Subject: gnu: emacs-xref: Update to 1.5.0. * gnu/packages/emacs-xyz.scm (emacs-xref): Update to 1.5.0. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index cfea0cf533..f36534d3a4 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -31037,14 +31037,14 @@ work on alists, hash-table and arrays. All functions are prefixed with (define-public emacs-xref (package (name "emacs-xref") - (version "1.4.1") + (version "1.5.0") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/xref-" version ".tar")) (sha256 - (base32 "1vbpplw0sngymmawi940nlqmncqznb5vp7zi0ib8v66g3y33ijrf")))) + (base32 "0xl6aiwkjbgs44c3wxk6s85diydm3y5lsd7znb0dhbqb7milid2d")))) (build-system emacs-build-system) (home-page "http://elpa.gnu.org/packages/xref.html") (synopsis "Cross-referencing commands") -- cgit 1.4.1 From 6e7c6b36778d0e12e29f7b3eb5d9a11fb4672a19 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 18 Aug 2022 12:23:34 +0200 Subject: gnu: emacs-rustic: Update to 3.3. * gnu/packages/emacs-xyz.scm (emacs-rustic): Update to 3.3. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index f36534d3a4..bfb489d273 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -23058,7 +23058,7 @@ source code.") (define-public emacs-rustic (package (name "emacs-rustic") - (version "3.2") + (version "3.3") (source (origin (method git-fetch) @@ -23067,7 +23067,7 @@ source code.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "000awxvnwxg2hmhhn6yd9pnvflr91npfs2v1p5y7hcwg1d6mmvgk")))) + (base32 "088g6arlbq7czxyg5f31zmcm0gla7qh4vapaaskf6866yyqhizvb")))) (build-system emacs-build-system) (propagated-inputs (list emacs-dash -- cgit 1.4.1 From 2572ce21945487e1b82d1ca1637e40b857e44690 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 18 Aug 2022 12:24:28 +0200 Subject: gnu: emacs-spacemacs-theme: Update to 0.3. * gnu/packages/emacs-xyz.scm (emacs-spacemacs-theme): Update to 0.3. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index bfb489d273..a93a5b1a3c 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -28172,7 +28172,7 @@ color. Designed for 256-color terminals. Comes in light and dark!") (define-public emacs-spacemacs-theme (package (name "emacs-spacemacs-theme") - (version "0.2") + (version "0.3") (source (origin (method git-fetch) @@ -28181,7 +28181,7 @@ color. Designed for 256-color terminals. Comes in light and dark!") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "15l9hb8f08nkxsaj8pxbg2mip4pp2msnrl0nvlq22zg40gh7pqsn")))) + (base32 "1yz8xg9ni9290nly5b93djkzk9235q6k4lhb5ghs6snr0r39157n")))) (build-system emacs-build-system) (home-page "https://github.com/nashamri/spacemacs-theme") (synopsis -- cgit 1.4.1 From 72cf16679128f70372af82c098d984a1094adba5 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 18 Aug 2022 12:28:08 +0200 Subject: gnu: fsearch: Update to 0.2.1. * gnu/packages/search.scm (fsearch): Update to 0.2.1. --- gnu/packages/search.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/search.scm b/gnu/packages/search.scm index bc5bb9fa83..9ebc4d0c9b 100644 --- a/gnu/packages/search.scm +++ b/gnu/packages/search.scm @@ -330,7 +330,7 @@ for parsing HTML files.") (define-public fsearch (package (name "fsearch") - (version "0.2") + (version "0.2.1") (source (origin (method git-fetch) @@ -339,7 +339,7 @@ for parsing HTML files.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1cf5bzacf1xfg8b8yvh5wrmmqqpdpnp6q39fwja71x8x9s92ir1w")))) + (base32 "02k3gwy19sf47srd5kp2fq3hpa7ylk4whifm8dp9hzfc46zdydwy")))) (build-system meson-build-system) (native-inputs (list autoconf -- cgit 1.4.1 From ceacf8e32f3671ab598c71e691b580a72af4e16e Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Thu, 18 Aug 2022 16:10:22 +0200 Subject: gnu: dezyne: Update to 2.16.0. * gnu/packages/dezyne.scm (dezyne): Update to 2.16.0. --- gnu/packages/dezyne.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/dezyne.scm b/gnu/packages/dezyne.scm index 5b79f0883a..413da49ece 100644 --- a/gnu/packages/dezyne.scm +++ b/gnu/packages/dezyne.scm @@ -31,14 +31,14 @@ (define-public dezyne (package (name "dezyne") - (version "2.15.4") + (version "2.16.0") (source (origin (method url-fetch) (uri (string-append "https://dezyne.org/download/dezyne/" name "-" version ".tar.gz")) (sha256 - (base32 "0d0jnnb3pgmspsz5qbgf33wsav5yp8wb45igns1sfinaz743n870")))) + (base32 "1x14jpv89dmrldar9g8pighbm68pvm4fvxz81mhjkimgf7kb4hbd")))) (inputs (list bash-minimal guile-3.0-latest guile-json-4 -- cgit 1.4.1 From 9cde566b9cd84c999c0074c906928e2cbef1ef30 Mon Sep 17 00:00:00 2001 From: Nguyễn Gia Phong Date: Wed, 3 Aug 2022 10:22:39 +0900 Subject: gnu: Add font-latin-modern. * gnu/packages/fonts.scm (font-latin-modern): New variable. Signed-off-by: Ricardo Wurmus --- gnu/packages/fonts.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 18ec0814bd..09445cd00c 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -51,6 +51,7 @@ ;;; Copyright © 2021 Liliana Marie Prikler ;;; Copyright © 2022 Jose G Perez Taveras ;;; Copyright © 2022 Hilton Chain +;;; Copyright © 2022 Nguyễn Gia Phong ;;; ;;; This file is part of GNU Guix. ;;; @@ -732,6 +733,26 @@ following fonts in the OpenType format: Adventor, Bonum, Chorus, Cursor, Heros, Pagella, Schola, Termes.") (license license:gfl1.0))) +(define-public font-latin-modern + (package + (name "font-latin-modern") + (version "2.004") + (source + (origin + (method url-fetch/zipbomb) + (uri (string-append "https://www.gust.org.pl/projects/e-foundry/" + "latin-modern/download/lm" version "otf.zip")) + (sha256 + (base32 "06qnvd6kh07gy2197vx3nmskhiqhp7ip9cpi2rkbwa1p3l2kc0jv")))) + (build-system font-build-system) + (home-page "https://www.gust.org.pl/projects/e-foundry/latin-modern") + (synopsis "OpenType fonts based on Computer Modern") + (description "The Latin Modern fonts are a set of scalable fonts based on +the PostScript Type 1 version of the Computer Modern fonts and contain many +additional characters (mostly accented ones). This package provides the +OpenType variant of these fonts.") + (license license:gfl1.0))) + (define-public font-amiri (package (name "font-amiri") -- cgit 1.4.1 From 975731e4093e419c7375216fe6e0f343680e1878 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 18 Aug 2022 11:58:46 -0400 Subject: gnu: linux-libre: Update to 5.18.18. * gnu/packages/linux.scm (linux-libre-5.18-version): Update to 5.18.18. (linux-libre-5.18-pristine-source, deblob-scripts-5.18): Update hashes. --- gnu/packages/linux.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index fb8b4fa5a8..8b33c1517f 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -352,17 +352,17 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The current "stable" kernels. That is, the most recently released major ;; versions that are still supported upstream. -(define-public linux-libre-5.18-version "5.18.16") +(define-public linux-libre-5.18-version "5.18.18") (define-public linux-libre-5.18-gnu-revision "gnu") (define deblob-scripts-5.18 (linux-libre-deblob-scripts linux-libre-5.18-version linux-libre-5.18-gnu-revision (base32 "09aikdhij4d89wqd8mmkdr0nrfwqz6dx3n74qm6wx815rfngd2dz") - (base32 "0vjpn8iw9yg39sr6jfhzyvivf159h9zfgnjamwa283zfll0h0a53"))) + (base32 "03w1p49rf7sqsxvwpdndqa0k9hc9748rplyqiiw1q6cbdjficwyw"))) (define-public linux-libre-5.18-pristine-source (let ((version linux-libre-5.18-version) - (hash (base32 "1khi1npn8d8jimwdy8bf3r7l780mxdmvk5azdv419pk33qjqdxgi"))) + (hash (base32 "0as0cslwz6zdiwd5wzcjggw3qpa9hzvfmxlhy72jdhn5vk47dhy1"))) (make-linux-libre-source version (%upstream-linux-source version hash) -- cgit 1.4.1 From de25c828feb6924699a545889bb7846b9e1fdadb Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 18 Aug 2022 11:59:25 -0400 Subject: gnu: linux-libre 5.15: Update to 5.15.61. * gnu/packages/linux.scm (linux-libre-5.15-version): Update to 5.15.61. (linux-libre-5.15-pristine-source, deblob-scripts-5.15): Update hashes. --- gnu/packages/linux.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 8b33c1517f..69af166c59 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -371,17 +371,17 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The "longterm" kernels — the older releases with long-term upstream support. ;; Here are the support timelines: ;; -(define-public linux-libre-5.15-version "5.15.59") +(define-public linux-libre-5.15-version "5.15.61") (define-public linux-libre-5.15-gnu-revision "gnu") (define deblob-scripts-5.15 (linux-libre-deblob-scripts linux-libre-5.15-version linux-libre-5.15-gnu-revision (base32 "1n57mz5agvf1d0ggbg080d7hvx8p9y0iqxkq4ypg10a7n96zy7y5") - (base32 "129qlhwdv2mfb85gbvq03kkbdfp73b444rryr4rrbvi0jmq4cp24"))) + (base32 "1qzmy0v040zj542zgs2569bpc7r1b77bf5gq1b3r5kffwpx900v3"))) (define-public linux-libre-5.15-pristine-source (let ((version linux-libre-5.15-version) - (hash (base32 "1jxw6fnc7yaw7r6193wy6l8wdlpy3frw48drnc3dnh3k0m1cdpg6"))) + (hash (base32 "0hpx0ziz162lc41jwi2ybj3qgidinjcsp71lchvmp6h0vyiddj9v"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.15))) -- cgit 1.4.1 From 876ebb852350a783709c8d32d6cdbb0cf4985a09 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 18 Aug 2022 11:59:56 -0400 Subject: gnu: linux-libre 5.10: Update to 5.10.136. * gnu/packages/linux.scm (linux-libre-5.10-version): Update to 5.10.136. (linux-libre-5.10-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 69af166c59..c28e101904 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -386,7 +386,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.15))) -(define-public linux-libre-5.10-version "5.10.135") +(define-public linux-libre-5.10-version "5.10.136") (define-public linux-libre-5.10-gnu-revision "gnu1") (define deblob-scripts-5.10 (linux-libre-deblob-scripts @@ -396,7 +396,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1981axxswghza3iadp94q54y8w30h9w9vyq4cbjiiv9alvbv0pb8"))) (define-public linux-libre-5.10-pristine-source (let ((version linux-libre-5.10-version) - (hash (base32 "0i1kahv739qpyyml7d7sx306nv7gp55i5d97vlb0fryfx4dsd6g4"))) + (hash (base32 "0naiwihlj6aswnqwdz3xzmga98xpj5lf2iy9vxqzdng7b46rs28w"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.10))) -- cgit 1.4.1 From 75a76ffffdeee53455fb01c010151dcd49997d15 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 18 Aug 2022 12:00:17 -0400 Subject: gnu: linux-libre 5.4: Update to 5.4.210. * gnu/packages/linux.scm (linux-libre-5.4-version): Update to 5.4.210. (linux-libre-5.4-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index c28e101904..910ad178fa 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -401,7 +401,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.10))) -(define-public linux-libre-5.4-version "5.4.209") +(define-public linux-libre-5.4-version "5.4.210") (define-public linux-libre-5.4-gnu-revision "gnu1") (define deblob-scripts-5.4 (linux-libre-deblob-scripts @@ -411,7 +411,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1vnjbdyssa7dwyjl9kg35alwvf7yh597cl74yr1wy2gk5bc9paw6"))) (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "1kdnz99k7zspzaxqaxahbf6hncigy4cvjlb79jsy7a95qxxr31qf"))) + (hash (base32 "13l8zh5balciqhi4k4328sznza30v8g871wxcqqka61cij3rc0wl"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) -- cgit 1.4.1 From 5feb567385849df168164959479a35bb8a5b9ceb Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 18 Aug 2022 12:00:35 -0400 Subject: gnu: linux-libre 4.19: Update to 4.19.255. * gnu/packages/linux.scm (linux-libre-4.19-version): Update to 4.19.255. (linux-libre-4.19-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 910ad178fa..2056082157 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -416,7 +416,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.4))) -(define-public linux-libre-4.19-version "4.19.254") +(define-public linux-libre-4.19-version "4.19.255") (define-public linux-libre-4.19-gnu-revision "gnu1") (define deblob-scripts-4.19 (linux-libre-deblob-scripts @@ -426,7 +426,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "00i91lx938nqlgy63hiricqd0fnbbf26vgya9c5lb7m1f4x324im"))) (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "1rd40wmdaymbly2zvf60mjqsflkd4n1y232qz0ixn1rfl28yz62i"))) + (hash (base32 "0hwa3g09cmllc2z01s2jqbczpznzdp3ldngx18k5c2ac7w394fbp"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -- cgit 1.4.1 From 517f0ed81301a5e06f0e750682dfbbef3d8e4899 Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Tue, 16 Aug 2022 10:05:26 +0800 Subject: gnu: Add rex. * gnu/packages/admin.scm (rex): New variable. --- gnu/packages/admin.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 35d3b53f24..a4c5189222 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -5454,3 +5454,40 @@ attempts, it cannot eliminate the risk presented by weak authentication. Set up services to use only two factor, or public/private authentication mechanisms if you really want to protect services.") (license license:gpl2+))) + +(define-public rex + (package + (name "rex") + (version "4.1") + (source (origin + (method url-fetch) + (uri (string-append + "https://download.gnu.org.ua/pub/releases/rex/rex-" + version ".tar.gz")) + (sha256 + (base32 + "1arb8z602invwavskq36nhwy42a3v14iyhi06iqlngfai2k93fai")))) + (build-system gnu-build-system) + (arguments + (list + #:tests? #f ; no tests + #:phases + #~(modify-phases %standard-phases + ;; No configure script and Makefile. + (delete 'configure) + (delete 'build) + (add-before 'install 'patch-exec-expect + (lambda _ + (substitute* "rex" + (("exec expect") (string-append "exec " (which "expect")))))) + (replace 'install + (lambda _ + (invoke "./install" + (string-append "--prefix=" #$output))))))) + (inputs (list expect)) + (home-page "https://www.gnu.org.ua/software/rex/") + (synopsis "Remote execution utility") + (description "@command{rex} runs a supplied command or shell script on +several hosts in succession or in parallel. It can also be used to copy a +file or files to several hosts.") + (license license:gpl3+))) -- cgit 1.4.1 From 0f090bdc48057197aecac5dc4eb4766d465e6945 Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Thu, 11 Aug 2022 14:37:49 +0800 Subject: gnu: Add rizin. * gnu/packages/engineering.scm (rizin): New variable. --- gnu/packages/engineering.scm | 57 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index f350da0042..892a05d5d0 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -67,6 +67,7 @@ #:use-module (guix build-system cmake) #:use-module (guix build-system emacs) #:use-module (guix build-system gnu) + #:use-module (guix build-system meson) #:use-module (guix build-system python) #:use-module (guix build-system qt) #:use-module (gnu packages) @@ -88,6 +89,7 @@ #:use-module (gnu packages digest) #:use-module (gnu packages docbook) #:use-module (gnu packages documentation) + #:use-module (gnu packages file) #:use-module (gnu packages flex) #:use-module (gnu packages fontutils) #:use-module (gnu packages fpga) @@ -142,6 +144,7 @@ #:use-module (gnu packages tbb) #:use-module (gnu packages tcl) #:use-module (gnu packages texinfo) + #:use-module (gnu packages text-editors) #:use-module (gnu packages tls) #:use-module (gnu packages tex) #:use-module (gnu packages version-control) @@ -3757,3 +3760,57 @@ form, numpad. @item Visualizing G-code files. @end itemize") (license license:gpl3+)))) + +(define-public rizin + (package + (name "rizin") + (version "0.4.0") + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/rizinorg/rizin/releases/download/v" + version "/rizin-src-v" version ".tar.xz")) + (sha256 + (base32 + "0nkb6v9lks25w5sv5s6p2ghgqnnnsf39md8nlx1cy4z89xlaisq9")))) + (build-system meson-build-system) + (arguments + (list + #:configure-flags + #~(list "-Dpackager=guix" + (string-append "-Dpackager_version=" #$version) + "-Duse_sys_capstone=enabled" + "-Duse_sys_magic=enabled" + "-Duse_sys_libzip=enabled" + "-Duse_sys_zlib=enabled" + "-Duse_sys_lz4=enabled" + "-Duse_sys_xxhash=enabled" + "-Duse_sys_openssl=enabled" + "-Duse_sys_tree_sitter=enabled" + "-Duse_sys_libuv=enabled" + "-Duse_gpl=true") + #:phases + #~(modify-phases %standard-phases + (add-before 'configure 'skip-integration-tests + (lambda _ + ;; Skip integration tests, which require prebuilt binaries at: + ;; . + ;; And 2 of them are failing, reported upstream: + ;; . + (substitute* "test/meson.build" + (("subdir\\('integration'\\)") ""))))))) + (native-inputs (list pkg-config)) + (inputs + (list capstone file libuv libzip lz4 openssl tree-sitter xxhash zlib)) + (home-page "https://rizin.re") + (synopsis "Disasm, debug, analyze and manipulate binary files") + (description + "Rizin is a reverse engineering framework and a set of small command-line +utilities, providing a complete binary analysis experience with features like +disassembler, hexadecimal editor, emulation, binary inspection, debugger, and +more.") + ;; Most files are under LGPL-3.0-only, other are under: Apache-2.0, + ;; BSD-2-Clause, BSD-3-Clause, CC0-1.0, CC-BY-SA-4.0, GPL-1.0-or-later, + ;; GPL-2.0-only, GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.0-or-later, + ;; LGPL-2.1-only, LGPL-2.1-or-later, LGPL-3.0-only, MIT, NCSA. + (license license:gpl3+))) -- cgit 1.4.1 From 89d427e4be35fe79c23e2785a55c19df781fb77e Mon Sep 17 00:00:00 2001 From: jgart Date: Thu, 18 Aug 2022 16:38:08 -0500 Subject: gnu: janet: Update to 1.24.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/lisp.scm (janet): Update to 1.24.0. Signed-off-by: 宋文武 --- gnu/packages/lisp.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 8a1be073ad..2f37b82ea5 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -1232,7 +1232,7 @@ including a built-in database engine and a GUI system.") (define-public janet (package (name "janet") - (version "1.23.0") + (version "1.24.0") (source (origin (method git-fetch) @@ -1241,7 +1241,7 @@ including a built-in database engine and a GUI system.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1qfahq1203kv5jxd0im7nxm3yy1p9k1wc0pk34b5h2sfships1hm")))) + (base32 "07kyjzbj5g197008n9qwpdnagylzlv8x4zbsf2d233mpskv3dixi")))) (build-system gnu-build-system) (arguments (list #:make-flags -- cgit 1.4.1 From 9d137c81edfde52210413e832edd34d214c96db5 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 19 Aug 2022 12:13:40 +0200 Subject: gnu: emacs-crdt: Update to 0.3.2. * gnu/packages/emacs-xyz.scm (emacs-crdt): Update to 0.3.2. --- gnu/packages/emacs-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index a93a5b1a3c..2ac4327cbb 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -19545,8 +19545,8 @@ never confused by comments or @code{foo-bar} matching @code{foo}.") (define-public emacs-crdt ;; XXX: Upstream does not always tag new releases. The commit below ;; corresponds exactly to latest version bump. - (let ((commit "7d8a6b13c2127c4302196030114fd6cd95fd6f49") - (version "0.3.1")) + (let ((commit "2feb88ea9a2589946014878790af585cad9f28fc") + (version "0.3.2")) (package (name "emacs-crdt") (version version) @@ -19558,7 +19558,7 @@ never confused by comments or @code{foo-bar} matching @code{foo}.") (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "0qs1pbv7skkgz9pdfq0k7sbdran1pal5ask29xf3kxdgx5qlv3x8")))) + (base32 "1fc98kl5qm7h5hrd70g61zzbdinnbf0zvk9rghf6w78ndp6lv7fz")))) (build-system emacs-build-system) (home-page "https://code.librehq.com/qhong/crdt.el") (synopsis "Real-time collaborative editing environment") -- cgit 1.4.1 From 65cabb010e3388d10f9b25ec560bfcfab5f810d4 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 19 Aug 2022 12:17:09 +0200 Subject: gnu: python-duniterpy: Update to 1.1.0. * gnu/packages/finance.scm (python-duniterpy): Update to 1.1.0. [propagated-inputs]: Remove PYTHON-AIOHTTP and PYTHON-PYLIBSCRYPT. --- gnu/packages/finance.scm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index bc886d9914..a851d74976 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2017–2021 Tobias Geerinckx-Rice ;;; Copyright © 2018 Eric Bavier ;;; Copyright © 2018 Adriano Peluso -;;; Copyright © 2018, 2019, 2020, 2021 Nicolas Goaziou +;;; Copyright © 2018, 2019, 2020, 2021, 2022 Nicolas Goaziou ;;; Copyright © 2018 Arun Isaac ;;; Copyright © 2019, 2020, 2021, 2022 Guillaume Le Vaillant ;;; Copyright © 2019 Tanguy Le Carrour @@ -1284,13 +1284,13 @@ Luhn and family of ISO/IEC 7064 check digit algorithms.") (define-public python-duniterpy (package (name "python-duniterpy") - (version "1.0.0") + (version "1.1.0") (source (origin (method url-fetch) (uri (pypi-uri "duniterpy" version)) (sha256 - (base32 "13kp2ph7fb1cdkx1y6j2h8q33fj2akc104l77ng52cy4v8jic9nz")))) + (base32 "18i5bqz58vjp740pxb4wb4ixg1g2d73cwi0d8gp85fmj5p8f2gx7")))) (build-system python-build-system) (arguments ;; FIXME: Tests fail with: "TypeError: block_uid() missing 1 required @@ -1303,13 +1303,11 @@ Luhn and family of ISO/IEC 7064 check digit algorithms.") (("mnemonic>=0\\.19,<0.20") "mnemonic>=0.19"))))))) (propagated-inputs - (list python-aiohttp - python-attrs + (list python-attrs python-base58 python-jsonschema python-libnacl python-pyaes - python-pylibscrypt python-graphql-core python-mnemonic python-websocket-client -- cgit 1.4.1 From 9f8d55870d8af49e1afb490fab2cc3927be6e036 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 16 Aug 2022 10:57:02 +0200 Subject: gnu: python-aiohttp: Disable tests that fail with Pytest 7. * gnu/packages/python-web.scm (python-aiohttp)[arguments]: Ignore three tests. --- gnu/packages/python-web.scm | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 59a3ee516d..d060d5b27c 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -363,6 +363,13 @@ for adding, removing and dropping callbacks.") ;; This test probably requires to be run with the ;; library loaded from the the build directory. "not test_c_parser_loaded and " + ;; TODO: These tests fail with recent versions of Pytest + ;; and the fix is difficult to backport: + ;; https://github.com/aio-libs/aiohttp/pull/6872 + ;; Re-enable after 3.9. + "not test_session_close_awaitable and " + "not test_async_with_session and " + "not test_close_run_until_complete_not_deprecated and " ;; Disable the following tests as they require ;; networking. "not TestDeflateBuffer and " -- cgit 1.4.1 From 6b627f0ebd88215dda1675c0f1cb3bc1b0828b0c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 16 Aug 2022 11:14:10 +0200 Subject: gnu: python-rq: Update to 1.11. * gnu/packages/databases.scm (python-rq): Update to 1.11. [native-inputs]: Add PYTHON-PSUTIL. --- gnu/packages/databases.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 837d31f946..27fc3d8f3e 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -3989,7 +3989,7 @@ reasonable substitute.") (define-public python-rq (package (name "python-rq") - (version "1.5.2") + (version "1.11") (source (origin (method git-fetch) @@ -3998,7 +3998,7 @@ reasonable substitute.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0ikqmpq0g1qiqwd7ar1286l4hqjb6aj2wr844gihhb8ijzwhp8va")))) + (base32 "1dj3m8dh9vf1qiq1drjhfw5xbr975v1kpzn4fwja83cfd7jrpzvy")))) (build-system python-build-system) (arguments '(#:phases (modify-phases %standard-phases @@ -4015,7 +4015,7 @@ reasonable substitute.") (getenv "PATH"))) (invoke "pytest" "-vv"))))))) (native-inputs - (list python-mock python-pytest redis)) + (list python-mock python-psutil python-pytest redis)) (propagated-inputs (list python-click python-redis)) (home-page "https://python-rq.org/") -- cgit 1.4.1 From e2feae7bef22ae2b96885a40d8450c781f2b3090 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 17 Aug 2022 12:37:45 +0200 Subject: gnu: varnish: Add release-monitoring-url. * gnu/packages/web.scm (varnish)[properties]: New field. --- gnu/packages/web.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 29b9da0096..834087fd5a 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5913,6 +5913,8 @@ deployments.") reverse proxy and load balancer. You install it in front of any server that speaks HTTP and configure it to cache the contents through an extensive configuration language.") + (properties + '((release-monitoring-url . "https://varnish-cache.org/releases/index.html"))) (license (list license:bsd-2 ;main distribution license:zlib ;lib/libvgz/* license:public-domain ;bin/varnishncsa/as64.c, include/miniobj.h -- cgit 1.4.1 From a7ca1a323433b76e6bdff8e8062d4966f130b550 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 17 Aug 2022 12:38:11 +0200 Subject: gnu: varnish: Update to 7.1.1. * gnu/packages/web.scm (varnish): Update to 7.1.1. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 834087fd5a..b4eda13a4a 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5846,13 +5846,13 @@ deployments.") (package (name "varnish") (home-page "https://varnish-cache.org/") - (version "7.0.1") + (version "7.1.1") (source (origin (method url-fetch) (uri (string-append home-page "_downloads/varnish-" version ".tgz")) (sha256 (base32 - "0q265fzarz5530g8lasvfpgks8z1kq1yh7rn88bn2qfly3pmpry4")))) + "14512fjjzwini3fics6sib9y83s45vlrpncamixqmmg7j0jvxbrc")))) (build-system gnu-build-system) (arguments `(#:configure-flags (list (string-append "LDFLAGS=-Wl,-rpath=" %output "/lib") -- cgit 1.4.1 From 29ba3898f9d51570c148ed5164e7f2840e867490 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 17 Aug 2022 12:39:13 +0200 Subject: gnu: hitch: Remove input labels. * gnu/packages/web.scm (hitch)[native-inputs]: Remove labels. --- gnu/packages/web.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index b4eda13a4a..49afdbd54a 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5739,14 +5739,14 @@ on the fly.") "$(ps -p $HITCH_PID -o state= | grep -qv '^Z$')")) #t))))) (native-inputs - `(("pkg-config" ,pkg-config) + (list pkg-config - ;; For tests. - ("curl" ,curl) - ("egrep" ,grep) - ("lsof" ,lsof) - ("procps" ,procps) - ("python" ,python))) + ;; For tests. + curl + grep + lsof + procps + python)) (inputs (list libev openssl)) (synopsis "Scalable TLS proxy") -- cgit 1.4.1 From 712b931d5064f51f834c55a45f2dda4e934e72c4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 17 Aug 2022 13:05:58 +0200 Subject: gnu: uBlock Origin: Update to 1.44.0. * gnu/packages/browser-extensions.scm (ublock-origin): Update to 1.44.0. --- gnu/packages/browser-extensions.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/browser-extensions.scm b/gnu/packages/browser-extensions.scm index 1012e4b643..63bd11b226 100644 --- a/gnu/packages/browser-extensions.scm +++ b/gnu/packages/browser-extensions.scm @@ -51,7 +51,7 @@ supported content to the Kodi media center.") (define ublock-origin (package (name "ublock-origin") - (version "1.43.0") + (version "1.44.0") (home-page "https://github.com/gorhill/uBlock") (source (origin (method git-fetch) @@ -62,7 +62,7 @@ supported content to the Kodi media center.") (file-name (git-file-name name version)) (sha256 (base32 - "0w0by41v1s1cbd3bfjlb7kxr2bl6r5z3jvizlx02x14hqlppma9k")))) + "0sws7xd8nvxnzcyw92i9sc5xv3hpqw1kzdj9vm8bhfxlh042l7ly")))) (build-system gnu-build-system) (outputs '("xpi" "firefox" "chromium")) (arguments -- cgit 1.4.1 From 005b088fa49cc2937bcca3d64de752a34e2ccd74 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 19 Aug 2022 13:09:22 +0200 Subject: gnu: ungoogled-chromium: Update to 104.0.5112.101-1. * gnu/packages/chromium.scm (%chromium-version): Set to 104.0.5112.101. (%ungoogled-origin, ungoogled-chromium): Update hashes. --- gnu/packages/chromium.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm index 52c84ebe8a..a5ce51a456 100644 --- a/gnu/packages/chromium.scm +++ b/gnu/packages/chromium.scm @@ -316,7 +316,7 @@ ;; run the Blink performance tests, just remove everything to save ~70MiB. '("third_party/blink/perf_tests")) -(define %chromium-version "104.0.5112.81") +(define %chromium-version "104.0.5112.101") (define %ungoogled-revision (string-append %chromium-version "-1")) (define %debian-revision "debian/102.0.5005.61-1") @@ -328,7 +328,7 @@ (file-name (git-file-name "ungoogled-chromium" %ungoogled-revision)) (sha256 (base32 - "0dvwh470h06x5a4p8kw22pi4lvch16knh90i2kh10y0wfggqz78w")))) + "0jy5hjn61p5mnbqns3jlybim7iy8w9cmzm3i84wn68cyyx1bk25m")))) (define %debian-origin (origin @@ -477,7 +477,7 @@ %chromium-version ".tar.xz")) (sha256 (base32 - "0x17jzzvn2aqx3ahqyi6ijyn70sn79kg648r0ks9m5gib1bbgf0y")) + "0nrghgngxdn9richjnxii9y94dg5zpwc3gd3vx609r4xaphibw30")) (modules '((guix build utils))) (snippet (force ungoogled-chromium-snippet)))) (build-system gnu-build-system) -- cgit 1.4.1 From 3138d3f3c919abc3cf450b19284e1f58598cc20e Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Sat, 6 Aug 2022 00:08:37 +0800 Subject: gnu: mu: Fix autoloads generation. * gnu/packages/mail.scm (mu)[arguments]<#:phases>: In the 'install-emacs-autoloads' phase, fix the path to mu4e files to generate autoloads. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/mail.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index b4b3162fff..530cd29f4d 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1201,7 +1201,7 @@ security functionality including PGP, S/MIME, SSH, and SSL.") (emacs-generate-autoloads "mu4e" (string-append (assoc-ref outputs "out") - "/share/emacs/site-lisp"))))))) + "/share/emacs/site-lisp/mu4e"))))))) (home-page "https://www.djcbsoftware.nl/code/mu/") (synopsis "Quickly find emails") (description -- cgit 1.4.1 From 03e7df49c429e08ce6ce46cf913bcc303a9541e0 Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Fri, 19 Aug 2022 13:33:20 +0800 Subject: gnu: mu: Use G-expressions. * gnu/packages/mail.scm (mu)[arguments]: Use G-expressions. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/mail.scm | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 530cd29f4d..646902b4db 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1179,29 +1179,30 @@ security functionality including PGP, S/MIME, SSH, and SSL.") (inputs (list glib gmime xapian)) (arguments - `(#:modules ((guix build meson-build-system) + (list + #:modules '((guix build meson-build-system) (guix build emacs-utils) (guix build utils)) - #:imported-modules (,@%meson-build-system-modules + #:imported-modules `(,@%meson-build-system-modules (guix build emacs-utils)) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-bin-references - (lambda _ - (substitute* '("guile/tests/test-mu-guile.cc" - "mu/tests/test-mu-cmd.cc" - "mu/tests/test-mu-cmd-cfind.cc" - "mu/tests/test-mu-query.cc") - (("/bin/sh") (which "sh"))) - (substitute* '("lib/tests/bench-indexer.cc" - "lib/utils/mu-test-utils.cc") - (("/bin/rm") (which "rm"))))) - (add-after 'install 'install-emacs-autoloads - (lambda* (#:key outputs #:allow-other-keys) - (emacs-generate-autoloads - "mu4e" - (string-append (assoc-ref outputs "out") - "/share/emacs/site-lisp/mu4e"))))))) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-bin-references + (lambda _ + (substitute* '("guile/tests/test-mu-guile.cc" + "mu/tests/test-mu-cmd.cc" + "mu/tests/test-mu-cmd-cfind.cc" + "mu/tests/test-mu-query.cc") + (("/bin/sh") (which "sh"))) + (substitute* '("lib/tests/bench-indexer.cc" + "lib/utils/mu-test-utils.cc") + (("/bin/rm") (which "rm"))))) + (add-after 'install 'install-emacs-autoloads + (lambda* (#:key outputs #:allow-other-keys) + (emacs-generate-autoloads + "mu4e" + (string-append (assoc-ref outputs "out") + "/share/emacs/site-lisp/mu4e"))))))) (home-page "https://www.djcbsoftware.nl/code/mu/") (synopsis "Quickly find emails") (description -- cgit 1.4.1 From e8b4e03e2945aa9556bee5cce0d47f55d8a96c07 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 14 Aug 2022 02:00:01 +0200 Subject: gnu: bear: Update to 3.0.20. * gnu/packages/build-tools.scm (bear): Update to 3.0.20. --- gnu/packages/build-tools.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index 1134b8eb3c..38a7ee2783 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -102,7 +102,7 @@ makes a few sacrifices to acquire fast full and incremental build times.") (define-public bear (package (name "bear") - (version "3.0.19") + (version "3.0.20") (source (origin (method git-fetch) @@ -111,7 +111,7 @@ makes a few sacrifices to acquire fast full and incremental build times.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "05jbcx5m923dg27j3i442hc73hdci5n7vp7a671x1w7bdivgqg96")))) + (base32 "0k89ccp9vz3x71w3r2wfpng9b8s0rxp4qr0ch9q32wq6y1ik847j")))) (build-system cmake-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit 1.4.1 From 6ce0ab08e29aeab16e4258dfb042ca0fa1168fd2 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 19 Aug 2022 22:09:48 +0200 Subject: gnu: emacs-modus-themes: Update to 2.6.0. * gnu/packages/emacs-xyz.scm (emacs-modus-themes): Update to 2.6.0. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 2ac4327cbb..a3a75c3e07 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -28106,7 +28106,7 @@ Emacs that integrate with major modes like Org-mode.") (define-public emacs-modus-themes (package (name "emacs-modus-themes") - (version "2.5.0") + (version "2.6.0") (source (origin (method git-fetch) @@ -28115,7 +28115,7 @@ Emacs that integrate with major modes like Org-mode.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0ng85240zabw87ac53xnrlrafp10ns5wn6dgv9d1jxvnq40p7zqz")))) + (base32 "1zl1gd3jlkanjmlsxmwhqaiwyblp6kzznfjnw9cq8ah2390y9n1c")))) (native-inputs (list texinfo)) (build-system emacs-build-system) (arguments -- cgit 1.4.1 From ec6122250de7c83a7e77054584a34767b11337db Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Fri, 19 Aug 2022 14:35:11 -0700 Subject: gnu: diffoscope: Update to 221. * gnu/packages/diffoscope.scm (diffoscope): Update to 221. --- gnu/packages/diffoscope.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm index 81d1a63652..645138c5d0 100644 --- a/gnu/packages/diffoscope.scm +++ b/gnu/packages/diffoscope.scm @@ -75,7 +75,7 @@ (define-public diffoscope (package (name "diffoscope") - (version "220") + (version "221") (source (origin (method git-fetch) @@ -84,7 +84,7 @@ (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0lkwbyf1z93skgqp1w4p0d7y8wwqf0bs53i43micwaq8p8xjs1ph")) + (base32 "0b89hygd4m18p3wcx7haz0kwx7gn7irjswxz29lv8sb2r1vqq4za")) (patches (search-patches "diffoscope-fix-llvm-test.patch")))) (build-system python-build-system) -- cgit 1.4.1 From 397b103bef313c84eb662051fbcd28e223806bd3 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Wed, 17 Aug 2022 17:03:30 -0700 Subject: gnu: directfb: Remove timestamp to build reproducibly. * gnu/packages/graphics.scm (directfb)[arguments]: Add 'remove-buildtime phase. --- gnu/packages/graphics.scm | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 1d6dd28c5c..1afaf687be 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -177,6 +177,11 @@ framebuffer graphics, audio output and input event.") (arguments `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'remove-buildtime + ;; Remove embedded build time for reproducible builds + (lambda _ + (substitute* "src/core/core.c" + (("..BUILDTIME..") "")))) (add-after 'unpack 'disable-configure-during-bootstrap (lambda _ (substitute* "autogen.sh" -- cgit 1.4.1 From d2b85f8906489fb95d8be41d6ba9fd520a5967d0 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Fri, 19 Aug 2022 17:22:30 -0700 Subject: gnu: libnet: Set man page date to built reproducibly. * gnu/packages/networking.scm (libnet)[argument]: Add 'fix-manpage-date phase. --- gnu/packages/networking.scm | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index f088b88c73..2fea1b2b59 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -3055,6 +3055,11 @@ interface and a programmable text output for scripting.") (arguments `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'fix-manpage-date + (lambda _ + ;; Replace current date with specific date to build reproducibly + (substitute* "doc/fixmanpages.in" + (("pod2man -d .* -n") "pod2man -d \"1970-01-01\" -n")))) (add-before 'build 'build-doc (lambda* (#:key make-flags #:allow-other-keys) (apply invoke "make" "-C" "doc" "doc" -- cgit 1.4.1 From f31e55d0819064557b9a2af687f05b131f5c4f26 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Fri, 19 Aug 2022 21:06:50 -0700 Subject: gnu: perl-class-methodmaker: Build reproducibly. * gnu/packages/patches/perl-class-methodmaker-reproducible.patch: New file. * gnu/local.mk (dist_patch_DATA): Add patch. * gnu/packages/perl.scm (perl-class-methodmaker)[source]: Use patch. --- gnu/local.mk | 1 + .../perl-class-methodmaker-reproducible.patch | 21 +++++++++++++++++++++ gnu/packages/perl.scm | 4 +++- 3 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/perl-class-methodmaker-reproducible.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 4e4ad908ce..26dfb6afe2 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1624,6 +1624,7 @@ dist_patch_DATA = \ %D%/packages/patches/perl-5.14-module-pluggable-search.patch \ %D%/packages/patches/perl-5.14-no-sys-dirs.patch \ %D%/packages/patches/perl-autosplit-default-time.patch \ + %D%/packages/patches/perl-class-methodmaker-reproducible.patch \ %D%/packages/patches/perl-finance-quote-unuse-mozilla-ca.patch \ %D%/packages/patches/perl-image-exiftool-CVE-2021-22204.patch \ %D%/packages/patches/perl-net-amazon-s3-moose-warning.patch \ diff --git a/gnu/packages/patches/perl-class-methodmaker-reproducible.patch b/gnu/packages/patches/perl-class-methodmaker-reproducible.patch new file mode 100644 index 0000000000..29a71babd1 --- /dev/null +++ b/gnu/packages/patches/perl-class-methodmaker-reproducible.patch @@ -0,0 +1,21 @@ +Description: make build reproducible by sorting hash keys + cf. https://reproducible.debian.net/dbd/unstable/amd64/libclass-methodmaker-perl_2.21-1.debbindiff.html +Origin: vendor +Bug-Debian: https://bugs.debian.org/778979 +Author: Chris Lamb +Reviewed-by: gregor herrmann +Last-Update: 2015-05-02 +Forwarded: https://rt.cpan.org/Ticket/Display.html?id=104163 +Bug: https://rt.cpan.org/Ticket/Display.html?id=104163 + +--- a/lib/Class/MethodMaker/OptExt.pm ++++ b/lib/Class/MethodMaker/OptExt.pm +@@ -357,7 +357,7 @@ + + # ------------------------------------- + +-sub option_names { grep $_ ne 'DEFAULT', keys %{OPTEXT()} } ++sub option_names { grep $_ ne 'DEFAULT', sort keys %{OPTEXT()} } + + sub optcode { + my $class = shift; diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index f9a95e818d..42c7d18c9d 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -1601,7 +1601,9 @@ Class::Load.") version ".tar.gz")) (sha256 (base32 - "0a03i4k3a33qqwhykhz5k437ld5mag2vq52vvsy03gbynb65ivsy")))) + "0a03i4k3a33qqwhykhz5k437ld5mag2vq52vvsy03gbynb65ivsy")) + (patches (search-patches + "perl-class-methodmaker-reproducible.patch")))) (build-system perl-build-system) (home-page "https://metacpan.org/release/Class-MethodMaker") (synopsis "Create generic methods for OO Perl") -- cgit 1.4.1 From e16fcc748457b6340d745e18e699cd3ba1e35fa5 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Sat, 20 Aug 2022 09:47:37 +0200 Subject: gnu: electron-cash: Update to 4.2.11. * gnu/packages/finance.scm (electron-cash): Update to 4.2.11. --- gnu/packages/finance.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index a851d74976..849f9aba99 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -626,7 +626,7 @@ other machines/servers. Electrum does not download the Bitcoin blockchain.") (define-public electron-cash (package (name "electron-cash") - (version "4.2.10") + (version "4.2.11") (source (origin (method git-fetch) @@ -635,7 +635,7 @@ other machines/servers. Electrum does not download the Bitcoin blockchain.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0axpypq9byda61rp3sznrq24b24qxbfwk56j75qp06s1ackg0pcv")))) + (base32 "1g0xnb63c52l379zrqkfhxlkg1d2hf2dgjs2swspa0vah845r282")))) (build-system python-build-system) (arguments (list -- cgit 1.4.1 From 2bba9c40caae1e8a0b89b56e834369194490f54c Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 15 Aug 2022 18:02:59 +0200 Subject: gnu: opam: Update to 2.1.3. * gnu/packages/ocaml.scm (opam): Update to 2.1.3. --- gnu/packages/ocaml.scm | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 3f123219f7..eb60cd00f0 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -778,7 +778,7 @@ the opam file format.") (define-public opam (package (name "opam") - (version "2.1.2") + (version "2.1.3") (source (origin (method git-fetch) (uri (git-reference @@ -787,7 +787,7 @@ the opam file format.") (file-name (git-file-name name version)) (sha256 (base32 - "0mdr32mg63yaw89p44zx8b9dxp1167ckmlxkp8svd6fwgb3z49yx")))) + "1mw535zsw7xlvpgwnk1dan76z3f7lh5imlg0s6kdyhfg0iqisjd7")))) (build-system dune-build-system) (arguments `(#:test-target "." @@ -822,6 +822,12 @@ the opam file format.") ;; home directory. (mkdir-p "test-home") (setenv "HOME" (string-append (getcwd) "/test-home")) + (with-output-to-file (string-append (getcwd) "/test-home/.gitconfig") + (lambda _ + (display "[user] +email = guix@localhost.none +name = Guix Builder") + (newline))) ;; Opam tests require data from opam-repository. Instead of ;; downloading them with wget from the guix environment, copy the @@ -832,11 +838,17 @@ the opam file format.") (assoc-ref inputs (string-append "opam-repo-" commit)) "/ %{targets}) (run chmod +w -R %{targets}")) (("wget[^)]*") "touch %{targets}") - ;; Disable a failing test because of different line wrapping - (("diff cli-versioning.test cli-versioning.out") "run true") ;; Disable a failing test because it tries to clone a git ;; repository from inside bwrap - (("diff upgrade-format.test upgrade-format.out") "run true")) + (("diff upgrade-format.test upgrade-format.out") "run true") + ;; Disable a failing test because it tries to figure out which + ;; distro this is, and it doesn't know Guix + (("diff pin.unix.test pin.unix.out") "run true") + ;; Disable a failing test because of a failed expansion + (("diff opamroot-versions.test opamroot-versions.out") "run true") + ;; Disable a failing test, probably because the repository we + ;; replaced is not as expected + (("diff opamrt-big-upgrade.test opamrt-big-upgrade.out") "run true")) (substitute* "tests/reftests/dune" ;; Because of our changes to the previous file, we cannot check ;; it can be regenerated @@ -874,6 +886,10 @@ the opam file format.") ;; Data for tests ("opam-repo-009e00fa" ,(opam-repo "009e00fa86300d11c311309a2544e5c6c3eb8de2" "1wwy0rwrsjf4q10j1rh1dazk32fbzhzy6f7zl6qmndidx9b1bq7w")) + ("opam-repo-7090735c" ,(opam-repo "7090735c9d1dd2dc481c4128c5ef4d3667238f15" + "1bccsgjhlp64lmvfjfn6viywf3x73ji75myg9ssf1ij1fkmabn0z")) + ("opam-repo-a5d7cdc0" ,(opam-repo "a5d7cdc0c91452b0aef4fa71c331ee5237f6dddd" + "0z7kawqisy07088p5xjxwpvmvzlbj1d9cgdipsj90yx7nc5qh369")) ("opam-repo-ad4dd344" ,(opam-repo "ad4dd344fe5cd1cab49ced49d6758a9844549fb4" "1a1qj47kj8xjdnc4zc50ijrix1kym1n7k20n3viki80a7518baw8")) ("opam-repo-c1d23f0e" ,(opam-repo "c1d23f0e17ec83a036ebfbad1c78311b898a2ca0" -- cgit 1.4.1 From 078d880f8fa52a33064dc1eb323e6547e10e651d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 14 Aug 2022 02:00:00 +0200 Subject: gnu: sqlitebrowser: Fix description. * gnu/packages/databases.scm (sqlitebrowser)[synopsis]: Include more keywords. [description]: Bring up to snuff. --- gnu/packages/databases.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 27fc3d8f3e..26f771de24 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -4815,9 +4815,9 @@ a Gtk.Grid Widget.") sqlite)) (native-inputs (list qttools-5)) (home-page "https://sqlitebrowser.org/") - (synopsis "Database browser for SQLite") - (description "Sqlitebrowser is a high quaility, visual, open source tool to -create design, and edit database file compatible with SQLite.") + (synopsis "Visual database browser and editor for SQLite") + (description "Sqlitebrowser lets you create, design, and edit database files +compatible with SQLite using a graphical user interface.") (license ;; dual license (list license:gpl3+ -- cgit 1.4.1 From 5a9c2abf9ecd47f4481c68cc5e57a85c84313645 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 14 Aug 2022 02:00:00 +0200 Subject: gnu: Remove ‘open source’ from package descriptions. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also do some (trivial) editing where appropriate. * gnu/packages/bioconductor.scm (r-anaquin, r-rcppnumerical) [description]: Remove superfluous ‘open source’. * gnu/packages/debian.scm (apt-mirror)[description]: Likewise. Add @acronym{}. Drop obscure Ubuntu for famous Trisquel. Reorder. * gnu/packages/documentation.scm (scrollkeeper)[description]: Remove superfluous ‘open systems’. Keep ‘Open Source’ in standard name. * gnu/packages/engineering.scm (freecad, cura-engine)[description]: Remove superfluous ‘open source’ and excessive puffery. * gnu/packages/firmware.scm (make-opensbi-package) [synopsis]: Remove ‘Open Source’. Use @acronym{}. [description]: Fix first sentence to follow guidelines. Use @acronym{}. * gnu/packages/game-development.scm (ioquake3, recastnavigation): [description]: Remove ‘open source’. * gnu/packages/graphics.scm (skia)[description]: Likewise. * gnu/packages/lisp-xyz.scm (sbcl-s-sysdeps)[description]: Likewise. * gnu/packages/machine-learning.scm (onnx)[description]: Likewise. Use @acronym{}. * gnu/packages/ocaml.scm (ocaml-cudf)[description]: Likewise. --- gnu/packages/bioconductor.scm | 11 ++++++----- gnu/packages/debian.scm | 6 +++--- gnu/packages/documentation.scm | 12 ++++++------ gnu/packages/engineering.scm | 19 +++++++++---------- gnu/packages/firmware.scm | 8 +++++--- gnu/packages/game-development.scm | 7 ++----- gnu/packages/graphics.scm | 5 +++-- gnu/packages/lisp-xyz.scm | 2 +- gnu/packages/machine-learning.scm | 8 ++++---- gnu/packages/ocaml.scm | 6 +++--- 10 files changed, 42 insertions(+), 42 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 111bd65823..7d2ca413e9 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -2091,8 +2091,8 @@ canonical cancer pathways.") (description "The project is intended to support the use of @dfn{sequins}(synthetic sequencing spike-in controls) owned and made available by the Garvan Institute -of Medical Research. The goal is to provide a standard open source library for -quantitative analysis, modelling and visualization of spike-in controls.") +of Medical Research. The goal is to provide a standard library for quantitative +analysis, modelling, and visualization of spike-in controls.") (license license:bsd-3))) (define-public r-aneufinder @@ -6542,9 +6542,10 @@ problems in genomics, brain imaging, astrophysics, and data mining.") `(("r-knitr" ,r-knitr))) (home-page "https://github.com/yixuan/RcppNumerical") (synopsis "Rcpp integration for numerical computing libraries") - (description "This package provides a collection of open source libraries -for numerical computing (numerical integration, optimization, etc.) and their -integration with @code{Rcpp}.") + (description + "This package provides a collection of libraries for numerical computing +(numerical integration, optimization, etc.) and their integration with +@code{Rcpp}.") (license license:gpl2+))) (define-public r-apeglm diff --git a/gnu/packages/debian.scm b/gnu/packages/debian.scm index 5ff09393b9..67b66be38d 100644 --- a/gnu/packages/debian.scm +++ b/gnu/packages/debian.scm @@ -331,9 +331,9 @@ debian/copyright for more information."))))) (home-page "http://apt-mirror.github.io/") (synopsis "Script for mirroring a Debian repository") (description - "apt-mirror is a small tool that provides the ability to -selectively mirror Debian and Ubuntu GNU/Linux distributions or any -other apt sources typically provided by open source developers.") + "apt-mirror is a small tool that provides the ability to selectively +mirror @acronym{APT, advanced package tool} sources, including GNU/Linux +distributions such as Debian and Trisquel.") (license license:gpl2)))) (define-public dpkg diff --git a/gnu/packages/documentation.scm b/gnu/packages/documentation.scm index 6f24149b5d..585a295fb4 100644 --- a/gnu/packages/documentation.scm +++ b/gnu/packages/documentation.scm @@ -338,12 +338,12 @@ additional metadata about the object to which the docstring belongs.") (list intltool)) (home-page "http://scrollkeeper.sourceforge.net/") (synopsis "Open Documentation Cataloging Project") - (description "ScrollKeeper is a cataloging system for documentation on open -systems. It manages documentation metadata as specified by the Open Source -Metadata Framework and provides a simple API to allow help browsers to find, -sort, and search the document catalog. It will also be able to communicate -with catalog servers on the Net to search for documents which are not on the -local system.") + (description + "ScrollKeeper is a cataloging system for documentation. It manages +documentation metadata as specified by the Open Source Metadata Framework and +provides a simple API to allow help browsers to find, sort, and search the +document catalog. It will also be able to communicate with catalog servers on +the Net to search for documents which are not on the local system.") (license lgpl2.1+))) (define-public zeal diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 892a05d5d0..f195179413 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -2527,12 +2527,11 @@ comments."))) (home-page "https://www.freecadweb.org/") (synopsis "Your Own 3D Parametric Modeler") (description - "FreeCAD is a general purpose feature-based, parametric 3D modeler for -CAD, MCAD, CAx, CAE and PLM, aimed directly at mechanical engineering and -product design but also fits a wider range of uses in engineering, such as -architecture or other engineering specialties. It is 100% Open Source (LGPL2+ -license) and extremely modular, allowing for very advanced extension and -customization.") + "FreeCAD is a general-purpose, feature-based, parametric 3D modeler for +CAD, MCAD, CAx, CAE, and PLM. It is aimed directly at mechanical engineering +and product design but also fits a wider range of uses in engineering, such as +architecture or other engineering specialties. It is modular, allowing for +extension and customization.") (license (list license:lgpl2.1+ @@ -3355,10 +3354,10 @@ facilitate the communication between Cura and its backend and similar code.") "stb_image.h"))))))) (home-page "https://github.com/Ultimaker/CuraEngine") (synopsis "Cura slicing engine") - (description "CuraEngine is a powerful, fast and robust engine for -processing 3D models into 3D printing instruction for Ultimaker and other -GCode based 3D printers. It is part of the larger open source project called -Cura.") + (description + "CuraEngine is an engine for processing 3D models into 3D printing +instructions for Ultimaker and other GCode-based 3D printers. It is part of a +larger project called Cura.") (license license:agpl3+))) (define-public cura-binary-data diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index a258af30bf..3ba5078b63 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -265,9 +265,11 @@ broadband modem as found, for example, on PinePhone.") bin)) #t))))) (home-page "https://github.com/riscv-software-src/opensbi") - (synopsis "RISC-V Open Source Supervisor Binary Interface") - (description "A reference implementation of the RISC-V SBI specifications -for platform-specific firmwares executing in M-mode.") + (synopsis "RISC-V @acronym{SBI, Supervisor Binary Interface} implementation") + (description + "OpenSBI is the reference implementation of the RISC-V @acronym{SBI, +Supervisory Binary Interface} specifications for platform-specific firmwares +executing in M-mode.") (license (list license:bsd-2 ;; lib/utils/libfdt/* is dual licensed under bsd-2 and gpl2+. license:gpl2+ diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 7f05d8ed06..7b2fb8dac3 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -2187,9 +2187,8 @@ of the others") (description "ioquake3 is a free software first person shooter engine based on the Quake 3: Arena and Quake 3: Team Arena source code. Compared to the original, ioquake3 has been cleaned up, bugs have been fixed and features -added. The permanent goal is to create the open source Quake 3 distribution -upon which people base their games, ports to new platforms, and other -projects.") +added. The permanent goal is to create a Quake 3 distribution upon which +people base their games, ports to new platforms, and other projects.") (license license:gpl2)))) (define-public instead @@ -2806,8 +2805,6 @@ construction toolset for games. @item It is automatic, which means that you can throw any level geometry at it and you will get robust mesh out. @item It is fast which means swift turnaround times for level designers. -@item It is open source so it comes with full source and you can - customize it to your heart's content. @end itemize The Recast process starts with constructing a voxel mold from a level diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 1afaf687be..9a378e76a6 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -1948,8 +1948,9 @@ Cflags: -I${includedir}~%" #$output #$version)))))))) (inputs (list expat fontconfig freetype harfbuzz mesa libwebp zlib)) (home-page "https://skia.org/") (synopsis "2D graphics library") - (description "Skia is an open source 2D graphics library. It can be -used for drawing text, geometries, and images and has support for: + (description + "Skia is a 2D graphics library for drawing text, geometries, and images. +It supports: @itemize @item 3x3 matrices with perspective @item antialiasing, transparency, filters diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index cdd4d479ac..6018c4deff 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -6831,7 +6831,7 @@ extension-points via the concept of hooks.") (synopsis "Common Lisp abstraction layer over platform dependent functionality") (description "@code{s-sysdeps} is an abstraction layer over platform dependent functionality. This simple package is used as a building block in a -number of other open source projects. +number of other projects. @code{s-sysdeps} abstracts: diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index cd0640cd27..c61428486c 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -828,10 +828,10 @@ in terms of new algorithms.") (home-page "https://onnx.ai/") (synopsis "Open Neural Network Exchange") (description - "Open Neural Network Exchange (ONNX) provides an open source format for -AI models, both deep learning and traditional ML. It defines an extensible -computation graph model, as well as definitions of built-in operators and -standard data types.") + "@acronym{ONNX, Open Neural Network Exchange} is a format for AI models, +both deep learning and traditional @acronym{ML, machine learning}. It defines +an extensible computation graph model, as well as definitions of built-in +operators and standard data types.") (license license:expat))) (define-public python-onnx diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index eb60cd00f0..79df84054f 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -608,9 +608,9 @@ for day to day programming.") (native-inputs (list ocaml-ounit2)) (home-page "https://www.mancoosi.org/cudf/") (synopsis "CUDF library (part of the Mancoosi tools)") - (description "CUDF (for Common Upgradeability Description Format) is a -format for describing upgrade scenarios in package-based Free and Open Source -Software distribution.") + (description + "@acronym{CUDF, Common Upgradeability Description Format} is a format for +describing upgrade scenarios in package-based software distributions.") ;; With static-linking exception (license license:lgpl2.1+))) -- cgit 1.4.1 From ee2657a018b5972ec41280abb215c6ba45c0a6fc Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 14 Aug 2022 02:00:00 +0200 Subject: gnu: ioquake3: Remove input labels. * gnu/packages/game-development.scm (ioquake3)[inputs]: Remove input labels. --- gnu/packages/game-development.scm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 7b2fb8dac3..e4a7ce1ae1 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -2152,15 +2152,15 @@ of the others") "1vflk028z9gccg5yfi5451y1k5wxjdh3qbhjf4x6r7w2pzlxh16z")))) (build-system gnu-build-system) (inputs - `(("sdl2" ,sdl2) - ("libjpeg" ,libjpeg-turbo) - ("openal" ,openal) - ("curl" ,curl) - ("opusfile" ,opusfile) - ("opus" ,opus) - ("libvorbis" ,libvorbis) - ("freetype" ,freetype) - ("libogg" ,libogg))) + (list curl + freetype + libjpeg-turbo + libogg + libvorbis + openal + opus + opusfile + sdl2)) (native-inputs (list which ; Else SDL_version.h won't be found. pkg-config)) -- cgit 1.4.1 From 466021fb90d88ef9cecbb8cd491e7991bae1b6e5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 14 Aug 2022 02:00:01 +0200 Subject: gnu: ioquake3: Use G-expressions. * gnu/packages/game-development.scm (ioquake3)[arguments]: Rewrite as G-expressions. --- gnu/packages/game-development.scm | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index e4a7ce1ae1..774564ed2a 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -2165,23 +2165,25 @@ of the others") (list which ; Else SDL_version.h won't be found. pkg-config)) (arguments - '(#:tests? #f ; No tests. - #:make-flags '("CC=gcc" + (list + #:tests? #f ; no tests + #:make-flags + #~(list "CC=gcc" + "USE_INTERNAL_LIBS=0" + "USE_FREETYPE=1" + "USE_RENDERER_DLOPEN=0" + "USE_OPENAL_DLOPEN=0" + "USE_CURL_DLOPEN=0") + #:phases + #~(modify-phases %standard-phases + (delete 'configure) ; no configure-script + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (invoke "make" "copyfiles" "CC=gcc" "USE_INTERNAL_LIBS=0" - "USE_FREETYPE=1" - "USE_RENDERER_DLOPEN=0" - "USE_OPENAL_DLOPEN=0" - "USE_CURL_DLOPEN=0") - #:phases - (modify-phases %standard-phases - (delete 'configure) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (invoke "make" "copyfiles" "CC=gcc" - "USE_INTERNAL_LIBS=0" - (string-append "COPYDIR=" - (assoc-ref outputs "out") - "/bin"))))))) + (string-append "COPYDIR=" + (assoc-ref outputs "out") + "/bin"))))))) (home-page "https://ioquake3.org/") (synopsis "FPS game engine based on Quake 3") (description "ioquake3 is a free software first person shooter engine -- cgit 1.4.1 From 5456a144c70ec11723b7400d9c47ea3abdcf8eed Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 14 Aug 2022 02:00:00 +0200 Subject: gnu: ioquake3: Deduplicate make flags. * gnu/packages/game-development.scm (ioquake3)[arguments]: Honour #:make-flags in the 'install phase. --- gnu/packages/game-development.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 774564ed2a..0a78ec6ad2 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -2178,12 +2178,12 @@ of the others") #~(modify-phases %standard-phases (delete 'configure) ; no configure-script (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (invoke "make" "copyfiles" "CC=gcc" - "USE_INTERNAL_LIBS=0" - (string-append "COPYDIR=" - (assoc-ref outputs "out") - "/bin"))))))) + (lambda* (#:key make-flags outputs #:allow-other-keys) + (apply invoke "make" "copyfiles" + (string-append "COPYDIR=" + (assoc-ref outputs "out") + "/bin") + make-flags)))))) (home-page "https://ioquake3.org/") (synopsis "FPS game engine based on Quake 3") (description "ioquake3 is a free software first person shooter engine -- cgit 1.4.1 From 86123955543be653f5631620f478561f07333e55 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 14 Aug 2022 02:00:01 +0200 Subject: gnu: ioquake3: Prepare for cross-compilation. * gnu/packages/game-development.scm (ioquake3)[arguments]: Use CC-FOR-TARGET. --- gnu/packages/game-development.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 0a78ec6ad2..397abadc5d 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -2168,7 +2168,7 @@ of the others") (list #:tests? #f ; no tests #:make-flags - #~(list "CC=gcc" + #~(list (string-append "CC=" #$(cc-for-target)) "USE_INTERNAL_LIBS=0" "USE_FREETYPE=1" "USE_RENDERER_DLOPEN=0" -- cgit 1.4.1 From 784c00d7fb422377a9e5609d514a5e7a1aae9d20 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 14 Aug 2022 02:00:01 +0200 Subject: gnu: ioquake3: Update to 1.3.6-2.29b0cc3. * gnu/packages/game-development.scm (ioquake3): Update to 1.3.6-2.29b0cc3. --- gnu/packages/game-development.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 397abadc5d..661e1c0e07 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -2136,10 +2136,11 @@ of the others") (define-public ioquake3 ;; We follow master since it seems that there won't be releases after 1.3.6. - (let ((commit "95b9cab4d644fa3bf757cfff821cc4f7d76e38b0")) + (let ((revision "2") + (commit "29b0cc3a4d037046eb3247fc04f4b703f6a33452")) (package (name "ioquake3") - (version (git-version "1.3.6" "1" commit)) + (version (git-version "1.3.6" revision commit)) (source (origin (method git-fetch) @@ -2148,8 +2149,7 @@ of the others") (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 - "1vflk028z9gccg5yfi5451y1k5wxjdh3qbhjf4x6r7w2pzlxh16z")))) + (base32 "0fqq2qpnrgpgf3gs71wvxlkcihxcrvhvllh88ii4ip134c1qbs9q")))) (build-system gnu-build-system) (inputs (list curl @@ -2162,7 +2162,7 @@ of the others") opusfile sdl2)) (native-inputs - (list which ; Else SDL_version.h won't be found. + (list which ; else SDL_version.h won't be found. pkg-config)) (arguments (list -- cgit 1.4.1 From e5baa4ad04ca7d1b78255782c3ec11282b56cd3b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 14 Aug 2022 02:00:00 +0200 Subject: gnu: memcached: Update to 1.6.16. * gnu/packages/databases.scm (memcached): Update to 1.6.16. --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 26f771de24..82a3f22b7c 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -481,14 +481,14 @@ mapping from string keys to string values.") (define-public memcached (package (name "memcached") - (version "1.6.15") + (version "1.6.16") (source (origin (method url-fetch) (uri (string-append "https://memcached.org/files/memcached-" version ".tar.gz")) (sha256 - (base32 "05fmds73hr71bha9gszjfp02lgyacqfyyhkgl6xysy4kchyvwyld")))) + (base32 "1nilmfhy8hc7zzlihnx3hmiqf7siyrpgz2g5s3r3l36xy4xsjl9h")))) (build-system gnu-build-system) (inputs (list libevent cyrus-sasl)) -- cgit 1.4.1 From acb38e3fdb19d58f93c071670ed3a92eca63b3ff Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 17 Jul 2022 02:00:06 +0200 Subject: gnu: guile2.0-bash: Update source & home page URI. * gnu/packages/guile-xyz.scm (guile2.0-bash)[home-page]: Use working URL. [source]: Likewise, and don't re-use HOME-PAGE. --- gnu/packages/guile-xyz.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 72b4b87d44..a032824ca1 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -417,13 +417,11 @@ dictionary and suggesting spelling corrections.") (package (name "guile2.0-bash") (version (string-append "0.1.6-" revision "." (string-take commit 7))) - (home-page - "https://anonscm.debian.org/cgit/users/kaction-guest/retired/dev.guile-bash.git") (source (origin (method git-fetch) (uri (git-reference (commit commit) - (url home-page))) + (url "https://git.sr.ht/~kaction/guile-bash"))) (sha256 (base32 "097vny990wp2qpjij6a5a5gwc6fxzg5wk56inhy18iki5v6pif1p")) @@ -454,6 +452,7 @@ dictionary and suggesting spelling corrections.") ("bash-full" ,bash))) (inputs `(("guile" ,guile-2.0) ("bash:include" ,bash "include"))) + (home-page "https://git.sr.ht/~kaction/guile-bash") (synopsis "Extend Bash using Guile") (description "Guile-Bash provides a shared library and set of Guile modules, -- cgit 1.4.1 From f4012ed2376227a8774d6dd2220cbc852487897a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 14 Aug 2022 02:00:01 +0200 Subject: gnu: guile2.0-bash: Remove native-input labels. * gnu/packages/guile-xyz.scm (guile2.0-bash)[native-inputs]: Remove input labels. --- gnu/packages/guile-xyz.scm | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index a032824ca1..780c88ba3a 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -440,16 +440,13 @@ dictionary and suggesting spelling corrections.") ;; Install 'lib/bash' as Bash 4.4 expects. (string-append "--libdir=" (assoc-ref %outputs "out") "/lib/bash")))) - (native-inputs `(("pkg-config" ,pkg-config) - ("autoconf" ,autoconf) - ("automake" ,automake) - ("libtool" ,libtool) - ;; Gettext brings 'AC_LIB_LINKFLAGS_FROM_LIBS'. - ("gettext" ,gettext-minimal) - - ;; Bash with loadable module support, for the test - ;; suite. - ("bash-full" ,bash))) + (native-inputs + (list autoconf + automake + bash ; with loadable module support, for tests + gettext-minimal ; for AC_LIB_LINKFLAGS_FROM_LIBS + libtool + pkg-config)) (inputs `(("guile" ,guile-2.0) ("bash:include" ,bash "include"))) (home-page "https://git.sr.ht/~kaction/guile-bash") -- cgit 1.4.1 From 19d576c645a822a22fc82fb8aef35405628a1b98 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 14 Aug 2022 02:00:01 +0200 Subject: gnu: guile2.0-bash: Use G-expressions. * gnu/packages/guile-xyz.scm (guile2.0-bash)[arguments]: Rewrite as G-expressions. --- gnu/packages/guile-xyz.scm | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 780c88ba3a..98f2fac5cf 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -428,18 +428,15 @@ dictionary and suggesting spelling corrections.") (file-name (string-append name "-" version "-checkout")))) (build-system gnu-build-system) (arguments - '(#:configure-flags - ;; Add -I to match 'bash.pc' of Bash 4.4. - (list (string-append "CPPFLAGS=-I" - (assoc-ref %build-inputs "bash:include") - "/include/bash/include") - - ;; The '.a' file is useless. - "--disable-static" - - ;; Install 'lib/bash' as Bash 4.4 expects. - (string-append "--libdir=" (assoc-ref %outputs "out") - "/lib/bash")))) + (list + #:configure-flags + #~(list (string-append "CPPFLAGS=-I" ; match bash.pc + (assoc-ref %build-inputs "bash:include") + "/include/bash/include") + ;; The '.a' file is useless. + "--disable-static" + ;; Install 'lib/bash' as Bash 4.4 expects. + (string-append "--libdir=" #$output "/lib/bash")))) (native-inputs (list autoconf automake -- cgit 1.4.1 From ae74b3020ca0f5fd2a714cfd14ac949833dcd69d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 17 Jul 2022 02:00:00 +0200 Subject: gnu: guile-bash: Modernise. * gnu/packages/guile-xyz.scm (guile-bash)[inputs]: Use MODIFY-INPUTS. [arguments]: Use SUBSTITUTE-KEYWORD-ARGUMENTS. --- gnu/packages/guile-xyz.scm | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 98f2fac5cf..a85c7e0fc4 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -476,19 +476,20 @@ and then run @command{scm example.scm}.") (inherit guile2.0-bash) (name "guile-bash") (inputs - `(("guile" ,guile-3.0-latest) - ,@(assoc-remove! (package-inputs guile2.0-bash) "guile"))) + (modify-inputs (package-inputs guile2.0-bash) + (replace "guile" guile-3.0-latest))) (arguments - `(#:tests? #f - #:phases (modify-phases %standard-phases - (add-after 'install 'install-guile - (lambda* (#:key inputs outputs #:allow-other-keys) - (copy-recursively - (string-append (assoc-ref outputs "out") - (assoc-ref inputs "guile") "/share") - (string-append (assoc-ref outputs "out") "/share")) - #t))) - ,@(package-arguments guile2.0-bash))))) + (substitute-keyword-arguments (package-arguments guile2.0-bash) + ;; XXX The tests succeed with Guile 2.0 but fail with 3.0. + ((#:tests? _ #f) #f) + ((#:phases phases #~%standard-phases) + #~(modify-phases #$phases + (add-after 'install 'install-guile + (lambda* (#:key inputs outputs #:allow-other-keys) + (copy-recursively + (string-append (assoc-ref outputs "out") + (assoc-ref inputs "guile") "/share") + (string-append (assoc-ref outputs "out") "/share")))))))))) (define-public guile-8sync (let ((commit "183b4f02e68279d4984e79b79e06bfcf1861fcbf") (revision "0")) -- cgit 1.4.1 From b8f2eb286ec52c97048e23d326d94ae5772797e8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 14 Aug 2022 02:00:00 +0200 Subject: gnu: Remove Realtek WiFi drivers with firmware blobs. rtl8821ce-linux-module contains, e.g., halhwimg8821c_fw.c and hal8821c_fw.c. rtl8812au-aircrack-ng-linux-module has, e.g., hal8814a_fw.c, hal8812a_fw.c, and hal8821a_fw.c. Each of these examples contains non-free firmware blobs disguised as C arrays. * gnu/packages/linux.scm (rtl8821ce-linux-module) (rtl8812au-aircrack-ng-linux-module): Remove variables. Reported by Jacob K --- gnu/packages/linux.scm | 75 -------------------------------------------------- 1 file changed, 75 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 2056082157..8704f32ae2 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1373,81 +1373,6 @@ and the notification, WiFi, and Bluetooth LED.") detection of security vulnerability exploits against the kernel.") (license license:gpl2))) -(define-public rtl8821ce-linux-module - (let ((commit "be733dc86781c68571650b395dd0fa6b53c0a039") - (revision "6")) - (package - (name "rtl8821ce-linux-module") - (version (git-version "0.0.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/tomaspinho/rtl8821ce") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "00sd7s0582b9jcpfgy0fw6418dwg700mfyizkfr22jf2x140iy70")))) - (build-system linux-module-build-system) - (arguments - (list #:make-flags - #~(list (string-append "CC=" #$(cc-for-target)) - (string-append "KSRC=" - (assoc-ref %build-inputs - "linux-module-builder") - "/lib/modules/build")) - #:phases - #~(modify-phases %standard-phases - (replace 'build - (lambda* (#:key (make-flags '()) (parallel-build? #t) - #:allow-other-keys) - (apply invoke "make" - `(,@(if parallel-build? - `("-j" ,(number->string (parallel-job-count))) - '()) - ,@make-flags))))) - #:tests? #f)) ; no test suite - (home-page "https://github.com/tomaspinho/rtl8821ce") - (synopsis "Linux driver for Realtek RTL8821CE wireless network adapters") - (description "This is Realtek's RTL8821CE Linux driver for wireless -network adapters.") - (license license:gpl2)))) - -(define-public rtl8812au-aircrack-ng-linux-module - (let ((commit "6d0d9fb56d4d918012a5c7a030b9233cad039cdd") - (revision "8")) - (package - (inherit rtl8821ce-linux-module) - (name "rtl8812au-aircrack-ng-linux-module") - (version (git-version "5.6.4.2" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/aircrack-ng/rtl8812au") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "012asiy43ik13kl9p97sscdsqq5jihq73s4ws3g5wqqczqcgrsvc")) - (modules '((guix build utils))) - (snippet - #~(begin - ;; Remove bundled tarballs, APKs, word lists, speadsheets, - ;; and other unnecessary unlicenced things. - (for-each delete-file-recursively (list "android" - "docs" - "tools")))))) - (supported-systems '("x86_64-linux" "i686-linux")) - (home-page "https://github.com/aircrack-ng/rtl8812au") - (synopsis "Linux driver for Realtek USB wireless network adapters") - (description - "This is Realtek's rtl8812au Linux driver for USB 802.11n wireless -network adapters, modified by the aircrack-ng project to support monitor mode -and frame injection. It provides a @code{88XXau} kernel module that supports -RTL8812AU, RTL8821AU, and RTL8814AU chips.") - (license license:gpl2+)))) - (define-public vhba-module (package (name "vhba-module") -- cgit 1.4.1 From 7783a18b7b65f857c0c5420c846b8f5596d137c1 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Thu, 18 Aug 2022 20:38:54 +0200 Subject: gnu: audacity: Remove gratuitous wrapper script. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Audacity installs a wrapper in the installation root. This wrapper is pointless, as Guix has its own wrapper script in the right location. For more information, see . * gnu/packages/audio.scm (audacity)[#:phases]: Add ‘delete-gratuitous-script’. --- gnu/packages/audio.scm | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index aad86bac06..c0bfb3b9d8 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -875,6 +875,10 @@ engineers, musicians, soundtrack editors and composers.") (lambda* (#:key inputs #:allow-other-keys) (substitute* '("libraries/lib-files/FileNames.cpp") (("\"/usr/include/linux/magic.h\"") "")))) + (add-after 'install 'delete-gratuitous-script + (lambda* (#:key outputs #:allow-other-keys) + (delete-file (string-append (assoc-ref outputs "out") + "/audacity")))) (add-after 'wrap-program 'glib-or-gtk-wrap (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))) ;; The test suite is not "well exercised" according to the developers, -- cgit 1.4.1 From f83f69ebfa65ac1955899e2a5b34bfa98dc29b5d Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 21 Aug 2022 17:55:55 +0200 Subject: gnu: emacs-async: Update to 1.9.6. * gnu/packages/emacs-xyz.scm (emacs-async): Update to 1.9.6. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index a3a75c3e07..a1bb9affa8 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -2881,7 +2881,7 @@ while paused.") (package (name "emacs-async") (home-page "https://github.com/jwiegley/emacs-async") - (version "1.9.4") + (version "1.9.6") (source (origin (method git-fetch) (uri (git-reference @@ -2890,7 +2890,7 @@ while paused.") (file-name (git-file-name name version)) (sha256 (base32 - "0hhpyxb3d531jb2f3wvzx25183f0anm8nxv6mh0p825q2gkm6ly7")))) + "1q480ss2jgijdpy6pa4xrjni9pf5q6dwf8hv052fhdpi55bmfdn2")))) (build-system emacs-build-system) (synopsis "Asynchronous processing in Emacs") (description -- cgit 1.4.1 From 706b3ef38b2f7ce9f05aa56e2eaaaf1c19e25f90 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 21 Aug 2022 18:09:49 +0300 Subject: gnu: vim: Update to 9.0.0235. * gnu/packages/vim.scm (vim): Update to 9.0.0235. --- gnu/packages/vim.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index bd25ae0be4..a07c681cb3 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -77,7 +77,7 @@ (define-public vim (package (name "vim") - (version "9.0.0000") + (version "9.0.0235") (source (origin (method git-fetch) (uri (git-reference @@ -86,7 +86,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "0zzhpkcx0gi2hngwvp0w8c4f289fzxvdc4955spkb9f1f3119pwb")))) + "1fshlggcq1fw4cbsgmagwxkmdiwv2cla0vds383z49ayqgqnamnj")))) (build-system gnu-build-system) (arguments `(#:test-target "test" -- cgit 1.4.1 From 254aa1781762d9173eaf671a2c972bc21892d64f Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Wed, 17 Aug 2022 00:21:58 -0300 Subject: gnu: python-wand: Update to 0.6.10. * gnu/packages/python-xyz.scm (python-wand): Update to 0.6.10. [description]: Remove text about the unused C API. --- gnu/packages/python-xyz.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index a08a0b7304..4a755ea566 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1792,13 +1792,13 @@ conventions and aliases in the same expression.") (define-public python-wand (package (name "python-wand") - (version "0.6.9") + (version "0.6.10") (source (origin (method url-fetch) (uri (pypi-uri "Wand" version)) (sha256 - (base32 "1g5midlhff2yy64ppiq7mvmy5dssg82mi3rjpvym7nx85644w9s0")))) + (base32 "0mywzs235skwq670c80achrd34kangwy24793k1nij3651zllgrp")))) (build-system python-build-system) (arguments `(#:phases @@ -1814,8 +1814,7 @@ conventions and aliases in the same expression.") (home-page "https://docs.wand-py.org/") (synopsis "MagickWand API binding for Python") (description - "Wand is a ctypes-based binding for the C API of ImageMagick's MagickWand -library.") + "Wand is a ctypes-based binding for ImageMagick's MagickWand library.") (license license:expat))) (define-public python-lockfile -- cgit 1.4.1 From 78ff8159816b038b959c8c5912f0173eb506fcab Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Wed, 17 Aug 2022 00:22:37 -0300 Subject: gnu: srain: Update to 1.4.1. * gnu/packages/irc.scm (srain): Update to 1.4.1. --- gnu/packages/irc.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm index efb32a39e0..b82210081c 100644 --- a/gnu/packages/irc.scm +++ b/gnu/packages/irc.scm @@ -261,7 +261,7 @@ using a mouse. It is customizable and extensible with plugins and scripts.") (define-public srain (package (name "srain") - (version "1.4.0") + (version "1.4.1") (source (origin (method git-fetch) @@ -270,7 +270,7 @@ using a mouse. It is customizable and extensible with plugins and scripts.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "113nvai3nr2c8mrr5q56fb7smg5awgb2f243sib4k1zj437v9q51")))) + (base32 "05n8j36yrmk353nkapc1vywf25wklwbzwkl2a4kz92wv74zrwi6f")))) (build-system meson-build-system) (arguments `(#:tests? #f ;there are no tests -- cgit 1.4.1 From b62da25698ad38e71d79e4b528a9ce1e155931fc Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Sun, 21 Aug 2022 10:58:21 -0300 Subject: gnu: lightspark: Remove optional input gnash. * gnu/packages/animation.scm (lightspark)[inputs]: Remove gnash. --- gnu/packages/animation.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/animation.scm b/gnu/packages/animation.scm index ba8ce00fbd..4f7654e3af 100644 --- a/gnu/packages/animation.scm +++ b/gnu/packages/animation.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2015, 2017 Ricardo Wurmus ;;; Copyright © 2018–2021 Tobias Geerinckx-Rice ;;; Copyright © 2019 Pkill -9 -;;; Copyright © 2020, 2021 Vinicius Monego +;;; Copyright © 2020, 2021, 2022 Vinicius Monego ;;; ;;; This file is part of GNU Guix. ;;; @@ -365,7 +365,6 @@ audio or video backends, ensuring good performance.") ("freeglut" ,freeglut) ("glew" ,glew) ("glibmm" ,glibmm) - ("gnash" ,gnash) ("gnutls" ,gnutls) ("libjpeg" ,libjpeg-turbo) ("openssl" ,openssl) -- cgit 1.4.1 From 9d829dc9a4959b98e2774a35e8c825bc21608717 Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Sun, 21 Aug 2022 12:21:40 -0300 Subject: gnu: lightspark: Update to 0.8.6. * gnu/packages/animation.scm (lightspark): Update to 0.8.6. --- gnu/packages/animation.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/animation.scm b/gnu/packages/animation.scm index 4f7654e3af..cb6de9e090 100644 --- a/gnu/packages/animation.scm +++ b/gnu/packages/animation.scm @@ -323,7 +323,7 @@ audio or video backends, ensuring good performance.") (define-public lightspark (package (name "lightspark") - (version "0.8.5") + (version "0.8.6") (source (origin (method git-fetch) @@ -332,7 +332,7 @@ audio or video backends, ensuring good performance.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "00535ndzjbz5xyr95cih01wlkc2mgvg60bv6amz4lnnglk0c5v0p")))) + (base32 "0v7d7vwb0xqkk3v8dyks0wyk52ga57v5lg93y74v1d2wh7spmmzw")))) (build-system cmake-build-system) (arguments `(#:tests? #f ;requires Adobe Flex SDK, see README.tests -- cgit 1.4.1 From 6defe340ab018779cd1ded2dc221ae1feec9243c Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Sun, 21 Aug 2022 13:10:07 -0300 Subject: gnu: lightspark: Remove input labels. * gnu/packages/animation.scm (lightspark)[native-inputs, inputs]: Remove labels. --- gnu/packages/animation.scm | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/animation.scm b/gnu/packages/animation.scm index cb6de9e090..b8524681fa 100644 --- a/gnu/packages/animation.scm +++ b/gnu/packages/animation.scm @@ -352,28 +352,28 @@ audio or video backends, ensuring good performance.") (when tests? (invoke "./tests"))))))) (native-inputs - `(("gettext" ,gettext-minimal) - ("glib:bin" ,glib "bin") - ("nasm" ,nasm) - ("perl" ,perl) - ("pkg-config" ,pkg-config) - ("python" ,python-wrapper))) + (list gettext-minimal + `(,glib "bin") + nasm + perl + pkg-config + python-wrapper)) (inputs - `(("cairo" ,cairo) - ("curl" ,curl) - ("ffmpeg" ,ffmpeg) - ("freeglut" ,freeglut) - ("glew" ,glew) - ("glibmm" ,glibmm) - ("gnutls" ,gnutls) - ("libjpeg" ,libjpeg-turbo) - ("openssl" ,openssl) - ("pango" ,pango) - ("pcre2" ,pcre2) - ("rtmpdump" ,rtmpdump) - ("sdl2" ,sdl2) - ("sdl2-mixer" ,sdl2-mixer) - ("zlib" ,zlib))) + (list cairo + curl + ffmpeg + freeglut + glew + glibmm + gnutls + libjpeg-turbo + openssl + pango + pcre2 + rtmpdump + sdl2 + sdl2-mixer + zlib)) (home-page "https://lightspark.github.io/") (synopsis "Flash player implementation") (description -- cgit 1.4.1 From 50fd5987298b9deb507f5beba7c6dcf396e58673 Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Sun, 21 Aug 2022 11:15:32 -0300 Subject: gnu: cozy: Update to 1.2.1. * gnu/packages/ebook.scm (cozy): Update to 1.2.1. --- gnu/packages/ebook.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index ccc0bdf88d..c3a27cb113 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -518,7 +518,7 @@ following formats: (define-public cozy (package (name "cozy") - (version "1.2.0") + (version "1.2.1") (source (origin (method git-fetch) @@ -527,7 +527,7 @@ following formats: (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0igqf9b77i13sxlk4ziw549h379hmz1slrb3vvf8irk94gxabsaw")))) + (base32 "0qky885fl63d5ih5d3rggm8rhp00sk6lny26qljyz3gga8n9y6ki")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t -- cgit 1.4.1 From 6072d025569ce6f980ca29c9111e2afa7b050885 Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Wed, 17 Aug 2022 10:13:58 +0800 Subject: gnu: lxqt-build-tools: Update to 0.11.0. * gnu/packages/lxqt.scm (lxqt-build-tools) [version]: Update to 0.11.0. [arguments]: Configure LXQtConfigVars.cmake to use relative paths. --- gnu/packages/lxqt.scm | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index eab9a24d1d..29ed90a462 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015 Andreas Enge -;;; Copyright © 2015 Sou Bunnbu +;;; Copyright © 2015, 2022 Sou Bunnbu ;;; Copyright © 2016 Mark H Weaver ;;; Copyright © 2016 Efraim Flashner ;;; Copyright © 2017 Nikita @@ -31,6 +31,7 @@ #:use-module (guix download) #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix gexp) #:use-module (guix packages) #:use-module (guix utils) #:use-module (guix build-system cmake) @@ -129,7 +130,7 @@ to statistics about the system on which it's run.") (define-public lxqt-build-tools (package (name "lxqt-build-tools") - (version "0.9.0") + (version "0.11.0") (source (origin (method url-fetch) @@ -137,16 +138,29 @@ to statistics about the system on which it's run.") "/download/" version "/lxqt-build-tools-" version ".tar.xz")) (sha256 - (base32 "0kayad5l72h8n90zkf3hy8fxy72n4b1mrkjglpa9dj0cdj6qg0lp")))) + (base32 "1ff1pkrlxd8h0j8v49p6wrfhnqrz8s5b53hi835m41cvkzjljpfx")))) (build-system cmake-build-system) (arguments - `(#:tests? #f ; no tests - #:configure-flags - ;; 'startlxqt' will add LXQT_DATA_DIR to XDG_DATA_DIRS, - ;; LXQT_ETC_XDG_DIR to XDG_CONFIG_DIRS, and 'lxqt-about' will report - ;; LXQT_ETC_XDG_DIR in its "Technical Info". - '("-DLXQT_DATA_DIR=/run/current-system/profile/share" - "-DLXQT_ETC_XDG_DIR=/run/current-system/profile/etc/xdg"))) + (list + #:tests? #f ; no tests + #:modules `((ice-9 regex) + (guix build cmake-build-system) + (guix build utils)) + ;; In phases and configure-flags: Set LXQT_TRANSLATIONS_DIR, + ;; LXQT_DATA_DIR, etc. to relative paths, so that packages using + ;; LXQtConfigVars.cmake from lxqt-build-tools will install translations + ;; and data files into their outputs, remove the need to patch their + ;; cmake files. + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'patch-LXQtConfigVars.cmake + (lambda _ + (substitute* (string-append #$output + "/share/cmake/lxqt-build-tools" + "/modules/LXQtConfigVars.cmake") + (((regexp-quote (string-append #$output "/"))) ""))))) + #:configure-flags + #~(list "-DLXQT_ETC_XDG_DIR=etc/xdg"))) (native-inputs (list pkg-config glib)) (inputs -- cgit 1.4.1 From e14150705467a3af9a35def31d11e7a8b2ad06a8 Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Wed, 17 Aug 2022 10:17:36 +0800 Subject: gnu: libqtxdg: Update to 3.9.1. * gnu/packages/lxqt.scm (libqtxdg): Update to 3.9.1. --- gnu/packages/lxqt.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index 29ed90a462..d2f9cc89ac 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -178,7 +178,7 @@ itself as well as other components maintained by the LXQt project.") (define-public libqtxdg (package (name "libqtxdg") - (version "3.7.1") + (version "3.9.1") (source (origin (method url-fetch) @@ -186,7 +186,7 @@ itself as well as other components maintained by the LXQt project.") "https://github.com/lxqt/libqtxdg/releases/download/" version "/libqtxdg-" version ".tar.xz")) (sha256 - (base32 "16wav2b948c837cpbvdr6hs1zifwrpdk3yjvbzzp2l1hndvbwz27")))) + (base32 "1kh4hv59bkjifq20ksh1mizf9mp7x30v6fpwccr45mi7hasqvvfi")))) (build-system cmake-build-system) (arguments '(#:configure-flags -- cgit 1.4.1 From 2472cec23b4432d719c5ada29da2a9984bc6c095 Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Wed, 17 Aug 2022 10:20:46 +0800 Subject: gnu: Add qtxdg-tools. * gnu/packages/lxqt.scm (qtxdg-tools): New variable. --- gnu/packages/lxqt.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index d2f9cc89ac..387caa06c0 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -210,6 +210,29 @@ itself as well as other components maintained by the LXQt project.") in Qt.") (license license:lgpl2.1+))) +(define-public qtxdg-tools + (package + (name "qtxdg-tools") + (version "3.9.1") + (source + (origin + (method url-fetch) + (uri (string-append + "https://github.com/lxqt/qtxdg-tools/releases/download/" + version "/qtxdg-tools-" version ".tar.xz")) + (sha256 + (base32 "0qn35v4dv71g0a4cqkbikppwmihxmfa560q9kw5pwk2y0xiwpncr")))) + (build-system cmake-build-system) + (arguments '(#:tests? #f)) ; no tests + (propagated-inputs (list libqtxdg)) + (native-inputs (list lxqt-build-tools)) + (home-page "https://github.com/lxqt/qtxdg-tools") + (synopsis "User tools for libqtxdg") + (description "This package contains a CLI MIME tool, @command{qtxdg-mat}, +for handling file associations and opening files with their default +applications.") + (license license:lgpl2.1+))) + (define-public liblxqt (package (name "liblxqt") -- cgit 1.4.1 From 9914671af5ca49b234e349e4ae238e550c738f12 Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Wed, 17 Aug 2022 10:25:37 +0800 Subject: gnu: liblxqt: Update to 1.1.0. * gnu/packages/lxqt.scm (liblxqt): Update to 1.1.0. [arguments]: Remove patch-translations-dir phase. --- gnu/packages/lxqt.scm | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index 387caa06c0..de6ce0e010 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -236,7 +236,7 @@ applications.") (define-public liblxqt (package (name "liblxqt") - (version "0.17.0") + (version "1.1.0") (source (origin (method url-fetch) @@ -244,7 +244,7 @@ applications.") "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "0ay3j6zdgffw3mzaq3wdq96la7fnn2dw52ij6987slv31563nknl")))) + (base32 "1fickg1q54pcb8bv3x0ydg4xx02cqykibnjcq09as2kws6xbhk9n")))) (build-system cmake-build-system) (arguments `(#:tests? #f ; no tests @@ -255,13 +255,6 @@ applications.") (substitute* "CMakeLists.txt" (("DESTINATION \"\\$\\{POLKITQT-1_POLICY_FILES_INSTALL_DIR\\}") "DESTINATION \"share/polkit-1/actions")) - #t)) - (add-after 'unpack 'patch-translations-dir - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "CMakeLists.txt" - (("\\$\\{LXQT_TRANSLATIONS_DIR\\}") - (string-append (assoc-ref outputs "out") - "/share/lxqt/translations"))) #t))))) (inputs (list kwindowsystem -- cgit 1.4.1 From c4a19dd79c49db69571179a01dff17c2d596a442 Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Wed, 17 Aug 2022 10:26:32 +0800 Subject: gnu: libsysstat: Update to 0.4.6. * gnu/packages/lxqt.scm (libsysstat): Update 0.4.6. --- gnu/packages/lxqt.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index de6ce0e010..e2a1fe4c5f 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -274,14 +274,14 @@ components of the LXQt desktop environment.") (define-public libsysstat (package (name "libsysstat") - (version "0.4.5") + (version "0.4.6") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "1ljy5ggvqvpm3k6kfy03dn47ygr9lzi8hmqws4dcqfc9sx86b6zi")))) + (base32 "1ghkzgz3ypjii08f00g26pnmw0s5naf344p83dwnf3kfdlykiip6")))) (build-system cmake-build-system) (arguments '(#:tests? #f)) ; no tests (inputs -- cgit 1.4.1 From 8ba91eaf7518799c629ef42b78c3b1e61c52f51b Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Wed, 17 Aug 2022 10:27:13 +0800 Subject: gnu: lxqt-about: Update to 1.1.0. * gnu/packages/lxqt.scm (lxqt-about): Update to 1.1.0. [arguments]: Remove patch-translations-dir phase. --- gnu/packages/lxqt.scm | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index e2a1fe4c5f..329e1fca8c 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -300,14 +300,14 @@ and memory usage or network traffic.") (define-public lxqt-about (package (name "lxqt-about") - (version "0.17.0") + (version "1.1.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "04riqf2xgbcnq67l5zb0dfnnmc4a2zljx8zfn3jlvxirnd73l0zm")))) + (base32 "03bqhbpdnfpan3l4snzzz6j0054m4r9zcgygcg21znslwicbqnw3")))) (build-system cmake-build-system) (inputs (list kwindowsystem @@ -325,13 +325,6 @@ and memory usage or network traffic.") (add-before 'build 'setenv (lambda _ (setenv "QT_RCC_SOURCE_DATE_OVERRIDE" "1") - #t)) - (add-after 'unpack 'patch-translations-dir - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "CMakeLists.txt" - (("\\$\\{LXQT_TRANSLATIONS_DIR\\}") - (string-append (assoc-ref outputs "out") - "/share/lxqt/translations"))) #t))))) (home-page "https://lxqt-project.org") (synopsis "Provides information about LXQt and the system") -- cgit 1.4.1 From 240d202a5b6cdeca3e6b2bacbc10407e9ad00cbe Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Wed, 17 Aug 2022 10:28:04 +0800 Subject: gnu: lxqt-admin: Update to 1.1.0. * gnu/packages/lxqt.scm (lxqt-admin): Update to 1.1.0. [arguments]: Remove patch-translations-dir phase. --- gnu/packages/lxqt.scm | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index 329e1fca8c..57f7c541a3 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -335,14 +335,14 @@ LXQt and the system it's running on.") (define-public lxqt-admin (package (name "lxqt-admin") - (version "0.17.0") + (version "1.1.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "07fkn3zmpfxjzzsv1hyv50sx0359n10lxjil35qn266nz165wj43")))) + (base32 "1zah3xdnif9miaq52mmfbbzvqjhca7w7h81ngrn25j9pvd2bflm8")))) (build-system cmake-build-system) (inputs (list kwindowsystem @@ -363,14 +363,6 @@ LXQt and the system it's running on.") "lxqt-admin-time/CMakeLists.txt") (("DESTINATION \"\\$\\{POLKITQT-1_POLICY_FILES_INSTALL_DIR\\}") "DESTINATION \"share/polkit-1/actions")) - #t)) - (add-after 'unpack 'patch-translations-dir - (lambda* (#:key outputs #:allow-other-keys) - (substitute* '("lxqt-admin-time/CMakeLists.txt" - "lxqt-admin-user/CMakeLists.txt") - (("\\$\\{LXQT_TRANSLATIONS_DIR\\}") - (string-append (assoc-ref outputs "out") - "/share/lxqt/translations"))) #t))))) (home-page "https://lxqt-project.org") (synopsis "LXQt system administration tool") -- cgit 1.4.1 From 90d5792eeaae0b17c0a89cda1a3aed4dd25050f9 Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Wed, 17 Aug 2022 10:29:02 +0800 Subject: gnu: lxqt-config: Update to 1.1.0. * gnu/packages/lxqt.scm (lxqt-config): Update to 1.1.0. [arguments]: Remove patch-source and patch-translations-dir phases. --- gnu/packages/lxqt.scm | 26 +++----------------------- 1 file changed, 3 insertions(+), 23 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index 57f7c541a3..56284bc638 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -373,14 +373,14 @@ the operating system LXQt is running on.") (define-public lxqt-config (package (name "lxqt-config") - (version "0.17.1") + (version "1.1.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "0nr43d6fyc5zg4b3iwpca2cy58ry8q0rahrk6ixm7wrvmaiwkh93")))) + (base32 "0f0x82qma86kjdvn08qlg0ydxh9fnqikijfhnicynxdqfnp50ia5")))) (build-system cmake-build-system) (inputs (list eudev @@ -406,12 +406,6 @@ the operating system LXQt is running on.") '(#:tests? #f ; no tests #:phases (modify-phases %standard-phases - (add-after 'unpack 'patch-source - (lambda _ - (substitute* '("src/CMakeLists.txt") - (("DESTINATION \"\\$\\{LXQT_ETC_XDG_DIR\\}") - "DESTINATION \"etc/xdg")) - #t)) (add-after 'unpack 'set-xkeyboard-config-file-name (lambda* (#:key inputs #:allow-other-keys) ;; Set the file name to xkeyboard-config. @@ -419,21 +413,7 @@ the operating system LXQt is running on.") (substitute* "lxqt-config-input/keyboardlayoutconfig.h" (("/usr/share/X11/xkb/rules/base.lst") (string-append xkb "/share/X11/xkb/rules/base.lst"))) - #t))) - (add-after 'unpack 'patch-translations-dir - (lambda* (#:key outputs #:allow-other-keys) - (substitute* '("lxqt-config-file-associations/CMakeLists.txt" - "lxqt-config-brightness/CMakeLists.txt" - "lxqt-config-appearance/CMakeLists.txt" - "lxqt-config-locale/CMakeLists.txt" - "lxqt-config-monitor/CMakeLists.txt" - "lxqt-config-input/CMakeLists.txt" - "liblxqt-config-cursor/CMakeLists.txt" - "src/CMakeLists.txt") - (("\\$\\{LXQT_TRANSLATIONS_DIR\\}") - (string-append (assoc-ref outputs "out") - "/share/lxqt/translations"))) - #t))))) + #t)))))) (home-page "https://lxqt-project.org") (synopsis "Tools to configure LXQt and the underlying operating system") (description "lxqt-config is providing several tools involved in the -- cgit 1.4.1 From e8b4c9af4b517c0d34d18f620aec7f59032ede20 Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Wed, 17 Aug 2022 10:30:03 +0800 Subject: gnu: lxqt-globalkeys: Update to 1.1.0. * gnu/packages/lxqt.scm (lxqt-globalkeys): Update to 1.1.0. [arguments]: Remove phases. --- gnu/packages/lxqt.scm | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index 56284bc638..2d249f4ed1 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -423,7 +423,7 @@ configuration of both LXQt and the underlying operating system.") (define-public lxqt-globalkeys (package (name "lxqt-globalkeys") - (version "0.17.0") + (version "1.1.0") (source (origin (method url-fetch) @@ -431,7 +431,7 @@ configuration of both LXQt and the underlying operating system.") "releases/download/" version "/" "lxqt-globalkeys-" version ".tar.xz")) (sha256 - (base32 "0pnyqiqhaawrnyvw3ljp850d911abaalnl4rgvl2xyzybvlhki4h")))) + (base32 "0bbw85aa59w0qnvkdggm3hbacps6yfcvcrs32d34mvvhc7d6g04l")))) (build-system cmake-build-system) (inputs (list kwindowsystem @@ -442,24 +442,7 @@ configuration of both LXQt and the underlying operating system.") qtx11extras)) (native-inputs (list pkg-config qttools-5 lxqt-build-tools)) - (arguments - '(#:tests? #f ; no tests - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-source - (lambda _ - (substitute* '("autostart/CMakeLists.txt" - "xdg/CMakeLists.txt") - (("DESTINATION \"\\$\\{LXQT_ETC_XDG_DIR\\}") - "DESTINATION \"etc/xdg")) - #t)) - (add-after 'unpack 'patch-translations-dir - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "config/CMakeLists.txt" - (("\\$\\{LXQT_TRANSLATIONS_DIR\\}") - (string-append (assoc-ref outputs "out") - "/share/lxqt/translations"))) - #t))))) + (arguments '(#:tests? #f)) ; no tests (home-page "https://lxqt-project.org") (synopsis "Daemon used to register global keyboard shortcuts") (description "lxqt-globalkeys is providing tools to set global keyboard -- cgit 1.4.1 From 826f188d52aa924e09b6480be334003a48742554 Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Wed, 17 Aug 2022 10:30:50 +0800 Subject: gnu: lxqt-notificationd: Update to 1.1.0. * gnu/packages/lxqt.scm (lxqt-notificationd): Update to 1.1.0. [arguments]: Remove phases. --- gnu/packages/lxqt.scm | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index 2d249f4ed1..c2f1c054e1 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -453,14 +453,14 @@ as a whole and are not limited to distinct applications.") (define-public lxqt-notificationd (package (name "lxqt-notificationd") - (version "0.17.0") + (version "1.1.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "1dyal7brmfnydfgb6lpxnqww8fj5gzixs7s3wf5nn2ihsz1wm4nk")))) + (base32 "0bz3qdvv591zvpkxqzqqmh1yq5icc3iinmjr13qzws3ajlj19z44")))) (build-system cmake-build-system) (inputs (list kwindowsystem @@ -471,24 +471,7 @@ as a whole and are not limited to distinct applications.") qtx11extras)) (native-inputs (list lxqt-build-tools qttools-5)) - (arguments - '(#:tests? #f ; no test target - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-source - (lambda _ - (substitute* '("autostart/CMakeLists.txt") - (("DESTINATION \"\\$\\{LXQT_ETC_XDG_DIR\\}") - "DESTINATION \"etc/xdg")) - #t)) - (add-after 'unpack 'patch-translations-dir - (lambda* (#:key outputs #:allow-other-keys) - (substitute* '("config/CMakeLists.txt" - "src/CMakeLists.txt") - (("\\$\\{LXQT_TRANSLATIONS_DIR\\}") - (string-append (assoc-ref outputs "out") - "/share/lxqt/translations"))) - #t))))) + (arguments '(#:tests? #f)) ; no test target (home-page "https://lxqt-project.org") (synopsis "The LXQt notification daemon") (description "lxqt-notificationd is LXQt's implementation of a daemon -- cgit 1.4.1 From fddf8dfa4e4f914f2d7d58b6eb7699cb99bc13bd Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Wed, 17 Aug 2022 10:31:34 +0800 Subject: gnu: lxqt-openssh-askpass: Update to 1.1.0. * gnu/packages/lxqt.scm (lxqt-openssh-askpass): Update to 1.1.0. [arguments]: Remove phases. --- gnu/packages/lxqt.scm | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index c2f1c054e1..dc0c7b9e44 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -481,14 +481,14 @@ according to the Desktop Notifications Specification.") (define-public lxqt-openssh-askpass (package (name "lxqt-openssh-askpass") - (version "0.17.0") + (version "1.1.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "0gdcy8c21sbfrlfz9c3zqw4dvdwf309flkjgqanwwl9i8hr26chr")))) + (base32 "1hxix513z2sanmygfzq1fgx30kaxw5rjmmklbyyzl8bv1xzjcwk7")))) (build-system cmake-build-system) (inputs (list kwindowsystem @@ -499,17 +499,7 @@ according to the Desktop Notifications Specification.") qtx11extras)) (native-inputs (list lxqt-build-tools qttools-5)) - (arguments - '(#:tests? #f ; no tests - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-translations-dir - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "CMakeLists.txt" - (("\\$\\{LXQT_TRANSLATIONS_DIR\\}") - (string-append (assoc-ref outputs "out") - "/share/lxqt/translations"))) - #t))))) + (arguments '(#:tests? #f)) ; no tests (home-page "https://lxqt-project.org") (synopsis "GUI to query passwords on behalf of SSH agents") (description "lxqt-openssh-askpass is a GUI to query credentials on behalf -- cgit 1.4.1 From bc89baeffe24fb38961ab050df778c95a34e63e2 Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Wed, 17 Aug 2022 10:32:23 +0800 Subject: gnu: lxqt-panel: Update to 1.1.0. * gnu/packages/lxqt.scm (lxqt-panel): Update to 1.1.0. [inputs]: Add libxtst and xcb-util-image. [arguments]: Remove patch-source and patch-translations-dir phases. --- gnu/packages/lxqt.scm | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index dc0c7b9e44..aee43b32bb 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -509,14 +509,14 @@ of other programs.") (define-public lxqt-panel (package (name "lxqt-panel") - (version "0.17.1") + (version "1.1.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "1k2cfs1mhad486kh93vbxma3jpjksp4hzjv1xmp1g5alb5dgnc0q")))) + (base32 "11dg18ac6kj8qkkrg940bzpykjih6nnw8y3hfww3wiyg6dka9gd7")))) (build-system cmake-build-system) (inputs (list alsa-lib @@ -530,6 +530,7 @@ of other programs.") libxdamage libxkbcommon libxrender + libxtst `(,lm-sensors "lib") lxqt-globalkeys pcre @@ -539,6 +540,7 @@ of other programs.") qtx11extras solid xcb-util + xcb-util-image xkeyboard-config)) (native-inputs (list pkg-config lxqt-build-tools qttools-5)) @@ -550,21 +552,6 @@ of other programs.") '(#:tests? #f ; no tests #:phases (modify-phases %standard-phases - (add-after 'unpack 'patch-source - (lambda _ - (substitute* '("autostart/CMakeLists.txt" - "menu/CMakeLists.txt") - (("DESTINATION \"\\$\\{LXQT_ETC_XDG_DIR\\}") - "DESTINATION \"etc/xdg")) - #t)) - (add-after 'unpack 'patch-translations-dir - (lambda* (#:key outputs #:allow-other-keys) - (substitute* '("cmake/BuildPlugin.cmake" - "panel/CMakeLists.txt") - (("\\$\\{LXQT_TRANSLATIONS_DIR\\}") - (string-append (assoc-ref outputs "out") - "/share/lxqt/translations"))) - #t)) (add-after 'unpack 'set-xkeyboard-config-file-path (lambda* (#:key inputs #:allow-other-keys) ;; Set the path to xkeyboard-config. -- cgit 1.4.1 From 0dc25538be09a49c34220ada2fd79377c206d09b Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Wed, 17 Aug 2022 10:33:17 +0800 Subject: gnu: lxqt-policykit: Update to 1.1.0. * gnu/packages/lxqt.scm (lxqt-policykit): Update to 1.1.0. [arguments]: Remove phases. --- gnu/packages/lxqt.scm | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index aee43b32bb..da2a1f5cce 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -568,14 +568,14 @@ of other programs.") (define-public lxqt-policykit (package (name "lxqt-policykit") - (version "0.17.0") + (version "1.1.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "119bjhx208g7wxmr8r0ajb3wl6vagq1aks6zz07df4bgjs3nnpli")))) + (base32 "150ggcfprascnwgsz721vnmay9cbar9annlhp6h2yzkl69iyc49r")))) (build-system cmake-build-system) (inputs (list kwindowsystem @@ -588,23 +588,7 @@ of other programs.") qtx11extras)) (native-inputs (list pkg-config polkit lxqt-build-tools qttools-5)) - (arguments - '(#:tests? #f ; no test target - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-source - (lambda _ - (substitute* '("autostart/CMakeLists.txt") - (("DESTINATION \"\\$\\{LXQT_ETC_XDG_DIR\\}") - "DESTINATION \"etc/xdg")) - #t)) - (add-after 'unpack 'patch-translations-dir - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "CMakeLists.txt" - (("\\$\\{LXQT_TRANSLATIONS_DIR\\}") - (string-append (assoc-ref outputs "out") - "/share/lxqt/translations"))) - #t))))) + (arguments '(#:tests? #f)) ; no test target (home-page "https://lxqt-project.org") (synopsis "The LXQt PolicyKit agent") (description "lxqt-policykit is the polkit authentication agent of -- cgit 1.4.1 From f739b5f408e63cb21e0fbcb54e7d85923069de3a Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Wed, 17 Aug 2022 10:34:35 +0800 Subject: gnu: lxqt-powermanagement: Update to 1.1.0. * gnu/packages/lxqt.scm (lxqt-powermanagement): Update to 1.1.0. [arguments]: Remove phases. --- gnu/packages/lxqt.scm | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index da2a1f5cce..cccfb9d77b 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -598,14 +598,14 @@ LXQt.") (define-public lxqt-powermanagement (package (name "lxqt-powermanagement") - (version "0.17.1") + (version "1.1.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "00njx8a8cs0zzpz798qc9j16k7i4y0ydy1xmmcq9yv0wawh4gqck")))) + (base32 "0zy6abbf3iwrxsr18gbxidb4m5spsigpa2778xg7y9r7fwgmqqkk")))) (build-system cmake-build-system) (inputs (list kidletime @@ -619,24 +619,7 @@ LXQt.") solid)) (native-inputs (list lxqt-build-tools qttools-5)) - (arguments - '(#:tests? #f ; no tests - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-source - (lambda _ - (substitute* '("autostart/CMakeLists.txt") - (("DESTINATION \"\\$\\{LXQT_ETC_XDG_DIR\\}") - "DESTINATION \"etc/xdg")) - #t)) - (add-after 'unpack 'patch-translations-dir - (lambda* (#:key outputs #:allow-other-keys) - (substitute* '("config/CMakeLists.txt" - "src/CMakeLists.txt") - (("\\$\\{LXQT_TRANSLATIONS_DIR\\}") - (string-append (assoc-ref outputs "out") - "/share/lxqt/translations"))) - #t))))) + (arguments '(#:tests? #f)) ; no tests (home-page "https://lxqt-project.org") (synopsis "Power management module for LXQt") (description "lxqt-powermanagement is providing tools to monitor power -- cgit 1.4.1 From 2d6a506624ba3654da523ff16281beb885c2cd26 Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Wed, 17 Aug 2022 10:35:35 +0800 Subject: gnu: lxqt-qtplugin: Update to 1.1.0. * gnu/packages/lxqt.scm (lxqt-qtplugin): Update to 1.1.0. --- gnu/packages/lxqt.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index cccfb9d77b..d9bf4fc65d 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -630,14 +630,14 @@ when laptop batteries are low on power.") (define-public lxqt-qtplugin (package (name "lxqt-qtplugin") - (version "0.17.0") + (version "1.1.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "14c6abxfg3vda333wrvb5lk45c45hnb66jclbs3vsmrjxdb13vv5")))) + (base32 "1zw79lnm35gj3dyd4vlnk08n1lnr8391n36nbn81d0fgmvs21yx4")))) (build-system cmake-build-system) (inputs (list libdbusmenu-qt -- cgit 1.4.1 From 850cc1cc6b9e15518566aa9c1df8bbf4d92867a4 Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Wed, 17 Aug 2022 10:36:03 +0800 Subject: gnu: lxqt-runner: Update to 1.1.0. * gnu/packages/lxqt.scm (lxqt-runner): Update to 1.1.0. [arguments]: Remove phases. --- gnu/packages/lxqt.scm | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index d9bf4fc65d..3c8d4fc8b7 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -667,14 +667,14 @@ Qt with LXQt.") (define-public lxqt-runner (package (name "lxqt-runner") - (version "0.17.0") + (version "1.1.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "0n53jbvkmp4vgi21a720gsvi407m4ybqk8xrpnm5f48yjr88r9i4")))) + (base32 "1wfng8g28mq97ibrgpfbj353i15vdimmjp83pfqrmkddx0yvzcdv")))) (build-system cmake-build-system) (inputs (list kwindowsystem @@ -688,23 +688,7 @@ Qt with LXQt.") qtx11extras)) (native-inputs (list pkg-config qttools-5 lxqt-build-tools)) - (arguments - '(#:tests? #f ; no tests - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-source - (lambda _ - (substitute* '("autostart/CMakeLists.txt") - (("DESTINATION \"\\$\\{LXQT_ETC_XDG_DIR\\}") - "DESTINATION \"etc/xdg")) - #t)) - (add-after 'unpack 'patch-translations-dir - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "CMakeLists.txt" - (("\\$\\{LXQT_TRANSLATIONS_DIR\\}") - (string-append (assoc-ref outputs "out") - "/share/lxqt/translations"))) - #t))))) + (arguments '(#:tests? #f)) ; no tests (home-page "https://lxqt-project.org") (synopsis "Tool used to launch programs quickly by typing their names") (description "lxqt-runner provides a GUI that comes up on the desktop and -- cgit 1.4.1 From 64678c72280c6d627d4b2a9fc62855b2680e5cc4 Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Wed, 17 Aug 2022 10:37:28 +0800 Subject: gnu: lxqt-session: Update to 1.1.1, don't hardcode /run/current-system. * gnu/packages/lxqt.scm (lxqt-session): Update to 1.1.1. [inputs]: Add qtxdg-tools, remove libqtxdg. [arguments]: Remove patching of LXQT_ETC_XDG_DIR and LXQT_TRANSLATIONS_DIR. Remove wrap-program. [native-search-paths]: Add 'XDG_CONFIG_DIRS'. --- gnu/packages/lxqt.scm | 44 ++++++++++++++++---------------------------- 1 file changed, 16 insertions(+), 28 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index 3c8d4fc8b7..9fea479605 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -698,20 +698,20 @@ allows for launching applications or shutting down the system.") (define-public lxqt-session (package (name "lxqt-session") - (version "0.17.1") + (version "1.1.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "0iwwfyngpbhs2dwvbw0cci0bf3qbqcpjjw7h5vm46nimvgp8q1fr")))) + (base32 "0j8q5jfpb2l0vvji3xs8y0jcr792z6sxzj111qqvmdrbpxrkwxnw")))) (build-system cmake-build-system) (inputs (list eudev kwindowsystem liblxqt - libqtxdg + qtxdg-tools procps qtbase-5 qtsvg-5 @@ -725,40 +725,28 @@ allows for launching applications or shutting down the system.") (modify-phases %standard-phases (add-after 'unpack 'patch-source (lambda* (#:key outputs #:allow-other-keys) - (substitute* '("autostart/CMakeLists.txt" - "config/CMakeLists.txt") - (("DESTINATION \"\\$\\{LXQT_ETC_XDG_DIR\\}") - "DESTINATION \"etc/xdg")) (let ((out (assoc-ref outputs "out"))) (substitute* '("xsession/lxqt.desktop.in") (("Exec=startlxqt") (string-append "Exec=" out "/bin/startlxqt")) - (("TryExec=lxqt-session") (string-append "TryExec=" out "/bin/startlxqt"))) - #t))) - ;; add write permission to lxqt-rc.xml file which is stored as read-only in store + (("TryExec=lxqt-session") (string-append "TryExec=" out "/bin/startlxqt")))))) + (add-after 'unpack 'patch-openbox-permission (lambda _ (substitute* "startlxqt.in" + ;; Don't add 'etc/xdg' to XDG_CONFIG_DIRS, and 'share' to XDG_DATA_DIRS. + (("! contains .*;") "false;") + ;; Add write permission to lxqt-rc.xml file which is stored as + ;; read-only in store. (("cp \"\\$LXQT_DEFAULT_OPENBOX_CONFIG\" \"\\$XDG_CONFIG_HOME/openbox\"") (string-append "cp \"$LXQT_DEFAULT_OPENBOX_CONFIG\" \"$XDG_CONFIG_HOME/openbox\"\n" " # fix openbox permission issue\n" - " chmod u+w \"$XDG_CONFIG_HOME/openbox\"/*"))) - #t)) - (add-after 'unpack 'patch-translations-dir - (lambda* (#:key outputs #:allow-other-keys) - (substitute* '("lxqt-config-session/CMakeLists.txt" - "lxqt-leave/CMakeLists.txt" - "lxqt-session/CMakeLists.txt") - (("\\$\\{LXQT_TRANSLATIONS_DIR\\}") - (string-append (assoc-ref outputs "out") - "/share/lxqt/translations"))) - #t)) - (add-after 'install 'wrap-program - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (wrap-program (string-append out "/bin/startlxqt") - `("XDG_CONFIG_DIRS" ":" suffix ("/run/current-system/profile/share" - "/run/current-system/profile/share/pcmanfm-qt"))) - #t)))))) + " chmod u+w \"$XDG_CONFIG_HOME/openbox\"/*")))))))) + (native-search-paths + (list (search-path-specification + ;; LXQt applications install their default config files into + ;; 'share/lxqt' and search them from XDG_CONFIG_DIRS/lxqt. + (variable "XDG_CONFIG_DIRS") + (files '("share"))))) (home-page "https://lxqt-project.org") (synopsis "Session manager for LXQt") (description "lxqt-session provides the standard session manager -- cgit 1.4.1 From da546ff3b911157c13e07246027a4fcffbd66cc5 Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Wed, 17 Aug 2022 11:07:44 +0800 Subject: gnu: lxqt-sudo: Update to 1.1.0. * gnu/packages/lxqt.scm (lxqt-sudo): Update to 1.1.0. [arguments]: Remove phases. --- gnu/packages/lxqt.scm | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index 9fea479605..5b3625bd08 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -756,14 +756,14 @@ for the LXQt desktop environment.") (define-public lxqt-sudo (package (name "lxqt-sudo") - (version "0.17.0") + (version "1.1.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "02s38m0ywp0gjkjczvrc4r1ignshbajlj084xd61d3rcm7vahhic")))) + (base32 "064w40v43m91y9aywxxf2pj5rpcl4gbsgj7dv97pg4vhj9s790b8")))) (build-system cmake-build-system) (inputs (list kwindowsystem @@ -775,17 +775,7 @@ for the LXQt desktop environment.") sudo)) (native-inputs (list pkg-config qttools-5 lxqt-build-tools)) - (arguments - '(#:tests? #f ; no tests - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-translations-dir - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "CMakeLists.txt" - (("\\$\\{LXQT_TRANSLATIONS_DIR\\}") - (string-append (assoc-ref outputs "out") - "/share/lxqt/translations"))) - #t))))) + (arguments '(#:tests? #f)) ; no tests (home-page "https://lxqt-project.org") (synopsis "GUI frontend for sudo/su") (description "lxqt-sudo is a graphical front-end of commands sudo and su -- cgit 1.4.1 From a79afa8d38f37f541b2ff9b6f52776d4d4fa8de9 Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Wed, 17 Aug 2022 11:08:22 +0800 Subject: gnu: lxqt-themes: Update to 1.1.0. * gnu/packages/lxqt.scm (lxqt-themes): Update to 1.1.0. [arguments]: Remove phases. --- gnu/packages/lxqt.scm | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index 5b3625bd08..0f123e5a2d 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -786,30 +786,18 @@ permissions of other users including root.") (define-public lxqt-themes (package (name "lxqt-themes") - (version "0.17.0") + (version "1.1.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "0kmvcz6rxghxxgb0m264zbvycc1zjma8mr4cpwg5kyrzb47rdw9z")))) + (base32 "18zrp2j0xpsrzy6m2dw8k55zczcc9jzavncasrp5j1dxscnzwrcr")))) (build-system cmake-build-system) (native-inputs (list lxqt-build-tools)) - (arguments - `(#:tests? #f ; no tests - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-source - (lambda _ - (substitute* '("CMakeLists.txt") - (("DESTINATION \"\\$\\{LXQT_GRAPHICS_DIR\\}") - "DESTINATION \"share/lxqt/graphics")) - (substitute* '("themes/CMakeLists.txt") - (("DESTINATION \"\\$\\{LXQT_SHARE_DIR\\}") - "DESTINATION \"share/lxqt")) - #t))))) + (arguments '(#:tests? #f)) ; no tests (home-page "https://lxqt-project.org") (synopsis "Themes, graphics and icons for LXQt") (description "This package comprises a number of graphic files and themes -- cgit 1.4.1 From 892d8995de139e279a8199f18793dc547e6e3b9b Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Wed, 17 Aug 2022 11:08:58 +0800 Subject: gnu: libfm-qt: Update to 1.1.0. * gnu/packages/lxqt.scm (libfm-qt): Update to 1.1.0. --- gnu/packages/lxqt.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index 0f123e5a2d..08e33ca0e3 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -812,14 +812,14 @@ for LXQt.") (define-public libfm-qt (package (name "libfm-qt") - (version "0.17.1") + (version "1.1.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "1991lm1gnw9s5wwn1yf3vba63bfmrrgsxc70h3nhdl9mh16qygxa")))) + (base32 "0m2fq1wh553yqi64a5nrdvm57fk3jnc3kxgaf0ja7h95jw6czvm5")))) (build-system cmake-build-system) (arguments '(#:tests? #f)) ; no tests -- cgit 1.4.1 From 50fb051d9760b484f6edea02cec61c78655e0c25 Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Wed, 17 Aug 2022 11:09:43 +0800 Subject: gnu: pcmanfm-qt: Update to 1.1.0. * gnu/packages/lxqt.scm (pcmanfm-qt) [version]: Update to 1.1.0. [inputs]: Add lxqt-themes. [arguments]: Remove patch-source phase. Add patch-settings.conf.in phase. --- gnu/packages/lxqt.scm | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index 08e33ca0e3..d2cbd1e131 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -843,32 +843,31 @@ components to build desktop file managers which belongs to LXDE.") (define-public pcmanfm-qt (package (name "pcmanfm-qt") - (version "0.17.0") + (version "1.1.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "1axs7dnh2z08ygy28iipfbgfck15k2i2pwlf0v8d8axjrmavzb3l")))) + (base32 "0pwl2j5kbs86vmq86phavq89bl2i82ic839bjk0v8kmxm9q2mrh9")))) (build-system cmake-build-system) + (arguments + (list + #:tests? #f ; no tests + #:phases + #~(modify-phases %standard-phases + (add-before 'configure 'patch-settings.conf.in + (lambda* (#:key inputs #:allow-other-keys) + (let ((wallpaper (search-input-file inputs + "share/lxqt/wallpapers/waves-logo.png"))) + (substitute* "config/pcmanfm-qt/lxqt/settings.conf.in" + (("Wallpaper=.*") + (string-append "Wallpaper=" wallpaper "\n"))))))))) (inputs - (list libfm-qt qtbase-5 qtx11extras)) + (list libfm-qt qtbase-5 qtx11extras lxqt-themes)) (native-inputs (list pkg-config qttools-5 lxqt-build-tools)) - (arguments - '(#:tests? #f ; no tests - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-source - (lambda _ - (substitute* '("autostart/CMakeLists.txt") - (("DESTINATION \"\\$\\{LXQT_ETC_XDG_DIR\\}") - "DESTINATION \"etc/xdg")) - (substitute* '("config/pcmanfm-qt/lxqt/settings.conf.in") - (("@LXQT_SHARE_DIR@") - "/run/current-system/profile/share/lxqt" )) - #t))))) (home-page "https://lxqt-project.org") (synopsis "File manager and desktop icon manager") (description "PCManFM-Qt is the Qt port of PCManFM, the file manager of -- cgit 1.4.1 From eae4a0a2c8b22b8eb2a86bf5f37e2d9832b3eb15 Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Wed, 17 Aug 2022 11:10:51 +0800 Subject: gnu: compton-conf: Remove patch-source phase. * gnu/packages/lxqt.scm (compton-conf)[arguments]: Remove patch-source phase. --- gnu/packages/lxqt.scm | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index d2cbd1e131..4de5bd944c 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -893,16 +893,7 @@ LXDE.") (list libconfig qtbase-5)) (native-inputs (list lxqt-build-tools pkg-config qttools-5)) - (arguments - '(#:tests? #f ; no tests - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-source - (lambda _ - (substitute* '("autostart/CMakeLists.txt") - (("DESTINATION \"\\$\\{LXQT_ETC_XDG_DIR\\}") - "DESTINATION \"etc/xdg")) - #t))))) + (arguments '(#:tests? #f)) ; no tests (home-page "https://lxqt-project.org") (synopsis "GUI configuration tool for compton X composite manager") (description "@code{compton-conf} is a configuration tool for X composite -- cgit 1.4.1 From 5ea35545c189b0357b66cf32a430d79d9d89e2eb Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Wed, 17 Aug 2022 11:11:38 +0800 Subject: gnu: lximage-qt: Update to 1.1.0. * gnu/packages/lxqt.scm (lximage-qt): Update to 1.1.0. --- gnu/packages/lxqt.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index 4de5bd944c..65f5921f4e 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -903,14 +903,14 @@ manager Compton.") (define-public lximage-qt (package (name "lximage-qt") - (version "0.17.0") + (version "1.1.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "0g6hs41xfw2ghhwpj0rqr2ciri0x9v984689yrnmnvah88zlya1f")))) + (base32 "0nal8n7nmkafapdbcs9c8rk313md2fak4xjl9m56n10dxcjpi2wb")))) (build-system cmake-build-system) (inputs (list libexif libfm-qt qtbase-5 qtsvg-5 qtx11extras)) -- cgit 1.4.1 From e1a9bae30493e3087cb3bd032b5bee8aac5e3029 Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Wed, 17 Aug 2022 11:12:01 +0800 Subject: gnu: obconf-qt: Update to 0.16.2. * gnu/packages/lxqt.scm (obconf-qt): Update to 0.16.2. --- gnu/packages/lxqt.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index 65f5921f4e..c8258a6773 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -927,14 +927,14 @@ image viewer.") (define-public obconf-qt (package (name "obconf-qt") - (version "0.16.1") + (version "0.16.2") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "0hlbivdbiw7wjhwrp8qfmq50ks19v0q21m3pyjj0k2na7nv9d3a5")))) + (base32 "0q29f77dkwy005gzrmn2wj2ga1hdnfd2gwp05h72i2dj0qbdla3k")))) (build-system cmake-build-system) (inputs (list imlib2 -- cgit 1.4.1 From 1c0677e3d110281a6212115de2f23d7cbc6fdb2f Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Wed, 17 Aug 2022 11:12:24 +0800 Subject: gnu: pavucontrol-qt: Update to 1.1.0. * gnu/packages/lxqt.scm (pavucontrol-qt): Update to 1.1.0. --- gnu/packages/lxqt.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index c8258a6773..a6c374e137 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -960,14 +960,14 @@ window manager OpenBox.") (define-public pavucontrol-qt (package (name "pavucontrol-qt") - (version "0.17.0") + (version "1.1.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "0w51dpjayav78lmhw966fz3gvypkmv64xgsd7x5rqs8am39lq9vc")))) + (base32 "0y3ql25cmg1cmzjvadf7zcb58hh69gcslvr944sxxhaqp4daz10v")))) (build-system cmake-build-system) (inputs (list glib pcre pulseaudio qtbase-5 qtx11extras)) -- cgit 1.4.1 From f024a6debf3acf631240134063f9954a07e33897 Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Wed, 17 Aug 2022 11:12:43 +0800 Subject: gnu: qps: Update 2.5.0. * gnu/packages/lxqt.scm (qps): Update to 2.5.0. --- gnu/packages/lxqt.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index a6c374e137..97ead5b36e 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -984,14 +984,14 @@ window manager OpenBox.") (define-public qps (package (name "qps") - (version "2.3.0") + (version "2.5.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "0zg0czrh3dlbnl5smxamhkdbj1g0szm47w1c0fwpaplgc1vv5lfq")))) + (base32 "16ybq07xpkl22mszakc1175xlqcayyj21i2h6wlxb8bmb7csg30n")))) (build-system cmake-build-system) (inputs (list kwindowsystem -- cgit 1.4.1 From 83ba42f0b1becb1368dd84221473f0034574bc86 Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Wed, 17 Aug 2022 11:13:04 +0800 Subject: gnu: qtermwidget: Update to 1.1.0. * gnu/packages/lxqt.scm (qtermwidget): Update to 1.1.0. --- gnu/packages/lxqt.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index 97ead5b36e..cdcb386f34 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -1013,14 +1013,14 @@ processes currently in existence, much like code{top} or code{ps}.") (define-public qtermwidget (package (name "qtermwidget") - (version "0.17.0") + (version "1.1.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "10lv475qj0x3c3vl4yhjyr6y10qj5pq8n5pal5k24f6pf7xv412f")))) + (base32 "1m64c1m8dkb06fgfk09da2anjspphph6qdk41rqhds2qymh090v4")))) (build-system cmake-build-system) (inputs (list qtbase-5 utf8proc)) -- cgit 1.4.1 From f2ec964b66885ec68dbf7238d2e5537661a12d68 Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Wed, 17 Aug 2022 11:13:23 +0800 Subject: gnu: qterminal: Update to 1.1.0. * gnu/packages/lxqt.scm (qterminal): Update to 1.1.0. --- gnu/packages/lxqt.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index cdcb386f34..489908cf3d 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -1036,14 +1036,14 @@ processes currently in existence, much like code{top} or code{ps}.") (define-public qterminal (package (name "qterminal") - (version "0.17.0") + (version "1.1.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "0rfv7a6ncm8fs8aicinh9l29w4636gxzcqz735jmch2r41v9i1d9")))) + (base32 "1b9568y5xyxymk8r7pkz878ba24dyaxql2sfiy6blr8szf308c5l")))) (build-system cmake-build-system) (inputs (list qtbase-5 qtx11extras qtermwidget)) -- cgit 1.4.1 From 33c1d2e515038571407cf13318f6d532e608a1a7 Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Wed, 17 Aug 2022 11:13:42 +0800 Subject: gnu: screengrab: Update to 2.4.0. * gnu/packages/lxqt.scm (screengrab): Update to 2.4.0. --- gnu/packages/lxqt.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index 489908cf3d..81754dd8a6 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -1060,14 +1060,14 @@ QTermWidget.") (define-public screengrab (package (name "screengrab") - (version "2.2.0") + (version "2.4.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/screengrab/releases/download/" version "/screengrab-" version ".tar.xz")) (sha256 - (base32 "0cilzw7rz5m2klzpax7rrs5rr6whfda2svwzsn2jvmrirmh5by7r")))) + (base32 "14kh287d70v1lpd5w8pji88nmw3jd44q4h927vnszrkv6bwplzx7")))) (build-system cmake-build-system) (inputs (list kwindowsystem libqtxdg qtbase-5 qtsvg-5 qtx11extras)) -- cgit 1.4.1 From bc334d4a2f3010473a7db54d483d27483da637d5 Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Wed, 17 Aug 2022 11:14:00 +0800 Subject: gnu: lxqt-archiver: Update to 0.6.0. * gnu/packages/lxqt.scm (lxqt-archiver): Update to 0.6.0. --- gnu/packages/lxqt.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index 81754dd8a6..4eebf95be9 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -1085,14 +1085,14 @@ easily publishing them on internet image hosting services.") (define-public lxqt-archiver (package (name "lxqt-archiver") - (version "0.4.0") + (version "0.6.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/lxqt/" name "/releases/download/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "0fzgq7cyr7hx8qmq84xfgbsdx04mc1r7vzq5mz79j7bp2ysh134z")))) + (base32 "1cxxr7rpflh2ki272pac927gzcw2w1lp3qz8vplflf148laigwc0")))) (build-system cmake-build-system) (inputs (list glib json-glib libfm-qt qtbase-5 qtx11extras)) -- cgit 1.4.1 From fdde53902834512c98823b47d29950577ce14d61 Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Wed, 17 Aug 2022 11:14:34 +0800 Subject: gnu: lxqt-connman-applet: Remove patch-translations-dir phase. * gnu/packages/lxqt.scm (lxqt-connman-applet)[arguments]: Remove patch-translations-dir phase. --- gnu/packages/lxqt.scm | 8 -------- 1 file changed, 8 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index 4eebf95be9..dbc41a7221 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -1139,14 +1139,6 @@ like @command{tar} and @command{zip}.") `(#:tests? #f ; no tests #:phases (modify-phases %standard-phases - (add-after 'unpack 'patch-translations-dir - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "CMakeLists.txt" - (("\\$\\{LXQT_TRANSLATIONS_DIR\\}") - (string-append (assoc-ref outputs "out") - "/share/lxqt/translations")) - (("\\$\\{LXQT_ETC_XDG_DIR\\}") "etc/xdg")) - #t)) (add-after 'unpack 'remove-definitions (lambda _ (substitute* "CMakeLists.txt" -- cgit 1.4.1 From 8634ab941f24e8b43192af8a61cedbab951efc04 Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Mon, 22 Aug 2022 02:44:53 +0200 Subject: gnu: xfce4-panel: Update to 4.16.5. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/xfce.scm (xfce4-panel): Update to 4.16.5. Signed-off-by: 宋文武 --- gnu/packages/xfce.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 4f48fb35ba..67a0dd7d31 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -397,7 +397,7 @@ management D-Bus specification.") (define-public xfce4-panel (package (name "xfce4-panel") - (version "4.16.4") + (version "4.16.5") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/xfce/" @@ -405,7 +405,7 @@ management D-Bus specification.") name "-" version ".tar.bz2")) (sha256 (base32 - "116dr516dvcgnccc55p0ks5dgc1s7v9rvb66lkdl8lk53al53bqz")) + "0c42qy76wqa1mr2rk8ka2vwj6k8w2bn7dp00zq67dkvnpki96rh9")) (patches (search-patches "xfce4-panel-plugins.patch")))) (build-system gnu-build-system) (arguments -- cgit 1.4.1 From a721bf68b3fd53bcaf396cee1437f9f6898f4a9d Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Mon, 22 Aug 2022 02:22:17 +0200 Subject: gnu: xfdesktop: Update to 4.16.1. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/xfce.scm (xfdesktop): Update to 4.16.1. Signed-off-by: 宋文武 --- gnu/packages/xfce.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 67a0dd7d31..fff86ff980 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -826,7 +826,7 @@ on the screen.") (define-public xfdesktop (package (name "xfdesktop") - (version "4.16.0") + (version "4.16.1") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/xfce/" @@ -834,7 +834,7 @@ on the screen.") "xfdesktop-" version ".tar.bz2")) (sha256 (base32 - "1bjv2mpkv7zmpzssbvvzh0x4pn8cqm8dvhgsv5i1xwngzspsajwk")) + "04dxljc74zlkz7h8wjj3hx9300r202a4d2hj8agfjmdf100cn7g3")) (modules '((guix build utils))) (snippet #~(begin -- cgit 1.4.1 From 7970f1392dfa252f8f367687b1b4912f0d9e5406 Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Mon, 22 Aug 2022 10:36:37 +0800 Subject: gnu: elementary-xfce-icon-theme: Update to 0.17. * gnu/packages/xfce.scm (elementary-xfce-icon-theme): Update to 0.17. --- gnu/packages/xfce.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index fff86ff980..328ba59db3 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -270,7 +270,7 @@ it to your needs by using several command line options.") (define-public elementary-xfce-icon-theme (package (name "elementary-xfce-icon-theme") - (version "0.16") + (version "0.17") (source (origin (method git-fetch) (uri @@ -280,7 +280,7 @@ it to your needs by using several command line options.") (file-name (git-file-name name version)) (sha256 (base32 - "1s8g7qyjdlq93fbrgysahy5kcbd8b2cpnfmpdvl0vbzyhy2x18d7")))) + "0jlawp6rg55w5cm4d7836r660i2pnc5gkzpdjsq7w5875i85arzm")))) (build-system gnu-build-system) (arguments '(#:tests? #f ; no check target -- cgit 1.4.1 From 5edd5bb800e70adc45a7a1bbf24090504ac8305f Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Mon, 22 Aug 2022 10:38:37 +0800 Subject: gnu: thunar: Update to 4.16.11. * gnu/packages/xfce.scm (thunar): Update to 4.16.11. --- gnu/packages/xfce.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 328ba59db3..93a751b915 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -737,7 +737,7 @@ like appearance, display, keyboard and mouse settings.") (define-public thunar (package (name "thunar") - (version "4.16.10") ;stable version = even minor + (version "4.16.11") ;stable version = even minor (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/xfce/" @@ -745,7 +745,7 @@ like appearance, display, keyboard and mouse settings.") "thunar-" version ".tar.bz2")) (sha256 (base32 - "14lwi4ax0wj77980kkfhdf18b97339b17y8qc8gl2365mgswh1gi")))) + "06wa58dy9z28j7l4a2l7j052sa3h6vfpvxd440cy7qz5na8dwzgl")))) (build-system gnu-build-system) (native-inputs (list pkg-config intltool)) -- cgit 1.4.1 From 7b521f3a90ad28e971d984bc95e1682349042b62 Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Mon, 22 Aug 2022 10:38:57 +0800 Subject: gnu: xfce4-terminal: Update to 1.0.4. * gnu/packages/xfce.scm (xfce4-terminal): Update to 1.0.4. --- gnu/packages/xfce.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 93a751b915..3c0785418b 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -955,7 +955,7 @@ features playback of local media files, DVD/CD and live streams.") (define-public xfce4-terminal (package (name "xfce4-terminal") - (version "1.0.3") + (version "1.0.4") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/apps/" name "/" @@ -963,7 +963,7 @@ features playback of local media files, DVD/CD and live streams.") name "-" version ".tar.bz2")) (sha256 (base32 - "1vgmgz38q5902m4prbww4zy5j8n10pyq5ni3f46z7fpzxp9acs8w")))) + "1x5saijxykxmn2hksf4qvaj965b6i0wy62z9hgrc2vvwmxbmkrbq")))) (build-system gnu-build-system) (native-inputs (list pkg-config intltool)) -- cgit 1.4.1 From 1dd5b07955057980d7551452154ada861096f321 Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Mon, 22 Aug 2022 10:39:18 +0800 Subject: gnu: xfce4-equake-plugin: Update to 1.3.8.1. * gnu/packages/xfce.scm (xfce4-equake-plugin): Update to 1.3.8.1. --- gnu/packages/xfce.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 3c0785418b..bcf255864f 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -1504,7 +1504,7 @@ watch your every step.") (define-public xfce4-equake-plugin (package (name "xfce4-equake-plugin") - (version "1.3.8") + (version "1.3.8.1") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/panel-plugins/" @@ -1513,7 +1513,7 @@ watch your every step.") "/xfce4-equake-plugin-" version ".tar.bz2")) (sha256 (base32 - "09b9k0n5xm115k44x74w4ad0xqklilyfh0hglsps7zj97pd7a5a3")))) + "073lxks7fb0bwgsp5rfwa310b9vd5jz6y5q8aa69kgfi0kbczygg")))) (build-system gnu-build-system) (native-inputs (list intltool pkg-config)) -- cgit 1.4.1 From 9ebed88cf686c3dc9f6f7d448beb27c6bdd38e44 Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Mon, 22 Aug 2022 00:13:27 +0800 Subject: gnu: dotherside: Update to 0.9.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/qt.scm (dotherside): Update to 0.9.0. Signed-off-by: 宋文武 --- gnu/packages/qt.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 8814f7cfd8..d9d796f551 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -3634,7 +3634,7 @@ time Web content can be enhanced with native controls.") (define-public dotherside (package (name "dotherside") - (version "0.6.4") + (version "0.9.0") (source (origin (method git-fetch) @@ -3644,11 +3644,12 @@ time Web content can be enhanced with native controls.") (file-name (git-file-name name version)) (sha256 (base32 - "09fz6v8rp28997f235yaifj8p4vvsyv45knc1iivgdvx7msgcd0m")))) + "13n2qb8q9jz4ihwlbs7y15lw90w9113gb1bgnb1dggpxkj64r953")))) (build-system cmake-build-system) (native-inputs (list qttools-5)) (inputs + ;; TODO: Support Qt 6 (requires qtdeclarative of Qt6). (list qtbase-5 qtdeclarative-5)) (home-page "https://filcuc.github.io/DOtherSide/index.html") (synopsis "C language library for creating bindings for the Qt QML language") -- cgit 1.4.1 From 79a8cfffe9595aafb4a664ab1feb7111cf0adbf5 Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Mon, 22 Aug 2022 04:26:05 +0200 Subject: gnu: beets: Update to 1.6.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/music.scm (beets): Update to 1.6.0. [inputs]: Remove python-six. Signed-off-by: 宋文武 --- gnu/packages/music.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 8f383358d8..e1de632dda 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -3724,13 +3724,13 @@ websites such as Libre.fm.") (define-public beets (package (name "beets") - (version "1.5.0") + (version "1.6.0") (source (origin (method url-fetch) (uri (pypi-uri "beets" version)) (sha256 (base32 - "0arl4nc3y8iwa331hf6ggai19y8ns9pl03g5d6ac857wq2x7nzw8")))) + "0paj2nxvdx4zz9xawjpbsh0dy1kp9kfhxg8akh1rpz2awhsbfvxa")))) (build-system python-build-system) (arguments `(#:phases @@ -3773,7 +3773,6 @@ websites such as Libre.fm.") python-munkres python-musicbrainzngs python-pyyaml - python-six python-unidecode ;; Optional dependencies for plugins. Some of these are also required by tests. python-beautifulsoup4 ; For lyrics. -- cgit 1.4.1 From d84e0b0454dc2b9613d0e9fc1d867656754e3289 Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Mon, 22 Aug 2022 04:51:16 +0200 Subject: gnu: celluloid: Update to 0.24. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/video.scm (celluloid): Update to 0.24. [inputs]: Add libadwaita. Signed-off-by: 宋文武 --- gnu/packages/video.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 0016877033..2ea575629f 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -774,7 +774,7 @@ old-fashioned output methods with powerful ascii-art renderer.") (define-public celluloid (package (name "celluloid") - (version "0.23") + (version "0.24") (source (origin (method url-fetch) @@ -782,12 +782,12 @@ old-fashioned output methods with powerful ascii-art renderer.") "/releases/download/v" version "/celluloid-" version ".tar.xz")) (sha256 - (base32 "0x23y09jwkg8wbb0yp5f03sj5hwjg3kyhbbww2y1a0izs1iijbdj")))) + (base32 "0ns9xh582c8kajw4v2x5ap5jfiba3gxywqc2klc0v6fc3id1gqii")))) (build-system glib-or-gtk-build-system) (native-inputs (list intltool pkg-config)) (inputs - (list gtk libepoxy mpv)) + (list gtk libadwaita libepoxy mpv)) (home-page "https://github.com/celluloid-player/celluloid") (synopsis "GTK+ frontend for the mpv media player") (description "Celluloid is a simple GTK+ frontend for the mpv media player. -- cgit 1.4.1 From 013fbf598a838b732067c6839471aeaa49d7bd4b Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Mon, 22 Aug 2022 05:16:10 +0200 Subject: gnu: emacs-dockerfile-mode: Update to 1.7. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/emacs-xyz.scm (emacs-dockerfile-mode): Update to 1.7. Signed-off-by: 宋文武 --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index a1bb9affa8..0601fc1384 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -25114,7 +25114,7 @@ constant expressions.") (define-public emacs-dockerfile-mode (package (name "emacs-dockerfile-mode") - (version "1.6") + (version "1.7") (source (origin (method git-fetch) @@ -25124,7 +25124,7 @@ constant expressions.") (file-name (git-file-name name version)) (sha256 (base32 - "0nmybfc9qch0jng06qgs2xb41dl9v52ckc9nc20d7hv3x36w555x")))) + "0hmzwh8m72rj6cwaxfypnv3fmjrs11iqr15vsdw1rw7m55xi675f")))) (build-system emacs-build-system) (propagated-inputs (list emacs-s)) -- cgit 1.4.1 From 114c9ea22fb3f8de466cebdfda133db735d4481e Mon Sep 17 00:00:00 2001 From: Nicolas Graves Date: Sun, 14 Aug 2022 18:07:02 +0200 Subject: gnu: Add emacs-citar-org-roam. * gnu/packages/emacs-xyz.scm (emacs-citar-org-roam): New variable. Signed-off-by: Andrew Tropin --- gnu/packages/emacs-xyz.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 0601fc1384..4d309ddad6 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -19005,6 +19005,36 @@ With Embark, it also makes available at-point actions in Org citations.") (license license:gpl3+))) +(define-public emacs-citar-org-roam + (package + (name "emacs-citar-org-roam") + (version "0.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/emacs-citar/citar-org-roam") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1ldfs7g7ixnrwj23draiph4vy6xq7qgw18vhi7vbw6wvkh9fcv9r")))) + (build-system emacs-build-system) + (propagated-inputs (list emacs-org-roam emacs-citar)) + (home-page "https://github.com/emacs-citar/citar-org-roam") + (synopsis "Emacs pacakge to provide tighter Citar and Org-Roam integration") + (description "\ +Out-of-box, Citar provides default support for file-per-note bibliographic +notes that are compatible with Org-Roam v2. This package integrates directly +with the Org-Roam database, and provides the following additional features to +Citar note support: +@itemize +@item multiple references per note +@item multiple reference notes per file +@item ability to query note citations by reference +@item ``live'' updating of Citar UI for presence of notes +@end itemize") + (license license:gpl3))) + (define-public emacs-helm-bibtex (let ((commit "aa775340ba691d2322948bfdc6a88158568a1399") (revision "3")) -- cgit 1.4.1 From 3a4a65bd74641dc6db41c6afcaa066b5e905dc47 Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Mon, 22 Aug 2022 00:14:39 +0800 Subject: gnu: i3-autotiling: Update to 1.6.1. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (i3-autotiling): Update to 1.6.1. Signed-off-by: 宋文武 --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 4a755ea566..079e087b10 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -30500,7 +30500,7 @@ window managers.") (define-public i3-autotiling (package (name "i3-autotiling") - (version "1.6") + (version "1.6.1") (source (origin (method git-fetch) (uri (git-reference @@ -30509,7 +30509,7 @@ window managers.") (file-name (git-file-name name version)) (sha256 (base32 - "1hjlvg7095s322gb43r9g7mqlsy3pj13l827jpnbn5x0918rq9rr")))) + "1m8k3g83n2n1xws89dh20f3sy6753wvip9dzf6bssv2cz9ll7406")))) (build-system python-build-system) (arguments (list #:tests? #f)) ;no tests (native-inputs (list python-wheel)) -- cgit 1.4.1 From 3534165413f8b9d299d034ae31ef94b560f6c0bc Mon Sep 17 00:00:00 2001 From: Mădălin Ionel Patrașcu Date: Thu, 18 Aug 2022 12:53:57 +0200 Subject: gnu: Add r-ggvenn. * gnu/packages/cran.scm (r-ggvenn): New variable. --- gnu/packages/cran.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index e03b707162..03801ecc47 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1061,6 +1061,26 @@ the reasonable size limit without losing vector properties of the scale-sensitive information.") (license license:expat))) +(define-public r-ggvenn + (package + (name "r-ggvenn") + (version "0.1.9") + (source (origin + (method url-fetch) + (uri (cran-uri "ggvenn" version)) + (sha256 + (base32 + "0bm52j3idchignp6nrw7c76jlbfkjf5zng258957vq019vx9qxrq")))) + (properties `((upstream-name . "ggvenn"))) + (build-system r-build-system) + (propagated-inputs (list r-dplyr r-ggplot2)) + (home-page "https://cran.r-project.org/package=ggvenn") + (synopsis "Draw Venn diagram with ggplot2") + (description + "This package offers an easy to use way to draw a Venn diagram with +@code{ggplot2}.") + (license license:expat))) + (define-public r-lmds (package (name "r-lmds") -- cgit 1.4.1 From ca823a1600bf99e4ca83b17b8cf0586790c180ba Mon Sep 17 00:00:00 2001 From: Mădălin Ionel Patrașcu Date: Thu, 18 Aug 2022 13:14:20 +0200 Subject: gnu: Add r-gensa. * gnu/packages/cran.scm (r-gensa): New variable. --- gnu/packages/cran.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 03801ecc47..b2a55d871b 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -3533,6 +3533,24 @@ coordinates.") @end enumerate\n") (license license:gpl2+))) +(define-public r-gensa + (package + (name "r-gensa") + (version "1.1.7") + (source (origin + (method url-fetch) + (uri (cran-uri "GenSA" version)) + (sha256 + (base32 + "03xqwxm7v7rnihx730a4p65dfwhjh4345r3d78y0qxxplk8d76cx")))) + (properties `((upstream-name . "GenSA"))) + (build-system r-build-system) + (home-page "https://cran.r-project.org/package=GenSA") + (synopsis "Generalized simulated annealing") + (description "This package performs search for the global minimum of a very +complex non-linear objective function with a very large number of optima.") + (license license:gpl2))) + (define-public r-geosphere (package (name "r-geosphere") -- cgit 1.4.1 From 36b38bb4f3f4926431ae2a6d6ae79d5ad0d3d079 Mon Sep 17 00:00:00 2001 From: Mădălin Ionel Patrașcu Date: Mon, 22 Aug 2022 10:42:44 +0200 Subject: gnu: Add r-polylabelr. * gnu/packages/cran.scm (r-polylabelr): New variable. Signed-off-by: Ricardo Wurmus --- gnu/packages/cran.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index b2a55d871b..3d1fcc928d 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1503,6 +1503,28 @@ qualitative palettes with many (20-30 or more) colors. See Coombes and colleagues (2019) @url{https://doi:10.18637/jss.v090.c01}.") (license license:asl2.0))) +(define-public r-polylabelr + (package + (name "r-polylabelr") + (version "0.2.0") + (source (origin + (method url-fetch) + (uri (cran-uri "polylabelr" version)) + (sha256 + (base32 + "01b2v0l5g8nxwbd6nwqv8ahypgh6gfhd4qabg75brlj7z1iyfzf2")))) + (properties `((upstream-name . "polylabelr"))) + (build-system r-build-system) + (propagated-inputs (list r-rcpp)) + (home-page "https://github.com/jolars/polylabelr") + (synopsis "Finding pole of inaccessibility (visual center) of a polygon") + (description + "This package provides a wrapper around the @code{C++} library @code{ +polylabel} from @code{Mapbox}, providing an efficient routine for finding the +approximate pole of inaccessibility of a polygon, which usually serves as an +excellent candidate for labeling of a polygon.") + (license license:expat))) + (define-public r-poorman (package (name "r-poorman") -- cgit 1.4.1 From 4719f3d204e2b835d8ea89848a8e27eee5394533 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 22 Aug 2022 12:12:12 +0200 Subject: gnu: emacs-geiser: Update to 0.25.1. * gnu/packages/emacs-xyz.scm (emacs-geiser): Update to 0.25.1. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 4d309ddad6..67e2eeea5f 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -250,7 +250,7 @@ (define-public emacs-geiser (package (name "emacs-geiser") - (version "0.23.2") + (version "0.25.1") (source (origin (method git-fetch) @@ -259,7 +259,7 @@ (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0p5cwx0xwva4ajgj8hnrk8bx6n3hv1z7aqs4zivp81crnq4077yw")))) + (base32 "0qm43qkf0rpcbsf5wb7b51m79jvn2fkl19f49acbzjpavx66vn3n")))) (build-system emacs-build-system) (arguments '(#:phases -- cgit 1.4.1 From 3a9fae15a07518e4f0eda1d20d3dc90f45047456 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 22 Aug 2022 12:13:21 +0200 Subject: gnu: emacs-autothemer: Update to 0.2.6. * gnu/packages/emacs-xyz.scm (emacs-autothemer): Update to 0.2.6. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 67e2eeea5f..7052fcb246 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -2961,7 +2961,7 @@ or XEmacs.") (define-public emacs-autothemer (package (name "emacs-autothemer") - (version "0.2.5") + (version "0.2.6") (source (origin (method git-fetch) @@ -2971,7 +2971,7 @@ or XEmacs.") (file-name (git-file-name name version)) (sha256 (base32 - "1rwz8hdmycmvak1w5sriwf1pwahham77vyab6jngdw8x9ngxabnx")))) + "1zrm09lzl5s3l0rnzihj9azj1n1l214r6lrmp9yqj7sm7y1xjf0c")))) (build-system emacs-build-system) (propagated-inputs (list emacs-dash)) -- cgit 1.4.1 From 3ac47c1b88ce57a8b145703c734caf1d0f6c4f16 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 22 Aug 2022 10:11:23 -0400 Subject: gnu: linux-libre: Update to 5.18.19. * gnu/packages/linux.scm (linux-libre-5.18-version): Update to 5.18.19. (linux-libre-5.18-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 8704f32ae2..36f090cc48 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -352,7 +352,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The current "stable" kernels. That is, the most recently released major ;; versions that are still supported upstream. -(define-public linux-libre-5.18-version "5.18.18") +(define-public linux-libre-5.18-version "5.18.19") (define-public linux-libre-5.18-gnu-revision "gnu") (define deblob-scripts-5.18 (linux-libre-deblob-scripts @@ -362,7 +362,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "03w1p49rf7sqsxvwpdndqa0k9hc9748rplyqiiw1q6cbdjficwyw"))) (define-public linux-libre-5.18-pristine-source (let ((version linux-libre-5.18-version) - (hash (base32 "0as0cslwz6zdiwd5wzcjggw3qpa9hzvfmxlhy72jdhn5vk47dhy1"))) + (hash (base32 "1mc8zhiw0v7fka64mydpdrxkrvy0jyqggq5lghw3pyqj2wjrpw6z"))) (make-linux-libre-source version (%upstream-linux-source version hash) -- cgit 1.4.1 From 5a07d998702a9279771cd52a9f18cb2677d8617f Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 22 Aug 2022 10:11:32 -0400 Subject: gnu: linux-libre 5.15: Update to 5.15.62. * gnu/packages/linux.scm (linux-libre-5.15-version): Update to 5.15.62. (linux-libre-5.15-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 36f090cc48..b2113e42c3 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -371,7 +371,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The "longterm" kernels — the older releases with long-term upstream support. ;; Here are the support timelines: ;; -(define-public linux-libre-5.15-version "5.15.61") +(define-public linux-libre-5.15-version "5.15.62") (define-public linux-libre-5.15-gnu-revision "gnu") (define deblob-scripts-5.15 (linux-libre-deblob-scripts @@ -381,7 +381,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1qzmy0v040zj542zgs2569bpc7r1b77bf5gq1b3r5kffwpx900v3"))) (define-public linux-libre-5.15-pristine-source (let ((version linux-libre-5.15-version) - (hash (base32 "0hpx0ziz162lc41jwi2ybj3qgidinjcsp71lchvmp6h0vyiddj9v"))) + (hash (base32 "0hgiag3mvdlcr6ckfy4bdr7h4471zqi53ahfybdvdkapivg7r086"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.15))) -- cgit 1.4.1 From ff3cecffafad0ddf5cc2af6cb676e73bcf58e431 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 22 Aug 2022 10:11:47 -0400 Subject: gnu: linux-libre 5.10: Update to 5.10.137. * gnu/packages/linux.scm (linux-libre-5.10-version): Update to 5.10.137. (linux-libre-5.10-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index b2113e42c3..a7d92816a8 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -386,7 +386,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.15))) -(define-public linux-libre-5.10-version "5.10.136") +(define-public linux-libre-5.10-version "5.10.137") (define-public linux-libre-5.10-gnu-revision "gnu1") (define deblob-scripts-5.10 (linux-libre-deblob-scripts @@ -396,7 +396,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1981axxswghza3iadp94q54y8w30h9w9vyq4cbjiiv9alvbv0pb8"))) (define-public linux-libre-5.10-pristine-source (let ((version linux-libre-5.10-version) - (hash (base32 "0naiwihlj6aswnqwdz3xzmga98xpj5lf2iy9vxqzdng7b46rs28w"))) + (hash (base32 "1j0n2r793pkvymjc70fzqwqi6h2j1wkja2kx012ydmsk2i6wssy1"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.10))) -- cgit 1.4.1 From b5c07581c4df0f49807fdbf43ba257bcb57b96a6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 21 Aug 2022 02:00:00 +0200 Subject: gnu: python-jaraco-functools: Disable flaky test. * gnu/packages/python-xyz.scm (python-jaraco-functools)[arguments]: Skip the "test_function_throttled". Reported by Lumine in #guix. --- gnu/packages/python-xyz.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 079e087b10..542f90ae29 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8337,8 +8337,11 @@ module with a few extra procedures.") (lambda* (#:key tests? #:allow-other-keys) (when tests? ;; Do not test the myproject.toml build as it tries to pull - ;; dependencies from the Internet. - (invoke "pytest" "-vv" "-k" "not project")))))))) + ;; dependencies from the Internet. Do not run a test that + ;; tries to emulate a broken proprietary CI set-up, fails + ;; to do so correctly, and then throws an error about it. + (invoke "pytest" "-vv" "-k" + "not project and not test_function_throttled")))))))) (native-inputs (modify-inputs (package-native-inputs python-jaraco-functools-bootstrap) -- cgit 1.4.1 From 504e06012687dd2ff11af60528e4232fbdeca85e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 21 Aug 2022 02:00:01 +0200 Subject: gnu: python-lzo: Update to 1.14. * gnu/packages/python-compression.scm (python-lzo): Update to 1.14. [arguments]: Don't explicitly return #t from phases. --- gnu/packages/python-compression.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-compression.scm b/gnu/packages/python-compression.scm index 12c172c0bc..b3d7925aa5 100644 --- a/gnu/packages/python-compression.scm +++ b/gnu/packages/python-compression.scm @@ -195,14 +195,13 @@ Python.") (define-public python-lzo (package (name "python-lzo") - (version "1.12") + (version "1.14") (source (origin (method url-fetch) (uri (pypi-uri "python-lzo" version)) (sha256 - (base32 - "0iakqgd51n1cd7r3lpdylm2rgbmd16y74cra9kcapwg84mlf9a4p")))) + (base32 "0315nq6r39n51n8qqamb7xv0ib0qrh76q7g3a1977172mbndijw3")))) (build-system python-build-system) (arguments `(#:test-target "check" @@ -215,8 +214,7 @@ Python.") (string-append "include_dirs.append('" (assoc-ref %build-inputs "lzo") "/include/lzo" - "')"))) - #t))))) + "')")))))))) (inputs (list lzo)) (home-page "https://github.com/jd-boyd/python-lzo") -- cgit 1.4.1 From 0337b65284d353b3c4fa05c7f92ac184d4c7d113 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 21 Aug 2022 02:00:00 +0200 Subject: gnu: python-lzo: Use G-expressions. * gnu/packages/python-compression.scm (python-lzo)[arguments]: Rewrite as G-expressions. --- gnu/packages/python-compression.scm | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-compression.scm b/gnu/packages/python-compression.scm index b3d7925aa5..0504dd0b2a 100644 --- a/gnu/packages/python-compression.scm +++ b/gnu/packages/python-compression.scm @@ -204,17 +204,18 @@ Python.") (base32 "0315nq6r39n51n8qqamb7xv0ib0qrh76q7g3a1977172mbndijw3")))) (build-system python-build-system) (arguments - `(#:test-target "check" - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-setuppy - (lambda _ - (substitute* "setup.py" - (("include_dirs.append\\(.*\\)") - (string-append "include_dirs.append('" - (assoc-ref %build-inputs "lzo") - "/include/lzo" - "')")))))))) + (list + #:test-target "check" + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-setuppy + (lambda _ + (substitute* "setup.py" + (("include_dirs.append\\(.*\\)") + (string-append "include_dirs.append('" + #$(this-package-input "lzo") + "/include/lzo" + "')")))))))) (inputs (list lzo)) (home-page "https://github.com/jd-boyd/python-lzo") -- cgit 1.4.1 From 4c03f62ad04c2cbbfc7ed61c97b0ecf897383706 Mon Sep 17 00:00:00 2001 From: Felix Gruber Date: Sun, 21 Aug 2022 13:53:30 +0000 Subject: gnu: python-shapely: Update to 1.8.4. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-shapely): Update to 1.8.4. Signed-off-by: 宋文武 --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 542f90ae29..24f08c670e 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1211,13 +1211,13 @@ iotop, uptime, pidof, tty, taskset, pmap.") (define-public python-shapely (package (name "python-shapely") - (version "1.8.2") + (version "1.8.4") (source (origin (method url-fetch) (uri (pypi-uri "Shapely" version)) (sha256 - (base32 "1dpbjw0w2l1r9s5drmi4cyr1yd5h2a4m9vip7qhy7mbg03azjajp")))) + (base32 "130rqd0czi128wm5pdn47v4m6czxd7pkzanbya8q48gsm8ffb5d1")))) (build-system python-build-system) (native-inputs (list python-cython python-matplotlib python-pytest -- cgit 1.4.1 From fc4ff8c3e13fb693d7c983d914e088cde38ac56b Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Tue, 23 Aug 2022 10:15:30 +0800 Subject: gnu: lxqt: Fix default icon theme. * gnu/packages/lxqt.scm (lxqt)[propagated-inputs]: Replace oxygen-icons with breeze-icons. --- gnu/packages/lxqt.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index dbc41a7221..ceb69f2199 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -1194,7 +1194,7 @@ desktop.") lximage-qt obconf-qt openbox - oxygen-icons + breeze-icons ; default by /share/lxqt/lxqt.conf pavucontrol-qt qps qterminal)) -- cgit 1.4.1 From 6c21c9fab1079e445e9ea2d23c007247fdac1199 Mon Sep 17 00:00:00 2001 From: Mădălin Ionel Patrașcu Date: Mon, 22 Aug 2022 12:33:19 +0200 Subject: gnu: Add r-parathyroidse. * gnu/packages/bioconductor.scm (r-parathyroidse): New variable. --- gnu/packages/bioconductor.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 7d2ca413e9..b4f880a080 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -1541,6 +1541,30 @@ harmonized subsetting of rows (features) and columns (patients / samples) across the entire multi-'omics experiment.") (license license:artistic2.0))) +(define-public r-parathyroidse + (package + (name "r-parathyroidse") + (version "1.34.0") + (source (origin + (method url-fetch) + (uri (bioconductor-uri "parathyroidSE" version + 'experiment)) + (sha256 + (base32 + "1h33x55c4gbzmh085skqif04wdcvjp2l9fm55qzwws27kwd30c16")))) + (properties `((upstream-name . "parathyroidSE"))) + (build-system r-build-system) + (propagated-inputs (list r-summarizedexperiment)) + (home-page "https://bioconductor.org/packages/parathyroidSE") + (synopsis "RangedSummarizedExperiment for RNA-Seq of parathyroid tumors") + (description + "This package provides @code{RangedSummarizedExperiment} objects of read +counts in genes and exonic parts for paired-end RNA-Seq data from experiments on +primary cultures of parathyroid tumors. The sequencing was performed on tumor +cultures from 4 patients at 2 time points over 3 conditions (DPN, OHT and control).") + ;; The author(s) mentions only LGPL without any specific version. + (license license:lgpl2.1+))) + (define-public r-tcgabiolinksgui-data (package (name "r-tcgabiolinksgui-data") -- cgit 1.4.1 From f6bcde85a6d227ddf492dd89f7e79ef2835cb228 Mon Sep 17 00:00:00 2001 From: Mădălin Ionel Patrașcu Date: Mon, 22 Aug 2022 12:59:41 +0200 Subject: gnu: Add r-pcaexplorer. * gnu/packages/bioconductor.scm (r-pcaexplorer): New variable. --- gnu/packages/bioconductor.scm | 55 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index b4f880a080..55b0024171 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -5073,6 +5073,61 @@ annotation packages each of which has its own schema by taking advantage of the fact that each of these packages implements a select methods.") (license license:artistic2.0))) +(define-public r-pcaexplorer + (package + (name "r-pcaexplorer") + (version "2.22.0") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "pcaExplorer" version)) + (sha256 + (base32 + "0xkafpi6y5n8hljdaj183hd5z4ik7lpbklg2cbx1hwfz4n4hh1bl")))) + (properties `((upstream-name . "pcaExplorer"))) + (build-system r-build-system) + (propagated-inputs + (list r-annotationdbi + r-base64enc + r-biomart + r-deseq2 + r-dt + r-genefilter + r-genomicranges + r-ggplot2 + r-ggrepel + r-go-db + r-gostats + r-heatmaply + r-iranges + r-knitr + r-limma + r-nmf + r-pheatmap + r-plotly + r-plyr + r-rmarkdown + r-s4vectors + r-scales + r-shiny + r-shinyace + r-shinybs + r-shinydashboard + r-summarizedexperiment + r-threejs + r-tidyr + r-topgo)) + (native-inputs (list r-knitr)) + (home-page "https://github.com/federicomarini/pcaExplorer") + (synopsis + "Interactive Visualization of RNA-seq Data Using a Principal Components Approach") + (description + "This package provides functionality for interactive visualization of RNA-seq +datasets based on Principal Components Analysis. The methods provided allow for +quick information extraction and effective data exploration. A Shiny +application encapsulates the whole analysis.") + (license license:expat))) + (define-public r-pcamethods (package (name "r-pcamethods") -- cgit 1.4.1 From 090663a7a5dcc3b9a2af1e7c70e1842f983a24f7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 23 Aug 2022 11:45:59 +0200 Subject: gnu: Add r-bladderbatch. * gnu/packages/bioconductor.scm (r-bladderbatch): New variable. --- gnu/packages/bioconductor.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 55b0024171..8842b0feb5 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -1221,6 +1221,27 @@ demonstration purposes in the @code{AneuFinder} package.") from Illumina 450k methylation arrays.") (license license:artistic2.0))) +(define-public r-bladderbatch + (package + (name "r-bladderbatch") + (version "1.34.0") + (source (origin + (method url-fetch) + (uri (bioconductor-uri "bladderbatch" version + 'experiment)) + (sha256 + (base32 + "1dpbaqsqizyi99r0imf5m4lndhhrkyiaqii9bi8rp18fjbjdd72k")))) + (properties `((upstream-name . "bladderbatch"))) + (build-system r-build-system) + (propagated-inputs (list r-biobase)) + (home-page "https://bioconductor.org/packages/bladderbatch") + (synopsis "Bladder gene expression data illustrating batch effects") + (description + "This package contains microarray gene expression data on 57 bladder samples from +5 batches. The data are used as an illustrative example for the sva package.") + (license license:artistic2.0))) + (define-public r-biscuiteerdata (package (name "r-biscuiteerdata") -- cgit 1.4.1 From 4a6c6484df286203a2cb6ed5c431047febf499f2 Mon Sep 17 00:00:00 2001 From: Mădălin Ionel Patrașcu Date: Mon, 22 Aug 2022 13:26:27 +0200 Subject: gnu: Add r-organism-dplyr. * gnu/packages/bioconductor.scm (r-organism-dplyr): New variable. Signed-off-by: Ricardo Wurmus --- gnu/packages/bioconductor.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 8842b0feb5..d27419428f 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -5062,6 +5062,45 @@ proteowizard library for mzML and mzIdentML. The netCDF reading code has previously been used in XCMS.") (license license:artistic2.0))) +(define-public r-organism-dplyr + (package + (name "r-organism-dplyr") + (version "1.24.0") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "Organism.dplyr" version)) + (sha256 + (base32 + "0j29f85d66c45ww3417xx376vpz0mmvga5n7h2cl1sd4h70b55as")))) + (properties `((upstream-name . "Organism.dplyr"))) + (build-system r-build-system) + (propagated-inputs + (list r-annotationdbi + r-annotationfilter + r-biocfilecache + r-dbi + r-dbplyr + r-dplyr + r-genomeinfodb + r-genomicfeatures + r-genomicranges + r-iranges + r-rlang + r-rsqlite + r-s4vectors + r-tibble)) + (native-inputs (list r-knitr)) + (home-page "https://bioconductor.org/packages/Organism.dplyr") + (synopsis "Dplyr-based access to Bioconductor annotation resources") + (description + "This package provides an alternative interface to Bioconductor @code{ +annotation} resources, in particular the gene identifier mapping functionality +of the @code{org} packages (e.g., @code{org.Hs.eg.db}) and the genome coordinate +functionality of the @code{TxDb} packages (e.g., +@code{TxDb.Hsapiens.UCSC.hg38.knownGene}).") + (license license:artistic2.0))) + (define-public r-organismdbi (package (name "r-organismdbi") -- cgit 1.4.1 From ee676283e2dbd38bf40ef21ccd4e7493baa2ad6d Mon Sep 17 00:00:00 2001 From: Mădălin Ionel Patrașcu Date: Mon, 22 Aug 2022 14:14:40 +0200 Subject: gnu: Add r-rvenn. * gnu/packages/cran.scm (r-rvenn): New variable. --- gnu/packages/cran.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 3d1fcc928d..20fa3a930d 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -749,6 +749,42 @@ similar rank-based tests for equal probability distributions due to Neuhauser WebAssembly engine.") (license license:expat))) +(define-public r-rvenn + (package + (name "r-rvenn") + (version "1.1.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "RVenn" version)) + (sha256 + (base32 + "016m00xv59lkwm2is32v5nr4lw5a1ymdnz34r3ffflcv9bfrc6n4")))) + (properties `((upstream-name . "RVenn"))) + (build-system r-build-system) + (propagated-inputs + (list r-ggforce + r-ggplot2 + r-magrittr + r-pheatmap + r-purrr + r-rlang + r-vegan)) + (native-inputs (list r-knitr)) + (home-page "https://cran.r-project.org/package=RVenn") + (synopsis "Set operations for many sets") + (description + "The base functions for set operations in @code{R} can be used for only two +sets. This package @code{RVenn} provides functions for dealing with multiple sets. +It uses @code{purr} to find the union, intersection and difference of three or +more sets. This package also provides functions for pairwise set operations among +several sets. Further, based on @code{ggplot2} and @code{ggforce}, a Venn diagram +can be drawn for two or three sets. For bigger data sets, a clustered heatmap +showing the presence or absence of the elements of the sets can be drawn based on +the @code{pheatmap} package. Finally, enrichment test can be applied to two sets +whether an overlap is statistically significant or not.") + (license license:gpl3))) + (define-public r-dot (package (name "r-dot") -- cgit 1.4.1 From 7c47fa25134a2111e596e96198d02644aedae459 Mon Sep 17 00:00:00 2001 From: Mădălin Ionel Patrașcu Date: Mon, 22 Aug 2022 14:14:41 +0200 Subject: gnu: Add r-ggvenndiagram. * gnu/packages/cran.scm (r-ggvenndiagram): New variable. Signed-off-by: Ricardo Wurmus --- gnu/packages/cran.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 20fa3a930d..ed541dd720 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1117,6 +1117,45 @@ scale-sensitive information.") @code{ggplot2}.") (license license:expat))) +(define-public r-ggvenndiagram + (package + (name "r-ggvenndiagram") + (version "1.2.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "ggVennDiagram" version)) + (sha256 + (base32 + "1mjs488npnxd53nsw936iw2vzv7z38h8d02pm4lwrz4i83jg3www")))) + (properties `((upstream-name . "ggVennDiagram"))) + (build-system r-build-system) + (propagated-inputs + (list r-dplyr + r-ggplot2 + r-magrittr + r-plotly + r-purrr + r-rvenn + r-sf + r-stringr + r-tibble)) + (native-inputs (list r-knitr)) + (home-page "https://github.com/gaospecial/ggVennDiagram") + (synopsis "Implementention of the Venn diagram using ggplot2") + (description + "This package implements easy-to-use functions to generate 2-7 sets Venn +plot in publication quality. @code{ggVennDiagram} plot Venn using +well-defined geometry dataset and @code{ggplot2}. The shapes of 2-4 sets Venn +use circles and ellipses, while the shapes of 4-7 sets Venn use irregular +polygons (4 has both forms), which are developed and imported from another +package @code{venn}. We provide internal functions to integrate shape data +with user provided sets data, and calculated the geometry of every +regions/intersections of them, then separately plot Venn in three components: +set edges, set labels, and regions. From version 1.0, it is possible to +customize these components as you demand in ordinary @code{ggplot2} grammar.") + (license license:gpl3))) + (define-public r-lmds (package (name "r-lmds") -- cgit 1.4.1 From 8d428985723dab0e203b965545fb708709a28882 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 23 Aug 2022 13:29:17 +0200 Subject: gnu: python-mappy: Update to 2.24. * gnu/packages/bioinformatics.scm (python-mappy): Update to 2.24. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 0e08a951a6..23a0fcd8b2 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -11391,13 +11391,13 @@ cases include: (define-public python-mappy (package (name "python-mappy") - (version "2.18") + (version "2.24") (source (origin (method url-fetch) (uri (pypi-uri "mappy" version)) (sha256 (base32 - "1a05p7rkmxa6qhm108na8flzj2v45jab06drk59kzk1ip2sgvzqq")))) + "1ycszza87p9qvx8mis9v1hry0ac465x1xcxbsn1k45qlxxrzp8im")))) (build-system python-build-system) (native-inputs (list python-cython)) -- cgit 1.4.1 From 01dfcad225a2eeca469bfdd665e01c7fb2d28941 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 23 Aug 2022 13:29:30 +0200 Subject: gnu: Add python-ncls. * gnu/packages/python-xyz.scm (python-ncls): New variable. --- gnu/packages/python-xyz.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 24f08c670e..8b0aae76ac 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1766,6 +1766,26 @@ client-side scripting and application development around the NETCONF protocol.") (license license:asl2.0))) +(define-public python-ncls + (package + (name "python-ncls") + (version "0.0.65") + (source (origin + (method url-fetch) + (uri (pypi-uri "ncls" version)) + (sha256 + (base32 + "1wx06xqknd2r98w8z93f47g5dpxzn92kamhj8vkq0nj569hf7cg1")))) + (build-system python-build-system) + (propagated-inputs (list python-numpy)) + (home-page "https://github.com/endrebak/ncls") + (synopsis "Nested containment list data structure") + (description + "This package provides a wrapper for the nested containment list data +structure. It is a static interval-tree that is fast for both construction +and lookups.") + (license license:bsd-3))) + (define-public python-license-expression (package (name "python-license-expression") -- cgit 1.4.1 From d26b29d263e2a3ce5c7ef446f4bfcdcec75ab39f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 23 Aug 2022 13:30:52 +0200 Subject: gnu: Add flair. * gnu/packages/bioinformatics.scm (flair): New variable. --- gnu/packages/bioinformatics.scm | 49 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 23a0fcd8b2..2bae609614 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -16456,6 +16456,55 @@ module capable of computing base-level alignments for very large sequences.") (home-page "https://github.com/ekg/wfmash") (license license:expat))) +(define-public flair + (package + (name "flair") + (version "1.6.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/BrooksLabUCSC/flair") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "106swb2q7l20ki58fca1hg95q5f79bgp9gjb0clr2243ycrzyxf8")))) + (build-system python-build-system) + (arguments + (list + #:tests? #false ;there are none + #:phases + #~(modify-phases %standard-phases + ;; TODO: implement as a feature of python-build-system (PEP-621, + ;; PEP-631, PEP-660) + (replace 'build + (lambda _ + (setenv "SETUPTOOLS_SCM_PRETEND_VERSION" #$version) + ;; ZIP does not support timestamps before 1980. + (setenv "SOURCE_DATE_EPOCH" "315532800") + (invoke "python" "-m" "build" "--wheel" "--no-isolation" "."))) + (replace 'install + (lambda _ + (apply invoke "pip" "--no-cache-dir" "--no-input" + "install" "--no-deps" "--prefix" #$output + (find-files "dist" "\\.whl$"))))))) + (propagated-inputs + (list python-mappy + python-ncls + python-pybedtools + python-pysam + python-tqdm)) + (native-inputs + (list python-pypa-build python-setuptools)) + (home-page "https://flair.readthedocs.io/en/latest/") + (synopsis "Full-length alternative isoform analysis of RNA") + (description "This package implements FLAIR (Full-Length Alternative +Isoform analysis of RNA) for the correction, isoform definition, and +alternative splicing analysis of noisy reads. FLAIR has primarily been used +for nanopore cDNA, native RNA, and PacBio sequencing reads.") + (license license:bsd-3))) + (define-public go-github-com-biogo-graph (package (name "go-github-com-biogo-graph") -- cgit 1.4.1 From d769cf81d83d75400e5ed0394b839d8ddb770384 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Mon, 22 Aug 2022 18:01:58 -0400 Subject: gnu: icecat: Update to 91.13.0-guix0-preview1 [security fixes]. Includes fixes for CVE-2022-38472, CVE-2022-38473, and CVE-2022-38478. * gnu/packages/gnuzilla.scm (%icecat-version, %icecat-build-id): Update. (icecat-source): Update gnuzilla commit, base version, and hashes. --- gnu/packages/gnuzilla.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index a914650506..4c08ef6095 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -371,8 +371,8 @@ in C/C++.") ;; XXXX: Workaround 'snippet' limitations. (define computed-origin-method (@@ (guix packages) computed-origin-method)) -(define %icecat-version "91.12.0-guix0-preview1") -(define %icecat-build-id "20220726000000") ;must be of the form YYYYMMDDhhmmss +(define %icecat-version "91.13.0-guix0-preview1") +(define %icecat-build-id "20220823000000") ;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' @@ -394,11 +394,11 @@ in C/C++.") "firefox-" upstream-firefox-version ".source.tar.xz")) (sha256 (base32 - "0p1bhc1qla4a7iqk0fc6sj224ld6wplpmj4yw6nfx1b8hbqqy2vc")))) + "0qh7j960wdp5zcfqhkj8ki47spp9i9ms12xx0v0kxvmmw36jpgjk")))) - (upstream-icecat-base-version "91.12.0") ; maybe older than base-version + (upstream-icecat-base-version "91.13.0") ; maybe older than base-version ;;(gnuzilla-commit (string-append "v" upstream-icecat-base-version)) - (gnuzilla-commit "298024d727053a1609df4003fb4438836d5181f4") + (gnuzilla-commit "4a87716686104266a9cccc2d83cc249e312f3673") (gnuzilla-source (origin (method git-fetch) @@ -410,7 +410,7 @@ in C/C++.") (string-take gnuzilla-commit 8))) (sha256 (base32 - "1lgz6knklxbrqr1vaj9d0y0997f4f6v44a8cng8ihkmn7aa7lvwg")))) + "070j78al04xzchfl5xj1w300hmw17a3iqcw7mnlxf6b8rqlgj20p")))) ;; 'search-patch' returns either a valid file name or #f, so wrap it ;; in 'assume-valid-file-name' to avoid 'local-file' warnings. -- cgit 1.4.1 From 90ca0f57bf9664e195bbb896ff3a17d89bd62f05 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Volatier Date: Sun, 21 Aug 2022 17:49:37 +0000 Subject: gnu: julia: Update to 1.6.7. * gnu/packages/julia.scm (julia): Update to 1.6.7. [arguments]: Add custom 'activate-gnu-source-for-loader phase. Adjust custom 'adjust-test-suite, 'disable-broken-tests phases for changes in the code. Remove trailing #t from phases. Co-authored-by: Efraim Flashner --- gnu/packages/julia.scm | 39 +++++++++++++++++---------------------- 1 file changed, 17 insertions(+), 22 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/julia.scm b/gnu/packages/julia.scm index 0bdac66175..29c981189c 100644 --- a/gnu/packages/julia.scm +++ b/gnu/packages/julia.scm @@ -1,10 +1,10 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015, 2016, 2017 Ricardo Wurmus -;;; Copyright © 2016, 2020, 2021 Efraim Flashner +;;; Copyright © 2016, 2020-2022 Efraim Flashner ;;; Copyright © 2020, 2021 Nicolò Balzarotti ;;; Copyright © 2020 Tim Howes ;;; Copyright © 2020 Tobias Geerinckx-Rice -;;; Copyright © 2021 Jean-Baptiste Volatier +;;; Copyright © 2021, 2022 Jean-Baptiste Volatier ;;; Copyright © 2021 Simon Tournier ;;; Copyright © 2021 Maxim Cournoyer ;;; @@ -139,7 +139,7 @@ libraries. It is also a bit like @code{ldd} and @code{otool -L}.") (define-public julia (package (name "julia") - (version "1.6.3") + (version "1.6.7") (source (origin (method url-fetch) (uri (string-append @@ -147,7 +147,7 @@ libraries. It is also a bit like @code{ldd} and @code{otool -L}.") version "/julia-" version ".tar.gz")) (sha256 (base32 - "1515x8fs25l3f9csbmd1v4nm041zvjnvigy6s5iidy4yrkwdx4r5")) + "0q9xgdpvdkskpzl294w215f6c15c5jk276c9dah5f5w4np3ivbvl")) (patches (search-patches "julia-SOURCE_DATE_EPOCH-mtime.patch" "julia-allow-parallel-build.patch")))) @@ -206,6 +206,10 @@ libraries. It is also a bit like @code{ldd} and @code{otool -L}.") (substitute* "base/Makefile" (("\\$\\$\\(build_depsbindir\\)/libwhich") (search-input-file inputs "/bin/libwhich"))))) + (add-after 'unpack 'activate-gnu-source-for-loader + (lambda _ + (substitute* "cli/Makefile" + (("LOADER_CFLAGS =") "LOADER_CFLAGS = -D_GNU_SOURCE")))) (add-after 'unpack 'change-number-of-precompile-statements (lambda _ ;; Remove nss-certs drops the number of statements below 1200, @@ -222,12 +226,11 @@ libraries. It is also a bit like @code{ldd} and @code{otool -L}.") "base/Makefile") ((".*libquadmath.*") "")) (substitute* "Makefile" - (("libquadmath ") "")) - #t))) + (("libquadmath ") ""))))) '()) (add-before 'check 'set-home ;; Some tests require a home directory to be set. - (lambda _ (setenv "HOME" "/tmp") #t)) + (lambda _ (setenv "HOME" "/tmp"))) (add-before 'build 'fix-include-and-link-paths (lambda* (#:key inputs #:allow-other-keys) ;; LIBUTF8PROC is a linker flag, not a build target. It is @@ -332,10 +335,11 @@ libraries. It is also a bit like @code{ldd} and @code{otool -L}.") (mpfr (assoc-ref inputs "mpfr")) (gmp (assoc-ref inputs "gmp")) (nghttp2 (assoc-ref inputs "libnghttp2")) + (zlib (assoc-ref inputs "zlib")) (suitesparse (assoc-ref inputs "suitesparse"))) ;; Some tests only check to see if the input is the correct version. (substitute* "stdlib/PCRE2_jll/test/runtests.jl" - (("10.36.0") ,(package-version pcre2))) + (("10.40.0") ,(package-version pcre2))) (substitute* "stdlib/MbedTLS_jll/test/runtests.jl" (("2.24.0") ,(package-version mbedtls-apache))) (substitute* "stdlib/MPFR_jll/test/runtests.jl" @@ -344,6 +348,8 @@ libraries. It is also a bit like @code{ldd} and @code{otool -L}.") (("6.2.0") ,(package-version gmp))) (substitute* "stdlib/nghttp2_jll/test/runtests.jl" (("1.41.0") ,(package-version nghttp2))) + (substitute* "stdlib/Zlib_jll/test/runtests.jl" + (("1.2.12") ,(package-version zlib))) (substitute* "stdlib/SuiteSparse_jll/test/runtests.jl" (("5004") ,(string-replace-substring (version-major+minor @@ -355,17 +361,12 @@ libraries. It is also a bit like @code{ldd} and @code{otool -L}.") ;; https://github.com/JuliaLang/julia/pull/41614 ;; https://github.com/JuliaLang/julia/issues/41156 (substitute* "test/choosetests.jl" - (("skip_tests = \\[\\]") - "skip_tests = [\"REPL\", \"precompile\"]")) + (("\"precompile\",") "")) ;; Dates/io tests fail on master when networking is unavailable ;; https://github.com/JuliaLang/julia/issues/34655 (substitute* "stdlib/Dates/test/io.jl" (("using Dates") "import Dates using Dates: @dateformat_str, Date, DateTime, DateFormat, Time")) - ;; Upstream bug I found when packaging - ;; https://github.com/JuliaLang/julia/issues/35785 - (substitute* "test/file.jl" - (("@test dirname\\(t\\) == d") "@test_broken dirname(t) == d")) ;; julia embeds a certificate, we are not doing that (substitute* "stdlib/MozillaCACerts_jll/test/runtests.jl" (("@test isfile\\(MozillaCACerts_jll.cacert\\)") @@ -385,14 +386,7 @@ using Dates: @dateformat_str, Date, DateTime, DateFormat, Time")) (substitute* "test/cmdlineargs.jl" (("test v\\[3") "test_broken v[3") (("test isempty\\(v\\[3") "test_broken isempty(v[3")) - ;; These tests randomly fails because they depend on CPU. - (substitute* "stdlib/LinearAlgebra/test/matmul.jl" - ;; Fixed in v1.6.4 (see: - ;; https://github.com/JuliaLang/julia/blob/v1.6.4/ - ;; stdlib/LinearAlgebra/test/matmul.jl#L155). - (("@test mul\\!\\(C, vf, transpose\\(vf\\), 2, 3\\)\ - == 2vf\\*vf' \\.\\+ 3C0") - "@test mul!(C, vf, transpose(vf), 2, 3) ≈ 2vf*vf' .+ 3C0")) + ;; These test(s) randomly fails because they depend on CPU. (substitute* "test/math.jl" ;; @test_broken cannot be used because if the test randomly ;; passes, then it also raises an error. @@ -447,6 +441,7 @@ using Dates: @dateformat_str, Date, DateTime, DateFormat, Time")) ("" "$JULIA_DEPOT_PATH")))))))) #:make-flags (list + "VERBOSE=1" ;; more helpful logging of what make is doing (string-append "prefix=" (assoc-ref %outputs "out")) ;; Passing the MARCH or JULIA_CPU_TARGET flag is necessary to build -- cgit 1.4.1 From 7032e0bc8acfa37581feedeaf91bff04fe47ba6a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 21 Aug 2022 12:17:06 +0300 Subject: gnu: ghc-7: Rewrite arguments using G-expressions. * gnu/packages/haskell.scm (ghc-7)[arguments]: Rewrite using G-expressions. Remove trailing #t from phases. --- gnu/packages/haskell.scm | 206 +++++++++++++++++++++++------------------------ 1 file changed, 101 insertions(+), 105 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index effc6eeb1b..59adcc8185 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -444,7 +444,8 @@ libraries are included in this package.") ghc-bootstrap-x86_64-7.8.4 ghc-bootstrap-i686-7.8.4)))) (arguments - `(#:test-target "test" + (list + #:test-target "test" ;; We get a smaller number of test failures by disabling parallel test ;; execution. #:parallel-tests? #f @@ -454,117 +455,112 @@ libraries are included in this package.") ;; then complains that they don't match. #:build #f - #:modules ((guix build gnu-build-system) - (guix build utils) - (srfi srfi-26) - (srfi srfi-1)) + #:modules '((guix build gnu-build-system) + (guix build utils) + (srfi srfi-26) + (srfi srfi-1)) #:configure-flags - (list - (string-append "--with-gmp-libraries=" - (assoc-ref %build-inputs "gmp") "/lib") - (string-append "--with-gmp-includes=" - (assoc-ref %build-inputs "gmp") "/include") - "--with-system-libffi" - (string-append "--with-ffi-libraries=" - (assoc-ref %build-inputs "libffi") "/lib") - (string-append "--with-ffi-includes=" - (assoc-ref %build-inputs "libffi") "/include")) + #~(list + (string-append "--with-gmp-libraries=" + (assoc-ref %build-inputs "gmp") "/lib") + (string-append "--with-gmp-includes=" + (assoc-ref %build-inputs "gmp") "/include") + "--with-system-libffi" + (string-append "--with-ffi-libraries=" + (assoc-ref %build-inputs "libffi") "/lib") + (string-append "--with-ffi-includes=" + (assoc-ref %build-inputs "libffi") "/include")) ;; FIXME: The user-guide needs dblatex, docbook-xsl and docbook-utils. ;; Currently we do not have the last one. ;; #:make-flags ;; (list "BUILD_DOCBOOK_HTML = YES") #:phases - (let* ((ghc-bootstrap-path - (string-append (getcwd) "/" ,name "-" ,version "/ghc-bin")) - (ghc-bootstrap-prefix - (string-append ghc-bootstrap-path "/usr" ))) - (alist-cons-after - 'unpack-bin 'unpack-testsuite-and-fix-bins - (lambda* (#:key inputs outputs #:allow-other-keys) - (with-directory-excursion ".." - (copy-file (assoc-ref inputs "ghc-testsuite") - "ghc-testsuite.tar.xz") - (invoke "tar" "xvf" "ghc-testsuite.tar.xz")) - (substitute* - (list "testsuite/timeout/Makefile" - "testsuite/timeout/timeout.py" - "testsuite/timeout/timeout.hs" - "testsuite/tests/rename/prog006/Setup.lhs" - "testsuite/tests/programs/life_space_leak/life.test" - "libraries/process/System/Process/Internals.hs" - "libraries/unix/cbits/execvpe.c") - (("/bin/sh") (which "sh")) - (("/bin/rm") "rm")) - #t) - (alist-cons-after - 'unpack 'unpack-bin - (lambda* (#:key inputs outputs #:allow-other-keys) - (mkdir-p ghc-bootstrap-prefix) - (with-directory-excursion ghc-bootstrap-path - (copy-file (assoc-ref inputs "ghc-binary") - "ghc-bin.tar.xz") - (invoke "tar" "xvf" "ghc-bin.tar.xz"))) - (alist-cons-before - 'install-bin 'configure-bin - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((binaries - (list - "./utils/ghc-pwd/dist-install/build/tmp/ghc-pwd" - "./utils/hpc/dist-install/build/tmp/hpc" - "./utils/haddock/dist/build/tmp/haddock" - "./utils/hsc2hs/dist-install/build/tmp/hsc2hs" - "./utils/runghc/dist-install/build/tmp/runghc" - "./utils/ghc-cabal/dist-install/build/tmp/ghc-cabal" - "./utils/hp2ps/dist/build/tmp/hp2ps" - "./utils/ghc-pkg/dist-install/build/tmp/ghc-pkg" - "./utils/unlit/dist/build/tmp/unlit" - "./ghc/stage2/build/tmp/ghc-stage2")) - (gmp (assoc-ref inputs "gmp")) - (gmp-lib (string-append gmp "/lib")) - (gmp-include (string-append gmp "/include")) - (ncurses-lib - (dirname (search-input-file inputs "/lib/libncurses.so"))) - (ld-so (search-input-file inputs ,(glibc-dynamic-linker))) - (libtinfo-dir - (string-append ghc-bootstrap-prefix - "/lib/ghc-7.8.4/terminfo-0.4.0.0"))) - (with-directory-excursion - (string-append ghc-bootstrap-path "/ghc-7.8.4") - (setenv "CONFIG_SHELL" (which "bash")) - (setenv "LD_LIBRARY_PATH" gmp-lib) - ;; The binaries have "/lib64/ld-linux-x86-64.so.2" hardcoded. - (for-each - (cut invoke "patchelf" "--set-interpreter" ld-so <>) - binaries) - ;; The binaries include a reference to libtinfo.so.5 which - ;; is a subset of libncurses.so.5. We create a symlink in a - ;; directory included in the bootstrap binaries rpath. - (mkdir-p libtinfo-dir) - (symlink - (string-append ncurses-lib "/libncursesw.so." - ;; Extract "6.0" from "6.0-20170930" if a - ;; dash-separated version tag exists. - ,(let* ((v (package-version ncurses)) - (d (or (string-index v #\-) - (string-length v)))) - (version-major+minor (string-take v d)))) - (string-append libtinfo-dir "/libtinfo.so.5")) - - (setenv "PATH" - (string-append (getenv "PATH") ":" - ghc-bootstrap-prefix "/bin")) - (invoke - (string-append (getcwd) "/configure") - (string-append "--prefix=" ghc-bootstrap-prefix) - (string-append "--with-gmp-libraries=" gmp-lib) - (string-append "--with-gmp-includes=" gmp-include))))) - (alist-cons-before - 'configure 'install-bin - (lambda* (#:key inputs outputs #:allow-other-keys) - (with-directory-excursion + #~(let* ((ghc-bootstrap-path + (string-append (getcwd) "/" #$name "-" #$version "/ghc-bin")) + (ghc-bootstrap-prefix + (string-append ghc-bootstrap-path "/usr" ))) + (modify-phases %standard-phases + (add-after 'unpack 'unpack-bin + (lambda* (#:key inputs outputs #:allow-other-keys) + (mkdir-p ghc-bootstrap-prefix) + (with-directory-excursion ghc-bootstrap-path + (copy-file (assoc-ref inputs "ghc-binary") + "ghc-bin.tar.xz") + (invoke "tar" "xvf" "ghc-bin.tar.xz")))) + (add-after 'unpack-bin 'unpack-testsuite-and-fix-bins + (lambda* (#:key inputs outputs #:allow-other-keys) + (with-directory-excursion ".." + (copy-file (assoc-ref inputs "ghc-testsuite") + "ghc-testsuite.tar.xz") + (invoke "tar" "xvf" "ghc-testsuite.tar.xz")) + (substitute* + (list "testsuite/timeout/Makefile" + "testsuite/timeout/timeout.py" + "testsuite/timeout/timeout.hs" + "testsuite/tests/rename/prog006/Setup.lhs" + "testsuite/tests/programs/life_space_leak/life.test" + "libraries/process/System/Process/Internals.hs" + "libraries/unix/cbits/execvpe.c") + (("/bin/sh") (search-input-file inputs "/bin/sh")) + (("/bin/rm") "rm")))) + (add-before 'configure 'install-bin + (lambda* (#:key inputs outputs #:allow-other-keys) + (with-directory-excursion (string-append ghc-bootstrap-path "/ghc-7.8.4") - (invoke "make" "install"))) - %standard-phases))))))) + (invoke "make" "install")))) + (add-before 'install-bin 'configure-bin + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((binaries + (list + "./utils/ghc-pwd/dist-install/build/tmp/ghc-pwd" + "./utils/hpc/dist-install/build/tmp/hpc" + "./utils/haddock/dist/build/tmp/haddock" + "./utils/hsc2hs/dist-install/build/tmp/hsc2hs" + "./utils/runghc/dist-install/build/tmp/runghc" + "./utils/ghc-cabal/dist-install/build/tmp/ghc-cabal" + "./utils/hp2ps/dist/build/tmp/hp2ps" + "./utils/ghc-pkg/dist-install/build/tmp/ghc-pkg" + "./utils/unlit/dist/build/tmp/unlit" + "./ghc/stage2/build/tmp/ghc-stage2")) + (gmp (assoc-ref inputs "gmp")) + (gmp-lib (string-append gmp "/lib")) + (gmp-include (string-append gmp "/include")) + (ncurses-lib + (dirname (search-input-file inputs "/lib/libncurses.so"))) + (ld-so (search-input-file inputs #$(glibc-dynamic-linker))) + (libtinfo-dir + (string-append ghc-bootstrap-prefix + "/lib/ghc-7.8.4/terminfo-0.4.0.0"))) + (with-directory-excursion + (string-append ghc-bootstrap-path "/ghc-7.8.4") + (setenv "CONFIG_SHELL" (which "bash")) + (setenv "LD_LIBRARY_PATH" gmp-lib) + ;; The binaries have "/lib64/ld-linux-x86-64.so.2" hardcoded. + (for-each + (cut invoke "patchelf" "--set-interpreter" ld-so <>) + binaries) + ;; The binaries include a reference to libtinfo.so.5 which + ;; is a subset of libncurses.so.5. We create a symlink in a + ;; directory included in the bootstrap binaries rpath. + (mkdir-p libtinfo-dir) + (symlink + (string-append ncurses-lib "/libncursesw.so." + ;; Extract "6.0" from "6.0-20170930" if a + ;; dash-separated version tag exists. + #$(let* ((v (package-version ncurses)) + (d (or (string-index v #\-) + (string-length v)))) + (version-major+minor (string-take v d)))) + (string-append libtinfo-dir "/libtinfo.so.5")) + + (setenv "PATH" + (string-append (getenv "PATH") ":" + ghc-bootstrap-prefix "/bin")) + (invoke + (string-append (getcwd) "/configure") + (string-append "--prefix=" ghc-bootstrap-prefix) + (string-append "--with-gmp-libraries=" gmp-lib) + (string-append "--with-gmp-includes=" gmp-include)))))))))) (native-search-paths (list (search-path-specification (variable "GHC_PACKAGE_PATH") (files (list -- cgit 1.4.1 From 0fc0ce23421243fae99f53c013a4c80b51f128ef Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 21 Aug 2022 12:49:34 +0300 Subject: gnu: ghc-7: Unpack tarballs from the store. * gnu/packages/haskell.scm (ghc-7)[arguments]: Adjust custom 'unpack-bin and 'unpack-testsuite-and-fix-bins phases to unpack tarballs directly from the store. --- gnu/packages/haskell.scm | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 59adcc8185..29a79289d8 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -484,15 +484,11 @@ libraries are included in this package.") (lambda* (#:key inputs outputs #:allow-other-keys) (mkdir-p ghc-bootstrap-prefix) (with-directory-excursion ghc-bootstrap-path - (copy-file (assoc-ref inputs "ghc-binary") - "ghc-bin.tar.xz") - (invoke "tar" "xvf" "ghc-bin.tar.xz")))) + (invoke "tar" "xvf" (assoc-ref inputs "ghc-binary"))))) (add-after 'unpack-bin 'unpack-testsuite-and-fix-bins (lambda* (#:key inputs outputs #:allow-other-keys) (with-directory-excursion ".." - (copy-file (assoc-ref inputs "ghc-testsuite") - "ghc-testsuite.tar.xz") - (invoke "tar" "xvf" "ghc-testsuite.tar.xz")) + (invoke "tar" "xvf" (assoc-ref inputs "ghc-testsuite"))) (substitute* (list "testsuite/timeout/Makefile" "testsuite/timeout/timeout.py" -- cgit 1.4.1 From a8848b9311d2c506aa1051b4dbd857f07b212c16 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 21 Aug 2022 16:00:05 +0300 Subject: gnu: ghc-7: Update to 7.10.3. * gnu/packages/haskell.scm (ghc-7): Update to 7.10.3. --- gnu/packages/haskell.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 29a79289d8..15a96f3dd7 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -408,7 +408,7 @@ libraries are included in this package.") (define-public ghc-7 (package (name "ghc") - (version "7.10.2") + (version "7.10.3") (source (origin (method url-fetch) @@ -416,7 +416,7 @@ libraries are included in this package.") version "/" name "-" version "-src.tar.xz")) (sha256 (base32 - "1x8m4rp2v7ydnrz6z9g8x7z3x3d3pxhv2pixy7i7hkbqbdsp7kal")))) + "1vsgmic8csczl62ciz51iv8nhrkm72lyhbz7p7id13y2w7fcx46g")))) (build-system gnu-build-system) (supported-systems '("i686-linux" "x86_64-linux")) (outputs '("out" "doc")) @@ -432,7 +432,7 @@ libraries are included in this package.") version "/" name "-" version "-testsuite.tar.xz")) (sha256 (base32 - "0qp9da9ar87zbyn6wjgacd2ic1vgzbi3cklxnhsmjqyafv9qaj4b")))))) + "0fk4xjw1x5lk2ifvgqij06lrbf1vxq9qfix86h9r16c0bilm3hah")))))) (native-inputs `(("perl" ,perl) ("python" ,python-2) ; for tests (fails with python-3) -- cgit 1.4.1 From 63e01d01b114d64eddaf68beb1a815696f205778 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 21 Aug 2022 15:29:41 +0300 Subject: gnu: ghc-8.0: Modernize package. * gnu/packages/haskell.scm (ghc-8.0)[arguments]: Rewrite using g-exps. Unpack testsuite tarball from the store. Remove trailing #t from phases. [inputs]: Remove input labels. Move ghc-testsuite ... [native-inputs]: ... to here. --- gnu/packages/haskell.scm | 96 +++++++++++++++++++++++------------------------- 1 file changed, 45 insertions(+), 51 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 15a96f3dd7..3465bfbdb6 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -587,25 +587,24 @@ interactive environment for the functional language Haskell.") (supported-systems '("i686-linux" "x86_64-linux")) (outputs '("out" "doc")) (inputs - `(("gmp" ,gmp) - ("ncurses" ,ncurses) - ("libffi" ,libffi) - ("ghc-testsuite" - ,(origin - (method url-fetch) - (uri (string-append - "https://www.haskell.org/ghc/dist/" - version "/" name "-" version "-testsuite.tar.xz")) - (sha256 - (base32 "1wjc3x68l305bl1h1ijd3yhqp2vqj83lkp3kqbr94qmmkqlms8sj")))))) + (list gmp ncurses libffi)) (native-inputs `(("perl" ,perl) ("python" ,python-2) ; for tests ("ghostscript" ,ghostscript) ; for tests ;; GHC is built with GHC. - ("ghc-bootstrap" ,ghc-7))) + ("ghc-bootstrap" ,ghc-7) + ("ghc-testsuite" + ,(origin + (method url-fetch) + (uri (string-append + "https://www.haskell.org/ghc/dist/" + version "/" name "-" version "-testsuite.tar.xz")) + (sha256 + (base32 "1wjc3x68l305bl1h1ijd3yhqp2vqj83lkp3kqbr94qmmkqlms8sj")))) )) (arguments - `(#:test-target "test" + (list + #:test-target "test" ;; We get a smaller number of test failures by disabling parallel test ;; execution. #:parallel-tests? #f @@ -616,53 +615,48 @@ interactive environment for the functional language Haskell.") #:build #f #:configure-flags - (list - (string-append "--with-gmp-libraries=" - (assoc-ref %build-inputs "gmp") "/lib") - (string-append "--with-gmp-includes=" - (assoc-ref %build-inputs "gmp") "/include") - "--with-system-libffi" - (string-append "--with-ffi-libraries=" - (assoc-ref %build-inputs "libffi") "/lib") - (string-append "--with-ffi-includes=" - (assoc-ref %build-inputs "libffi") "/include") - (string-append "--with-curses-libraries=" - (assoc-ref %build-inputs "ncurses") "/lib") - (string-append "--with-curses-includes=" - (assoc-ref %build-inputs "ncurses") "/include")) + #~(list + (string-append "--with-gmp-libraries=" + (assoc-ref %build-inputs "gmp") "/lib") + (string-append "--with-gmp-includes=" + (assoc-ref %build-inputs "gmp") "/include") + "--with-system-libffi" + (string-append "--with-ffi-libraries=" + (assoc-ref %build-inputs "libffi") "/lib") + (string-append "--with-ffi-includes=" + (assoc-ref %build-inputs "libffi") "/include") + (string-append "--with-curses-libraries=" + (assoc-ref %build-inputs "ncurses") "/lib") + (string-append "--with-curses-includes=" + (assoc-ref %build-inputs "ncurses") "/include")) #:phases - (modify-phases %standard-phases - (add-after 'unpack 'unpack-testsuite - (lambda* (#:key inputs #:allow-other-keys) - (with-directory-excursion ".." - (copy-file (assoc-ref inputs "ghc-testsuite") - "ghc-testsuite.tar.xz") - (zero? (system* "tar" "xvf" "ghc-testsuite.tar.xz"))))) - (add-before 'build 'fix-lib-paths - (lambda _ - (substitute* + #~(modify-phases %standard-phases + (add-after 'unpack 'unpack-testsuite + (lambda* (#:key inputs #:allow-other-keys) + (with-directory-excursion ".." + (invoke "tar" "xvf" (assoc-ref inputs "ghc-testsuite"))))) + (add-before 'build 'fix-lib-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* (list "libraries/process/System/Process/Posix.hs" "libraries/process/tests/process001.hs" "libraries/process/tests/process002.hs" "libraries/unix/cbits/execvpe.c") - (("/bin/sh") (which "sh")) - (("/bin/ls") (which "ls"))) - #t)) - (add-before 'build 'fix-environment - (lambda _ - (unsetenv "GHC_PACKAGE_PATH") - (setenv "CONFIG_SHELL" (which "bash")) - #t)) - (add-before 'check 'fix-testsuite - (lambda _ - (substitute* + (("/bin/sh") (search-input-file inputs "/bin/sh")) + (("/bin/ls") (search-input-file inputs "/bin/ls"))))) + (add-before 'build 'fix-environment + (lambda _ + (unsetenv "GHC_PACKAGE_PATH") + (setenv "CONFIG_SHELL" (which "bash")))) + (add-before 'check 'fix-testsuite + (lambda _ + (substitute* (list "testsuite/timeout/Makefile" "testsuite/timeout/timeout.py" "testsuite/timeout/timeout.hs" "testsuite/tests/programs/life_space_leak/life.test") - (("/bin/sh") (which "sh")) - (("/bin/rm") "rm")) - #t))))) + (("/bin/sh") (which "sh")) + (("/bin/rm") "rm"))))))) (native-search-paths (list (search-path-specification (variable "GHC_PACKAGE_PATH") (files (list -- cgit 1.4.1 From ab8c83dd48c00467503aa33ef68537a85d5b491e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 22 Aug 2022 09:49:06 +0300 Subject: gnu: ghc-8.4: Modernize package. * gnu/packages/haskell.scm (ghc-8.4)[inputs]: Use inherited inputs. [arguments]: Rewrite using g-exps. Adjust to use inherited package arguments. Use inherited 'unpack-testsuite, 'fix environment phases. Remove redundant 'fix-references phase. (ghc-8.8)[arguments]: Adjust phases based on changed inherited phases. --- gnu/packages/haskell.scm | 125 +++++++++++++---------------------------------- 1 file changed, 35 insertions(+), 90 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 3465bfbdb6..fcad88f240 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -681,13 +681,11 @@ interactive environment for the functional language Haskell.") version "/" name "-" version "-src.tar.xz")) (sha256 (base32 "1ch4j2asg7pr52ai1hwzykxyj553wndg7wq93i47ql4fllspf48i")))) - (inputs - (list gmp ncurses libffi)) (native-inputs `(("perl" ,perl) ("python" ,python) ; for tests ("ghostscript" ,ghostscript) ; for tests - ;; GHC 8.4.3 is built with GHC 8. + ;; GHC 8.4.4 is built with GHC >= 8.0. ("ghc-bootstrap" ,ghc-8.0) ("ghc-testsuite" ,(origin @@ -699,92 +697,39 @@ interactive environment for the functional language Haskell.") (base32 "0s8lf9sxj7n89pjagi58b3fahnp34qvmwhnn0j1fbg6955vbrfj6")))))) (arguments - `(#:test-target "test" - ;; We get a smaller number of test failures by disabling parallel test - ;; execution. - #:parallel-tests? #f - - ;; Don't pass --build=, because the configure script - ;; auto-detects slightly different triplets for --host and --target and - ;; then complains that they don't match. - #:build #f - - #:configure-flags - (list - (string-append "--with-gmp-libraries=" - (assoc-ref %build-inputs "gmp") "/lib") - (string-append "--with-gmp-includes=" - (assoc-ref %build-inputs "gmp") "/include") - "--with-system-libffi" - (string-append "--with-ffi-libraries=" - (assoc-ref %build-inputs "libffi") "/lib") - (string-append "--with-ffi-includes=" - (assoc-ref %build-inputs "libffi") "/include") - (string-append "--with-curses-libraries=" - (assoc-ref %build-inputs "ncurses") "/lib") - (string-append "--with-curses-includes=" - (assoc-ref %build-inputs "ncurses") "/include")) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'unpack-testsuite - (lambda* (#:key inputs #:allow-other-keys) - (invoke "tar" "xvf" - (assoc-ref inputs "ghc-testsuite") - "--strip-components=1") - #t)) - ;; This phase patches the 'ghc-pkg' command so that it sorts the list - ;; of packages in the binary cache it generates. - (add-before 'build 'fix-ghc-pkg-nondeterminism - (lambda _ - (substitute* "utils/ghc-pkg/Main.hs" - (("confs = map \\(path \\) \\$ filter \\(\".conf\" `isSuffixOf`\\) fs") - "confs = map (path ) $ filter (\".conf\" `isSuffixOf`) (sort fs)")) - #t)) - (add-after 'unpack-testsuite 'fix-shell-wrappers - (lambda _ - (substitute* '("driver/ghci/ghc.mk" - "utils/mkdirhier/ghc.mk" - "rules/shell-wrapper.mk") - (("echo '#!/bin/sh'") - (format #f "echo '#!~a'" (which "sh")))) - #t)) - ;; This is necessary because the configure system no longer uses - ;; “AC_PATH_” but “AC_CHECK_”, setting the variables to just the - ;; plain command names. - (add-before 'configure 'set-target-programs - (lambda* (#:key inputs #:allow-other-keys) - (let ((binutils (assoc-ref inputs "binutils")) - (gcc (assoc-ref inputs "gcc")) - (ld-wrapper (assoc-ref inputs "ld-wrapper"))) - (setenv "CC" (string-append gcc "/bin/gcc")) - (setenv "CXX" (string-append gcc "/bin/g++")) - (setenv "LD" (string-append ld-wrapper "/bin/ld")) - (setenv "NM" (string-append binutils "/bin/nm")) - (setenv "RANLIB" (string-append binutils "/bin/ranlib")) - (setenv "STRIP" (string-append binutils "/bin/strip")) - ;; The 'ar' command does not follow the same pattern. - (setenv "fp_prog_ar" (string-append binutils "/bin/ar")) - #t))) - (add-before 'build 'fix-references - (lambda _ - (substitute* '("testsuite/timeout/Makefile" - "testsuite/timeout/timeout.py" - "testsuite/timeout/timeout.hs" - "testsuite/tests/programs/life_space_leak/life.test" - ;; libraries - "libraries/process/System/Process/Posix.hs" - "libraries/process/tests/process001.hs" - "libraries/process/tests/process002.hs" - "libraries/unix/cbits/execvpe.c") - (("/bin/sh") (which "sh")) - (("/bin/ls") (which "ls")) - (("/bin/rm") "rm")) - #t)) - (add-before 'build 'fix-environment - (lambda _ - (unsetenv "GHC_PACKAGE_PATH") - (setenv "CONFIG_SHELL" (which "bash")) - #t))))) + (substitute-keyword-arguments (package-arguments ghc-8.0) + ((#:phases phases) + #~(modify-phases #$phases + ;; This phase patches the 'ghc-pkg' command so that it sorts the list + ;; of packages in the binary cache it generates. + (add-before 'build 'fix-ghc-pkg-nondeterminism + (lambda _ + (substitute* "utils/ghc-pkg/Main.hs" + (("confs = map \\(path \\) \\$ filter \\(\".conf\" `isSuffixOf`\\) fs") + "confs = map (path ) $ filter (\".conf\" `isSuffixOf`) (sort fs)")))) + (add-after 'unpack-testsuite 'fix-shell-wrappers + (lambda _ + (substitute* '("driver/ghci/ghc.mk" + "utils/mkdirhier/ghc.mk" + "rules/shell-wrapper.mk") + (("echo '#!/bin/sh'") + (format #f "echo '#!~a'" (which "sh")))))) + ;; This is necessary because the configure system no longer uses + ;; “AC_PATH_” but “AC_CHECK_”, setting the variables to just the + ;; plain command names. + (add-before 'configure 'set-target-programs + (lambda* (#:key inputs #:allow-other-keys) + (let ((binutils (assoc-ref inputs "binutils")) + (gcc (assoc-ref inputs "gcc")) + (ld-wrapper (assoc-ref inputs "ld-wrapper"))) + (setenv "CC" (string-append gcc "/bin/gcc")) + (setenv "CXX" (string-append gcc "/bin/g++")) + (setenv "LD" (string-append ld-wrapper "/bin/ld")) + (setenv "NM" (string-append binutils "/bin/nm")) + (setenv "RANLIB" (string-append binutils "/bin/ranlib")) + (setenv "STRIP" (string-append binutils "/bin/strip")) + ;; The 'ar' command does not follow the same pattern. + (setenv "fp_prog_ar" (string-append binutils "/bin/ar"))))))))) (native-search-paths (list (search-path-specification (variable "GHC_PACKAGE_PATH") (files (list @@ -903,7 +848,7 @@ interactive environment for the functional language Haskell.") (substitute-keyword-arguments (package-arguments ghc-8.6) ((#:phases phases '%standard-phases) `(modify-phases ,phases - (add-after 'fix-references 'fix-cc-reference + (add-before 'build 'fix-cc-reference (lambda _ (substitute* "utils/hsc2hs/Common.hs" (("\"cc\"") "\"gcc\"")) -- cgit 1.4.1 From 279563ffe8cdf16b94603706e32c94d1bdc169ac Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 22 Aug 2022 10:32:34 +0300 Subject: gnu: ghc-8.6: Rewrite using G-exps. * gnu/packages/haskell.scm (ghc-8.6)[arguments]: Rewrite using g-exps. Remove trailing #t from phases. --- gnu/packages/haskell.scm | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index fcad88f240..8c0cc48ef5 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -769,10 +769,10 @@ interactive environment for the functional language Haskell.") (arguments (substitute-keyword-arguments (package-arguments ghc-8.4) ((#:make-flags make-flags ''()) - `(cons "EXTRA_RUNTEST_OPTS=--skip-perf-tests" - ,make-flags)) + #~(cons "EXTRA_RUNTEST_OPTS=--skip-perf-tests" + #$make-flags)) ((#:phases phases '%standard-phases) - `(modify-phases ,phases + #~(modify-phases #$phases (add-after 'install 'remove-unnecessary-references (lambda* (#:key outputs #:allow-other-keys) (substitute* (find-files (string-append (assoc-ref outputs "out") "/lib/") @@ -797,8 +797,7 @@ interactive environment for the functional language Haskell.") (new (string-append out subdir))) (mkdir-p (dirname new)) (rename-file haddock-file new))) - (find-files doc "\\.haddock$"))) - #t)) + (find-files doc "\\.haddock$"))))) (add-after 'unpack-testsuite 'skip-tests (lambda _ ;; These two tests refer to the root user, which doesn't exist @@ -806,8 +805,7 @@ interactive environment for the functional language Haskell.") (substitute* "libraries/unix/tests/all.T" (("^test\\('T8108'") "# guix skipped: test('T8108'")) (substitute* "libraries/unix/tests/libposix/all.T" - (("^test\\('posix010'") "# guix skipped: test('posix010'")) - #t)))))) + (("^test\\('posix010'") "# guix skipped: test('posix010'")))))))) (native-search-paths (list (search-path-specification (variable "GHC_PACKAGE_PATH") (files (list -- cgit 1.4.1 From 9e263027731b085640ddf48451e8f967ead283e4 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 22 Aug 2022 10:34:24 +0300 Subject: gnu: ghc-8.8: Rewrite using G-exps. * gnu/packages/haskell.scm (ghc-8.8)[arguments]: Rewrite using g-exps. Remove trailing #t from phases. --- gnu/packages/haskell.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 8c0cc48ef5..984aa33f6e 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -845,19 +845,17 @@ interactive environment for the functional language Haskell.") (arguments (substitute-keyword-arguments (package-arguments ghc-8.6) ((#:phases phases '%standard-phases) - `(modify-phases ,phases + #~(modify-phases #$phases (add-before 'build 'fix-cc-reference (lambda _ (substitute* "utils/hsc2hs/Common.hs" - (("\"cc\"") "\"gcc\"")) - #t)) + (("\"cc\"") "\"gcc\"")))) (add-after 'unpack-testsuite 'skip-more-tests (lambda _ ;; XXX: This test fails because our ld-wrapper script ;; mangles the response file passed to the linker. (substitute* "testsuite/tests/hp2ps/all.T" - (("^test\\('T15904'") "# guix skipped: test('T15904'")) - #t)))))) + (("^test\\('T15904'") "# guix skipped: test('T15904'")))))))) (native-search-paths (list (search-path-specification (variable "GHC_PACKAGE_PATH") (files (list -- cgit 1.4.1 From b94534adf0fcbdcba92819e6b80c87d5dc228351 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 22 Aug 2022 10:37:00 +0300 Subject: gnu: ghc-8.10: Add phase unconditionally. * gnu/packages/haskell.scm (ghc-8.10)[arguments]: Apply custom 'skip-failing-tests-i686 phase for all architectures. --- gnu/packages/haskell.scm | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 984aa33f6e..b99984406b 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -910,20 +910,16 @@ interactive environment for the functional language Haskell.") (("extra_files" all) (string-append "[" all)) (("\\]\\), " all) (string-append all "expect_broken(0)], "))))) - ;; TODO: Turn this into an undconditional patch on the next rebuild. - ,@(if (string-prefix? "i686" (or (%current-target-system) - (%current-system))) - '((add-after 'skip-more-tests 'skip-failing-tests-i686 - (lambda _ - (substitute* '("testsuite/tests/codeGen/should_compile/all.T") - (("(test\\('T15155l', )when\\(unregisterised\\(\\), skip\\)" all before) - (string-append before "when(arch('i386'), skip)"))) - ;; Unexpected failures: - ;; quasiquotation/T14028.run T14028 [bad stderr] (dyn) - (substitute* '("testsuite/tests/quasiquotation/all.T") - (("unless\\(config.have_ext_interp, skip\\),") - "unless(config.have_ext_interp, skip), when(arch('i386'), skip),"))))) - '()))))) + (add-after 'skip-more-tests 'skip-failing-tests-i686 + (lambda _ + (substitute* '("testsuite/tests/codeGen/should_compile/all.T") + (("(test\\('T15155l', )when\\(unregisterised\\(\\), skip\\)" all before) + (string-append before "when(arch('i386'), skip)"))) + ;; Unexpected failures: + ;; quasiquotation/T14028.run T14028 [bad stderr] (dyn) + (substitute* '("testsuite/tests/quasiquotation/all.T") + (("unless\\(config.have_ext_interp, skip\\),") + "unless(config.have_ext_interp, skip), when(arch('i386'), skip),")))))))) (native-search-paths (list (search-path-specification (variable "GHC_PACKAGE_PATH") (files (list -- cgit 1.4.1 From b4b7b236fa4a19aa9985e57499d2714436e69cdc Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 22 Aug 2022 10:38:25 +0300 Subject: gnu: ghc-8.10: Rewrite using G-exps. * gnu/packages/haskell.scm (ghc-8.10)[arguments]: Rewrite using g-exps. --- gnu/packages/haskell.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index b99984406b..547af248e4 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -896,7 +896,7 @@ interactive environment for the functional language Haskell.") (arguments (substitute-keyword-arguments (package-arguments ghc-8.8) ((#:phases phases '%standard-phases) - `(modify-phases ,phases + #~(modify-phases #$phases (add-after 'unpack-testsuite 'patch-more-shebangs (lambda* (#:key inputs #:allow-other-keys) (let ((bash (assoc-ref inputs "bash"))) -- cgit 1.4.1 From 47316120b73dd0a00b3b7fc38a2e7caaf5e30816 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 22 Aug 2022 10:39:44 +0300 Subject: gnu: ghc-8.10: Build using ghc-8.6. * gnu/packages/haskell.scm (ghc-8.10)[native-inputs]: Replace ghc-8.8 with ghc-8.6. --- gnu/packages/haskell.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 547af248e4..8a3c8d44c7 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -876,7 +876,8 @@ interactive environment for the functional language Haskell.") (sha256 (base32 "179ws2q0dinl1a39wm9j37xzwm84zfz3c5543vz8v479khigdvp3")))) (native-inputs - `(("ghc-bootstrap" ,ghc-8.8) + `(;; GHC 8.10.7 must be built with GHC >= 8.6. + ("ghc-bootstrap" ,ghc-8.6) ("ghc-testsuite" ,(origin (method url-fetch) -- cgit 1.4.1 From c1a4ef98932799adbd278068fa4fdd8c24fff714 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 22 Aug 2022 17:39:01 -0400 Subject: gnu: libsecret: Update to 0.20.5, use gexps and remove input labels. * gnu/packages/gnome.scm (libsecret): Update to 0.20.5. [outputs]: Delete doc output. [configure-flags]: Use gexps. Remove --with-html-dir and add -Dgtk_doc. [phases]{disable-problematic-tests}: New phase. {check}: Override and move after the install phase. [inputs]: Move docbook-xsl and libxml2 to... [native-inputs]: ... here. Remove input labels. Add dbus, docbook-xml-4.2, python, python-dbus and python-pygobject. --- gnu/packages/gnome.scm | 59 ++++++++++++++++++++++++++++++++++---------------- 1 file changed, 40 insertions(+), 19 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index ae46e55c51..da123eefe8 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4997,7 +4997,7 @@ and the GLib main loop, to integrate well with GNOME applications.") (define-public libsecret (package (name "libsecret") - (version "0.20.4") + (version "0.20.5") (source (origin (method url-fetch) (uri (string-append @@ -5006,28 +5006,49 @@ and the GLib main loop, to integrate well with GNOME applications.") "libsecret-" version ".tar.xz")) (sha256 (base32 - "0a4xnfmraxchd9cq5ai66j12jv2vrgjmaaxz25kl031jvda4qnij")))) - (build-system gnu-build-system) - (outputs '("out" "doc")) + "0k9bs47rzb3dwvznb4179d6nw7rbzjdyd4y8hx6vazfd1wscxcrz")))) + (build-system meson-build-system) (arguments - `(#:tests? #f ; FIXME: Testing hangs. - #:configure-flags - (list (string-append "--with-html-dir=" - (assoc-ref %outputs "doc") - "/share/gtk-doc/html")))) + (list + #:configure-flags + #~(list "-Dgtk_doc=false") ;requires gi-docgen + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'disable-problematic-tests + (lambda _ + (substitute* "libsecret/meson.build" + ;; The test-collection test fails non-deterministically (see: + ;; https://gitlab.gnome.org/GNOME/libsecret/-/issues/80). + ((".*'test-collection',.*") "")))) + (delete 'check) + (add-after 'install 'check + (lambda* (#:key tests? test-options #:allow-other-keys) + (when tests? + (setenv "HOME" "/tmp") + (setenv "XDG_DATA_DIRS" ;for /org/freedesktop/secrets/collection + (string-append #$output "/share:" + (getenv "XDG_DATA_DIRS"))) + (apply invoke "dbus-run-session" "--" + "meson" "test" "--print-errorlogs" "-t" "0" + test-options))))))) (native-inputs - `(("gettext" ,gettext-minimal) - ("glib:bin" ,glib "bin") ; for gdbus-codegen, etc. - ("gobject-introspection" ,gobject-introspection) - ("pkg-config" ,pkg-config) - ("vala" ,vala) - ("xsltproc" ,libxslt))) + (list dbus + docbook-xml-4.2 + docbook-xsl + gettext-minimal + `(,glib "bin") ;for gdbus-codegen, etc. + gobject-introspection + libxml2 ;for XML_CATALOG_FILES + libxslt + pkg-config + python + python-dbus + python-pygobject + vala)) (propagated-inputs - (list glib)) ; required by libsecret-1.pc + (list glib)) ;required by libsecret-1.pc (inputs - ;; The ‘build’ phase complains about missing docbook-xml-4.2 but adding it - ;; doesn't seem to affect the build result. - (list docbook-xsl libgcrypt libxml2)) ; for XML_CATALOG_FILES + (list libgcrypt)) (home-page "https://wiki.gnome.org/Projects/Libsecret/") (synopsis "GObject bindings for \"Secret Service\" API") (description -- cgit 1.4.1 From c3b8defbe0f9b6294871d43ea23d4d3b8c381346 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 24 Aug 2022 09:36:25 +0200 Subject: gnu: fsearch: Update to 0.2.2. * gnu/packages/search.scm (fsearch): Update to 0.2.2. --- gnu/packages/search.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/search.scm b/gnu/packages/search.scm index 9ebc4d0c9b..84c4af68a3 100644 --- a/gnu/packages/search.scm +++ b/gnu/packages/search.scm @@ -330,7 +330,7 @@ for parsing HTML files.") (define-public fsearch (package (name "fsearch") - (version "0.2.1") + (version "0.2.2") (source (origin (method git-fetch) @@ -339,7 +339,7 @@ for parsing HTML files.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "02k3gwy19sf47srd5kp2fq3hpa7ylk4whifm8dp9hzfc46zdydwy")))) + (base32 "126sg0fa96vxwinih120riqhj42jlxs2h1bp373r6ml7jwkvlyyn")))) (build-system meson-build-system) (native-inputs (list autoconf -- cgit 1.4.1 From f323f04326025d1cb2abf6379b35a3fe2e2e53ba Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 23 Aug 2022 18:11:50 +0200 Subject: gnu: Add gwl/next. * gnu/packages/package-management.scm (gwl/next): New variable. --- gnu/packages/package-management.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 0469c73ff5..519924737c 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1356,6 +1356,23 @@ environments.") ;; and the fonts included in this package are licensed OFL1.1. (license (list license:gpl3+ license:agpl3+ license:silofl1.1)))) +(define-public gwl/next + (let ((commit "706a0895f639ed3ed77d0fe88382f51a6638b514") + (revision "1")) + (package + (inherit gwl) + (name "gwl-next") + (version (git-version "0.5.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://git.savannah.gnu.org/git/gwl.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0k9zkdyyzir3fvlbcfcqy17k28b51i20rpbjwlx2i1mwd2pw9cxc"))))))) + (define-public guix-build-coordinator (let ((commit "cc884efa7ee8a481cd3dae1b93d27454ac8dfcd2") (revision "59")) -- cgit 1.4.1 From 1e16af13b02dfe4b56267af2258694f1baf09e6c Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 24 Aug 2022 16:03:32 +0200 Subject: gnu: crawl: Update to 0.29.0. * gnu/packages/games.scm (crawl): Update to 0.29.0. [source]: Use GIT-FETCH method. [arguments]<#:make-flags>: Match new directory layout. <#:phases>: Add a phase to set version without calling GIT. * gnu/packages/patches/crawl-upgrade-saves.patch: Match new directory layout. --- gnu/packages/games.scm | 21 ++++++++++++++------- gnu/packages/patches/crawl-upgrade-saves.patch | 4 ++-- 2 files changed, 16 insertions(+), 9 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index a3278b8918..71abc57dd2 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -6515,14 +6515,16 @@ fish. The whole game is accompanied by quiet, comforting music.") (define-public crawl (package (name "crawl") - (version "0.28.0") + (version "0.29.0") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/crawl/crawl/releases/download/" - version "/stone_soup-" version "-nodeps.tar.xz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/crawl/crawl") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 "0irg5w4m127fxcj037kyp9vnyqyq1fi4q64rn6yq92w8z1lf2sss")) + (base32 "0cx67ln5qr4bawidi48ss63wflx7x22901da683c9wvy6m41vks8")) (patches (search-patches "crawl-upgrade-saves.patch")))) (build-system gnu-build-system) (inputs @@ -6552,12 +6554,17 @@ fish. The whole game is accompanied by quiet, comforting music.") "BUILD_LUA=" "BUILD_SQLITE=" "BUILD_ZLIB=" - "-Csource") + "-Ccrawl-ref/source") #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'set-version + (lambda _ + (call-with-output-file "crawl-ref/source/util/release_ver" + (lambda (port) + (display #$version port))))) (add-after 'unpack 'find-SDL-image (lambda _ - (substitute* "source/windowmanager-sdl.cc" + (substitute* "crawl-ref/source/windowmanager-sdl.cc" (("SDL_image.h") "SDL2/SDL_image.h")))) (delete 'configure) (replace 'check diff --git a/gnu/packages/patches/crawl-upgrade-saves.patch b/gnu/packages/patches/crawl-upgrade-saves.patch index 720a94f3e5..831f3c60be 100644 --- a/gnu/packages/patches/crawl-upgrade-saves.patch +++ b/gnu/packages/patches/crawl-upgrade-saves.patch @@ -6,8 +6,8 @@ upgrade is required, but guix nulls all file dates, and crawl would never upgrade saves. diff -ur a/source/database.cc b/source/database.cc ---- a/source/database.cc 2018-08-09 21:49:26.000000000 -0400 -+++ b/source/database.cc 2018-10-07 18:06:41.022445789 -0400 +--- a/crawl-ref/source/database.cc 2018-08-09 21:49:26.000000000 -0400 ++++ b/crawl-ref/source/database.cc 2018-10-07 18:06:41.022445789 -0400 @@ -24,6 +24,7 @@ #include "stringutil.h" #include "syscalls.h" -- cgit 1.4.1 From 6199ee19ff84f904972fcc703442dff24018ef4d Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 24 Aug 2022 16:06:46 +0200 Subject: gnu: crawl: Honor the #:tests? flag. * gnu/packages/games.scm (crawl)[arguments]<#:phases>: Honor the #:tests? flag in custom check phase. --- gnu/packages/games.scm | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 71abc57dd2..ebf805c119 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -6568,15 +6568,16 @@ fish. The whole game is accompanied by quiet, comforting music.") (("SDL_image.h") "SDL2/SDL_image.h")))) (delete 'configure) (replace 'check - (lambda* (#:key make-flags #:allow-other-keys) - (setenv "HOME" (getcwd)) - ;; Fake a terminal for the test cases. - (setenv "TERM" "xterm-256color") - ;; Run the tests that don't require a debug build. - (apply invoke "make" "nondebugtest" - (format #f "-j~d" (parallel-job-count)) - ;; Force command line build for test cases. - (append make-flags '("GAME=crawl" "TILES=")))))))) + (lambda* (#:key tests? make-flags #:allow-other-keys) + (when tests? + (setenv "HOME" (getcwd)) + ;; Fake a terminal for the test cases. + (setenv "TERM" "xterm-256color") + ;; Run the tests that don't require a debug build. + (apply invoke "make" "nondebugtest" + (format #f "-j~d" (parallel-job-count)) + ;; Force command line build for test cases. + (append make-flags '("GAME=crawl" "TILES="))))))))) (synopsis "Roguelike dungeon crawler game") (description "Dungeon Crawl Stone Soup (also known as \"Crawl\" or DCSS for short) is a roguelike adventure through dungeons filled with dangerous -- cgit 1.4.1 From 09e3ab6fbfa3749e577cd01362a8bf5a5a53e8a3 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Wed, 24 Aug 2022 18:16:52 +0200 Subject: gnu: maven: Update to 3.8.6. * gnu/packages/maven.scm (maven): Update to 3.8.6. --- gnu/packages/maven.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index f84f1ae177..28ec4eb9a8 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -1118,13 +1118,13 @@ gets and puts artifacts through HTTP(S) using Apache HttpClient-4.x."))) (define maven-pom (package (name "maven-pom") - (version "3.8.5") + (version "3.8.6") (source (origin (method url-fetch) (uri (string-append "mirror://apache/maven/" "maven-3/" version "/source/" "apache-maven-" version "-src.tar.gz")) - (sha256 (base32 "01y0fjvlvgy1bl3mdhbjll2xhzpli6aklqb3w29xpbgk6frxn3d6")) + (sha256 (base32 "0jszmcaxp597a62ajrc478jxix1qmw4pknhiygsbjdy3kccc7gvj")) (modules '((guix build utils))) (snippet '(begin -- cgit 1.4.1 From 6256e267da0e134e76364cc28b6b397ecdf4e74f Mon Sep 17 00:00:00 2001 From: Xinglu Chen Date: Mon, 22 Aug 2022 09:54:35 +0000 Subject: gnu: Add ocaml-afl-persistent. * gnu/packages/ocaml.scm (ocaml-afl-persistent): New variable. Signed-off-by: Julien Lepiller --- gnu/packages/ocaml.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 79df84054f..bb1d952bb8 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -8561,6 +8561,40 @@ It makes it possible to run pure OCaml programs in JavaScript environment like browsers and Node.js.") (license license:lgpl2.1+))) +(define-public ocaml-afl-persistent + (package + (name "ocaml-afl-persistent") + (version "1.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/stedolan/ocaml-afl-persistent") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "06yyds2vcwlfr2nd3gvyrazlijjcrd1abnvkfpkaadgwdw3qam1i")))) + (build-system ocaml-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (delete 'configure) + (replace 'build + (lambda _ + (invoke "./build.sh"))) + ;; XXX: The tests are already run in the build.sh script. + (delete 'check)))) + (native-inputs + `(("opam" ,opam))) + (home-page "https://github.com/stedolan/ocaml-afl-persistent") + (synopsis "Use afl-fuzz in persistent mode") + (description + "afl-fuzz normally works by repeatedly forking the program being tested. +Using this package, you can run afl-fuzz in ``persistent mode'', which avoids +repeated forking and is much faster.") + (license license:expat))) + (define-public ocaml-bibtex2html (package (name "ocaml-bibtex2html") -- cgit 1.4.1 From 3d403f56dd52a46e0ca119a67552e82896aee3b4 Mon Sep 17 00:00:00 2001 From: pukkamustard Date: Mon, 22 Aug 2022 09:54:36 +0000 Subject: gnu: Add ocaml-pprint. * gnu/packages/ocaml.scm (ocaml-pprint): New variable. Signed-off-by: Julien Lepiller --- gnu/packages/ocaml.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index bb1d952bb8..3572b36881 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -8595,6 +8595,31 @@ Using this package, you can run afl-fuzz in ``persistent mode'', which avoids repeated forking and is much faster.") (license license:expat))) +(define-public ocaml-pprint + (package + (name "ocaml-pprint") + (version "20220103") + (home-page "https://github.com/fpottier/pprint") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "09y6nwnjldifm47406q1r9987njlk77g4ifqg6qs54dckhr64vax")))) + (build-system dune-build-system) + (synopsis "OCaml pretty-printing combinator library and rendering +engine") + (description "This OCaml library offers a set of combinators for building +so-called documents as well as an efficient engine for converting documents to +a textual, fixed-width format. The engine takes care of indentation and line +breaks, while respecting the constraints imposed by the structure of the +document and by the text width.") + (license license:lgpl2.0))) + (define-public ocaml-bibtex2html (package (name "ocaml-bibtex2html") -- cgit 1.4.1 From 4719f43841907610ffdcda8364f7c36e32497930 Mon Sep 17 00:00:00 2001 From: pukkamustard Date: Mon, 22 Aug 2022 09:54:37 +0000 Subject: gnu: Add ocaml-crowbar. * gnu/packages/ocaml.scm (ocaml-crowbar): New variable. Signed-off-by: Julien Lepiller --- gnu/packages/ocaml.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 3572b36881..ac5eb4b239 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -8620,6 +8620,41 @@ breaks, while respecting the constraints imposed by the structure of the document and by the text width.") (license license:lgpl2.0))) +(define-public ocaml-crowbar + (package + (name "ocaml-crowbar") + (version "0.2.1") + (home-page "https://github.com/stedolan/crowbar") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "11f3kiw58g8njx15akx16xcplzvzdw9y6c4jpyfxylkxws4g0f6j")))) + (build-system dune-build-system) + (arguments + `(#:test-target ".")) + (propagated-inputs + (list ocaml-ocplib-endian + ocaml-cmdliner + ocaml-afl-persistent)) + (native-inputs + (list ocaml-calendar + ocaml-fpath + ocaml-uucp + ocaml-uunf + ocaml-uutf + ocaml-pprint)) + (synopsis "Ocaml library for tests, let a fuzzer find failing cases") + (description "Crowbar is a library for testing code, combining +QuickCheck-style property-based testing and the magical bug-finding powers of +@uref{http://lcamtuf.coredump.cx/afl/, afl-fuzz}.") + (license license:expat))) + (define-public ocaml-bibtex2html (package (name "ocaml-bibtex2html") -- cgit 1.4.1 From 1cb6064b49c52657f02ccea843dab4bc66ebb471 Mon Sep 17 00:00:00 2001 From: pukkamustard Date: Mon, 22 Aug 2022 09:54:38 +0000 Subject: gnu: Add ocaml-eqaf. * gnu/packages/ocaml.scm (ocaml-eqaf): New variable. Signed-off-by: Julien Lepiller --- gnu/packages/ocaml.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index ac5eb4b239..b070ee7748 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -8655,6 +8655,29 @@ QuickCheck-style property-based testing and the magical bug-finding powers of @uref{http://lcamtuf.coredump.cx/afl/, afl-fuzz}.") (license license:expat))) +(define-public ocaml-eqaf + (package + (name "ocaml-eqaf") + (version "0.9") + (home-page "https://github.com/mirage/eqaf") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "16ics56wiqyng70dy2hqikicm8ag1mv5w1h7hkiwvydw1x2j2rsl")))) + (build-system dune-build-system) + (propagated-inputs (list ocaml-cstruct)) + (native-inputs (list ocaml-alcotest ocaml-crowbar)) + (synopsis "OCaml library for constant-time equal function on string") + (description "This OCaml library provides an equal function on string in +constant-time to avoid timing-attack with crypto stuff.") + (license license:expat))) + (define-public ocaml-bibtex2html (package (name "ocaml-bibtex2html") -- cgit 1.4.1 From a39207f7afd977e4e4299c6f0bb34bcb6d153818 Mon Sep 17 00:00:00 2001 From: pukkamustard Date: Mon, 22 Aug 2022 09:54:39 +0000 Subject: gnu: Add ocaml-digestif. * gnu/packages/ocaml.scm (ocaml-digestif): New variable. Signed-off-by: Julien Lepiller --- gnu/packages/ocaml.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index b070ee7748..0e8e5b2adc 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -8678,6 +8678,39 @@ QuickCheck-style property-based testing and the magical bug-finding powers of constant-time to avoid timing-attack with crypto stuff.") (license license:expat))) +(define-public ocaml-digestif + (package + (name "ocaml-digestif") + (version "1.1.2") + (home-page "https://github.com/mirage/digestif") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0mc233d63y04jznsn3bxncgv7fkvyngbv6hcka412iq0y3x4qsmq")))) + (build-system dune-build-system) + (propagated-inputs (list ocaml-eqaf)) + (native-inputs + (list pkg-config + ocaml-fmt + ocaml-alcotest + ocaml-bos + ocaml-astring + ocaml-fpath + ocaml-rresult + ocaml-findlib)) + (synopsis "Simple hash algorithms in OCaml") + (description + "Digestif is an OCaml library that provides implementations of hash +algorithms. Implemented hash algorithms include MD5, SHA1, SHA224, SHA256, +SHA384, SHA512, Blake2b, Blake2s and RIPEMD160.") + (license license:expat))) + (define-public ocaml-bibtex2html (package (name "ocaml-bibtex2html") -- cgit 1.4.1 From 31339f5f5ffd80f3fca9dbe49990fa3be4234bb5 Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Tue, 23 Aug 2022 23:21:17 +0800 Subject: gnu: Rename procedure "qt5-urls" to "qt-urls" in (gnu packages qt). MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This procedure now used by Qt5 and Qt6. "qt-urls" is more neutral than original one. * gnu/packages/qt.scm (qt5-urls): Rename to "qt-urls". (qtbase-5)[source]: Use "qt-urls" for uri field. (qtbase)[source]: Ditto. (qt5compat)[source]: Ditto. (qtsvg-5)[source]: Ditto. (qtsvg)[source]: Ditto. (qtimageformats)[source]: Ditto. (qtx11extras)[source]: Ditto. (qtxmlpatterns)[source]: Ditto. (qtdeclarative-5)[source]: Ditto. (qtdeclarative)[source]: Ditto. (qtconnectivity)[source]: Ditto. (qtwebsockets-5)[source]: Ditto. (qtwebsockets)[source]: Ditto. (qtsensors)[source]: Ditto. (qtmultimedia-5)[source]: Ditto. (qtshadertools)[source]: Ditto. (qtmultimedia)[source]: Ditto. (qtwayland)[source]: Ditto. (qtserialport)[source]: Ditto. (qtserialbus)[source]: Ditto. (qtwebchannel-5)[source]: Ditto. (qtwebchannel)[source]: Ditto. (qtwebglplugin)[source]: Ditto. (qtwebview)[source]: Ditto. (qtlottie)[source]: Ditto. (qttools-5)[source]: Ditto. (qttools)[source]: Ditto. (qtscript)[source]: Ditto. (qtquickcontrols-5)[source]: Ditto. (qtquickcontrols2-5)[source]: Ditto. (qtgraphicaleffects)[source]: Ditto. (qtgamepad)[source]: Ditto. (qtscxml)[source]: Ditto. (qtpositioning)[source]: Ditto. (qtpurchasing)[source]: Ditto. (qtcharts)[source]: Ditto. (qtdatavis3d)[source]: Ditto. (qtnetworkauth-5)[source]: Ditto. (qtnetworkauth)[source]: Ditto. (qtremoteobjects)[source]: Ditto. (qtspeech)[source]: Ditto. (qtwebengine-5)[source]: Ditto. (qtwebengine)[source]: Ditto. Signed-off-by: 宋文武 --- gnu/packages/qt.scm | 88 ++++++++++++++++++++++++++--------------------------- 1 file changed, 44 insertions(+), 44 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index d9d796f551..9832568d10 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -262,7 +262,7 @@ other text such as code. The syntax uses the syntax of the Django template system, and the core design of Django is reused in Grantlee.") (license license:lgpl2.1+))) -(define (qt5-urls component version) +(define (qt-urls component version) "Return a list of URLs for VERSION of the Qt5 COMPONENT." ;; We can't use a mirror:// scheme because these URLs are not exact copies: ;; the layout differs between them. @@ -286,7 +286,7 @@ system, and the core design of Django is reused in Grantlee.") (version "5.15.2") (source (origin (method url-fetch) - (uri (qt5-urls name version)) + (uri (qt-urls name version)) (sha256 (base32 "1y70libf2x52lpbqvhz10lpk7nyl1ajjwzjxly9pjdpfj4jsv7wh")) @@ -540,7 +540,7 @@ developers using C++ or QML, a CSS & JavaScript like language.") (version "6.3.1") (source (origin (inherit (package-source qtbase-5)) - (uri (qt5-urls name version)) + (uri (qt-urls name version)) (sha256 (base32 "00sfya41ihqb0zwg6wf1kiy02iymj6mk584hhk2c4s94khfl4r0a")) @@ -822,7 +822,7 @@ developers using C++ or QML, a CSS & JavaScript like language.") (version "6.3.1") (source (origin (method url-fetch) - (uri (qt5-urls name version)) + (uri (qt-urls name version)) (sha256 (base32 "1zbcaswpl79ixcxzj85qzjq73962s4c7316pibwfrskqswmwcgm4")))) @@ -852,7 +852,7 @@ came with the @{qtgraphicaleffects} Qt 5 package.") (version "5.15.2") (source (origin (method url-fetch) - (uri (qt5-urls name version)) + (uri (qt-urls name version)) (sha256 (base32 "0pjqrdmd1991x9h4rl8sf81pkd89hfd5h1a2gp3fjw96pk0w5hwb")))) @@ -922,7 +922,7 @@ HostData=lib/qt5 (version "6.3.1") (source (origin (method url-fetch) - (uri (qt5-urls name version)) + (uri (qt-urls name version)) (sha256 (base32 "1xvxz2jfpr1al85rhwss7ji5vkxa812d0b888hry5f7pwqcg86bv")))) @@ -953,7 +953,7 @@ HostData=lib/qt5 (version "5.15.2") (source (origin (method url-fetch) - (uri (qt5-urls name version)) + (uri (qt-urls name version)) (sha256 (base32 "1msk8a0z8rr16hkp2fnv668vf6wayiydqgc2mcklaa04rv3qb0mz")) @@ -991,7 +991,7 @@ support for MNG, TGA, TIFF and WBMP image formats."))) (version "5.15.2") (source (origin (method url-fetch) - (uri (qt5-urls name version)) + (uri (qt-urls name version)) (sha256 (base32 "0gkfzj195v9flwljnqpdz3a532618yn4h2577nlsai56x4p7053h")))) @@ -1011,7 +1011,7 @@ from within Qt 5."))) (version "5.15.2") (source (origin (method url-fetch) - (uri (qt5-urls name version)) + (uri (qt-urls name version)) (sha256 (base32 "1ypj5jpa31rlx8yfw3y9jia212lfnxvnqkvygs6ihjf3lxi23skn")))) @@ -1038,7 +1038,7 @@ xmlpatternsvalidator."))) (version "5.15.2") (source (origin (method url-fetch) - (uri (qt5-urls name version)) + (uri (qt-urls name version)) (sha256 (base32 "0lancdn7y0lrlmyn5cbdm0izd5yprvd5n77nhkb7a3wl2sbx0066")))) @@ -1079,7 +1079,7 @@ with JavaScript and C++."))) ;; TODO: Package 'masm' and unbundle from sources. (source (origin (method url-fetch) - (uri (qt5-urls name version)) + (uri (qt-urls name version)) (sha256 (base32 "1s268fha3650dn1lqxf8jfa07wxpw09f6p7rjyiwq3w24d0nkrq3")))) @@ -1206,7 +1206,7 @@ integrate QML code with JavaScript and C++.") (version "5.15.2") (source (origin (method url-fetch) - (uri (qt5-urls name version)) + (uri (qt-urls name version)) (sha256 (base32 "185zci61ip1wpjrygcw2m6v55lvninc0b8y2p3jh6qgpf5w35003")))) @@ -1224,7 +1224,7 @@ with Bluetooth and NFC."))) (version "5.15.2") (source (origin (method url-fetch) - (uri (qt5-urls name version)) + (uri (qt-urls name version)) (sha256 (base32 "0gr399fn5n8j3m9d3vv01vcbr1cb7pw043j04cnnxzrlvn2jvd50")))) @@ -1247,7 +1247,7 @@ consume data received from the server, or both."))) (version "6.3.1") (source (origin (method url-fetch) - (uri (qt5-urls name version)) + (uri (qt-urls name version)) (sha256 (base32 "06hj0pkdzjicmbiinjp1dk1ziz8cb3fgcwy7a0dxxjvzr680v64z")))) @@ -1286,7 +1286,7 @@ consume data received from the server, or both.") (version "5.15.2") (source (origin (method url-fetch) - (uri (qt5-urls name version)) + (uri (qt-urls name version)) (sha256 (base32 "0fa81r7bn1mf9ynwsx524a55dx1q0jb4vda6j48ssb4lx7wi201z")))) @@ -1316,7 +1316,7 @@ recognition API for devices."))) (version "5.15.2") (source (origin (method url-fetch) - (uri (qt5-urls name version)) + (uri (qt-urls name version)) (sha256 (base32 "1xbd6kc7i0iablqdkvfrajpi32cbq7j6ajbfyyyalcai1s0mhdqc")) @@ -1361,7 +1361,7 @@ set of plugins for interacting with pulseaudio and GStreamer."))) (version "6.3.1") (source (origin (method url-fetch) - (uri (qt5-urls name version)) + (uri (qt-urls name version)) ;; Note: the source bundles *patched* glslang and SPIRV-Cross ;; sources. (sha256 @@ -1390,7 +1390,7 @@ Vulkan, OpenGL and other main graphic APIs.") (version "6.3.1") (source (origin (method url-fetch) - (uri (qt5-urls name version)) + (uri (qt-urls name version)) (sha256 (base32 "0dkk3lmzi2fs13cnj8q1lpcs6gghj219826gkwnzyd6nmlm280vy")) @@ -1455,7 +1455,7 @@ set of plugins for interacting with pulseaudio and GStreamer.") (version "5.15.2") (source (origin (method url-fetch) - (uri (qt5-urls name version)) + (uri (qt-urls name version)) (patches (search-patches "qtwayland-gcc-11.patch")) (sha256 (base32 @@ -1505,7 +1505,7 @@ compositor libraries."))) (version "5.15.2") (source (origin (method url-fetch) - (uri (qt5-urls name version)) + (uri (qt-urls name version)) (sha256 (base32 "17gp5qzg4wdg8qlxk2p3mh8x1vk33rf33wic3fy0cws193bmkiar")))) @@ -1535,7 +1535,7 @@ interacting with serial ports from within Qt."))) (version "5.15.2") (source (origin (method url-fetch) - (uri (qt5-urls name version)) + (uri (qt-urls name version)) (sha256 (base32 "125x6756fjpldqy6wbw6cg7ngjh2016aiq92bchh719z1mf7xsxf")))) @@ -1565,7 +1565,7 @@ and others."))) (version "5.15.2") (source (origin (method url-fetch) - (uri (qt5-urls name version)) + (uri (qt-urls name version)) (sha256 (base32 "1h9y634phvvk557mhmf9z4lmxr41rl8x9mqy2lzp31mk8ffffzqj")))) @@ -1584,7 +1584,7 @@ popular web engines, Qt WebKit 2 and Qt WebEngine."))) (version "6.3.1") (source (origin (method url-fetch) - (uri (qt5-urls name version)) + (uri (qt-urls name version)) (sha256 (base32 "0s16zx3qn3byldvhmsnwijm8rmizk8vpqj7fnwhjg6c67z10m8ma")))) @@ -1621,7 +1621,7 @@ application).") (version "5.15.2") (source (origin (method url-fetch) - (uri (qt5-urls name version)) + (uri (qt-urls name version)) (sha256 (base32 "0ihlnhv8ldkqz82v3j7j22lrhk17b6ghra8sx85y2agd2ysq5rw1")))) @@ -1650,7 +1650,7 @@ OpenGL ES 2.0 and can be used in HTML5 canvas elements"))) (version "5.15.2") (source (origin (method url-fetch) - (uri (qt5-urls name version)) + (uri (qt-urls name version)) (sha256 (base32 "1rw1wibmbxlj6xc86qs3y8h42al1vczqiksyxzaylxs9gqb4d7xy")))) @@ -1693,7 +1693,7 @@ positioning and geolocation plugins."))) (version "6.3.1") (source (origin (method url-fetch) - (uri (qt5-urls name version)) + (uri (qt-urls name version)) (sha256 (base32 "1x8wmc6gwmxk92zjcsrbhrbqbfvnk7302ggghld5wk8jk5lsf2vl")))) @@ -1725,7 +1725,7 @@ plugin for Adobe After Effects.") (version "5.15.2") (source (origin (method url-fetch) - (uri (qt5-urls name version)) + (uri (qt-urls name version)) (sha256 (base32 "1k618f7v6jaj0ygy8d7jvgb8zjr47sn55kiskbdkkizp3z7d12f1")))) @@ -1747,7 +1747,7 @@ that helps in Qt development."))) (version "6.3.1") (source (origin (method url-fetch) - (uri (qt5-urls name version)) + (uri (qt-urls name version)) (sha256 (base32 "1h96w4bzkbd80vr7lh6hnypdlmbzc1y52c2zrqzvkgm3587pa4n4")))) @@ -1774,7 +1774,7 @@ that helps in Qt development.") (version "5.15.2") (source (origin (method url-fetch) - (uri (qt5-urls name version)) + (uri (qt-urls name version)) (sha256 (base32 "0gk74hk488k9ldacxbxcranr3arf8ifqg8kz9nm1rgdgd59p36d2")) @@ -1794,7 +1794,7 @@ ECMAScript and Qt."))) (version "5.15.2") (source (origin (method url-fetch) - (uri (qt5-urls name version)) + (uri (qt-urls name version)) (sha256 (base32 "1dczakl868mg0lnwpf082jjc5976ycn879li1vqlgw5ihirzp4y3")))) @@ -1814,7 +1814,7 @@ can be used to build complete interfaces in Qt Quick."))) (version "5.15.2") (source (origin (method url-fetch) - (uri (qt5-urls name version)) + (uri (qt-urls name version)) (sha256 (base32 "06c9vrwvbjmzapmfa25y34lgjkzg57xxbm92nr6wkv5qykjnq6v7")))) @@ -1841,7 +1841,7 @@ not available."))) (version "5.15.2") (source (origin (method url-fetch) - (uri (qt5-urls name version)) + (uri (qt-urls name version)) (sha256 (base32 "1r6zfc0qga2ax155js7c8y5rx6vgayf582s921j09mb797v6g3gc")))) @@ -1864,7 +1864,7 @@ coloring, and many more."))) (version "5.15.2") (source (origin (method url-fetch) - (uri (qt5-urls name version)) + (uri (qt-urls name version)) (sha256 (base32 "0p07bg93fdfn4gr2kv38qgnws5znhswajrxdfs8xc9l3i7vi2xn7")))) @@ -1890,7 +1890,7 @@ and mobile applications targeting TV-like form factors."))) (version "5.15.2") (source (origin (method url-fetch) - (uri (qt5-urls name version)) + (uri (qt-urls name version)) (sha256 (base32 "1p5771b9hnpchfcdgy0zkhwg09a6xq88934aggp0rij1k85mkfb0")) @@ -1917,7 +1917,7 @@ also contains functionality to support data models and executable content."))) (version "6.3.1") (source (origin (method url-fetch) - (uri (qt5-urls name version)) + (uri (qt-urls name version)) (sha256 (base32 "0v78wamvdw02kf9rq7m5v24q2g6jmgq4ch0fnfa014p1r978wy06")))) @@ -1947,7 +1947,7 @@ information and perform area based monitoring.") (version "5.15.2") (source (origin (method url-fetch) - (uri (qt5-urls name version)) + (uri (qt-urls name version)) (sha256 (base32 "09rjx53519dfk4qj2gbn3vlxyriasyb747wpg1p11y7jkwqhs4l7")))) @@ -1963,7 +1963,7 @@ purchasing goods and services."))) (version "5.15.2") (source (origin (method url-fetch) - (uri (qt5-urls name version)) + (uri (qt-urls name version)) (sha256 (base32 "049x7z8zcp9jixmdv2fjscy2ggpd6za9hkdbb2bqp2mxjm0hwxg0")))) @@ -1986,7 +1986,7 @@ selecting one of the charts themes.") (version "5.15.2") (source (origin (method url-fetch) - (uri (qt5-urls name version)) + (uri (qt-urls name version)) (sha256 (base32 "1zdn3vm0nfy9ny7c783aabp3mhlnqhi9fw2rljn7ibbksmsnasi2")))) @@ -2009,7 +2009,7 @@ customized by using themes or by adding custom items and labels to them.") (version "5.15.2") (source (origin (method url-fetch) - (uri (qt5-urls name version)) + (uri (qt-urls name version)) (sha256 (base32 "11fdgacv4syr8bff2vdw7rb0dg1gcqpdf37hm3pn31d6z91frhpw")))) @@ -2035,7 +2035,7 @@ implementation of OAuth and OAuth2 authenticathon methods for Qt."))) (version "6.3.1") (source (origin (method url-fetch) - (uri (qt5-urls name version)) + (uri (qt-urls name version)) (sha256 (base32 "0apvsb2ip1m3kw8vi9spvf6f6q72ys8vr40rpyysi7shsjwm83yn")))) @@ -2055,7 +2055,7 @@ implementation of OAuth and OAuth2 authenticathon methods for Qt.") (version "5.15.2") (source (origin (method url-fetch) - (uri (qt5-urls name version)) + (uri (qt-urls name version)) (sha256 (base32 "1hngbp0vkr35rpsrac7b9vx6f360v8v2g0fffzm590l8j2ybd0b7")))) @@ -2088,7 +2088,7 @@ processes or computers."))) (version "5.15.2") (source (origin (method url-fetch) - (uri (qt5-urls name version)) + (uri (qt-urls name version)) (sha256 (base32 "1xc3x3ghnhgchsg1kgj156yg69wn4rwjx8r28i1jd05hxjggn468")))) @@ -2145,7 +2145,7 @@ using the Enchant spell-checking library.") (source (origin (method url-fetch) - (uri (qt5-urls name version)) + (uri (qt-urls name version)) (sha256 (base32 "1q4idxdm81sx102xc12ixj0xpfx52d6vwvs3jpapnkyq8c7cmby8")) @@ -2509,7 +2509,7 @@ and binaries removed, and adds modular support for using system libraries.") (source (origin (method url-fetch) - (uri (qt5-urls name version)) + (uri (qt-urls name version)) (sha256 (base32 "0ivfsqd5c0cxsnssj6z37901cf6a47w50zaqgjiysvcm3ar36ymd")) -- cgit 1.4.1 From 0e11067d53783bb5ac202480c76b84956d0e8762 Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Thu, 25 Aug 2022 11:12:03 +0800 Subject: gnu: wesnoth: Update to 1.16.5. * gnu/packages/games.scm (wesnoth): Update to 1.16.5. --- gnu/packages/games.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index ebf805c119..5dc7298acb 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -4163,7 +4163,7 @@ falling, themeable graphics and sounds, and replays.") (define-public wesnoth (package (name "wesnoth") - (version "1.16.1") + (version "1.16.5") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/wesnoth/wesnoth-" @@ -4172,7 +4172,7 @@ falling, themeable graphics and sounds, and replays.") "wesnoth-" version ".tar.bz2")) (sha256 (base32 - "0cyrwmdg93pqpdm7030540jznaky9rda355i9ym8am4k9civlcwf")))) + "02pzijbmkgcb8hc4l3f4r3r3mxqda936dp488i9sd9d4m3xdzimh")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) ;no check target -- cgit 1.4.1 From a36fb3d131e3db20926c5c374e26cb57a5c7b243 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Thu, 25 Aug 2022 13:14:21 +0530 Subject: gnu: laminar: Update to 1.2. * gnu/packages/ci.scm (laminar): Update to 1.2. [arguments]: Do not return #t from custom phases. --- gnu/packages/ci.scm | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index 9cd2f6884e..f4bd4ce000 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2017, 2020, 2021 Mathieu Othacehe ;;; Copyright © 2017, 2019, 2020 Ricardo Wurmus ;;; Copyright © 2018 Clément Lassieur +;;; Copyright © 2022 Arun Isaac ;;; ;;; This file is part of GNU Guix. ;;; @@ -193,7 +194,7 @@ intended as a replacement for Hydra.") (define-public laminar (package (name "laminar") - (version "1.1") + (version "1.2") (source (origin (method url-fetch) (uri (string-append "https://github.com/ohwgiles/laminar/archive/" @@ -202,7 +203,7 @@ intended as a replacement for Hydra.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1lzfmfjygmbdr2n1q49kwwffw8frz5y6iczhdz5skwmzwg0chbsf")))) + "0vcgpp8g67mlhqnyhkihxz9j5jz1pal79jrdhnmjl5ddbhkvji8i")))) (build-system cmake-build-system) (arguments `(#:tests? #f ; TODO Can't build tests @@ -223,8 +224,7 @@ intended as a replacement for Hydra.") (("install\\(FILES \\$\\{CMAKE\\_CURRENT\\_BINARY\\_DIR\\}\\/laminar\\.service DESTINATION \\$\\{SYSTEMD\\_UNITDIR\\}\\)") "") (("install\\(FILES etc/laminar\\.conf DESTINATION \\/etc\\)") "") - (("\\/usr\\/") "")) - #t)) + (("\\/usr\\/") "")))) (add-after 'configure 'copy-in-javascript-and-css (lambda* (#:key inputs outputs #:allow-other-keys) (use-modules (ice-9 popen)) @@ -253,9 +253,7 @@ intended as a replacement for Hydra.") ;; ansi_up.js isn't minified (copy-file (assoc-ref inputs "ansi_up.js") - "../build/js/ansi_up.js") - - #t))))) + "../build/js/ansi_up.js")))))) (inputs (list capnproto rapidjson sqlite boost zlib)) (native-inputs -- cgit 1.4.1 From ee221461c3ce52733906ba37e5c9c3dfa562c5af Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Thu, 25 Aug 2022 13:46:41 +0530 Subject: gnu: laminar: Do not use auto-generated tarball. * gnu/packages/ci.scm (laminar)[source]: Use git-fetch. --- gnu/packages/ci.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index f4bd4ce000..86d99c9031 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -196,14 +196,14 @@ intended as a replacement for Hydra.") (name "laminar") (version "1.2") (source - (origin (method url-fetch) - (uri (string-append "https://github.com/ohwgiles/laminar/archive/" - version - ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (origin (method git-fetch) + (uri (git-reference + (url "https://github.com/ohwgiles/laminar") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "0vcgpp8g67mlhqnyhkihxz9j5jz1pal79jrdhnmjl5ddbhkvji8i")))) + "1sg0kccp3nczkn2vxcsqv10vyvmjnhpaykc1nfhh55jyda4xzf9w")))) (build-system cmake-build-system) (arguments `(#:tests? #f ; TODO Can't build tests -- cgit 1.4.1 From dfa373069df55bb4eb6e13792336db8e0fb85d1d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 25 Aug 2022 11:30:49 +0200 Subject: gnu: Add r-glmpca. * gnu/packages/cran.scm (r-glmpca): New variable. --- gnu/packages/cran.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index ed541dd720..a52493fa4d 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -393,6 +393,28 @@ Gaussian quadrature for a numerical solution.") Distance (EMD).") (license license:expat))) +(define-public r-glmpca + (package + (name "r-glmpca") + (version "0.2.0") + (source (origin + (method url-fetch) + (uri (cran-uri "glmpca" version)) + (sha256 + (base32 + "02xjf0gg52925hw9nw2j0znfmzfzfwbv0fxjl9d2fy9j63drr2h4")))) + (properties `((upstream-name . "glmpca"))) + (build-system r-build-system) + (propagated-inputs (list r-mass)) + (native-inputs (list r-knitr)) + (home-page "https://github.com/willtownes/glmpca") + (synopsis "Dimension Reduction of Non-Normally Distributed Data") + (description + "This package implements a generalized version of principal components +analysis (GLM-PCA) for dimension reduction of non-normally distributed data +such as counts or binary matrices.") + (license license:lgpl3+))) + (define-public r-googledrive (package (name "r-googledrive") -- cgit 1.4.1 From add211b277cd67fcd0607f877dfa7ffc972a020b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 25 Aug 2022 11:31:13 +0200 Subject: gnu: Add r-scry. * gnu/packages/bioconductor.scm (r-scry): New variable. --- gnu/packages/bioconductor.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index d27419428f..facfb75abf 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -5751,6 +5751,38 @@ a scRNA-seq experiment onto the cell-types or individual cells identified in a different experiment.") (license license:gpl3))) +(define-public r-scry + (package + (name "r-scry") + (version "1.8.0") + (source (origin + (method url-fetch) + (uri (bioconductor-uri "scry" version)) + (sha256 + (base32 + "16mj21r91jy8ircdz8rfrdli9gjy0hrx90kf6ghs305d3d4dl193")))) + (properties `((upstream-name . "scry"))) + (build-system r-build-system) + (propagated-inputs + (list r-biocsingular + r-delayedarray + r-glmpca + r-hdf5array + r-matrix + r-singlecellexperiment + r-summarizedexperiment)) + (native-inputs (list r-knitr)) + (home-page "https://bioconductor.org/packages/scry.html") + (synopsis "Small-count analysis methods for high-dimensional data") + (description + "Many modern biological datasets consist of small counts that are not +well fit by standard linear-Gaussian methods such as principal component +analysis. This package provides implementations of count-based feature +selection and dimension reduction algorithms. These methods can be used to +facilitate unsupervised analysis of any high-dimensional data such as +single-cell RNA-seq.") + (license license:artistic2.0))) + (define-public r-seqlogo (package (name "r-seqlogo") -- cgit 1.4.1 From abf0b2744d0334929761922cf5ea4a31ad168a14 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 25 Aug 2022 11:37:46 +0200 Subject: gnu: Add r-ips. * gnu/packages/cran.scm (r-ips): New variable. --- gnu/packages/cran.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index a52493fa4d..fa587737cc 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6551,6 +6551,27 @@ Information-Maximization (Infomax), and @dfn{Joint Approximate Diagonalization of Eigenmatrices} (JADE).") (license license:gpl2+))) +(define-public r-ips + (package + (name "r-ips") + (version "0.0.11") + (source (origin + (method url-fetch) + (uri (cran-uri "ips" version)) + (sha256 + (base32 + "02jxanfhsjrabj33nwjv71vdc87hiyzikyqrfdj9ix6dky6lm199")))) + (properties `((upstream-name . "ips"))) + (build-system r-build-system) + (propagated-inputs (list r-ape r-phangorn r-plyr r-seqinr r-xml)) + (home-page "https://cran.r-project.org/package=ips") + (synopsis "Interfaces to phylogenetic software in R") + (description + "This package provides functions that wrap popular phylogenetic software +for sequence alignment, masking of sequence alignments, and estimation of +phylogenies and ancestral character states.") + (license license:gpl3))) + (define-public r-dtw (package (name "r-dtw") -- cgit 1.4.1 From a901d8e0daabb9e766e42865c74908d3303293b9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 25 Aug 2022 11:41:59 +0200 Subject: gnu: Add r-aer. * gnu/packages/cran.scm (r-aer): New variable. --- gnu/packages/cran.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index fa587737cc..7aa3ebde97 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -116,6 +116,35 @@ #:use-module (gnu packages xml) #:use-module (gnu packages xorg)) +(define-public r-aer + (package + (name "r-aer") + (version "1.2-10") + (source (origin + (method url-fetch) + (uri (cran-uri "AER" version)) + (sha256 + (base32 + "1p6vxr0220lim5i4gwsvphqrfd65zbs8h3qydz4gipca9asmy2k5")))) + (properties `((upstream-name . "AER"))) + (build-system r-build-system) + (propagated-inputs + (list r-car + r-formula + r-lmtest + r-sandwich + r-survival + r-zoo)) + (home-page "https://cran.r-project.org/package=AER") + (synopsis "Applied econometrics with R") + (description + "This package provides functions, data sets, examples, demos, and +vignettes for the book Christian Kleiber and Achim Zeileis (2008), Applied +Econometrics with R, Springer-Verlag, New York. ISBN 978-0-387-77316-2. (See +the vignette \"AER\" for a package overview.)") + ;; Either version of the GPL + (license (list license:gpl2 license:gpl3)))) + (define-public r-afpt (package (name "r-afpt") -- cgit 1.4.1 From 25494265b28d0121e9d1e12113fd64d9dcefe8f7 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 24 Aug 2022 21:19:42 +0300 Subject: gnu: go-github-com-pkg-errors: Skip tests with gccgo. * gnu/packages/golang.scm (go-github-com-pkg-errors)[arguments]: Don't run the test suite when building with gccgo. --- gnu/packages/golang.scm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index d2f3dc39df..29812d48ef 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -54,6 +54,7 @@ (define-module (gnu packages golang) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix utils) + #:use-module (guix gexp) #:use-module (guix memoization) #:use-module ((guix build utils) #:select (alist-replace)) #:use-module (guix download) @@ -6017,7 +6018,16 @@ decode/encode structures and slices.") "1761pybhc2kqr6v5fm8faj08x9bql8427yqg6vnfv6nhrasx1mwq")))) (build-system go-build-system) (arguments - `(#:import-path "github.com/pkg/errors")) + (list + #:import-path "github.com/pkg/errors" + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key inputs #:allow-other-keys #:rest args) + (unless + ;; The tests fail when run with gccgo. + (false-if-exception (search-input-file inputs "/bin/gccgo")) + (apply (assoc-ref %standard-phases 'check) args))))))) (synopsis "Go error handling primitives") (description "This package provides @code{error}, which offers simple error handling primitives in Go.") -- cgit 1.4.1 From 54da48e2cea47b230f9306dcb33e41dfa934a84e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 24 Aug 2022 21:27:00 +0300 Subject: gnu: go-github.com-jtolds-gls: Skip tests with gccgo. * gnu/packages/golang.scm (go-github.com-ktolds-gls)[arguments]: Don't run the test suite when building with gccgo. --- gnu/packages/golang.scm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 29812d48ef..98338cb701 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -2439,7 +2439,16 @@ termination.") "1k7xd2q2ysv2xsh373qs801v6f359240kx0vrl0ydh7731lngvk6")))) (build-system go-build-system) (arguments - '(#:import-path "github.com/jtolds/gls")) + (list + #:import-path "github.com/jtolds/gls" + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key inputs #:allow-other-keys #:rest args) + (unless + ;; The tests fail when run with gccgo. + (false-if-exception (search-input-file inputs "/bin/gccgo")) + (apply (assoc-ref %standard-phases 'check) args))))))) (synopsis "@code{gls} provides Goroutine local storage") (description "The @code{gls} package provides a way to store a retrieve values -- cgit 1.4.1 From 4275727ac5ab29c833fd6306d153cdc4e9164dd6 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 24 Aug 2022 21:30:48 +0300 Subject: gnu: python-natsort: Honor the #:tests? flag. * gnu/packages/python-xyz.scm (python-natsort)[arguments]: Adjust the custom 'check phase to honor the #:tests? flag. --- gnu/packages/python-xyz.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 8b0aae76ac..de8c7de6e2 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -18195,8 +18195,9 @@ JSON) codec.") `(#:phases (modify-phases %standard-phases (replace 'check - (lambda _ - (invoke "pytest" "-v")))))) + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "pytest" "-v"))))))) (native-inputs (list python-hypothesis python-pytest-cov python-pytest-mock python-pytest)) -- cgit 1.4.1 From fd305cd9600adc87599ea5a9aa70ec7eb0a5ac10 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 24 Aug 2022 21:36:38 +0300 Subject: gnu: python-natsort: Reflow description. * gnu/packages/python-xyz.scm (python-natsort)[description]: Rewrap description to normal columns. --- gnu/packages/python-xyz.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index de8c7de6e2..e8763342f6 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -18207,13 +18207,13 @@ JSON) codec.") (synopsis "Natural sorting for python and shell") (description "Natsort lets you apply natural sorting on lists instead of - lexicographical. If you use the built-in @code{sorted} method in python - on a list such as @code{[@code{a20}, @code{a9}, @code{a1}, @code{a4}, - @code{a10}]}, it would be returned as @code{[@code{a1}, @code{a10}, @code{a20}, - @code{a4}, @code{a9}]}. Natsort provides a function @code{natsorted} that - identifies numbers and sorts them separately from strings. It can also sort - version numbers, real numbers, mixed types and more, and comes with a shell - command @command{natsort} that exposes this functionality in the command line.") +lexicographical. If you use the built-in @code{sorted} method in python on a +list such as @code{[@code{a20}, @code{a9}, @code{a1}, @code{a4}, @code{a10}]}, +it would be returned as @code{[@code{a1}, @code{a10}, @code{a20}, @code{a4}, +@code{a9}]}. Natsort provides a function @code{natsorted} that identifies +numbers and sorts them separately from strings. It can also sort version +numbers, real numbers, mixed types and more, and comes with a shell command +@command{natsort} that exposes this functionality in the command line.") (license license:expat))) (define-public glances -- cgit 1.4.1 From 04f813ec63de85e72becce40b625d6ebd0cd4484 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 24 Aug 2022 22:58:47 +0300 Subject: gnu: python-natsort: Fix the test suite on slower machines. * gnu/packages/python-xyz.scm (python-natsort)[arguments]: Add custom phase to remove the time limit for some of the tests. --- gnu/packages/python-xyz.scm | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index e8763342f6..f7971b75fa 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -18194,6 +18194,13 @@ JSON) codec.") (arguments `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'remove-test-hypothesis-deadlines + (lambda _ + (substitute* "tests/test_utils.py" + (("from hypothesis import given") + "from hypothesis import given, settings") + (("( +)@given" all spaces) + (string-append spaces "@settings(deadline=None)\n" all))))) (replace 'check (lambda* (#:key tests? #:allow-other-keys) (when tests? -- cgit 1.4.1 From 4892c1af84a83b9c966af1dc5ea085f8122cfa05 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 24 Aug 2022 21:45:34 +0300 Subject: gnu: go-github.com-smartystreets-assertions: Update to 1.13.0. * gnu/packages/check.scm (go-github.com-smartystreets-assertions): Update to 1.13.0. --- gnu/packages/check.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 75bd20cff9..2bb8128f34 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -665,16 +665,15 @@ test) much simpler.") (define-public go-github.com-smartystreets-assertions (package (name "go-github.com-smartystreets-assertions") - (version "1.8.1") + (version "1.13.0") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/smartystreets/assertions") - (commit version))) + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 - "1j0adgbykl55rf2945g0n5bmqdsnjcqlx5dcmpfh4chki43hiwg9")))) + (base32 "0flf3fb6fsw3bk1viva0fzrzw87djaj1mqvrx2gzg1ssn7xzfrzr")))) (build-system go-build-system) (arguments '(#:import-path "github.com/smartystreets/assertions")) -- cgit 1.4.1 From e77383e16fe4244a82b5e988e6edcfb52bf8965c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 24 Aug 2022 21:50:04 +0300 Subject: gnu: go-github.com-smartystreets-assertions: Skip tests with gccgo. * gnu/packages/check.scm (go-github.com-smartystreets-assertions): Don't run the test suite when building with gccgo. --- gnu/packages/check.scm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 2bb8128f34..26a49056a2 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -676,7 +676,16 @@ test) much simpler.") (base32 "0flf3fb6fsw3bk1viva0fzrzw87djaj1mqvrx2gzg1ssn7xzfrzr")))) (build-system go-build-system) (arguments - '(#:import-path "github.com/smartystreets/assertions")) + (list + #:import-path "github.com/smartystreets/assertions" + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key inputs #:allow-other-keys #:rest args) + (unless + ;; The tests fail when run with gccgo. + (false-if-exception (search-input-file inputs "/bin/gccgo")) + (apply (assoc-ref %standard-phases 'check) args))))))) (native-inputs (list go-github.com-smartystreets-gunit)) (synopsis "Assertions for testing with Go") -- cgit 1.4.1 From 22487dfc227613a5c769435e3448d6b791dc9bf3 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 24 Aug 2022 22:00:20 +0300 Subject: gnu: go-gopkg-in-check-v1: Skip tests with gccgo. * gnu/packages/golang.scm (go-gopkg-in-check-v1)[arguments]: Don't run the test suite when building with gccgo. --- gnu/packages/golang.scm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 98338cb701..ed31d330de 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -4051,7 +4051,16 @@ which satisfies the cron expression.") "1jwxndf8rsyx0fgrp47d99rp55yzssmryb92jfj3yf7zd8rjjljn")))) (build-system go-build-system) (arguments - '(#:import-path "gopkg.in/check.v1")) + (list + #:import-path "gopkg.in/check.v1" + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key inputs #:allow-other-keys #:rest args) + (unless + ;; The tests fail when run with gccgo. + (false-if-exception (search-input-file inputs "/bin/gccgo")) + (apply (assoc-ref %standard-phases 'check) args))))))) (propagated-inputs (list go-github-com-kr-pretty)) (home-page "https://gopkg.in/check.v1") -- cgit 1.4.1 From 23e03dd087240a8dc39a2568f1b2576ed9bfba67 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 24 Aug 2022 22:24:18 +0300 Subject: gnu: go-github-com-stretchr-objx: Update to 0.4.0. * gnu/packages/golang.scm (go-github-com-stretchr-objx): Update to 0.4.0. --- gnu/packages/golang.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index ed31d330de..8b343890aa 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3009,7 +3009,7 @@ Go.") (define-public go-github-com-stretchr-objx (package (name "go-github-com-stretchr-objx") - (version "0.2.0") + (version "0.4.0") (source (origin (method git-fetch) @@ -3019,7 +3019,7 @@ Go.") (file-name (git-file-name name version)) (sha256 (base32 - "0pcdvakxgddaiwcdj73ra4da05a3q4cgwbpm2w75ycq4kzv8ij8k")) + "0dygds32qxx6x1x2mmn7msyjr15qi5r70pyzv8dz8cprxq32nzc1")) (modules '((guix build utils))) (snippet '(begin -- cgit 1.4.1 From 1d49fd4fab2396fc92bf9930875947ce79a27610 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 24 Aug 2022 22:24:59 +0300 Subject: gnu: go-github-com-stretchr-objx: Skip tests with gccgo. * gnu/packages/golang.scm (go-github-com-stretchr-objx)[arguments]: Don't run the test suite when building with gccgo. --- gnu/packages/golang.scm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 8b343890aa..537722f164 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3026,7 +3026,16 @@ Go.") (delete-file-recursively "vendor"))))) (build-system go-build-system) (arguments - '(#:import-path "github.com/stretchr/objx")) + (list + #:import-path "github.com/stretchr/objx" + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key inputs #:allow-other-keys #:rest args) + (unless + ;; The tests fail when run with gccgo. + (false-if-exception (search-input-file inputs "/bin/gccgo")) + (apply (assoc-ref %standard-phases 'check) args))))))) (propagated-inputs (list go-github-com-davecgh-go-spew go-github-com-pmezard-go-difflib)) -- cgit 1.4.1 From 87720306307dc4297435d45c43c9b326907b1415 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 24 Aug 2022 22:48:45 +0300 Subject: gnu: go-github-com-sirupsen-logrus: Update to 1.9.0. * gnu/packages/golang.scm (go-github-com-sirupsen-logrus): Update to 1.9.0. --- gnu/packages/golang.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 537722f164..45f1150fb7 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3800,7 +3800,7 @@ application's http.Handlers.") (define-public go-github-com-sirupsen-logrus (package (name "go-github-com-sirupsen-logrus") - (version "1.8.1") + (version "1.9.0") (source (origin (method git-fetch) @@ -3810,7 +3810,7 @@ application's http.Handlers.") (file-name (git-file-name name version)) (sha256 (base32 - "0rvqzic2zz7fpxyizmqxwmhv1m52ii9bgxnqa6km8wsa0l08wh42")))) + "12i402dxq5js4npnncg043vx874h6nk4ffn4gswcccxrp6h10ivz")))) (build-system go-build-system) (propagated-inputs (list go-github-com-davecgh-go-spew go-github-com-pmezard-go-difflib -- cgit 1.4.1 From c15692b938e04ad253d9bbfe127e8fd3deb85b6f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 24 Aug 2022 22:49:25 +0300 Subject: gnu: go-github-com-sirupsen-logrus: Skip tests with gccgo. * gnu/packages/golang.scm (go-github-com-sirupsen-logrus)[arguments]: Don't run the test suite when building with gccgo. --- gnu/packages/golang.scm | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 45f1150fb7..f31fb4105d 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3812,12 +3812,21 @@ application's http.Handlers.") (base32 "12i402dxq5js4npnncg043vx874h6nk4ffn4gswcccxrp6h10ivz")))) (build-system go-build-system) + (arguments + (list + #:import-path "github.com/sirupsen/logrus" + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key inputs #:allow-other-keys #:rest args) + (unless + ;; The tests fail when run with gccgo. + (false-if-exception (search-input-file inputs "/bin/gccgo")) + (apply (assoc-ref %standard-phases 'check) args))))))) (propagated-inputs (list go-github-com-davecgh-go-spew go-github-com-pmezard-go-difflib go-github-com-stretchr-testify go-golang-org-x-crypto go-golang-org-x-sys)) - (arguments - '(#:import-path "github.com/sirupsen/logrus")) (home-page "https://github.com/sirupsen/logrus") (synopsis "Structured, pluggable logging for Go") (description "Logrus is a structured logger for Go, completely API -- cgit 1.4.1 From e5fca82414c6f21322e897dd41d26d0aced98dd6 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 24 Aug 2022 23:11:03 +0300 Subject: gnu: go-github-com-valyala-fasthttp: Update to 1.39.0. * gnu/packages/golang.scm (go-github-com-valyala-fasthttp): Update to 1.39.0. --- gnu/packages/golang.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index f31fb4105d..416208707e 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -9138,7 +9138,7 @@ anti-fragmentation protection.") (define-public go-github-com-valyala-fasthttp (package (name "go-github-com-valyala-fasthttp") - (version "1.31.0") + (version "1.39.0") (source (origin (method git-fetch) @@ -9147,7 +9147,7 @@ anti-fragmentation protection.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0ra0n2shcp11736xv37cjnsqn32gvqfm3dkf9v8j98xmch2wqxqg")))) + (base32 "12qwx0yk7wjj25v4fswgmj28r69gk94kqdmzavca8k9f0yznniz1")))) (build-system go-build-system) (arguments '(#:import-path "github.com/valyala/fasthttp")) -- cgit 1.4.1 From 932edeb3a0f91571551c16e6fb7b75dd092d3902 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 24 Aug 2022 23:16:56 +0300 Subject: gnu: go-github-com-valyala-fasthttp: Skip tests with gccgo. * gnu/packages/golang.scm (go-github-com-valyala-fasthttp)[arguments]: Don't run the test suite when building with gccgo. --- gnu/packages/golang.scm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 416208707e..383d4d1618 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -9150,7 +9150,16 @@ anti-fragmentation protection.") (base32 "12qwx0yk7wjj25v4fswgmj28r69gk94kqdmzavca8k9f0yznniz1")))) (build-system go-build-system) (arguments - '(#:import-path "github.com/valyala/fasthttp")) + (list + #:import-path "github.com/valyala/fasthttp" + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key inputs #:allow-other-keys #:rest args) + (unless + ;; Tests hang forever with gccgo. + (false-if-exception (search-input-file inputs "/bin/gccgo")) + (apply (assoc-ref %standard-phases 'check) args))))))) (propagated-inputs (list go-golang-org-x-sys go-golang-org-x-net -- cgit 1.4.1 From b94a82dcf2bf2a44f5a03acc9f39489059b1a230 Mon Sep 17 00:00:00 2001 From: jgart Date: Thu, 21 Jul 2022 20:58:23 -0500 Subject: gnu: emacs-better-defaults: Update source url. * gnu/packages/emacs-xyz.scm (emacs-better-defaults): Update source url. [url]: Update url. [home-page]: Update url. Also fixes the 404 on this page: https://guix.gnu.org/packages/emacs-better-defaults-0.1.3/ Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 7052fcb246..b17d6c3423 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -10503,14 +10503,14 @@ as Fuseki or DBPedia.") (origin (method git-fetch) (uri (git-reference - (url "https://github.com/technomancy/better-defaults") + (url "https://git.sr.ht/~technomancy/better-defaults") (commit version))) (file-name (git-file-name name version)) (sha256 (base32 "1rxznx2l0cdpiz8mad8s6q17m1fngpgb1cki7ch6yh18r3qz8ysr")))) (build-system emacs-build-system) - (home-page "https://github.com/technomancy/better-defaults") + (home-page "https://git.sr.ht/~technomancy/better-defaults") (synopsis "Better defaults for Emacs") (description "Better defaults attempts to address the most obvious deficiencies of the -- cgit 1.4.1 From e92c483be8ede1b4ff78743b52bb3ef80d6c3e20 Mon Sep 17 00:00:00 2001 From: jgart Date: Tue, 26 Jul 2022 18:44:11 -0500 Subject: gnu: Add emacs-consult-lsp. * gnu/packages/emacs-xyz.scm (emacs-consult-lsp): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index b17d6c3423..f01af98c7c 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -31980,6 +31980,29 @@ scrolling, and they even don't go away when switching buffer, but you can bind a popon to a specific buffer to only show on that buffer.") (license license:gpl3+)))) +(define-public emacs-consult-lsp + (package + (name "emacs-consult-lsp") + (version "1.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/gagbo/consult-lsp") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "14dyclspkf1a34nvjj800ckz1phsizq07ps8k4x0ah6ik0hfhy1w")))) + (build-system emacs-build-system) + (propagated-inputs (list emacs-consult emacs-lsp-mode emacs-f)) + (home-page "https://github.com/gagbo/consult-lsp/") + (synopsis "LSP-mode and consult helping each other") + (description +"@code{emacs-consult-lsp} provides helpers for interactively selecting LSP +workspace diagnostics, symbols, and file symbols from @{emacs-lsp-mode} +by leveraging @code{emacs-consult} APIs.") + (license license:expat))) + (define-public emacs-bitbake-modes (package (name "emacs-bitbake-modes") -- cgit 1.4.1 From 57fad8f60cdfd968481eec35dcf24194d4a59b69 Mon Sep 17 00:00:00 2001 From: Nicolas Graves Date: Tue, 2 Aug 2022 14:00:33 +0200 Subject: gnu: Add emacs-consult-bibtex. * gnu/packages/emacs-xyz.scm (emacs-consult-bibtex): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index f01af98c7c..fd2351b9fb 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -9086,6 +9086,28 @@ Emacs completion function completing-read, which allows quickly selecting from a list of candidates.") (license license:gpl3+))) +(define-public emacs-consult-bibtex + ;; XXX: Upstream contains a single commit, which matches the version below. + (let ((commit "2f870d6eefb54a53216d90a82cff0ff97ba54725")) + (package + (name "emacs-consult-bibtex") + (version "0.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mohkale/consult-bibtex") + (commit commit))) + (sha256 + (base32 + "0jxjvpg3j8zk77sfhyy27fd1zbj2zz7xayavan3hhj4853q92kwq")))) + (build-system emacs-build-system) + (inputs (list emacs-consult emacs-embark emacs-org-roam-bibtex)) + (home-page "https://github.com/mohkale/consult-bibtex") + (synopsis "Consulting-read interface for BibTeX completion") + (description "This package provides a read interface for BibTeX +completion using Consult.") + (license license:gpl3)))) + (define-public emacs-consult-dir (package (name "emacs-consult-dir") -- cgit 1.4.1 From 59d52f6d434ed9e68e31c03d246609307f20dec5 Mon Sep 17 00:00:00 2001 From: Nicolas Graves Date: Tue, 2 Aug 2022 14:55:02 +0200 Subject: gnu: Add emacs-consult-yasnippet. * gnu/packages/emacs-xyz.scm (emacs-consult-yasnippet): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index fd2351b9fb..f5870c9efa 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -9177,6 +9177,31 @@ provides a front-end interface for the workspace/symbols LSP procedure call.") (license license:gpl3+))) +(define-public emacs-consult-yasnippet + (let ((commit "ae0450889484f23dc4ec37518852a2c61b89f184") + (revision "0")) + (package + (name "emacs-consult-yasnippet") + (version (git-version "0.2" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mohkale/consult-yasnippet") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "13hmmsnmh32vafws61sckzzy354rq0nslqpyzhw97iwvn0fpsa35")))) + (build-system emacs-build-system) + (propagated-inputs (list emacs-consult emacs-yasnippet)) + (home-page "https://github.com/mohkale/consult-yasnippet") + (synopsis "Consulting-read interface for Yasnippet") + (description + "This package allows you to expand Yasnippet' snippets through +a completing-read interface. It supports previewing the current snippet +expansion and overwriting the marked region with a new snippet completion.") + (license license:gpl3+)))) + (define-public emacs-marginalia (package (name "emacs-marginalia") -- cgit 1.4.1 From 05f2938f04414ba57909f1cdb8b6eadcf9ac4cd6 Mon Sep 17 00:00:00 2001 From: Nicolas Graves Date: Tue, 2 Aug 2022 22:03:22 +0200 Subject: gnu: Add emacs-super-save. * gnu/packages/emacs-xyz.scm (emacs-super-save): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index f5870c9efa..5d90b78208 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -28064,6 +28064,29 @@ It can also be useful on Unix-like platforms to delay having to enter your passphrase until the first time you push to a remote.") (license license:gpl3+))) +(define-public emacs-super-save + (package + (name "emacs-super-save") + (version "0.3.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/bbatsov/super-save") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "066fyg4r4pksyandpd7s53hagpvm2rw90q5ks4jlpgy7x00hw09l")))) + (build-system emacs-build-system) + (home-page "https://github.com/bbatsov/super-save") + (synopsis "Auto-save buffers, based on your activity") + (description "Super-save auto-saves your buffers, when certain events +happen, e.g., when you switch between buffers or when an Emacs frame loses +focus. You can think of it as both something that augments and replaces the +standard Auto-save mode.") + (license license:gpl3+))) + (define-public emacs-tao-theme (let ((commit "468ee4f6ba7afb9dbfc8855ae2c333cb16ca4408") (revision "1")) -- cgit 1.4.1 From 80baa8f87aa69151dffe04fb432a37c91d4dd242 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 25 Aug 2022 12:28:42 +0200 Subject: gnu: emacs-consult-bibtex: Fix license. * gnu/packages/emacs-xyz.scm (emacs-consult-bibtex)[license]: Use GPL3+. --- gnu/packages/emacs-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 5d90b78208..b7460eb085 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -9106,7 +9106,7 @@ list of candidates.") (synopsis "Consulting-read interface for BibTeX completion") (description "This package provides a read interface for BibTeX completion using Consult.") - (license license:gpl3)))) + (license license:gpl3+)))) (define-public emacs-consult-dir (package -- cgit 1.4.1 From 6f678b847a9cccfa2e028c6f1d3286a8b8f23350 Mon Sep 17 00:00:00 2001 From: Morgan Smith Date: Wed, 3 Aug 2022 20:37:42 -0400 Subject: gnu: Add emacs-buffer-env. * gnu/packages/emacs-xyz.scm (emacs-buffer-env): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index b7460eb085..96635957db 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -29557,6 +29557,27 @@ text, such a marking style might be used to show externally included text or example code.") (license license:gpl3+))) +(define-public emacs-buffer-env + (package + (name "emacs-buffer-env") + (version "0.4") + (source (origin + (method url-fetch) + (uri (string-append "https://elpa.gnu.org/packages/buffer-env-" + version ".tar")) + (sha256 + (base32 + "0y8ik87dqldhn6q631zp2ln9z5byqgm9icrvr4xrdx6g8mr9c56z")))) + (build-system emacs-build-system) + (propagated-inputs (list emacs-compat)) + (home-page "https://github.com/astoff/buffer-env") + (synopsis "Create buffer-local process environments") + (description "This package creates buffer-local environments using scripts +similar to Direnv. This allows Emacs to call the correct version of external +programs such as linters, compilers, and language servers on a per-project +basis.") + (license license:gpl3+))) + (define-public emacs-buffer-move (package (name "emacs-buffer-move") -- cgit 1.4.1 From 9593cf511e4ca12e0880fbcddc9b7ce3b5139598 Mon Sep 17 00:00:00 2001 From: jgart Date: Sat, 6 Aug 2022 21:47:58 -0500 Subject: gnu: emacs-logos: Update to 0.4.0. * gnu/packages/emacs-xyz.scm (emacs-logos): Update to 0.4.0. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 96635957db..aeb921d82c 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -13668,7 +13668,7 @@ you to deal with multiple log levels.") (define-public emacs-logos (package (name "emacs-logos") - (version "0.3.1") + (version "0.4.0") (source (origin (method git-fetch) (uri (git-reference @@ -13677,7 +13677,7 @@ you to deal with multiple log levels.") (file-name (git-file-name name version)) (sha256 (base32 - "1xhnhaxmjqdv0bbh22gj9ak83hha8d59q64b6aa4rynrgcyajk45")))) + "1f40h8kbmza2rgmz84rgwbb4bwqkbfxnc3sc7gqshvxdkz3flbb7")))) (native-inputs (list texinfo)) (build-system emacs-build-system) (arguments -- cgit 1.4.1 From f677f8b6dbea1e7d995d8f7f660c82ec19624db2 Mon Sep 17 00:00:00 2001 From: Pierre-Henry Fröhring Date: Sun, 7 Aug 2022 13:43:18 +0200 Subject: gnu: Add emacs-vertico-posframe. * gnu/packages/emacs-xyz.scm (emacs-vertico-posframe): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index aeb921d82c..f0163fe2f1 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -32136,3 +32136,27 @@ projects.") tree to go back to previous buffer states. To use vundo, type @kbd{M-x vundo RET} in the buffer you want to undo. An undo tree buffer should pop up.") (license license:gpl3+))) + +(define-public emacs-vertico-posframe + (package + (name "emacs-vertico-posframe") + (version "0.5.4") + (source (origin + (method url-fetch) + (uri (string-append + "https://elpa.gnu.org/packages/vertico-posframe-" version + ".tar")) + (sha256 + (base32 + "19lx6p06wkwfivxgswdljdsh9bgcd1b9zkzx426w3pwicdk0cvgg")))) + (build-system emacs-build-system) + (propagated-inputs (list emacs-posframe emacs-vertico)) + (home-page "https://github.com/tumashu/vertico-posframe") + (synopsis "Pop up a frame at point to show vertical completion UI") + (description + "Vertico is an Emacs package that provides a vertical completion UI based +on the default completion system. Posframe is an Emacs package that provides +a way to pop up a frame at point. Vertico-posframe is an Emacs package and +a Vertico extension which provides a way to pop up a frame at point to show +a vertical completion UI.") + (license license:gpl3+))) -- cgit 1.4.1 From ce38e65f3d975d0a4613a40cc110f3398bae7966 Mon Sep 17 00:00:00 2001 From: jgart Date: Mon, 8 Aug 2022 18:44:48 -0500 Subject: gnu: Add emacs-vlf. * gnu/packages/emacs-xyz.scm (emacs-vlf): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index f0163fe2f1..85252c81b0 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -642,6 +642,25 @@ outlines, manage all your contacts, your windows and frames, and search across buffers, directory trees, or the web.") (license license:gpl3+))) +(define-public emacs-vlf + (package + (name "emacs-vlf") + (version "1.7.2") + (source + (origin + (method url-fetch) + (uri (string-append "https://elpa.gnu.org/packages/" + "vlf-" version ".tar")) + (sha256 + (base32 "0hpri19z6b7dqmrj5ckp8sf0m0l72lkgahqzvfmwhgpgv2p81bny")))) + (build-system emacs-build-system) + (home-page "https://github.com/m00natic/vlfi/") + (synopsis "View large files in Emacs") + (description +"Vlf is an Emacs minor mode that allows viewing, editing, searching and +comparing large files in batches.") + (license license:gpl2+))) + (define-public emacs-hg-histedit ;; From 2021-03-02. ;; No releases available. -- cgit 1.4.1 From 72aba543b92c8e1a7a190f8383ea4e0ba14e9615 Mon Sep 17 00:00:00 2001 From: jgart Date: Tue, 9 Aug 2022 19:30:33 -0500 Subject: gnu: emacs-pulsar: Update to 0.4.0. * gnu/packages/emacs-xyz.scm (emacs-pulsar): Update to 0.4.0. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 85252c81b0..33ae95ac6f 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -19454,7 +19454,7 @@ navigate and display hierarchy structures.") (define-public emacs-pulsar (package (name "emacs-pulsar") - (version "0.3.0") + (version "0.4.0") (source (origin (method git-fetch) (uri (git-reference @@ -19463,7 +19463,7 @@ navigate and display hierarchy structures.") (file-name (git-file-name name version)) (sha256 (base32 - "09s1r9zqc28g75jjxajdm34ni4m7gynh0xsffy5d60c50igiqa94")))) + "05ig8p3y5k20w4xy0ahaml9z0i0xyw6fkypzvz0mjpldhxl7dbxd")))) (native-inputs (list texinfo)) (build-system emacs-build-system) (arguments -- cgit 1.4.1 From b29742124e4d5b2c6b423b891c6c430186f10535 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 25 Aug 2022 18:36:05 +0300 Subject: gnu: go-github-com-cespare-xxhash: Skip tests with gccgo. * gnu/packages/syncthing.scm (go-github-com-cespare-xxhash)[arguments]: Don't run the test suite when building with gccgo. --- gnu/packages/syncthing.scm | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index 717a953f2f..41dd388da9 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2016 Petter ;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Leo Famulari ;;; Copyright © 2020 Tobias Geerinckx-Rice -;;; Copyright © 2020, 2021 Efraim Flashner +;;; Copyright © 2020-2022 Efraim Flashner ;;; Copyright © 2020 Giacomo Leidi ;;; Copyright © 2021 Maxim Cournoyer ;;; Copyright © 2021 Arun Isaac @@ -27,6 +27,7 @@ #:use-module (guix build-system go) #:use-module (guix build-system python) #:use-module (guix build-system trivial) + #:use-module (guix gexp) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) @@ -1123,7 +1124,16 @@ and RFC 5389).") "12ad3z7ki9j07c4kx3ywkl6188i2afsjg7sl60wd21p6zkkpfjxq")))) (build-system go-build-system) (arguments - '(#:import-path "github.com/cespare/xxhash")) + (list + #:import-path "github.com/cespare/xxhash" + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key inputs #:allow-other-keys #:rest args) + (unless + ;; The tests fail when run with gccgo. + (false-if-exception (search-input-file inputs "/bin/gccgo")) + (apply (assoc-ref %standard-phases 'check) args))))))) (synopsis "Go implementation of xxHash") (description "This package provides of Go implementation of the 64-bit xxHash algorithm (XXH64).") -- cgit 1.4.1 From 71f51e8c608dbb94465d0468411ee273394bb4ee Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 25 Aug 2022 18:37:35 +0300 Subject: gnu: go-github-com-cespare-xxhash: Update to 2.1.2. * gnu/packages/syncthing.scm (go-github-com-cespare-xxhash): Update to 2.1.2. --- gnu/packages/syncthing.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index 41dd388da9..15ce6a8e29 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -1112,7 +1112,7 @@ and RFC 5389).") (define-public go-github-com-cespare-xxhash (package (name "go-github-com-cespare-xxhash") - (version "2.1.0") + (version "2.1.2") (source (origin (method git-fetch) (uri (git-reference @@ -1121,7 +1121,7 @@ and RFC 5389).") (file-name (git-file-name name version)) (sha256 (base32 - "12ad3z7ki9j07c4kx3ywkl6188i2afsjg7sl60wd21p6zkkpfjxq")))) + "1f3wyr9msnnz94szrkmnfps9wm40s5sp9i4ak0kl92zcrkmpy29a")))) (build-system go-build-system) (arguments (list -- cgit 1.4.1 From 26ff8a4b733c06b4f38aa1fb1ec6705bf30eae4a Mon Sep 17 00:00:00 2001 From: jgart Date: Thu, 25 Aug 2022 08:48:03 -0500 Subject: gnu: Add emacs-pdb-capf. * gnu/packages/emacs-xyz.scm (emacs-pdb-capf): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 33ae95ac6f..5811e89664 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -32113,6 +32113,30 @@ workspace diagnostics, symbols, and file symbols from @{emacs-lsp-mode} by leveraging @code{emacs-consult} APIs.") (license license:expat))) +(define-public emacs-pdb-capf + (let ((commit "31602ccab53aa7dcf26a1af222c7da2bcc1390ed") + (revision "0")) + (package + (name "emacs-pdb-capf") + (version (git-version "1.0" revision commit)) + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/muffinmad/emacs-pdb-capf") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0x2pg03csf25vj8y2zb5sv493dk3n0s4xbkihii2mzhkx82vgpxg")))) + (build-system emacs-build-system) + (home-page "https://github.com/muffinmad/emacs-pdb-capf") + (synopsis "Completion-at-point function for pdb") + (description +"@code{emacs-pdb-capf} provides a @code{completion-at-point} function +for pdb allowing completion in a @code{*gud-pdb*} buffer.") + (license license:gpl3+)))) + (define-public emacs-bitbake-modes (package (name "emacs-bitbake-modes") -- cgit 1.4.1 From 7cdea58a8dbef60c9234e53beab77abd16f497bf Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 25 Aug 2022 20:45:08 -0400 Subject: gnu: linux-libre 5.15: Update to 5.15.63. * gnu/packages/linux.scm (linux-libre-5.15-version): Update to 5.15.63. (linux-libre-5.15-pristine-source, deblob-scripts-5.15): Update hashes. --- gnu/packages/linux.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index a7d92816a8..24fffb6fa1 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -371,17 +371,17 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The "longterm" kernels — the older releases with long-term upstream support. ;; Here are the support timelines: ;; -(define-public linux-libre-5.15-version "5.15.62") +(define-public linux-libre-5.15-version "5.15.63") (define-public linux-libre-5.15-gnu-revision "gnu") (define deblob-scripts-5.15 (linux-libre-deblob-scripts linux-libre-5.15-version linux-libre-5.15-gnu-revision (base32 "1n57mz5agvf1d0ggbg080d7hvx8p9y0iqxkq4ypg10a7n96zy7y5") - (base32 "1qzmy0v040zj542zgs2569bpc7r1b77bf5gq1b3r5kffwpx900v3"))) + (base32 "1r189c704jvizk452zcsm9v3g27ybjcjchjwxazsy3nx0wdwx7si"))) (define-public linux-libre-5.15-pristine-source (let ((version linux-libre-5.15-version) - (hash (base32 "0hgiag3mvdlcr6ckfy4bdr7h4471zqi53ahfybdvdkapivg7r086"))) + (hash (base32 "0hbkxgadz0vcslni4r46yc202wcnxblcfvkcph1017b2b8gcvlvd"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.15))) -- cgit 1.4.1 From 3550a153d9afae4d9308ad596528c87691c9e5a7 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 25 Aug 2022 20:46:00 -0400 Subject: gnu: linux-libre 5.10: Update to 5.10.183. * gnu/packages/linux.scm (linux-libre-5.10-version): Update to 5.10.183. (linux-libre-5.10-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 24fffb6fa1..bc276e33ef 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -386,7 +386,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.15))) -(define-public linux-libre-5.10-version "5.10.137") +(define-public linux-libre-5.10-version "5.10.138") (define-public linux-libre-5.10-gnu-revision "gnu1") (define deblob-scripts-5.10 (linux-libre-deblob-scripts @@ -396,7 +396,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1981axxswghza3iadp94q54y8w30h9w9vyq4cbjiiv9alvbv0pb8"))) (define-public linux-libre-5.10-pristine-source (let ((version linux-libre-5.10-version) - (hash (base32 "1j0n2r793pkvymjc70fzqwqi6h2j1wkja2kx012ydmsk2i6wssy1"))) + (hash (base32 "1a2vmcqzi71w88j79lxsrgyycq1l1gxp0cvh5ya4afhfisxh7819"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.10))) -- cgit 1.4.1 From ea3752028f62e4afd1cb59663ad96ab100e5ef0f Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 25 Aug 2022 20:46:40 -0400 Subject: gnu: linux-libre 5.4: Update to 5.4.211. * gnu/packages/linux.scm (linux-libre-5.4-version): Update to 5.4.211. (linux-libre-5.4-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index bc276e33ef..9d678cd3f7 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -401,7 +401,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.10))) -(define-public linux-libre-5.4-version "5.4.210") +(define-public linux-libre-5.4-version "5.4.211") (define-public linux-libre-5.4-gnu-revision "gnu1") (define deblob-scripts-5.4 (linux-libre-deblob-scripts @@ -411,7 +411,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1vnjbdyssa7dwyjl9kg35alwvf7yh597cl74yr1wy2gk5bc9paw6"))) (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "13l8zh5balciqhi4k4328sznza30v8g871wxcqqka61cij3rc0wl"))) + (hash (base32 "1v1dgsk66fi6x6v9k6hg9ik3f3b3pv7a3gk8mybmgm9cnx0k5d5z"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) -- cgit 1.4.1 From 3d8b3b58cae5918ad7ddc52ecdcc0b140dafd718 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 25 Aug 2022 20:47:03 -0400 Subject: gnu: linux-libre 4.19: Update to 4.19.256. * gnu/packages/linux.scm (linux-libre-4.19-version): Update to 4.19.256. (linux-libre-4.19-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 9d678cd3f7..e3841f9bd3 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -416,7 +416,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.4))) -(define-public linux-libre-4.19-version "4.19.255") +(define-public linux-libre-4.19-version "4.19.256") (define-public linux-libre-4.19-gnu-revision "gnu1") (define deblob-scripts-4.19 (linux-libre-deblob-scripts @@ -426,7 +426,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "00i91lx938nqlgy63hiricqd0fnbbf26vgya9c5lb7m1f4x324im"))) (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "0hwa3g09cmllc2z01s2jqbczpznzdp3ldngx18k5c2ac7w394fbp"))) + (hash (base32 "0jgm7ydha9achbcq3a6q85wq1nz4qg7phx122jzk0mqb1339bpk7"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -- cgit 1.4.1 From aed61ada1c38784761f1efcb4663d1573444f4de Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 25 Aug 2022 20:47:22 -0400 Subject: gnu: linux-libre 4.14: Update to 4.14.291. * gnu/packages/linux.scm (linux-libre-4.14-version): Update to 4.14.291. (linux-libre-4.14-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index e3841f9bd3..4c14ae3e56 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -431,7 +431,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.19))) -(define-public linux-libre-4.14-version "4.14.290") +(define-public linux-libre-4.14-version "4.14.291") (define-public linux-libre-4.14-gnu-revision "gnu1") (define deblob-scripts-4.14 (linux-libre-deblob-scripts @@ -441,7 +441,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "00i91lx938nqlgy63hiricqd0fnbbf26vgya9c5lb7m1f4x324im"))) (define-public linux-libre-4.14-pristine-source (let ((version linux-libre-4.14-version) - (hash (base32 "0zyxb99a7fa2l85vnzmvg2nry99clj20d4j38piqm921iqxak2j4"))) + (hash (base32 "15h76l81zn733g8dc6gsymf52nz325plhminv3m4x3klwhav34zc"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.14))) -- cgit 1.4.1 From e106b27c4b0b43631790257b7073e8d1c2cdfcc8 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 25 Aug 2022 20:47:44 -0400 Subject: gnu: linux-libre 4.9: Update to 4.9.236. * gnu/packages/linux.scm (linux-libre-4.9-version): Update to 4.9.236. (linux-libre-4.9-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 4c14ae3e56..d8f1f6912e 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -446,7 +446,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.14))) -(define-public linux-libre-4.9-version "4.9.325") +(define-public linux-libre-4.9-version "4.9.326") (define-public linux-libre-4.9-gnu-revision "gnu1") (define deblob-scripts-4.9 (linux-libre-deblob-scripts @@ -456,7 +456,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0bib3641dbcqdkx3anna3caxnsg3nw9cnmhcklq0s93g3m57041h"))) (define-public linux-libre-4.9-pristine-source (let ((version linux-libre-4.9-version) - (hash (base32 "04msx0x0d8v93zjr3jj0qqkgg7m4hb7rj6hk5vzrzasmgbjmb3dl"))) + (hash (base32 "0yw83a8nk5abjsvqrz8m2sj699c228j2f2wr5q8m95vgqzfw5wrb"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.9))) -- cgit 1.4.1 From 4ff0ceb26462d27281eed5cf789ca4158f94409a Mon Sep 17 00:00:00 2001 From: Andrew Tropin Date: Fri, 26 Aug 2022 08:22:25 +0300 Subject: gnu: obs: Update to 27.2.4. * gnu/packages/video.scm (obs): Update to 27.2.4. [arguments]: Migrate from TRUE/FALSE to ON/OFF. [inputs]: Add picuitls and libxkbcommon for successful build of new version, bash-minimal for satisfying guix lint, and luajit, python for scripting support. [native-inputs]: Add swig for scripting support. --- gnu/packages/video.scm | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 2ea575629f..556eb46df4 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -163,6 +163,7 @@ #:use-module (gnu packages networking) #:use-module (gnu packages ocr) #:use-module (gnu packages pcre) + #:use-module (gnu packages pciutils) #:use-module (gnu packages perl) #:use-module (gnu packages perl-check) #:use-module (gnu packages perl-web) @@ -3320,7 +3321,7 @@ be used for realtime video capture via Linux-specific APIs.") (define-public obs (package (name "obs") - (version "27.1.3") + (version "27.2.4") (source (origin (method git-fetch) (uri (git-reference @@ -3330,7 +3331,7 @@ be used for realtime video capture via Linux-specific APIs.") (file-name (git-file-name name version)) (sha256 (base32 - "1ndiarr3d6qihymaigf34jjml0lrgbj640fnpnffz2ysj7276q0j")) + "13bfzjqmvabli99yr1h0306w5lx72mbl5sxrnr46hjig1a6rw91s")) (patches (search-patches "obs-modules-location.patch")))) (build-system cmake-build-system) @@ -3338,10 +3339,10 @@ be used for realtime video capture via Linux-specific APIs.") (list #:configure-flags #~(list (string-append "-DOBS_VERSION_OVERRIDE=" #$version) - "-DENABLE_UNIT_TESTS=TRUE" + "-DENABLE_UNIT_TESTS=ON" ;; Browser plugin requires cef, but it is not packaged yet. ;; - "-DBUILD_BROWSER=FALSE") + "-DBUILD_BROWSER=OFF") #:phases #~(modify-phases %standard-phases (add-after 'install 'wrap-executable @@ -3359,10 +3360,11 @@ be used for realtime video capture via Linux-specific APIs.") (separator #f) ;single entry (files '("share/obs/obs-plugins"))))) (native-inputs - (list cmocka pkg-config)) + (list cmocka pkg-config swig)) (inputs (list alsa-lib + bash-minimal curl eudev ffmpeg @@ -3373,10 +3375,14 @@ be used for realtime video capture via Linux-specific APIs.") jansson libx264 libxcomposite + libxkbcommon + luajit mbedtls-apache mesa + pciutils pipewire-0.3 pulseaudio + python qtbase-5 qtsvg-5 qtx11extras -- cgit 1.4.1 From c82a99c9e2d613d5485f4d01b2a3ea5fd9f15e9b Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 26 Aug 2022 10:03:33 +0200 Subject: gnu: emacs-autothemer: Update to 0.2.9. * gnu/packages/emacs-xyz.scm (emacs-autothemer): Update to 0.2.9. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 5811e89664..675098e963 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -2980,7 +2980,7 @@ or XEmacs.") (define-public emacs-autothemer (package (name "emacs-autothemer") - (version "0.2.6") + (version "0.2.9") (source (origin (method git-fetch) @@ -2990,7 +2990,7 @@ or XEmacs.") (file-name (git-file-name name version)) (sha256 (base32 - "1zrm09lzl5s3l0rnzihj9azj1n1l214r6lrmp9yqj7sm7y1xjf0c")))) + "1p7ii7f0w607zxyqnr8ivi0n0sg2p93pi6dpd9kjqywdagqyrnw1")))) (build-system emacs-build-system) (propagated-inputs (list emacs-dash)) -- cgit 1.4.1 From bb4bdd8538f4cbe8f1312536be8bd4639697296a Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 26 Aug 2022 10:05:13 +0200 Subject: gnu: emacs-eldev: Update to 1.2.1. * gnu/packages/emacs-xyz.scm (emacs-eldev): Update to 1.2.1. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 675098e963..f7bd94d967 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -18764,7 +18764,7 @@ according to a parsing expression grammar.") (define-public emacs-eldev (package (name "emacs-eldev") - (version "1.2") + (version "1.2.1") (source (origin (method git-fetch) @@ -18773,7 +18773,7 @@ according to a parsing expression grammar.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1dmi05ry62nszy9w6zyvzh2q5ii57vdyc7mwv3dyfhwx4hqbngs4")))) + (base32 "1zf3vrk9yw4f4fj31g3vphjd3rhr2hv3q2crkdsgi7z5xlb8frds")))) (build-system emacs-build-system) (arguments (list -- cgit 1.4.1 From ec0865f2eed22e2163f4bb3523f24b87d209c184 Mon Sep 17 00:00:00 2001 From: Zzull Date: Tue, 9 Aug 2022 20:51:23 +0200 Subject: gnu: Add emacs-blight. * gnu/packages/emacs-xyz.scm (emacs-blight): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index f7bd94d967..c80fc2715a 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -49,7 +49,7 @@ ;;; Copyright © 2019, 2020, 2021 Joseph LaFreniere ;;; Copyright © 2019 Todor Kondić 15669 ;;; Copyright © 2019 Amar Singh -;;; Copyright © 2019 Baptiste Strazzulla +;;; Copyright © 2019, 2022 Baptiste Strazzulla ;;; Copyright © 2019 Giacomo Leidi ;;; Copyright © 2019 Jens Mølgaard ;;; Copyright © 2019, 2020 Amin Bandali @@ -4319,6 +4319,34 @@ which is restored where possible when the file is loaded again.") strings.") (license license:gpl3+))) +(define-public emacs-blight + (let ((commit "6bf9c6192d2bf979eebbfae1963401ef3ff4ef5d") + (revision "0")) + (package + (name "emacs-blight") + (version (git-version "0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://codeberg.org/emacs-weirdware/blight") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1x7s1fcva5kkl9iyb5grd6crf38rrz3zb0c6wb85khi9far10vgq")))) + (build-system emacs-build-system) + (home-page "https://codeberg.org/emacs-weirdware/blight") + (synopsis "Control display brightness") + (description + "Blight allows you to control display brightness from Emacs. It +features object-oriented code using EIEIO, a base class implementing +a reasonable API which focuses on the @emph{set the back light to this +percentage} functionality, it includes a concrete implementation that uses +SysFS to control brightness. Other systems (D-Bus, xbacklight, XELB using +XRandR) are easily supportable, giving the same experience across +environments.") + (license license:gpl3+)))) + (define-public emacs-symon (package (name "emacs-symon") -- cgit 1.4.1 From fd8f5f7ebcf132e4307debf7ffb7417aff02be06 Mon Sep 17 00:00:00 2001 From: Zzull Date: Tue, 9 Aug 2022 20:52:19 +0200 Subject: gnu: Add emacs-lemon. * gnu/packages/emacs-xyz.scm (emacs-lemon): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index c80fc2715a..01bce02b02 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -4367,6 +4367,35 @@ environments.") "Tiny graphical system monitor for the Emacs minibuffer when idle.") (license license:gpl2+))) +(define-public emacs-lemon + (let ((commit "37a6e6d6ef0900ca19c820a2dbc122c7fe6d86cf") + (revision "0")) + (package + (name "emacs-lemon") + (version (git-version "2.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://codeberg.org/emacs-weirdware/lemon") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0bc77vzi4p6mlzmhgybbldlpcsiiv4xqrd5lnc7wzvmxv8byhqpm")))) + (build-system emacs-build-system) + (native-inputs + (list emacs-blight emacs-emms)) + (propagated-inputs + (list emacs-s)) + (home-page "https://codeberg.org/emacs-weirdware/lemon") + (synopsis "System monitors in the echo area") + (description + "Lemon is a tiny system monitor which displays system information in +the echo area when Emacs is has been idle for a few seconds. This is a fork +of zk_phi’s Symon, which has been largely rewritten. It works nicely with +EXWM.") + (license license:gpl3+)))) + (define-public emacs-sx (let ((version "20191229") (revision "0") -- cgit 1.4.1 From f4fc71284e2a0c678fe16b076a03f303d240c60d Mon Sep 17 00:00:00 2001 From: jgart Date: Tue, 9 Aug 2022 19:31:50 -0500 Subject: gnu: Add emacs-tmr. * gnu/packages/emacs-xyz.scm (emacs-tmr): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 01bce02b02..f25569808d 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -13777,6 +13777,40 @@ structure, or any other pattern.") (license (list license:gpl3+ license:fdl1.3+)))) ; GFDLv1.3+ for the manual +(define-public emacs-tmr + (package + (name "emacs-tmr") + (version "0.4.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.sr.ht/~protesilaos/tmr") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1vz9zfqap221baiy41wpxph33g6h2plnanzgpjs0wk8dz1fpwfky")))) + (build-system emacs-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-ffplay + (lambda* (#:key inputs #:allow-other-keys) + (let ((ffplay (search-input-file inputs "/bin/ffplay"))) + (make-file-writable "tmr.el") + (substitute* "tmr.el" + (("\"ffplay") + (string-append "\"" ffplay))))))))) + (native-inputs (list texinfo)) + (inputs (list ffmpeg)) + (home-page "https://protesilaos.com/emacs/tmr/") + (synopsis "Set timers using a convenient notation") + (description + "TMR is an Emacs package that provides facilities for setting timers +using a convenient notation.") + (license license:gpl3+))) + (define-public emacs-gn-mode (package (name "emacs-gn-mode") -- cgit 1.4.1 From 35b176daf1a466f136f0b77c03de78f482a30702 Mon Sep 17 00:00:00 2001 From: jgart Date: Thu, 11 Aug 2022 17:33:34 -0500 Subject: gnu: Add emacs-denote. * gnu/packages/emacs-xyz.scm (emacs-denote): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index f25569808d..e6fb7572cc 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -13741,6 +13741,31 @@ provides functions to convert hash tables from and to alists and plists.") you to deal with multiple log levels.") (license license:gpl3+))) +(define-public emacs-denote + (package + (name "emacs-denote") + (version "0.5.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.sr.ht/~protesilaos/denote") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "00f50dhw0x1hn87rc6vkrdwpybnbphg5z0g2c6c4r4cbgaiia8bi")))) + (build-system emacs-build-system) + (native-inputs (list texinfo)) + (home-page "https://protesilaos.com/emacs/denote/") + (synopsis "Simple notes for Emacs") + (description +"Denote is a simple note-taking tool for Emacs. It is based on the idea that +notes should follow a predictable and descriptive file-naming scheme. The +file name must offer a clear indication of what the note is about, without +reference to any other metadata. Denote basically streamlines the creation of +such files while providing facilities to link between them.") + (license license:gpl3+))) + (define-public emacs-logos (package (name "emacs-logos") -- cgit 1.4.1 From de2f419618b9929cf65b477568f21bc77e218b70 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 26 Aug 2022 15:22:25 +0200 Subject: gnu: emacs-geiser: Update to 0.26. * gnu/packages/emacs-xyz.scm (emacs-geiser): Update to 0.26. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index e6fb7572cc..379c5fb22c 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -250,7 +250,7 @@ (define-public emacs-geiser (package (name "emacs-geiser") - (version "0.25.1") + (version "0.26") (source (origin (method git-fetch) @@ -259,7 +259,7 @@ (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0qm43qkf0rpcbsf5wb7b51m79jvn2fkl19f49acbzjpavx66vn3n")))) + (base32 "1pm33zlcq84h61xhplmrlicckrax1pv39zrmv8ryzhi9mqrb6bdg")))) (build-system emacs-build-system) (arguments '(#:phases -- cgit 1.4.1 From 4aa3bae2c6b6f05464d4ed5864af8156bd76fe67 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 25 Aug 2022 17:04:10 +0200 Subject: gnu: libreoffice: Add release-monitoring-url. * gnu/packages/libreoffice.scm (libreoffice)[properties]: New field. --- gnu/packages/libreoffice.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 54ee4b4ca8..46eba12431 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -1279,4 +1279,7 @@ a number of components: Writer, a word processor; Calc, a spreadsheet application; Impress, a presentation engine; Draw, a drawing and flowcharting application; Base, a database and database frontend; Math for editing mathematics.") + (properties + '((release-monitoring-url + . "https://www.libreoffice.org/download/download-libreoffice/"))) (license license:mpl2.0))) -- cgit 1.4.1 From 3d06823e6b214b2f047870d5cecb4da649b3048d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 17 Aug 2022 21:14:07 +0200 Subject: gnu: rust-ghost: Update to 0.1.6. * gnu/packages/crates-io.scm (rust-ghost-0.1): Update to 0.1.6. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index cfafce9aa3..e73269663e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -24981,14 +24981,14 @@ authenticated encryption cipher.") (define-public rust-ghost-0.1 (package (name "rust-ghost") - (version "0.1.2") + (version "0.1.6") (source (origin (method url-fetch) (uri (crate-uri "ghost" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0yalg3g1g3cz63n3phy7cdhh7p2qd220mrpxy96alwxbpqdwynqs")))) + (base32 "0fj42hmlgcj1rbqcshlvk65npsks4ba7vdzphb9202gawf6zw6gb")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t -- cgit 1.4.1 From 8c06526634b365fd1e9a78b3039a76c639c7abc7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 17 Aug 2022 21:14:29 +0200 Subject: gnu: rust-inventory: Add 0.2.3. * gnu/packages/crates-io.scm (rust-inventory-0.2): New variable. (rust-inventory-0.1): Inherit from it. --- gnu/packages/crates-io.scm | 40 ++++++++++++++++++++++++++++++---------- 1 file changed, 30 insertions(+), 10 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index e73269663e..ed2fe3c487 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -29417,8 +29417,37 @@ primitive Rust types.") immutable interval tree.") (license license:expat))) +(define-public rust-inventory-0.2 + (package + (name "rust-inventory") + (version "0.2.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "inventory" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "06h9xw67wx18rank4yyz93iq89j0fk6fbazryfvf5ach1dp4qd44")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-ctor" ,rust-ctor-0.1) + ("rust-ghost" ,rust-ghost-0.1)) + #:cargo-development-inputs + (("rust-rustversion" ,rust-rustversion-1) + ("rust-trybuild" ,rust-trybuild-1)))) + (home-page "https://github.com/dtolnay/inventory") + (synopsis "Typed distributed plugin registration") + (description + "This package provides a way to set up a plugin registry into which +plugins can be registered from any source file linked into your program. +There does not need to be a central list of all the plugins.") + ;; Either license can be chosen at the users option. + (license (list license:expat license:asl2.0)))) + (define-public rust-inventory-0.1 (package + (inherit rust-inventory-0.2) (name "rust-inventory") (version "0.1.11") (source @@ -29428,21 +29457,12 @@ immutable interval tree.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "1m1zdjgs3nzfdxf86mc1i0id56fvk8rfw63rf04yi88bqrh53szh")))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-ctor" ,rust-ctor-0.1) ("rust-ghost" ,rust-ghost-0.1) - ("rust-inventory-impl" ,rust-inventory-impl-0.1)))) - (home-page "https://github.com/dtolnay/inventory") - (synopsis "Typed distributed plugin registration") - (description - "This package provides a way to set up a plugin registry into which -plugins can be registered from any source file linked into your program. -There does not need to be a central list of all the plugins.") - ;; Either license can be chosen at the users option. - (license (list license:expat license:asl2.0)))) + ("rust-inventory-impl" ,rust-inventory-impl-0.1)))))) (define-public rust-inventory-impl-0.1 (package -- cgit 1.4.1 From 58faf8069c9dc77da626a26b9f9ccd3bfc37b977 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 17 Aug 2022 21:19:13 +0200 Subject: gnu: rust-ouroboros: Add 0.15.2. * gnu/packages/crates-io.scm (rust-ouroboros-macro-0.15): New variable. (rust-ouroboros-macro-0.14): Inherit from it. (rust-ouroboros-0.15): New variable. (rust-ouroboros-0.14): Inherit from it. --- gnu/packages/crates-io.scm | 45 ++++++++++++++++++++++++++++++++++++++------- 1 file changed, 38 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index ed2fe3c487..0b801a59fe 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -40340,17 +40340,17 @@ platform-native strings.") "11agh8n3x2l4sr3sxvx6byc1j3ryb1g6flb1ywn0qhq7xv1y3cmg")))) (arguments `(#:skip-build? #t)))) -(define-public rust-ouroboros-macro-0.14 +(define-public rust-ouroboros-macro-0.15 (package (name "rust-ouroboros-macro") - (version "0.14.0") + (version "0.15.2") (source (origin (method url-fetch) (uri (crate-uri "ouroboros_macro" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "11cav04x82liknlrv50lpl1i1ln2jw4isdqzdjnjsg0pcpvwik9r")))) + (base32 "01lgyj5nxgr6r1l0m20pp4ilz3m14clsqg2j28hic2rrlsjafjkk")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -40366,22 +40366,35 @@ platform-native strings.") "This package provides a proc macro for the @code{ouroboros} crate.") (license (list license:expat license:asl2.0)))) -(define-public rust-ouroboros-0.14 +(define-public rust-ouroboros-macro-0.14 (package - (name "rust-ouroboros") + (inherit rust-ouroboros-macro-0.15) + (name "rust-ouroboros-macro") (version "0.14.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "ouroboros_macro" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "11cav04x82liknlrv50lpl1i1ln2jw4isdqzdjnjsg0pcpvwik9r")))))) + +(define-public rust-ouroboros-0.15 + (package + (name "rust-ouroboros") + (version "0.15.2") (source (origin (method url-fetch) (uri (crate-uri "ouroboros" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1ih1lna1d2is3a6aicmc7lpfhqmg046kssxpryk24kwg8j42ymh6")))) + (base32 "1qhd9cvc4hwdbr37da1jh0k0742slchixlxn4wxgc7g3l63yl9bl")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-aliasable" ,rust-aliasable-0.1) - ("rust-ouroboros-macro" ,rust-ouroboros-macro-0.14) + ("rust-ouroboros-macro" ,rust-ouroboros-macro-0.15) ("rust-stable-deref-trait" ,rust-stable-deref-trait-1)))) (home-page "https://github.com/joshua-maros/ouroboros") (synopsis "Self-referential struct generation") @@ -40389,6 +40402,24 @@ platform-native strings.") "Easy, safe self-referential struct generation for Rust.") (license (list license:expat license:asl2.0)))) +(define-public rust-ouroboros-0.14 + (package + (inherit rust-ouroboros-0.15) + (name "rust-ouroboros") + (version "0.14.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "ouroboros" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1ih1lna1d2is3a6aicmc7lpfhqmg046kssxpryk24kwg8j42ymh6")))) + (arguments + `(#:cargo-inputs + (("rust-aliasable" ,rust-aliasable-0.1) + ("rust-ouroboros-macro" ,rust-ouroboros-macro-0.14) + ("rust-stable-deref-trait" ,rust-stable-deref-trait-1)))))) + (define-public rust-output-vt100-0.1 (package (name "rust-output-vt100") -- cgit 1.4.1 From 8ece2cf5713df0f58e6287214efed8f2b3035413 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 17 Aug 2022 21:37:36 +0200 Subject: gnu: rust-send-wrapper: Add 0.5.0. * gnu/packages/crates-io.scm (rust-send-wrapper-0.5): New variable. (rust-send-wrapper-0.4): Inherit from it. --- gnu/packages/crates-io.scm | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 0b801a59fe..2a37db698a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -54488,17 +54488,17 @@ Semantic Versioning.") (base32 "18vhypw6zgccnrlm5ps1pwa0khz7ry927iznpr88b87cagr1v2iq")))))) -(define-public rust-send-wrapper-0.4 +(define-public rust-send-wrapper-0.5 (package (name "rust-send-wrapper") - (version "0.4.0") + (version "0.5.0") (source (origin (method url-fetch) (uri (crate-uri "send_wrapper" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1l7s28vfnwdbjyrrk3lx81jy4f0dcrv4iwyah2wj6vndxhqxaf7n")))) + (base32 "1mwbg1nv36d5kdjb0iwmprz24km0m8ck08dn59gdngqdc77hl34k")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t)) (home-page "https://github.com/thk1/send_wrapper") @@ -54511,6 +54511,20 @@ also have to make sure that the wrapper is dropped from within the original thread. If any of these constraints is violated, a panic occurs.") (license (list license:expat license:asl2.0)))) +(define-public rust-send-wrapper-0.4 + (package + (inherit rust-send-wrapper-0.5) + (name "rust-send-wrapper") + (version "0.4.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "send_wrapper" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1l7s28vfnwdbjyrrk3lx81jy4f0dcrv4iwyah2wj6vndxhqxaf7n")))) + (arguments `(#:skip-build? #t)))) + (define-public rust-seq-io-0.3 (package (name "rust-seq-io") -- cgit 1.4.1 From c51cd144d7714d05efa84170ff421549313986c8 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 17 Aug 2022 21:42:31 +0200 Subject: gnu: rust-widestring: Add 0.5.1. * gnu/packages/crates-io.scm (rust-widestring-0.5): New variable. (rust-widestring-0.4): Inherit from it. --- gnu/packages/crates-io.scm | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 2a37db698a..883cb019f8 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -71565,10 +71565,10 @@ terms of allowing LLVM's auto-vectorizer to do its job.") (("rust-bytemuck" ,rust-bytemuck-1)))) (license (list license:zlib)))) -(define-public rust-widestring-0.4 +(define-public rust-widestring-0.5 (package (name "rust-widestring") - (version "0.4.2") + (version "0.5.1") (source (origin (method url-fetch) @@ -71576,7 +71576,7 @@ terms of allowing LLVM's auto-vectorizer to do its job.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "13565qy4jhpg4x0xw8mwxzzsh0p8c93p5208lh6kpwp0q01y6qx7")))) + "10qrilijh1qzw362mvd4nsz3vv32dxx530vk41hkcx8hah22z20p")))) (build-system cargo-build-system) (arguments `(#:cargo-development-inputs @@ -71590,6 +71590,23 @@ UTF-32 types are provided, including support for malformed encoding.") (license (list license:asl2.0 license:expat)))) +(define-public rust-widestring-0.4 + (package + (inherit rust-widestring-0.5) + (name "rust-widestring") + (version "0.4.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "widestring" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "13565qy4jhpg4x0xw8mwxzzsh0p8c93p5208lh6kpwp0q01y6qx7")))) + (arguments + `(#:cargo-development-inputs + (("rust-winapi" ,rust-winapi-0.3)))))) + (define-public rust-wild-2 (package (name "rust-wild") -- cgit 1.4.1 From 1a38540d8d68e0c5c0a57b784eebde233e5ecb23 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 18 Aug 2022 16:16:06 +0200 Subject: gnu: rust-indoc: Update to 1.0.7. * gnu/packages/crates-io.scm (rust-indoc-1): Update to 1.0.7. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 883cb019f8..7c5850791d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -28835,14 +28835,14 @@ Rust.") (define-public rust-indoc-1 (package (name "rust-indoc") - (version "1.0.3") + (version "1.0.7") (source (origin (method url-fetch) (uri (crate-uri "indoc" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0diih20xsxjb159nr0dq6jxnyhq7gg10dlsnh2siikphmvm5m9z5")))) + (base32 "1qs42cn8rj7kdpmp1dlkzhv62rfmbx3ffwvsfw67zyq86jm1xaxd")))) (build-system cargo-build-system) (arguments `(#:skip-build? #true -- cgit 1.4.1 From 40c28fa3223c5ec8fedb9e9f1db7eb2153056685 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 24 Aug 2022 19:22:52 +0200 Subject: gnu: python-cryptography: Update to 37.0.4. * gnu/packages/python-crypto.scm (python-cryptography-vectors-next): Update to 37.0.4. (python-cryptography-next): Likewise. [arguments]: Add phase to adjust pyo3 requirement. Don't adjust ouroboros version. [inputs]: Change from RUST-OUROBOROS-0.14 and RUST-OUROBOROS-MACRO-0.14 to RUST-OUROBOROS-0.15 and RUST-OUROBOROS-MACRO-0.15. [native-inputs]: Add PYTHON-PYTEST-BENCHMARK. --- gnu/packages/python-crypto.scm | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index 5569f54841..5e78417042 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -441,14 +441,14 @@ is used by the Requests library to verify HTTPS requests.") (define-public python-cryptography-vectors-next (package (name "python-cryptography-vectors") - (version "36.0.1") + (version "37.0.4") (source (origin (method url-fetch) (uri (pypi-uri "cryptography_vectors" version)) (sha256 (base32 - "166mvhhmgglqai1sjkkb76mpdkad2yykam11d2w44hs2snpr117w")))) + "1a1yi37ygw0jp72q280cmxd3qn9y9vmcch2bcnjkg2g2202l0qas")))) (build-system python-build-system) (home-page "https://github.com/pyca/cryptography") (synopsis "Test vectors for the cryptography package") @@ -470,14 +470,14 @@ is used by the Requests library to verify HTTPS requests.") (define-public python-cryptography-next (package (name "python-cryptography") - (version "36.0.1") + (version "37.0.4") (source (origin (method url-fetch) (uri (pypi-uri "cryptography" version)) (sha256 (base32 - "0f1n8bvngarhsssm60xc59xfzkh7yqpyyyypaph3v5bs7pfc3rak")))) + "10haq7sn8mrdlhcfs791rczknnxm0wpww0lkpjzcqx141ryc3yb3")))) (build-system python-build-system) (arguments (list @@ -489,11 +489,13 @@ is used by the Requests library to verify HTTPS requests.") (ice-9 match)) #:phases #~(modify-phases (@ (guix build python-build-system) %standard-phases) - (add-after 'unpack 'loosen-ouroboros-version + (add-after 'unpack 'adjust-pyo3-requirement (lambda _ + ;; The package depends on 0.15.2, which is not on crates.io(!?). + ;; Downgrade to 0.15.1... (substitute* "src/rust/Cargo.toml" - (("ouroboros = \"0\\.13\"") - "ouroboros = \"0.14\"")))) + (("pyo3 = \\{ version = \"0\\.15\\.2\"") + "pyo3 = { version = \"0.15.1\"")))) (add-before 'build 'configure-cargo (lambda* (#:key inputs #:allow-other-keys) ;; Hide irrelevant inputs from cargo-build-system so it does @@ -518,6 +520,9 @@ is used by the Requests library to verify HTTPS requests.") (invoke "pytest" "-vv" "tests"))))))) (inputs (list openssl + ;; TODO: Most of these inputs are transitive dependencies of + ;; the Rust requirements (see src/rust/cargo.toml). Surely + ;; there is a better way than manually listing everything..? rust-aliasable-0.1 rust-asn1-0.8 rust-asn1-derive-0.8 @@ -538,8 +543,8 @@ is used by the Requests library to verify HTTPS requests.") rust-num-integer-0.1 rust-num-traits-0.2 rust-once-cell-1 - rust-ouroboros-0.14 - rust-ouroboros-macro-0.14 + rust-ouroboros-0.15 + rust-ouroboros-macro-0.15 rust-parking-lot-0.11 rust-parking-lot-core-0.8 rust-paste-0.1 @@ -572,6 +577,7 @@ is used by the Requests library to verify HTTPS requests.") python-pretend python-pytz python-pytest + python-pytest-benchmark python-pytest-subtests python-setuptools-rust rust -- cgit 1.4.1 From 8dc1430a4c3637a67a5475abf3b6b2178d7f67a9 Mon Sep 17 00:00:00 2001 From: Simon Streit Date: Fri, 19 Aug 2022 11:34:38 +0200 Subject: gnu: Add streamripper. * gnu/packages/audio.scm (streamripper): New variable. Signed-off-by: Marius Bakke --- gnu/packages/audio.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index c0bfb3b9d8..9a6c5b859e 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -38,6 +38,7 @@ ;;; Copyright © 2021 Aleksandr Vityazev ;;; Copyright © 2022 Arjan Adriaanse ;;; Copyright © 2022 Juliana Sims +;;; Copyright © 2022 Simon Streit ;;; ;;; This file is part of GNU Guix. ;;; @@ -5867,3 +5868,26 @@ framework. It provides a visual interface to audio and video connections managed by PipeWire.") (home-page "https://gitlab.freedesktop.org/rncbc/qpwgraph") (license license:gpl2))) + +(define-public streamripper + (package + (name "streamripper") + (version "1.64.6") + (source + (origin + (method url-fetch) + (uri (string-append "https://sourceforge.net/projects/streamripper" + "/files/streamripper%20(current)/" + version "/streamripper-" version ".tar.gz")) + (sha256 + (base32 "0hnyv3206r0rfprn3k7k6a0j959kagsfyrmyjm3gsf3vkhp5zmy1")))) + (build-system gnu-build-system) + (native-inputs (list pkg-config)) + (inputs (list faad2 glib libmad libvorbis)) + (home-page "http://streamripper.sourceforge.net") + (synopsis "Record audio streams to your hard drive") + (description "Streamripper records shoutcast-compatible +streams. For shoutcast style streams it finds the “meta data” or track +separation data, and uses that as a marker for where the track should +be separated.") + (license license:gpl2+))) -- cgit 1.4.1 From 586f6c3a7ac0578f1b4a0a5de6f2e73221ea130a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 20 Aug 2022 01:02:09 +0200 Subject: gnu: streamripper: Remove bundled software. * gnu/packages/audio.scm (streamripper)[source](modules, snippet): New fields. --- gnu/packages/audio.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 9a6c5b859e..8795caef71 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -5880,7 +5880,11 @@ managed by PipeWire.") "/files/streamripper%20(current)/" version "/streamripper-" version ".tar.gz")) (sha256 - (base32 "0hnyv3206r0rfprn3k7k6a0j959kagsfyrmyjm3gsf3vkhp5zmy1")))) + (base32 "0hnyv3206r0rfprn3k7k6a0j959kagsfyrmyjm3gsf3vkhp5zmy1")) + (modules '((guix build utils))) + (snippet + ;; Delete bundled copy of libmad. + '(delete-file-recursively "libmad-0.15.1b")))) (build-system gnu-build-system) (native-inputs (list pkg-config)) (inputs (list faad2 glib libmad libvorbis)) -- cgit 1.4.1 From 17ffcde1fc465bd10d99def36329101912ddc79a Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Fri, 26 Aug 2022 22:28:48 +0800 Subject: gnu: python-apsw: Update to 3.39.2.0. * gnu/packages/databases.scm (python-apsw): Update to 3.39.2.0. [source]: Change to git-fetch. [inputs]: Replace sqlite with sqlite-next. [arguments]: Remove custom check phase. Some styling adjustments as well. Signed-off-by: Marius Bakke --- gnu/packages/databases.scm | 60 +++++++++++++++++++++------------------------- 1 file changed, 27 insertions(+), 33 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 82a3f22b7c..dd8ed50371 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -3568,44 +3568,38 @@ PickleShare.") (define-public python-apsw (package (name "python-apsw") - (version "3.36.0-r1") + (version "3.39.2.0") (source - (origin - (method url-fetch) - (uri (string-append "https://github.com/rogerbinns/apsw/releases" - "/download/" version "/apsw-" version ".zip")) - (sha256 - (base32 - "0w8q73147hv77dlpqrx6h1gx03acc8xqhvdpfp6vkffdm0wmqd8p")))) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/rogerbinns/apsw") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0q7fnk8n3m5mpjzh6xyhj409k8sacdbjsfis98my9c50fdn5sr7y")))) (build-system python-build-system) - (native-inputs - (list unzip)) - (inputs - (list sqlite)) + (native-inputs (list unzip)) + (inputs (list sqlite-next)) ;SQLite 3.39 required. (arguments - `(#:phases - (modify-phases %standard-phases - (replace 'build - (lambda _ - (invoke "python" "setup.py" "build" "--enable-all-extensions" - "--enable=load_extension") - #t)) - (add-after 'build 'build-test-helper - (lambda _ - (invoke "gcc" "-fPIC" "-shared" "-o" "./testextension.sqlext" - "-I." "-Isqlite3" "src/testextension.c") - #t)) - (replace 'check - (lambda* (#:key inputs outputs #:allow-other-keys) - (add-installed-pythonpath inputs outputs) - (invoke "python" "setup.py" "test") - #t))))) + (list #:phases + #~(modify-phases %standard-phases + (replace 'build + (lambda _ + (invoke "python" "setup.py" "build" "--enable-all-extensions" + "--enable=load_extension") #t)) + (add-after 'build 'build-test-helper + (lambda _ + (invoke "gcc" "-fPIC" "-shared" "-o" "./testextension.sqlext" + "-I." "-Isqlite3" "src/testextension.c") #t))))) (home-page "https://github.com/rogerbinns/apsw/") (synopsis "Another Python SQLite Wrapper") - (description "APSW is a Python wrapper for the SQLite -embedded relational database engine. In contrast to other wrappers such as -pysqlite it focuses on being a minimal layer over SQLite attempting just to -translate the complete SQLite API into Python.") + (description + "APSW is a Python wrapper for the SQLite embedded relational database +engine. In contrast to other wrappers such as pysqlite it focuses on being a +minimal layer over SQLite attempting just to translate the complete SQLite API +into Python.") (license license:zlib))) (define-public python-aiosqlite -- cgit 1.4.1 From a45c30b6951e438ecc638d5dad82cf0fa73d092e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 26 Aug 2022 23:44:58 +0200 Subject: gnu: python-apsw: Remove obsolete code. * gnu/packages/databases.scm (python-apsw)[native-inputs]: Remove UNZIP. [arguments]: Remove trailing #t's. --- gnu/packages/databases.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index dd8ed50371..209ad0f278 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -3580,7 +3580,6 @@ PickleShare.") (base32 "0q7fnk8n3m5mpjzh6xyhj409k8sacdbjsfis98my9c50fdn5sr7y")))) (build-system python-build-system) - (native-inputs (list unzip)) (inputs (list sqlite-next)) ;SQLite 3.39 required. (arguments (list #:phases @@ -3588,11 +3587,11 @@ PickleShare.") (replace 'build (lambda _ (invoke "python" "setup.py" "build" "--enable-all-extensions" - "--enable=load_extension") #t)) + "--enable=load_extension"))) (add-after 'build 'build-test-helper (lambda _ (invoke "gcc" "-fPIC" "-shared" "-o" "./testextension.sqlext" - "-I." "-Isqlite3" "src/testextension.c") #t))))) + "-I." "-Isqlite3" "src/testextension.c")))))) (home-page "https://github.com/rogerbinns/apsw/") (synopsis "Another Python SQLite Wrapper") (description -- cgit 1.4.1 From af9a49e42e984251a8070527956e959e162e1f0e Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Thu, 25 Aug 2022 18:53:28 +0800 Subject: gnu: python-qtpy: Update to 2.2.0. * gnu/packages/qt.scm (python-qtpy): Update to 2.2.0. Signed-off-by: Marius Bakke --- gnu/packages/qt.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 9832568d10..931bc35352 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -3207,14 +3207,14 @@ top of the PyQt bindings for Qt. PyQt-builder is used to build PyQt itself.") (define-public python-qtpy (package (name "python-qtpy") - (version "2.0.1") + (version "2.2.0") (source (origin (method url-fetch) (uri (pypi-uri "QtPy" version)) (sha256 (base32 - "13zbhnl2rm30xafwrzfwdb4mjp7gk4s9h2xagbf83pnjzczhgzdd")))) + "051rj10lbv2ny48lz34zhclcbdxxdbk4di2mdk91m9143w91npyq")))) (build-system python-build-system) (propagated-inputs (list python-packaging)) (arguments -- cgit 1.4.1 From 63471f6e7aab9efc6dbca126bbd027d85aa71f2c Mon Sep 17 00:00:00 2001 From: arkhan Date: Thu, 25 Aug 2022 20:14:37 -0500 Subject: gnu: xonsh: Update to 0.13.1 * gnu/packages/shells.scm (xonsh): Update to 0.13.0. Signed-off-by: Marius Bakke --- gnu/packages/shells.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index cb983fb148..1f87fe26bf 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -540,13 +540,14 @@ ksh, and tcsh.") (define-public xonsh (package (name "xonsh") - (version "0.13.0") + (version "0.13.1") (source (origin (method url-fetch) (uri (pypi-uri "xonsh" version)) (sha256 - (base32 "12ayz1kw2ag3r407j0lng2kfp75im8xqap1nvpmpa0lmsx8wk7ll")) + (base32 + "1b409wkh41inn6m0qmps4iq6bgvwg465dcfcbffqd15fr1j2d0hq")) (modules '((guix build utils))) (snippet #~(begin -- cgit 1.4.1 From 67b0a69f8508e2fd9db4f2ab0c9ed793bab36755 Mon Sep 17 00:00:00 2001 From: Felix Gruber Date: Thu, 25 Aug 2022 16:36:31 +0000 Subject: gnu: oil: Update to 0.12.4. * gnu/packages/shells.scm (oil): Update to 0.12.4. Signed-off-by: Marius Bakke --- gnu/packages/shells.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 1f87fe26bf..4d0dd92007 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -849,7 +849,7 @@ Shell (pdksh).") (define-public oil (package (name "oil") - (version "0.12.0") + (version "0.12.4") (source ;; oil's sources contain a modified version of CPython 2.7.13. ;; According to https://www.oilshell.org/blog/2017/05/05.html @@ -862,7 +862,7 @@ Shell (pdksh).") (uri (string-append "https://www.oilshell.org/download/oil-" version ".tar.gz")) (sha256 - (base32 "1sz5xb88773ass6ip5yxmnby9p6h0bz1d02n6n0cna3hdzqn7bpv")))) + (base32 "1ck59fs2mkid4d9fss6kplvv0aiimsr9m3gv75ckivb376sd8pmc")))) (build-system gnu-build-system) (arguments (list #:strip-binaries? #f ; strip breaks the binary -- cgit 1.4.1 From 598b683e1838a306111a0a7cef245c12949ccfde Mon Sep 17 00:00:00 2001 From: Simon Streit Date: Wed, 24 Aug 2022 16:55:43 +0200 Subject: gnu: transmission: Add libappindicator to inputs. * gnu/packages/bittorrent.scm (transmission) : Add libappindicator. Signed-off-by: Marius Bakke --- gnu/packages/bittorrent.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index 43fc287b95..db5237c997 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -16,6 +16,7 @@ ;;; Copyright © 2021 Josselin Poiret ;;; Copyright © 2022 Brice Waegeneire ;;; Copyright © 2022 Jacob Hart +;;; Copyright © 2022 Simon Streit ;;; ;;; This file is part of GNU Guix. ;;; @@ -132,7 +133,7 @@ (string-append gui "/share/man/man1/transmission-gtk.1")) #t)))))) (inputs - (list libevent curl openssl zlib gtk+)) + (list libevent curl openssl zlib gtk+ libappindicator)) (native-inputs (list intltool pkg-config)) (home-page "https://transmissionbt.com/") -- cgit 1.4.1 From 9f7236e3baf0523c53193c1836ed888e63449f50 Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Mon, 22 Aug 2022 18:26:07 +0000 Subject: gnu: gcc-12: Update to 12.2.0. * gnu/packages/gcc.scm (gcc-12): Update to 12.2.0. Signed-off-by: Marius Bakke --- gnu/packages/gcc.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index 4c496e31b2..11ee631bf4 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -702,14 +702,14 @@ It also includes runtime support libraries for these languages.") (package (inherit gcc-11) ;; Note: 'compiler-cpu-architectures' is unchanged compared to GCC 11. - (version "12.1.0") + (version "12.2.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/gcc/gcc-" version "/gcc-" version ".tar.xz")) (sha256 (base32 - "0ywws66myjxcwsmla721g35d2ymlckq6ii7j9av0477ki5467zb2")) + "1zrhca90c7hqnjz3jgr1vl675q3h5lrd92b5ggi00jjryffcyjg5")) (patches (search-patches "gcc-12-strmov-store-file-names.patch" "gcc-5.0-libvtv-runpath.patch")) (modules '((guix build utils))) -- cgit 1.4.1 From c8c7dc311f8b1dd23162b99c51cb95c8abe84d29 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 16 Aug 2022 11:37:41 +0200 Subject: gnu: python-cython: Update to 0.29.32. * gnu/packages/python-xyz.scm (python-cython): Update to 0.29.32. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index d3bfb10acf..87ed92e3ee 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5568,13 +5568,13 @@ provides additional functionality on the produced Mallard documents.") (define-public python-cython (package (name "python-cython") - (version "0.29.24") + (version "0.29.32") (source (origin (method url-fetch) (uri (pypi-uri "Cython" version)) (sha256 - (base32 "0hw4gs18rh4slij1fg252argxhraypld9apbqbl60230qc3lvw6d")))) + (base32 "1xqsihpqnfal29nb5kmw8z71nd4jbsnbz7p3lkr094xpb13wycw7")))) (build-system python-build-system) ;; we need the full python package and not just the python-wrapper ;; because we need libpython3.3m.so -- cgit 1.4.1 From e38a46a9bb1f2c4be40a27d09f2a02f752357f09 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 17 Aug 2022 21:55:15 +0200 Subject: gnu: rust-cc: Update to 1.0.73. * gnu/packages/crates-io.scm (rust-cc-1): Update to 1.0.73. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index dc87ea7cb8..6afcfb74fc 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -10307,7 +10307,7 @@ box''.") (define-public rust-cc-1 (package (name "rust-cc") - (version "1.0.67") + (version "1.0.73") (source (origin (method url-fetch) @@ -10315,7 +10315,7 @@ box''.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1z9p27ys80shv09zhknmlal8jjra78agdwg97i6jjd6lg83rpip3")))) + "04ccylrjq94jssh8f7d7hxv64gs9f1m1jrsxb7wqgfxk4xljmzrg")))) (build-system cargo-build-system) (arguments `(#:tests? #f -- cgit 1.4.1 From 2fe473a5aff2e906bc7af0211d35e2d0ba792388 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 17 Aug 2022 21:57:28 +0200 Subject: gnu: Add rust-python3-dll-a. * gnu/packages/crates-io.scm (rust-python3-dll-a-0.2): New variable. --- gnu/packages/crates-io.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 6afcfb74fc..1968ed24a7 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -46449,6 +46449,28 @@ creating native Python extension modules. Running and interacting with Python code from a Rust binary is also supported.") (license license:asl2.0))) +(define-public rust-python3-dll-a-0.2 + (package + (name "rust-python3-dll-a") + (version "0.2.5") + (source (origin + (method url-fetch) + (uri (crate-uri "python3-dll-a" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "01k2nf4wq4f4xnaq3fy1gx12v10pndwmdrjq4x4pshhjxxnrpml9")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ;Windows-like targets only + #:cargo-inputs (("rust-cc" ,rust-cc-1)))) + (home-page "https://github.com/pyo3/python3-dll-a") + (synopsis "Python import library generator") + (description + "This crate generates import libraries for the Python shared library +for MinGW-w64 and MSVC (cross-)compile targets.") + (license license:expat))) + (define-public rust-qstring-0.7 (package (name "rust-qstring") -- cgit 1.4.1 From 283d3fd7c3ce46519a0063bcecde497abffb5ad5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 24 Aug 2022 19:16:39 +0200 Subject: gnu: rust-pyo3: Add 0.16.5. * gnu/packages/crates-io.scm (rust-pyo3-build-config-0.16, rust-pyo3-ffi-0.16, rust-pyo3-macros-backend-0.16, rust-pyo3-macros-0.16, rust-pyo3-0.16): New variables. (rust-pyo3-build-config-0.15, rust-pyo3-macros-backend-0.15, rust-pyo3-macros-0.15, rust-pyo3-0.15): Inherit accordingly. --- gnu/packages/crates-io.scm | 168 ++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 149 insertions(+), 19 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 1968ed24a7..34514ea0c7 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -46320,8 +46320,34 @@ they were parsed from") @code{LC_COLLATE} and @code{LC_CTYPE} are not yet supported.") (license license:expat))) +(define-public rust-pyo3-build-config-0.16 + (package + (name "rust-pyo3-build-config") + (version "0.16.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "pyo3-build-config" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1j2jj5qnnpagi3gvkwjpydcxfsd5qv3vmpghnaqs7n1mdia5pdmm")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-once-cell" ,rust-once-cell-1) + ("rust-python3-dll-a" ,rust-python3-dll-a-0.2) + ("rust-target-lexicon" ,rust-target-lexicon-0.12)))) + (native-inputs (list python)) ;for tests + (home-page "https://github.com/pyo3/pyo3") + (synopsis "Build configuration for PyO3") + (description + "This package contains build configuration helpers for the PyO3 +ecosystem.") + (license license:asl2.0))) + (define-public rust-pyo3-build-config-0.15 (package + (inherit rust-pyo3-build-config-0.16) (name "rust-pyo3-build-config") (version "0.15.1") (source @@ -46331,20 +46357,63 @@ they were parsed from") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "0aw5zfqwzj5rzfxjyqvrqfam138d1009jh6kia4xrgdz538y9yfv")))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-once-cell" ,rust-once-cell-1)))) + (native-inputs '()))) + +(define-public rust-pyo3-ffi-0.16 + (package + (name "rust-pyo3-ffi") + (version "0.16.5") + (source (origin + (method url-fetch) + (uri (crate-uri "pyo3-ffi" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0avls4q393nmzhb124zg6kp5lj6xzy2f6qx564qa7b614xqs0xf2")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-libc" ,rust-libc-0.2) + ("rust-pyo3-build-config" ,rust-pyo3-build-config-0.16)))) (home-page "https://github.com/pyo3/pyo3") - (synopsis "Build configuration for PyO3") + (synopsis "Python API bindings for the PyO3 ecosystem") (description - "This package contains build configuration helpers for the PyO3 -ecosystem.") + "This crate provides Rust FFI declarations for Python 3.") + (license license:asl2.0))) + +(define-public rust-pyo3-macros-backend-0.16 + (package + (name "rust-pyo3-macros-backend") + (version "0.16.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "pyo3-macros-backend" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1bvzvdx2a6hhliny12n2vy7v7gbsgzanxjckjr1cbxbkizss1gak")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-pyo3-build-config" ,rust-pyo3-build-config-0.16) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-1)))) + (home-page "https://github.com/pyo3/pyo3") + (synopsis "Code generation for PyO3") + (description + "This package provides code generation backends for PyO3.") (license license:asl2.0))) (define-public rust-pyo3-macros-backend-0.15 (package + (inherit rust-pyo3-macros-backend-0.16) (name "rust-pyo3-macros-backend") (version "0.15.1") (source @@ -46361,15 +46430,35 @@ ecosystem.") (("rust-proc-macro2" ,rust-proc-macro2-1) ("rust-pyo3-build-config" ,rust-pyo3-build-config-0.15) ("rust-quote" ,rust-quote-1) - ("rust-syn" ,rust-syn-1)))) + ("rust-syn" ,rust-syn-1)))))) + +(define-public rust-pyo3-macros-0.16 + (package + (name "rust-pyo3-macros") + (version "0.16.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "pyo3-macros" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1xwh7sl4n73746q80n5m5afd261zg0kxcqfnlr89ik7vbd4c8kr8")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-pyo3-macros-backend" ,rust-pyo3-macros-backend-0.16) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-1)))) (home-page "https://github.com/pyo3/pyo3") - (synopsis "Code generation for PyO3") + (synopsis "Proc macros for PyO3") (description - "This package provides code generation backends for PyO3.") + "This package provides compiler macros for use with PyO3.") (license license:asl2.0))) (define-public rust-pyo3-macros-0.15 (package + (inherit rust-pyo3-macros-0.16) (name "rust-pyo3-macros") (version "0.15.1") (source @@ -46385,15 +46474,64 @@ ecosystem.") #:cargo-inputs (("rust-pyo3-macros-backend" ,rust-pyo3-macros-backend-0.15) ("rust-quote" ,rust-quote-1) - ("rust-syn" ,rust-syn-1)))) + ("rust-syn" ,rust-syn-1)))))) + +(define-public rust-pyo3-0.16 + (package + (name "rust-pyo3") + (version "0.16.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "pyo3" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1p5kjsj3jdw2gnahdjrzljmi93w3nxdp11qq8x3i80b0a3l04qqy")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-anyhow" ,rust-anyhow-1) + ("rust-cfg-if" ,rust-cfg-if-1) + ("rust-eyre" ,rust-eyre-0.6) + ("rust-hashbrown" ,rust-hashbrown-0.11) + ("rust-indexmap" ,rust-indexmap-1) + ("rust-indoc" ,rust-indoc-1) + ("rust-inventory" ,rust-inventory-0.2) + ("rust-libc" ,rust-libc-0.2) + ("rust-num-bigint" ,rust-num-bigint-0.4) + ("rust-num-complex" ,rust-num-complex-0.4) + ("rust-parking-lot" ,rust-parking-lot-0.11) + ("rust-paste" ,rust-paste-0.1) + ("rust-pyo3-build-config" ,rust-pyo3-build-config-0.16) + ("rust-pyo3-ffi" ,rust-pyo3-ffi-0.16) + ("rust-pyo3-macros" ,rust-pyo3-macros-0.16) + ("rust-serde" ,rust-serde-1) + ("rust-unindent" ,rust-unindent-0.1)) + #:cargo-development-inputs + (("rust-assert-approx-eq" ,rust-assert-approx-eq-1) + ("rust-bitflags" ,rust-bitflags-1.2) + ("rust-criterion" ,rust-criterion-0.3) + ("rust-half" ,rust-half-1) + ("rust-proptest" ,rust-proptest-0.10) + ("rust-rustversion" ,rust-rustversion-1) + ("rust-send-wrapper" ,rust-send-wrapper-0.5) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-trybuild" ,rust-trybuild-1) + ("rust-widestring" ,rust-widestring-0.5)) + ;; FIXME: fails to initialize Python interpreter. + #:tests? #f)) + (inputs (list python)) (home-page "https://github.com/pyo3/pyo3") - (synopsis "Proc macros for PyO3") + (synopsis "Rust bindings for the Python interpreter") (description - "This package provides compiler macros for use with PyO3.") + "This package provides Rust bindings for Python, including tools for +creating native Python extension modules. Running and interacting with +Python code from a Rust binary is also supported.") (license license:asl2.0))) (define-public rust-pyo3-0.15 (package + (inherit rust-pyo3-0.16) (name "rust-pyo3") (version "0.15.1") (source @@ -46439,15 +46577,7 @@ ecosystem.") ("rust-serde-json" ,rust-serde-json-1) ("rust-trybuild" ,rust-trybuild-1)) ;; FIXME: fails to initialize Python interpreter. - #:tests? #f)) - (inputs (list python)) - (home-page "https://github.com/pyo3/pyo3") - (synopsis "Rust bindings for the Python interpreter") - (description - "This package provides Rust bindings for Python, including tools for -creating native Python extension modules. Running and interacting with -Python code from a Rust binary is also supported.") - (license license:asl2.0))) + #:tests? #f)))) (define-public rust-python3-dll-a-0.2 (package -- cgit 1.4.1 From d6fa3ac7a8203173b125390aed596832565a3687 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 16 Aug 2022 10:28:31 +0200 Subject: gnu: mozjs: Update to 102.2.0. * gnu/packages/gnuzilla.scm (mozjs): Update to 102.2.0. (source)[uri]: Use new download location. [arguments]: Adjust configure phase for upstream changes. Remove adjust-tests-for-icu-68 phase, add adjust-tests phase. Don't delete tests in pre-check phase. [native-inputs]: Remove AUTOCONF-2.13 and PYTHON-3. Add AUTOCONF, M4, and PYTHON-WRAPPER. [inputs]: Replace ICU4C with ICU4C-71. (mozjs-78): New variable. * gnu/packages/games.scm (0ad)[inputs]: Change from MOZJS to MOZJS-78. * gnu/packages/polkit.scm (polkit-mozjs)[inputs]: Likewise. --- gnu/packages/games.scm | 2 +- gnu/packages/gnuzilla.scm | 204 ++++++++++++++++++++++++++++++++-------------- gnu/packages/polkit.scm | 2 +- 3 files changed, 144 insertions(+), 64 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 5dc7298acb..aa2e4e04b0 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -6736,7 +6736,7 @@ fight against their plot and save his fellow rabbits from slavery.") libxcursor libxml2 miniupnpc - mozjs + mozjs-78 openal sdl2 wxwidgets diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index ad955649cc..3fc0355e60 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -14,7 +14,7 @@ ;;; Copyright © 2020 Jakub Kądziołka ;;; Copyright © 2019, 2020 Adrian Malacoda ;;; Copyright © 2020, 2021, 2022 Jonathan Brielmaier -;;; Copyright © 2020 Marius Bakke +;;; Copyright © 2020, 2022 Marius Bakke ;;; Copyright © 2021 Brice Waegeneire ;;; Copyright © 2021 Maxime Devos ;;; Copyright © 2021, 2022 Maxim Cournoyer @@ -96,16 +96,16 @@ (define-public mozjs (package (name "mozjs") - (version "78.15.0") + (version "102.2.0") (source (origin (method url-fetch) ;; TODO: Switch to IceCat source once available on ftp.gnu.org. - (uri (string-append "https://archive.mozilla.org/pub/firefox" + (uri (string-append "https://ftp.mozilla.org/pub/firefox" "/releases/" version "esr/source/firefox-" version "esr.source.tar.xz")) (sha256 (base32 - "0l91cxdc5v9fps79ckb1kid4gw6v5qng1jd9zvaacwaiv628shx4")))) + "1zwpgis7py1bf8p88pz3mpai6a02qrdb8ww2fa9kxxdl9b8r2k81")))) (build-system gnu-build-system) (arguments (list @@ -147,7 +147,7 @@ (for-each generate-all-checksums '("js" "third_party/rust"))))) (replace 'configure - (lambda* (#:key inputs configure-flags #:allow-other-keys) + (lambda* (#:key configure-flags #:allow-other-keys) ;; The configure script does not accept environment variables as ;; arguments. It also must be run from a different directory, ;; but not the root directory either. @@ -156,43 +156,11 @@ (setenv "SHELL" (which "sh")) (setenv "CONFIG_SHELL" (which "sh")) (setenv "AUTOCONF" (which "autoconf")) - (apply invoke "../js/src/configure" - (cons (string-append "--prefix=" #$output) - configure-flags)))) - (add-after 'unpack 'adjust-for-icu-68 - (lambda _ - (with-directory-excursion "js/src/tests" - ;; The test suite expects a lightly patched ICU 67. Since - ;; Guix is about to switch to ICU 68, massage the tests to - ;; work with that instead of patching ICU. Try removing this - ;; phase for newer versions of mozjs. - - ;; These tests look up locale names and expects to get - ;; "GB" instead of "UK". - (substitute* "non262/Intl/DisplayNames/language.js" - (("Traditionell, GB") - "Traditionell, UK")) - (substitute* "non262/Intl/DisplayNames/region.js" - (("\"GB\": \"GB\"") - "\"GB\": \"UK\"")) - - ;; XXX: Some localized time formats have changed, and - ;; substitution fails for accented characters, even though - ;; it works in the REPL(?). Just delete these for now. - (delete-file "non262/Intl/Date/toLocaleString_timeZone.js") - (delete-file "non262/Intl/Date/toLocaleDateString_timeZone.js") - - ;; Similarly, these get an unexpected "A" suffix when looking - ;; up a time in the "ar-MA-u-ca-islamicc" locale, which is - ;; tricky to substitute. - (delete-file "non262/Intl/DateTimeFormat/format_timeZone.js") - (delete-file "non262/Intl/DateTimeFormat/format.js") - - ;; This file compares a generated list of ICU locale names - ;; with actual lookups. Some have changed slightly, i.e. - ;; daf-Latn-ZZ -> daf-Latn-CI, so drop it for simplicity. - (delete-file "non262/Intl/Locale/likely-subtags-generated.js")))) - (add-before 'check 'pre-check + (apply invoke "python" "../configure.py" + "--enable-project=js" + (string-append "--prefix=" #$output) + configure-flags))) + (add-before 'check 'adjust-tests (lambda _ (with-directory-excursion "../js/src/tests" (substitute* "shell/os.js" @@ -200,34 +168,44 @@ ((".*killed process should not have exitStatus.*") "")) - ;; XXX: Delete all tests that test time zone functionality, - ;; because the test suite uses /etc/localtime to figure out - ;; the offset from the hardware clock, which does not work - ;; in the build container. See . - (delete-file-recursively "non262/Date") - (delete-file "non262/Intl/DateTimeFormat/tz-environment-variable.js") + ;; The test suite expects a lightly patched ICU. Disable tests + ;; that do not work with the system version. See + ;; "intl/icu-patches" for clues. - (setenv "JSTESTS_EXTRA_ARGS" - (string-join - (list - ;; Do not run tests marked as "random". - "--exclude-random" - ;; Exclude web platform tests. - "--wpt=disabled" - ;; Respect the daemons configured number of jobs. - (string-append "--worker-count=" - (number->string (parallel-job-count)))))))))))) + ;; See and + ;; and + ;; related patch for why this is failing. + (delete-file "non262/Intl/DateTimeFormat/\ +fractional-second-digits-append-item.js") + ;; FIXME: got "0 \u251CAM/PM: noon\u2524", expected "0 (AM/PM: noon)" + (delete-file "non262/Intl/DateTimeFormat/day-period-hour-cycle.js") + ;; FIXME: got "en-US-posix", expected "en-US-POSIX". + (delete-file "non262/Intl/available-locales-supported.js") + ;; FIXME: got "en-US", expected "en-US-POSIX" + (delete-file "non262/Intl/available-locales-resolved.js")))) + (add-before 'check 'pre-check + (lambda _ + (setenv "JSTESTS_EXTRA_ARGS" + (string-join + (list + ;; Do not run tests marked as "random". + "--exclude-random" + ;; Exclude web platform tests. + "--wpt=disabled" + ;; Respect the daemons configured number of jobs. + (string-append "--worker-count=" + (number->string (parallel-job-count))))))))))) (native-inputs - (list autoconf-2.13 - automake + (list autoconf llvm ;for llvm-objdump + m4 perl pkg-config - python-3 + python-wrapper rust `(,rust "cargo"))) (inputs - (list icu4c readline zlib)) + (list icu4c-71 readline zlib)) (propagated-inputs (list nspr)) ; in the Requires.private field of mozjs-*.pc (home-page @@ -237,6 +215,108 @@ in C/C++.") (license license:mpl2.0))) ; and others for some files +(define-public mozjs-78 + (package + (inherit mozjs) + (name "mozjs") + (version "78.15.0") + (source (origin + (method url-fetch) + (uri (string-append "https://archive.mozilla.org/pub/firefox" + "/releases/" version "esr/source/firefox-" + version "esr.source.tar.xz")) + (sha256 + (base32 + "0l91cxdc5v9fps79ckb1kid4gw6v5qng1jd9zvaacwaiv628shx4")))) + (build-system gnu-build-system) + (arguments + (substitute-keyword-arguments (package-arguments mozjs) + ((#:phases phases) + #~(modify-phases #$phases + (replace 'configure + (lambda* (#:key configure-flags #:allow-other-keys) + ;; The configure script does not accept environment variables as + ;; arguments. It also must be run from a different directory, + ;; but not the root directory either. + (mkdir "run-configure-from-here") + (chdir "run-configure-from-here") + (setenv "SHELL" (which "sh")) + (setenv "CONFIG_SHELL" (which "sh")) + (setenv "AUTOCONF" (which "autoconf")) + (apply invoke "../js/src/configure" + (cons (string-append "--prefix=" #$output) + configure-flags)))) + (replace 'adjust-tests + (lambda _ + (with-directory-excursion "../js/src/tests" + ;; The test suite expects a lightly patched ICU 67. Since + ;; Guix is about to switch to ICU 68, massage the tests to + ;; work with that instead of patching ICU. Try removing this + ;; phase for newer versions of mozjs. + + ;; These tests look up locale names and expects to get + ;; "GB" instead of "UK". + (substitute* "non262/Intl/DisplayNames/language.js" + (("Traditionell, GB") + "Traditionell, UK")) + (substitute* "non262/Intl/DisplayNames/region.js" + (("\"GB\": \"GB\"") + "\"GB\": \"UK\"")) + + ;; XXX: Some localized time formats have changed, and + ;; substitution fails for accented characters, even though + ;; it works in the REPL(?). Just delete these for now. + (delete-file "non262/Intl/Date/toLocaleString_timeZone.js") + (delete-file "non262/Intl/Date/toLocaleDateString_timeZone.js") + + ;; Similarly, these get an unexpected "A" suffix when looking + ;; up a time in the "ar-MA-u-ca-islamicc" locale, which is + ;; tricky to substitute. + (delete-file "non262/Intl/DateTimeFormat/format_timeZone.js") + (delete-file "non262/Intl/DateTimeFormat/format.js") + + ;; This file compares a generated list of ICU locale names + ;; with actual lookups. Some have changed slightly, i.e. + ;; daf-Latn-ZZ -> daf-Latn-CI, so drop it for simplicity. + (delete-file "non262/Intl/Locale/likely-subtags-generated.js")))) + (replace 'pre-check + (lambda _ + (with-directory-excursion "../js/src/tests" + (substitute* "shell/os.js" + ;; FIXME: Why does the killed process have an exit status? + ((".*killed process should not have exitStatus.*") + "")) + + ;; XXX: Delete all tests that test time zone functionality, + ;; because the test suite uses /etc/localtime to figure out + ;; the offset from the hardware clock, which does not work + ;; in the build container. See . + (delete-file-recursively "non262/Date") + (delete-file "non262/Intl/DateTimeFormat/tz-environment-variable.js") + + (setenv "JSTESTS_EXTRA_ARGS" + (string-join + (list + ;; Do not run tests marked as "random". + "--exclude-random" + ;; Exclude web platform tests. + "--wpt=disabled" + ;; Respect the daemons configured number of jobs. + (string-append "--worker-count=" + (number->string + (parallel-job-count))))))))))))) + (native-inputs + (list autoconf-2.13 + automake + llvm ;for llvm-objdump + perl + pkg-config + python-3 + rust + `(,rust "cargo"))) + (inputs + (list icu4c readline zlib)))) + (define mozilla-compare-locales (origin (method hg-fetch) diff --git a/gnu/packages/polkit.scm b/gnu/packages/polkit.scm index 9a3703b196..38e7f36c2a 100644 --- a/gnu/packages/polkit.scm +++ b/gnu/packages/polkit.scm @@ -90,7 +90,7 @@ "\"/run/setuid-programs/polkit-agent-helper-1\"")))))) (build-system gnu-build-system) (inputs - (list expat linux-pam elogind mozjs nspr)) + (list expat linux-pam elogind mozjs-78 nspr)) (propagated-inputs (list glib)) ; required by polkit-gobject-1.pc (native-inputs -- cgit 1.4.1 From 5ddc99da699ab2d8a2c896b18d23adea1d977174 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 24 Aug 2022 19:44:56 +0200 Subject: gnu: mozjs: Add 91.13.0. * gnu/packages/gnuzilla.scm (mozjs-91): New variable. --- gnu/packages/gnuzilla.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 3fc0355e60..589f123029 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -215,6 +215,37 @@ fractional-second-digits-append-item.js") in C/C++.") (license license:mpl2.0))) ; and others for some files +(define-public mozjs-91 + (package + (inherit mozjs) + (version "91.13.0") + (source (origin + (method url-fetch) + (uri (string-append "https://ftp.mozilla.org/pub/firefox" + "/releases/" version "esr/source/firefox-" + version "esr.source.tar.xz")) + (sha256 + (base32 + "0qh7j960wdp5zcfqhkj8ki47spp9i9ms12xx0v0kxvmmw36jpgjk")))) + (arguments + (substitute-keyword-arguments (package-arguments mozjs) + ((#:phases phases) + #~(modify-phases #$phases + (add-before 'check 'disable-timezone-tests + (lambda _ + (with-directory-excursion "../js/src/tests" + ;; FIXME: Assertion failed: got "2021a", expected "2021a3"? + (delete-file "non262/Intl/DateTimeFormat/timeZone_version.js") + ;; XXX: Delete all tests that test time zone functionality, + ;; because the test suite uses /etc/localtime to figure out + ;; the offset from the hardware clock, which does not work + ;; in the build container. See . + (delete-file-recursively "non262/Date") + (delete-file + "non262/Intl/DateTimeFormat/tz-environment-variable.js")))))))) + (inputs (modify-inputs (package-inputs mozjs) + (replace "icu4c" icu4c))))) + (define-public mozjs-78 (package (inherit mozjs) -- cgit 1.4.1 From 290ac5cd1e67d99b4d704603c1559dfb72f542c2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 25 Aug 2022 12:59:42 +0200 Subject: gnu: polkit: Update to 121. * gnu/packages/polkit.scm (polkit-mozjs): Update to 121. [source](patches): Remove. [source](snippet): Adjust for build system changes. [build-system]: Change to MESON-BUILD-SYSTEM. [inputs]: Replace MOZJS-78 with MOZJS-91. [native-inputs]: Add GETTEXT-MINIMAL and LIBXML2. [arguments]: Remove #:phases. Adjust #:configure-flags for build system changes. Use G-expression. (polkit-duktape)[source]: Remove. [arguments]: Adjust for build build system changes. * gnu/packages/patches/polkit-CVE-2021-4034.patch, gnu/packages/patches/polkit-configure-elogind.patch, gnu/packages/patches/polkit-use-duktape.patch: Delete files. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. --- gnu/local.mk | 3 - gnu/packages/patches/polkit-CVE-2021-4034.patch | 82 - .../patches/polkit-configure-elogind.patch | 15 - gnu/packages/patches/polkit-use-duktape.patch | 5030 -------------------- gnu/packages/polkit.scm | 110 +- 5 files changed, 36 insertions(+), 5204 deletions(-) delete mode 100644 gnu/packages/patches/polkit-CVE-2021-4034.patch delete mode 100644 gnu/packages/patches/polkit-configure-elogind.patch delete mode 100644 gnu/packages/patches/polkit-use-duktape.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 1094e2dfd5..68d2a3dc8c 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1650,9 +1650,6 @@ dist_patch_DATA = \ %D%/packages/patches/plib-CVE-2011-4620.patch \ %D%/packages/patches/plib-CVE-2012-4552.patch \ %D%/packages/patches/plotutils-spline-test.patch \ - %D%/packages/patches/polkit-CVE-2021-4034.patch \ - %D%/packages/patches/polkit-configure-elogind.patch \ - %D%/packages/patches/polkit-use-duktape.patch \ %D%/packages/patches/portaudio-audacity-compat.patch \ %D%/packages/patches/portmidi-modular-build.patch \ %D%/packages/patches/postgresql-disable-resolve_symlinks.patch \ diff --git a/gnu/packages/patches/polkit-CVE-2021-4034.patch b/gnu/packages/patches/polkit-CVE-2021-4034.patch deleted file mode 100644 index ca766cb3be..0000000000 --- a/gnu/packages/patches/polkit-CVE-2021-4034.patch +++ /dev/null @@ -1,82 +0,0 @@ -Fixes CVE-2021-4034, local privilege escalation with 'pkexec': - - https://www.openwall.com/lists/oss-security/2022/01/25/11 - -Patch from . - -From a2bf5c9c83b6ae46cbd5c779d3055bff81ded683 Mon Sep 17 00:00:00 2001 -From: Jan Rybar -Date: Tue, 25 Jan 2022 17:21:46 +0000 -Subject: [PATCH] pkexec: local privilege escalation (CVE-2021-4034) - ---- - src/programs/pkcheck.c | 5 +++++ - src/programs/pkexec.c | 23 ++++++++++++++++++++--- - 2 files changed, 25 insertions(+), 3 deletions(-) - -diff --git a/src/programs/pkcheck.c b/src/programs/pkcheck.c -index f1bb4e1..768525c 100644 ---- a/src/programs/pkcheck.c -+++ b/src/programs/pkcheck.c -@@ -363,6 +363,11 @@ main (int argc, char *argv[]) - local_agent_handle = NULL; - ret = 126; - -+ if (argc < 1) -+ { -+ exit(126); -+ } -+ - /* Disable remote file access from GIO. */ - setenv ("GIO_USE_VFS", "local", 1); - -diff --git a/src/programs/pkexec.c b/src/programs/pkexec.c -index 7698c5c..84e5ef6 100644 ---- a/src/programs/pkexec.c -+++ b/src/programs/pkexec.c -@@ -488,6 +488,15 @@ main (int argc, char *argv[]) - pid_t pid_of_caller; - gpointer local_agent_handle; - -+ -+ /* -+ * If 'pkexec' is called THIS wrong, someone's probably evil-doing. Don't be nice, just bail out. -+ */ -+ if (argc<1) -+ { -+ exit(127); -+ } -+ - ret = 127; - authority = NULL; - subject = NULL; -@@ -614,10 +623,10 @@ main (int argc, char *argv[]) - - path = g_strdup (pwstruct.pw_shell); - if (!path) -- { -+ { - g_printerr ("No shell configured or error retrieving pw_shell\n"); - goto out; -- } -+ } - /* If you change this, be sure to change the if (!command_line) - case below too */ - command_line = g_strdup (path); -@@ -636,7 +645,15 @@ main (int argc, char *argv[]) - goto out; - } - g_free (path); -- argv[n] = path = s; -+ path = s; -+ -+ /* argc<2 and pkexec runs just shell, argv is guaranteed to be null-terminated. -+ * /-less shell shouldn't happen, but let's be defensive and don't write to null-termination -+ */ -+ if (argv[n] != NULL) -+ { -+ argv[n] = path; -+ } - } - if (access (path, F_OK) != 0) - { diff --git a/gnu/packages/patches/polkit-configure-elogind.patch b/gnu/packages/patches/polkit-configure-elogind.patch deleted file mode 100644 index 8fefb7a0c2..0000000000 --- a/gnu/packages/patches/polkit-configure-elogind.patch +++ /dev/null @@ -1,15 +0,0 @@ -Even when the polkit configure script detects elogind, it does not use -it. This patch ensures that elogind is used when it is detected. - -diff -ruN a/configure b/configure ---- a/configure 1969-12-31 19:00:01.000000000 -0500 -+++ b/configure 2021-11-19 00:04:55.581385020 -0500 -@@ -20390,7 +20390,7 @@ - - - -- if test "$have_libsystemd" = "yes"; then -+ if test "$have_libsystemd" = "yes" || test "$have_libelogind" = "yes"; then - HAVE_LIBSYSTEMD_TRUE= - HAVE_LIBSYSTEMD_FALSE='#' - else diff --git a/gnu/packages/patches/polkit-use-duktape.patch b/gnu/packages/patches/polkit-use-duktape.patch deleted file mode 100644 index 4eaa7963c2..0000000000 --- a/gnu/packages/patches/polkit-use-duktape.patch +++ /dev/null @@ -1,5030 +0,0 @@ -From 4f66a9549a393e4d74b93eb85301a04ea94bc750 Mon Sep 17 00:00:00 2001 -From: Wu Xiaotian -Date: Wed, 24 Jul 2019 15:55:17 +0800 -Subject: [PATCH 01/16] Add duktape as javascript engine. - -Signed-off-by: Gustavo Lima Chaves ---- - configure.ac | 28 +- - src/polkitbackend/Makefile.am | 14 +- - .../polkitbackendduktapeauthority.c | 1402 +++++++++++++++++ - 3 files changed, 1436 insertions(+), 8 deletions(-) - create mode 100644 src/polkitbackend/polkitbackendduktapeauthority.c - -diff --git a/configure.ac b/configure.ac -index e434ca2..5a03593 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -80,11 +80,22 @@ PKG_CHECK_MODULES(GLIB, [gmodule-2.0 gio-unix-2.0 >= 2.30.0]) - AC_SUBST(GLIB_CFLAGS) - AC_SUBST(GLIB_LIBS) - --PKG_CHECK_MODULES(LIBJS, [mozjs-78]) -- --AC_SUBST(LIBJS_CFLAGS) --AC_SUBST(LIBJS_CXXFLAGS) --AC_SUBST(LIBJS_LIBS) -+dnl --------------------------------------------------------------------------- -+dnl - Check javascript backend -+dnl --------------------------------------------------------------------------- -+AC_ARG_WITH(duktape, AS_HELP_STRING([--with-duktape],[Use Duktape as javascript backend]),with_duktape=yes,with_duktape=no) -+AS_IF([test x${with_duktape} == xyes], [ -+ PKG_CHECK_MODULES(LIBJS, [duktape >= 2.0.0 ]) -+ AC_SUBST(LIBJS_CFLAGS) -+ AC_SUBST(LIBJS_LIBS) -+], [ -+ PKG_CHECK_MODULES(LIBJS, [mozjs-78]) -+ -+ AC_SUBST(LIBJS_CFLAGS) -+ AC_SUBST(LIBJS_CXXFLAGS) -+ AC_SUBST(LIBJS_LIBS) -+]) -+AM_CONDITIONAL(USE_DUKTAPE, [test x$with_duktape == xyes], [Using duktape as javascript engine library]) - - EXPAT_LIB="" - AC_ARG_WITH(expat, [ --with-expat= Use expat from here], -@@ -585,6 +596,13 @@ echo " - PAM support: ${have_pam} - systemdsystemunitdir: ${systemdsystemunitdir} - polkitd user: ${POLKITD_USER}" -+if test "x${with_duktape}" = xyes; then -+echo " -+ Javascript engine: Duktape" -+else -+echo " -+ Javascript engine: Mozjs" -+fi - - if test "$have_pam" = yes ; then - echo " -diff --git a/src/polkitbackend/Makefile.am b/src/polkitbackend/Makefile.am -index 7e3c080..abcbc6f 100644 ---- a/src/polkitbackend/Makefile.am -+++ b/src/polkitbackend/Makefile.am -@@ -33,7 +33,7 @@ libpolkit_backend_1_la_SOURCES = \ - polkitbackendprivate.h \ - polkitbackendauthority.h polkitbackendauthority.c \ - polkitbackendinteractiveauthority.h polkitbackendinteractiveauthority.c \ -- polkitbackendjsauthority.h polkitbackendjsauthority.cpp \ -+ polkitbackendjsauthority.h \ - polkitbackendactionpool.h polkitbackendactionpool.c \ - polkitbackendactionlookup.h polkitbackendactionlookup.c \ - $(NULL) -@@ -51,19 +51,27 @@ libpolkit_backend_1_la_CFLAGS = \ - -D_POLKIT_BACKEND_COMPILATION \ - $(GLIB_CFLAGS) \ - $(LIBSYSTEMD_CFLAGS) \ -- $(LIBJS_CFLAGS) \ -+ $(LIBJS_CFLAGS) \ - $(NULL) - - libpolkit_backend_1_la_CXXFLAGS = $(libpolkit_backend_1_la_CFLAGS) - - libpolkit_backend_1_la_LIBADD = \ - $(GLIB_LIBS) \ -+ $(DUKTAPE_LIBS) \ - $(LIBSYSTEMD_LIBS) \ - $(top_builddir)/src/polkit/libpolkit-gobject-1.la \ - $(EXPAT_LIBS) \ -- $(LIBJS_LIBS) \ -+ $(LIBJS_LIBS) \ - $(NULL) - -+if USE_DUKTAPE -+libpolkit_backend_1_la_SOURCES += polkitbackendduktapeauthority.c -+libpolkit_backend_1_la_LIBADD += -lm -+else -+libpolkit_backend_1_la_SOURCES += polkitbackendjsauthority.cpp -+endif -+ - rulesdir = $(sysconfdir)/polkit-1/rules.d - rules_DATA = 50-default.rules - -diff --git a/src/polkitbackend/polkitbackendduktapeauthority.c b/src/polkitbackend/polkitbackendduktapeauthority.c -new file mode 100644 -index 0000000..ae98453 ---- /dev/null -+++ b/src/polkitbackend/polkitbackendduktapeauthority.c -@@ -0,0 +1,1402 @@ -+/* -+ * Copyright (C) 2008-2012 Red Hat, Inc. -+ * Copyright (C) 2015 Tangent Space -+ * Copyright (C) 2019 Wu Xiaotian -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General -+ * Public License along with this library; if not, write to the -+ * Free Software Foundation, Inc., 59 Temple Place, Suite 330, -+ * Boston, MA 02111-1307, USA. -+ * -+ * Author: David Zeuthen -+ */ -+ -+#include "config.h" -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#include -+#include "polkitbackendjsauthority.h" -+ -+#include -+ -+#ifdef HAVE_LIBSYSTEMD -+#include -+#endif /* HAVE_LIBSYSTEMD */ -+ -+#include "initjs.h" /* init.js */ -+#include "duktape.h" -+ -+/** -+ * SECTION:polkitbackendjsauthority -+ * @title: PolkitBackendJsAuthority -+ * @short_description: JS Authority -+ * @stability: Unstable -+ * -+ * An implementation of #PolkitBackendAuthority that reads and -+ * evalates Javascript files and supports interaction with -+ * authentication agents (virtue of being based on -+ * #PolkitBackendInteractiveAuthority). -+ */ -+ -+/* ---------------------------------------------------------------------------------------------------- */ -+ -+struct _PolkitBackendJsAuthorityPrivate -+{ -+ gchar **rules_dirs; -+ GFileMonitor **dir_monitors; /* NULL-terminated array of GFileMonitor instances */ -+ duk_context *cx; -+}; -+ -+#define WATCHDOG_TIMEOUT (15 * G_TIME_SPAN_SECOND) -+ -+static void utils_spawn (const gchar *const *argv, -+ guint timeout_seconds, -+ GCancellable *cancellable, -+ GAsyncReadyCallback callback, -+ gpointer user_data); -+ -+gboolean utils_spawn_finish (GAsyncResult *res, -+ gint *out_exit_status, -+ gchar **out_standard_output, -+ gchar **out_standard_error, -+ GError **error); -+ -+static void on_dir_monitor_changed (GFileMonitor *monitor, -+ GFile *file, -+ GFile *other_file, -+ GFileMonitorEvent event_type, -+ gpointer user_data); -+ -+/* ---------------------------------------------------------------------------------------------------- */ -+ -+enum -+{ -+ PROP_0, -+ PROP_RULES_DIRS, -+}; -+ -+/* ---------------------------------------------------------------------------------------------------- */ -+ -+static GList *polkit_backend_js_authority_get_admin_auth_identities (PolkitBackendInteractiveAuthority *authority, -+ PolkitSubject *caller, -+ PolkitSubject *subject, -+ PolkitIdentity *user_for_subject, -+ gboolean subject_is_local, -+ gboolean subject_is_active, -+ const gchar *action_id, -+ PolkitDetails *details); -+ -+static PolkitImplicitAuthorization polkit_backend_js_authority_check_authorization_sync ( -+ PolkitBackendInteractiveAuthority *authority, -+ PolkitSubject *caller, -+ PolkitSubject *subject, -+ PolkitIdentity *user_for_subject, -+ gboolean subject_is_local, -+ gboolean subject_is_active, -+ const gchar *action_id, -+ PolkitDetails *details, -+ PolkitImplicitAuthorization implicit); -+ -+G_DEFINE_TYPE (PolkitBackendJsAuthority, polkit_backend_js_authority, POLKIT_BACKEND_TYPE_INTERACTIVE_AUTHORITY); -+ -+/* ---------------------------------------------------------------------------------------------------- */ -+ -+/* ---------------------------------------------------------------------------------------------------- */ -+ -+static void -+polkit_backend_js_authority_init (PolkitBackendJsAuthority *authority) -+{ -+ authority->priv = G_TYPE_INSTANCE_GET_PRIVATE (authority, -+ POLKIT_BACKEND_TYPE_JS_AUTHORITY, -+ PolkitBackendJsAuthorityPrivate); -+} -+ -+static gint -+rules_file_name_cmp (const gchar *a, -+ const gchar *b) -+{ -+ gint ret; -+ const gchar *a_base; -+ const gchar *b_base; -+ -+ a_base = strrchr (a, '/'); -+ b_base = strrchr (b, '/'); -+ -+ g_assert (a_base != NULL); -+ g_assert (b_base != NULL); -+ a_base += 1; -+ b_base += 1; -+ -+ ret = g_strcmp0 (a_base, b_base); -+ if (ret == 0) -+ { -+ /* /etc wins over /usr */ -+ ret = g_strcmp0 (a, b); -+ g_assert (ret != 0); -+ } -+ -+ return ret; -+} -+ -+static void -+load_scripts (PolkitBackendJsAuthority *authority) -+{ -+ duk_context *cx = authority->priv->cx; -+ GList *files = NULL; -+ GList *l; -+ guint num_scripts = 0; -+ GError *error = NULL; -+ guint n; -+ -+ files = NULL; -+ -+ for (n = 0; authority->priv->rules_dirs != NULL && authority->priv->rules_dirs[n] != NULL; n++) -+ { -+ const gchar *dir_name = authority->priv->rules_dirs[n]; -+ GDir *dir = NULL; -+ -+ polkit_backend_authority_log (POLKIT_BACKEND_AUTHORITY (authority), -+ "Loading rules from directory %s", -+ dir_name); -+ -+ dir = g_dir_open (dir_name, -+ 0, -+ &error); -+ if (dir == NULL) -+ { -+ polkit_backend_authority_log (POLKIT_BACKEND_AUTHORITY (authority), -+ "Error opening rules directory: %s (%s, %d)", -+ error->message, g_quark_to_string (error->domain), error->code); -+ g_clear_error (&error); -+ } -+ else -+ { -+ const gchar *name; -+ while ((name = g_dir_read_name (dir)) != NULL) -+ { -+ if (g_str_has_suffix (name, ".rules")) -+ files = g_list_prepend (files, g_strdup_printf ("%s/%s", dir_name, name)); -+ } -+ g_dir_close (dir); -+ } -+ } -+ -+ files = g_list_sort (files, (GCompareFunc) rules_file_name_cmp); -+ -+ for (l = files; l != NULL; l = l->next) -+ { -+ const gchar *filename = l->data; -+ -+#if (DUK_VERSION >= 20000) -+ gchar *contents; -+ gsize length; -+ GError *error = NULL; -+ if (!g_file_get_contents (filename, &contents, &length, &error)){ -+ g_warning("Error when file contents of %s: %s\n", filename, error->message); -+ g_error_free (error); -+ continue; -+ } -+ if (duk_peval_lstring_noresult(cx, contents,length) != 0) -+#else -+ if (duk_peval_file_noresult (cx, filename) != 0) -+#endif -+ { -+ polkit_backend_authority_log (POLKIT_BACKEND_AUTHORITY (authority), -+ "Error compiling script %s: %s", -+ filename, duk_safe_to_string (authority->priv->cx, -1)); -+#if (DUK_VERSION >= 20000) -+ g_free (contents); -+#endif -+ continue; -+ } -+#if (DUK_VERSION >= 20000) -+ g_free (contents); -+#endif -+ num_scripts++; -+ } -+ -+ polkit_backend_authority_log (POLKIT_BACKEND_AUTHORITY (authority), -+ "Finished loading, compiling and executing %d rules", -+ num_scripts); -+ g_list_free_full (files, g_free); -+} -+ -+static void -+reload_scripts (PolkitBackendJsAuthority *authority) -+{ -+ duk_context *cx = authority->priv->cx; -+ -+ duk_set_top (cx, 0); -+ duk_get_global_string (cx, "polkit"); -+ duk_push_string (cx, "_deleteRules"); -+ -+ duk_call_prop (cx, 0, 0); -+ -+ polkit_backend_authority_log (POLKIT_BACKEND_AUTHORITY (authority), -+ "Collecting garbage unconditionally..."); -+ -+ load_scripts (authority); -+ -+ /* Let applications know we have new rules... */ -+ g_signal_emit_by_name (authority, "changed"); -+} -+ -+static void -+on_dir_monitor_changed (GFileMonitor *monitor, -+ GFile *file, -+ GFile *other_file, -+ GFileMonitorEvent event_type, -+ gpointer user_data) -+{ -+ PolkitBackendJsAuthority *authority = POLKIT_BACKEND_JS_AUTHORITY (user_data); -+ -+ /* TODO: maybe rate-limit so storms of events are collapsed into one with a 500ms resolution? -+ * Because when editing a file with emacs we get 4-8 events.. -+ */ -+ -+ if (file != NULL) -+ { -+ gchar *name; -+ -+ name = g_file_get_basename (file); -+ -+ /* g_print ("event_type=%d file=%p name=%s\n", event_type, file, name); */ -+ if (!g_str_has_prefix (name, ".") && -+ !g_str_has_prefix (name, "#") && -+ g_str_has_suffix (name, ".rules") && -+ (event_type == G_FILE_MONITOR_EVENT_CREATED || -+ event_type == G_FILE_MONITOR_EVENT_DELETED || -+ event_type == G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT)) -+ { -+ polkit_backend_authority_log (POLKIT_BACKEND_AUTHORITY (authority), -+ "Reloading rules"); -+ reload_scripts (authority); -+ } -+ g_free (name); -+ } -+} -+ -+ -+static void -+setup_file_monitors (PolkitBackendJsAuthority *authority) -+{ -+ guint n; -+ GPtrArray *p; -+ -+ p = g_ptr_array_new (); -+ for (n = 0; authority->priv->rules_dirs != NULL && authority->priv->rules_dirs[n] != NULL; n++) -+ { -+ GFile *file; -+ GError *error; -+ GFileMonitor *monitor; -+ -+ file = g_file_new_for_path (authority->priv->rules_dirs[n]); -+ error = NULL; -+ monitor = g_file_monitor_directory (file, -+ G_FILE_MONITOR_NONE, -+ NULL, -+ &error); -+ g_object_unref (file); -+ if (monitor == NULL) -+ { -+ g_warning ("Error monitoring directory %s: %s", -+ authority->priv->rules_dirs[n], -+ error->message); -+ g_clear_error (&error); -+ } -+ else -+ { -+ g_signal_connect (monitor, -+ "changed", -+ G_CALLBACK (on_dir_monitor_changed), -+ authority); -+ g_ptr_array_add (p, monitor); -+ } -+ } -+ g_ptr_array_add (p, NULL); -+ authority->priv->dir_monitors = (GFileMonitor**) g_ptr_array_free (p, FALSE); -+} -+ -+static duk_ret_t js_polkit_log (duk_context *cx); -+static duk_ret_t js_polkit_spawn (duk_context *cx); -+static duk_ret_t js_polkit_user_is_in_netgroup (duk_context *cx); -+ -+static const duk_function_list_entry js_polkit_functions[] = -+{ -+ { "log", js_polkit_log, 1 }, -+ { "spawn", js_polkit_spawn, 1 }, -+ { "_userIsInNetGroup", js_polkit_user_is_in_netgroup, 2 }, -+ { NULL, NULL, 0 }, -+}; -+ -+static void -+polkit_backend_js_authority_constructed (GObject *object) -+{ -+ PolkitBackendJsAuthority *authority = POLKIT_BACKEND_JS_AUTHORITY (object); -+ duk_context *cx; -+ -+ cx = duk_create_heap (NULL, NULL, NULL, authority, NULL); -+ if (cx == NULL) -+ goto fail; -+ -+ authority->priv->cx = cx; -+ -+ duk_push_global_object (cx); -+ duk_push_object (cx); -+ duk_put_function_list (cx, -1, js_polkit_functions); -+ duk_put_prop_string (cx, -2, "polkit"); -+ -+ duk_eval_string (cx, init_js); -+ -+ if (authority->priv->rules_dirs == NULL) -+ { -+ authority->priv->rules_dirs = g_new0 (gchar *, 3); -+ authority->priv->rules_dirs[0] = g_strdup (PACKAGE_SYSCONF_DIR "/polkit-1/rules.d"); -+ authority->priv->rules_dirs[1] = g_strdup (PACKAGE_DATA_DIR "/polkit-1/rules.d"); -+ } -+ -+ setup_file_monitors (authority); -+ load_scripts (authority); -+ -+ G_OBJECT_CLASS (polkit_backend_js_authority_parent_class)->constructed (object); -+ return; -+ -+ fail: -+ g_critical ("Error initializing JavaScript environment"); -+ g_assert_not_reached (); -+} -+ -+static void -+polkit_backend_js_authority_finalize (GObject *object) -+{ -+ PolkitBackendJsAuthority *authority = POLKIT_BACKEND_JS_AUTHORITY (object); -+ guint n; -+ -+ for (n = 0; authority->priv->dir_monitors != NULL && authority->priv->dir_monitors[n] != NULL; n++) -+ { -+ GFileMonitor *monitor = authority->priv->dir_monitors[n]; -+ g_signal_handlers_disconnect_by_func (monitor, -+ G_CALLBACK (on_dir_monitor_changed), -+ authority); -+ g_object_unref (monitor); -+ } -+ g_free (authority->priv->dir_monitors); -+ g_strfreev (authority->priv->rules_dirs); -+ -+ duk_destroy_heap (authority->priv->cx); -+ -+ G_OBJECT_CLASS (polkit_backend_js_authority_parent_class)->finalize (object); -+} -+ -+static void -+polkit_backend_js_authority_set_property (GObject *object, -+ guint property_id, -+ const GValue *value, -+ GParamSpec *pspec) -+{ -+ PolkitBackendJsAuthority *authority = POLKIT_BACKEND_JS_AUTHORITY (object); -+ -+ switch (property_id) -+ { -+ case PROP_RULES_DIRS: -+ g_assert (authority->priv->rules_dirs == NULL); -+ authority->priv->rules_dirs = (gchar **) g_value_dup_boxed (value); -+ break; -+ -+ default: -+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); -+ break; -+ } -+} -+ -+static const gchar * -+polkit_backend_js_authority_get_name (PolkitBackendAuthority *authority) -+{ -+ return "js"; -+} -+ -+static const gchar * -+polkit_backend_js_authority_get_version (PolkitBackendAuthority *authority) -+{ -+ return PACKAGE_VERSION; -+} -+ -+static PolkitAuthorityFeatures -+polkit_backend_js_authority_get_features (PolkitBackendAuthority *authority) -+{ -+ return POLKIT_AUTHORITY_FEATURES_TEMPORARY_AUTHORIZATION; -+} -+ -+static void -+polkit_backend_js_authority_class_init (PolkitBackendJsAuthorityClass *klass) -+{ -+ GObjectClass *gobject_class; -+ PolkitBackendAuthorityClass *authority_class; -+ PolkitBackendInteractiveAuthorityClass *interactive_authority_class; -+ -+ -+ gobject_class = G_OBJECT_CLASS (klass); -+ gobject_class->finalize = polkit_backend_js_authority_finalize; -+ gobject_class->set_property = polkit_backend_js_authority_set_property; -+ gobject_class->constructed = polkit_backend_js_authority_constructed; -+ -+ authority_class = POLKIT_BACKEND_AUTHORITY_CLASS (klass); -+ authority_class->get_name = polkit_backend_js_authority_get_name; -+ authority_class->get_version = polkit_backend_js_authority_get_version; -+ authority_class->get_features = polkit_backend_js_authority_get_features; -+ -+ interactive_authority_class = POLKIT_BACKEND_INTERACTIVE_AUTHORITY_CLASS (klass); -+ interactive_authority_class->get_admin_identities = polkit_backend_js_authority_get_admin_auth_identities; -+ interactive_authority_class->check_authorization_sync = polkit_backend_js_authority_check_authorization_sync; -+ -+ g_object_class_install_property (gobject_class, -+ PROP_RULES_DIRS, -+ g_param_spec_boxed ("rules-dirs", -+ NULL, -+ NULL, -+ G_TYPE_STRV, -+ G_PARAM_CONSTRUCT_ONLY | G_PARAM_WRITABLE)); -+ -+ -+ g_type_class_add_private (klass, sizeof (PolkitBackendJsAuthorityPrivate)); -+} -+ -+/* ---------------------------------------------------------------------------------------------------- */ -+ -+static void -+set_property_str (duk_context *cx, -+ const gchar *name, -+ const gchar *value) -+{ -+ duk_push_string (cx, value); -+ duk_put_prop_string (cx, -2, name); -+} -+ -+static void -+set_property_strv (duk_context *cx, -+ const gchar *name, -+ GPtrArray *value) -+{ -+ guint n; -+ duk_push_array (cx); -+ for (n = 0; n < value->len; n++) -+ { -+ duk_push_string (cx, g_ptr_array_index (value, n)); -+ duk_put_prop_index (cx, -2, n); -+ } -+ duk_put_prop_string (cx, -2, name); -+} -+ -+static void -+set_property_int32 (duk_context *cx, -+ const gchar *name, -+ gint32 value) -+{ -+ duk_push_int (cx, value); -+ duk_put_prop_string (cx, -2, name); -+} -+ -+static void -+set_property_bool (duk_context *cx, -+ const char *name, -+ gboolean value) -+{ -+ duk_push_boolean (cx, value); -+ duk_put_prop_string (cx, -2, name); -+} -+ -+/* ---------------------------------------------------------------------------------------------------- */ -+ -+static gboolean -+push_subject (duk_context *cx, -+ PolkitSubject *subject, -+ PolkitIdentity *user_for_subject, -+ gboolean subject_is_local, -+ gboolean subject_is_active, -+ GError **error) -+{ -+ gboolean ret = FALSE; -+ pid_t pid; -+ uid_t uid; -+ gchar *user_name = NULL; -+ GPtrArray *groups = NULL; -+ struct passwd *passwd; -+ char *seat_str = NULL; -+ char *session_str = NULL; -+ -+ duk_get_global_string (cx, "Subject"); -+ duk_new (cx, 0); -+ -+ if (POLKIT_IS_UNIX_PROCESS (subject)) -+ { -+ pid = polkit_unix_process_get_pid (POLKIT_UNIX_PROCESS (subject)); -+ } -+ else if (POLKIT_IS_SYSTEM_BUS_NAME (subject)) -+ { -+ PolkitSubject *process; -+ process = polkit_system_bus_name_get_process_sync (POLKIT_SYSTEM_BUS_NAME (subject), NULL, error); -+ if (process == NULL) -+ goto out; -+ pid = polkit_unix_process_get_pid (POLKIT_UNIX_PROCESS (process)); -+ g_object_unref (process); -+ } -+ else -+ { -+ g_assert_not_reached (); -+ } -+ -+#ifdef HAVE_LIBSYSTEMD -+ if (sd_pid_get_session (pid, &session_str) == 0) -+ { -+ if (sd_session_get_seat (session_str, &seat_str) == 0) -+ { -+ /* do nothing */ -+ } -+ } -+#endif /* HAVE_LIBSYSTEMD */ -+ -+ g_assert (POLKIT_IS_UNIX_USER (user_for_subject)); -+ uid = polkit_unix_user_get_uid (POLKIT_UNIX_USER (user_for_subject)); -+ -+ groups = g_ptr_array_new_with_free_func (g_free); -+ -+ passwd = getpwuid (uid); -+ if (passwd == NULL) -+ { -+ user_name = g_strdup_printf ("%d", (gint) uid); -+ g_warning ("Error looking up info for uid %d: %m", (gint) uid); -+ } -+ else -+ { -+ gid_t gids[512]; -+ int num_gids = 512; -+ -+ user_name = g_strdup (passwd->pw_name); -+ -+ if (getgrouplist (passwd->pw_name, -+ passwd->pw_gid, -+ gids, -+ &num_gids) < 0) -+ { -+ g_warning ("Error looking up groups for uid %d: %m", (gint) uid); -+ } -+ else -+ { -+ gint n; -+ for (n = 0; n < num_gids; n++) -+ { -+ struct group *group; -+ group = getgrgid (gids[n]); -+ if (group == NULL) -+ { -+ g_ptr_array_add (groups, g_strdup_printf ("%d", (gint) gids[n])); -+ } -+ else -+ { -+ g_ptr_array_add (groups, g_strdup (group->gr_name)); -+ } -+ } -+ } -+ } -+ -+ set_property_int32 (cx, "pid", pid); -+ set_property_str (cx, "user", user_name); -+ set_property_strv (cx, "groups", groups); -+ set_property_str (cx, "seat", seat_str); -+ set_property_str (cx, "session", session_str); -+ set_property_bool (cx, "local", subject_is_local); -+ set_property_bool (cx, "active", subject_is_active); -+ -+ ret = TRUE; -+ -+ out: -+ free (session_str); -+ free (seat_str); -+ g_free (user_name); -+ if (groups != NULL) -+ g_ptr_array_unref (groups); -+ -+ return ret; -+} -+ -+/* ---------------------------------------------------------------------------------------------------- */ -+ -+static gboolean -+push_action_and_details (duk_context *cx, -+ const gchar *action_id, -+ PolkitDetails *details, -+ GError **error) -+{ -+ gchar **keys; -+ guint n; -+ -+ duk_get_global_string (cx, "Action"); -+ duk_new (cx, 0); -+ -+ set_property_str (cx, "id", action_id); -+ -+ keys = polkit_details_get_keys (details); -+ for (n = 0; keys != NULL && keys[n] != NULL; n++) -+ { -+ gchar *key; -+ const gchar *value; -+ key = g_strdup_printf ("_detail_%s", keys[n]); -+ value = polkit_details_lookup (details, keys[n]); -+ set_property_str (cx, key, value); -+ g_free (key); -+ } -+ g_strfreev (keys); -+ -+ return TRUE; -+} -+ -+/* ---------------------------------------------------------------------------------------------------- */ -+ -+/* ---------------------------------------------------------------------------------------------------- */ -+ -+static GList * -+polkit_backend_js_authority_get_admin_auth_identities (PolkitBackendInteractiveAuthority *_authority, -+ PolkitSubject *caller, -+ PolkitSubject *subject, -+ PolkitIdentity *user_for_subject, -+ gboolean subject_is_local, -+ gboolean subject_is_active, -+ const gchar *action_id, -+ PolkitDetails *details) -+{ -+ PolkitBackendJsAuthority *authority = POLKIT_BACKEND_JS_AUTHORITY (_authority); -+ GList *ret = NULL; -+ guint n; -+ GError *error = NULL; -+ const char *ret_str = NULL; -+ gchar **ret_strs = NULL; -+ duk_context *cx = authority->priv->cx; -+ -+ duk_set_top (cx, 0); -+ duk_get_global_string (cx, "polkit"); -+ duk_push_string (cx, "_runAdminRules"); -+ -+ if (!push_action_and_details (cx, action_id, details, &error)) -+ { -+ polkit_backend_authority_log (POLKIT_BACKEND_AUTHORITY (authority), -+ "Error converting action and details to JS object: %s", -+ error->message); -+ g_clear_error (&error); -+ goto out; -+ } -+ -+ if (!push_subject (cx, subject, user_for_subject, subject_is_local, subject_is_active, &error)) -+ { -+ polkit_backend_authority_log (POLKIT_BACKEND_AUTHORITY (authority), -+ "Error converting subject to JS object: %s", -+ error->message); -+ g_clear_error (&error); -+ goto out; -+ } -+ -+ if (duk_pcall_prop (cx, 0, 2) != DUK_ERR_NONE) -+ { -+ polkit_backend_authority_log (POLKIT_BACKEND_AUTHORITY (authority), -+ "Error evaluating admin rules: ", -+ duk_safe_to_string (cx, -1)); -+ goto out; -+ } -+ -+ ret_str = duk_require_string (cx, -1); -+ -+ ret_strs = g_strsplit (ret_str, ",", -1); -+ for (n = 0; ret_strs != NULL && ret_strs[n] != NULL; n++) -+ { -+ const gchar *identity_str = ret_strs[n]; -+ PolkitIdentity *identity; -+ -+ error = NULL; -+ identity = polkit_identity_from_string (identity_str, &error); -+ if (identity == NULL) -+ { -+ polkit_backend_authority_log (POLKIT_BACKEND_AUTHORITY (authority), -+ "Identity `%s' is not valid, ignoring: %s", -+ identity_str, error->message); -+ g_clear_error (&error); -+ } -+ else -+ { -+ ret = g_list_prepend (ret, identity); -+ } -+ } -+ ret = g_list_reverse (ret); -+ -+ out: -+ g_strfreev (ret_strs); -+ /* fallback to root password auth */ -+ if (ret == NULL) -+ ret = g_list_prepend (ret, polkit_unix_user_new (0)); -+ -+ return ret; -+} -+ -+/* ---------------------------------------------------------------------------------------------------- */ -+ -+static PolkitImplicitAuthorization -+polkit_backend_js_authority_check_authorization_sync (PolkitBackendInteractiveAuthority *_authority, -+ PolkitSubject *caller, -+ PolkitSubject *subject, -+ PolkitIdentity *user_for_subject, -+ gboolean subject_is_local, -+ gboolean subject_is_active, -+ const gchar *action_id, -+ PolkitDetails *details, -+ PolkitImplicitAuthorization implicit) -+{ -+ PolkitBackendJsAuthority *authority = POLKIT_BACKEND_JS_AUTHORITY (_authority); -+ PolkitImplicitAuthorization ret = implicit; -+ GError *error = NULL; -+ gchar *ret_str = NULL; -+ gboolean good = FALSE; -+ duk_context *cx = authority->priv->cx; -+ -+ duk_set_top (cx, 0); -+ duk_get_global_string (cx, "polkit"); -+ duk_push_string (cx, "_runRules"); -+ -+ if (!push_action_and_details (cx, action_id, details, &error)) -+ { -+ polkit_backend_authority_log (POLKIT_BACKEND_AUTHORITY (authority), -+ "Error converting action and details to JS object: %s", -+ error->message); -+ g_clear_error (&error); -+ goto out; -+ } -+ -+ if (!push_subject (cx, subject, user_for_subject, subject_is_local, subject_is_active, &error)) -+ { -+ polkit_backend_authority_log (POLKIT_BACKEND_AUTHORITY (authority), -+ "Error converting subject to JS object: %s", -+ error->message); -+ g_clear_error (&error); -+ goto out; -+ } -+ -+ if (duk_pcall_prop (cx, 0, 2) != DUK_ERR_NONE) -+ { -+ polkit_backend_authority_log (POLKIT_BACKEND_AUTHORITY (authority), -+ "Error evaluating authorization rules: ", -+ duk_safe_to_string (cx, -1)); -+ goto out; -+ } -+ -+ if (duk_is_null(cx, -1)) { -+ good = TRUE; -+ goto out; -+ } -+ ret_str = g_strdup (duk_require_string (cx, -1)); -+ if (!polkit_implicit_authorization_from_string (ret_str, &ret)) -+ { -+ polkit_backend_authority_log (POLKIT_BACKEND_AUTHORITY (authority), -+ "Returned result `%s' is not valid", -+ ret_str); -+ goto out; -+ } -+ -+ good = TRUE; -+ -+ out: -+ if (!good) -+ ret = POLKIT_IMPLICIT_AUTHORIZATION_NOT_AUTHORIZED; -+ g_free (ret_str); -+ -+ return ret; -+} -+ -+/* ---------------------------------------------------------------------------------------------------- */ -+ -+static duk_ret_t -+js_polkit_log (duk_context *cx) -+{ -+ const char *str = duk_require_string (cx, 0); -+ fprintf (stderr, "%s\n", str); -+ return 0; -+} -+ -+/* ---------------------------------------------------------------------------------------------------- */ -+ -+static const gchar * -+get_signal_name (gint signal_number) -+{ -+ switch (signal_number) -+ { -+#define _HANDLE_SIG(sig) case sig: return #sig; -+ _HANDLE_SIG (SIGHUP); -+ _HANDLE_SIG (SIGINT); -+ _HANDLE_SIG (SIGQUIT); -+ _HANDLE_SIG (SIGILL); -+ _HANDLE_SIG (SIGABRT); -+ _HANDLE_SIG (SIGFPE); -+ _HANDLE_SIG (SIGKILL); -+ _HANDLE_SIG (SIGSEGV); -+ _HANDLE_SIG (SIGPIPE); -+ _HANDLE_SIG (SIGALRM); -+ _HANDLE_SIG (SIGTERM); -+ _HANDLE_SIG (SIGUSR1); -+ _HANDLE_SIG (SIGUSR2); -+ _HANDLE_SIG (SIGCHLD); -+ _HANDLE_SIG (SIGCONT); -+ _HANDLE_SIG (SIGSTOP); -+ _HANDLE_SIG (SIGTSTP); -+ _HANDLE_SIG (SIGTTIN); -+ _HANDLE_SIG (SIGTTOU); -+ _HANDLE_SIG (SIGBUS); -+#ifdef SIGPOLL -+ _HANDLE_SIG (SIGPOLL); -+#endif -+ _HANDLE_SIG (SIGPROF); -+ _HANDLE_SIG (SIGSYS); -+ _HANDLE_SIG (SIGTRAP); -+ _HANDLE_SIG (SIGURG); -+ _HANDLE_SIG (SIGVTALRM); -+ _HANDLE_SIG (SIGXCPU); -+ _HANDLE_SIG (SIGXFSZ); -+#undef _HANDLE_SIG -+ default: -+ break; -+ } -+ return "UNKNOWN_SIGNAL"; -+} -+ -+typedef struct -+{ -+ GMainLoop *loop; -+ GAsyncResult *res; -+} SpawnData; -+ -+static void -+spawn_cb (GObject *source_object, -+ GAsyncResult *res, -+ gpointer user_data) -+{ -+ SpawnData *data = user_data; -+ data->res = g_object_ref (res); -+ g_main_loop_quit (data->loop); -+} -+ -+static duk_ret_t -+js_polkit_spawn (duk_context *cx) -+{ -+#if (DUK_VERSION >= 20000) -+ duk_ret_t ret = DUK_RET_ERROR; -+#else -+ duk_ret_t ret = DUK_RET_INTERNAL_ERROR; -+#endif -+ gchar *standard_output = NULL; -+ gchar *standard_error = NULL; -+ gint exit_status; -+ GError *error = NULL; -+ guint32 array_len; -+ gchar **argv = NULL; -+ GMainContext *context = NULL; -+ GMainLoop *loop = NULL; -+ SpawnData data = {0}; -+ char *err_str = NULL; -+ guint n; -+ -+ if (!duk_is_array (cx, 0)) -+ goto out; -+ -+ array_len = duk_get_length (cx, 0); -+ -+ argv = g_new0 (gchar*, array_len + 1); -+ for (n = 0; n < array_len; n++) -+ { -+ duk_get_prop_index (cx, 0, n); -+ argv[n] = g_strdup (duk_to_string (cx, -1)); -+ duk_pop (cx); -+ } -+ -+ context = g_main_context_new (); -+ loop = g_main_loop_new (context, FALSE); -+ -+ g_main_context_push_thread_default (context); -+ -+ data.loop = loop; -+ utils_spawn ((const gchar *const *) argv, -+ 10, /* timeout_seconds */ -+ NULL, /* cancellable */ -+ spawn_cb, -+ &data); -+ -+ g_main_loop_run (loop); -+ -+ g_main_context_pop_thread_default (context); -+ -+ if (!utils_spawn_finish (data.res, -+ &exit_status, -+ &standard_output, -+ &standard_error, -+ &error)) -+ { -+ err_str = g_strdup_printf ("Error spawning helper: %s (%s, %d)", -+ error->message, g_quark_to_string (error->domain), error->code); -+ g_clear_error (&error); -+ goto out; -+ } -+ -+ if (!(WIFEXITED (exit_status) && WEXITSTATUS (exit_status) == 0)) -+ { -+ GString *gstr; -+ gstr = g_string_new (NULL); -+ if (WIFEXITED (exit_status)) -+ { -+ g_string_append_printf (gstr, -+ "Helper exited with non-zero exit status %d", -+ WEXITSTATUS (exit_status)); -+ } -+ else if (WIFSIGNALED (exit_status)) -+ { -+ g_string_append_printf (gstr, -+ "Helper was signaled with signal %s (%d)", -+ get_signal_name (WTERMSIG (exit_status)), -+ WTERMSIG (exit_status)); -+ } -+ g_string_append_printf (gstr, ", stdout=`%s', stderr=`%s'", -+ standard_output, standard_error); -+ err_str = g_string_free (gstr, FALSE); -+ goto out; -+ } -+ -+ duk_push_string (cx, standard_output); -+ ret = 1; -+ -+ out: -+ g_strfreev (argv); -+ g_free (standard_output); -+ g_free (standard_error); -+ g_clear_object (&data.res); -+ if (loop != NULL) -+ g_main_loop_unref (loop); -+ if (context != NULL) -+ g_main_context_unref (context); -+ -+ if (err_str) -+ duk_error (cx, DUK_ERR_ERROR, err_str); -+ -+ return ret; -+} -+ -+/* ---------------------------------------------------------------------------------------------------- */ -+ -+ -+static duk_ret_t -+js_polkit_user_is_in_netgroup (duk_context *cx) -+{ -+ const char *user; -+ const char *netgroup; -+ gboolean is_in_netgroup = FALSE; -+ -+ user = duk_require_string (cx, 0); -+ netgroup = duk_require_string (cx, 1); -+ -+ if (innetgr (netgroup, -+ NULL, /* host */ -+ user, -+ NULL)) /* domain */ -+ { -+ is_in_netgroup = TRUE; -+ } -+ -+ duk_push_boolean (cx, is_in_netgroup); -+ return 1; -+} -+ -+/* ---------------------------------------------------------------------------------------------------- */ -+ -+typedef struct -+{ -+ GSimpleAsyncResult *simple; /* borrowed reference */ -+ GMainContext *main_context; /* may be NULL */ -+ -+ GCancellable *cancellable; /* may be NULL */ -+ gulong cancellable_handler_id; -+ -+ GPid child_pid; -+ gint child_stdout_fd; -+ gint child_stderr_fd; -+ -+ GIOChannel *child_stdout_channel; -+ GIOChannel *child_stderr_channel; -+ -+ GSource *child_watch_source; -+ GSource *child_stdout_source; -+ GSource *child_stderr_source; -+ -+ guint timeout_seconds; -+ gboolean timed_out; -+ GSource *timeout_source; -+ -+ GString *child_stdout; -+ GString *child_stderr; -+ -+ gint exit_status; -+} UtilsSpawnData; -+ -+static void -+utils_child_watch_from_release_cb (GPid pid, -+ gint status, -+ gpointer user_data) -+{ -+} -+ -+static void -+utils_spawn_data_free (UtilsSpawnData *data) -+{ -+ if (data->timeout_source != NULL) -+ { -+ g_source_destroy (data->timeout_source); -+ data->timeout_source = NULL; -+ } -+ -+ /* Nuke the child, if necessary */ -+ if (data->child_watch_source != NULL) -+ { -+ g_source_destroy (data->child_watch_source); -+ data->child_watch_source = NULL; -+ } -+ -+ if (data->child_pid != 0) -+ { -+ GSource *source; -+ kill (data->child_pid, SIGTERM); -+ /* OK, we need to reap for the child ourselves - we don't want -+ * to use waitpid() because that might block the calling -+ * thread (the child might handle SIGTERM and use several -+ * seconds for cleanup/rollback). -+ * -+ * So we use GChildWatch instead. -+ * -+ * Avoid taking a references to ourselves. but note that we need -+ * to pass the GSource so we can nuke it once handled. -+ */ -+ source = g_child_watch_source_new (data->child_pid); -+ g_source_set_callback (source, -+ (GSourceFunc) utils_child_watch_from_release_cb, -+ source, -+ (GDestroyNotify) g_source_destroy); -+ g_source_attach (source, data->main_context); -+ g_source_unref (source); -+ data->child_pid = 0; -+ } -+ -+ if (data->child_stdout != NULL) -+ { -+ g_string_free (data->child_stdout, TRUE); -+ data->child_stdout = NULL; -+ } -+ -+ if (data->child_stderr != NULL) -+ { -+ g_string_free (data->child_stderr, TRUE); -+ data->child_stderr = NULL; -+ } -+ -+ if (data->child_stdout_channel != NULL) -+ { -+ g_io_channel_unref (data->child_stdout_channel); -+ data->child_stdout_channel = NULL; -+ } -+ if (data->child_stderr_channel != NULL) -+ { -+ g_io_channel_unref (data->child_stderr_channel); -+ data->child_stderr_channel = NULL; -+ } -+ -+ if (data->child_stdout_source != NULL) -+ { -+ g_source_destroy (data->child_stdout_source); -+ data->child_stdout_source = NULL; -+ } -+ if (data->child_stderr_source != NULL) -+ { -+ g_source_destroy (data->child_stderr_source); -+ data->child_stderr_source = NULL; -+ } -+ -+ if (data->child_stdout_fd != -1) -+ { -+ g_warn_if_fail (close (data->child_stdout_fd) == 0); -+ data->child_stdout_fd = -1; -+ } -+ if (data->child_stderr_fd != -1) -+ { -+ g_warn_if_fail (close (data->child_stderr_fd) == 0); -+ data->child_stderr_fd = -1; -+ } -+ -+ if (data->cancellable_handler_id > 0) -+ { -+ g_cancellable_disconnect (data->cancellable, data->cancellable_handler_id); -+ data->cancellable_handler_id = 0; -+ } -+ -+ if (data->main_context != NULL) -+ g_main_context_unref (data->main_context); -+ -+ if (data->cancellable != NULL) -+ g_object_unref (data->cancellable); -+ -+ g_slice_free (UtilsSpawnData, data); -+} -+ -+/* called in the thread where @cancellable was cancelled */ -+static void -+utils_on_cancelled (GCancellable *cancellable, -+ gpointer user_data) -+{ -+ UtilsSpawnData *data = user_data; -+ GError *error; -+ -+ error = NULL; -+ g_warn_if_fail (g_cancellable_set_error_if_cancelled (cancellable, &error)); -+ g_simple_async_result_take_error (data->simple, error); -+ g_simple_async_result_complete_in_idle (data->simple); -+ g_object_unref (data->simple); -+} -+ -+static gboolean -+utils_read_child_stderr (GIOChannel *channel, -+ GIOCondition condition, -+ gpointer user_data) -+{ -+ UtilsSpawnData *data = user_data; -+ gchar buf[1024]; -+ gsize bytes_read; -+ -+ g_io_channel_read_chars (channel, buf, sizeof buf, &bytes_read, NULL); -+ g_string_append_len (data->child_stderr, buf, bytes_read); -+ return TRUE; -+} -+ -+static gboolean -+utils_read_child_stdout (GIOChannel *channel, -+ GIOCondition condition, -+ gpointer user_data) -+{ -+ UtilsSpawnData *data = user_data; -+ gchar buf[1024]; -+ gsize bytes_read; -+ -+ g_io_channel_read_chars (channel, buf, sizeof buf, &bytes_read, NULL); -+ g_string_append_len (data->child_stdout, buf, bytes_read); -+ return TRUE; -+} -+ -+static void -+utils_child_watch_cb (GPid pid, -+ gint status, -+ gpointer user_data) -+{ -+ UtilsSpawnData *data = user_data; -+ gchar *buf; -+ gsize buf_size; -+ -+ if (g_io_channel_read_to_end (data->child_stdout_channel, &buf, &buf_size, NULL) == G_IO_STATUS_NORMAL) -+ { -+ g_string_append_len (data->child_stdout, buf, buf_size); -+ g_free (buf); -+ } -+ if (g_io_channel_read_to_end (data->child_stderr_channel, &buf, &buf_size, NULL) == G_IO_STATUS_NORMAL) -+ { -+ g_string_append_len (data->child_stderr, buf, buf_size); -+ g_free (buf); -+ } -+ -+ data->exit_status = status; -+ -+ /* ok, child watch is history, make sure we don't free it in spawn_data_free() */ -+ data->child_pid = 0; -+ data->child_watch_source = NULL; -+ -+ /* we're done */ -+ g_simple_async_result_complete_in_idle (data->simple); -+ g_object_unref (data->simple); -+} -+ -+static gboolean -+utils_timeout_cb (gpointer user_data) -+{ -+ UtilsSpawnData *data = user_data; -+ -+ data->timed_out = TRUE; -+ -+ /* ok, timeout is history, make sure we don't free it in spawn_data_free() */ -+ data->timeout_source = NULL; -+ -+ /* we're done */ -+ g_simple_async_result_complete_in_idle (data->simple); -+ g_object_unref (data->simple); -+ -+ return FALSE; /* remove source */ -+} -+ -+static void -+utils_spawn (const gchar *const *argv, -+ guint timeout_seconds, -+ GCancellable *cancellable, -+ GAsyncReadyCallback callback, -+ gpointer user_data) -+{ -+ UtilsSpawnData *data; -+ GError *error; -+ -+ data = g_slice_new0 (UtilsSpawnData); -+ data->timeout_seconds = timeout_seconds; -+ data->simple = g_simple_async_result_new (NULL, -+ callback, -+ user_data, -+ utils_spawn); -+ data->main_context = g_main_context_get_thread_default (); -+ if (data->main_context != NULL) -+ g_main_context_ref (data->main_context); -+ -+ data->cancellable = cancellable != NULL ? g_object_ref (cancellable) : NULL; -+ -+ data->child_stdout = g_string_new (NULL); -+ data->child_stderr = g_string_new (NULL); -+ data->child_stdout_fd = -1; -+ data->child_stderr_fd = -1; -+ -+ /* the life-cycle of UtilsSpawnData is tied to its GSimpleAsyncResult */ -+ g_simple_async_result_set_op_res_gpointer (data->simple, data, (GDestroyNotify) utils_spawn_data_free); -+ -+ error = NULL; -+ if (data->cancellable != NULL) -+ { -+ /* could already be cancelled */ -+ error = NULL; -+ if (g_cancellable_set_error_if_cancelled (data->cancellable, &error)) -+ { -+ g_simple_async_result_take_error (data->simple, error); -+ g_simple_async_result_complete_in_idle (data->simple); -+ g_object_unref (data->simple); -+ goto out; -+ } -+ -+ data->cancellable_handler_id = g_cancellable_connect (data->cancellable, -+ G_CALLBACK (utils_on_cancelled), -+ data, -+ NULL); -+ } -+ -+ error = NULL; -+ if (!g_spawn_async_with_pipes (NULL, /* working directory */ -+ (gchar **) argv, -+ NULL, /* envp */ -+ G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD, -+ NULL, /* child_setup */ -+ NULL, /* child_setup's user_data */ -+ &(data->child_pid), -+ NULL, /* gint *stdin_fd */ -+ &(data->child_stdout_fd), -+ &(data->child_stderr_fd), -+ &error)) -+ { -+ g_prefix_error (&error, "Error spawning: "); -+ g_simple_async_result_take_error (data->simple, error); -+ g_simple_async_result_complete_in_idle (data->simple); -+ g_object_unref (data->simple); -+ goto out; -+ } -+ -+ if (timeout_seconds > 0) -+ { -+ data->timeout_source = g_timeout_source_new_seconds (timeout_seconds); -+ g_source_set_priority (data->timeout_source, G_PRIORITY_DEFAULT); -+ g_source_set_callback (data->timeout_source, utils_timeout_cb, data, NULL); -+ g_source_attach (data->timeout_source, data->main_context); -+ g_source_unref (data->timeout_source); -+ } -+ -+ data->child_watch_source = g_child_watch_source_new (data->child_pid); -+ g_source_set_callback (data->child_watch_source, (GSourceFunc) utils_child_watch_cb, data, NULL); -+ g_source_attach (data->child_watch_source, data->main_context); -+ g_source_unref (data->child_watch_source); -+ -+ data->child_stdout_channel = g_io_channel_unix_new (data->child_stdout_fd); -+ g_io_channel_set_flags (data->child_stdout_channel, G_IO_FLAG_NONBLOCK, NULL); -+ data->child_stdout_source = g_io_create_watch (data->child_stdout_channel, G_IO_IN); -+ g_source_set_callback (data->child_stdout_source, (GSourceFunc) utils_read_child_stdout, data, NULL); -+ g_source_attach (data->child_stdout_source, data->main_context); -+ g_source_unref (data->child_stdout_source); -+ -+ data->child_stderr_channel = g_io_channel_unix_new (data->child_stderr_fd); -+ g_io_channel_set_flags (data->child_stderr_channel, G_IO_FLAG_NONBLOCK, NULL); -+ data->child_stderr_source = g_io_create_watch (data->child_stderr_channel, G_IO_IN); -+ g_source_set_callback (data->child_stderr_source, (GSourceFunc) utils_read_child_stderr, data, NULL); -+ g_source_attach (data->child_stderr_source, data->main_context); -+ g_source_unref (data->child_stderr_source); -+ -+ out: -+ ; -+} -+ -+gboolean -+utils_spawn_finish (GAsyncResult *res, -+ gint *out_exit_status, -+ gchar **out_standard_output, -+ gchar **out_standard_error, -+ GError **error) -+{ -+ GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (res); -+ UtilsSpawnData *data; -+ gboolean ret = FALSE; -+ -+ g_return_val_if_fail (G_IS_ASYNC_RESULT (res), FALSE); -+ g_return_val_if_fail (error == NULL || *error == NULL, FALSE); -+ -+ g_warn_if_fail (g_simple_async_result_get_source_tag (simple) == utils_spawn); -+ -+ if (g_simple_async_result_propagate_error (simple, error)) -+ goto out; -+ -+ data = g_simple_async_result_get_op_res_gpointer (simple); -+ -+ if (data->timed_out) -+ { -+ g_set_error (error, -+ G_IO_ERROR, -+ G_IO_ERROR_TIMED_OUT, -+ "Timed out after %d seconds", -+ data->timeout_seconds); -+ goto out; -+ } -+ -+ if (out_exit_status != NULL) -+ *out_exit_status = data->exit_status; -+ -+ if (out_standard_output != NULL) -+ *out_standard_output = g_strdup (data->child_stdout->str); -+ -+ if (out_standard_error != NULL) -+ *out_standard_error = g_strdup (data->child_stderr->str); -+ -+ ret = TRUE; -+ -+ out: -+ return ret; -+} --- -GitLab - - -From d74aad8152a7c51999fffa9abe28e4306a052399 Mon Sep 17 00:00:00 2001 -From: Wu Xiaotian -Date: Sun, 22 Nov 2020 13:15:17 +0800 -Subject: [PATCH 02/16] check netgroup.h header file - -Signed-off-by: Gustavo Lima Chaves ---- - src/polkitbackend/polkitbackendduktapeauthority.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/polkitbackend/polkitbackendduktapeauthority.c b/src/polkitbackend/polkitbackendduktapeauthority.c -index ae98453..543d6fd 100644 ---- a/src/polkitbackend/polkitbackendduktapeauthority.c -+++ b/src/polkitbackend/polkitbackendduktapeauthority.c -@@ -26,7 +26,11 @@ - #include - #include - #include -+#ifdef HAVE_NETGROUP_H -+#include -+#else - #include -+#endif - #include - #include - #include --- -GitLab - - -From 69c761506cbe458807e4ae2742c9e05bc60dad3d Mon Sep 17 00:00:00 2001 -From: Wu Xiaotian -Date: Sun, 22 Nov 2020 10:59:03 +0800 -Subject: [PATCH 03/16] check return value - -Signed-off-by: Gustavo Lima Chaves ---- - src/polkitbackend/polkitbackendduktapeauthority.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/src/polkitbackend/polkitbackendduktapeauthority.c b/src/polkitbackend/polkitbackendduktapeauthority.c -index 543d6fd..a54ed5b 100644 ---- a/src/polkitbackend/polkitbackendduktapeauthority.c -+++ b/src/polkitbackend/polkitbackendduktapeauthority.c -@@ -249,7 +249,11 @@ reload_scripts (PolkitBackendJsAuthority *authority) - duk_context *cx = authority->priv->cx; - - duk_set_top (cx, 0); -- duk_get_global_string (cx, "polkit"); -+ if (!duk_get_global_string (cx, "polkit")) { -+ polkit_backend_authority_log (POLKIT_BACKEND_AUTHORITY (authority), -+ "Error deleting old rules, not loading new ones"); -+ return; -+ } - duk_push_string (cx, "_deleteRules"); - - duk_call_prop (cx, 0, 0); --- -GitLab - - -From f1536c4899934fd3c8243fda2d084a472fe57d2e Mon Sep 17 00:00:00 2001 -From: Wu Xiaotian -Date: Sun, 22 Nov 2020 11:22:39 +0800 -Subject: [PATCH 04/16] check return value - -Signed-off-by: Gustavo Lima Chaves ---- - src/polkitbackend/polkitbackendduktapeauthority.c | 12 ++++++++++-- - 1 file changed, 10 insertions(+), 2 deletions(-) - -diff --git a/src/polkitbackend/polkitbackendduktapeauthority.c b/src/polkitbackend/polkitbackendduktapeauthority.c -index a54ed5b..1a7e6d3 100644 ---- a/src/polkitbackend/polkitbackendduktapeauthority.c -+++ b/src/polkitbackend/polkitbackendduktapeauthority.c -@@ -656,7 +656,10 @@ push_action_and_details (duk_context *cx, - gchar **keys; - guint n; - -- duk_get_global_string (cx, "Action"); -+ if (!duk_get_global_string (cx, "Action")) { -+ return FALSE; -+ } -+ - duk_new (cx, 0); - - set_property_str (cx, "id", action_id); -@@ -699,7 +702,12 @@ polkit_backend_js_authority_get_admin_auth_identities (PolkitBackendInteractiveA - duk_context *cx = authority->priv->cx; - - duk_set_top (cx, 0); -- duk_get_global_string (cx, "polkit"); -+ if (!duk_get_global_string (cx, "polkit")) { -+ polkit_backend_authority_log (POLKIT_BACKEND_AUTHORITY (authority), -+ "Error deleting old rules, not loading new ones"); -+ goto out; -+ } -+ - duk_push_string (cx, "_runAdminRules"); - - if (!push_action_and_details (cx, action_id, details, &error)) --- -GitLab - - -From ca15eecf5dc7755947515c1bfc651fd8770aaf8f Mon Sep 17 00:00:00 2001 -From: Wu Xiaotian -Date: Sun, 22 Nov 2020 13:17:16 +0800 -Subject: [PATCH 05/16] check return value - -Signed-off-by: Gustavo Lima Chaves ---- - src/polkitbackend/polkitbackendduktapeauthority.c | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/src/polkitbackend/polkitbackendduktapeauthority.c b/src/polkitbackend/polkitbackendduktapeauthority.c -index 1a7e6d3..3f1b32d 100644 ---- a/src/polkitbackend/polkitbackendduktapeauthority.c -+++ b/src/polkitbackend/polkitbackendduktapeauthority.c -@@ -550,7 +550,10 @@ push_subject (duk_context *cx, - char *seat_str = NULL; - char *session_str = NULL; - -- duk_get_global_string (cx, "Subject"); -+ if (!duk_get_global_string (cx, "Subject")) { -+ return FALSE; -+ } -+ - duk_new (cx, 0); - - if (POLKIT_IS_UNIX_PROCESS (subject)) -@@ -789,8 +792,11 @@ polkit_backend_js_authority_check_authorization_sync (PolkitBackendInteractiveAu - gboolean good = FALSE; - duk_context *cx = authority->priv->cx; - -+ if (!duk_get_global_string (cx, "polkit")) { -+ goto out; -+ } -+ - duk_set_top (cx, 0); -- duk_get_global_string (cx, "polkit"); - duk_push_string (cx, "_runRules"); - - if (!push_action_and_details (cx, action_id, details, &error)) --- -GitLab - - -From 870348365cc0166e14f28e0d144ed552bba4d794 Mon Sep 17 00:00:00 2001 -From: Wu Xiaotian -Date: Sun, 22 Nov 2020 13:18:13 +0800 -Subject: [PATCH 06/16] check return value - -Signed-off-by: Gustavo Lima Chaves ---- - src/polkitbackend/polkitbackendduktapeauthority.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/polkitbackend/polkitbackendduktapeauthority.c b/src/polkitbackend/polkitbackendduktapeauthority.c -index 3f1b32d..6294ad9 100644 ---- a/src/polkitbackend/polkitbackendduktapeauthority.c -+++ b/src/polkitbackend/polkitbackendduktapeauthority.c -@@ -843,7 +843,8 @@ polkit_backend_js_authority_check_authorization_sync (PolkitBackendInteractiveAu - out: - if (!good) - ret = POLKIT_IMPLICIT_AUTHORIZATION_NOT_AUTHORIZED; -- g_free (ret_str); -+ if (ret_str != NULL) -+ g_free (ret_str); - - return ret; - } --- -GitLab - - -From 81c916ff08fdcee3c7340c4b2d4632086b89666c Mon Sep 17 00:00:00 2001 -From: Wu Xiaotian -Date: Sun, 22 Nov 2020 11:23:04 +0800 -Subject: [PATCH 07/16] fix typecase - -Signed-off-by: Gustavo Lima Chaves ---- - src/polkitbackend/polkitbackendduktapeauthority.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/src/polkitbackend/polkitbackendduktapeauthority.c b/src/polkitbackend/polkitbackendduktapeauthority.c -index 6294ad9..d466c9d 100644 ---- a/src/polkitbackend/polkitbackendduktapeauthority.c -+++ b/src/polkitbackend/polkitbackendduktapeauthority.c -@@ -1191,7 +1191,7 @@ static void - utils_on_cancelled (GCancellable *cancellable, - gpointer user_data) - { -- UtilsSpawnData *data = user_data; -+ UtilsSpawnData *data = (UtilsSpawnData *)user_data; - GError *error; - - error = NULL; -@@ -1206,7 +1206,7 @@ utils_read_child_stderr (GIOChannel *channel, - GIOCondition condition, - gpointer user_data) - { -- UtilsSpawnData *data = user_data; -+ UtilsSpawnData *data = (UtilsSpawnData *)user_data; - gchar buf[1024]; - gsize bytes_read; - -@@ -1220,7 +1220,7 @@ utils_read_child_stdout (GIOChannel *channel, - GIOCondition condition, - gpointer user_data) - { -- UtilsSpawnData *data = user_data; -+ UtilsSpawnData *data = (UtilsSpawnData *)user_data; - gchar buf[1024]; - gsize bytes_read; - -@@ -1234,7 +1234,7 @@ utils_child_watch_cb (GPid pid, - gint status, - gpointer user_data) - { -- UtilsSpawnData *data = user_data; -+ UtilsSpawnData *data = (UtilsSpawnData *)user_data; - gchar *buf; - gsize buf_size; - -@@ -1263,7 +1263,7 @@ utils_child_watch_cb (GPid pid, - static gboolean - utils_timeout_cb (gpointer user_data) - { -- UtilsSpawnData *data = user_data; -+ UtilsSpawnData *data = (UtilsSpawnData *)user_data; - - data->timed_out = TRUE; - --- -GitLab - - -From acb956bf52f0a78bf7aaf925876f96e97a146995 Mon Sep 17 00:00:00 2001 -From: Wu Xiaotian -Date: Sun, 22 Nov 2020 18:04:27 +0800 -Subject: [PATCH 08/16] typecase - -Signed-off-by: Gustavo Lima Chaves ---- - src/polkitbackend/polkitbackendduktapeauthority.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/src/polkitbackend/polkitbackendduktapeauthority.c b/src/polkitbackend/polkitbackendduktapeauthority.c -index d466c9d..237b1ad 100644 ---- a/src/polkitbackend/polkitbackendduktapeauthority.c -+++ b/src/polkitbackend/polkitbackendduktapeauthority.c -@@ -915,8 +915,8 @@ spawn_cb (GObject *source_object, - GAsyncResult *res, - gpointer user_data) - { -- SpawnData *data = user_data; -- data->res = g_object_ref (res); -+ SpawnData *data = (SpawnData *)user_data; -+ data->res = (GAsyncResult*)g_object_ref (res); - g_main_loop_quit (data->loop); - } - -@@ -1292,12 +1292,12 @@ utils_spawn (const gchar *const *argv, - data->simple = g_simple_async_result_new (NULL, - callback, - user_data, -- utils_spawn); -+ (gpointer*)utils_spawn); - data->main_context = g_main_context_get_thread_default (); - if (data->main_context != NULL) - g_main_context_ref (data->main_context); - -- data->cancellable = cancellable != NULL ? g_object_ref (cancellable) : NULL; -+ data->cancellable = cancellable != NULL ? (GCancellable*)g_object_ref (cancellable) : NULL; - - data->child_stdout = g_string_new (NULL); - data->child_stderr = g_string_new (NULL); -@@ -1397,7 +1397,7 @@ utils_spawn_finish (GAsyncResult *res, - if (g_simple_async_result_propagate_error (simple, error)) - goto out; - -- data = g_simple_async_result_get_op_res_gpointer (simple); -+ data = (UtilsSpawnData*)g_simple_async_result_get_op_res_gpointer (simple); - - if (data->timed_out) - { --- -GitLab - - -From be060e4d48aceb09af34868b555b6c73c7afdabb Mon Sep 17 00:00:00 2001 -From: Wu Xiaotian -Date: Sun, 22 Nov 2020 13:53:23 +0800 -Subject: [PATCH 09/16] some change - -Signed-off-by: Gustavo Lima Chaves ---- - .../polkitbackendduktapeauthority.c | 26 +++++++++++-------- - 1 file changed, 15 insertions(+), 11 deletions(-) - -diff --git a/src/polkitbackend/polkitbackendduktapeauthority.c b/src/polkitbackend/polkitbackendduktapeauthority.c -index 237b1ad..fad9017 100644 ---- a/src/polkitbackend/polkitbackendduktapeauthority.c -+++ b/src/polkitbackend/polkitbackendduktapeauthority.c -@@ -207,18 +207,22 @@ load_scripts (PolkitBackendJsAuthority *authority) - - for (l = files; l != NULL; l = l->next) - { -- const gchar *filename = l->data; -- -+ const gchar *filename = (gchar *)l->data; - #if (DUK_VERSION >= 20000) -- gchar *contents; -- gsize length; -- GError *error = NULL; -- if (!g_file_get_contents (filename, &contents, &length, &error)){ -- g_warning("Error when file contents of %s: %s\n", filename, error->message); -- g_error_free (error); -- continue; -- } -- if (duk_peval_lstring_noresult(cx, contents,length) != 0) -+ GFile *file = g_file_new_for_path (filename); -+ char *contents; -+ gsize len; -+ if (!g_file_load_contents (file, NULL, &contents, &len, NULL, NULL)) -+ { -+ polkit_backend_authority_log (POLKIT_BACKEND_AUTHORITY (authority), -+ "Error compiling script %s", -+ filename); -+ g_object_unref (file); -+ continue; -+ } -+ -+ g_object_unref (file); -+ if (duk_peval_lstring_noresult(cx, contents,len) != 0) - #else - if (duk_peval_file_noresult (cx, filename) != 0) - #endif --- -GitLab - - -From 2ffb62048a5ebedfe3bb053feb7385c7270ede28 Mon Sep 17 00:00:00 2001 -From: Wu Xiaotian -Date: Sun, 22 Nov 2020 15:25:45 +0800 -Subject: [PATCH 10/16] some change - -Signed-off-by: Gustavo Lima Chaves ---- - .../polkitbackendduktapeauthority.c | 24 +++++++++---------- - 1 file changed, 12 insertions(+), 12 deletions(-) - -diff --git a/src/polkitbackend/polkitbackendduktapeauthority.c b/src/polkitbackend/polkitbackendduktapeauthority.c -index fad9017..6fac3be 100644 ---- a/src/polkitbackend/polkitbackendduktapeauthority.c -+++ b/src/polkitbackend/polkitbackendduktapeauthority.c -@@ -125,6 +125,18 @@ G_DEFINE_TYPE (PolkitBackendJsAuthority, polkit_backend_js_authority, POLKIT_BAC - - /* ---------------------------------------------------------------------------------------------------- */ - -+static duk_ret_t js_polkit_log (duk_context *cx); -+static duk_ret_t js_polkit_spawn (duk_context *cx); -+static duk_ret_t js_polkit_user_is_in_netgroup (duk_context *cx); -+ -+static const duk_function_list_entry js_polkit_functions[] = -+{ -+ { "log", js_polkit_log, 1 }, -+ { "spawn", js_polkit_spawn, 1 }, -+ { "_userIsInNetGroup", js_polkit_user_is_in_netgroup, 2 }, -+ { NULL, NULL, 0 }, -+}; -+ - static void - polkit_backend_js_authority_init (PolkitBackendJsAuthority *authority) - { -@@ -347,18 +359,6 @@ setup_file_monitors (PolkitBackendJsAuthority *authority) - authority->priv->dir_monitors = (GFileMonitor**) g_ptr_array_free (p, FALSE); - } - --static duk_ret_t js_polkit_log (duk_context *cx); --static duk_ret_t js_polkit_spawn (duk_context *cx); --static duk_ret_t js_polkit_user_is_in_netgroup (duk_context *cx); -- --static const duk_function_list_entry js_polkit_functions[] = --{ -- { "log", js_polkit_log, 1 }, -- { "spawn", js_polkit_spawn, 1 }, -- { "_userIsInNetGroup", js_polkit_user_is_in_netgroup, 2 }, -- { NULL, NULL, 0 }, --}; -- - static void - polkit_backend_js_authority_constructed (GObject *object) - { --- -GitLab - - -From edb70ef69eed3275f5654510d135e680eb46c85d Mon Sep 17 00:00:00 2001 -From: Wu Xiaotian -Date: Sun, 22 Nov 2020 15:25:35 +0800 -Subject: [PATCH 11/16] remove WATCHDOG_TIMEOUT define - -Signed-off-by: Gustavo Lima Chaves ---- - src/polkitbackend/polkitbackendduktapeauthority.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/src/polkitbackend/polkitbackendduktapeauthority.c b/src/polkitbackend/polkitbackendduktapeauthority.c -index 6fac3be..51e03fd 100644 ---- a/src/polkitbackend/polkitbackendduktapeauthority.c -+++ b/src/polkitbackend/polkitbackendduktapeauthority.c -@@ -69,7 +69,6 @@ struct _PolkitBackendJsAuthorityPrivate - duk_context *cx; - }; - --#define WATCHDOG_TIMEOUT (15 * G_TIME_SPAN_SECOND) - - static void utils_spawn (const gchar *const *argv, - guint timeout_seconds, --- -GitLab - - -From 906ae404f29f15ef8c529b999bf091b5d18ed7ac Mon Sep 17 00:00:00 2001 -From: Wu Xiaotian -Date: Sun, 22 Nov 2020 12:46:40 +0800 -Subject: [PATCH 12/16] add meson build system support - -Signed-off-by: Gustavo Lima Chaves ---- - meson.build | 11 ++++++++++- - meson_options.txt | 1 + - src/polkitbackend/meson.build | 10 ++++++++-- - 3 files changed, 19 insertions(+), 3 deletions(-) - -diff --git a/meson.build b/meson.build -index 858078d..4e44723 100644 ---- a/meson.build -+++ b/meson.build -@@ -133,7 +133,13 @@ expat_dep = dependency('expat') - assert(cc.has_header('expat.h', dependencies: expat_dep), 'Can\'t find expat.h. Please install expat.') - assert(cc.has_function('XML_ParserCreate', dependencies: expat_dep), 'Can\'t find expat library. Please install expat.') - --mozjs_dep = dependency('mozjs-78') -+js_engine = get_option('js_engine') -+if js_engine == 'duktape' -+ js_dep = dependency('duktape') -+ libm_dep = cc.find_library('m') -+elif js_engine == 'mozjs' -+ js_dep = dependency('mozjs-78') -+endif - - dbus_dep = dependency('dbus-1', required: false) - dbus_policydir = pk_prefix / pk_datadir / 'dbus-1/system.d' -@@ -361,6 +367,9 @@ if enable_logind - output += ' systemdsystemunitdir: ' + systemd_systemdsystemunitdir + '\n' - endif - output += ' polkitd user: ' + polkitd_user + ' \n' -+output += ' Javascript engine: ' + js_engine + '\n' -+if enable_logind -+endif - output += ' PAM support: ' + enable_pam.to_string() + '\n\n' - if enable_pam - output += ' PAM file auth: ' + pam_conf['PAM_FILE_INCLUDE_AUTH'] + '\n' -diff --git a/meson_options.txt b/meson_options.txt -index 25e3e77..76aa311 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -16,3 +16,4 @@ option('introspection', type: 'boolean', value: true, description: 'Enable intro - - option('gtk_doc', type: 'boolean', value: false, description: 'use gtk-doc to build documentation') - option('man', type: 'boolean', value: false, description: 'build manual pages') -+option('js_engine', type: 'combo', choices: ['mozjs', 'duktape'], value: 'duktape', description: 'javascript engine') -diff --git a/src/polkitbackend/meson.build b/src/polkitbackend/meson.build -index 64f0e4a..489897d 100644 ---- a/src/polkitbackend/meson.build -+++ b/src/polkitbackend/meson.build -@@ -5,7 +5,6 @@ sources = files( - 'polkitbackendactionpool.c', - 'polkitbackendauthority.c', - 'polkitbackendinteractiveauthority.c', -- 'polkitbackendjsauthority.cpp', - ) - - output = 'initjs.h' -@@ -21,7 +20,7 @@ sources += custom_target( - deps = [ - expat_dep, - libpolkit_gobject_dep, -- mozjs_dep, -+ js_dep, - ] - - c_flags = [ -@@ -31,6 +30,13 @@ c_flags = [ - '-DPACKAGE_SYSCONF_DIR="@0@"'.format(pk_prefix / pk_sysconfdir), - ] - -+if js_engine == 'duktape' -+ sources += files('polkitbackendduktapeauthority.c') -+ deps += libm_dep -+elif js_engine == 'mozjs' -+ sources += files('polkitbackendjsauthority.cpp') -+endif -+ - if enable_logind - sources += files('polkitbackendsessionmonitor-systemd.c') - --- -GitLab - - -From 1380b505c25be4aebe54b1b4223a570d64af83cc Mon Sep 17 00:00:00 2001 -From: Wu Xiaotian -Date: Sun, 22 Nov 2020 18:49:14 +0800 -Subject: [PATCH 13/16] fix run error - -Signed-off-by: Gustavo Lima Chaves ---- - src/polkitbackend/polkitbackendduktapeauthority.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/polkitbackend/polkitbackendduktapeauthority.c b/src/polkitbackend/polkitbackendduktapeauthority.c -index 51e03fd..4b4f8fd 100644 ---- a/src/polkitbackend/polkitbackendduktapeauthority.c -+++ b/src/polkitbackend/polkitbackendduktapeauthority.c -@@ -795,11 +795,11 @@ polkit_backend_js_authority_check_authorization_sync (PolkitBackendInteractiveAu - gboolean good = FALSE; - duk_context *cx = authority->priv->cx; - -+ duk_set_top (cx, 0); - if (!duk_get_global_string (cx, "polkit")) { - goto out; - } - -- duk_set_top (cx, 0); - duk_push_string (cx, "_runRules"); - - if (!push_action_and_details (cx, action_id, details, &error)) --- -GitLab - - -From 6856a704b70378948ef5f66e9b09555d97d4070b Mon Sep 17 00:00:00 2001 -From: Gustavo Lima Chaves -Date: Fri, 10 Sep 2021 15:17:58 -0700 -Subject: [PATCH 14/16] Deduplicate code for "Add duktape as JS engine backend" - effort/MR - -This leverages Wu Xiaotian (@yetist)'s original MR -(https://gitlab.freedesktop.org/polkit/polkit/-/merge_requests/35), in -an effort to complete said work. - -This is the first of the requests from maintainers--to reduce -eliminate code duplication. - -The runaway-killer missing functionality will come in the sequence. - -Signed-off-by: Gustavo Lima Chaves ---- - src/polkitbackend/Makefile.am | 1 + - src/polkitbackend/meson.build | 1 + - src/polkitbackend/polkitbackendcommon.c | 530 +++++++++++++ - src/polkitbackend/polkitbackendcommon.h | 156 ++++ - .../polkitbackendduktapeauthority.c | 714 ++---------------- - .../polkitbackendjsauthority.cpp | 711 ++--------------- - 6 files changed, 790 insertions(+), 1323 deletions(-) - create mode 100644 src/polkitbackend/polkitbackendcommon.c - create mode 100644 src/polkitbackend/polkitbackendcommon.h - -diff --git a/src/polkitbackend/Makefile.am b/src/polkitbackend/Makefile.am -index abcbc6f..6a8b4ae 100644 ---- a/src/polkitbackend/Makefile.am -+++ b/src/polkitbackend/Makefile.am -@@ -31,6 +31,7 @@ libpolkit_backend_1_la_SOURCES = \ - polkitbackend.h \ - polkitbackendtypes.h \ - polkitbackendprivate.h \ -+ polkitbackendcommon.h polkitbackendcommon.c \ - polkitbackendauthority.h polkitbackendauthority.c \ - polkitbackendinteractiveauthority.h polkitbackendinteractiveauthority.c \ - polkitbackendjsauthority.h \ -diff --git a/src/polkitbackend/meson.build b/src/polkitbackend/meson.build -index 489897d..9ec01b2 100644 ---- a/src/polkitbackend/meson.build -+++ b/src/polkitbackend/meson.build -@@ -4,6 +4,7 @@ sources = files( - 'polkitbackendactionlookup.c', - 'polkitbackendactionpool.c', - 'polkitbackendauthority.c', -+ 'polkitbackendcommon.c', - 'polkitbackendinteractiveauthority.c', - ) - -diff --git a/src/polkitbackend/polkitbackendcommon.c b/src/polkitbackend/polkitbackendcommon.c -new file mode 100644 -index 0000000..6783dff ---- /dev/null -+++ b/src/polkitbackend/polkitbackendcommon.c -@@ -0,0 +1,530 @@ -+/* -+ * Copyright (C) 2008 Red Hat, Inc. -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General -+ * Public License along with this library; if not, write to the -+ * Free Software Foundation, Inc., 59 Temple Place, Suite 330, -+ * Boston, MA 02111-1307, USA. -+ * -+ * Author: David Zeuthen -+ */ -+ -+#include "polkitbackendcommon.h" -+ -+static void -+utils_child_watch_from_release_cb (GPid pid, -+ gint status, -+ gpointer user_data) -+{ -+} -+ -+static void -+utils_spawn_data_free (UtilsSpawnData *data) -+{ -+ if (data->timeout_source != NULL) -+ { -+ g_source_destroy (data->timeout_source); -+ data->timeout_source = NULL; -+ } -+ -+ /* Nuke the child, if necessary */ -+ if (data->child_watch_source != NULL) -+ { -+ g_source_destroy (data->child_watch_source); -+ data->child_watch_source = NULL; -+ } -+ -+ if (data->child_pid != 0) -+ { -+ GSource *source; -+ kill (data->child_pid, SIGTERM); -+ /* OK, we need to reap for the child ourselves - we don't want -+ * to use waitpid() because that might block the calling -+ * thread (the child might handle SIGTERM and use several -+ * seconds for cleanup/rollback). -+ * -+ * So we use GChildWatch instead. -+ * -+ * Avoid taking a references to ourselves. but note that we need -+ * to pass the GSource so we can nuke it once handled. -+ */ -+ source = g_child_watch_source_new (data->child_pid); -+ g_source_set_callback (source, -+ (GSourceFunc) utils_child_watch_from_release_cb, -+ source, -+ (GDestroyNotify) g_source_destroy); -+ g_source_attach (source, data->main_context); -+ g_source_unref (source); -+ data->child_pid = 0; -+ } -+ -+ if (data->child_stdout != NULL) -+ { -+ g_string_free (data->child_stdout, TRUE); -+ data->child_stdout = NULL; -+ } -+ -+ if (data->child_stderr != NULL) -+ { -+ g_string_free (data->child_stderr, TRUE); -+ data->child_stderr = NULL; -+ } -+ -+ if (data->child_stdout_channel != NULL) -+ { -+ g_io_channel_unref (data->child_stdout_channel); -+ data->child_stdout_channel = NULL; -+ } -+ if (data->child_stderr_channel != NULL) -+ { -+ g_io_channel_unref (data->child_stderr_channel); -+ data->child_stderr_channel = NULL; -+ } -+ -+ if (data->child_stdout_source != NULL) -+ { -+ g_source_destroy (data->child_stdout_source); -+ data->child_stdout_source = NULL; -+ } -+ if (data->child_stderr_source != NULL) -+ { -+ g_source_destroy (data->child_stderr_source); -+ data->child_stderr_source = NULL; -+ } -+ -+ if (data->child_stdout_fd != -1) -+ { -+ g_warn_if_fail (close (data->child_stdout_fd) == 0); -+ data->child_stdout_fd = -1; -+ } -+ if (data->child_stderr_fd != -1) -+ { -+ g_warn_if_fail (close (data->child_stderr_fd) == 0); -+ data->child_stderr_fd = -1; -+ } -+ -+ if (data->cancellable_handler_id > 0) -+ { -+ g_cancellable_disconnect (data->cancellable, data->cancellable_handler_id); -+ data->cancellable_handler_id = 0; -+ } -+ -+ if (data->main_context != NULL) -+ g_main_context_unref (data->main_context); -+ -+ if (data->cancellable != NULL) -+ g_object_unref (data->cancellable); -+ -+ g_slice_free (UtilsSpawnData, data); -+} -+ -+/* called in the thread where @cancellable was cancelled */ -+static void -+utils_on_cancelled (GCancellable *cancellable, -+ gpointer user_data) -+{ -+ UtilsSpawnData *data = (UtilsSpawnData *)user_data; -+ GError *error; -+ -+ error = NULL; -+ g_warn_if_fail (g_cancellable_set_error_if_cancelled (cancellable, &error)); -+ g_simple_async_result_take_error (data->simple, error); -+ g_simple_async_result_complete_in_idle (data->simple); -+ g_object_unref (data->simple); -+} -+ -+static gboolean -+utils_timeout_cb (gpointer user_data) -+{ -+ UtilsSpawnData *data = (UtilsSpawnData *)user_data; -+ -+ data->timed_out = TRUE; -+ -+ /* ok, timeout is history, make sure we don't free it in spawn_data_free() */ -+ data->timeout_source = NULL; -+ -+ /* we're done */ -+ g_simple_async_result_complete_in_idle (data->simple); -+ g_object_unref (data->simple); -+ -+ return FALSE; /* remove source */ -+} -+ -+static void -+utils_child_watch_cb (GPid pid, -+ gint status, -+ gpointer user_data) -+{ -+ UtilsSpawnData *data = (UtilsSpawnData *)user_data; -+ gchar *buf; -+ gsize buf_size; -+ -+ if (g_io_channel_read_to_end (data->child_stdout_channel, &buf, &buf_size, NULL) == G_IO_STATUS_NORMAL) -+ { -+ g_string_append_len (data->child_stdout, buf, buf_size); -+ g_free (buf); -+ } -+ if (g_io_channel_read_to_end (data->child_stderr_channel, &buf, &buf_size, NULL) == G_IO_STATUS_NORMAL) -+ { -+ g_string_append_len (data->child_stderr, buf, buf_size); -+ g_free (buf); -+ } -+ -+ data->exit_status = status; -+ -+ /* ok, child watch is history, make sure we don't free it in spawn_data_free() */ -+ data->child_pid = 0; -+ data->child_watch_source = NULL; -+ -+ /* we're done */ -+ g_simple_async_result_complete_in_idle (data->simple); -+ g_object_unref (data->simple); -+} -+ -+static gboolean -+utils_read_child_stderr (GIOChannel *channel, -+ GIOCondition condition, -+ gpointer user_data) -+{ -+ UtilsSpawnData *data = (UtilsSpawnData *)user_data; -+ gchar buf[1024]; -+ gsize bytes_read; -+ -+ g_io_channel_read_chars (channel, buf, sizeof buf, &bytes_read, NULL); -+ g_string_append_len (data->child_stderr, buf, bytes_read); -+ return TRUE; -+} -+ -+static gboolean -+utils_read_child_stdout (GIOChannel *channel, -+ GIOCondition condition, -+ gpointer user_data) -+{ -+ UtilsSpawnData *data = (UtilsSpawnData *)user_data; -+ gchar buf[1024]; -+ gsize bytes_read; -+ -+ g_io_channel_read_chars (channel, buf, sizeof buf, &bytes_read, NULL); -+ g_string_append_len (data->child_stdout, buf, bytes_read); -+ return TRUE; -+} -+ -+void -+polkit_backend_common_spawn (const gchar *const *argv, -+ guint timeout_seconds, -+ GCancellable *cancellable, -+ GAsyncReadyCallback callback, -+ gpointer user_data) -+{ -+ UtilsSpawnData *data; -+ GError *error; -+ -+ data = g_slice_new0 (UtilsSpawnData); -+ data->timeout_seconds = timeout_seconds; -+ data->simple = g_simple_async_result_new (NULL, -+ callback, -+ user_data, -+ (gpointer*)polkit_backend_common_spawn); -+ data->main_context = g_main_context_get_thread_default (); -+ if (data->main_context != NULL) -+ g_main_context_ref (data->main_context); -+ -+ data->cancellable = cancellable != NULL ? (GCancellable*)g_object_ref (cancellable) : NULL; -+ -+ data->child_stdout = g_string_new (NULL); -+ data->child_stderr = g_string_new (NULL); -+ data->child_stdout_fd = -1; -+ data->child_stderr_fd = -1; -+ -+ /* the life-cycle of UtilsSpawnData is tied to its GSimpleAsyncResult */ -+ g_simple_async_result_set_op_res_gpointer (data->simple, data, (GDestroyNotify) utils_spawn_data_free); -+ -+ error = NULL; -+ if (data->cancellable != NULL) -+ { -+ /* could already be cancelled */ -+ error = NULL; -+ if (g_cancellable_set_error_if_cancelled (data->cancellable, &error)) -+ { -+ g_simple_async_result_take_error (data->simple, error); -+ g_simple_async_result_complete_in_idle (data->simple); -+ g_object_unref (data->simple); -+ goto out; -+ } -+ -+ data->cancellable_handler_id = g_cancellable_connect (data->cancellable, -+ G_CALLBACK (utils_on_cancelled), -+ data, -+ NULL); -+ } -+ -+ error = NULL; -+ if (!g_spawn_async_with_pipes (NULL, /* working directory */ -+ (gchar **) argv, -+ NULL, /* envp */ -+ G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD, -+ NULL, /* child_setup */ -+ NULL, /* child_setup's user_data */ -+ &(data->child_pid), -+ NULL, /* gint *stdin_fd */ -+ &(data->child_stdout_fd), -+ &(data->child_stderr_fd), -+ &error)) -+ { -+ g_prefix_error (&error, "Error spawning: "); -+ g_simple_async_result_take_error (data->simple, error); -+ g_simple_async_result_complete_in_idle (data->simple); -+ g_object_unref (data->simple); -+ goto out; -+ } -+ -+ if (timeout_seconds > 0) -+ { -+ data->timeout_source = g_timeout_source_new_seconds (timeout_seconds); -+ g_source_set_priority (data->timeout_source, G_PRIORITY_DEFAULT); -+ g_source_set_callback (data->timeout_source, utils_timeout_cb, data, NULL); -+ g_source_attach (data->timeout_source, data->main_context); -+ g_source_unref (data->timeout_source); -+ } -+ -+ data->child_watch_source = g_child_watch_source_new (data->child_pid); -+ g_source_set_callback (data->child_watch_source, (GSourceFunc) utils_child_watch_cb, data, NULL); -+ g_source_attach (data->child_watch_source, data->main_context); -+ g_source_unref (data->child_watch_source); -+ -+ data->child_stdout_channel = g_io_channel_unix_new (data->child_stdout_fd); -+ g_io_channel_set_flags (data->child_stdout_channel, G_IO_FLAG_NONBLOCK, NULL); -+ data->child_stdout_source = g_io_create_watch (data->child_stdout_channel, G_IO_IN); -+ g_source_set_callback (data->child_stdout_source, (GSourceFunc) utils_read_child_stdout, data, NULL); -+ g_source_attach (data->child_stdout_source, data->main_context); -+ g_source_unref (data->child_stdout_source); -+ -+ data->child_stderr_channel = g_io_channel_unix_new (data->child_stderr_fd); -+ g_io_channel_set_flags (data->child_stderr_channel, G_IO_FLAG_NONBLOCK, NULL); -+ data->child_stderr_source = g_io_create_watch (data->child_stderr_channel, G_IO_IN); -+ g_source_set_callback (data->child_stderr_source, (GSourceFunc) utils_read_child_stderr, data, NULL); -+ g_source_attach (data->child_stderr_source, data->main_context); -+ g_source_unref (data->child_stderr_source); -+ -+ out: -+ ; -+} -+ -+void -+polkit_backend_common_on_dir_monitor_changed (GFileMonitor *monitor, -+ GFile *file, -+ GFile *other_file, -+ GFileMonitorEvent event_type, -+ gpointer user_data) -+{ -+ PolkitBackendJsAuthority *authority = POLKIT_BACKEND_JS_AUTHORITY (user_data); -+ -+ /* TODO: maybe rate-limit so storms of events are collapsed into one with a 500ms resolution? -+ * Because when editing a file with emacs we get 4-8 events.. -+ */ -+ -+ if (file != NULL) -+ { -+ gchar *name; -+ -+ name = g_file_get_basename (file); -+ -+ /* g_print ("event_type=%d file=%p name=%s\n", event_type, file, name); */ -+ if (!g_str_has_prefix (name, ".") && -+ !g_str_has_prefix (name, "#") && -+ g_str_has_suffix (name, ".rules") && -+ (event_type == G_FILE_MONITOR_EVENT_CREATED || -+ event_type == G_FILE_MONITOR_EVENT_DELETED || -+ event_type == G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT)) -+ { -+ polkit_backend_authority_log (POLKIT_BACKEND_AUTHORITY (authority), -+ "Reloading rules"); -+ polkit_backend_common_reload_scripts (authority); -+ } -+ g_free (name); -+ } -+} -+ -+gboolean -+polkit_backend_common_spawn_finish (GAsyncResult *res, -+ gint *out_exit_status, -+ gchar **out_standard_output, -+ gchar **out_standard_error, -+ GError **error) -+{ -+ GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (res); -+ UtilsSpawnData *data; -+ gboolean ret = FALSE; -+ -+ g_return_val_if_fail (G_IS_ASYNC_RESULT (res), FALSE); -+ g_return_val_if_fail (error == NULL || *error == NULL, FALSE); -+ -+ g_warn_if_fail (g_simple_async_result_get_source_tag (simple) == polkit_backend_common_spawn); -+ -+ if (g_simple_async_result_propagate_error (simple, error)) -+ goto out; -+ -+ data = (UtilsSpawnData*)g_simple_async_result_get_op_res_gpointer (simple); -+ -+ if (data->timed_out) -+ { -+ g_set_error (error, -+ G_IO_ERROR, -+ G_IO_ERROR_TIMED_OUT, -+ "Timed out after %d seconds", -+ data->timeout_seconds); -+ goto out; -+ } -+ -+ if (out_exit_status != NULL) -+ *out_exit_status = data->exit_status; -+ -+ if (out_standard_output != NULL) -+ *out_standard_output = g_strdup (data->child_stdout->str); -+ -+ if (out_standard_error != NULL) -+ *out_standard_error = g_strdup (data->child_stderr->str); -+ -+ ret = TRUE; -+ -+ out: -+ return ret; -+} -+ -+static const gchar * -+polkit_backend_js_authority_get_name (PolkitBackendAuthority *authority) -+{ -+ return "js"; -+} -+ -+static const gchar * -+polkit_backend_js_authority_get_version (PolkitBackendAuthority *authority) -+{ -+ return PACKAGE_VERSION; -+} -+ -+static PolkitAuthorityFeatures -+polkit_backend_js_authority_get_features (PolkitBackendAuthority *authority) -+{ -+ return POLKIT_AUTHORITY_FEATURES_TEMPORARY_AUTHORIZATION; -+} -+ -+void -+polkit_backend_common_js_authority_class_init_common (PolkitBackendJsAuthorityClass *klass) -+{ -+ GObjectClass *gobject_class; -+ PolkitBackendAuthorityClass *authority_class; -+ PolkitBackendInteractiveAuthorityClass *interactive_authority_class; -+ -+ gobject_class = G_OBJECT_CLASS (klass); -+ gobject_class->finalize = polkit_backend_common_js_authority_finalize; -+ gobject_class->set_property = polkit_backend_common_js_authority_set_property; -+ gobject_class->constructed = polkit_backend_common_js_authority_constructed; -+ -+ authority_class = POLKIT_BACKEND_AUTHORITY_CLASS (klass); -+ authority_class->get_name = polkit_backend_js_authority_get_name; -+ authority_class->get_version = polkit_backend_js_authority_get_version; -+ authority_class->get_features = polkit_backend_js_authority_get_features; -+ -+ interactive_authority_class = POLKIT_BACKEND_INTERACTIVE_AUTHORITY_CLASS (klass); -+ interactive_authority_class->get_admin_identities = polkit_backend_common_js_authority_get_admin_auth_identities; -+ interactive_authority_class->check_authorization_sync = polkit_backend_common_js_authority_check_authorization_sync; -+ -+ g_object_class_install_property (gobject_class, -+ PROP_RULES_DIRS, -+ g_param_spec_boxed ("rules-dirs", -+ NULL, -+ NULL, -+ G_TYPE_STRV, -+ G_PARAM_CONSTRUCT_ONLY | G_PARAM_WRITABLE)); -+} -+ -+gint -+polkit_backend_common_rules_file_name_cmp (const gchar *a, -+ const gchar *b) -+{ -+ gint ret; -+ const gchar *a_base; -+ const gchar *b_base; -+ -+ a_base = strrchr (a, '/'); -+ b_base = strrchr (b, '/'); -+ -+ g_assert (a_base != NULL); -+ g_assert (b_base != NULL); -+ a_base += 1; -+ b_base += 1; -+ -+ ret = g_strcmp0 (a_base, b_base); -+ if (ret == 0) -+ { -+ /* /etc wins over /usr */ -+ ret = g_strcmp0 (a, b); -+ g_assert (ret != 0); -+ } -+ -+ return ret; -+} -+ -+const gchar * -+polkit_backend_common_get_signal_name (gint signal_number) -+{ -+ switch (signal_number) -+ { -+#define _HANDLE_SIG(sig) case sig: return #sig; -+ _HANDLE_SIG (SIGHUP); -+ _HANDLE_SIG (SIGINT); -+ _HANDLE_SIG (SIGQUIT); -+ _HANDLE_SIG (SIGILL); -+ _HANDLE_SIG (SIGABRT); -+ _HANDLE_SIG (SIGFPE); -+ _HANDLE_SIG (SIGKILL); -+ _HANDLE_SIG (SIGSEGV); -+ _HANDLE_SIG (SIGPIPE); -+ _HANDLE_SIG (SIGALRM); -+ _HANDLE_SIG (SIGTERM); -+ _HANDLE_SIG (SIGUSR1); -+ _HANDLE_SIG (SIGUSR2); -+ _HANDLE_SIG (SIGCHLD); -+ _HANDLE_SIG (SIGCONT); -+ _HANDLE_SIG (SIGSTOP); -+ _HANDLE_SIG (SIGTSTP); -+ _HANDLE_SIG (SIGTTIN); -+ _HANDLE_SIG (SIGTTOU); -+ _HANDLE_SIG (SIGBUS); -+#ifdef SIGPOLL -+ _HANDLE_SIG (SIGPOLL); -+#endif -+ _HANDLE_SIG (SIGPROF); -+ _HANDLE_SIG (SIGSYS); -+ _HANDLE_SIG (SIGTRAP); -+ _HANDLE_SIG (SIGURG); -+ _HANDLE_SIG (SIGVTALRM); -+ _HANDLE_SIG (SIGXCPU); -+ _HANDLE_SIG (SIGXFSZ); -+#undef _HANDLE_SIG -+ default: -+ break; -+ } -+ return "UNKNOWN_SIGNAL"; -+} -+ -+void -+polkit_backend_common_spawn_cb (GObject *source_object, -+ GAsyncResult *res, -+ gpointer user_data) -+{ -+ SpawnData *data = (SpawnData *)user_data; -+ data->res = (GAsyncResult*)g_object_ref (res); -+ g_main_loop_quit (data->loop); -+} -diff --git a/src/polkitbackend/polkitbackendcommon.h b/src/polkitbackend/polkitbackendcommon.h -new file mode 100644 -index 0000000..6d0d267 ---- /dev/null -+++ b/src/polkitbackend/polkitbackendcommon.h -@@ -0,0 +1,156 @@ -+/* -+ * Copyright (C) 2008 Red Hat, Inc. -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General -+ * Public License along with this library; if not, write to the -+ * Free Software Foundation, Inc., 59 Temple Place, Suite 330, -+ * Boston, MA 02111-1307, USA. -+ * -+ * Author: David Zeuthen -+ */ -+ -+#if !defined (_POLKIT_BACKEND_COMPILATION) && !defined(_POLKIT_BACKEND_INSIDE_POLKIT_BACKEND_H) -+#error "Only can be included directly, this file may disappear or change contents." -+#endif -+ -+#ifndef __POLKIT_BACKEND_COMMON_H -+#define __POLKIT_BACKEND_COMMON_H -+ -+#include "config.h" -+#include -+#include -+#include -+#include -+#ifdef HAVE_NETGROUP_H -+#include -+#else -+#include -+#endif -+#include -+#include -+#include -+#include //here, all things glib via glib.h (including -> gspawn.h) -+ -+#include -+#include "polkitbackendjsauthority.h" -+ -+#include -+ -+#ifdef HAVE_LIBSYSTEMD -+#include -+#endif /* HAVE_LIBSYSTEMD */ -+ -+#ifdef __cplusplus -+extern "C" { -+#endif -+ -+enum -+{ -+ PROP_0, -+ PROP_RULES_DIRS, -+}; -+ -+typedef struct -+{ -+ GSimpleAsyncResult *simple; /* borrowed reference */ -+ GMainContext *main_context; /* may be NULL */ -+ -+ GCancellable *cancellable; /* may be NULL */ -+ gulong cancellable_handler_id; -+ -+ GPid child_pid; -+ gint child_stdout_fd; -+ gint child_stderr_fd; -+ -+ GIOChannel *child_stdout_channel; -+ GIOChannel *child_stderr_channel; -+ -+ GSource *child_watch_source; -+ GSource *child_stdout_source; -+ GSource *child_stderr_source; -+ -+ guint timeout_seconds; -+ gboolean timed_out; -+ GSource *timeout_source; -+ -+ GString *child_stdout; -+ GString *child_stderr; -+ -+ gint exit_status; -+} UtilsSpawnData; -+ -+typedef struct -+{ -+ GMainLoop *loop; -+ GAsyncResult *res; -+} SpawnData; -+ -+void polkit_backend_common_spawn (const gchar *const *argv, -+ guint timeout_seconds, -+ GCancellable *cancellable, -+ GAsyncReadyCallback callback, -+ gpointer user_data); -+void polkit_backend_common_spawn_cb (GObject *source_object, -+ GAsyncResult *res, -+ gpointer user_data); -+gboolean polkit_backend_common_spawn_finish (GAsyncResult *res, -+ gint *out_exit_status, -+ gchar **out_standard_output, -+ gchar **out_standard_error, -+ GError **error); -+ -+void polkit_backend_common_on_dir_monitor_changed (GFileMonitor *monitor, -+ GFile *file, -+ GFile *other_file, -+ GFileMonitorEvent event_type, -+ gpointer user_data); -+ -+void polkit_backend_common_js_authority_class_init_common (PolkitBackendJsAuthorityClass *klass); -+ -+gint polkit_backend_common_rules_file_name_cmp (const gchar *a, -+ const gchar *b); -+ -+const gchar *polkit_backend_common_get_signal_name (gint signal_number); -+ -+/* To be provided by each JS backend, from here onwards ---------------------------------------------- */ -+ -+void polkit_backend_common_reload_scripts (PolkitBackendJsAuthority *authority); -+void polkit_backend_common_js_authority_finalize (GObject *object); -+void polkit_backend_common_js_authority_constructed (GObject *object); -+GList *polkit_backend_common_js_authority_get_admin_auth_identities (PolkitBackendInteractiveAuthority *_authority, -+ PolkitSubject *caller, -+ PolkitSubject *subject, -+ PolkitIdentity *user_for_subject, -+ gboolean subject_is_local, -+ gboolean subject_is_active, -+ const gchar *action_id, -+ PolkitDetails *details); -+void polkit_backend_common_js_authority_set_property (GObject *object, -+ guint property_id, -+ const GValue *value, -+ GParamSpec *pspec); -+PolkitImplicitAuthorization polkit_backend_common_js_authority_check_authorization_sync (PolkitBackendInteractiveAuthority *_authority, -+ PolkitSubject *caller, -+ PolkitSubject *subject, -+ PolkitIdentity *user_for_subject, -+ gboolean subject_is_local, -+ gboolean subject_is_active, -+ const gchar *action_id, -+ PolkitDetails *details, -+ PolkitImplicitAuthorization implicit); -+#ifdef __cplusplus -+} -+#endif -+ -+#endif /* __POLKIT_BACKEND_COMMON_H */ -+ -diff --git a/src/polkitbackend/polkitbackendduktapeauthority.c b/src/polkitbackend/polkitbackendduktapeauthority.c -index 4b4f8fd..a2b4420 100644 ---- a/src/polkitbackend/polkitbackendduktapeauthority.c -+++ b/src/polkitbackend/polkitbackendduktapeauthority.c -@@ -21,32 +21,12 @@ - * Author: David Zeuthen - */ - --#include "config.h" --#include --#include --#include --#include --#ifdef HAVE_NETGROUP_H --#include --#else --#include --#endif --#include --#include --#include --#include -- --#include --#include "polkitbackendjsauthority.h" -- --#include -+#include "polkitbackendcommon.h" - --#ifdef HAVE_LIBSYSTEMD --#include --#endif /* HAVE_LIBSYSTEMD */ -+#include "duktape.h" - -+/* Built source and not too big to worry about deduplication */ - #include "initjs.h" /* init.js */ --#include "duktape.h" - - /** - * SECTION:polkitbackendjsauthority -@@ -54,10 +34,9 @@ - * @short_description: JS Authority - * @stability: Unstable - * -- * An implementation of #PolkitBackendAuthority that reads and -- * evalates Javascript files and supports interaction with -- * authentication agents (virtue of being based on -- * #PolkitBackendInteractiveAuthority). -+ * An (Duktape-based) implementation of #PolkitBackendAuthority that reads and -+ * evaluates Javascript files and supports interaction with authentication -+ * agents (virtue of being based on #PolkitBackendInteractiveAuthority). - */ - - /* ---------------------------------------------------------------------------------------------------- */ -@@ -66,64 +45,16 @@ struct _PolkitBackendJsAuthorityPrivate - { - gchar **rules_dirs; - GFileMonitor **dir_monitors; /* NULL-terminated array of GFileMonitor instances */ -- duk_context *cx; --}; -- -- --static void utils_spawn (const gchar *const *argv, -- guint timeout_seconds, -- GCancellable *cancellable, -- GAsyncReadyCallback callback, -- gpointer user_data); -- --gboolean utils_spawn_finish (GAsyncResult *res, -- gint *out_exit_status, -- gchar **out_standard_output, -- gchar **out_standard_error, -- GError **error); - --static void on_dir_monitor_changed (GFileMonitor *monitor, -- GFile *file, -- GFile *other_file, -- GFileMonitorEvent event_type, -- gpointer user_data); -- --/* ---------------------------------------------------------------------------------------------------- */ -- --enum --{ -- PROP_0, -- PROP_RULES_DIRS, -+ duk_context *cx; - }; - - /* ---------------------------------------------------------------------------------------------------- */ - --static GList *polkit_backend_js_authority_get_admin_auth_identities (PolkitBackendInteractiveAuthority *authority, -- PolkitSubject *caller, -- PolkitSubject *subject, -- PolkitIdentity *user_for_subject, -- gboolean subject_is_local, -- gboolean subject_is_active, -- const gchar *action_id, -- PolkitDetails *details); -- --static PolkitImplicitAuthorization polkit_backend_js_authority_check_authorization_sync ( -- PolkitBackendInteractiveAuthority *authority, -- PolkitSubject *caller, -- PolkitSubject *subject, -- PolkitIdentity *user_for_subject, -- gboolean subject_is_local, -- gboolean subject_is_active, -- const gchar *action_id, -- PolkitDetails *details, -- PolkitImplicitAuthorization implicit); -- - G_DEFINE_TYPE (PolkitBackendJsAuthority, polkit_backend_js_authority, POLKIT_BACKEND_TYPE_INTERACTIVE_AUTHORITY); - - /* ---------------------------------------------------------------------------------------------------- */ - --/* ---------------------------------------------------------------------------------------------------- */ -- - static duk_ret_t js_polkit_log (duk_context *cx); - static duk_ret_t js_polkit_spawn (duk_context *cx); - static duk_ret_t js_polkit_user_is_in_netgroup (duk_context *cx); -@@ -144,33 +75,6 @@ polkit_backend_js_authority_init (PolkitBackendJsAuthority *authority) - PolkitBackendJsAuthorityPrivate); - } - --static gint --rules_file_name_cmp (const gchar *a, -- const gchar *b) --{ -- gint ret; -- const gchar *a_base; -- const gchar *b_base; -- -- a_base = strrchr (a, '/'); -- b_base = strrchr (b, '/'); -- -- g_assert (a_base != NULL); -- g_assert (b_base != NULL); -- a_base += 1; -- b_base += 1; -- -- ret = g_strcmp0 (a_base, b_base); -- if (ret == 0) -- { -- /* /etc wins over /usr */ -- ret = g_strcmp0 (a, b); -- g_assert (ret != 0); -- } -- -- return ret; --} -- - static void - load_scripts (PolkitBackendJsAuthority *authority) - { -@@ -214,7 +118,7 @@ load_scripts (PolkitBackendJsAuthority *authority) - } - } - -- files = g_list_sort (files, (GCompareFunc) rules_file_name_cmp); -+ files = g_list_sort (files, (GCompareFunc) polkit_backend_common_rules_file_name_cmp); - - for (l = files; l != NULL; l = l->next) - { -@@ -258,8 +162,8 @@ load_scripts (PolkitBackendJsAuthority *authority) - g_list_free_full (files, g_free); - } - --static void --reload_scripts (PolkitBackendJsAuthority *authority) -+void -+polkit_backend_common_reload_scripts (PolkitBackendJsAuthority *authority) - { - duk_context *cx = authority->priv->cx; - -@@ -282,42 +186,6 @@ reload_scripts (PolkitBackendJsAuthority *authority) - g_signal_emit_by_name (authority, "changed"); - } - --static void --on_dir_monitor_changed (GFileMonitor *monitor, -- GFile *file, -- GFile *other_file, -- GFileMonitorEvent event_type, -- gpointer user_data) --{ -- PolkitBackendJsAuthority *authority = POLKIT_BACKEND_JS_AUTHORITY (user_data); -- -- /* TODO: maybe rate-limit so storms of events are collapsed into one with a 500ms resolution? -- * Because when editing a file with emacs we get 4-8 events.. -- */ -- -- if (file != NULL) -- { -- gchar *name; -- -- name = g_file_get_basename (file); -- -- /* g_print ("event_type=%d file=%p name=%s\n", event_type, file, name); */ -- if (!g_str_has_prefix (name, ".") && -- !g_str_has_prefix (name, "#") && -- g_str_has_suffix (name, ".rules") && -- (event_type == G_FILE_MONITOR_EVENT_CREATED || -- event_type == G_FILE_MONITOR_EVENT_DELETED || -- event_type == G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT)) -- { -- polkit_backend_authority_log (POLKIT_BACKEND_AUTHORITY (authority), -- "Reloading rules"); -- reload_scripts (authority); -- } -- g_free (name); -- } --} -- -- - static void - setup_file_monitors (PolkitBackendJsAuthority *authority) - { -@@ -349,7 +217,7 @@ setup_file_monitors (PolkitBackendJsAuthority *authority) - { - g_signal_connect (monitor, - "changed", -- G_CALLBACK (on_dir_monitor_changed), -+ G_CALLBACK (polkit_backend_common_on_dir_monitor_changed), - authority); - g_ptr_array_add (p, monitor); - } -@@ -358,8 +226,8 @@ setup_file_monitors (PolkitBackendJsAuthority *authority) - authority->priv->dir_monitors = (GFileMonitor**) g_ptr_array_free (p, FALSE); - } - --static void --polkit_backend_js_authority_constructed (GObject *object) -+void -+polkit_backend_common_js_authority_constructed (GObject *object) - { - PolkitBackendJsAuthority *authority = POLKIT_BACKEND_JS_AUTHORITY (object); - duk_context *cx; -@@ -395,8 +263,8 @@ polkit_backend_js_authority_constructed (GObject *object) - g_assert_not_reached (); - } - --static void --polkit_backend_js_authority_finalize (GObject *object) -+void -+polkit_backend_common_js_authority_finalize (GObject *object) - { - PolkitBackendJsAuthority *authority = POLKIT_BACKEND_JS_AUTHORITY (object); - guint n; -@@ -405,7 +273,7 @@ polkit_backend_js_authority_finalize (GObject *object) - { - GFileMonitor *monitor = authority->priv->dir_monitors[n]; - g_signal_handlers_disconnect_by_func (monitor, -- G_CALLBACK (on_dir_monitor_changed), -+ G_CALLBACK (polkit_backend_common_on_dir_monitor_changed), - authority); - g_object_unref (monitor); - } -@@ -417,11 +285,11 @@ polkit_backend_js_authority_finalize (GObject *object) - G_OBJECT_CLASS (polkit_backend_js_authority_parent_class)->finalize (object); - } - --static void --polkit_backend_js_authority_set_property (GObject *object, -- guint property_id, -- const GValue *value, -- GParamSpec *pspec) -+void -+polkit_backend_common_js_authority_set_property (GObject *object, -+ guint property_id, -+ const GValue *value, -+ GParamSpec *pspec) - { - PolkitBackendJsAuthority *authority = POLKIT_BACKEND_JS_AUTHORITY (object); - -@@ -438,55 +306,10 @@ polkit_backend_js_authority_set_property (GObject *object, - } - } - --static const gchar * --polkit_backend_js_authority_get_name (PolkitBackendAuthority *authority) --{ -- return "js"; --} -- --static const gchar * --polkit_backend_js_authority_get_version (PolkitBackendAuthority *authority) --{ -- return PACKAGE_VERSION; --} -- --static PolkitAuthorityFeatures --polkit_backend_js_authority_get_features (PolkitBackendAuthority *authority) --{ -- return POLKIT_AUTHORITY_FEATURES_TEMPORARY_AUTHORIZATION; --} -- - static void - polkit_backend_js_authority_class_init (PolkitBackendJsAuthorityClass *klass) - { -- GObjectClass *gobject_class; -- PolkitBackendAuthorityClass *authority_class; -- PolkitBackendInteractiveAuthorityClass *interactive_authority_class; -- -- -- gobject_class = G_OBJECT_CLASS (klass); -- gobject_class->finalize = polkit_backend_js_authority_finalize; -- gobject_class->set_property = polkit_backend_js_authority_set_property; -- gobject_class->constructed = polkit_backend_js_authority_constructed; -- -- authority_class = POLKIT_BACKEND_AUTHORITY_CLASS (klass); -- authority_class->get_name = polkit_backend_js_authority_get_name; -- authority_class->get_version = polkit_backend_js_authority_get_version; -- authority_class->get_features = polkit_backend_js_authority_get_features; -- -- interactive_authority_class = POLKIT_BACKEND_INTERACTIVE_AUTHORITY_CLASS (klass); -- interactive_authority_class->get_admin_identities = polkit_backend_js_authority_get_admin_auth_identities; -- interactive_authority_class->check_authorization_sync = polkit_backend_js_authority_check_authorization_sync; -- -- g_object_class_install_property (gobject_class, -- PROP_RULES_DIRS, -- g_param_spec_boxed ("rules-dirs", -- NULL, -- NULL, -- G_TYPE_STRV, -- G_PARAM_CONSTRUCT_ONLY | G_PARAM_WRITABLE)); -- -- -+ polkit_backend_common_js_authority_class_init_common (klass); - g_type_class_add_private (klass, sizeof (PolkitBackendJsAuthorityPrivate)); - } - -@@ -689,15 +512,15 @@ push_action_and_details (duk_context *cx, - - /* ---------------------------------------------------------------------------------------------------- */ - --static GList * --polkit_backend_js_authority_get_admin_auth_identities (PolkitBackendInteractiveAuthority *_authority, -- PolkitSubject *caller, -- PolkitSubject *subject, -- PolkitIdentity *user_for_subject, -- gboolean subject_is_local, -- gboolean subject_is_active, -- const gchar *action_id, -- PolkitDetails *details) -+GList * -+polkit_backend_common_js_authority_get_admin_auth_identities (PolkitBackendInteractiveAuthority *_authority, -+ PolkitSubject *caller, -+ PolkitSubject *subject, -+ PolkitIdentity *user_for_subject, -+ gboolean subject_is_local, -+ gboolean subject_is_active, -+ const gchar *action_id, -+ PolkitDetails *details) - { - PolkitBackendJsAuthority *authority = POLKIT_BACKEND_JS_AUTHORITY (_authority); - GList *ret = NULL; -@@ -777,16 +600,16 @@ polkit_backend_js_authority_get_admin_auth_identities (PolkitBackendInteractiveA - - /* ---------------------------------------------------------------------------------------------------- */ - --static PolkitImplicitAuthorization --polkit_backend_js_authority_check_authorization_sync (PolkitBackendInteractiveAuthority *_authority, -- PolkitSubject *caller, -- PolkitSubject *subject, -- PolkitIdentity *user_for_subject, -- gboolean subject_is_local, -- gboolean subject_is_active, -- const gchar *action_id, -- PolkitDetails *details, -- PolkitImplicitAuthorization implicit) -+PolkitImplicitAuthorization -+polkit_backend_common_js_authority_check_authorization_sync (PolkitBackendInteractiveAuthority *_authority, -+ PolkitSubject *caller, -+ PolkitSubject *subject, -+ PolkitIdentity *user_for_subject, -+ gboolean subject_is_local, -+ gboolean subject_is_active, -+ const gchar *action_id, -+ PolkitDetails *details, -+ PolkitImplicitAuthorization implicit) - { - PolkitBackendJsAuthority *authority = POLKIT_BACKEND_JS_AUTHORITY (_authority); - PolkitImplicitAuthorization ret = implicit; -@@ -864,65 +687,6 @@ js_polkit_log (duk_context *cx) - - /* ---------------------------------------------------------------------------------------------------- */ - --static const gchar * --get_signal_name (gint signal_number) --{ -- switch (signal_number) -- { --#define _HANDLE_SIG(sig) case sig: return #sig; -- _HANDLE_SIG (SIGHUP); -- _HANDLE_SIG (SIGINT); -- _HANDLE_SIG (SIGQUIT); -- _HANDLE_SIG (SIGILL); -- _HANDLE_SIG (SIGABRT); -- _HANDLE_SIG (SIGFPE); -- _HANDLE_SIG (SIGKILL); -- _HANDLE_SIG (SIGSEGV); -- _HANDLE_SIG (SIGPIPE); -- _HANDLE_SIG (SIGALRM); -- _HANDLE_SIG (SIGTERM); -- _HANDLE_SIG (SIGUSR1); -- _HANDLE_SIG (SIGUSR2); -- _HANDLE_SIG (SIGCHLD); -- _HANDLE_SIG (SIGCONT); -- _HANDLE_SIG (SIGSTOP); -- _HANDLE_SIG (SIGTSTP); -- _HANDLE_SIG (SIGTTIN); -- _HANDLE_SIG (SIGTTOU); -- _HANDLE_SIG (SIGBUS); --#ifdef SIGPOLL -- _HANDLE_SIG (SIGPOLL); --#endif -- _HANDLE_SIG (SIGPROF); -- _HANDLE_SIG (SIGSYS); -- _HANDLE_SIG (SIGTRAP); -- _HANDLE_SIG (SIGURG); -- _HANDLE_SIG (SIGVTALRM); -- _HANDLE_SIG (SIGXCPU); -- _HANDLE_SIG (SIGXFSZ); --#undef _HANDLE_SIG -- default: -- break; -- } -- return "UNKNOWN_SIGNAL"; --} -- --typedef struct --{ -- GMainLoop *loop; -- GAsyncResult *res; --} SpawnData; -- --static void --spawn_cb (GObject *source_object, -- GAsyncResult *res, -- gpointer user_data) --{ -- SpawnData *data = (SpawnData *)user_data; -- data->res = (GAsyncResult*)g_object_ref (res); -- g_main_loop_quit (data->loop); --} -- - static duk_ret_t - js_polkit_spawn (duk_context *cx) - { -@@ -962,21 +726,21 @@ js_polkit_spawn (duk_context *cx) - g_main_context_push_thread_default (context); - - data.loop = loop; -- utils_spawn ((const gchar *const *) argv, -- 10, /* timeout_seconds */ -- NULL, /* cancellable */ -- spawn_cb, -- &data); -+ polkit_backend_common_spawn ((const gchar *const *) argv, -+ 10, /* timeout_seconds */ -+ NULL, /* cancellable */ -+ polkit_backend_common_spawn_cb, -+ &data); - - g_main_loop_run (loop); - - g_main_context_pop_thread_default (context); - -- if (!utils_spawn_finish (data.res, -- &exit_status, -- &standard_output, -- &standard_error, -- &error)) -+ if (!polkit_backend_common_spawn_finish (data.res, -+ &exit_status, -+ &standard_output, -+ &standard_error, -+ &error)) - { - err_str = g_strdup_printf ("Error spawning helper: %s (%s, %d)", - error->message, g_quark_to_string (error->domain), error->code); -@@ -998,7 +762,7 @@ js_polkit_spawn (duk_context *cx) - { - g_string_append_printf (gstr, - "Helper was signaled with signal %s (%d)", -- get_signal_name (WTERMSIG (exit_status)), -+ polkit_backend_common_get_signal_name (WTERMSIG (exit_status)), - WTERMSIG (exit_status)); - } - g_string_append_printf (gstr, ", stdout=`%s', stderr=`%s'", -@@ -1052,377 +816,3 @@ js_polkit_user_is_in_netgroup (duk_context *cx) - } - - /* ---------------------------------------------------------------------------------------------------- */ -- --typedef struct --{ -- GSimpleAsyncResult *simple; /* borrowed reference */ -- GMainContext *main_context; /* may be NULL */ -- -- GCancellable *cancellable; /* may be NULL */ -- gulong cancellable_handler_id; -- -- GPid child_pid; -- gint child_stdout_fd; -- gint child_stderr_fd; -- -- GIOChannel *child_stdout_channel; -- GIOChannel *child_stderr_channel; -- -- GSource *child_watch_source; -- GSource *child_stdout_source; -- GSource *child_stderr_source; -- -- guint timeout_seconds; -- gboolean timed_out; -- GSource *timeout_source; -- -- GString *child_stdout; -- GString *child_stderr; -- -- gint exit_status; --} UtilsSpawnData; -- --static void --utils_child_watch_from_release_cb (GPid pid, -- gint status, -- gpointer user_data) --{ --} -- --static void --utils_spawn_data_free (UtilsSpawnData *data) --{ -- if (data->timeout_source != NULL) -- { -- g_source_destroy (data->timeout_source); -- data->timeout_source = NULL; -- } -- -- /* Nuke the child, if necessary */ -- if (data->child_watch_source != NULL) -- { -- g_source_destroy (data->child_watch_source); -- data->child_watch_source = NULL; -- } -- -- if (data->child_pid != 0) -- { -- GSource *source; -- kill (data->child_pid, SIGTERM); -- /* OK, we need to reap for the child ourselves - we don't want -- * to use waitpid() because that might block the calling -- * thread (the child might handle SIGTERM and use several -- * seconds for cleanup/rollback). -- * -- * So we use GChildWatch instead. -- * -- * Avoid taking a references to ourselves. but note that we need -- * to pass the GSource so we can nuke it once handled. -- */ -- source = g_child_watch_source_new (data->child_pid); -- g_source_set_callback (source, -- (GSourceFunc) utils_child_watch_from_release_cb, -- source, -- (GDestroyNotify) g_source_destroy); -- g_source_attach (source, data->main_context); -- g_source_unref (source); -- data->child_pid = 0; -- } -- -- if (data->child_stdout != NULL) -- { -- g_string_free (data->child_stdout, TRUE); -- data->child_stdout = NULL; -- } -- -- if (data->child_stderr != NULL) -- { -- g_string_free (data->child_stderr, TRUE); -- data->child_stderr = NULL; -- } -- -- if (data->child_stdout_channel != NULL) -- { -- g_io_channel_unref (data->child_stdout_channel); -- data->child_stdout_channel = NULL; -- } -- if (data->child_stderr_channel != NULL) -- { -- g_io_channel_unref (data->child_stderr_channel); -- data->child_stderr_channel = NULL; -- } -- -- if (data->child_stdout_source != NULL) -- { -- g_source_destroy (data->child_stdout_source); -- data->child_stdout_source = NULL; -- } -- if (data->child_stderr_source != NULL) -- { -- g_source_destroy (data->child_stderr_source); -- data->child_stderr_source = NULL; -- } -- -- if (data->child_stdout_fd != -1) -- { -- g_warn_if_fail (close (data->child_stdout_fd) == 0); -- data->child_stdout_fd = -1; -- } -- if (data->child_stderr_fd != -1) -- { -- g_warn_if_fail (close (data->child_stderr_fd) == 0); -- data->child_stderr_fd = -1; -- } -- -- if (data->cancellable_handler_id > 0) -- { -- g_cancellable_disconnect (data->cancellable, data->cancellable_handler_id); -- data->cancellable_handler_id = 0; -- } -- -- if (data->main_context != NULL) -- g_main_context_unref (data->main_context); -- -- if (data->cancellable != NULL) -- g_object_unref (data->cancellable); -- -- g_slice_free (UtilsSpawnData, data); --} -- --/* called in the thread where @cancellable was cancelled */ --static void --utils_on_cancelled (GCancellable *cancellable, -- gpointer user_data) --{ -- UtilsSpawnData *data = (UtilsSpawnData *)user_data; -- GError *error; -- -- error = NULL; -- g_warn_if_fail (g_cancellable_set_error_if_cancelled (cancellable, &error)); -- g_simple_async_result_take_error (data->simple, error); -- g_simple_async_result_complete_in_idle (data->simple); -- g_object_unref (data->simple); --} -- --static gboolean --utils_read_child_stderr (GIOChannel *channel, -- GIOCondition condition, -- gpointer user_data) --{ -- UtilsSpawnData *data = (UtilsSpawnData *)user_data; -- gchar buf[1024]; -- gsize bytes_read; -- -- g_io_channel_read_chars (channel, buf, sizeof buf, &bytes_read, NULL); -- g_string_append_len (data->child_stderr, buf, bytes_read); -- return TRUE; --} -- --static gboolean --utils_read_child_stdout (GIOChannel *channel, -- GIOCondition condition, -- gpointer user_data) --{ -- UtilsSpawnData *data = (UtilsSpawnData *)user_data; -- gchar buf[1024]; -- gsize bytes_read; -- -- g_io_channel_read_chars (channel, buf, sizeof buf, &bytes_read, NULL); -- g_string_append_len (data->child_stdout, buf, bytes_read); -- return TRUE; --} -- --static void --utils_child_watch_cb (GPid pid, -- gint status, -- gpointer user_data) --{ -- UtilsSpawnData *data = (UtilsSpawnData *)user_data; -- gchar *buf; -- gsize buf_size; -- -- if (g_io_channel_read_to_end (data->child_stdout_channel, &buf, &buf_size, NULL) == G_IO_STATUS_NORMAL) -- { -- g_string_append_len (data->child_stdout, buf, buf_size); -- g_free (buf); -- } -- if (g_io_channel_read_to_end (data->child_stderr_channel, &buf, &buf_size, NULL) == G_IO_STATUS_NORMAL) -- { -- g_string_append_len (data->child_stderr, buf, buf_size); -- g_free (buf); -- } -- -- data->exit_status = status; -- -- /* ok, child watch is history, make sure we don't free it in spawn_data_free() */ -- data->child_pid = 0; -- data->child_watch_source = NULL; -- -- /* we're done */ -- g_simple_async_result_complete_in_idle (data->simple); -- g_object_unref (data->simple); --} -- --static gboolean --utils_timeout_cb (gpointer user_data) --{ -- UtilsSpawnData *data = (UtilsSpawnData *)user_data; -- -- data->timed_out = TRUE; -- -- /* ok, timeout is history, make sure we don't free it in spawn_data_free() */ -- data->timeout_source = NULL; -- -- /* we're done */ -- g_simple_async_result_complete_in_idle (data->simple); -- g_object_unref (data->simple); -- -- return FALSE; /* remove source */ --} -- --static void --utils_spawn (const gchar *const *argv, -- guint timeout_seconds, -- GCancellable *cancellable, -- GAsyncReadyCallback callback, -- gpointer user_data) --{ -- UtilsSpawnData *data; -- GError *error; -- -- data = g_slice_new0 (UtilsSpawnData); -- data->timeout_seconds = timeout_seconds; -- data->simple = g_simple_async_result_new (NULL, -- callback, -- user_data, -- (gpointer*)utils_spawn); -- data->main_context = g_main_context_get_thread_default (); -- if (data->main_context != NULL) -- g_main_context_ref (data->main_context); -- -- data->cancellable = cancellable != NULL ? (GCancellable*)g_object_ref (cancellable) : NULL; -- -- data->child_stdout = g_string_new (NULL); -- data->child_stderr = g_string_new (NULL); -- data->child_stdout_fd = -1; -- data->child_stderr_fd = -1; -- -- /* the life-cycle of UtilsSpawnData is tied to its GSimpleAsyncResult */ -- g_simple_async_result_set_op_res_gpointer (data->simple, data, (GDestroyNotify) utils_spawn_data_free); -- -- error = NULL; -- if (data->cancellable != NULL) -- { -- /* could already be cancelled */ -- error = NULL; -- if (g_cancellable_set_error_if_cancelled (data->cancellable, &error)) -- { -- g_simple_async_result_take_error (data->simple, error); -- g_simple_async_result_complete_in_idle (data->simple); -- g_object_unref (data->simple); -- goto out; -- } -- -- data->cancellable_handler_id = g_cancellable_connect (data->cancellable, -- G_CALLBACK (utils_on_cancelled), -- data, -- NULL); -- } -- -- error = NULL; -- if (!g_spawn_async_with_pipes (NULL, /* working directory */ -- (gchar **) argv, -- NULL, /* envp */ -- G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD, -- NULL, /* child_setup */ -- NULL, /* child_setup's user_data */ -- &(data->child_pid), -- NULL, /* gint *stdin_fd */ -- &(data->child_stdout_fd), -- &(data->child_stderr_fd), -- &error)) -- { -- g_prefix_error (&error, "Error spawning: "); -- g_simple_async_result_take_error (data->simple, error); -- g_simple_async_result_complete_in_idle (data->simple); -- g_object_unref (data->simple); -- goto out; -- } -- -- if (timeout_seconds > 0) -- { -- data->timeout_source = g_timeout_source_new_seconds (timeout_seconds); -- g_source_set_priority (data->timeout_source, G_PRIORITY_DEFAULT); -- g_source_set_callback (data->timeout_source, utils_timeout_cb, data, NULL); -- g_source_attach (data->timeout_source, data->main_context); -- g_source_unref (data->timeout_source); -- } -- -- data->child_watch_source = g_child_watch_source_new (data->child_pid); -- g_source_set_callback (data->child_watch_source, (GSourceFunc) utils_child_watch_cb, data, NULL); -- g_source_attach (data->child_watch_source, data->main_context); -- g_source_unref (data->child_watch_source); -- -- data->child_stdout_channel = g_io_channel_unix_new (data->child_stdout_fd); -- g_io_channel_set_flags (data->child_stdout_channel, G_IO_FLAG_NONBLOCK, NULL); -- data->child_stdout_source = g_io_create_watch (data->child_stdout_channel, G_IO_IN); -- g_source_set_callback (data->child_stdout_source, (GSourceFunc) utils_read_child_stdout, data, NULL); -- g_source_attach (data->child_stdout_source, data->main_context); -- g_source_unref (data->child_stdout_source); -- -- data->child_stderr_channel = g_io_channel_unix_new (data->child_stderr_fd); -- g_io_channel_set_flags (data->child_stderr_channel, G_IO_FLAG_NONBLOCK, NULL); -- data->child_stderr_source = g_io_create_watch (data->child_stderr_channel, G_IO_IN); -- g_source_set_callback (data->child_stderr_source, (GSourceFunc) utils_read_child_stderr, data, NULL); -- g_source_attach (data->child_stderr_source, data->main_context); -- g_source_unref (data->child_stderr_source); -- -- out: -- ; --} -- --gboolean --utils_spawn_finish (GAsyncResult *res, -- gint *out_exit_status, -- gchar **out_standard_output, -- gchar **out_standard_error, -- GError **error) --{ -- GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (res); -- UtilsSpawnData *data; -- gboolean ret = FALSE; -- -- g_return_val_if_fail (G_IS_ASYNC_RESULT (res), FALSE); -- g_return_val_if_fail (error == NULL || *error == NULL, FALSE); -- -- g_warn_if_fail (g_simple_async_result_get_source_tag (simple) == utils_spawn); -- -- if (g_simple_async_result_propagate_error (simple, error)) -- goto out; -- -- data = (UtilsSpawnData*)g_simple_async_result_get_op_res_gpointer (simple); -- -- if (data->timed_out) -- { -- g_set_error (error, -- G_IO_ERROR, -- G_IO_ERROR_TIMED_OUT, -- "Timed out after %d seconds", -- data->timeout_seconds); -- goto out; -- } -- -- if (out_exit_status != NULL) -- *out_exit_status = data->exit_status; -- -- if (out_standard_output != NULL) -- *out_standard_output = g_strdup (data->child_stdout->str); -- -- if (out_standard_error != NULL) -- *out_standard_error = g_strdup (data->child_stderr->str); -- -- ret = TRUE; -- -- out: -- return ret; --} -diff --git a/src/polkitbackend/polkitbackendjsauthority.cpp b/src/polkitbackend/polkitbackendjsauthority.cpp -index ca17108..e28091d 100644 ---- a/src/polkitbackend/polkitbackendjsauthority.cpp -+++ b/src/polkitbackend/polkitbackendjsauthority.cpp -@@ -19,29 +19,7 @@ - * Author: David Zeuthen - */ - --#include "config.h" --#include --#include --#include --#include --#ifdef HAVE_NETGROUP_H --#include --#else --#include --#endif --#include --#include --#include --#include -- --#include --#include "polkitbackendjsauthority.h" -- --#include -- --#ifdef HAVE_LIBSYSTEMD --#include --#endif /* HAVE_LIBSYSTEMD */ -+#include "polkitbackendcommon.h" - - #include - #include -@@ -52,6 +30,7 @@ - #include - #include - -+/* Built source and not too big to worry about deduplication */ - #include "initjs.h" /* init.js */ - - #ifdef JSGC_USE_EXACT_ROOTING -@@ -67,10 +46,9 @@ - * @short_description: JS Authority - * @stability: Unstable - * -- * An implementation of #PolkitBackendAuthority that reads and -- * evalates Javascript files and supports interaction with -- * authentication agents (virtue of being based on -- * #PolkitBackendInteractiveAuthority). -+ * An (SpiderMonkey-based) implementation of #PolkitBackendAuthority that reads -+ * and evaluates Javascript files and supports interaction with authentication -+ * agents (virtue of being based on #PolkitBackendInteractiveAuthority). - */ - - /* ---------------------------------------------------------------------------------------------------- */ -@@ -100,57 +78,11 @@ static bool execute_script_with_runaway_killer (PolkitBackendJsAuthority *author - JS::HandleScript script, - JS::MutableHandleValue rval); - --static void utils_spawn (const gchar *const *argv, -- guint timeout_seconds, -- GCancellable *cancellable, -- GAsyncReadyCallback callback, -- gpointer user_data); -- --gboolean utils_spawn_finish (GAsyncResult *res, -- gint *out_exit_status, -- gchar **out_standard_output, -- gchar **out_standard_error, -- GError **error); -- --static void on_dir_monitor_changed (GFileMonitor *monitor, -- GFile *file, -- GFile *other_file, -- GFileMonitorEvent event_type, -- gpointer user_data); -- --/* ---------------------------------------------------------------------------------------------------- */ -- --enum --{ -- PROP_0, -- PROP_RULES_DIRS, --}; -- - /* ---------------------------------------------------------------------------------------------------- */ - - static gpointer runaway_killer_thread_func (gpointer user_data); - static void runaway_killer_terminate (PolkitBackendJsAuthority *authority); - --static GList *polkit_backend_js_authority_get_admin_auth_identities (PolkitBackendInteractiveAuthority *authority, -- PolkitSubject *caller, -- PolkitSubject *subject, -- PolkitIdentity *user_for_subject, -- gboolean subject_is_local, -- gboolean subject_is_active, -- const gchar *action_id, -- PolkitDetails *details); -- --static PolkitImplicitAuthorization polkit_backend_js_authority_check_authorization_sync ( -- PolkitBackendInteractiveAuthority *authority, -- PolkitSubject *caller, -- PolkitSubject *subject, -- PolkitIdentity *user_for_subject, -- gboolean subject_is_local, -- gboolean subject_is_active, -- const gchar *action_id, -- PolkitDetails *details, -- PolkitImplicitAuthorization implicit); -- - G_DEFINE_TYPE (PolkitBackendJsAuthority, polkit_backend_js_authority, POLKIT_BACKEND_TYPE_INTERACTIVE_AUTHORITY); - - /* ---------------------------------------------------------------------------------------------------- */ -@@ -229,33 +161,6 @@ polkit_backend_js_authority_init (PolkitBackendJsAuthority *authority) - PolkitBackendJsAuthorityPrivate); - } - --static gint --rules_file_name_cmp (const gchar *a, -- const gchar *b) --{ -- gint ret; -- const gchar *a_base; -- const gchar *b_base; -- -- a_base = strrchr (a, '/'); -- b_base = strrchr (b, '/'); -- -- g_assert (a_base != NULL); -- g_assert (b_base != NULL); -- a_base += 1; -- b_base += 1; -- -- ret = g_strcmp0 (a_base, b_base); -- if (ret == 0) -- { -- /* /etc wins over /usr */ -- ret = g_strcmp0 (a, b); -- g_assert (ret != 0); -- } -- -- return ret; --} -- - /* authority->priv->cx must be within a request */ - static void - load_scripts (PolkitBackendJsAuthority *authority) -@@ -299,7 +204,7 @@ load_scripts (PolkitBackendJsAuthority *authority) - } - } - -- files = g_list_sort (files, (GCompareFunc) rules_file_name_cmp); -+ files = g_list_sort (files, (GCompareFunc) polkit_backend_common_rules_file_name_cmp); - - for (l = files; l != NULL; l = l->next) - { -@@ -365,8 +270,8 @@ load_scripts (PolkitBackendJsAuthority *authority) - g_list_free_full (files, g_free); - } - --static void --reload_scripts (PolkitBackendJsAuthority *authority) -+void -+polkit_backend_common_reload_scripts (PolkitBackendJsAuthority *authority) - { - JS::RootedValueArray<1> args(authority->priv->cx); - JS::RootedValue rval(authority->priv->cx); -@@ -395,42 +300,6 @@ reload_scripts (PolkitBackendJsAuthority *authority) - g_signal_emit_by_name (authority, "changed"); - } - --static void --on_dir_monitor_changed (GFileMonitor *monitor, -- GFile *file, -- GFile *other_file, -- GFileMonitorEvent event_type, -- gpointer user_data) --{ -- PolkitBackendJsAuthority *authority = POLKIT_BACKEND_JS_AUTHORITY (user_data); -- -- /* TODO: maybe rate-limit so storms of events are collapsed into one with a 500ms resolution? -- * Because when editing a file with emacs we get 4-8 events.. -- */ -- -- if (file != NULL) -- { -- gchar *name; -- -- name = g_file_get_basename (file); -- -- /* g_print ("event_type=%d file=%p name=%s\n", event_type, file, name); */ -- if (!g_str_has_prefix (name, ".") && -- !g_str_has_prefix (name, "#") && -- g_str_has_suffix (name, ".rules") && -- (event_type == G_FILE_MONITOR_EVENT_CREATED || -- event_type == G_FILE_MONITOR_EVENT_DELETED || -- event_type == G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT)) -- { -- polkit_backend_authority_log (POLKIT_BACKEND_AUTHORITY (authority), -- "Reloading rules"); -- reload_scripts (authority); -- } -- g_free (name); -- } --} -- -- - static void - setup_file_monitors (PolkitBackendJsAuthority *authority) - { -@@ -462,7 +331,7 @@ setup_file_monitors (PolkitBackendJsAuthority *authority) - { - g_signal_connect (monitor, - "changed", -- G_CALLBACK (on_dir_monitor_changed), -+ G_CALLBACK (polkit_backend_common_on_dir_monitor_changed), - authority); - g_ptr_array_add (p, monitor); - } -@@ -471,8 +340,8 @@ setup_file_monitors (PolkitBackendJsAuthority *authority) - authority->priv->dir_monitors = (GFileMonitor**) g_ptr_array_free (p, FALSE); - } - --static void --polkit_backend_js_authority_constructed (GObject *object) -+void -+polkit_backend_common_js_authority_constructed (GObject *object) - { - PolkitBackendJsAuthority *authority = POLKIT_BACKEND_JS_AUTHORITY (object); - -@@ -561,8 +430,8 @@ polkit_backend_js_authority_constructed (GObject *object) - g_assert_not_reached (); - } - --static void --polkit_backend_js_authority_finalize (GObject *object) -+void -+polkit_backend_common_js_authority_finalize (GObject *object) - { - PolkitBackendJsAuthority *authority = POLKIT_BACKEND_JS_AUTHORITY (object); - guint n; -@@ -577,7 +446,7 @@ polkit_backend_js_authority_finalize (GObject *object) - { - GFileMonitor *monitor = authority->priv->dir_monitors[n]; - g_signal_handlers_disconnect_by_func (monitor, -- (gpointer*)G_CALLBACK (on_dir_monitor_changed), -+ (gpointer*)G_CALLBACK (polkit_backend_common_on_dir_monitor_changed), - authority); - g_object_unref (monitor); - } -@@ -594,11 +463,11 @@ polkit_backend_js_authority_finalize (GObject *object) - G_OBJECT_CLASS (polkit_backend_js_authority_parent_class)->finalize (object); - } - --static void --polkit_backend_js_authority_set_property (GObject *object, -- guint property_id, -- const GValue *value, -- GParamSpec *pspec) -+void -+polkit_backend_common_js_authority_set_property (GObject *object, -+ guint property_id, -+ const GValue *value, -+ GParamSpec *pspec) - { - PolkitBackendJsAuthority *authority = POLKIT_BACKEND_JS_AUTHORITY (object); - -@@ -615,57 +484,12 @@ polkit_backend_js_authority_set_property (GObject *object, - } - } - --static const gchar * --polkit_backend_js_authority_get_name (PolkitBackendAuthority *authority) --{ -- return "js"; --} -- --static const gchar * --polkit_backend_js_authority_get_version (PolkitBackendAuthority *authority) --{ -- return PACKAGE_VERSION; --} -- --static PolkitAuthorityFeatures --polkit_backend_js_authority_get_features (PolkitBackendAuthority *authority) --{ -- return POLKIT_AUTHORITY_FEATURES_TEMPORARY_AUTHORIZATION; --} -- - static void - polkit_backend_js_authority_class_init (PolkitBackendJsAuthorityClass *klass) - { -- GObjectClass *gobject_class; -- PolkitBackendAuthorityClass *authority_class; -- PolkitBackendInteractiveAuthorityClass *interactive_authority_class; -- -- -- gobject_class = G_OBJECT_CLASS (klass); -- gobject_class->finalize = polkit_backend_js_authority_finalize; -- gobject_class->set_property = polkit_backend_js_authority_set_property; -- gobject_class->constructed = polkit_backend_js_authority_constructed; -- -- authority_class = POLKIT_BACKEND_AUTHORITY_CLASS (klass); -- authority_class->get_name = polkit_backend_js_authority_get_name; -- authority_class->get_version = polkit_backend_js_authority_get_version; -- authority_class->get_features = polkit_backend_js_authority_get_features; -- -- interactive_authority_class = POLKIT_BACKEND_INTERACTIVE_AUTHORITY_CLASS (klass); -- interactive_authority_class->get_admin_identities = polkit_backend_js_authority_get_admin_auth_identities; -- interactive_authority_class->check_authorization_sync = polkit_backend_js_authority_check_authorization_sync; -- -- g_object_class_install_property (gobject_class, -- PROP_RULES_DIRS, -- g_param_spec_boxed ("rules-dirs", -- NULL, -- NULL, -- G_TYPE_STRV, -- GParamFlags(G_PARAM_CONSTRUCT_ONLY | G_PARAM_WRITABLE))); -- -+ polkit_backend_common_js_authority_class_init_common (klass); - - g_type_class_add_private (klass, sizeof (PolkitBackendJsAuthorityPrivate)); -- - JS_Init (); - } - -@@ -1099,15 +923,15 @@ call_js_function_with_runaway_killer (PolkitBackendJsAuthority *authority, - - /* ---------------------------------------------------------------------------------------------------- */ - --static GList * --polkit_backend_js_authority_get_admin_auth_identities (PolkitBackendInteractiveAuthority *_authority, -- PolkitSubject *caller, -- PolkitSubject *subject, -- PolkitIdentity *user_for_subject, -- gboolean subject_is_local, -- gboolean subject_is_active, -- const gchar *action_id, -- PolkitDetails *details) -+GList * -+polkit_backend_common_js_authority_get_admin_auth_identities (PolkitBackendInteractiveAuthority *_authority, -+ PolkitSubject *caller, -+ PolkitSubject *subject, -+ PolkitIdentity *user_for_subject, -+ gboolean subject_is_local, -+ gboolean subject_is_active, -+ const gchar *action_id, -+ PolkitDetails *details) - { - PolkitBackendJsAuthority *authority = POLKIT_BACKEND_JS_AUTHORITY (_authority); - GList *ret = NULL; -@@ -1202,16 +1026,16 @@ polkit_backend_js_authority_get_admin_auth_identities (PolkitBackendInteractiveA - - /* ---------------------------------------------------------------------------------------------------- */ - --static PolkitImplicitAuthorization --polkit_backend_js_authority_check_authorization_sync (PolkitBackendInteractiveAuthority *_authority, -- PolkitSubject *caller, -- PolkitSubject *subject, -- PolkitIdentity *user_for_subject, -- gboolean subject_is_local, -- gboolean subject_is_active, -- const gchar *action_id, -- PolkitDetails *details, -- PolkitImplicitAuthorization implicit) -+PolkitImplicitAuthorization -+polkit_backend_common_js_authority_check_authorization_sync (PolkitBackendInteractiveAuthority *_authority, -+ PolkitSubject *caller, -+ PolkitSubject *subject, -+ PolkitIdentity *user_for_subject, -+ gboolean subject_is_local, -+ gboolean subject_is_active, -+ const gchar *action_id, -+ PolkitDetails *details, -+ PolkitImplicitAuthorization implicit) - { - PolkitBackendJsAuthority *authority = POLKIT_BACKEND_JS_AUTHORITY (_authority); - PolkitImplicitAuthorization ret = implicit; -@@ -1324,65 +1148,6 @@ js_polkit_log (JSContext *cx, - - /* ---------------------------------------------------------------------------------------------------- */ - --static const gchar * --get_signal_name (gint signal_number) --{ -- switch (signal_number) -- { --#define _HANDLE_SIG(sig) case sig: return #sig; -- _HANDLE_SIG (SIGHUP); -- _HANDLE_SIG (SIGINT); -- _HANDLE_SIG (SIGQUIT); -- _HANDLE_SIG (SIGILL); -- _HANDLE_SIG (SIGABRT); -- _HANDLE_SIG (SIGFPE); -- _HANDLE_SIG (SIGKILL); -- _HANDLE_SIG (SIGSEGV); -- _HANDLE_SIG (SIGPIPE); -- _HANDLE_SIG (SIGALRM); -- _HANDLE_SIG (SIGTERM); -- _HANDLE_SIG (SIGUSR1); -- _HANDLE_SIG (SIGUSR2); -- _HANDLE_SIG (SIGCHLD); -- _HANDLE_SIG (SIGCONT); -- _HANDLE_SIG (SIGSTOP); -- _HANDLE_SIG (SIGTSTP); -- _HANDLE_SIG (SIGTTIN); -- _HANDLE_SIG (SIGTTOU); -- _HANDLE_SIG (SIGBUS); --#ifdef SIGPOLL -- _HANDLE_SIG (SIGPOLL); --#endif -- _HANDLE_SIG (SIGPROF); -- _HANDLE_SIG (SIGSYS); -- _HANDLE_SIG (SIGTRAP); -- _HANDLE_SIG (SIGURG); -- _HANDLE_SIG (SIGVTALRM); -- _HANDLE_SIG (SIGXCPU); -- _HANDLE_SIG (SIGXFSZ); --#undef _HANDLE_SIG -- default: -- break; -- } -- return "UNKNOWN_SIGNAL"; --} -- --typedef struct --{ -- GMainLoop *loop; -- GAsyncResult *res; --} SpawnData; -- --static void --spawn_cb (GObject *source_object, -- GAsyncResult *res, -- gpointer user_data) --{ -- SpawnData *data = (SpawnData *)user_data; -- data->res = (GAsyncResult*)g_object_ref (res); -- g_main_loop_quit (data->loop); --} -- - static bool - js_polkit_spawn (JSContext *cx, - unsigned js_argc, -@@ -1440,21 +1205,21 @@ js_polkit_spawn (JSContext *cx, - g_main_context_push_thread_default (context); - - data.loop = loop; -- utils_spawn ((const gchar *const *) argv, -- 10, /* timeout_seconds */ -- NULL, /* cancellable */ -- spawn_cb, -- &data); -+ polkit_backend_common_spawn ((const gchar *const *) argv, -+ 10, /* timeout_seconds */ -+ NULL, /* cancellable */ -+ polkit_backend_common_spawn_cb, -+ &data); - - g_main_loop_run (loop); - - g_main_context_pop_thread_default (context); - -- if (!utils_spawn_finish (data.res, -- &exit_status, -- &standard_output, -- &standard_error, -- &error)) -+ if (!polkit_backend_common_spawn_finish (data.res, -+ &exit_status, -+ &standard_output, -+ &standard_error, -+ &error)) - { - JS_ReportErrorUTF8 (cx, - "Error spawning helper: %s (%s, %d)", -@@ -1477,7 +1242,7 @@ js_polkit_spawn (JSContext *cx, - { - g_string_append_printf (gstr, - "Helper was signaled with signal %s (%d)", -- get_signal_name (WTERMSIG (exit_status)), -+ polkit_backend_common_get_signal_name (WTERMSIG (exit_status)), - WTERMSIG (exit_status)); - } - g_string_append_printf (gstr, ", stdout=`%s', stderr=`%s'", -@@ -1542,381 +1307,5 @@ js_polkit_user_is_in_netgroup (JSContext *cx, - return ret; - } - -- -- - /* ---------------------------------------------------------------------------------------------------- */ - --typedef struct --{ -- GSimpleAsyncResult *simple; /* borrowed reference */ -- GMainContext *main_context; /* may be NULL */ -- -- GCancellable *cancellable; /* may be NULL */ -- gulong cancellable_handler_id; -- -- GPid child_pid; -- gint child_stdout_fd; -- gint child_stderr_fd; -- -- GIOChannel *child_stdout_channel; -- GIOChannel *child_stderr_channel; -- -- GSource *child_watch_source; -- GSource *child_stdout_source; -- GSource *child_stderr_source; -- -- guint timeout_seconds; -- gboolean timed_out; -- GSource *timeout_source; -- -- GString *child_stdout; -- GString *child_stderr; -- -- gint exit_status; --} UtilsSpawnData; -- --static void --utils_child_watch_from_release_cb (GPid pid, -- gint status, -- gpointer user_data) --{ --} -- --static void --utils_spawn_data_free (UtilsSpawnData *data) --{ -- if (data->timeout_source != NULL) -- { -- g_source_destroy (data->timeout_source); -- data->timeout_source = NULL; -- } -- -- /* Nuke the child, if necessary */ -- if (data->child_watch_source != NULL) -- { -- g_source_destroy (data->child_watch_source); -- data->child_watch_source = NULL; -- } -- -- if (data->child_pid != 0) -- { -- GSource *source; -- kill (data->child_pid, SIGTERM); -- /* OK, we need to reap for the child ourselves - we don't want -- * to use waitpid() because that might block the calling -- * thread (the child might handle SIGTERM and use several -- * seconds for cleanup/rollback). -- * -- * So we use GChildWatch instead. -- * -- * Avoid taking a references to ourselves. but note that we need -- * to pass the GSource so we can nuke it once handled. -- */ -- source = g_child_watch_source_new (data->child_pid); -- g_source_set_callback (source, -- (GSourceFunc) utils_child_watch_from_release_cb, -- source, -- (GDestroyNotify) g_source_destroy); -- /* attach source to the global default main context */ -- g_source_attach (source, NULL); -- g_source_unref (source); -- data->child_pid = 0; -- } -- -- if (data->child_stdout != NULL) -- { -- g_string_free (data->child_stdout, TRUE); -- data->child_stdout = NULL; -- } -- -- if (data->child_stderr != NULL) -- { -- g_string_free (data->child_stderr, TRUE); -- data->child_stderr = NULL; -- } -- -- if (data->child_stdout_channel != NULL) -- { -- g_io_channel_unref (data->child_stdout_channel); -- data->child_stdout_channel = NULL; -- } -- if (data->child_stderr_channel != NULL) -- { -- g_io_channel_unref (data->child_stderr_channel); -- data->child_stderr_channel = NULL; -- } -- -- if (data->child_stdout_source != NULL) -- { -- g_source_destroy (data->child_stdout_source); -- data->child_stdout_source = NULL; -- } -- if (data->child_stderr_source != NULL) -- { -- g_source_destroy (data->child_stderr_source); -- data->child_stderr_source = NULL; -- } -- -- if (data->child_stdout_fd != -1) -- { -- g_warn_if_fail (close (data->child_stdout_fd) == 0); -- data->child_stdout_fd = -1; -- } -- if (data->child_stderr_fd != -1) -- { -- g_warn_if_fail (close (data->child_stderr_fd) == 0); -- data->child_stderr_fd = -1; -- } -- -- if (data->cancellable_handler_id > 0) -- { -- g_cancellable_disconnect (data->cancellable, data->cancellable_handler_id); -- data->cancellable_handler_id = 0; -- } -- -- if (data->main_context != NULL) -- g_main_context_unref (data->main_context); -- -- if (data->cancellable != NULL) -- g_object_unref (data->cancellable); -- -- g_slice_free (UtilsSpawnData, data); --} -- --/* called in the thread where @cancellable was cancelled */ --static void --utils_on_cancelled (GCancellable *cancellable, -- gpointer user_data) --{ -- UtilsSpawnData *data = (UtilsSpawnData *)user_data; -- GError *error; -- -- error = NULL; -- g_warn_if_fail (g_cancellable_set_error_if_cancelled (cancellable, &error)); -- g_simple_async_result_take_error (data->simple, error); -- g_simple_async_result_complete_in_idle (data->simple); -- g_object_unref (data->simple); --} -- --static gboolean --utils_read_child_stderr (GIOChannel *channel, -- GIOCondition condition, -- gpointer user_data) --{ -- UtilsSpawnData *data = (UtilsSpawnData *)user_data; -- gchar buf[1024]; -- gsize bytes_read; -- -- g_io_channel_read_chars (channel, buf, sizeof buf, &bytes_read, NULL); -- g_string_append_len (data->child_stderr, buf, bytes_read); -- return TRUE; --} -- --static gboolean --utils_read_child_stdout (GIOChannel *channel, -- GIOCondition condition, -- gpointer user_data) --{ -- UtilsSpawnData *data = (UtilsSpawnData *)user_data; -- gchar buf[1024]; -- gsize bytes_read; -- -- g_io_channel_read_chars (channel, buf, sizeof buf, &bytes_read, NULL); -- g_string_append_len (data->child_stdout, buf, bytes_read); -- return TRUE; --} -- --static void --utils_child_watch_cb (GPid pid, -- gint status, -- gpointer user_data) --{ -- UtilsSpawnData *data = (UtilsSpawnData *)user_data; -- gchar *buf; -- gsize buf_size; -- -- if (g_io_channel_read_to_end (data->child_stdout_channel, &buf, &buf_size, NULL) == G_IO_STATUS_NORMAL) -- { -- g_string_append_len (data->child_stdout, buf, buf_size); -- g_free (buf); -- } -- if (g_io_channel_read_to_end (data->child_stderr_channel, &buf, &buf_size, NULL) == G_IO_STATUS_NORMAL) -- { -- g_string_append_len (data->child_stderr, buf, buf_size); -- g_free (buf); -- } -- -- data->exit_status = status; -- -- /* ok, child watch is history, make sure we don't free it in spawn_data_free() */ -- data->child_pid = 0; -- data->child_watch_source = NULL; -- -- /* we're done */ -- g_simple_async_result_complete_in_idle (data->simple); -- g_object_unref (data->simple); --} -- --static gboolean --utils_timeout_cb (gpointer user_data) --{ -- UtilsSpawnData *data = (UtilsSpawnData *)user_data; -- -- data->timed_out = TRUE; -- -- /* ok, timeout is history, make sure we don't free it in spawn_data_free() */ -- data->timeout_source = NULL; -- -- /* we're done */ -- g_simple_async_result_complete_in_idle (data->simple); -- g_object_unref (data->simple); -- -- return FALSE; /* remove source */ --} -- --static void --utils_spawn (const gchar *const *argv, -- guint timeout_seconds, -- GCancellable *cancellable, -- GAsyncReadyCallback callback, -- gpointer user_data) --{ -- UtilsSpawnData *data; -- GError *error; -- -- data = g_slice_new0 (UtilsSpawnData); -- data->timeout_seconds = timeout_seconds; -- data->simple = g_simple_async_result_new (NULL, -- callback, -- user_data, -- (gpointer*)utils_spawn); -- data->main_context = g_main_context_get_thread_default (); -- if (data->main_context != NULL) -- g_main_context_ref (data->main_context); -- -- data->cancellable = cancellable != NULL ? (GCancellable*)g_object_ref (cancellable) : NULL; -- -- data->child_stdout = g_string_new (NULL); -- data->child_stderr = g_string_new (NULL); -- data->child_stdout_fd = -1; -- data->child_stderr_fd = -1; -- -- /* the life-cycle of UtilsSpawnData is tied to its GSimpleAsyncResult */ -- g_simple_async_result_set_op_res_gpointer (data->simple, data, (GDestroyNotify) utils_spawn_data_free); -- -- error = NULL; -- if (data->cancellable != NULL) -- { -- /* could already be cancelled */ -- error = NULL; -- if (g_cancellable_set_error_if_cancelled (data->cancellable, &error)) -- { -- g_simple_async_result_take_error (data->simple, error); -- g_simple_async_result_complete_in_idle (data->simple); -- g_object_unref (data->simple); -- goto out; -- } -- -- data->cancellable_handler_id = g_cancellable_connect (data->cancellable, -- G_CALLBACK (utils_on_cancelled), -- data, -- NULL); -- } -- -- error = NULL; -- if (!g_spawn_async_with_pipes (NULL, /* working directory */ -- (gchar **) argv, -- NULL, /* envp */ -- GSpawnFlags(G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD), -- NULL, /* child_setup */ -- NULL, /* child_setup's user_data */ -- &(data->child_pid), -- NULL, /* gint *stdin_fd */ -- &(data->child_stdout_fd), -- &(data->child_stderr_fd), -- &error)) -- { -- g_prefix_error (&error, "Error spawning: "); -- g_simple_async_result_take_error (data->simple, error); -- g_simple_async_result_complete_in_idle (data->simple); -- g_object_unref (data->simple); -- goto out; -- } -- -- if (timeout_seconds > 0) -- { -- data->timeout_source = g_timeout_source_new_seconds (timeout_seconds); -- g_source_set_priority (data->timeout_source, G_PRIORITY_DEFAULT); -- g_source_set_callback (data->timeout_source, utils_timeout_cb, data, NULL); -- g_source_attach (data->timeout_source, data->main_context); -- g_source_unref (data->timeout_source); -- } -- -- data->child_watch_source = g_child_watch_source_new (data->child_pid); -- g_source_set_callback (data->child_watch_source, (GSourceFunc) utils_child_watch_cb, data, NULL); -- g_source_attach (data->child_watch_source, data->main_context); -- g_source_unref (data->child_watch_source); -- -- data->child_stdout_channel = g_io_channel_unix_new (data->child_stdout_fd); -- g_io_channel_set_flags (data->child_stdout_channel, G_IO_FLAG_NONBLOCK, NULL); -- data->child_stdout_source = g_io_create_watch (data->child_stdout_channel, G_IO_IN); -- g_source_set_callback (data->child_stdout_source, (GSourceFunc) utils_read_child_stdout, data, NULL); -- g_source_attach (data->child_stdout_source, data->main_context); -- g_source_unref (data->child_stdout_source); -- -- data->child_stderr_channel = g_io_channel_unix_new (data->child_stderr_fd); -- g_io_channel_set_flags (data->child_stderr_channel, G_IO_FLAG_NONBLOCK, NULL); -- data->child_stderr_source = g_io_create_watch (data->child_stderr_channel, G_IO_IN); -- g_source_set_callback (data->child_stderr_source, (GSourceFunc) utils_read_child_stderr, data, NULL); -- g_source_attach (data->child_stderr_source, data->main_context); -- g_source_unref (data->child_stderr_source); -- -- out: -- ; --} -- --gboolean --utils_spawn_finish (GAsyncResult *res, -- gint *out_exit_status, -- gchar **out_standard_output, -- gchar **out_standard_error, -- GError **error) --{ -- GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (res); -- UtilsSpawnData *data; -- gboolean ret = FALSE; -- -- g_return_val_if_fail (G_IS_ASYNC_RESULT (res), FALSE); -- g_return_val_if_fail (error == NULL || *error == NULL, FALSE); -- -- g_warn_if_fail (g_simple_async_result_get_source_tag (simple) == utils_spawn); -- -- if (g_simple_async_result_propagate_error (simple, error)) -- goto out; -- -- data = (UtilsSpawnData*)g_simple_async_result_get_op_res_gpointer (simple); -- -- if (data->timed_out) -- { -- g_set_error (error, -- G_IO_ERROR, -- G_IO_ERROR_TIMED_OUT, -- "Timed out after %d seconds", -- data->timeout_seconds); -- goto out; -- } -- -- if (out_exit_status != NULL) -- *out_exit_status = data->exit_status; -- -- if (out_standard_output != NULL) -- *out_standard_output = g_strdup (data->child_stdout->str); -- -- if (out_standard_error != NULL) -- *out_standard_error = g_strdup (data->child_stderr->str); -- -- ret = TRUE; -- -- out: -- return ret; --} --- -GitLab - - -From 4858128107be9c3ab11828ee8f35c5e26efd36ce Mon Sep 17 00:00:00 2001 -From: Gustavo Lima Chaves -Date: Tue, 14 Sep 2021 14:38:15 -0700 -Subject: [PATCH 15/16] Gitlab CI: add duktape pkgconfig dependency - -Make way for the CI to be able to build with duktape too - -Signed-off-by: Gustavo Lima Chaves ---- - .gitlab-ci.yml | 1 + - 1 file changed, 1 insertion(+) - -GitLab - - -From cd5d6da837fce95f8831a355dad88c83347c7337 Mon Sep 17 00:00:00 2001 -From: Gustavo Lima Chaves -Date: Mon, 20 Sep 2021 17:17:26 -0700 -Subject: [PATCH 16/16] duktape: implement runaway scripts killer timeout - -This was missing on Duktape's JS backend proposal, now in. As -discussed in -https://gitlab.freedesktop.org/polkit/polkit/-/merge_requests/35 and -verified by the commit author, Duktape has no interrupt injection -mechanism (it has no thread-safe API entry whatsoever, even). Using -DUK_USE_EXEC_TIMEOUT_CHECK is also not feasible, because: - - i) It must be enabled at build time and shared object builds of the - lib on distros go with the default options, something we cannot - change/control - - ii) That does not account for non-ECMAScript explicit execution - contexts, like regex execution, native C calls, etc. - -It has been agreed, on that thread, that pthread_cond_timedwait()-ing -and having proper Duktape evaluation/execution calls take place in a -separate thread, to be killed after the runaway script killer's -accorded timeout value, a reasonable approach. We have considered -using glib wrappers for direct pthread usage, but that way would make -it impossible to issue -pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, ...) and we want to -be paranoid in that regard. - -On Duktape, we don't get to err from the JS context (to be captured by -the offending script), but to be forcibly killed on timeout scenarios, -leading to null returns, thus polkit negation, by definition. It's a -reasonable design/compromise. - -A fatal error handler routine, for the Duktape context, has also been -added, using the polkit_backend_authority_log() logging infra to -better assist users on what went wrong. - -Finally, the script evaluation routine has been made to use -duk_peval_lstring() (previously using _noresult variant), so to able -to present the user with proper error messages, should any occur. - -The original runaway script killer test has been adjusted to please -both JS backends. - -Signed-off-by: Gustavo Lima Chaves ---- - meson.build | 1 + - src/polkitbackend/meson.build | 1 + - src/polkitbackend/polkitbackendcommon.h | 2 + - .../polkitbackendduktapeauthority.c | 236 ++++++++++++++---- - .../polkitbackendjsauthority.cpp | 10 +- - .../etc/polkit-1/rules.d/10-testing.rules | 6 +- - .../test-polkitbackendjsauthority.c | 2 +- - 7 files changed, 209 insertions(+), 49 deletions(-) - -diff --git a/meson.build b/meson.build -index 4e44723..46956e3 100644 ---- a/meson.build -+++ b/meson.build -@@ -137,6 +137,7 @@ js_engine = get_option('js_engine') - if js_engine == 'duktape' - js_dep = dependency('duktape') - libm_dep = cc.find_library('m') -+ libpthread_dep = cc.find_library('pthread') - elif js_engine == 'mozjs' - js_dep = dependency('mozjs-78') - endif -diff --git a/src/polkitbackend/meson.build b/src/polkitbackend/meson.build -index 9ec01b2..4dfea39 100644 ---- a/src/polkitbackend/meson.build -+++ b/src/polkitbackend/meson.build -@@ -34,6 +34,7 @@ c_flags = [ - if js_engine == 'duktape' - sources += files('polkitbackendduktapeauthority.c') - deps += libm_dep -+ deps += libpthread_dep - elif js_engine == 'mozjs' - sources += files('polkitbackendjsauthority.cpp') - endif -diff --git a/src/polkitbackend/polkitbackendcommon.h b/src/polkitbackend/polkitbackendcommon.h -index 6d0d267..dd700fc 100644 ---- a/src/polkitbackend/polkitbackendcommon.h -+++ b/src/polkitbackend/polkitbackendcommon.h -@@ -50,6 +50,8 @@ - #include - #endif /* HAVE_LIBSYSTEMD */ - -+#define RUNAWAY_KILLER_TIMEOUT (15) -+ - #ifdef __cplusplus - extern "C" { - #endif -diff --git a/src/polkitbackend/polkitbackendduktapeauthority.c b/src/polkitbackend/polkitbackendduktapeauthority.c -index a2b4420..80f1976 100644 ---- a/src/polkitbackend/polkitbackendduktapeauthority.c -+++ b/src/polkitbackend/polkitbackendduktapeauthority.c -@@ -47,8 +47,20 @@ struct _PolkitBackendJsAuthorityPrivate - GFileMonitor **dir_monitors; /* NULL-terminated array of GFileMonitor instances */ - - duk_context *cx; -+ -+ pthread_t runaway_killer_thread; -+}; -+ -+enum -+{ -+ RUNAWAY_KILLER_THREAD_EXIT_STATUS_UNSET, -+ RUNAWAY_KILLER_THREAD_EXIT_STATUS_SUCCESS, -+ RUNAWAY_KILLER_THREAD_EXIT_STATUS_FAILURE, - }; - -+static gboolean execute_script_with_runaway_killer(PolkitBackendJsAuthority *authority, -+ const gchar *filename); -+ - /* ---------------------------------------------------------------------------------------------------- */ - - G_DEFINE_TYPE (PolkitBackendJsAuthority, polkit_backend_js_authority, POLKIT_BACKEND_TYPE_INTERACTIVE_AUTHORITY); -@@ -67,6 +79,15 @@ static const duk_function_list_entry js_polkit_functions[] = - { NULL, NULL, 0 }, - }; - -+static void report_error (void *udata, -+ const char *msg) -+{ -+ PolkitBackendJsAuthority *authority = udata; -+ polkit_backend_authority_log (POLKIT_BACKEND_AUTHORITY (authority), -+ "fatal Duktape JS backend error: %s", -+ (msg ? msg : "no message")); -+} -+ - static void - polkit_backend_js_authority_init (PolkitBackendJsAuthority *authority) - { -@@ -78,7 +99,6 @@ polkit_backend_js_authority_init (PolkitBackendJsAuthority *authority) - static void - load_scripts (PolkitBackendJsAuthority *authority) - { -- duk_context *cx = authority->priv->cx; - GList *files = NULL; - GList *l; - guint num_scripts = 0; -@@ -123,36 +143,9 @@ load_scripts (PolkitBackendJsAuthority *authority) - for (l = files; l != NULL; l = l->next) - { - const gchar *filename = (gchar *)l->data; --#if (DUK_VERSION >= 20000) -- GFile *file = g_file_new_for_path (filename); -- char *contents; -- gsize len; -- if (!g_file_load_contents (file, NULL, &contents, &len, NULL, NULL)) -- { -- polkit_backend_authority_log (POLKIT_BACKEND_AUTHORITY (authority), -- "Error compiling script %s", -- filename); -- g_object_unref (file); -- continue; -- } - -- g_object_unref (file); -- if (duk_peval_lstring_noresult(cx, contents,len) != 0) --#else -- if (duk_peval_file_noresult (cx, filename) != 0) --#endif -- { -- polkit_backend_authority_log (POLKIT_BACKEND_AUTHORITY (authority), -- "Error compiling script %s: %s", -- filename, duk_safe_to_string (authority->priv->cx, -1)); --#if (DUK_VERSION >= 20000) -- g_free (contents); --#endif -+ if (!execute_script_with_runaway_killer(authority, filename)) - continue; -- } --#if (DUK_VERSION >= 20000) -- g_free (contents); --#endif - num_scripts++; - } - -@@ -232,7 +225,7 @@ polkit_backend_common_js_authority_constructed (GObject *object) - PolkitBackendJsAuthority *authority = POLKIT_BACKEND_JS_AUTHORITY (object); - duk_context *cx; - -- cx = duk_create_heap (NULL, NULL, NULL, authority, NULL); -+ cx = duk_create_heap (NULL, NULL, NULL, authority, report_error); - if (cx == NULL) - goto fail; - -@@ -243,6 +236,9 @@ polkit_backend_common_js_authority_constructed (GObject *object) - duk_put_function_list (cx, -1, js_polkit_functions); - duk_put_prop_string (cx, -2, "polkit"); - -+ /* load polkit objects/functions into JS context (e.g. addRule(), -+ * _deleteRules(), _runRules() et al) -+ */ - duk_eval_string (cx, init_js); - - if (authority->priv->rules_dirs == NULL) -@@ -510,6 +506,167 @@ push_action_and_details (duk_context *cx, - - /* ---------------------------------------------------------------------------------------------------- */ - -+typedef struct { -+ PolkitBackendJsAuthority *authority; -+ const gchar *filename; -+ pthread_cond_t cond; -+ pthread_mutex_t mutex; -+ gint ret; -+} RunawayKillerCtx; -+ -+static gpointer -+runaway_killer_thread_execute_js (gpointer user_data) -+{ -+ RunawayKillerCtx *ctx = user_data; -+ duk_context *cx = ctx->authority->priv->cx; -+ -+ int oldtype; -+ -+ pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, &oldtype); -+ -+#if (DUK_VERSION >= 20000) -+ GFile *file = g_file_new_for_path(ctx->filename); -+ char *contents; -+ gsize len; -+ -+ if (!g_file_load_contents(file, NULL, &contents, &len, NULL, NULL)) { -+ polkit_backend_authority_log(POLKIT_BACKEND_AUTHORITY(ctx->authority), -+ "Error compiling script %s", ctx->filename); -+ g_object_unref(file); -+ goto err; -+ } -+ -+ g_object_unref(file); -+ -+ /* evaluate the script, trying to print context in any syntax errors -+ found */ -+ if (duk_peval_lstring(cx, contents, len) != 0) -+#else -+ if (duk_peval_file(cx, ctx->filename) != 0) -+#endif -+ { -+ polkit_backend_authority_log(POLKIT_BACKEND_AUTHORITY(ctx->authority), -+ "Error compiling script %s: %s", ctx->filename, -+ duk_safe_to_string(cx, -1)); -+ duk_pop(cx); -+ goto free_err; -+ } -+#if (DUK_VERSION >= 20000) -+ g_free(contents); -+#endif -+ -+ ctx->ret = RUNAWAY_KILLER_THREAD_EXIT_STATUS_SUCCESS; -+ goto end; -+ -+free_err: -+#if (DUK_VERSION >= 20000) -+ g_free(contents); -+#endif -+err: -+ ctx->ret = RUNAWAY_KILLER_THREAD_EXIT_STATUS_FAILURE; -+end: -+ pthread_cond_signal(&ctx->cond); -+ return NULL; -+} -+ -+static gpointer -+runaway_killer_thread_call_js (gpointer user_data) -+{ -+ RunawayKillerCtx *ctx = user_data; -+ duk_context *cx = ctx->authority->priv->cx; -+ int oldtype; -+ -+ pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, &oldtype); -+ -+ if (duk_pcall_prop (cx, 0, 2) != DUK_EXEC_SUCCESS) -+ { -+ polkit_backend_authority_log (POLKIT_BACKEND_AUTHORITY (ctx->authority), -+ "Error evaluating admin rules: ", -+ duk_safe_to_string (cx, -1)); -+ goto err; -+ } -+ -+ ctx->ret = RUNAWAY_KILLER_THREAD_EXIT_STATUS_SUCCESS; -+ goto end; -+ -+err: -+ ctx->ret = RUNAWAY_KILLER_THREAD_EXIT_STATUS_FAILURE; -+end: -+ pthread_cond_signal(&ctx->cond); -+ return NULL; -+} -+ -+/* Blocking for at most for RUNAWAY_KILLER_TIMEOUT */ -+static gboolean -+execute_script_with_runaway_killer(PolkitBackendJsAuthority *authority, -+ const gchar *filename) -+{ -+ gint64 end_time; -+ gboolean cancel = FALSE; -+ RunawayKillerCtx ctx = {.authority = authority, .filename = filename, -+ .ret = RUNAWAY_KILLER_THREAD_EXIT_STATUS_UNSET, -+ .mutex = PTHREAD_MUTEX_INITIALIZER, -+ .cond = PTHREAD_COND_INITIALIZER}; -+ struct timespec abs_time; -+ -+ pthread_mutex_lock(&ctx.mutex); -+ -+ clock_gettime(CLOCK_REALTIME, &abs_time); -+ abs_time.tv_sec += RUNAWAY_KILLER_TIMEOUT; -+ -+ pthread_create(&authority->priv->runaway_killer_thread, NULL, runaway_killer_thread_execute_js, &ctx); -+ -+ while (ctx.ret == RUNAWAY_KILLER_THREAD_EXIT_STATUS_UNSET) /* loop to treat spurious wakeups */ -+ if (pthread_cond_timedwait(&ctx.cond, &ctx.mutex, &abs_time) == ETIMEDOUT) { -+ cancel = TRUE; -+ break; -+ } -+ -+ pthread_mutex_unlock(&ctx.mutex); -+ -+ if (cancel) -+ pthread_cancel (authority->priv->runaway_killer_thread); -+ pthread_join (authority->priv->runaway_killer_thread, NULL); -+ -+ return ctx.ret == RUNAWAY_KILLER_THREAD_EXIT_STATUS_SUCCESS; -+} -+ -+/* Calls already stacked function and args. Blocking for at most for -+ * RUNAWAY_KILLER_TIMEOUT -+ */ -+static gboolean -+call_js_function_with_runaway_killer(PolkitBackendJsAuthority *authority) -+{ -+ gint64 end_time; -+ gboolean cancel = FALSE; -+ RunawayKillerCtx ctx = {.authority = authority, -+ .ret = RUNAWAY_KILLER_THREAD_EXIT_STATUS_UNSET, -+ .mutex = PTHREAD_MUTEX_INITIALIZER, -+ .cond = PTHREAD_COND_INITIALIZER}; -+ struct timespec abs_time; -+ -+ pthread_mutex_lock(&ctx.mutex); -+ -+ clock_gettime(CLOCK_REALTIME, &abs_time); -+ abs_time.tv_sec += RUNAWAY_KILLER_TIMEOUT; -+ -+ pthread_create(&authority->priv->runaway_killer_thread, NULL, runaway_killer_thread_call_js, &ctx); -+ -+ while (ctx.ret == RUNAWAY_KILLER_THREAD_EXIT_STATUS_UNSET) /* loop to treat spurious wakeups */ -+ if (pthread_cond_timedwait(&ctx.cond, &ctx.mutex, &abs_time) == ETIMEDOUT) { -+ cancel = TRUE; -+ break; -+ } -+ -+ pthread_mutex_unlock(&ctx.mutex); -+ -+ if (cancel) -+ pthread_cancel (authority->priv->runaway_killer_thread); -+ pthread_join (authority->priv->runaway_killer_thread, NULL); -+ -+ return ctx.ret == RUNAWAY_KILLER_THREAD_EXIT_STATUS_SUCCESS; -+} -+ - /* ---------------------------------------------------------------------------------------------------- */ - - GList * -@@ -557,13 +714,8 @@ polkit_backend_common_js_authority_get_admin_auth_identities (PolkitBackendInter - goto out; - } - -- if (duk_pcall_prop (cx, 0, 2) != DUK_ERR_NONE) -- { -- polkit_backend_authority_log (POLKIT_BACKEND_AUTHORITY (authority), -- "Error evaluating admin rules: ", -- duk_safe_to_string (cx, -1)); -- goto out; -- } -+ if (!call_js_function_with_runaway_killer (authority)) -+ goto out; - - ret_str = duk_require_string (cx, -1); - -@@ -643,15 +795,11 @@ polkit_backend_common_js_authority_check_authorization_sync (PolkitBackendIntera - goto out; - } - -- if (duk_pcall_prop (cx, 0, 2) != DUK_ERR_NONE) -- { -- polkit_backend_authority_log (POLKIT_BACKEND_AUTHORITY (authority), -- "Error evaluating authorization rules: ", -- duk_safe_to_string (cx, -1)); -- goto out; -- } -+ if (!call_js_function_with_runaway_killer (authority)) -+ goto out; - - if (duk_is_null(cx, -1)) { -+ /* this fine, means there was no match, use implicit authorizations */ - good = TRUE; - goto out; - } -diff --git a/src/polkitbackend/polkitbackendjsauthority.cpp b/src/polkitbackend/polkitbackendjsauthority.cpp -index e28091d..11e91c0 100644 ---- a/src/polkitbackend/polkitbackendjsauthority.cpp -+++ b/src/polkitbackend/polkitbackendjsauthority.cpp -@@ -829,11 +829,14 @@ runaway_killer_setup (PolkitBackendJsAuthority *authority) - { - g_assert (authority->priv->rkt_source == NULL); - -- /* set-up timer for runaway scripts, will be executed in runaway_killer_thread */ -+ /* set-up timer for runaway scripts, will be executed in -+ runaway_killer_thread, that is one, permanent thread running a glib -+ mainloop (rkt_loop) whose context (rkt_context) has a timeout source -+ (rkt_source) */ - g_mutex_lock (&authority->priv->rkt_timeout_pending_mutex); - authority->priv->rkt_timeout_pending = FALSE; - g_mutex_unlock (&authority->priv->rkt_timeout_pending_mutex); -- authority->priv->rkt_source = g_timeout_source_new_seconds (15); -+ authority->priv->rkt_source = g_timeout_source_new_seconds (RUNAWAY_KILLER_TIMEOUT); - g_source_set_callback (authority->priv->rkt_source, rkt_on_timeout, authority, NULL); - g_source_attach (authority->priv->rkt_source, authority->priv->rkt_context); - -@@ -893,6 +896,9 @@ execute_script_with_runaway_killer (PolkitBackendJsAuthority *authority, - { - bool ret; - -+ // tries to JS_ExecuteScript(), may hang for > RUNAWAY_KILLER_TIMEOUT, -+ // runaway_killer_thread makes sure the call returns, due to exception -+ // injection - runaway_killer_setup (authority); - ret = JS_ExecuteScript (authority->priv->cx, - script, -diff --git a/test/data/etc/polkit-1/rules.d/10-testing.rules b/test/data/etc/polkit-1/rules.d/10-testing.rules -index 98bf062..e346b5d 100644 ---- a/test/data/etc/polkit-1/rules.d/10-testing.rules -+++ b/test/data/etc/polkit-1/rules.d/10-testing.rules -@@ -189,8 +189,10 @@ polkit.addRule(function(action, subject) { - ; - } catch (error) { - if (error == "Terminating runaway script") -- return polkit.Result.YES; -- return polkit.Result.NO; -+ // Inverted logic to accomodate Duktape's model as well, which -+ // will always fail with negation, on timeouts -+ return polkit.Result.NO; -+ return polkit.Result.YES; - } - } - }); -diff --git a/test/polkitbackend/test-polkitbackendjsauthority.c b/test/polkitbackend/test-polkitbackendjsauthority.c -index f97e0e0..2103b17 100644 ---- a/test/polkitbackend/test-polkitbackendjsauthority.c -+++ b/test/polkitbackend/test-polkitbackendjsauthority.c -@@ -328,7 +328,7 @@ static const RulesTestCase rules_test_cases[] = { - "net.company.run_away_script", - "unix-user:root", - NULL, -- POLKIT_IMPLICIT_AUTHORIZATION_AUTHORIZED, -+ POLKIT_IMPLICIT_AUTHORIZATION_NOT_AUTHORIZED, - }, - - { --- -GitLab - diff --git a/gnu/packages/polkit.scm b/gnu/packages/polkit.scm index 38e7f36c2a..18d299bbd1 100644 --- a/gnu/packages/polkit.scm +++ b/gnu/packages/polkit.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2021 Morgan Smith ;;; Copyright © 2021 Maxim Cournoyer ;;; Copyright © 2022 Jean-Pierre De Jesus DIAZ +;;; Copyright © 2022 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -29,14 +30,16 @@ (define-module (gnu packages polkit) #:use-module ((guix licenses) #:select (lgpl2.0+)) #:use-module (guix packages) + #:use-module (guix gexp) #:use-module (guix download) #:use-module (guix memoization) #:use-module (guix utils) #:use-module (guix build utils) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) + #:use-module (guix build-system meson) #:use-module (gnu packages) - #:use-module (gnu packages autotools) + #:use-module (gnu packages gettext) #:use-module (gnu packages freedesktop) #:use-module (gnu packages glib) #:use-module (gnu packages gtk) @@ -54,7 +57,7 @@ (define-public polkit-mozjs (package (name "polkit") - (version "0.120") + (version "121") (source (origin (method url-fetch) (uri (string-append @@ -62,22 +65,15 @@ name "-" version ".tar.gz")) (sha256 (base32 - "00zfg9b9ivkcj2jcf5b92cpvvyljz8cmfwj86lkvy5rihnd5jypf")) - (patches (search-patches "polkit-configure-elogind.patch" - "polkit-CVE-2021-4034.patch")) + "1apz3bh7nbpmlp1cr00pb8z8wp0c7yb23ninb959jz3r38saxiwx")) (modules '((guix build utils))) (snippet '(begin - (use-modules (guix build utils)) - ;; Disable broken test. - (substitute* "test/Makefile.in" - (("SUBDIRS = mocklibc . polkit polkitbackend") - "SUBDIRS = mocklibc . polkit")) ;; Disable a test that requires Python, D-Bus and a few ;; libraries and fails with "ERROR: timed out waiting for bus ;; process to terminate". - (substitute* "test/polkitbackend/Makefile.am" - (("TEST_PROGS \\+= polkitbackendjsauthoritytest-wrapper.py") + (substitute* "test/meson.build" + (("subdir\\('polkitbackend'\\)") "")) ;; Guix System's polkit ;; service stores actions under /etc/polkit-1/actions. @@ -88,58 +84,39 @@ (substitute* "src/polkitagent/polkitagentsession.c" (("PACKAGE_PREFIX \"/lib/polkit-1/polkit-agent-helper-1\"") "\"/run/setuid-programs/polkit-agent-helper-1\"")))))) - (build-system gnu-build-system) + (build-system meson-build-system) (inputs - (list expat linux-pam elogind mozjs-78 nspr)) + (list elogind + expat + linux-pam + mozjs-91 + nspr)) (propagated-inputs - (list glib)) ; required by polkit-gobject-1.pc + (list glib)) ;required by polkit-gobject-1.pc (native-inputs (list pkg-config - `(,glib "bin") ;for glib-mkenums - intltool + gettext-minimal + perl + `(,glib "bin") ;for glib-mkenums gobject-introspection - libxslt ;for man page generation - docbook-xsl)) ;for man page generation + libxml2 ;for man page generation + libxslt ;for man page generation + docbook-xsl)) ;for man page generation (arguments - `(#:configure-flags '("--sysconfdir=/etc" - "--enable-man-pages" - ;; Prevent ‘configure: error: cannot check for - ;; file existence when cross compiling’. - ,@(if (%current-target-system) - '("--with-os-type=unknown") - '())) - #:phases - (modify-phases %standard-phases - (add-after - 'unpack 'fix-introspection-install-dir - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (substitute* (find-files "." "Makefile.in") - (("@INTROSPECTION_GIRDIR@") - (string-append out "/share/gir-1.0/")) - (("@INTROSPECTION_TYPELIBDIR@") - (string-append out "/lib/girepository-1.0/")))))) - (add-after 'unpack 'fix-manpage-generation - (lambda* (#:key inputs native-inputs #:allow-other-keys) - (let ((xsldoc (string-append - (assoc-ref (or native-inputs inputs) "docbook-xsl") - "/xml/xsl/docbook-xsl-" - ,(package-version docbook-xsl)))) - (substitute* '("docs/man/Makefile.am" "docs/man/Makefile.in") - (("http://docbook.sourceforge.net/release/xsl/current") - xsldoc))))) - (replace - 'install - (lambda* (#:key outputs (make-flags '()) #:allow-other-keys) - ;; Override sysconfdir during "make install", to avoid attempting - ;; to install in /etc, and to instead install the skeletons in the - ;; output directory. - (let ((out (assoc-ref outputs "out"))) - (apply invoke "make" "install" - (string-append "sysconfdir=" out "/etc") - (string-append "polkit_actiondir=" - out "/share/polkit-1/actions") - make-flags))))))) + (list #:configure-flags + #~'("-Dman=true" + "-Dtests=true" + "-Djs_engine=mozjs" + ;; Work around broken gobject-introspection detection when + ;; cross-compiling. The build system probes for the _target_ + ;; gobject-introspection, but if we change it to native, Meson + ;; fails with: + ;; ERROR: Pkg-config binary for machine MachineChoice.BUILD + ;; not found, giving up. + ;; Just disable introspection for now. + #$@(if (%current-target-system) + '("-Dintrospection=false") + '())))) (home-page "https://www.freedesktop.org/wiki/Software/polkit/") (synopsis "Authorization API for privilege management") (description "Polkit is an application-level toolkit for defining and @@ -155,25 +132,10 @@ for unprivileged applications.") (let ((base polkit-mozjs)) (package/inherit base (name "polkit-duktape") - (source - (origin - (inherit (package-source base)) - (patches - (append - (search-patches "polkit-use-duktape.patch") - (origin-patches (package-source base)))))) (arguments (substitute-keyword-arguments (package-arguments base) ((#:configure-flags flags) - `(cons "--with-duktape" ,flags)) - ((#:phases phases) - `(modify-phases ,phases - (add-after 'unpack 'force-gnu-build-system-bootstrap - (lambda _ - (delete-file "configure"))))))) - (native-inputs - (modify-inputs (package-native-inputs base) - (prepend autoconf automake libtool))) + #~(delete "-Djs_engine=mozjs" #$flags)))) (inputs (modify-inputs (package-inputs base) (replace "mozjs" duktape)))))) -- cgit 1.4.1 From b048c4a0e93acbcfcf8f320732cf35df9f2cd546 Mon Sep 17 00:00:00 2001 From: Peter Polidoro Date: Thu, 25 Aug 2022 08:48:49 -0400 Subject: gnu: python-click: Update to 8.1.3. * gnu/packages/python-xyz.scm (python-click): Update to 8.1.3. Signed-off-by: Marius Bakke --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 87ed92e3ee..ca7b1074b1 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3473,14 +3473,14 @@ interfaces.") (define-public python-click (package (name "python-click") - (version "8.1.2") + (version "8.1.3") (source (origin (method url-fetch) (uri (pypi-uri "click" version)) (sha256 (base32 - "0whs38a2i0561kwbgigs6vic9r0a1887m2v1aw3rmv6r2kz0g5s7")))) + "13kvp8visj5xh9d43brnda6q0kc1s40flxa5cw0p0a9hzf5dr0kn")))) (build-system python-build-system) (arguments `(#:phases -- cgit 1.4.1 From ad99842136dbf43d9645bfff73e465a32212488e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 27 Aug 2022 04:04:22 +0200 Subject: gnu: libsecret: Propagate libgcrypt. This is a follow-up to commit c1a4ef98932799adbd278068fa4fdd8c24fff714. * gnu/packages/gnome.scm (libsecret)[inputs]: Remove. [propagated-inputs]: Add LIBGCRYPT. --- gnu/packages/gnome.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index da123eefe8..d44a222ed7 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5046,9 +5046,7 @@ and the GLib main loop, to integrate well with GNOME applications.") python-pygobject vala)) (propagated-inputs - (list glib)) ;required by libsecret-1.pc - (inputs - (list libgcrypt)) + (list glib libgcrypt)) ;required by libsecret-1.pc (home-page "https://wiki.gnome.org/Projects/Libsecret/") (synopsis "GObject bindings for \"Secret Service\" API") (description -- cgit 1.4.1 From de2dbbcda5df0612523bbfd50a8d0dad56c9813d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 27 Aug 2022 04:05:57 +0200 Subject: gnu: gjs: Build with mozjs 78. This is a follow-up to commit d6fa3ac7a8203173b125390aed596832565a3687. * gnu/packages/gnome.scm (gjs)[propagated-inputs]: Change from MOZJS to MOZJS-78. --- gnu/packages/gnome.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index d44a222ed7..124d7f6952 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7287,7 +7287,7 @@ configuration program to choose applications starting on login.") ("xvfb" ,xorg-server-for-tests))) (propagated-inputs ;; These are all in the Requires.private field of gjs-1.0.pc. - (list cairo gobject-introspection mozjs)) + (list cairo gobject-introspection mozjs-78)) (inputs (list gtk+ readline)) (synopsis "Javascript bindings for GNOME") -- cgit 1.4.1 From 8888e9bfb2f101261e4c4b6e8152c2a35df87952 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 27 Aug 2022 04:09:40 +0200 Subject: gnu: gjs: Remove input labels. * gnu/packages/gnome.scm (gjs)[native-inputs]: Remove labels. --- gnu/packages/gnome.scm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 124d7f6952..a349f106bb 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7277,14 +7277,14 @@ configuration program to choose applications starting on login.") ;; For the missing /etc/machine-id. (setenv "DBUS_FATAL_WARNINGS" "0")))))) (native-inputs - `(("glib:bin" ,glib "bin") ; for glib-compile-resources - ("pkg-config" ,pkg-config) - ("xmllint" ,libxml2) - ;; For testing - ("dbus-launch" ,dbus) - ("dconf" ,dconf) ; required to properly store settings - ("uuidgen" ,util-linux) - ("xvfb" ,xorg-server-for-tests))) + (list `(,glib "bin") ;for glib-compile-resources + pkg-config + libxml2 + ;; For testing + dbus + dconf ;required to properly store settings + util-linux + xorg-server-for-tests)) (propagated-inputs ;; These are all in the Requires.private field of gjs-1.0.pc. (list cairo gobject-introspection mozjs-78)) -- cgit 1.4.1 From bff11d6ac2d99cc5e6964acbf7d94861ba98ea86 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 27 Aug 2022 15:49:48 +0200 Subject: gnu: gjs: Update to 1.72.2. * gnu/packages/gnome.scm (gjs): Update to 1.72.2. [arguments]: Remove #:meson. [propagated-inputs]: Change from MOZJS-78 to MOZJS-91. --- gnu/packages/gnome.scm | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index a349f106bb..44effe2b2b 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7245,7 +7245,7 @@ configuration program to choose applications starting on login.") (define-public gjs (package (name "gjs") - (version "1.70.0") + (version "1.72.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -7253,7 +7253,7 @@ configuration program to choose applications starting on login.") name "-" version ".tar.xz")) (sha256 (base32 - "0pqwhq0znprs0h5ixz396912acwzk9zvjfhi9qvh52ii38s2j1jb")) + "0xrrv9lsi087yb9yf146a1aarf5yh6rf4jw9blx30zasvjdkgvnx")) (modules '((guix build utils))) (snippet '(begin @@ -7262,10 +7262,7 @@ configuration program to choose applications starting on login.") (("☭") "")))))) (build-system meson-build-system) (arguments - ;; Use meson-0.59, otherwise we'd get "ERROR: "install_dir" must be - ;; specified when installing a target". - `(#:meson ,meson-0.59 - #:configure-flags '("-Dinstalled_tests=false") + '(#:configure-flags '("-Dinstalled_tests=false") #:phases (modify-phases %standard-phases (add-before 'check 'pre-check @@ -7287,7 +7284,7 @@ configuration program to choose applications starting on login.") xorg-server-for-tests)) (propagated-inputs ;; These are all in the Requires.private field of gjs-1.0.pc. - (list cairo gobject-introspection mozjs-78)) + (list cairo gobject-introspection mozjs-91)) (inputs (list gtk+ readline)) (synopsis "Javascript bindings for GNOME") -- cgit 1.4.1 From fb3d90b8f31c4b1e2e3d427544c6610f3fe1ce55 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 27 Aug 2022 16:15:53 +0200 Subject: gnu: gst-plugins-base: Propagate gudev. This is a follow-up to commit f1e8cc6a9826f951fe95dc374b4db6fc8e25d981. * gnu/packages/gstreamer.scm (gst-plugins-base)[inputs]: Move LIBGUDEV ... [propagated-inputs]: ... here. --- gnu/packages/gstreamer.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index ba05591dae..fc3f3eaaa6 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -534,6 +534,7 @@ This package provides the core library and elements.") (propagated-inputs (cons* glib ;required by gstreamer-sdp-1.0.pc gstreamer ;required by gstreamer-plugins-base-1.0.pc + libgudev ;required by gstreamer-gl-1.0.pc ;; wayland-client.h is referred to in ;; include/gstreamer-1.0/gst/gl/wayland/gstgldisplay_wayland.h wayland @@ -550,7 +551,6 @@ This package provides the core library and elements.") cdparanoia graphene iso-codes - libgudev libjpeg-turbo libogg libpng -- cgit 1.4.1