From d3402765327e862d996ac1f13eef1ddf4862492a Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Fri, 2 May 2025 14:32:38 +0200 Subject: [PATCH] proxsuite: clean --- pkgs/by-name/pr/proxsuite/package.nix | 40 ++++++++++++++------------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/pkgs/by-name/pr/proxsuite/package.nix b/pkgs/by-name/pr/proxsuite/package.nix index 0acf7886422f..f7274158a0fa 100644 --- a/pkgs/by-name/pr/proxsuite/package.nix +++ b/pkgs/by-name/pr/proxsuite/package.nix @@ -2,18 +2,25 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, - cereal_1_3_2, - cmake, - doxygen, - eigen, fontconfig, - graphviz, - jrl-cmakemodules, - simde, - matio, + nix-update-script, pythonSupport ? false, python3Packages, + + # nativeBuildInputs + cmake, + doxygen, + graphviz, + + # propagatedBuildInputs + cereal_1_3_2, + eigen, + jrl-cmakemodules, + simde, + + # checkInputs + matio, + }: stdenv.mkDerivation (finalAttrs: { pname = "proxsuite"; @@ -26,15 +33,6 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-iKc55WDHArmmIM//Wir6FHrNV84HnEDcBUlwnsbtMME="; }; - patches = [ - # Fix use of system cereal - # This was merged upstream and can be removed on next release - (fetchpatch { - url = "https://github.com/Simple-Robotics/proxsuite/pull/352/commits/8305864f13ca7dff7210f89004a56652b71f8891.patch"; - hash = "sha256-XMS/zHFVrEp1P6aDlGrLbrcmuKq42+GdZRH9ObewNCY="; - }) - ]; - outputs = [ "doc" "out" @@ -57,12 +55,14 @@ stdenv.mkDerivation (finalAttrs: { doxygen graphviz ] ++ lib.optional pythonSupport python3Packages.pythonImportsCheckHook; + propagatedBuildInputs = [ cereal_1_3_2 eigen jrl-cmakemodules simde ] ++ lib.optionals pythonSupport [ python3Packages.pybind11 ]; + checkInputs = [ matio ] ++ lib.optionals pythonSupport [ @@ -85,11 +85,13 @@ stdenv.mkDerivation (finalAttrs: { doCheck = true; pythonImportsCheck = [ "proxsuite" ]; + passthru.updateScript = nix-update-script { }; + meta = { description = "The Advanced Proximal Optimization Toolbox"; homepage = "https://github.com/Simple-Robotics/proxsuite"; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ nim65s ]; - platforms = lib.platforms.unix; + platforms = lib.platforms.unix ++ lib.platforms.windows; }; })