From patchwork Sun Apr 30 10:53:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josselin Poiret X-Patchwork-Id: 49705 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 5878127BBE2; Sun, 30 Apr 2023 11:55:24 +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=-1.7 required=5.0 tests=BAYES_00,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 4658027BBE9 for ; Sun, 30 Apr 2023 11:55:22 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pt4hx-0003Mj-OE; Sun, 30 Apr 2023 06:55:11 -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 1pt4hr-0003KL-6u for guix-patches@gnu.org; Sun, 30 Apr 2023 06:55:03 -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 1pt4hq-0002h0-Pi for guix-patches@gnu.org; Sun, 30 Apr 2023 06:55:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pt4hq-0000b8-LU for guix-patches@gnu.org; Sun, 30 Apr 2023 06:55:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#61915] [PATCH v2 10/13] gnu: Add agda-stdlib. Resent-From: Josselin Poiret Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 30 Apr 2023 10:55: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 , Simon Tournier , 61915@debbugs.gnu.org Received: via spool by 61915-submit@debbugs.gnu.org id=B61915.16828520562066 (code B ref 61915); Sun, 30 Apr 2023 10:55:02 +0000 Received: (at 61915) by debbugs.gnu.org; 30 Apr 2023 10:54:16 +0000 Received: from localhost ([127.0.0.1]:37379 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pt4h5-0000XE-OO for submit@debbugs.gnu.org; Sun, 30 Apr 2023 06:54:16 -0400 Received: from jpoiret.xyz ([206.189.101.64]:53234) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pt4gU-0000SP-4w for 61915@debbugs.gnu.org; Sun, 30 Apr 2023 06:53:53 -0400 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id 3ABDE18531A; Sun, 30 Apr 2023 10:53:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1682852017; 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=mYGSblUGzIIkj+N/tdYL1iNvRjHO7pmCEgsheblgH4Q=; b=wc30Q7cANPWQ/CLgIE8GoKiLGoWem0slYMMHQBvfZDfkgIIB8qChvS+bXFwDaInHd3LHWu Mz/HDJBdKmWj66w2NCX6U0Rqo8V59aVesr8FGhzRbZ5W7M/QqqkGJmZUAmZ5yQqE5Wqza1 w0YCHx/CTA8VF4zrajG06u2gvbsNtPNoKWVwHtMD9NXfUGUIrjpLHSlsXQxqUSuLeCcYd5 YpEM6pCu+AGqlNrPMtXLBkfF3aR1jqb8y2o5VMlogNoxcvBNZb86xE7qg/Vo7wJnkCtmVF DnfgZ5/U4sWUDBFDSksk1Afd0Y22b8BTYxKxGdffGXSqlO5sWfTfLCLtI8PzBg== Date: Sun, 30 Apr 2023 12:53:20 +0200 Message-Id: <5182ba2731eb1f2e4b27164f9409cace176710de.1682851600.git.dev@jpoiret.xyz> In-Reply-To: References: MIME-Version: 1.0 X-Spamd-Bar: / Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz 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 From: Josselin Poiret * gnu/packages/patches/agda-stdlib-use-runhaskell.patch: New patch. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/agda.scm: New variable agda-stdlib. --- gnu/local.mk | 1 + gnu/packages/agda.scm | 37 +++++++++++++++++++ .../patches/agda-stdlib-use-runhaskell.patch | 28 ++++++++++++++ 3 files changed, 66 insertions(+) create mode 100644 gnu/packages/patches/agda-stdlib-use-runhaskell.patch diff --git a/gnu/local.mk b/gnu/local.mk index 712649c5fc..0a1c4dfb24 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -881,6 +881,7 @@ dist_patch_DATA = \ %D%/packages/patches/aegisub-boost68.patch \ %D%/packages/patches/aegisub-make43.patch \ %D%/packages/patches/agda-libdirs-env-variable.patch \ + %D%/packages/patches/agda-stdlib-use-runhaskell.patch \ %D%/packages/patches/agg-am_c_prototype.patch \ %D%/packages/patches/agg-2.5-gcc8.patch \ %D%/packages/patches/akonadi-paths.patch \ diff --git a/gnu/packages/agda.scm b/gnu/packages/agda.scm index 17ea5b62be..a6ff01b737 100644 --- a/gnu/packages/agda.scm +++ b/gnu/packages/agda.scm @@ -30,6 +30,7 @@ (define-module (gnu packages agda) #:use-module (gnu packages python) #:use-module (gnu packages sphinx) #:use-module (gnu packages texinfo) + #:use-module (guix build-system agda) #:use-module (guix build-system emacs) #:use-module (guix build-system gnu) #:use-module (guix build-system haskell) @@ -193,3 +194,39 @@ (define-public agda-ial trees, tries, vectors, and rudimentary IO. A number of good ideas come from Agda's standard library.") (license license:expat))) + +(define-public agda-stdlib + (package + (name "agda-stdlib") + (version "1.7.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/agda/agda-stdlib") + (commit (string-append "v" version)))) + (sha256 + (base32 + "065hf24xjpciwdrvk4isslgcgi01q0k93ql0y1sjqqvy5ryg5xmy")))) + (build-system agda-build-system) + (arguments + (list + #:plan '(("^\\./README.agda$" "-i.")) + #:gnu-and-haskell? #t + #:phases + #~(modify-phases %standard-phases + (add-before 'build 'generate-everything + (lambda* (#:key inputs native-inputs #:allow-other-keys) + (invoke + (search-input-file (or native-inputs inputs) "/bin/runhaskell") + "GenerateEverything.hs")))))) + (native-inputs (list ghc-filemanip)) + (synopsis "The Agda Standard Library") + (description + "The standard library aims to contain all the tools needed to write +both programs and proofs easily. While we always try and write efficient +code, we prioritize ease of proof over type-checking and normalization +performance. If computational performance is important to you, then perhaps +try agda-prelude instead.") + (home-page "https://wiki.portal.chalmers.se/agda/pmwiki.php") + (license license:expat))) + diff --git a/gnu/packages/patches/agda-stdlib-use-runhaskell.patch b/gnu/packages/patches/agda-stdlib-use-runhaskell.patch new file mode 100644 index 0000000000..21ce16689f --- /dev/null +++ b/gnu/packages/patches/agda-stdlib-use-runhaskell.patch @@ -0,0 +1,28 @@ +From 3dc3c0856906d25bb697a4480a8457a69637cd51 Mon Sep 17 00:00:00 2001 +Message-Id: <3dc3c0856906d25bb697a4480a8457a69637cd51.1682798848.git.dev@jpoiret.xyz> +From: Josselin Poiret +Date: Sat, 29 Apr 2023 22:06:55 +0200 +Subject: [PATCH] Makefile: use runhaskell instead of cabal + +From: Josselin Poiret + +--- + GNUmakefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/GNUmakefile b/GNUmakefile +index c5d886e03..f3cb2a1e7 100644 +--- a/GNUmakefile ++++ b/GNUmakefile +@@ -21,7 +21,7 @@ Everything.agda: + # command `cabal install` is needed by cabal-install <= 2.4.*. I did + # not found any problem running both commands with different versions + # of cabal-install. See Issue #1001. +- cabal run GenerateEverything ++ runhaskell GenerateEverything + + .PHONY: listings + listings: Everything.agda +-- +2.39.2 +