movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-10 19:55:41 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into staging

Browse source 
Conflict: rename of pythondaemon -> python-daemon.
This commit is contained in:
Vladimír Čunát 2018-11-02 14:36:19 +01:00
commit a92a2c8e15
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
192 changed files with 5268 additions and 1800 deletions
Download patch file Download diff file Expand all files Collapse all files

2
doc/languages-frameworks/python.section.md
View file

@ -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; {
...