commit 92ad187a934f82e5a38e7959bd22104ee10fd73f · pyrox.dev/nixpkgs

+3 -3

pkgs/servers/nosql/influxdb2/cli.nix

···

       5
       5
        
       }:

     

       6
       6
        
       

     

       7
       7
        
       let

     

       8
       8
       -
         version = "2.4.0";

     

       8
       8
       +
         version = "2.5.0";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchFromGitHub {

     

       11
       11
        
           owner = "influxdata";

     

       12
       12
        
           repo = "influx-cli";

     

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

     

       14
       14
       -
           sha256 = "sha256-l27BAHQtMA4kE7VEZLdOPFnSXtyWUOrcUFitaWqwvTw=";

     

       14
       14
       +
           sha256 = "sha256-gztLANO42VbgA6LxiuVh8ESF20JqjC+7znYhmWJKxVA=";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
       in buildGoModule {

     

       18
       18
        
         pname = "influx-cli";

     

       19
       19
        
         version = version;

     

       20
       20
       -
         src = src;

     

       20
       20
       +
         inherit src;

     

       21
       21
        
       

     

       22
       22
        
         vendorSha256 = "sha256-GnVLr9mWehgw8vs4RiOrFHVlPpPT/LP6XvCq94aJxJQ=";

     

       23
       23
        
         subPackages = [ "cmd/influx" ];

+12 -22

pkgs/servers/nosql/influxdb2/default.nix

···

       13
       13
        
       }:

     

       14
       14
        
       

     

       15
       15
        
       let

     

       16
       16
       -
         version = "2.4.0";

     

       16
       16
       +
         version = "2.5.1";

     

       17
       17
        
         # Despite the name, this is not a rolling release. This is the

     

       18
       18
       -
         # version of the UI assets for 2.4.0, as specified in

     

       19
       19
       -
         # scripts/fetch-ui-assets.sh in the 2.4.0 tag of influxdb.

     

       20
       20
       -
         ui_version = "Master";

     

       21
       21
       -
         libflux_version = "0.179.0";

     

       18
       18
       +
         # version of the UI assets for 2.5.1, as specified in

     

       19
       19
       +
         # scripts/fetch-ui-assets.sh in the 2.5.1 tag of influxdb.

     

       20
       20
       +
         ui_version = "OSS-2022-09-16";

     

       21
       21
       +
         libflux_version = "0.188.1";

     

       22
       22
        
       

     

       23
       23
        
         src = fetchFromGitHub {

     

       24
       24
        
           owner = "influxdata";

     

       25
       25
        
           repo = "influxdb";

     

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

     

       27
       27
       -
           sha256 = "sha256-ufJnrVWVfia2/xLRmFkauCw8ktdSJUybJkv42Gd0npg=";

     

       27
       27
       +
           sha256 = "sha256-AKyuFBja06BuWYliqIGKOb4PIc5G8S9S+cf/dLrEATY=";

     

       28
       28
        
         };

     

       29
       29
        
       

     

       30
       30
        
         ui = fetchurl {

     

       31
       31
       -
           url = "https://github.com/influxdata/ui/releases/download/OSS-${ui_version}/build.tar.gz";

     

       31
       31
       +
           url = "https://github.com/influxdata/ui/releases/download/${ui_version}/build.tar.gz";

     

       32
       32
        
           sha256 = "sha256-YKDp1jLyo4n+YTeMaWl8dhN4Lr3H8FXV7stJ3p3zFe8=";

     

       33
       33
        
         };

     

       34
       34
        
       

     
···

       39
       39
        
             owner = "influxdata";

     

       40
       40
        
             repo = "flux";

     

       41
       41
        
             rev = "v${libflux_version}";

     

       42
       42
       -
             sha256 = "sha256-xcsmvT8Ve1WbfwrdVPnJcj7RAvrk795N3C95ubbGig0=";

     

       42
       42
       +
             sha256 = "sha256-Xmh7V/o1Gje62kcnTeB9h/fySljhfu+tjbyvryvIGRc=";

     

       43
       43
        
           };

     

       44
       44
       -
           patches = [

     

       45
       45
       -
             # https://github.com/influxdata/flux/pull/5273

     

       46
       46
       -
             # fix compile error with Rust 1.64

     

       47
       47
       -
             (fetchpatch {

     

       48
       48
       -
               url = "https://github.com/influxdata/flux/commit/20ca62138a0669f2760dd469ca41fc333e04b8f2.patch";

     

       49
       49
       -
               stripLen = 2;

     

       50
       50
       -
               extraPrefix = "";

     

       51
       51
       -
               sha256 = "sha256-Fb4CuH9ZvrPha249dmLLI8MqSNQRKqKPxPbw2pjqwfY=";

     

       52
       52
       -
             })

     

       53
       53
       -
           ];

     

       54
       44
        
           sourceRoot = "source/libflux";

     

       55
       55
       -
           cargoSha256 = "sha256-+hJQFV0tWeTQDN560DzROUNpdkcZ5h2sc13akHCgqPc=";

     

       45
       45
       +
           cargoSha256 = "sha256-9rPW0lgi3lXJARa1KXgSY8LVJsoFjppok5ODGlqYeYw=";

     

       56
       46
        
           nativeBuildInputs = [ llvmPackages.libclang ];

     

       57
       47
        
           buildInputs = lib.optional stdenv.isDarwin libiconv;

     

       58
       48
        
           LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib";

     
···

       77
       67
        
       in buildGoModule {

     

       78
       68
        
         pname = "influxdb";

     

       79
       69
        
         version = version;

     

       80
       80
       -
         src = src;

     

       70
       70
       +
         inherit src;

     

       81
       71
        
       

     

       82
       72
        
         nativeBuildInputs = [ go-bindata pkg-config perl ];

     

       83
       73
        
       

     

       84
       84
       -
         vendorSha256 = "sha256-DZsd6qPKfRbnvz0UAww+ubaeTEqQxLeil1S3SZAmmJk=";

     

       74
       74
       +
         vendorSha256 = "sha256-02x+HsWkng7OnKVSfkQR8LL1Qk42Bdrw0IMtBpS7xQc=";

     

       85
       75
        
         subPackages = [ "cmd/influxd" "cmd/telemetryd" ];

     

       86
       76
        
       

     

       87
       77
        
         PKG_CONFIG_PATH = "${flux}/pkgconfig";

     
···

       102
       92
        
               exit 1

     

       103
       93
        
             fi

     

       104
       94
        
       

     

       105
       105
       -
             ui_ver=$(egrep 'influxdata/ui/releases/.*/sha256.txt' scripts/fetch-ui-assets.sh | perl -pe 's#.*/OSS-([^/]+)/.*#$1#')

     

       95
       95
       +
             ui_ver=$(egrep 'UI_RELEASE=".*"' scripts/fetch-ui-assets.sh | cut -d'"' -f2)

     

       106
       96
        
             if [ "$ui_ver" != "${ui_version}" ]; then

     

       107
       97
        
               echo "scripts/fetch-ui-assets.sh wants UI $ui_ver, but nix derivation provides ${ui_version}"

     

       108
       98
        
               exit 1