John Wiegley aec35dfa58 Revert "git-imerge: new package" ... This reverts commit 309d0f0c8b.		2015-04-08 14:03:14 -05:00
..
applications	Revert "git-imerge: new package"	2015-04-08 14:03:14 -05:00
build-support	agda: migrate to haskell-ng, update and cleanup	2015-04-06 21:24:33 +02:00
data	Add geolite-legacy 2015-03-26	2015-03-31 16:36:15 +02:00
desktops	Get rid of fetchurlGnome	2015-04-04 22:22:12 -07:00
development	hackage-packages.nix: re-generate from Hackage 2015-04-08T15:53:57+0200	2015-04-08 21:00:03 +02:00
games	instead: update from 2.2.2 to 2.2.3	2015-04-08 16:06:09 +02:00
misc	vim-plugins: update youcompleteme to build with latest llvmPackages	2015-04-07 08:21:58 -07:00
os-specific	kernel: add patch to fix btrfs deadlocks to affected kernels	2015-04-08 20:49:12 +03:00
servers	Merge pull request #7189 from arno01/hardenpostfix	2015-04-06 16:19:37 +02:00
shells
stdenv	Set more precise meta.position for Haskell packages	2015-03-27 16:17:48 +01:00
test
tools	Update fdupes to version 1.51	2015-04-08 17:11:17 +02:00
top-level	emacs-packages: add ibuffer-vc	2015-04-08 09:58:37 -07:00