From d3402765327e862d996ac1f13eef1ddf4862492a Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Fri, 2 May 2025 14:32:38 +0200 Subject: [PATCH 1/7] 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; }; }) From 74af8a1a14c702867374d4ddb723dd49bc6217bc Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Fri, 2 May 2025 14:34:07 +0200 Subject: [PATCH 2/7] proxsuite: 0.6.7 -> 0.7.2 Diff: https://github.com/simple-robotics/proxsuite/compare/v0.6.7...v0.7.2 --- pkgs/by-name/pr/proxsuite/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pr/proxsuite/package.nix b/pkgs/by-name/pr/proxsuite/package.nix index f7274158a0fa..39ddcdeafe9d 100644 --- a/pkgs/by-name/pr/proxsuite/package.nix +++ b/pkgs/by-name/pr/proxsuite/package.nix @@ -24,13 +24,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "proxsuite"; - version = "0.6.7"; + version = "0.7.2"; src = fetchFromGitHub { owner = "simple-robotics"; repo = "proxsuite"; rev = "v${finalAttrs.version}"; - hash = "sha256-iKc55WDHArmmIM//Wir6FHrNV84HnEDcBUlwnsbtMME="; + hash = "sha256-1+a5tFOlEwzhGZtll35EMFceD0iUOOQCbwJd9NcFDlk="; }; outputs = [ From bb051b65d7bdbc479956c28e4cd6bc755d87aea7 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Sun, 4 May 2025 18:25:21 +0200 Subject: [PATCH 3/7] python3Packages.proxsuite: pybind11 -> nanobind --- pkgs/by-name/pr/proxsuite/package.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/pr/proxsuite/package.nix b/pkgs/by-name/pr/proxsuite/package.nix index 39ddcdeafe9d..433654d2232e 100644 --- a/pkgs/by-name/pr/proxsuite/package.nix +++ b/pkgs/by-name/pr/proxsuite/package.nix @@ -50,18 +50,23 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; - nativeBuildInputs = [ - cmake - doxygen - graphviz - ] ++ lib.optional pythonSupport python3Packages.pythonImportsCheckHook; + nativeBuildInputs = + [ + cmake + doxygen + graphviz + ] + ++ lib.optionals pythonSupport [ + python3Packages.python + python3Packages.pythonImportsCheckHook + ]; propagatedBuildInputs = [ cereal_1_3_2 eigen jrl-cmakemodules simde - ] ++ lib.optionals pythonSupport [ python3Packages.pybind11 ]; + ] ++ lib.optionals pythonSupport [ python3Packages.nanobind ]; checkInputs = [ matio ] From 5333a03e39fd09973cea20a8b72d9bd2989a461f Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Fri, 2 May 2025 14:20:35 +0200 Subject: [PATCH 4/7] aligator: clean --- pkgs/by-name/al/aligator/package.nix | 33 ++++++++++++++++++---------- 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/al/aligator/package.nix b/pkgs/by-name/al/aligator/package.nix index 7c26ac68aa57..98c1e82576e0 100644 --- a/pkgs/by-name/al/aligator/package.nix +++ b/pkgs/by-name/al/aligator/package.nix @@ -1,21 +1,29 @@ { - cmake, - crocoddyl, - doxygen, - fetchFromGitHub, - fmt, - fontconfig, - gbenchmark, - graphviz, lib, + stdenv, + fetchFromGitHub, + fontconfig, llvmPackages, - pinocchio, - pkg-config, - proxsuite-nlp, python3Packages, pythonSupport ? false, - stdenv, + + # nativeBuildInputs + doxygen, + cmake, + graphviz, + pkg-config, + + # buildInputs + fmt, + + # propagatedBuildInputs suitesparse, + crocoddyl, + pinocchio, + proxsuite-nlp, + + # checkInputs + gbenchmark, }: stdenv.mkDerivation (finalAttrs: { @@ -44,6 +52,7 @@ stdenv.mkDerivation (finalAttrs: { pkg-config ] ++ lib.optionals pythonSupport [ + python3Packages.python python3Packages.pythonImportsCheckHook ]; buildInputs = From 6208fbff634ce263067f01bad8e3066eb23624b2 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Fri, 2 May 2025 14:23:01 +0200 Subject: [PATCH 5/7] aligator: 0.12.0 -> 0.13.0 Diff: https://github.com/Simple-Robotics/aligator/compare/refs/tags/v0.12.0...refs/tags/v0.13.0 Changelog: https://github.com/Simple-Robotics/aligator/blob/v0.13.0/CHANGELOG.md --- pkgs/by-name/al/aligator/package.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/al/aligator/package.nix b/pkgs/by-name/al/aligator/package.nix index 98c1e82576e0..b3855110365f 100644 --- a/pkgs/by-name/al/aligator/package.nix +++ b/pkgs/by-name/al/aligator/package.nix @@ -1,11 +1,12 @@ { lib, - stdenv, fetchFromGitHub, fontconfig, llvmPackages, + nix-update-script, python3Packages, pythonSupport ? false, + stdenv, # nativeBuildInputs doxygen, @@ -28,13 +29,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "aligator"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "Simple-Robotics"; repo = "aligator"; tag = "v${finalAttrs.version}"; - hash = "sha256-oy2qcJbIGr5pe+XYWKntfsc6Ie7oEU1qqrPXjuqULmY="; + hash = "sha256-i+NQzhYdHQ+KcNxSLELgnMk98mdfN/vbXfRlU3k/dUU="; }; outputs = [ @@ -108,6 +109,8 @@ stdenv.mkDerivation (finalAttrs: { doCheck = true; pythonImportsCheck = [ "aligator" ]; + passthru.updateScript = nix-update-script { }; + meta = { description = "Versatile and efficient framework for constrained trajectory optimization"; homepage = "https://github.com/Simple-Robotics/aligator"; From fb21d6c0edc32c33230542457246f3b4c9ee8c1b Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Mon, 5 May 2025 12:45:31 +0200 Subject: [PATCH 6/7] jrl-cmakemodules: 0-unstable-2025-01-29 -> 0-unstable-2025-05-04 --- pkgs/by-name/jr/jrl-cmakemodules/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/jr/jrl-cmakemodules/package.nix b/pkgs/by-name/jr/jrl-cmakemodules/package.nix index ef1489066436..caf1828b090c 100644 --- a/pkgs/by-name/jr/jrl-cmakemodules/package.nix +++ b/pkgs/by-name/jr/jrl-cmakemodules/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation { pname = "jrl-cmakemodules"; - version = "0-unstable-2025-01-29"; + version = "0-unstable-2025-05-04"; src = fetchFromGitHub { owner = "jrl-umi3218"; repo = "jrl-cmakemodules"; - rev = "2ede15d1cb9d66401ba96788444ad64c44ffccd8"; - hash = "sha256-0o5DKt9BxZlAYTHp/BjzF6eJRP/d6lVlaV5P4xlzKnA="; + rev = "2dd858f5a71d8224f178fb3dc0bcd95256ba10e7"; + hash = "sha256-Iq9IuhEJBmDd14FhQ3wb94AoJDUjJ1h1D3qCdQYCnUc="; }; nativeBuildInputs = [ cmake ]; From c930de820ebcbb2b66410fc3c0871dbc065e4e5c Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Mon, 12 May 2025 18:28:26 +0200 Subject: [PATCH 7/7] aligator: 0.13.0 -> 0.14.0 ref. https://github.com/Simple-Robotics/aligator/blob/main/CHANGELOG.md#0140---2025-05-07 drop pinocchio 2 support, but we have 3 drop proxsuite-nlp dependency, done --- pkgs/by-name/al/aligator/package.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/al/aligator/package.nix b/pkgs/by-name/al/aligator/package.nix index b3855110365f..95b48a12cdb3 100644 --- a/pkgs/by-name/al/aligator/package.nix +++ b/pkgs/by-name/al/aligator/package.nix @@ -21,7 +21,6 @@ suitesparse, crocoddyl, pinocchio, - proxsuite-nlp, # checkInputs gbenchmark, @@ -29,13 +28,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "aligator"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "Simple-Robotics"; repo = "aligator"; tag = "v${finalAttrs.version}"; - hash = "sha256-i+NQzhYdHQ+KcNxSLELgnMk98mdfN/vbXfRlU3k/dUU="; + hash = "sha256-SkhFV/a3A6BqzoicQa7MUgsEuDzd+JfgYvL4ztHg/K0="; }; outputs = [ @@ -67,12 +66,10 @@ stdenv.mkDerivation (finalAttrs: { python3Packages.crocoddyl python3Packages.matplotlib python3Packages.pinocchio - python3Packages.proxsuite-nlp ] ++ lib.optionals (!pythonSupport) [ crocoddyl pinocchio - proxsuite-nlp ]; checkInputs = [ gbenchmark ]