diff options
| author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2024-06-24 14:07:44 +0200 |
|---|---|---|
| committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2024-06-24 14:07:50 +0200 |
| commit | 153fa063ee2853e86654a9d3987f19990c666f00 (patch) | |
| tree | de48576d4c8a65e557f913b5a6dae048dd4e84da /pkgs/top-level | |
| parent | a619546ecad2a21f1d0208f36f497eaf3582ff95 (diff) | |
| parent | fc37099c05138ee0481554497afde3305ccd6708 (diff) | |
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts: - pkgs/development/python-modules/eigenpy/default.nix
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b24863bf01bd1..da4ea26d21548 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3794,7 +3794,7 @@ self: super: with self; { eggdeps = callPackage ../development/python-modules/eggdeps { }; - eigenpy = toPythonModule (callPackage ../development/python-modules/eigenpy { }); + eigenpy = callPackage ../development/python-modules/eigenpy { }; einops = callPackage ../development/python-modules/einops { }; |