commit 7b38f24f2fe65231f1f957d7259e929acb260c1f · pyrox.dev/nixpkgs

+3 -3

pkgs/by-name/re/rerun/package.nix

···

       34
       34
        
       }:

     

       35
       35
        
       rustPlatform.buildRustPackage (finalAttrs: {

     

       36
       36
        
         pname = "rerun";

     

       37
       37
       -
         version = "0.24.1";

     

       37
       37
       +
         version = "0.25.1";

     

       38
       38
        
       

     

       39
       39
        
         src = fetchFromGitHub {

     

       40
       40
        
           owner = "rerun-io";

     

       41
       41
        
           repo = "rerun";

     

       42
       42
        
           tag = finalAttrs.version;

     

       43
       43
       -
           hash = "sha256-unPgvQcYhshdx5NGCl/pLh8UdJ9T6B8Fd0s8G1NSBmE=";

     

       43
       43
       +
           hash = "sha256-YppVNVfVqOATLCoUvpeYYrhivKBb6f4G1JCG1Bl+cjc=";

     

       44
       44
        
         };

     

       45
       45
        
       

     

       46
       46
        
         # The path in `build.rs` is wrong for some reason, so we patch it to make the passthru tests work

     
···

       49
       49
        
             --replace-fail '"rerun_sdk/rerun_cli/rerun"' '"rerun_sdk/rerun"'

     

       50
       50
        
         '';

     

       51
       51
        
       

     

       52
       52
       -
         cargoHash = "sha256-zdq8djnmH8srSd9sml7t6wsbxpTaT3x5/7hkDRgelbg=";

     

       52
       52
       +
         cargoHash = "sha256-jUn7b6t5hS7KjdymxTTP8mKLT671QgKrv7R9uiOkmJU=";

     

       53
       53
        
       

     

       54
       54
        
         cargoBuildFlags = [ "--package rerun-cli" ];

     

       55
       55
        
         cargoTestFlags = [ "--package rerun-cli" ];

+31 -47

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

···

       1
       1
        
       {

     

       2
       2
        
         lib,

     

       3
       3
       -
         stdenv,

     

       4
       3
        
         buildPythonPackage,

     

       5
       4
        
         fetchFromGitHub,

     

       6
       5
        
         rustPlatform,

     

       7
       7
       -
         pytestCheckHook,

     

       8
       8
       -
         libiconv,

     

       9
       9
       -
         numpy,

     

       10
       10
       -
         protobuf,

     

       6
       6
       +
       

     

       7
       7
       +
         # nativeBuildInputs

     

       11
       8
        
         protoc,

     

       9
       9
       +
       

     

       10
       10
       +
         # buildInputs

     

       11
       11
       +
         protobuf,

     

       12
       12
       +
       

     

       13
       13
       +
         # dependencies

     

       12
       14
        
         pyarrow,

     

       13
       15
        
         typing-extensions,

     

       14
       14
       -
         pythonOlder,

     

       16
       16
       +
       

     

       17
       17
       +
         # tests

     

       18
       18
       +
         numpy,

     

       19
       19
       +
         pytest-asyncio,

     

       20
       20
       +
         pytestCheckHook,

     

       15
       21
        
       }:

     

       16
       22
        
       

     

       17
       17
       -
       let

     

       18
       18
       -
         arrow-testing = fetchFromGitHub {

     

       19
       19
       -
           name = "arrow-testing";

     

       20
       20
       -
           owner = "apache";

     

       21
       21
       -
           repo = "arrow-testing";

     

       22
       22
       -
           rev = "4d209492d514c2d3cb2d392681b9aa00e6d8da1c";

     

       23
       23
       -
           hash = "sha256-IkiCbuy0bWyClPZ4ZEdkEP7jFYLhM7RCuNLd6Lazd4o=";

     

       24
       24
       -
         };

     

       25
       25
       -
       

     

       26
       26
       -
         parquet-testing = fetchFromGitHub {

     

       27
       27
       -
           name = "parquet-testing";

     

       28
       28
       -
           owner = "apache";

     

       29
       29
       -
           repo = "parquet-testing";

     

       30
       30
       -
           rev = "50af3d8ce206990d81014b1862e5ce7380dc3e08";

     

       31
       31
       -
           hash = "sha256-edyv/r5olkj09aHtm8LHZY0b3jUtLNUcufwI41qKYaY=";

     

       32
       32
       -
         };

     

       33
       33
       -
       in

     

       34
       34
       -
       

     

       35
       23
        
       buildPythonPackage rec {

     

       36
       24
        
         pname = "datafusion";

     

       37
       37
       -
         version = "40.1.0";

     

       25
       25
       +
         version = "48.0.0";

     

       38
       26
        
         pyproject = true;

     

       39
       27
        
       

     

       40
       28
        
         src = fetchFromGitHub {

     
···

       42
       30
        
           owner = "apache";

     

       43
       31
        
           repo = "arrow-datafusion-python";

     

       44
       32
        
           tag = version;

     

       45
       45
       -
           hash = "sha256-5WOSlx4XW9zO6oTY16lWQElShLv0ubflVPfSSEGrFgg=";

     

       33
       33
       +
           # Fetch arrow-testing and parquet-testing (tests assets)

     

       34
       34
       +
           fetchSubmodules = true;

     

       35
       35
       +
           hash = "sha256-9IOkb31f4nFo9mWTr+z5ZG8xSXIZSgW3vCBgLaGxpfI=";

     

       46
       36
        
         };

     

       47
       37
        
       

     

       48
       38
        
         cargoDeps = rustPlatform.fetchCargoVendor {

     

       49
       49
       -
           name = "datafusion-cargo-deps";

     

       50
       50
       -
           inherit src;

     

       51
       51
       -
           hash = "sha256-xUpchV4UFEX1HkCpClOwxnEfGLVlOIX4UmzYKiUth9U=";

     

       39
       39
       +
           inherit pname src version;

     

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

     

       52
       41
        
         };

     

       53
       42
        
       

     

       54
       43
        
         nativeBuildInputs = with rustPlatform; [

     
···

       59
       48
        
       

     

       60
       49
        
         buildInputs = [

     

       61
       50
        
           protobuf

     

       62
       62
       -
         ]

     

       63
       63
       -
         ++ lib.optionals stdenv.hostPlatform.isDarwin [

     

       64
       64
       -
           libiconv

     

       65
       51
        
         ];

     

       66
       52
        
       

     

       67
       53
        
         dependencies = [

     
···

       70
       56
        
         ];

     

       71
       57
        
       

     

       72
       58
        
         nativeCheckInputs = [

     

       59
       59
       +
           numpy

     

       60
       60
       +
           pytest-asyncio

     

       73
       61
        
           pytestCheckHook

     

       74
       74
       -
           numpy

     

       75
       62
        
         ];

     

       76
       63
        
       

     

       77
       77
       -
         pythonImportsCheck = [ "datafusion" ];

     

       78
       78
       -
       

     

       79
       79
       -
         pytestFlags = [

     

       80
       80
       -
           "--pyargs"

     

       81
       81
       -
           pname

     

       64
       64
       +
         pythonImportsCheck = [

     

       65
       65
       +
           "datafusion"

     

       66
       66
       +
           "datafusion._internal"

     

       82
       67
        
         ];

     

       83
       68
        
       

     

       84
       69
        
         preCheck = ''

     

       85
       85
       -
           pushd $TMPDIR

     

       86
       86
       -
           ln -s ${arrow-testing} ./testing

     

       87
       87
       -
           ln -s ${parquet-testing} ./parquet

     

       70
       70
       +
           rm -rf python/datafusion

     

       88
       71
        
         '';

     

       89
       72
        
       

     

       90
       90
       -
         postCheck = ''

     

       91
       91
       -
           popd

     

       92
       92
       -
         '';

     

       73
       73
       +
         disabledTests = [

     

       74
       74
       +
           # Exception: DataFusion error (requires internet access)

     

       75
       75
       +
           "test_register_http_csv"

     

       76
       76
       +
         ];

     

       93
       77
        
       

     

       94
       94
       -
         meta = with lib; {

     

       78
       78
       +
         meta = {

     

       95
       79
        
           description = "Extensible query execution framework";

     

       96
       80
        
           longDescription = ''

     

       97
       81
        
             DataFusion is an extensible query execution framework, written in Rust,

     
···

       99
       83
        
           '';

     

       100
       84
        
           homepage = "https://arrow.apache.org/datafusion/";

     

       101
       85
        
           changelog = "https://github.com/apache/arrow-datafusion-python/blob/${version}/CHANGELOG.md";

     

       102
       102
       -
           license = with licenses; [ asl20 ];

     

       103
       103
       -
           maintainers = with maintainers; [ cpcloud ];

     

       86
       86
       +
           license = with lib.licenses; [ asl20 ];

     

       87
       87
       +
           maintainers = with lib.maintainers; [ cpcloud ];

     

       104
       88
        
         };

     

       105
       89
        
       }

pkgs/development/python-modules/rerun-sdk/default.nix

···

       18
       18
        
         typing-extensions,

     

       19
       19
        
       

     

       20
       20
        
         # tests

     

       21
       21
       +
         datafusion,

     

       21
       22
        
         pytestCheckHook,

     

       22
       23
        
         torch,

     

       23
       24
        
       }:

     
···

       64
       65
        
         pythonImportsCheck = [ "rerun" ];

     

       65
       66
        
       

     

       66
       67
        
         nativeCheckInputs = [

     

       68
       68
       +
           datafusion

     

       67
       69
        
           pytestCheckHook

     

       68
       70
        
           torch

     

       69
       71
        
         ];

     
···

       74
       76
        
         disabledTestPaths = [

     

       75
       77
        
           # "fixture 'benchmark' not found"

     

       76
       78
        
           "tests/python/log_benchmark/test_log_benchmark.py"

     

       79
       79
       +
       

     

       80
       80
       +
           # ConnectionError: Connection error: transport error

     

       81
       81
       +
           "rerun_py/tests/unit/test_datafusion_tables.py"

     

       77
       82
        
         ];

     

       78
       83
        
       

     

       79
       84
        
         meta = {