From f3b018344b7323c2fb455fc02c551d96daa5e227 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 23 Jan 2024 04:11:08 +0000 Subject: [PATCH 1/2] beancount-language-server: 1.3.1 -> 1.3.4 --- .../language-servers/beancount-language-server/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/language-servers/beancount-language-server/default.nix b/pkgs/development/tools/language-servers/beancount-language-server/default.nix index 9eb1d746c216..f1dbfdcfff9d 100644 --- a/pkgs/development/tools/language-servers/beancount-language-server/default.nix +++ b/pkgs/development/tools/language-servers/beancount-language-server/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "beancount-language-server"; - version = "1.3.1"; + version = "1.3.4"; src = fetchFromGitHub { owner = "polarmutex"; repo = "beancount-language-server"; rev = "v${version}"; - hash = "sha256-9IkbEOG6xcmpowsLj/RHnMFGQxh02JMQsTVli4hvs/M="; + hash = "sha256-C44Z8JaEZvwgocaGjWT3rUAgIBtCRo0xZappMsydR7g="; }; - cargoHash = "sha256-qhN2//hhCaKpm0HAiUL/CfdrtvAXgR34vXBECB8UDxE="; + cargoHash = "sha256-NMSNCURSO1iIWHH27FI5Y0q7+Ghds8VSxRGBOp+fH6A="; doInstallCheck = true; postInstallCheck = '' From a94f12d7196c38dade2799f8082641e769c32b7d Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 28 Jan 2024 05:57:15 +0100 Subject: [PATCH 2/2] beancount-language-server: fix build on darwin --- .../language-servers/beancount-language-server/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/tools/language-servers/beancount-language-server/default.nix b/pkgs/development/tools/language-servers/beancount-language-server/default.nix index f1dbfdcfff9d..844bc89567d0 100644 --- a/pkgs/development/tools/language-servers/beancount-language-server/default.nix +++ b/pkgs/development/tools/language-servers/beancount-language-server/default.nix @@ -1,6 +1,7 @@ { lib , fetchFromGitHub , rustPlatform +, stdenv }: rustPlatform.buildRustPackage rec { @@ -16,6 +17,11 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-NMSNCURSO1iIWHH27FI5Y0q7+Ghds8VSxRGBOp+fH6A="; + # Workaround for https://github.com/NixOS/nixpkgs/issues/166205 + env = lib.optionalAttrs (stdenv.cc.libcxx != null) { + NIX_LDFLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}"; + }; + doInstallCheck = true; postInstallCheck = '' $out/bin/beancount-language-server --help > /dev/null