summary refs log tree commit diff
path: root/doc
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2018-11-02 14:36:19 +0100
committerVladimír Čunát <vcunat@gmail.com>2018-11-02 14:40:14 +0100
commita92a2c8e158c1a67486e17063d04e448f25b865c (patch)
treedb7fac830d1fbd363ccaeecc300a2e492844f33d /doc
parenta53bc2c2659d638982e15c6e981e447f5e88075f (diff)
parent87e4e1ba72dafd0ea1208cd959d047c04612b4aa (diff)
downloadnixpkgs-a92a2c8e158c1a67486e17063d04e448f25b865c.tar
nixpkgs-a92a2c8e158c1a67486e17063d04e448f25b865c.tar.gz
nixpkgs-a92a2c8e158c1a67486e17063d04e448f25b865c.tar.bz2
nixpkgs-a92a2c8e158c1a67486e17063d04e448f25b865c.tar.lz
nixpkgs-a92a2c8e158c1a67486e17063d04e448f25b865c.tar.xz
nixpkgs-a92a2c8e158c1a67486e17063d04e448f25b865c.tar.zst
nixpkgs-a92a2c8e158c1a67486e17063d04e448f25b865c.zip
Merge branch 'master' into staging
Conflict: rename of pythondaemon -> python-daemon.
Diffstat (limited to 'doc')
-rw-r--r--doc/languages-frameworks/python.section.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md
index 86633c827df..857463c5787 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; {
     ...