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
..
altcoins	dapp: v0.5.2 -> v0.5.3	2017-07-18 11:10:26 +03:00
audio	mpg123: update to version 1.25.4	2017-07-24 13:39:24 +02:00
backup	crashplan: 4.8.2 -> 4.8.3	2017-06-24 16:19:30 +10:00
display-managers	qt58: determine plugin and import paths from PATH	2017-06-18 08:44:47 -05:00
editors	Merge remote-tracking branch 'upstream/master' into HEAD	2017-07-23 11:23:43 +02:00
gis	qgis: 2.18.4 -> 2.18.10	2017-07-15 19:32:38 +02:00
graphics	pythonmagick: note to whoever maintains this that expression should be moved	2017-07-19 14:36:05 +02:00
inferno
kde	kde applications : fix builds by adding missing dependencies	2017-06-29 05:01:46 +00:00
misc	gpsbabel: remove failing tests for mac and aarch64	2017-07-25 18:37:21 +02:00
networking	mumble_git: 2017-04-16 -> 2017-05-25	2017-07-26 18:36:52 +03:00
office	paperwork: 1.0.6.1 -> 1.2	2017-07-15 15:10:14 +02:00
science	cryptominisat: use new xxd package instead of vim	2017-07-24 09:37:58 +08:00
search	recoll: 1.21.3 -> 1.23.1	2017-03-22 17:14:30 -05:00
taxes
version-management	gitkraken: 2.6.0 -> 2.7.0	2017-07-22 17:29:35 -04:00
video	mpv: 0.25.0 -> 0.26.0	2017-07-23 11:00:00 +02:00
virtualization	Merge remote-tracking branch 'upstream/master' into staging-base	2017-07-26 13:46:04 -04:00
window-managers	jwm: 1594 -> 1600	2017-07-23 13:30:21 -03:00