From 317c1cb14da289fddfacf619041f39306735c4cb Mon Sep 17 00:00:00 2001
From: Orne Brocaar <info@brocaar.com>
Date: Mon, 10 Feb 2025 10:27:22 +0000
Subject: [PATCH] Update dev-dependencies to shell.nix.

---
 Makefile  |  7 +++----
 shell.nix | 16 +++++++++-------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index 5cc78b08..1d9e4406 100644
--- a/Makefile
+++ b/Makefile
@@ -6,11 +6,10 @@ dist:
 	cd chirpstack && make dist
 
 # Install dev dependencies
+# TODO: test latest cargo-deb and move it to shell.nix.
 dev-dependencies:
-	cargo install cross --version 0.2.5
-	cargo install diesel_cli --version 2.2.1 --no-default-features --features postgres,sqlite
-	cargo install cargo-deb --version 1.43.1
-	cargo install cargo-generate-rpm --version 0.12.1
+	cargo install cargo-deb --version 1.43.1 --locked
+	cargo install cargo-generate-rpm --version 0.12.1 --locked
 
 # Set the versions
 version:
diff --git a/shell.nix b/shell.nix
index 6c7b39a6..800e0779 100644
--- a/shell.nix
+++ b/shell.nix
@@ -7,19 +7,21 @@ pkgs.mkShell {
   buildInputs = [
     pkgs.cacert
     pkgs.rustup
-    pkgs.protobuf
     pkgs.perl
     pkgs.cmake
     pkgs.clang
-    pkgs.postgresql              # needed to build the diesel cli utility
+    pkgs.protobuf               # api
     pkgs.go                     # go api
-    pkgs.nodejs                 # js api + ui
-    pkgs.yarn
-    pkgs.protoc-gen-grpc-web    # grpc-web api
     pkgs.protoc-gen-go          # go api
-    pkgs.protoc-gen-go-grpc
+    pkgs.protoc-gen-go-grpc     # go api
+    pkgs.protoc-gen-grpc-web    # grpc-web api
+    pkgs.nodejs                 # js api + ui
+    pkgs.yarn                   # ui
     pkgs.openssl
-    pkgs.sqlite
+    pkgs.sqlite-interactive     # sqlite binary + library for diesel
+    pkgs.postgresql             # psql binary + library for diesel
+    pkgs.cargo-cross            # cross-compiling
+    pkgs.diesel-cli             # diesel cli
   ];
   LIBCLANG_PATH = "${pkgs.llvmPackages.libclang.lib}/lib";
   BINDGEN_EXTRA_CLANG_ARGS = "-I${pkgs.llvmPackages.libclang.lib}/lib/clang/${pkgs.llvmPackages.libclang.version}/include";