From patchwork Thu Mar 2 14:13:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josselin Poiret X-Patchwork-Id: 47532 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 85F6716D0B; Thu, 2 Mar 2023 14:14:21 +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=0.2 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 F0FAD16D02 for ; Thu, 2 Mar 2023 14:14:20 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXjh5-00015z-Vm; Thu, 02 Mar 2023 09:14:04 -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 1pXjh4-00015Y-PG for guix-patches@gnu.org; Thu, 02 Mar 2023 09:14:02 -0500 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 1pXjh4-0000p0-Gw for guix-patches@gnu.org; Thu, 02 Mar 2023 09:14:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pXjh4-0005e9-CI for guix-patches@gnu.org; Thu, 02 Mar 2023 09:14:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61915] [PATCH 1/4] gnu: Add ghc-peano Resent-From: Josselin Poiret Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 02 Mar 2023 14:14:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61915 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Josselin Poiret , 61915@debbugs.gnu.org Received: via spool by 61915-submit@debbugs.gnu.org id=B61915.167776642821640 (code B ref 61915); Thu, 02 Mar 2023 14:14:02 +0000 Received: (at 61915) by debbugs.gnu.org; 2 Mar 2023 14:13:48 +0000 Received: from localhost ([127.0.0.1]:56220 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXjgq-0005cy-4t for submit@debbugs.gnu.org; Thu, 02 Mar 2023 09:13:48 -0500 Received: from jpoiret.xyz ([206.189.101.64]:54728) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXjgo-0005cj-5z for 61915@debbugs.gnu.org; Thu, 02 Mar 2023 09:13:46 -0500 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id D3A4E184D70; Thu, 2 Mar 2023 14:13:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1677766425; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=U5rHgDL9/7cHJEztWHa84efRkxFESbXYTRXWOE+IdEA=; b=At6jNeXeU8lKXDuX358GHc7OR3k2WsFXUjf/gi/dtrHHr0yrjLF3Lo0gpDjHTayRhx2hhy fcdUdmm18VS0R2iZ6NPB6YQoXZpqepA0NsZ+lizXoEMSnk50KDG2X5cRqH9kPp2JPhd++k XOhJR2EKL4cVilpIsLweuIKU6+sIy3tN8HiMOrA7x51XpGrhQMB+Jz36y3tOGxMufRDQxr /QHd74gYpcrKHQaTZX42WI0WcM6v7CugxdIXBlwEaaebjpat87KnxW8IdODgAxtnTEMS+O XERgWU8GWgjmjIlhEChXD7+wtX4RbCSUBzfSSNPeeeCTeJMlF74bbIfsDCtEng== Date: Thu, 2 Mar 2023 15:13:33 +0100 Message-Id: <2e14cdd0ab2fb7159b6536ad2286bbb1ed793010.1677685282.git.dev@jpoiret.xyz> In-Reply-To: References: MIME-Version: 1.0 Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz X-Spamd-Bar: / 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: Josselin Poiret X-ACL-Warn: , Josselin Poiret via Guix-patches X-Patchwork-Original-From: Josselin Poiret via Guix-patches via From: Josselin Poiret 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/haskell-xyz.scm (ghc-peano): New variable. --- gnu/packages/haskell-xyz.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index b6c3a71045..e7e566fcfc 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -8579,6 +8579,26 @@ (define-public ghc-pcre-light syntax and semantics as Perl 5.") (license license:bsd-3))) +(define-public ghc-peano + (package + (name "ghc-peano") + (version "0.1.0.1") + (source (origin + (method url-fetch) + (uri (hackage-uri "peano" version)) + (sha256 + (base32 + "0yzcxrl41dacvx2wkyxjj7hgvz56l4qb59r4h9rmaqd7jcwx5z9i")))) + (build-system haskell-build-system) + (arguments + `(#:cabal-revision ("3" + "0wl22dnz6ld300cg6id3lw991bp8kdfi8h0nbv37vn79i1zdcj5n"))) + (home-page "http://hackage.haskell.org/package/peano") + (synopsis "Peano numbers") + (description "Provides an efficient Haskell implementation of Peano +numbers") + (license license:bsd-3))) + (define-public ghc-persistent (package (name "ghc-persistent") From patchwork Thu Mar 2 14:13:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josselin Poiret X-Patchwork-Id: 47533 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 520BF16D1A; Thu, 2 Mar 2023 14:14:39 +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=0.2 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 A79B416D02 for ; Thu, 2 Mar 2023 14:14:38 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXjh6-00016C-8C; Thu, 02 Mar 2023 09:14:04 -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 1pXjh5-00015g-4v for guix-patches@gnu.org; Thu, 02 Mar 2023 09:14:03 -0500 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 1pXjh4-0000pI-SI for guix-patches@gnu.org; Thu, 02 Mar 2023 09:14:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pXjh4-0005eH-OI for guix-patches@gnu.org; Thu, 02 Mar 2023 09:14:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61915] [PATCH 2/4] gnu: Add ghc-vector-hashtables Resent-From: Josselin Poiret Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 02 Mar 2023 14:14:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61915 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Josselin Poiret , 61915@debbugs.gnu.org Received: via spool by 61915-submit@debbugs.gnu.org id=B61915.167776642921655 (code B ref 61915); Thu, 02 Mar 2023 14:14:02 +0000 Received: (at 61915) by debbugs.gnu.org; 2 Mar 2023 14:13:49 +0000 Received: from localhost ([127.0.0.1]:56224 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXjgq-0005d4-Hq for submit@debbugs.gnu.org; Thu, 02 Mar 2023 09:13:48 -0500 Received: from jpoiret.xyz ([206.189.101.64]:54804) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXjgp-0005cq-7X for 61915@debbugs.gnu.org; Thu, 02 Mar 2023 09:13:47 -0500 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id 6229C185320; Thu, 2 Mar 2023 14:13:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1677766426; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=egpW670P+vY2duP75uNLaCQsl9BDGepdjk/CqKlWPVw=; b=VbtKuwenpTt5vSehiylG+MfeVPt8qFtRE1nb9zxdWoNHsxhewBJrlWDxFzCDZoFj5MTZyQ MP/TzlsI5HFyz05+kVeuJjtEsvuU5C2Yb/S5nlWjRxXRCoqv5cUct+dm0QtHCXiGoJniXx 2dYAdDxwFkPLKBtdWwgNudeZUsrDwEqw3HVp4s1Epp7P9OdcSjYWi1nkrPMbzpQnQa11SV J9zPYhIrWCow2d/RNIYeJ7Q8ZGVt2QL1Qxctt+gUDGdeD/ccVN7GYbyfBkjQDByk2rUs6J TjHASGdhHoM6SjtpzGidOiXDDtEzF/N+C3REHk3bfDcZN4GKsl+idEEHO6Nk7Q== Date: Thu, 2 Mar 2023 15:13:34 +0100 Message-Id: <19d6b531d74ba3a36971000c304851fa29e4de5f.1677685282.git.dev@jpoiret.xyz> In-Reply-To: References: MIME-Version: 1.0 Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz X-Spamd-Bar: / 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: Josselin Poiret X-ACL-Warn: , Josselin Poiret via Guix-patches X-Patchwork-Original-From: Josselin Poiret via Guix-patches via From: Josselin Poiret 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/haskell-xyz.scm (ghc-vector-hashtables): New variable. --- gnu/packages/haskell-xyz.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index e7e566fcfc..a98f8adeb0 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -13305,6 +13305,27 @@ (define-public ghc-vector-builder vector.") (license license:expat))) +(define-public ghc-vector-hashtables + (package + (name "ghc-vector-hashtables") + (version "0.1.1.2") + (source (origin + (method url-fetch) + (uri (hackage-uri "vector-hashtables" version)) + (sha256 + (base32 + "0hrjvy9qg1m5g3w91zxy4syqmp8jk7ajjbxbzkhy282dwfigkyd2")))) + (build-system haskell-build-system) + (inputs (list ghc-primitive ghc-vector ghc-hashable)) + (native-inputs (list ghc-hspec ghc-quickcheck ghc-quickcheck-instances + hspec-discover)) + (home-page "https://github.com/klapaucius/vector-hashtables#readme") + (synopsis "Efficient vector-based mutable hashtables implementation") + (description + "This package provides efficient vector-based hashtable implementation +similar to .NET Generic Dictionary implementation (at the time of 2015).") + (license license:bsd-3))) + (define-public ghc-vector-th-unbox (package (name "ghc-vector-th-unbox") From patchwork Thu Mar 2 14:13:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josselin Poiret X-Patchwork-Id: 47535 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 18EBE16D06; Thu, 2 Mar 2023 14:14: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=0.2 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 2D2AB16D0C for ; Thu, 2 Mar 2023 14:14:39 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXjh7-00016x-J0; Thu, 02 Mar 2023 09:14:05 -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 1pXjh5-00015p-Gd for guix-patches@gnu.org; Thu, 02 Mar 2023 09:14:03 -0500 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 1pXjh5-0000pP-82 for guix-patches@gnu.org; Thu, 02 Mar 2023 09:14:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pXjh5-0005eO-3l for guix-patches@gnu.org; Thu, 02 Mar 2023 09:14:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61915] [PATCH 3/4] gnu: agda: Update to 2.6.3 and switch to git-fetch Resent-From: Josselin Poiret Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 02 Mar 2023 14:14:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61915 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Josselin Poiret , 61915@debbugs.gnu.org Received: via spool by 61915-submit@debbugs.gnu.org id=B61915.167776643021669 (code B ref 61915); Thu, 02 Mar 2023 14:14:03 +0000 Received: (at 61915) by debbugs.gnu.org; 2 Mar 2023 14:13:50 +0000 Received: from localhost ([127.0.0.1]:56228 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXjgr-0005dK-Vw for submit@debbugs.gnu.org; Thu, 02 Mar 2023 09:13:50 -0500 Received: from jpoiret.xyz ([206.189.101.64]:54872) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXjgq-0005cx-3Y for 61915@debbugs.gnu.org; Thu, 02 Mar 2023 09:13:48 -0500 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id 51B94184D70; Thu, 2 Mar 2023 14:13:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1677766427; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4msAWHEg0efsQs1ZfDR+7t1FUXp6fxu8++eZ+QwrCg4=; b=ktdnykO9CkPWQd4evFmgol8M7qnw1vJTMFXt3Tfth/yfbaZwOO2uViWW14aOnUB0YuXaeZ g2TS/jqsdLCjo0FhOZaXZedHuDnfKCpNUiD8/1JRXvmi32nJ1jy3RoZneDcIzzRd6xE92C fDsSc7ZiZ6Tu3OyLJE05KHHsnjCcI8ajDi3d6ri6ab+dS8Q/+ZGEID3ZNhDEA/kX4f0wfm qnHiV1tsbj4sBcdYSKOWDXRhrKsYfm6rzMcqc5/YJYLmNE+PAz+6u+u0uyqbaCxK0s21aV ta2qgPMQe4E7esPGj86Xd2Sg5nUDcJixqMsXbevkarU7+SrVXqC7bwCvuRw0eg== Date: Thu, 2 Mar 2023 15:13:35 +0100 Message-Id: <00bf60ca441527bcd53f209fc9eca0f36389b42b.1677685282.git.dev@jpoiret.xyz> In-Reply-To: References: MIME-Version: 1.0 Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz X-Spamd-Bar: / 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: Josselin Poiret X-ACL-Warn: , Josselin Poiret via Guix-patches X-Patchwork-Original-From: Josselin Poiret via Guix-patches via From: Josselin Poiret 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/agda.scm (agda): Update to 2.6.3, switch to fetching using git so that doc files are included, and add new dependencies ghc-peano and ghc-vector-hashtables. --- gnu/packages/agda.scm | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/gnu/packages/agda.scm b/gnu/packages/agda.scm index 7128a3f108..1595f2cd22 100644 --- a/gnu/packages/agda.scm +++ b/gnu/packages/agda.scm @@ -37,15 +37,17 @@ (define-module (gnu packages agda) (define-public agda (package (name "agda") - (version "2.6.2.2") + (version "2.6.3") (source (origin - (method url-fetch) - (uri (hackage-uri "Agda" version)) + (method git-fetch) + (uri (git-reference + (url "https://github.com/agda/agda.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 "0yjjbhc593ylrm4mq4j01nkdvh7xqsg5in30wxj4y53vf5hkggp5")))) + (base32 "1s7zd01i8pmvi90ywx497kc07z50nah7h0fc2dn6jzb132k5sh1q")))) (build-system haskell-build-system) - (properties '((upstream-name . "Agda"))) (inputs (list ghc-aeson ghc-alex @@ -63,11 +65,13 @@ (define-public agda ghc-monad-control ghc-murmur-hash ghc-parallel + ghc-peano ghc-regex-tdfa ghc-split ghc-strict ghc-unordered-containers ghc-uri-encode + ghc-vector-hashtables ghc-zlib)) (arguments (list #:modules `((guix build haskell-build-system) From patchwork Thu Mar 2 14:13:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josselin Poiret X-Patchwork-Id: 47534 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 8592A16D17; Thu, 2 Mar 2023 14:14:39 +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=0.2 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 A7D6016D06 for ; Thu, 2 Mar 2023 14:14:38 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXjh7-00017G-Q9; Thu, 02 Mar 2023 09:14:05 -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 1pXjh5-00015x-RC for guix-patches@gnu.org; Thu, 02 Mar 2023 09:14:03 -0500 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 1pXjh5-0000pX-Is for guix-patches@gnu.org; Thu, 02 Mar 2023 09:14:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pXjh5-0005eV-FG for guix-patches@gnu.org; Thu, 02 Mar 2023 09:14:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61915] [PATCH 4/4] gnu: agda: Build info manual Resent-From: Josselin Poiret Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 02 Mar 2023 14:14:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61915 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Josselin Poiret , 61915@debbugs.gnu.org Received: via spool by 61915-submit@debbugs.gnu.org id=B61915.167776643121677 (code B ref 61915); Thu, 02 Mar 2023 14:14:03 +0000 Received: (at 61915) by debbugs.gnu.org; 2 Mar 2023 14:13:51 +0000 Received: from localhost ([127.0.0.1]:56230 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXjgt-0005dZ-As for submit@debbugs.gnu.org; Thu, 02 Mar 2023 09:13:51 -0500 Received: from jpoiret.xyz ([206.189.101.64]:54938) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXjgr-0005dE-8d for 61915@debbugs.gnu.org; Thu, 02 Mar 2023 09:13:49 -0500 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id 3AEE8185320; Thu, 2 Mar 2023 14:13:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1677766428; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=v3h10WzqwYTpiBL1c8ZaRcOoNOZcepwpSeEDMR3AktU=; b=BRtfLyuc90rF3fNzmCmSx7r4YrYBEcs1q62bAT81j5eJ4s74ZbtpJCdOwEwdsfMTscba62 KU21CaCeo7enWWSYCzM3NgmwD65cu1uWOJnfT12VLBPUWsd2Rnj14PaF/XdttBArKxvSSq 1uJMCLgeZOOqdFEjXW2P3b2y0OlXiaSttTNvIQ1juAZ4QWrzT6B0Ewqo2bNezoEPtOGtg1 31r+vyIJQJT3w2O0TT8q03rN5yGSKVkCtfG/JdmIWMVkTJd8lNylpsSXCyw6q296DGS0Sj UXxdtsrX5SyrhZTRbdRT/q0+ZblllphX27CMCKLKxLhiGeSsQjnedbRNxdd9BQ== Date: Thu, 2 Mar 2023 15:13:36 +0100 Message-Id: <81be0b60a3c43f9e5a20c662734b8eba2d6f457c.1677685282.git.dev@jpoiret.xyz> In-Reply-To: References: MIME-Version: 1.0 Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz X-Spamd-Bar: / 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: Josselin Poiret X-ACL-Warn: , Josselin Poiret via Guix-patches X-Patchwork-Original-From: Josselin Poiret via Guix-patches via From: Josselin Poiret 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/agda.scm (agda): Build the user manual as an info manual. --- gnu/packages/agda.scm | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/gnu/packages/agda.scm b/gnu/packages/agda.scm index 1595f2cd22..4a157d5c39 100644 --- a/gnu/packages/agda.scm +++ b/gnu/packages/agda.scm @@ -25,6 +25,10 @@ (define-module (gnu packages agda) #:use-module (gnu packages haskell-check) #:use-module (gnu packages haskell-web) #:use-module (gnu packages haskell-xyz) + #:use-module (gnu packages imagemagick) + #:use-module (gnu packages python) + #:use-module (gnu packages texinfo) + #:use-module (gnu packages sphinx) #:use-module (guix build-system emacs) #:use-module (guix build-system gnu) #:use-module (guix build-system haskell) @@ -73,6 +77,12 @@ (define-public agda ghc-uri-encode ghc-vector-hashtables ghc-zlib)) + (native-inputs + (list python + python-sphinx + python-sphinx-rtd-theme + texinfo + imagemagick)) (arguments (list #:modules `((guix build haskell-build-system) (guix build utils) @@ -89,7 +99,16 @@ (define-public agda (let ((agda-compiler (string-append #$output "/bin/agda"))) (for-each (cut invoke agda-compiler <>) (find-files (string-append #$output "/share") - "\\.agda$")))))))) + "\\.agda$"))))) + (add-after 'agda-compile 'install-info + (lambda _ + (with-directory-excursion "doc/user-manual" + (invoke "sphinx-build" "-b" "texinfo" + "." "_build_texinfo") + (with-directory-excursion "_build_texinfo" + (setenv "infodir" (string-append #$output + "/share/info")) + (invoke "make" "install-info")))))))) (home-page "https://wiki.portal.chalmers.se/agda/") (synopsis "Dependently typed functional programming language and proof assistant")