diff options
| author | Tim Steinbach <tim@nequissimus.com> | 2017-01-14 12:57:58 -0500 |
|---|---|---|
| committer | Tim Steinbach <tim@nequissimus.com> | 2017-01-14 12:57:58 -0500 |
| commit | e8d3c74b499ad026e40ca77f54214444f9461e3c (patch) | |
| tree | d49e87282d79e737a354f6aeeef6c1be3ceb9de0 /pkgs/os-specific/linux/util-linux | |
| parent | 70b0af9f831c1396672bbcfbf5b119343402476f (diff) | |
| download | nixpkgs-e8d3c74b499ad026e40ca77f54214444f9461e3c.tar nixpkgs-e8d3c74b499ad026e40ca77f54214444f9461e3c.tar.gz nixpkgs-e8d3c74b499ad026e40ca77f54214444f9461e3c.tar.bz2 nixpkgs-e8d3c74b499ad026e40ca77f54214444f9461e3c.tar.lz nixpkgs-e8d3c74b499ad026e40ca77f54214444f9461e3c.tar.xz nixpkgs-e8d3c74b499ad026e40ca77f54214444f9461e3c.tar.zst nixpkgs-e8d3c74b499ad026e40ca77f54214444f9461e3c.zip | |
util-linux: 2.28.1 -> 2.29
Diffstat (limited to 'pkgs/os-specific/linux/util-linux')
| -rw-r--r-- | pkgs/os-specific/linux/util-linux/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/util-linux/rtcwake-search-PATH-for-shutdown.patch | 14 |
2 files changed, 8 insertions, 12 deletions
diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index f8461113903..f6e26f51cc8 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -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 = [ diff --git a/pkgs/os-specific/linux/util-linux/rtcwake-search-PATH-for-shutdown.patch b/pkgs/os-specific/linux/util-linux/rtcwake-search-PATH-for-shutdown.patch index 3615984ed0c..2dd3fcc4ebe 100644 --- a/pkgs/os-specific/linux/util-linux/rtcwake-search-PATH-for-shutdown.patch +++ b/pkgs/os-specific/linux/util-linux/rtcwake-search-PATH-for-shutdown.patch @@ -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) |