summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-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/engineering.scm30
-rw-r--r--gnu/packages/finance.scm19
-rw-r--r--gnu/packages/game-development.scm4
-rw-r--r--gnu/packages/geo.scm42
-rw-r--r--gnu/packages/lisp.scm4
-rw-r--r--gnu/packages/maths.scm2
-rw-r--r--gnu/packages/messaging.scm3
-rw-r--r--gnu/packages/monitoring.scm2
-rw-r--r--gnu/packages/prolog.scm4
-rw-r--r--gnu/packages/task-management.scm37
-rw-r--r--gnu/packages/wm.scm4
14 files changed, 127 insertions, 91 deletions
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/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 03533e5a3c..ecb324d738 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -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.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 ada3b63d82..0eb23b2b84 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -1520,7 +1520,8 @@ default.")
qtpositioning
qtsvg
qttools
- qxmpp))
+ qxmpp
+ 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/prolog.scm b/gnu/packages/prolog.scm
index 14267ef290..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.81.1")
+ (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 "1magrvdjmjf65mnm1zrmzi6wrdb7c11s60iazrvk57ayx4n7lvaa"))
+ (base32 "0y92d80r3w2cvgkc1yz7c126bgycqj8xy8jnnvirbf6qdmr78h5d"))
(file-name (git-file-name name version))))
(build-system gnu-build-system)
(native-inputs
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-10 03:50:38 +0000