Commit Graph

1018 Commits

Author SHA1 Message Date
Eelco Dolstra
1b598da460 Drop unnecessary setting of java.home 2014-01-25 03:04:46 +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