GNU bug report logs - #67315
[PATCH 1/2] gnu: lean: Use G-expressions.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 67315 in the body.
You can then email your comments to 67315 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Zhu Zihao <all_but_last <at> 163.com>
To: guix-patches <at> gnu.org
Cc: Zhu Zihao <all_but_last <at> 163.com>
Subject: [PATCH 1/2] gnu: lean: Use G-expressions.
Date: Tue, 21 Nov 2023 11:54:38 +0800

* gnu/packages/lean.scm (lean)[arguments]: Use G-expressions.
---
 gnu/packages/lean.scm | 49 +++++++++++++++++++++++--------------------
 1 file changed, 26 insertions(+), 23 deletions(-)

diff --git a/gnu/packages/lean.scm b/gnu/packages/lean.scm
index 12c1849cdb..a8ad085d7e 100644
--- a/gnu/packages/lean.scm
+++ b/gnu/packages/lean.scm
@@ -3,6 +3,7 @@
 ;;; Copyright © 2020 Brett Gilio <brettg <at> gnu.org>
 ;;; Copyright © 2020 Tobias Geerinckx-Rice <me <at> tobias.gr>
 ;;; Copyright © 2022 Pradana Aumars <paumars <at> courrier.dev>
+;;; Copyright © 2023 Zhu Zihao <all_but_last <at> 163.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -25,6 +26,7 @@ (define-module (gnu packages lean)
   #:use-module (guix build-system cmake)
   #:use-module (guix build-system python)
   #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix gexp)
   #:use-module (guix packages)
   #:use-module (guix git-download)
   #:use-module (guix download)
@@ -52,29 +54,30 @@ (define-public lean
     (inputs
      (list bash-minimal gmp))
     (arguments
-     `(#:build-type "Release"           ; default upstream build type
-       ;; XXX: Test phases currently fail on 32-bit sytems.
-       ;; Tests for those architectures have been temporarily
-       ;; disabled, pending further investigation.
-       #:tests? ,(and (not (%current-target-system))
-                      (let ((arch (%current-system)))
-                        (not (or (string-prefix? "i686" arch)
-                                 (string-prefix? "armhf" arch)))))
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'patch-source-shebangs 'patch-tests-shebangs
-           (lambda _
-             (let ((sh (which "sh"))
-                   (bash (which "bash")))
-               (substitute* (find-files "tests/lean" "\\.sh$")
-                 (("#![[:blank:]]?/bin/sh")
-                  (string-append "#!" sh))
-                 (("#![[:blank:]]?/bin/bash")
-                  (string-append "#!" bash))
-                 (("#![[:blank:]]?usr/bin/env bash")
-                  (string-append "#!" bash))))))
-         (add-before 'configure 'chdir-to-src
-           (lambda _ (chdir "src"))))))
+     (list
+      #:build-type "Release"            ; default upstream build type
+      ;; XXX: Test phases currently fail on 32-bit sytems.
+      ;; Tests for those architectures have been temporarily
+      ;; disabled, pending further investigation.
+      #:tests? (and (not (%current-target-system))
+                    (let ((arch (%current-system)))
+                      (not (or (string-prefix? "i686" arch)
+                               (string-prefix? "armhf" arch)))))
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'patch-source-shebangs 'patch-tests-shebangs
+            (lambda _
+              (let ((sh (which "sh"))
+                    (bash (which "bash")))
+                (substitute* (find-files "tests/lean" "\\.sh$")
+                  (("#![[:blank:]]?/bin/sh")
+                   (string-append "#!" sh))
+                  (("#![[:blank:]]?/bin/bash")
+                   (string-append "#!" bash))
+                  (("#![[:blank:]]?usr/bin/env bash")
+                   (string-append "#!" bash))))))
+          (add-before 'configure 'chdir-to-src
+            (lambda _ (chdir "src"))))))
     (synopsis "Theorem prover and programming language")
     (description
      "Lean is a theorem prover and programming language with a small trusted

base-commit: d20ece07dbb09382f361c8bbf0bcab9e83d8b73e
-- 
2.41.0

Message #8 received at 67315 <at> debbugs.gnu.org (full text, mbox):

From: Zhu Zihao <all_but_last <at> 163.com>
To: 67315 <at> debbugs.gnu.org
Cc: Zhu Zihao <all_but_last <at> 163.com>
Subject: [PATCH 2/2] gnu: lean: Update to 3.51.1.
Date: Tue, 21 Nov 2023 12:48:29 +0800

* gnu/packages/lean.scm (lean): Update to 3.51.1.
[home-page]: Use new home page.
[arguments]<#:phases>: Remove stale phase 'patch-tests-shebangs'.
[inputs]: Remove bash-minimal.

Change-Id: Ib90a124b4a6b06fb30223ad4b9254249e56dd086
---
 gnu/packages/lean.scm | 24 +++++++-----------------
 1 file changed, 7 insertions(+), 17 deletions(-)

diff --git a/gnu/packages/lean.scm b/gnu/packages/lean.scm
index a8ad085d7e..1533200426 100644
--- a/gnu/packages/lean.scm
+++ b/gnu/packages/lean.scm
@@ -40,19 +40,20 @@ (define-module (gnu packages lean)
 (define-public lean
   (package
     (name "lean")
-    (version "3.41.0")
-    (home-page "https://github.com/leanprover-community/lean")
+    (version "3.51.1")
+    (home-page "https://lean-lang.org" )
     (source (origin
               (method git-fetch)
-              (uri (git-reference (url home-page)
-                                  (commit (string-append "v" version))))
+              (uri (git-reference
+                    (url "https://github.com/leanprover-community/lean")
+                    (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0mpxlfjq460x1vi3v6qzgjv74asg0qlhykd51pj347795x5b1hf1"))))
+                "17g4d3lqnbl1yfy2pjannf73v8qhc5003d2jkmrqiy05zkqs8d9n"))))
     (build-system cmake-build-system)
     (inputs
-     (list bash-minimal gmp))
+     (list gmp))
     (arguments
      (list
       #:build-type "Release"            ; default upstream build type
@@ -65,17 +66,6 @@ (define-public lean
                                (string-prefix? "armhf" arch)))))
       #:phases
       #~(modify-phases %standard-phases
-          (add-after 'patch-source-shebangs 'patch-tests-shebangs
-            (lambda _
-              (let ((sh (which "sh"))
-                    (bash (which "bash")))
-                (substitute* (find-files "tests/lean" "\\.sh$")
-                  (("#![[:blank:]]?/bin/sh")
-                   (string-append "#!" sh))
-                  (("#![[:blank:]]?/bin/bash")
-                   (string-append "#!" bash))
-                  (("#![[:blank:]]?usr/bin/env bash")
-                   (string-append "#!" bash))))))
           (add-before 'configure 'chdir-to-src
             (lambda _ (chdir "src"))))))
     (synopsis "Theorem prover and programming language")
-- 
2.41.0

Message #13 received at 67315-done <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: Zhu Zihao <all_but_last <at> 163.com>
Cc: 67315-done <at> debbugs.gnu.org
Subject: Re: [bug#67315] [PATCH 1/2] gnu: lean: Use G-expressions.
Date: Mon, 11 Dec 2023 23:49:59 +0100

Hi,

Zhu Zihao <all_but_last <at> 163.com> skribis:

> * gnu/packages/lean.scm (lean)[arguments]: Use G-expressions.

[...]

> * gnu/packages/lean.scm (lean): Update to 3.51.1.
> [home-page]: Use new home page.
> [arguments]<#:phases>: Remove stale phase 'patch-tests-shebangs'.
> [inputs]: Remove bash-minimal.
>
> Change-Id: Ib90a124b4a6b06fb30223ad4b9254249e56dd086

Applied, thanks!

Ludo’.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.