Clean up nix setup, only toolchain.nix is still in a weird state

default.nix

@@ -6,9 +6,8 @@
   features ? null,
 }:
 
-with import ./nix/common.nix;
-
 let
+  pkgsSrc = import ./nix/pkgs.nix;
   newBuildTarget = {
     nixPkgsSystem,
     rustTarget ? nixPkgsSystem,
@@ -32,11 +31,12 @@ let
       nixPkgsSystem = "aarch64-unknown-linux-musl";
     };
 
-    # Old Raspberry Pi's
+    # Old Raspberry Pi's (not currently supported due to linking errors with
-    "armv6l-linux" = newBuildTarget {
+    # libsqlite3 and libsodium
-      nixPkgsSystem = "armv6l-unknown-linux-musleabihf";
+    #"armv6l-linux" = newBuildTarget {
-      rustTarget = "arm-unknown-linux-musleabihf";
+    #  nixPkgsSystem = "armv6l-unknown-linux-musleabihf";
-    };
+    #  rustTarget = "arm-unknown-linux-musleabihf";
+    #};
 
     "x86_64-windows" = newBuildTarget {
       nixPkgsSystem = "x86_64-w64-mingw32";
@@ -77,6 +77,7 @@ let
       (mkToolchain fenix).rustc
       (mkToolchain fenix).rustfmt
       (mkToolchain fenix).cargo
+      (mkToolchain fenix).clippy
       (mkToolchain fenix.targets.${rustTarget}).rust-std
     ];
 
@@ -121,6 +122,10 @@ let
     fi
   '';
 
+in rec {
+  inherit pkgs pkgsCross;
+
+  # Exported separately so it can be used from shell.nix
   buildEnv = rec {
     nativeBuildInputs = (buildTarget.nativeBuildInputs pkgsCross) ++ [
       toolchain
@@ -147,11 +152,7 @@ let
     ] ++ (buildTarget.rustFlags pkgsCross);
   };
 
-in {
+  build = naersk.buildPackage (rec {
-
-  inherit pkgs pkgsCross;
-
-  release = naersk.buildPackage (rec {
     inherit release;
 
     src = ./.;
@@ -162,6 +163,4 @@ in {
       "--features=${builtins.concatStringsSep "," builtFeatures}"
     ];
   } // buildEnv);
-
-  shell = pkgsCross.mkShell buildEnv;
 }

flake.lock

@@ -1,31 +1,5 @@
 {
   "nodes": {
-    "cargo2nix": {
-      "inputs": {
-        "flake-compat": [
-          "flake-compat"
-        ],
-        "flake-utils": "flake-utils",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "rust-overlay": "rust-overlay"
-      },
-      "locked": {
-        "lastModified": 1666087781,
-        "narHash": "sha256-trKVdjMZ8mNkGfLcY5LsJJGtdV3xJDZnMVrkFjErlcs=",
-        "owner": "Alexis211",
-        "repo": "cargo2nix",
-        "rev": "a7a61179b66054904ef6a195d8da736eaaa06c36",
-        "type": "github"
-      },
-      "original": {
-        "owner": "Alexis211",
-        "repo": "cargo2nix",
-        "rev": "a7a61179b66054904ef6a195d8da736eaaa06c36",
-        "type": "github"
-      }
-    },
     "flake-compat": {
       "locked": {
         "lastModified": 1688025799,
@@ -46,54 +20,19 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1681202837,
+        "lastModified": 1701680307,
-        "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
+        "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "cfacdce06f30d2b68473a46042957675eebb3401",
+        "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
         "type": "github"
       },
       "original": {
-        "owner": "numtide",
+        "id": "flake-utils",
-        "repo": "flake-utils",
+        "type": "indirect"
-        "type": "github"
-      }
-    },
-    "flake-utils_2": {
-      "inputs": {
-        "systems": "systems_2"
-      },
-      "locked": {
-        "lastModified": 1681202837,
-        "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "cfacdce06f30d2b68473a46042957675eebb3401",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
       }
     },
     "nixpkgs": {
-      "locked": {
-        "lastModified": 1682109806,
-        "narHash": "sha256-d9g7RKNShMLboTWwukM+RObDWWpHKaqTYXB48clBWXI=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "2362848adf8def2866fabbffc50462e929d7fffb",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
       "locked": {
         "lastModified": 1682423271,
         "narHash": "sha256-WHhl1GiOij1ob4cTLL+yhqr+vFOUH8E5wAX8Ir8fvjE=",
@@ -111,32 +50,9 @@
     },
     "root": {
       "inputs": {
-        "cargo2nix": "cargo2nix",
         "flake-compat": "flake-compat",
-        "flake-utils": [
+        "flake-utils": "flake-utils",
-          "cargo2nix",
-          "flake-utils"
-        ],
-        "nixpkgs": "nixpkgs_2"
-      }
-    },
-    "rust-overlay": {
-      "inputs": {
-        "flake-utils": "flake-utils_2",
         "nixpkgs": "nixpkgs"
-      },
-      "locked": {
-        "lastModified": 1682389182,
-        "narHash": "sha256-8t2nmFnH+8V48+IJsf8AK51ebXNlVbOSVYOpiqJKvJE=",
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "rev": "74f1a64dd28faeeb85ef081f32cad2989850322c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "type": "github"
       }
     },
     "systems": {
@@ -153,21 +69,6 @@
         "repo": "default",
         "type": "github"
       }
-    },
-    "systems_2": {
-      "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",

flake.nix

@@ -8,50 +8,23 @@
 
   inputs.flake-compat.url = "github:nix-community/flake-compat";
 
-  inputs.cargo2nix = {
+  outputs = { self, nixpkgs, flake-utils, ... }:
-    # As of 2022-10-18: two small patches over unstable branch, one for clippy and one to fix feature detection
-    url = "github:Alexis211/cargo2nix/a7a61179b66054904ef6a195d8da736eaaa06c36";
-
-    # As of 2023-04-25:
-    # - my two patches were merged into unstable (one for clippy and one to "fix" feature detection)
-    # - rustc v1.66
-    # url = "github:cargo2nix/cargo2nix/8fb57a670f7993bfc24099c33eb9c5abb51f29a2";
-
-    # Rust overlay as of 2023-04-25
-    inputs.rust-overlay.url =
-      "github:oxalica/rust-overlay/74f1a64dd28faeeb85ef081f32cad2989850322c";
-
-    inputs.nixpkgs.follows = "nixpkgs";
-    inputs.flake-compat.follows = "flake-compat";
-  };
-
-  inputs.flake-utils.follows = "cargo2nix/flake-utils";
-
-  outputs = { self, nixpkgs, cargo2nix, flake-utils, ... }:
     let
-      git_version = self.lastModifiedDate;
+      gitVersion = self.lastModifiedDate;
       compile = import ./nix/compile.nix;
     in
     flake-utils.lib.eachDefaultSystem (system:
       let pkgs = nixpkgs.legacyPackages.${system};
       in {
         packages = {
-          default = (compile {
+          default = (import ./default.nix {
-            inherit system git_version;
+            inherit gitVersion;
-            pkgsSrc = nixpkgs;
+            buildSystem = system;
-            cargo2nixOverlay = cargo2nix.overlays.default;
             release = true;
-          }).workspace.garage { compileMode = "build"; };
+          }).build;
         };
-        devShell = (compile {
+        devShell = (import ./shell.nix {
-          inherit system git_version;
+          buildSystem = system;
-          pkgsSrc = nixpkgs;
+        }).rust;
-          cargo2nixOverlay = cargo2nix.overlays.default;
-          release = false;
-        }).workspaceShell { packages = with pkgs; [
-          rustfmt
-          clang
-          mold
-        ]; };
       });
 }

nix/build_index.nix

@@ -1,6 +1,6 @@
 { path ? "/../aws-list.txt", }:
 
-with import ./common.nix;
+with import ./pkgs.nix;
 let
   pkgs = import pkgsSrc { };
   lib = pkgs.lib;

nix/common.nix

@@ -1,17 +0,0 @@
-let
-  lock = builtins.fromJSON (builtins.readFile ../flake.lock);
-
-  inherit (lock.nodes.flake-compat.locked) owner repo rev narHash;
-
-  flake-compat = fetchTarball {
-    url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz";
-    sha256 = narHash;
-  };
-
-  flake = (import flake-compat { system = builtins.currentSystem; src = ../.; });
-in
-rec {
-  pkgsSrc = flake.defaultNix.inputs.nixpkgs;
-  cargo2nix = flake.defaultNix.inputs.cargo2nix;
-  cargo2nixOverlay = cargo2nix.overlays.default;
-}

nix/pkgs.nix

@@ -0,0 +1,8 @@
+let
+  lock = builtins.fromJSON (builtins.readFile ../flake.lock);
+  inherit (lock.nodes.nixpkgs.locked) owner repo rev narHash;
+in
+  fetchTarball {
+    url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz";
+    sha256 = narHash;
+  }

shell.nix

@@ -1,12 +1,12 @@
-{ system ? builtins.currentSystem, }:
+{
+  buildSystem ? builtins.currentSystem,
+  targetSystem ? buildSystem,
+}:
 
-with import ./nix/common.nix;
+with import ./nix/pkgs.nix;
 
 let
-  pkgs = import pkgsSrc {
+  inherit (import ./default.nix { inherit buildSystem targetSystem; }) pkgs pkgsCross buildEnv;
-    inherit system;
-    overlays = [ cargo2nixOverlay ];
-  };
   kaniko = (import ./nix/kaniko.nix) pkgs;
   manifest-tool = (import ./nix/manifest-tool.nix) pkgs;
   winscp = (import ./nix/winscp.nix) pkgs;
@@ -14,22 +14,13 @@ let
 in {
   # --- Rust Shell ---
   # Use it to compile Garage
-  rust = pkgs.mkShell {
+  rust = pkgsCross.mkShell (buildEnv // {
-    nativeBuildInputs = with pkgs; [
+    inputsFrom = [
-      #rustPlatform.rust.rustc
+      kaniko
-      rustPlatform.rust.cargo
+      manifest-tool
-      clang
+      winscp
-      mold
-      #clippy
-      rustfmt
-      #perl
-      #protobuf
-      #pkg-config
-      #openssl
-      file
-      #cargo2nix.packages.x86_64-linux.cargo2nix
     ];
-  };
+  });
 
   # --- Integration shell ---
   # Use it to test Garage with common S3 clients