commit 2fa0d23c2b5e86e3778a5b47476645b82d4fe776 · pyrox.dev/nixpkgs

+29 -44

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

···

       1
       1
        
       {

     

       2
       2
        
         lib,

     

       3
       3
       -
         fetchFromGitHub,

     

       4
       3
        
         buildPythonPackage,

     

       5
       5
       -
         pytestCheckHook,

     

       6
       6
       -
         stdenv,

     

       7
       7
       -
         pythonOlder,

     

       8
       8
       -
         setuptools,

     

       4
       4
       +
         fetchFromGitHub,

     

       5
       5
       +
         replaceVars,

     

       6
       6
       +
         cpu_features,

     

       7
       7
       +
       

     

       8
       8
       +
         # build-system

     

       9
       9
        
         cmake,

     

       10
       10
        
         ninja,

     

       11
       11
       -
         wheel,

     

       12
       12
       -
         matio,

     

       11
       11
       +
         pybind11,

     

       12
       12
       +
         scikit-build-core,

     

       13
       13
       +
       

     

       14
       14
       +
         # buildInputs

     

       13
       15
        
         eigen,

     

       14
       16
        
         gtest,

     

       15
       15
       -
         cpu_features,

     

       16
       16
       -
         pybind11,

     

       17
       17
       -
         python,

     

       17
       17
       +
         matio,

     

       18
       18
       +
       

     

       19
       19
       +
         # tests

     

       18
       20
        
         numpy,

     

       19
       21
        
         scipy,

     

       22
       22
       +
         pytestCheckHook,

     

       20
       23
        
       }:

     

       21
       24
        
       buildPythonPackage rec {

     

       22
       25
        
         pname = "piqp";

     

       23
       23
       -
         version = "0.6.0";

     

       26
       26
       +
         version = "0.6.2";

     

       24
       27
        
         pyproject = true;

     

       25
       25
       -
       

     

       26
       26
       -
         disabled = pythonOlder "3.7";

     

       27
       28
        
       

     

       28
       29
        
         src = fetchFromGitHub {

     

       29
       30
        
           owner = "PREDICT-EPFL";

     

       30
       31
        
           repo = "piqp";

     

       31
       32
        
           tag = "v${version}";

     

       32
       32
       -
           hash = "sha256-hVUeDV2GrBAOIgaWhg+RV+8CFRIm8Kv6/wCs5bXs2aY=";

     

       33
       33
       +
           hash = "sha256-W9t7d+wV5WcphL54e6tpnKxiWFay9UrFmIRKsGk2yMM=";

     

       33
       34
        
         };

     

       34
       35
        
       

     

       35
       35
       -
         postPatch =

     

       36
       36
       -
           let

     

       37
       37
       -
             # E.g. 3.11.2 -> "311"

     

       38
       38
       -
             pythonVersionMajorMinor =

     

       39
       39
       -
               with lib.versions;

     

       40
       40
       -
               "${major python.pythonVersion}${minor python.pythonVersion}";

     

       41
       41
       -
       

     

       42
       42
       -
             # E.g. "linux-aarch64"

     

       43
       43
       -
             platform =

     

       44
       44
       -
               with stdenv.hostPlatform;

     

       45
       45
       -
               (lib.optionalString (!isDarwin) "${parsed.kernel.name}-${parsed.cpu.name}")

     

       46
       46
       -
               + (lib.optionalString isDarwin "macosx-${darwinMinVersion}-${darwinArch}");

     

       47
       47
       -
           in

     

       48
       48
       -
           ''

     

       49
       49
       -
             build="build/temp.${platform}-cpython-${pythonVersionMajorMinor}/${pname}.${pname}"

     

       50
       50
       -
             mkdir -p $build/_deps

     

       51
       51
       -
             ln -s ${cpu_features.src} $build/_deps/cpu_features-src

     

       52
       52
       -
           '';

     

       53
       53
       -
       

     

       54
       54
       -
         patches = [ ./use-nix-packages.patch ];

     

       36
       36
       +
         patches = [

     

       37
       37
       +
           (replaceVars ./use-nix-packages.patch {

     

       38
       38
       +
             cpu_features_src = cpu_features.src;

     

       39
       39
       +
           })

     

       40
       40
       +
         ];

     

       55
       41
        
       

     

       56
       42
        
         build-system = [

     

       57
       57
       -
           setuptools

     

       58
       43
        
           cmake

     

       59
       44
        
           ninja

     

       60
       60
       -
           wheel

     

       45
       45
       +
           pybind11

     

       46
       46
       +
           scikit-build-core

     

       61
       47
        
         ];

     

       48
       48
       +
         dontUseCmakeConfigure = true;

     

       62
       49
        
       

     

       63
       50
        
         buildInputs = [

     

       64
       64
       -
           matio

     

       65
       51
        
           eigen

     

       66
       52
        
           gtest

     

       67
       67
       -
           pybind11

     

       53
       53
       +
           matio

     

       68
       54
        
         ];

     

       69
       69
       -
       

     

       70
       70
       -
         dontUseCmakeConfigure = true;

     

       71
       55
        
       

     

       72
       56
        
         pythonImportsCheck = [ "piqp" ];

     

       73
       57
        
       

     

       74
       58
        
         nativeCheckInputs = [

     

       75
       75
       -
           pytestCheckHook

     

       76
       59
        
           numpy

     

       60
       60
       +
           pytestCheckHook

     

       77
       61
        
           scipy

     

       78
       62
        
         ];

     

       79
       63
        
       

     

       80
       80
       -
         meta = with lib; {

     

       64
       64
       +
         meta = {

     

       81
       65
        
           description = "Proximal Interior Point Quadratic Programming solver";

     

       82
       66
        
           homepage = "https://github.com/PREDICT-EPFL/piqp";

     

       83
       83
       -
           license = licenses.bsd2;

     

       84
       84
       -
           maintainers = with maintainers; [ renesat ];

     

       67
       67
       +
           changelog = "https://github.com/PREDICT-EPFL/piqp/releases/tag/v${version}";

     

       68
       68
       +
           license = lib.licenses.bsd2;

     

       69
       69
       +
           maintainers = with lib.maintainers; [ renesat ];

     

       85
       70
        
         };

     

       86
       71
        
       }

+13 -16

pkgs/development/python-modules/piqp/use-nix-packages.patch

···

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

     

       2
       2
       -
       index ea1da5e..0a6f096 100644

     

       2
       2
       +
       index 8e0eb68..0131d4e 100644

     

       3
       3
        
       --- a/CMakeLists.txt

     

       4
       4
        
       +++ b/CMakeLists.txt

     

       5
       5
       -
       @@ -100,7 +100,7 @@ if (BUILD_PYTHON_INTERFACE OR BUILD_MATLAB_INTERFACE)

     

       5
       5
       +
       @@ -109,7 +109,7 @@ if (BUILD_PYTHON_INTERFACE OR BUILD_MATLAB_INTERFACE)

     

       6
       6
        
            include(FetchContent)

     

       7
       7
        
            FetchContent_Declare(

     

       8
       8
        
                cpu_features

     

       9
       9
       -
       -        URL https://github.com/google/cpu_features/archive/refs/tags/v0.9.0.zip

     

       10
       10
       -
       +	DOWNLOAD_COMMAND true

     

       9
       9
       +
       -        URL https://github.com/google/cpu_features/archive/refs/tags/v0.10.1.zip

     

       10
       10
       +
       +        URL @cpu_features_src@

     

       11
       11
        
            )

     

       12
       12
        
            set(BUILD_SHARED_LIBS_COPY ${BUILD_SHARED_LIBS})

     

       13
       13
        
            set(BUILD_SHARED_LIBS OFF)

     

       14
       14
        
       diff --git a/interfaces/c/tests/CMakeLists.txt b/interfaces/c/tests/CMakeLists.txt

     

       15
       15
       -
       index 010f038..c8f9ec4 100644

     

       15
       15
       +
       index 5919593..bf504c5 100644

     

       16
       16
        
       --- a/interfaces/c/tests/CMakeLists.txt

     

       17
       17
        
       +++ b/interfaces/c/tests/CMakeLists.txt

     

       18
       18
       -
       @@ -13,18 +13,8 @@ if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.24.0")

     

       18
       18
       +
       @@ -17,18 +17,8 @@ if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.30.0")

     

       19
       19
        
        endif()

     

       20
       20
        
        

     

       21
       21
        
        # Google Test

     
···

       37
       37
        
        enable_testing()

     

       38
       38
        
        

     

       39
       39
        
       diff --git a/interfaces/python/CMakeLists.txt b/interfaces/python/CMakeLists.txt

     

       40
       40
       -
       index f7415dc..885aeff 100644

     

       40
       40
       +
       index b2e3cef..3d9cf65 100644

     

       41
       41
        
       --- a/interfaces/python/CMakeLists.txt

     

       42
       42
        
       +++ b/interfaces/python/CMakeLists.txt

     

       43
       43
       -
       @@ -14,19 +14,7 @@ if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.24.0")

     

       43
       43
       +
       @@ -13,16 +13,7 @@ if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.24.0")

     

       44
       44
       +
            cmake_policy(SET CMP0135 OLD)

     

       44
       45
        
        endif()

     

       45
       46
        
        

     

       46
       46
       -
        # Find pybind11

     

       47
       47
       -
       -include(FetchContent)

     

       48
       48
       -
       -FetchContent_Declare(

     

       49
       49
       -
       -    pybind11

     

       50
       50
       -
       -    URL https://github.com/pybind/pybind11/archive/refs/tags/v2.12.0.zip

     

       51
       51
       -
       -)

     

       52
       52
       -
       -FetchContent_MakeAvailable(pybind11)

     

       47
       47
       +
       -# Find pybind11

     

       48
       48
       +
       -set(PYBIND11_FINDPYTHON ON)

     

       49
       49
       +
       -find_package(pybind11 CONFIG REQUIRED)

     

       53
       50
        
       -

     

       54
       51
        
       -# detect arm64 cross compilation on macOS

     

       55
       52
        
       -if(DEFINED ENV{_PYTHON_HOST_PLATFORM})

     
···

       62
       59
        
        # add instruction set detection on x86/amd64

     

       63
       60
        
        pybind11_add_module(instruction_set src/instruction_set.cpp)

     

       64
       61
        
       diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt

     

       65
       65
       -
       index d11bd37..2275a62 100644

     

       62
       62
       +
       index fded71a..cb568a7 100644

     

       66
       63
        
       --- a/tests/CMakeLists.txt

     

       67
       64
        
       +++ b/tests/CMakeLists.txt

     

       68
       65
        
       @@ -14,18 +14,8 @@ if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.24.0")