Unverified Commit 41f16ee6 authored by Nick Cao's avatar Nick Cao Committed by GitHub
Browse files

Merge pull request #231545 from figsoda/tremor 

tremor-rs: fix build, unpin openssl
parents 699700ce 51883ea1

pkgs/tools/misc/tremor-rs/default.nix

+8 −0
Original line number Diff line number Diff line
@@ -38,6 +38,14 @@ rustPlatform.buildRustPackage rec { 
  buildInputs = [ openssl ]

    ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security libiconv ];



  # relax lints to fix an error caused by invalid macro_export

  # error: `log_error` isn't a valid `#[macro_export]` argument

  # note: `#[deny(invalid_macro_export_arguments)]` implied by `#[deny(warnings)]`

  postPatch = ''

    substituteInPlace src/lib.rs \

      --replace '#![deny(' '#![warn('

  '';



  # TODO export TREMOR_PATH($out/lib) variable

  postInstall = ''

    # Copy the standard library to $out/lib

pkgs/top-level/all-packages.nix

+0 −1
Original line number Diff line number Diff line
@@ -13661,7 +13661,6 @@ with pkgs; 














  tremor-rs = callPackage ../tools/misc/tremor-rs {















    inherit (darwin.apple_sdk.frameworks) Security;













    openssl = openssl_1_1;















  };





























  tremor-language-server = callPackage ../tools/misc/tremor-rs/ls.nix { };