Commit graph

3872 commits

Author SHA1 Message Date
Lluís Batlle i Rossell 0e4c970d11 Updating from trunk - I hope I fixed the conflict around gettext - I left it as
it was before merging.


svn path=/nixpkgs/branches/stdenv-updates/; revision=24876
2010-11-26 14:40:39 +00:00
Lluís Batlle i Rossell 5387036c50 Adding php 5.2 (5.3 does not build on arm), although not the default in the attribute 'php'.
svn path=/nixpkgs/trunk/; revision=24872
2010-11-26 14:26:15 +00:00
Rob Vermaas 0c455b53ac gettext, now properly
svn path=/nixpkgs/trunk/; revision=24869
2010-11-26 12:38:42 +00:00
Rob Vermaas b37f799732 gettext, now properly
svn path=/nixpkgs/branches/stdenv-updates/; revision=24868
2010-11-26 12:38:09 +00:00
Rob Vermaas 8d9d42f773 add gettext_0_17, gettext_0_18 aliases to gettext, preparation for stdenv merge, concerning gnu hydra build configuration
svn path=/nixpkgs/branches/stdenv-updates/; revision=24867
2010-11-26 12:34:46 +00:00
Rob Vermaas 4db5a0b5a9 add gettext_0_17 alias to gettext, preparation for stdenv merge, concerning gnu hydra build configuration
svn path=/nixpkgs/trunk/; revision=24866
2010-11-26 12:33:48 +00:00
Lluís Batlle i Rossell 4018d18e96 Committing patch adding verilog from Antonio Vargas Gonzalez
From his original, I adapted some spacing, and removed the release.nix reference
(superfluous having set meta.platforms)

svn path=/nixpkgs/trunk/; revision=24860
2010-11-25 22:01:14 +00:00
Michael Raskin 5af12418ef Pass parameters with correct arch to DF
svn path=/nixpkgs/trunk/; revision=24843
2010-11-24 20:05:43 +00:00
Michael Raskin 81fd05cdd3 Dwarf fortress asserts the need for i686-linux; give it to it even on amd64
svn path=/nixpkgs/trunk/; revision=24842
2010-11-24 20:02:35 +00:00
Michael Raskin 823f34a075 Adding Anonymous Pro font
svn path=/nixpkgs/trunk/; revision=24840
2010-11-24 11:51:50 +00:00
Michael Raskin a94fc3966d Add inconsolata font
svn path=/nixpkgs/trunk/; revision=24839
2010-11-24 11:19:38 +00:00
Michael Raskin 31b22ed108 Merge from trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=24820
2010-11-23 08:57:29 +00:00
Michael Raskin 9813c8feb6 Adding untie - a tool for manipulating namespaces
svn path=/nixpkgs/trunk/; revision=24819
2010-11-23 07:52:57 +00:00
Michael Raskin 6162fffede Adding IOtop
svn path=/nixpkgs/trunk/; revision=24818
2010-11-23 07:46:18 +00:00
Lluís Batlle i Rossell 8cd20e6f61 Adding valkyrie, a frontend for some valgrind 3.6 tools.
svn path=/nixpkgs/trunk/; revision=24815
2010-11-22 19:10:15 +00:00
Rob Vermaas 1c86c832c1 add google v8 engine
svn path=/nixpkgs/trunk/; revision=24809
2010-11-22 14:23:06 +00:00
Michael Raskin 6af8a1debd Merging from trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=24804
2010-11-22 11:39:42 +00:00
Michael Raskin 6a9414d938 Adding dd_rescue - this is not the same as GNU ddrescue which has not been updated for a long time
svn path=/nixpkgs/trunk/; revision=24801
2010-11-22 08:40:10 +00:00
Lluís Batlle i Rossell 13a8b34a81 Fix for a syscall restart bug on linux-mips
svn path=/nixpkgs/branches/stdenv-updates/; revision=24791
2010-11-21 15:26:36 +00:00
Lluís Batlle i Rossell 79c06ac912 Updating qemu
svn path=/nixpkgs/trunk/; revision=24784
2010-11-20 14:48:23 +00:00
Rob Vermaas db8748b170 added eclipse 3.6.1, maven3, szip
svn path=/nixpkgs/trunk/; revision=24772
2010-11-19 13:24:11 +00:00
Eelco Dolstra 165a3df7f5 * Update nixSqlite.
svn path=/nixpkgs/trunk/; revision=24764
2010-11-19 10:39:48 +00:00
Michael Raskin fb58f74d82 Updating from trunk again
svn path=/nixpkgs/branches/stdenv-updates/; revision=24745
2010-11-17 17:03:09 +00:00
Evgeny Egorochkin 61e9a549f6 cmus: packaged. Patch by Paul van der Walt <nix@denknerd.nl>.
svn path=/nixpkgs/trunk/; revision=24739
2010-11-17 15:20:57 +00:00
Peter Simons 63f114c3dd This patch adds the cmus console music player.
svn path=/nixpkgs/trunk/; revision=24738
2010-11-17 15:03:12 +00:00
Ludovic Courtès 44c11bdf47 Fiddle with priorities to provide a smoother upgrade path.
svn path=/nixpkgs/branches/stdenv-updates/; revision=24726
2010-11-17 10:43:04 +00:00
Ludovic Courtès d3c50a23f4 SuperTuxKart: Use GNU Make 3.81.
svn path=/nixpkgs/branches/stdenv-updates/; revision=24725
2010-11-17 10:43:00 +00:00
Rob Vermaas de68a76cf8 added netcdf-4.1.1
svn path=/nixpkgs/trunk/; revision=24722
2010-11-17 10:05:46 +00:00
Michael Raskin 52ea4804e2 Correctly override cairo for firefox 4.0 beta
svn path=/nixpkgs/trunk/; revision=24715
2010-11-16 23:19:08 +00:00
Michael Raskin e59ddf7bcb Update Cairo, Pixman; update FF4beta - still broken, cannot pass fresh cairo correctly to it yet
svn path=/nixpkgs/trunk/; revision=24714
2010-11-16 21:05:54 +00:00
Michael Raskin 1b4fe21978 Use FPC 2.4.0 for Lazarus
svn path=/nixpkgs/trunk/; revision=24705
2010-11-15 21:10:18 +00:00
Andres Löh feecbd4ee3 Trying to fix priorities of various GHC/Haskell package versions.
svn path=/nixpkgs/trunk/; revision=24701
2010-11-15 20:28:42 +00:00
Lluís Batlle i Rossell b9c159416c Adding keepnote
svn path=/nixpkgs/trunk/; revision=24695
2010-11-15 19:44:53 +00:00
Evgeny Egorochkin b9b7665edd lshw: Packaged
svn path=/nixpkgs/trunk/; revision=24688
2010-11-15 09:52:57 +00:00
Evgeny Egorochkin 2e516fab70 Gemrb: replace the ugly workaround with a less ugly one.
svn path=/nixpkgs/trunk/; revision=24684
2010-11-14 08:57:49 +00:00
Tobias Hammerschmidt 1314fde101 wesnoth 1.8.5 (patch by Karn Kallio)
svn path=/nixpkgs/trunk/; revision=24682
2010-11-13 11:50:43 +00:00
Evgeny Egorochkin 5029db2160 Spring RTS: packaged along with its deps and utils: libDevIL, libtorrent-rasterbar, spring-lobby.
svn path=/nixpkgs/trunk/; revision=24681
2010-11-13 07:47:04 +00:00
Lluís Batlle i Rossell 8746de3ae8 Updating from trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=24674
2010-11-11 22:18:14 +00:00
Michael Raskin e870391644 Adding acpi-call
svn path=/nixpkgs/trunk/; revision=24668
2010-11-11 22:00:57 +00:00
Rob Vermaas 523c1de575 re-add gettext 0.17
svn path=/nixpkgs/branches/stdenv-updates/; revision=24663
2010-11-11 14:42:35 +00:00
Michael Raskin eed53122c1 Remove ttmkfdir reference
svn path=/nixpkgs/trunk/; revision=24659
2010-11-11 12:27:39 +00:00
Ludovic Courtès 1410156f2a OpenOffice.org 3.2.1.
svn path=/nixpkgs/branches/stdenv-updates/; revision=24644
2010-11-10 16:22:29 +00:00
Rob Vermaas 5e70f43ead reinstate gmp 4.3.1 for i686-darwin (like in trunk)
svn path=/nixpkgs/branches/stdenv-updates/; revision=24641
2010-11-10 15:05:18 +00:00
Michael Raskin d19aa61253 Update Botan
svn path=/nixpkgs/trunk/; revision=24639
2010-11-10 14:48:42 +00:00
Ludovic Courtès 0ef4e570c8 OpenOffice.org: Build with GCC 4.4.
svn path=/nixpkgs/branches/stdenv-updates/; revision=24636
2010-11-10 09:30:03 +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
Ludovic Courtès 9e46c5b3e2 Fix libcanberra.
svn path=/nixpkgs/branches/stdenv-updates/; revision=24625
2010-11-09 09:14:16 +00:00
Ludovic Courtès a09b3a9d0a Fix GNU Emacs 22.
svn path=/nixpkgs/branches/stdenv-updates/; revision=24624
2010-11-09 09:14:12 +00:00
Ludovic Courtès 7ecc652da4 Re-add GNU Make 3.81.
svn path=/nixpkgs/branches/stdenv-updates/; revision=24623
2010-11-09 09:14:07 +00:00
Evgeny Egorochkin 55be5106fd Amule, Quassel: use appendToName to provide different names for common/named overrides.
svn path=/nixpkgs/trunk/; revision=24622
2010-11-08 23:45:58 +00:00