diff options
author | John Ericson <git@JohnEricson.me> | 2019-04-01 00:24:46 -0400 |
---|---|---|
committer | John Ericson <git@JohnEricson.me> | 2019-04-01 00:40:03 -0400 |
commit | 4ccb74011fc77cb761a3c33ed796724795425420 (patch) | |
tree | 91e0d95cdfe1023c3de5ff214eba58985e2d2d35 /pkgs/development/python-modules/irc/default.nix | |
parent | 75514175920e1613c8eaf8026b367b48f8b77027 (diff) | |
parent | 18aa59b0f26fc707e7313f8467e67159e61600c2 (diff) | |
download | nixlib-4ccb74011fc77cb761a3c33ed796724795425420.tar nixlib-4ccb74011fc77cb761a3c33ed796724795425420.tar.gz nixlib-4ccb74011fc77cb761a3c33ed796724795425420.tar.bz2 nixlib-4ccb74011fc77cb761a3c33ed796724795425420.tar.lz nixlib-4ccb74011fc77cb761a3c33ed796724795425420.tar.xz nixlib-4ccb74011fc77cb761a3c33ed796724795425420.tar.zst nixlib-4ccb74011fc77cb761a3c33ed796724795425420.zip |
Merge commit '18aa59b0f26fc707e7313f8467e67159e61600c2' from master into staging
There was one conflict in the NixOS manual; I checked that it still built after resolving it.
Diffstat (limited to 'pkgs/development/python-modules/irc/default.nix')
-rw-r--r-- | pkgs/development/python-modules/irc/default.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/development/python-modules/irc/default.nix b/pkgs/development/python-modules/irc/default.nix index 672704249dc9..b422b368ffb6 100644 --- a/pkgs/development/python-modules/irc/default.nix +++ b/pkgs/development/python-modules/irc/default.nix @@ -1,6 +1,7 @@ { buildPythonPackage, fetchPypi, isPy3k , six, jaraco_logging, jaraco_text, jaraco_stream, pytz, jaraco_itertools -, setuptools_scm }: +, setuptools_scm, jaraco_collections +}: buildPythonPackage rec { pname = "irc"; @@ -23,5 +24,6 @@ buildPythonPackage rec { jaraco_stream pytz jaraco_itertools + jaraco_collections ]; } |