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
..
arduino	arduino: 1.6.12 -> 1.8.2	2017-06-01 08:44:27 +02:00
beam-modules	elixir: 1.5.0-rc.2 -> 1.5.0	2017-07-25 09:44:49 -04:00
bower-modules/generic
compilers	Merge remote-tracking branch 'upstream/master' into staging-base	2017-07-26 13:46:04 -04:00
coq-modules	coqPackages_8_6.CoLoR: Fix installPhase	2017-07-18 20:22:03 -04:00
dotnet-modules/patches
eclipse/ecj
em-modules/generic
go-modules	go-modules/generic: add missing PATHs to GOPATH when using nix-shell (#26176)	2017-06-01 20:40:21 +02:00
guile-modules
haskell-modules	Merge remote-tracking branch 'upstream/master' into staging-base	2017-07-26 13:46:04 -04:00
idris-modules
interpreters	Merge remote-tracking branch 'upstream/master' into staging-base	2017-07-26 13:46:04 -04:00
java-modules
libraries	Merge remote-tracking branch 'upstream/master' into staging-base	2017-07-26 13:46:04 -04:00
lisp-modules	Fresh SBCL is not compatible with not-fresh iolib	2017-06-28 22:18:25 +02:00
lua-modules
misc	treewide: fix the remaining issues with meta attributes	2017-04-29 04:24:34 +00:00
mobile	adbfs-rootless: limit platform to linux	2017-06-29 08:20:54 +01:00
node-packages	nodePackages.js-beautify: init at 1.6.14	2017-07-14 22:17:12 +01:00
ocaml-modules	ocamlPackages.ocaml-migrate-parsetree: 0.7 -> 1.0	2017-07-26 07:54:15 +00:00
perl-modules
pharo
pure-modules
python-modules	Merge remote-tracking branch 'upstream/master' into staging-base	2017-07-26 13:46:04 -04:00
qtcreator	qtcreator: 4.3.0 -> 4.3.1	2017-07-01 14:47:28 -03:00
r-modules	r-pbdZMQ: fix Darwin install	2017-07-14 14:32:51 +09:00
ruby-modules	bundix: use same ruby as bundler	2017-07-19 16:13:09 +10:00
tools	Merge remote-tracking branch 'upstream/master' into staging-base	2017-07-26 13:46:04 -04:00
web	nodejs: 8.2.0 -> 8.2.1	2017-07-21 12:27:23 +02:00