From 484eda940bea49bfbc6ca3e4e8c8e48d5789bd6e Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Wed, 19 Nov 2025 17:38:47 +0200 Subject: [PATCH 1/9] git-latexdiff: add doronbehar as maintainer --- pkgs/by-name/gi/git-latexdiff/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/gi/git-latexdiff/package.nix b/pkgs/by-name/gi/git-latexdiff/package.nix index 34f5a33b5e69..160fdfa5e474 100644 --- a/pkgs/by-name/gi/git-latexdiff/package.nix +++ b/pkgs/by-name/gi/git-latexdiff/package.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "View diff on LaTeX source files on the generated PDF files"; homepage = "https://gitlab.com/git-latexdiff/git-latexdiff"; - maintainers = [ ]; + maintainers = with lib.maintainers; [ doronbehar ]; license = lib.licenses.bsd3; # https://gitlab.com/git-latexdiff/git-latexdiff/issues/9 platforms = lib.platforms.unix; mainProgram = "git-latexdiff"; From 619efc7f0de136602b2c60f0ca93de5d6af2abbc Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Wed, 19 Nov 2025 17:39:16 +0200 Subject: [PATCH 2/9] git-latexdiff: use tag argument in src --- pkgs/by-name/gi/git-latexdiff/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/gi/git-latexdiff/package.nix b/pkgs/by-name/gi/git-latexdiff/package.nix index 160fdfa5e474..f03dc904315b 100644 --- a/pkgs/by-name/gi/git-latexdiff/package.nix +++ b/pkgs/by-name/gi/git-latexdiff/package.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitLab { hash = "sha256-DMoGEbCBuqUGjbna3yDpD4WNTikPudYRD4Wy1pPG2mw="; - rev = finalAttrs.version; + tag = finalAttrs.version; repo = "git-latexdiff"; owner = "git-latexdiff"; }; From 480985dd9ac448adcd688c52c6e01cd3b3aac9d8 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Wed, 19 Nov 2025 17:42:41 +0200 Subject: [PATCH 3/9] git-latexdiff: use --replace-fail in substitution --- pkgs/by-name/gi/git-latexdiff/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/gi/git-latexdiff/package.nix b/pkgs/by-name/gi/git-latexdiff/package.nix index f03dc904315b..a092f005edf9 100644 --- a/pkgs/by-name/gi/git-latexdiff/package.nix +++ b/pkgs/by-name/gi/git-latexdiff/package.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' substituteInPlace git-latexdiff \ - --replace "@GIT_LATEXDIFF_VERSION@" "v${finalAttrs.version}" + --replace-fail "@GIT_LATEXDIFF_VERSION@" "v${finalAttrs.version}" patchShebangs git-latexdiff ''; From 19d17a403b6897e13c4f3b605ab885b00efa47ae Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Wed, 19 Nov 2025 17:45:34 +0200 Subject: [PATCH 4/9] git-latexdiff: use a more common order of attributes --- pkgs/by-name/gi/git-latexdiff/package.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/gi/git-latexdiff/package.nix b/pkgs/by-name/gi/git-latexdiff/package.nix index a092f005edf9..5afe2e663242 100644 --- a/pkgs/by-name/gi/git-latexdiff/package.nix +++ b/pkgs/by-name/gi/git-latexdiff/package.nix @@ -11,19 +11,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "git-latexdiff"; src = fetchFromGitLab { - hash = "sha256-DMoGEbCBuqUGjbna3yDpD4WNTikPudYRD4Wy1pPG2mw="; - tag = finalAttrs.version; repo = "git-latexdiff"; owner = "git-latexdiff"; + tag = finalAttrs.version; + hash = "sha256-DMoGEbCBuqUGjbna3yDpD4WNTikPudYRD4Wy1pPG2mw="; }; - buildInputs = [ - git - bash - ]; - - dontBuild = true; - patches = [ ./version-test.patch ]; postPatch = '' @@ -32,6 +25,13 @@ stdenv.mkDerivation (finalAttrs: { patchShebangs git-latexdiff ''; + buildInputs = [ + git + bash + ]; + + dontBuild = true; + installPhase = '' mkdir -p $prefix/bin mv git-latexdiff $prefix/bin From 95c75a44b5d3aee003e6a94a7d4d3b27bc079e87 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Wed, 19 Nov 2025 17:44:23 +0200 Subject: [PATCH 5/9] git-latexdiff: use installShellFiles --- pkgs/by-name/gi/git-latexdiff/package.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gi/git-latexdiff/package.nix b/pkgs/by-name/gi/git-latexdiff/package.nix index 5afe2e663242..9c62b950777c 100644 --- a/pkgs/by-name/gi/git-latexdiff/package.nix +++ b/pkgs/by-name/gi/git-latexdiff/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitLab, + installShellFiles, git, bash, }: @@ -25,6 +26,10 @@ stdenv.mkDerivation (finalAttrs: { patchShebangs git-latexdiff ''; + nativeBuildInputs = [ + installShellFiles + ]; + buildInputs = [ git bash @@ -33,9 +38,7 @@ stdenv.mkDerivation (finalAttrs: { dontBuild = true; installPhase = '' - mkdir -p $prefix/bin - mv git-latexdiff $prefix/bin - chmod +x $prefix/bin/git-latexdiff + installBin git-latexdiff ''; meta = { From 9f79fd7ec187f0dfc2110c2f7eb1f3b14e5b8c9a Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 20 Nov 2025 08:32:52 +0200 Subject: [PATCH 6/9] git-latexdiff: install manual page --- pkgs/by-name/gi/git-latexdiff/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/gi/git-latexdiff/package.nix b/pkgs/by-name/gi/git-latexdiff/package.nix index 9c62b950777c..46972784aec3 100644 --- a/pkgs/by-name/gi/git-latexdiff/package.nix +++ b/pkgs/by-name/gi/git-latexdiff/package.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitLab, installShellFiles, + asciidoc, git, bash, }: @@ -28,6 +29,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ installShellFiles + asciidoc ]; buildInputs = [ @@ -39,6 +41,8 @@ stdenv.mkDerivation (finalAttrs: { installPhase = '' installBin git-latexdiff + make git-latexdiff.1 + installManPage git-latexdiff.1 ''; meta = { From 8d25cd9fc965a448b3f4cbf3a007578903b502eb Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Wed, 19 Nov 2025 17:47:50 +0200 Subject: [PATCH 7/9] git-latexdiff: use versionCheckHook; wrap it properly Wrap it with coreutils & gnused for no errors in --help --- pkgs/by-name/gi/git-latexdiff/package.nix | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/gi/git-latexdiff/package.nix b/pkgs/by-name/gi/git-latexdiff/package.nix index 46972784aec3..fd181fe4a084 100644 --- a/pkgs/by-name/gi/git-latexdiff/package.nix +++ b/pkgs/by-name/gi/git-latexdiff/package.nix @@ -4,8 +4,10 @@ fetchFromGitLab, installShellFiles, asciidoc, - git, - bash, + makeBinaryWrapper, + coreutils, + gnused, + versionCheckHook, }: stdenv.mkDerivation (finalAttrs: { @@ -30,17 +32,25 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ installShellFiles asciidoc + makeBinaryWrapper ]; - buildInputs = [ - git - bash + nativeInstallCheckInputs = [ + versionCheckHook ]; + doInstallCheck = true; dontBuild = true; installPhase = '' installBin git-latexdiff + wrapProgram ''${!outputBin}/bin/git-latexdiff \ + --prefix PATH : ${ + lib.makeBinPath [ + coreutils + gnused + ] + } make git-latexdiff.1 installManPage git-latexdiff.1 ''; From 5fe88ae4bd86b39e037dd09ad5ba18833d9bf33f Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 20 Nov 2025 08:28:50 +0200 Subject: [PATCH 8/9] git-latexdiff: 1.6.0 -> 1.7.1 Diff: https://gitlab.com/git-latexdiff/git-latexdiff/-/compare/1.6.0...1.7.1 --- pkgs/by-name/gi/git-latexdiff/package.nix | 6 ++---- .../by-name/gi/git-latexdiff/version-test.patch | 17 ----------------- 2 files changed, 2 insertions(+), 21 deletions(-) delete mode 100644 pkgs/by-name/gi/git-latexdiff/version-test.patch diff --git a/pkgs/by-name/gi/git-latexdiff/package.nix b/pkgs/by-name/gi/git-latexdiff/package.nix index fd181fe4a084..69acfd533d9e 100644 --- a/pkgs/by-name/gi/git-latexdiff/package.nix +++ b/pkgs/by-name/gi/git-latexdiff/package.nix @@ -11,18 +11,16 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "1.6.0"; + version = "1.7.1"; pname = "git-latexdiff"; src = fetchFromGitLab { repo = "git-latexdiff"; owner = "git-latexdiff"; tag = finalAttrs.version; - hash = "sha256-DMoGEbCBuqUGjbna3yDpD4WNTikPudYRD4Wy1pPG2mw="; + hash = "sha256-ocEDds1vAnaj84YiAez150OZV82w3NlsgXoxNbUGW/Q="; }; - patches = [ ./version-test.patch ]; - postPatch = '' substituteInPlace git-latexdiff \ --replace-fail "@GIT_LATEXDIFF_VERSION@" "v${finalAttrs.version}" diff --git a/pkgs/by-name/gi/git-latexdiff/version-test.patch b/pkgs/by-name/gi/git-latexdiff/version-test.patch deleted file mode 100644 index 243bd90f9005..000000000000 --- a/pkgs/by-name/gi/git-latexdiff/version-test.patch +++ /dev/null @@ -1,17 +0,0 @@ -Fix for https://gitlab.com/git-latexdiff/git-latexdiff/issues/7 ---- ---- src/git-latexdiff 2016-01-26 14:04:54.338568955 +0100 -+++ src/git-latexdiff 2016-01-26 14:40:23.700381943 +0100 -@@ -44,11 +44,7 @@ - git_latexdiff_version='@GIT_LATEXDIFF_VERSION@' - - git_latexdiff_compute_version () { -- if [ "$git_latexdiff_version" = '@GIT_LATEXDIFF''_VERSION@' ]; then -- (cd "$(dirname "$0")" && git describe --tags HEAD 2>/dev/null || echo 'Unknown version') -- else -- echo "$git_latexdiff_version" -- fi -+ echo "$git_latexdiff_version" - } - - usage () { From c10f03f52bf1207a10047eac13ccfbf39f1ac3f2 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 24 Nov 2025 12:21:11 +0200 Subject: [PATCH 9/9] texlivePackages.git-latexdiff: inherit top-level attribute --- pkgs/tools/typesetting/tex/texlive/default.nix | 2 ++ pkgs/tools/typesetting/tex/texlive/tlpdb-overrides.nix | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index 94bd06efacaa..155c2c801983 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -14,6 +14,7 @@ buildEnv, callPackage, ghostscript_headless, + git-latexdiff, harfbuzz, makeWrapper, installShellFiles, @@ -79,6 +80,7 @@ let gawk getopt ghostscript_headless + git-latexdiff gnugrep gnumake gnupg diff --git a/pkgs/tools/typesetting/tex/texlive/tlpdb-overrides.nix b/pkgs/tools/typesetting/tex/texlive/tlpdb-overrides.nix index 489fc23c05eb..df72bce8ffc1 100644 --- a/pkgs/tools/typesetting/tex/texlive/tlpdb-overrides.nix +++ b/pkgs/tools/typesetting/tex/texlive/tlpdb-overrides.nix @@ -12,6 +12,7 @@ gawk, getopt, ghostscript_headless, + git-latexdiff, gnugrep, gnumake, gnupg, @@ -545,6 +546,12 @@ lib.recursiveUpdate orig rec { fi ''; + # Use top-level git-latexdiff's version and src. NOTE that this derivation is + # still different from top-level's `git-latexdiff`, due to __structuredAttrs + # enabled unconditionally. Still though this derivation produces a funcitonal + # binary. + inherit git-latexdiff; + # RISC-V: https://github.com/LuaJIT/LuaJIT/issues/628 luajittex.binfiles = lib.optionals (lib.meta.availableOn stdenv.hostPlatform luajit) orig.luajittex.binfiles;