swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-10-01 09:30:20 +02:00
Code Issues Packages Projects Releases Wiki Activity
nixpkgs/pkgs/applications/science
History
Vladimír Čunát 985d1ac425
Merge branch 'master' into staging-next 
There were several more conflicts from name -> pname+version;
all auto-solved by kdiff3, hopefully OK.

Hydra nixpkgs: ?compare=1538611
2019-08-25 14:57:11 +02:00
..
astronomy treewide: name -> pname 2019-08-17 10:54:38 +00:00
biology Merge branch 'master' into staging-next 2019-08-24 08:55:37 +02:00
chemistry Merge branch 'master' into staging-next 2019-08-24 08:55:37 +02:00
electronics Merge branch 'master' into staging-next 2019-08-24 08:55:37 +02:00
geometry treewide: name -> pname 2019-08-17 10:54:38 +00:00
logic Merge branch 'master' into staging-next 2019-08-24 08:55:37 +02:00
machine-learning treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
math treewide: name -> pname 2019-08-17 10:54:38 +00:00
medicine/aliza aliza: ? -> 1.48.10 2019-05-21 11:31:38 +02:00
misc Merge branch 'master' into staging-next 2019-08-24 08:55:37 +02:00
molecular-dynamics treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
physics treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
programming treewide: name -> pname 2019-08-17 10:54:38 +00:00
robotics Merge branch 'master' into staging-next 2019-08-25 14:57:11 +02:00