John Ericson 93d3561b57 Merge pull request #33393 from bnikolic/boostconfigurepythonfix ... Correct boost configure phase when enablePython is false		2018-01-03 17:12:13 -05:00
..
applications	font-lock-plus: 2017-0222.1755 -> 20180101.25	2018-01-03 19:55:38 +01:00
build-support	lxterminal: patch m4 to respect XML_CATALOG_FILES	2018-01-02 00:58:20 -07:00
common-updater
data	Merge pull request #26805 from obsidiansystems/cross-elegant	2017-12-30 22:58:02 -05:00
desktops	Merge remote-tracking branch 'upstream/master' into HEAD	2018-01-01 15:09:55 +01:00
development	Merge pull request #33393 from bnikolic/boostconfigurepythonfix	2018-01-03 17:12:13 -05:00
games	Merge remote-tracking branch 'upstream/staging' into HEAD	2018-01-02 19:10:45 +01:00
misc	sc-controller: init at 0.4.0.1	2018-01-03 03:27:34 +00:00
os-specific	Merge pull request #33358 from obsidiansystems/cross-haskell-samehash	2018-01-03 11:49:49 +01:00
servers	osrm-backend: Use nativeBuildInputs for compile-time-only deps	2018-01-03 14:52:23 +01:00
shells	Merge pull request #26805 from obsidiansystems/cross-elegant	2017-12-30 22:58:02 -05:00
stdenv	linux bootstrap tools: Use same derivation whether cross compiling or not	2018-01-02 13:52:41 -05:00
test
tools	zbar: Enable building on darwin by disabling video support there	2018-01-03 12:40:33 -08:00
top-level	Merge pull request #33350 from dhess/ghc821Binary	2018-01-03 15:54:39 -05:00