From patchwork Fri Oct 27 18:14:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josselin Poiret X-Patchwork-Id: 55428 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 0B69427BBEC; Fri, 27 Oct 2023 19:14:55 +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=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, 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 9827E27BBE9 for ; Fri, 27 Oct 2023 19:14:53 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qwRM7-0003ww-LJ; Fri, 27 Oct 2023 14:14:47 -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 1qwRLs-0003q1-26 for guix-patches@gnu.org; Fri, 27 Oct 2023 14:14:32 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qwRLr-0003q0-RL for guix-patches@gnu.org; Fri, 27 Oct 2023 14:14:31 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qwRMN-0008P6-03 for guix-patches@gnu.org; Fri, 27 Oct 2023 14:15:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66775] [PATCH 2/6] gnu: agda: Update to 2.6.4. Resent-From: Josselin Poiret Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 27 Oct 2023 18:15:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66775 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66775@debbugs.gnu.org Cc: Josselin Poiret Received: via spool by 66775-submit@debbugs.gnu.org id=B66775.169843049832259 (code B ref 66775); Fri, 27 Oct 2023 18:15:02 +0000 Received: (at 66775) by debbugs.gnu.org; 27 Oct 2023 18:14:58 +0000 Received: from localhost ([127.0.0.1]:37169 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qwRMG-0008O5-N8 for submit@debbugs.gnu.org; Fri, 27 Oct 2023 14:14:57 -0400 Received: from jpoiret.xyz ([206.189.101.64]:52462) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qwRMD-0008Nu-Gg for 66775@debbugs.gnu.org; Fri, 27 Oct 2023 14:14:54 -0400 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id C5A3318518E; Fri, 27 Oct 2023 18:14:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1698430461; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=bxE3M5MCFQ2jcpbjdhlZHxiiisYrSljW3C9Rfbyk33c=; b=pBHqkIDHmCzF5xsdPFOlV9yOb7qBaQpyH5D3RBZspNBH5DspbujLgLTxrPw8Qcd1ZodrgV fIvxgrOmB/Ccs+JphrufUCtEdIoM7O2MjrpMJmVs+MPDO9fF1HIYodEsUg8my5iLeHMt4E OgvJ8E/1PnThWmWH5WyVs1oIejcTVt8lOSbjD2j+N2eNby3dx8Cf66vnN/yNoxSb8DkV3v wp8tYKV37Asu53puqrHezvGSPT9LDvpwVl7ssUowWP8jVJtbXDzfVzpMRkdZ89gon647+W 4aE+oQRKpTzOkS9CbAIX14d+iCk1KJKag1mEHT5cSRgnnRYtqRpcCRyGkDPGFw== Date: Fri, 27 Oct 2023 20:14:02 +0200 Message-ID: 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/agda.scm (agda): Update to 2.6.4. Also build with optimizations and cluster counting support. * gnu/packages/patches/agda-use-sphinx-5.patch: New patch. * gnu/local.mk (dist_patch_DATA): Register it. Change-Id: I98a66678ec401b9201d9fd3a0f606fff9767b4bc --- gnu/local.mk | 1 + gnu/packages/agda.scm | 11 +++-- gnu/packages/patches/agda-use-sphinx-5.patch | 51 ++++++++++++++++++++ 3 files changed, 60 insertions(+), 3 deletions(-) create mode 100644 gnu/packages/patches/agda-use-sphinx-5.patch diff --git a/gnu/local.mk b/gnu/local.mk index a00884a7c6..47626a6926 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -900,6 +900,7 @@ dist_patch_DATA = \ %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-use-sphinx-5.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 \ diff --git a/gnu/packages/agda.scm b/gnu/packages/agda.scm index 8258818722..8c82701596 100644 --- a/gnu/packages/agda.scm +++ b/gnu/packages/agda.scm @@ -44,7 +44,7 @@ (define-module (gnu packages agda) (define-public agda (package (name "agda") - (version "2.6.3") + (version "2.6.4") (source (origin (method git-fetch) @@ -53,12 +53,14 @@ (define-public agda (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1s7zd01i8pmvi90ywx497kc07z50nah7h0fc2dn6jzb132k5sh1q")) - (patches (search-patches "agda-libdirs-env-variable.patch")))) + (base32 "0n4avd58j45rdcmnwgrmz5s0ril0z4n2z711mwwbahl50f7359ky")) + (patches (search-patches "agda-libdirs-env-variable.patch" + "agda-use-sphinx-5.patch")))) (build-system haskell-build-system) (inputs (list ghc-aeson ghc-alex + ghc-ansi-terminal ghc-async ghc-blaze-html ghc-boxes @@ -73,9 +75,11 @@ (define-public agda ghc-monad-control ghc-murmur-hash ghc-parallel + ghc-peano ghc-regex-tdfa ghc-split ghc-strict + ghc-text-icu ghc-unordered-containers ghc-uri-encode ghc-vector-hashtables @@ -91,6 +95,7 @@ (define-public agda (guix build utils) (srfi srfi-26) (ice-9 match)) + #:configure-flags #~(list "-foptimise-heavily" "-fenable-cluster-counting") #:phases #~(modify-phases %standard-phases ;; This allows us to call the 'agda' binary before installing. diff --git a/gnu/packages/patches/agda-use-sphinx-5.patch b/gnu/packages/patches/agda-use-sphinx-5.patch new file mode 100644 index 0000000000..19fcf252f9 --- /dev/null +++ b/gnu/packages/patches/agda-use-sphinx-5.patch @@ -0,0 +1,51 @@ +From 99ed1b59ef73fd35053810f6a09e034e1513caee Mon Sep 17 00:00:00 2001 +Message-ID: <99ed1b59ef73fd35053810f6a09e034e1513caee.1698243851.git.dev@jpoiret.xyz> +From: Josselin Poiret +Date: Wed, 25 Oct 2023 16:23:32 +0200 +Subject: [PATCH] Revert "Docs: bump Sphinx to 6.0.0" + +From: Josselin Poiret + +This reverts commit 40dd42eaa7c04e134fa38cb4f958414a76df27a7. +--- + doc/user-manual/conf.py | 5 ++--- + doc/user-manual/requirements.txt | 4 ++-- + 2 files changed, 4 insertions(+), 5 deletions(-) + +diff --git a/doc/user-manual/conf.py b/doc/user-manual/conf.py +index 127f6582dc..d737ede19b 100644 +--- a/doc/user-manual/conf.py ++++ b/doc/user-manual/conf.py +@@ -35,7 +35,7 @@ release = version + # + # If your change the version here also change it in the + # `requirements.txt` file [Issue #1936]. +-needs_sphinx = '6.0.0' ++needs_sphinx = '5.0.0' + + # Add any Sphinx extension module names here, as strings. They can be + # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom +@@ -43,8 +43,7 @@ needs_sphinx = '6.0.0' + extensions = [ + 'sphinx.ext.imgmath', + 'sphinx.ext.ifconfig', +- 'sphinx.ext.imgconverter', +- 'sphinxcontrib.jquery' ++ 'sphinx.ext.imgconverter' + ] + + # Add any paths that contain templates here, relative to this directory. +diff --git a/doc/user-manual/requirements.txt b/doc/user-manual/requirements.txt +index 384b1466b4..656e6c9ac0 100644 +--- a/doc/user-manual/requirements.txt ++++ b/doc/user-manual/requirements.txt +@@ -1,2 +1,2 @@ +-Sphinx >= 7.2.5 +-sphinx_rtd_theme >= 1.3.0 ++Sphinx >= 5.0.0, != 5.2.0.post0 ++sphinx_rtd_theme >= 1.0 + +base-commit: 08b79a684d712ba3dc4b26e5052ec49f49f5ff6c +-- +2.41.0 +