Merge branch 'master' into systemd-219

Conflicts: nixos/modules/system/boot/systemd.nix pkgs/applications/networking/p2p/transmission/default.nix pkgs/development/libraries/libseccomp/default.nix pkgs/os-specific/linux/systemd/default.nix pkgs/top-level/all-packages.nix
2015-09-07 21:28:33 +02:00
parent 026c31dd9d 86eaeb4c0a
commit 916793cf13
1488 changed files with 63828 additions and 38513 deletions
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {

  patches =
    [ # These are all changes between upstream and
-      # https://github.com/edolstra/systemd/tree/nixos-v220.
+      # https://github.com/NixOS/systemd/tree/nixos-v220.
      ./fixes.patch
    ];