commit e84a0ad49c592639bfad263527aee505988ba32c · pyrox.dev/nixpkgs

+69 -43

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

···

       1
       1
        
       {

     

       2
       2
        
         lib,

     

       3
       3
        
         buildPythonPackage,

     

       4
       4
       +
         fetchFromGitHub,

     

       5
       5
       +
         replaceVars,

     

       6
       6
       +
         applyPatches,

     

       7
       7
       +
       

     

       8
       8
       +
         # build-system

     

       4
       9
        
         cmake,

     

       5
       5
       -
         cvxopt,

     

       6
       6
       -
         fetchPypi,

     

       7
       7
       -
         future,

     

       10
       10
       +
         ninja,

     

       11
       11
       +
         scikit-build-core,

     

       12
       12
       +
         pybind11,

     

       13
       13
       +
         setuptools-scm,

     

       14
       14
       +
       

     

       15
       15
       +
         # dependencies

     

       16
       16
       +
         jinja2,

     

       17
       17
       +
         joblib,

     

       8
       18
        
         numpy,

     

       9
       9
       -
         oldest-supported-numpy,

     

       10
       10
       -
         pytestCheckHook,

     

       11
       11
       -
         pythonOlder,

     

       12
       12
       -
         qdldl,

     

       13
       19
        
         scipy,

     

       14
       14
       -
         setuptools-scm,

     

       20
       20
       +
       

     

       21
       21
       +
         # tests

     

       22
       22
       +
         cvxopt,

     

       23
       23
       +
         pytestCheckHook,

     

       24
       24
       +
         torch,

     

       15
       25
        
       }:

     

       16
       26
        
       

     

       27
       27
       +
       let

     

       28
       28
       +
         qdldl_src = fetchFromGitHub {

     

       29
       29
       +
           owner = "osqp";

     

       30
       30
       +
           repo = "qdldl";

     

       31
       31
       +
           tag = "v0.1.8";

     

       32
       32
       +
           hash = "sha256-qCeOs4UjZLuqlbiLgp6BMxvw4niduCPDOOqFt05zi2E=";

     

       33
       33
       +
         };

     

       34
       34
       +
       

     

       35
       35
       +
         osqp_src = applyPatches {

     

       36
       36
       +
           src = fetchFromGitHub {

     

       37
       37
       +
             owner = "osqp";

     

       38
       38
       +
             repo = "osqp";

     

       39
       39
       +
             tag = "v1.0.0";

     

       40
       40
       +
             hash = "sha256-BOAytzJzHcggncQzeDrXwJOq8B3doWERJ6CKIVg1yJY=";

     

       41
       41
       +
           };

     

       42
       42
       +
           patches = [

     

       43
       43
       +
             (replaceVars ./dont-fetch-qdldl.patch {

     

       44
       44
       +
               inherit qdldl_src;

     

       45
       45
       +
             })

     

       46
       46
       +
           ];

     

       47
       47
       +
         };

     

       48
       48
       +
       in

     

       49
       49
       +
       

     

       17
       50
        
       buildPythonPackage rec {

     

       18
       51
        
         pname = "osqp";

     

       19
       19
       -
         version = "0.6.7.post3";

     

       52
       52
       +
         version = "1.0.4";

     

       20
       53
        
         pyproject = true;

     

       21
       54
        
       

     

       22
       22
       -
         disabled = pythonOlder "3.7";

     

       23
       23
       -
       

     

       24
       24
       -
         src = fetchPypi {

     

       25
       25
       -
           inherit pname version;

     

       26
       26
       -
           hash = "sha256-sMXgpyHyHJckCXpP1QEIME0pZGjRJOFvNKxnBG9wIOE=";

     

       55
       55
       +
         src = fetchFromGitHub {

     

       56
       56
       +
           owner = "osqp";

     

       57
       57
       +
           repo = "osqp-python";

     

       58
       58
       +
           tag = "v${version}";

     

       59
       59
       +
           hash = "sha256-i39tphtGO//MS5sqwn6qx5ORR/A8moi0O8ltGGmkv2w=";

     

       27
       60
        
         };

     

       28
       61
        
       

     

       29
       29
       -
         postPatch = ''

     

       30
       30
       -
           substituteInPlace pyproject.toml \

     

       31
       31
       -
             --replace-fail "numpy >= 2.0.0" numpy

     

       32
       32
       -
         '';

     

       33
       33
       -
       

     

       34
       34
       -
         dontUseCmakeConfigure = true;

     

       62
       62
       +
         patches = [

     

       63
       63
       +
           (replaceVars ./dont-fetch-osqp.patch {

     

       64
       64
       +
             inherit osqp_src;

     

       65
       65
       +
           })

     

       66
       66
       +
         ];

     

       35
       67
        
       

     

       36
       36
       -
         nativeBuildInputs = [

     

       68
       68
       +
         build-system = [

     

       37
       69
        
           cmake

     

       38
       38
       -
           numpy

     

       39
       39
       -
           oldest-supported-numpy

     

       70
       70
       +
           ninja

     

       71
       71
       +
           pybind11

     

       72
       72
       +
           scikit-build-core

     

       40
       73
        
           setuptools-scm

     

       41
       74
        
         ];

     

       42
       42
       -
       

     

       43
       43
       -
         pythonRelaxDeps = [

     

       44
       44
       -
           "scipy"

     

       45
       45
       -
         ];

     

       75
       75
       +
         dontUseCmakeConfigure = true;

     

       46
       76
        
       

     

       47
       47
       -
         propagatedBuildInputs = [

     

       77
       77
       +
         dependencies = [

     

       78
       78
       +
           jinja2

     

       79
       79
       +
           joblib

     

       48
       80
        
           numpy

     

       49
       49
       -
           qdldl

     

       50
       81
        
           scipy

     

       51
       82
        
         ];

     

       52
       83
        
       

     

       53
       84
        
         nativeCheckInputs = [

     

       54
       85
        
           cvxopt

     

       55
       86
        
           pytestCheckHook

     

       87
       87
       +
           torch

     

       56
       88
        
         ];

     

       57
       89
        
       

     

       58
       90
        
         pythonImportsCheck = [ "osqp" ];

     

       59
       91
        
       

     

       60
       60
       -
         disabledTests = [

     

       61
       61
       -
           # Need an unfree license package - mkl

     

       62
       62
       -
           "test_issue14"

     

       63
       63
       -
         ]

     

       64
       64
       -
         # disable tests failing after scipy 1.12 update

     

       65
       65
       -
         # https://github.com/osqp/osqp-python/issues/121

     

       66
       66
       -
         # re-enable once unit tests fixed

     

       67
       67
       -
         ++ [

     

       68
       68
       -
           "feasibility_tests"

     

       69
       69
       -
           "polish_tests"

     

       70
       70
       -
           "update_matrices_tests"

     

       92
       92
       +
         disabledTestPaths = [

     

       93
       93
       +
           # CalledProcessError

     

       94
       94
       +
           # Try to invoke `python setup.py build_ext --inplace`

     

       95
       95
       +
           "src/osqp/tests/codegen_matrices_test.py"

     

       96
       96
       +
           "src/osqp/tests/codegen_vectors_test.py"

     

       71
       97
        
         ];

     

       72
       98
        
       

     

       73
       73
       -
         meta = with lib; {

     

       99
       99
       +
         meta = {

     

       74
       100
        
           description = "Operator Splitting QP Solver";

     

       75
       101
        
           longDescription = ''

     

       76
       102
        
             Numerical optimization package for solving problems in the form

     
···

       81
       107
        
           '';

     

       82
       108
        
           homepage = "https://osqp.org/";

     

       83
       109
        
           downloadPage = "https://github.com/oxfordcontrol/osqp-python/releases";

     

       84
       84
       -
           license = licenses.asl20;

     

       85
       85
       -
           maintainers = with maintainers; [ drewrisinger ];

     

       110
       110
       +
           license = lib.licenses.asl20;

     

       111
       111
       +
           maintainers = with lib.maintainers; [ drewrisinger ];

     

       86
       112
        
         };

     

       87
       113
        
       }

+14

pkgs/development/python-modules/osqp/dont-fetch-osqp.patch

···

       1
       1
       +
       diff --git a/CMakeLists.txt b/CMakeLists.txt

     

       2
       2
       +
       index 3334931..64220c4 100644

     

       3
       3
       +
       --- a/CMakeLists.txt

     

       4
       4
       +
       +++ b/CMakeLists.txt

     

       5
       5
       +
       @@ -27,8 +27,7 @@ message(STATUS "Fetching/configuring OSQP")

     

       6
       6
       +
        list(APPEND CMAKE_MESSAGE_INDENT "  ")

     

       7
       7
       +
        FetchContent_Declare(

     

       8
       8
       +
          osqp

     

       9
       9
       +
       -  GIT_REPOSITORY https://github.com/osqp/osqp.git

     

       10
       10
       +
       -  GIT_TAG v1.0.0

     

       11
       11
       +
       +  URL @osqp_src@

     

       12
       12
       +
        )

     

       13
       13
       +
        list(POP_BACK CMAKE_MESSAGE_INDENT)

     

       14
       14
       +
        FetchContent_MakeAvailable(osqp)

+14

pkgs/development/python-modules/osqp/dont-fetch-qdldl.patch

···

       1
       1
       +
       diff --git a/algebra/_common/lin_sys/qdldl/qdldl.cmake b/algebra/_common/lin_sys/qdldl/qdldl.cmake

     

       2
       2
       +
       index ac777bd0..3e419097 100644

     

       3
       3
       +
       --- a/algebra/_common/lin_sys/qdldl/qdldl.cmake

     

       4
       4
       +
       +++ b/algebra/_common/lin_sys/qdldl/qdldl.cmake

     

       5
       5
       +
       @@ -5,8 +5,7 @@ list(APPEND CMAKE_MESSAGE_INDENT "  ")

     

       6
       6
       +
        

     

       7
       7
       +
        FetchContent_Declare(

     

       8
       8
       +
          qdldl

     

       9
       9
       +
       -  GIT_REPOSITORY https://github.com/osqp/qdldl.git

     

       10
       10
       +
       -  GIT_TAG v0.1.8

     

       11
       11
       +
       +  URL @qdldl_src@

     

       12
       12
       +
          )

     

       13
       13
       +
        

     

       14
       14
       +
        # Make QDLDL use the same types as OSQP

pkgs/development/python-modules/scikit-survival/default.nix

···

       51
       51
        
           setuptools-scm

     

       52
       52
        
         ];

     

       53
       53
        
       

     

       54
       54
       +
         pythonRelaxDeps = [

     

       55
       55
       +
           "osqp"

     

       56
       56
       +
         ];

     

       54
       57
        
         dependencies = [

     

       55
       58
        
           ecos

     

       56
       59
        
           joblib