6 commits

Author	SHA1	Message	Date
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
Peter Simons	d0ca8c237e	Fix broken license references.	2014-07-28 11:43:20 +02:00
Mateusz Kowalczyk	7a45996233	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
Eelco Dolstra	40f7b0f9df	Another attempt to eradicate ensureDir ... See c556a6ea46.	2014-06-30 14:56:10 +02:00
Michael Raskin	6bc87a1ac8	Add packages to GAP ... svn path=/nixpkgs/trunk/; revision=33601	2012-04-05 04:46:11 +00:00
Michael Raskin	7c0d7abdd7	Adding GAP discrete algebra system ... svn path=/nixpkgs/trunk/; revision=32908	2012-03-08 18:23:47 +00:00