Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump to latest version of Lean and fix errors introduced by breaking changes #129

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
+12 −12
Draft

Bump to latest version of Lean and fix errors introduced by breaking changes #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion LeanCopilot/LlmAesop.lean
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import LeanCopilot.Tactics
import LeanCopilot.Options
import Batteries.Data.String.Basic
import Aesop

set_option autoImplicit false
Expand Down
1 change: 1 addition & 0 deletions LeanCopilot/Tactics.lean
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
10 changes: 5 additions & 5 deletions lake-manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
10 changes: 5 additions & 5 deletions lakefile.lean
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
2 changes: 1 addition & 1 deletion lean-toolchain
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
leanprover/lean4:v4.11.0
leanprover/lean4:v4.13.0
Loading