commit cc35c7fc8535edb8692890b5769cb4ade95cccfb · pyrox.dev/nixpkgs

+7

pkgs/applications/science/logic/poly/default.nix

···

       12
       12
        
           sha256 = "sha256-E2lHo8Bt4ujoGQ623fjkQbqRnDYJYilXdRt4lnF4wJk=";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
       +
         # https://github.com/SRI-CSL/libpoly/pull/52

     

       16
       16
       +
         postPatch = lib.optionalString stdenv.isDarwin ''

     

       17
       17
       +
           substituteInPlace src/CMakeLists.txt --replace \

     

       18
       18
       +
             '"utils/open_memstream.c ''${poly_SOURCES}"' \

     

       19
       19
       +
             'utils/open_memstream.c ''${poly_SOURCES}'

     

       20
       20
       +
         '';

     

       21
       21
       +
       

     

       15
       22
        
         nativeBuildInputs = [ cmake ];

     

       16
       23
        
       

     

       17
       24
        
         buildInputs = [ gmp python3 ];

+3 -3

pkgs/applications/version-management/git-and-tools/gh/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "gh";

     

       5
       5
       -
         version = "1.10.2";

     

       5
       5
       +
         version = "1.10.3";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "cli";

     

       9
       9
        
           repo = "cli";

     

       10
       10
        
           rev = "v${version}";

     

       11
       11
       -
           sha256 = "sha256-hI4kV7Xj0oMEfD6SzZ+KWHmMp9yGtr18HPPwkOpr5JA=";

     

       11
       11
       +
           sha256 = "sha256-hwqnINygXycd9W6tPjXsRcGbdTyULGL31aRl5NUxGtc=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         vendorSha256 = "sha256-A7Bo0HQ5Z2SXY32jWCYgwvvInD3xYLSXvipzeaQTDiM=";

     

       14
       14
       +
         vendorSha256 = "sha256-acFN/StOMu8RSN/wvJsf4vSnjsmRnkrjuDb9cDMnXRs=";

     

       15
       15
        
       

     

       16
       16
        
         nativeBuildInputs = [ installShellFiles ];

     

       17
       17

+4 -3

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

···

       1
       1
        
       { lib, buildPythonPackage, fetchPypi, fetchFromGitHub

     

       2
       2
       -
       , wheel, pytestCheckHook, pytestrunner }:

     

       2
       2
       +
       , wheel, pytestCheckHook, pytestrunner, pythonAtLeast }:

     

       3
       3
        
       

     

       4
       4
        
       buildPythonPackage rec {

     

       5
       5
       -
         version = "0.18.1";

     

       5
       5
       +
         version = "0.18.4";

     

       6
       6
        
         pname = "bacpypes";

     

       7
       7
       +
         disabled = pythonAtLeast "3.9";

     

       7
       8
        
       

     

       8
       9
        
         src = fetchFromGitHub {

     

       9
       10
        
           owner = "JoelBender";

     

       10
       11
        
           repo = "bacpypes";

     

       11
       12
        
           rev = version;

     

       12
       12
       -
           sha256 = "1fxrh57z3fjl95db8jh71grkv5id8qk65g6k5jqcs9v3dgkg8jkl";

     

       13
       13
       +
           sha256 = "1z5v0i7ms8na062wxd5ki43yy5z2d9cns0p4vdmkx2drwsbzlav2";

     

       13
       14
        
         };

     

       14
       15
        
       

     

       15
       16
        
         propagatedBuildInputs = [ wheel ];

+2 -2

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

···

       1
       1
        
       { lib, buildPythonPackage, fetchFromGitHub, isPy27 }:

     

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
       -
         version = "2.2.1";

     

       4
       4
       +
         version = "2.2.2";

     

       5
       5
        
         pname = "elementpath";

     

       6
       6
        
         disabled = isPy27; # uses incompatible class syntax

     

       7
       7
        
       

     
···

       9
       9
        
           owner = "sissaschool";

     

       10
       10
        
           repo = "elementpath";

     

       11
       11
        
           rev = "v${version}";

     

       12
       12
       -
           sha256 = "15yjl18n81zddd27789mcy12gnja3cqycjdykybwgd9i0ysj96gl";

     

       12
       12
       +
           sha256 = "sha256-n4zIn2WmFHaVaah2J0mz7Q6G4Ptb8Ms0dwQYbh0Ofcs=";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         # avoid circular dependency with xmlschema which directly depends on this

+3

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

···

       53
       53
        
         ] ++ lib.optionals stdenv.isAarch64 [

     

       54
       54
        
           # https://github.com/pydicom/pydicom/issues/1386

     

       55
       55
        
           "test_array"

     

       56
       56
       +
         ] ++ lib.optionals stdenv.isDarwin [

     

       57
       57
       +
           # flaky, hard to reproduce failure outside hydra

     

       58
       58
       +
           "test_time_check"

     

       56
       59
        
         ];

     

       57
       60
        
       

     

       58
       61
        
         meta = with lib; {

+13 -5

pkgs/development/python-modules/pyside/shiboken.nix

···

       1
       1
        
       { lib, fetchFromGitHub, buildPythonPackage

     

       2
       2
        
       , cmake

     

       3
       3
       -
       , isPy35

     

       4
       4
       -
       , isPy36

     

       5
       5
       -
       , isPy37

     

       3
       3
       +
       , fetchurl

     

       6
       4
        
       , isPy3k

     

       7
       5
        
       , libxml2

     

       8
       6
        
       , libxslt

     
···

       10
       8
        
       , pysideApiextractor

     

       11
       9
        
       , pysideGeneratorrunner

     

       12
       10
        
       , python

     

       11
       11
       +
       , pythonAtLeast

     

       13
       12
        
       , qt4

     

       14
       13
        
       , sphinx

     

       15
       14
        
       }:

     
···

       39
       38
        
             \"$\{GENERATORRUNNER_PLUGIN_DIR}\" lib/generatorrunner/

     

       40
       39
        
         '';

     

       41
       40
        
       

     

       42
       42
       -
         # gcc6 patch was also sent upstream: https://github.com/pyside/Shiboken/pull/86

     

       43
       43
       -
         patches = [ ./gcc6.patch ] ++ (lib.optional (isPy35 || isPy36 || isPy37) ./shiboken_py35.patch);

     

       41
       41
       +
         patches = [

     

       42
       42
       +
           # gcc6 patch was also sent upstream: https://github.com/pyside/Shiboken/pull/86

     

       43
       43
       +
           ./gcc6.patch

     

       44
       44
       +
           (lib.optional (pythonAtLeast "3.5") ./shiboken_py35.patch)

     

       45
       45
       +
           (fetchurl {

     

       46
       46
       +
             # https://github.com/pyside/Shiboken/pull/90

     

       47
       47
       +
             name = "fix-build-with-python-3.9.patch";

     

       48
       48
       +
             url = "https://github.com/pyside/Shiboken/commit/d1c901d4c0af581003553865360ba964cda041e8.patch";

     

       49
       49
       +
             sha256 = "1f7slz8n8rps5r67hz3hi4rr82igc3l166shfy6647ivsb2fnxwy";

     

       50
       50
       +
           })

     

       51
       51
       +
         ];

     

       44
       52
        
       

     

       45
       53
        
         cmakeFlags = lib.optionals isPy3k [

     

       46
       54
        
           "-DUSE_PYTHON3=TRUE"

+48

pkgs/development/python-modules/pyvisa-py/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , fetchFromGitHub

     

       3
       3
       +
       , buildPythonPackage

     

       4
       4
       +
       , setuptools-scm

     

       5
       5
       +
       , pyserial

     

       6
       6
       +
       , pyusb

     

       7
       7
       +
       , pyvisa

     

       8
       8
       +
       , typing-extensions

     

       9
       9
       +
       , pytestCheckHook

     

       10
       10
       +
       }:

     

       11
       11
       +
       

     

       12
       12
       +
       buildPythonPackage rec {

     

       13
       13
       +
         pname = "pyvisa-py";

     

       14
       14
       +
         version = "0.5.1";

     

       15
       15
       +
       

     

       16
       16
       +
         src = fetchFromGitHub {

     

       17
       17
       +
           owner = "pyvisa";

     

       18
       18
       +
           repo = "pyvisa-py";

     

       19
       19
       +
           rev = version;

     

       20
       20
       +
           hash = "sha256-V1BS+BvHVI8h/rynLnOHvQdIR6RwQrNa2p2S6GQug98=";

     

       21
       21
       +
         };

     

       22
       22
       +
       

     

       23
       23
       +
         nativeBuildInputs = [

     

       24
       24
       +
           setuptools-scm

     

       25
       25
       +
         ];

     

       26
       26
       +
       

     

       27
       27
       +
         propagatedBuildInputs = [

     

       28
       28
       +
           pyserial

     

       29
       29
       +
           pyusb

     

       30
       30
       +
           pyvisa

     

       31
       31
       +
           typing-extensions

     

       32
       32
       +
         ];

     

       33
       33
       +
       

     

       34
       34
       +
         checkInputs = [

     

       35
       35
       +
           pytestCheckHook

     

       36
       36
       +
         ];

     

       37
       37
       +
       

     

       38
       38
       +
         postConfigure = ''

     

       39
       39
       +
           export SETUPTOOLS_SCM_PRETEND_VERSION="v${version}"

     

       40
       40
       +
         '';

     

       41
       41
       +
       

     

       42
       42
       +
         meta = with lib; {

     

       43
       43
       +
           description = "PyVISA backend that implements a large part of the Virtual Instrument Software Architecture in pure Python";

     

       44
       44
       +
           homepage = "https://github.com/pyvisa/pyvisa-py";

     

       45
       45
       +
           license = licenses.mit;

     

       46
       46
       +
           maintainers = with maintainers; [ mvnetbiz ];

     

       47
       47
       +
         };

     

       48
       48
       +
       }

+49

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

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , fetchFromGitHub

     

       3
       3
       +
       , buildPythonPackage

     

       4
       4
       +
       , setuptools-scm

     

       5
       5
       +
       , setuptools

     

       6
       6
       +
       , typing-extensions

     

       7
       7
       +
       , pytestCheckHook

     

       8
       8
       +
       }:

     

       9
       9
       +
       

     

       10
       10
       +
       buildPythonPackage rec {

     

       11
       11
       +
         pname = "pyvisa";

     

       12
       12
       +
         version = "1.11.3";

     

       13
       13
       +
       

     

       14
       14
       +
         src = fetchFromGitHub {

     

       15
       15
       +
           owner = "pyvisa";

     

       16
       16
       +
           repo = "pyvisa";

     

       17
       17
       +
           rev = version;

     

       18
       18
       +
           hash = "sha256-Qe7W1zPI1aedLDnhkLTDPTa/lsNnCGik5Hu+jLn+meA=";

     

       19
       19
       +
         };

     

       20
       20
       +
       

     

       21
       21
       +
         nativeBuildInputs = [

     

       22
       22
       +
           setuptools-scm

     

       23
       23
       +
         ];

     

       24
       24
       +
       

     

       25
       25
       +
         propagatedBuildInputs = [

     

       26
       26
       +
           typing-extensions

     

       27
       27
       +
           setuptools

     

       28
       28
       +
         ];

     

       29
       29
       +
       

     

       30
       30
       +
         checkInputs = [

     

       31
       31
       +
           pytestCheckHook

     

       32
       32
       +
         ];

     

       33
       33
       +
       

     

       34
       34
       +
         # Test can't find cli tool bin path correctly

     

       35
       35
       +
         disabledTests = [

     

       36
       36
       +
           "test_visa_info"

     

       37
       37
       +
         ];

     

       38
       38
       +
       

     

       39
       39
       +
         postConfigure = ''

     

       40
       40
       +
           export SETUPTOOLS_SCM_PRETEND_VERSION="v${version}"

     

       41
       41
       +
         '';

     

       42
       42
       +
       

     

       43
       43
       +
         meta = with lib; {

     

       44
       44
       +
           description = "Python package for support of the Virtual Instrument Software Architecture (VISA)";

     

       45
       45
       +
           homepage = "https://github.com/pyvisa/pyvisa";

     

       46
       46
       +
           license = licenses.mit;

     

       47
       47
       +
           maintainers = with maintainers; [ mvnetbiz ];

     

       48
       48
       +
         };

     

       49
       49
       +
       }

+2 -7

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

···

       5
       5
        
       }:

     

       6
       6
        
       

     

       7
       7
        
       buildPythonPackage rec {

     

       8
       8
       -
         version = "1.5.3";

     

       8
       8
       +
         version = "1.6.2";

     

       9
       9
        
         pname = "xmlschema";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchFromGitHub {

     

       12
       12
        
           owner = "sissaschool";

     

       13
       13
        
           repo = "xmlschema";

     

       14
       14
        
           rev = "v${version}";

     

       15
       15
       -
           sha256 = "0pv8zdz03wjnjwrgjr5pc3q69h7zh51h0iwgwxwl65qi1r6ydk54";

     

       15
       15
       +
           sha256 = "sha256-GL2PlHxKDSEsZwHPBAy+tjBSbKyvlbXUWwXakKPmzSs=";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
        
         propagatedBuildInputs = [ elementpath ];

     

       19
       19
        
       

     

       20
       20
        
         checkInputs = [ lxml pytest ];

     

       21
       21
       -
       

     

       22
       22
       -
         postPatch = ''

     

       23
       23
       -
           substituteInPlace setup.py \

     

       24
       24
       -
             --replace "elementpath~=2.0.0" "elementpath~=2.0"

     

       25
       25
       -
         '';

     

       26
       21
        
       

     

       27
       22
        
         # Ignore broken fixtures, and tests for files which don't exist.

     

       28
       23
        
         # For darwin, we need to explicity say we can't reach network

+3 -3

pkgs/tools/games/ajour/default.nix

···

       34
       34
        
       

     

       35
       35
        
       in rustPlatform.buildRustPackage rec {

     

       36
       36
        
         pname = "Ajour";

     

       37
       37
       -
         version = "1.1.0";

     

       37
       37
       +
         version = "1.2.0";

     

       38
       38
        
       

     

       39
       39
        
         src = fetchFromGitHub {

     

       40
       40
        
           owner = "casperstorm";

     

       41
       41
        
           repo = "ajour";

     

       42
       42
        
           rev = version;

     

       43
       43
       -
           sha256 = "1xzsgxkdwdqcr8xs9ajr1ykfjjz95z9k7b7l644yijg31xf1lbq6";

     

       43
       43
       +
           sha256 = "0xmjr8brjmkk13dsn3yvcl5ss6b214hpka0idk072n46qsyhg2wh";

     

       44
       44
        
         };

     

       45
       45
        
       

     

       46
       46
       -
         cargoSha256 = "02g25wr0f2bjr7zmpll3iicc6i8wk1j9iavagg1vhbpynp6z013x";

     

       46
       46
       +
         cargoSha256 = "06d1h2c2abg56567znxh65d4ddpi6wvxip9rbzkmdnzgy3b3y2wl";

     

       47
       47
        
       

     

       48
       48
        
         nativeBuildInputs = [

     

       49
       49
        
           autoPatchelfHook

+4

pkgs/top-level/python-packages.nix

···

       6927
       6927
        
       

     

       6928
       6928
        
         pyvicare = callPackage ../development/python-modules/pyvicare { };

     

       6929
       6929
        
       

     

       6930
       6930
       +
         pyvisa = callPackage ../development/python-modules/pyvisa { };

     

       6931
       6931
       +
       

     

       6932
       6932
       +
         pyvisa-py = callPackage ../development/python-modules/pyvisa-py { };

     

       6933
       6933
       +
       

     

       6930
       6934
        
         pyviz-comms = callPackage ../development/python-modules/pyviz-comms { };

     

       6931
       6935
        
       

     

       6932
       6936
        
         pyvizio = callPackage ../development/python-modules/pyvizio { };