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
parent 4eec6bc9c9 ddddca5c2f
commit 7079e744d4
927 changed files with 18154 additions and 12101 deletions
@@ -233,7 +233,7 @@
      calibre-server = 213;
      heapster = 214;
      bepasty = 215;
-      pumpio = 216;
+      # pumpio = 216; # unused, removed 2018-02-24
      nm-openvpn = 217;
      mathics = 218;
      ejabberd = 219;
@@ -514,7 +514,7 @@
      xtreemfs = 212;
      calibre-server = 213;
      bepasty = 215;
-      pumpio = 216;
+      # pumpio = 216; # unused, removed 2018-02-24
      nm-openvpn = 217;
      mathics = 218;
      ejabberd = 219;