Peter Simons 9d457ec228 Merge pull request #3282 from aycanirican/jmacro ... Added haskelPackages.jmacro-*		2014-07-16 12:10:51 +02:00
..
applications	Re-generate Haskell expressions with cabal2nix.	2014-07-16 12:10:10 +02:00
build-support	Merge branch 'master' of git://github.com/ip1981/nixpkgs	2014-07-14 10:26:39 -04:00
data
desktops	gtksourceview 3.12: hard code data dirs to nix store path	2014-07-13 16:32:41 +02:00
development	Merge pull request #3282 from aycanirican/jmacro	2014-07-16 12:10:51 +02:00
games	Add "please don't edit" comment at the top of every auto-generated Haskell file.	2014-07-14 13:21:41 +02:00
misc	Merge pull request #3244 from ehmry/xscreensaver	2014-07-15 20:00:41 +02:00
os-specific	wpa_supplicant: update 2.1 -> 2.2, drop a patch	2014-07-16 10:30:38 +02:00
servers	elasticsearch: update to 1.2.2	2014-07-15 16:57:16 +01:00
shells
stdenv
test
tools	bgs: update from 0.5 to 0.6	2014-07-15 19:50:29 +02:00
top-level	Merge pull request #3282 from aycanirican/jmacro	2014-07-16 12:10:51 +02:00