From d805539b34d134d29ba957cd7608c494d5296f09 Mon Sep 17 00:00:00 2001 From: Henrik Date: Fri, 18 Aug 2023 11:07:52 +0200 Subject: [PATCH] chore: update toolchain --- DocGen4/Output/SourceLinker.lean | 4 ++-- lake-manifest.json | 20 ++++++++++++++------ lean-toolchain | 2 +- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/DocGen4/Output/SourceLinker.lean b/DocGen4/Output/SourceLinker.lean index a8ef27d..676fb30 100644 --- a/DocGen4/Output/SourceLinker.lean +++ b/DocGen4/Output/SourceLinker.lean @@ -74,8 +74,8 @@ def sourceLinker (ws : Lake.Workspace) : IO (Name → Option DeclarationRange |>.toIO (fun _ => IO.userError "Failed to load lake manifest") for pkg in manifest.entryArray do match pkg with - | .git _ url rev .. => gitMap := gitMap.insert pkg.name (getGithubBaseUrl url, rev) - | .path _ path => + | .git _ _ _ url rev .. => gitMap := gitMap.insert pkg.name (getGithubBaseUrl url, rev) + | .path _ _ _ path => let pkgBaseUrl := getGithubBaseUrl (← getProjectGithubUrl path) let pkgCommit ← getProjectCommit path gitMap := gitMap.insert pkg.name (pkgBaseUrl, pkgCommit) diff --git a/lake-manifest.json b/lake-manifest.json index f607b57..697d027 100644 --- a/lake-manifest.json +++ b/lake-manifest.json @@ -1,27 +1,35 @@ -{"version": 4, +{"version": 5, "packagesDir": "lake-packages", "packages": [{"git": {"url": "https://github.com/xubaiw/CMark.lean", "subDir?": null, "rev": "0077cbbaa92abf855fc1c0413e158ffd8195ec77", + "opts": {}, "name": "CMark", - "inputRev?": "main"}}, + "inputRev?": "main", + "inherited": false}}, {"git": {"url": "https://github.com/fgdorais/lean4-unicode-basic", "subDir?": null, "rev": "f09250282cea3ed8c010f430264d9e8e50d7bc32", - "name": "lean4-unicode-basic", - "inputRev?": "main"}}, + "opts": {}, + "name": "«lean4-unicode-basic»", + "inputRev?": "main", + "inherited": false}}, {"git": {"url": "https://github.com/mhuisi/lean4-cli", "subDir?": null, "rev": "5a858c32963b6b19be0d477a30a1f4b6c120be7e", + "opts": {}, "name": "Cli", - "inputRev?": "nightly"}}, + "inputRev?": "nightly", + "inherited": false}}, {"git": {"url": "https://github.com/hargonix/LeanInk", "subDir?": null, "rev": "2447df5cc6e48eb965c3c3fba87e46d353b5e9f1", + "opts": {}, "name": "leanInk", - "inputRev?": "doc-gen"}}]} + "inputRev?": "doc-gen", + "inherited": false}}]} diff --git a/lean-toolchain b/lean-toolchain index dc4c3b8..ea806c1 100644 --- a/lean-toolchain +++ b/lean-toolchain @@ -1 +1 @@ -leanprover/lean4:nightly-2023-08-03 +leanprover/lean4:nightly-2023-08-17