aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarius Bakke <marius@gnu.org>2022-09-10 17:27:06 +0200
committerMarius Bakke <marius@gnu.org>2022-09-10 17:27:06 +0200
commit07140e8b10c56bc271c74fa82470a900684b91c6 (patch)
tree8b452a7a676f4791d4d824e19f9892d6ae6eaf82
parentcbc391102966336a1a175204ebbf4aeec66e3018 (diff)
parent575dbab74622ee8304827b98865a26225145e22a (diff)
downloadguix-07140e8b10c56bc271c74fa82470a900684b91c6.tar
guix-07140e8b10c56bc271c74fa82470a900684b91c6.tar.gz
Merge branch 'master' into staging
-rw-r--r--gnu/packages/bioconductor.scm6
-rw-r--r--gnu/packages/bioinformatics.scm6
-rw-r--r--gnu/packages/cran.scm72
-rw-r--r--gnu/packages/crates-io.scm6
-rw-r--r--gnu/packages/emacs-xyz.scm6
-rw-r--r--gnu/packages/gnome.scm553
-rw-r--r--gnu/packages/golang.scm28
-rw-r--r--gnu/packages/guile-xyz.scm6
-rw-r--r--gnu/packages/haskell-xyz.scm5
-rw-r--r--gnu/packages/java.scm6
-rw-r--r--gnu/packages/julia-xyz.scm6
-rw-r--r--gnu/packages/linux.scm16
-rw-r--r--gnu/packages/lisp-xyz.scm6
-rw-r--r--gnu/packages/mpd.scm35
-rw-r--r--gnu/packages/ocaml.scm6
-rw-r--r--gnu/packages/perl.scm6
-rw-r--r--gnu/packages/python-science.scm6
-rw-r--r--gnu/packages/python-xyz.scm10
-rw-r--r--gnu/packages/ruby.scm6
-rw-r--r--gnu/packages/telephony.scm6
-rw-r--r--gnu/packages/tex.scm102
21 files changed, 609 insertions, 290 deletions
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 7aa3ebde97..3d90dc2caa 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")
@@ -593,6 +636,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")
@@ -34503,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 7688efb69d..f09ac91df5 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -75373,3 +75373,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/gnome.scm b/gnu/packages/gnome.scm
index 0ea6ae1b84..e407547d58 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.
@@ -6751,7 +6751,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)
@@ -6759,12 +6759,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
@@ -7504,177 +7503,172 @@ 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="
- (assoc-ref %build-inputs "xorg-server-xwayland")
- "/bin/Xwayland")
- ;; the remaining flags are needed for the bundled cogl
- (string-append "-Dopengl_libname="
- (assoc-ref %build-inputs "mesa")
- "/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
- #: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")
- (string-append (assoc-ref inputs "egl-wayland")
- "/lib/libnvidia-egl-wayland.so.1")))))
- (add-before 'configure 'set-udev-dir
- (lambda* (#:key inputs 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 <https://gitlab.gnome.org/GNOME/mutter/-/issues/2125>
- (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
-
- (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
- `(("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)
+ #: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 <https://gitlab.gnome.org/GNOME/mutter/-/issues/2125>
+ (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
+
+ (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
+ gettext-minimal
+ `(,glib "bin") ; for glib-compile-schemas, etc.
+ gobject-introspection
+ 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)))
- (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 ;; 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
+ (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
@@ -8751,112 +8745,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 intltool 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"))
- #:outputs outputs)))))))
- (native-inputs
- `(("asciidoc" ,asciidoc)
- ("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)
- ("pkg-config" ,pkg-config)
- ("python" ,python)
- ("ruby-sass" ,ruby-sass)
- ("sassc" ,sassc)
- ("xsltproc" ,libxslt)
- ;; For tests
- ("xorg-server" ,xorg-server-for-tests)))
+ (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
+ (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
@@ -8876,7 +8875,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
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 8e76534d34..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"))
@@ -9992,3 +10014,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/linux.scm b/gnu/packages/linux.scm
index 06cbd7f232..e50be451b2 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)))
@@ -372,22 +372,22 @@ 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:
;; <https://www.kernel.org/category/releases.html>
-(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)))
-(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)))
diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm
index e533aa2a0f..d07eace479 100644
--- a/gnu/packages/lisp-xyz.scm
+++ b/gnu/packages/lisp-xyz.scm
@@ -23906,3 +23906,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/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+)))
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 755f5932ce..6eab98ab74 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 b218759bf8..8143088d11 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 dcade0a579..d98d80dcd6 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -12465,14 +12465,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.
@@ -30784,3 +30784,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 ee0c7bb72d..0fda93fd59 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -13741,3 +13741,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/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 <tona_kosmicznego_smiecia@interia.pl>
;;; Copyright © 2019 Ivan Vilata i Balaguer <ivan@selidor.net>
;;; Copyright © 2020 Brett Gilio <brettg@gnu.org>
-;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
+;;; Copyright © 2020, 2022 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2020 Raghav Gururajan <raghavgururajan@disroot.org>
;;; Copyright © 2020, 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
@@ -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)))
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 46ad251a64..a3c9689759 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5101,6 +5101,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
@@ -5531,6 +5552,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
@@ -6686,6 +6726,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
@@ -6797,6 +6853,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{<max width>}{<text>} 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")
@@ -10662,6 +10735,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
@@ -11683,3 +11779,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.
+;;;