From baf070301096f5c6c1765d7e14c05032c4f27df9 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Thu, 4 Oct 2018 21:51:46 -0400 Subject: [PATCH] pythonPackages.pythondaemon: rename to pythonPackages.python-daemon This commit renames the pythondaemon module to match its module name, github name, and pypi name, which makes it easier to find and reference. In order to avoid breaking any external users, I've left an alias with a deprecated warning. --- doc/languages-frameworks/python.section.md | 2 +- pkgs/applications/networking/cluster/luigi/default.nix | 2 +- pkgs/development/python-modules/coilmq/default.nix | 4 ++-- pkgs/development/python-modules/libagent/default.nix | 4 ++-- pkgs/development/python-modules/salmon-mail/default.nix | 4 ++-- pkgs/top-level/python-packages.nix | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index b52b79c62d9..e6c8ab37d68 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -670,7 +670,7 @@ python3Packages.buildPythonApplication rec { sha256 = "035w8gqql36zlan0xjrzz9j4lh9hs0qrsgnbyw07qs7lnkvbdv9x"; }; - propagatedBuildInputs = with python3Packages; [ tornado_4 pythondaemon ]; + propagatedBuildInputs = with python3Packages; [ tornado_4 python-daemon ]; meta = with lib; { ... diff --git a/pkgs/applications/networking/cluster/luigi/default.nix b/pkgs/applications/networking/cluster/luigi/default.nix index ced7b9882b9..35721208a6e 100644 --- a/pkgs/applications/networking/cluster/luigi/default.nix +++ b/pkgs/applications/networking/cluster/luigi/default.nix @@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec { sed -i 's/<2.2.0//' setup.py ''; - propagatedBuildInputs = with python3Packages; [ tornado_4 pythondaemon ]; + propagatedBuildInputs = with python3Packages; [ tornado_4 python-daemon ]; # Requires tox, hadoop, and google cloud doCheck = false; diff --git a/pkgs/development/python-modules/coilmq/default.nix b/pkgs/development/python-modules/coilmq/default.nix index 11d39e411ce..90eb1edc2cd 100644 --- a/pkgs/development/python-modules/coilmq/default.nix +++ b/pkgs/development/python-modules/coilmq/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchPypi -, stompclient, pythondaemon, redis, pid, pytest, six, click, coverage +, stompclient, python-daemon, redis, pid, pytest, six, click, coverage , sqlalchemy }: buildPythonPackage rec { @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "4cbfeb5ed2459df14902c1380157be6267702b1271682924cd316ccad8a29d1d"; }; - propagatedBuildInputs = [ stompclient pythondaemon redis pid ]; + propagatedBuildInputs = [ stompclient python-daemon redis pid ]; buildInputs = [ pytest six click coverage sqlalchemy ]; # The teste data is not included in the distribution diff --git a/pkgs/development/python-modules/libagent/default.nix b/pkgs/development/python-modules/libagent/default.nix index f70d538bb8d..f9395886040 100644 --- a/pkgs/development/python-modules/libagent/default.nix +++ b/pkgs/development/python-modules/libagent/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchPypi, buildPythonPackage, ed25519, ecdsa , semver, mnemonic, unidecode, mock, pytest , backports-shutil-which, ConfigArgParse, - pythondaemon, pymsgbox }: + python-daemon, pymsgbox }: buildPythonPackage rec { pname = "libagent"; @@ -12,7 +12,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ unidecode backports-shutil-which ConfigArgParse - pythondaemon pymsgbox ecdsa ed25519 mnemonic semver ]; + python-daemon pymsgbox ecdsa ed25519 mnemonic semver ]; checkInputs = [ mock pytest ]; diff --git a/pkgs/development/python-modules/salmon-mail/default.nix b/pkgs/development/python-modules/salmon-mail/default.nix index b278d26b5dd..9486899c606 100644 --- a/pkgs/development/python-modules/salmon-mail/default.nix +++ b/pkgs/development/python-modules/salmon-mail/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchPypi, nose, dnspython -, chardet, lmtpd, pythondaemon, six, jinja2, mock }: +, chardet, lmtpd, python-daemon, six, jinja2, mock }: buildPythonPackage rec { pname = "salmon-mail"; @@ -11,7 +11,7 @@ buildPythonPackage rec { }; checkInputs = [ nose jinja2 mock ]; - propagatedBuildInputs = [ chardet dnspython lmtpd pythondaemon six ]; + propagatedBuildInputs = [ chardet dnspython lmtpd python-daemon six ]; # The tests use salmon executable installed by salmon itself so we need to add # that to PATH diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b2cff4940c1..d5cc2785171 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6554,7 +6554,7 @@ in { }; in if isPy3k then py3 else py2; - pythondaemon = callPackage ../development/python-modules/python-daemon { }; + python-daemon = callPackage ../development/python-modules/python-daemon { }; sympy = callPackage ../development/python-modules/sympy { };