From patchwork Fri Jul 7 09:42:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Saku Laesvuori X-Patchwork-Id: 51615 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 235C127BBEA; Fri, 7 Jul 2023 10:43:31 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED,URIBL_SBL_A autolearn=ham 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 F070827BBE9 for ; Fri, 7 Jul 2023 10:43:27 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qHhzT-0001GB-Jz; Fri, 07 Jul 2023 05:43:03 -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 1qHhzR-0001Fn-Tb for guix-patches@gnu.org; Fri, 07 Jul 2023 05:43:01 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qHhzR-0002qi-Lk for guix-patches@gnu.org; Fri, 07 Jul 2023 05:43:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qHhzR-0004B7-Hm for guix-patches@gnu.org; Fri, 07 Jul 2023 05:43:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63799] [PATCH v2] gnu: Add ghc-xmobar Resent-From: Saku Laesvuori Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 07 Jul 2023 09:43:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63799 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Lars-Dominik Braun Cc: 63799@debbugs.gnu.org, Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 63799-submit@debbugs.gnu.org id=B63799.168872293616001 (code B ref 63799); Fri, 07 Jul 2023 09:43:01 +0000 Received: (at 63799) by debbugs.gnu.org; 7 Jul 2023 09:42:16 +0000 Received: from localhost ([127.0.0.1]:42569 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qHhyf-00049z-QO for submit@debbugs.gnu.org; Fri, 07 Jul 2023 05:42:16 -0400 Received: from vmi571514.contaboserver.net ([75.119.130.101]:44042 helo=mail.laesvuori.fi) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qHhyZ-00049k-SY for 63799@debbugs.gnu.org; Fri, 07 Jul 2023 05:42:12 -0400 Received: from X-kone (88-113-24-127.elisa-laajakaista.fi [88.113.24.127]) by mail.laesvuori.fi (Postfix) with ESMTPSA id 86C3434014B; Fri, 7 Jul 2023 11:42:16 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=laesvuori.fi; s=mail; t=1688722936; bh=b866KaqTvieT23KtownRie7/0WoLejspDdUiUqnYrd0=; h=Date:From:To:Cc:Subject:References:In-Reply-To; b=dAYQTxZKHZqXUmuyvNI4A9QalD+tsqRY7SIG+N+Fzy7ao5tFZqCW1RHGdsIcaxEgP xQHFMw/YLibaWalXbSTtnm3W6FkuwVFoBmBkwKZPBl6nFW62IlTkrN3z9gC8Haibco E+di6/S+kLZRSI90z5RmAo93GTRYqRMQ6het96sg= Date: Fri, 7 Jul 2023 12:42:04 +0300 Message-ID: <20230707094204.ipay3bqnksyx3eci@X-kone> References: <20230530075453.30789-1-saku@laesvuori.fi> <87jzvjzojw.fsf@gnu.org> <138E85F5-FD22-4C38-A91F-C07765474A41@laesvuori.fi> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: 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: Saku Laesvuori X-ACL-Warn: , Saku Laesvuori via Guix-patches X-Patchwork-Original-From: Saku Laesvuori via Guix-patches via From: Saku Laesvuori 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/wm.scm (ghc-xmobar): New variable. (xmobar)[inputs]: Remove everything except libxpm. Add ghc-xmobar. [arguments]: Disable tests as they are run in ghc-xmobar. Configure only the xmobar executable. Remove unnecessary phases. [native-inputs]: Remove everything. --- gnu/packages/wm.scm | 43 +++++++++++++++++++++++++++++++++++-------- 1 file changed, 35 insertions(+), 8 deletions(-) base-commit: 961ffca1c75141cbb351d143b22b673638e9659d diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 46a1030490..728c9454c6 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -877,9 +877,9 @@ (define-public xmonad tiled on several screens.") (license license:bsd-3))) -(define-public xmobar +(define-public ghc-xmobar (package - (name "xmobar") + (name "ghc-xmobar") (version "0.46") (source (origin (method url-fetch) @@ -896,17 +896,18 @@ (define-public xmobar ghc-alsa-mixer ghc-dbus ghc-hinotify - ghc-http + ghc-http-client-tls ghc-http-conduit ghc-http-types - ghc-iwlib ghc-libmpd ghc-netlink + ghc-cereal ghc-old-locale ghc-parsec-numbers ghc-regex-compat ghc-temporary ghc-timezone-olson + ghc-timezone-series ghc-x11 ghc-x11-xft ghc-cairo @@ -914,18 +915,44 @@ (define-public xmobar libxpm)) (arguments `(#:configure-flags (list "--flags=all_extensions") - ;; Haddock documentation is for the library. - #:haddock? #f #:phases (modify-phases %standard-phases - (add-after 'register 'remove-libraries + (add-after 'install 'remove-binaries (lambda* (#:key outputs #:allow-other-keys) - (delete-file-recursively (string-append (assoc-ref outputs "out") "/lib")))) + (delete-file-recursively (string-append (assoc-ref outputs "out") "/bin")))) (add-before 'build 'patch-test-shebang (lambda* (#:key inputs #:allow-other-keys) (substitute* "test/Xmobar/Plugins/Monitors/AlsaSpec.hs" (("/bin/bash") (which "bash")))))))) (home-page "https://xmobar.org") + (synopsis "Haskell library for minimalistic text based status bars") + (description + "@code{ghc-xmobar} is the haskell library that @code{xmobar} is based on. +It can be used to extend @code{xmobar} with other Haskell code.") + (license license:bsd-3))) + +(define-public xmobar + (package + (name "xmobar") + (version "0.46") + (source (origin + (method url-fetch) + (uri (hackage-uri "xmobar" version)) + (sha256 + (base32 + "0glpiq7c0qwfcxnc2flgzj7afm5m1a9ghzwwcq7f8q27m21kddrd")))) + (build-system haskell-build-system) + (properties '((upstream-name . "xmobar"))) + (inputs + (list ghc-xmobar + libxpm)) + (arguments + `(#:configure-flags (list "--flags=all_extensions" "exe:xmobar") + ;; Haddock documentation is for the library. + #:haddock? #f + ;; Tests are for the library. + #:tests? #f)) + (home-page "https://xmobar.org") (synopsis "Minimalistic text based status bar") (description "@code{xmobar} is a lightweight, text-based, status bar written in