diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 77f0717..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@v27 + - 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@v27 + - uses: cachix/install-nix-action@v31 with: nix_path: nixpkgs=channel:nixos-unstable - name: cargo fmt --check diff --git a/bladerf.nix b/bladerf.nix index 24dcb23..9d09ef1 100644 --- a/bladerf.nix +++ b/bladerf.nix @@ -50,7 +50,9 @@ 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"; + } // lib.optionalAttrs (stdenv.hostPlatform.isLinux && !stdenv.cc.isClang) { + NIX_CFLAGS_COMPILE = "-Wno-error=maybe-uninitialized -Wno-error=calloc-transposed-args"; }; 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}";