nixpkgs/pkgs/build-support
Shea Levy fde3526e7d Merge branch 'master' into stdenv-updates
Conflict in kerberos, which was updated both in master and in
stdenv-updates. Kept the stdenv-updates version, except pulled in the
enableParallelBuilding change from master.

Signed-off-by: Shea Levy <shea@shealevy.com>

Conflicts:
	pkgs/development/libraries/kerberos/krb5.nix
2013-05-04 18:28:48 -04: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 Merge branch 'master' into stdenv-updates 2013-05-04 18:28:48 -04: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 * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
fetchbzr - fetchbzr and nix-prefetch-bzr now only export, instead of cloning 2013-03-31 19:16:18 -07:00
fetchcvs * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
fetchdarcs Remove deprecated option --ephemeral from fetchdarcs 2012-10-22 15:02:33 +02:00
fetchfile Fixed error in build-support/fetchfile 2011-08-09 12:28:49 +00:00
fetchgit Handle invalid references 2012-06-20 23:28:53 -04:00
fetchgitrevision Remove semicolon causing evaluation error. 2011-01-02 23:52:39 +00:00
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 fetchsvn: Add ignoreExternals attribute. 2013-03-27 00:26:55 +01:00
fetchsvnrevision Live builds support: initially for git and svn. taglib_live is packaged as an example. 2011-01-02 23:23:59 +00:00
fetchsvnssh undo 2008-07-06 15:46:10 +00:00
fetchurl mirrors.nix: add http://backpan.perl.org/ for old CPAN modules 2013-05-03 10:59:36 +02:00
gcc-cross-wrapper Merge branch 'stdenv-updates' into pi-stdenv-updates 2012-12-28 20:14:01 +00:00
gcc-wrapper Merge changes from branch 'master' into stdenv-updates. 2013-04-19 11:48:11 +02:00
kernel Merge branch 'master' into stdenv-updates 2013-02-21 11:13:30 -05:00
make-desktopitem * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
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 * "." -> "source". 2005-12-05 14:11:09 +00:00
mono-dll-fixer * Remove references to substitute.sh. 2006-12-27 18:17:53 +00:00
native-darwin-cctools-wrapper Darwin: Add mig', lipo', etc. to `stdenvNative'. 2012-04-23 15:47:31 +00:00
nuke-references * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
release pkgs/build-support/release/nix-build.nix: unconfuse syntax highlighting 2013-04-18 12:18:39 +02:00
setup-hooks Rename buildNativeInputs -> nativeBuildInputs 2012-12-28 19:20:09 +01:00
src-only A helper to get the source some package is built from. 2008-10-01 15:57:22 +00:00
substitute * Set preferLocalBuild on a few more trivial builders. 2012-04-26 15:17:43 +00:00
upstream-updater Adding ZPAQ archiver 2013-03-09 16:33:14 +04:00
vm Add Ubuntu 13.04 2013-05-03 14:01:32 +02:00
vsenv * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
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