diff --git a/pkgs/development/libraries/science/math/scs/default.nix b/pkgs/by-name/sc/scs/package.nix similarity index 62% rename from pkgs/development/libraries/science/math/scs/default.nix rename to pkgs/by-name/sc/scs/package.nix index 087f4787a53b..49911355e2db 100644 --- a/pkgs/development/libraries/science/math/scs/default.nix +++ b/pkgs/by-name/sc/scs/package.nix @@ -1,16 +1,25 @@ -{ lib, stdenv, fetchFromGitHub, blas, lapack, gfortran, fixDarwinDylibNames }: +{ + lib, + stdenv, + fetchFromGitHub, + blas, + lapack, + gfortran, + fixDarwinDylibNames, + nix-update-script, +}: assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "scs"; - version = "3.2.3"; + version = "3.2.7"; src = fetchFromGitHub { owner = "cvxgrp"; repo = "scs"; - rev = version; - sha256 = "sha256-0g0r3DNgkPZgag0qtz79Wk3Cre1I2yaabFi3OgUzgfc="; + rev = "refs/tags/${version}"; + hash = "sha256-Y28LrYUuDaXPO8sce1pJIfG3A03rw7BumVgxCIKRn+U="; }; # Actually link and add libgfortran to the rpath @@ -22,7 +31,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = lib.optional stdenv.isDarwin fixDarwinDylibNames; - buildInputs = [ blas lapack gfortran.cc.lib ]; + buildInputs = [ + blas + lapack + gfortran.cc.lib + ]; doCheck = true; @@ -39,14 +52,19 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with lib; { + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { description = "Splitting Conic Solver"; longDescription = '' Numerical optimization package for solving large-scale convex cone problems ''; homepage = "https://github.com/cvxgrp/scs"; - license = licenses.mit; - platforms = platforms.all; - maintainers = [ maintainers.bhipple ]; + changelog = "https://github.com/cvxgrp/scs/releases/tag/${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 9214204db210..8736930939e3 100644 --- a/pkgs/development/python-modules/scs/default.nix +++ b/pkgs/development/python-modules/scs/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "scs"; - version = "3.2.6"; + version = "3.2.7"; pyproject = true; src = fetchFromGitHub { owner = "bodono"; repo = "scs-python"; rev = "refs/tags/${version}"; - hash = "sha256-Sl0+1/uEXAg+V2ijDFGmez6hBKQjbi63gN26lPCiEnI="; + hash = "sha256-ZhY4h0C8aF3IjD9NMtevcNTSqX+tIUao9bC+WlP+uDk="; fetchSubmodules = true; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ff352964cc01..3f3741a71ad7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -37184,8 +37184,6 @@ with pkgs; QuadProgpp = callPackage ../development/libraries/science/math/QuadProgpp { }; - scs = callPackage ../development/libraries/science/math/scs { }; - sage = callPackage ../applications/science/math/sage { }; sageWithDoc = sage.override { withDoc = true; };