chirpstack: smaller cleanups and harmonization (#366031)

pkgs/by-name/ch/chirpstack-fuota-server/package.nix

@@ -24,12 +24,10 @@ buildGoModule rec {
     "-X main.version=${version}"
   ];
 
-  nativeInstallCheckInputs = [
-    versionCheckHook
-  ];
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
   doInstallCheck = true;
   versionCheckProgramArg = "version";
-
   checkFlags = [
     "-skip=TestStorage" # Depends on external database server
   ];

pkgs/by-name/ch/chirpstack-gateway-bridge/package.nix

@@ -24,12 +24,10 @@ buildGoModule rec {
     "-X main.version=v${version}"
   ];
 
-  nativeInstallCheckInputs = [
-    versionCheckHook
-  ];
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
   doInstallCheck = true;
   versionCheckProgramArg = "version";
-
   checkFlags = [
     "-skip=TestMQTTBackend" # Depends on external MQTT broker
   ];

pkgs/by-name/ch/chirpstack-mqtt-forwarder/package.nix

@@ -1,7 +1,6 @@
 {
   lib,
   stdenv,
-  darwin,
   rustPlatform,
   fetchFromGitHub,
   nix-update-script,
@@ -23,13 +22,12 @@ rustPlatform.buildRustPackage rec {
 
   nativeBuildInputs = [ protobuf ];
 
-  nativeInstallCheckInputs = [
-    versionCheckHook
-  ];
+  nativeInstallCheckInputs = [ versionCheckHook ];
 
-  # Skip tests depending on internet connectivity
-  checkFlags = [ "--skip=end_to_end" ];
   doInstallCheck = true;
+  checkFlags = [
+    "--skip=end_to_end" # Depends on internet connectivity
+  ];
 
   passthru.updateScript = nix-update-script { };
 

pkgs/by-name/ch/chirpstack-udp-forwarder/package.nix

@@ -1,7 +1,6 @@
 {
   lib,
   stdenv,
-  darwin,
   rustPlatform,
   fetchFromGitHub,
   nix-update-script,
@@ -23,11 +22,9 @@ rustPlatform.buildRustPackage rec {
 
   nativeBuildInputs = [ protobuf ];
 
-  nativeInstallCheckInputs = [
-    versionCheckHook
-  ];
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
   doInstallCheck = true;
-  versionCheckProgramArg = "--version";
 
   passthru.updateScript = nix-update-script { };