cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2
87123 commits 1 branch 0 tags 3.7 GiB
Commit graph

574 commits

Author SHA1 Message Date
Eelco Dolstra
811de3bfaa Merge remote-tracking branch 'origin/staging' into darwin-clang-stdenv 
Conflicts:
	pkgs/tools/security/gnupg/default.nix
 2014-10-09 10:57:57 +02:00
Aristid Breitkreuz
a8e104f3de xmlstarlet: update from 1.5.0 to 1.6.1 2014-10-08 20:23:26 +02:00
Francesco Lazzarino
672654f9e9 new: gist – cli for gist.github.com 2014-10-08 07:31:36 -05:00
Eelco Dolstra
a85dcf4a00 Merge remote-tracking branch 'origin/master' into staging 
Conflicts:
	pkgs/development/libraries/libav/default.nix
	pkgs/shells/bash/bash-4.2-patches.nix
	pkgs/stdenv/generic/default.nix
 2014-10-07 00:09:37 +02:00
Eelco Dolstra
a1d9c56389 gnugrep: Fix bootstrap-tools reference 2014-10-06 22:05:55 +02:00
Aristid Breitkreuz
60b174966c dos2unix: update from 6.0.6 to 7.0 2014-10-06 21:57:59 +02:00
Eelco Dolstra
ae863192e6 gnugrep: Update to 2.20 2014-10-06 20:44:26 +02:00
Pascal Wittmann
494a52306a dadadodo: adopt and cleanup expression 2014-10-06 11:36:58 +02:00
Eelco Dolstra
03397674c8 Merge remote-tracking branch 'origin/staging' into darwin-clang-stdenv 2014-10-03 16:14:36 +02:00
Eelco Dolstra
d9fbcd12ce Revert "Upgraded gawk to v4.1.1" 
This reverts commit e48e994a12. "make
check" fails with "5 TESTS FAILED".
 2014-10-03 16:12:09 +02:00
Eelco Dolstra
8c3ddec416 Merge remote-tracking branch 'origin/staging' into darwin-clang-stdenv 2014-10-03 15:49:20 +02:00
koral
e48e994a12 Upgraded gawk to v4.1.1 2014-10-02 23:09:42 +04:00
Eelco Dolstra
6843fc41c9 Fix evaluation 2014-09-30 00:51:00 +02:00
Eelco Dolstra
dad7623758 wdiff: Update to 1.2.2 2014-09-23 11:51:46 +02:00
Eelco Dolstra
cd71f7a2e6 Merge branch 'darwin-stdenv' of github.com:joelteon/nixpkgs into staging 
Conflicts:
	pkgs/development/interpreters/ruby/ruby-19.nix
	pkgs/development/libraries/libc++/default.nix
	pkgs/development/libraries/libc++abi/default.nix
	pkgs/tools/text/sgml/opensp/default.nix
 2014-09-23 11:27:53 +02:00
Michael Raskin
d22a3b8d0e Fix /bin/mv reference in replace-literal 2014-09-20 11:53:21 +04:00
Eelco Dolstra
91ec6e0d90 Merge remote-tracking branch 'origin/master' into staging 2014-09-18 22:28:35 +02:00
Alexander Kjeldaas
7141303c99 groff, opensp: make deterministic 2014-09-13 15:06:59 +02:00
Pascal Wittmann
8d67b9a240 transformed meta.maintainers of some packages into lists 2014-09-13 13:52:02 +02:00
Joel Taylor
7da056233f wip libc++ 2014-09-09 13:54:25 -07:00
Vladimír Čunát
82797f98f2 Merge branch 'staging' into modular-stdenv 
Conflicts:
	pkgs/development/interpreters/perl/5.10/setup-hook.sh
	pkgs/development/interpreters/perl/5.8/setup-hook.sh
	pkgs/stdenv/linux/default.nix
 2014-09-08 18:24:58 +02:00
Vladimír Čunát
1e389c976c merge 'staging' into modular-stdenv 
In 2c62a36b77 the messages in pkgs/stdenv/generic/default.nix
were not merged correctly.

Conflicts:
	pkgs/stdenv/generic/default.nix
 2014-09-08 18:16:54 +02:00
Peter Simons
ff85b53c5f highlight: update to version 3.18 to fix build errors with Lua 5.2 2014-09-08 10:22:50 +02:00
Moritz Ulrich
2bfd7ae15c dos2unix: update from 6.0.5 to 6.0.6 2014-09-04 19:31:33 +02:00
Moritz Ulrich
14fd86307f diffstat: update from 1.58 to 1.59 2014-09-04 19:31:32 +02:00
Vladimír Čunát
8da52a642a Merge branch 'staging' into v/modular 
Conflicts (easy):
	pkgs/development/interpreters/perl/5.10/setup-hook.sh
	pkgs/development/interpreters/perl/5.8/setup-hook.sh
	pkgs/development/libraries/gtk+/2.x.nix
 2014-08-31 12:23:18 +02:00
Vladimír Čunát
030af0a803 fix .xz in stdenv bootstrap 
Presumably needed due to the last staging merge.
There was some stdenv stage refactoring within, IIRC.
 2014-08-30 15:48:17 +02:00
Vladimír Čunát
a70180ba73 mutiout: make it builtin 2014-08-30 08:27:43 +02:00
Vladimír Čunát
fb59f27a43 WIP: getting good 2014-08-27 01:14:09 +02:00
Domen Kožar
fbecc676e5 wgetpaste: 2.23 -> 2.25 2014-08-25 13:03:30 +02:00
Bjørn Forsman
c9baba9212 Fix many package descriptions 
(My OCD kicked in today...)

Remove repeated package names, capitalize first word, remove trailing
periods and move overlong descriptions to longDescription.

I also simplified some descriptions as well, when they were particularly
long or technical, often based on Arch Linux' package descriptions.

I've tried to stay away from generated expressions (and I think I
succeeded).

Some specifics worth mentioning:
 * cron, has "Vixie Cron" in its description. The "Vixie" part is not
   mentioned anywhere else. I kept it in a parenthesis at the end of the
   description.

 * ctags description started with "Exuberant Ctags ...", and the
   "exuberant" part is not mentioned elsewhere. Kept it in a parenthesis
   at the end of description.

 * nix has the description "The Nix Deployment System". Since that
   doesn't really say much what it is/does (especially after removing
   the package name!), I changed that to "Powerful package manager that
   makes package management reliable and reproducible" (borrowed from
   nixos.org).

 * Tons of "GNU Foo, Foo is a [the important bits]" descriptions
   is changed to just [the important bits]. If the package name doesn't
   contain GNU I don't think it's needed to say it in the description
   either.
 2014-08-24 22:31:37 +02:00
Vladimír Čunát
694fa543af Merge 'staging' 
Conflicts:
	pkgs/servers/x11/xorg/default.nix
 2014-08-24 10:50:22 +02:00
Eelco Dolstra
2c62a36b77 Merge remote-tracking branch 'origin/staging' into modular-stdenv 
Conflicts:
	pkgs/stdenv/generic/default.nix
 2014-08-22 00:07:05 +02:00
Eelco Dolstra
a9baea48df openjade: Use default perl 2014-08-21 16:54:28 +02:00
Pascal Wittmann
464ec2a8e5 silver-searcher: update from 0.21.0 to 0.24.1 2014-08-19 19:27:16 +02:00
Vladimír Čunát
8a4827a881 kdiff3: minor update 2014-08-14 19:43:27 +02:00
Eelco Dolstra
e3f7dbbac8 Cleanup: Use += to append to envHooks 2014-08-09 12:47:05 +02:00
Peter Simons
9226fbf56a Merge remote-tracking branch 'origin/master' into staging. 2014-08-08 09:51:01 +02:00
taku0
74ce1a016f add peco: Simplistic interactive filtering tool 2014-08-07 01:34:28 +02:00
Peter Simons
2d326e5032 Merge remote-tracking branch 'origin/master' into staging. 
Conflicts:
	pkgs/desktops/e18/enlightenment.nix
 2014-08-04 16:51:47 +02:00
Mateusz Kowalczyk
7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
Eelco Dolstra
4c2c0499f3 enscript: Build with the default GCC 2014-07-23 11:25:38 +02:00
Eelco Dolstra
8aacdfee7c gawk: Remove unnecessary ‘gawk-<version>’ copy 
This saves > 600 KiB.
 2014-07-08 15:43:05 +02:00
John Wiegley
f4b3bc0334 diffstat: weaken platform requirement 
This fixes a change made in 3ae765278f.
 2014-06-24 14:45:33 -07:00
Bjørn Forsman
5d97335b6d colordiff: update 1.0.9 -> 1.0.13 2014-06-22 23:00:14 +02:00
Bjørn Forsman
7061116faa colordiff: add meta attributes 2014-06-22 22:57:08 +02:00
Bjørn Forsman
4d120e29c5 catdoc: add meta.description 2014-06-22 22:48:09 +02:00
Bjørn Forsman
3ae765278f diffstat: clean up expression 
Most importantly, add meta.description and meta.platforms.
 2014-06-22 13:39:28 +02:00
Rob Vermaas
6bfb25b9e8 dos2unix: update from 6.0.4 to 6.0.5 2014-05-27 21:33:07 +02:00
Bjørn Forsman
1d79330e1d basex: update 7.7.2 -> 7.8.2 2014-05-25 13:00:37 +02:00
Austin Seipp
c0db39e294 Merge pull request #2671 from wmertens/recode-osx 
Recode: Build on OS X
 2014-05-18 14:07:35 -05:00
Vladimír Čunát
137eae0b55 Merge #2630: add and use fetchpatch 
fetchpatch is fetchurl that determinizes the patch.
Some parts of generated patches change from time to time, e.g. see #1983 and
http://comments.gmane.org/gmane.linux.distributions.nixos/12815
Using fetchpatch should prevent the hash from changing.

Conflicts (auto-solved):
	pkgs/development/libraries/haskell/gitit/default.nix
 2014-05-17 07:31:03 +02:00
Wout Mertens
d04c84d0ac Recode: Build on OS X 2014-05-16 23:28:19 +02:00
Eelco Dolstra
6aeb59bbe0 Rename fetchGitHub -> fetchFromGitHub 
We're not fetching all of GitHub, after all.
 2014-05-08 15:49:39 +02:00
Eelco Dolstra
ebd8573046 Add a utility function "fetchGitHub" 
This is a small wrapper around fetchzip. It allows you to say:

  src = fetchGitHub {
    owner = "NixOS";
    repo = "nix";
    rev = "924e19341a5ee488634bc9ce1ea9758ac496afc3"; # or a tag
    sha256 = "1ld1jc26wy0smkg63chvdzsppfw6zy1ykf3mmc50hkx397wcbl09";
  };
 2014-05-08 15:30:18 +02:00
aszlig
709ccd520b
patchutils: Update to new upstream version 0.3.3. 
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-05-08 15:01:55 +02:00
Eelco Dolstra
dbd332d147 Fix meta.maintainer -> meta.maintainers 2014-04-23 14:26:32 +02:00
宋文武
c796adfd65 add kakasi, a Kanji to Hiragana, Katakana or Romaji converter 2014-04-18 22:07:17 +08:00
Georges Dubus
b13a33550a silver-searcher: update to 0.21.0 2014-03-27 17:57:02 +01:00
Shea Levy
d574c34e0a Merge branch 'master' of git://github.com/madjar/nixpkgs 
silver-searcher: avoid -lgcc_s on darwin
 2014-03-19 18:18:08 -04:00
Cillian de Róiste
b57ee8c331 nixpkgs-lint: add the platforms meta attr for most of my packages 2014-03-16 12:08:26 +01:00
Georges Dubus
b805528552 silver-searcher: avoid -lgcc_s on darwin 2014-03-12 17:48:32 +01:00
Karn Kallio
0774192dd3 xmlstarlet: advance version to 1.5.0 2014-02-11 23:17:39 +01:00
Georges Dubus
8677b19c9d silver-searcher: updated to 0.19.2 
Also fixed the "libgcc_s.so.1 must be installed for pthread_cancel to
work" problem.
 2014-02-03 18:21:43 +01:00
Georges Dubus
a737352862 silver-searcher: updated to 0.19.1 2014-02-01 21:56:28 +01:00
Eelco Dolstra
150ec8f79e wdiff: Update to 1.2.1 2014-01-27 17:58:26 +01:00
Kevin Quick
8f0511b0a0 gawk: add gawkInteractive with readline support 
stdenv (on linux) depends on gawk, readline and similar are useless for non-interactive usage.
Close #1596. Original patch was almost completely rewritten by vcunat.

On darwin we always specify whether to use readline, so it isn't always picked as reported.
 2014-01-26 10:53:22 +01:00
Shea Levy
ca116f76f9 Unmaintain a bunch of packages 
Trying to take maintainership more seriously...

Signed-off-by: Shea Levy <shea@shealevy.com>
 2014-01-21 22:34:41 -05:00
Vladimír Čunát
ac6761c908 Merge master into stdenv-updates 
Conflicts:
	pkgs/applications/version-management/gource/default.nix
	pkgs/top-level/all-packages.nix
 2014-01-20 19:39:28 +01:00
Georges Dubus
9f9244f061 silver-search: Add 2014-01-19 17:42:43 +01:00
Vladimír Čunát
0a58b512cb Merge master into stdenv-updates 
Conflicts (simple):
	pkgs/development/compilers/gcc/4.8/default.nix
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/libraries/gmp/5.1.1.nix
	pkgs/development/libraries/gmp/5.1.3.nix
	pkgs/development/libraries/gmp/5.1.x.nix
	pkgs/top-level/all-packages.nix
 2014-01-18 14:46:20 +01:00
Eelco Dolstra
86afcccecb sp-compat: Fix build 
You can't run fixupPhase before installPhase.

http://hydra.nixos.org/build/8149119
 2014-01-17 12:13:20 +01:00
Nixpkgs Monitor
bfb16b5296 dos2unix: update from 6.0.3 to 6.0.4 2014-01-13 17:28:42 +01:00
Vladimír Čunát
e740b565cf Merge master into stdenv-updates 
Conflicts (easy):
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/compilers/openjdk/default.nix
	pkgs/development/libraries/icu/default.nix
	pkgs/development/libraries/libssh/default.nix
	pkgs/development/libraries/libxslt/default.nix
	pkgs/development/tools/parsing/bison/3.x.nix
 2013-12-29 10:01:22 +01:00
Vladimír Čunát
cb639302df Merge glibc-2.18 branch into stdenv-updates 
It's to separate from other changes coming from master.

Conflicts:
	pkgs/development/libraries/glibc/2.18/common.nix (taking both changes)
	pkgs/development/libraries/ncurses/5_4.nix (deleted)
 2013-12-28 18:51:23 +01:00
Eelco Dolstra
9f75797d0b Merge remote-tracking branch 'origin/glibc-2.18' 2013-12-26 14:49:19 +01:00
Nixpkgs Monitor
69e6bd8707 mairix: update from 0.22 to 0.23 2013-12-21 04:07:50 +02:00
Nixpkgs Monitor
32a2e5dad3 numdiff: update from 5.6.1 to 5.8.1 2013-12-21 04:00:19 +02:00
Nixpkgs Monitor
d9952c5b40 namazu: update from 2.0.20 to 2.0.21 2013-12-21 02:28:24 +02:00
Nixpkgs Monitor
1ef60acae5 highlight: update from 3.5 to 3.9 2013-12-18 18:18:31 +02:00
Evgeny Egorochkin
74ced3209e enca: update dependencies 2013-12-18 18:18:25 +02:00
Nixpkgs Monitor
74c3965b92 enca: update from 1.13 to 1.15 2013-12-18 18:18:25 +02:00
Nixpkgs Monitor
b89bcaef22 dos2unix: update from 5.3.1 to 6.0.3 2013-12-18 18:18:25 +02:00
Eelco Dolstra
134ba27ea2 Merge remote-tracking branch 'origin/master' into glibc-2.18 2013-12-18 15:42:54 +01:00
Peter Simons
45e8de9a7d Merge branch 'origin/master' into stdenv-updates. 
Conflicts:
	pkgs/tools/misc/less/default.nix
 2013-12-16 21:13:24 +01:00
Eelco Dolstra
eea9e405c8 source-highlight: Don't do a parallel build 
The "make check" appears to have a race condition.

http://hydra.nixos.org/build/7116409
 2013-12-16 17:03:19 +01:00
Nixpkgs Monitor
e4df13e956 enscript: update from 1.6.5.2 to 1.6.6 2013-12-15 12:35:47 +02:00
Nixpkgs Monitor
d706aab747 diffstat: update from 1.45 to 1.58 2013-12-11 09:47:45 +02:00
Eelco Dolstra
ed463a7671 boost: Remove 1.53 and 1.54 
These don't build against Glibc 2.18, but they're not used anyway
(except by source-highlight, which builds fine against 1.49).
 2013-12-10 12:02:53 +01:00
Peter Simons
486e7736df Merge remote-tracking branch 'origin/master' into stdenv-updates. 
Conflicts:
	pkgs/tools/networking/p2p/amule/default.nix
 2013-12-10 00:25:54 +01:00
Nixpkgs Monitor
d643418edd wgetpaste: update from 2.20 to 2.23 2013-12-06 17:13:23 +02:00
Peter Simons
c32bf83301 Merge remote-tracking branch 'origin/master' into stdenv-updates. 
Conflicts:
	pkgs/development/interpreters/perl/5.16/default.nix
	pkgs/tools/networking/curl/default.nix
	pkgs/top-level/all-packages.nix
	pkgs/top-level/release-python.nix
	pkgs/top-level/release-small.nix
	pkgs/top-level/release.nix
 2013-12-04 18:33:52 +01:00
Nixpkgs Monitor
5378fd5948 uni2ascii: update from 4.15 to 4.18 2013-12-04 06:39:34 +02:00
Nixpkgs Monitor
1b20cadd1d ebook_tools: update from 0.2.1 to 0.2.2 2013-12-04 06:30:16 +02:00
Bjørn Forsman
214e92081f ascii: update 3.12 -> 3.14 
The Makefile has changed so the I had to update the sed line.
 2013-11-30 23:51:39 +01:00
Bjørn Forsman
456edc140d ascii: update/add meta attributes 2013-11-30 23:51:33 +01:00
Bjørn Forsman
bd67a1a16f basex: bump 7.7 -> 7.7.2 
This update brings "fixes and better CSV support":

  http://basex.org/about-us/news/
 2013-11-21 22:52:42 +01:00
Eelco Dolstra
01087750ba Don't build some packages on some platforms 2013-11-04 21:11:00 +01:00
Peter Simons
6be8ad3392 Merge branch 'origin/master' into stdenv-updates. 
There was a minor conflict in 'stumpwm'. The package needs texinfo
version 4.x. At least is used to, I'm not sure whether it still does.
 2013-10-18 18:57:24 +02:00
Shea Levy
e1ea4e3800 Add htm-xml-utils 
Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-10-17 14:11:15 -04:00
Bjørn Forsman
866d57d93d wgetpaste: better package description 2013-10-06 21:19:27 +02:00
Peter Simons
ac5d5297dd Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-10-02 22:44:12 +02:00
Peter Simons
3a7efa38ba source-highlight: don't repeat the package name in meta.description 2013-09-26 11:12:12 +02:00
Peter Simons
24366adf19 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-09-14 15:28:40 +02:00
Domen Kožar
e67a2479e1 add poedit 2013-09-13 20:42:49 +02:00
Peter Simons
3d2caf1180 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-09-08 22:54:35 +02:00
Bjørn Forsman
6167864aab source-highlight: 3.1.6 -> 3.1.7 
From NEWS file (version 3.1.7):

  * fixed compilation bugs in MacOsX systems (thanks to
    Trevor Spiteri)
  * language definition for Lilypond (thanks to Federico Bruni)
  * language definition for R statistics programming language
  * language definition for ISLISP (thanks to Christian Jullien)
  * improved Erlang definition file (thanks to Erik Søe Sørensen)
  * new output format: ESC 256 ascii code (thanks to
    Xavier-Emmanuel Vincent).

(It still needs boost 1.53 for all tests to pass.)
 2013-09-04 20:00:27 +02:00
Bjørn Forsman
b7d4c94d52 unoconv: new package 
unoconv is a tool that converts between any document format supported by
LibreOffice/OpenOffice.

Example of how to convert an .odt file to .pdf:
  unoconv -f pdf some-file.odt

Homepage: http://dag.wieers.com/home-made/unoconv/

Implementation notes:
unoconv must use the same python version as libreoffice (unless it will
not be able to load the pyuno module from libreoffice). And because we
recently switched to libreoffice 4.x, which uses python3, I had to
include unoconv-python3.patch. The patch comes from upstream unoconv.git
repo, so it will be included in the next release.
 2013-09-02 07:11:58 +02:00
Bjørn Forsman
0526403461 basex: new package 
BaseX is a very fast and light-weight, yet powerful XML database and
XPath/XQuery processor, including support for the latest W3C Full Text
and Update Recommendations. It supports large XML instances and offers a
highly interactive front-end (basexgui). Apart from two local standalone
modes, BaseX offers a client/server architecture.

Homepage: http://basex.org/

Implementation notes:
 - I'm using the pre-built java package (because it's simple)
 - I copied the basex.svg icon file from the Ubuntu package because I
   couldn't find it anywhere else. It's 9.3 KiB.
 2013-08-31 14:27:40 +02:00
Peter Simons
9ac8ea937c Merge branch 'origin/master' into stdenv-updates. 2013-08-26 12:21:23 +02:00
Bjørn Forsman
edd2d907a0 Remove jing_tools expression (now contained in jing expression itself) 
The jing expression now creates its own "jing" wrapper script, so there
is no need for jing_tools anymore.

jing hasn't been updated in years, so I assume (or hope) that not many
(if any) have jing_tools in their configuration.nix. If you do, just
change it to jing and it should behave the same.
 2013-08-22 23:20:10 +02:00
Bjørn Forsman
3f928466df jing-trang: update to version 20091111 
Also add meta attributes and a wrapper for jing so that it can be
invoked directly from the shell as "jing" (similar to Debian/Ubuntu).
Trang already has such a wrapper.
 2013-08-22 22:00:33 +02:00
Peter Simons
0d7118814b Merge branch 'origin/master' into stdenv. 2013-08-17 10:00:16 +02:00
Ludovic Courtès
2e937c437a unmaintain several packages 2013-08-16 23:45:01 +02:00
Peter Simons
522acfd2f4 Merge remote-tracking branch 'master' into stdenv-updates. 
Conflicts:
	pkgs/applications/version-management/git-and-tools/git/default.nix
	pkgs/top-level/all-packages.nix
 2013-07-30 11:29:30 +02:00
Evgeny Egorochkin
da4be371e9 make package use mirror:// for gnu, savannah and gnome repositories where possible 2013-07-14 05:23:06 +03:00
Evgeny Egorochkin
5ae43d2494 Change more packages from direct downloads to mirror://sourceforge 2013-07-14 02:48:32 +03:00
Vladimír Čunát
8ba92b8895 Merge master into stdenv-updates 
Conflicts (simple):
	pkgs/development/tools/misc/binutils/default.nix
	pkgs/tools/package-management/disnix/default.nix
	pkgs/top-level/all-packages.nix
 2013-07-08 10:48:05 +02:00
Vladimír Čunát
6726776c74 kdiff3: maintenance update 2013-07-05 14:45:59 +02:00
Vladimír Čunát
e8bd49f132 gawk: update 4.0.2 -> 4.1.0 2013-06-30 09:00:11 +02:00
Vladimír Čunát
f4ec2a3090 diffutils: minor stable update 3.2 -> 3.3 2013-06-30 08:58:51 +02:00
Eelco Dolstra
acba9240cd nixos.org/tarballs -> tarballs.nixos.org 
It's currently the same machine, but tarballs.nixos.org should become
an S3/CloudFront site eventually.
 2013-06-25 14:12:16 +02:00
Vladimír Čunát
842420c3e1 Merge branch 'master' into stdenv-updates 
Conflicts (relatively simple):
	pkgs/development/interpreters/python/2.7/default.nix
	pkgs/development/libraries/dbus/default.nix
	pkgs/development/libraries/glib/default.nix
	pkgs/development/libraries/glibc/2.17/common.nix
 2013-06-20 19:21:25 +02:00
Peter Simons
a2680cdc48 groff: explicitly disable X11 support in configure to avoid impure builds 
Without this flag, the configure script will find /usr/X11 on host system and
assume that it can build with X11 support.
 2013-06-11 12:14:49 +02:00
Peter Simons
6b1ebeccf2 Merge branch 'master' into stdenv-updates. 
There were conflicts in pkgs/development/interpreters/ruby/ruby-19.nix,
which I resolved to the best of my knowledge. I'd appreciate if some of
the ruby gurus could have a look at the outcome of my merge, though.
 2013-06-11 12:11:25 +02:00
Peter Simons
a3cc980193 groff: explicitly disable X11 support in configure to avoid impure builds 
Without this flag, the configure script will find /usr/X11 on host system and
assume that it can build with X11 support.
 2013-06-11 11:55:52 +02:00
Michael Raskin
8271de6727 Merge remote-tracking branch 'upstream/master' into x-updates 
Conflicts:
	pkgs/misc/emulators/wine/default.nix
 2013-06-10 10:04:46 +04:00
Evgeny Egorochkin
dc54358ce9 Change package versions to conform to nixpkgs conventions. 2013-06-09 05:41:44 +03:00
Domen Kozar
74bde3bedd groff: let hydra build it 2013-06-07 09:35:20 +02:00
bbenoist
f7934d7b9d Add numdiff-5.6.1 
A little program that can be used to compare putatively similar files line
by line and field by field, ignoring small numeric differences or/and
different numeric formats.
 2013-06-01 00:59:58 +02:00
Peter Simons
64f600a010 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-04-01 13:39:57 +02:00
Domen Kozar
92f72cb80f pwgen, wgetpaste: set platforms 2013-03-29 18:32:58 +01:00
Peter Simons
a28ff44c76 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-03-21 16:26:34 +01:00
Ludovic Courtès
31c513d4b7 gawk: Remove now-unneeded Cygwin patch. 2013-03-21 14:27:07 +01:00
Peter Simons
22fb1ad99e Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-03-21 09:23:54 +01:00
Lluís Batlle i Rossell
d711dcc070 Adding setup-hook for opensp, to set the sgml catalog files 
This sets the SGML_CATALOG_FILES, similar to how libxml2 does the same with
XML_CATALOG_FILES.

I based the hook on the libxml2 one, and I followed the instructions about this
variable here:
http://docbook.sourceforge.net/release/dsssl/1.79/doc/install.html
 2013-03-18 15:07:20 +01:00
Danny Wilson
d007a78ccb Merge remote-tracking branch 'origin/stdenv-updates' into illumos 
Conflicts:
	pkgs/development/libraries/gmp/5.1.1.nix
	pkgs/development/libraries/mpc/default.nix
	pkgs/development/libraries/mpfr/default.nix
	pkgs/development/libraries/ppl/default.nix
	pkgs/tools/misc/coreutils/default.nix
 2013-03-17 13:22:24 +01:00
Vladimír Čunát
f0f34067e7 recode: fix build after stdenv merge + #354 
ToDo: tests don't pass yet.
 2013-03-09 11:32:22 +01:00
Shea Levy
064155ad38 Merge branch 'recode.130306' of git://github.com/jcumming/nixpkgs 
Attempts to fix recode build on darwin, verified by inspection (don't
have a readily available darwin machine for testing right now, will let
hydra see if this worked).

Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-03-08 18:22:13 -05:00
Eelco Dolstra
674c51af3c Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-03-07 19:33:52 +01:00
Jack Cummings
a1c4fa8edc recode: attempt to fix Darwin testsuite build problem 2013-03-06 10:12:21 -08:00
Jack Cummings
ed99c87a26 get recode testsuite running. 2013-03-06 01:07:54 -08:00
Jack Cummings
e61bdcfacd recode-3.7-git 2013-03-05 14:31:51 -08:00
Danny Wilson
58e6277d77 Allow GNU Patch tests to run with non-bash shell. 
Fix gnused url.
 2013-02-28 20:04:11 +01:00
Danny Wilson
ef85e97b51 Update gnused to 4.2.2 2013-02-28 20:04:11 +01:00
Danny Wilson
e33b77d84d Fix gnugrep build on Illumos. 2013-02-28 20:04:10 +01:00
Vladimír Čunát
f20ff74afe recode: fix with new automake 2013-02-24 16:40:36 +01:00
Eelco Dolstra
2aa6f262cb Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-02-15 13:36:34 +01:00
Peter Simons
f9e75352cf groff: update to version 1.22.2 2013-02-09 20:39:04 +01:00
Cillian de Róiste
72cc82d49a Add PODIFF, a tool to diff PO files 2013-01-30 14:37:10 +01:00
Eelco Dolstra
6930efd1e5 openjade: Use default gcc 2013-01-28 18:31:17 +01:00
Eelco Dolstra
d1d0720861 wdiff: Update to 1.1.2 to fix the build 
http://hydra.nixos.org/build/3875995
 2013-01-28 17:47:12 +01:00
Peter Simons
7505cb5f9a gawk: update to 4.0.2 2013-01-04 20:39:54 +01:00
Eelco Dolstra
ab3eeabfed Rename buildNativeInputs -> nativeBuildInputs 
Likewise for propagatedBuildNativeInputs, etc.  "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
 2012-12-28 19:20:09 +01:00
Eelco Dolstra
f364619e22 Merge remote-tracking branch 'origin/master' into stdenv-updates 2012-12-12 17:01:20 +01:00
aszlig
0c160be3d2
ascii: New package, version 3.12. 
Quite a useful tool, especially for non English native speakers to find out what
people mean with things like "hiccup", "boink", "blugle" and whatnot.

And of course it's quite useful to convert between hex/oct/dec/bin.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2012-12-12 12:36:19 +01:00
Eelco Dolstra
c138356805 Fix evaluation 2012-12-04 17:08:58 +01:00
Eelco Dolstra
c0ae221bb0 patch: Update to 2.7.1 
Also disable the tests on FreeBSD.

http://hydra.nixos.org/build/3070072
 2012-10-16 15:05:39 -04:00
Eelco Dolstra
8f26b38d4e Drop Darwin patch in GNU patch 
Seems to build fine without it.

http://hydra.nixos.org/build/3053575
 2012-09-24 16:53:42 -04:00
Eelco Dolstra
a893399776 Fix more gets() problems 2012-09-18 14:51:15 -04:00
Eelco Dolstra
80be1c60d5 gawk: Update to 4.0.1 2012-09-18 14:50:35 -04:00
Eelco Dolstra
23deea257d gnugrep: Update to 2.14 2012-09-18 14:49:03 -04:00
Eelco Dolstra
37b44ed690 patch: Update to 2.7 2012-09-18 14:48:31 -04:00
Jan Malakhovski
179b1bd294 Add package enca 1.13 to tools/text 2012-08-08 03:58:17 +04:00
Joachim Schiele
19bd2da96e fixed the hash, which was wrong 2012-07-21 09:17:12 +00:00
System administrator
c043cd2d26 added new version 2012-07-20 22:16:38 +00:00
Ludovic Courtès
9786a98261 tar, gzip, diffutils: Allow builds with newer versions of glibc. 
This is a follow-up to 77fdc7bb35 ("GNU
Coreutils: Allow builds with newer versions of glibc.").
 2012-07-01 01:14:56 +02:00
Joachim Schiele
b6ee9fb5c0 fixed wgetpaste to make it work without having to have wget in the profile 
svn path=/nixpkgs/trunk/; revision=34381
 2012-06-08 12:20:41 +00:00
Ludovic Courtès
e38bf54592 GNU Awk: Fix Cygwin builds. 
svn path=/nixpkgs/trunk/; revision=34240
 2012-05-25 09:11:51 +00:00
Ludovic Courtès
c5b6f8a374 GNU Awk: Disable tests on Cygwin. 
svn path=/nixpkgs/trunk/; revision=34236
 2012-05-25 07:38:44 +00:00
Joachim Schiele
acbd97ed2e a new revision 
svn path=/nixpkgs/trunk/; revision=33973
 2012-05-02 19:42:23 +00:00
Ludovic Courtès
0a9d954bc6 GNU Patch: On Darwin, use an existing tarball, and patch from there. 
svn path=/nixpkgs/trunk/; revision=33892
 2012-04-23 15:47:21 +00:00
Joachim Schiele
37e67f9888 wgetpaste is a handy shell utility getting things pasted on pasting services online 
svn path=/nixpkgs/trunk/; revision=33450
 2012-03-28 13:21:42 +00:00
Yury G. Kudryashov
57fd764a39 svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32792
 2012-03-05 10:00:23 +00:00
Eelco Dolstra
962b01f686 * Remove unnecessary copy on sed. 
svn path=/nixpkgs/trunk/; revision=32773
 2012-03-04 15:52:41 +00:00
Florian Friesdorf
360ec296a6 Revert "adapted xpf to new libxml2Python" 
This reverts commit b1f634f3d384a39e015d69e348cf220855457049.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32649
 2012-02-28 00:07:08 +00:00
Florian Friesdorf
c0dcbb912c adapted xpf to new libxml2Python 
authored by: chaoflow, goibhniu

svn path=/nixpkgs/branches/stdenv-updates/; revision=32597
 2012-02-26 17:23:54 +00:00
Yury G. Kudryashov
79d0d410cb svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32350
 2012-02-17 13:43:31 +00:00
Yury G. Kudryashov
8b4f571491 kdiff3-0.9.96 
svn path=/nixpkgs/trunk/; revision=32348
 2012-02-17 13:29:34 +00:00
Yury G. Kudryashov
fc21cca549 svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32231
 2012-02-12 09:33:54 +00:00
Eelco Dolstra
761785c4ab * Fix ebook-tools. It broke because of the libzip update. 
svn path=/nixpkgs/trunk/; revision=32215
 2012-02-10 18:33:14 +00:00
Yury G. Kudryashov
84c0185038 svn merge ^/nixpkgs/trunk, one simple conflict in jruby 
svn path=/nixpkgs/branches/stdenv-updates/; revision=31721
 2012-01-19 21:31:51 +00:00
Eelco Dolstra
d4d7931a62 * Cleanup: remove obsolete references to ‘xz’, which is in stdenv now. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=31678
 2012-01-18 20:53:01 +00:00
Ludovic Courtès
94a0bbcef3 GNU Source-Highlight 3.1.6. 
svn path=/nixpkgs/trunk/; revision=31676
 2012-01-18 20:52:55 +00:00
Eelco Dolstra
c556a6ea46 * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 
function, so obsolete it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
 2012-01-18 20:16:00 +00:00
Eelco Dolstra
f8f4f4af33 * gnugrep needs xz to unpack its sources. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=30879
 2011-12-14 10:26:44 +00:00
Ludovic Courtès
d2c923bc01 GNU grep 2.10. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=30868
 2011-12-13 16:09:48 +00:00
Eelco Dolstra
eda3fd1730 * Sync with the trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=30852
 2011-12-12 16:54:35 +00:00
Ludovic Courtès
95696578a9 GNU wdiff 1.10. 
svn path=/nixpkgs/trunk/; revision=30665
 2011-12-01 22:43:53 +00:00
Peter Simons
e3984c2caf synchronize with trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=29739
 2011-10-10 17:01:17 +00:00
Peter Simons
6170e88607 pkgs/tools/text/odt2txt: fixed evaluation error 
svn path=/nixpkgs/trunk/; revision=29738
 2011-10-10 08:56:08 +00:00
Yury G. Kudryashov
8d94826486 colordiff: fix man install path 
svn path=/nixpkgs/trunk/; revision=29735
 2011-10-09 18:45:47 +00:00
Yury G. Kudryashov
9caf409d96 odt2txt-0.4 
svn path=/nixpkgs/trunk/; revision=29734
 2011-10-09 18:22:18 +00:00
Ludovic Courtès
88dd456354 GNU grep 2.9. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=29592
 2011-10-02 20:36:06 +00:00
Ludovic Courtès
29d669037e GNU Awk 4.0.0. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=29591
 2011-10-02 20:36:01 +00:00
Ludovic Courtès
14a86cfa3b GNU diffutils 3.2. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=29590
 2011-10-02 20:35:57 +00:00
Yury G. Kudryashov
9ee5230537 Move qt3/qt4 choice to .nix expressions 
svn path=/nixpkgs/trunk/; revision=29404
 2011-09-20 22:49:13 +00:00
Ludovic Courtès
e15f102b5f GNU wdiff 1.0.1. 
svn path=/nixpkgs/trunk/; revision=29317
 2011-09-17 10:09:39 +00:00
Peter Simons
2482d4ba22 wdiff: updated to version 1.0.0 
svn path=/nixpkgs/trunk/; revision=29087
 2011-09-07 16:53:30 +00:00
Shea Levy
9dd496c687 highlight: Update to 3.5 
svn path=/nixpkgs/trunk/; revision=29064
 2011-09-06 17:10:08 +00:00
Ludovic Courtès
02f91a458d GNU Source-Highlight 3.1.5. 
svn path=/nixpkgs/trunk/; revision=29013
 2011-09-04 23:06:03 +00:00
Lluís Batlle i Rossell
a9ce52e01a Updating dos2unix, that now includes also unix2dos. 
svn path=/nixpkgs/trunk/; revision=28788
 2011-08-24 07:48:02 +00:00
Karn Kallio
a233ebf891 Switch to forward compatibility of kde45 on kde_baseapps. 
svn path=/nixpkgs/trunk/; revision=28217
 2011-08-07 01:45:26 +00:00
Karn Kallio
6a2f1f3d72 Remove kdebase as input to kdiff3. 
Seems not to be needed and gives evaluation error when with kde4.7

svn path=/nixpkgs/trunk/; revision=28197
 2011-08-06 18:01:56 +00:00
Lluís Batlle i Rossell
71dc3b87eb Adding mairix 
svn path=/nixpkgs/trunk/; revision=28122
 2011-08-02 14:26:47 +00:00
Nicolas Pierron
ebc8642aec Add colordiff package. 
svn path=/nixpkgs/trunk/; revision=26860
 2011-04-17 08:26:56 +00:00
Ludovic Courtès
20111bb05a GNU Source-Highlight 3.1.4. 
svn path=/nixpkgs/trunk/; revision=26079
 2011-02-23 17:36:32 +00:00
Yury G. Kudryashov
0d730b4362 Add sp compatibility wrapper 
This wrapper is required by some old programs (e.g., po4a which I'm trying to package)

svn path=/nixpkgs/trunk/; revision=25320
 2010-12-29 18:04:11 +00:00
Ludovic Courtès
2e819f094c GNU wdiff 0.6.5. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=25084
 2010-12-12 20:19:48 +00:00
Peter Simons
475cbea101 pkgs/tools/text/replace: move --mandir to standard location $out/share/man 
Also, fixed the type of $makeFlags, which is a string, not a list.

svn path=/nixpkgs/branches/stdenv-updates/; revision=25006
 2010-12-06 17:43:57 +00:00
Ludovic Courtès
f1cd0dd6d9 Namazu 2.0.20. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24671
 2010-11-11 22:12:08 +00:00
Rob Vermaas
7f5431f095 gnugrep: trying to fix darwin builds 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24634
 2010-11-10 07:45:41 +00:00
Ludovic Courtès
c317c7f4bd GNU grep: Fix build on non-GNU platforms. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24627
 2010-11-09 13:12:31 +00:00
Lluís Batlle i Rossell
6dc839d344 Merging from trunk. I resolved some conflicts; I hope that well. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24429
 2010-10-23 14:52:21 +00:00
Peter Simons
5019f883f3 pkgs/tools/text/recode: added (heavily patched) version 3.6 
svn path=/nixpkgs/trunk/; revision=24384
 2010-10-20 13:05:49 +00:00
Yury G. Kudryashov
51ac7f1a27 Patch kdiff3 so it will build with KDE 4.5.2 
The DocBook DTD version must be at least 4.2 for validation.  Add a patch
to change version number in the DOCTYPE.

Submitted by Karn Kallio

svn path=/nixpkgs/trunk/; revision=24382
 2010-10-20 11:59:13 +00:00
Yury G. Kudryashov
b86b382b50 kdiff3 cleanup 
svn path=/nixpkgs/trunk/; revision=24381
 2010-10-20 11:59:06 +00:00
Yury G. Kudryashov
f039080451 ebook-tools-0.2.1 
svn path=/nixpkgs/trunk/; revision=24233
 2010-10-12 07:49:13 +00:00
Lluís Batlle i Rossell
143ea0f491 gnu grep does not need the patch we set anymore. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24186
 2010-10-08 14:28:48 +00:00
Lluís Batlle i Rossell
c93a74426b Fixing the gnupatch url; it was taking the alpha snapshot for all the platforms 
at the time of building the stdenv (because there !(stdenv ? glibc)).
I changed that to stdenv.isDarwin, in a guess that it may work for those who
experienced problems with the last patch release.

svn path=/nixpkgs/branches/stdenv-updates/; revision=24171
 2010-10-08 06:53:35 +00:00
Ludovic Courtès
dc71d2e6d3 GNU grep 2.7. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24160
 2010-10-07 22:29:00 +00:00
Lluís Batlle i Rossell
fca582bff0 Updating from trunk. I had to resolve the pcre and some stdenv2 in all-packages 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24155
 2010-10-07 21:21:31 +00:00
Yury G. Kudryashov
673e66e3a3 Move most kde-extragear apps to top-level 
svn path=/nixpkgs/trunk/; revision=24092
 2010-10-05 17:44:33 +00:00
Lluís Batlle i Rossell
cd4b54748a Updating from trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24038
 2010-10-03 09:25:34 +00:00
Russell O'Connor
41f2c2ed1f use sourceforge mirror for openjade. 
svn path=/nixpkgs/trunk/; revision=24010
 2010-10-01 02:29:45 +00:00
Evgeny Egorochkin
a774549139 uni2ascii: packaged 
Patch by Cillian de Róiste

svn path=/nixpkgs/trunk/; revision=23984
 2010-09-28 09:48:15 +00:00
Lluís Batlle i Rossell
2c5de61327 Updating from trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23840
 2010-09-17 19:10:21 +00:00
Yury G. Kudryashov
255acffe14 ebook-tools-0.2.0 
svn path=/nixpkgs/trunk/; revision=23750
 2010-09-13 14:22:37 +00:00
Lluís Batlle i Rossell
49893ec540 Allowing cross-build of groff 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23314
 2010-08-21 16:54:24 +00:00
Ludovic Courtès
14e86a9812 GNU gawk 3.1.8. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23280
 2010-08-20 15:26:36 +00:00
Lluís Batlle i Rossell
f16353b6f2 Updated from trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23275
 2010-08-20 13:41:12 +00:00
Eelco Dolstra
3be78e74fb * Added xmlstarlet. 
svn path=/nixpkgs/trunk/; revision=23271
 2010-08-20 10:07:35 +00:00
Eelco Dolstra
7120017365 * Add meta info to xpf. 
svn path=/nixpkgs/trunk/; revision=23269
 2010-08-20 09:18:53 +00:00
Yury G. Kudryashov
f9a218b691 Add ebook-tools-0.1.1 
svn path=/nixpkgs/trunk/; revision=23189
 2010-08-16 12:40:03 +00:00
Lluís Batlle i Rossell
47b45f812e Updating diffutils 
svn path=/nixpkgs/branches/stdenv-updates/; revision=22942
 2010-08-04 11:05:53 +00:00
Lluís Batlle i Rossell
5417c720fd Merging from trunk. 
I tried to fix some trivial conflicts.
I don't know if I merged well some more difficult conflicts on openssl/darwin_patch
or haskell-platform.


svn path=/nixpkgs/branches/stdenv-updates/; revision=22878
 2010-08-02 15:48:19 +00:00
Lluís Batlle i Rossell
fb4a1baa45 Updating 'patch' for bootstrap (reference broken) 
svn path=/nixpkgs/branches/stdenv-updates/; revision=22851
 2010-08-01 21:25:19 +00:00
Lluís Batlle i Rossell
2954596106 Making gnugrep cross-build for mips 
svn path=/nixpkgs/branches/stdenv-updates/; revision=22847
 2010-08-01 21:17:29 +00:00
Eelco Dolstra
6609710409 * Get rid of many instances of "args: with args;", and other coding 
guidelines violations.
* Updated libsamplerate to 0.1.7.

svn path=/nixpkgs/trunk/; revision=22782
 2010-07-28 11:55:54 +00:00
Ludovic Courtès
900b3d9d86 GNU wdiff 0.6.3. 
svn path=/nixpkgs/trunk/; revision=22463
 2010-07-04 21:11:03 +00:00
Eelco Dolstra
7fb06b3986 * Fix the URL. 
svn path=/nixpkgs/trunk/; revision=22380
 2010-06-22 15:23:39 +00:00
Eelco Dolstra
7c979671b8 * Revert r22376, this should be in the stdenv branch. 
svn path=/nixpkgs/trunk/; revision=22379
 2010-06-22 15:21:06 +00:00
Peter Simons
9cc3ddfc1a pkgs/tools/text/gnupatch: patch 2.6.1-2-g2c4e3ec no longer exists; update to latest version 
svn path=/nixpkgs/trunk/; revision=22376
 2010-06-22 14:34:41 +00:00
Lluís Batlle i Rossell
86345919c2 Updating from trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=22254
 2010-06-14 09:28:10 +00:00
Ludovic Courtès
c91a0c873f GNU Enscript 1.6.5.2. 
svn path=/nixpkgs/trunk/; revision=22220
 2010-06-10 21:52:52 +00:00
David Guibert
bf11f132e0 gnupatch: fix broken url 
svn path=/nixpkgs/branches/stdenv-updates/; revision=22042
 2010-05-28 11:06:52 +00:00
Lluís Batlle i Rossell
6d88da9a23 Merging from trunk (conflict on glibc, I think I resolved it) 
svn path=/nixpkgs/branches/stdenv-updates/; revision=21879
 2010-05-19 15:26:00 +00:00
Ludovic Courtès
659e48bbb0 GNU wdiff: Fix URL. 
svn path=/nixpkgs/trunk/; revision=21713
 2010-05-10 17:54:26 +00:00
Ludovic Courtès
340f826442 GNU Wdiff 0.6.1. 
svn path=/nixpkgs/trunk/; revision=21708
 2010-05-10 14:30:44 +00:00
Yury G. Kudryashov
de4815afa8 catdoc: fix evaluation error 
svn path=/nixpkgs/trunk/; revision=21577
 2010-05-03 13:39:46 +00:00