summaryrefslogtreecommitdiffstats
path: root/pkgs
diff options
context:
space:
mode:
authorqfjp <qfjp@protonmail.com>2018-11-18 18:56:02 -0500
committerRenaud <c0bw3b@users.noreply.github.com>2018-11-19 00:56:02 +0100
commita6ddb1f666369305c7a6a6efb094be9a241d0f98 (patch)
tree0aa4d4e296c7c8c1766090d0ddd680050b546148 /pkgs
parent487235e2f0492f40514d07042afa8558208eaece (diff)
git-latexdiff: 1.1.2 -> 1.3.0
* git-latexdiff: v1.1.2 -> v1.3.0 (#50217) * git-latexdiff: refresh meta Homepage is https://gitlab.com/git-latexdiff/git-latexdiff License is BSD 3-Clause
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/tools/typesetting/git-latexdiff/default.nix10
-rw-r--r--pkgs/tools/typesetting/git-latexdiff/shebang.patch10
-rw-r--r--pkgs/tools/typesetting/git-latexdiff/version-test.patch6
3 files changed, 9 insertions, 17 deletions
diff --git a/pkgs/tools/typesetting/git-latexdiff/default.nix b/pkgs/tools/typesetting/git-latexdiff/default.nix
index 61c05666726e..a255779c08a3 100644
--- a/pkgs/tools/typesetting/git-latexdiff/default.nix
+++ b/pkgs/tools/typesetting/git-latexdiff/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchFromGitLab, git, bash }:
stdenv.mkDerivation rec {
- version = "1.1.2";
+ version = "1.3.0";
name = "git-latexdiff-${version}";
src = fetchFromGitLab {
- sha256 = "1alnrjcf3f1qv7fk8h9yachmdz7mjgcynlgsvchfgcb2cpdavxjg";
+ sha256 = "05fnhr1pqvj8l25vi9hdccwfk4mv2f0pfhn05whbdvf66gyl4fs9";
rev = "v${version}";
repo = "git-latexdiff";
owner = "git-latexdiff";
@@ -15,11 +15,12 @@ stdenv.mkDerivation rec {
dontBuild = true;
- patches = [ ./shebang.patch ./version-test.patch ];
+ patches = [ ./version-test.patch ];
postPatch = ''
substituteInPlace git-latexdiff \
--replace "@GIT_LATEXDIFF_VERSION@" "v${version}"
+ patchShebangs git-latexdiff
'';
installPhase = ''
@@ -30,8 +31,9 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "View diff on LaTeX source files on the generated PDF files";
+ homepage = https://gitlab.com/git-latexdiff/git-latexdiff;
maintainers = [ ];
- license = licenses.free; # https://gitlab.com/git-latexdiff/git-latexdiff/issues/9
+ license = licenses.bsd3; # https://gitlab.com/git-latexdiff/git-latexdiff/issues/9
platforms = platforms.unix;
};
}
diff --git a/pkgs/tools/typesetting/git-latexdiff/shebang.patch b/pkgs/tools/typesetting/git-latexdiff/shebang.patch
deleted file mode 100644
index 1d6d27c6e310..000000000000
--- a/pkgs/tools/typesetting/git-latexdiff/shebang.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-Fix for https://gitlab.com/git-latexdiff/git-latexdiff/issues/8
----
---- src/git-latexdiff 2016-01-26 14:04:54.338568955 +0100
-+++ src/git-latexdiff 2016-01-26 14:40:23.700381943 +0100
-@@ -1,4 +1,4 @@
--#! /bin/bash
-+#!/usr/bin/env bash
-
- # Main author: Matthieu Moy <Matthieu.Moy@imag.fr> (2012 - 2015)
- # (See the Git history for other contributors)
diff --git a/pkgs/tools/typesetting/git-latexdiff/version-test.patch b/pkgs/tools/typesetting/git-latexdiff/version-test.patch
index e116bbd2c24d..243bd90f9005 100644
--- a/pkgs/tools/typesetting/git-latexdiff/version-test.patch
+++ b/pkgs/tools/typesetting/git-latexdiff/version-test.patch
@@ -4,14 +4,14 @@ Fix for https://gitlab.com/git-latexdiff/git-latexdiff/issues/7
+++ 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
+- 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 () {