scs: 3.2.7 -> 3.2.8 (#433462)

authored by Gaétan Lepage and committed by GitHub 4ecfff8e 01486022

+14 -11
+10 -8
pkgs/by-name/sc/scs/package.nix
··· 7 7 gfortran, 8 8 fixDarwinDylibNames, 9 9 nix-update-script, 10 + python3Packages, 10 11 }: 11 12 12 13 assert (!blas.isILP64) && (!lapack.isILP64); 13 14 14 - stdenv.mkDerivation rec { 15 + stdenv.mkDerivation (finalAttrs: { 15 16 pname = "scs"; 16 - version = "3.2.7"; 17 + version = "3.2.8"; 17 18 18 19 src = fetchFromGitHub { 19 20 owner = "cvxgrp"; 20 21 repo = "scs"; 21 - tag = version; 22 - hash = "sha256-Y28LrYUuDaXPO8sce1pJIfG3A03rw7BumVgxCIKRn+U="; 22 + tag = finalAttrs.version; 23 + hash = "sha256-BPVuihxLUuBbavKVhgdo1MdzkkDq2Nm/EYiAY/jwiqU="; 23 24 }; 24 25 25 26 # Actually link and add libgfortran to the rpath 26 27 postPatch = '' 27 28 substituteInPlace scs.mk \ 28 - --replace "#-lgfortran" "-lgfortran" \ 29 - --replace "gcc" "cc" 29 + --replace-fail "# -lgfortran" "-lgfortran" \ 30 + --replace-fail "gcc" "cc" 30 31 ''; 31 32 32 33 nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; ··· 54 55 55 56 passthru = { 56 57 updateScript = nix-update-script { }; 58 + tests.scs-python = python3Packages.scs; 57 59 }; 58 60 59 61 meta = { ··· 62 64 Numerical optimization package for solving large-scale convex cone problems 63 65 ''; 64 66 homepage = "https://github.com/cvxgrp/scs"; 65 - changelog = "https://github.com/cvxgrp/scs/releases/tag/${version}"; 67 + changelog = "https://github.com/cvxgrp/scs/releases/tag/${finalAttrs.version}"; 66 68 license = lib.licenses.mit; 67 69 platforms = lib.platforms.all; 68 70 maintainers = with lib.maintainers; [ bhipple ]; 69 71 }; 70 - } 72 + })
+4 -3
pkgs/development/python-modules/scs/default.nix
··· 1 1 { 2 2 lib, 3 3 stdenv, 4 + pkgs, 4 5 buildPythonPackage, 5 6 fetchFromGitHub, 6 7 ··· 21 22 22 23 buildPythonPackage rec { 23 24 pname = "scs"; 24 - version = "3.2.7.post2"; 25 + inherit (pkgs.scs) version; 25 26 pyproject = true; 26 27 27 28 src = fetchFromGitHub { 28 29 owner = "bodono"; 29 30 repo = "scs-python"; 30 31 tag = version; 31 - hash = "sha256-A626gK30J4e/TrJMXYc+jMgYw7fNcnWfnTeXlyYQNMM="; 32 32 fetchSubmodules = true; 33 + hash = "sha256-Dv0LDY6JFFq/dpcDsnU+ErnHJ8RDpaNhrRjEwY31Szk="; 33 34 }; 34 35 35 36 postPatch = '' ··· 63 64 Can solve: linear programs (LPs), second-order cone programs (SOCPs), semidefinite programs (SDPs), 64 65 exponential cone programs (ECPs), and power cone programs (PCPs), or problems with any combination of those cones. 65 66 ''; 66 - homepage = "https://github.com/cvxgrp/scs"; # upstream C package 67 + inherit (pkgs.scs.meta) homepage; 67 68 downloadPage = "https://github.com/bodono/scs-python"; 68 69 license = lib.licenses.mit; 69 70 maintainers = with lib.maintainers; [ drewrisinger ];