Merge remote-tracking branch 'upstream/master' into staging

2018-05-03 16:35:36 -04:00
parent cbe21ac614 b45ef79b74
commit cf06e42d1c
330 changed files with 20106 additions and 16120 deletions
@@ -3,8 +3,6 @@
 , useSystemd ? true, systemd, gobjectIntrospection
 }:

-assert stdenv.isLinux;
-
 stdenv.mkDerivation rec {
  name = "upower-0.99.7";