diff --git a/pkgs/development/python-modules/scs/default.nix b/pkgs/development/python-modules/scs/default.nix index 128e9276608..24b7d36343a 100644 --- a/pkgs/development/python-modules/scs/default.nix +++ b/pkgs/development/python-modules/scs/default.nix @@ -5,26 +5,22 @@ , lapack , numpy , scipy -, scs # check inputs -, nose +, pytestCheckHook }: buildPythonPackage rec { - inherit (scs) pname version; + pname = "scs"; + version = "3.0.0"; src = fetchFromGitHub { owner = "bodono"; repo = "scs-python"; - rev = "f02abdc0e2e0a5851464e30f6766ccdbb19d73f0"; # need to choose commit manually, untagged - sha256 = "174b5s7cwgrn1m55jlrszdl403zhpzc4yl9acs6kjv9slmg1mmjr"; + rev = version; + sha256 = "sha256-7OgqCo21S0FDev8xv6/8iGFXg8naVi93zd8v1f9iaWw="; + fetchSubmodules = true; }; - preConfigure = '' - rm -r scs - ln -s ${scs.src} scs - ''; - buildInputs = [ lapack blas @@ -35,10 +31,7 @@ buildPythonPackage rec { scipy ]; - checkInputs = [ nose ]; - checkPhase = '' - nosetests - ''; + checkInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "scs" ]; meta = with lib; { @@ -50,7 +43,7 @@ buildPythonPackage rec { ''; homepage = "https://github.com/cvxgrp/scs"; # upstream C package downloadPage = "https://github.com/bodono/scs-python"; - license = licenses.gpl3; + license = licenses.mit; maintainers = with maintainers; [ drewrisinger ]; }; } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a6abc29d135..bc267347583 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8426,7 +8426,7 @@ in { scikit-survival = callPackage ../development/python-modules/scikit-survival { }; - scs = callPackage ../development/python-modules/scs { scs = pkgs.scs; }; + scs = callPackage ../development/python-modules/scs { }; sdnotify = callPackage ../development/python-modules/sdnotify { };