From 9e230d0c4378b5c992c820cc1f4322896f739095 Mon Sep 17 00:00:00 2001 From: Son Ho Date: Mon, 18 Mar 2024 07:01:48 +0100 Subject: Update the flake.nix and the flake.lock --- flake.lock | 350 +------------------------------------------------------------ flake.nix | 21 +--- 2 files changed, 4 insertions(+), 367 deletions(-) diff --git a/flake.lock b/flake.lock index 48273b6a..9bbf68bc 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1710648057, - "narHash": "sha256-Jm5EZsXXIhAhDHAA1jZx4TYPpKREGZBNAUeqpiufbPo=", + "lastModified": 1710741599, + "narHash": "sha256-/5o81Ifs6OGqNpxMklGCJ6w2CVQrQn+xMaC1VrC8pZE=", "owner": "aeneasverif", "repo": "charon", - "rev": "a3ba8b5286ef99584e87035cb965d3cb9c43660c", + "rev": "f3faf02ec1dbd6645b816d54be39261dea6970c2", "type": "github" }, "original": { @@ -77,54 +77,6 @@ "type": "indirect" } }, - "flake-utils_3": { - "inputs": { - "systems": "systems_3" - }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_4": { - "locked": { - "lastModified": 1656928814, - "narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_5": { - "locked": { - "lastModified": 1656928814, - "narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "fstar": { "inputs": { "flake-utils": "flake-utils_2", @@ -236,173 +188,6 @@ "type": "github" } }, - "lake": { - "inputs": { - "flake-utils": "flake-utils_3", - "lean": "lean", - "nixpkgs": "nixpkgs_5" - }, - "locked": { - "lastModified": 1689377246, - "narHash": "sha256-UP5Vu5RFPqoRa2tpHaQ7JoX5IY/7BTA9b+MF418oszY=", - "owner": "leanprover", - "repo": "lake", - "rev": "9919b5efc48c71a940635a0bbab00a394ebe53f8", - "type": "github" - }, - "original": { - "owner": "leanprover", - "ref": "lean4-master", - "repo": "lake", - "type": "github" - } - }, - "lean": { - "inputs": { - "flake-utils": "flake-utils_4", - "lean4-mode": "lean4-mode", - "nix": "nix", - "nixpkgs": "nixpkgs_4" - }, - "locked": { - "lastModified": 1710638987, - "narHash": "sha256-88u7WVtuwQwd4yjUXUJouMBd2W6meLg0C2k9Kv8PuYM=", - "owner": "leanprover", - "repo": "lean4", - "rev": "9ee10aa3ebb8e518132873e3d98a13dd7df5e9f7", - "type": "github" - }, - "original": { - "owner": "leanprover", - "repo": "lean4", - "type": "github" - } - }, - "lean4-mode": { - "flake": false, - "locked": { - "lastModified": 1676498134, - "narHash": "sha256-u3WvyKxOViZG53hkb8wd2/Og6muTecbh+NdflIgVeyk=", - "owner": "leanprover", - "repo": "lean4-mode", - "rev": "2c6ef33f476fdf5eb5e4fa4fa023ba8b11372440", - "type": "github" - }, - "original": { - "owner": "leanprover", - "repo": "lean4-mode", - "type": "github" - } - }, - "lean4-mode_2": { - "flake": false, - "locked": { - "lastModified": 1676498134, - "narHash": "sha256-u3WvyKxOViZG53hkb8wd2/Og6muTecbh+NdflIgVeyk=", - "owner": "leanprover", - "repo": "lean4-mode", - "rev": "2c6ef33f476fdf5eb5e4fa4fa023ba8b11372440", - "type": "github" - }, - "original": { - "owner": "leanprover", - "repo": "lean4-mode", - "type": "github" - } - }, - "lean_2": { - "inputs": { - "flake-utils": "flake-utils_5", - "lean4-mode": "lean4-mode_2", - "nix": "nix_2", - "nixpkgs": "nixpkgs_7" - }, - "locked": { - "lastModified": 1710638987, - "narHash": "sha256-88u7WVtuwQwd4yjUXUJouMBd2W6meLg0C2k9Kv8PuYM=", - "owner": "leanprover", - "repo": "lean4", - "rev": "9ee10aa3ebb8e518132873e3d98a13dd7df5e9f7", - "type": "github" - }, - "original": { - "owner": "leanprover", - "repo": "lean4", - "type": "github" - } - }, - "lowdown-src": { - "flake": false, - "locked": { - "lastModified": 1633514407, - "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=", - "owner": "kristapsdz", - "repo": "lowdown", - "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8", - "type": "github" - }, - "original": { - "owner": "kristapsdz", - "repo": "lowdown", - "type": "github" - } - }, - "lowdown-src_2": { - "flake": false, - "locked": { - "lastModified": 1633514407, - "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=", - "owner": "kristapsdz", - "repo": "lowdown", - "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8", - "type": "github" - }, - "original": { - "owner": "kristapsdz", - "repo": "lowdown", - "type": "github" - } - }, - "nix": { - "inputs": { - "lowdown-src": "lowdown-src", - "nixpkgs": "nixpkgs_3", - "nixpkgs-regression": "nixpkgs-regression" - }, - "locked": { - "lastModified": 1657097207, - "narHash": "sha256-SmeGmjWM3fEed3kQjqIAO8VpGmkC2sL1aPE7kKpK650=", - "owner": "NixOS", - "repo": "nix", - "rev": "f6316b49a0c37172bca87ede6ea8144d7d89832f", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nix", - "type": "github" - } - }, - "nix_2": { - "inputs": { - "lowdown-src": "lowdown-src_2", - "nixpkgs": "nixpkgs_6", - "nixpkgs-regression": "nixpkgs-regression_2" - }, - "locked": { - "lastModified": 1657097207, - "narHash": "sha256-SmeGmjWM3fEed3kQjqIAO8VpGmkC2sL1aPE7kKpK650=", - "owner": "NixOS", - "repo": "nix", - "rev": "f6316b49a0c37172bca87ede6ea8144d7d89832f", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nix", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1701436327, @@ -418,38 +203,6 @@ "type": "indirect" } }, - "nixpkgs-regression": { - "locked": { - "lastModified": 1643052045, - "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "github" - } - }, - "nixpkgs-regression_2": { - "locked": { - "lastModified": 1643052045, - "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "github" - } - }, "nixpkgs_2": { "locked": { "lastModified": 1693158576, @@ -465,86 +218,6 @@ "type": "indirect" } }, - "nixpkgs_3": { - "locked": { - "lastModified": 1653988320, - "narHash": "sha256-ZaqFFsSDipZ6KVqriwM34T739+KLYJvNmCWzErjAg7c=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "2fa57ed190fd6c7c746319444f34b5917666e5c1", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-22.05-small", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 1686089707, - "narHash": "sha256-LTNlJcru2qJ0XhlhG9Acp5KyjB774Pza3tRH0pKIb3o=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "af21c31b2a1ec5d361ed8050edd0303c31306397", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { - "locked": { - "lastModified": 1659914493, - "narHash": "sha256-lkA5X3VNMKirvA+SUzvEhfA7XquWLci+CGi505YFAIs=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "022caabb5f2265ad4006c1fa5b1ebe69fb0c3faf", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-21.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_6": { - "locked": { - "lastModified": 1653988320, - "narHash": "sha256-ZaqFFsSDipZ6KVqriwM34T739+KLYJvNmCWzErjAg7c=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "2fa57ed190fd6c7c746319444f34b5917666e5c1", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-22.05-small", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_7": { - "locked": { - "lastModified": 1686089707, - "narHash": "sha256-LTNlJcru2qJ0XhlhG9Acp5KyjB774Pza3tRH0pKIb3o=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "af21c31b2a1ec5d361ed8050edd0303c31306397", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "root": { "inputs": { "charon": "charon", @@ -553,8 +226,6 @@ "flake-utils" ], "hacl-nix": "hacl-nix", - "lake": "lake", - "lean": "lean_2", "nixpkgs": [ "charon", "nixpkgs" @@ -615,21 +286,6 @@ "repo": "default", "type": "github" } - }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index cfeb5188..32898765 100644 --- a/flake.nix +++ b/flake.nix @@ -8,15 +8,11 @@ flake-utils.follows = "charon/flake-utils"; nixpkgs.follows = "charon/nixpkgs"; hacl-nix.url = "github:hacl-star/hacl-nix"; - lean.url = "github:leanprover/lean4"; - #lake.url = "github:leanprover/lake"; - lake.url = "github:leanprover/lake/lean4-master"; - #lake.flake = false; }; # Remark: keep the list of outputs in sync with the list of inputs above # (see above remark) - outputs = { self, charon, flake-utils, nixpkgs, hacl-nix, lean, lake }: + outputs = { self, charon, flake-utils, nixpkgs, hacl-nix }: flake-utils.lib.eachSystem [ "x86_64-linux" ] (system: let pkgs = import nixpkgs { inherit system; }; @@ -126,20 +122,6 @@ # The tests don't generate anything - TODO: actually they do installPhase = "touch $out"; }; - # Replay the Lean proofs. TODO: doesn't work - aeneas-verify-lean = pkgs.stdenv.mkDerivation { - name = "aeneas_verify_lean"; - src = ./tests/lean; - #LAKE_EXE = lean.packages.${system}; - #buildInputs = [lean.packages.${system}.lake-dev]; - buildInputs = [lean.packages.${system} lake.packages.${system}.cli]; - #buildInputs = [lake.packages.${system}.cli]; - buildPhase= '' - make prepare-projects - #make verify -j $NIX_BUILD_CORES - make verify - ''; - }; # Replay the HOL4 proofs # # Remark: we tried to have two targets, one for ./backends/hol4 and @@ -174,7 +156,6 @@ inherit aeneas aeneas-tests aeneas-verify-fstar aeneas-verify-coq - aeneas-verify-lean aeneas-verify-hol4; }; }); } -- cgit v1.2.3