3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

312 commits

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