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

[Merged by Bors] - chore: adaptations for nightly-2024-01-23 #9960

Closed
wants to merge 4 commits into from
Closed

[Merged by Bors] - chore: adaptations for nightly-2024-01-23 #9960

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
25711b6
merge master
kim-em Jan 24, 2024
7170571
merge changes from nightly-testing
kim-em Jan 24, 2024
f05090d
Merge branch 'bump/v4.6.0' into adaptations-20240124
kim-em Jan 24, 2024
67e0ea2
fix
kim-em Jan 24, 2024
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
2 changes: 1 addition & 1 deletion Mathlib/Init/Data/Int/Basic.lean
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ The integers, with addition, multiplication, and subtraction.
-/
import Mathlib.Mathport.Rename
import Mathlib.Init.Data.Nat.Notation
import Std.Data.Int.Lemmas
import Std.Data.Int.Order

open Nat

Expand Down
2 changes: 1 addition & 1 deletion Mathlib/Init/Data/Int/Lemmas.lean
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Released under Apache 2.0 license as described in the file LICENSE.
Authors: Johan Commelin
-/

import Std.Data.Int.Lemmas
import Std.Data.Int.Order
import Mathlib.Mathport.Rename

/-!
Expand Down
6 changes: 3 additions & 3 deletions lake-manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
[{"url": "https://github.com/leanprover/std4",
"type": "git",
"subDir": null,
"rev": "427cf7ea160ef0c2c10fbe92102a2f470b9d74ad",
"rev": "c6c85991538681aa7eb8a8cca6f15038b022bbc4",
"name": "std",
"manifestFile": "lake-manifest.json",
"inputRev": "bump/v4.6.0",
Expand All @@ -31,10 +31,10 @@
{"url": "https://github.com/leanprover-community/ProofWidgets4",
"type": "git",
"subDir": null,
"rev": "8dd18350791c85c0fc9adbd6254c94a81d260d35",
"rev": "9466e2c665dd81f8c9bdd2e27b67c1cac0145571",
"name": "proofwidgets",
"manifestFile": "lake-manifest.json",
"inputRev": "v0.0.25",
"inputRev": "v0.0.26-pre",
"inherited": false,
"configFile": "lakefile.lean"},
{"url": "https://github.com/leanprover/lean4-cli",
Expand Down
2 changes: 1 addition & 1 deletion lakefile.lean
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ require «doc-gen4» from git "https://github.com/leanprover/doc-gen4" @ "main"
require std from git "https://github.com/leanprover/std4" @ "bump/v4.6.0"
require Qq from git "https://github.com/leanprover-community/quote4" @ "master"
require aesop from git "https://github.com/leanprover-community/aesop" @ "bump/v4.6.0"
require proofwidgets from git "https://github.com/leanprover-community/ProofWidgets4" @ "v0.0.25"
require proofwidgets from git "https://github.com/leanprover-community/ProofWidgets4" @ "v0.0.26-pre"
require Cli from git "https://github.com/leanprover/lean4-cli" @ "main"
require importGraph from git "https://github.com/leanprover-community/import-graph.git" @ "main"

Expand Down
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:nightly-2024-01-22
leanprover/lean4:nightly-2024-01-23
Loading