Merge pull request #337025 from GaetanLepage/scs

scs: 3.2.3 -> 3.2.7
NixOS · Aug 24, 2024 · dc05f34 · dc05f34
2 parents eb0e6df + 74685cd
commit dc05f34
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 13 deletions.
diff --git a/...nt/libraries/science/math/scs/default.nix → pkgs/by-name/sc/scs/package.nix b/...nt/libraries/science/math/scs/default.nix → 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
@@ -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
@@ -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; };