Merge pull request #180075 from KenMacD/nrfutil-update

Update nrfutil and dependencies.

pkgs/development/libraries/pc-ble-driver/default.nix

···
-{ lib, stdenv, fetchFromGitHub
+{ lib, stdenv, fetchpatch, fetchFromGitHub
 , cmake, git
 , asio, catch2, spdlog
 , IOKit, udev
···
     rev = "v${version}";
     sha256 = "1609x17sbfi668jfwyvnfk9z29w6cgzvgv67xcpvpx5jv0czpcdj";
   };
+
+  patches = [
+     # Fix build with GCC 11
+    (fetchpatch {
+      url = "https://github.com/NordicSemiconductor/pc-ble-driver/commit/37258e65bdbcd0b4369ae448faf650dd181816ec.patch";
+      sha256 = "sha256-gOdzIW8YJQC+PE4FJd644I1+I7CMcBY8wpF6g02eI5g=";
+    })
+  ];
 
   cmakeFlags = [
     "-DNRF_BLE_DRIVER_VERSION=${version}"

pkgs/development/python-modules/pc-ble-driver-py/default.nix

···
 
 buildPythonPackage rec {
   pname = "pc-ble-driver-py";
-  version = "0.16.3";
+  version = "0.17.0";
 
-  disabled = pythonOlder "3.7" || pythonAtLeast "3.10";
+  disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "NordicSemiconductor";
     repo = "pc-ble-driver-py";
     rev = "v${version}";
-    sha256 = "sha256-X21GQsyRZu1xdoTlD9DjceIWKpcuTLdIDf8UahntS3s=";
+    sha256 = "sha256-brC33ar2Jq3R2xdrklvVsQKf6pcnKwD25PO4TIvXgTg=";
   };
 
   nativeBuildInputs = [

pkgs/development/tools/misc/nrfutil/default.nix

···
 { lib
 , stdenv
 , fetchFromGitHub
-, pkgs
 , python3
-, python3Packages
 }:
-let
-  py = python3.override {
-    packageOverrides = self: super: {
 
-      libusb1 = super.libusb1.overridePythonAttrs (oldAttrs: rec {
-        version = "1.9.3";
-        src = oldAttrs.src.override {
-          inherit version;
-          sha256 = "0j8p7jb7sibiiib18vyv3w5rrk0f4d2dl99bs18nwkq6pqvwxrk0";
-        };
-
-        postPatch = ''
-          substituteInPlace usb1/libusb1.py --replace \
-            "ctypes.util.find_library(base_name)" \
-            "'${pkgs.libusb1}/lib/libusb-1.0${stdenv.hostPlatform.extensions.sharedLibrary}'"
-        '';
-      });
-    };
-  };
-in
-with py.pkgs;
+with python3.pkgs;
 
 buildPythonApplication rec {
   pname = "nrfutil";
-  version = "6.1.3";
+  version = "6.1.6";
 
   src = fetchFromGitHub {
     owner = "NordicSemiconductor";
     repo = "pc-nrfutil";
     rev = "v${version}";
-    sha256 = "1gpxjdcjn4rjvk649vpkh563c7lx3rrfvamazb1qjii1pxrvvqa7";
+    sha256 = "sha256-UiGNNJxNSpIzpeYMlzocLG2kuetl8xti5A3n6zz0lcY=";
   };
 
   propagatedBuildInputs = [
···
 
   postPatch = ''
     mkdir test-reports
+    substituteInPlace requirements.txt --replace "libusb1==1.9.3" "libusb1"
   '';
 
   meta = with lib; {
···
     license = licenses.unfreeRedistributable;
     platforms = platforms.unix;
     maintainers = with maintainers; [ gebner ];
-    # libusb1 1.9.3 uses setuptools' 2to3 translation feature, which has been removed in setuptools 58
-    broken = true;
   };
 }