Peter Simons f67d5a9a39 Merge branch 'master' into stdenv-updates. ... Conflicts have been resolved in: pkgs/tools/misc/file/default.nix pkgs/top-level/all-packages.nix pkgs/top-level/python-packages.nix		2012-11-21 16:20:36 +01:00
..
buildenv	buildEnv: don't warn about collisions in propagated packages	2012-07-25 23:18:39 -04:00
builder-defs
cabal	Clean up changes to the Cabal builder, which needed to be done in an awkward fashion to avoid a complete re-build of all Haskell packages.	2012-09-11 16:53:48 +02:00
checker
clang-wrapper	Extend compiler wrapper scripts to allow compilation of "/dev/null" input.	2012-07-02 17:15:21 +02:00
dotnetenv
fetchbzr
fetchcvs
fetchdarcs	Remove deprecated option --ephemeral from fetchdarcs	2012-10-22 15:02:33 +02:00
fetchfile
fetchgit	Handle invalid references	2012-06-20 23:28:53 -04:00
fetchgitrevision
fetchhg	fetchhg: removing the nix dependency	2012-08-26 23:16:28 +02:00
fetchmtn
fetchsvn
fetchsvnrevision
fetchsvnssh
fetchurl	mirrors.nix: use GNU mirrors before hitting the master site	2012-08-22 14:28:50 +02:00
gcc-cross-wrapper	Extend compiler wrapper scripts to allow compilation of "/dev/null" input.	2012-07-02 17:15:21 +02:00
gcc-upc-wrapper	Extend compiler wrapper scripts to allow compilation of "/dev/null" input.	2012-07-02 17:15:21 +02:00
gcc-wrapper	stdenv-updates: merge updates from 'master' branch	2012-09-11 16:48:41 +02:00
kernel	* Be less verbose generating initrds.	2012-05-21 20:47:57 +00:00
make-desktopitem
make-startupitem
make-symlinks
mono-dll-fixer
native-darwin-cctools-wrapper
nuke-references
release	use openjdk as default for ant-build.nix	2012-08-25 19:39:49 +02:00
setup-hooks	* Add a setup hook ‘autoreconfHook’ to simplify packages that need to	2012-05-19 02:52:36 +00:00
src-only
substitute
upstream-updater	Support for low-impact updaters; some SF.net boilerplate helper.	2012-11-10 14:38:53 +04:00
vm	Add universe repo for older Ubuntu releases	2012-09-13 17:15:58 -04:00
vsenv
source-from-head-fun.nix	Remove getConfig helper function	2012-09-19 13:56:56 -04:00
trivial-builders.nix