From patchwork Fri Jan 3 12:08:47 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: muradm X-Patchwork-Id: 36396 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id E750127BBE9; Fri, 3 Jan 2025 12:10:53 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id D495D27BBE2 for ; Fri, 3 Jan 2025 12:10:50 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tTgVM-0002HW-P2; Fri, 03 Jan 2025 07:10:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tTgVB-0002C5-HB for guix-patches@gnu.org; Fri, 03 Jan 2025 07:10:07 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tTgV9-0008Ca-Ms for guix-patches@gnu.org; Fri, 03 Jan 2025 07:10:05 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=NeR7PNIbdrIoPf0uAve0GdkczCIfYn0JQfwBau+i8GE=; b=N6c00sCRxb6JpDoAhhH2vEo4ieuY2hWiwKDYs+tnXnS6lhERVqGzfDi/00LCkTZReAeRmawm5+E68SUHe7hV001HvqiIM7hEA/QYcWzP8nLL3zxkFnX/hc64aLmN4KpPZgu5f1nS+M9WWO9JnRAXHBDUb17L9XaMrLqWcpNWeEB9tJbKVP+UVGbf3VrCKEHOvV81KfU5w9n2fzPSNYjKCCtSkQ9Tk1IA9kZ3V/DHJg8yNVIcXlfL9VHImPUem10NeP2cbXJMyUw6VJBVI0vqnCi5hOfZPGEoF10p3b1ukf9OnFCowxSDuwV6gy0tD1SgZ4MJRA6O0ZJeKF+3hvxnIA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tTgV7-0003Yl-Nq; Fri, 03 Jan 2025 07:10:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75311] [PATCH] gnu: wlgreet: Update to 0.5.0. Resent-From: muradm Original-Sender: "Debbugs-submit" Resent-CC: efraim@flashner.co.il, sharlatanus@gmail.com, guix-patches@gnu.org Resent-Date: Fri, 03 Jan 2025 12:10:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 75311 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75311@debbugs.gnu.org Cc: Efraim Flashner , Sharlatan Hellseher X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Efraim Flashner , Sharlatan Hellseher Received: via spool by submit@debbugs.gnu.org id=B.173590615213614 (code B ref -1); Fri, 03 Jan 2025 12:10:01 +0000 Received: (at submit) by debbugs.gnu.org; 3 Jan 2025 12:09:12 +0000 Received: from localhost ([127.0.0.1]:49867 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tTgUJ-0003XV-EY for submit@debbugs.gnu.org; Fri, 03 Jan 2025 07:09:12 -0500 Received: from lists.gnu.org ([2001:470:142::17]:58342) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tTgUG-0003Wt-7Z for submit@debbugs.gnu.org; Fri, 03 Jan 2025 07:09:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tTgU3-00027g-0Y for guix-patches@gnu.org; Fri, 03 Jan 2025 07:08:58 -0500 Received: from nomad-cl1.muradm.net ([139.162.159.157]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tTgTy-0007qa-UK for guix-patches@gnu.org; Fri, 03 Jan 2025 07:08:54 -0500 Received: from localhost ([127.0.0.1]:57716) by nomad-cl1.muradm.net with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96.1) (envelope-from ) id 1tTgQG-00019k-1m for guix-patches@gnu.org; Fri, 03 Jan 2025 12:05:00 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=muradm.net; s=mail; h=Content-Transfer-Encoding:MIME-Version:Message-ID:Date:Subject:To: From:Sender:Reply-To:Cc:Content-Type:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=NeR7PNIbdrIoPf0uAve0GdkczCIfYn0JQfwBau+i8GE=; b=J32m5eCFCsBXh/jrxmmKuy7zx1 qTCoFa9s5BvMfT36W6j8+usJYJJmSXZRV+uTR60p1ikyU/u8u3xJkYAUlNuLvtni71zKWoeqBsOCq sDHK7z2fm1XStIoedTaIru86hl2BOm/ln0TRa+aShwjwb02OZnMHoX1YPqFEIZtb9iSAXQF29M+Xv iu2wBhviCEXxOs/DButpI2BUlh+SFNTXNiLRKlAdmdRJyWz0StPfMAkwvSbkLO+56Sgfowh0/S5Yn eN0bsc0eowldY2X0jSLDq0hWObWgfume3DNqb/xhG5tW16G1WL1G/4P1JLN+SEwJXWAb3oK6lud/+ nZiYvB73Pr92QWkcVC+19BAPsrfB4TCgIv6qoBdo5781vxM0CbYDRnYygdVJeV/v3yl76AEm12o08 qGWfw0ivFSXq7Zg4UueQNDWBjKRexTPa3/55VGUBXLbc8qx+NAoEXvGkfqGoCW/IhfhDBSEKlJ6GO h7ZaYPVUyLojXzmhJNj1Oog3; Received: from muradm by localhost with local (Exim 4.98) (envelope-from ) id 1tTgTw-0000000010h-1HqJ for guix-patches@gnu.org; Fri, 03 Jan 2025 15:08:48 +0300 From: muradm Date: Fri, 3 Jan 2025 15:08:47 +0300 Message-ID: X-Mailer: git-send-email 2.47.1 MIME-Version: 1.0 Received-SPF: pass client-ip=139.162.159.157; envelope-from=mail@muradm.net; helo=nomad-cl1.muradm.net X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/admin.scm (wlgreet): Update to 0.5.0. * gnu/packages/crates-io (rust-greetd-ipc): Add 0.10.3, remove 0.9 and 0.8. Change-Id: I31783ffadcc06eb668169ec2fd64801bcc4e8cff --- gnu/packages/admin.scm | 126 ++++++++++++++++++------------------- gnu/packages/crates-io.scm | 42 +++---------- 2 files changed, 72 insertions(+), 96 deletions(-) base-commit: ce3ffac5d366ebf20e0d95779f2fe1ea6dde0202 diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 466df65dd9..6da2f814bb 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -5763,73 +5763,71 @@ (define-public greetd-pam-mount interfering with any pam-mount configuration."))) (define-public wlgreet - (let ((commit "7e79d6004fc5e765a5c3ece6d377f8c5999d9dfa") - (revision "1")) - (package - (name "wlgreet") - (version (git-version "0.4.1" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://git.sr.ht/~kennylevinsen/wlgreet") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "039a05v6c2i3al86k4fncqr3z47dnrz7y8wmhx6wvm08zx8s89ww")))) - (build-system cargo-build-system) - (arguments - (list #:cargo-inputs - `(("rust-chrono" ,rust-chrono-0.4) - ("rust-getopts" ,rust-getopts-0.2) - ("rust-greetd-ipc" ,rust-greetd-ipc-0.9) - ("rust-lazy-static" ,rust-lazy-static-1) - ("rust-memmap2" ,rust-memmap2-0.3) - ("rust-nix" ,rust-nix-0.25) - ("rust-os-pipe" ,rust-os-pipe-1) - ("rust-rusttype" ,rust-rusttype-0.9) - ("rust-serde" ,rust-serde-1) - ("rust-smithay-client-toolkit" - ,rust-smithay-client-toolkit-0.15) - ("rust-toml" ,rust-toml-0.5) - ("rust-wayland-client" ,rust-wayland-client-0.29) - ("rust-wayland-protocols" ,rust-wayland-protocols-0.29)) - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'remove-bundled-fonts - (lambda _ - (delete-file-recursively "fonts"))) - (add-after 'remove-bundled-fonts 'fix-font-references - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "src/draw.rs" - (("\\.\\./fonts/dejavu/DejaVuSansMono\\.ttf" _) - (search-input-file - inputs - "share/fonts/truetype/DejaVuSansMono.ttf")) - (("\\.\\./fonts/Roboto-Regular\\.ttf" _) - (search-input-file - inputs - "share/fonts/truetype/Roboto-Regular.ttf"))))) - (add-after 'configure 'fix-library-references - (lambda* (#:key inputs vendor-dir #:allow-other-keys) - (substitute* (find-files vendor-dir "\\.rs$") - (("lib(wayland-.*|xkbcommon)\\.so" so-file) - (search-input-file - inputs - (string-append "lib/" so-file))))))))) - (inputs - (list font-dejavu - font-google-roboto - libxkbcommon - wayland)) - (home-page "https://git.sr.ht/~kennylevinsen/wlgreet") - (synopsis "Bare-bones Wayland-based greeter for @command{greetd}") - (description - "@command{wlgreet} provides a @command{greetd} greeter + (package + (name "wlgreet") + (version "0.5.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://git.sr.ht/~kennylevinsen/wlgreet") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0d7lfx5jg2w7fp7llwrirnbsp27nv74f21mhrspd9ilk2cacf12d")))) + (build-system cargo-build-system) + (arguments + (list #:cargo-inputs + `(("rust-chrono" ,rust-chrono-0.4) + ("rust-getopts" ,rust-getopts-0.2) + ("rust-greetd-ipc" ,rust-greetd-ipc-0.10) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-memmap2" ,rust-memmap2-0.3) + ("rust-nix" ,rust-nix-0.25) + ("rust-os-pipe" ,rust-os-pipe-1) + ("rust-rusttype" ,rust-rusttype-0.9) + ("rust-serde" ,rust-serde-1) + ("rust-smithay-client-toolkit" + ,rust-smithay-client-toolkit-0.15) + ("rust-toml" ,rust-toml-0.5) + ("rust-wayland-client" ,rust-wayland-client-0.29) + ("rust-wayland-protocols" ,rust-wayland-protocols-0.29)) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'remove-bundled-fonts + (lambda _ + (delete-file-recursively "fonts"))) + (add-after 'remove-bundled-fonts 'fix-font-references + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "src/draw.rs" + (("\\.\\./fonts/dejavu/DejaVuSansMono\\.ttf" _) + (search-input-file + inputs + "share/fonts/truetype/DejaVuSansMono.ttf")) + (("\\.\\./fonts/Roboto-Regular\\.ttf" _) + (search-input-file + inputs + "share/fonts/truetype/Roboto-Regular.ttf"))))) + (add-after 'configure 'fix-library-references + (lambda* (#:key inputs vendor-dir #:allow-other-keys) + (substitute* (find-files vendor-dir "\\.rs$") + (("lib(wayland-.*|xkbcommon)\\.so" so-file) + (search-input-file + inputs + (string-append "lib/" so-file))))))))) + (inputs + (list font-dejavu + font-google-roboto + libxkbcommon + wayland)) + (home-page "https://git.sr.ht/~kennylevinsen/wlgreet") + (synopsis "Bare-bones Wayland-based greeter for @command{greetd}") + (description + "@command{wlgreet} provides a @command{greetd} greeter that runs on a Wayland compositor such as @command{sway}. It is implemented with pure Wayland APIs, so it does not depend on a GUI toolkit.") - (license license:gpl3)))) + (license license:gpl3))) (define-public libseat (package diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 1587abe3bb..6869976517 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -32262,52 +32262,30 @@ (define-public rust-graphql-parser-0.3 language and scheme definition language (sometimes called IDL).") (license (list license:expat license:asl2.0)))) -(define-public rust-greetd-ipc-0.9 +(define-public rust-greetd-ipc-0.10 (package (name "rust-greetd-ipc") - (version "0.9.0") + (version "0.10.3") (source (origin (method url-fetch) (uri (crate-uri "greetd_ipc" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1xl2cix3jv4sgigl5ijayab7rchr6v02za2qd87fv1z8dl1r14w3")))) + (base32 "0y1095qwmiwpm94z3vgbklbnlp088pi6vd1isp8l584izidjw3bh")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs - (("rust-async-trait" ,rust-async-trait-0.1) - ("rust-serde" ,rust-serde-1) - ("rust-serde-json" ,rust-serde-json-1) - ("rust-thiserror" ,rust-thiserror-1) - ("rust-tokio" ,rust-tokio-1)))) + `(#:cargo-inputs (("rust-async-trait" ,rust-async-trait-0.1) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-tokio" ,rust-tokio-1)))) (home-page "https://kl.wtf/projects/greetd") - (synopsis "@command{greetd} IPC protocol library for Rust") + (synopsis "An implementation of the greetd IPC protocol") (description - "This package provides library that helps you use the -@command{greetd} JSON-based IPC protocol from Rust.") + "This package provides An implementation of the greetd IPC protocol.") (license license:gpl3))) -(define-public rust-greetd-ipc-0.8 - (package - (inherit rust-greetd-ipc-0.9) - (name "rust-greetd-ipc") - (version "0.8.0") - (source (origin - (method url-fetch) - (uri (crate-uri "greetd_ipc" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "1dscriv3adjyaxfaax3cmqrzx6q2vwwchbh86dhll783wjc4ivw0")))) - (arguments - (list #:cargo-inputs - `(("rust-async-trait" ,rust-async-trait-0.1) - ("rust-serde" ,rust-serde-1) - ("rust-serde-json" ,rust-serde-json-1) - ("rust-thiserror" ,rust-thiserror-1) - ("rust-tokio" ,rust-tokio-1)))))) - (define-public rust-grep-0.3 (package (name "rust-grep")