From c8d7ba717cf00378b603bd6aacfc8d545bf6f4dd Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Sun, 31 Aug 2025 18:54:06 +0200 Subject: [PATCH] qpoases: clean --- pkgs/by-name/qp/qpoases/package.nix | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/qp/qpoases/package.nix b/pkgs/by-name/qp/qpoases/package.nix index 42e442d4ff07..5724b703f4e0 100644 --- a/pkgs/by-name/qp/qpoases/package.nix +++ b/pkgs/by-name/qp/qpoases/package.nix @@ -1,9 +1,13 @@ { lib, stdenv, + fetchFromGitHub, - fetchpatch, + nix-update-script, + cmake, + + withShared ? (!stdenv.hostPlatform.isStatic), }: stdenv.mkDerivation (finalAttrs: { @@ -13,30 +17,27 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "coin-or"; repo = "qpOASES"; - rev = "releases/${finalAttrs.version}"; + tag = "releases/${finalAttrs.version}"; hash = "sha256-NWKwKYdXJD8lGorhTFWJmYeIhSCO00GHiYx+zHEJk0M="; }; - patches = [ - # Allow building as shared library. - # This was merged upstream, and can be removed on next version - (fetchpatch { - name = "shared-libs.patch"; - url = "https://github.com/coin-or/qpOASES/pull/109/commits/cb49b52c17e0b638c88ff92f4c59e347cd82a332.patch"; - hash = "sha256-6IoJHCFVCZpf3+Im1f64VwV5vj+bbbwCSF0vqpdd5Os="; - }) - ]; - nativeBuildInputs = [ cmake ]; cmakeFlags = [ - "-DBUILD_SHARED_LIBS=ON" + (lib.cmakeBool "BUILD_SHARED_LIBS" withShared) ]; + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "releases/(.*)" + ]; + }; + meta = with lib; { description = "Open-source C++ implementation of the recently proposed online active set strategy"; homepage = "https://github.com/coin-or/qpOASES"; - changelog = "https://github.com/coin-or/qpOASES/blob/${finalAttrs.src.rev}/VERSIONS.txt"; + changelog = "https://github.com/coin-or/qpOASES/blob/${finalAttrs.src.tag}/VERSIONS.txt"; license = licenses.lgpl21; maintainers = with maintainers; [ nim65s ]; };