This is an automated email from the git hooks/post-receive script.
guix_mirror_bot pushed a commit to branch master
in repository guix.
The following commit(s) were added to refs/heads/master by this push:
new 6913cd0e84 gnu: gnome-2048: Update to 50.2.
6913cd0e84 is described below
commit 6913cd0e84cfa48f306834f166192c35bfb9bf1e
Author: Maxim Cournoyer <[email protected]>
AuthorDate: Fri Aug 28 21:42:43 2026 +0900
gnu: gnome-2048: Update to 50.2.
* gnu/packages/games.scm (gnome-2048): Update to 50.2.
[source]: Delete patches. Fix URI.
[#:tests?]: Set to #f.
[#:phases] {prepare-cargo-build-system}: New phase.
{skip-gtk-update-icon-cache}: Update phase.
[native-inputs]: Add desktop-file-utils, rust, rust:cargo and
(conditionally)
a rust-sysroot. Delete libxml2.
[inputs]: Replace gtk+ with gtk. Remove clutter, clutter-gtk,
libgnome-games-support-1.0 and libgee. Add cargo inputs.
[home-page]: Update.
* gnu/packages/rust-crates.scm: Import gnome-2048 crates.
---
gnu/local.mk | 1 -
gnu/packages/games.scm | 81 +++++++++----
.../gnome-2048-fix-positional-argument.patch | 36 ------
gnu/packages/rust-crates.scm | 134 +++++++++++++++++++++
4 files changed, 189 insertions(+), 63 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index 9c3ddb4fc1..10e1f5e620 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1524,7 +1524,6 @@ dist_patch_DATA =
\
%D%/packages/patches/gmime-disable-tests.patch \
%D%/packages/patches/gmp-arm-asm-nothumb.patch \
%D%/packages/patches/gmp-faulty-test.patch \
- %D%/packages/patches/gnome-2048-fix-positional-argument.patch \
%D%/packages/patches/gnome-contacts-evolution-compat.patch \
%D%/packages/patches/gnome-control-center-firmware-security.patch \
%D%/packages/patches/gnome-control-center-libexecdir.patch \
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index fe6274fb2e..74d877a299 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -2521,41 +2521,70 @@ Game Jam. The objective is to reach the goal by
assigning rules to colors.")
(define-public gnome-2048
(package
(name "gnome-2048")
- (version "3.38.2")
+ (version "50.2")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/gnome-2048/"
- (version-major+minor version) "/"
+ (version-major version) "/"
"gnome-2048-" version ".tar.xz"))
(sha256
(base32
- "0s5fg4z5in1h39fcr69j1qc5ynmg7a8mfprk3mc3c0csq3snfwz2"))
- (patches
- (search-patches "gnome-2048-fix-positional-argument.patch"))))
+ "1a9dpm14lk2b3p9g8gh0qhyp6yv6ijphi2arkv4z130jlrldy5bd"))))
(build-system meson-build-system)
(arguments
- `(#:glib-or-gtk? #t
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'skip-gtk-update-icon-cache
- ;; Don't create 'icon-theme.cache'.
- (lambda _
- (substitute* "meson_post_install.py"
- (("gtk-update-icon-cache") "true")))))))
- (inputs
- (list gtk+
- clutter
- clutter-gtk
- libgee
- libgnome-games-support-1))
+ (list
+ ;; The 'libgnome-games-support-tests' test fails (see:
+ ;; <https://gitlab.gnome.org/GNOME/gnome-2048/-/work_items/56>).
+ #:tests? #f
+ #:glib-or-gtk? #t
+ #:imported-modules
+ `((guix build cargo-build-system)
+ ,@%meson-build-system-modules)
+ #:modules '((guix build meson-build-system)
+ ((guix build cargo-build-system) #:prefix cargo:)
+ (guix build utils))
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'prepare-cargo-build-system
+ (lambda args
+ (substitute* "src/meson.build"
+ ;; The build system sets CARGO_HOME itself, which is also used
+ ;; by the cargo configure phase.
+ ((".*cargo_env.set.*CARGO_HOME.*") ""))
+ (for-each
+ (lambda (phase)
+ (format #t "Running cargo phase: ~a~%" phase)
+ (apply (assoc-ref cargo:%standard-phases phase)
+ #:vendor-dir ".cargo/vendor"
+ #:cargo-target #$(cargo-triplet)
+ args))
+ '(unpack-rust-crates
+ configure
+ check-for-pregenerated-files
+ patch-cargo-checksums))))
+ (add-after 'unpack 'skip-gtk-update-icon-cache
+ ;; Don't create 'icon-theme.cache'.
+ (lambda _
+ (substitute* "meson.build"
+ (("gtk_update_icon_cache: true")
+ "gtk_update_icon_cache: false")))))))
(native-inputs
- (list gettext-minimal
- `(,glib "bin") ; for desktop-file-validate and appstream-util
- itstool
- libxml2
- pkg-config
- vala))
- (home-page "https://wiki.gnome.org/Apps/2048";)
+ (cons* desktop-file-utils
+ gettext-minimal
+ `(,glib "bin") ; for desktop-file-validate and appstream-util
+ itstool
+ pkg-config
+ rust
+ `(,rust "cargo")
+ vala
+ (or (and=> (%current-target-system)
+ (compose list make-rust-sysroot))
+ '())))
+ (inputs
+ (cons* libadwaita
+ gtk
+ (cargo-inputs 'gnome-2048)))
+ (home-page "https://gitlab.gnome.org/GNOME/gnome-2048";)
(synopsis "Move the tiles until you obtain the 2048 tile")
(description "GNOME 2048 provides a 2D grid for playing 2048, a
single-player sliding tile puzzle game. The objective of the game is to merge
diff --git a/gnu/packages/patches/gnome-2048-fix-positional-argument.patch
b/gnu/packages/patches/gnome-2048-fix-positional-argument.patch
deleted file mode 100644
index 912759654d..0000000000
--- a/gnu/packages/patches/gnome-2048-fix-positional-argument.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 194e22699f7166a016cd39ba26dd719aeecfc868 Mon Sep 17 00:00:00 2001
-From: Jan Beich <[email protected]>
-Date: Sun, 23 Jan 2022 10:49:07 +0000
-Subject: [PATCH] meson: drop unused argument for i18n.merge_file()
-
-Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0.
-
-data/meson.build:19:0: ERROR: Function does not take positional arguments.
-data/meson.build:39:0: ERROR: Function does not take positional arguments.
----
- data/meson.build | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/data/meson.build b/data/meson.build
-index 33f73ca..8974a63 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -17,7 +17,6 @@ install_data(
-
- # Desktop file
- desktop_file = i18n.merge_file(
-- 'desktop-file',
- input: 'org.gnome.TwentyFortyEight.desktop.in',
- output: 'org.gnome.TwentyFortyEight.desktop',
- install: true,
-@@ -37,7 +36,6 @@ endif
-
- # AppData file
- appdata_file = i18n.merge_file(
-- 'appdata-file',
- input: 'org.gnome.TwentyFortyEight.appdata.xml.in',
- output: 'org.gnome.TwentyFortyEight.appdata.xml',
- install: true,
---
-GitLab
-
diff --git a/gnu/packages/rust-crates.scm b/gnu/packages/rust-crates.scm
index 2783dc1c02..af17bc6be0 100644
--- a/gnu/packages/rust-crates.scm
+++ b/gnu/packages/rust-crates.scm
@@ -4523,6 +4523,10 @@ fn main() {
(crate-source "cfg-expr" "0.20.8"
"0z4r6l4936g1c1s27ryvjdy5pjij6sfvs3myk3hji9dgpi13asgv"))
+(define rust-cfg-expr-0.20.9
+ (crate-source "cfg-expr" "0.20.9"
+ "05z97ah29viw66l3c46y391nfsri9dxpwr166k36dxxmfj2cwkpy"))
+
(define rust-cfg-if-0.1.10
(crate-source "cfg-if" "0.1.10"
"08h80ihs74jcyp24cd75wwabygbbdgl05k6p5dmq8akbr78vv1a7"))
@@ -25202,6 +25206,10 @@ fn main() {
(crate-source "proptest-derive" "0.8.0"
"16sl8waqx20flr49aj24dh4rfbzqkcpzj6rfm7xxmpb432l28yf5"))
+(define rust-proptest-macro-0.5.0
+ (crate-source "proptest-macro" "0.5.0"
+ "0gpkn7w652n9rrpvb59lp1jibr8rmc822zvvv92v7ckci65jiapg"))
+
(define rust-proptest-state-machine-0.8.0
(crate-source "proptest-state-machine" "0.8.0"
"0bkgymvz1wnvy2kz28pd9f7s0k8qfzj9ilz76przcvyncmwp4x8n"))
@@ -59856,6 +59864,132 @@ fn main() {
rust-zvariant-5.11.0
rust-zvariant-derive-5.11.0
rust-zvariant-utils-3.3.1))
+ (gnome-2048 =>
+ (list rust-aho-corasick-1.1.5
+ rust-async-channel-2.5.0
+ rust-autocfg-1.5.1
+ rust-bit-set-0.8.0
+ rust-bit-vec-0.8.0
+ rust-bitflags-2.13.1
+ rust-block-0.1.6
+ rust-cairo-rs-0.22.0
+ rust-cairo-sys-rs-0.22.0
+ rust-cc-1.4.4
+ rust-cfg-expr-0.20.9
+ rust-cfg-if-1.0.4
+ rust-concurrent-queue-2.5.0
+ rust-convert-case-0.11.0
+ rust-crossbeam-utils-0.8.22
+ rust-equivalent-1.0.2
+ rust-errno-0.3.14
+ rust-event-listener-5.4.2
+ rust-event-listener-strategy-0.5.4
+ rust-fastrand-2.5.0
+ rust-field-offset-0.3.6
+ rust-find-msvc-tools-0.1.11
+ rust-fnv-1.0.7
+ rust-futures-channel-0.3.34
+ rust-futures-core-0.3.34
+ rust-futures-executor-0.3.34
+ rust-futures-io-0.3.34
+ rust-futures-macro-0.3.34
+ rust-futures-task-0.3.34
+ rust-futures-util-0.3.34
+ rust-gdk-pixbuf-0.22.0
+ rust-gdk-pixbuf-sys-0.22.0
+ rust-gdk4-0.11.4
+ rust-gdk4-sys-0.11.4
+ rust-getrandom-0.3.4
+ rust-getrandom-0.4.3
+ rust-gettext-rs-0.7.7
+ rust-gettext-sys-0.26.0
+ rust-gio-0.22.8
+ rust-gio-sys-0.22.8
+ rust-glib-0.22.8
+ rust-glib-macros-0.22.6
+ rust-glib-sys-0.22.8
+ rust-gobject-sys-0.22.6
+ rust-graphene-rs-0.22.8
+ rust-graphene-sys-0.22.8
+ rust-gsk4-0.11.4
+ rust-gsk4-sys-0.11.4
+ rust-gtk4-0.11.4
+ rust-gtk4-macros-0.11.4
+ rust-gtk4-sys-0.11.4
+ rust-hashbrown-0.17.1
+ rust-heck-0.5.0
+ rust-indexmap-2.14.0
+ rust-lazy-static-1.5.0
+ rust-libadwaita-0.9.2
+ rust-libadwaita-sys-0.9.2
+ rust-libc-0.2.189
+ rust-linux-raw-sys-0.12.1
+ rust-locale-config-0.3.0
+ rust-malloc-buf-0.0.6
+ rust-memchr-2.8.3
+ rust-memoffset-0.9.1
+ rust-num-traits-0.2.19
+ rust-objc-0.2.7
+ rust-objc-foundation-0.1.1
+ rust-objc-id-0.1.1
+ rust-once-cell-1.21.4
+ rust-pango-0.22.8
+ rust-pango-sys-0.22.0
+ rust-parking-2.2.1
+ rust-pin-project-lite-0.2.17
+ rust-pkg-config-0.3.34
+ rust-ppv-lite86-0.2.21
+ rust-proc-macro-crate-3.5.0
+ rust-proc-macro2-1.0.107
+ rust-proptest-1.11.0
+ rust-proptest-macro-0.5.0
+ rust-quick-error-1.2.3
+ rust-quote-1.0.47
+ rust-r-efi-5.3.0
+ rust-r-efi-6.0.0
+ rust-rand-0.9.5
+ rust-rand-chacha-0.9.0
+ rust-rand-core-0.9.5
+ rust-rand-xorshift-0.4.0
+ rust-regex-1.13.1
+ rust-regex-automata-0.4.18
+ rust-regex-syntax-0.8.11
+ rust-rustc-version-0.4.1
+ rust-rustix-1.1.4
+ rust-rusty-fork-0.3.1
+ rust-semver-1.0.28
+ rust-serde-core-1.0.229
+ rust-serde-derive-1.0.229
+ rust-serde-spanned-1.1.1
+ rust-shlex-2.0.1
+ rust-slab-0.4.12
+ rust-smallvec-1.15.2
+ rust-syn-2.0.119
+ rust-syn-3.0.4
+ rust-system-deps-7.0.8
+ rust-target-lexicon-0.13.5
+ rust-temp-dir-0.1.16
+ rust-tempfile-3.27.0
+ rust-toml-1.1.4+spec-1.1.0
+ rust-toml-datetime-1.1.1+spec-1.1.0
+ rust-toml-edit-0.25.13+spec-1.1.0
+ rust-toml-parser-1.1.3+spec-1.1.0
+ rust-toml-writer-1.1.2+spec-1.1.0
+ rust-unarray-0.1.4
+ rust-unicode-ident-1.0.24
+ rust-unicode-segmentation-1.13.3
+ rust-version-compare-0.2.1
+ rust-wait-timeout-0.2.1
+ rust-wasip2-1.0.4+wasi-0.2.12
+ rust-winapi-0.3.9
+ rust-winapi-i686-pc-windows-gnu-0.4.0
+ rust-winapi-x86-64-pc-windows-gnu-0.4.0
+ rust-windows-link-0.2.1
+ rust-windows-sys-0.61.2
+ rust-winnow-1.0.4
+ rust-wit-bindgen-0.57.1
+ rust-zerocopy-0.8.56
+ rust-zerocopy-derive-0.8.56))
(gnome-authenticator =>
(list rust-adler2-2.0.1
rust-aead-0.5.2
