From patchwork Sat Nov 4 19:55:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jaeme Sifat X-Patchwork-Id: 55940 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 0ED7327BBE9; Sat, 4 Nov 2023 19:56:59 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,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 3EE2727BBE2 for ; Sat, 4 Nov 2023 19:56:54 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qzMkt-0000O5-Kc; Sat, 04 Nov 2023 15:56:27 -0400 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 1qzMks-0000Nl-7Q for guix-patches@gnu.org; Sat, 04 Nov 2023 15:56:26 -0400 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 1qzMkr-0005yL-VS for guix-patches@gnu.org; Sat, 04 Nov 2023 15:56:25 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qzMlS-0004wO-8N for guix-patches@gnu.org; Sat, 04 Nov 2023 15:57:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66784] [PATCH 2/4] gnu: Remove dunst.scm. Resent-From: Jaeme Sifat Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 04 Nov 2023 19:57:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66784 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66784@debbugs.gnu.org Cc: Jaeme Sifat Received: via spool by 66784-submit@debbugs.gnu.org id=B66784.169912781418962 (code B ref 66784); Sat, 04 Nov 2023 19:57:02 +0000 Received: (at 66784) by debbugs.gnu.org; 4 Nov 2023 19:56:54 +0000 Received: from localhost ([127.0.0.1]:35780 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qzMlJ-0004vl-Bz for submit@debbugs.gnu.org; Sat, 04 Nov 2023 15:56:54 -0400 Received: from mailtransmit05.runbox.com ([2a0c:5a00:149::26]:52952) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qzMlG-0004vP-J8 for 66784@debbugs.gnu.org; Sat, 04 Nov 2023 15:56:51 -0400 Received: from mailtransmit03.runbox ([10.9.9.163] helo=aibo.runbox.com) by mailtransmit05.runbox.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1qzMkZ-006QhE-Hm for 66784@debbugs.gnu.org; Sat, 04 Nov 2023 20:56:07 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=runbox.com; s=selector2; h=Content-Transfer-Encoding:Content-Type:MIME-Version: References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From; bh=mDPZTExg4SSEzaQoRhmWsQ5MNbNNf7t1gyJXpFdQqFE=; b=HMASIzX5wjpfeIcG2B5yYM4l+J 6vLsd71stsNYlnLk6nGfgFnEahKLlFKqF89fnWA392cy+QamMry4/rwT9VBxEO9JGuPzEpnV3u8KQ 3WOHl6tDZJdXC5+3Msb5Ws7Lvcl6MvJ5Km6tuDTdBu8ICXQtKnBw5G45uhTFH3LL9SfYecvJaPNES KTpBLQ5yoSN/mLwecNx/58NONsAhTxhbM0JTkycVVzktCbrSJooAUxySYemT26cqffVj/gLsqq441 AkQhd8S98znasUHs3ReG0/uGYMInFtofc+6xhAH2Jj5aYYLamvjt+AzXYUCcifqx+EaWm6WqgvUvG kGE8/tmg==; Received: from [10.9.9.73] (helo=submission02.runbox) by mailtransmit03.runbox with esmtp (Exim 4.86_2) (envelope-from ) id 1qzMkZ-0000Hs-8b for 66784@debbugs.gnu.org; Sat, 04 Nov 2023 20:56:07 +0100 Received: by submission02.runbox with esmtpsa [Authenticated ID (1176697)] (TLS1.2:ECDHE_SECP256R1__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim 4.93) id 1qzMkJ-006oqc-6c; Sat, 04 Nov 2023 20:55:51 +0100 Date: Sat, 4 Nov 2023 15:55:08 -0400 Message-ID: <97b7f7f24bf51a53650f47e3cf5dc13149330553.1699127223.git.jaeme@runbox.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 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: , Reply-to: Jaeme Sifat X-ACL-Warn: , Jaeme Sifat via Guix-patches X-Patchwork-Original-From: Jaeme Sifat via Guix-patches via From: Jaeme Sifat 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 The dunst package is much beter suited to be in wm.scm. This patch deletes dunst.scm, moves dunst to wm.scm, and removes dunst.scm from the build process. * gnu/local.mk (GNU_SYSTEM_MODULES): Remove dunst.scm. * gnu/packages/dunst.scm: Delete file. * gnu/packages/wm.scm (dunst): New variable. Change-Id: I3b074f12f34e14ef1101069ed45ddb33f8d3ea51 --- gnu/local.mk | 1 - gnu/packages/dunst.scm | 91 ------------------------------------------ gnu/packages/wm.scm | 51 +++++++++++++++++++++++ 3 files changed, 51 insertions(+), 92 deletions(-) delete mode 100644 gnu/packages/dunst.scm diff --git a/gnu/local.mk b/gnu/local.mk index 8d817379a7..a381d28b83 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -234,7 +234,6 @@ GNU_SYSTEM_MODULES = \ %D%/packages/docbook.scm \ %D%/packages/docker.scm \ %D%/packages/documentation.scm \ - %D%/packages/dunst.scm \ %D%/packages/dvtm.scm \ %D%/packages/easyrpg.scm \ %D%/packages/ebook.scm \ diff --git a/gnu/packages/dunst.scm b/gnu/packages/dunst.scm deleted file mode 100644 index ee389098fb..0000000000 --- a/gnu/packages/dunst.scm +++ /dev/null @@ -1,91 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2015, 2017, 2018 Alex Kost -;;; Copyright © 2018 Tobias Geerinckx-Rice -;;; Copyright © 2019, 2023 Efraim Flashner -;;; Copyright © 2020 Brice Waegeneire -;;; Copyright © 2021 Alexandru-Sergiu Marton -;;; Copyright © 2021 Guillaume Le Vaillant -;;; Copyright © 2022 Jai Vetrivelan -;;; Copyright © 2023 Jaeme Sifat -;;; -;;; This file is part of GNU Guix. -;;; -;;; GNU Guix is free software; you can redistribute it and/or modify it -;;; under the terms of the GNU General Public License as published by -;;; the Free Software Foundation; either version 3 of the License, or (at -;;; your option) any later version. -;;; -;;; GNU Guix is distributed in the hope that it will be useful, but -;;; WITHOUT ANY WARRANTY; without even the implied warranty of -;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;;; GNU General Public License for more details. -;;; -;;; You should have received a copy of the GNU General Public License -;;; along with GNU Guix. If not, see . - -(define-module (gnu packages dunst) - #:use-module (guix packages) - #:use-module (guix gexp) - #:use-module (guix git-download) - #:use-module (guix build-system gnu) - #:use-module (guix utils) - #:use-module ((guix licenses) #:prefix license:) - #:use-module (gnu packages) - #:use-module (gnu packages base) - #:use-module (gnu packages freedesktop) - #:use-module (gnu packages glib) - #:use-module (gnu packages gnome) - #:use-module (gnu packages gtk) - #:use-module (gnu packages perl) - #:use-module (gnu packages pkg-config) - #:use-module (gnu packages xorg)) - -(define-public dunst - (package - (name "dunst") - (version "1.9.2") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/dunst-project/dunst") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "17zrw7jrnlyln81pxw7p4jgvl7j1w1gf488nfskhns6j6dcz90gh")))) - (build-system gnu-build-system) - (arguments - (list - #:tests? #f ;no check target - #:make-flags #~(list (string-append "CC=" - #$(cc-for-target)) - (string-append "PREFIX=" %output) - (string-append "SYSCONFDIR=" %output "/etc") - ;; Otherwise it tries to install service file - ;; to "dbus" store directory. - (string-append "SERVICEDIR_DBUS=" %output - "/share/dbus-1/services") - "dunstify") - #:phases #~(modify-phases %standard-phases - (delete 'configure)))) - (native-inputs (list pkg-config perl ;for pod2man - which)) - (inputs (list dbus - (librsvg-for-system) ;for svg support - glib - cairo - pango - libnotify ;for dunstify - libx11 - libxscrnsaver - libxinerama - libxrandr - libxdg-basedir - wayland)) ;for wayland support - (home-page "https://dunst-project.org/") - (synopsis "Customizable and lightweight notification daemon") - (description - "Dunst is a highly configurable and minimalistic notification daemon. -It provides @code{org.freedesktop.Notifications} D-Bus service, so it is -started automatically on the first call via D-Bus.") - (license license:bsd-3))) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index c3a6b31c84..95d2a879bc 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -64,6 +64,7 @@ ;;; Copyright © 2023 Jonathan Brielamier ;;; Copyright © 2023 Vessel Wave ;;; Copyright © 2023 Nicolas Graves +;;; Copyright © 2023 Jaeme Sifat ;;; ;;; This file is part of GNU Guix. ;;; @@ -1490,6 +1491,56 @@ (define-public cwm project derived from the original Calm Window Manager.") (license license:isc))) +(define-public dunst + (package + (name "dunst") + (version "1.9.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/dunst-project/dunst") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "17zrw7jrnlyln81pxw7p4jgvl7j1w1gf488nfskhns6j6dcz90gh")))) + (build-system gnu-build-system) + (arguments + (list + #:tests? #f ;no check target + #:make-flags #~(list (string-append "CC=" + #$(cc-for-target)) + (string-append "PREFIX=" %output) + (string-append "SYSCONFDIR=" %output "/etc") + ;; Otherwise it tries to install service file + ;; to "dbus" store directory. + (string-append "SERVICEDIR_DBUS=" %output + "/share/dbus-1/services") + "dunstify") + #:phases #~(modify-phases %standard-phases + (delete 'configure)))) + (native-inputs (list pkg-config perl ;for pod2man + which)) + (inputs (list dbus + (librsvg-for-system) ;for svg support + glib + cairo + pango + libnotify ;for dunstify + libx11 + libxscrnsaver + libxinerama + libxrandr + libxdg-basedir + wayland)) ;for wayland support + (home-page "https://dunst-project.org/") + (synopsis "Customizable and lightweight notification daemon") + (description + "Dunst is a highly configurable and minimalistic notification daemon. +It provides @code{org.freedesktop.Notifications} D-Bus service, so it is +started automatically on the first call via D-Bus.") + (license license:bsd-3))) + (define-public dwl (package (name "dwl")