From patchwork Fri Dec 24 19:28:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: John Kehayias X-Patchwork-Id: 35641 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 E45DC27BBE9; 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 7ACB927BBEA for ; Fri, 24 Dec 2021 19:30:46 +0000 (GMT) Received: from localhost ([::1]:34610 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n0qH7-0005vJ-Kx for patchwork@mira.cbaines.net; Fri, 24 Dec 2021 14:30:45 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39022) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n0qGQ-0005uP-K4 for guix-patches@gnu.org; Fri, 24 Dec 2021 14:30:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:54775) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n0qGQ-000618-Ak for guix-patches@gnu.org; Fri, 24 Dec 2021 14:30:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n0qGQ-0007Yb-0W for guix-patches@gnu.org; Fri, 24 Dec 2021 14:30:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52784] [PATCH 1/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:01 +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.164037414228901 (code B ref 52784); Fri, 24 Dec 2021 19:30:01 +0000 Received: (at 52784) by debbugs.gnu.org; 24 Dec 2021 19:29:02 +0000 Received: from localhost ([127.0.0.1]:38075 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n0qFR-0007W4-WA for submit@debbugs.gnu.org; Fri, 24 Dec 2021 14:29:02 -0500 Received: from mail-40134.protonmail.ch ([185.70.40.134]:14030) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n0qFO-0007VR-FM for 52784@debbugs.gnu.org; Fri, 24 Dec 2021 14:29:01 -0500 Date: Fri, 24 Dec 2021 19:28:47 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail2; t=1640374127; bh=etG/dmgaAaO0iqSFCdE2+iZpGoBT0tmmMqfw2PSU2ZQ=; h=Date:To:From:Reply-To:Subject:Message-ID:From:To:Cc; b=Kg3S/hYDmGY6ePNjTvQqRiGGkCQLcxeB+RwmIx2judIoAa1ir8WGOzyiQFMJ6rqhG tRPalsip1aSAN/YiSpuU50YFxs00VtUN6iect+zFWiSasIUV7C0yRVzbiB+YN40HUl LsT18eKEiM1aERyDMY1cAGvlWfsoq9XIfa0q2zoYQIcIKvPp2oh3nl5E95RpcM/XN3 JnEiQmR/FnphawbJTf6e9Ijid6ZqtHcs3J3I8nAtwJgwOOd22DarDHL4x7uc0U3doD MOsug1cX51iiWXLRxXpsP3BfgnOlxigvi9WK9ObzFY7ohkEx4HOTEUA+ahiKD6olPn vk0K/HLqjo3jQ== 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 72a5160025feb84bf7fb111fd1d2b2a29d0ffdb9 Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Fri, 24 Dec 2021 13:45:59 -0500 Subject: [PATCH 1/5] gnu: Add ghc-primitive-addr. * gnu/packages/haskell-xyz.scm (ghc-primitive-addr): New variable. --- gnu/packages/haskell-xyz.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index e2adefa48f..7649e4922d 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -29,6 +29,7 @@ ;;; Copyright © 2020 Carlo Holl ;;; Copyright © 2020 Christine Lemmer-Webber ;;; Copyright © 2021 Alice BRENON +;;; Copyright © 2021 John Kehayias ;;; ;;; This file is part of GNU Guix. ;;; @@ -9944,6 +9945,28 @@ (define-public ghc-primitive "This package provides various primitive memory-related operations.") (license license:bsd-3))) +(define-public ghc-primitive-addr + (package + (name "ghc-primitive-addr") + (version "0.1.0.2") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/primitive-addr/primitive-addr-" + version + ".tar.gz")) + (sha256 + (base32 "06r1p56wm8rbjxnlaqbmc3rbsj1rsv5scwnh80lsn0xw56jc70a2")))) + (build-system haskell-build-system) + (inputs (list ghc-primitive)) + (home-page "https://github.com/haskell-primitive/primitive-addr") + (synopsis "Addresses to unmanaged memory") + (description + "This library provides the @code{Data.Primitive.Addr} module that was a part +of the @code{primitive} library before @code{primitive-0.7.0.0}.") + (license license:bsd-3))) + (define-public ghc-process-extras (package (name "ghc-process-extras") -- 2.34.1 From patchwork Fri Dec 24 19:29:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Kehayias X-Patchwork-Id: 35639 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 7E77C27BBEA; Fri, 24 Dec 2021 19:30:43 +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 3695B27BBE9 for ; Fri, 24 Dec 2021 19:30:43 +0000 (GMT) Received: from localhost ([::1]:34600 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n0qH3-0005uk-BV for patchwork@mira.cbaines.net; Fri, 24 Dec 2021 14:30:41 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39024) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n0qGQ-0005uQ-Ow for guix-patches@gnu.org; Fri, 24 Dec 2021 14:30:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:54776) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n0qGQ-00061X-Fp for guix-patches@gnu.org; Fri, 24 Dec 2021 14:30:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n0qGQ-0007Yj-Dt for guix-patches@gnu.org; Fri, 24 Dec 2021 14:30:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52784] [PATCH 2/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:02 +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.164037415928934 (code B ref 52784); Fri, 24 Dec 2021 19:30:02 +0000 Received: (at 52784) by debbugs.gnu.org; 24 Dec 2021 19:29:19 +0000 Received: from localhost ([127.0.0.1]:38080 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n0qFj-0007Wc-9u for submit@debbugs.gnu.org; Fri, 24 Dec 2021 14:29:19 -0500 Received: from mail-40131.protonmail.ch ([185.70.40.131]:12281) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n0qFh-0007WM-B2 for 52784@debbugs.gnu.org; Fri, 24 Dec 2021 14:29:18 -0500 Date: Fri, 24 Dec 2021 19:29:06 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail2; t=1640374146; bh=lZsVwzjswDolL4ouM0cuGoTB5IHG9dgdMphi6FZPZoA=; h=Date:To:From:Reply-To:Subject:Message-ID:From:To:Cc; b=nii5OL0f1lJHaCQFq0yjmmj9dT5c00T5lD8T1njLzb+tQ6YX/o5gZijDDAr//kw91 sTxSfk8Eolm/jckMOZnGB5ooy7EMXoYvdWCxhjk8uXY8inoBfqYfThwNoLFPIJkcMN Wn5KULjibH28tULLHHdHLfyFraK509ySVPF9Y9AVuhmbabJ538jpQElY3CBByjPHpC R/kPgAufwMxqquvowgY/NHkp5LT8jMHBVFrZOXOHfBR9KRTKsBvVTwyq7A67Ye+2Iq mv1glHo6Db6vLJCJmwqy4mKHgop7FJAW24Hdsl0WT4OA+gO2GPrFezmuwoOqikv9pD mw8crMBpxKN3Q== Message-ID: <1tlUn_67MAFJiBN4BVeunQTBFZhX9lQfK9ZRjTmY0solgLP1fAdeSQoMJsdoR31YWPJv4cqAckDSJK-YhWZO9xe6L8CUaQ4uBSGWtLTvuZY=@protonmail.com> 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 aee88dedea562c405d38eb4dc1a2164b52281600 Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Fri, 24 Dec 2021 13:51:33 -0500 Subject: [PATCH 2/5] gnu: Add ghc-semirings. * gnu/packages/haskell-xyz.scm (ghc-semirings): New variable. --- gnu/packages/haskell-xyz.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 7649e4922d..9e6df24093 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -11398,6 +11398,40 @@ (define-public ghc-semigroups-bootstrap ghc-unordered-containers-bootstrap ghc-hashable-bootstrap)) (properties '((hidden? #t))))) +(define-public ghc-semirings + (package + (name "ghc-semirings") + (version "0.6") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/semirings/semirings-" + version + ".tar.gz")) + (sha256 + (base32 "16q535bvjl7395sqkx6zlw48y4fzr7irp44pcp7w9irpn4cncdcr")))) + (build-system haskell-build-system) + (inputs + (list ghc-base-compat-batteries ghc-hashable ghc-unordered-containers)) + (arguments + `(#:cabal-revision + ("1" "1c06yhfa053sv3rfz0d72a33l5qb0xmj1b3hy2z7pzxrcay6g1yc"))) + (home-page "https://github.com/chessai/semirings") + (synopsis "Two monoids as one, in holy haskimony") + (description + "Haskellers are usually familiar with monoids and semigroups. A monoid has an +appending operation @code{<>} (or @code{mappend}), and an identity element, +@code{mempty}. A semigroup has an appending @code{<>} operation, but does not +require a @code{mempty} element. A Semiring has two appending operations, +@code{plus} and @code{times}, and two respective identity elements, +@code{zero} and @code{one}. More formally, a Semiring R is a set equipped +with two binary relations @code{+} and @code{*}, such that: (R,+) is a +commutative monoid with identity element 0, (R,*) is a monoid with identity +element 1, (*) left and right distributes over addition, and . multiplication +by @code{0} annihilates R.") + (license license:bsd-3))) + (define-public ghc-serialise (package (name "ghc-serialise") -- 2.34.1 From patchwork Fri Dec 24 19:29:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: John Kehayias X-Patchwork-Id: 35642 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 644BF27BBEA; Fri, 24 Dec 2021 19:31:31 +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 D7E7B27BBE9 for ; Fri, 24 Dec 2021 19:31:30 +0000 (GMT) Received: from localhost ([::1]:35254 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n0qHq-0006UI-2k for patchwork@mira.cbaines.net; Fri, 24 Dec 2021 14:31:30 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39026) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n0qGR-0005ug-Iq for guix-patches@gnu.org; Fri, 24 Dec 2021 14:30:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:54777) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n0qGQ-00061x-TK 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 1n0qGQ-0007Yq-R6 for guix-patches@gnu.org; Fri, 24 Dec 2021 14:30:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52784] [PATCH 3/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:02 +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.164037417828979 (code B ref 52784); Fri, 24 Dec 2021 19:30:02 +0000 Received: (at 52784) by debbugs.gnu.org; 24 Dec 2021 19:29:38 +0000 Received: from localhost ([127.0.0.1]:38084 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n0qG1-0007XK-Ju for submit@debbugs.gnu.org; Fri, 24 Dec 2021 14:29:37 -0500 Received: from mail-4322.protonmail.ch ([185.70.43.22]:42287) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n0qFy-0007Ww-Ax for 52784@debbugs.gnu.org; Fri, 24 Dec 2021 14:29:36 -0500 Date: Fri, 24 Dec 2021 19:29:27 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail2; t=1640374167; bh=FnnYhKVFTQU0c6quzhYdp9e3h2S2ZoYg8SnFo4WaQVI=; h=Date:To:From:Reply-To:Subject:Message-ID:From:To:Cc; b=iuTHkH239+OjIJrWPJ/ASfbjfzl6nFWokO4qiUbFYSScAOvzSVEBXGyxfFMpuFwSV 0CLdwDqiGCsdULTIKCO6HMycCge3sYmj4H/v5RGnjrZvzyCeR2WR7E0moQV2FSrWTb N1Lxwgr+GUEQjT2WQjLfd+GGAQuJpLi6baMKBCnu1yRp8hoaZEuDk5BEpGElAJvRCF OX9nY6/r1F9SO/ERBVDHTnjYNm8Rz9zR2bKfLuYn5mapDGYb7jczSArE66j76+VYVI r5b0abqf6ity3syRSebQJaz4bOQu/fsCxbH05I1Hu+Q0suYn1woC/VNL4Ura4YXRMn i+IJgOxE6gWRg== Message-ID: <1kkjy9LkMD4phCPjYgqUH-wqbJpWbrKFcL7eUQsdg0Q-5i5tC5kayc9M5K_lQfbW2PinIaEIVvWISXbsY3vxbzOg3NBSPlf8kvyi34dcwvU=@protonmail.com> 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 e72e083b36d3ad12aa81ee7cbc325c4f61799187 Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Fri, 24 Dec 2021 13:52:16 -0500 Subject: [PATCH 3/5] gnu: Add ghc-quickcheck-classes. * gnu/packages/haskell-check.scm (ghc-quickcheck-classes): New variable. --- gnu/packages/haskell-check.scm | 46 ++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm index e647d65a89..62433cdb15 100644 --- a/gnu/packages/haskell-check.scm +++ b/gnu/packages/haskell-check.scm @@ -13,6 +13,7 @@ ;;; Copyright © 2019 Timothy Sample ;;; Copyright © 2020 John Soo ;;; Copyright © 2020 Carlo Holl +;;; Copyright © 2021 John Kehayias ;;; ;;; This file is part of GNU Guix. ;;; @@ -32,6 +33,7 @@ (define-module (gnu packages haskell-check) #:use-module (gnu packages) #:use-module (gnu packages haskell-crypto) + #:use-module (gnu packages haskell-web) #:use-module (gnu packages haskell-xyz) #:use-module (guix build-system haskell) #:use-module (guix download) @@ -1056,6 +1058,50 @@ (define-public ghc-inspection-testing examples and more information.") (license license:expat))) +(define-public ghc-quickcheck-classes + (package + (name "ghc-quickcheck-classes") + (version "0.6.5.0") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/quickcheck-classes/quickcheck-classes-" + version + ".tar.gz")) + (sha256 + (base32 "19iw15mvb7gws3ljdxqwsbb4pmfc0sfflf8szgmrhiqr3k82mqv2")))) + (build-system haskell-build-system) + (inputs + (list ghc-quickcheck + ghc-primitive + ghc-primitive-addr + ghc-quickcheck-classes-base + ghc-aeson + ghc-semigroupoids + ghc-semirings + ghc-vector)) + (native-inputs + (list ghc-base-orphans + ghc-tagged + ghc-base-orphans + ghc-tagged + ghc-tasty + ghc-tasty-quickcheck)) + (home-page "https://github.com/andrewthad/quickcheck-classes#readme") + (synopsis "QuickCheck common typeclasses") + (description + "This library provides QuickCheck properties to ensure that typeclass +instances adhere to the set of laws that they are supposed to. There are +other libraries that do similar things, such as @code{genvalidity-hspec} and +@code{checkers}. This library differs from other solutions by not introducing +any new typeclasses that the user needs to learn. /Note:/ on GHC < 8.5, this +library uses the higher-kinded typeclasses (@code{Data.Functor.Classes.Show1}, +@code{Data.Functor.Classes.Eq1}, @code{Data.Functor.Classes.Ord1}, etc.), but +on GHC >= 8.5, it uses @code{-XQuantifiedConstraints} to express these +constraints more cleanly.") + (license license:bsd-3))) + (define-public ghc-quickcheck-classes-base (package (name "ghc-quickcheck-classes-base") -- 2.34.1 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 From patchwork Fri Dec 24 19:30:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Kehayias X-Patchwork-Id: 35643 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 2F63A27BBEA; Fri, 24 Dec 2021 19:31:42 +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 EBB6027BBE9 for ; Fri, 24 Dec 2021 19:31:41 +0000 (GMT) Received: from localhost ([::1]:35326 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n0qI1-0006X4-5D for patchwork@mira.cbaines.net; Fri, 24 Dec 2021 14:31:41 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39318) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n0qHW-0006Tk-9H for guix-patches@gnu.org; Fri, 24 Dec 2021 14:31:10 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:54783) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n0qHO-0006JZ-9j for guix-patches@gnu.org; Fri, 24 Dec 2021 14:31:09 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n0qHO-0007cE-7r for guix-patches@gnu.org; Fri, 24 Dec 2021 14:31:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52784] [PATCH 5/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:31:02 +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.164037421429201 (code B ref 52784); Fri, 24 Dec 2021 19:31:02 +0000 Received: (at 52784) by debbugs.gnu.org; 24 Dec 2021 19:30:14 +0000 Received: from localhost ([127.0.0.1]:38096 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n0qGc-0007au-EI for submit@debbugs.gnu.org; Fri, 24 Dec 2021 14:30:14 -0500 Received: from mail-4316.protonmail.ch ([185.70.43.16]:34839) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n0qGa-0007ZZ-W8 for 52784@debbugs.gnu.org; Fri, 24 Dec 2021 14:30:13 -0500 Date: Fri, 24 Dec 2021 19:30:04 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail2; t=1640374206; bh=Rpz9/oK7t8Up4OvQY8RteFxmkUo3W8HEjp0RFJRi/Y4=; h=Date:To:From:Reply-To:Subject:Message-ID:From:To:Cc; b=M1RbuBcqv0TvbPLg1l97LqiWyZzUGogkSNpfa0p7zvOlt4IX5YxHdk+inM70o7V1m lmkiK+EBqX1HptMjTmQN8L4SJf2LwAiNIHiMz8Ji0mALC0g0LLefJ5XL7ASI6R3Wxz DZs0rGFIb7uTExwC8OxEWKNMr5BxhJeYi9+MZqdkBqxVPZKaNnJfeiEraaBt0aXj2D 5HqXFY/9swa0ET5VkxpjoymVkGxr2/StVKWxXL6H5Ix2mN1Eyqtu9rcjZuLnmXUtPn E+qtoH5qG28huMXnP6bwRHxH/suRC9ikUcUuOCdS9Z1aCWfV50ot4GvvbMiONALT4l ZTmtUZqiZ7f0w== 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 ed12779f7d9364e8473495504220e91607e47757 Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Fri, 24 Dec 2021 14:11:29 -0500 Subject: [PATCH 5/5] gnu: xmobar: Update to 0.40. * gnu/packages/wm.scm (xmobar): Update to 0.40. --- gnu/packages/wm.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 2aa7309027..4f79b5f383 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -785,14 +785,14 @@ (define-public xmonad (define-public xmobar (package (name "xmobar") - (version "0.39") + (version "0.40") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/xmobar/" "xmobar-" version ".tar.gz")) (sha256 (base32 - "1k1n3ff0ikdmfq0mi8r2vpqg1iq6hsw1drvxps6k98rvvn87pws6")))) + "1mrdiblm8vilkm1w23pz6xbi16zh1b1lvql26czjzw5k79vd67sf")))) (build-system haskell-build-system) (native-inputs (list ghc-hspec hspec-discover)) -- 2.34.1