From 0912afd6efd0f7acc0855dbefe94b0eac3c016f9 Mon Sep 17 00:00:00 2001
From: Kira Bruneau <kira.bruneau@pm.me>
Date: Sat, 5 Nov 2022 02:48:19 +0000
Subject: [PATCH 1/2] =?UTF-8?q?texlab:=204.3.0=20=E2=86=92=204.3.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pkgs/development/tools/misc/texlab/default.nix | 18 +++++-------------
1 file changed, 5 insertions(+), 13 deletions(-)
diff --git a/pkgs/development/tools/misc/texlab/default.nix b/pkgs/development/tools/misc/texlab/default.nix
index cd57796b0bc3..017d82c4e661 100644
--- a/pkgs/development/tools/misc/texlab/default.nix
+++ b/pkgs/development/tools/misc/texlab/default.nix
@@ -14,16 +14,16 @@ let
isCross = stdenv.hostPlatform != stdenv.buildPlatform;
in rustPlatform.buildRustPackage rec {
pname = "texlab";
- version = "4.3.0";
+ version = "4.3.1";
src = fetchFromGitHub {
owner = "latex-lsp";
repo = pname;
rev = "refs/tags/v${version}";
- sha256 = "sha256-PhzxWLkqsHU32vIZwHzdy86bwIzDDmnxp12PS774P3k=";
+ sha256 = "sha256-gtPnuKmKfUBZDM6DATJB5NxndOwvG5JpBRO4cEU6lIU=";
};
- cargoSha256 = "sha256-tH566L0oHnI9mNp1KtJYaBaWCkiAOrtBYkfVSCA2N6w=";
+ cargoSha256 = "sha256-nu2KltPgexBTxG13kUgHgMrxefPD+Gaj5qBIWWFPdFs=";
outputs = [ "out" ] ++ lib.optional (!isCross) "man";
@@ -36,19 +36,11 @@ in rustPlatform.buildRustPackage rec {
CoreServices
];
- postInstall = ''
- # Remove generated dylib of human_name dependency. TexLab statically
- # links to the generated rlib and doesn't reference the dylib. I
- # couldn't find any way to prevent building this by passing cargo flags.
- # See https://github.com/djudd/human-name/blob/master/Cargo.toml#L43
- rm "$out/lib/libhuman_name${stdenv.hostPlatform.extensions.sharedLibrary}"
- rmdir "$out/lib"
- ''
# When we cross compile we cannot run the output executable to
# generate the man page
- + lib.optionalString (!isCross) ''
+ postInstall = lib.optionalString (!isCross) ''
# TexLab builds man page separately in CI:
- # https://github.com/latex-lsp/texlab/blob/v4.3.0/.github/workflows/publish.yml#L131-L135
+ # https://github.com/latex-lsp/texlab/blob/v4.3.1/.github/workflows/publish.yml#L126-L130
help2man --no-info "$out/bin/texlab" > texlab.1
installManPage texlab.1
'';
From 9f07f3bc7e382eda7dcc1366c0aa88a08e44b976 Mon Sep 17 00:00:00 2001
From: Kira Bruneau <kira.bruneau@pm.me>
Date: Mon, 12 Sep 2022 13:10:59 -0400
Subject: [PATCH 2/2] texlab: format with nixpkgs-fmt
---
pkgs/development/tools/misc/texlab/default.nix | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/pkgs/development/tools/misc/texlab/default.nix b/pkgs/development/tools/misc/texlab/default.nix
index 017d82c4e661..d33ac023fcd3 100644
--- a/pkgs/development/tools/misc/texlab/default.nix
+++ b/pkgs/development/tools/misc/texlab/default.nix
@@ -12,13 +12,14 @@
let
isCross = stdenv.hostPlatform != stdenv.buildPlatform;
-in rustPlatform.buildRustPackage rec {
+in
+rustPlatform.buildRustPackage rec {
pname = "texlab";
version = "4.3.1";
src = fetchFromGitHub {
owner = "latex-lsp";
- repo = pname;
+ repo = "texlab";
rev = "refs/tags/v${version}";
sha256 = "sha256-gtPnuKmKfUBZDM6DATJB5NxndOwvG5JpBRO4cEU6lIU=";
};
@@ -28,7 +29,7 @@ in rustPlatform.buildRustPackage rec {
outputs = [ "out" ] ++ lib.optional (!isCross) "man";
nativeBuildInputs = [ installShellFiles ]
- ++ lib.optional (!isCross) help2man;
+ ++ lib.optional (!isCross) help2man;
buildInputs = lib.optionals stdenv.isDarwin [
libiconv