alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

util-linux: 2.28.1 -> 2.29

Browse source
This commit is contained in:
Tim Steinbach 2017-01-14 12:57:58 -05:00
parent 70b0af9f83
commit e8d3c74b49
No known key found for this signature in database
GPG key ID: 472BFCCA96BD0EDA
2 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/os-specific/linux/util-linux/default.nix
View file

@ -4,12 +4,12 @@ stdenv.mkDerivation rec {
name = "util-linux-${version}";
version = lib.concatStringsSep "." ([ majorVersion ]
++ lib.optional (patchVersion != "") patchVersion);
majorVersion = "2.28";
patchVersion = "1";
majorVersion = "2.29";
patchVersion = "";
src = fetchurl {
url = "mirror://kernel/linux/utils/util-linux/v${majorVersion}/${name}.tar.xz";
sha256 = "03xnaw3c7pavxvvh1vnimcr44hlhhf25whawiyv8dxsflfj4xkiy";
sha256 = "1rzrmdrz51p9sy7vlw5qmj8pmqazm7hgcch5yq242mkvrikyln9c";
};
patches = [

14
pkgs/os-specific/linux/util-linux/rtcwake-search-PATH-for-shutdown.patch
View file

@ -3,21 +3,17 @@ which isn't valid on NixOS (and a compatibility link on most other modern
distros anyway).
-- nckx <tobias.geerinckx.rice@gmail.com>
diff --git a/include/pathnames.h b/include/pathnames.h
index de6a13c..0c1aeb9 100644
--- a/include/pathnames.h
+++ b/include/pathnames.h
@@ -50,7 +50,7 @@
#define _PATH_VAR_NOLOGIN "/var/run/nologin"
@@ -53,7 +53,7 @@
#ifndef _PATH_LOGIN
#define _PATH_LOGIN "/bin/login"
#endif
-#define _PATH_SHUTDOWN "/sbin/shutdown"
+#define _PATH_SHUTDOWN "shutdown"
+#define _PATH_SHUTDOWN "shutdown"
#define _PATH_TERMCOLORS_DIRNAME "terminal-colors.d"
#define _PATH_TERMCOLORS_DIR "/etc/" _PATH_TERMCOLORS_DIRNAME
diff --git a/sys-utils/rtcwake.c b/sys-utils/rtcwake.c
index 7c748dc..9a99a7c 100644
--- a/sys-utils/rtcwake.c
+++ b/sys-utils/rtcwake.c
@@ -575,7 +575,7 @@ int main(int argc, char **argv)