r
/
bookshelf-doc
mirror of https://github.com/jrpotter/bookshelf-doc
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

chore: Bump toolchain

main
Henrik Böving 2022-03-06 16:48:49 +01:00
parent 6492f827b7
commit 5535616725
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
DocGen4/Load.lean
View File

@ -16,7 +16,7 @@ def getLakePath : IO FilePath := do
match (← IO.getEnv "LAKE") with match (← IO.getEnv "LAKE") with
| some path => pure $ System.FilePath.mk path | some path => pure $ System.FilePath.mk path
| none => | none =>
let lakePath := (←findSysroot?) / "bin" / "lake" let lakePath := (←findSysroot) / "bin" / "lake"
pure $ lakePath.withExtension System.FilePath.exeExtension pure $ lakePath.withExtension System.FilePath.exeExtension
-- Modified from the LSP Server -- Modified from the LSP Server
@ -37,7 +37,7 @@ def lakeSetupSearchPath (lakePath : System.FilePath) (imports : List String) : I
let stdout := stdout.split (· == '\n') |>.getLast! let stdout := stdout.split (· == '\n') |>.getLast!
let Except.ok (paths : LeanPaths) ← pure (Json.parse stdout >>= fromJson?) let Except.ok (paths : LeanPaths) ← pure (Json.parse stdout >>= fromJson?)
| throw $ userError s!"invalid output from `{cmdStr}`:\n{stdout}\nstderr:\n{stderr}" | throw $ userError s!"invalid output from `{cmdStr}`:\n{stdout}\nstderr:\n{stderr}"
initSearchPath (← findSysroot?) paths.oleanPath initSearchPath (← findSysroot) paths.oleanPath
paths.oleanPath.mapM realPathNormalized paths.oleanPath.mapM realPathNormalized
| 2 => pure [] -- no lakefile.lean | 2 => pure [] -- no lakefile.lean
| _ => throw $ userError s!"`{cmdStr}` failed:\n{stdout}\nstderr:\n{stderr}" | _ => throw $ userError s!"`{cmdStr}` failed:\n{stdout}\nstderr:\n{stderr}"

2
lean-toolchain
View File

@ -1 +1 @@
leanprover/lean4:nightly-2022-02-27 leanprover/lean4:nightly-2022-03-06