Commit graph

221 commits

Author SHA1 Message Date
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
Yury G. Kudryashov d8c07cc4d6 Add catdoc
svn path=/nixpkgs/trunk/; revision=21558
2010-05-03 03:45:40 +00:00
Peter Simons 2cd7033243 pkgs/tools/text/source-highlight: added GNU source highlight version 3.1.3
svn path=/nixpkgs/trunk/; revision=21457
2010-04-30 12:23:26 +00:00
Eelco Dolstra a011b43d1f * Reverted r21314 because it causes all of Nixpkgs on Linux to be
rebuilt.  Not sure why though.  Maybe "isLinux" is not set in the
  bootstrap stdenv.

svn path=/nixpkgs/trunk/; revision=21327
2010-04-26 18:36:53 +00:00
Ludovic Courtès 9009a04e38 GNU Patch: Fix `stdenvNative' GNU/Linux builds.
Reported by Brian Gough <bjg@gnu.org>.

svn path=/nixpkgs/trunk/; revision=21314
2010-04-26 08:47:20 +00:00
Lluís Batlle i Rossell bbb833cf8b Fixing the gnused fetchurl hash type, for stdenv-updates to evaluate well
svn path=/nixpkgs/branches/stdenv-updates/; revision=21252
2010-04-22 21:45:56 +00:00
Lluís Batlle i Rossell 6f2fac6466 Merging from trunk.
I hope I resolved the conflicts well (gmp and gccCross)


svn path=/nixpkgs/branches/stdenv-updates/; revision=21251
2010-04-22 21:44:33 +00:00
Ludovic Courtès 99d51d0e92 Assorted GNU updates.
svn path=/nixpkgs/branches/stdenv-updates/; revision=21047
2010-04-13 08:37:54 +00:00
Lluís Batlle i Rossell 19b9811012 Making a bunch of basic programs cross-buildable.
After this, the 'bootstrap-tools' can be cross-built.


svn path=/nixpkgs/branches/stdenv-updates/; revision=20945
2010-04-04 18:10:42 +00:00
Lluís Batlle i Rossell e6ad0bd25e Updating gnused 4.2
svn path=/nixpkgs/trunk/; revision=20837
2010-03-27 17:40:05 +00:00
Eelco Dolstra 806099dbc8 * Added GNU wdiff.
svn path=/nixpkgs/trunk/; revision=20817
2010-03-25 11:51:55 +00:00
Lluís Batlle i Rossell f68b2277b7 Adding qshowdiff.
svn path=/nixpkgs/trunk/; revision=20633
2010-03-15 14:26:52 +00:00
Ludovic Courtès 8863a06fff GNU Enscript 1.6.5.1.
svn path=/nixpkgs/trunk/; revision=20472
2010-03-08 10:40:01 +00:00
Michael Raskin bfc5bc58e7 Fix missing include
svn path=/nixpkgs/trunk/; revision=20148
2010-02-21 08:24:00 +00:00
Eelco Dolstra a617a7c239 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19786
2010-02-03 14:23:43 +00:00
Lluís Batlle i Rossell 62c315a723 Adding libofx and updating opensp (to get libofx built).
(I may have broken openjade... I will check later).


svn path=/nixpkgs/trunk/; revision=19697
2010-01-26 22:04:54 +00:00
Ludovic Courtès 0c46b7b4d8 GNU Enscript 1.6.5.
svn path=/nixpkgs/trunk/; revision=19668
2010-01-26 14:49:00 +00:00
Ludovic Courtès 907be69b26 GNU Patch: Fix for BSDs.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19522
2010-01-18 14:54:46 +00:00
Lluís Batlle i Rossell 9183f21f7e Merging from trunk.
I fixed conflicts regarding the renaming 'kernel' -> 'linux' in all-packages.
Also a small conflict in all-packages about making openssl overridable.
And I some linux 2.6.31-zen kernel files also marked in conflict.


svn path=/nixpkgs/branches/stdenv-updates/; revision=19438
2010-01-14 14:49:31 +00:00
Ludovic Courtès c161cd1773 GNU Patch: Fix typo.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19432
2010-01-14 12:46:10 +00:00
Ludovic Courtès 7c8062b8a2 GNU Patch: Try fix for Darwin.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19430
2010-01-14 10:09:45 +00:00
Rob Vermaas a6cd7eb8a1 dos2unix and unix2dos provided by griswold
svn path=/nixpkgs/trunk/; revision=19409
2010-01-13 21:09:55 +00:00
Ludovic Courtès a9ced90be9 GNU Patch: Use GNU ed and re-enable the tests.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19315
2010-01-08 21:28:30 +00:00
Lluís Batlle i Rossell ab76500645 Disabling patch doCheck, because they fail.
To be fixed some day, with a bug report to gnupatch if required.


svn path=/nixpkgs/branches/stdenv-updates/; revision=19286
2010-01-07 14:08:39 +00:00
Ludovic Courtès 9fefb472c5 GNU Patch 2.6.1.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19260
2010-01-06 13:50:51 +00:00
Lluís Batlle i Rossell 7993499325 Disabling libsigsegv in gawk, because it makes me fail the 'Check'.
This disables some kind of gawk useful output on segfault.
I haven't found an easy way of getting gawk use a newer libsigsegv with that
problem fixed.
So I do like the fedora people: disable libsigsegv.
(I don't know why this did not happen in the hydra machine. I could not build
gawk)


svn path=/nixpkgs/branches/stdenv-updates/; revision=19070
2009-12-21 22:46:18 +00:00
Lluís Batlle i Rossell 89fe676bb3 Updating from trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18878
2009-12-10 14:48:45 +00:00
Rob Vermaas d8800474f7 x86_64 darwin related changes
svn path=/nixpkgs/trunk/; revision=18665
2009-11-27 10:16:42 +00:00
Lluís Batlle i Rossell e85500987b Merging from trunk. I had to do two manual merges, quite trivial I think.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18472
2009-11-19 19:09:10 +00:00
Eelco Dolstra 7f5b839524 * Removed selectVersion. There's no good reason to write
`selectVersion ./foo "bar"' instead of `import ./foo/bar.nix'.
* Replaced `with args' with formal function arguments in several
  packages.
* Renamed several files to `default.nix'.  As a general rule, version
  numbers should only be included in the filename when there is a
  reason to keep multiple versions of a package in Nixpkgs.
  Otherwise, it just makes it harder to update the package.

svn path=/nixpkgs/trunk/; revision=18403
2009-11-18 09:39:59 +00:00
Lluís Batlle i Rossell 6864119104 Updating from trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18341
2009-11-13 19:19:34 +00:00
Pjotr Prins 5747c2194b rxp requires CFLAG -D_GNU_SOURCE
svn path=/nixpkgs/trunk/; revision=18318
2009-11-10 14:25:26 +00:00
Lluís Batlle i Rossell 4b27d28701 Porting changes from stdenv-updates into this branch.
This comes from:
svn diff  ^/nixpkgs/trunk/@18255 ^/nixpkgs/branches/stdenv-updates/ > diff
patch -p0 < diff
and then adding into svn all files new from the patch.

trunk@18255 comes from the last time I updated stdenv-updates from trunk.


svn path=/nixpkgs/stdenv-updates2/; revision=18272
2009-11-08 00:32:12 +00:00
Marc Weber 0d76da3b6f new: openjade, opensp - by Russell O'Connor
svn path=/nixpkgs/trunk/; revision=17926
2009-10-22 15:41:39 +00:00
Lluís Batlle i Rossell c66b4ee26d Updating freeimage, and setting me as maintainer on some packages.
svn path=/nixpkgs/trunk/; revision=17584
2009-10-02 07:39:03 +00:00
Rob Vermaas c100551503 * darwin patch to make sure gnupatch doesn't get dSYM extension
svn path=/nixpkgs/trunk/; revision=16447
2009-07-23 22:07:45 +00:00
Michael Raskin e9dddc50ab Adding dadadodo - a markov chain-based text generator
svn path=/nixpkgs/trunk/; revision=16206
2009-07-07 10:03:26 +00:00
Ludovic Courtès 9f3511c882 Add HTML Tidy, an HTML validator.
svn path=/nixpkgs/trunk/; revision=16176
2009-07-05 14:07:39 +00:00
Ludovic Courtès 5d72685300 Namazu: Fix builds, broken in r15324.
svn path=/nixpkgs/trunk/; revision=16069
2009-06-27 21:16:59 +00:00
Rob Vermaas 1c3f49e06f * Changed version of gcc to 4.0.1 - 5484 on darwin
* Added dsymutil to gcc wrapper env on darwin
 * turned off make check for gnugrep on darwin
 * added --enable-bsd=libs configure flag for gnugrep on darwin 


svn path=/nixpkgs/trunk/; revision=16014
2009-06-21 18:37:54 +00:00
Ludovic Courtès 28353f8440 GNU sed 4.2.
svn path=/nixpkgs/trunk/; revision=15418
2009-04-30 19:36:26 +00:00
Ludovic Courtès 39195f42ff GNU sed: Update/fix `meta'.
svn path=/nixpkgs/trunk/; revision=15417
2009-04-30 19:30:35 +00:00
Eelco Dolstra 7ec61219db * lib/site_perl -> lib/perl5/site_perl.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15258
2009-04-22 23:04:18 +00:00
Eelco Dolstra d8e436c742 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=14634
2009-03-20 16:49:02 +00:00
Lluís Batlle i Rossell e72f1929b0 Adding multitran. I added a note in the 'data' expression, regarding
a locale that should be added into the system.

svn path=/nixpkgs/trunk/; revision=14582
2009-03-17 21:49:39 +00:00
Eelco Dolstra 3593b97d63 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=14557
2009-03-16 12:45:27 +00:00
Peter Simons f8c360148e Moved python stringtemplate library from tools/text/py-string-template
to development/python-modules/stringtemplate.

svn path=/nixpkgs/trunk/; revision=14455
2009-03-09 10:46:42 +00:00
Eelco Dolstra 013d8e5e3a * Fix building on Darwin.
svn path=/nixpkgs/branches/stdenv-updates/; revision=14061
2009-02-12 22:03:32 +00:00
Ludovic Courtès 9e2fb3fe06 GNU grep 2.5.4 (untested).
svn path=/nixpkgs/branches/stdenv-updates/; revision=14024
2009-02-10 22:46:00 +00:00
Eelco Dolstra 3709e0e666 * GNU sed 4.1.2: obsolete.
svn path=/nixpkgs/branches/stdenv-updates/; revision=13825
2009-01-23 10:50:53 +00:00
Eelco Dolstra 88ba45c499 svn path=/nixpkgs/branches/stdenv-updates/; revision=13791 2009-01-16 17:13:35 +00:00
Ludovic Courtès 68eec57920 GNU Troff 1.20.1.
svn path=/nixpkgs/trunk/; revision=13733
2009-01-10 23:35:15 +00:00
Ludovic Courtès f64c0bc28e Add Namazu, a full-text search engine.
svn path=/nixpkgs/trunk/; revision=13655
2008-12-17 17:09:29 +00:00
Eelco Dolstra aa84bce64d * Get rid of all references to nix.cs.uu.nl.
svn path=/nixpkgs/trunk/; revision=13299
2008-11-14 16:57:19 +00:00