[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#61915] [PATCH v2 11/13] gnu: Add agda-categories.
From: |
Josselin Poiret |
Subject: |
[bug#61915] [PATCH v2 11/13] gnu: Add agda-categories. |
Date: |
Sun, 30 Apr 2023 12:53:21 +0200 |
From: Josselin Poiret <dev@jpoiret.xyz>
* 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 <dev@jpoiret.xyz>
+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 <dev@jpoiret.xyz>
+
+---
+ .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 <dev@jpoiret.xyz>
+Date: Sun, 30 Apr 2023 09:51:12 +0200
+Subject: [PATCH] Remove stdlib-incompatible flags
+
+From: Josselin Poiret <dev@jpoiret.xyz>
+
+---
+ 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 <dev@jpoiret.xyz>
+Date: Sun, 30 Apr 2023 09:48:21 +0200
+Subject: [PATCH] Use find instead of git ls-tree in Makefile
+
+From: Josselin Poiret <dev@jpoiret.xyz>
+
+---
+ 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
+
--
2.39.2
- [bug#61915] [PATCH v2 02/13] gnu: Add ghc-vector-hashtables., (continued)
- [bug#61915] [PATCH v2 02/13] gnu: Add ghc-vector-hashtables., Josselin Poiret, 2023/04/30
- [bug#61915] [PATCH v2 04/13] gnu: agda: Build info manual., Josselin Poiret, 2023/04/30
- [bug#61915] [PATCH v2 06/13] gnu: emacs-agda2-mode: Switch to G-Exps., Josselin Poiret, 2023/04/30
- [bug#61915] [PATCH v2 07/13] gnu: agda: Add AGDA_LIBDIRS search-path., Josselin Poiret, 2023/04/30
- [bug#61915] [PATCH v2 12/13] gnu: Add agda-cubical., Josselin Poiret, 2023/04/30
- [bug#61915] [PATCH v2 05/13] gnu: emacs-agda2-mode: No longer inherit from agda., Josselin Poiret, 2023/04/30
- [bug#61915] [PATCH v2 03/13] gnu: agda: Update to 2.6.3 and switch to git-fetch., Josselin Poiret, 2023/04/30
- [bug#61915] [PATCH v2 09/13] build-system: New agda-build-system., Josselin Poiret, 2023/04/30
- [bug#61915] [PATCH v2 13/13] gnu: Add agda-1lab., Josselin Poiret, 2023/04/30
- [bug#61915] [PATCH v2 08/13] build-system/haskell: Export default-haskell., Josselin Poiret, 2023/04/30
- [bug#61915] [PATCH v2 11/13] gnu: Add agda-categories.,
Josselin Poiret <=
- [bug#61915] [PATCH v2 10/13] gnu: Add agda-stdlib., Josselin Poiret, 2023/04/30