Shea Levy acd4299e75 Merge branch 'master' into stdenv-updates ... Conflicts: pkgs/applications/networking/browsers/chromium/default.nix pkgs/top-level/all-packages.nix Merge conflicts seemed trivial, but a look from viric and aszlig would be nice.		2013-02-21 11:13:30 -05:00
..
buildenv	buildEnv: don't warn about collisions in propagated packages	2012-07-25 23:18:39 -04:00
builder-defs	Remove unnecessary parentheses around if conditions	2012-12-28 19:54:15 +01:00
cabal	pkgs/build-support/cabal: add 'enableSplitObjs' field to enable/disable object splitting	2013-02-18 12:32:15 +01:00
checker	Remove unnecessary parentheses around if conditions	2012-12-28 19:54:15 +01:00
clang-wrapper	Rename hostDrv -> crossDrv, buildDrv -> nativeDrv	2012-12-28 19:08:19 +01: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	Remove unnecessary parentheses around if conditions	2012-12-28 19:54:15 +01:00
fetchmtn	Rename buildNativeInputs -> nativeBuildInputs	2012-12-28 19:20:09 +01:00
fetchsvn
fetchsvnrevision
fetchsvnssh
fetchurl	Merge remote-tracking branch 'origin/master' into stdenv-updates	2013-02-15 13:36:34 +01:00
gcc-cross-wrapper	Merge branch 'stdenv-updates' into pi-stdenv-updates	2012-12-28 20:14:01 +00:00
gcc-wrapper	Merge branch 'stdenv-updates' into pi-stdenv-updates	2012-12-29 14:18:43 +00:00
kernel	Merge branch 'master' into stdenv-updates	2013-02-21 11:13:30 -05:00
make-desktopitem
make-startupitem	Added an optional parameter to "make-startupitem" to provide a prefix to the ".desktop" file.	2012-02-29 12:50:17 +00:00
make-symlinks
mono-dll-fixer
native-darwin-cctools-wrapper	Darwin: Add mig', lipo', etc. to `stdenvNative'.	2012-04-23 15:47:31 +00:00
nuke-references
release	releaseTools.nixBuild: Put hydra-build-products in each output	2013-02-18 13:57:02 +01:00
setup-hooks	Rename buildNativeInputs -> nativeBuildInputs	2012-12-28 19:20:09 +01:00
src-only
substitute	* Set preferLocalBuild on a few more trivial builders.	2012-04-26 15:17:43 +00:00
upstream-updater	More specific tracing of a relatively tricky replace once; account for default.nix being present everywhere.	2012-12-22 14:14:48 +04:00
vm	VM builds: Use BusyBox	2012-12-18 16:57:11 +01:00
vsenv
replace-dependency.nix	replace-dependency: Eelco has ruled, lowerCamelCase > dash-case :(	2013-01-13 11:15:01 -05:00
source-from-head-fun.nix	Remove getConfig helper function	2012-09-19 13:56:56 -04:00
trivial-builders.nix	Rename buildNativeInputs -> nativeBuildInputs	2012-12-28 19:20:09 +01:00