Unverified Commit 746c1846 authored by Mitchell Skaggs's avatar Mitchell Skaggs
Browse files

influxdb: 1.10.5 -> 1.10.7 

New patch addresses issues with Rust 1.78 until `influxdb` updates `flux >= v0.195.0`.
parent 541458b4

pkgs/servers/nosql/influxdb/default.nix

+12 −12
Original line number Diff line number Diff line 
{ lib, buildGoModule, fetchFromGitHub, stdenv, pkg-config, rustPlatform, libiconv, fetchpatch, nixosTests }:



let

  libflux_version = "0.188.0";

  libflux_version = "0.194.5";



  # This is copied from influxdb2 with flux version matching the needed by thi

  # This is copied from influxdb2 with the required flux version

  flux = rustPlatform.buildRustPackage rec {

    pname = "libflux";

    version = "v${libflux_version}";
@@ -11,21 +11,21 @@ let 
      owner = "influxdata";

      repo = "flux";

      rev = "v${libflux_version}";

      hash = "sha256-4Z6Vfdyh0zimQlE47plSIjTWBYiju0Qu09M+MgMQOL4=";

      hash = "sha256-XHT/+JMu5q1cPjZT2x/OKEPgxFJcnjrQKqn8w9/Mb3s=";

    };

    patches = [

      # https://github.com/influxdata/flux/pull/5440

      # fix compile error with Rust 1.72.0

      # Fix build on Rust 1.78 (included after v0.195.0)

      (fetchpatch {

        url = "https://github.com/influxdata/flux/commit/8d1d6c8b485eb7e15b6a5f57762d1f766b17defd.patch";

        name = "fix-build-on-rust-1.78.patch";

        url = "https://github.com/influxdata/flux/commit/68c831c40b396f0274f6a9f97d77707c39970b02.patch";

        stripLen = 2;

        extraPrefix = "";

        hash = "sha256-BDBmGKsC2RWMyObDm7dPwFq/3cVIdBKF8ZVaCL+uftw=";

        includes = [ "flux/src/lib.rs" ];

        excludes = [ ];

        hash = "sha256-6LOTgbOCfETNTmshyXgtDZf9y4t/2iqRuVPkz9dYPHc=";

      })

    ];

    sourceRoot = "${src.name}/libflux";

    cargoHash = "sha256-925U9weBOvMuyApsTOjtQxik3nqT2UpK+DPM64opc7c=";

    cargoHash = "sha256-O+t4f4P5291BuyARH6Xf3LejMFEQEBv+qKtyjHRhclA=";

    nativeBuildInputs = [ rustPlatform.bindgenHook ];

    buildInputs = lib.optional stdenv.isDarwin libiconv;

    pkgcfg = ''
@@ -48,16 +48,16 @@ let 
in

buildGoModule rec {

  pname = "influxdb";

  version = "1.10.5";

  version = "1.10.7";



  src = fetchFromGitHub {

    owner = "influxdata";

    repo = pname;

    rev = "v${version}";

    hash = "sha256-FvKGNqy27q6/X2DI/joJXfGVrax6hQcNcx5nJDeSLm0=";

    hash = "sha256-Aibu3yG/D1501Hr2F2qsGvjig14tbEAI+MBfqbxlpg8=";

  };



  vendorHash = "sha256-1jeZBVmNOxF5NPlTKg+YRw6VqIIZDcT3snnoMLX3y4g=";

  vendorHash = "sha256-AA6uj7PgXjC+IK2ZSwRnYpHS4MFScOROO1BpP+s33IU=";



  nativeBuildInputs = [ pkg-config ];