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
..
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: disable split-objects for GHC 7.7 builds to work around broken compiler	2013-04-24 13:21:05 +02: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
fetchgit	Handle invalid references	2012-06-20 23:28:53 -04:00
fetchgitrevision
fetchhg	fetchhg: allow untrusted certs (merge #540)	2013-05-20 21:24:25 +02:00
fetchmtn	Rename buildNativeInputs -> nativeBuildInputs	2012-12-28 19:20:09 +01:00
fetchsvn	fetchsvn: Allow setting the name of the output	2013-05-26 11:58:01 -04:00
fetchsvnrevision
fetchsvnssh
fetchurl	fetchUrl: add curlOpts parameter (merge #535)	2013-05-16 10:45:16 +02:00
gcc-cross-wrapper	Merge branch 'stdenv-updates' into pi-stdenv-updates	2012-12-28 20:14:01 +00:00
gcc-wrapper	gcc-wrapper: avoiding one glibc rebuild, for gcc.crossDrv	2013-04-10 18:26:42 +02:00
kdewrapper	Some kde wrapper improvements.	2013-05-14 18:51:24 +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
mono-dll-fixer
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
substitute	* Set preferLocalBuild on a few more trivial builders.	2012-04-26 15:17:43 +00:00
upstream-updater	Adding jq JSON processor	2013-05-20 11:17:20 +04:00
vm	runInLinuxImage: Fix derivation overriding.	2013-05-15 01:15:16 -04:00
vsenv	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
multiple-outputs.nix	Merge remote-tracking branch 'origin/master' into multiple-outputs	2013-06-09 00:41:27 +02: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