2018-07-21 01:44:44 +01:00
|
|
|
{ lib, stdenv, fetchurl, pkgconfig, zlib, shadow
|
2018-07-23 22:03:39 +01:00
|
|
|
, ncurses ? null, perl ? null, pam, systemd ? null, minimal ? false }:
|
2009-01-06 09:28:45 +00:00
|
|
|
|
2017-06-15 12:05:50 +01:00
|
|
|
let
|
2016-09-05 11:13:31 +01:00
|
|
|
version = lib.concatStringsSep "." ([ majorVersion ]
|
|
|
|
++ lib.optional (patchVersion != "") patchVersion);
|
2018-03-25 22:14:48 +01:00
|
|
|
majorVersion = "2.32";
|
Merge staging-next into master (#44009)
* substitute(): --subst-var was silently coercing to "" if the variable does not exist.
* libffi: simplify using `checkInputs`
* pythonPackges.hypothesis, pythonPackages.pytest: simpify dependency cycle fix
* utillinux: 2.32 -> 2.32.1
https://lkml.org/lkml/2018/7/16/532
* busybox: 1.29.0 -> 1.29.1
* bind: 9.12.1-P2 -> 9.12.2
https://ftp.isc.org/isc/bind9/9.12.2/RELEASE-NOTES-bind-9.12.2.html
* curl: 7.60.0 -> 7.61.0
* gvfs: make tests run, but disable
* ilmbase: disable tests on i686. Spooky!
* mdds: fix tests
* git: disable checks as tests are run in installcheck
* ruby: disable tests
* libcommuni: disable checks as tests are run in installcheck
* librdf: make tests run, but disable
* neon, neon_0_29: make tests run, but disable
* pciutils: 3.6.0 -> 3.6.1
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/pciutils/versions.
* mesa: more include fixes
mostly from void-linux (thanks!)
* npth: 1.5 -> 1.6
minor bump
* boost167: Add lockfree next_prior patch
* stdenv: cleanup darwin bootstrapping
Also gets rid of the full python and some of it's dependencies in the
stdenv build closure.
* Revert "pciutils: use standardized equivalent for canonicalize_file_name"
This reverts commit f8db20fb3ae382eba1ba2b160fe24739f43c0bd7.
Patching should no longer be needed with 3.6.1.
* binutils-wrapper: Try to avoid adding unnecessary -L flags
(cherry picked from commit f3758258b8895508475caf83e92bfb236a27ceb9)
Signed-off-by: Domen Kožar <domen@dev.si>
* libffi: don't check on darwin
libffi usages in stdenv broken darwin. We need to disable doCheck for that case.
* "rm $out/share/icons/hicolor/icon-theme.cache" -> hicolor-icon-theme setup-hook
* python.pkgs.pytest: setupHook to prevent creation of .pytest-cache folder, fixes #40273
When `py.test` was run with a folder as argument, it would not only
search for tests in that folder, but also create a .pytest-cache folder.
Not only is this state we don't want, but it was also causing
collisions.
* parity-ui: fix after merge
* python.pkgs.pytest-flake8: disable test, fix build
* Revert "meson: 0.46.1 -> 0.47.0"
With meson 0.47.0 (or 0.47.1, or git)
things are very wrong re:rpath handling
resulting in at best missing libs but
even corrupt binaries :(.
When we run patchelf it masks the problem
by removing obviously busted paths.
Which is probably why this wasn't noticed immediately.
Unfortunately the binary already
has a long series of paths scribbled
in a space intended for a much smaller string;
in my testing it was something like
lengths were 67 with 300+ written to it.
I think we've reported the relevant issues upstream,
but unfortunately it appears our patches
are what introduces the overwrite/corruption
(by no longer being correct in what they assume)
This doesn't look so bad to fix but it's
not something I can spend more time on
at the moment.
--
Interestingly the overwritten string data
(because it is scribbled past the bounds)
remains in the binary and is why we're suddenly
seeing unexpected references in various builds
-- notably this is is the reason we're
seeing the "extra-utils" breakage
that entirely crippled NixOS on master
(and probably on staging before?).
Fixes #43650.
This reverts commit 305ac4dade5758c58e8ab1666ad0197fd305828d.
(cherry picked from commit 273d68eff8f7b6cd4ebed3718e5078a0f43cb55d)
Signed-off-by: Domen Kožar <domen@dev.si>
2018-07-24 15:04:48 +01:00
|
|
|
patchVersion = "1";
|
2009-01-06 09:28:45 +00:00
|
|
|
|
2017-06-15 12:05:50 +01:00
|
|
|
in stdenv.mkDerivation rec {
|
|
|
|
name = "util-linux-${version}";
|
|
|
|
|
2009-01-06 09:28:45 +00:00
|
|
|
src = fetchurl {
|
2016-08-25 00:02:50 +01:00
|
|
|
url = "mirror://kernel/linux/utils/util-linux/v${majorVersion}/${name}.tar.xz";
|
Merge staging-next into master (#44009)
* substitute(): --subst-var was silently coercing to "" if the variable does not exist.
* libffi: simplify using `checkInputs`
* pythonPackges.hypothesis, pythonPackages.pytest: simpify dependency cycle fix
* utillinux: 2.32 -> 2.32.1
https://lkml.org/lkml/2018/7/16/532
* busybox: 1.29.0 -> 1.29.1
* bind: 9.12.1-P2 -> 9.12.2
https://ftp.isc.org/isc/bind9/9.12.2/RELEASE-NOTES-bind-9.12.2.html
* curl: 7.60.0 -> 7.61.0
* gvfs: make tests run, but disable
* ilmbase: disable tests on i686. Spooky!
* mdds: fix tests
* git: disable checks as tests are run in installcheck
* ruby: disable tests
* libcommuni: disable checks as tests are run in installcheck
* librdf: make tests run, but disable
* neon, neon_0_29: make tests run, but disable
* pciutils: 3.6.0 -> 3.6.1
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/pciutils/versions.
* mesa: more include fixes
mostly from void-linux (thanks!)
* npth: 1.5 -> 1.6
minor bump
* boost167: Add lockfree next_prior patch
* stdenv: cleanup darwin bootstrapping
Also gets rid of the full python and some of it's dependencies in the
stdenv build closure.
* Revert "pciutils: use standardized equivalent for canonicalize_file_name"
This reverts commit f8db20fb3ae382eba1ba2b160fe24739f43c0bd7.
Patching should no longer be needed with 3.6.1.
* binutils-wrapper: Try to avoid adding unnecessary -L flags
(cherry picked from commit f3758258b8895508475caf83e92bfb236a27ceb9)
Signed-off-by: Domen Kožar <domen@dev.si>
* libffi: don't check on darwin
libffi usages in stdenv broken darwin. We need to disable doCheck for that case.
* "rm $out/share/icons/hicolor/icon-theme.cache" -> hicolor-icon-theme setup-hook
* python.pkgs.pytest: setupHook to prevent creation of .pytest-cache folder, fixes #40273
When `py.test` was run with a folder as argument, it would not only
search for tests in that folder, but also create a .pytest-cache folder.
Not only is this state we don't want, but it was also causing
collisions.
* parity-ui: fix after merge
* python.pkgs.pytest-flake8: disable test, fix build
* Revert "meson: 0.46.1 -> 0.47.0"
With meson 0.47.0 (or 0.47.1, or git)
things are very wrong re:rpath handling
resulting in at best missing libs but
even corrupt binaries :(.
When we run patchelf it masks the problem
by removing obviously busted paths.
Which is probably why this wasn't noticed immediately.
Unfortunately the binary already
has a long series of paths scribbled
in a space intended for a much smaller string;
in my testing it was something like
lengths were 67 with 300+ written to it.
I think we've reported the relevant issues upstream,
but unfortunately it appears our patches
are what introduces the overwrite/corruption
(by no longer being correct in what they assume)
This doesn't look so bad to fix but it's
not something I can spend more time on
at the moment.
--
Interestingly the overwritten string data
(because it is scribbled past the bounds)
remains in the binary and is why we're suddenly
seeing unexpected references in various builds
-- notably this is is the reason we're
seeing the "extra-utils" breakage
that entirely crippled NixOS on master
(and probably on staging before?).
Fixes #43650.
This reverts commit 305ac4dade5758c58e8ab1666ad0197fd305828d.
(cherry picked from commit 273d68eff8f7b6cd4ebed3718e5078a0f43cb55d)
Signed-off-by: Domen Kožar <domen@dev.si>
2018-07-24 15:04:48 +01:00
|
|
|
sha256 = "1ck7d8srw5szpjq7v0gpmjahnjs6wgqzm311ki4gazww6xx71rl6";
|
2009-01-06 09:28:45 +00:00
|
|
|
};
|
|
|
|
|
2017-06-15 12:05:50 +01:00
|
|
|
patches = [
|
|
|
|
./rtcwake-search-PATH-for-shutdown.patch
|
|
|
|
];
|
2012-08-27 03:53:19 +01:00
|
|
|
|
2016-09-08 23:34:09 +01:00
|
|
|
outputs = [ "bin" "dev" "out" "man" ];
|
2015-01-01 21:23:22 +00:00
|
|
|
|
2014-12-30 09:53:41 +00:00
|
|
|
postPatch = ''
|
|
|
|
substituteInPlace include/pathnames.h \
|
2017-01-19 14:11:23 +00:00
|
|
|
--replace "/bin/login" "${shadow}/bin/login"
|
2017-04-20 08:38:55 +01:00
|
|
|
substituteInPlace sys-utils/eject.c \
|
|
|
|
--replace "/bin/umount" "$out/bin/umount"
|
2014-12-30 09:53:41 +00:00
|
|
|
'';
|
|
|
|
|
2017-05-30 14:39:27 +01:00
|
|
|
preConfigure = lib.optionalString (systemd != null) ''
|
2017-06-07 14:17:40 +01:00
|
|
|
configureFlags+=" --with-systemd --with-systemdsystemunitdir=$bin/lib/systemd/system/"
|
2017-05-30 14:39:27 +01:00
|
|
|
'';
|
|
|
|
|
2010-11-08 22:40:05 +00:00
|
|
|
# !!! It would be better to obtain the path to the mount helpers
|
|
|
|
# (/sbin/mount.*) through an environment variable, but that's
|
|
|
|
# somewhat risky because we have to consider that mount can setuid
|
|
|
|
# root...
|
2017-06-07 14:17:40 +01:00
|
|
|
configureFlags = [
|
|
|
|
"--enable-write"
|
|
|
|
"--enable-last"
|
|
|
|
"--enable-mesg"
|
|
|
|
"--disable-use-tty-group"
|
|
|
|
"--enable-fs-paths-default=/run/wrappers/bin:/var/run/current-system/sw/bin:/sbin"
|
|
|
|
"--disable-makeinstall-setuid" "--disable-makeinstall-chown"
|
2018-07-23 22:03:39 +01:00
|
|
|
] ++ lib.optional (ncurses == null) "--without-ncurses"
|
|
|
|
++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
|
|
|
|
"scanf_cv_type_modifier=ms"
|
|
|
|
;
|
2009-01-06 09:28:45 +00:00
|
|
|
|
2013-06-12 16:12:30 +01:00
|
|
|
makeFlags = "usrbin_execdir=$(bin)/bin usrsbin_execdir=$(bin)/sbin";
|
|
|
|
|
2017-01-19 13:48:00 +00:00
|
|
|
nativeBuildInputs = [ pkgconfig ];
|
2013-01-28 15:55:12 +00:00
|
|
|
buildInputs =
|
2017-01-19 13:48:00 +00:00
|
|
|
[ zlib pam ]
|
2017-06-07 14:17:40 +01:00
|
|
|
++ lib.filter (p: p != null) [ ncurses systemd perl ];
|
2013-01-28 15:55:12 +00:00
|
|
|
|
2014-04-05 19:41:23 +01:00
|
|
|
postInstall = ''
|
2014-08-30 18:11:52 +01:00
|
|
|
rm "$bin/bin/su" # su should be supplied by the su package (shadow)
|
2016-09-05 11:13:31 +01:00
|
|
|
'' + lib.optionalString minimal ''
|
|
|
|
rm -rf $out/share/{locale,doc,bash-completion}
|
2014-04-05 19:41:23 +01:00
|
|
|
'';
|
|
|
|
|
2013-01-28 15:55:12 +00:00
|
|
|
enableParallelBuilding = true;
|
|
|
|
|
2016-09-05 11:13:31 +01:00
|
|
|
meta = with lib; {
|
2016-04-28 04:19:02 +01:00
|
|
|
homepage = https://www.kernel.org/pub/linux/utils/util-linux/;
|
2013-01-28 15:55:12 +00:00
|
|
|
description = "A set of system utilities for Linux";
|
2014-08-30 18:11:52 +01:00
|
|
|
license = licenses.gpl2; # also contains parts under more permissive licenses
|
2015-04-18 10:00:58 +01:00
|
|
|
platforms = platforms.linux;
|
2015-08-24 23:37:54 +01:00
|
|
|
priority = 6; # lower priority than coreutils ("kill") and shadow ("login" etc.) packages
|
2013-01-28 15:55:12 +00:00
|
|
|
};
|
2009-01-06 09:28:45 +00:00
|
|
|
}
|