From d1197b4419706c5e715973e1897c736641802b8c Mon Sep 17 00:00:00 2001 From: aleksana Date: Wed, 19 Jun 2024 14:52:43 +0800 Subject: [PATCH 1/2] python3Packages.eigenpy: build with buildPythonPackage --- pkgs/development/python-modules/eigenpy/default.nix | 11 ++++++----- pkgs/top-level/python-packages.nix | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/eigenpy/default.nix b/pkgs/development/python-modules/eigenpy/default.nix index 8cf0e827a8d3..01b96ecc90eb 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,14 +11,15 @@ scipy, }: -stdenv.mkDerivation (finalAttrs: { +buildPythonPackage rec { pname = "eigenpy"; version = "3.6.0"; + pyproject = false; # Built with cmake src = fetchFromGitHub { owner = "stack-of-tasks"; repo = "eigenpy"; - rev = "v${finalAttrs.version}"; + rev = "v${version}"; hash = "sha256-S6kMfpTOMqJPIFgvdcHHFDvIl2b+GE8dhJH0QFDdC1c="; }; @@ -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 483cb05e6996..3a962e4b2e1c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3763,7 +3763,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 { }; From f73d4566473471f883e7f5e68a18c7b1e25ba1cd Mon Sep 17 00:00:00 2001 From: aleksana Date: Wed, 19 Jun 2024 15:04:14 +0800 Subject: [PATCH 2/2] python3Packages.eigenpy: 3.6.0 -> 3.7.0 --- pkgs/development/python-modules/eigenpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/eigenpy/default.nix b/pkgs/development/python-modules/eigenpy/default.nix index 01b96ecc90eb..f1a67cc0ff75 100644 --- a/pkgs/development/python-modules/eigenpy/default.nix +++ b/pkgs/development/python-modules/eigenpy/default.nix @@ -13,14 +13,14 @@ 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${version}"; - hash = "sha256-S6kMfpTOMqJPIFgvdcHHFDvIl2b+GE8dhJH0QFDdC1c="; + hash = "sha256-D/k/ka500EZch5Ydym2WYtd5vciGkd9rdBUSjTsZ0w4="; }; outputs = [