Age | Commit message (Collapse) | Author | Files | Lines | |
---|---|---|---|---|---|
2018-03-10 | Merge branch 'master' into staging | Jan Malakhovski | 1 | -2/+2 | |
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 | pythonPackages.daphne: 2.0.3 -> 2.1.0 | Lancelot SIX | 1 | -2/+2 | |
2018-02-26 | Revert "Merge staging at '8d490ca9934d0' into master" | Vladimír Čunát | 1 | -19/+7 | |
This reverts commit fc232422201c0364dbd57826c9a137cc1239caea, reversing changes made to 754816b84b98afdc0727e13dd66e1698b097de6a. We don't have many binaries yet. Comment on the original merge commit. | |||||
2018-02-22 | pythonPackages.daphne: fix build and enable tests | Robert Schütz | 1 | -7/+19 | |
2018-02-18 | python: daphne: 2.0.0 -> 2.0.3 | Frederik Rietdijk | 1 | -2/+2 | |
2018-02-03 | python: daphne: 1.4.2 -> 2.0.0 | Frederik Rietdijk | 1 | -2/+2 | |
2018-01-07 | python: daphne: 1.3.0 -> 1.4.2 | Frederik Rietdijk | 1 | -2/+2 | |
2017-07-31 | pythonPackages.daphne: 1.2.0 -> 1.3.0 | Lancelot SIX | 1 | -5/+5 | |
2017-05-27 | Python: add pname attributes to libraries | Frederik Rietdijk | 1 | -1/+2 | |
so that we can use the update script. | |||||
2017-05-02 | pythonPackages.daphne: 1.0.3 -> 1.2.0 | Lancelot SIX | 1 | -3/+4 | |
2017-02-23 | pythonPackages.daphne: 1.0.1 -> 1.0.3 | Lancelot SIX | 1 | -0/+20 | |