From 94b186eade17009a81ca1a96d833785eceda0787 Mon Sep 17 00:00:00 2001 From: Troy Neubauer Date: Sat, 14 Mar 2026 17:13:54 -0700 Subject: [PATCH 1/5] bump rustc to latest stable --- bladerf.nix | 2 +- flake.lock | 14 +++++++------- flake.nix | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/bladerf.nix b/bladerf.nix index 24dcb23..18bb6bc 100644 --- a/bladerf.nix +++ b/bladerf.nix @@ -50,7 +50,7 @@ rec { ]; env = lib.optionalAttrs stdenv.cc.isClang { - NIX_CFLAGS_COMPILE = "-Wno-error=unused-but-set-variable"; + NIX_CFLAGS_COMPILE = "-Wno-error=unused-but-set-variable -Wno-error=tautological-overlap-compare"; }; hardeningDisable = [ "fortify" ]; diff --git a/flake.lock b/flake.lock index 198691e..08e74ac 100644 --- a/flake.lock +++ b/flake.lock @@ -20,16 +20,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1723556749, - "narHash": "sha256-+CHVZnTnIYRLYsARInHYoWkujzcRkLY/gXm3s5bE52o=", + "lastModified": 1773524153, + "narHash": "sha256-Jms57zzlFf64ayKzzBWSE2SGvJmK+NGt8Gli71d9kmY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4a92571f9207810b559c9eac203d1f4d79830073", + "rev": "e9f278faa1d0c2fc835bd331d4666b59b505a410", "type": "github" }, "original": { "owner": "nixos", - "ref": "release-24.05", + "ref": "release-25.11", "repo": "nixpkgs", "type": "github" } @@ -48,11 +48,11 @@ ] }, "locked": { - "lastModified": 1728095260, - "narHash": "sha256-X62hA5ivYLY5G5+mXI6l9eUDkgi6Wu/7QUrwXhJ09oo=", + "lastModified": 1773457417, + "narHash": "sha256-waABTSxPdbxml4BhcabHhyQF02Qnj27qRU4ard0mTQo=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "d1d2532ab267cfe6e40dff73fbaf34436c406d26", + "rev": "055977c30249484010750e03074c744dcdaa0d23", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index e972566..bad93b2 100644 --- a/flake.nix +++ b/flake.nix @@ -1,6 +1,6 @@ { inputs = { - nixpkgs.url = "github:nixos/nixpkgs/release-24.05"; + nixpkgs.url = "github:nixos/nixpkgs/release-25.11"; flake-utils.url = "github:numtide/flake-utils"; @@ -23,7 +23,7 @@ (import rust-overlay) ]; }; - rust-pkgs = pkgs.rust-bin.nightly.latest.default.override { + rust-pkgs = pkgs.rust-bin.stable.latest.default.override { extensions = [ "rust-src" "rust-analyzer" ]; }; ndkVersion = "25.1.8937393"; @@ -62,7 +62,7 @@ inputsFrom = [ bladerf.libbladerf ]; shellHook = '' - export LIBCLANG_PATH="${llvmPackages_14.clang.cc.lib}/lib"; + export LIBCLANG_PATH="${llvmPackages.clang.cc.lib}/lib"; export BLADERF_INCLUDE_PATH="${bladerf.libbladerf}/include"; export BLADERF_RS_FPGA_BITSTREAM_PATH="${bladerf.xa4-bitstream}"; From 681b54e974729ed1eb9dbf4dff241b21e6025196 Mon Sep 17 00:00:00 2001 From: Troy Neubauer Date: Mon, 16 Mar 2026 20:42:02 -0700 Subject: [PATCH 2/5] CI --- .github/workflows/CI.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 77f0717..bdc29d4 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -51,7 +51,7 @@ jobs: timeout-minutes: 10 steps: - uses: actions/checkout@v4 - - uses: cachix/install-nix-action@v27 + - uses: cachix/install-nix-action@31 with: nix_path: nixpkgs=channel:nixos-unstable - name: cargo fmt --check @@ -62,7 +62,7 @@ jobs: timeout-minutes: 10 steps: - uses: actions/checkout@v4 - - uses: cachix/install-nix-action@v27 + - uses: cachix/install-nix-action@31 with: nix_path: nixpkgs=channel:nixos-unstable - name: cargo fmt --check From af621a62b114156ed1c9802980de5e1cb0c13516 Mon Sep 17 00:00:00 2001 From: Troy Neubauer Date: Mon, 16 Mar 2026 20:43:38 -0700 Subject: [PATCH 3/5] CI --- .github/workflows/CI.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index bdc29d4..210b050 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -51,7 +51,7 @@ jobs: timeout-minutes: 10 steps: - uses: actions/checkout@v4 - - uses: cachix/install-nix-action@31 + - uses: cachix/install-nix-action@v31 with: nix_path: nixpkgs=channel:nixos-unstable - name: cargo fmt --check @@ -62,7 +62,7 @@ jobs: timeout-minutes: 10 steps: - uses: actions/checkout@v4 - - uses: cachix/install-nix-action@31 + - uses: cachix/install-nix-action@v31 with: nix_path: nixpkgs=channel:nixos-unstable - name: cargo fmt --check From bad35e48951a621aacd1d5cc340d340ea6f14877 Mon Sep 17 00:00:00 2001 From: Troy Neubauer Date: Mon, 16 Mar 2026 20:50:26 -0700 Subject: [PATCH 4/5] CI --- bladerf.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bladerf.nix b/bladerf.nix index 18bb6bc..b3956e7 100644 --- a/bladerf.nix +++ b/bladerf.nix @@ -45,6 +45,8 @@ rec { "-DUDEV_RULES_PATH=etc/udev/rules.d" "-DINSTALL_UDEV_RULES=ON" "-DBLADERF_GROUP=bladerf" + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ + "-DCMAKE_C_FLAGS=-Wno-error=maybe-uninitialized" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DCMAKE_C_FLAGS=-Wno-error=format" ]; From 4d3843a95e7064fb9660f42daaf58c4b9dc981e7 Mon Sep 17 00:00:00 2001 From: Troy Neubauer Date: Mon, 16 Mar 2026 20:58:12 -0700 Subject: [PATCH 5/5] CI --- bladerf.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bladerf.nix b/bladerf.nix index b3956e7..9d09ef1 100644 --- a/bladerf.nix +++ b/bladerf.nix @@ -45,14 +45,14 @@ rec { "-DUDEV_RULES_PATH=etc/udev/rules.d" "-DINSTALL_UDEV_RULES=ON" "-DBLADERF_GROUP=bladerf" - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - "-DCMAKE_C_FLAGS=-Wno-error=maybe-uninitialized" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DCMAKE_C_FLAGS=-Wno-error=format" ]; env = lib.optionalAttrs stdenv.cc.isClang { NIX_CFLAGS_COMPILE = "-Wno-error=unused-but-set-variable -Wno-error=tautological-overlap-compare"; + } // lib.optionalAttrs (stdenv.hostPlatform.isLinux && !stdenv.cc.isClang) { + NIX_CFLAGS_COMPILE = "-Wno-error=maybe-uninitialized -Wno-error=calloc-transposed-args"; }; hardeningDisable = [ "fortify" ];