Merge branch 'master' into add-missing-licenses

Conflicts: pkgs/tools/networking/network-manager/fortisslvpn.nix
2018-08-11 09:36:34 +02:00
parent af8cd3c74e 40dea2488f
commit a34579e01e
158 changed files with 2671 additions and 1385 deletions
@@ -33,7 +33,7 @@ stdenv.mkDerivation {
      rm -rf $out/include
      rm -rf $out/share/man/man5
      rm $(for i in $out/share/man/man8/*; do echo $i; done | grep -v 'pidof\|killall5')
-      rm $out/bin/{mountpoint,wall} $out/share/man/man1/{mountpoint.1,wall.1}
+      rm $out/bin/wall $out/share/man/man1/wall.1
    '';

  meta = {