From b62a4c0d7029cd3067eb9b18e2e90a2e68625282 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sun, 19 May 2019 12:10:51 +0200 Subject: [PATCH 1/5] pythonPackages.intelhex: 2.1 -> 2.2.1 --- pkgs/development/python-modules/intelhex/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/intelhex/default.nix b/pkgs/development/python-modules/intelhex/default.nix index 82b5880f465..6ed21597aff 100644 --- a/pkgs/development/python-modules/intelhex/default.nix +++ b/pkgs/development/python-modules/intelhex/default.nix @@ -1,22 +1,24 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch , fetchurl }: buildPythonPackage rec { pname = "intelhex"; - version = "2.1"; + version = "2.2.1"; src = fetchPypi { inherit pname version; - sha256 = "0k5l1mn3gv1vb0jd24ygxksx8xqr57y1ivgyj37jsrwpzrp167kw"; + sha256 = "0ckqjbxd8gwcg98gfzpn4vq1qxzfvq3rdbrr1hikj1nmw08qb780"; }; patches = [ - (fetchurl { - url = https://github.com/bialix/intelhex/commit/f251aef214daa2116e15ff7f7dcec1639eb12d5b.patch; - sha256 = "02i15qjmcz7mwbwvyj3agl5y7098rag2iwypdilkaadhbslsl9b9"; + # patch the tests to check for the correct version string (2.2.1) + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/bialix/intelhex/pull/26.patch"; + sha256 = "1f3f2cyf9ipb9zdifmjs8rqhg028dhy91vabxxn3l7br657s8r2l"; }) ]; From fbfc8b173243542999224fcec9d579d37db90ec2 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sun, 19 May 2019 12:11:18 +0200 Subject: [PATCH 2/5] pythonPackages.pyspinel: init at 1.0.0a3 --- .../python-modules/pyspinel/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/python-modules/pyspinel/default.nix diff --git a/pkgs/development/python-modules/pyspinel/default.nix b/pkgs/development/python-modules/pyspinel/default.nix new file mode 100644 index 00000000000..990e2b28bd8 --- /dev/null +++ b/pkgs/development/python-modules/pyspinel/default.nix @@ -0,0 +1,21 @@ +{ buildPythonPackage, fetchPypi, lib, future, pyserial, ipaddress }: + +buildPythonPackage rec { + pname = "pyspinel"; + version = "1.0.0a3"; + + src = fetchPypi { + inherit pname version; + sha256 = "0914a662d57a14bce9df21f22711b5c9b2fef37cf461be54ed35c6e229060fd4"; + }; + + propagatedBuildInputs = [ pyserial ipaddress future ]; + + doCheck = false; + + meta = { + description = "Interface to the OpenThread Network Co-Processor (NCP)"; + homepage = "https://github.com/openthread/pyspinel"; + maintainers = with lib.maintainers; [ gebner ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cc281887d8b..ec988ca4000 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -780,6 +780,8 @@ in { slurm = pkgs.slurm; }; + pyspinel = callPackage ../development/python-modules/pyspinel {}; + pyssim = callPackage ../development/python-modules/pyssim { }; pystache = callPackage ../development/python-modules/pystache { }; From 4ca821fbce3aa0938779d043c8e0b5d8dc32e80e Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sun, 19 May 2019 12:11:41 +0200 Subject: [PATCH 3/5] pythonPackages.piccata: init at 1.0.1 --- .../python-modules/piccata/default.nix | 19 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/development/python-modules/piccata/default.nix diff --git a/pkgs/development/python-modules/piccata/default.nix b/pkgs/development/python-modules/piccata/default.nix new file mode 100644 index 00000000000..bd00b2f6d55 --- /dev/null +++ b/pkgs/development/python-modules/piccata/default.nix @@ -0,0 +1,19 @@ +{ buildPythonPackage, fetchPypi, lib, ipaddress }: + +buildPythonPackage rec { + pname = "piccata"; + version = "1.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "45f6c98c2ea809d445040888117f99bc3ee843490d86fecc5805ff5ea41508f7"; + }; + + propagatedBuildInputs = [ ipaddress ]; + + meta = { + description = "Simple CoAP (RFC7252) toolkit"; + homepage = "https://github.com/NordicSemiconductor/piccata"; + maintainers = with lib.maintainers; [ gebner ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ec988ca4000..08bbd4b52c1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -605,6 +605,8 @@ in { phonopy = callPackage ../development/python-modules/phonopy { }; + piccata = callPackage ../development/python-modules/piccata {}; + pims = callPackage ../development/python-modules/pims { }; plantuml = callPackage ../tools/misc/plantuml { }; From ef22dd015dd537717f1f28e793fc98a19009329c Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sun, 19 May 2019 12:12:09 +0200 Subject: [PATCH 4/5] pythonPackages.pc-ble-driver-py: init at 0.11.4 --- .../pc-ble-driver-py/default.nix | 51 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 53 insertions(+) create mode 100644 pkgs/development/python-modules/pc-ble-driver-py/default.nix diff --git a/pkgs/development/python-modules/pc-ble-driver-py/default.nix b/pkgs/development/python-modules/pc-ble-driver-py/default.nix new file mode 100644 index 00000000000..d21d9d07150 --- /dev/null +++ b/pkgs/development/python-modules/pc-ble-driver-py/default.nix @@ -0,0 +1,51 @@ +{ stdenv, buildPythonPackage, fetchpatch, fetchFromGitHub, + python, cmake, git, swig, boost, udev, + setuptools, enum34, wrapt, future }: + +buildPythonPackage rec { + pname = "pc-ble-driver-py"; + version = "0.11.4"; + disabled = python.isPy3k; + + src = fetchFromGitHub { + owner = "NordicSemiconductor"; + repo = "pc-ble-driver-py"; + rev = "v${version}"; + fetchSubmodules = true; + sha256 = "0lgmcnrlcivmawmlcwnn4pdp6afdbnf3fyfgq22xzs6v72m9gp81"; + }; + + nativeBuildInputs = [ cmake swig git setuptools ]; + buildInputs = [ boost udev ]; + 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 + ''; + + meta = with stdenv.lib; { + description = "Bluetooth Low Energy nRF5 SoftDevice serialization"; + homepage = "https://github.com/NordicSemiconductor/pc-ble-driver-py"; + license = licenses.unfreeRedistributable; + platforms = platforms.unix; + maintainers = with maintainers; [ gebner ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 08bbd4b52c1..91b191341d4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -593,6 +593,8 @@ in { pathlib = callPackage ../development/python-modules/pathlib { }; + pc-ble-driver-py = toPythonModule (callPackage ../development/python-modules/pc-ble-driver-py { }); + pdf2image = callPackage ../development/python-modules/pdf2image { }; pdfminer = callPackage ../development/python-modules/pdfminer_six { }; From 131d9e53a2e49b02f4996edde25936b6d8cc270a Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sun, 19 May 2019 12:12:32 +0200 Subject: [PATCH 5/5] nrfutil: init at 5.2.0 --- .../tools/misc/nrfutil/default.nix | 33 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/tools/misc/nrfutil/default.nix diff --git a/pkgs/development/tools/misc/nrfutil/default.nix b/pkgs/development/tools/misc/nrfutil/default.nix new file mode 100644 index 00000000000..0a6155e649e --- /dev/null +++ b/pkgs/development/tools/misc/nrfutil/default.nix @@ -0,0 +1,33 @@ +{ stdenv, python2Packages, fetchFromGitHub }: + +with python2Packages; buildPythonApplication rec { + pname = "nrfutil"; + version = "5.2.0"; + + src = fetchFromGitHub { + owner = "NordicSemiconductor"; + repo = "pc-nrfutil"; + rev = "v${version}"; + sha256 = "1hajjgz8r4fjbwqr22p5dvb6k83dpxf8k7mhx20gkbrrx9ivqh79"; + }; + + 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 + ''; + + meta = with stdenv.lib; { + description = "Device Firmware Update tool for nRF chips"; + homepage = "https://github.com/NordicSemiconductor/pc-nrfutil"; + license = licenses.unfreeRedistributable; + platforms = platforms.unix; + maintainers = with maintainers; [ gebner ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9ac9475e278..26cd39388bb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9397,6 +9397,8 @@ in noweb = callPackage ../development/tools/literate-programming/noweb { }; nuweb = callPackage ../development/tools/literate-programming/nuweb { tex = texlive.combined.scheme-small; }; + nrfutil = callPackage ../development/tools/misc/nrfutil { }; + obelisk = callPackage ../development/tools/ocaml/obelisk { }; obuild = callPackage ../development/tools/ocaml/obuild { };