From eb6ae2d8fb47bdcf895a78efe631826315062eab Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 27 Feb 2018 10:26:21 +0100 Subject: pythonPackages.d2to1: move to python-modules --- pkgs/development/python-modules/d2to1/default.nix | 23 +++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 18 +----------------- 2 files changed, 24 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/python-modules/d2to1/default.nix diff --git a/pkgs/development/python-modules/d2to1/default.nix b/pkgs/development/python-modules/d2to1/default.nix new file mode 100644 index 000000000000..c6013050e69d --- /dev/null +++ b/pkgs/development/python-modules/d2to1/default.nix @@ -0,0 +1,23 @@ +{ buildPythonPackage +, lib +, fetchPypi +, nose +}: +buildPythonPackage rec { + pname = "d2to1"; + version = "0.2.11"; + + checkInputs = [ nose ]; + + src = fetchPypi { + inherit version pname; + sha256 = "1a5z367b7dpd6dgi0w8pymb68aj2pblk8w04l2c8hibhj8dpl2b4"; + }; + + meta = with lib;{ + description = "Support for distutils2-like setup.cfg files as package metadata"; + homepage = https://github.com/embray/d2to1; + license = licenses.bsd2; + maintainers = with maintainers; [ makefu ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 57973045062e..000a6cd58e06 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -20358,23 +20358,7 @@ EOF }; }; - d2to1 = buildPythonPackage rec { - name = "d2to1-${version}"; - version = "0.2.11"; - - buildInputs = with self; [ nose ]; - src = pkgs.fetchurl { - url = "mirror://pypi/d/d2to1/d2to1-${version}.tar.gz"; - sha256 = "1a5z367b7dpd6dgi0w8pymb68aj2pblk8w04l2c8hibhj8dpl2b4"; - }; - - meta = { - description = "Support for distutils2-like setup.cfg files as package metadata"; - homepage = https://pypi.python.org/pypi/d2to1; - license = licenses.bsd2; - maintainers = [ maintainers.makefu ]; - }; - }; + d2to1 = callPackage ../development/python-modules/d2to1 { }; ovh = callPackage ../development/python-modules/ovh { }; -- cgit 1.4.1 From 1aa8e259c70133ed7f61067bd50e05a29fc16916 Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 28 Feb 2018 08:28:56 +0100 Subject: pythonPackages.d2to1: 0.2.11 -> 0.2.12 --- pkgs/development/python-modules/d2to1/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/d2to1/default.nix b/pkgs/development/python-modules/d2to1/default.nix index c6013050e69d..195b20c27e4f 100644 --- a/pkgs/development/python-modules/d2to1/default.nix +++ b/pkgs/development/python-modules/d2to1/default.nix @@ -1,17 +1,19 @@ { buildPythonPackage , lib -, fetchPypi +, fetchFromGitHub , nose }: buildPythonPackage rec { pname = "d2to1"; - version = "0.2.11"; + version = "0.2.12"; checkInputs = [ nose ]; - src = fetchPypi { - inherit version pname; - sha256 = "1a5z367b7dpd6dgi0w8pymb68aj2pblk8w04l2c8hibhj8dpl2b4"; + src = fetchFromGitHub { + owner = "embray"; + repo = pname; + rev = version; + sha256 = "1q04ab8vjvx7fmq9ckkl8r9hlwwbqiyjbzaa4v1mv5zicfssxwsi"; }; meta = with lib;{ -- cgit 1.4.1 From fa23628f04bd6ea8900481fe3cbb215a76d46d75 Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 27 Feb 2018 10:31:10 +0100 Subject: pythonPackages.xstatic: move to python-modules --- .../development/python-modules/xstatic/default.nix | 25 ++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 17 ++------------- 2 files changed, 27 insertions(+), 15 deletions(-) create mode 100644 pkgs/development/python-modules/xstatic/default.nix diff --git a/pkgs/development/python-modules/xstatic/default.nix b/pkgs/development/python-modules/xstatic/default.nix new file mode 100644 index 000000000000..02931215b8d3 --- /dev/null +++ b/pkgs/development/python-modules/xstatic/default.nix @@ -0,0 +1,25 @@ +{ buildPythonPackage +, lib +, fetchPypi +}: + +buildPythonPackage rec { + pname = "XStatic"; + version = "1.0.1"; + + src = fetchPypi { + inherit version pname; + sha256 = "09npcsyf1ccygjs0qc8kdsv4qqy8gm1m6iv63g9y1fgbcry3vj8f"; + }; + + # no tests implemented + doCheck = false; + + meta = with lib;{ + homepage = https://bitbucket.org/thomaswaldmann/xstatic; + description = "Base packaged static files for python"; + license = licenses.mit; + maintainers = with maintainers; [ makefu ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 000a6cd58e06..18639676daa4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -20450,21 +20450,6 @@ EOF }; }; - xstatic = buildPythonPackage rec { - name = "XStatic-${version}"; - version = "1.0.1"; - src = pkgs.fetchurl { - url = "mirror://pypi/X/XStatic/XStatic-${version}.tar.gz"; - sha256 = "09npcsyf1ccygjs0qc8kdsv4qqy8gm1m6iv63g9y1fgbcry3vj8f"; - }; - meta = { - homepage = https://bitbucket.org/thomaswaldmann/xstatic; - description = "Base packaged static files for python"; - license = licenses.mit; - maintainers = [ maintainers.makefu ]; - }; - }; - xlsx2csv = buildPythonPackage rec { name = "xlsx2csv-${version}"; version = "0.7.2"; @@ -20482,6 +20467,8 @@ EOF xmpppy = callPackage ../development/python-modules/xmpppy {}; + xstatic = callPackage ../development/python-modules/xstatic {}; + xstatic-bootbox = buildPythonPackage rec { name = "XStatic-Bootbox-${version}"; version = "4.3.0.1"; -- cgit 1.4.1 From ce8fbda10815e0fb3a65d5b191bc4456dfb05d90 Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 27 Feb 2018 10:37:19 +0100 Subject: pythonPackages.xstatic-bootbox: move to python-modules --- .../python-modules/xstatic-bootbox/default.nix | 25 ++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 16 +------------- 2 files changed, 26 insertions(+), 15 deletions(-) create mode 100644 pkgs/development/python-modules/xstatic-bootbox/default.nix diff --git a/pkgs/development/python-modules/xstatic-bootbox/default.nix b/pkgs/development/python-modules/xstatic-bootbox/default.nix new file mode 100644 index 000000000000..68c81157eb08 --- /dev/null +++ b/pkgs/development/python-modules/xstatic-bootbox/default.nix @@ -0,0 +1,25 @@ +{ buildPythonPackage +, lib +, fetchPypi +}: + +buildPythonPackage rec { + pname = "XStatic-Bootbox"; + version = "4.3.0.1"; + + src = fetchPypi { + inherit version pname; + sha256 = "0wks1lsqngn3gvlhzrvaan1zj8w4wr58xi0pfqhrzckbghvvr0gj"; + }; + + # no tests implemented + doCheck = false; + + meta = with lib;{ + homepage = http://bootboxjs.com; + description = "Bootboxjs packaged static files for python"; + license = licenses.mit; + maintainers = with maintainers; [ makefu ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 18639676daa4..634be631b51b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -20469,21 +20469,7 @@ EOF xstatic = callPackage ../development/python-modules/xstatic {}; - xstatic-bootbox = buildPythonPackage rec { - name = "XStatic-Bootbox-${version}"; - version = "4.3.0.1"; - src = pkgs.fetchurl { - url = "mirror://pypi/X/XStatic-Bootbox/XStatic-Bootbox-${version}.tar.gz"; - sha256 = "0wks1lsqngn3gvlhzrvaan1zj8w4wr58xi0pfqhrzckbghvvr0gj"; - }; - - meta = { - homepage = http://bootboxjs.com; - description = "bootboxjs packaged static files for python"; - license = licenses.mit; - maintainers = [ maintainers.makefu ]; - }; - }; + xstatic-bootbox = callPackage ../development/python-modules/xstatic-bootbox {}; xstatic-bootstrap = buildPythonPackage rec { name = "XStatic-Bootstrap-${version}"; -- cgit 1.4.1 From 0a5724173393ecaf6d29ef0355d50976369880b4 Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 27 Feb 2018 10:41:47 +0100 Subject: pythonPackages.xstatic-bootstrap: move to python-modules --- .../python-modules/xstatic-bootstrap/default.nix | 25 ++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 16 +------------- 2 files changed, 26 insertions(+), 15 deletions(-) create mode 100644 pkgs/development/python-modules/xstatic-bootstrap/default.nix diff --git a/pkgs/development/python-modules/xstatic-bootstrap/default.nix b/pkgs/development/python-modules/xstatic-bootstrap/default.nix new file mode 100644 index 000000000000..757c2cc240ed --- /dev/null +++ b/pkgs/development/python-modules/xstatic-bootstrap/default.nix @@ -0,0 +1,25 @@ +{ buildPythonPackage +, lib +, fetchPypi +}: + +buildPythonPackage rec { + pname = "XStatic-Bootstrap"; + version = "3.3.5.1"; + + src = fetchPypi { + inherit version pname; + sha256 = "0jzjq3d4vp2shd2n20f9y53jnnk1cvphkj1v0awgrf18qsy2bmin"; + }; + + # no tests implemented + doCheck = false; + + meta = with lib;{ + homepage = http://getbootstrap.com; + description = "Bootstrap packaged static files for python"; + license = licenses.mit; + maintainers = with maintainers; [ makefu ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 634be631b51b..a9b2dae3f665 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -20471,21 +20471,7 @@ EOF xstatic-bootbox = callPackage ../development/python-modules/xstatic-bootbox {}; - xstatic-bootstrap = buildPythonPackage rec { - name = "XStatic-Bootstrap-${version}"; - version = "3.3.5.1"; - src = pkgs.fetchurl { - url = "mirror://pypi/X/XStatic-Bootstrap/XStatic-Bootstrap-${version}.tar.gz"; - sha256 = "0jzjq3d4vp2shd2n20f9y53jnnk1cvphkj1v0awgrf18qsy2bmin"; - }; - - meta = { - homepage = http://getbootstrap.com; - description = "bootstrap packaged static files for python"; - license = licenses.mit; - maintainers = [ maintainers.makefu ]; - }; - }; + xstatic-bootstrap = callPackage ../development/python-modules/xstatic-bootstrap {}; xstatic-jquery = buildPythonPackage rec { name = "XStatic-jQuery-${version}"; -- cgit 1.4.1 From 9fe410fd495433af28cf4144335ffb9a6314fb2a Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 27 Feb 2018 10:46:52 +0100 Subject: pythonPackages.xstatic-jquery: move to python-modules --- .../python-modules/xstatic-jquery/default.nix | 25 ++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 16 +------------- 2 files changed, 26 insertions(+), 15 deletions(-) create mode 100644 pkgs/development/python-modules/xstatic-jquery/default.nix diff --git a/pkgs/development/python-modules/xstatic-jquery/default.nix b/pkgs/development/python-modules/xstatic-jquery/default.nix new file mode 100644 index 000000000000..c414e0a070ae --- /dev/null +++ b/pkgs/development/python-modules/xstatic-jquery/default.nix @@ -0,0 +1,25 @@ +{ buildPythonPackage +, lib +, fetchPypi +}: + +buildPythonPackage rec { + pname = "XStatic-jQuery"; + version = "1.10.2.1"; + + src = fetchPypi { + inherit version pname; + sha256 = "018kx4zijflcq8081xx6kmiqf748bsjdq7adij2k91bfp1mnlhc3"; + }; + + # no tests implemented + doCheck = false; + + meta = with lib;{ + homepage = http://jquery.org; + description = "jquery packaged static files for python"; + license = licenses.mit; + maintainers = with maintainers; [ makefu ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a9b2dae3f665..acc4b086e6ce 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -20473,21 +20473,7 @@ EOF xstatic-bootstrap = callPackage ../development/python-modules/xstatic-bootstrap {}; - xstatic-jquery = buildPythonPackage rec { - name = "XStatic-jQuery-${version}"; - version = "1.10.2.1"; - src = pkgs.fetchurl { - url = "mirror://pypi/X/XStatic-jQuery/XStatic-jQuery-${version}.tar.gz"; - sha256 = "018kx4zijflcq8081xx6kmiqf748bsjdq7adij2k91bfp1mnlhc3"; - }; - - meta = { - homepage = http://jquery.org; - description = "jquery packaged static files for python"; - license = licenses.mit; - maintainers = [ maintainers.makefu ]; - }; - }; + xstatic-jquery = callPackage ../development/python-modules/xstatic-jquery {}; xstatic-jquery-file-upload = buildPythonPackage rec { name = "XStatic-jQuery-File-Upload-${version}"; -- cgit 1.4.1 From 2fb4fafdfbf29e3105c8a7c5cb7d9ef2f2cd6a52 Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 27 Feb 2018 10:50:09 +0100 Subject: pythonPackages.xstatic-jquery-file-upload: move to python-modules --- .../xstatic-jquery-file-upload/default.nix | 28 ++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 17 +------------ 2 files changed, 29 insertions(+), 16 deletions(-) create mode 100644 pkgs/development/python-modules/xstatic-jquery-file-upload/default.nix diff --git a/pkgs/development/python-modules/xstatic-jquery-file-upload/default.nix b/pkgs/development/python-modules/xstatic-jquery-file-upload/default.nix new file mode 100644 index 000000000000..0cf029c68a59 --- /dev/null +++ b/pkgs/development/python-modules/xstatic-jquery-file-upload/default.nix @@ -0,0 +1,28 @@ +{ buildPythonPackage +, lib +, fetchPypi +, xstatic-jquery +}: + +buildPythonPackage rec { + pname = "XStatic-jQuery-File-Upload"; + version = "9.7.0.1"; + + src = fetchPypi { + inherit version pname; + sha256 = "0d5za18lhzhb54baxq8z73wazq801n3qfj5vgcz7ri3ngx7nb0cg"; + }; + + # no tests implemented + doCheck = false; + + propagatedBuildInputs = [ xstatic-jquery ]; + + meta = with lib;{ + homepage = http://plugins.jquery.com/project/jQuery-File-Upload; + description = "jquery-file-upload packaged static files for python"; + license = licenses.mit; + maintainers = with maintainers; [ makefu ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index acc4b086e6ce..5f5737d7f136 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -20475,22 +20475,7 @@ EOF xstatic-jquery = callPackage ../development/python-modules/xstatic-jquery {}; - xstatic-jquery-file-upload = buildPythonPackage rec { - name = "XStatic-jQuery-File-Upload-${version}"; - version = "9.7.0.1"; - propagatedBuildInputs = with self;[ xstatic-jquery ]; - src = pkgs.fetchurl { - url = "mirror://pypi/X/XStatic-jQuery-File-Upload/XStatic-jQuery-File-Upload-${version}.tar.gz"; - sha256 = "0d5za18lhzhb54baxq8z73wazq801n3qfj5vgcz7ri3ngx7nb0cg"; - }; - - meta = { - homepage = http://plugins.jquery.com/project/jQuery-File-Upload; - description = "jquery-file-upload packaged static files for python"; - license = licenses.mit; - maintainers = [ maintainers.makefu ]; - }; - }; + xstatic-jquery-file-upload = callPackage ../development/python-modules/xstatic-jquery-file-upload {}; xstatic-jquery-ui = buildPythonPackage rec { name = "XStatic-jquery-ui-${version}"; -- cgit 1.4.1 From 0b5af0399d14bf9382b415e280fd6226279ce517 Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 27 Feb 2018 10:54:52 +0100 Subject: pythonPackages.xstatic-jquery-ui: move to python-modules --- .../python-modules/xstatic-jquery-ui/default.nix | 28 ++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 17 +------------ 2 files changed, 29 insertions(+), 16 deletions(-) create mode 100644 pkgs/development/python-modules/xstatic-jquery-ui/default.nix diff --git a/pkgs/development/python-modules/xstatic-jquery-ui/default.nix b/pkgs/development/python-modules/xstatic-jquery-ui/default.nix new file mode 100644 index 000000000000..1b884a97eb22 --- /dev/null +++ b/pkgs/development/python-modules/xstatic-jquery-ui/default.nix @@ -0,0 +1,28 @@ +{ buildPythonPackage +, lib +, fetchPypi +, xstatic-jquery +}: + +buildPythonPackage rec { + pname = "XStatic-jquery-ui"; + version = "1.12.0.1"; + + src = fetchPypi { + inherit version pname; + sha256 = "0w7mabv6qflpd47g33j3ggp5rv17mqk0xz3bsdswcj97wqpga2l2"; + }; + + # no tests implemented + doCheck = false; + + propagatedBuildInputs = [ xstatic-jquery ]; + + meta = with lib;{ + homepage = http://jqueryui.com/; + description = "jquery-ui packaged static files for python"; + license = licenses.mit; + maintainers = with maintainers; [ makefu ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5f5737d7f136..53f5cf063d84 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -20477,22 +20477,7 @@ EOF xstatic-jquery-file-upload = callPackage ../development/python-modules/xstatic-jquery-file-upload {}; - xstatic-jquery-ui = buildPythonPackage rec { - name = "XStatic-jquery-ui-${version}"; - version = "1.12.0.1"; - propagatedBuildInputs = with self; [ xstatic-jquery ]; - src = pkgs.fetchurl { - url = "mirror://pypi/X/XStatic-jquery-ui/XStatic-jquery-ui-${version}.tar.gz"; - sha256 = "0w7mabv6qflpd47g33j3ggp5rv17mqk0xz3bsdswcj97wqpga2l2"; - }; - - meta = { - homepage = http://jqueryui.com/; - description = "jquery-ui packaged static files for python"; - license = licenses.mit; - maintainers = [ maintainers.makefu ]; - }; - }; + xstatic-jquery-ui = callPackage ../development/python-modules/xstatic-jquery-ui {}; xstatic-pygments = buildPythonPackage rec { name = "XStatic-Pygments-${version}"; -- cgit 1.4.1 From b4eee22b6f061611acd4571b25d1ec2ef37a1023 Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 27 Feb 2018 10:59:18 +0100 Subject: pythonPackages.xstatic-pygments: move to python-modules --- .../python-modules/xstatic-pygments/default.nix | 25 ++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 16 +------------- 2 files changed, 26 insertions(+), 15 deletions(-) create mode 100644 pkgs/development/python-modules/xstatic-pygments/default.nix diff --git a/pkgs/development/python-modules/xstatic-pygments/default.nix b/pkgs/development/python-modules/xstatic-pygments/default.nix new file mode 100644 index 000000000000..8ec9b77860c2 --- /dev/null +++ b/pkgs/development/python-modules/xstatic-pygments/default.nix @@ -0,0 +1,25 @@ +{ buildPythonPackage +, lib +, fetchPypi +}: + +buildPythonPackage rec { + pname = "XStatic-Pygments"; + version = "1.6.0.1"; + + src = fetchPypi { + inherit version pname; + sha256 = "0fjqgg433wfdnswn7fad1g6k2x6mf24wfnay2j82j0fwgkdxrr7m"; + }; + + # no tests implemented + doCheck = false; + + meta = with lib;{ + homepage = http://pygments.org; + description = "pygments packaged static files for python"; + license = licenses.mit; + maintainers = with maintainers; [ makefu ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 53f5cf063d84..78491a1c0901 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -20479,21 +20479,7 @@ EOF xstatic-jquery-ui = callPackage ../development/python-modules/xstatic-jquery-ui {}; - xstatic-pygments = buildPythonPackage rec { - name = "XStatic-Pygments-${version}"; - version = "1.6.0.1"; - src = pkgs.fetchurl { - url = "mirror://pypi/X/XStatic-Pygments/XStatic-Pygments-${version}.tar.gz"; - sha256 = "0fjqgg433wfdnswn7fad1g6k2x6mf24wfnay2j82j0fwgkdxrr7m"; - }; - - meta = { - homepage = http://pygments.org; - description = "pygments packaged static files for python"; - license = licenses.bsd2; - maintainers = [ maintainers.makefu ]; - }; - }; + xstatic-pygments = callPackage ../development/python-modules/xstatic-pygments {}; xvfbwrapper = callPackage ../development/python-modules/xvfbwrapper { inherit (pkgs.xorg) xorgserver; -- cgit 1.4.1