diff options
author | Robert Schütz <rschuetz17@gmail.com> | 2018-11-12 11:37:06 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-11-12 11:37:06 +0100 |
commit | b9494ac352920a3c5254a7ff661470d7343eb8f8 (patch) | |
tree | 401d804358adb23906cfd1af6d53a5907971171a /pkgs/development | |
parent | 92c478babd58c2e83a1465480c8d5f65b64d3239 (diff) | |
parent | dbceff85b94eca9e5ecea4fedadbe4db52bfdbf9 (diff) | |
download | nixlib-b9494ac352920a3c5254a7ff661470d7343eb8f8.tar nixlib-b9494ac352920a3c5254a7ff661470d7343eb8f8.tar.gz nixlib-b9494ac352920a3c5254a7ff661470d7343eb8f8.tar.bz2 nixlib-b9494ac352920a3c5254a7ff661470d7343eb8f8.tar.lz nixlib-b9494ac352920a3c5254a7ff661470d7343eb8f8.tar.xz nixlib-b9494ac352920a3c5254a7ff661470d7343eb8f8.tar.zst nixlib-b9494ac352920a3c5254a7ff661470d7343eb8f8.zip |
Merge pull request #50166 from dotlambda/home-assistant-0.82
home-assistant: 0.81.5 -> 0.82.0
Diffstat (limited to 'pkgs/development')
3 files changed, 51 insertions, 4 deletions
diff --git a/pkgs/development/libraries/openzwave/default.nix b/pkgs/development/libraries/openzwave/default.nix index 087a22dd61ba..4150f0f466cd 100644 --- a/pkgs/development/libraries/openzwave/default.nix +++ b/pkgs/development/libraries/openzwave/default.nix @@ -3,16 +3,18 @@ , systemd }: let - version = "2018-04-04"; + version = "2018-11-04"; in stdenv.mkDerivation rec { name = "openzwave-${version}"; + # Use fork by Home Assistant because this package is mainly used for python.pkgs.homeassistant-pyozw. + # See https://github.com/OpenZWave/open-zwave/compare/master...home-assistant:hass for the difference. src = fetchFromGitHub { - owner = "OpenZWave"; + owner = "home-assistant"; repo = "open-zwave"; - rev = "ab5fe966fee882bb9e8d78a91db892a60a1863d9"; - sha256 = "0yby8ygzjn5zp5vhysxaadbzysqanwd2zakz379299qs454pr2h9"; + rev = "2cc174ad5c935d2d17828634aca2db5a60c59237"; + sha256 = "1d13maj93i6h792cbvqpx43ffss44dxmvbwj2777vzvvjib8m4n8"; }; nativeBuildInputs = [ doxygen fontconfig graphviz-nox libxml2 pkgconfig which ]; diff --git a/pkgs/development/python-modules/homeassistant-pyozw/default.nix b/pkgs/development/python-modules/homeassistant-pyozw/default.nix new file mode 100644 index 000000000000..c4410cfdbcf1 --- /dev/null +++ b/pkgs/development/python-modules/homeassistant-pyozw/default.nix @@ -0,0 +1,14 @@ +{ python_openzwave, fetchPypi }: + +python_openzwave.overridePythonAttrs (oldAttrs: rec { + pname = "homeassistant_pyozw"; + version = "0.1.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "bca4062906f65db9b4668388e6755d6ea3ee9e1b02ad3ed81738bb4d32a79342"; + }; + + meta.homepage = https://github.com/home-assistant/python-openzwave; +}) diff --git a/pkgs/development/python-modules/ruamel_yaml/default.nix b/pkgs/development/python-modules/ruamel_yaml/default.nix new file mode 100644 index 000000000000..59674d82c90c --- /dev/null +++ b/pkgs/development/python-modules/ruamel_yaml/default.nix @@ -0,0 +1,31 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, ruamel_base +, typing +, ruamel_ordereddict +, isPy3k +}: + +buildPythonPackage rec { + pname = "ruamel.yaml"; + version = "0.15.35"; + + src = fetchPypi { + inherit pname version; + sha256 = "0xggyfaj6vprggahf7cq8kp9j79rb7hn8ndk3bxj2sxvwhhliiwd"; + }; + + # Tests cannot load the module to test + doCheck = false; + + propagatedBuildInputs = [ ruamel_base typing ] + ++ stdenv.lib.optional (!isPy3k) ruamel_ordereddict; + + meta = with stdenv.lib; { + description = "YAML parser/emitter that supports roundtrip preservation of comments, seq/map flow style, and map key order"; + homepage = https://bitbucket.org/ruamel/yaml; + license = licenses.mit; + }; + +} |