Skip to content

Commit

Permalink
chore(docs/user): update to 4.11.0-rc2
Browse files Browse the repository at this point in the history
Micro-guide for update:

- Update the Lean flake.
- Update all the sha256 hashes of every dependency if you have a
compilation error, e.g. batteries changed, etc.

The day where `inputs.lean.packages.${system}.deprecated` disappear, we
will need to consider an alternative for the nixpkgs from lean, etc.

Signed-off-by: Ryan Lahfa <ryan.lahfa@inria.fr>
  • Loading branch information
Ryan Lahfa committed Aug 27, 2024
1 parent fa20b35 commit f6376df
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 121 deletions.
121 changes: 9 additions & 112 deletions docs/user/flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 9 additions & 9 deletions docs/user/flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{
description = "Aeneas documentation";

inputs.lean.url = "github:leanprover/lean4/v4.10.0";
inputs.lean.url = "github:leanprover/lean4/v4.11.0-rc2";
inputs.flake-utils.follows = "lean/flake-utils";
inputs.mdBook = {
url = "github:leanprover/mdBook";
Expand All @@ -18,7 +18,7 @@
};

outputs = inputs@{ self, ... }: inputs.flake-utils.lib.eachDefaultSystem (system:
with inputs.lean.packages.${system}; with nixpkgs;
with inputs.lean.packages.${system}.deprecated; with nixpkgs;
let
doc-src = ./.; # lib.sourceByRegex ../. ["doc.*" "tests(/lean(/beginEndAsMacro.lean)?)?"];
leanLib = callPackage ./nix { };
Expand Down Expand Up @@ -87,46 +87,46 @@

aeneas-base =
let
manifest = builtins.fromJSON (builtins.readFile ./lake-manifest.json);
manifest = builtins.fromJSON (builtins.readFile ../../backends/lean/lake-manifest.json);
fetchFromLakeManifest = leanLib.fetchFromLakeManifest manifest;
inherit (leanLib) addFakeFiles;

batteries = buildLeanPackage {
name = "Batteries";
src = fetchFromLakeManifest {
name = "batteries";
hash = "sha256-JbOOKsUiYedNj3oiCNfwgkWyEIXsb1bAUm3uSEWsWPs=";
hash = "sha256-EGcjOcTu66rtAICAqgPKaR8kBlImoq4lUZfNZR9dHiY=";
};
};
qq = buildLeanPackage {
name = "Qq";
src = fetchFromLakeManifest {
name = "Qq";
hash = "sha256-//sZE32XzebePy81HEwNhIH8YW8iHgk+O8A0y/qNJrg=";
hash = "sha256-iFlAiq8Uxq+QD6ql4EMpRQENvIhKdioaleoEiDmMuDQ=";
};
};
aesop = buildLeanPackage {
name = "Aesop";
deps = [ batteries ];
src = fetchFromLakeManifest {
name = "aesop";
hash = "sha256-LzooSD6NaSQyqKkBcxbSbjIZHrnDBx/lp/s4UdWeHpU=";
hash = "sha256-97xcl82SU9/EZ8L4vT7g/Ureoi11s3c4ZeFlaCd4Az4=";
};
};
import-graph = buildLeanPackage {
name = "ImportGraph";
deps = [ batteries ];
src = fetchFromLakeManifest {
name = "importGraph";
hash = "sha256-3bWWnklUHuY/dA1Y3SK78SSDE+J8syEsMPJ67LnRI3M=";
hash = "sha256-u8tk5IWU/n47kmNAlxZCmurq7e08oCzANhsk9VJeCCM=";
};
};
proof-widgets = buildLeanPackage {
name = "ProofWidgets";
deps = [ batteries ];
src = fetchFromLakeManifest {
name = "proofwidgets";
hash = "sha256-6PzWhCNxxcuh0vEV0JhV0G30NVkYGEDup1j3KvG2VzA=";
hash = "sha256-jPvUi73NylxFiU5V0tjK92M0hJfHWZi5ULZldDwctYY=";
};

overrideBuildModAttrs = addFakeFiles {
Expand All @@ -150,7 +150,7 @@
name = "Mathlib";
src = fetchFromLakeManifest {
name = "mathlib";
hash = "sha256-gJYmaNDVus3vgUE3aNQfyMCcQJxw/lq5aYtLjs4OI7I=";
hash = "sha256-3FnWd0dUVhNyUPxLNNHA41RWF34fwmXulnRSIEmIQXM=";
};
};
in
Expand Down

0 comments on commit f6376df

Please sign in to comment.