From f8b6f8a4fd0db2e3fed1bd3ddafc64c2af6fc9ab Mon Sep 17 00:00:00 2001 From: psong Date: Sun, 3 Nov 2024 17:30:24 -0800 Subject: [PATCH] Bump to Lean v4.13.0 (latest stable release) and fix some bugs --- LeanCopilot/LlmAesop.lean | 1 - LeanCopilot/Tactics.lean | 1 + lake-manifest.json | 10 +++++----- lakefile.lean | 10 +++++----- lean-toolchain | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/LeanCopilot/LlmAesop.lean b/LeanCopilot/LlmAesop.lean index 097cb5b..8cc9bf5 100644 --- a/LeanCopilot/LlmAesop.lean +++ b/LeanCopilot/LlmAesop.lean @@ -1,6 +1,5 @@ import LeanCopilot.Tactics import LeanCopilot.Options -import Batteries.Data.String.Basic import Aesop set_option autoImplicit false diff --git a/LeanCopilot/Tactics.lean b/LeanCopilot/Tactics.lean index 763c538..a4319c5 100644 --- a/LeanCopilot/Tactics.lean +++ b/LeanCopilot/Tactics.lean @@ -3,6 +3,7 @@ import LeanCopilot.Options import LeanCopilot.Frontend import Aesop.Util.Basic import Batteries.Data.String.Basic +import Batteries.Data.String.Matcher open Lean Meta Parser Elab Term Tactic diff --git a/lake-manifest.json b/lake-manifest.json index 3a0d6f5..3910d6e 100644 --- a/lake-manifest.json +++ b/lake-manifest.json @@ -5,20 +5,20 @@ "type": "git", "subDir": null, "scope": "", - "rev": "9c6c2d647e57b2b7a0b42dd8080c698bd33a1b6f", + "rev": "31a10a332858d6981dbcf55d54ee51680dd75f18", "name": "batteries", "manifestFile": "lake-manifest.json", - "inputRev": "9c6c2d647e57b2b7a0b42dd8080c698bd33a1b6f", + "inputRev": "31a10a332858d6981dbcf55d54ee51680dd75f18", "inherited": false, - "configFile": "lakefile.lean"}, + "configFile": "lakefile.toml"}, {"url": "https://github.com/leanprover-community/aesop", "type": "git", "subDir": null, "scope": "", - "rev": "deb279eb7be16848d0bc8387f80d6e41bcdbe738", + "rev": "5f934891e11d70a1b86e302fdf9cecfc21e8de46", "name": "aesop", "manifestFile": "lake-manifest.json", - "inputRev": "deb279eb7be16848d0bc8387f80d6e41bcdbe738", + "inputRev": "5f934891e11d70a1b86e302fdf9cecfc21e8de46", "inherited": false, "configFile": "lakefile.toml"}], "name": "LeanCopilot", diff --git a/lakefile.lean b/lakefile.lean index 941b5dc..d18e614 100644 --- a/lakefile.lean +++ b/lakefile.lean @@ -118,14 +118,14 @@ private def nameToVersionedSharedLib (name : String) (v : String) : String := def afterReleaseSync {α : Type} (pkg : Package) (build : SpawnM (Job α)) : FetchM (Job α) := do if pkg.preferReleaseBuild ∧ pkg.name ≠ (← getRootPackage).name then - (← pkg.release.fetch).bindAsync fun _ _ => build + (← pkg.gitHubRelease.fetch).bindAsync fun _ _ => build else build def afterReleaseAsync {α : Type} (pkg : Package) (build : JobM α) : FetchM (Job α) := do if pkg.preferReleaseBuild ∧ pkg.name ≠ (← getRootPackage).name then - (← pkg.release.fetch).bindSync fun _ _ => build + (← pkg.gitHubRelease.fetch).bindSync fun _ _ => build else Job.async build @@ -303,8 +303,8 @@ extern_lib libleanffi pkg := do buildStaticLib (pkg.nativeLibDir / name) #[ct2O] -require batteries from git "https://github.com/leanprover-community/batteries.git" @ "9c6c2d647e57b2b7a0b42dd8080c698bd33a1b6f" -- Lean v4.11.0 -require aesop from git "https://github.com/leanprover-community/aesop" @ "deb279eb7be16848d0bc8387f80d6e41bcdbe738" -- Lean v4.11.0 +require batteries from git "https://github.com/leanprover-community/batteries.git" @ "31a10a332858d6981dbcf55d54ee51680dd75f18" -- Lean v4.13.0 +require aesop from git "https://github.com/leanprover-community/aesop" @ "5f934891e11d70a1b86e302fdf9cecfc21e8de46" -- Lean v4.13.0 meta if get_config? env = some "dev" then -- dev is so not everyone has to build it -require «doc-gen4» from git "https://github.com/leanprover/doc-gen4" @ "e490631b72a43a6a82b4ddd3a2d020b2029491d0" -- Lean v4.11.0 +require «doc-gen4» from git "https://github.com/leanprover/doc-gen4" @ "c2156beadb1a4d049ff3b19fe396c5403025aac5" -- Lean v4.13.0 diff --git a/lean-toolchain b/lean-toolchain index e98229d..e0676e0 100644 --- a/lean-toolchain +++ b/lean-toolchain @@ -1 +1 @@ -leanprover/lean4:v4.11.0 \ No newline at end of file +leanprover/lean4:v4.13.0 \ No newline at end of file