Commit graph

106 commits

Author SHA1 Message Date
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
Vladimír Čunát 6222093eec Revert "merge #5505: use /run/current-system/sw/bin/*"
I didn't realize it causes a nontrivial rebuild (through systemd).
I'll re-push to staging.

This reverts commit 8cf4ef7ab7.
2014-12-30 10:51:36 +01:00
Tobias Geerinckx-Rice 8cf4ef7ab7 merge #5505: use /run/current-system/sw/bin/*
A working /sbin/shutdown (usually provided by systemd) is required by
"rtcwake -m off". Creating a circular dependency on systemd for this
just isn't worth the trouble, so take the straightforward way out.

One could easily make the argument that rtcwake wants to shut down the
*currently running system*, and that the correct API for that *is* in
fact /run/current-system. And it makes a very tempting sort of sense.

@vcunat moved to postPatch and added #FIXME.
2014-12-30 10:31:20 +01:00
Eelco Dolstra e7ad8af28e util-linux: Update to 2.25.2 2014-12-17 13:47:27 +01:00
Shea Levy e2331b52cd util-linux: bump 2014-09-16 11:53:20 -04:00
Vladimír Čunát abbc93f783 WIP: getting better 2014-08-30 19:11:52 +02:00
Vladimír Čunát 96cec2a7bd Merge 'staging' into multiple-outputs
Conflicts:
	pkgs/applications/audio/flac/default.nix
	pkgs/build-support/gcc-wrapper/builder.sh
	pkgs/development/libraries/apr-util/default.nix
	pkgs/development/libraries/apr/default.nix
	pkgs/development/libraries/atk/default.nix
	pkgs/development/libraries/freetype/default.nix
	pkgs/development/libraries/gdk-pixbuf/default.nix
	pkgs/development/libraries/glib/default.nix
	pkgs/development/libraries/glibc/2.17/builder.sh
	pkgs/development/libraries/glibc/2.17/locales.nix
	pkgs/development/libraries/libjpeg/default.nix
	pkgs/development/libraries/libogg/default.nix
	pkgs/development/libraries/libsamplerate/default.nix
	pkgs/development/libraries/libtiff/default.nix
	pkgs/development/libraries/libvorbis/default.nix
	pkgs/development/libraries/mesa/default.nix
	pkgs/development/libraries/pango/default.nix
	pkgs/development/web/nodejs/default.nix
	pkgs/os-specific/linux/pam/default.nix
	pkgs/os-specific/linux/systemd/default.nix
	pkgs/stdenv/generic/setup.sh
	pkgs/stdenv/linux/default.nix
	pkgs/top-level/all-packages.nix
	pkgs/top-level/release-small.nix
2014-08-23 16:04:53 +02:00
Eelco Dolstra 69deced59b util-linux: Update to 2.24.2 2014-06-24 14:01:54 +02:00
Eelco Dolstra 7438b95437 util-linux: Update to 2.24.1 2014-04-16 16:31:58 +02:00
William A. Kennington III 28ab3acb58 su: Make the su package a provider of only the su binary
Additionally, provide su with the base system and remove su from the
util-linux package as it is now provided by shadow.
2014-04-05 16:01:52 -05:00
William A. Kennington III f6503e5e35 Upgrade util-linux from 2.22 -> 2.24 2013-11-28 00:52:13 -06:00
Eelco Dolstra cc8db57097 util-linux: Install all binaries in $bin 2013-06-12 17:12:30 +02:00
Eelco Dolstra 99b88cfb53 Merge remote-tracking branch 'origin/master' into multiple-outputs
Conflicts:
	pkgs/development/libraries/acl/default.nix
	pkgs/development/libraries/atk/2.6.x.nix
	pkgs/development/libraries/attr/default.nix
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/freetype/default.nix
	pkgs/development/libraries/glib/2.34.x.nix
	pkgs/development/libraries/gtk+/2.24.x.nix
	pkgs/development/libraries/libtiff/default.nix
	pkgs/development/libraries/openssl/default.nix
	pkgs/development/libraries/pango/1.30.x.nix
	pkgs/misc/cups/default.nix
	pkgs/os-specific/linux/util-linux/default.nix
	pkgs/servers/x11/xorg/builder.sh
	pkgs/servers/x11/xorg/default.nix
	pkgs/top-level/all-packages.nix
2013-06-09 00:41:27 +02:00
Eelco Dolstra ce83f79a65 util-linux: Update to 2.22.2
This update is essential because coreutils no longer provides ‘su’.
Also enable ‘last’ and some other commands so that we can get rid of
sysvtools.
2013-01-28 17:19:03 +01:00
Lluís Batlle i Rossell b58780c43d Merge remote-tracking branch 'eelco/master' into stdenv-updates
Conflicts:
	pkgs/development/compilers/gcc/4.7/default.nix

Trivial solution.
2012-12-28 23:28:16 +01:00
Lluís Batlle i Rossell 5a475f7250 utillinux: fixing mount/umount, for our case of /etc/mtab symlinking to /proc/mounts
In systemd, without this patch, 'mount' for 'user' fstab devices works, but
umount does not; it says to require root.
All gets normal with this patch.
2012-12-16 15:43:47 +01:00
Eelco Dolstra 61129e1ee9 Split some GTK/X11-related packages
The closure of the Pan newsreader is now down from 344 MiB to 195 MiB.
2012-08-26 22:53:19 -04:00
Eelco Dolstra fd0a9f6bae * util-linux updated to 2.21.2.
svn path=/nixpkgs/branches/stdenv-updates/; revision=34280
2012-05-29 17:11:55 +00:00
Lluís Batlle i Rossell eddf9e24c7 Allowing mount to call /var/setuid-wrappers in preference. mount.cifs may require this,
as it does not support the 'user' option in fstab.


svn path=/nixpkgs/trunk/; revision=32975
2012-03-10 19:02:07 +00:00
Ludovic Courtès 330a4e656a util-linux: Use Linux-specific header on Linux only.
svn path=/nixpkgs/trunk/; revision=32867
2012-03-07 22:15:42 +00:00
Ludovic Courtès 3666a7c149 util-linux: Allow cross-compilation.
svn path=/nixpkgs/trunk/; revision=32851
2012-03-07 13:45:06 +00:00
Eelco Dolstra da3eea5c9e * util-linux 2.20.1.
svn path=/nixpkgs/branches/stdenv-updates/; revision=30860
2011-12-12 19:56:17 +00:00
Eelco Dolstra acca11b49c * Got rid of the old util-linux; use util-linux-ng instead.
svn path=/nixpkgs/trunk/; revision=14799
2009-03-31 09:26:47 +00:00
Eelco Dolstra 0a884b25f9 * util-linux: added an option to build just mount/umount, and an
option to set the path to the mount helpers programs
  (mount.<fstype>) to something other than /sbin.  Needed in NixOS to
  get the mount command to work for NTFS-3G, CIFS, etc.

svn path=/nixpkgs/trunk/; revision=12514
2008-08-06 15:27:50 +00:00
Eelco Dolstra 874804eb04 * Security fix for CVE-2007-5191.
svn path=/nixpkgs/trunk/; revision=12417
2008-07-24 13:48:23 +00:00
Michael Raskin 58610e801a Added curses variant of util-linux. cfdisk is a fine tool..
svn path=/nixpkgs/trunk/; revision=9870
2007-12-06 19:36:43 +00:00
Eelco Dolstra d39fd2a578 * Rewrite all the kernel.org URLs to mirror://kernel/.
svn path=/nixpkgs/trunk/; revision=9202
2007-08-27 13:59:40 +00:00
Eelco Dolstra cd32e67b2b * Remove makeFlags/installFlags redundancy.
svn path=/nixpkgs/trunk/; revision=7501
2006-12-27 18:26:23 +00:00
Eelco Dolstra 32cb4c8a54 * Hack to get static util-linux builds to work.
svn path=/nixpkgs/trunk/; revision=6917
2006-10-31 16:21:24 +00:00
Eelco Dolstra 39b95dd1f9 * util-linux 2.13pre7.
svn path=/nixpkgs/trunk/; revision=6909
2006-10-30 15:14:15 +00:00
Eelco Dolstra 3389f4bc36 * Copy lots of files to nix.cs.uu.nl.
svn path=/nixpkgs/trunk/; revision=4623
2006-01-30 16:04:03 +00:00
Armijn Hemel 6e80370dfe update util-linux to 2.12r
svn path=/nixpkgs/trunk/; revision=4424
2005-12-23 22:59:33 +00:00
Eelco Dolstra 454707da23 * catamaran.labs.cs.uu.nl -> nix.cs.uu.nl.
svn path=/nixpkgs/trunk/; revision=3660
2005-08-22 08:39:27 +00:00
Eelco Dolstra f6e91bc9c9 * Merge r2396.
svn path=/nixpkgs/trunk/; revision=2397
2005-03-14 09:22:26 +00:00
Eelco Dolstra 78ef3030fe * Util-linux updated to 2.12q.
svn path=/nixpkgs/trunk/; revision=2369
2005-03-10 15:32:24 +00:00
Eelco Dolstra e42507d182 * Move tarballs to catamaran so that we are no longer dependent on a
gazillion different servers.  Resurrected some 25 missing files.

svn path=/nixpkgs/trunk/; revision=2237
2005-02-15 14:44:19 +00:00
Eelco Dolstra dde13d1ada * Remove patch arguments.
svn path=/nixpkgs/trunk/; revision=1462
2004-09-19 10:34:01 +00:00
Eelco Dolstra 12ae5363ea * Remove trivial builders.
* Make builders unexecutable by removing the hash-bang line and
  execute permission.
* Convert calls to `derivation' to `mkDerivation'.
* Remove `system' and `stdenv' attributes from calls to
  `mkDerivation'.  These transformations were all done automatically,
  so it is quite possible I broke stuff.
* Put the `mkDerivation' function in stdenv/generic.

svn path=/nixpkgs/trunk/; revision=874
2004-03-29 17:23:01 +00:00
Eelco Dolstra a33753a973 * Added util-linux (for mount etc.).
svn path=/nixpkgs/trunk/; revision=786
2004-02-16 10:40:45 +00:00