public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge #15048: util-linux: 2.27.1 -> 2.28

Browse Source
This commit is contained in:
Vladimír Čunát 2016-05-07 11:16:57 +02:00
commit 717670720f
2 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/os-specific/linux/util-linux/default.nix
View File

@ -1,11 +1,12 @@
{ stdenv, fetchurl, pkgconfig, zlib, ncurses ? null, perl ? null, pam, systemd }: { stdenv, fetchurl, pkgconfig, zlib, ncurses ? null, perl ? null, pam, systemd }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "util-linux-2.27.1"; name = "util-linux-${version}";
version = "2.28";
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/utils/util-linux/v2.27/${name}.tar.xz"; url = "mirror://kernel/linux/utils/util-linux/v${version}/${name}.tar.xz";
sha256 = "1452hz5zx56a3mad8yrg5wb0vy5zi19mpjp6zx1yr6p9xp6qz08a"; sha512 = "251zv6lk6b8ip38w2h0w2rpnly38nzh96945mbpssvwjv8fgr5bnhj3207aingyybik79761zngk981wl0rblq5f7l5v655znyi3yd1";
}; };
patches = [ patches = [
@ -63,7 +64,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = http://www.kernel.org/pub/linux/utils/util-linux/; homepage = https://www.kernel.org/pub/linux/utils/util-linux/;
description = "A set of system utilities for Linux"; description = "A set of system utilities for Linux";
license = licenses.gpl2; # also contains parts under more permissive licenses license = licenses.gpl2; # also contains parts under more permissive licenses
platforms = platforms.linux; platforms = platforms.linux;

29
pkgs/os-specific/linux/util-linux/rtcwake-search-PATH-for-shutdown.patch
View File

@ -3,23 +3,24 @@ which isn't valid on NixOS (and a compatibility link on most other modern
distros anyway). distros anyway).
-- nckx <tobias.geerinckx.rice@gmail.com> -- nckx <tobias.geerinckx.rice@gmail.com>
diff --git a/include/pathnames.h b/include/pathnames.h
diff -ru util-linux-2.27-orig/include/pathnames.h util-linux-2.27/include/pathnames.h index de6a13c..0c1aeb9 100644
--- util-linux-2.27-orig/include/pathnames.h 2015-06-29 13:13:14.669847478 +0200 --- a/include/pathnames.h
+++ util-linux-2.27/include/pathnames.h 2015-10-07 20:09:17.401022602 +0200 +++ b/include/pathnames.h
@@ -54,7 +54,7 @@ @@ -50,7 +50,7 @@
#define _PATH_INITTAB "/etc/inittab" #define _PATH_VAR_NOLOGIN "/var/run/nologin"
#define _PATH_RC "/etc/rc"
#define _PATH_REBOOT "/sbin/reboot" #define _PATH_LOGIN "/bin/login"
-#define _PATH_SHUTDOWN "/sbin/shutdown" -#define _PATH_SHUTDOWN "/sbin/shutdown"
+#define _PATH_SHUTDOWN "shutdown" +#define _PATH_SHUTDOWN "shutdown"
#define _PATH_SINGLE "/etc/singleboot"
#define _PATH_SHUTDOWN_CONF "/etc/shutdown.conf"
diff -ru util-linux-2.27-orig/sys-utils/rtcwake.c util-linux-2.27/sys-utils/rtcwake.c #define _PATH_TERMCOLORS_DIRNAME "terminal-colors.d"
--- util-linux-2.27-orig/sys-utils/rtcwake.c 2015-08-05 11:32:44.453821232 +0200 #define _PATH_TERMCOLORS_DIR "/etc/" _PATH_TERMCOLORS_DIRNAME
+++ util-linux-2.27/sys-utils/rtcwake.c 2015-10-07 20:09:37.834032536 +0200 diff --git a/sys-utils/rtcwake.c b/sys-utils/rtcwake.c
@@ -576,7 +576,7 @@ index 7c748dc..9a99a7c 100644
--- a/sys-utils/rtcwake.c
+++ b/sys-utils/rtcwake.c
@@ -575,7 +575,7 @@ int main(int argc, char **argv)
arg[i++] = "now"; arg[i++] = "now";
arg[i] = NULL; arg[i] = NULL;
if (!ctl.dryrun) { if (!ctl.dryrun) {