Yury G. Kudryashov 5b132f6e96 svn merge ^/nixpkgs/trunk ... Conflicts: cups, all-packages.nix (gcc45_debug) svn path=/nixpkgs/branches/stdenv-updates/; revision=31863		2012-01-26 15:27:03 +00:00
..
admin	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
archivers	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
backup	Updating btar to latest release.	2011-12-10 22:00:56 +00:00
bluetooth
cd-dvd	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
compression	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
filesystems	* Fix the squashfs build (it links against xz, so xz has	2012-01-20 17:43:50 +00:00
graphics	* Cleanup: remove obsolete references to ‘xz’, which is in stdenv now.	2012-01-18 20:53:01 +00:00
misc	* Sync with the trunk.	2012-01-20 15:29:04 +00:00
networking	* Curl is used during the bootstrap, so don't rely on pattern	2012-01-23 13:06:01 +00:00
package-management	svn merge ^/nixpkgs/trunk	2012-01-26 15:27:03 +00:00
pydb
security	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
system	svn merge ^/nixpkgs/trunk, one simple conflict in jruby	2012-01-19 21:31:51 +00:00
text	svn merge ^/nixpkgs/trunk, one simple conflict in jruby	2012-01-19 21:31:51 +00:00
typesetting	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
video
virtualization	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
X11	svn merge ^/nixpkgs/trunk, one simple conflict in jruby	2012-01-19 21:31:51 +00:00