From 52592e11324dc942f74e8a8828176f64c1e702d9 Mon Sep 17 00:00:00 2001 From: Michiel Leenaars Date: Sat, 20 Aug 2016 21:30:58 +0200 Subject: [PATCH 1/6] pythonPackages.lightblue: init at 0.4 --- pkgs/top-level/python-packages.nix | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6f94a8fa40b..e1cb603e193 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7117,6 +7117,29 @@ in modules // { }; }; + lightblue = buildPythonPackage rec { + pname = "lightblue"; + version = "0.4"; + name = "${pname}-${version}"; + + src = pkgs.fetchurl { + url = "mirror://sourceforge/${pname}/${name}.tar.gz"; + sha256 = "016h1mlhpqxjj25lcvl4fqc19k8ifmsv6df7rhr12fyfcrp5i14d"; + }; + + buildInputs = [ pkgs.bluez pkgs.openobex ]; + + + meta = { + homepage = http://lightblue.sourceforge.net; + description = "Cross-platform Bluetooth API for Python"; + maintainers = with maintainers; [ leenaars ]; + license = licenses.gpl3; + platform = platforms.all; + }; + }; + + lightning = buildPythonPackage rec { version = "1.2.1"; name = "lightning-python-${version}"; From b06b865dccb842d9536dd3bcd1526787cb98af8e Mon Sep 17 00:00:00 2001 From: Michiel Leenaars Date: Sat, 20 Aug 2016 21:31:32 +0200 Subject: [PATCH 2/6] pythonPackages.nxt_python: init at unstable-20160819 --- pkgs/top-level/python-packages.nix | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e1cb603e193..1f9a78ebcec 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7513,6 +7513,33 @@ in modules // { }; }; + nxt_python = buildPythonPackage rec { + version = "unstable-20160819"; + pname = "nxt-python"; + name = "${pname}-${version}"; + + propagatedBuildInputs = with self; [ pyusb pybluez pyfantom pkgs.git ]; + disabled = isPy3k; + + src = pkgs.fetchgit { + url = "http://github.com/Eelviny/nxt-python"; + rev = "479e20b7491b28567035f4cee294c4a2af629297"; + sha256 = "0mcsajhgm2wy4iy2lhmyi3xibgmbixbchanzmlhsxk6qyjccn9r9"; + branchName= "pyusb"; + }; + + # Tests fail on Mac dependency + doCheck = false; + + meta = { + description = "Python driver/interface for Lego Mindstorms NXT robot"; + homepage = https://github.com/Eelviny/nxt-python; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ leenaars ]; + }; + }; + odfpy = buildPythonPackage rec { version = "0.9.6"; name = "odfpy-${version}"; From 4d7cc55344a18142b4b4120cfe81b18344d78b0b Mon Sep 17 00:00:00 2001 From: Michiel Leenaars Date: Sat, 20 Aug 2016 21:35:31 +0200 Subject: [PATCH 3/6] pythonPackages.pyusb: add propagatedBuildInput libusb --- pkgs/top-level/python-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1f9a78ebcec..ab319ace430 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -26185,6 +26185,8 @@ in modules // { sed -i -e "s|find_library=None|find_library=lambda _:\"$libusb\"|" usb/backend/libusb1.py ''; + propagatedBuildInputs = [ pkgs.libusb ]; + # No tests included doCheck = false; From c7b800a6bf3a43dc158e7d9e1358d68565e03883 Mon Sep 17 00:00:00 2001 From: Michiel Leenaars Date: Sat, 20 Aug 2016 21:32:42 +0200 Subject: [PATCH 4/6] pythonPackages.pybluez: init at unstable-20160819 --- pkgs/top-level/python-packages.nix | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ab319ace430..2b1ccce41d5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7844,6 +7844,30 @@ in modules // { }; }; + pybluez = buildPythonPackage rec { + version = "unstable-20160819"; + pname = "pybluez"; + name = "${pname}-${version}"; + + propagatedBuildInputs = with self; [ pkgs.bluez ]; + + src = pkgs.fetchFromGitHub { + owner = "karulis"; + repo = "${pname}"; + rev = "a0b226a61b166e170d48539778525b31e47a4731"; + sha256 = "104dm5ngfhqisv1aszdlr3szcav2g3bhsgzmg4qfs09b3i5zj047"; + }; + + # the tests do not pass + doCheck = false; + + meta = { + description = "Bluetooth Python extension module"; + license = licenses.gpl2; + maintainers = with maintainers; [ leenaars ]; + }; + }; + pycares = buildPythonPackage rec { name = "pycares-${version}"; version = "1.0.0"; From 53b618105dd115ecefbb7fee190d5e9c0d51d3af Mon Sep 17 00:00:00 2001 From: Michiel Leenaars Date: Sat, 20 Aug 2016 21:56:08 +0200 Subject: [PATCH 5/6] pythonPackages.pyfantom: init at unstable-2013-12-18 --- pkgs/top-level/python-packages.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2b1ccce41d5..6dac793514d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18689,6 +18689,25 @@ in modules // { }; }; + pyfantom = buildPythonPackage rec { + name = "pyfantom-${version}"; + version = "unstable-2013-12-18"; + + src = pkgs.fetchgit { + url = "http://git.ni.fr.eu.org/pyfantom.git"; + sha256 = "1m53n8bxslq5zmvcf7i1xzsgq5bdsf1z529br5ypmj5bg0s86j4q"; + }; + + # No tests included + doCheck = false; + + meta = { + homepage = http://pyfantom.ni.fr.eu.org/; + description = "Wrapper for the LEGO Mindstorms Fantom Driver"; + license = licenses.gpl2; + }; + }; + pyfeed = buildPythonPackage rec { url = "http://www.blarg.net/%7Esteveha/pyfeed-0.7.4.tar.gz"; name = stdenv.lib.nameFromURL url ".tar"; From a45f2033664010edd9f00db4296352ffd5ef0992 Mon Sep 17 00:00:00 2001 From: Michiel Leenaars Date: Sat, 20 Aug 2016 23:43:15 +0200 Subject: [PATCH 6/6] pythonPackages.BlinkStick: fix brokenness --- pkgs/top-level/python-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6dac793514d..714dbc62915 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -26255,6 +26255,8 @@ in modules // { # Likely current pyusb will work but we need to patch the hard requirement then. broken = true; + patchPhase = "substituteInPlace setup.py --replace pyusb==1.0.0b1 pyusb==1.0.0"; + propagatedBuildInputs = with self; [ pyusb ]; meta = {