From 4f68f59a434e17462160cf0476634242b0bc01b0 Mon Sep 17 00:00:00 2001 From: Felix Breidenstein Date: Fri, 24 Nov 2017 00:09:00 +0100 Subject: [PATCH 1/7] Add f-breidenstein as maintainer --- lib/maintainers.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 7f8b613187635..bd36d3d75a719 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -228,6 +228,7 @@ fadenb = "Tristan Helmich "; falsifian = "James Cook "; fare = "Francois-Rene Rideau "; + f-breidenstein = "Felix Breidenstein "; fgaz = "Francesco Gazzetta "; FireyFly = "Jonas Höglund "; flokli = "Florian Klink "; From a474a711be78a6af1bd0ef00e0dbfe0fadd77b5b Mon Sep 17 00:00:00 2001 From: Felix Breidenstein Date: Fri, 24 Nov 2017 00:09:16 +0100 Subject: [PATCH 2/7] vincenty: init at 0.1.4 --- .../python-modules/vincenty/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/python-modules/vincenty/default.nix diff --git a/pkgs/development/python-modules/vincenty/default.nix b/pkgs/development/python-modules/vincenty/default.nix new file mode 100644 index 0000000000000..0d10dbb977350 --- /dev/null +++ b/pkgs/development/python-modules/vincenty/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchPypi, buildPythonApplication }: + +buildPythonApplication rec { + name = "${pname}-${version}"; + version = "0.1.4"; + pname = "vincenty"; + + src = fetchPypi { + inherit version pname; + sha256 = "0nkqhbhrqar4jab7rvxfyjh2sh8d9v6ir861f6yrqdjzhggg58pa"; + }; + + # Project does not have any tests + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/maurycyp/vincenty/; + description = " Calculate the geographical distance between 2 points with extreme accuracy"; + license = licenses.unlicense; + platforms = platforms.linux; + maintainers = with maintainers; [ f-breidenstein ]; + }; +} + + diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 47563ac163b35..957a0bb006a30 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -22591,6 +22591,8 @@ EOF vine = callPackage ../development/python-modules/vine { }; + vincenty = callPackage ../development/python-modules/vincenty { }; + wp_export_parser = buildPythonPackage rec { name = "${pname}-${version}"; pname = "wp_export_parser"; From f9a7fc5faf8d0a15627f4b6537873a15a5e8ae0d Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Thu, 23 Nov 2017 23:53:28 +0100 Subject: [PATCH 3/7] astral: init at 1.4 --- .../python-modules/astral/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/python-modules/astral/default.nix diff --git a/pkgs/development/python-modules/astral/default.nix b/pkgs/development/python-modules/astral/default.nix new file mode 100644 index 0000000000000..4b9aec5e9aae8 --- /dev/null +++ b/pkgs/development/python-modules/astral/default.nix @@ -0,0 +1,27 @@ +{ stdenv, buildPythonPackage, fetchPypi, pytz, pytest }: + +buildPythonPackage rec { + pname = "astral"; + version = "1.4"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "1zm1ypc6w279gh7lbgsfbzfxk2x4gihlq3rfh59hj70hmhjwiwp7"; + }; + + propagatedBuildInputs = [ pytz ]; + + checkInputs = [ pytest ]; + checkPhase = '' + py.test -k "not test_GoogleLocator" + ''; + + meta = with stdenv.lib; { + description = "Calculations for the position of the sun and the moon"; + homepage = https://github.com/sffjunkie/astral/; + license = licenses.asl20; + maintainers = with maintainers; [ flokli ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 957a0bb006a30..9433edc3c856d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -165,6 +165,8 @@ in { asn1crypto = callPackage ../development/python-modules/asn1crypto { }; + astral = callPackage ../development/python-modules/astral { }; + astropy = callPackage ../development/python-modules/astropy { }; augeas = callPackage ../development/python-modules/augeas { From be48259c1070bbb565314cc206ccc4b68b36ffb5 Mon Sep 17 00:00:00 2001 From: Felix Breidenstein Date: Tue, 9 Jan 2018 23:10:19 +0100 Subject: [PATCH 4/7] home-assistant: init at 0.60.1 Tests are currently disabled due to many errors. There are also pending commits on the 'dev' branch which fixes some tests. Also home-assistant installs more dependencies dynamically on every start via pip. This still needs to be fixed. --- pkgs/servers/home-assistant/default.nix | 38 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 40 insertions(+) create mode 100644 pkgs/servers/home-assistant/default.nix diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix new file mode 100644 index 0000000000000..8687696a3797a --- /dev/null +++ b/pkgs/servers/home-assistant/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, fetchurl, python3Packages, git, nmap }: + +python3Packages.buildPythonApplication rec { + name = "${pname}-${version}"; + version = "0.60.1"; + pname = "homeassistant"; + + src = fetchFromGitHub { + owner = "home-assistant"; + repo = "home-assistant"; + rev = version; + sha256 = "164a87dh4zxw1a5nmlgwjc1nls0d4jjhdy5pzz43pgnwhhflbph3"; + }; + + patchPhase = '' + sed -i 's/yarl==/yarl>=/' setup.py + sed -i 's/aiohttp==/aiohttp>=/' setup.py + ''; + + propagatedBuildInputs = with python3Packages; [ astral certifi netifaces pip vincenty webcolors pyyaml yarl + aiohttp-cors voluptuous async-timeout requests aiohttp jinja2 + pytz chardet setuptools_scm typing git nmap ]; + + + #checkInputs = [ python3Packages.pytest python3Packages.sqlalchemy ]; + # Disable tests for now due to many failing checks caused by network and fs access + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://home-assistant.io/; + description = "An open-source home automation platform running on Python 3"; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ f-breidenstein ]; + }; +} + + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a25521ce53758..a0fbb8d8ce40b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11851,6 +11851,8 @@ with pkgs; hbase = callPackage ../servers/hbase {}; + home-assistant = callPackage ../servers/home-assistant { }; + hiawatha = callPackage ../servers/http/hiawatha {}; ircdHybrid = callPackage ../servers/irc/ircd-hybrid { }; From 2d3d6003faa27b5c1ba4e575777dd1063c43d178 Mon Sep 17 00:00:00 2001 From: Felix Breidenstein Date: Thu, 11 Jan 2018 18:10:06 +0100 Subject: [PATCH 5/7] home-assistant: Change 'patchPhase' to 'postPatch' --- pkgs/servers/home-assistant/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 8687696a3797a..7f11208f890a8 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec { sha256 = "164a87dh4zxw1a5nmlgwjc1nls0d4jjhdy5pzz43pgnwhhflbph3"; }; - patchPhase = '' + postPatch = '' sed -i 's/yarl==/yarl>=/' setup.py sed -i 's/aiohttp==/aiohttp>=/' setup.py ''; From 6d270c58924676cbd5dc0df9fe32851c36b47372 Mon Sep 17 00:00:00 2001 From: Felix Breidenstein Date: Thu, 11 Jan 2018 18:22:09 +0100 Subject: [PATCH 6/7] vincenty: Correct 'pythonApplication' to 'pythonPackage' --- pkgs/development/python-modules/vincenty/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/vincenty/default.nix b/pkgs/development/python-modules/vincenty/default.nix index 0d10dbb977350..f9ef4e3034273 100644 --- a/pkgs/development/python-modules/vincenty/default.nix +++ b/pkgs/development/python-modules/vincenty/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchPypi, buildPythonApplication }: +{ stdenv, fetchPypi, buildPythonPackage }: -buildPythonApplication rec { +buildPythonPackage rec { name = "${pname}-${version}"; version = "0.1.4"; pname = "vincenty"; From 5f70c81d485f80331b8902533eebddf63a4b5aec Mon Sep 17 00:00:00 2001 From: Felix Breidenstein Date: Thu, 11 Jan 2018 18:49:39 +0100 Subject: [PATCH 7/7] astral, home-assistant, vincenty: Remove 'name' buildPythonPackage inherits from toPythonModule which automatically generates the name for the package with "name ? "${attrs.pname}-${attrs.version}" in the file mk-python-derivation.nix --- pkgs/development/python-modules/astral/default.nix | 1 - pkgs/development/python-modules/vincenty/default.nix | 1 - pkgs/servers/home-assistant/default.nix | 1 - 3 files changed, 3 deletions(-) diff --git a/pkgs/development/python-modules/astral/default.nix b/pkgs/development/python-modules/astral/default.nix index 4b9aec5e9aae8..76dba87f9648b 100644 --- a/pkgs/development/python-modules/astral/default.nix +++ b/pkgs/development/python-modules/astral/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "astral"; version = "1.4"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/vincenty/default.nix b/pkgs/development/python-modules/vincenty/default.nix index f9ef4e3034273..2f89313bcb0cd 100644 --- a/pkgs/development/python-modules/vincenty/default.nix +++ b/pkgs/development/python-modules/vincenty/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchPypi, buildPythonPackage }: buildPythonPackage rec { - name = "${pname}-${version}"; version = "0.1.4"; pname = "vincenty"; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 7f11208f890a8..c2ea5c2822927 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, fetchurl, python3Packages, git, nmap }: python3Packages.buildPythonApplication rec { - name = "${pname}-${version}"; version = "0.60.1"; pname = "homeassistant";