diff options
author | Peter Simons <simons@cryp.to> | 2013-08-15 12:25:03 +0200 |
---|---|---|
committer | Peter Simons <simons@cryp.to> | 2013-08-15 12:25:07 +0200 |
commit | e2baa14addbe91d620792c02cc8a1b80b25dd0ca (patch) | |
tree | ba435bc391e022d73f33fa5c105413749cf14439 /pkgs/development/tools/misc/xxdiff/default.nix | |
parent | 9faad8f2743388a2d597323468ace90cd3496204 (diff) | |
download | nixlib-e2baa14addbe91d620792c02cc8a1b80b25dd0ca.tar nixlib-e2baa14addbe91d620792c02cc8a1b80b25dd0ca.tar.gz nixlib-e2baa14addbe91d620792c02cc8a1b80b25dd0ca.tar.bz2 nixlib-e2baa14addbe91d620792c02cc8a1b80b25dd0ca.tar.lz nixlib-e2baa14addbe91d620792c02cc8a1b80b25dd0ca.tar.xz nixlib-e2baa14addbe91d620792c02cc8a1b80b25dd0ca.tar.zst nixlib-e2baa14addbe91d620792c02cc8a1b80b25dd0ca.zip |
xxdiff: update to version 4.0
Diffstat (limited to 'pkgs/development/tools/misc/xxdiff/default.nix')
-rw-r--r-- | pkgs/development/tools/misc/xxdiff/default.nix | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/pkgs/development/tools/misc/xxdiff/default.nix b/pkgs/development/tools/misc/xxdiff/default.nix index ac1bc2f1abc5..36047210a924 100644 --- a/pkgs/development/tools/misc/xxdiff/default.nix +++ b/pkgs/development/tools/misc/xxdiff/default.nix @@ -1,13 +1,11 @@ -{ stdenv, fetchhg, qt4, flex, bison, docutils }: +{ stdenv, fetchurl, qt4, flex, bison, docutils }: -stdenv.mkDerivation { - name = "xxdiff-2013.03.08"; +stdenv.mkDerivation rec { + name = "xxdiff-4.0"; - src = fetchhg { - name = "xxdiff"; - tag = "6a86d8353eef"; - url = https://hg.furius.ca/public/xxdiff; - sha256 = "1c1krgmf1cfkrmg48w6zw61wgy01xm171ifkkh6givm8v6c8i340"; + src = fetchurl { + url = "mirror://sourceforge/xxdiff/${name}.tar.bz2"; + sha256 = "0c0k8cwxyv5byw7va1n9iykvypv435j0isvys21rkj1bx121al4i"; }; nativeBuildInputs = [ flex bison qt4 docutils ]; @@ -16,14 +14,16 @@ stdenv.mkDerivation { QMAKE = "qmake"; - configurePhase = - '' - cd src - make -f Makefile.bootstrap - ''; + configurePhase = "cd src; make -f Makefile.bootstrap"; installPhase = "mkdir -pv $out/bin; cp -v ../bin/xxdiff $out/bin"; - meta.platforms = stdenv.lib.platforms.linux; + meta = { + homepage = "http://furius.ca/xxdiff/"; + description = "graphical file and directories comparator and merge tool"; + license = "GPLv2"; + platforms = stdenv.lib.platforms.linux; + maintainers = []; + }; } |