Commit graph

351 commits

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