Unverified Commit dc05f34c authored by Pol Dellaiera's avatar Pol Dellaiera Committed by GitHub
Browse files

Merge pull request #337025 from GaetanLepage/scs 

scs: 3.2.3 -> 3.2.7
parents eb0e6df0 74685cd1

pkgs/development/libraries/science/math/scs/default.nix→pkgs/by-name/sc/scs/package.nix

+27 −9
Original line number Diff line number Diff line 
{ 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 ];

  };

}

pkgs/development/python-modules/scs/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -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;

  };

pkgs/top-level/all-packages.nix

+0 −2
Original line number Diff line number Diff line
@@ -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; };