Greg Pfeil 38deb53542 Merge branch 'master' into add/flootty		2018-01-12 15:08:44 -07:00
..
applications	qgroundcontrol: 2.9.4 -> 3.2.7, unbreak build	2018-01-13 04:03:38 +08:00
build-support	callCabal2nix: Fix calling with a path in the store.	2018-01-11 10:17:56 -05:00
common-updater	update-source-version: Name part of name can contain dashes	2017-12-26 20:02:01 +02:00
data	treewide: Fix deps in a few other fixed output derivations	2018-01-10 11:18:44 -05:00
desktops	qlipper: 5.0.0 -> 5.1.1	2018-01-12 10:24:36 -02:00
development	Merge branch 'master' into add/flootty	2018-01-12 15:08:44 -07:00
games	qgo: unstable-2016-06-23 -> unstable-2017-12-18	2018-01-13 04:03:31 +08:00
misc	materia-theme: 20171213 -> 20180110	2018-01-11 21:36:02 +01:00
os-specific	Merge pull request #25713 from jbaum98/darwin-trash	2018-01-12 09:34:03 +01:00
servers	telegraf: 1.5.0 -> 1.5.1	2018-01-12 19:40:56 +00:00
shells	nix-bash-completions: 0.6.1 -> 0.6.2	2018-01-10 08:40:57 +01:00
stdenv	Merge pull request #33681 from obsidiansystems/fixed-output-deps	2018-01-10 14:28:10 -05:00
test	sierra-shared-test: fix build	2018-01-05 23:20:55 +01:00
tools	nixUnstable: pre5810_5d5b931f -> pre5849_74f75c85	2018-01-12 14:19:24 -05:00
top-level	Merge branch 'master' into add/flootty	2018-01-12 15:08:44 -07:00