1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-26 15:41:40 +00:00
nixpkgs/pkgs/applications/science/chemistry
Vladimír Čunát 2e6bf42a22
Merge branch 'master' into staging-next
There ver very many conflicts, basically all due to
name -> pname+version.  Fortunately, almost everything was auto-resolved
by kdiff3, and for now I just fixed up a couple evaluation problems,
as verified by the tarball job.  There might be some fallback to these
conflicts, but I believe it should be minimal.

Hydra nixpkgs: ?compare=1538299
2019-08-24 08:55:37 +02:00
..
avogadro
gwyddion treewide: name -> pname 2019-08-17 10:54:38 +00:00
jmol jmol: 14.29.46 -> 14.29.49 (#65951) 2019-08-04 22:09:13 +02:00
marvin treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
molden Merge staging-next into staging 2019-08-17 09:39:23 +02:00
octopus octopus: 9.0 -> 9.1 2019-08-19 10:24:44 +02:00
openmolcas treewide: name -> pname 2019-08-17 10:54:38 +00:00
pymol
quantum-espresso treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
siesta treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00