commit f70f1c7be0c7bc097ac0aac0f36e63fae32be609 · pyrox.dev/nixpkgs

+27

pkgs/development/python-modules/brian2/0001-remove-invalidxyz.patch

···

       1
       1
       +
       From dbf0af29767629def355427cf63410158708c632 Mon Sep 17 00:00:00 2001

     

       2
       2
       +
       From: Bot_wxt1221 <3264117476@qq.com>

     

       3
       3
       +
       Date: Wed, 13 Nov 2024 21:15:04 +0800

     

       4
       4
       +
       Subject: [PATCH] Update test_codegen.py

     

       5
       5
       +
       

     

       6
       6
       +
       ---

     

       7
       7
       +
        brian2/tests/test_codegen.py | 7 -------

     

       8
       8
       +
        1 file changed, 7 deletions(-)

     

       9
       9
       +
       

     

       10
       10
       +
       diff --git a/brian2/tests/test_codegen.py b/brian2/tests/test_codegen.py

     

       11
       11
       +
       index fdc03cdf2..6f7ae50bd 100644

     

       12
       12
       +
       --- a/brian2/tests/test_codegen.py

     

       13
       13
       +
       +++ b/brian2/tests/test_codegen.py

     

       14
       14
       +
       @@ -589,13 +589,6 @@ def test_cpp_flags_support():

     

       15
       15
       +
            _, compile_args = get_compiler_and_args()

     

       16
       16
       +
            assert compile_args == prefs["codegen.cpp.extra_compile_args"]

     

       17
       17
       +
        

     

       18
       18
       +
       -    # Should never be supported and raise a warning

     

       19
       19
       +
       -    prefs["codegen.cpp.extra_compile_args"] = ["-invalidxyz"]

     

       20
       20
       +
       -    with catch_logs() as l:

     

       21
       21
       +
       -        _, compile_args = get_compiler_and_args()

     

       22
       22
       +
       -    assert len(l) == 1 and l[0][0] == "WARNING"

     

       23
       23
       +
       -    assert compile_args == []

     

       24
       24
       +
       -

     

       25
       25
       +
            prefs["codegen.cpp.extra_compile_args"] = old_prefs

     

       26
       26
       +
        

     

       27
       27
       +

+30 -4

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

···

       9
       9
        
         setuptools,

     

       10
       10
        
         sympy,

     

       11
       11
        
         pytest,

     

       12
       12
       +
         pythonOlder,

     

       12
       13
        
         pytest-xdist,

     

       14
       14
       +
         setuptools-scm,

     

       13
       15
        
         python,

     

       16
       16
       +
         scipy,

     

       17
       17
       +
         fetchpatch,

     

       14
       18
        
       }:

     

       15
       19
        
       

     

       16
       20
        
       buildPythonPackage rec {

     
···

       18
       22
        
         version = "2.7.1";

     

       19
       23
        
         pyproject = true;

     

       20
       24
        
       

     

       25
       25
       +
         # https://github.com/python/cpython/issues/117692

     

       26
       26
       +
         disabled = pythonOlder "3.12";

     

       27
       27
       +
       

     

       21
       28
        
         src = fetchPypi {

     

       22
       29
        
           inherit pname version;

     

       23
       30
        
           hash = "sha256-mp1xo6ooYm21s6FYcegQdsHmVgH81usV9IfIM0GM7lc=";

     

       24
       31
        
         };

     

       25
       32
        
       

     

       26
       26
       -
         build-system = [ setuptools ];

     

       33
       33
       +
         patches = [

     

       34
       34
       +
           (fetchpatch {

     

       35
       35
       +
             url = "https://github.com/brian-team/brian2/commit/8ed663cafde42cbe2e0171cb19d2217e01676d20.patch";

     

       36
       36
       +
             hash = "sha256-+s5SJdJmsnee3sWhaj/jwf8RXkfMrLp0aTWF52jLdqU=";

     

       37
       37
       +
           })

     

       38
       38
       +
           ./0001-remove-invalidxyz.patch # invalidxyz are reported as error so I remove it

     

       39
       39
       +
         ];

     

       40
       40
       +
       

     

       41
       41
       +
         postPatch = ''

     

       42
       42
       +
           substituteInPlace pyproject.toml \

     

       43
       43
       +
             --replace-fail "numpy>=2.0.0rc1" "numpy"

     

       44
       44
       +
       

     

       45
       45
       +
           substituteInPlace brian2/codegen/cpp_prefs.py \

     

       46
       46
       +
             --replace-fail "distutils" "setuptools._distutils"

     

       47
       47
       +
         '';

     

       48
       48
       +
       

     

       49
       49
       +
         build-system = [

     

       50
       50
       +
           setuptools-scm

     

       51
       51
       +
         ];

     

       27
       52
        
       

     

       28
       53
        
         dependencies = [

     

       29
       54
        
           cython

     
···

       32
       57
        
           pyparsing

     

       33
       58
        
           setuptools

     

       34
       59
        
           sympy

     

       60
       60
       +
           scipy

     

       35
       61
        
         ];

     

       36
       62
        
       

     

       37
       63
        
         nativeCheckInputs = [

     
···

       47
       73
        
           runHook postCheck

     

       48
       74
        
         '';

     

       49
       75
        
       

     

       50
       50
       -
         meta = with lib; {

     

       76
       76
       +
         meta = {

     

       51
       77
        
           description = "Clock-driven simulator for spiking neural networks";

     

       52
       78
        
           homepage = "https://briansimulator.org/";

     

       53
       53
       -
           license = licenses.cecill21;

     

       54
       54
       -
           maintainers = with maintainers; [ jiegec ];

     

       79
       79
       +
           license = lib.licenses.cecill21;

     

       80
       80
       +
           maintainers = with lib.maintainers; [ jiegec ];

     

       55
       81
        
         };

     

       56
       82
        
       }