From e1a1b974edc45f12a4c7b564484c9936dba96590 Mon Sep 17 00:00:00 2001 From: Jonas Schievink Date: Mon, 13 Jul 2020 13:49:22 +0200 Subject: [PATCH 1/3] pc-ble-driver: init at 4.1.1 It's a dependency of pc-ble-driver-py, but it's no longer built alongside it. --- maintainers/maintainer-list.nix | 6 ++++ .../libraries/pc-ble-driver/default.nix | 28 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 36 insertions(+) create mode 100644 pkgs/development/libraries/pc-ble-driver/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e5cd163cb14..a9c014ff568 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3959,6 +3959,12 @@ githubId = 4611077; name = "Raymond Gauthier"; }; + jschievink = { + email = "jonasschievink@gmail.com"; + github = "jonas-schievink"; + githubId = 1786438; + name = "Jonas Schievink"; + }; jtcoolen = { email = "jtcoolen@pm.me"; name = "Julien Coolen"; diff --git a/pkgs/development/libraries/pc-ble-driver/default.nix b/pkgs/development/libraries/pc-ble-driver/default.nix new file mode 100644 index 00000000000..9f2c9748036 --- /dev/null +++ b/pkgs/development/libraries/pc-ble-driver/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, git, cmake, catch2, asio, udev }: + +stdenv.mkDerivation rec { + pname = "pc-ble-driver"; + version = "4.1.1"; + + src = fetchFromGitHub { + owner = "NordicSemiconductor"; + repo = "pc-ble-driver"; + rev = "v${version}"; + sha256 = "1llhkpbdbsq9d91m873vc96bprkgpb5wsm5fgs1qhzdikdhg077q"; + }; + + cmakeFlags = [ + "-DNRF_BLE_DRIVER_VERSION=${version}" + ]; + + nativeBuildInputs = [ cmake git ]; + buildInputs = [ catch2 asio udev ]; + + meta = with stdenv.lib; { + description = "Desktop library for Bluetooth low energy development"; + homepage = "https://github.com/NordicSemiconductor/pc-ble-driver"; + license = licenses.unfreeRedistributable; + platforms = platforms.unix; + maintainers = with maintainers; [ jschievink ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5a5c9659b9e..e13f7d20309 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21354,6 +21354,8 @@ in partio = callPackage ../development/libraries/partio {}; + pc-ble-driver = callPackage ../development/libraries/pc-ble-driver {}; + pbis-open = callPackage ../tools/security/pbis { }; pcmanfm = callPackage ../applications/misc/pcmanfm { }; From d82b7b86904424c27e28c7caf26ca6880149d33b Mon Sep 17 00:00:00 2001 From: Jonas Schievink Date: Mon, 13 Jul 2020 13:50:05 +0200 Subject: [PATCH 2/3] pc-ble-driver-py: 0.11.4 -> 0.14.2 --- .../pc-ble-driver-py/default.nix | 40 +++++-------------- 1 file changed, 10 insertions(+), 30 deletions(-) diff --git a/pkgs/development/python-modules/pc-ble-driver-py/default.nix b/pkgs/development/python-modules/pc-ble-driver-py/default.nix index d21d9d07150..c8967fa5eab 100644 --- a/pkgs/development/python-modules/pc-ble-driver-py/default.nix +++ b/pkgs/development/python-modules/pc-ble-driver-py/default.nix @@ -1,45 +1,25 @@ -{ stdenv, buildPythonPackage, fetchpatch, fetchFromGitHub, - python, cmake, git, swig, boost, udev, - setuptools, enum34, wrapt, future }: +{ stdenv, fetchFromGitHub, cmake, git, swig, boost, udev, pc-ble-driver +, buildPythonPackage, enum34, wrapt, future, setuptools, scikit-build }: buildPythonPackage rec { pname = "pc-ble-driver-py"; - version = "0.11.4"; - disabled = python.isPy3k; + version = "0.14.2"; src = fetchFromGitHub { owner = "NordicSemiconductor"; repo = "pc-ble-driver-py"; rev = "v${version}"; - fetchSubmodules = true; - sha256 = "0lgmcnrlcivmawmlcwnn4pdp6afdbnf3fyfgq22xzs6v72m9gp81"; + sha256 = "1zbi3v4jmgq1a3ml34dq48y1hinw2008vwqn30l09r5vqvdgnj8m"; }; - nativeBuildInputs = [ cmake swig git setuptools ]; - buildInputs = [ boost udev ]; + # doCheck tries to write to the global python directory to install things + doCheck = false; + + nativeBuildInputs = [ cmake swig git setuptools scikit-build ]; + buildInputs = [ boost udev pc-ble-driver ]; propagatedBuildInputs = [ enum34 wrapt future ]; - patches = [ - # build system expects case-insensitive file system - (fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/NordicSemiconductor/pc-ble-driver-py/pull/84.patch"; - sha256 = "0ibx5g2bndr5h9sfnx51bk9b62q4jvpdwhxadbnj3da8kvcz13cy"; - }) - ]; - - postPatch = '' - # do not force static linking of boost - sed -i /Boost_USE_STATIC_LIBS/d pc-ble-driver/cmake/*.cmake - - cd python - ''; - - preBuild = '' - pushd ../build - cmake .. - make -j $NIX_BUILD_CORES - popd - ''; + dontUseCmakeConfigure = true; meta = with stdenv.lib; { description = "Bluetooth Low Energy nRF5 SoftDevice serialization"; From 720a9358dd8442f135ede54be514c6c8a7488c9e Mon Sep 17 00:00:00 2001 From: Jonas Schievink Date: Mon, 13 Jul 2020 13:50:11 +0200 Subject: [PATCH 3/3] nrfutil: 5.2 -> 6.1 --- pkgs/development/tools/misc/nrfutil/default.nix | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/misc/nrfutil/default.nix b/pkgs/development/tools/misc/nrfutil/default.nix index 0a6155e649e..eeb9100a4c8 100644 --- a/pkgs/development/tools/misc/nrfutil/default.nix +++ b/pkgs/development/tools/misc/nrfutil/default.nix @@ -1,25 +1,22 @@ -{ stdenv, python2Packages, fetchFromGitHub }: +{ stdenv, python37Packages, fetchFromGitHub }: -with python2Packages; buildPythonApplication rec { +with python37Packages; buildPythonApplication rec { pname = "nrfutil"; - version = "5.2.0"; + version = "6.1"; src = fetchFromGitHub { owner = "NordicSemiconductor"; repo = "pc-nrfutil"; rev = "v${version}"; - sha256 = "1hajjgz8r4fjbwqr22p5dvb6k83dpxf8k7mhx20gkbrrx9ivqh79"; + sha256 = "0g43lf5jmk0qxb7r4h68wr38fli6pjjk67w8l2cpdm9rd8jz4lpn"; }; - propagatedBuildInputs = [ pc-ble-driver-py six pyserial enum34 click ecdsa + propagatedBuildInputs = [ pc-ble-driver-py six pyserial enum34 click ecdsa protobuf tqdm piccata pyspinel intelhex pyyaml crcmod libusb1 ipaddress ]; checkInputs = [ nose behave ]; postPatch = '' - # remove version bound on pyyaml - sed -i /pyyaml/d requirements.txt - mkdir test-reports '';