From patchwork Sun Apr 30 10:53:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josselin Poiret X-Patchwork-Id: 49698 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 D651627BBEA; Sun, 30 Apr 2023 11:54: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 AB1E827BBE9 for ; Sun, 30 Apr 2023 11:54:23 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pt4h3-0002xO-NS; Sun, 30 Apr 2023 06:54:13 -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 1pt4gy-0002tY-NJ for guix-patches@gnu.org; Sun, 30 Apr 2023 06:54:08 -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 1pt4gw-0002UP-1z for guix-patches@gnu.org; Sun, 30 Apr 2023 06:54:08 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pt4gv-0000WS-Ui for guix-patches@gnu.org; Sun, 30 Apr 2023 06:54:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#61915] [PATCH v2 11/13] gnu: Add agda-categories. Resent-From: Josselin Poiret Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 30 Apr 2023 10:54:05 +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.16828520391909 (code B ref 61915); Sun, 30 Apr 2023 10:54:05 +0000 Received: (at 61915) by debbugs.gnu.org; 30 Apr 2023 10:53:59 +0000 Received: from localhost ([127.0.0.1]:37358 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pt4go-0000UX-3W for submit@debbugs.gnu.org; Sun, 30 Apr 2023 06:53:58 -0400 Received: from jpoiret.xyz ([206.189.101.64]:53586) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pt4ga-0000TJ-9w for 61915@debbugs.gnu.org; Sun, 30 Apr 2023 06:53:44 -0400 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id 886A3185309; Sun, 30 Apr 2023 10:53:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1682852018; 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=A0yDo8vue0W+vSJ0wKJ7KU5tbn+r72lpGbjDlPht2w0=; b=qHcPYO4/phy0+1udh0TIKE3/LcmoUqvXZYiw4o+VnvVCNyVeASMFygch6qmT14+cWqhvLF 4paF/sIbc4R7rN4B0vC30dPhfp9hAW4JcZFtjz7SUmfuqPVpzMr/58Rg9HfYDQ7cc06WP5 OSQX3EQ9Qs+dTIo9XZ2Lm5SYaCUU+1v66PvHMYpBY4Li/PjNT7MnAy0UtWi1DdsbrQa/Xw L9rJpw28r4QrQZkWJjASiq1EXWHWyEFHwbrqxUpOhiyHtQbHf9H1fKxqJORVLOa8cdiPxx iKsaRXc2o5JVakFIp68LjCFw6BsZd0Zq+A3YkgBMussQ9122R1o9W5vIqhs59g== Date: Sun, 30 Apr 2023 12:53:21 +0200 Message-Id: <667b750918cd5dc1b5ae8b635871aa9f942b763b.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-categories-bump-stdlib-version.patch * gnu/packages/patches/agda-categories-remove-incompatible-flags.patch * gnu/packages/patches/agda-categories-use-find.patch: New patches. * gnu/local.mk (dist_patch_DATA): Register them. * gnu/packages/agda.scm: New variable agda-categories. --- gnu/local.mk | 3 ++ gnu/packages/agda.scm | 35 ++++++++++++++++ .../agda-categories-bump-stdlib-version.patch | 42 +++++++++++++++++++ ...categories-remove-incompatible-flags.patch | 31 ++++++++++++++ .../patches/agda-categories-use-find.patch | 31 ++++++++++++++ 5 files changed, 142 insertions(+) create mode 100644 gnu/packages/patches/agda-categories-bump-stdlib-version.patch create mode 100644 gnu/packages/patches/agda-categories-remove-incompatible-flags.patch create mode 100644 gnu/packages/patches/agda-categories-use-find.patch diff --git a/gnu/local.mk b/gnu/local.mk index 0a1c4dfb24..4193146862 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -880,6 +880,9 @@ dist_patch_DATA = \ %D%/packages/patches/aegisub-icu59-include-unistr.patch \ %D%/packages/patches/aegisub-boost68.patch \ %D%/packages/patches/aegisub-make43.patch \ + %D%/packages/patches/agda-categories-bump-stdlib-version.patch \ + %D%/packages/patches/agda-categories-remove-incompatible-flags.patch \ + %D%/packages/patches/agda-categories-use-find.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 \ diff --git a/gnu/packages/agda.scm b/gnu/packages/agda.scm index a6ff01b737..1068d8734f 100644 --- a/gnu/packages/agda.scm +++ b/gnu/packages/agda.scm @@ -230,3 +230,38 @@ (define-public agda-stdlib (home-page "https://wiki.portal.chalmers.se/agda/pmwiki.php") (license license:expat))) +(define-public agda-categories + ;; Upstream hasn't released in a very long time, especially not against + ;; 2.6.3. + (let* ((revision "1") + (commit "20397e93a60ed1439ed57ee76ae377c66a5eb8d9")) + (package + (name "agda-categories") + (version (git-version "0.4" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/agda/agda-categories.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0q4dqvs4ig138wghlglz37ay5i524gk6k5x476ki5mnxc603bmqy")) + (patches (search-patches "agda-categories-bump-stdlib-version.patch" + "agda-categories-remove-incompatible-flags.patch" + "agda-categories-use-find.patch")))) + (build-system agda-build-system) + (arguments + (list + #:gnu-and-haskell? #t + #:phases + #~(modify-phases %standard-phases + (replace 'build + (lambda _ + (invoke "make")))))) + (propagated-inputs + (list agda-stdlib)) + (synopsis "A new Categories library for Agda") + (description "A new Categories library for Agda") + (home-page "https://github.com/agda/agda-categories") + (license license:expat)))) diff --git a/gnu/packages/patches/agda-categories-bump-stdlib-version.patch b/gnu/packages/patches/agda-categories-bump-stdlib-version.patch new file mode 100644 index 0000000000..2e78cc1446 --- /dev/null +++ b/gnu/packages/patches/agda-categories-bump-stdlib-version.patch @@ -0,0 +1,42 @@ +From 080eae2adc1b0e8f1829c4138b3d462218a02f36 Mon Sep 17 00:00:00 2001 +Message-Id: <080eae2adc1b0e8f1829c4138b3d462218a02f36.1682840777.git.dev@jpoiret.xyz> +From: Josselin Poiret +Date: Sun, 30 Apr 2023 09:32:59 +0200 +Subject: [PATCH] Bump Agda to 2.6.3 and stdlib to 1.7.2 + +From: Josselin Poiret + +--- + .github/workflows/ci-ubuntu.yml | 4 ++-- + agda-categories.agda-lib | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/.github/workflows/ci-ubuntu.yml b/.github/workflows/ci-ubuntu.yml +index ab26835d..25604420 100644 +--- a/.github/workflows/ci-ubuntu.yml ++++ b/.github/workflows/ci-ubuntu.yml +@@ -45,8 +45,8 @@ on: + ######################################################################## + + env: +- AGDA_COMMIT: tags/v2.6.2 +- STDLIB_VERSION: 1.7.1 ++ AGDA_COMMIT: tags/v2.6.3 ++ STDLIB_VERSION: 1.7.2 + + GHC_VERSION: 8.6.5 + CABAL_VERSION: 3.2.0.0 +diff --git a/agda-categories.agda-lib b/agda-categories.agda-lib +index 186e350b..5b19c405 100644 +--- a/agda-categories.agda-lib ++++ b/agda-categories.agda-lib +@@ -1,3 +1,3 @@ + name: agda-categories +-depend: standard-library-1.7.1 ++depend: standard-library-1.7.2 + include: src/ + +base-commit: 20397e93a60ed1439ed57ee76ae377c66a5eb8d9 +-- +2.39.2 + diff --git a/gnu/packages/patches/agda-categories-remove-incompatible-flags.patch b/gnu/packages/patches/agda-categories-remove-incompatible-flags.patch new file mode 100644 index 0000000000..dc33af7cf9 --- /dev/null +++ b/gnu/packages/patches/agda-categories-remove-incompatible-flags.patch @@ -0,0 +1,31 @@ +From 3d73d59617281c6ae9c19032eae381ff77fd2e65 Mon Sep 17 00:00:00 2001 +Message-Id: <3d73d59617281c6ae9c19032eae381ff77fd2e65.1682841188.git.dev@jpoiret.xyz> +From: Josselin Poiret +Date: Sun, 30 Apr 2023 09:51:12 +0200 +Subject: [PATCH] Remove stdlib-incompatible flags + +From: Josselin Poiret + +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 68846579..ba5923a2 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,6 +1,6 @@ + .PHONY: test Everything.agda clean + +-OTHEROPTS = --auto-inline -Werror ++OTHEROPTS = + + RTSARGS = +RTS -M6G -A128M -RTS ${OTHEROPTS} + + +base-commit: 20397e93a60ed1439ed57ee76ae377c66a5eb8d9 +prerequisite-patch-id: da10df58fa86d08b31174a01db7b9a02377aba55 +prerequisite-patch-id: 508dabd923ba9ac1ee4d8dab6697432b4bd8ba18 +-- +2.39.2 + diff --git a/gnu/packages/patches/agda-categories-use-find.patch b/gnu/packages/patches/agda-categories-use-find.patch new file mode 100644 index 0000000000..772352a0cb --- /dev/null +++ b/gnu/packages/patches/agda-categories-use-find.patch @@ -0,0 +1,31 @@ +From 53922aedd81d5111d9007b41235aa12eaa2a863d Mon Sep 17 00:00:00 2001 +Message-Id: <53922aedd81d5111d9007b41235aa12eaa2a863d.1682840933.git.dev@jpoiret.xyz> +From: Josselin Poiret +Date: Sun, 30 Apr 2023 09:48:21 +0200 +Subject: [PATCH] Use find instead of git ls-tree in Makefile + +From: Josselin Poiret + +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 158802d1..68846579 100644 +--- a/Makefile ++++ b/Makefile +@@ -11,7 +11,7 @@ html: Everything.agda + agda ${RTSARGS} --html -i. Everything.agda + + Everything.agda: +- git ls-tree --full-tree -r --name-only HEAD | grep '^src/[^\.]*.agda' | sed -e 's|^src/[/]*|import |' -e 's|/|.|g' -e 's/.agda//' -e '/import Everything/d' | LC_COLLATE='C' sort > Everything.agda ++ find src -iname '*.agda' | sed -e 's|^src/[/]*|import |' -e 's|/|.|g' -e 's/.agda//' -e '/import Everything/d' | LC_COLLATE='C' sort > Everything.agda + + clean: + find . -name '*.agdai' -exec rm \{\} \; + +base-commit: 20397e93a60ed1439ed57ee76ae377c66a5eb8d9 +prerequisite-patch-id: da10df58fa86d08b31174a01db7b9a02377aba55 +-- +2.39.2 +