John Ericson 9be40841ea Merge remote-tracking branch 'upstream/master' into staging-base ... Conflicts: pkgs/build-support/cc-wrapper/default.nix pkgs/build-support/gcc-wrapper-old/builder.sh pkgs/build-support/trivial-builders.nix pkgs/desktops/kde-4.14/kde-package/default.nix pkgs/development/compilers/openjdk-darwin/8.nix pkgs/development/compilers/openjdk-darwin/default.nix pkgs/development/compilers/openjdk/7.nix pkgs/development/compilers/openjdk/8.nix pkgs/development/compilers/oraclejdk/jdk-linux-base.nix pkgs/development/compilers/zulu/default.nix pkgs/development/haskell-modules/generic-builder.nix pkgs/misc/misc.nix pkgs/stdenv/generic/builder.sh pkgs/stdenv/generic/setup.sh		2017-07-26 13:46:04 -04:00
..
aliases.nix	wine: reorganize packages	2017-06-04 00:57:45 +03:00
all-packages.nix	Merge remote-tracking branch 'upstream/master' into staging-base	2017-07-26 13:46:04 -04:00
beam-packages.nix	elixir: 1.5.0-rc.2 -> 1.5.0	2017-07-25 09:44:49 -04:00
default.nix
dotnet-packages.nix
emacs-packages.nix
emscripten-packages.nix
haskell-packages.nix	ghc821: init at 8.2.1-rc2 (a.k.a., 8.2.0.20170507)	2017-06-15 19:59:38 +02:00
haxe-packages.nix	haxe: fix hxcpp, introduce haxePackage with hxjava and hxcs	2017-07-03 20:06:23 +00:00
impure.nix
java-packages.nix
lua-packages.nix	lrexlib: 2.7.2 (broken) -> 2.8.0	2017-07-08 23:09:32 +01:00
make-tarball.nix
metrics.nix
node-packages-generated.nix
node-packages.json
node-packages.nix
ocaml-packages.nix	ocaml: init at 4.05.0	2017-07-13 17:58:24 +00:00
perl-packages.nix	perl-Unicode-CaseFold: 1.00 -> 1.01	2017-07-25 18:37:21 +02:00
php-packages.nix	phpPackages.phpcbf: init at 2.6.0	2017-07-14 00:26:37 +02:00
pure-packages.nix
python-packages.nix	Merge remote-tracking branch 'upstream/master' into staging-base	2017-07-26 13:46:04 -04:00
release-cross.nix
release-lib.nix
release-python.nix
release-small.nix
release.nix
rust-packages.nix	rustRegistry: 2017-06-27 -> 2017-07-23	2017-07-23 23:12:37 +02:00
splice.nix
stage.nix	top-level: {build,host,target}Platform are defined in the stdenv instead	2017-07-07 12:55:02 -04:00