From d706c1b1e6ac3e24555fa57df2745018e750bd2d Mon Sep 17 00:00:00 2001 From: Florian Pelz Date: Thu, 13 Mar 2025 09:13:27 +0100 Subject: [PATCH] gnu: g-golf-adw-1-examples: Downgrade to 0.8.0. * gnu/packages/guile-xyz.scm (g-golf-source): New procedure. (guile-g-golf, g-golf-adw-1-examples)[source]: Use it. (g-golf-adw-1-examples)[version]: Go back to 0.8.0, where adwaita-1-demo still supports our version of libadwaita. Change-Id: I469d1039e859e5dafb0d4ca05a13f6f28ac87c24 --- gnu/packages/guile-xyz.scm | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 213b719749c1e1a6eb58bf252992325ff1f94c7c..30c8e8479963ad00d05b3cb3e58cbd9f36d4b509 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -2565,19 +2565,24 @@ capabilities.") (home-page "https://dthompson.us/projects/sly.html") (license license:gpl3+))) +(define* (g-golf-source #:key version hash) + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.savannah.gnu.org/git/g-golf.git") + (commit (string-append "v" version)))) + (file-name (git-file-name "g-golf" version)) + (hash hash))) + (define-public guile-g-golf (package (name "guile-g-golf") (version "0.8.1") (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://git.savannah.gnu.org/git/g-golf.git") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "044iidjd24cjncvx510ai46is9jxni72iz8pxyi34g4p7gbbcbi7")))) + (g-golf-source #:version version + #:hash + (content-hash + "044iidjd24cjncvx510ai46is9jxni72iz8pxyi34g4p7gbbcbi7"))) (build-system gnu-build-system) (arguments (list @@ -2865,6 +2870,13 @@ writing a Guix package."))) (package (inherit guile-g-golf) (name "g-golf-adw-1-examples") + ;; XXX: Update version when we have a recent enough libadwaita. + (version "0.8.0") + (source + (g-golf-source #:version version + #:hash + (content-hash + "14b6pjchra0axqifpm90m7jbxla2sarhd7bfhzqbn7d14b74sv2d"))) (build-system glib-or-gtk-build-system) (arguments (list