diff options
| author | Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk> | 2019-04-20 17:39:23 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-20 17:39:23 +0900 |
| commit | 575d6a48267670cbb298770a910fb1c6311f55fd (patch) | |
| tree | fba197600203d079097609809a95517f2b1ae9e3 /pkgs/top-level/all-packages.nix | |
| parent | 7250104c7b1567dc5b9a78daa8f0018fa383f939 (diff) | |
| parent | ae6b9dcb0e9ece499db00ba1ab5062ee4bf13ce8 (diff) | |
| download | nixlib-575d6a48267670cbb298770a910fb1c6311f55fd.tar nixlib-575d6a48267670cbb298770a910fb1c6311f55fd.tar.gz nixlib-575d6a48267670cbb298770a910fb1c6311f55fd.tar.bz2 nixlib-575d6a48267670cbb298770a910fb1c6311f55fd.tar.lz nixlib-575d6a48267670cbb298770a910fb1c6311f55fd.tar.xz nixlib-575d6a48267670cbb298770a910fb1c6311f55fd.tar.zst nixlib-575d6a48267670cbb298770a910fb1c6311f55fd.zip | |
Merge pull request #58417 from andersk/ortools-7.0
or-tools: 6.10 -> 7.0, add Python bindings
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index af3798fe7e0a..240297c9a4a0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9570,6 +9570,8 @@ in aalib = callPackage ../development/libraries/aalib { }; + abseil-cpp = callPackage ../development/libraries/abseil-cpp { }; + accountsservice = callPackage ../development/libraries/accountsservice { }; acl = callPackage ../development/libraries/acl { }; @@ -22079,7 +22081,9 @@ in nauty = callPackage ../applications/science/math/nauty {}; - or-tools = callPackage ../development/libraries/science/math/or-tools {}; + or-tools = callPackage ../development/libraries/science/math/or-tools { + pythonProtobuf = pythonPackages.protobuf; + }; rubiks = callPackage ../development/libraries/science/math/rubiks { }; |