Robin Gloster 9265012de6 mariadb: fix lib cycle and hash		2017-12-29 02:18:35 +01:00
..
applications	Merge branch 'alt-stdenv' into staging	2017-12-27 17:20:32 -05:00
build-support	Merge pull request #32916 from jbedo/singularity-2.4	2017-12-25 13:30:42 +00:00
common-updater	update-source-version: Name part of name can contain dashes	2017-12-26 20:02:01 +02:00
data	Merge pull request #32861 from romildo/new.ibm-plex	2017-12-24 13:36:08 +00:00
desktops	pluma: 1.18.2 -> 1.18.3	2017-12-24 00:05:56 -02:00
development	python.pkgs.jinja2: enable tests	2017-12-26 20:39:26 +01:00
games	Merge pull request #32759 from bflyblue/factorio-0.15.40	2017-12-23 23:54:15 +00:00
misc	dolphinEmuMaster: 20170902 -> 20171218	2017-12-23 22:31:15 -08:00
os-specific	Merge branch 'alt-stdenv' into staging	2017-12-27 17:20:32 -05:00
servers	mariadb: fix lib cycle and hash	2017-12-29 02:18:35 +01:00
shells	fish: 2.7.0 -> 2.7.1	2017-12-25 14:56:25 -06:00
stdenv	Merge remote-tracking branch 'upstream/master' into staging	2017-12-26 21:10:12 +02:00
test	Add clang multilib variants (x64_64-only, 64/32bit), basic multilib tests	2017-12-05 07:17:14 -06:00
tools	coreutils: 8.28 -> 8.29	2017-12-29 02:18:23 +01:00
top-level	Merge branch 'alt-stdenv' into staging	2017-12-27 17:20:32 -05:00