Merge branch 'master' into staging

Conflicts (simple): pkgs/os-specific/linux/util-linux/default.nix It seems this merge creates a new stdenv hash, because we had changes on both branches :-/
2015-01-13 18:07:11 +01:00
parent 1c0477c08c 7637e71cee
commit 1575bc652e
452 changed files with 143747 additions and 4903 deletions
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
    sha256 = "e0457f715b73f4a349e1acb08cb410bf0edc9a74a3f75c357070f31f70e33cd6";
  };

+  patches = [ ./rtcwake-search-PATH-for-shutdown.patch ];
+
  #FIXME: make it also work on non-nixos?
  postPatch = ''
    # Substituting store paths would create a circular dependency on systemd