commit ed31564636d600a9edd63073cf1245ee67e5e68a · pyrox.dev/nixpkgs

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

···

       41
       41
        
             url = "https://github.com/scikit-build/scikit-build/commit/3992485c67331097553ec8f54233c4c295943f70.patch";

     

       42
       42
        
             hash = "sha256-U34UY+m6RE3c3UN/jGHuR+sRUqTGmG7dT52NWCY7nIE=";

     

       43
       43
        
           })

     

       44
       44
       +
       

     

       45
       45
       +
           # <https://github.com/scikit-build/scikit-build/pull/1160>

     

       46
       46
       +
           ./fix-cmake-4.patch

     

       44
       47
        
         ];

     

       45
       48
        
       

     

       46
       49
        
         # This line in the filterwarnings section of the pytest configuration leads to this error:

+47

pkgs/development/python-modules/scikit-build/fix-cmake-4.patch

···

       1
       1
       +
       From 9efbf7f9baa846867a9c5586e4cc82a8a19e2e84 Mon Sep 17 00:00:00 2001

     

       2
       2
       +
       From: Emily <hello@emily.moe>

     

       3
       3
       +
       Date: Wed, 17 Sep 2025 19:00:01 +0100

     

       4
       4
       +
       Subject: [PATCH 1/2] tests: fix `test_issue335_support_cmake_source_dir` with

     

       5
       5
       +
        CMake 4

     

       6
       6
       +
       

     

       7
       7
       +
       ---

     

       8
       8
       +
        tests/samples/issue-335-support-cmake-source-dir/CMakeLists.txt | 2 +-

     

       9
       9
       +
        1 file changed, 1 insertion(+), 1 deletion(-)

     

       10
       10
       +
       

     

       11
       11
       +
       diff --git a/tests/samples/issue-335-support-cmake-source-dir/CMakeLists.txt b/tests/samples/issue-335-support-cmake-source-dir/CMakeLists.txt

     

       12
       12
       +
       index 7e391c46..18bae2bf 100644

     

       13
       13
       +
       --- a/tests/samples/issue-335-support-cmake-source-dir/CMakeLists.txt

     

       14
       14
       +
       +++ b/tests/samples/issue-335-support-cmake-source-dir/CMakeLists.txt

     

       15
       15
       +
       @@ -1,4 +1,4 @@

     

       16
       16
       +
       -cmake_minimum_required(VERSION 3.2)

     

       17
       17
       +
       +cmake_minimum_required(VERSION 3.2...3.10)

     

       18
       18
       +
        

     

       19
       19
       +
        project(hello NONE)

     

       20
       20
       +
        

     

       21
       21
       +
       

     

       22
       22
       +
       From 491d7494a3ec6cc181d37d02670c65b74c67cbfe Mon Sep 17 00:00:00 2001

     

       23
       23
       +
       From: Emily <hello@emily.moe>

     

       24
       24
       +
       Date: Wed, 17 Sep 2025 19:00:01 +0100

     

       25
       25
       +
       Subject: [PATCH 2/2] tests: fix `test_make_without_configure_fails` with CMake

     

       26
       26
       +
        4

     

       27
       27
       +
       

     

       28
       28
       +
       ---

     

       29
       29
       +
        tests/test_cmaker.py | 5 ++++-

     

       30
       30
       +
        1 file changed, 4 insertions(+), 1 deletion(-)

     

       31
       31
       +
       

     

       32
       32
       +
       diff --git a/tests/test_cmaker.py b/tests/test_cmaker.py

     

       33
       33
       +
       index cf166905..9b6c3758 100644

     

       34
       34
       +
       --- a/tests/test_cmaker.py

     

       35
       35
       +
       +++ b/tests/test_cmaker.py

     

       36
       36
       +
       @@ -82,7 +82,10 @@ def test_make_without_configure_fails(capfd):

     

       37
       37
       +
                CMaker().make()

     

       38
       38
       +
            _, err = capfd.readouterr()

     

       39
       39
       +
            assert "An error occurred while building with CMake." in str(excinfo.value)

     

       40
       40
       +
       -    assert "Error: could not load cache" in err

     

       41
       41
       +
       +    # CMake 4 changed the error message.

     

       42
       42
       +
       +    err_message_cmake_3 = "Error: could not load cache"

     

       43
       43
       +
       +    err_message_cmake_4 = "Error: not a CMake build directory (missing CMakeCache.txt)"

     

       44
       44
       +
       +    assert err_message_cmake_3 in err or err_message_cmake_4 in err

     

       45
       45
       +
        

     

       46
       46
       +
        

     

       47
       47
       +
        @pytest.mark.parametrize("configure_with_cmake_source_dir", [True, False])