From ca5e22957c67d8ca05ba5bde4b751ccb378c38ee Mon Sep 17 00:00:00 2001 From: Kirill Elagin Date: Tue, 26 Sep 2017 15:34:43 +0300 Subject: [PATCH 1/4] pythonPackages.livereload: 2.5.0 -> 2.5.1 Also move to development/python-modules. --- .../python-modules/livereload/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 22 +------------- 2 files changed, 30 insertions(+), 21 deletions(-) create mode 100644 pkgs/development/python-modules/livereload/default.nix diff --git a/pkgs/development/python-modules/livereload/default.nix b/pkgs/development/python-modules/livereload/default.nix new file mode 100644 index 000000000000..fba324d43930 --- /dev/null +++ b/pkgs/development/python-modules/livereload/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, fetchPypi +, nose +, django +, tornado +, six +}: + +buildPythonPackage rec { + pname = "livereload"; + version = "2.5.1"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "0b2yyfnpddmrwjfqsndidzchkf3l9jlgzfkwl8dplim9gq6y2ba2"; + }; + + buildInputs = [ nose django ]; + + propagatedBuildInputs = [ tornado six ]; + + meta = { + description = "Runs a local server that reloads as you develop"; + homepage = "https://github.com/lepture/python-livereload"; + license = lib.licenses.bsd3; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3e24dd180c86..f1142c6b31f2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11174,27 +11174,7 @@ in { linode-api = callPackage ../development/python-modules/linode-api { }; - livereload = buildPythonPackage rec { - name = "livereload-${version}"; - version = "2.5.0"; - - src = pkgs.fetchFromGitHub { - owner = "lepture"; - repo = "python-livereload"; - rev = "v${version}"; - sha256 = "0ixsc7wibmkfk9fnyq0d1b5d9snxfpzzzgsxvq28rn54v6q8b7m2"; - }; - - buildInputs = with self; [ nose django ]; - - propagatedBuildInputs = with self; [ tornado six ]; - - meta = { - description = "Runs a local server that reloads as you develop"; - homepage = "https://github.com/lepture/python-livereload"; - license = licenses.bsd3; - }; - }; + livereload = callPackage ../development/python-modules/livereload { }; llfuse = buildPythonPackage rec { name = "llfuse-1.0"; From d70f426dfc336b90a0435dd0c465dcf8b2609cad Mon Sep 17 00:00:00 2001 From: Kirill Elagin Date: Tue, 26 Sep 2017 15:35:17 +0300 Subject: [PATCH 2/4] mkdocs: Initialise at 0.16.3 --- .../tools/documentation/mkdocs/default.nix | 29 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/tools/documentation/mkdocs/default.nix diff --git a/pkgs/development/tools/documentation/mkdocs/default.nix b/pkgs/development/tools/documentation/mkdocs/default.nix new file mode 100644 index 000000000000..1aecb2675520 --- /dev/null +++ b/pkgs/development/tools/documentation/mkdocs/default.nix @@ -0,0 +1,29 @@ +{ lib, python }: + +with python.pkgs; + +buildPythonApplication rec { + pname = "mkdocs"; + version = "0.16.3"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "0z9n0dnidnvm511pdzf73grmr4xn59znkfalq8x9gw5v7lqwa2mc"; + }; + + propagatedBuildInputs = [ + tornado + livereload + click + pyyaml + markdown + jinja2 + ]; + + meta = { + homepage = http://mkdocs.org/; + description = "Project documentation with Markdown"; + license = lib.licenses.bsd2; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2ba0c3add19a..a16b2ab3d735 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7266,6 +7266,8 @@ with pkgs; mk = callPackage ../development/tools/build-managers/mk { }; + mkdocs = callPackage ../development/tools/documentation/mkdocs { }; + moby = callPackage ../development/tools/misc/moby { }; msgpack-tools = callPackage ../development/tools/msgpack-tools { }; From fa2adc6129ece97beef0f7bf6dd2e16bf5e4693a Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Sun, 1 Oct 2017 10:56:05 +0100 Subject: [PATCH 3/4] mkdocs: run tests --- .../tools/documentation/mkdocs/default.nix | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/documentation/mkdocs/default.nix b/pkgs/development/tools/documentation/mkdocs/default.nix index 1aecb2675520..144bd059634f 100644 --- a/pkgs/development/tools/documentation/mkdocs/default.nix +++ b/pkgs/development/tools/documentation/mkdocs/default.nix @@ -1,4 +1,4 @@ -{ lib, python }: +{ lib, python, fetchFromGitHub }: with python.pkgs; @@ -7,11 +7,21 @@ buildPythonApplication rec { version = "0.16.3"; name = "${pname}-${version}"; - src = fetchPypi { - inherit pname version; - sha256 = "0z9n0dnidnvm511pdzf73grmr4xn59znkfalq8x9gw5v7lqwa2mc"; + src = fetchFromGitHub { + owner = "mkdocs"; + repo = "mkdocs"; + rev = version; + sha256 = "0gssa5gbd1y2v3azdhf2zh7ayx4ncfag4r2a6fi96jbic64r3qrs"; }; + checkInputs = [ + nose nose-exclude mock + ]; + + NOSE_EXCLUDE_TESTS="mkdocs.tests.gh_deploy_tests.TestGitHubDeploy;mkdocs.tests.config.config_tests.ConfigTests"; + + checkPhase = "nosetests mkdocs"; + propagatedBuildInputs = [ tornado livereload From 6f71cce5304a51e004a1cd383a3659f7f2f0591d Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Sun, 1 Oct 2017 11:00:26 +0100 Subject: [PATCH 4/4] python.pkgs.livereload: enable tests --- .../python-modules/livereload/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/livereload/default.nix b/pkgs/development/python-modules/livereload/default.nix index fba324d43930..fa9067fa0fee 100644 --- a/pkgs/development/python-modules/livereload/default.nix +++ b/pkgs/development/python-modules/livereload/default.nix @@ -1,10 +1,11 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , nose , django , tornado , six +, pytest }: buildPythonPackage rec { @@ -12,15 +13,20 @@ buildPythonPackage rec { version = "2.5.1"; name = "${pname}-${version}"; - src = fetchPypi { - inherit pname version; - sha256 = "0b2yyfnpddmrwjfqsndidzchkf3l9jlgzfkwl8dplim9gq6y2ba2"; + src = fetchFromGitHub { + owner = "lepture"; + repo = "python-livereload"; + rev = "v${version}"; + sha256 = "1irs59wqmffp8q4l9fh7givs05mamlgm5n7ga49gwxp5imwrdzba"; }; buildInputs = [ nose django ]; propagatedBuildInputs = [ tornado six ]; + checkInputs = [ pytest ]; + checkPhase = "pytest tests"; + meta = { description = "Runs a local server that reloads as you develop"; homepage = "https://github.com/lepture/python-livereload";