3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

201 commits

Author SHA1 Message Date
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