From patchwork Fri Dec 24 19:29:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: John Kehayias X-Patchwork-Id: 35640 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 9BEEB27BBEB; Fri, 24 Dec 2021 19:30:46 +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,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,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 055F427BBE9 for ; Fri, 24 Dec 2021 19:30:46 +0000 (GMT) Received: from localhost ([::1]:34612 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n0qH7-0005vO-59 for patchwork@mira.cbaines.net; Fri, 24 Dec 2021 14:30:45 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39028) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n0qGR-0005ui-Ka for guix-patches@gnu.org; Fri, 24 Dec 2021 14:30:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:54778) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n0qGR-00061y-AY for guix-patches@gnu.org; Fri, 24 Dec 2021 14:30:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n0qGR-0007Yx-7Y for guix-patches@gnu.org; Fri, 24 Dec 2021 14:30:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52784] [PATCH 4/5] Update XMonad (and add new dependencies) References: In-Reply-To: Resent-From: John Kehayias Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 24 Dec 2021 19:30:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52784 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: "52784@debbugs.gnu.org" <52784@debbugs.gnu.org> Received: via spool by 52784-submit@debbugs.gnu.org id=B52784.164037419829014 (code B ref 52784); Fri, 24 Dec 2021 19:30:03 +0000 Received: (at 52784) by debbugs.gnu.org; 24 Dec 2021 19:29:58 +0000 Received: from localhost ([127.0.0.1]:38088 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n0qGM-0007Xu-0G for submit@debbugs.gnu.org; Fri, 24 Dec 2021 14:29:58 -0500 Received: from mail-40133.protonmail.ch ([185.70.40.133]:27965) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n0qGJ-0007Xf-8x for 52784@debbugs.gnu.org; Fri, 24 Dec 2021 14:29:56 -0500 Date: Fri, 24 Dec 2021 19:29:44 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail2; t=1640374184; bh=6JQR6g/8Kf729xVzhuEzA5d803H228xXiFGT4jLqTAU=; h=Date:To:From:Reply-To:Subject:Message-ID:From:To:Cc; b=ujRssqy483VTgo3i4SRDYNRtx96T0EbNvSVb24M2FNxQg4Z2PO3K79xICBchee3n9 kAfdimXxW0S0rUaOc37Im2PNI49eAQHg+PWxV7ADC7tfIzXZX+2rcPwzHB6idz2F7K ajnbFlVeCA0UJElLwhWcN4tdG/PmDeV0+bZd3fOGY1/0y0q51fPu/k5myPY/cCCZsi ejIigve+0V7StRLMXt26fS5kbtPdgCyvg7SqhELVnvHpq4igF7juJscgjMZG88jIQA yI/tNpmEHoAmTbwQZOwtRbkLfwOfdOrHqkNMt+UweMz7/q3n9cU4UdeGNovXjWneOb REc/fKTBiSIWw== Message-ID: 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: John Kehayias X-ACL-Warn: , John Kehayias via Guix-patches X-Patchwork-Original-From: John Kehayias via Guix-patches via From: John Kehayias X-getmail-retrieved-from-mailbox: Patches Empty Message From f48d7d5c2ff1b65a0a95b33acfae17d3fb540ddb Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Fri, 24 Dec 2021 13:55:37 -0500 Subject: [PATCH 4/5] gnu: xmonad: Update to 0.17.0. * gnu/packages/wm.scm (xmonad): Update to 0.17.0. [inputs]: Add GHC-DATA-DEFAULT-CLASS, remove GHC-EXTENSIBLE-EXCEPTIONS, GHC-DATA-DEFAULT, GHC-SEMIGROUPS, and GHC-UTF8-STRING. [native-inputs]: Add GHC-QUICKCHECK and GHC-QUICKCHECK-CLASSES. (ghc-xmonad-contrib): Update to 0.17.0. [propagated-inputs]: Remove GHC-OLD-TIME, GHC-EXTENSIBLE-EXCEPTIONS, GHC-SEMIGROUPS. [native-inputs]: Add GHC-QUICKCHECK and GHC-HSPEC. * gnu/packages/patches/xmonad-dynamic-linking.patch: Update patch. --- .../patches/xmonad-dynamic-linking.patch | 24 ++++++------ gnu/packages/wm.scm | 37 +++++-------------- 2 files changed, 22 insertions(+), 39 deletions(-) diff --git a/gnu/packages/patches/xmonad-dynamic-linking.patch b/gnu/packages/patches/xmonad-dynamic-linking.patch index 4f3386e53a..a1d71825b6 100644 --- a/gnu/packages/patches/xmonad-dynamic-linking.patch +++ b/gnu/packages/patches/xmonad-dynamic-linking.patch @@ -2,15 +2,15 @@ This patch is required for xmonad to make use of shared libraries. Without it, xmonad will not work since we do not (by default) use statically linked Haskell libraries. -diff -ruN xmonad-0.15-a/src/XMonad/Core.hs xmonad-0.15-b/src/XMonad/Core.hs ---- xmonad-0.15-a/src/XMonad/Core.hs 1969-12-31 19:00:00.000000000 -0500 -+++ xmonad-0.15-b/src/XMonad/Core.hs 1969-12-31 19:00:00.000000000 -0500 -@@ -681,6 +681,8 @@ - compileGHC bin dir errHandle = - runProcess "ghc" ["--make" - , "xmonad.hs" -+ , "-dynamic" -+ , "-fPIC" - , "-i" - , "-ilib" - , "-fforce-recomp" +index 46a0939..5ad4f8f 100644 +--- a/src/XMonad/Core.hs ++++ b/src/XMonad/Core.hs +@@ -664,6 +664,8 @@ compile dirs method = + where + ghcArgs = [ "--make" + , "xmonad.hs" ++ , "-dynamic" ++ , "-fPIC" + , "-i" -- only look in @lib@ + , "-ilib" + , "-fforce-recomp" diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index c6881154fe..2aa7309027 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -48,6 +48,7 @@ ;;; Copyright © 2021 Petr Hodina ;;; Copyright © 2021 jgart ;;; Copyright © 2021 Disseminate Dissent +;;; Copyright © 2021 John Kehayias ;;; ;;; This file is part of GNU Guix. ;;; @@ -739,7 +740,7 @@ (define-public i3lock-fancy (define-public xmonad (package (name "xmonad") - (version "0.15") + (version "0.17.0") (synopsis "Tiling window manager") (source (origin (method url-fetch) @@ -747,21 +748,13 @@ (define-public xmonad "xmonad-" version ".tar.gz")) (sha256 (base32 - "0a7rh21k9y6g8fwkggxdxjns2grvvsd5hi2ls4klmqz5xvk4hyaa")) + "04qspdz9w6xpw1npcmx2zx0595wc68q985pv4i0hvp32zillvdqy")) (patches (search-patches "xmonad-dynamic-linking.patch")))) (build-system haskell-build-system) - (inputs - (list ghc-extensible-exceptions - ghc-data-default - ghc-quickcheck - ghc-semigroups - ghc-setlocale - ghc-utf8-string - ghc-x11)) + (inputs (list ghc-data-default-class ghc-setlocale ghc-x11)) + (native-inputs (list ghc-quickcheck ghc-quickcheck-classes)) (arguments - `(#:cabal-revision - ("1" "0yqh96qqphllr0zyz5j93cij5w2qvf39xxnrb52pz0qz3pywz9wd") - #:phases + `(#:phases (modify-phases %standard-phases (add-after 'install 'install-xsession @@ -865,27 +858,17 @@ (define-public yeganesh (define-public ghc-xmonad-contrib (package (name "ghc-xmonad-contrib") - (version "0.16") + (version "0.17.0") (source (origin (method url-fetch) (uri (string-append "mirror://hackage/package/xmonad-contrib/" "xmonad-contrib-" version ".tar.gz")) (sha256 - (base32 "1pddgkvnbww28wykncc7j0yb0lv15bk7xnnhdcbrwkxzw66w6wmd")))) + (base32 "11g1cyfgfvcmz35qhgi9wzxrk3br8m8b7qy3jvph4nnf6aj13wvy")))) (build-system haskell-build-system) - (arguments - `(#:cabal-revision - ("1" "0vimkby2gq6sgzxzbvz67caba609xqlv2ii2gi8a1cjrnn6ib011"))) - (propagated-inputs - (list ghc-old-time - ghc-random - ghc-utf8-string - ghc-extensible-exceptions - ghc-semigroups - ghc-x11 - ghc-x11-xft - xmonad)) + (propagated-inputs (list ghc-random ghc-x11 ghc-utf8-string ghc-x11-xft xmonad)) + (native-inputs (list ghc-quickcheck ghc-hspec)) (home-page "https://xmonad.org") (synopsis "Third party extensions for xmonad") (description -- 2.34.1