11 Commits

Author	SHA1	Message	Date
Jan Malakhovski	7079e744d4	Merge branch 'master' into staging ... Resolved the following conflicts (by carefully applying patches from the both branches since the fork point): pkgs/development/libraries/epoxy/default.nix pkgs/development/libraries/gtk+/3.x.nix pkgs/development/python-modules/asgiref/default.nix pkgs/development/python-modules/daphne/default.nix pkgs/os-specific/linux/systemd/default.nix	2018-03-10 20:38:13 +00:00
Lancelot SIX	ddddca5c2f	pythonPackages.daphne: 2.0.3 -> 2.1.0	2018-03-10 14:55:00 +01:00
Vladimír Čunát	f5ce8f86df	Revert "Merge staging at '8d490ca9934d0' into master" ... This reverts commit fc232422201c0364dbd57826c9a137cc1239caea, reversing changes made to 754816b84b98afdc0727e13dd66e1698b097de6a. We don't have many binaries yet. Comment on the original merge commit.	2018-02-26 22:53:18 +01:00
Robert Schütz	40b0c58549	pythonPackages.daphne: fix build and enable tests	2018-02-22 01:46:11 +01:00
Frederik Rietdijk	6ac32c78f0	python: daphne: 2.0.0 -> 2.0.3	2018-02-18 20:07:42 +01:00
Frederik Rietdijk	c80893f40b	python: daphne: 1.4.2 -> 2.0.0	2018-02-03 17:43:29 +01:00
Frederik Rietdijk	8cc70cac8b	python: daphne: 1.3.0 -> 1.4.2	2018-01-07 09:00:24 +01:00
Lancelot SIX	561c815ad7	pythonPackages.daphne: 1.2.0 -> 1.3.0	2017-07-31 17:55:03 +02:00
Frederik Rietdijk	959842a9c7	Python: add pname attributes to libraries ... so that we can use the update script.	2017-05-27 11:30:21 +02:00
Lancelot SIX	519d3d0451	pythonPackages.daphne: 1.0.3 -> 1.2.0	2017-05-02 09:28:35 +02:00
Lancelot SIX	4d5093f5e1	pythonPackages.daphne: 1.0.1 -> 1.0.3	2017-02-23 11:00:19 +01:00