Commit Graph

1116 Commits

Author SHA1 Message Date
宋文武
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
Domen Kožar
4a1e74673a pypy: support only linux for now 2014-02-08 20:27:57 +01:00
Domen Kožar
a23b87a13a pypy: disable a test with transient error #1634 2014-02-08 20:26:23 +01:00
Moritz Ulrich
c983d23e33 elixir: Update to 0.12.3. 2014-02-08 19:05:31 +01:00
Bjørn Forsman
f0be5119d9 ruby/patches.nix: sort attributes alphabetically
And remove trailing whitespace.
2014-02-01 19:56:54 +01:00
Linquize
8f7a502af2 Add cython3 (python 3), move cython (python 2) to subfolder 2014-02-01 17:21:57 +01:00
Linquize
67d73f3957 Update cython 2014-02-01 17:21:56 +01:00
Rob Vermaas
18af65c09b Merge pull request #1584 from monocell/hhvm
HipHopVM update
2014-01-31 01:46:03 -08:00
Eelco Dolstra
82359bba65 python-3.3: Only build on Linux
It doesn't build on Darwin: http://hydra.nixos.org/build/8597946
2014-01-30 13:57:16 +01:00
Petr Rockai
5383e07e40 lua5: Add the lua-sockets extension. 2014-01-28 21:48:47 +01:00
Eelco Dolstra
1b598da460 Drop unnecessary setting of java.home 2014-01-25 03:04:46 +01:00
Song Wenwu
b6cc977580 tcl: update to 8.5.15 2014-01-25 08:45:56 +08:00
Emil Rangden
1e3a151d3b hiphopvm: update to commit 1e23dec9f0 2014-01-24 19:23:23 +01:00
Vladimír Čunát
ac6761c908 Merge master into stdenv-updates
Conflicts:
	pkgs/applications/version-management/gource/default.nix
	pkgs/top-level/all-packages.nix
2014-01-20 19:39:28 +01:00
Domen Kožar
34270e37a7 Add gnome3.gjs 2014-01-20 12:35:31 +01:00
Vladimír Čunát
0a58b512cb Merge master into stdenv-updates
Conflicts (simple):
	pkgs/development/compilers/gcc/4.8/default.nix
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/libraries/gmp/5.1.1.nix
	pkgs/development/libraries/gmp/5.1.3.nix
	pkgs/development/libraries/gmp/5.1.x.nix
	pkgs/top-level/all-packages.nix
2014-01-18 14:46:20 +01:00
Marco Maggesi
9af1ff7ecb Update Io lang to version 2013.12.04 2014-01-14 15:07:31 +01:00
Eelco Dolstra
1343ce97cb rascal: Add 2014-01-14 10:47:08 +01:00
Peter Simons
26ed6c1148 maude: cosmetic 2014-01-13 17:14:40 +01:00
Eelco Dolstra
6fb27abf33 Merge branch 'java' 2014-01-13 13:16:17 +01:00
Eelco Dolstra
36f10d4556 clojure: Don't create $out/bin/java 2014-01-13 13:15:37 +01:00
Michael Raskin
826e7f8a94 Add a LUA_COMPAT_ALL version of Lua 5.2 2014-01-12 22:15:54 +04:00
Vladimír Čunát
a2c316288c Merge master into stdenv-updates
Conflicts:
	pkgs/development/lisp-modules/stumpwm/default.nix (auto-solved)
	pkgs/top-level/all-packages.nix (trivial)
2014-01-12 12:29:24 +01:00
Eelco Dolstra
16e626a80d Replace lib/java -> share/java 2014-01-09 13:01:38 +01:00
Michael Raskin
37e6b8ec80 A larger Octave build with GUI 2014-01-07 22:02:44 +04:00
Michael Raskin
0cbc292e1c Skip Octave test result copying, too, for now 2014-01-07 12:16:50 +04:00
Michael Raskin
b93e6efbf4 Skip Octave tests for now 2014-01-07 01:01:08 +04:00
Eelco Dolstra
cd5a9f4980 clooj: Update to 0.4.4
Also, merge the wrapper into the main package.
2014-01-06 14:36:13 +01:00
Michael Raskin
75f97f5299 Update Octave to 3.8.0 2014-01-05 02:49:45 +04:00
Vladimír Čunát
9443129b08 Merge master into stdenv-updates
Conflicts:
	pkgs/development/libraries/glibc/2.18/common.nix (take stdenv-updates)
	pkgs/misc/emulators/zsnes/default.nix (more complex, build tested)
	pkgs/top-level/all-packages.nix (auto-solved)
2014-01-04 18:34:53 +01:00
Song Wenwu
5f3a737d79 add SuperCollider 3.6.6 2014-01-04 21:39:35 +08:00
Eelco Dolstra
8398b23e10 clojure: Update to 1.5.1
Also, merge the wrapper into the main package, and get rid of the
binary variant.
2014-01-03 14:48:21 +01:00
Eelco Dolstra
ec685e30de kaffe: Remove
It no longer builds and doesn't seem very maintained.
2014-01-03 13:51:23 +01:00
Nixpkgs Monitor
4d3bf74b0a elixir: update from 0.11.2 to 0.12.0 2014-01-02 16:35:54 +01:00
Michael Raskin
f1daf24bea Less aggressive LD_LIBRARY_PATH seems to avoid segfault 2013-12-29 18:52:43 +04:00
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
William A. Kennington III
e4b4df6f43 Update python3 from 3.3.2 -> 3.3.3 2013-12-28 21:04:50 +01:00
Shea Levy
44c97e02f6 Move GEM_PATH part of rubygems' setup hook to ruby
Fixes #1413

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-12-26 18:38:10 -05:00
Vladimír Čunát
b80d1c5923 Merge x-updates 2013-12-25 23:56:41 +01:00
Peter Simons
4e917cdc35 python-2.6-bsddb: build this module with Berkeley DB 4.5
The current 'db' attribute refers to DB 4.8, which Python 2.6 does
recognize: <http://hydra.nixos.org/build/7320517/nixlog/1/raw>.
2013-12-23 21:45:46 +01:00
Vladimír Čunát
2b24f1349a Merge master into x-updates 2013-12-21 10:20:55 +01:00
Evgeny Egorochkin
ba9e03472c pypy: disable failing test 2013-12-21 07:09:16 +02:00
Nixpkgs Monitor
b8eb00bcde pypy: update from 2.2 to 2.2.1 2013-12-21 02:28:26 +02:00
Vladimír Čunát
4c5a71f777 Merge master into x-updates
Conflicts:
	pkgs/desktops/gnome-2/desktop/gvfs/default.nix
	pkgs/development/libraries/cogl/default.nix
	pkgs/development/libraries/libsoup/2.44.nix
2013-12-18 23:21:29 +01:00
Nixpkgs Monitor
f52514956d clojure_binary: update from 1.4.0 to 1.5.1 2013-12-18 18:18:22 +02: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
a2b45034b3 php: Update to 5.4.23, 5.3.28
CVE-2013-4073, CVE-2013-6420
2013-12-16 14:50:40 +01:00
Michael Raskin
556e38c0f4 Fix LuaJIT evaluation on non-Linux platforms 2013-12-15 20:12:35 +04:00
Michael Raskin
45fadcfd39 Merge pull request #1356 from iyzsong/renpy
renpy: update to 6.16.3
2013-12-14 22:50:06 -08:00
Song Wenwu
87e572a3d1 add love-0.9.0 (use luajit by default) 2013-12-15 14:24:28 +08:00
Song Wenwu
77cefbe76a luajit: fix ldconfig to correct *.so files(symlinks) 2013-12-15 14:04:07 +08:00
Song Wenwu
7d5ab6167c renpy: update to 6.16.3 2013-12-11 13:05:07 +08:00
Vladimír Čunát
1d62c6445f racket: fix build via forcing -lgcc_s 2013-12-10 22:37:35 +01:00
Vladimír Čunát
6690c97569 Merge branch 'master' into x-updates
Conflicts (just different styles, same semantics):
	pkgs/development/libraries/libusb1/default.nix
2013-12-07 14:17:16 +01: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
56c9ae9b1d rubygems: update from 1.8.17 to 1.8.25, potentially fixes CVE-2012-2125, CVE-2012-2126, CVE-2013-4287, CVE-2013-4363 2013-12-04 05:10:30 +02:00
Vladimír Čunát
d09b722f77 Merge master into x-updates 2013-12-02 21:41:16 +01:00
zimbatm
b802a7be88 Updates ruby 1.8.7 to the latest patch-level. WARNING: unsupported
ruby 1.8 should be phased out as it contains security issues and is
unsupported by the ruby core team. This is the last update available but it
doesn't fix all CVEs.
2013-12-02 20:11:58 +01:00
zimbatm
c8065de0af Updates ruby 2.0.0 to patch-level 353. Fixes CVE-2013-4164 2013-12-02 20:11:58 +01:00
zimbatm
75a6ed8ddb Updates ruby 1.9.3 to patch-level 484. Fixes CVE-2013-4164 2013-12-02 20:11:58 +01:00
zimbatm
7c6e108c2d Use the recommended http://cache.ruby-lang.org host to get the ruby archives 2013-12-02 20:11:58 +01:00
zimbatm
7a01483d51 Fixes ruby 2.0.0 compilation on Darwin. 2013-12-02 20:11:58 +01:00
Vladimír Čunát
d29ce61521 spidermonkey_185: drop unused readline, parallel build 2013-11-30 13:50:10 +01:00
Vladimír Čunát
cb4639f2b9 spidermonkey_185: enable threads and tests by default
Also drop redundant autoconf.
2013-11-30 13:50:10 +01:00