guix_mirror_bot pushed a commit to branch python-team
in repository guix.
commit d696d2a568be9ad61688a5a32ad000105491e582
Author: Nicolas Graves <[email protected]>
AuthorDate: Sat Jan 17 00:22:33 2026 +0100
build-system/cargo: Remove uneeded use of cargo-guile-json.
* gnu/packages/antivirus.scm (clamav)
* gnu/packages/freedesktop.scm (waypipe)
* gnu/packages/gnome.scm (librsvg)
* gnu/packages/kde-pim.scm (kdepim-addons)
* gnu/packages/language.scm (libchewing)
* gnu/packages/rust-apps.scm (helvum)
* gnu/packages/shells.scm (fish):
[arguments]<#:phases>: Remove uneeded use of cargo-guile-json
extension.
Change-Id: I041819515585777a3d63945b755d71e607fa0650
Signed-off-by: Sharlatan Hellseher <[email protected]>
---
gnu/packages/antivirus.scm | 3 +--
gnu/packages/freedesktop.scm | 19 +++++++++----------
gnu/packages/gnome.scm | 6 ++----
gnu/packages/kde-pim.scm | 3 +--
gnu/packages/language.scm | 3 +--
gnu/packages/rust-apps.scm | 3 +--
gnu/packages/shells.scm | 3 +--
7 files changed, 16 insertions(+), 24 deletions(-)
diff --git a/gnu/packages/antivirus.scm b/gnu/packages/antivirus.scm
index 5a6625e208..bc3a472809 100644
--- a/gnu/packages/antivirus.scm
+++ b/gnu/packages/antivirus.scm
@@ -83,7 +83,6 @@
(guix build cmake-build-system)
(guix build utils))
#:phases
- (with-extensions (list (cargo-guile-json))
#~(modify-phases %standard-phases
(add-after 'unpack 'prepare-cargo-build-system
(lambda args
@@ -112,7 +111,7 @@
(substitute* "unit_tests/CMakeLists.txt"
(("clamd_test\\.py" test)
(string-append
- test " -k \"not test_clamd_08_VirusEvent\""))))))))))
+ test " -k \"not test_clamd_08_VirusEvent\"")))))))))
(native-inputs
(append
(list pkg-config
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 1f5f30a98f..643c5eefd6 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -3530,25 +3530,24 @@ notifies the user using any notification daemon
implementing
(guix build meson-build-system)
(guix build utils))
#:phases
- (with-extensions (list (cargo-guile-json))
- #~(modify-phases %standard-phases
+ #~(modify-phases %standard-phases
(add-after 'unpack 'prepare-cargo-build-system
(lambda args
(for-each
- (lambda (phase)
- (apply (assoc-ref cargo:%standard-phases phase)
- #:cargo-target #$(cargo-triplet) args))
- '(unpack-rust-crates
- configure
- check-for-pregenerated-files
- patch-cargo-checksums))))
+ (lambda (phase)
+ (apply (assoc-ref cargo:%standard-phases phase)
+ #:cargo-target #$(cargo-triplet) args))
+ '(unpack-rust-crates
+ configure
+ check-for-pregenerated-files
+ patch-cargo-checksums))))
(add-after 'unpack 'patch-vulkan
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "src/dmabuf.rs"
(("Entry::load\\(\\)")
(string-append "Entry::load_from(\""
(search-input-file inputs "lib/libvulkan.so")
- "\")")))))))
+ "\")"))))))
#:configure-flags
#~(list "-Dwith_lz4=enabled"
"-Dwith_vaapi=enabled"
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index a0da9e8322..ca80afc2dd 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -3599,7 +3599,6 @@ for dealing with different structured file formats.")
(guix build gnu-build-system)
(guix build utils))
#:phases
- (with-extensions (list (cargo-guile-json))
#~(modify-phases %standard-phases
(add-after 'unpack 'patch-gdk-pixbuf-thumbnailer
(lambda* (#:key inputs #:allow-other-keys)
@@ -3651,7 +3650,7 @@ for dealing with different structured file formats.")
'(unpack-rust-crates
configure
check-for-pregenerated-files
- patch-cargo-checksums))))))))
+ patch-cargo-checksums)))))))
(native-inputs
(append
(list gdk-pixbuf
@@ -10492,7 +10491,6 @@ specified duration and save it as a GIF encoded
animated image file.")
(guix build meson-build-system)
(guix build utils))
#:phases
- (with-extensions (list (cargo-guile-json))
#~(modify-phases %standard-phases
(add-after 'unpack 'prepare-for-build
(lambda _
@@ -10519,7 +10517,7 @@ specified duration and save it as a GIF encoded
animated image file.")
'(unpack-rust-crates
configure
check-for-pregenerated-files
- patch-cargo-checksums))))))))
+ patch-cargo-checksums)))))))
(native-inputs
(append
(list gettext-minimal
diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm
index 07fdfa963d..edcaedd7fb 100644
--- a/gnu/packages/kde-pim.scm
+++ b/gnu/packages/kde-pim.scm
@@ -997,7 +997,6 @@ verifiedserverdialogtest" ;SEGFAULT
(guix build qt-build-system)
(guix build utils))
#:phases
- (with-extensions (list (cargo-guile-json))
#~(modify-phases %standard-phases
(add-before 'configure 'change-directory-to-adblock
(lambda _
@@ -1020,7 +1019,7 @@ verifiedserverdialogtest" ;SEGFAULT
(lambda* (#:key tests? (test-exclude "") #:allow-other-keys)
(setenv "HOME" "/tmp")
(when tests?
- (invoke "dbus-launch" "ctest" "-E" test-exclude))))))))
+ (invoke "dbus-launch" "ctest" "-E" test-exclude)))))))
(native-inputs
(list corrosion
dbus
diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm
index d448d2ffc8..4b637491be 100644
--- a/gnu/packages/language.scm
+++ b/gnu/packages/language.scm
@@ -297,7 +297,6 @@ Random Cage Fighting Birds, Cool Music etc.")
,@%cargo-build-system-modules)
#:out-of-source? #f ;For the tests.
#:phases
- (with-extensions (list (cargo-guile-json))
#~(modify-phases %standard-phases
(add-after 'unpack 'prepare-cargo-build-system
(lambda args
@@ -317,7 +316,7 @@ Random Cage Fighting Birds, Cool Music etc.")
(lambda _
;; Remove this phase when we can find ncurses with cmake.
(substitute* "tests/CMakeLists.txt"
- (("CURSES_FOUND") "FALSE"))))))))
+ (("CURSES_FOUND") "FALSE")))))))
(native-inputs
(append
(list rust `(,rust "cargo") )
diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm
index 5b5a9de115..ff8abf93a0 100644
--- a/gnu/packages/rust-apps.scm
+++ b/gnu/packages/rust-apps.scm
@@ -1364,7 +1364,6 @@ repositories.")
(guix build meson-build-system)
(guix build utils))
#:phases
- (with-extensions (list (cargo-guile-json))
#~(modify-phases %standard-phases
(add-after 'unpack 'prepare-for-build
(lambda _
@@ -1387,7 +1386,7 @@ repositories.")
'(unpack-rust-crates
configure
check-for-pregenerated-files
- patch-cargo-checksums))))))))
+ patch-cargo-checksums)))))))
(native-inputs (list clang pkg-config rust `(,rust "cargo")))
(inputs (cons* glib gtk libadwaita pipewire (cargo-inputs 'helvum)))
(home-page "https://gitlab.freedesktop.org/pipewire/helvum";)
diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm
index 5fe831a76c..cb2d00c74a 100644
--- a/gnu/packages/shells.scm
+++ b/gnu/packages/shells.scm
@@ -171,7 +171,6 @@ direct descendant of NetBSD's Almquist Shell
(@command{ash}).")
((guix build gnu-build-system) #:prefix gnu:)
(guix build utils))
#:phases
- (with-extensions (list (cargo-guile-json))
#~(modify-phases %standard-phases
(add-after 'unpack 'use-guix-vendored-dependencies
(lambda _
@@ -302,7 +301,7 @@ direct descendant of NetBSD's Almquist Shell
(@command{ash}).")
" set -e fish_function_path\n"
"end\n")
port)
- (close-port port))))))))
+ (close-port port)))))))
(synopsis "The friendly interactive shell")
(description
"Fish (friendly interactive shell) is a shell focused on interactive use,
