commit 4b1a98bf84e08aa3976721f29352b4a8ad0928ae · pyrox.dev/nixpkgs

+8 -17
pkgs/by-name/ap/apache-orc/package.nix
···

       7
       7
        
         cmake,

     

       8
       8
        
         gtest,

     

       9
       9
        
         lz4,

     

       10
       10
       -
         protobuf,

     

       10
       10
       +
         protobuf_30,

     

       11
       11
        
         snappy,

     

       12
       12
        
         zlib,

     

       13
       13
        
         zstd,

     
···

       15
       15
        
       

     

       16
       16
        
       let

     

       17
       17
        
         orc-format = fetchurl {

     

       18
       18
       -
           name = "orc-format-1.0.0.tar.gz";

     

       19
       19
       -
           url = "https://www.apache.org/dyn/closer.lua/orc/orc-format-1.0.0/orc-format-1.0.0.tar.gz?action=download";

     

       20
       20
       -
           hash = "sha256-c5+uX/lLH4ErQTB3KANhBFv5LlEO8Es0phDiOpRdjNU=";

     

       18
       18
       +
           name = "orc-format-1.1.0.tar.gz";

     

       19
       19
       +
           url = "https://www.apache.org/dyn/closer.lua/orc/orc-format-1.1.0/orc-format-1.1.0.tar.gz?action=download";

     

       20
       20
       +
           hash = "sha256-1KesdsVEKr9xGeLLhOcbZ34HWv9TUYqoZgVeLq0EUNc=";

     

       21
       21
        
         };

     

       22
       22
        
       in

     

       23
       23
        
       stdenv.mkDerivation (finalAttrs: {

     

       24
       24
        
         pname = "apache-orc";

     

       25
       25
       -
         version = "2.1.1";

     

       25
       25
       +
         version = "2.1.2";

     

       26
       26
        
       

     

       27
       27
        
         src = fetchFromGitHub {

     

       28
       28
        
           owner = "apache";

     

       29
       29
        
           repo = "orc";

     

       30
       30
        
           tag = "v${finalAttrs.version}";

     

       31
       31
       -
           hash = "sha256-Ib02mIUQaLEVwIBv5xdKDyX+FeI8vhh9+5hM7miKwHo=";

     

       31
       31
       +
           hash = "sha256-hNKzqNOagBJOWQRebkVHIuvqfpk9Mi30bu4z7dGbsxk=";

     

       32
       32
        
         };

     

       33
       33
        
       

     

       34
       34
       -
         patches = [

     

       35
       35
       -
           # Patch that adds 2 missing imports in source files

     

       36
       36
       -
           # To be removed this PR land: https://github.com/apache/orc/pull/2175

     

       37
       37
       -
           (fetchpatch {

     

       38
       38
       -
             url = "https://github.com/apache/orc/commit/fb20db2440226da6b92d38ce260e5b850d2f0092.patch";

     

       39
       39
       -
             hash = "sha256-rHGECXJoBPgZ62yZciYdSMq4pGnVt75lxkHyO46IiyQ=";

     

       40
       40
       -
           })

     

       41
       41
       -
         ];

     

       42
       42
       -
       

     

       43
       34
        
         nativeBuildInputs = [

     

       44
       35
        
           cmake

     

       45
       36
        
         ];

     
···

       47
       38
        
         buildInputs = [

     

       48
       39
        
           gtest

     

       49
       40
        
           lz4

     

       50
       50
       -
           protobuf

     

       41
       41
       +
           protobuf_30

     

       51
       42
        
           snappy

     

       52
       43
        
           zlib

     

       53
       44
        
           zstd

     
···

       64
       55
        
           GTEST_HOME = gtest.dev;

     

       65
       56
        
           LZ4_ROOT = lz4;

     

       66
       57
        
           ORC_FORMAT_URL = orc-format;

     

       67
       67
       -
           PROTOBUF_HOME = protobuf;

     

       58
       58
       +
           PROTOBUF_HOME = protobuf_30;

     

       68
       59
        
           SNAPPY_ROOT = snappy.dev;

     

       69
       60
        
           ZLIB_ROOT = zlib.dev;

     

       70
       61
        
           ZSTD_ROOT = zstd.dev;