Add .envrc for direnv magic (#60)

wrsturgeon · Nov 16, 2023 · 25a9418 · 25a9418
2 parents 519b864 + e9a854f
commit 25a9418
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 32 deletions.
diff --git a/.envrc b/.envrc
@@ -0,0 +1 @@
+use flake .
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,5 @@
 **/target/
 **/result
 **/examples/**/Cargo.lock
+**/autogen.rs
+**/.direnv/
diff --git a/ci.sh b/ci.sh
@@ -15,8 +15,6 @@ fi
 set -u
 
 # Update our workbench
-rustup self update || :
-rustup update || :
 rustup toolchain install nightly || :
 rustup component add clippy miri rustfmt
 git submodule update --init --recursive --remote

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -1,32 +1,18 @@
 {
   inputs = {
-    fenix = {
-      url = "github:nix-community/fenix";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
+    fenix.url = "github:nix-community/fenix";
     flake-utils.url = "github:numtide/flake-utils";
-    naersk = {
-      url = "github:nix-community/naersk";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    naersk.url = "github:nix-community/naersk";
   };
-  outputs = { fenix, flake-utils, naersk, nixpkgs, self }:
+  outputs = { fenix, flake-utils, naersk, self }:
     flake-utils.lib.eachDefaultSystem (system:
       let
         name = "inator";
-        # pkgs = (import nixpkgs) { inherit system; };
-        # naersk' = pkgs.callPackage naersk { };
-        naersk' = (naersk.lib.${system}.override {
+        naersk' = naersk.lib.${system}.override {
           cargo = toolchain;
           rustc = toolchain;
-        });
+        };
         settings = {
-          # cargoBuildOptions = orig: orig ++ [ "--examples" ];
-          # doCheck = true;
-          doDocFail = true;
-          gitAllRefs = true;
-          gitSubmodules = true;
           pname = "${name}";
           src = ./.;
         };