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
..
apulse	apulse: 0.1.5 -> 0.1.6	2015-10-17 20:48:21 -04:00
base16	treewide: Add lots of meta.platforms	2016-08-02 21:42:43 +03:00
beep
cups	cups-filters: 0.14.0 -> 0.15.0	2017-07-25 19:00:06 +02:00
drivers	hplip: introduce nettools dependency (#26439)	2017-06-10 10:04:33 +01:00
emulators	cdemu: 3.0.x -> 3.1.0	2017-07-25 11:56:59 +02:00
foldingathome
freestyle	freestyle: mark as broken	2017-03-30 16:23:33 +02:00
frescobaldi	Remove top-level pyqt4	2016-08-14 12:38:01 +02:00
ghostscript	ghostscript: fix installed library name on darwin	2017-02-16 13:32:39 -05:00
gnash	gnash: init at 0.8.11-2017-03-08	2017-06-19 15:08:57 +02:00
gnuk	treewide: Add lots of meta.platforms	2016-08-02 21:42:43 +03:00
jackaudio	jackaudio: 1.9.10 -> 1.9.11-RC1	2017-06-19 15:11:41 +02:00
lilypond	lilypond-with-fonts: fix quoting	2017-05-26 04:52:11 -05:00
logging/beats	elasticsearch: 5.4.0 -> 5.4.2	2017-06-26 08:47:28 +02:00
long-shebang	long-shebang: 1.1.0 -> 1.2.0	2017-02-23 18:27:12 -05:00
mnemonicode	mnemonicode: fix name	2016-05-19 16:19:18 -04:00
mxt-app	mxt-app:1.26 -> 1.27	2017-03-23 20:15:14 -05:00
my-env	user-local config.nix path fixed in docs	2017-05-27 13:38:15 +03:00
phabricator	treewide: Add lots of platforms to packages with no meta	2016-08-02 21:17:44 +03:00
sailsd	sailsd: fix darwin build	2016-08-16 19:25:45 +00:00
screensavers	alock: 20160713 -> 20170720	2017-07-20 23:30:05 +02:00
seafile-shared	seafile-shared: vala -> vala_0_23	2016-08-21 20:15:14 +03:00
solfege	Python: more evaluation fixups.	2016-10-14 00:03:12 +02:00
sound-of-sorting	sound-of-sorting: 0.6.5 -> 20150721 (#23549)	2017-03-06 15:24:40 +01:00
source-and-tags
talkfilters	talkfilters: disable format hardening	2016-08-03 20:28:05 +00:00
themes	zuki-themes: 3.20.2017-02-17 -> 3.20.2017-04-23	2017-07-15 23:58:35 -03:00
tw-rs	tw-rs: init at 0.1.26	2017-05-06 08:14:49 +01:00
uboot	uboot: Don't use stdenv.cross	2017-06-28 19:43:08 -04:00
urbit	urbit: 2016-06-02 -> 0.4 (#20922)	2016-12-13 15:43:02 +01:00
vim-plugins	vim-plugins: add ale	2017-07-25 19:28:05 +02:00
xosd	xosd: supports darwin	2017-04-23 18:08:41 -05:00
misc.nix	stdenv-setup and misc pkgs: Revert to space-deliminated propagated-* files	2017-07-26 09:07:55 -04:00