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
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
aszlig
e64b342fa8
Use mingw-w64 for 32bit Windows builds as well.
...
Mingw(32) is rather poorly maintaned and has quite a lot of bugs. And
because our Windows cross builds were also poorly maintained and most of
the cross-tests were broken as well, I'm just taking this step and try
to switch to mingw-w64 for everything "cross Windows".
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-03-03 22:38:48 +01:00
Domen Kožar
83771bd926
add python 3.4.0rc2
2014-03-03 14:21:28 +01:00
Song Wenwu
2e99141805
renpy: update to 6.17.2
2014-03-02 12:46:47 +08:00
Domen Kožar
9019998576
refactor cython into pythonPackages, fixes #1803
2014-02-27 16:37:35 +01:00
Song Wenwu
687fe45582
renpy: update to 6.17.1
2014-02-26 19:21:46 +08:00
Peter Simons
51c9dbc9f3
python-wrapper: add 'ignoreCollisions' parameter (which default to 'false')
2014-02-24 12:41:12 +01:00
aszlig
4f69722ee5
lua52/cross: Allow to cross-compile to mingw-w64.
...
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-02-24 07:26:25 +01:00
Domen Kožar
a0ff8f687f
python3.3: 3.3.3 -> 3.3.4
2014-02-20 00:44:51 +01:00
Domen Kožar
31949ead32
python2.7: 2.7.5 -> 2.7.6
2014-02-20 00:44:27 +01:00
Domen Kožar
67cc87a35a
python2.6: 2.6.8 -> 2.6.9
2014-02-20 00:44:08 +01:00
Moritz Ulrich
5228c2b94e
elixir: update from 0.12.3 to 0.12.4
2014-02-16 15:50:24 +01:00
William A. Kennington III
bdb842d5eb
Move all db4 packages to the default db5
2014-02-15 12:03:02 +01:00
Vladimír Čunát
161d029d7d
preferLocalBuild: set to true for wrappers and fetchers
2014-02-10 21:04:17 +01:00