diff --git a/.travis.yml b/.travis.yml index 78b967e..d5173fc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,6 @@ env: - PKGS_SET=django - PKGS_SET=flake8 - PKGS_SET=flask -- PKGS_SET=homeassistant - PKGS_SET=pelican - PKGS_SET=pykube - PKGS_SET=pypi2nix diff --git a/Makefile b/Makefile index e447ae6..1016636 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,6 @@ all: \ django \ flake8 \ flask \ - homeassistant \ openstackclient \ pelican \ pykube \ @@ -68,16 +67,6 @@ flask: nix-build -Q -A flask -o result-flask -homeassistant: - cd homeassistant/ && \ - $(PYPI2NIX) -v \ - -V 3.5 \ - -s pytz - -O ../overrides.nix \ - -r requirements.txt - nix-build -Q -A homeassistant -o result-homeassistant - - pelican: cd pelican/ && \ $(PYPI2NIX) -v \ @@ -196,7 +185,6 @@ static: django \ flake8 \ flask \ - homeassistant \ httpie \ openstackclient \ pelican \ diff --git a/README.rst b/README.rst index 0d5d730..054924c 100644 --- a/README.rst +++ b/README.rst @@ -50,9 +50,8 @@ This is a collections of Pelican_ and Pelican extensions packages. HomeAssistant ^^^^^^^^^^^^^ -:maintainers: ??? (Looking for maintainer) - -This is a collections of HomeAssistant_ and its components. +HomeAssistant is available from https://github.com/NixOS/nixpkgs and has as a +consequence been removed from this repository. Science diff --git a/default.nix b/default.nix index aeefd47..0c96e3b 100644 --- a/default.nix +++ b/default.nix @@ -62,11 +62,6 @@ in createSets [ description = "Flask framework and its extensions."; } - { name = "homeassistant"; - maintainers = [ maintainers.unknown ]; - description = "Homeassistant framework and its components."; - } - { name = "pelican"; maintainers = [ maintainers.garbas ]; description = "Pelican static blog generator and its extensions."; diff --git a/homeassistant/requirements.nix b/homeassistant/requirements.nix deleted file mode 100644 index 02ae88f..0000000 --- a/homeassistant/requirements.nix +++ /dev/null @@ -1,113 +0,0 @@ -# generated using pypi2nix tool (version: 1.8.1) -# See more at: https://github.com/garbas/pypi2nix -# -# COMMAND: -# pypi2nix -W https://travis.garbas.si/wheels_cache/ -v -V 3.5 -s pytz -# - -{ pkgs ? import {} -}: - -let - - inherit (pkgs) makeWrapper; - inherit (pkgs.stdenv.lib) fix' extends inNixShell; - - pythonPackages = - import "${toString pkgs.path}/pkgs/top-level/python-packages.nix" { - inherit pkgs; - inherit (pkgs) stdenv; - python = pkgs.python35; - # patching pip so it does not try to remove files when running nix-shell - overrides = - self: super: { - bootstrapped-pip = super.bootstrapped-pip.overrideDerivation (old: { - patchPhase = old.patchPhase + '' - sed -i \ - -e "s|paths_to_remove.remove(auto_confirm)|#paths_to_remove.remove(auto_confirm)|" \ - -e "s|self.uninstalled = paths_to_remove|#self.uninstalled = paths_to_remove|" \ - $out/${pkgs.python35.sitePackages}/pip/req/req_install.py - ''; - }); - }; - }; - - commonBuildInputs = []; - commonDoCheck = false; - - withPackages = pkgs': - let - pkgs = builtins.removeAttrs pkgs' ["__unfix__"]; - interpreter = pythonPackages.buildPythonPackage { - name = "python35-interpreter"; - buildInputs = [ makeWrapper ] ++ (builtins.attrValues pkgs); - buildCommand = '' - mkdir -p $out/bin - ln -s ${pythonPackages.python.interpreter} \ - $out/bin/${pythonPackages.python.executable} - for dep in ${builtins.concatStringsSep " " - (builtins.attrValues pkgs)}; do - if [ -d "$dep/bin" ]; then - for prog in "$dep/bin/"*; do - if [ -x "$prog" ] && [ -f "$prog" ]; then - ln -s $prog $out/bin/`basename $prog` - fi - done - fi - done - for prog in "$out/bin/"*; do - wrapProgram "$prog" --prefix PYTHONPATH : "$PYTHONPATH" - done - pushd $out/bin - ln -s ${pythonPackages.python.executable} python - ln -s ${pythonPackages.python.executable} \ - python3 - popd - ''; - passthru.interpreter = pythonPackages.python; - }; - in { - __old = pythonPackages; - inherit interpreter; - mkDerivation = pythonPackages.buildPythonPackage; - packages = pkgs; - overrideDerivation = drv: f: - pythonPackages.buildPythonPackage ( - drv.drvAttrs // f drv.drvAttrs // { meta = drv.meta; } - ); - withPackages = pkgs'': - withPackages (pkgs // pkgs''); - }; - - python = withPackages {}; - - generated = self: { - "pytz" = python.mkDerivation { - name = "pytz-2018.4"; - src = pkgs.fetchurl { url = "https://files.pythonhosted.org/packages/10/76/52efda4ef98e7544321fd8d5d512e11739c1df18b0649551aeccfb1c8376/pytz-2018.4.tar.gz"; sha256 = "c06425302f2cf668f1bba7a0a03f3c1d34d4ebeef2c72003da308b3947c7f749"; }; - doCheck = commonDoCheck; - buildInputs = commonBuildInputs; - propagatedBuildInputs = [ ]; - meta = with pkgs.stdenv.lib; { - homepage = "http://pythonhosted.org/pytz"; - license = licenses.mit; - description = "World timezone definitions, modern and historical"; - }; - }; - }; - localOverridesFile = ./requirements_override.nix; - overrides = import localOverridesFile { inherit pkgs python; }; - commonOverrides = [ - - ]; - allOverrides = - (if (builtins.pathExists localOverridesFile) - then [overrides] else [] ) ++ commonOverrides; - -in python.withPackages - (fix' (pkgs.lib.fold - extends - generated - allOverrides - ) - ) \ No newline at end of file diff --git a/homeassistant/requirements.txt b/homeassistant/requirements.txt deleted file mode 100644 index 2b5ba80..0000000 --- a/homeassistant/requirements.txt +++ /dev/null @@ -1,4 +0,0 @@ -homeassistant - -# homeassistant.components.discovery -netdisco==0.7.7 diff --git a/homeassistant/requirements_frozen.txt b/homeassistant/requirements_frozen.txt deleted file mode 100644 index eced451..0000000 --- a/homeassistant/requirements_frozen.txt +++ /dev/null @@ -1 +0,0 @@ -pytz==2018.4 diff --git a/homeassistant/requirements_generated.nix b/homeassistant/requirements_generated.nix deleted file mode 100644 index 2e1a0ca..0000000 --- a/homeassistant/requirements_generated.nix +++ /dev/null @@ -1,353 +0,0 @@ -# generated using pypi2nix tool (version: 1.8.0) -# -# COMMAND: -# pypi2nix -v -V 3.5 --setup-requires six packaging appdirs -r requirements.txt -# - -{ pkgs, python, commonBuildInputs ? [], commonDoCheck ? false }: - -self: { - - "Jinja2" = python.mkDerivation { - name = "Jinja2-2.9.5"; - src = pkgs.fetchurl { url = "https://pypi.python.org/packages/71/59/d7423bd5e7ddaf3a1ce299ab4490e9044e8dfd195420fc83a24de9e60726/Jinja2-2.9.5.tar.gz"; sha256 = "702a24d992f856fa8d5a7a36db6128198d0c21e1da34448ca236c42e92384825"; }; - doCheck = commonDoCheck; - buildInputs = commonBuildInputs; - propagatedBuildInputs = [ - self."MarkupSafe" - ]; - meta = with pkgs.stdenv.lib; { - homepage = ""; - license = licenses.bsdOriginal; - description = "A small but fast and easy to use stand-alone template engine written in pure python."; - }; - }; - - - - "MarkupSafe" = python.mkDerivation { - name = "MarkupSafe-0.23"; - src = pkgs.fetchurl { url = "https://pypi.python.org/packages/c0/41/bae1254e0396c0cc8cf1751cb7d9afc90a602353695af5952530482c963f/MarkupSafe-0.23.tar.gz"; sha256 = "a4ec1aff59b95a14b45eb2e23761a0179e98319da5a7eb76b56ea8cdc7b871c3"; }; - doCheck = commonDoCheck; - buildInputs = commonBuildInputs; - propagatedBuildInputs = [ ]; - meta = with pkgs.stdenv.lib; { - homepage = ""; - license = licenses.bsdOriginal; - description = "Implements a XML/HTML/XHTML Markup safe string for Python"; - }; - }; - - - - "PyYAML" = python.mkDerivation { - name = "PyYAML-3.12"; - src = pkgs.fetchurl { url = "https://pypi.python.org/packages/4a/85/db5a2df477072b2902b0eb892feb37d88ac635d36245a72a6a69b23b383a/PyYAML-3.12.tar.gz"; sha256 = "592766c6303207a20efc445587778322d7f73b161bd994f227adaa341ba212ab"; }; - doCheck = commonDoCheck; - buildInputs = commonBuildInputs; - propagatedBuildInputs = [ ]; - meta = with pkgs.stdenv.lib; { - homepage = ""; - license = licenses.mit; - description = "YAML parser and emitter for Python"; - }; - }; - - - - "aiohttp" = python.mkDerivation { - name = "aiohttp-1.3.1"; - src = pkgs.fetchurl { url = "https://pypi.python.org/packages/41/42/76a4cff04488799e78d37c5bb3b607e36d2c4686141621002d2479b54dbe/aiohttp-1.3.1.tar.gz"; sha256 = "e147b0cea568773443683becce9de4071506431118609b5d477fe61508417af1"; }; - doCheck = commonDoCheck; - buildInputs = commonBuildInputs; - propagatedBuildInputs = [ - self."async-timeout" - self."chardet" - self."multidict" - self."yarl" - ]; - meta = with pkgs.stdenv.lib; { - homepage = ""; - license = licenses.asl20; - description = "http client/server for asyncio"; - }; - }; - - - - "appdirs" = python.mkDerivation { - name = "appdirs-1.4.2"; - src = pkgs.fetchurl { url = "https://pypi.python.org/packages/88/99/293dac0b3cdf58ce029ec5393624fac5c6bde52f737f9775bd9ef608ec98/appdirs-1.4.2.tar.gz"; sha256 = "e2de7ae2b3be52542b711eacf4221683f1d2f7706a5550cb2c562ee4ba93ee74"; }; - doCheck = commonDoCheck; - buildInputs = commonBuildInputs; - propagatedBuildInputs = [ ]; - meta = with pkgs.stdenv.lib; { - homepage = ""; - license = licenses.mit; - description = "A small Python module for determining appropriate platform-specific dirs, e.g. a \"user data dir\"."; - }; - }; - - - - "async-timeout" = python.mkDerivation { - name = "async-timeout-1.1.0"; - src = pkgs.fetchurl { url = "https://pypi.python.org/packages/29/f6/eeac39dfadd3a7610bb33842cf611a1f09fcd2e445ab76e4c951efde0c2b/async-timeout-1.1.0.tar.gz"; sha256 = "b88bd1fe001b800ec23c7bf27a81b32819e2a56668e9fba5646a7f3618143081"; }; - doCheck = commonDoCheck; - buildInputs = commonBuildInputs; - propagatedBuildInputs = [ ]; - meta = with pkgs.stdenv.lib; { - homepage = ""; - license = licenses.asl20; - description = "Timeout context manager for asyncio programs"; - }; - }; - - - - "chardet" = python.mkDerivation { - name = "chardet-2.3.0"; - src = pkgs.fetchurl { url = "https://pypi.python.org/packages/7d/87/4e3a3f38b2f5c578ce44f8dc2aa053217de9f0b6d737739b0ddac38ed237/chardet-2.3.0.tar.gz"; sha256 = "e53e38b3a4afe6d1132de62b7400a4ac363452dc5dfcf8d88e8e0cce663c68aa"; }; - doCheck = commonDoCheck; - buildInputs = commonBuildInputs; - propagatedBuildInputs = [ ]; - meta = with pkgs.stdenv.lib; { - homepage = ""; - license = licenses.lgpl2; - description = "Universal encoding detector for Python 2 and 3"; - }; - }; - - - - "enum-compat" = python.mkDerivation { - name = "enum-compat-0.0.2"; - src = pkgs.fetchurl { url = "https://pypi.python.org/packages/95/6e/26bdcba28b66126f66cf3e4cd03bcd63f7ae330d29ee68b1f6b623550bfa/enum-compat-0.0.2.tar.gz"; sha256 = "939ceff18186a5762ae4db9fa7bfe017edbd03b66526b798dd8245394c8a4192"; }; - doCheck = commonDoCheck; - buildInputs = commonBuildInputs; - propagatedBuildInputs = [ ]; - meta = with pkgs.stdenv.lib; { - homepage = ""; - license = licenses.mit; - description = "enum/enum34 compatibility package"; - }; - }; - - - - "homeassistant" = python.mkDerivation { - name = "homeassistant-0.38.4"; - src = pkgs.fetchurl { url = "https://pypi.python.org/packages/82/b4/844f551d3e08efc06eec9e70866a80452ce1983554c6338991dae981910e/homeassistant-0.38.4.tar.gz"; sha256 = "a347b5aa1f5da815ab760ee2b932b9fba3a34ef36bdd44a573c4f9700973ee89"; }; - doCheck = commonDoCheck; - buildInputs = commonBuildInputs; - propagatedBuildInputs = [ - self."Jinja2" - self."PyYAML" - self."aiohttp" - self."async-timeout" - self."pytz" - self."requests" - self."typing" - self."voluptuous" - ]; - meta = with pkgs.stdenv.lib; { - homepage = ""; - license = licenses.asl20; - description = "Open-source home automation platform running on Python 3."; - }; - }; - - - - "multidict" = python.mkDerivation { - name = "multidict-2.1.4"; - src = pkgs.fetchurl { url = "https://pypi.python.org/packages/2a/df/eaea73e46a58fd780c35ecc304ca42364fa3c1f4cd03568ed33b9d2c7547/multidict-2.1.4.tar.gz"; sha256 = "a77aa8c9f68846c3b5db43ff8ed2a7a884dbe845d01f55113a3fba78518c4cd7"; }; - doCheck = commonDoCheck; - buildInputs = commonBuildInputs; - propagatedBuildInputs = [ ]; - meta = with pkgs.stdenv.lib; { - homepage = ""; - license = licenses.asl20; - description = "multidict implementation"; - }; - }; - - - - "netdisco" = python.mkDerivation { - name = "netdisco-0.7.7"; - src = pkgs.fetchurl { url = "https://pypi.python.org/packages/d2/5c/220997aba36946596570f8670b0d3b96a119f0f2b12aaac66a88b206f4eb/netdisco-0.7.7.tar.gz"; sha256 = "ece9c994c16c59794bb1b80a7e33f5837529dd1757369df6dccf082a8178115c"; }; - doCheck = commonDoCheck; - buildInputs = commonBuildInputs; - propagatedBuildInputs = [ - self."netifaces" - self."requests" - self."zeroconf" - ]; - meta = with pkgs.stdenv.lib; { - homepage = ""; - license = licenses.mit; - description = "Discover devices on your local network"; - }; - }; - - - - "netifaces" = python.mkDerivation { - name = "netifaces-0.10.5"; - src = pkgs.fetchurl { url = "https://pypi.python.org/packages/a7/4c/8e0771a59fd6e55aac993a7cc1b6a0db993f299514c464ae6a1ecf83b31d/netifaces-0.10.5.tar.gz"; sha256 = "59d8ad52dd3116fcb6635e175751b250dc783fb011adba539558bd764e5d628b"; }; - doCheck = commonDoCheck; - buildInputs = commonBuildInputs; - propagatedBuildInputs = [ ]; - meta = with pkgs.stdenv.lib; { - homepage = ""; - license = licenses.mit; - description = "Portable network interface information."; - }; - }; - - - - "packaging" = python.mkDerivation { - name = "packaging-16.8"; - src = pkgs.fetchurl { url = "https://pypi.python.org/packages/c6/70/bb32913de251017e266c5114d0a645f262fb10ebc9bf6de894966d124e35/packaging-16.8.tar.gz"; sha256 = "5d50835fdf0a7edf0b55e311b7c887786504efea1177abd7e69329a8e5ea619e"; }; - doCheck = commonDoCheck; - buildInputs = commonBuildInputs; - propagatedBuildInputs = [ - self."pyparsing" - self."six" - ]; - meta = with pkgs.stdenv.lib; { - homepage = ""; - license = licenses.bsdOriginal; - description = "Core utilities for Python packages"; - }; - }; - - - - "pyparsing" = python.mkDerivation { - name = "pyparsing-2.1.10"; - src = pkgs.fetchurl { url = "https://pypi.python.org/packages/38/bb/bf325351dd8ab6eb3c3b7c07c3978f38b2103e2ab48d59726916907cd6fb/pyparsing-2.1.10.tar.gz"; sha256 = "811c3e7b0031021137fc83e051795025fcb98674d07eb8fe922ba4de53d39188"; }; - doCheck = commonDoCheck; - buildInputs = commonBuildInputs; - propagatedBuildInputs = [ ]; - meta = with pkgs.stdenv.lib; { - homepage = ""; - license = licenses.mit; - description = "Python parsing module"; - }; - }; - - - - "pytz" = python.mkDerivation { - name = "pytz-2016.10"; - src = pkgs.fetchurl { url = "https://pypi.python.org/packages/d0/e1/aca6ef73a7bd322a7fc73fd99631ee3454d4fc67dc2bee463e2adf6bb3d3/pytz-2016.10.tar.bz2"; sha256 = "7016b2c4fa075c564b81c37a252a5fccf60d8964aa31b7f5eae59aeb594ae02b"; }; - doCheck = commonDoCheck; - buildInputs = commonBuildInputs; - propagatedBuildInputs = [ ]; - meta = with pkgs.stdenv.lib; { - homepage = ""; - license = licenses.mit; - description = "World timezone definitions, modern and historical"; - }; - }; - - - - "requests" = python.mkDerivation { - name = "requests-2.13.0"; - src = pkgs.fetchurl { url = "https://pypi.python.org/packages/16/09/37b69de7c924d318e51ece1c4ceb679bf93be9d05973bb30c35babd596e2/requests-2.13.0.tar.gz"; sha256 = "5722cd09762faa01276230270ff16af7acf7c5c45d623868d9ba116f15791ce8"; }; - doCheck = commonDoCheck; - buildInputs = commonBuildInputs; - propagatedBuildInputs = [ ]; - meta = with pkgs.stdenv.lib; { - homepage = ""; - license = licenses.asl20; - description = "Python HTTP for Humans."; - }; - }; - - - - "six" = python.mkDerivation { - name = "six-1.10.0"; - src = pkgs.fetchurl { url = "https://pypi.python.org/packages/b3/b2/238e2590826bfdd113244a40d9d3eb26918bd798fc187e2360a8367068db/six-1.10.0.tar.gz"; sha256 = "105f8d68616f8248e24bf0e9372ef04d3cc10104f1980f54d57b2ce73a5ad56a"; }; - doCheck = commonDoCheck; - buildInputs = commonBuildInputs; - propagatedBuildInputs = [ ]; - meta = with pkgs.stdenv.lib; { - homepage = ""; - license = licenses.mit; - description = "Python 2 and 3 compatibility utilities"; - }; - }; - - - - "typing" = python.mkDerivation { - name = "typing-3.5.3.0"; - src = pkgs.fetchurl { url = "https://pypi.python.org/packages/b6/0c/53c42edca789378b8c05a5496e689f44e5dd82bc6861d1ae5a926ee51b84/typing-3.5.3.0.tar.gz"; sha256 = "ca2daac7e393e8ee86e9140cd0cf0172ff6bb50ebdf0b06281770f98f31bff21"; }; - doCheck = commonDoCheck; - buildInputs = commonBuildInputs; - propagatedBuildInputs = [ ]; - meta = with pkgs.stdenv.lib; { - homepage = ""; - license = licenses.psfl; - description = "Type Hints for Python"; - }; - }; - - - - "voluptuous" = python.mkDerivation { - name = "voluptuous-0.9.3"; - src = pkgs.fetchurl { url = "https://pypi.python.org/packages/e6/5d/2b9ed56f2e69fe54cf00d07b7b3b9b43e8c9763dff3015365bd4c3f6f2a6/voluptuous-0.9.3.tar.gz"; sha256 = "ed5a11fda273754caabb6becd5fe172ee2621cd2c8ff8279433173bb7b0ec568"; }; - doCheck = commonDoCheck; - buildInputs = commonBuildInputs; - propagatedBuildInputs = [ ]; - meta = with pkgs.stdenv.lib; { - homepage = ""; - license = licenses.bsdOriginal; - description = "# Voluptuous is a Python data validation library"; - }; - }; - - - - "yarl" = python.mkDerivation { - name = "yarl-0.9.8"; - src = pkgs.fetchurl { url = "https://pypi.python.org/packages/66/2e/646e7da82260ad1dce86ebeed0befbd487941b7aa61ee2291fa47aa71bf4/yarl-0.9.8.tar.gz"; sha256 = "a7818b0654265623525b56e78b901315a9ffb7ef0bf21b4af7e0e27572d54dec"; }; - doCheck = commonDoCheck; - buildInputs = commonBuildInputs; - propagatedBuildInputs = [ - self."multidict" - ]; - meta = with pkgs.stdenv.lib; { - homepage = ""; - license = licenses.asl20; - description = "Yet another URL library"; - }; - }; - - - - "zeroconf" = python.mkDerivation { - name = "zeroconf-0.17.6"; - src = pkgs.fetchurl { url = "https://pypi.python.org/packages/b8/15/d4b1773e91f8ff54681c3a0d45baec553ffa850f42beb62353156ab4a64c/zeroconf-0.17.6.tar.gz"; sha256 = "b614baa73833bdfc8ae64f2a9f5d19b014ad3164fbbc8513ef27a7bbe1e6c5e3"; }; - doCheck = commonDoCheck; - buildInputs = commonBuildInputs; - propagatedBuildInputs = [ - self."enum-compat" - self."netifaces" - self."six" - ]; - meta = with pkgs.stdenv.lib; { - homepage = ""; - license = licenses.lgpl2; - description = "Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)"; - }; - }; - -} \ No newline at end of file