Commit graph

89 commits

Author SHA1 Message Date
Frederik Rietdijk 099c13da1b 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 f8db20fb3a.
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 305ac4dade.

(cherry picked from commit 273d68eff8f7b6cd4ebed3718e5078a0f43cb55d)
Signed-off-by: Domen Kožar <domen@dev.si>
2018-07-24 15:04:48 +01:00
volth 52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
Will Dietz 0a74845ce3 util-linux: 2.31.1 -> 2.32 2018-03-25 18:39:06 -05:00
Shea Levy 085bfcefb9
utillinux: Fix cross-compiling when building with systemd 2018-02-28 15:01:30 -05:00
Tuomas Tynkkynen b1c1190f36 utillinux: 2.31 -> 2.31.1 2018-01-17 12:53:22 +02:00
adisbladis 7b64943e8b
util-linux: 2.30.2 -> 2.31 2017-10-27 22:01:07 +08:00
Tuomas Tynkkynen 7b4db5da18 utillinux: 2.30 -> 2.30.2 2017-10-22 01:40:58 +03:00
Tobias Geerinckx-Rice 46dc5394cd
Update e-mail address for nckx 2017-07-10 20:54:18 +02:00
Franz Pletz 5389caab83
utillinux: 2.29.2 -> 2.30 2017-06-22 00:38:44 +02:00
gnidorah 286c36d737 utillinux: fix "fstrim --all" 2017-06-15 14:05:50 +03:00
Vladimír Čunát 1aac1fe5dd
util-linux: fixup setuid/setgid build problems
... hopefully.  Also refactor some nix code a little.
2017-06-07 15:17:40 +02:00
gnidorah a996fe849f fstrim: Add service 2017-05-30 16:39:27 +03:00
Linus Heckemann 7e34a9c397 util-linux: fix path to umount in eject 2017-04-20 15:52:31 +01:00
Franz Pletz 9d14ea4295
utillinux: 2.29 -> 2.29.2 for CVE-2017-2616
cc #23072
2017-02-25 09:40:36 +01:00
Parnell Springmeyer 4aa0923009
Getting rid of the var indirection and using a bin path instead 2017-01-29 04:11:01 -06:00
Parnell Springmeyer e92b8402b0
Addressing PR feedback 2017-01-28 20:48:03 -08:00
Parnell Springmeyer a26a796d5c
Merging against master - updating smokingpig, rebase was going to be messy 2017-01-26 02:00:04 -08:00
Parnell Springmeyer bae00e8aa8
setcap-wrapper: Merging with upstream master and resolving conflicts 2017-01-25 11:08:05 -08:00
Jörg Thalheim 104a37a9fb
util-linux: improve purity by using login from shadow
replacing shutdown in postPatch phase is not necessary as rtcwake was already
patched to use the search path (the only user of shutdown)
2017-01-19 15:13:38 +01:00
Jörg Thalheim 4b9b1fa945
util-linux: remove seccomp sandbox for CVE-2016-2279
the patch for CVE-2016-2779 was reverted by upstream and was not adopted
by any other downstream distributions. Upstream waits for a better fix
in the kernel:
https://www.kernel.org/pub/linux/utils/util-linux/v2.28/v2.28-ReleaseNotes
2017-01-19 15:10:18 +01:00
Tim Steinbach e8d3c74b49
util-linux: 2.28.1 -> 2.29 2017-01-14 12:57:58 -05:00
Vladimír Čunát 1525568c74 util-linux: fixup patch hash from grandparent merge
And name the file, too.
2016-10-03 23:06:51 +02:00
Jörg Thalheim ba00ba65eb
util-linux: workaround CVE-2016-2779
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-2779
2016-10-03 08:49:56 +02:00
Tuomas Tynkkynen 35ec0e72e3 util-linux: Split 'dev' 2016-09-10 19:05:05 +03:00
Eelco Dolstra 78178d5854 systemd: Separate lib output
This moves libsystemd.so and libudev.so into systemd.lib, and gets rid
of libudev (which just contained a copy of libudev.so and the udev
headers). It thus reduces the closure size of all packages that
(indirectly) depend on libsystemd, of which there are quite a few (for
instance, PulseAudio and dbus). For example, it reduces the closure of
Blender from 430.8 to 400.8 MiB.
2016-09-05 19:17:14 +02:00
Eelco Dolstra 8295089e6a utillinuxMinimal: Make more minimal
This removes locales, bash completion and crap like that. This cuts
6.5 MiB from the NixOS system closure (which unfortunately contains
two copies of util-linux, because of the need to break a dependency
cycle with systemd).
2016-09-05 13:45:59 +02:00
Parnell Springmeyer 98c058a1ee Adapting everything for the merged permissions wrappers work. 2016-09-01 19:21:06 -05:00
Franz Pletz f0f95d03ca utillinux: 2.28 -> 2.28.1 2016-08-25 01:55:42 +02:00
Vladimír Čunát 26e8e3e654 util-linux: use sha256 instead of sha512 again
/cc #15048. I believe the usage of sha512 here at this point
brings very little gain and can be quite painful to some users.
2016-05-14 22:19:28 +02:00
Aneesh Agrawal 279a01d0dc util-linux: 2.27.1 -> 2.28 2016-04-27 23:26:46 -04:00
Vladimír Čunát 09af15654f Merge master into closure-size
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
2016-03-08 09:58:19 +01:00
Kevin Cox eead3bc536 util-linux: create -Minimal and utillinux (full)
Close #12952. Now the full version is used by default,
supporting systemd and curses.
2016-02-25 08:52:05 +01:00
Vladimír Čunát 333d69a5f0 Merge staging into closure-size
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
2015-11-20 14:32:58 +01:00
William A. Kennington III 64e262dd91 util-linux: 2.27 -> 2.27.1 2015-11-07 18:51:07 -08:00
Eelco Dolstra 256438659c util-linux: Update to 2.27
This version is required by systemd 227.

CVE-2015-5224
2015-10-07 20:15:00 +02:00
Vladimír Čunát 5227fb1dd5 Merge commit staging+systemd into closure-size
Many non-conflict problems weren't (fully) resolved in this commit yet.
2015-10-03 13:33:37 +02:00
Eelco Dolstra e4610f2965 buildEnv: Support package priorities like nix-env
This gets rid of a bunch of collision warnings.
2015-08-25 00:40:40 +02:00
William A. Kennington III 7a9e0a5ae4 util-linux: 2.26.1 -> 2.26.2 2015-05-28 02:20:08 -07:00
Vladimír Čunát fc20660945 util-linux, e2fsprogs: fixup multiple outputs
Also revert back to using util-linux as the default libuuid provider,
and make e2fsprogs use shared libs from util-linux.
2015-04-19 15:16:05 +02:00
Vladimír Čunát bf414c9d4f Merge 'staging' into closure-size
- there were many easy merge conflicts
- cc-wrapper needed nontrivial changes

Many other problems might've been created by interaction of the branches,
but stdenv and a few other packages build fine now.
2015-04-18 11:22:20 +02:00
Tobias Geerinckx-Rice 487b200ea1 util-linux: ddate was removed in 2.23 2015-04-16 06:29:11 +02:00
Eric Seidel 6ec373d776 Merge branch master into staging 2015-04-06 18:58:08 -07:00
William A. Kennington III ff21171921 Fix references to current-system/sw/sbin 2015-04-01 13:57:36 -07:00
William A. Kennington III 5e33c85248 util-linux: 2.26 -> 2.26.1 2015-03-26 00:57:59 -07:00
Eelco Dolstra 2ed5c2bd6b Set some meta.platforms
Also fix meta.platform -> meta.platforms in a few places.
2015-03-20 20:04:42 +01:00
Alexander V. Nikolaev bd87d32efc util-linux: update to 2.26 (close #6553)
Patch unshare-fix-map-root-user.patch appiled upstream, and removed.

Trigger mass-rebuild, so PR will be to staging
2015-03-03 11:36:53 +01:00
Nikolay Amiantov dee90b2c25 util-linux: fix unshare -r on linux >=3.19 (close #6130) 2015-02-05 00:22:10 +01:00
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
Tobias Geerinckx-Rice 14eff8f7fa util-linux: fix rtcwake(8) to search $PATH for shutdown(8)
This makes "rtcwake -m off" actually work on NixOS without breaking it
on other platforms.
2015-01-01 22:23:22 +01:00
Vladimír Čunát 88fd7f4527 Re-Revert merge #5505: util-linux: use /run/current-system/sw/bin/*
This reverts commit 6222093eec.
2014-12-30 10:53:41 +01:00