chn/nixpkgs
1
0
Fork 0
mirror of https://github.com/CHN-beta/nixpkgs.git synced 2026-01-20 15:00:35 +08:00
Code Issues Packages Projects Releases Wiki Activity
Files
ecf5caf457331ca777f498a94dea34e9befac028
nixpkgs/pkgs/development/python-modules/daphne
History
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
..
default.nix
Merge branch 'master' into staging
2018-03-10 20:38:13 +00:00