summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorShea Levy <shea@shealevy.com>2018-07-15 18:25:07 -0400
committerShea Levy <shea@shealevy.com>2018-07-15 18:25:07 -0400
commited23255c5a26a2f1bdd6f0cc12fe10c69558cea2 (patch)
tree44ce8e686efa0dd40e78e214f594ee0ee0027c2d /pkgs/top-level
parent86e27e29c4c223f062f5c0ca0ebe3e3036f4b45f (diff)
parentd6874a7e1edfe3cf256a01f692050b05ec77e2b2 (diff)
downloadnixlib-ed23255c5a26a2f1bdd6f0cc12fe10c69558cea2.tar
nixlib-ed23255c5a26a2f1bdd6f0cc12fe10c69558cea2.tar.gz
nixlib-ed23255c5a26a2f1bdd6f0cc12fe10c69558cea2.tar.bz2
nixlib-ed23255c5a26a2f1bdd6f0cc12fe10c69558cea2.tar.lz
nixlib-ed23255c5a26a2f1bdd6f0cc12fe10c69558cea2.tar.xz
nixlib-ed23255c5a26a2f1bdd6f0cc12fe10c69558cea2.tar.zst
nixlib-ed23255c5a26a2f1bdd6f0cc12fe10c69558cea2.zip
Merge branch 'init-gurobi' of git://github.com/jfrankenau/nixpkgs
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix2
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a9916143be61..cc216ac311c9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20408,6 +20408,8 @@ with pkgs;
 
   flintqs = callPackage ../development/libraries/science/math/flintqs { };
 
+  gurobi = callPackage ../applications/science/math/gurobi { };
+
   jags = callPackage ../applications/science/math/jags { };