cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2
nixpkgs/pkgs
History
Peter Simons 2d326e5032 Merge remote-tracking branch 'origin/master' into staging. 
Conflicts:
	pkgs/desktops/e18/enlightenment.nix
2014-08-04 16:51:47 +02:00
..
applications Merge remote-tracking branch 'origin/master' into staging. 2014-08-04 16:51:47 +02:00
build-support cabal: cosmetic fix to syntax highlighting in Emacs 2014-08-04 12:39:11 +02:00
data Merge remote-tracking branch 'origin/master' into staging. 2014-08-04 16:51:47 +02:00
desktops Merge remote-tracking branch 'origin/master' into staging. 2014-08-04 16:51:47 +02:00
development Merge remote-tracking branch 'origin/master' into staging. 2014-08-04 16:51:47 +02:00
games Merge remote-tracking branch 'origin/master' into staging. 2014-08-04 16:51:47 +02:00
misc Merge remote-tracking branch 'origin/master' into staging. 2014-08-04 16:51:47 +02:00
os-specific Merge remote-tracking branch 'origin/master' into staging. 2014-08-04 16:51:47 +02:00
servers Merge remote-tracking branch 'origin/master' into staging. 2014-08-04 16:51:47 +02:00
shells Merge remote-tracking branch 'origin/master' into staging. 2014-08-04 16:51:47 +02:00
stdenv Set CONFIG_SHELL to stdenv.shell in the default builder, just like SHELL 2014-07-30 16:44:28 +02:00
test
tools Merge remote-tracking branch 'origin/master' into staging. 2014-08-04 16:51:47 +02:00
top-level Merge remote-tracking branch 'origin/master' into staging. 2014-08-04 16:51:47 +02:00