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
..
content
ecm
eukleides	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
fricas
gap	Merge remote-tracking branch 'origin/master' into staging.	2014-08-04 16:51:47 +02:00
ginac
glsurf	fetchbzr, fetchdarcs, fetchhg: use rev attr	2014-06-28 21:06:10 +02:00
jags
mathematica	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
maxima	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
msieve
pari
pssp
R
sage
scilab
singular	Fix broken license references.	2014-07-28 11:43:20 +02:00
sloane	Re-generate Haskell packages with cabal2nix.	2014-07-14 17:33:52 +02:00
speedcrunch
weka	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
wxmaxima	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
yacas	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00