Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 4166986dfad5
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 35e62a279d15
Choose a head ref
  • 8 commits
  • 7 files changed
  • 2 contributors

Commits on Mar 26, 2018

  1. pythonPackages.yahooweather: init at 0.10

    (cherry picked from commit 4af9a88)
    peterhoeg committed Mar 26, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    Copy the full SHA
    c4e3797 View commit details
  2. pythonPackages.deluge-client: init at 1.2.0

    (cherry picked from commit 0bb55ed)
    peterhoeg committed Mar 26, 2018
    Copy the full SHA
    af9b83a View commit details
  3. pythonPackages.sseclient: init at 0.0.19

    (cherry picked from commit 91456c6)
    peterhoeg committed Mar 26, 2018
    Copy the full SHA
    05e0dc4 View commit details
  4. pythonPackages.ha-ffmpeg: init at 1.9

    (cherry picked from commit 083ac5a)
    peterhoeg committed Mar 26, 2018
    Copy the full SHA
    79086fb View commit details
  5. pythonPackages.miniupnpc: init at 2.0.2

    (cherry picked from commit b1d7d13)
    peterhoeg committed Mar 26, 2018
    Copy the full SHA
    1d3e888 View commit details
  6. pythonPackages.async: uninit because deprecated

    Citing from PyPI:
    DEPRECATION NOTE: Please do not use this library ! It’s not working correctly in python 3, and besides that might be called a failed experiment.
    
    (cherry picked from commit 33e1699)
    Robert Schütz authored and peterhoeg committed Mar 26, 2018
    Copy the full SHA
    972c80d View commit details
  7. home-assistant: add missing dependencies

    (cherry picked from commit 15f63cb)
    peterhoeg committed Mar 26, 2018
    Copy the full SHA
    7662b6c View commit details
  8. Merge pull request #37847 from peterhoeg/hass1803

    home-assistant: backport of a number of python packages
    peterhoeg authored Mar 26, 2018
    Copy the full SHA
    35e62a2 View commit details
21 changes: 21 additions & 0 deletions pkgs/development/python-modules/deluge-client/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{ stdenv, buildPythonPackage, fetchPypi }:

buildPythonPackage rec {
pname = "deluge-client";
version = "1.2.0";

src = fetchPypi {
inherit pname version;
sha256 = "048zfidv08sr4hivdd3xxf1pywhqbnszj5qcn51h2f4y1588fhpf";
};

# it will try to connect to a running instance
doCheck = false;

meta = with stdenv.lib; {
description = "Lightweight pure-python rpc client for deluge";
homepage = https://github.com/JohnDoee/deluge-client;
license = licenses.mit;
maintainers = with maintainers; [ peterhoeg ];
};
}
28 changes: 28 additions & 0 deletions pkgs/development/python-modules/ha-ffmpeg/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{ stdenv, buildPythonPackage, fetchPypi, isPy3k
, ffmpeg, async-timeout }:

buildPythonPackage rec {
pname = "ha-ffmpeg";
version = "1.9";

disabled = !isPy3k;

src = fetchPypi {
inherit pname version;
sha256 = "0644j5fqw8p6li6nrnm1rw7nhvsixq1c7gik3f1yx50776yg05i8";
};

buildInputs = [ ffmpeg ];

propagatedBuildInputs = [ async-timeout ];

# only manual tests
doCheck = false;

meta = with stdenv.lib; {
homepage = https://github.com/pvizeli/ha-ffmpeg;
description = "Library for home-assistant to handle ffmpeg";
license = licenses.bsd3;
maintainers = with maintainers; [ peterhoeg ];
};
}
18 changes: 18 additions & 0 deletions pkgs/development/python-modules/miniupnpc/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{ stdenv, buildPythonPackage, fetchPypi }:

buildPythonPackage rec {
pname = "miniupnpc";
version = "2.0.2";

src = fetchPypi {
inherit pname version;
sha256 = "0ca94zz7sr2x57j218aypxqcwkr23n8js30f3yrvvqbg929nr93y";
};

meta = with stdenv.lib; {
description = "miniUPnP client";
homepage = http://miniupnp.free.fr/;
license = licenses.mit;
maintainers = with maintainers; [ peterhoeg ];
};
}
24 changes: 24 additions & 0 deletions pkgs/development/python-modules/sseclient/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{ stdenv, buildPythonPackage, fetchPypi
, requests, six
, backports_unittest-mock, pluggy, pytest, pytestrunner }:

buildPythonPackage rec {
pname = "sseclient";
version = "0.0.19";

src = fetchPypi {
inherit pname version;
sha256 = "7a2ea3f4c8525ae9a677bc8193df5db88e23bcaafcc34938a1ee665975703a9f";
};

propagatedBuildInputs = [ requests six ];

checkInputs = [ backports_unittest-mock pytest pytestrunner ];

meta = with stdenv.lib; {
description = "Client library for reading Server Sent Event streams";
homepage = https://github.com/btubbs/sseclient;
license = licenses.mit;
maintainers = with maintainers; [ peterhoeg ];
};
}
23 changes: 23 additions & 0 deletions pkgs/development/python-modules/yahooweather/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{ lib, buildPythonPackage, fetchPypi, isPy3k }:

buildPythonPackage rec {
pname = "yahooweather";
version = "0.10";

disabled = !isPy3k;

src = fetchPypi {
inherit pname version;
sha256 = "0bsxmngkpzvqm50i2cnxjzhpbdhb8s10ly8h5q08696cjihqdkpa";
};

# Tests require network access
doCheck = false;

meta = with lib; {
description = "Provide an interface to the Yahoo! Weather RSS feed";
homepage = https://github.com/pvizeli/yahooweather;
license = licenses.bsd2;
maintainers = with maintainers; [ peterhoeg ];
};
}
12 changes: 6 additions & 6 deletions pkgs/servers/home-assistant/component-packages.nix
Original file line number Diff line number Diff line change
@@ -99,7 +99,7 @@
"envisalink" = ps: with ps; [ ];
"fan.xiaomi_miio" = ps: with ps; [ ];
"feedreader" = ps: with ps; [ feedparser ];
"ffmpeg" = ps: with ps; [ ];
"ffmpeg" = ps: with ps; [ ha-ffmpeg ];
"frontend" = ps: with ps; [ ];
"gc100" = ps: with ps; [ ];
"goalfeed" = ps: with ps; [ ];
@@ -280,7 +280,7 @@
"sensor.crimereports" = ps: with ps; [ ];
"sensor.cups" = ps: with ps; [ ];
"sensor.darksky" = ps: with ps; [ ];
"sensor.deluge" = ps: with ps; [ ];
"sensor.deluge" = ps: with ps; [ deluge-client ];
"sensor.deutsche_bahn" = ps: with ps; [ ];
"sensor.dht" = ps: with ps; [ ];
"sensor.discogs" = ps: with ps; [ discogs_client ];
@@ -376,7 +376,7 @@
"sensor.xbox_live" = ps: with ps; [ ];
"sensor.yahoo_finance" = ps: with ps; [ ];
"sensor.yr" = ps: with ps; [ xmltodict ];
"sensor.yweather" = ps: with ps; [ ];
"sensor.yweather" = ps: with ps; [ yahooweather ];
"sensor.zestimate" = ps: with ps; [ xmltodict ];
"shiftr" = ps: with ps; [ paho-mqtt ];
"skybell" = ps: with ps; [ ];
@@ -387,7 +387,7 @@
"switch.acer_projector" = ps: with ps; [ pyserial ];
"switch.anel_pwrctrl" = ps: with ps; [ ];
"switch.broadlink" = ps: with ps; [ ];
"switch.deluge" = ps: with ps; [ ];
"switch.deluge" = ps: with ps; [ deluge-client ];
"switch.digitalloggers" = ps: with ps; [ ];
"switch.dlink" = ps: with ps; [ ];
"switch.edimax" = ps: with ps; [ ];
@@ -423,7 +423,7 @@
"twilio" = ps: with ps; [ twilio ];
"upcloud" = ps: with ps; [ ];
"updater" = ps: with ps; [ distro ];
"upnp" = ps: with ps; [ ];
"upnp" = ps: with ps; [ miniupnpc ];
"usps" = ps: with ps; [ ];
"vacuum.roomba" = ps: with ps; [ ];
"vacuum.xiaomi_miio" = ps: with ps; [ ];
@@ -439,7 +439,7 @@
"weather.darksky" = ps: with ps; [ ];
"weather.metoffice" = ps: with ps; [ ];
"weather.openweathermap" = ps: with ps; [ ];
"weather.yweather" = ps: with ps; [ ];
"weather.yweather" = ps: with ps; [ yahooweather ];
"wemo" = ps: with ps; [ ];
"wink" = ps: with ps; [ ];
"xiaomi_aqara" = ps: with ps; [ ];
23 changes: 9 additions & 14 deletions pkgs/top-level/python-packages.nix
Original file line number Diff line number Diff line change
@@ -257,6 +257,8 @@ in {
hdf5 = pkgs.hdf5-mpi;
};

ha-ffmpeg = callPackage ../development/python-modules/ha-ffmpeg { };

habanero = callPackage ../development/python-modules/habanero { };

i3ipc = callPackage ../development/python-modules/i3ipc { };
@@ -642,23 +644,10 @@ in {
gui = false;
};

deluge-client = callPackage ../development/python-modules/deluge-client { };

arrow = callPackage ../development/python-modules/arrow { };

async = buildPythonPackage rec {
name = "async-0.6.1";
disabled = isPy3k;
meta.maintainers = with maintainers; [ ];

buildInputs = with self; [ pkgs.zlib ];
doCheck = false;

src = pkgs.fetchurl {
url = "mirror://pypi/a/async/${name}.tar.gz";
sha256 = "1lfmjm8apy9qpnpbq8g641fd01qxh9jlya5g2d6z60vf8p04rla1";
};
};

asynctest = callPackage ../development/python-modules/asynctest { };

async-timeout = callPackage ../development/python-modules/async_timeout { };
@@ -2788,6 +2777,8 @@ in {
};
};

miniupnpc = callPackage ../development/python-modules/miniupnpc {};

mixpanel = buildPythonPackage rec {
version = "4.0.2";
name = "mixpanel-${version}";
@@ -20472,10 +20463,14 @@ EOF

thinc = callPackage ../development/python-modules/thinc { };

yahooweather = callPackage ../development/python-modules/yahooweather { };

spacy = callPackage ../development/python-modules/spacy { };

spacy_models = callPackage ../development/python-modules/spacy/models.nix { };

sseclient = callPackage ../development/python-modules/sseclient { };

textacy = callPackage ../development/python-modules/textacy { };

pyemd = callPackage ../development/python-modules/pyemd { };