From cb51f7683573ec227fb5acd29f39dabe0291a0c8 Mon Sep 17 00:00:00 2001 From: Luis Eduardo Bueso de Barrio Date: Fri, 6 Mar 2026 21:05:17 +0100 Subject: [PATCH] texlab-patch removed --- flake.lock | 20 ++++++++++- flake.nix | 7 +--- pkgs/default.nix | 32 ++++++----------- pkgs/texlab/default.nix | 24 ------------- pkgs/texlab/patches/subfile-diagnostics.patch | 36 ------------------- 5 files changed, 30 insertions(+), 89 deletions(-) delete mode 100644 pkgs/texlab/default.nix delete mode 100644 pkgs/texlab/patches/subfile-diagnostics.patch diff --git a/flake.lock b/flake.lock index 075c25e..b96b7ac 100644 --- a/flake.lock +++ b/flake.lock @@ -352,7 +352,8 @@ "flake-utils": "flake-utils", "jailed-agents": "jailed-agents", "mcp-servers": "mcp-servers", - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_6", + "texlab-src": "texlab-src" } }, "systems": { @@ -445,6 +446,23 @@ "type": "github" } }, + "texlab-src": { + "flake": false, + "locked": { + "lastModified": 1767083273, + "narHash": "sha256-hd7fDnZqNEz4Ayop3uPqL4IU6xgGsTjMhGvgF+Trgcw=", + "owner": "latex-lsp", + "repo": "texlab", + "rev": "d89bf0fa65bd931ab57183d067f66189fc31e6c9", + "type": "github" + }, + "original": { + "owner": "latex-lsp", + "ref": "v5.25.1", + "repo": "texlab", + "type": "github" + } + }, "treefmt-nix": { "inputs": { "nixpkgs": [ diff --git a/flake.nix b/flake.nix index 19b353f..fc37b61 100644 --- a/flake.nix +++ b/flake.nix @@ -15,10 +15,6 @@ flake-utils.url = "github:numtide/flake-utils"; jailed-agents.url = "git+https://gitea@gitea.bueso.eu/luis/jailed-agents"; mcp-servers.url = "git+https://gitea@gitea.bueso.eu/luis/mcp-servers"; - texlab-src = { - url = "github:latex-lsp/texlab/v5.25.1"; - flake = false; - }; }; outputs = @@ -28,7 +24,6 @@ flake-utils, jailed-agents, mcp-servers, - texlab-src, }: flake-utils.lib.eachDefaultSystem ( system: @@ -37,7 +32,7 @@ in { packages = import ./pkgs { - inherit pkgs texlab-src; + inherit pkgs; }; devShells.default = import ./devshells { diff --git a/pkgs/default.nix b/pkgs/default.nix index 93acd84..6230a68 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -1,28 +1,16 @@ { pkgs, - texlab-src ? null, }: let - self = - { - example-a = pkgs.callPackage ./example-a { }; - example-b = pkgs.callPackage ./example-b { }; - pyzotero = pkgs.callPackage ./pyzotero { }; - pyzotero-cli = pkgs.callPackage ./pyzotero-cli { - pyzotero = self.pyzotero; - }; - khal-export = pkgs.callPackage ./khal-export { }; - org-zotero-export = pkgs.callPackage ./org-zotero-export { }; - } - // ( - if texlab-src != null then - { - texlab = pkgs.callPackage ./texlab { - inherit texlab-src; - }; - } - else - { } - ); + self = { + example-a = pkgs.callPackage ./example-a { }; + example-b = pkgs.callPackage ./example-b { }; + pyzotero = pkgs.callPackage ./pyzotero { }; + pyzotero-cli = pkgs.callPackage ./pyzotero-cli { + pyzotero = self.pyzotero; + }; + khal-export = pkgs.callPackage ./khal-export { }; + org-zotero-export = pkgs.callPackage ./org-zotero-export { }; + }; in self // { default = self.example-a; } diff --git a/pkgs/texlab/default.nix b/pkgs/texlab/default.nix deleted file mode 100644 index f8f8671..0000000 --- a/pkgs/texlab/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ - lib, - rustPlatform, - pkg-config, - openssl, - texlab-src, -}: -rustPlatform.buildRustPackage { - pname = "texlab"; - version = "5.25.1-patched"; - src = texlab-src; - cargoLock.lockFile = "${texlab-src}/Cargo.lock"; - patches = [ ./patches/subfile-diagnostics.patch ]; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ]; - - meta = { - description = "Texlab with subfile diagnostic fix"; - mainProgram = "texlab"; - license = lib.licenses.mit; - platforms = lib.platforms.all; - }; -} diff --git a/pkgs/texlab/patches/subfile-diagnostics.patch b/pkgs/texlab/patches/subfile-diagnostics.patch deleted file mode 100644 index 3277f29..0000000 --- a/pkgs/texlab/patches/subfile-diagnostics.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/crates/diagnostics/src/build_log.rs b/crates/diagnostics/src/build_log.rs -index 1234567..abcdefg 100644 ---- a/crates/diagnostics/src/build_log.rs -+++ b/crates/diagnostics/src/build_log.rs -@@ -14,8 +14,13 @@ pub fn update( - - let data = log_document.data.as_log()?; - -- let parents = deps::parents(workspace, log_document); -- let root_document = parents.iter().next()?; -+ // Try to find the compiled .tex file from the log file name first. -+ // This handles subfile compilation where the subfile is the actual root. -+ let root_document = find_compiled_document(workspace, log_document) -+ .or_else(|| { -+ // Fallback to original behavior: find parent via dependency graph -+ deps::parents(workspace, log_document).into_iter().next() -+ })?; - - let base_path = root_document - .path -@@ -57,3 +62,14 @@ fn find_range_of_hint(document: &Document, error: &BuildError) -> Option `/path/to/chapter.tex` -+fn find_compiled_document<'a>( -+ workspace: &'a Workspace, -+ log_document: &Document, -+) -> Option<&'a Document> { -+ let log_path = log_document.path.as_ref()?; -+ let tex_path = log_path.with_extension("tex"); -+ let tex_uri = Url::from_file_path(&tex_path).ok()?; -+ workspace.lookup(&tex_uri) -+}