Joachim Schiele a72ff7f4e7 Merge branch 'master' of github.com:NixOS/nixpkgs		2015-12-06 19:43:53 +01:00
..
applications	Merge branch 'master' of github.com:NixOS/nixpkgs	2015-12-06 19:43:53 +01:00
build-support	fetchgit: follow up to 2cf7069b7d	2015-12-06 15:06:02 +01:00
data	ipafont: fix source url.	2015-12-04 17:47:18 +01:00
desktops	gpaste: 3.16.3 → 3.18.2	2015-12-04 20:39:19 +01:00
development	Rename 'emery' maintainer handle to 'ehmry', fixes #11493	2015-12-05 23:06:20 +01:00
games	openttd: 1.5.2 -> 1.5.3	2015-12-06 16:59:55 +01:00
misc	nix-prefetch-scripts: Split into multiple derivations	2015-12-04 14:38:41 +02:00
os-specific	conky: build the docs, fixes #11461	2015-12-05 20:34:57 +01:00
servers	shellinabox: 2.16 -> 2.19	2015-12-06 15:38:07 +13:00
shells	zsh: 5.1.1 -> 5.2	2015-12-05 17:07:41 +01:00
stdenv	Merge recent staging built on Hydra	2015-12-05 11:11:51 +01:00
test
tools	tor: 0.2.6.10 -> 0.2.7.5, fixes #11489	2015-12-06 13:18:45 +01:00
top-level	Merge branch 'master' of github.com:NixOS/nixpkgs	2015-12-06 19:43:53 +01:00