diff options
author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-05-19 15:26:00 +0000 |
---|---|---|
committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-05-19 15:26:00 +0000 |
commit | 6d88da9a2346dd19681db16d8593ae0a39cbadd9 (patch) | |
tree | 309ec8be139bd6c9f1f2711ff28e6d7a898629ac /pkgs/tools/text | |
parent | d15d6267fa396eb8db3412f6a364ddaedce98c31 (diff) | |
parent | e283f861746bdaba44e4f58478ba2a5b1e3257e4 (diff) | |
download | nixpkgs-6d88da9a2346dd19681db16d8593ae0a39cbadd9.tar nixpkgs-6d88da9a2346dd19681db16d8593ae0a39cbadd9.tar.gz nixpkgs-6d88da9a2346dd19681db16d8593ae0a39cbadd9.tar.bz2 nixpkgs-6d88da9a2346dd19681db16d8593ae0a39cbadd9.tar.lz nixpkgs-6d88da9a2346dd19681db16d8593ae0a39cbadd9.tar.xz nixpkgs-6d88da9a2346dd19681db16d8593ae0a39cbadd9.tar.zst nixpkgs-6d88da9a2346dd19681db16d8593ae0a39cbadd9.zip |
Merging from trunk (conflict on glibc, I think I resolved it)
svn path=/nixpkgs/branches/stdenv-updates/; revision=21879
Diffstat (limited to 'pkgs/tools/text')
-rw-r--r-- | pkgs/tools/text/catdoc/default.nix | 17 | ||||
-rw-r--r-- | pkgs/tools/text/source-highlight/default.nix | 33 | ||||
-rw-r--r-- | pkgs/tools/text/wdiff/default.nix | 18 |
3 files changed, 60 insertions, 8 deletions
diff --git a/pkgs/tools/text/catdoc/default.nix b/pkgs/tools/text/catdoc/default.nix new file mode 100644 index 00000000000..5880de7a735 --- /dev/null +++ b/pkgs/tools/text/catdoc/default.nix @@ -0,0 +1,17 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "catdoc-0.94.2"; + src = fetchurl { + url = "http://ftp.wagner.pp.ru/pub/catdoc/${name}.tar.gz"; + sha256 = "0qnk8fw3wc40qa34yqz51g0knif2jd78a4717nvd3rb46q88pj83"; + }; + + configureFlags = "--disable-wordview"; + + meta = with stdenv.lib; { + platforms = platforms.all; + license = "GPL2"; + maintainers = [ maintainers.urkud ]; + }; +} diff --git a/pkgs/tools/text/source-highlight/default.nix b/pkgs/tools/text/source-highlight/default.nix new file mode 100644 index 00000000000..35dc7a8a8e6 --- /dev/null +++ b/pkgs/tools/text/source-highlight/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, boost }: + +let + name = "source-highlight"; + version = "3.1.3"; +in +stdenv.mkDerivation { + name = "${name}-${version}"; + + src = fetchurl { + url = "mirror://gnu/src-highlite/${name}-${version}.tar.gz"; + sha256 = "2d819f2ffdc8bb23a87635bdfbc51545db22605a8e544f66f86054b8075af0b5"; + }; + + buildInputs = [boost]; + doCheck = false; # The test suite fails with a trivial + # error, so I'll disable it for now. + # Whoever bumps this build to the next + # version, please re-enable it though! + + meta = { + description = "render source code with syntax highlighting"; + homepage = "http://www.gnu.org/software/src-highlite/"; + license = "GPLv3+"; + maintainers = [ ]; + platforms = stdenv.lib.platforms.all; + longDescription = + '' + GNU Source-highlight, given a source file, produces a document + with syntax highlighting. + ''; + }; +} diff --git a/pkgs/tools/text/wdiff/default.nix b/pkgs/tools/text/wdiff/default.nix index da1ff92add3..7ae7241c40b 100644 --- a/pkgs/tools/text/wdiff/default.nix +++ b/pkgs/tools/text/wdiff/default.nix @@ -1,18 +1,20 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "wdiff-0.5.95"; - + name = "wdiff-0.6.1"; + src = fetchurl { - url = "http://alpha.gnu.org/gnu/wdiff/${name}.tar.gz"; - sha256 = "1rha2x8b6i0gk9s2gp61x4acakkx5q9ar1k54x9grmgr6w7fzd97"; + url = "mirror://gnu/wdiff/${name}.tar.gz"; + sha256 = "0cgmx9k8sj0l79kp4m2lmn4ifx55ah68q4qk7xsanx69m1061ghf"; }; - + + doCheck = true; + 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 ]; + description = "GNU wdiff, comparing files on a word by word basis"; + license = "GPLv3+"; + maintainers = [ stdenv.lib.maintainers.eelco stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.all; }; } |