summaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
Diffstat (limited to 'gnu')
-rw-r--r--gnu/local.mk1
-rw-r--r--gnu/packages/admin.scm3
-rw-r--r--gnu/packages/compression.scm4
-rw-r--r--gnu/packages/django.scm20
-rw-r--r--gnu/packages/docker.scm43
-rw-r--r--gnu/packages/electronics.scm19
-rw-r--r--gnu/packages/engineering.scm30
-rw-r--r--gnu/packages/finance.scm19
-rw-r--r--gnu/packages/game-development.scm4
-rw-r--r--gnu/packages/geo.scm48
-rw-r--r--gnu/packages/lisp-xyz.scm4
-rw-r--r--gnu/packages/lisp.scm4
-rw-r--r--gnu/packages/maths.scm2
-rw-r--r--gnu/packages/messaging.scm71
-rw-r--r--gnu/packages/monitoring.scm2
-rw-r--r--gnu/packages/opencl.scm20
-rw-r--r--gnu/packages/patches/daemontools-gcc14.patch561
-rw-r--r--gnu/packages/pretty-print.scm14
-rw-r--r--gnu/packages/prolog.scm4
-rw-r--r--gnu/packages/ruby-xyz.scm39
-rw-r--r--gnu/packages/task-management.scm37
-rw-r--r--gnu/packages/wm.scm4
22 files changed, 768 insertions, 185 deletions
diff --git a/gnu/local.mk b/gnu/local.mk
index af9c49bd90..a2a78dd74f 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1183,6 +1183,7 @@ dist_patch_DATA = \
%D%/packages/patches/cursynth-wave-rand.patch \
%D%/packages/patches/cvs-CVE-2017-12836.patch \
%D%/packages/patches/d-feet-drop-unused-meson-argument.patch \
+ %D%/packages/patches/daemontools-gcc14.patch \
%D%/packages/patches/dante-non-darwin.patch \
%D%/packages/patches/date-ignore-zonenow.patch \
%D%/packages/patches/date-output-pkg-config-files.patch \
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index cfbff824d3..237f0e02a8 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -269,7 +269,8 @@ usual file attributes can be checked for inconsistencies.")
"daemontools-" version ".tar.gz"))
(sha256
(base32
- "07scvw88faxkscxi91031pjkpccql6wspk4yrlnsbrrb5c0kamd5"))))
+ "07scvw88faxkscxi91031pjkpccql6wspk4yrlnsbrrb5c0kamd5"))
+ (patches (search-patches "daemontools-gcc14.patch"))))
(build-system gnu-build-system)
(arguments
(list #:tests? #f ;; No tests as far as I can tell.
diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index 1e8ed923bd..cf96024888 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -2553,7 +2553,7 @@ download times, and other distribution and storage costs.")
(define-public quazip
(package
(name "quazip")
- (version "1.4")
+ (version "1.5")
(source
(origin
(method git-fetch)
@@ -2562,7 +2562,7 @@ download times, and other distribution and storage costs.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "1jsw4xm5wyaqcj1pma5zzd8f5xbgd5lcjh18ah3kg36xz5i69yi4"))))
+ (base32 "0ni1656g2xf0cspwjp645hhd2p4iaqki4z26xhkxz04l5nzsdrh0"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f)) ;no test
diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 4d428d4686..cd1d0c0d9a 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -137,7 +137,7 @@ a system that allows you to easily communicate between processes, and separate
your project into different processes.")
(license license:bsd-3)))
-(define-public python-django-4.2
+(define-public python-django
(package
(name "python-django")
(version "4.2.16")
@@ -229,24 +229,6 @@ to the @dfn{don't repeat yourself} (DRY) principle.")
;; This CVE seems fixed since 4.2.1.
(lint-hidden-cve . ("CVE-2023-31047"))))))
-;; archivebox requires django>=3.1.3,<3.2
-(define-public python-django-3.1.14
- (package
- (inherit python-django-4.2)
- (version "3.1.14")
- (source (origin
- (method url-fetch)
- (uri (pypi-uri "Django" version))
- (sha256
- (base32
- "0ix3v2wlnplv78zxjrlw8z3hiap2d5mxvk0ny2fc65526shsb93j"))))
- (propagated-inputs
- (modify-inputs (package-propagated-inputs python-django-4.2)
- ;; Django 4.0 deprecated pytz in favor of Pythons built-in zoneinfo.
- (append python-pytz)))))
-
-(define-public python-django python-django-4.2)
-
(define-public python-django-cache-url
(package
(name "python-django-cache-url")
diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm
index a0c90ac5aa..21e20e1842 100644
--- a/gnu/packages/docker.scm
+++ b/gnu/packages/docker.scm
@@ -11,6 +11,7 @@
;;; Copyright © 2024 Nicolas Graves <ngraves@ngraves.fr>
;;; Copyright © 2025 Artyom V. Poptsov <poptsov.artyom@gmail.com>
;;; Copyright © 2025 Vinicius Monego <monego@posteo.net>
+;;; Copyright © 2025 John Kehayias <john.kehayias@protonmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -103,6 +104,33 @@
management tool.")
(license license:asl2.0)))
+;; Needed for old v1 of docker-compose; remove once Docker is updated to a
+;; more recent version which has the command "docker compose" built-in.
+(define-public python-docker-5
+ (package
+ (inherit python-docker)
+ (name "python-docker")
+ (version "5.0.3")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/docker/docker-py")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0m5ifgxdhcf7yci0ncgnxjas879sksrf3im0fahs573g268farz9"))))
+ (build-system python-build-system)
+ ;; Integration tests need a running Docker daemon.
+ (arguments (list #:tests? #f))
+ (native-inputs '())
+ (inputs (modify-inputs (package-inputs python-docker)
+ (prepend python-six)
+ (delete "python-urllib3")))
+ (propagated-inputs
+ (modify-inputs (package-propagated-inputs python-docker)
+ (prepend python-docker-pycreds python-urllib3-1.26)))))
+
(define-public python-dockerpty
(package
(name "python-dockerpty")
@@ -139,16 +167,25 @@ client.")
"1dq9kfak61xx7chjrzmkvbw9mvj9008k7g8q7mwi4x133p9dk32c"))))
(build-system python-build-system)
;; TODO: Tests require running Docker daemon.
- (arguments '(#:tests? #f))
+ (arguments
+ (list
+ #:tests? #f
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'fix-pyyaml
+ (lambda _
+ (substitute* "setup.py"
+ ((", < 6")
+ "")))))))
(inputs
(list python-cached-property
python-distro
- python-docker
+ python-docker-5
python-dockerpty
python-docopt
python-dotenv
python-jsonschema-3
- python-pyyaml-5
+ python-pyyaml
python-requests
python-six
python-texttable
diff --git a/gnu/packages/electronics.scm b/gnu/packages/electronics.scm
index a13ad2196a..05bee696b2 100644
--- a/gnu/packages/electronics.scm
+++ b/gnu/packages/electronics.scm
@@ -106,7 +106,7 @@ individual low-level driver modules.")
(home-page "https://www.comedi.org/")
(license license:lgpl2.1)))
-(define-public librnd
+(define librnd
(package
(name "librnd")
(version "4.3.2")
@@ -561,12 +561,12 @@ The following features are currently available:
(define-public opensta
;; There are no releases, we use last commit.
- (let ((commit "eb8d39a7dd81b5ca2582ad9bbce0fb6e094b3e0f")
+ (let ((commit "12f03395ec80d3593f4796b2a3cf5480e75735bd")
(revision "0"))
(package
(name "opensta")
;; The version string is taken from the CMakeLists.txt.
- (version (git-version "2.6.2" revision commit))
+ (version (git-version "2.7.0" revision commit))
(source
(origin
(method git-fetch)
@@ -575,20 +575,27 @@ The following features are currently available:
(commit commit)))
(file-name (git-file-name name version))
(sha256
- (base32 "0bpc7fj4pd5713yny2vrh542jbag1kj20g0ji01c9scqb9av5qw5"))))
+ (base32 "1gka50p4wv2b49d8jbw5fs3qg7cppa8ynl3diqgdf8mqgskwapzf"))))
(build-system cmake-build-system)
(arguments
(list
+ ;; Tests expect output sta binary inside source tree.
+ #:out-of-source? #f
#:phases
#~(modify-phases %standard-phases
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
- (invoke "../source/test/regression")))))
+ (invoke "../test/regression"))))
+ (add-before 'build 'create-build-dir
+ (lambda _
+ (mkdir-p "./build")
+ (chdir "./build"))))
#:configure-flags
#~(list
(string-append "-DCUDD_DIR=" #$(this-package-input "cudd"))
- (string-append "-DBUILD_SHARED_LIBS=YES"))))
+ (string-append "-DBUILD_SHARED_LIBS=YES")
+ "-B./build")))
(native-inputs (list bison flex swig))
(inputs (list cudd eigen tcl tcllib zlib))
(synopsis "Parallax Static Timing Analyzer")
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index 77383428b5..cba13fff86 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -3446,9 +3446,9 @@ models in the STL and OFF file formats.")
(license license:gpl2+))))
(define-public pythonscad
- (let ((commit "e2641ca1a208a9a54a034a8818a9774ad4d5867c")
+ (let ((commit "e1d49035b8dd4cac187a03f04dd9de9d61972cbf")
(version "0.0.0")
- (revision "0"))
+ (revision "1"))
(package
(inherit openscad)
(name "pythonscad")
@@ -3464,7 +3464,7 @@ models in the STL and OFF file formats.")
;; deleted in the patch-source build phase.
(recursive? #t)))
(sha256
- (base32 "1i6yajamdrha2kpgyhn7jn6dv35qmgq0zsqv8cdzdqg5142v66ay"))
+ (base32 "1q0ib5iz4l2vpi8208fghgwcfb0n7a0ypm1ch860dl0zd1p4zljz"))
(modules '((guix build utils)))
(snippet #~(begin
;; Delete all unbundled libraries to replace them with
@@ -3477,13 +3477,23 @@ models in the STL and OFF file formats.")
(file-name (git-file-name name version))))
(arguments
(substitute-keyword-arguments (package-arguments openscad)
- ((#:configure-flags flags
- '())
- #~(append #$flags
- (list "-DENABLE_LIBFIVE=ON" "-DUSE_BUILTIN_LIBFIVE=OFF"
- (string-append "-DPYTHON_VERSION="
- #$(version-major+minor
- (package-version python))))))
+ ((#:configure-flags flags)
+ #~(begin
+ (use-modules (srfi srfi-1))
+ (append
+ (remove (lambda (flag)
+ (or (string-prefix? "-DOPENSCAD_VERSION=" flag)
+ (string-prefix? "-DOPENSCAD_COMMIT=" flag)))
+ #$flags)
+ (list "-DENABLE_LIBFIVE=ON"
+ "-DUSE_BUILTIN_LIBFIVE=OFF"
+ (string-append "-DOPENSCAD_VERSION="
+ #$version)
+ (string-append "-DOPENSCAD_COMMIT="
+ #$commit)
+ (string-append "-DPYTHON_VERSION="
+ #$(version-major+minor
+ (package-version python)))))))
((#:phases phases)
#~(modify-phases #$phases
(replace 'patch-source
diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index f2177edfad..0ef4c206c9 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -777,7 +777,7 @@ blockchain.")
;; the system's dynamically linked library.
(package
(name "monero")
- (version "0.18.4.0")
+ (version "0.18.4.1")
(source
(origin
(method git-fetch)
@@ -795,7 +795,7 @@ blockchain.")
delete-file-recursively
'("external/miniupnp" "external/rapidjson"))))
(sha256
- (base32 "0dfb9yxpfijdjgl67dgmhgn4xd42rnwfn4nnp0dfakq34imv2cjh"))))
+ (base32 "0k4z01l8dvnazh650yarwn6ja1wrxcqq4g7302xw0dhw7h1qvy1j"))))
(build-system cmake-build-system)
(native-inputs
(list doxygen
@@ -882,7 +882,7 @@ the Monero command line client and daemon.")
(define-public monero-gui
(package
(name "monero-gui")
- (version "0.18.4.0")
+ (version "0.18.4.1")
(source
(origin
(method git-fetch)
@@ -898,7 +898,7 @@ the Monero command line client and daemon.")
;; See the 'extract-monero-sources' phase.
(delete-file-recursively "monero")))
(sha256
- (base32 "0gzq3cq54mr85f86yibsska19lri2w2ak98pb4z237dffgjqkaj5"))))
+ (base32 "1r2cfzh4lc94mb7fqa8f41613msnsyy5kz6mzcr4npjpm8bxqs8k"))))
(build-system qt-build-system)
(native-inputs
`(,@(package-native-inputs monero)
@@ -2595,7 +2595,7 @@ mining.")
(define-public p2pool
(package
(name "p2pool")
- (version "4.6")
+ (version "4.9")
(source
(origin
(method git-fetch)
@@ -2604,7 +2604,7 @@ mining.")
(commit (string-append "v" version))
(recursive? #t)))
(file-name (git-file-name name version))
- (sha256 (base32 "1qal9ilpyxds6nk2fgzfypk3y1qxh06f6lly3alawz385gf68fkv"))
+ (sha256 (base32 "0898a823mi38z6dwdm6crb2l98rv79sznmqwa0ss96xggvk12nlw"))
(modules '((guix build utils)))
(snippet
#~(for-each delete-file-recursively
@@ -2615,6 +2615,8 @@ mining.")
"external/src/rapidjson"
"external/src/robin-hood-hashing")))))
(build-system cmake-build-system)
+ (native-inputs
+ (list xz))
(inputs
(list cppzmq curl libuv rapidjson robin-hood-hashing zeromq))
(arguments
@@ -2629,8 +2631,9 @@ mining.")
(chdir "tests")
(invoke "cmake" "-DWITH_LTO=OFF" "../../source/tests")
(invoke "make" "-j" (number->string (parallel-job-count)))
- (invoke "gzip" "-d" "sidechain_dump.dat.gz")
- (invoke "gzip" "-d" "sidechain_dump_mini.dat.gz")
+ (invoke "xz" "-d" "sidechain_dump.dat.xz")
+ (invoke "xz" "-d" "sidechain_dump_mini.dat.xz")
+ (invoke "xz" "-d" "sidechain_dump_nano.dat.xz")
(invoke "./p2pool_tests")
(chdir ".."))))
(replace 'install
diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
index 4d60ff60d1..9ef6df8d80 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -1490,6 +1490,10 @@ It offers the following features:
(base32
"08ddhywdy2qg17m592ng3yr0p1ih96irg8wg729g75hsxxq9ipks"))))
(build-system gnu-build-system)
+ (arguments
+ `(#:configure-flags
+ ;; Disable added pointer type checks (quesoglc no longer maintained)
+ '("CFLAGS=-g -O2 -Wno-error=incompatible-pointer-types")))
(native-inputs (list pkg-config))
(inputs (list fontconfig freeglut fribidi glew))
(home-page "https://quesoglc.sourceforge.net")
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index 367440ccc7..ecb324d738 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -2079,7 +2079,7 @@ based on the Osmium library.")
(define-public osm2pgsql
(package
(name "osm2pgsql")
- (version "1.11.0")
+ (version "2.1.1")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -2088,7 +2088,7 @@ based on the Osmium library.")
(file-name (git-file-name name version))
(sha256
(base32
- "135vqahlcrhwa3b9hfgbiqkzbbsjd4i79fp41cd0rp4zarcpi47p"))
+ "1plaayi3mfwpsz48abjqnw4ymvqrwzlwhb44dwfpaz02qqqhvcg6"))
(modules '((guix build utils)))
(snippet
;; Remove bundled libraries.
@@ -2105,7 +2105,7 @@ based on the Osmium library.")
bzip2
cli11
expat
- fmt-8
+ fmt-11
libosmium
luajit
nlohmann-json
@@ -2860,14 +2860,14 @@ The API also works with MaxMind’s free GeoLite2 databases.")
(define-public routino
(package
(name "routino")
- (version "3.4.1")
+ (version "3.4.3")
(source (origin
(method url-fetch)
(uri (string-append "https://www.routino.org/download/routino-"
version ".tgz"))
(sha256
(base32
- "0aw5idqz7nv458llgwp5wcgikf34xcblpq46mq7msxfib0m8vahb"))))
+ "0m0yq665sdsiikbl0win564d841wb87prsfni8wajz6969yhdfjf"))))
(build-system gnu-build-system)
(native-inputs (list perl))
(inputs (list bzip2 xz zlib))
@@ -2925,7 +2925,7 @@ data.")
(define-public qmapshack
(package
(name "qmapshack")
- (version "1.17.1")
+ (version "1.18.0")
(source
(origin
(method git-fetch)
@@ -2934,36 +2934,34 @@ data.")
(commit (string-append "V_" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "1ckadklk67dp1pvkacfkr8379g2pwk73q85jfzm8viclcqmfvb62"))))
+ (base32 "04r2m7qwzqwgnwhi15999n0w7fmddjcmdv8mxm8c0flrjw8zmkpq"))))
(build-system qt-build-system)
(native-inputs
- (list pkg-config qttools-5))
+ (list pkg-config))
(inputs
- (list curl
- gdal
+ (list gdal
libjpeg-turbo
proj
- qtbase-5
- qtdeclarative-5
- qtlocation-5
- qtwebchannel-5
- qtwebengine-5
- quazip-5
- routino
- sqlite ; See wrap phase
- zlib))
+ qt5compat
+ qtpositioning
+ qttools
+ qtwebengine
+ quazip
+ routino))
(arguments
- `(#:tests? #f
+ (list
+ #:qtbase qtbase
+ #:tests? #f ;no tests
#:phases
- (modify-phases %standard-phases
+ #~(modify-phases %standard-phases
(add-after 'unpack 'fix-cmake-modules
- (lambda* (#:key inputs #:allow-other-keys)
+ (lambda _
(substitute* "CMakeLists.txt"
- (("find_package\\(Qt5PrintSupport REQUIRED\\)" all)
- (string-append all "\nfind_package(Qt5Positioning REQUIRED)")))
+ (("find_package\\(Qt6PrintSupport REQUIRED\\)" all)
+ (string-append all "\nfind_package(Qt6Positioning REQUIRED)")))
(substitute* "cmake/Modules/FindROUTINO.cmake"
(("/usr/local")
- (assoc-ref inputs "routino"))))))))
+ #$(this-package-input "routino"))))))))
(synopsis "GPS mapping application")
(description
"QMapShack can be used to plan your next outdoor trip or to visualize and
diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm
index de64f618f8..0d4b6f21e5 100644
--- a/gnu/packages/lisp-xyz.scm
+++ b/gnu/packages/lisp-xyz.scm
@@ -32972,7 +32972,7 @@ has a small codebase that's easy to understand and use.")
(define-public sbcl-wayflan
(package
(name "sbcl-wayflan")
- (version "0.0.4")
+ (version "0.1.0")
(source
(origin
(method git-fetch)
@@ -32981,7 +32981,7 @@ has a small codebase that's easy to understand and use.")
(commit (string-append "v" version))))
(file-name (git-file-name "cl-wayflan" version))
(sha256
- (base32 "0y6hzskp1vgaigzj5b3i695sc6dn5mk7nlxs21nh5ybzmf4chhyy"))))
+ (base32 "11n8w4fh996gspgcsfhbrcmz7az4yrx9a15jh6n72kswgjzq0s5j"))))
(build-system asdf-build-system/sbcl)
(native-inputs
(list sbcl-parachute))
diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm
index bf2ffd0f9b..3a7771a2e4 100644
--- a/gnu/packages/lisp.scm
+++ b/gnu/packages/lisp.scm
@@ -1703,7 +1703,7 @@ the HTML documentation of TXR.")
(define-public txr
(package
(name "txr")
- (version "300")
+ (version "302")
(source
(origin
(method git-fetch)
@@ -1712,7 +1712,7 @@ the HTML documentation of TXR.")
(commit (string-append "txr-" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "1cxdsk31wj8874nijwbcx7c3zsspsclr722jbaivisrm2wx5hbqn"))))
+ (base32 "01h09lbpgyzv64m8ycpr2vavdpdxhxdgvmc3p0jqrkvnrzhkdlhj"))))
(build-system gnu-build-system)
(arguments
(list #:configure-flags
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index dad9d4c4d5..7974a2f0b7 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -11399,7 +11399,7 @@ Mathics3.")
(setenv "PYTHONPATH" (getcwd))
(setenv "DJANGO_SETTINGS_MODULE" "mathics_django.settings")
(invoke "django-admin" "test"))))))
- (propagated-inputs (list python-django-4.2
+ (propagated-inputs (list python-django
python-mathics-scanner
python-mathics-core
python-networkx
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index df35fc8229..0eb23b2b84 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -2,7 +2,7 @@
;;; Copyright © 2014, 2015, 2016 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2014, 2017 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
-;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
+;;; Copyright © 2015, 2025 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2021, 2022, 2024, 2025 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015, 2018-2021, 2023 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2017 Nikita <nikita@n0.is>
@@ -400,20 +400,23 @@ conferencing.")
(define-public qxmpp
(package
(name "qxmpp")
- (version "1.4.0")
+ ;; kaidan requires a precise version
+ (version "1.10.3")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/qxmpp-project/qxmpp")
+ (url "https://invent.kde.org/libraries/qxmpp")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "1knpq1jkwk0lxdwczbmzf7qrjvlxba9yr40nbq9s5nqkcx6q1c3i"))))
- (build-system cmake-build-system)
+ (base32 "0qinrbr63b1baqv1a7cph8bma6kj1ib8s8ywq6d9497lc1yl2kgi"))))
+ (build-system qt-build-system)
(arguments
- `(#:configure-flags (list "-DBUILD_EXAMPLES=false"
- "-DWITH_GSTREAMER=true")
+ `(#:qtbase ,qtbase
+ #:configure-flags (list "-DBUILD_EXAMPLES=false"
+ "-DWITH_GSTREAMER=true"
+ "-DBUILD_OMEMO=ON") ;needed by kaidan
#:test-exclude
(string-join ;; These tests use the network.
(list "tst_qxmppiceconnection"
@@ -423,8 +426,12 @@ conferencing.")
(native-inputs
(list pkg-config))
(inputs
- (list gstreamer qtbase-5))
- (home-page "https://github.com/qxmpp-project/qxmpp")
+ (list
+ gstreamer
+ libomemo-c
+ qca-qt6
+ qt5compat))
+ (home-page "https://invent.kde.org/libraries/qxmpp")
(synopsis "XMPP client and server library")
(description
"QXmpp is a XMPP client and server library written in C++ and uses the Qt
@@ -1473,7 +1480,7 @@ default.")
(define-public kaidan
(package
(name "kaidan")
- (version "0.9.0")
+ (version "0.12.2")
(source (origin
(method url-fetch)
(uri (string-append "mirror://kde/unstable/kaidan/" version
@@ -1483,28 +1490,38 @@ default.")
#~(begin
(delete-file-recursively "3rdparty")))
(sha256
- (base32 "1waqv0fdkhvp3cqy2a2g6i2wc9s0zbvgzknymrwxy99mnx9ymw9g"))))
+ (base32 "0q8py100nmvyhm8pfnvpxmghbg445x2vgpw3c519bcrr4w7y6yl0"))))
(build-system qt-build-system)
(arguments
- (list #:configure-flags #~(list "-DBUILD_TESTS=true")))
+ (list
+ #:qtbase qtbase
+ #:configure-flags #~(list "-DBUILD_TESTS=true")
+ #:test-exclude "PublicGroupChatTest"
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'check 'set-home
+ (lambda _
+ ;; Tests need write permission in $HOME.
+ (setenv "HOME" "/tmp"))))))
(native-inputs (list extra-cmake-modules
- perl
- pkg-config
- python-wrapper))
- (inputs (list kirigami-5
- knotifications-5
- qtbase-5
- qtdeclarative-5
- qtgraphicaleffects
- qtlocation-5
- qtquickcontrols2-5
- qtsvg-5
- qtmultimedia-5
- qtxmlpatterns-5
+ pkg-config))
+ (inputs (list icu4c
+ kcrash
+ kdsingleapplication
+ kio
+ kirigami
+ kirigami-addons
+ knotifications
+ kquickimageeditor
+ prison
qqc2-desktop-style
+ qtlocation
+ qtmultimedia
+ qtpositioning
+ qtsvg
+ qttools
qxmpp
- sonnet
- zxing-cpp-1.2a))
+ sonnet))
(home-page "https://www.kaidan.im/")
(synopsis "Qt-based XMPP/Jabber Client")
(description "Kaidan is a chat client. It uses the open communication
diff --git a/gnu/packages/monitoring.scm b/gnu/packages/monitoring.scm
index 66b1a761d9..5f6d661587 100644
--- a/gnu/packages/monitoring.scm
+++ b/gnu/packages/monitoring.scm
@@ -519,7 +519,7 @@ and persisting them to disk using the Whisper time-series library.")
python-whisper))
(propagated-inputs
(list python-cairocffi
- python-django-4.2
+ python-django
python-django-tagging
python-pyparsing
python-pytz
diff --git a/gnu/packages/opencl.scm b/gnu/packages/opencl.scm
index 40fa5981fe..114e5315cf 100644
--- a/gnu/packages/opencl.scm
+++ b/gnu/packages/opencl.scm
@@ -78,26 +78,6 @@
(home-page "https://registry.khronos.org/OpenCL/")
(license license:asl2.0)))
-(define (make-opencl-headers major-version subversion)
- ;; The upstream OpenCL-Headers repository is no longer separating headers by
- ;; version; instead, you are supposed to #define CL_TARGET_OPENCL_VERSION.
- (deprecated-package (string-append "opencl-headers-"
- major-version "."
- subversion) opencl-headers))
-
-(define-public opencl-headers-2.2
- (make-opencl-headers "2" "2"))
-(define-public opencl-headers-2.1
- (make-opencl-headers "2" "1"))
-(define-public opencl-headers-2.0
- (make-opencl-headers "2" "0"))
-(define-public opencl-headers-1.2
- (make-opencl-headers "1" "2"))
-(define-public opencl-headers-1.1
- (make-opencl-headers "1" "1"))
-(define-public opencl-headers-1.0
- (make-opencl-headers "1" "0"))
-
(define-public opencl-clhpp
(package
(name "opencl-clhpp")
diff --git a/gnu/packages/patches/daemontools-gcc14.patch b/gnu/packages/patches/daemontools-gcc14.patch
new file mode 100644
index 0000000000..00b772bc3b
--- /dev/null
+++ b/gnu/packages/patches/daemontools-gcc14.patch
@@ -0,0 +1,561 @@
+Taken from Debian, see
+https://salsa.debian.org/debian/daemontools/-/blob/6b5584ccae6bd7c8cb6f47dd71062e3b1cd0a038/debian/patches/0005-fix-ftbfs.patch
+
+From: =?utf-8?b?SmFuIE1vasW+w63FoQ==?= <jan.mojzis@gmail.com>
+Date: Sat, 30 Mar 2024 10:15:13 +0100
+Subject: fix ftbfs
+
+Forwarded: no
+---
+ daemontools-0.76/src/chkshsgr.c | 3 ++-
+ daemontools-0.76/src/envdir.c | 2 +-
+ daemontools-0.76/src/envuidgid.c | 2 +-
+ daemontools-0.76/src/fghack.c | 6 ++++--
+ daemontools-0.76/src/matchtest.c | 1 +
+ daemontools-0.76/src/multilog.c | 3 ++-
+ daemontools-0.76/src/pathexec.h | 4 ++--
+ daemontools-0.76/src/pathexec_env.c | 6 +++---
+ daemontools-0.76/src/pathexec_run.c | 3 ++-
+ daemontools-0.76/src/pgrphack.c | 2 +-
+ daemontools-0.76/src/prot.c | 4 +++-
+ daemontools-0.76/src/seek_set.c | 1 +
+ daemontools-0.76/src/setlock.c | 2 +-
+ daemontools-0.76/src/setuidgid.c | 2 +-
+ daemontools-0.76/src/sgetopt.c | 2 +-
+ daemontools-0.76/src/sgetopt.h | 2 +-
+ daemontools-0.76/src/softlimit.c | 2 +-
+ daemontools-0.76/src/subgetopt.c | 2 +-
+ daemontools-0.76/src/subgetopt.h | 2 +-
+ daemontools-0.76/src/supervise.c | 6 ++++--
+ daemontools-0.76/src/svc.c | 2 +-
+ daemontools-0.76/src/svscan.c | 2 +-
+ daemontools-0.76/src/trycpp.c | 3 +++
+ daemontools-0.76/src/tryflock.c | 2 +-
+ daemontools-0.76/src/trypoll.c | 1 +
+ daemontools-0.76/src/trysgact.c | 2 +-
+ daemontools-0.76/src/trysgprm.c | 2 +-
+ daemontools-0.76/src/tryshsgr.c | 13 ++++++++-----
+ daemontools-0.76/src/tryulong64.c | 5 ++++-
+ daemontools-0.76/src/trywaitp.c | 2 +-
+ daemontools-0.76/src/uint64.h1 | 2 +-
+ daemontools-0.76/src/uint64.h2 | 5 +++--
+ daemontools-0.76/src/x86cpuid.c | 2 ++
+ 33 files changed, 62 insertions(+), 38 deletions(-)
+
+diff --git a/daemontools-0.76/src/chkshsgr.c b/daemontools-0.76/src/chkshsgr.c
+index 38c352d..470f565 100644
+--- a/daemontools-0.76/src/chkshsgr.c
++++ b/daemontools-0.76/src/chkshsgr.c
+@@ -1,12 +1,13 @@
+ /* Public domain. */
+
+ #include <unistd.h>
++#include <grp.h>
+
+ int main()
+ {
+ short x[4];
+
+ x[0] = x[1] = 0;
+- if (getgroups(1,x) == 0) if (setgroups(1,x) == -1) _exit(1);
++ if (getgroups(1,(gid_t *)x) == 0) if (setgroups(1,(gid_t *)x) == -1) _exit(1);
+ _exit(0);
+ }
+diff --git a/daemontools-0.76/src/envdir.c b/daemontools-0.76/src/envdir.c
+index beb1b1f..d02bc63 100644
+--- a/daemontools-0.76/src/envdir.c
++++ b/daemontools-0.76/src/envdir.c
+@@ -21,7 +21,7 @@ void nomem(void)
+
+ static stralloc sa;
+
+-int main(int argc,const char *const *argv)
++int main(int argc,char **argv)
+ {
+ int fdorigdir;
+ const char *fn;
+diff --git a/daemontools-0.76/src/envuidgid.c b/daemontools-0.76/src/envuidgid.c
+index 294960a..f097db1 100644
+--- a/daemontools-0.76/src/envuidgid.c
++++ b/daemontools-0.76/src/envuidgid.c
+@@ -15,7 +15,7 @@ char strnum[FMT_ULONG];
+ const char *account;
+ struct passwd *pw;
+
+-int main(int argc,const char *const *argv)
++int main(int argc,char **argv)
+ {
+ account = *++argv;
+ if (!account || !*++argv)
+diff --git a/daemontools-0.76/src/fghack.c b/daemontools-0.76/src/fghack.c
+index 34ca1db..262876a 100644
+--- a/daemontools-0.76/src/fghack.c
++++ b/daemontools-0.76/src/fghack.c
+@@ -9,12 +9,13 @@
+
+ int pid;
+
+-int main(int argc,const char * const *argv,const char * const *envp)
++int main(int argc,char **argv,char **envp)
+ {
+ char ch;
+ int wstat;
+ int pi[2];
+ int i;
++ int dummy;
+
+ if (!argv[1])
+ strerr_die1x(100,"fghack: usage: fghack child");
+@@ -28,7 +29,8 @@ int main(int argc,const char * const *argv,const char * const *envp)
+ case 0:
+ close(pi[0]);
+ for (i = 0;i < 30;++i)
+- dup(pi[1]);
++ dummy = dup(pi[1]);
++ (void) dummy;
+ pathexec_run(argv[1],argv + 1,envp);
+ strerr_die4sys(111,FATAL,"unable to run ",argv[1],": ");
+ }
+diff --git a/daemontools-0.76/src/matchtest.c b/daemontools-0.76/src/matchtest.c
+index 980dd1c..1bd4bbc 100644
+--- a/daemontools-0.76/src/matchtest.c
++++ b/daemontools-0.76/src/matchtest.c
+@@ -1,3 +1,4 @@
++#include <unistd.h>
+ #include "match.h"
+ #include "buffer.h"
+ #include "str.h"
+diff --git a/daemontools-0.76/src/multilog.c b/daemontools-0.76/src/multilog.c
+index be27a6a..ea02909 100644
+--- a/daemontools-0.76/src/multilog.c
++++ b/daemontools-0.76/src/multilog.c
+@@ -1,6 +1,7 @@
+ #include <unistd.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#include <stdio.h>
+ #include "direntry.h"
+ #include "alloc.h"
+ #include "buffer.h"
+@@ -172,7 +173,7 @@ void finish(struct cyclog *d,const char *file,const char *code)
+
+ void startprocessor(struct cyclog *d)
+ {
+- const char *args[4];
++ char *args[4];
+ int fd;
+
+ sig_uncatch(sig_term);
+diff --git a/daemontools-0.76/src/pathexec.h b/daemontools-0.76/src/pathexec.h
+index 61da922..f984f77 100644
+--- a/daemontools-0.76/src/pathexec.h
++++ b/daemontools-0.76/src/pathexec.h
+@@ -3,8 +3,8 @@
+ #ifndef PATHEXEC_H
+ #define PATHEXEC_H
+
+-extern void pathexec_run(const char *,const char * const *,const char * const *);
++extern void pathexec_run(const char *,char **,char **);
+ extern int pathexec_env(const char *,const char *);
+-extern void pathexec(const char * const *);
++extern void pathexec(char **);
+
+ #endif
+diff --git a/daemontools-0.76/src/pathexec_env.c b/daemontools-0.76/src/pathexec_env.c
+index 2cb101c..a1404ad 100644
+--- a/daemontools-0.76/src/pathexec_env.c
++++ b/daemontools-0.76/src/pathexec_env.c
+@@ -22,9 +22,9 @@ int pathexec_env(const char *s,const char *t)
+ return stralloc_cat(&plus,&tmp);
+ }
+
+-void pathexec(const char *const *argv)
++void pathexec(char **argv)
+ {
+- const char **e;
++ char **e;
+ unsigned int elen;
+ unsigned int i;
+ unsigned int j;
+@@ -40,7 +40,7 @@ void pathexec(const char *const *argv)
+ if (!plus.s[i])
+ ++elen;
+
+- e = (const char **) alloc((elen + 1) * sizeof(char *));
++ e = (char **) alloc((elen + 1) * sizeof(char *));
+ if (!e) return;
+
+ elen = 0;
+diff --git a/daemontools-0.76/src/pathexec_run.c b/daemontools-0.76/src/pathexec_run.c
+index 1770ac7..7929144 100644
+--- a/daemontools-0.76/src/pathexec_run.c
++++ b/daemontools-0.76/src/pathexec_run.c
+@@ -1,5 +1,6 @@
+ /* Public domain. */
+
++#include <unistd.h>
+ #include "error.h"
+ #include "stralloc.h"
+ #include "str.h"
+@@ -8,7 +9,7 @@
+
+ static stralloc tmp;
+
+-void pathexec_run(const char *file,const char * const *argv,const char * const *envp)
++void pathexec_run(const char *file,char **argv,char **envp)
+ {
+ const char *path;
+ unsigned int split;
+diff --git a/daemontools-0.76/src/pgrphack.c b/daemontools-0.76/src/pgrphack.c
+index 9aa10dc..6b06a84 100644
+--- a/daemontools-0.76/src/pgrphack.c
++++ b/daemontools-0.76/src/pgrphack.c
+@@ -4,7 +4,7 @@
+
+ #define FATAL "pgrphack: fatal: "
+
+-int main(int argc,const char * const *argv,const char * const *envp)
++int main(int argc,char **argv,char **envp)
+ {
+ if (!argv[1]) strerr_die1x(100,"pgrphack: usage: pgrphack child");
+ setsid(); /* shouldn't fail; if it does, too bad */
+diff --git a/daemontools-0.76/src/prot.c b/daemontools-0.76/src/prot.c
+index 79a88c5..45af0ef 100644
+--- a/daemontools-0.76/src/prot.c
++++ b/daemontools-0.76/src/prot.c
+@@ -1,5 +1,7 @@
+ /* Public domain. */
+
++#include <unistd.h>
++#include <grp.h>
+ #include "hasshsgr.h"
+ #include "prot.h"
+
+@@ -8,7 +10,7 @@ int prot_gid(int gid)
+ #ifdef HASSHORTSETGROUPS
+ short x[2];
+ x[0] = gid; x[1] = 73; /* catch errors */
+- if (setgroups(1,x) == -1) return -1;
++ if (setgroups(1,(gid_t *)x) == -1) return -1;
+ #else
+ if (setgroups(1,&gid) == -1) return -1;
+ #endif
+diff --git a/daemontools-0.76/src/seek_set.c b/daemontools-0.76/src/seek_set.c
+index 19b8265..5299201 100644
+--- a/daemontools-0.76/src/seek_set.c
++++ b/daemontools-0.76/src/seek_set.c
+@@ -1,5 +1,6 @@
+ /* Public domain. */
+
++#include <unistd.h>
+ #include <sys/types.h>
+ #include "seek.h"
+
+diff --git a/daemontools-0.76/src/setlock.c b/daemontools-0.76/src/setlock.c
+index eec2192..d900540 100644
+--- a/daemontools-0.76/src/setlock.c
++++ b/daemontools-0.76/src/setlock.c
+@@ -14,7 +14,7 @@ void usage() {
+ int flagndelay = 0;
+ int flagx = 0;
+
+-int main(int argc,const char *const *argv,const char *const *envp)
++int main(int argc,char **argv,char **envp)
+ {
+ int opt;
+ int fd;
+diff --git a/daemontools-0.76/src/setuidgid.c b/daemontools-0.76/src/setuidgid.c
+index 8c683de..90485e9 100644
+--- a/daemontools-0.76/src/setuidgid.c
++++ b/daemontools-0.76/src/setuidgid.c
+@@ -9,7 +9,7 @@
+ const char *account;
+ struct passwd *pw;
+
+-int main(int argc,const char *const *argv,const char *const *envp)
++int main(int argc,char **argv,char **envp)
+ {
+ account = *++argv;
+ if (!account || !*++argv)
+diff --git a/daemontools-0.76/src/sgetopt.c b/daemontools-0.76/src/sgetopt.c
+index 8bb608f..1d6d9f4 100644
+--- a/daemontools-0.76/src/sgetopt.c
++++ b/daemontools-0.76/src/sgetopt.c
+@@ -27,7 +27,7 @@ Documentation in sgetopt.3.
+ int opterr = 1;
+ const char *optprogname = 0;
+
+-int getopt(int argc,const char *const *argv,const char *opts)
++int getopt(int argc,char **argv,const char *opts)
+ {
+ int c;
+ const char *s;
+diff --git a/daemontools-0.76/src/sgetopt.h b/daemontools-0.76/src/sgetopt.h
+index bf8bce6..6a6e111 100644
+--- a/daemontools-0.76/src/sgetopt.h
++++ b/daemontools-0.76/src/sgetopt.h
+@@ -16,7 +16,7 @@
+
+ #include "subgetopt.h"
+
+-extern int sgetoptmine(int,const char *const *,const char *);
++extern int sgetoptmine(int,char **,const char *);
+ extern int sgetopterr;
+ extern const char *sgetoptprogname;
+
+diff --git a/daemontools-0.76/src/softlimit.c b/daemontools-0.76/src/softlimit.c
+index 8be40b8..4d9f81e 100644
+--- a/daemontools-0.76/src/softlimit.c
++++ b/daemontools-0.76/src/softlimit.c
+@@ -36,7 +36,7 @@ void doit(int resource,const char *arg)
+ strerr_die2sys(111,FATAL,"setrlimit failed: ");
+ }
+
+-int main(int argc,const char *const *argv,const char *const *envp)
++int main(int argc,char **argv,char **envp)
+ {
+ int opt;
+
+diff --git a/daemontools-0.76/src/subgetopt.c b/daemontools-0.76/src/subgetopt.c
+index 266e72a..bbbbb6c 100644
+--- a/daemontools-0.76/src/subgetopt.c
++++ b/daemontools-0.76/src/subgetopt.c
+@@ -16,7 +16,7 @@ const char *optarg = 0;
+ int optproblem = 0;
+ int optdone = SUBGETOPTDONE;
+
+-int sgopt(int argc,const char *const *argv,const char *opts)
++int sgopt(int argc,char **argv,const char *opts)
+ {
+ int c;
+ const char *s;
+diff --git a/daemontools-0.76/src/subgetopt.h b/daemontools-0.76/src/subgetopt.h
+index 41ad26a..7e5636e 100644
+--- a/daemontools-0.76/src/subgetopt.h
++++ b/daemontools-0.76/src/subgetopt.h
+@@ -15,7 +15,7 @@
+
+ #define SUBGETOPTDONE -1
+
+-extern int subgetopt(int,const char *const *,const char *);
++extern int subgetopt(int,char **,const char *);
+ extern const char *subgetoptarg;
+ extern int subgetoptind;
+ extern int subgetoptpos;
+diff --git a/daemontools-0.76/src/supervise.c b/daemontools-0.76/src/supervise.c
+index 483e9a2..3a27f42 100644
+--- a/daemontools-0.76/src/supervise.c
++++ b/daemontools-0.76/src/supervise.c
+@@ -2,6 +2,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <signal.h>
++#include <stdio.h>
+ #include "sig.h"
+ #include "strerr.h"
+ #include "error.h"
+@@ -81,10 +82,11 @@ void announce(void)
+
+ void trigger(void)
+ {
+- write(selfpipe[1],"",1);
++ int dummy = write(selfpipe[1],"",1);
++ (void) dummy;
+ }
+
+-const char *run[2] = { "./run", 0 };
++char *run[2] = { "./run", 0 };
+
+ int flagfailed = 0;
+
+diff --git a/daemontools-0.76/src/svc.c b/daemontools-0.76/src/svc.c
+index 08e9a5c..aae2d9d 100644
+--- a/daemontools-0.76/src/svc.c
++++ b/daemontools-0.76/src/svc.c
+@@ -19,7 +19,7 @@ char bspace[1];
+
+ int fdorigdir;
+
+-int main(int argc,const char *const *argv)
++int main(int argc,char **argv)
+ {
+ int opt;
+ int fd;
+diff --git a/daemontools-0.76/src/svscan.c b/daemontools-0.76/src/svscan.c
+index 15a8c89..39b8887 100644
+--- a/daemontools-0.76/src/svscan.c
++++ b/daemontools-0.76/src/svscan.c
+@@ -36,7 +36,7 @@ void start(char *fn)
+ struct stat st;
+ int child;
+ int i;
+- const char *args[3];
++ char *args[3];
+
+ if (fn[0] == '.') return;
+
+diff --git a/daemontools-0.76/src/trycpp.c b/daemontools-0.76/src/trycpp.c
+index e4503d4..70bc8d6 100644
+--- a/daemontools-0.76/src/trycpp.c
++++ b/daemontools-0.76/src/trycpp.c
+@@ -1,5 +1,8 @@
+ /* Public domain. */
+
++#include <stdio.h>
++#include <stdlib.h>
++
+ int main()
+ {
+ #ifdef NeXT
+diff --git a/daemontools-0.76/src/tryflock.c b/daemontools-0.76/src/tryflock.c
+index a82ffc2..68599d3 100644
+--- a/daemontools-0.76/src/tryflock.c
++++ b/daemontools-0.76/src/tryflock.c
+@@ -4,7 +4,7 @@
+ #include <sys/file.h>
+ #include <fcntl.h>
+
+-main()
++int main()
+ {
+ flock(0,LOCK_EX | LOCK_UN | LOCK_NB);
+ }
+diff --git a/daemontools-0.76/src/trypoll.c b/daemontools-0.76/src/trypoll.c
+index 6506617..a7b26df 100644
+--- a/daemontools-0.76/src/trypoll.c
++++ b/daemontools-0.76/src/trypoll.c
+@@ -3,6 +3,7 @@
+ #include <sys/types.h>
+ #include <fcntl.h>
+ #include <poll.h>
++#include <unistd.h>
+
+ int main()
+ {
+diff --git a/daemontools-0.76/src/trysgact.c b/daemontools-0.76/src/trysgact.c
+index e264ef2..841b88a 100644
+--- a/daemontools-0.76/src/trysgact.c
++++ b/daemontools-0.76/src/trysgact.c
+@@ -2,7 +2,7 @@
+
+ #include <signal.h>
+
+-main()
++int main()
+ {
+ struct sigaction sa;
+ sa.sa_handler = 0;
+diff --git a/daemontools-0.76/src/trysgprm.c b/daemontools-0.76/src/trysgprm.c
+index a46c82c..3e78a82 100644
+--- a/daemontools-0.76/src/trysgprm.c
++++ b/daemontools-0.76/src/trysgprm.c
+@@ -2,7 +2,7 @@
+
+ #include <signal.h>
+
+-main()
++int main()
+ {
+ sigset_t ss;
+
+diff --git a/daemontools-0.76/src/tryshsgr.c b/daemontools-0.76/src/tryshsgr.c
+index c5ed6d6..ba298a7 100644
+--- a/daemontools-0.76/src/tryshsgr.c
++++ b/daemontools-0.76/src/tryshsgr.c
+@@ -1,16 +1,19 @@
+ /* Public domain. */
+
++#include <unistd.h>
++#include <grp.h>
++
+ int main()
+ {
+ short x[4];
+-
++
+ x[0] = x[1] = 1;
+- if (getgroups(1,x) == 0) if (setgroups(1,x) == -1) _exit(1);
+-
+- if (getgroups(1,x) == -1) _exit(1);
++ if (getgroups(1,(gid_t *)x) == 0) if (setgroups(1,(gid_t *)x) == -1) _exit(1);
++
++ if (getgroups(1,(gid_t *)x) == -1) _exit(1);
+ if (x[1] != 1) _exit(1);
+ x[1] = 2;
+- if (getgroups(1,x) == -1) _exit(1);
++ if (getgroups(1,(gid_t *)x) == -1) _exit(1);
+ if (x[1] != 2) _exit(1);
+ _exit(0);
+ }
+diff --git a/daemontools-0.76/src/tryulong64.c b/daemontools-0.76/src/tryulong64.c
+index 003548a..f3b111d 100644
+--- a/daemontools-0.76/src/tryulong64.c
++++ b/daemontools-0.76/src/tryulong64.c
+@@ -1,8 +1,11 @@
+ /* Public domain. */
+
++#include <unistd.h>
++#include <stdint.h>
++
+ int main()
+ {
+- unsigned long u;
++ uint64_t u;
+ u = 1;
+ u += u; u += u; u += u; u += u; u += u; u += u; u += u; u += u;
+ u += u; u += u; u += u; u += u; u += u; u += u; u += u; u += u;
+diff --git a/daemontools-0.76/src/trywaitp.c b/daemontools-0.76/src/trywaitp.c
+index 319b81f..76b3329 100644
+--- a/daemontools-0.76/src/trywaitp.c
++++ b/daemontools-0.76/src/trywaitp.c
+@@ -3,7 +3,7 @@
+ #include <sys/types.h>
+ #include <sys/wait.h>
+
+-main()
++int main()
+ {
+ waitpid(0,0,0);
+ }
+diff --git a/daemontools-0.76/src/uint64.h1 b/daemontools-0.76/src/uint64.h1
+index 486a380..fde25ca 100644
+--- a/daemontools-0.76/src/uint64.h1
++++ b/daemontools-0.76/src/uint64.h1
+@@ -3,7 +3,7 @@
+ #ifndef UINT64_H
+ #define UINT64_H
+
+-/* sysdep: -ulong64 */
++/* sysdep: -uint64_t */
+
+ typedef unsigned long long uint64;
+
+diff --git a/daemontools-0.76/src/uint64.h2 b/daemontools-0.76/src/uint64.h2
+index 8869e43..fd134f2 100644
+--- a/daemontools-0.76/src/uint64.h2
++++ b/daemontools-0.76/src/uint64.h2
+@@ -3,8 +3,9 @@
+ #ifndef UINT64_H
+ #define UINT64_H
+
+-/* sysdep: +ulong64 */
++/* sysdep: +uint64_t */
+
+-typedef unsigned long uint64;
++#include <stdint.h>
++typedef uint64_t uint64;
+
+ #endif
+diff --git a/daemontools-0.76/src/x86cpuid.c b/daemontools-0.76/src/x86cpuid.c
+index f81c593..122eed1 100644
+--- a/daemontools-0.76/src/x86cpuid.c
++++ b/daemontools-0.76/src/x86cpuid.c
+@@ -1,6 +1,8 @@
+ /* Public domain. */
+
+ #include <signal.h>
++#include <stdlib.h>
++#include <stdio.h>
+
+ void nope()
+ {
diff --git a/gnu/packages/pretty-print.scm b/gnu/packages/pretty-print.scm
index 1406ed90a9..36cf137383 100644
--- a/gnu/packages/pretty-print.scm
+++ b/gnu/packages/pretty-print.scm
@@ -300,21 +300,9 @@ a fast alternative to @code{IOStreams}.")
(sha256
(base32 "0p8f82ijqa57sk72hjf0qviv1wwinmns0p87wiv2v8fvisnqnxr3"))))))
-(define-public fmt-7
- (package
- (inherit fmt-8)
- (version "7.1.3")
- (source
- (origin
- (method url-fetch)
- (uri (string-append "https://github.com/fmtlib/fmt/releases/download/"
- version "/fmt-" version ".zip"))
- (sha256
- (base32 "17sc10hfg087z0s774lnn05wwy3bfzmcv7j448p92pr0s02cb62x"))))))
-
(define-public fmt-6
(package
- (inherit fmt-7)
+ (inherit fmt-8)
(version "6.1.2")
(source
(origin
diff --git a/gnu/packages/prolog.scm b/gnu/packages/prolog.scm
index 5189299aad..d629754af3 100644
--- a/gnu/packages/prolog.scm
+++ b/gnu/packages/prolog.scm
@@ -185,7 +185,7 @@ it.")
(define-public trealla
(package
(name "trealla")
- (version "2.80.13")
+ (version "2.81.3")
(source
(origin
(method git-fetch)
@@ -194,7 +194,7 @@ it.")
(url "https://github.com/trealla-prolog/trealla")
(commit (string-append "v" version))))
(sha256
- (base32 "1fj1xlg4b1cfwdmmac1cihs2rihjbmd2fg9gnb1qllzhrsyvzkbr"))
+ (base32 "0y92d80r3w2cvgkc1yz7c126bgycqj8xy8jnnvirbf6qdmr78h5d"))
(file-name (git-file-name name version))))
(build-system gnu-build-system)
(native-inputs
diff --git a/gnu/packages/ruby-xyz.scm b/gnu/packages/ruby-xyz.scm
index 80bf94a365..13539b5364 100644
--- a/gnu/packages/ruby-xyz.scm
+++ b/gnu/packages/ruby-xyz.scm
@@ -11644,7 +11644,7 @@ part of the Prawn PDF generator.")
(define-public ruby-puma
(package
(name "ruby-puma")
- (version "6.6.0")
+ (version "6.6.1")
(source
(origin
(method git-fetch) ;for tests
@@ -11654,7 +11654,7 @@ part of the Prawn PDF generator.")
(file-name (git-file-name name version))
(sha256
(base32
- "1pdd7s403pi4y75s1sb4jkghhmm2w9zcqifj7z7yx4z0qfs7lvzv"))))
+ "0wppz08pfwz1ypidjiz199i5jl2qvb9ppg0sdvf0kc7azpx5mphl"))))
(build-system ruby-build-system)
(arguments
(list
@@ -14049,37 +14049,30 @@ common interface over different adapters.")
(define-public ruby-nio4r
(package
(name "ruby-nio4r")
- (version "2.5.2")
+ (version "2.7.4")
(source
(origin
- (method url-fetch)
- (uri (rubygems-uri "nio4r" version))
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/socketry/nio4r")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
(sha256
(base32
- "0gnmvbryr521r135yz5bv8354m7xn6miiapfgpg1bnwsvxz8xj6c"))))
+ "1planm0yrzgkjqvxbfrcp477k030f1cyplpf8g1p7dppgzk2iqqm"))))
(build-system ruby-build-system)
(arguments
- '(#:phases
+ '(#:test-target "spec"
+ #:phases
(modify-phases %standard-phases
- (add-after 'unpack 'remove-unnecessary-dependencies
+ (add-after 'extract-gemspec 'delete-certificate
(lambda _
- (substitute* "spec/spec_helper.rb"
- ;; Coveralls is for uploading test coverage information to an
- ;; online service, and thus unnecessary for building the Guix
- ;; package
- (("require \"coveralls\"") "")
- (("Coveralls\\.wear!") "")
- ;; Remove rspec/retry as we are not retrying the tests
- (("require \"rspec/retry\"") "")
- (("config\\.display_try_failure_messages = true") "")
- (("config\\.verbose_retry = true") ""))))
+ (substitute* "nio4r.gemspec"
+ (("spec.cert_chain = .*") "")
+ (("spec.signing_key = .*") ""))))
(add-before 'check 'compile
(lambda _
- (invoke "rake" "compile")))
- (replace 'check
- (lambda* (#:key tests? #:allow-other-keys)
- (when tests?
- (invoke "rspec")))))))
+ (invoke "rake" "compile"))))))
(native-inputs
(list bundler ruby-rake-compiler ruby-rspec ruby-rubocop))
(synopsis "New I/O for Ruby")
diff --git a/gnu/packages/task-management.scm b/gnu/packages/task-management.scm
index 047145dd63..0a978f9c9f 100644
--- a/gnu/packages/task-management.scm
+++ b/gnu/packages/task-management.scm
@@ -414,34 +414,34 @@ a task.")
(define-public blanket
(package
(name "blanket")
- (version "0.5.0")
+ (version "0.8.0")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/rafaelmardojai/blanket/")
- (commit version)))
+ (url "https://github.com/rafaelmardojai/blanket/")
+ (commit version)))
(file-name (git-file-name name version))
(sha256
- (base32 "00i821zqfbigxmc709322r16z75qsw4rg23yhv35gza9sl65bzkg"))))
+ (base32 "1inqb8z2vbmfybcrqbla76sny7cg2qz932agynqj4pn9a3zwnw9f"))))
(build-system meson-build-system)
(arguments
- `(#:glib-or-gtk? #t
- #:tests? #f ;the "Validate appstream file" test fails
- #:phases
- (modify-phases %standard-phases
- (add-after 'wrap 'wrap-libs
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (gi-typelib-path (getenv "GI_TYPELIB_PATH"))
+ (list
+ #:glib-or-gtk? #t
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'glib-or-gtk-wrap 'wrap-libs
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((gi-typelib-path (getenv "GI_TYPELIB_PATH"))
(gst-plugin-path (getenv "GST_PLUGIN_SYSTEM_PATH"))
(python-path (getenv "GUIX_PYTHONPATH")))
- (wrap-program (string-append out "/bin/blanket")
- `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))
- `("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,gst-plugin-path))
- `("GUIX_PYTHONPATH" ":" prefix (,python-path)))))))))
+ (wrap-program (search-input-file outputs "/bin/blanket")
+ `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))
+ `("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,gst-plugin-path))
+ `("GUIX_PYTHONPATH" ":" prefix (,python-path)))))))))
(native-inputs
- (list desktop-file-utils
+ (list blueprint-compiler
+ desktop-file-utils
gettext-minimal
`(,glib "bin")
gobject-introspection
@@ -453,8 +453,9 @@ a task.")
gsettings-desktop-schemas
gst-plugins-bad
gst-plugins-good ;for ScaleTempo plugin
- gtk+
+ gtk
libhandy
+ libadwaita
python
python-gst
python-pygobject))
diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index dc2f0b0db1..545b20d477 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -2553,7 +2553,7 @@ compository, supporting the following features:
(define-public waybar
(package
(name "waybar")
- (version "0.13.0")
+ (version "0.14.0")
(source
(origin
(method git-fetch)
@@ -2562,7 +2562,7 @@ compository, supporting the following features:
(commit version)))
(file-name (git-file-name name version))
(sha256
- (base32 "0bdwdyxgrfv1ffabf1n4wqq1wz20qig9j9w0k76nhzw979ha7x99"))))
+ (base32 "1b1783382y38mzzrzw53p20lwpfs0n2npqbs91j9ddgg6xk82s4q"))))
(build-system meson-build-system)
(arguments
(list #:configure-flags #~(list "--wrap-mode=nodownload")))
generated by cgit v1.2.3 (git 2.50.1) at 2025-08-09 22:44:27 +0000