alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity
61282 commits 217 branches 121 tags 4.5 GiB
Commit graph

415 commits

Author SHA1 Message Date
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
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
Peter Simons 52e1bb158c Added python's implementation for the www.stringtemplate.org language. 
svn path=/nixpkgs/trunk/; revision=13199
 2008-11-05 20:03:00 +00:00
Pjotr Prins 1587e34e0a XML validating parser for Arb 
svn path=/nixpkgs/trunk/; revision=12951
 2008-10-05 08:57:39 +00:00
Eelco Dolstra fc980b49f9 * Test setting $sourceRoot directly. 
svn path=/nixpkgs/trunk/; revision=12746
 2008-08-27 14:56:59 +00:00
Peter Simons 4dba81501f replace: makeFlags is an array 
svn path=/nixpkgs/trunk/; revision=12701
 2008-08-25 10:00:17 +00:00
Eelco Dolstra 7493ae8010 * Added convertlit, a tool for converting Microsoft Reader ebooks, 
plus its dependency libtommath.

svn path=/nixpkgs/trunk/; revision=12606
 2008-08-12 19:57:35 +00:00
Marc Weber e2a6d56a0d added patchutils 
svn path=/nixpkgs/trunk/; revision=12387
 2008-07-18 23:36:28 +00:00