diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-01-18 00:37:32 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-18 00:37:32 +0100 |
| commit | fe2882e5d3bfa1fdb4805c14a6cdccf75909f7a6 (patch) | |
| tree | c24719bdaa6aec0026c89d9779d560dc867b1fbe /pkgs/top-level | |
| parent | eb0b2a0c230baa4cfdf8a97d99d2b3176d76bf1d (diff) | |
| parent | 197eace0818140013f4e5cd12d6ecc40e153852c (diff) | |
Merge pull request #107845 from danielbarter/openbabel3
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 7 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 4 |
2 files changed, 10 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 579bac12bb5c..50b5549c5bea 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15799,7 +15799,11 @@ in }; openal = openalSoft; - openbabel = callPackage ../development/libraries/openbabel { }; + openbabel = openbabel3; + + openbabel2 = callPackage ../development/libraries/openbabel/2.nix { }; + + openbabel3 = callPackages ../development/libraries/openbabel { }; opencascade = callPackage ../development/libraries/opencascade { inherit (darwin.apple_sdk.frameworks) OpenCL Cocoa; @@ -27369,6 +27373,7 @@ in ### SCIENCE/CHEMISTY avogadro = callPackage ../applications/science/chemistry/avogadro { + openbabel = openbabel2; eigen = eigen2; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 314c952ee346..97b48ffa1f0d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4468,6 +4468,10 @@ in { openapi-spec-validator = callPackage ../development/python-modules/openapi-spec-validator { }; + openbabel-bindings = callPackage ../development/python-modules/openbabel-bindings { + openbabel = (callPackage ../development/libraries/openbabel { python = self.python; }); + }; + opencv3 = toPythonModule (pkgs.opencv3.override { enablePython = true; pythonPackages = self; |