update nix to flake

arithmetic/Cargo.toml

@@ -2,19 +2,16 @@
 name = "arithmetic"
 version = "0.1.0"
 edition = "2021"
-
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-
+ark-bls12-381 = { version = "0.3.0", default-features = false, features = [ "curve" ] }
 ark-ff = { version = "^0.3.0", default-features = false }
-ark-std = { version = "^0.3.0", default-features = false }
 ark-poly = { version = "^0.3.0", default-features = false }
 ark-serialize =  { version = "^0.3.0", default-features = false }
-ark-bls12-381 = { version = "0.3.0", default-features = false, features = [ "curve" ] }
-
-rand_chacha = { version = "0.3.0", default-features = false }
+ark-std = { version = "^0.3.0", default-features = false }
 displaydoc = { version = "0.2.3", default-features = false }
+rand_chacha = { version = "0.3.0", default-features = false }
 rayon = { version = "1.5.2", default-features = false, optional = true }
 
 [dev-dependencies]
@@ -23,7 +20,7 @@ criterion = "0.3.0"
 
 [features]
 # default = [ "parallel", "print-trace" ]
-default = [ "parallel" ]
+default = ["parallel"]
 parallel = [ 
     "rayon",
     "ark-std/parallel", 
@@ -34,8 +31,7 @@ print-trace = [
     "ark-std/print-trace" 
     ] 
 
-
 [[bench]]
 name = "mle_eval"
 path = "benches/bench.rs"
-harness = false
+harness = false

flake.nix

@@ -0,0 +1,84 @@
+{
+  description = "Hyperplonk dev env";
+
+  inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+  inputs.flake-utils.url = "github:numtide/flake-utils"; # for dedup
+
+  # allow shell.nix alongside flake.nix
+  inputs.flake-compat.url = "github:edolstra/flake-compat";
+  inputs.flake-compat.flake = false;
+
+  inputs.rust-overlay.url = "github:oxalica/rust-overlay";
+  inputs.pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix";
+  inputs.pre-commit-hooks.inputs.nixpkgs.follows = "nixpkgs";
+
+  outputs = { self, nixpkgs, flake-utils, flake-compat, rust-overlay, pre-commit-hooks, ... }:
+    flake-utils.lib.eachDefaultSystem (system:
+      let
+        overlays = [ (import rust-overlay) ];
+        pkgs = import nixpkgs { inherit system overlays; };
+        nightlyToolchain = pkgs.rust-bin.selectLatestNightlyWith
+          (toolchain: toolchain.minimal.override { extensions = [ "rustfmt" ]; });
+
+        stableToolchain = pkgs.rust-bin.stable.latest.minimal.override {
+          extensions = [ "clippy" "llvm-tools-preview" "rust-src" ];
+        };
+      in with pkgs;
+      {
+        check = {
+          pre-commit-check = pre-commit-hooks.lib.${system}.run {
+            src = ./.;
+            hooks = {
+              check-format = {
+                enable = true;
+                files = "\\.rs$";
+                entry = "cargo fmt -- --check";
+              };
+              doctest = {
+                enable = true;
+                entry = "cargo test --doc";
+                files = "\\.rs$";
+                pass_filenames = false;
+              };
+              cargo-clippy = {
+                enable = true;
+                description = "Lint Rust code.";
+                entry = "cargo-clippy --workspace -- -D warnings";
+                files = "\\.rs$";
+                pass_filenames = false;
+              };
+              cargo-sort = {
+                enable = true;
+                description = "Ensure Cargo.toml are sorted";
+                entry = "cargo sort -w";
+                pass_filenames = false;
+              };
+            };
+          };
+        };
+        devShell = mkShell {
+          buildInputs = [
+            argbash
+            openssl
+            pkgconfig
+            git
+
+            stableToolchain
+            nightlyToolchain
+            cargo-sort
+
+          ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
+
+          shellHook = ''
+            export RUST_BACKTRACE=full
+            export PATH="$PATH:$(pwd)/target/debug:$(pwd)/target/release"
+
+            # Ensure `cargo fmt` uses `rustfmt` from nightly.
+            export RUSTFMT="${nightlyToolchain}/bin/rustfmt"
+          ''
+          # install pre-commit hooks
+          + self.check.${system}.pre-commit-check.shellHook;
+        };
+      }
+    );
+}

hyperplonk/Cargo.toml

@@ -2,26 +2,21 @@
 name = "hyperplonk"
 version = "0.1.0"
 edition = "2021"
-
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-
-ark-std = { version = "^0.3.0", default-features = false }
+arithmetic = { path = "../arithmetic" }
 ark-ec = { version = "^0.3.0", default-features = false }
 ark-ff = { version = "^0.3.0", default-features = false }
 ark-poly = { version = "^0.3.0", default-features = false }
 ark-serialize = { version = "^0.3.0", default-features = false, features = [ "derive" ] }
-
+ark-std = { version = "^0.3.0", default-features = false }
 displaydoc = { version = "0.2.3", default-features = false }
-
+rayon = { version = "1.5.2", default-features = false, optional = true }
 subroutines = { path = "../subroutines" }
 transcript = { path = "../transcript" }
-arithmetic = { path = "../arithmetic" }
 util = { path = "../util" }
 
-rayon = { version = "1.5.2", default-features = false, optional = true }
-
 [dev-dependencies]
 ark-bls12-381 = { version = "0.3.0", default-features = false, features = [ "curve" ] }
 
@@ -35,8 +30,8 @@ harness = false
 # default = [ ]
 # default = [ "parallel" ]
 # default = [ "parallel", "print-trace" ]
-default = [ "parallel",  "extensive_sanity_checks" ]
-bench = [ "parallel" ]
+default = ["parallel", "extensive_sanity_checks"]
+bench = ["parallel"]
 # extensive sanity checks that are useful for debugging
 extensive_sanity_checks = [
     "subroutines/extensive_sanity_checks",
@@ -56,4 +51,4 @@ print-trace = [
     "ark-std/print-trace",
     "arithmetic/print-trace",
     "subroutines/print-trace"
-    ] 
+    ]