Vladimír Čunát dbae4f109f Merge branch 'master' into staging ... Conflicts (relatively simple): pkgs/applications/audio/spotify/default.nix pkgs/build-support/cc-wrapper/default.nix pkgs/development/compilers/cryptol/1.8.x.nix		2015-01-31 19:34:57 +01:00
..
astronomy	stellarium: update from 0.12.4 to 0.13.2	2015-01-27 14:04:54 +01:00
biology	Fix many package descriptions	2014-08-24 22:31:37 +02:00
chemistry/avogadro
electronics	rename all occurrences of stdenv.cc.gcc to stdenv.cc.cc	2015-01-14 20:27:55 -08:00
geometry	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
logic	Merge branch 'master' into staging	2015-01-31 19:34:57 +01:00
math	Merge branch 'master' into staging	2015-01-31 19:34:57 +01:00
misc	unmaintain a bunch of packages	2015-01-13 22:33:49 +01:00
molecular-dynamics/gromacs	Fix many package descriptions	2014-08-24 22:31:37 +02:00
spyder	Fix many package descriptions	2014-08-24 22:31:37 +02:00