3
0
Fork 0
forked from mirrors/nixpkgs
nixpkgs/pkgs/applications/science
Dmitry Kalinkin c455adcc42
Merge branch 'master' into staging-next
Fixes eval on darwin after #69072

Resolved conflict in pkgs/tools/security/thc-hydra/default.nix
Basically had to revert a1c0e10564 which
adapts #69210 to master that doesn't yet have
329a88efa7

Tested using maintainers/scripts/eval-release.sh before and after to see
that the fix works
2019-09-25 19:21:46 -04:00
..
astronomy Merge pull request #65726 from smaret/gildas-20190801_a 2019-09-06 11:15:45 -04:00
biology maintainer: mimadrid: update github username and personal data 2019-09-14 12:15:46 +02:00
chemistry treewide: remove redundant quotes 2019-09-08 23:38:31 +00:00
electronics Re-Revert "Merge branch 'staging-next'" 2019-09-22 09:38:09 +02:00
geometry treewide: name -> pname 2019-08-17 10:54:38 +00:00
logic tamarin-prover: mark as broken because upstream is broken 2019-09-24 15:25:43 +02:00
machine-learning treewide: name -> pname (#67513) 2019-08-31 07:41:22 -04:00
math Merge branch 'master' into staging-next 2019-09-24 08:14:34 +02:00
medicine/aliza
misc Merge pull request #68773 from mimame/update/cytoscape-3.7.2 2019-09-15 09:43:11 -04:00
molecular-dynamics treewide: remove redundant quotes 2019-09-08 23:38:31 +00:00
physics treewide: remove redundant rec 2019-08-28 11:07:32 +00:00
programming treewide: use libtinfo.so.5 where needed 2019-09-18 13:57:20 -04:00
robotics treewide: remove redundant quotes 2019-09-08 23:38:31 +00:00