libbladeRF: 2.5.0 -> 2025.10

pkgs/by-name/li/libbladeRF/gcc-14-calloc-fixes.diff

@@ -1,26 +0,0 @@
-diff --git a/host/utilities/bladeRF-fsk/c/src/fir_filter.c b/host/utilities/bladeRF-fsk/c/src/fir_filter.c
-index 59f34f0..7def697 100644
---- a/host/utilities/bladeRF-fsk/c/src/fir_filter.c
-+++ b/host/utilities/bladeRF-fsk/c/src/fir_filter.c
-@@ -213,18 +213,18 @@ int main(int argc, char *argv[])
-         return EXIT_FAILURE;
-     }
- 
--    inbuf = calloc(2*sizeof(int16_t), chunk_size);
-+    inbuf = calloc(chunk_size, 2*sizeof(int16_t));
-     if (!inbuf) {
-         perror("calloc");
-         goto out;
-     }
--    tempbuf = calloc(2*sizeof(int16_t), chunk_size);
-+    tempbuf = calloc(chunk_size, 2*sizeof(int16_t));
-     if (!tempbuf) {
-         perror("calloc");
-         goto out;
-     }
- 
--    outbuf = calloc(sizeof(struct complex_sample), chunk_size);
-+    outbuf = calloc(chunk_size, sizeof(struct complex_sample));
-     if (!outbuf) {
-         perror("calloc");
-         goto out;

pkgs/by-name/li/libbladeRF/package.nix

@@ -10,26 +10,22 @@
   ncurses,
   tecla,
   libusb1,
+  curl,
   udev,
 }:
 
 stdenv.mkDerivation rec {
   pname = "libbladeRF";
-  version = "2.5.0";
+  version = "2025.10";
 
   src = fetchFromGitHub {
     owner = "Nuand";
     repo = "bladeRF";
-    tag = "libbladeRF_v${version}";
-    hash = "sha256-H40w5YKp6M3QLrsPhILEnJiWutCYLtbgC4a63sV397Q=";
+    tag = version;
+    hash = "sha256-gp+OnAlECGZs4+JEWNX5Gt7LYdTFJUItpmDdJgeoJO4=";
     fetchSubmodules = true;
   };
 
-  patches = [
-    # https://github.com/Nuand/bladeRF/issues/994
-    ./gcc-14-calloc-fixes.diff
-  ];
-
   nativeBuildInputs = [
     cmake
     pkg-config
@@ -41,9 +37,10 @@ stdenv.mkDerivation rec {
   buildInputs = [
     tecla
     libusb1
+    curl
+    ncurses
   ]
-  ++ lib.optionals stdenv.hostPlatform.isLinux [ udev ]
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [ ncurses ];
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ udev ];
 
   # Fixup shebang
   prePatch = "patchShebangs host/utilities/bladeRF-cli/src/cmd/doc/generate.bash";