summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gnu/packages/django.scm20
-rw-r--r--gnu/packages/electronics.scm2
-rw-r--r--gnu/packages/geo.scm6
-rw-r--r--gnu/packages/lisp-xyz.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/pretty-print.scm14
-rw-r--r--gnu/packages/prolog.scm4
-rw-r--r--gnu/packages/ruby-xyz.scm39
11 files changed, 72 insertions, 112 deletions
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/electronics.scm b/gnu/packages/electronics.scm
index 995e625d17..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")
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index 367440ccc7..03533e5a3c 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
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/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/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..14267ef290 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.1")
(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 "1magrvdjmjf65mnm1zrmzi6wrdb7c11s60iazrvk57ayx4n7lvaa"))
(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")
generated by cgit v1.2.3 (git 2.50.1) at 2025-08-08 23:27:49 +0000