cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2
52735 commits 1 branch 0 tags 3.7 GiB
Commit graph

1292 commits

Author SHA1 Message Date
Michael Fellinger
57b667fe65 ruby: add version 2.1.2 2014-08-31 13:24:10 +01:00
Domen Kožar
df98dda81d pypy: compile also curses 2014-08-30 23:01:09 +02:00
Domen Kožar
33949a413c python34: include a patch to fix http://bugs.python.org/issue21121 2014-08-30 20:43:31 +02:00
Vladimír Čunát
e51f73652d Merge recent master into staging 
Hydra: ?compare=1149952

Conflicts:
	nixos/doc/manual/configuration.xml (changed split file)
	nixos/modules/config/users-groups.nix (choosing filterNull instead of inline definition)
	pkgs/development/libraries/readline/readline6.3.nix (auto-solved)
 2014-08-30 10:04:02 +02:00
Rüdiger Sonderfeld
05b83fe6a2 octave: Update to 3.8.2. 
Also change "," placement to be consistent and remove unnecessary let.
 2014-08-29 16:44:18 +02:00
Domen Kožar
17b88f1b09 pypy: wrap to provide sqlite3 at runtime 2014-08-29 13:49:12 +02:00
Michael Raskin
c7bb162710 Factor out the maintainer 2014-08-29 01:19:24 +04:00
Michael Raskin
ef974b1c24 Merge pull request #3175 from doublec/self 
Add Self programming language
 2014-08-29 01:09:47 +04:00
Domen Kožar
7b7fb63314 pypy: disable test_sqlite again... 2014-08-27 19:04:38 +02:00
Domen Kožar
df30066790 pypy: test sqlite3 and verify the module 2014-08-27 11:20:24 +02:00
Domen Kožar
4f2781019e pypy: properly hint sqlite3 headers 2014-08-26 19:51:39 +02:00
Domen Kožar
0ba31c1e6d pypy: give hints about sqlite3 2014-08-26 12:26:09 +02:00
Domen Kožar
276220262e pypy: hint about tcl/tk headers/libs paths 2014-08-26 09:57:38 +02:00
Dmitry Belyaev
93697e85ca Support odbc in erlang R16 and R17 2014-08-26 13:11:24 +10:00
Domen Kožar
db47d51592 pypy: add X libs to build tkinter 2014-08-25 19:00:37 +02:00
Bjørn Forsman
c9baba9212 Fix many package descriptions 
(My OCD kicked in today...)

Remove repeated package names, capitalize first word, remove trailing
periods and move overlong descriptions to longDescription.

I also simplified some descriptions as well, when they were particularly
long or technical, often based on Arch Linux' package descriptions.

I've tried to stay away from generated expressions (and I think I
succeeded).

Some specifics worth mentioning:
 * cron, has "Vixie Cron" in its description. The "Vixie" part is not
   mentioned anywhere else. I kept it in a parenthesis at the end of the
   description.

 * ctags description started with "Exuberant Ctags ...", and the
   "exuberant" part is not mentioned elsewhere. Kept it in a parenthesis
   at the end of description.

 * nix has the description "The Nix Deployment System". Since that
   doesn't really say much what it is/does (especially after removing
   the package name!), I changed that to "Powerful package manager that
   makes package management reliable and reproducible" (borrowed from
   nixos.org).

 * Tons of "GNU Foo, Foo is a [the important bits]" descriptions
   is changed to just [the important bits]. If the package name doesn't
   contain GNU I don't think it's needed to say it in the description
   either.
 2014-08-24 22:31:37 +02:00
Domen Kožar
bce42c282a rubyLibs.nokogiri: fix build 2014-08-24 18:33:47 +02:00
Domen Kožar
3df019067d pypy: add tcl support 2014-08-24 17:33:27 +02:00
Michael Raskin
ede8be9281 Fix tarball evaluation; had to regenerate Ruby gem list 2014-08-24 12:55:08 +04:00
Domen Kožar
4ac4440e2f pypy: verify tkinter module 2014-08-24 10:16:54 +02:00
Domen Kožar
3194d5cc32 zope.testing: 4.1.2 -> 4.1.3 (also, fix pypy build) 2014-08-23 17:38:28 +02:00
Rickard Nilsson
52b53dc370 ruby gems: Add riemann-dash 2014-08-23 12:41:49 +02:00
Michael Raskin
a2f96adb3d Merge pull request #3549 from pmahoney/php-pdo-pgsql 
php: Compile pdo_pgsql support
 2014-08-23 12:48:30 +04:00
Eelco Dolstra
0c781b3d8f perl-5.8: Remove 2014-08-21 16:54:29 +02:00
Eelco Dolstra
36a00a0f93 perl-5.10: Remove 2014-08-21 16:54:29 +02:00
Vladimír Čunát
d4e9fd2a90 Merge recent master into staging 
Hydra: ?compare=1148749

Conflicts (easy):
	nixos/modules/virtualisation/containers.nix
 2014-08-21 15:09:31 +02:00
Eelco Dolstra
315e58762d perl: Disable tests 
It appears that these got re-enabled accidentally in
d1ed0f44cd.

http://hydra.nixos.org/build/13369824
 2014-08-17 16:04:47 +02:00
Tino Breddin
655db00a78 elixir: bump to 0.15.1 2014-08-17 14:10:51 +02:00
Luca Bruno
b83aceaecb Merge branch 'master' into staging 2014-08-14 23:09:59 +02:00
Vladimír Čunát
d1ed0f44cd Merge #2823: better cygwin support, also add x86_64 
Conflicts (easy):
	pkgs/development/interpreters/perl/5.16/default.nix
 2014-08-14 20:38:09 +02:00
Moritz Ulrich
79c835212b Erlang R17: Bump to 17.1. 2014-08-12 13:47:38 +02:00
Florian Friesdorf
53490bd17e include ssl with python2.6 as is the case with 2.7 
Signed-off-by: Domen Kožar <domen@dev.si>
 2014-08-12 13:33:23 +02:00
Patrick Mahoney
5ec563707c php: Compile pdo_pgsql support 2014-08-11 22:02:24 -05:00
Peter Simons
8e7442b3ed lua-5: don't restrict the platforms which can build this package 
Hydra builds run only on Linux, but all other platforms can build LUA,
too, if necessary.
 2014-08-09 15:04:44 +02:00
Vladimír Čunát
52d9c93abe Merge 'staging' into master 2014-08-08 20:13:23 +02:00
Eelco Dolstra
8a7f3c3618 Mark a bunch of packages as broken or not supported on Darwin 2014-08-08 17:59:02 +02:00
Peter Simons
9226fbf56a Merge remote-tracking branch 'origin/master' into staging. 2014-08-08 09:51:01 +02:00
Pascal Wittmann
b18d0eee05 groovy: update from 1.7.1 to 2.3.6 and adopt it 2014-08-07 23:41:04 +02:00
Eelco Dolstra
69b426a1eb php: Update to 5.4.31 2014-08-05 11:47:16 +02:00
Peter Simons
2d326e5032 Merge remote-tracking branch 'origin/master' into staging. 
Conflicts:
	pkgs/desktops/e18/enlightenment.nix
 2014-08-04 16:51:47 +02:00
Michael Raskin
399c5285ec Update Angelscript 2014-08-03 22:29:41 +04:00
Vladimír Čunát
6295a3ca36 Merge recent master into x-updates 
Hydra: ?compare=1142825

Conflicts (easy):
	pkgs/applications/audio/lmms/default.nix
	pkgs/desktops/e18/enlightenment.nix
	pkgs/games/exult/default.nix
	pkgs/os-specific/linux/alsa-plugins/default.nix
 2014-08-02 05:08:07 +02:00
Bjørn Forsman
62d0a320b3 Revert "Remove obsolete jackaudio version 1." 
This reverts commit bdb77826d9.

Jack1 is not obsolete and neither jack1 nor jack2 is called 'jackaudio'.

Q: What's the difference between Jack1 and Jack2?
A: http://trac.jackaudio.org/wiki/Q_differenc_jack1_jack2
 2014-07-31 12:52:29 +02:00
Lluís Batlle i Rossell
43ed6b8f62 Updating octave to 3.8.1 2014-07-31 10:11:18 +02:00
Eelco Dolstra
95bbfc957f erlang: Fix name attribute 
Versions should not start with a letter.
 2014-07-30 12:39:35 +02:00
Bjørn Forsman
559eaeb2d2 Revert "use wrapper to set LUA_PATH variable" 
This reverts commit 807cd4b4d4, as it
broke the 'awesome' package. It was also an incomplete change, only
modifying lua-5.1 and none of the other lua versions.

A better approach, if wanting lua to pick up external modules, would be
to loop over $NIX_PROFILES. $NIX_PROFILES is unset in build
environments, so it should be safe.

Conflicts:
	pkgs/development/interpreters/lua-5/5.1.nix
 2014-07-29 18:42:20 +02:00
aszlig
ec65a1e391
erlang: Add manpages to all release packages. 
This puts manpages into "$out/lib/erlang/man" and also symlinks them
into "$out/share/man" with an "erl" suffix (similar to how Debian is
handling this) so those manpages are unlikely to collide with any other
manpages, like for example inet(3).

Closes #3396.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Acked-by: Moritz Ulrich <moritz@tarn-vedra.de>
 2014-07-29 15:26:13 +02:00
Peter Simons
bdb77826d9 Remove obsolete jackaudio version 1. 2014-07-28 20:32:52 +02:00
Mateusz Kowalczyk
7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
Eelco Dolstra
f64d84698e Merge remote-tracking branch 'origin/master' into staging 
Conflicts:
	pkgs/applications/audio/espeak/edit.nix
	pkgs/applications/audio/lmms/default.nix
	pkgs/desktops/e18/enlightenment.nix
	pkgs/games/exult/default.nix
	pkgs/os-specific/linux/alsa-plugins/default.nix
 2014-07-28 11:30:49 +02:00
Bjørn Forsman
f6f2f38a6e jack: change package and attr names to 'jack1' and 'jack2' 
Currently, we have a 'jack' package with attrname 'jack1d' and a
'jackdbus' package with attrname 'jackaudio'. Make it consistent 'jack1'
and 'jack2' in both package name and attrname.

This aligns the naming with what can be found on the JACK homepage.

Q: what's the difference between jack1 and jack2?
A: http://trac.jackaudio.org/wiki/Q_differenc_jack1_jack2
 2014-07-23 20:22:14 +02:00
Eelco Dolstra
5c5f115603 firefox: Build without xulrunner 
Fixes #2950.
 2014-07-23 17:28:36 +02:00
Vladimír Čunát
b9045a7d96 Merge branch 'x-updates' into staging 
...in preparation for a merge to master
 2014-07-22 22:28:39 +02:00
Vladimír Čunát
16e35532e4 Merge recent master into x-updates 2014-07-17 19:30:56 +02:00
Eelco Dolstra
ff97b7dbe6 Merge remote-tracking branch 'origin/master' into staging 2014-07-14 17:04:55 +02:00
Philipp Gesang
df3c10caa3
lua-5.1, lua-5.2: fix typo / copy-n-paste mistake in configurePhase 
s/LDLAGS/LDFLAGS/g in both packages
 2014-07-11 07:17:11 +02:00
Florian Friesdorf
4fd6168e8a python.isPyXY markers 2014-07-10 16:40:35 +02:00
Florian Friesdorf
7dde165353 pythonX.Y sitePackages passthru 
Let python tell you the correct path for site-packages.
 2014-07-10 16:34:45 +02:00
Charles Strahan
08f2ce1172 Fix Python 3.{2,3,4} on Darwin. 
This removes the `-lcrypt` linker flag when compiling under Darwin.
 2014-07-09 00:18:11 -04:00
Markus Kohlhase
1d109fc211 added lua-sec-0.5 2014-07-08 00:26:04 +02:00
Eelco Dolstra
95b828de42 Merge remote-tracking branch 'origin/master' into staging 2014-07-07 13:16:26 +02:00
Chris Double
c6c889b4ea Add Self programming language 2014-07-04 16:09:57 +12:00
Vladimír Čunát
5d2ff3b5c2 php-5.3: fix build with freetype-2.5 (by Gentoo patch) 2014-07-03 18:20:46 +02:00
Austin Seipp
d958fc4ea2 Merge pull request #3137 from flosse/lua5-prefix-fix 
use wrapper to set LUA_PATH variable to fix #3036
 2014-07-02 13:47:21 -05:00
Austin Seipp
002d33b6cc Merge pull request #3151 from flosse/lua5-filesystem 
added lua-filesystem-1.6.2
 2014-07-02 13:46:11 -05:00
Domen Kožar
2e70c676ca python: link gcc_s 
Signed-off-by: Domen Kožar <domen@dev.si>
 2014-07-02 19:57:16 +02:00
Domen Kožar
cfcbfb494e python: 2.7.7 -> 2.7.8 2014-07-02 18:45:34 +02:00
Markus Kohlhase
0d30718357 include share directory 2014-07-01 19:16:24 +02:00
Markus Kohlhase
e0fc4e7734 added lua-filesystem-1.6.2 2014-07-01 13:34:08 +02:00
Eelco Dolstra
06fc1ec34d Merge remote-tracking branch 'origin/master' into staging 
Conflicts:
	pkgs/servers/serfdom/default.nix
 2014-07-01 11:25:41 +02:00
Michael Raskin
a7984cca3b Update angelscript 2014-07-01 12:55:16 +04:00
Markus Kohlhase
807cd4b4d4 use wrapper to set LUA_PATH variable 2014-06-30 03:43:20 +02:00
Markus Kohlhase
7987cd2cc1 added luaexpat 1.3.0 2014-06-30 00:38:05 +02:00
Austin Seipp
593e938341 php: 5.4.29 -> 5.4.30 
CVE-2014-3981, CVE-2014-0207, CVE-2014-3478, CVE-2014-3479,
CVE-2014-3480, CVE-2014-3487, CVE-2014-4049, CVE-2014-3515

Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-06-27 00:24:45 -05:00
Eelco Dolstra
f56567ce74 perl: Add 5.20.0 2014-06-25 11:06:23 +02:00
Eelco Dolstra
da7a12b908 perl: Disable tests 
They're on the critical path for stdenv rebuilds.
 2014-06-24 13:24:12 +02:00
Vladimír Čunát
dc215c2988 php{53,54}: fetch from generic URL 
I see no reason to download from a pre-specified mirror.
It didn't even work for me.
 2014-06-22 15:02:41 +02:00
Austin Seipp
fc4adcd7af php: 5.4.27 -> 5.4.29 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-06-22 00:46:58 -05:00
Austin Seipp
6b345e088b php: Fix fallout from 1228caae9e 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-06-21 21:15:29 -05:00
John Wiegley
1228caae9e php-5.4: Do not build with mssql support on Darwin 2014-06-21 16:29:28 -07:00
Domen Kožar
ad666c56ff pypy: correctly bump the version 2014-06-19 18:16:43 +02:00
Austin Seipp
537dbfed78 Merge pull request #2898 from robberer/php/mssql 
mssql support for php-5.4
 2014-06-18 16:25:24 -05:00
Vladimír Čunát
de12094b0e Merge recent master 2014-06-12 09:15:11 +02:00
System administrator
7b1b46b96b mssql support for php-5.4 
small changes to freetds
see: http://www.php.net/manual/de/mssql.setup.php
 2014-06-11 12:58:40 +02:00
Austin Seipp
2f996c6075 Add Rakudo Star (closes #2054) 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-06-10 18:12:33 -05:00
Austin Seipp
3d319b8264 Remove old hiphop-vm package 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-06-10 13:28:35 -05:00
Vladimír Čunát
f2352f7ecf Merge recent master 2014-06-10 20:14:08 +02:00
Moritz Ulrich
966f13880f Clojure: bump to 1.6.0. 2014-06-10 11:46:05 +02:00
Domen Kožar
be976b2c46 pypy: disable a test 2014-06-09 20:42:57 +02:00
Vladimír Čunát
5a98b9f514 Merge recent master into p/stdenv 
Merged just before the pypi update, as it seems to cause problems on Hydra.
 2014-06-09 19:07:31 +02:00
Michael Raskin
7aa7b967a9 Merge pull request #2810 from letac/raco 
raco pkg install ... is not throwing ssl error anymore
 2014-06-09 10:02:27 +04:00
Domen Kožar
74bc6252a3 pypy: 2.2.1 -> 2.3.1 2014-06-08 22:10:53 +02:00
Moritz Ulrich
77a937beec elixir: Bump to 1.13.3. 2014-06-06 11:57:54 +02:00
Rok Garbas
4eeb0f10fb erlangR16: updated to R16B03-1 
- couchdb: using erlangR16 (fails to build with R17)
 - rename erlang attr names to use only major version in attr name
 2014-06-05 01:16:50 +01:00
Peter Simons
3ee3a5d387 maude: update full-maude to version 2.6.1h 2014-06-04 16:56:32 +02:00
Domen Kožar
73169b3a37 python: 2.7.6 -> 2.7.7 2014-06-04 16:18:36 +02:00
Austin Seipp
80162fb81c Merge pull request #2811 from letac/rocket6 
Update racket to 6.0.1
 2014-06-03 20:30:36 -05:00
letac
b899a69659 Update racket to 6.0.1 2014-06-02 19:42:15 +02:00
letac
f412b73f49 Upgrade rocket to 6.0.1 2014-06-02 19:36:08 +02:00
letac
29b1a9d295 raco pkg install ... is not throwing ssl error anymore 2014-06-02 16:30:10 +02:00
Peter Simons
2f43cd3793 maude: update full-maude to version 2.6.1e 2014-06-01 22:47:49 +02:00
Sander van der Burg
86e18c965f Fix perl compilation 2014-05-31 14:25:46 +02:00
Vladimír Čunát
872860e6de Merge #1187 into p/stdenv 
Tested building firefox, kdelibs, evince on x86_64-linux.
 2014-05-29 22:16:07 +02:00
Sander van der Burg
9ec52d6323 Fixes to make basic builds on Cygwin work again + additions to support x86_64-cygwin 2014-05-29 14:47:07 +02:00
宋文武
3d59f42ce5 renpy: update to 6.17.6 2014-05-23 23:51:05 +08:00
Domen Kožar
53465c35a0 python: 3.4.0 -> 3.4.1 2014-05-22 09:05:38 +02:00
Luca Bruno
d1720a73dd Add spidermonkey_24 2014-05-20 13:41:38 +02:00
Moritz Ulrich
d4dadce5e4 elixir: update from 0.13.0 to 0.13.2 2014-05-19 15:38:21 +02:00
Vladimír Čunát
6275803808 Merge branch 'test-1515' (close #1515) 2014-05-18 17:34:28 +02:00
Austin Seipp
c8dd0f68d7 Merge pull request #2350 from wizeman/u/upd-jruby 
jruby: Update from 1.6.5.1 to 1.7.12
 2014-05-18 08:27:37 -05:00
Ricardo M. Correia
f3967570e7 python-3.4: Add support for grsecurity 2014-05-15 13:25:50 +02:00
Ricardo M. Correia
982c84514b python-3.3: Add support for grsecurity 2014-05-15 13:25:50 +02:00
Ricardo M. Correia
6a4fd79b51 python-2.7: Add support for grsecurity 2014-05-15 13:25:50 +02:00
Ricardo M. Correia
72b711bb1f spidermonkey-17: Add support for grsecurity 2014-05-15 13:25:50 +02:00
Ricardo M. Correia
2ef09b10b4 spidermonkey: Add support for grsecurity 2014-05-15 13:25:48 +02:00
Shea Levy
89238a251c Merge branch 'sysdig-0.1.82-now-with-osx' of git://github.com/proger/nixpkgs 
sysdig: updated to 0.1.82, starting to support Darwin builds (includes
luajit Darwin support)
 2014-05-12 09:34:23 -04:00
Henry Till
6223cbd7a8 supercollider: added emacs support 2014-05-10 22:18:03 -04:00
Vladimir Kirillov
e5f7e4ec3c luajit: support Darwin builds 2014-05-10 13:50:49 +03:00
Vladimir Kirillov
16e7ae3b10 re-introduce phpXdebug as phpPackages.xdebug and bump to 2.2.5 
this uses buildPecl now.
 2014-05-07 14:18:18 +03:00
宋文武
da98b7d65e renpy: update from 6.17.3 to 6.17.4 2014-05-02 21:31:05 +02:00
Michael Raskin
feddcfaf1e Readding Erlang R16B02: R17 is a major update and it breaks Ejabberd. 2014-05-02 20:50:58 +04:00
Domen Kožar
1d2278f480 pypy: disable sqlite3 tests (failing due to sqlite bump) 2014-05-01 18:38:06 +02:00
Eelco Dolstra
ba332accc2 php: Update to 5.4.27 
CVE-2013-7345, CVE-2014-1943, CVE-2014-2270, CVE-2013-6712
 2014-05-01 11:45:35 +02:00
Moritz Ulrich
1ac4383889 elixir: update from 0.12.4 to 0.13.0 2014-04-30 23:52:55 +02:00
Moritz Ulrich
a21486d990 Erlang: Update from R16B02 to 17.0. 2014-04-30 23:52:55 +02:00
Jaka Hudoklin
ab53d469f8 erlang: enable and fix builds on darwin 2014-04-29 22:06:53 +02:00
宋文武
0b99e20a3c love: update 0.9.0 -> 0.9.1 
Changelog:
  https://www.love2d.org/wiki/0.9.1
 2014-04-26 00:03:34 -05:00
Shea Levy
e85b164df8 Add php 5.3 variant with fpm support 2014-04-25 08:19:45 -04:00
Ricardo M. Correia
384db64d95 jruby: Update from 1.6.5.1 to 1.7.12 2014-04-22 19:20:33 +02:00
aszlig
625d7b9043
Merge pull request #1928 from 'cross-win-osx'. 
This includes a lot of fixes for cross-building to Windows and Mac OS X
and could possibly fix things even for non-cross-builds, like for
example OpenSSL on Windows.

The main reason for merging this in 14.04 already is that we already
have runInWindowsVM in master and it doesn't work until we actually
cross-build Cygwin's setup binary as the upstream version is a fast
moving target which gets _overwritten_ on every new release.

Conflicts:
	pkgs/top-level/all-packages.nix
 2014-04-21 10:00:35 +02:00
John Wiegley
b18dc38dc1 Patch lua52 to build on Darwin 2014-04-15 04:46:14 -05:00
John Wiegley
f9c2f684e8 Allow lua5 to build as a dylib on Darwin 2014-04-14 14:39:23 -05:00
James Cook
21cb9c24f0 Patch python32 for CVE-2014-1912. 2014-04-13 05:15:19 +02:00
James Cook
324ade4658 Patch python27 for CVE-2014-1912. 2014-04-13 05:15:19 +02:00
Vladimír Čunát
7be0e37ca2 Merge master into test-1515 
To get rid of 2k aborted builds. ?compare=1095725
 2014-04-12 10:38:40 +02:00
Austin Seipp
29c0d0047f luajit: adopt, upgrade, optimize 
- Build the 'amalgamation' by default - more RAM needed to build, but
   better overall performance
 - Upgrade to version 2.0.3
 - Adopt as maintainer

Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-04-08 21:16:33 -05:00
Shea Levy
decd2feb0a Merge branch 'pd' of git://github.com/iyzsong/nixpkgs into test-1515 
tcl/tk: update to 8.5.15, fix #1479
 2014-04-05 14:01:07 -04:00
Vladimír Čunát
1046b4ccab Merge #1905: perl: disable tests that involve networking 
I rebased the branch not to include newer changes from master.
 2014-04-02 19:06:10 +02:00
Ricardo M. Correia
842ae7674b python-3.4: Add support for lzma 2014-03-23 21:26:54 +01:00
Ricardo M. Correia
c173ddb70e python-3.3: Add support for lzma 2014-03-23 21:26:54 +01:00
Georges Dubus
24e9c676d2 python: update 3.4.0 to stable release 2014-03-17 17:07:20 +01:00
Nixpkgs Monitor
74488f2ade clisp_2_44_1: update from 2.44.1 to 2.49 2014-03-14 11:16:56 +01:00
aszlig
c7bac81c66
Merge 'mingw-w64' and 'darwin' into cross-win-osx. 
Both branches have quite a lot in common, so it's time for a merge and
do the cleanups with respect to both implementations and also generalize
both implementations as much as possible.

This also closes #1876.

Conflicts:
	pkgs/development/interpreters/lua-5/5.2.nix
	pkgs/development/libraries/SDL/default.nix
	pkgs/development/libraries/glew/default.nix
	pkgs/top-level/all-packages.nix
 2014-03-12 10:16:51 +01:00
aszlig
745c477930
lua5.2/cross: Fix build for Darwin. 
The ld from cctools doesn't like the -soname argument, so let's strip it
off for now until we have a binutils <-> cctools bridge.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-03-12 10:00:46 +01:00
Domen Kozar
f911d51243 python 3.3.4 -> 3.3.5 2014-03-09 21:04:14 +01:00
Matthew Sackman
ce2ac1f8a9 erl_call should be in bin. erl_call is very useful and other distributions make erl_call available on PATH. 2014-03-07 14:58:25 +01:00
Domen Kozar
fedd018d93 fix pypy and pypyPackages 2014-03-07 14:34:06 +01:00
Domen Kožar
8477605a51 Merge pull request #1839 from iyzsong/renpy 
renpy: update to 6.17.3
 2014-03-07 13:56:44 +01:00
Song Wenwu
265be593c8 renpy: update to 6.17.3 2014-03-05 12:22:38 +08:00
Shea Levy
6d5176a28b php54: enable fpm support 2014-03-04 07:48:27 -05:00