From 2934c4c9f0dd66e07ed799b57335751510830e71 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 8 Sep 2022 18:25:55 -0400 Subject: [PATCH 01/22] gnu: linux-libre: Update to 5.19.8. * gnu/packages/linux.scm (linux-libre-5.19-version): Update to 5.19.8. (linux-libre-5.19-pristine-source, deblob-scripts-5.19): Update hashes. --- gnu/packages/linux.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index ee6e592183..b947dc609c 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -353,17 +353,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.19-version "5.19.7") +(define-public linux-libre-5.19-version "5.19.8") (define-public linux-libre-5.19-gnu-revision "gnu") (define deblob-scripts-5.19 (linux-libre-deblob-scripts linux-libre-5.19-version linux-libre-5.19-gnu-revision - (base32 "0a4pln89nbxiniykm14kyqmnn79gfgj22dr3h94w917xhidq7gp1") + (base32 "1lk90psz33ldb8aiaws4iayhycl5bmywr6badvzffjpr87s5phxw") (base32 "1ph67fvg5qvlkh4cynrrmvkngkb0sw6k90b1mwy9466s24khn05i"))) (define-public linux-libre-5.19-pristine-source (let ((version linux-libre-5.19-version) - (hash (base32 "17qr061b617g64s60svw7lf9s5vn5zwd1y96cwckjpr5shcn1fxq"))) + (hash (base32 "1kl7fifsa6vsm34xg3kd2svhx18n771hfj67nhwnlalmb9whhqv1"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.19))) From a90e5f1434282469c8dd17c61ef5f0e8ffad809e Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 8 Sep 2022 18:26:19 -0400 Subject: [PATCH 02/22] gnu: linux-libre 5.15: Update to 5.15.67. * gnu/packages/linux.scm (linux-libre-5.15-version): Update to 5.15.67. (linux-libre-5.15-pristine-source, deblob-scripts-5.15): Update hashes. --- gnu/packages/linux.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index b947dc609c..6a564baf4f 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -372,17 +372,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.65") +(define-public linux-libre-5.15-version "5.15.67") (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 "0vj60bra81fmbx3lz924czbhxs4dmvd4d584g9mcs80b7c4q52kg") (base32 "1r189c704jvizk452zcsm9v3g27ybjcjchjwxazsy3nx0wdwx7si"))) (define-public linux-libre-5.15-pristine-source (let ((version linux-libre-5.15-version) - (hash (base32 "150w5bahp78s12gq7n8gdmi1zn44pwv31qnb1nmzkz2d5wwgsi7v"))) + (hash (base32 "0h7r2k59jsw8ykb2p7nxrpazbwx1n5p3nmfbbj1lhib91fldjiys"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.15))) From f760e628fb923a4e968bae6d38be870d6a4b668e Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 8 Sep 2022 18:26:37 -0400 Subject: [PATCH 03/22] gnu: linux-libre 5.10: Update to 5.10.142. * gnu/packages/linux.scm (linux-libre-5.10-version): Update to 5.10.142. (linux-libre-5.10-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 6a564baf4f..8f50c7ec8c 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -387,7 +387,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.141") +(define-public linux-libre-5.10-version "5.10.142") (define-public linux-libre-5.10-gnu-revision "gnu1") (define deblob-scripts-5.10 (linux-libre-deblob-scripts @@ -397,7 +397,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 "1wqf38nasmyzan83r0268bxixr0fddxvkg760zp2x0wnby9zsyi4"))) + (hash (base32 "0s52vfvw5pgnq7gq9n66ib05ryhkxwv765f16862l5gykbdynirz"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.10))) From bcca8332ff778e115323a4d0b00928bfa20f7584 Mon Sep 17 00:00:00 2001 From: zimoun Date: Thu, 8 Sep 2022 16:56:55 +0200 Subject: [PATCH 04/22] gnu: Add r-proj4. * gnu/packages/cran.scm (r-proj4): New variable. --- gnu/packages/cran.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 7aa3ebde97..471b5b1eb5 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -593,6 +593,29 @@ pronounceable identifiers.") can read and write both the metadata and the cell data in a Sheet.") (license license:expat))) +(define-public r-proj4 + (package + (name "r-proj4") + (version "1.0-11") + (source (origin + (method url-fetch) + (uri (cran-uri "proj4" version)) + (sha256 + (base32 + "07fil52jswbg2h807cd82m2wlm5j2fb891ifri9ms037099qdwf5")))) + (properties `((upstream-name . "proj4"))) + (build-system r-build-system) + (inputs (list proj.4 zlib)) + (native-inputs (list pkg-config)) + (home-page "http://www.rforge.net/proj4/") + (synopsis "Simple interface to the PROJ.4 cartographic projections library") + (description + "This package provides a simple interface to lat/long projection and +datum transformation of the PROJ.4 cartographic projections library. It +allows transformation of geographic coordinates from one projection and/or +datum to another.") + (license license:gpl2))) + (define-public r-waldo (package (name "r-waldo") From 4f134f26fd9e4feb799b21157424af216be3d267 Mon Sep 17 00:00:00 2001 From: zimoun Date: Thu, 8 Sep 2022 16:56:56 +0200 Subject: [PATCH 05/22] gnu: Add r-ggalt. * gnu/packages/cran.scm (r-ggalt): New variable. --- gnu/packages/cran.scm | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 471b5b1eb5..81fa0f7b5b 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -422,6 +422,49 @@ Gaussian quadrature for a numerical solution.") Distance (EMD).") (license license:expat))) +(define-public r-ggalt + (package + (name "r-ggalt") + (version "0.4.0") + (source (origin + (method url-fetch) + (uri (cran-uri "ggalt" version)) + (sha256 + (base32 + "0ssa274d41vhd6crzjz7jqzbwgnjimxwxl23p2cx35aqs5wdfjpc")))) + (properties `((upstream-name . "ggalt"))) + (build-system r-build-system) + (propagated-inputs + (list r-ash + r-dplyr + r-extrafont + r-ggplot2 + r-gtable + r-kernsmooth + r-maps + r-mass + r-plotly + r-proj4 + r-rcolorbrewer + r-scales + r-tibble)) + (native-inputs (list r-knitr)) + (home-page "https://github.com/hrbrmstr/ggalt") + (synopsis + "Geometries, coordinate systems, fonts and more for ggplot2") + (description + "This package provides a compendium of new geometries, coordinate systems, +statistical transformations, scales and fonts for ggplot2, including splines, +1d and 2d densities, univariate average shifted histograms, a new map +coordinate system based on the PROJ.4-library along with +@code{geom_cartogram()} that mimics the original functionality of +@code{geom_map()}, formatters for \"bytes\", a @code{stat_stepribbon()} +function, increased @code{plotly} compatibility and the @code{StateFace} open +source font ProPublica. Further new functionality includes lollipop charts, +dumbbell charts, the ability to encircle points and coordinate-system-based +text annotations.") + (license license:agpl3))) + (define-public r-glmpca (package (name "r-glmpca") From ad1d3f98b1d6f498d7f3e13d810f417ef3e7df5d Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Fri, 2 Sep 2022 19:59:04 +0100 Subject: [PATCH 06/22] gnu: Add comments to the bottom of a few package modules. This will hopefully discourage patches which add new packages to the bottom of files, as this increases the likelihood of conflicts when applying patches. If there are more specific ways that packages should be arranged in specific modules, this message can be updated accordingly. * gnu/packages/bioconductor.scm: Add comment discouraging adding packages to the bottom of the file. * gnu/packages/bioinformatics.scm: ditto. * gnu/packages/cran.scm: ditto. * gnu/packages/crates-io.scm: ditto. * gnu/packages/emacs-xyz.scm: ditto. * gnu/packages/golang.scm: ditto. * gnu/packages/guile-xyz.scm: ditto. * gnu/packages/haskell-xyz.scm: ditto. * gnu/packages/java.scm: ditto. * gnu/packages/julia-xyz.scm: ditto. * gnu/packages/lisp-xyz.scm: ditto. * gnu/packages/ocaml.scm: ditto. * gnu/packages/perl.scm: ditto. * gnu/packages/python-science.scm: ditto. * gnu/packages/python-xyz.scm: ditto. * gnu/packages/ruby.scm: ditto. * gnu/packages/tex.scm: ditto. --- gnu/packages/bioconductor.scm | 6 ++++++ gnu/packages/bioinformatics.scm | 6 ++++++ gnu/packages/cran.scm | 6 ++++++ gnu/packages/crates-io.scm | 6 ++++++ gnu/packages/emacs-xyz.scm | 6 ++++++ gnu/packages/golang.scm | 6 ++++++ gnu/packages/guile-xyz.scm | 6 ++++++ gnu/packages/haskell-xyz.scm | 5 +++++ gnu/packages/java.scm | 6 ++++++ gnu/packages/julia-xyz.scm | 6 ++++++ gnu/packages/lisp-xyz.scm | 6 ++++++ gnu/packages/ocaml.scm | 6 ++++++ gnu/packages/perl.scm | 6 ++++++ gnu/packages/python-science.scm | 6 ++++++ gnu/packages/python-xyz.scm | 6 ++++++ gnu/packages/ruby.scm | 6 ++++++ gnu/packages/tex.scm | 6 ++++++ 17 files changed, 101 insertions(+) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 791c8b5476..5c377a7d59 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -17036,3 +17036,9 @@ reproducibility.") "Phyloseq provides a set of classes and tools to facilitate the import, storage, analysis, and graphical display of microbiome census data.") (license license:agpl3))) + +;;; +;;; Avoid adding new packages to the end of this file. To reduce the chances +;;; of a merge conflict, place them above by existing packages with similar +;;; functionality or similar names. +;;; diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index efc8514a63..8700f42c5d 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -16721,3 +16721,9 @@ handling."))) (description "Bíogo is a bioinformatics library for the Go language.") (license license:bsd-3))) + +;;; +;;; Avoid adding new packages to the end of this file. To reduce the chances +;;; of a merge conflict, place them above by existing packages with similar +;;; functionality or similar names. +;;; diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 81fa0f7b5b..3d90dc2caa 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -34569,3 +34569,9 @@ calculate a dimension's unknown value from other dimensions' measurements.") "Tools for integrating spatially-misaligned GIS datasets. Part of the Sub-National Geospatial Data Archive System.") (license license:gpl2))) + +;;; +;;; Avoid adding new packages to the end of this file. To reduce the chances +;;; of a merge conflict, place them above by existing packages with similar +;;; functionality or similar names. +;;; diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 02f7bc7d4d..e95055dad7 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -75105,3 +75105,9 @@ way to convert simple shell commands to windows batch commands.") (description "This crate uses bindgen to generate the raw FFI definitions for PAM. For a rustified API consider using pam.") (license (list license:expat license:asl2.0)))) + +;;; +;;; Avoid adding new packages to the end of this file. To reduce the chances +;;; of a merge conflict, place them above by existing packages with similar +;;; functionality or similar names. +;;; diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 508418ee92..1a9c946223 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -32570,3 +32570,9 @@ 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+))) + +;;; +;;; Avoid adding new packages to the end of this file. To reduce the chances +;;; of a merge conflict, place them above by existing packages with similar +;;; functionality or similar names. +;;; diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 8e76534d34..610e18310d 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -9992,3 +9992,9 @@ implementation.") (description "This package provides basic image processing functions (resize, rotate, crop, brightness/contrast adjustments, etc.).") (license license:expat))) + +;;; +;;; Avoid adding new packages to the end of this file. To reduce the chances +;;; of a merge conflict, place them above by existing packages with similar +;;; functionality or similar names. +;;; diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index ca251641d5..1affb90027 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -5200,3 +5200,9 @@ capability security designs. Goblins is a general toolkit, and also the core layer of Spritely's work to support healthy distributed networked communities.") (license license:asl2.0))) + +;;; +;;; Avoid adding new packages to the end of this file. To reduce the chances +;;; of a merge conflict, place them above by existing packages with similar +;;; functionality or similar names. +;;; diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index a01248f355..43eb448c7e 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -16123,3 +16123,8 @@ data Dec a "This package provides Type-level booleans.") (license license:bsd-3))) +;;; +;;; Avoid adding new packages to the end of this file. To reduce the chances +;;; of a merge conflict, place them above by existing packages with similar +;;; functionality or similar names. +;;; diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 73898d120c..bb172f3bee 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -14323,3 +14323,9 @@ The following TLA+ tools are available in this distribution: @item The PlusCal translator. @end itemize") (license license:expat)))) + +;;; +;;; Avoid adding new packages to the end of this file. To reduce the chances +;;; of a merge conflict, place them above by existing packages with similar +;;; functionality or similar names. +;;; diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index 6aa185486b..28c759a5c0 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -5878,3 +5878,9 @@ Zygote, without depending on Zygote itself.") differentiation (AD) in Julia, and is the next-generation AD system for the Flux differentiable programming framework.") (license license:expat))) + +;;; +;;; Avoid adding new packages to the end of this file. To reduce the chances +;;; of a merge conflict, place them above by existing packages with similar +;;; functionality or similar names. +;;; diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 4fd3da31a4..2ce5438b71 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -23897,3 +23897,9 @@ descent parsers without funky syntax or impenetrable macrology.") (define-public ecl-smug (sbcl-package->ecl-package sbcl-smug)) + +;;; +;;; Avoid adding new packages to the end of this file. To reduce the chances +;;; of a merge conflict, place them above by existing packages with similar +;;; functionality or similar names. +;;; diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 2fd519ca41..89dcb1d60a 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -8774,3 +8774,9 @@ bibliography files in BibTeX format, a bibliography in HTML format.") "The OCaml guile library provides high-level OCaml bindings to GNU Guile 3.0, supporting easy interop between OCaml and GNU Guile Scheme.") (license license:gpl3+))) + +;;; +;;; Avoid adding new packages to the end of this file. To reduce the chances +;;; of a merge conflict, place them above by existing packages with similar +;;; functionality or similar names. +;;; diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 42c7d18c9d..64868607dc 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -11901,3 +11901,9 @@ It also allows manipulating ancillary data or so-called control information (cmsghdr). This ancillary data may be used for file descriptor passing, IPv6 operations, and a host of implemenation-specific extensions.") (license license:perl-license))) + +;;; +;;; Avoid adding new packages to the end of this file. To reduce the chances +;;; of a merge conflict, place them above by existing packages with similar +;;; functionality or similar names. +;;; diff --git a/gnu/packages/python-science.scm b/gnu/packages/python-science.scm index 331b16df8f..d571dd8406 100644 --- a/gnu/packages/python-science.scm +++ b/gnu/packages/python-science.scm @@ -1478,3 +1478,9 @@ Dask, PyTorch, Tensorflow, CuPy, Sparse, Theano, JAX, and Autograd arrays as well as potentially any library which conforms to a standard API. See the documentation for more information.") (license license:expat))) + +;;; +;;; Avoid adding new packages to the end of this file. To reduce the chances +;;; of a merge conflict, place them above by existing packages with similar +;;; functionality or similar names. +;;; diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 86fed87f26..180464e157 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -30791,3 +30791,9 @@ functions @item Type annotations to help ensure correct usage @end itemize") (license license:bsd-3))) + +;;; +;;; Avoid adding new packages to the end of this file. To reduce the chances +;;; of a merge conflict, place them above by existing packages with similar +;;; functionality or similar names. +;;; diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 94c3bfeb6f..c7d820e9e9 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -13766,3 +13766,9 @@ can also be used as a Ruby library or as a web application, though the later has not yet been packaged for Guix.") (license license:bsd-2) (properties `((upstream-name . "anystyle-cli"))))) + +;;; +;;; Avoid adding new packages to the end of this file. To reduce the chances +;;; of a merge conflict, place them above by existing packages with similar +;;; functionality or similar names. +;;; diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index ae8bf43161..5e0228f2ab 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -11685,3 +11685,9 @@ syllable. The package itself does not support UTF-8 input in ordinary interest. Since most such counters are simply incremented when they are changed, the recorded value will usually be the maximum value.") (license license:lppl1.3c+))) + +;;; +;;; Avoid adding new packages to the end of this file. To reduce the chances +;;; of a merge conflict, place them above by existing packages with similar +;;; functionality or similar names. +;;; From 37e4015f46583e7fb314868876ff70b424a6154c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wiktor=20=C5=BBelazny?= Date: Mon, 5 Sep 2022 19:55:33 +0200 Subject: [PATCH 07/22] gnu: Add texlive-latex-seqsplit. * gnu/packages/tex.scm (texlive-latex-seqsplit): New variable. Signed-off-by: Christopher Baines --- gnu/packages/tex.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 5e0228f2ab..530ba5070a 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -5103,6 +5103,27 @@ recent classes such as powerdot or beamer, both of which are tuned to (define-deprecated-package texlive-latex-seminar texlive-seminar) +(define-public texlive-latex-seqsplit + (package + (inherit (simple-texlive-package + "texlive-latex-seqsplit" + (list "doc/latex/seqsplit/" + "tex/latex/seqsplit/") + (base32 "1vwzs90520qsk22djl6gs6gpqx83y4b19kziirwj2xwbivcfk1h4") + #:trivial? #t)) + (build-system texlive-build-system) + (home-page "https://ctan.org/pkg/seqsplit") + (synopsis "Split long sequences of characters in a neutral way") + (description + "@code{seqsplit} provides a command @code{\\seqsplit}, which makes its +argument splittable anywhere, and then leaves the TeX paragraph-maker to do the +splitting. The package is suitable for situations when one needs to type long +sequences of letters or of numbers in which there is no obvious break points to +be found, such as in base-sequences in genes or calculations of transcendental +numbers. While the package may obviously be used to typeset DNA sequences, the +user may consider the @code{dnaseq} as a rather more powerful alternative.") + (license license:lppl1.3+))) + (define-public texlive-latex-stackengine (package (inherit (simple-texlive-package From 13f1584b2ed01f93af010b5e84b5281a07acf0cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wiktor=20=C5=BBelazny?= Date: Mon, 5 Sep 2022 20:06:24 +0200 Subject: [PATCH 08/22] gnu: Add texlive-latex-enotez. * gnu/packages/tex.scm (texlive-latex-enotez): New variable. Signed-off-by: Christopher Baines --- gnu/packages/tex.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 530ba5070a..ff4701b873 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -6709,6 +6709,22 @@ splines, and filled circles and ellipses. The package uses @code{tpic} @code{\\special} commands.") (license license:public-domain))) +(define-public texlive-latex-enotez + (package + (inherit (simple-texlive-package + "texlive-latex-enotez" + (list "doc/latex/enotez/" + "tex/latex/enotez/") + (base32 "1s1wyq6m5932gpbpvvkiw857q94jn1rp7xy9y7hysz9aafjqjyk2") + #:trivial? #t)) + (build-system texlive-build-system) + (home-page "https://ctan.org/pkg/enotez") + (synopsis "Support for end-notes") + (description + "This package allows nested endnotes, supports @code{hyperref} and +provides means for easy customization of the list of notes.") + (license license:lppl1.3c+))) + (define-public texlive-enumitem (package (inherit From b8850bf2c1e5d13ca4ea16eae315c1e1c2e01af6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wiktor=20=C5=BBelazny?= Date: Mon, 5 Sep 2022 20:08:44 +0200 Subject: [PATCH 09/22] gnu: Add texlive-latex-translations. * gnu/packages/tex.scm (texlive-latex-translations): New variable. --- gnu/packages/tex.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index ff4701b873..b3a81092db 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -10701,6 +10701,29 @@ are valid as arguments for the macros. The package may be used under LaTeX and plain TeX.") (license (license:fsf-free "file:/binhex.dtx")))) +(define-public texlive-latex-translations + (package + (inherit (simple-texlive-package + "texlive-latex-translations" + (list "doc/latex/translations/" + "tex/latex/translations/") + (base32 "0vl7ckpbkjvz3a5snzppb96ncwgmhpwb2p6cg30grfyn421kap3v") + #:trivial? #t)) + (build-system texlive-build-system) + (home-page "https://ctan.org/pkg/translations") + (synopsis "Internationalisation of LaTeX2e packages") + (description + ;; Polish not mentioned on CTAN, but there is a + ;; translations-basic-dictionary-polish.trsl file. + "This package (once part of the @code{exsheets} package), provides a +framework for providing multilingual features to a LaTeX package. The package +has its own basic dictionaries for English, Brazilian, Catalan, Dutch, French, +German, Polish and Spanish. It aims to use translation material for English, +Dutch, French, German, Italian, Spanish, Catalan, Turkish, Croatian, Hungarian, +Danish and Portuguese from babel or polyglossia if either is in use in the +document.") + (license license:lppl1.3c+))) + (define-public texlive-translator (package (inherit (simple-texlive-package From a53ef49baa6256a29dabb86c5d36f850f3838e2a Mon Sep 17 00:00:00 2001 From: Adam Kandur Date: Mon, 5 Sep 2022 16:34:34 +0300 Subject: [PATCH 10/22] gnu: Add go-github-com-goccy-go-json. * gnu/packages/golang.scm (go-github-com-goccy-go-json): New variable. Signed-off-by: Christopher Baines --- gnu/packages/golang.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 610e18310d..29a11a4ec1 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -2923,6 +2923,28 @@ loading algorithms.") is similar to Go's standard library @code{json} and @code{xml} package.") (license license:expat))) +(define-public go-github-com-goccy-go-json + (package + (name "go-github-com-goccy-go-json") + (version "0.9.10") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/goccy/go-json") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1bg8p4c6r8r0kixdxv2m8xmdsmb1zl5sd8czswpccldjk3c358wp")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/goccy/go-json")) + (home-page "https://github.com/goccy/go-json") + (synopsis "JSON encoder/decoder in Go") + (description + "Fast JSON encoder/decoder compatible with encoding/json for Go.") + (license license:expat))) + (define-public go-github-com-getsentry-raven-go (let ((commit "5c24d5110e0e198d9ae16f1f3465366085001d92") (revision "0")) From 2411e0b0bb84a45c408a4e709cb11f76de467168 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wiktor=20=C5=BBelazny?= Date: Mon, 5 Sep 2022 13:47:32 +0200 Subject: [PATCH 11/22] gnu: Add texlive-latex-marginfix. * gnu/packages/tex.scm (texlive-latex-marginfix): New variable. Signed-off-by: Christopher Baines --- gnu/packages/tex.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index b3a81092db..0d0ff58f1b 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -5554,6 +5554,25 @@ always (re)defines a command. There is also @code{\\makeenvironment} and @code{\\provideenvironment} for environments.") (license license:lppl1.3c+))) +(define-public texlive-latex-marginfix + (package + (inherit (simple-texlive-package + "texlive-latex-marginfix" + (list "doc/latex/marginfix/" + "tex/latex/marginfix/") + (base32 "1qinf42mjry8bi5h3kgbi6hcymnk8fw0w43527wm95nc365dq0mf") + #:trivial? #t)) + (build-system texlive-build-system) + (home-page "https://ctan.org/pkg/marginfix") + (synopsis "Patch \\marginpar to avoid overfull margins") + (description + "Authors using LaTeX to typeset books with significant margin material +often run into the problem of long notes running off the bottom of the page. +This package implements a solution to make marginpars ``just work'' by keeping +a list of floating inserts and arranging them intelligently in the output +routine.") + (license license:lppl))) + (define-public texlive-metalogo (package (inherit (simple-texlive-package From 175fa28a4f6ad800ca87591369c573b7cae4d1b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wiktor=20=C5=BBelazny?= Date: Mon, 5 Sep 2022 12:40:23 +0200 Subject: [PATCH 12/22] gnu: Add texlive-latex-pbox. * gnu/packages/tex.scm (texlive-latex-pbox): New variable. Signed-off-by: Christopher Baines --- gnu/packages/tex.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 0d0ff58f1b..c96887300f 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -6855,6 +6855,23 @@ that is untidy; this package (though it is no substitute for a properly designed class) helps alleviate this untidiness.") (license license:lppl))) +(define-public texlive-latex-pbox + (package + (inherit (simple-texlive-package + "texlive-latex-pbox" + (list "doc/latex/pbox/" + "tex/latex/pbox/") + (base32 "0902snjidmhjml01zcppcpp4j6pidin1sdvfi7gnbb5v86zd5f0n") + #:trivial? #t)) + (build-system texlive-build-system) + (home-page "https://ctan.org/pkg/pbox") + (synopsis "\\parbox with a variable width") + (description + "@code{pbox} defines a \\pbox{}{} command which adjusts +the box width to that of the enclosed text, up to the maximum width given. The +package also defines some associated length commands.") + (license license:gpl3+))) + (define-public texlive-latex-pdfpages (package (name "texlive-latex-pdfpages") From fe42befd64df016d755f56107a407f5e4b5c3814 Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Fri, 2 Sep 2022 16:41:45 +0000 Subject: [PATCH 13/22] gnu: python-pip: Update to 22.2.2. * gnu/packages/python-xyz.scm (python-pip): Update to 22.2.2. Signed-off-by: Christopher Baines --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 180464e157..ed44c53f38 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -12472,14 +12472,14 @@ responses, rather than doing any computation.") (define-public python-pip (package (name "python-pip") - (version "20.2.4") + (version "22.2.2") (source (origin (method url-fetch) (uri (pypi-uri "pip" version)) (sha256 (base32 - "18b4qcijwivvkj1g0hs4w8zjbks0bjzdjcrqybnhmyx0gs2rmjc5")))) + "0jwac0bhfp48w4fqibf1ysrs2grksdv92hwqm7bmdw2jn2fr5l9z")))) (build-system python-build-system) (arguments '(#:tests? #f)) ; there are no tests in the pypi archive. From 7d92ad4dfc359499e4812be8e648cb4a27bc58fb Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 10 Sep 2022 01:45:05 +0200 Subject: [PATCH 14/22] gnu: simple-scan: Update to 42.1. * gnu/packages/gnome.scm (simple-scan): Update to 42.1. [arguments]: Remove #:meson. --- gnu/packages/gnome.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 7ac0698f02..34039fbb05 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6732,7 +6732,7 @@ USB transfers with your high-level application or system daemon.") (define-public simple-scan (package (name "simple-scan") - (version "40.7") + (version "42.1") (source (origin (method url-fetch) @@ -6740,12 +6740,11 @@ USB transfers with your high-level application or system daemon.") (version-major version) "/" "simple-scan-" version ".tar.xz")) (sha256 - (base32 "0lrxmk8xqvrb5gn5mpgqij133giwvrgavy49m55d7xssrd91hmbw")))) + (base32 "09i23f8j3knppyxmikzfq9s09xarsgp9sqx9mfyvas8p3ihw16w5")))) (build-system meson-build-system) ;; TODO: Fix icons in home screen, About dialogue, and scan menu. (arguments - `(#:glib-or-gtk? #t - #:meson ,meson-0.60)) + '(#:glib-or-gtk? #t)) (native-inputs (list gettext-minimal itstool From e9a32184fdbf685570a0309cf5b08c56f3ad0904 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 10 Sep 2022 01:54:34 +0200 Subject: [PATCH 15/22] gnu: rygel: Update to 0.40.4. * gnu/packages/gnome.scm (rygel): Update to 0.40.4. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 34039fbb05..912091e25b 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1642,7 +1642,7 @@ to preview files on the GNOME desktop.") (define-public rygel (package (name "rygel") - (version "0.40.1") + (version "0.40.4") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -1650,7 +1650,7 @@ to preview files on the GNOME desktop.") name "-" version ".tar.xz")) (sha256 (base32 - "0bd3d2swa8lq47b9r04x8xwdr9nhjnrwqi6scygd134wb5vxfh22")))) + "12rl1bgvwbdmnhva57b22q7d2pwqvi2rizygiyy6qpv1x3dqlvbk")))) (build-system meson-build-system) (arguments ;; Disable the tracker plugin. From 6af5818262d4fa898293d053793f820c0b3c413a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 10 Sep 2022 02:04:15 +0200 Subject: [PATCH 16/22] gnu: mutter: Remove input labels. * gnu/packages/gnome.scm (mutter)[native-inputs, inputs, propagated-inputs]: Remove labels. [arguments]: Use SEARCH-INPUT-FILE instead of labels. --- gnu/packages/gnome.scm | 145 ++++++++++++++++++++--------------------- 1 file changed, 71 insertions(+), 74 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 912091e25b..37c1f3957b 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7504,17 +7504,14 @@ to display dialog boxes from the commandline and shell scripts.") "-Dsystemd=false" ;; The following flags are needed for the bundled clutter (string-append "-Dxwayland_path=" - (assoc-ref %build-inputs "xorg-server-xwayland") - "/bin/Xwayland") + (search-input-file %build-inputs "/bin/Xwayland")) ;; the remaining flags are needed for the bundled cogl (string-append "-Dopengl_libname=" - (assoc-ref %build-inputs "mesa") - "/lib/libGL.so") + (search-input-file %build-inputs "/lib/libGL.so")) (string-append "-Dgles2_libname=" - (assoc-ref %build-inputs "mesa") - "/lib/libGLESv2.so") - "-Degl_device=true" ;false by default - "-Dwayland_eglstream=true") ;false by default + (search-input-file %build-inputs "/lib/libGLESv2.so")) + "-Degl_device=true" ;false by default + "-Dwayland_eglstream=true") ;false by default #:test-options (list "--verbose") #:phases @@ -7523,10 +7520,10 @@ to display dialog boxes from the commandline and shell scripts.") (lambda* (#:key inputs #:allow-other-keys) (substitute* "src/wayland/meta-wayland-egl-stream.c" (("libnvidia-egl-wayland.so.1") - (string-append (assoc-ref inputs "egl-wayland") - "/lib/libnvidia-egl-wayland.so.1"))))) + (search-input-file inputs + "/lib/libnvidia-egl-wayland.so.1"))))) (add-before 'configure 'set-udev-dir - (lambda* (#:key inputs outputs #:allow-other-keys) + (lambda* (#:key outputs #:allow-other-keys) (setenv "PKG_CONFIG_UDEV_UDEVDIR" (string-append (assoc-ref outputs "out") "/lib/udev")))) @@ -7593,71 +7590,71 @@ to display dialog boxes from the commandline and shell scripts.") (error "`meson test' exited with status" status)))))))))))) (native-inputs - `(("desktop-file-utils" ,desktop-file-utils) ; for update-desktop-database - ("glib:bin" ,glib "bin") ; for glib-compile-schemas, etc. - ("gobject-introspection" ,gobject-introspection) - ("intltool" ,intltool) - ("pkg-config" ,pkg-config) - ("xvfb-run" ,xvfb-run) - ;; For git build - ("autoconf" ,autoconf) - ("automake" ,automake) - ("libtool" ,libtool) - ;; For tests. - ;; Warnings are configured to be fatal during the tests; add an icon - ;; theme to please libxcursor. - ("adwaita-icon-theme" ,adwaita-icon-theme) - ("libxcursor" ,libxcursor) ;for XCURSOR_PATH - ("pipewire" ,pipewire-0.3) - ("python" ,python) - ("python-dbus" ,python-dbus) - ("python-dbusmock" ,python-dbusmock) - ("tini" ,tini))) ;acting as init (zombie reaper) + (list desktop-file-utils ; for update-desktop-database + `(,glib "bin") ; for glib-compile-schemas, etc. + gobject-introspection + intltool + pkg-config + xvfb-run + ;; For git build + autoconf + automake + libtool + ;; For tests. + ;; Warnings are configured to be fatal during the tests; add an icon + ;; theme to please libxcursor. + adwaita-icon-theme + libxcursor ;for XCURSOR_PATH + pipewire-0.3 + python + python-dbus + python-dbusmock + tini)) ;acting as init (zombie reaper) (propagated-inputs - `( ;; libmutter.pc refers to these: - ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) - ("gtk+" ,gtk+) - ;; mutter-clutter-1.0.pc and mutter-cogl-1.0.pc refer to these: - ("atk" ,atk) - ("cairo" ,cairo) - ("gdk-pixbuf" ,gdk-pixbuf) - ("glib" ,glib) - ("json-glib" ,json-glib) - ("libinput" ,libinput) - ("libx11" ,libx11) - ("libxcomposite" ,libxcomposite) - ("libxcvt" ,libxcvt) - ("libxdamage" ,libxdamage) - ("libxext" ,libxext) - ("libxfixes" ,libxfixes) - ("libxkbcommon" ,libxkbcommon) - ("libxml2" ,libxml2) - ("libxrandr" ,libxrandr) - ("mesa" ,mesa) - ("pango" ,pango) - ("udev" ,eudev) - ("xinput" ,xinput))) + (list ;; libmutter.pc refers to these: + gsettings-desktop-schemas + gtk+ + ;; mutter-clutter-1.0.pc and mutter-cogl-1.0.pc refer to these: + atk + cairo + gdk-pixbuf + glib + json-glib + libinput + libx11 + libxcomposite + libxcvt + libxdamage + libxext + libxfixes + libxkbcommon + libxml2 + libxrandr + mesa + pango + eudev + xinput)) (inputs - `(("egl-wayland" ,egl-wayland) ;for wayland-eglstream-protocols - ("elogind" ,elogind) - ("gnome-desktop" ,gnome-desktop) - ("gnome-settings-daemon" ,gnome-settings-daemon) - ("graphene" ,graphene) - ("libcanberra-gtk" ,libcanberra) - ("libgudev" ,libgudev) - ("libice" ,libice) - ("libsm" ,libsm) - ("libwacom" ,libwacom) - ("libxkbfile" ,libxkbfile) - ("libxrandr" ,libxrandr) - ("libxtst" ,libxtst) - ("pipewire" ,pipewire-0.3) - ("startup-notification" ,startup-notification) - ("sysprof" ,sysprof) - ("upower-glib" ,upower) - ("xkeyboard-config" ,xkeyboard-config) - ("xorg-server-xwayland" ,xorg-server-xwayland) - ("zenity" ,zenity))) + (list egl-wayland ;for wayland-eglstream-protocols + elogind + gnome-desktop + gnome-settings-daemon + graphene + libcanberra + libgudev + libice + libsm + libwacom + libxkbfile + libxrandr + libxtst + pipewire-0.3 + startup-notification + sysprof + upower + xkeyboard-config + xorg-server-xwayland + zenity)) (synopsis "Window and compositing manager") (home-page "https://www.gnome.org") (description From 03cae37faed538ebf55e041222dadd7e0fec72f8 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 10 Sep 2022 02:14:20 +0200 Subject: [PATCH 17/22] gnu: mutter: Use G-expression. * gnu/packages/gnome.scm (mutter)[arguments]: Use G-expressions. --- gnu/packages/gnome.scm | 190 ++++++++++++++++++++--------------------- 1 file changed, 94 insertions(+), 96 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 37c1f3957b..d6d321cfb1 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7487,108 +7487,106 @@ to display dialog boxes from the commandline and shell scripts.") ;; needed here as well. (build-system meson-build-system) (arguments - `(#:imported-modules (,@%meson-build-system-modules + (list + #:imported-modules `(,@%meson-build-system-modules (guix build syscalls)) - #:modules ((guix build meson-build-system) + #:modules '((guix build meson-build-system) (guix build syscalls) (guix build utils) (ice-9 match)) - #:glib-or-gtk? #t - #:configure-flags - (list - ;; Otherwise, the RUNPATH will lack the final path component. - (string-append "-Dc_link_args=-Wl,-rpath=" - (assoc-ref %outputs "out") "/lib:" - (assoc-ref %outputs "out") "/lib/mutter-9") - ;; Disable systemd support. - "-Dsystemd=false" - ;; The following flags are needed for the bundled clutter - (string-append "-Dxwayland_path=" - (search-input-file %build-inputs "/bin/Xwayland")) - ;; the remaining flags are needed for the bundled cogl - (string-append "-Dopengl_libname=" - (search-input-file %build-inputs "/lib/libGL.so")) - (string-append "-Dgles2_libname=" - (search-input-file %build-inputs "/lib/libGLESv2.so")) - "-Degl_device=true" ;false by default - "-Dwayland_eglstream=true") ;false by default - #:test-options - (list "--verbose") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-dlopen-calls - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "src/wayland/meta-wayland-egl-stream.c" - (("libnvidia-egl-wayland.so.1") - (search-input-file inputs - "/lib/libnvidia-egl-wayland.so.1"))))) - (add-before 'configure 'set-udev-dir - (lambda* (#:key outputs #:allow-other-keys) - (setenv "PKG_CONFIG_UDEV_UDEVDIR" - (string-append (assoc-ref outputs "out") - "/lib/udev")))) - (add-after 'unpack 'disable-problematic-tests - (lambda _ - ;; The native-headless test hangs due to attempting to use audio, - ;; unavailable in the container. - ;; Note: the following sed expression deletes the whole test(...) - ;; expression paragraph. For an explanation, see: info '(sed) - ;; Multiline techniques'. - (invoke "sed" "/./{H;$!d} ; x ; s/^.*native-headless.*$//" - "-i" "src/tests/meson.build") - ;; Timeline tests may unexpectedly fail on missed frames, so - ;; let's disable them as well. - ;; See - (substitute* "src/tests/clutter/conform/meson.build" - (("'timeline.*',") "")))) - (replace 'check - (lambda* (#:key tests? test-options parallel-tests? - #:allow-other-keys) - (when tests? - ;; Setup (see the 'test-mutter' CI target at - ;; https://gitlab.gnome.org/GNOME/mutter/-/raw/main/.gitlab-ci.yml). - (setenv "XDG_RUNTIME_DIR" "runtime-dir") - (setenv "GSETTINGS_SCHEMA_DIR" "data") - (setenv "MUTTER_DEBUG_DUMMY_MODE_SPECS" "800x600@10.0") - (setenv "PIPEWIRE_DEBUG" "2") - (setenv "PIPEWIRE_LOG" "meson-logs/pipewire.log") - (setenv "XVFB_SERVER_ARGS" "+iglx -noreset") - (setenv "G_SLICE" "always-malloc") - (setenv "MALLOC_CHECK" "3") - (setenv "NO_AT_BRIDGE" "1") - ;; This is needed, otherwise the "mutter:core+mutter/unit / - ;; anonymous-file" test would fail (see: - ;; https://gitlab.gnome.org/GNOME/mutter/-/issues/2017). - (setenv "CI_JOB_ID" "1") + #:glib-or-gtk? #t + #:configure-flags + #~(list + ;; Otherwise, the RUNPATH will lack the final path component. + (string-append "-Dc_link_args=-Wl,-rpath=" + #$output "/lib:" #$output "/lib/mutter-9") + ;; Disable systemd support. + "-Dsystemd=false" + ;; The following flags are needed for the bundled clutter + (string-append "-Dxwayland_path=" + (search-input-file %build-inputs "/bin/Xwayland")) + ;; the remaining flags are needed for the bundled cogl + (string-append "-Dopengl_libname=" + (search-input-file %build-inputs "/lib/libGL.so")) + (string-append "-Dgles2_libname=" + (search-input-file %build-inputs "/lib/libGLESv2.so")) + "-Degl_device=true" ;false by default + "-Dwayland_eglstream=true") ;false by default + #:test-options ''("--verbose") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-dlopen-calls + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "src/wayland/meta-wayland-egl-stream.c" + (("libnvidia-egl-wayland.so.1") + (search-input-file inputs + "/lib/libnvidia-egl-wayland.so.1"))))) + (add-before 'configure 'set-udev-dir + (lambda _ + (setenv "PKG_CONFIG_UDEV_UDEVDIR" + (string-append #$output "/lib/udev")))) + (add-after 'unpack 'disable-problematic-tests + (lambda _ + ;; The native-headless test hangs due to attempting to use audio, + ;; unavailable in the container. + ;; Note: the following sed expression deletes the whole test(...) + ;; expression paragraph. For an explanation, see: info '(sed) + ;; Multiline techniques'. + (invoke "sed" "/./{H;$!d} ; x ; s/^.*native-headless.*$//" + "-i" "src/tests/meson.build") + ;; Timeline tests may unexpectedly fail on missed frames, so + ;; let's disable them as well. + ;; See + (substitute* "src/tests/clutter/conform/meson.build" + (("'timeline.*',") "")))) + (replace 'check + (lambda* (#:key tests? test-options parallel-tests? + #:allow-other-keys) + (when tests? + ;; Setup (see the 'test-mutter' CI target at + ;; https://gitlab.gnome.org/GNOME/mutter/-/raw/main/.gitlab-ci.yml). + (setenv "XDG_RUNTIME_DIR" "runtime-dir") + (setenv "GSETTINGS_SCHEMA_DIR" "data") + (setenv "MUTTER_DEBUG_DUMMY_MODE_SPECS" "800x600@10.0") + (setenv "PIPEWIRE_DEBUG" "2") + (setenv "PIPEWIRE_LOG" "meson-logs/pipewire.log") + (setenv "XVFB_SERVER_ARGS" "+iglx -noreset") + (setenv "G_SLICE" "always-malloc") + (setenv "MALLOC_CHECK" "3") + (setenv "NO_AT_BRIDGE" "1") + ;; This is needed, otherwise the "mutter:core+mutter/unit / + ;; anonymous-file" test would fail (see: + ;; https://gitlab.gnome.org/GNOME/mutter/-/issues/2017). + (setenv "CI_JOB_ID" "1") - (invoke "glib-compile-schemas" (getenv "GSETTINGS_SCHEMA_DIR")) - (mkdir-p (getenv "XDG_RUNTIME_DIR")) - (chmod (getenv "XDG_RUNTIME_DIR") #o755) - (invoke "pipewire" "--version") ;check for pipewire - (system "pipewire &") ;always returns 0 due to forking + (invoke "glib-compile-schemas" (getenv "GSETTINGS_SCHEMA_DIR")) + (mkdir-p (getenv "XDG_RUNTIME_DIR")) + (chmod (getenv "XDG_RUNTIME_DIR") #o755) + (invoke "pipewire" "--version") ;check for pipewire + (system "pipewire &") ;always returns 0 due to forking - (setenv "MESON_TESTTHREADS" - (if parallel-tests? - (number->string (parallel-job-count)) - "1")) - (match (primitive-fork) - (0 ;child process - (set-child-subreaper!) - ;; Use tini so that signals are properly handled and - ;; doubly-forked processes get reaped; otherwise, - ;; python-dbusmock would waste time polling for the dbus - ;; processes it spawns to be reaped, in vain. - (apply execlp "tini" "--" - "dbus-run-session" "--" - "xvfb-run" "-a" "-s" (getenv "XVFB_SERVER_ARGS") - "meson" "test" "-t" "0" "--print-errorlogs" - test-options)) - (pid - (match (waitpid pid) - ((_ . status) - (unless (zero? status) - (error "`meson test' exited with status" - status)))))))))))) + (setenv "MESON_TESTTHREADS" + (if parallel-tests? + (number->string (parallel-job-count)) + "1")) + (match (primitive-fork) + (0 ;child process + (set-child-subreaper!) + ;; Use tini so that signals are properly handled and + ;; doubly-forked processes get reaped; otherwise, + ;; python-dbusmock would waste time polling for the dbus + ;; processes it spawns to be reaped, in vain. + (apply execlp "tini" "--" + "dbus-run-session" "--" + "xvfb-run" "-a" "-s" (getenv "XVFB_SERVER_ARGS") + "meson" "test" "-t" "0" "--print-errorlogs" + test-options)) + (pid + (match (waitpid pid) + ((_ . status) + (unless (zero? status) + (error "`meson test' exited with status" + status)))))))))))) (native-inputs (list desktop-file-utils ; for update-desktop-database `(,glib "bin") ; for glib-compile-schemas, etc. From 966649a74c120cabda4abc31b597ddd202ea71ca Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 10 Sep 2022 12:45:04 +0200 Subject: [PATCH 18/22] gnu: mutter: Remove obsolete input. * gnu/packages/gnome.scm (mutter)[native-inputs]: Remove INTLTOOL. Add GETTEXT-MINIMAL. --- gnu/packages/gnome.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index d6d321cfb1..3873f783f7 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7589,9 +7589,9 @@ to display dialog boxes from the commandline and shell scripts.") status)))))))))))) (native-inputs (list desktop-file-utils ; for update-desktop-database + gettext-minimal `(,glib "bin") ; for glib-compile-schemas, etc. gobject-introspection - intltool pkg-config xvfb-run ;; For git build From 45c2da38758f1cb75b2044440c78202ed26b881c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 10 Sep 2022 14:40:29 +0200 Subject: [PATCH 19/22] gnu: gnome-shell: Remove obsolete input. * gnu/packages/gnome.scm (gnome-shell)[arguments]: Don't remove intltool from XDG_DATA_DIRS. [native-inputs]: Remove INTLTOOL. Add GETTEXT-MINIMAL and PERL. --- gnu/packages/gnome.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 3873f783f7..f1ec619ef8 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -8815,19 +8815,20 @@ printf '~a is deprecated. Use the \"gnome-extensions\" CLI or \ (replace 'glib-or-gtk-wrap (let ((wrap (assoc-ref %standard-phases 'glib-or-gtk-wrap))) (lambda* (#:key inputs outputs #:allow-other-keys #:rest rest) - ;; By default intltool et al. would end up in the XDG_DATA_DIRS + ;; By default glib:bin et al. would end up in the XDG_DATA_DIRS ;; settings of the wrappers created by the 'glib-or-gtk-wrap' ;; phase. Fix that since we don't need these. (wrap #:inputs (fold alist-delete inputs - '("intltool" "glib:bin")) + '("glib:bin")) #:outputs outputs))))))) (native-inputs `(("asciidoc" ,asciidoc) + ("gettext" ,gettext-minimal) ("glib:bin" ,glib "bin") ; for glib-compile-schemas, etc. ("desktop-file-utils" ,desktop-file-utils) ; for update-desktop-database ("gobject-introspection" ,gobject-introspection) ("hicolor-icon-theme" ,hicolor-icon-theme) - ("intltool" ,intltool) + ("perl" ,perl) ("pkg-config" ,pkg-config) ("python" ,python) ("ruby-sass" ,ruby-sass) From f0114656876dcf2e09874e4ea0c00cacf31f1bb2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 10 Sep 2022 16:33:49 +0200 Subject: [PATCH 20/22] gnu: gnome-shell: Remove input labels and use G-expression. * gnu/packages/gnome.scm (gnome-shell)[native-inputs]: Remove labels. [arguments]: Convert to G-expressions. Add (ice-9 match) to #:modules. Use SEARCH-INPUT-FILE and #$OUTPUT where appropriate. Add let-binding for DISALLOWED-REFERENCES and use them in glib-or-gtk-wrap phase. --- gnu/packages/gnome.scm | 214 +++++++++++++++++++++-------------------- 1 file changed, 109 insertions(+), 105 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index f1ec619ef8..189c2002cb 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -8729,113 +8729,117 @@ properties, screen resolution, and other GNOME parameters.") "0ragmcln210zvzhc2br33yprbkj9drjzd7inp5sdxra0a7l73yaj")))) (build-system meson-build-system) (arguments - `(#:glib-or-gtk? #t - #:disallowed-references ,(list (gexp-input glib "bin") - (gexp-input libxslt) - (gexp-input ruby-sass)) - #:configure-flags - (list "-Dsystemd=false" - ;; Otherwise, the RUNPATH will lack the final path component. - (string-append "-Dc_link_args=-Wl,-rpath=" - (assoc-ref %outputs "out") - "/lib/gnome-shell")) - - #:modules ((guix build meson-build-system) - (guix build utils) - (srfi srfi-1)) - - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-keysdir - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (keysdir (string-append - out "/share/gnome-control-center/keybindings"))) - (substitute* "meson.build" - (("keysdir =.*") - (string-append "keysdir = '" keysdir "'\n")))))) - (add-after 'unpack 'skip-gtk-update-icon-cache - ;; Don't create 'icon-theme.cache'. - (lambda _ - (substitute* "meson/postinstall.py" - (("gtk-update-icon-cache") "true")))) - (add-before 'configure 'record-absolute-file-names - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "js/misc/ibusManager.js" - (("'ibus-daemon'") - (string-append "'" (assoc-ref inputs "ibus") - "/bin/ibus-daemon'"))) - (substitute* "js/ui/status/keyboard.js" - (("'gkbd-keyboard-display'") - (string-append "'" (assoc-ref inputs "libgnomekbd") - "/bin/gkbd-keyboard-display'"))))) - (add-before 'check 'pre-check - (lambda* (#:key inputs #:allow-other-keys) - ;; Tests require a running X server. - (system "Xvfb :1 &") - (setenv "DISPLAY" ":1") - (setenv "HOME" "/tmp"))) ;to avoid "fatal" warnings - (add-after 'install 'wrap-programs - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (gi-typelib-path (getenv "GI_TYPELIB_PATH")) - (python-path (getenv "GUIX_PYTHONPATH"))) - (for-each - (lambda (prog) - (wrap-program (string-append out "/bin/" prog) - `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path)))) - '("gnome-shell" "gnome-extensions-app")) - (substitute* (string-append out "/share/gnome-shell/" - "org.gnome.Shell.Extensions") - (("imports\\.package\\.start" all) - (string-append "'" gi-typelib-path "'.split(':').forEach(" - "path => imports.gi.GIRepository.Repository." - "prepend_search_path(path));\n" - all))) - (for-each - (lambda (prog) - (wrap-program (string-append out "/bin/" prog) - `("GUIX_PYTHONPATH" ":" prefix (,python-path)) - `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path)))) - '("gnome-shell-perf-tool"))))) - (add-after 'install 'rewire - (lambda* (#:key inputs outputs #:allow-other-keys) - (for-each - (lambda (tool) - (call-with-output-file (string-append - (assoc-ref outputs "out") - "/bin/" tool) - (lambda (port) - (format port "#!~a + (let ((disallowed-references + (list (gexp-input glib "bin") + (gexp-input libxslt) + (gexp-input ruby-sass)))) + (list + #:glib-or-gtk? #t + #:disallowed-references disallowed-references + #:configure-flags + #~(list "-Dsystemd=false" + ;; Otherwise, the RUNPATH will lack the final path component. + (string-append "-Dc_link_args=-Wl,-rpath=" + #$output "/lib/gnome-shell")) + #:modules '((guix build meson-build-system) + (guix build utils) + (ice-9 match) + (srfi srfi-1)) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-keysdir + (lambda _ + (let ((keysdir + (string-append #$output + "/share/gnome-control-center/keybindings"))) + (substitute* "meson.build" + (("keysdir =.*") + (string-append "keysdir = '" keysdir "'\n")))))) + (add-after 'unpack 'skip-gtk-update-icon-cache + ;; Don't create 'icon-theme.cache'. + (lambda _ + (substitute* "meson/postinstall.py" + (("gtk-update-icon-cache") "true")))) + (add-before 'configure 'record-absolute-file-names + (lambda* (#:key inputs #:allow-other-keys) + (let ((ibus-daemon (search-input-file inputs "bin/ibus-daemon")) + (gkbd-keyboard-display + (search-input-file inputs "bin/gkbd-keyboard-display"))) + (substitute* "js/misc/ibusManager.js" + (("'ibus-daemon'") + (string-append "'" ibus-daemon "'"))) + (substitute* "js/ui/status/keyboard.js" + (("'gkbd-keyboard-display'") + (string-append "'" gkbd-keyboard-display "'")))))) + (add-before 'check 'pre-check + (lambda* (#:key inputs #:allow-other-keys) + ;; Tests require a running X server. + (system "Xvfb :1 &") + (setenv "DISPLAY" ":1") + (setenv "HOME" "/tmp"))) ;to avoid "fatal" warnings + (add-after 'install 'wrap-programs + (lambda* (#:key inputs #:allow-other-keys) + (let ((gi-typelib-path (getenv "GI_TYPELIB_PATH")) + (python-path (getenv "GUIX_PYTHONPATH"))) + (for-each + (lambda (prog) + (wrap-program (string-append #$output "/bin/" prog) + `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path)))) + '("gnome-shell" "gnome-extensions-app")) + (substitute* (string-append #$output "/share/gnome-shell/" + "org.gnome.Shell.Extensions") + (("imports\\.package\\.start" all) + (string-append "'" gi-typelib-path "'.split(':').forEach(" + "path => imports.gi.GIRepository.Repository." + "prepend_search_path(path));\n" + all))) + (for-each + (lambda (prog) + (wrap-program (string-append #$output "/bin/" prog) + `("GUIX_PYTHONPATH" ":" prefix (,python-path)) + `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path)))) + '("gnome-shell-perf-tool"))))) + (add-after 'install 'rewire + (lambda* (#:key inputs #:allow-other-keys) + (for-each + (lambda (tool) + (call-with-output-file (string-append #$output + "/bin/" tool) + (lambda (port) + (format port "#!~a printf '~a is deprecated. Use the \"gnome-extensions\" CLI or \ \"gnome-extensions-app\" instead.\\n'" - (search-input-file inputs "bin/bash") - tool)))) - '("gnome-shell-extension-tool" "gnome-shell-extension-prefs")))) - (replace 'glib-or-gtk-wrap - (let ((wrap (assoc-ref %standard-phases 'glib-or-gtk-wrap))) - (lambda* (#:key inputs outputs #:allow-other-keys #:rest rest) - ;; By default glib:bin et al. would end up in the XDG_DATA_DIRS - ;; settings of the wrappers created by the 'glib-or-gtk-wrap' - ;; phase. Fix that since we don't need these. - (wrap #:inputs (fold alist-delete inputs - '("glib:bin")) - #:outputs outputs))))))) + (search-input-file inputs "bin/bash") + tool)))) + '("gnome-shell-extension-tool" "gnome-shell-extension-prefs")))) + (replace 'glib-or-gtk-wrap + (let ((wrap (assoc-ref %standard-phases 'glib-or-gtk-wrap))) + (lambda* (#:key inputs outputs #:allow-other-keys) + ;; By default glib:bin et al. would end up in the XDG_DATA_DIRS + ;; settings of the wrappers created by the 'glib-or-gtk-wrap' + ;; phase. Fix that since we don't need these. + (wrap #:inputs + (filter (match-lambda + ((label . output) + (not (member output + '#$disallowed-references)))) + inputs) + #:outputs outputs)))))))) (native-inputs - `(("asciidoc" ,asciidoc) - ("gettext" ,gettext-minimal) - ("glib:bin" ,glib "bin") ; for glib-compile-schemas, etc. - ("desktop-file-utils" ,desktop-file-utils) ; for update-desktop-database - ("gobject-introspection" ,gobject-introspection) - ("hicolor-icon-theme" ,hicolor-icon-theme) - ("perl" ,perl) - ("pkg-config" ,pkg-config) - ("python" ,python) - ("ruby-sass" ,ruby-sass) - ("sassc" ,sassc) - ("xsltproc" ,libxslt) - ;; For tests - ("xorg-server" ,xorg-server-for-tests))) + (list asciidoc + gettext-minimal + `(,glib "bin") ;for glib-compile-schemas, etc. + desktop-file-utils ;for update-desktop-database + gobject-introspection + hicolor-icon-theme + libxslt + perl + pkg-config + python + ruby-sass + sassc + ;; For tests + xorg-server-for-tests)) (inputs (list accountsservice caribou @@ -8855,7 +8859,7 @@ printf '~a is deprecated. Use the \"gnome-extensions\" CLI or \ ibus libcanberra libcroco - libgnomekbd ;for gkbd-keyboard-display + libgnomekbd ;for gkbd-keyboard-display libgweather libnma libsoup From a38f03e4deaccf79660c1b06b49f8f18bc0096d5 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Thu, 8 Sep 2022 10:48:25 +0200 Subject: [PATCH 21/22] gnu: Add mpdevil. * gnu/packages/mpd.scm (mpdevil): New variable. --- gnu/packages/mpd.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index 046471f32d..05737f3a86 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -43,6 +43,7 @@ #:use-module (gnu packages autotools) #:use-module (gnu packages avahi) #:use-module (gnu packages base) + #:use-module (gnu packages bash) #:use-module (gnu packages build-tools) ;meson-next #:use-module (gnu packages boost) #:use-module (gnu packages cdrom) @@ -523,3 +524,37 @@ for your favorite MPD client but an addition to get a better album-experience.") (home-page "https://gitlab.com/coderkun/mcg") (license license:gpl3+))) + +(define-public mpdevil + (package + (name "mpdevil") + (version "1.7.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/SoongNoonien/mpdevil") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1va8fqlz8qb68gvacnzmp4asnipi11316n1cv2wb41sml9d7v00j")))) + (build-system meson-build-system) + (arguments + (list + #:glib-or-gtk? #t + #:phases + #~(modify-phases %standard-phases + (add-after 'glib-or-gtk-wrap 'python-and-gi-wrap + (lambda _ + (let ((prog (string-append #$output "/bin/mpdevil"))) + (wrap-program prog + `("GUIX_PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH"))) + `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH")))))))))) + (inputs (list bash-minimal gtk+ python python-mpd2 python-pygobject)) + (native-inputs (list `(,glib "bin"))) + (home-page "https://github.com/SoongNoonien/mpdevil") + (synopsis "Music browser for the MPD") + (description "mpdevil is a music browser for the Music Player Daemon (MPD), +which is focused on playing local music without the need of managing playlists. +Instead of maintaining a client side database of your music library, +mpdevil loads all tags and covers on demand.") + (license license:gpl3+))) From 575dbab74622ee8304827b98865a26225145e22a Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Fri, 9 Sep 2022 18:32:34 +0200 Subject: [PATCH 22/22] gnu: mumble: Update to 1.4.274. * gnu/packages/telephony.scm (mumble): Update to 1.4.274. Signed-off-by: Liliana Marie Prikler --- gnu/packages/telephony.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index 0c12341771..6702155a57 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -15,7 +15,7 @@ ;;; Copyright © 2019 Jan Wielkiewicz ;;; Copyright © 2019 Ivan Vilata i Balaguer ;;; Copyright © 2020 Brett Gilio -;;; Copyright © 2020 Michael Rohleder +;;; Copyright © 2020, 2022 Michael Rohleder ;;; Copyright © 2020 Raghav Gururajan ;;; Copyright © 2020, 2021 Maxim Cournoyer ;;; Copyright © 2020 Vincent Legoll @@ -555,7 +555,7 @@ address of one of the participants.") (define-public mumble (package (name "mumble") - (version "1.4.230") + (version "1.4.274") (source (origin (method url-fetch) (uri @@ -564,7 +564,7 @@ address of one of the participants.") version "/" name "-" version ".tar.gz")) (sha256 (base32 - "1c1lwj0cpyawr74adpdrsnxk8ra5kqrjbg65cnwk8n6cwss84zdn")) + "12rv61mmpgvcc1svq2y66r29sl47y9lfi9if0r09x4nqrkf7vj3y")) (modules '((guix build utils) (ice-9 ftw) (srfi srfi-1)))