From 994b84d816b76425964cabdbee334b52aa151d52 Mon Sep 17 00:00:00 2001
From: "nagato.pain" <iuns@outlook.fr>
Date: Sat, 13 Oct 2018 10:12:58 -0700
Subject: [PATCH 1/3] pythonPackages.helper: 2.4.1 -> 2.4.2 | cleanup
---
.../python-modules/helper/default.nix | 24 +++++++++++++++++
pkgs/top-level/python-packages.nix | 27 ++-----------------
2 files changed, 26 insertions(+), 25 deletions(-)
create mode 100644 pkgs/development/python-modules/helper/default.nix
diff --git a/pkgs/development/python-modules/helper/default.nix b/pkgs/development/python-modules/helper/default.nix
new file mode 100644
index 000000000000..15dadd0bf114
--- /dev/null
+++ b/pkgs/development/python-modules/helper/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, buildPythonPackage, fetchPypi, pyyaml, mock }:
+
+buildPythonPackage rec {
+ pname = "helper";
+ version = "2.4.2";
+ name = "${pname}-${version}";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0p56dvjpaz9wnr0ik2wmvgqjf9ji180bhjky7q272l5dan94lgd6";
+ };
+
+ buildInputs = [ mock ];
+ propagatedBuildInputs = [ pyyaml ];
+
+ # No tests in the pypi tarball
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ description = "Development library for quickly writing configurable applications and daemons";
+ homepage = https://helper.readthedocs.org/;
+ license = licenses.bsd3;
+ };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4c66fd52d43b..3ab1af6c32a9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -358,6 +358,8 @@ in {
habanero = callPackage ../development/python-modules/habanero { };
+ helper = callPackage ../development/python-modules/helper { };
+
histbook = callPackage ../development/python-modules/histbook { };
httpsig = callPackage ../development/python-modules/httpsig { };
@@ -2532,31 +2534,6 @@ in {
hbmqtt = callPackage ../development/python-modules/hbmqtt { };
- helper = buildPythonPackage rec {
- pname = "helper";
- version = "2.4.1";
- name = "${pname}-${version}";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/h/${pname}/${name}.tar.gz";
- sha256 = "4e33dde42ad4df30fb7790689f93d77252cff26a565610d03ff2e434865a53a2";
- };
-
- buildInputs = with self; [ mock ];
- propagatedBuildInputs = with self; [ pyyaml ];
-
- # No tests
- doCheck = false;
-
- meta = {
- description = "Development library for quickly writing configurable applications and daemons";
- homepage = https://helper.readthedocs.org/;
- license = licenses.bsd3;
- };
-
-
- };
-
hiro = callPackage ../development/python-modules/hiro {};
hglib = callPackage ../development/python-modules/hglib {};
From 206f9ce2e008ac85e58fcfbf731e60ab2847e5d8 Mon Sep 17 00:00:00 2001
From: "nagato.pain" <iuns@outlook.fr>
Date: Sat, 13 Oct 2018 10:24:23 -0700
Subject: [PATCH 2/3] pythonPackages.mwclient: 0.8.3 -> 0.9.1 | move to a
seperate file
---
.../python-modules/mwclient/default.nix | 30 +++++++++++++++++++
pkgs/top-level/python-packages.nix | 30 ++-----------------
2 files changed, 32 insertions(+), 28 deletions(-)
create mode 100644 pkgs/development/python-modules/mwclient/default.nix
diff --git a/pkgs/development/python-modules/mwclient/default.nix b/pkgs/development/python-modules/mwclient/default.nix
new file mode 100644
index 000000000000..186bc26f002f
--- /dev/null
+++ b/pkgs/development/python-modules/mwclient/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, buildPythonPackage, fetchFromGitHub, requests, requests_oauthlib
+, responses, mock, pytestcov, pytest, pytestcache, pytestpep8, coverage, six }:
+
+buildPythonPackage rec {
+ version = "0.9.1";
+ pname = "mwclient";
+ name = "${pname}-${version}";
+
+ src = fetchFromGitHub {
+ owner = "mwclient";
+ repo = "mwclient";
+ rev = "v${version}";
+ sha256 = "0l7l5j7znlyn2yqvdfxr4dq23wyp6d8z49pnkjqy2kan11nrjzym";
+ };
+
+ buildInputs = [ mock responses pytestcov pytest pytestcache pytestpep8 coverage ];
+
+ propagatedBuildInputs = [ six requests requests_oauthlib ];
+
+ checkPhase = ''
+ py.test
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Python client library to the MediaWiki API";
+ maintainers = with maintainers; [ ];
+ license = licenses.mit;
+ homepage = https://github.com/mwclient/mwclient;
+ };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3ab1af6c32a9..30c9de1c445a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -390,6 +390,8 @@ in {
mpi = pkgs.openmpi;
};
+ mwclient = callPackage ../development/python-modules/mwclient { };
+
mwoauth = callPackage ../development/python-modules/mwoauth { };
nest-asyncio = callPackage ../development/python-modules/nest-asyncio { };
@@ -7479,34 +7481,6 @@ in {
mypy-protobuf = callPackage ../development/python-modules/mypy-protobuf { };
- mwclient = buildPythonPackage rec {
- version = "0.8.3";
- pname = "mwclient";
- name = "${pname}-${version}";
-
- src = pkgs.fetchFromGitHub {
- owner = "mwclient";
- repo = "mwclient";
- rev = "v${version}";
- sha256 = "0kl1yp9z5f1wl6lkm0vix87zkrbl9wcmkrrj1x5c35xvf95laf53";
- };
-
- buildInputs = with self; [ mock responses pytestcov pytest pytestcache pytestpep8 coverage ];
-
- propagatedBuildInputs = with self; [ six requests requests_oauthlib ];
-
- checkPhase = ''
- py.test
- '';
-
- meta = {
- description = "Python client library to the MediaWiki API";
- maintainers = with maintainers; [ ];
- license = licenses.mit;
- homepage = https://github.com/mwclient/mwclient;
- };
- };
-
neuronpy = buildPythonPackage rec {
name = "neuronpy-${version}";
version = "0.1.6";
From 1d1748c3c0b8b3c972451ec7aafbc5ea97e8a2ef Mon Sep 17 00:00:00 2001
From: "nagato.pain" <iuns@outlook.fr>
Date: Sat, 13 Oct 2018 10:35:18 -0700
Subject: [PATCH 3/3] pythonPackages.pystache: move to a seperate file
---
.../python-modules/pystache/default.nix | 29 ++++++++++++++++++
pkgs/top-level/python-packages.nix | 30 ++-----------------
2 files changed, 31 insertions(+), 28 deletions(-)
create mode 100644 pkgs/development/python-modules/pystache/default.nix
diff --git a/pkgs/development/python-modules/pystache/default.nix b/pkgs/development/python-modules/pystache/default.nix
new file mode 100644
index 000000000000..ee57c4995481
--- /dev/null
+++ b/pkgs/development/python-modules/pystache/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, buildPythonPackage, python, fetchPypi, isPy3k, glibcLocales }:
+
+buildPythonPackage rec {
+ pname = "pystache-${version}";
+ version = "0.5.4";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "f7bbc265fb957b4d6c7c042b336563179444ab313fb93a719759111eabd3b85a";
+ };
+
+ LC_ALL = "en_US.UTF-8";
+
+ buildInputs = [ glibcLocales ];
+
+ checkPhase = ''
+ ${python.interpreter} -m unittest discover
+ '';
+
+ # SyntaxError Python 3
+ # https://github.com/defunkt/pystache/issues/181
+ doCheck = !isPy3k;
+
+ meta = with stdenv.lib; {
+ description = "A framework-agnostic, logic-free templating system inspired by ctemplate and et";
+ homepage = https://github.com/defunkt/pystache;
+ license = licenses.mit;
+ };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 30c9de1c445a..dfd6437550bc 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -559,6 +559,8 @@ in {
slurm = pkgs.slurm;
};
+ pystache = callPackage ../development/python-modules/pystache { };
+
pytest-tornado = callPackage ../development/python-modules/pytest-tornado { };
python-binance = callPackage ../development/python-modules/python-binance { };
@@ -10333,34 +10335,6 @@ in {
};
};
- pystache = buildPythonPackage rec {
- name = "pystache-${version}";
- version = "0.5.4";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/p/pystache/${name}.tar.gz";
- sha256 = "f7bbc265fb957b4d6c7c042b336563179444ab313fb93a719759111eabd3b85a";
- };
-
- LC_ALL = "en_US.UTF-8";
-
- buildInputs = [ pkgs.glibcLocales ];
-
- checkPhase = ''
- ${python.interpreter} -m unittest discover
- '';
-
- # SyntaxError Python 3
- # https://github.com/defunkt/pystache/issues/181
- doCheck = !isPy3k;
-
- meta = {
- description = "A framework-agnostic, logic-free templating system inspired by ctemplate and et";
- homepage = https://github.com/defunkt/pystache;
- license = licenses.mit;
- };
- };
-
PyStemmer = callPackage ../development/python-modules/pystemmer {};
Pyro = callPackage ../development/python-modules/pyro { };