diff --git a/pkgs/by-name/sc/scs/package.nix b/pkgs/by-name/sc/scs/package.nix index d35c737408bb..a870e973f4aa 100644 --- a/pkgs/by-name/sc/scs/package.nix +++ b/pkgs/by-name/sc/scs/package.nix @@ -7,26 +7,27 @@ gfortran, fixDarwinDylibNames, nix-update-script, + python3Packages, }: assert (!blas.isILP64) && (!lapack.isILP64); -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "scs"; - version = "3.2.7"; + version = "3.2.8"; src = fetchFromGitHub { owner = "cvxgrp"; repo = "scs"; - tag = version; - hash = "sha256-Y28LrYUuDaXPO8sce1pJIfG3A03rw7BumVgxCIKRn+U="; + tag = finalAttrs.version; + hash = "sha256-BPVuihxLUuBbavKVhgdo1MdzkkDq2Nm/EYiAY/jwiqU="; }; # Actually link and add libgfortran to the rpath postPatch = '' substituteInPlace scs.mk \ - --replace "#-lgfortran" "-lgfortran" \ - --replace "gcc" "cc" + --replace-fail "# -lgfortran" "-lgfortran" \ + --replace-fail "gcc" "cc" ''; nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; @@ -54,6 +55,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = nix-update-script { }; + tests.scs-python = python3Packages.scs; }; meta = { @@ -62,9 +64,9 @@ stdenv.mkDerivation rec { Numerical optimization package for solving large-scale convex cone problems ''; homepage = "https://github.com/cvxgrp/scs"; - changelog = "https://github.com/cvxgrp/scs/releases/tag/${version}"; + changelog = "https://github.com/cvxgrp/scs/releases/tag/${finalAttrs.version}"; license = lib.licenses.mit; platforms = lib.platforms.all; maintainers = with lib.maintainers; [ bhipple ]; }; -} +}) diff --git a/pkgs/development/python-modules/scs/default.nix b/pkgs/development/python-modules/scs/default.nix index 5e53e2c793af..4668c0996151 100644 --- a/pkgs/development/python-modules/scs/default.nix +++ b/pkgs/development/python-modules/scs/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, + pkgs, buildPythonPackage, fetchFromGitHub, @@ -21,15 +22,15 @@ buildPythonPackage rec { pname = "scs"; - version = "3.2.7.post2"; + inherit (pkgs.scs) version; pyproject = true; src = fetchFromGitHub { owner = "bodono"; repo = "scs-python"; tag = version; - hash = "sha256-A626gK30J4e/TrJMXYc+jMgYw7fNcnWfnTeXlyYQNMM="; fetchSubmodules = true; + hash = "sha256-Dv0LDY6JFFq/dpcDsnU+ErnHJ8RDpaNhrRjEwY31Szk="; }; postPatch = '' @@ -63,7 +64,7 @@ buildPythonPackage rec { Can solve: linear programs (LPs), second-order cone programs (SOCPs), semidefinite programs (SDPs), exponential cone programs (ECPs), and power cone programs (PCPs), or problems with any combination of those cones. ''; - homepage = "https://github.com/cvxgrp/scs"; # upstream C package + inherit (pkgs.scs.meta) homepage; downloadPage = "https://github.com/bodono/scs-python"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ drewrisinger ];