nixpkgs/pkgs/os-specific/linux/util-linux
Vladimír Čunát 1575bc652e 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
..
default.nix Merge branch 'master' into staging 2015-01-13 18:07:11 +01:00
rtcwake-search-PATH-for-shutdown.patch util-linux: fix rtcwake(8) to search $PATH for shutdown(8) 2015-01-01 22:23:22 +01:00