summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSandro <sandro.jaeckel@gmail.com>2024-06-24 14:04:03 +0200
committerGitHub <noreply@github.com>2024-06-24 14:04:03 +0200
commitfc37099c05138ee0481554497afde3305ccd6708 (patch)
treecd12dff48e8929147c4a1e4e7d5b4dd1d58b6a58
parent35ee941b0a5903eba6b834388cb5022557bc73ba (diff)
parentf73d4566473471f883e7f5e68a18c7b1e25ba1cd (diff)
Merge pull request #320945 from Aleksanaa/eigenpy
-rw-r--r--pkgs/development/python-modules/eigenpy/default.nix15
-rw-r--r--pkgs/top-level/python-packages.nix2
2 files changed, 9 insertions, 8 deletions
diff --git a/pkgs/development/python-modules/eigenpy/default.nix b/pkgs/development/python-modules/eigenpy/default.nix
index 8cf0e827a8d3..f1a67cc0ff75 100644
--- a/pkgs/development/python-modules/eigenpy/default.nix
+++ b/pkgs/development/python-modules/eigenpy/default.nix
@@ -1,6 +1,6 @@
{
lib,
- stdenv,
+ buildPythonPackage,
fetchFromGitHub,
cmake,
doxygen,
@@ -11,15 +11,16 @@
scipy,
}:
-stdenv.mkDerivation (finalAttrs: {
+buildPythonPackage rec {
pname = "eigenpy";
- version = "3.6.0";
+ version = "3.7.0";
+ pyproject = false; # Built with cmake
src = fetchFromGitHub {
owner = "stack-of-tasks";
repo = "eigenpy";
- rev = "v${finalAttrs.version}";
- hash = "sha256-S6kMfpTOMqJPIFgvdcHHFDvIl2b+GE8dhJH0QFDdC1c=";
+ rev = "v${version}";
+ hash = "sha256-D/k/ka500EZch5Ydym2WYtd5vciGkd9rdBUSjTsZ0w4=";
};
outputs = [
@@ -55,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: {
meta = with lib; {
description = "Bindings between Numpy and Eigen using Boost.Python";
homepage = "https://github.com/stack-of-tasks/eigenpy";
- changelog = "https://github.com/stack-of-tasks/eigenpy/releases/tag/v${finalAttrs.version}";
+ changelog = "https://github.com/stack-of-tasks/eigenpy/releases/tag/v${version}";
license = licenses.bsd2;
maintainers = with maintainers; [
nim65s
@@ -63,4 +64,4 @@ stdenv.mkDerivation (finalAttrs: {
];
platforms = platforms.unix;
};
-})
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a1d726515961..3067e18baed0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3792,7 +3792,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 { };