diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-04-22 21:44:33 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-04-22 21:44:33 +0000 |
| commit | 6f2fac6466cbc684f01093364e60bb96b79c120f (patch) | |
| tree | 2b0ee90e26a0d6ed8a081351299a66daf35ef9f9 /pkgs/tools/text | |
| parent | 6d62947d71342aa29441a720d4eeb2f003126c76 (diff) | |
| parent | 93d2b4b7bfe5c78e36c93f94a0c057cde04b580f (diff) | |
| download | nixpkgs-6f2fac6466cbc684f01093364e60bb96b79c120f.tar nixpkgs-6f2fac6466cbc684f01093364e60bb96b79c120f.tar.gz nixpkgs-6f2fac6466cbc684f01093364e60bb96b79c120f.tar.bz2 nixpkgs-6f2fac6466cbc684f01093364e60bb96b79c120f.tar.lz nixpkgs-6f2fac6466cbc684f01093364e60bb96b79c120f.tar.xz nixpkgs-6f2fac6466cbc684f01093364e60bb96b79c120f.tar.zst nixpkgs-6f2fac6466cbc684f01093364e60bb96b79c120f.zip | |
Merging from trunk.
I hope I resolved the conflicts well (gmp and gccCross) svn path=/nixpkgs/branches/stdenv-updates/; revision=21251
Diffstat (limited to 'pkgs/tools/text')
| -rw-r--r-- | pkgs/tools/text/gnused/4.2.nix | 6 | ||||
| -rw-r--r-- | pkgs/tools/text/qshowdiff/default.nix | 23 | ||||
| -rw-r--r-- | pkgs/tools/text/wdiff/default.nix | 18 |
3 files changed, 44 insertions, 3 deletions
diff --git a/pkgs/tools/text/gnused/4.2.nix b/pkgs/tools/text/gnused/4.2.nix index 76e943b216e..7a75f50d122 100644 --- a/pkgs/tools/text/gnused/4.2.nix +++ b/pkgs/tools/text/gnused/4.2.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "gnused-4.2"; + name = "gnused-4.2.1"; src = fetchurl { - url = "mirror://gnu/sed/sed-4.2.tar.bz2"; - sha256 = "1j25icv75rnc0r1b9hv2164rcnnn7ba4zx5xrvp7v3h3mgimaxzf"; + url = "mirror://gnu/sed/sed-4.2.1.tar.bz2"; + sha256 = "13wlsb4sf5d5a82xjhxqmdvrrn36rmw5f0pl9qyb9zkvldnb7hra"; }; doCheck = true; diff --git a/pkgs/tools/text/qshowdiff/default.nix b/pkgs/tools/text/qshowdiff/default.nix new file mode 100644 index 00000000000..ee87bffc672 --- /dev/null +++ b/pkgs/tools/text/qshowdiff/default.nix @@ -0,0 +1,23 @@ +{stdenv, fetchurl, qt, perl}: + +stdenv.mkDerivation rec { + name = "qshowdiff-1.2"; + + src = fetchurl { + url = http://qshowdiff.danfis.cz/files/qshowdiff-1.2.tar.gz; + sha256 = "0i3ssvax4xync9c53jaxribazvh8d8v148l3yiqsfjmqsggw9rh3"; + }; + + buildInputs = [ qt perl ]; + + configurePhase = '' + ensureDir $out/{bin,man/man1} + makeFlags="PREFIX=$out" + ''; + + meta = { + homepage = http://qshowdiff.danfis.cz/; + description = "Colourful diff viewer"; + license = "GPLv3+"; + }; +} diff --git a/pkgs/tools/text/wdiff/default.nix b/pkgs/tools/text/wdiff/default.nix new file mode 100644 index 00000000000..da1ff92add3 --- /dev/null +++ b/pkgs/tools/text/wdiff/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "wdiff-0.5.95"; + + src = fetchurl { + url = "http://alpha.gnu.org/gnu/wdiff/${name}.tar.gz"; + sha256 = "1rha2x8b6i0gk9s2gp61x4acakkx5q9ar1k54x9grmgr6w7fzd97"; + }; + + meta = { + homepage = http://www.gnu.org/software/wdiff/; + description = "A front-end to diff for comparing files on a word per word basis"; + license = "GPLv3"; + maintainers = [ stdenv.lib.maintainers.eelco ]; + platforms = stdenv.lib.platforms.all; + }; +} |