Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 487235e2f049
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a6ddb1f66636
Choose a head ref
  • 1 commit
  • 3 files changed
  • 1 contributor

Commits on Nov 18, 2018

  1. 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
    @c0bw3b
    qfjp authored and c0bw3b committed Nov 18, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    b4ldr John Bond
    GPG key ID: 1ADE98E442BAB1C4
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    a6ddb1f View commit details
10 changes: 6 additions & 4 deletions pkgs/tools/typesetting/git-latexdiff/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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;
};
}
10 changes: 0 additions & 10 deletions pkgs/tools/typesetting/git-latexdiff/shebang.patch
View file

This file was deleted.

6 changes: 3 additions & 3 deletions pkgs/tools/typesetting/git-latexdiff/version-test.patch
View file
Original file line number Diff line number Diff line change
@@ -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 () {