3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

1828 commits

Author SHA1 Message Date
William A. Kennington III ae28ff8b91 Merge branch 'master.upstream' into staging.upstream 2015-07-06 17:15:11 -07:00
William A. Kennington III 8f17099d6a bundler: 1.9.2 -> 1.10.5 2015-07-06 16:42:16 -07:00
William A. Kennington III 0f21f3e00b bundler-head: Correct hash 2015-07-06 16:42:16 -07:00
William A. Kennington III d5cd6eebcd ruby: Add 2.1.6 2015-07-06 16:42:16 -07:00
William A. Kennington III 84ef883ac2 rvm-patchsets: Update 2015-07-06 16:42:16 -07:00
William A. Kennington III d605663ae2 Merge branch 'master.upstream' into staging.upstream 2015-07-05 13:06:02 -07:00
Michael Raskin 5f95a8cc10 Angelscript: update 2.30.0 -> 2.30.1 2015-07-05 00:32:53 +03:00
William A. Kennington III 7eae48871f Merge branch 'master.upstream' into staging.upstream 2015-07-01 13:38:17 -07:00
Shea Levy 145768bf9b Unmaintain a bunch of packages 2015-07-01 08:11:05 -04:00
Luca Bruno 22fce48371 php: fix broken build inputs (ZHF) 2015-07-01 12:31:01 +02:00
William A. Kennington III 612f0bdd67 Merge branch 'master.upstream' into staging.upstream 2015-06-30 23:58:07 -07:00
Andrey Pavlov 15fd734a58 elixir: 1.0.4 -> 1.0.5 2015-06-29 17:30:59 +03:00
William A. Kennington III 12102562f7 Merge branch 'master.upstream' into staging.upstream 2015-06-27 00:18:18 -07:00
William A. Kennington III 7297255019 Convert all jack references to libjack2 2015-06-27 00:17:52 -07:00
William A. Kennington III ef253212f4 Merge branch 'master.upstream' into staging.upstream 2015-06-26 17:25:49 -07:00
Jude Taylor e130e9d3a3 fix bundler hash 2015-06-26 09:54:49 -07:00
Andrey Pavlov 5506632473 erlang: add Erlang R18, closes #8515 2015-06-26 16:15:14 +02:00
Jude Taylor 80c62d1325 darwin purity: ruby-1.9.3 2015-06-25 16:36:04 -07:00
Thomas Tuegel a8c52d0958 Merge branch 'master' into staging 2015-06-25 09:15:05 -05:00
Arseniy Seroka 22b89f2fcd Merge pull request #8463 from mbbx6spp/jruby-1_7_20_1
jruby: 1.7.12 -> 1.7.20.1 (update package for CVE patch)
2015-06-23 20:04:31 +03:00
Susan Potter 2968707101 jruby: 1.7.12 -> 1.7.20.1
Security release which only updates Rubygems to version 2.4.8. Rubygems 2.4.8
addresses CVE-2015-1855 to resolve some problems with wildcard matching of
hostnames.

See following entry for more information:
http://jruby.org/2015/06/10/jruby-1-7-20-1.html
2015-06-23 11:58:29 -05:00
Henry Till e6e04d3a45 racket: 6.1.1 -> 6.2 2015-06-22 19:28:43 -04:00
Jude Taylor e3927f6b92 remove unbuildables from impure darwin stdenv 2015-06-19 22:08:11 -07:00
Jude Taylor f048ff3969 darwin purity: python-2.7 2015-06-19 12:56:39 -07:00
Jude Taylor e039794e5b apply perl-5.20 fix to pure darwin only 2015-06-19 12:56:38 -07:00
Vladimír Čunát 61596bf405 Merge #8363: pure-darwin stdenv 2015-06-18 22:38:08 +02:00
Jude Taylor fa9c81f694 pure darwin stdenv 2015-06-18 12:37:41 -07:00
Daiderd Jordan b66942702b erlang: use wxmac on darwin 2015-06-18 11:34:05 +02:00
William A. Kennington III 8e19ac8d7c Merge branch 'master.upstream' into staging.upstream 2015-06-17 11:57:40 -07:00
William A. Kennington III 4c8f84e8af python: Correctly detect ncurses opaque api 2015-06-15 17:55:44 -07:00
Arseniy Seroka 8a23f0eba0 Merge pull request #8345 from joachifm/reimplement-picolisp
Re-define picolisp
2015-06-15 22:43:03 +02:00
William A. Kennington III 354e5af036 Revert "perl: Don't use builtin zlib and bzip2"
This reverts commit 86f9f5d128.
2015-06-13 10:29:12 -07:00
William A. Kennington III 03efddef75 perl: Add version 5.22.0 2015-06-12 13:55:34 -07:00
William A. Kennington III 4c536065b7 perl: Add gcc5 compat patch 2015-06-12 13:54:46 -07:00
William A. Kennington III 86f9f5d128 perl: Don't use builtin zlib and bzip2 2015-06-12 13:53:53 -07:00
William A. Kennington III 954801a9a8 Merge branch 'master.upstream' into staging.upstream 2015-06-12 13:47:46 -07:00
Thomas Tuegel 2a2448bcb7 Merge pull request #8182 from ttuegel/openblas
Numerical computing overhaul
2015-06-12 08:06:03 -05:00
Eelco Dolstra e982ac1017 php: Update to 5.4.42, 5.6.10
CVE-2015-3414, CVE-2015-3415, CVE-2015-3416
2015-06-12 13:47:30 +02:00
Rok Garbas 617c16f8f6 cygwin: python27 gdbm module needs gettext 2015-06-12 12:17:12 +02:00
Thomas Tuegel 089f9d6486 gnuapl: latest version doesn't require liblapack 2015-06-11 22:00:13 -05:00
Domen Kožar 4227b13af6 pypy: 2.5.1 -> 2.6.0 2015-06-11 10:42:14 +02:00
Thomas Tuegel 614c867b29 octave: build with openblas
The expression inherits integer width from OpenBLAS, so Octave will use
64-bit integers if OpenBLAS supports it. However, this feature in Octave
is experimental, so we continue to use OpenBLAS with 32-bit integers by
default. (This only applies to the integer width, the pointer width is
always the platform-native width.)
2015-06-07 14:16:37 -05:00
Vladimír Čunát 4c475520d9 spidermonkey_17: remove *.a to save 8 MB
The sole user (polkit) still builds fine.
Inspired by #8147.
2015-06-07 09:22:14 +02:00
Arseniy Seroka 70b5e51456 Merge pull request #8178 from jagajaga/fix/versions
fix: add missing versions
2015-06-06 00:22:10 +03:00
William A. Kennington III ffd0539eba cacert: store ca-bundle.crt in $out/etc/ssl/certs instead of $out 2015-06-05 13:00:52 -07:00
Arseniy Seroka daf4ec39a5 fix: add missing versions 2015-06-04 23:34:14 +03:00
Michael Raskin e66294151a Adding Lua 5.3, seems to work 2015-06-02 20:32:12 +03:00
Michael Raskin c84a9d2d17 Update Octave to 4.0.0 2015-05-31 11:01:51 +03:00
William A. Kennington III 14c1e0fa1f Fix ca-bundle paths 2015-05-29 14:03:34 -07:00
Shea Levy 1b93d64168 nix-exec: bump 2015-05-29 11:05:36 -04:00
Peter Simons 99273a6716 Merge pull request #8047 from nckx/master
Don't use "with licenses;" for single licences
2015-05-28 22:14:53 +02:00
Tobias Geerinckx-Rice 158e1cfdd0 Don't use "with licenses;" for single licences
And don't use square brackets on such lines.
2015-05-28 19:20:29 +02:00
Rok Garbas 93d507cac8 cygwin: for 2.7.10 export-PyNode_SizeOf patch not needed anymore 2015-05-28 14:15:47 +02:00
Florian Friesdorf 5f4a9c3391 cygwin: python-2.7 2015-05-28 10:53:36 +02:00
Florian Friesdorf ebf6d98fc2 cygwin: build perl as usual, no sysPerl 2015-05-28 10:53:34 +02:00
Austin Seipp 5762db8504 nixpkgs: luajit 2.0.3 -> 2.0.4
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-05-27 16:36:27 -05:00
Tobias Geerinckx-Rice b2d7f4b1ba Use common licence attributes from lib/licenses.nix
Many (less easily automatically converted) old-style strings
remain.

Where there was any possible ambiguity about the exact version or
variant intended, nothing was changed. IANAL, nor a search robot.

Use `with stdenv.lib` wherever it makes sense.
2015-05-27 22:00:06 +02:00
Pascal Wittmann 6c2fc83a85 bundler: bin/bundler expects ruby in PATH 2015-05-27 17:11:33 +02:00
Pascal Wittmann 150ae25546 bundler: do not add a ruby name prefix
Otherwise bundler replaces ruby:

% nix-env -iA nixpkgs.ruby
installing ‘ruby-1.9.3-p547’
% nix-env -iA nixpkgs.bundler
replacing old ‘ruby-1.9.3-p547’
installing ‘ruby-1.9.3-p547-bundler-1.9.2’
2015-05-27 14:48:44 +02:00
Domen Kožar c918903381 python: 2.7.9 -> 2.7.10 2015-05-24 18:55:53 +02:00
Eelco Dolstra 9a159fc2bc php: Update to latest versions 2015-05-20 11:34:08 +02:00
Joel Taylor d60058af4b lua: update patch for 5.2 on darwin 2015-05-18 13:12:45 -07:00
Joel Taylor c7ed090e21 Revert "fix lua.pc library name"
This reverts commit 330836a82b.
2015-05-17 15:03:53 -07:00
Joel Taylor 330836a82b fix lua.pc library name 2015-05-17 14:34:22 -07:00
Peter Simons 9bc42f6d00 hugs: set meta.platforms 2015-05-15 21:26:10 +02:00
Peter Simons 1ceebca7af hugs is an interpreter, not a compiler 2015-05-15 21:24:02 +02:00
Spencer Whitt a634c11075 ruby_1_8_7: Fix on Darwin 2015-05-15 11:58:19 -04:00
Domen Kožar 3dc204f42e fix eval 2015-05-14 20:21:56 +02:00
Domen Kožar d769b52307 python: pass stdenv.glibc to crypt module to expose crypt.so 2015-05-13 18:39:50 +02:00
aszlig a7028d3d07
python2: Pass configureFlags to modules as well.
Fixes regression from 086e801d51.

The switch tu UCS-4 only happened for the main Python interpreter and
libraries, but the extension modules were using the same source but
without any configureFlags, so the extensions still referred to UCS-2
symbols.

Tested module builds of Python 2.7 and all modules except crypto fail.
Also tested against sqlite3 module of Python 2.6, although for other
modules there still seems to be an unrelated build failure with Tcl/Tk
libraries, so we might need to fix that later.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-05-12 18:06:33 +02:00
aszlig 55e66db0fa
python2: Don't fail silently on module build.
A build output of such a failure can be found here:

http://hydra.nixos.org/build/21994789/nixlog/1/raw

The build_ext command doesn't return non-zero if it fails but instead
produces a file with a "_failed.so" suffix, which we're now checking
after the build_ext command.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-05-12 18:06:33 +02:00
Michael Raskin be221a05ed Update Regina/REXX 2015-05-10 13:46:30 +02:00
Dario Bertini 86290712d2 Enable old pythons' wide builds 2015-05-10 13:45:26 +02:00
William A. Kennington III 074c4a7f78 Merge remote-tracking branch 'upstream/master' into staging 2015-05-07 01:44:49 -07:00
Dan Peebles 5454be28aa I suppose this is the 'better' way to fix bundler for now. Ugh 2015-05-07 01:14:14 -04:00
Dan Peebles 35ddd2543a Revert "Fix bundler HEAD"
This reverts commit 00c4c52277.
2015-05-07 01:10:46 -04:00
Dan Peebles 00c4c52277 Fix bundler HEAD 2015-05-07 00:11:00 -04:00
Arseniy Seroka 75ee41fdb9 lua_patch: fix url 2015-05-06 22:05:44 +03:00
Arseniy Seroka f24d8777dd Revert "lua_patch: fix sha"
This reverts commit c5a0dae668.
2015-05-06 22:05:20 +03:00
Arseniy Seroka c5a0dae668 lua_patch: fix sha 2015-05-06 22:01:16 +03:00
Tobias Geerinckx-Rice c37ca32be2 Add picoc 2015-05-04: a very small C interpreter 2015-05-05 19:43:20 +02:00
Ricardo M. Correia 372f7e0a13 pypy: Update from 2.5.0 -> 2.5.1 2015-05-03 01:19:39 +02:00
William A. Kennington III 5835d577e7 tcl/tk: Refactor and add maintainers 2015-04-30 18:49:27 -07:00
Thomas Tuegel 1fe28a1132 Merge remote-tracking branch 'upstream/master' into staging 2015-04-29 11:33:28 -05:00
Eelco Dolstra 182acabbae Don't use camelCase in file names 2015-04-29 16:09:30 +02:00
Eelco Dolstra 552ea209d0 php: Update to 5.4.40 2015-04-29 16:07:36 +02:00
Charles Strahan 09602f7f39 ruby: fix gems that use mysql 2015-04-27 22:00:52 -04:00
lethalman f134ba68e3 Merge pull request #7534 from berdario/jython
Add jython
2015-04-27 12:14:45 +02:00
William A. Kennington III d8c949cc26 Make tcl and tk versions generic 2015-04-26 21:30:01 -07:00
William A. Kennington III d7c0e3eaf8 tcl: Make generic and add 8.5 2015-04-26 21:15:25 -07:00
William A. Kennington III 55a64a5ddb tcl/tk: Tie versioning together and propagate 2015-04-26 20:55:42 -07:00
Vladimír Čunát 30f31c9afc Merge 'master' into staging
(relatively simple conflicts)
2015-04-26 22:52:08 +02:00
Joachim Fasting 4761419821 picolisp: 3.1.9 -> 3.1.10 2015-04-25 19:04:40 +02:00
Joachim Fasting 8854691356 picolisp: re-define using mkDerivation
Retains the old install script, with two exceptions:
- Generates a custom pil wrapper; the existing wrapper
  inexplicably fails to load lib.l
- Installs emacs lisp into share/emacs/site-lisp, so that
  it gets installed into the user's environment.
2015-04-25 18:06:19 +02:00
Dario Bertini 7c5dbbe23a
Add jython 2015-04-24 10:44:33 +01:00
Robin Gloster cb904510a6 consolidate php builds 2015-04-18 03:46:48 -07:00
Charles Strahan 7fc3b002e6 bundlerEnv: better error handling
properly handle the case where a gemspec is missing
2015-04-15 19:24:30 -04:00
Charles Strahan be3d3dd298 bundlerEnv: fix charlock_holmes config 2015-04-15 19:24:04 -04:00
Charles Strahan bb7c9f71e1 bundix: 1.0.2 -> 1.0.3 2015-04-15 19:07:09 -04:00
Thomas Tuegel 88918e10e9 Merge branch 'master' into staging 2015-04-10 07:45:38 -05:00
Peter Simons 79fca7c3e4 Merge pull request #7267 from couchemar/erlang-r17.5
erlang/R17 update to 17.5
2015-04-10 11:12:40 +02:00
Andrey Pavlov c3fd42ff64 Update elixir to 1.0.4 2015-04-09 10:10:35 +03:00
Pascal Wittmann c50d47858f groovy: update from 2.4.2 to 2.4.3 2015-04-08 16:25:13 +02:00
Andrey Pavlov 90b1507419 erlang/R17 update to 17.5 2015-04-08 15:18:39 +03:00
Eric Seidel 6ec373d776 Merge branch master into staging 2015-04-06 18:58:08 -07:00
Arseniy Seroka c7a099d4aa Merge pull request #7192 from KoviRobi/gnu-apl-update
Updated GNU APL to 1.5
2015-04-06 00:42:14 +03:00
Michael Raskin b783b69326 Merge pull request #6044 from sjmackenzie/erlang-javac-hipe
Problem: erlang in nixpkgs doesn't support jinterface + no hipe
2015-04-05 21:07:11 +03:00
Michael Raskin c6eafc4eef Update lush 2015-04-05 20:27:25 +03:00
Nikolay Amiantov 250a39dc79 bundler: update 2015-04-05 16:04:54 +03:00
William A. Kennington III 43d114c74b bundler-head: Fix hash 2015-04-03 23:18:23 -07:00
Austin Seipp 83a6da7377 rakudo: 2014.04 -> 2015.03
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-04-03 23:18:35 -05:00
William A. Kennington III a604b42480 mysql: Use libs in place of the binary mysql 2015-04-01 16:46:53 -07:00
Eelco Dolstra 33dfdbd0df php: Update to 5.4.39
CVE-2015-2787, CVE-2015-2348, CVE-2015-2305, CVE-2015-2331.
2015-04-01 16:22:12 +02:00
Karn Kallio 39a3fd1454 pure: advance to version 0.64; use llvm 3.5 as 3.6 breaks the build 2015-03-31 13:21:47 +02:00
= c06b50339a Updated GNU APL to 1.5
Plus also did a bit of meta nitpick
2015-03-30 14:06:26 +01:00
Jan Malakhovski a3e00bf6c4 python 2.7: add x11Support option 2015-03-29 23:30:39 +00:00
William A. Kennington III 7ccccc15ba Merge branch 'master' into staging 2015-03-27 16:03:03 -07:00
Arseniy Seroka 91eaf5495f Merge pull request #7035 from joachifm/reimplement-kona
Reimplement kona
2015-03-27 23:13:25 +03:00
Joachim Fasting 933e6cc832 kona: bump to 3.21
Use release tarball rather than GIT checkout. Note: disregard the
platform and arch embedded in the release tarball name.
2015-03-27 19:33:59 +01:00
Joachim Fasting 52d77f2360 kona: reimplement using mkDerivation
Also set supported platforms to `all`, per upstream, and specify
license (ISC).
2015-03-27 18:10:32 +01:00
Eelco Dolstra 0e2257966f Disable packages that depend on <nixpkgs>
Nothing in Nixpkgs should use <nixpkgs>, because it can cause Nixpkgs
evaluation to depend in part on a different version of Nixpkgs,
leading to unpredictable results (including evaluation errors).
2015-03-27 16:17:48 +01:00
William A. Kennington III 8286f6cef3 tcl: 8.5.15 -> 8.6.4 2015-03-26 15:39:20 -07:00
William A. Kennington III 5f50b087f8 perl: 5.20.1 -> 5.20.2 2015-03-26 00:24:17 -07:00
Michael Raskin 7c8410b196 Merge pull request #6965 from joachifm/reimplement-j
j: re-implement using mkDerivation
2015-03-24 17:02:48 +03:00
Joachim Fasting 62a6499243 j: re-implement using mkDerivation 2015-03-24 14:05:25 +01:00
Pascal Wittmann 5e3a99e7d6 groovy: update from 2.4.1 to 2.4.2 2015-03-23 15:29:36 +01:00
William A. Kennington III 935938f262 Merge pull request #6924 from joachifm/picolisp-update
picolisp: bump to 3.1.9
2015-03-21 20:46:41 -07:00
Joachim Fasting 262a3ac3c4 picolisp: bump to 3.1.9 2015-03-21 23:49:57 +01:00
Michael Raskin 0d2a00fdee update lush 2015-03-21 21:29:38 +03:00
Eelco Dolstra 2ed5c2bd6b Set some meta.platforms
Also fix meta.platform -> meta.platforms in a few places.
2015-03-20 20:04:42 +01:00
Jaka Hudoklin 17b9405685 bundlerEnv: add support for additional build inputs 2015-03-18 14:15:50 +01:00
Kovacsics Robert (NixOS-SSD2) 8f5f047286 Added GNU APL, a free APL interpreter.
It is an almost complete implementation of ISO 13751: Programming
Language APL, Extended.
2015-03-16 21:57:51 +00:00
Robin Gloster 282530454a add myself as php and rustc maintainer 2015-03-11 11:24:55 +01:00
Robin Gloster 9d26ad274a rename weirdly called patch for php 2015-03-11 11:24:43 +01:00
Robin Gloster fff1cc805a add calendar functions to PHP by default 2015-03-11 11:07:22 +01:00
Eelco Dolstra 7f90cc40b4 php: Update to 5.4.38 2015-03-09 11:36:40 +01:00
Michael Raskin 0f8e3caec5 Repackage from scratch and update angelscript 2015-03-09 01:03:01 +03:00
Lluís Batlle i Rossell 0f4a9a58d8 Avoid bash arg in Spidermonkey 17 2015-03-06 14:34:26 +00:00
Ambroz Bizjak e47afb3601 spidermonkey-17: Disable test which fails on ARM.
(cherry picked from commit b90dca35aac458953182b4e1ad725c9466d11a66)
2015-03-06 09:11:03 +00:00
Charles Strahan b4d4b88988 Merge pull request #6147 from abbradar/bundlerenv-env
bundler-env: add .env
2015-03-02 18:28:02 -05:00
Charles Strahan f87a7fd241 bundix: update 2015-02-27 14:28:34 -05:00
Vladimír Čunát 7abccbe81c octave: disable parallel building again
http://hydra.nixos.org/build/19917018
2015-02-27 12:55:49 +01:00
Domen Kožar 61c3aa5047 python: 3.4.2 -> 3.4.3 2015-02-25 15:21:14 +01:00
Pascal Wittmann c639b834c2 groovy: update from 2.4.0 to 2.4.1 2015-02-24 19:04:23 +01:00
Pascal Wittmann 48add86c05 groovy: update homepage 2015-02-24 19:04:23 +01:00
Lluís Batlle i Rossell 781666da50 octave: generate the documentation
I find octave quite unusable, without its help pages. Recently it started to
require gnuplot to generate them (even the text-only).

I also enabled parallel building. A comment from 2012 said about spurious
failures if it were enabled, but I don't know if these happen again. Let's
enable it to see.

(cherry picked from commit a6f1024b1f)

Conflicts:
	pkgs/top-level/all-packages.nix
2015-02-23 10:29:42 +01:00
Ryan Scheel f2f3c5b4ef Update Elixir to v.1.0.3
Tested locally and it works. :D
2015-02-20 14:23:04 -08:00
Nikolay Amiantov aa878ffe94 bundler: fix hash 2015-02-18 19:06:30 +03:00
Dan Peebles a68484a0ac Minor fix for broken ruby evaluation and libiconv 2015-02-17 21:39:29 -05:00
Shea Levy 2f061ff16b Merge remote-tracking branch 'origin/staging'
Darwin and haskell fixes.
2015-02-17 13:52:37 -05:00
AndersonTorres 71299b9120 LOLcode(version 0.10.5): New Package
LOLcode is an esoteric programming language, composed of LOLspeaks.
2015-02-15 08:58:42 -02:00
Shea Levy 127efcd6f6 Merge branch 'kill-libiconv' of git://github.com/gridaphobe/nixpkgs into staging
Took "ours" for the conflict and changed libiconvOrEmpty to libiconv

Conflicts:
	pkgs/applications/audio/ncmpcpp/default.nix
2015-02-11 19:37:22 -05:00
Domen Kožar c0d814d62b pypy: fix build 2015-02-08 20:43:44 +01:00
Eric Seidel e08b9ab8d3 kill libiconvOr*
Conflicts:
	pkgs/applications/networking/mailreaders/sup/default.nix
	pkgs/development/compilers/ghc/7.8.3-binary.nix
	pkgs/development/interpreters/php/5.3.nix
	pkgs/development/interpreters/ruby/patches.nix
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/poppler/default.nix
	pkgs/top-level/all-packages.nix
2015-02-07 20:29:28 -08:00
Emil Rangden 36ceb01176 add php 5.6 2015-02-05 20:28:16 +01:00
Emil Rangden 90e8287ce6 add php 5.5 2015-02-05 20:28:16 +01:00
Emil Rangden 1b057e9f6f remove patch that was only used in 5.3 2015-02-05 20:28:16 +01:00
Nikolay Amiantov 35f1d4459b bundix: fix checksum 2015-02-04 19:44:19 +03:00
Nikolay Amiantov 0deb3fce70 bundler-env: add .env 2015-02-04 19:42:40 +03:00
Domen Kožar a3e23f6535 fix eval 2015-02-04 14:11:33 +01:00
Domen Kožar d75a91ef1e pypy: 2.4 -> 2.5 2015-02-04 13:21:20 +01:00
Eric Seidel dbf3d31727 make llvm-3.5 the default and remove references to gccApple
make perl be less dumb

revert change to release.nix
2015-02-03 14:31:04 -08:00
Pascal Wittmann f086517f81 mujs: update to latest revision 2015-02-03 10:43:41 +01:00
Shea Levy c45372f038 Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'
Partial staging merge, including cc-wrapper fixes

Conflicts:
	pkgs/applications/audio/spotify/default.nix
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/development/compilers/cryptol/1.8.x.nix
2015-02-02 21:14:28 -05:00
Edward O'Callaghan ed232ef5f8 php: update from 5.4.35 to 5.4.37
Potentially fixes CVE-2014-8142, CVE-2014-9427, CVE-2015-0231, CVE-2015-0232

Signed-off-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
2015-01-30 01:54:20 +11:00
Stewart Mackenzie f8bdabaafa Problem: erlang in nixpkgs doesn't support jinterface + no hipe
Solution:
* Every Erlang programmer expects Hipe to be enabled; So it's now enabled by default
* Java support is very often needed, many expect it by default. So I've added top-level support for erlang-javac and erlang-javac-odbc
2015-01-29 08:35:33 +00:00
Charles Strahan 6eaa419920 gitlab: fix evaluation 2015-01-25 16:28:18 -05:00
Charles Strahan 989a894fc8 ruby: patch path in tzdata gem 2015-01-25 16:22:30 -05:00
Charles Strahan c1814073ac bundlerEnv: use full path to ruby in wrappers 2015-01-24 17:35:11 -05:00
Domen Kožar 8270a5f0eb Merge pull request #5876 from berdario/pew
Update pew to 0.1.14
2015-01-24 20:02:20 +01:00
Henry Till aa4abb7d9b racket: add missing libs and clean up 2015-01-24 11:02:23 -05:00
Dario Bertini 57577f2019
Explicitly specify the pythonVersion and use that together with versionOlder/versionAtLeast to specify bounds 2015-01-24 10:38:54 +00:00
Charles Strahan ad026dab98 ruby: don't reference baseruby 2015-01-23 21:22:34 -05:00
Pascal Wittmann 100c6e85ad mujs: updated to latest commit 2015-01-22 11:31:27 +01:00
Pascal Wittmann dff539acd9 groovy: update from 2.3.9 to 2.4.0 2015-01-22 10:53:40 +01:00
Charles Strahan 00f93c494b ruby: fixup 2.2's passthru 2015-01-22 01:00:00 -05:00
Charles Strahan 98bfaf52f7 ruby: use commit to identify libv8 patch 2015-01-22 00:47:08 -05:00
Charles Strahan 8d49e87dec Merge pull request #4677 from cstrahan/pleasant-ruby
Pleasant ruby
2015-01-21 23:27:38 -05:00
Charles Strahan 034488ec80 ruby: fixup mpdcron 2015-01-21 22:38:29 -05:00
Charles Strahan 8085f088cb ruby: exorcise the last few remaining rubyPackages 2015-01-21 22:23:37 -05:00
Charles Strahan 65c7c61841 ruby: use patch for libv8 2015-01-21 20:37:05 -05:00
Charles Strahan 317d78d145 consule: use new bundlerEnv 2015-01-21 20:33:19 -05:00
Charles Strahan f52c32fcfc ruby: rewrite sup package 2015-01-21 18:23:35 -05:00
Charles Strahan 115c299ea0 ruby: enable curses support by default 2015-01-21 15:22:21 -05:00
Charles Strahan 5f1622e95f ruby: allow for passing build arguments 2015-01-20 23:33:57 -05:00
Charles Strahan 7d8b2f0d60 ruby: make buildInputs work 2015-01-20 22:20:28 -05:00
Charles Strahan dfc225d143 Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby
Conflicts:
	pkgs/applications/version-management/git-and-tools/default.nix
	pkgs/applications/version-management/git-and-tools/hub/default.nix
	pkgs/tools/audio/mpdcron/default.nix
2015-01-20 20:21:03 -05:00
Charles Strahan bd53746646 ruby: patching gems works 2015-01-20 19:09:02 -05:00
Charles Strahan 221509b0a6 ruby: refactoring, and package bundix 2015-01-20 01:07:55 -05:00
Charles Strahan bf16d03075 ruby: support for proper bundler installs 2015-01-19 20:02:47 -05:00
Peter Simons ec6b82a0c2 Merge branch 'master' into staging. 2015-01-19 18:41:17 +01:00
Charles Strahan 673fccf505 ruby: new bundler approach 2015-01-18 18:47:28 -05:00
Domen Kožar 652cfc36e9 python2.6: add a patch to fix parallel make failure
(cherry picked from commit 23a202519c)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-01-18 19:20:07 +01:00
Pascal Wittmann e4294c27e0 mujs: update to latest commit 2015-01-18 18:42:01 +01:00
Domen Kožar 029dae30ac Merge pull request #5696 from mdesantis/ruby-2.2.0-package
Add Ruby 2.2.0 package
2015-01-18 11:41:03 +01:00
Vladimír Čunát 88089559b9 Merge #5676: gcc-wrapper -> cc-wrapper and related 2015-01-17 08:43:04 +01:00
Charles Strahan 9ad38ec322 ruby: allow for overriding the src 2015-01-15 20:58:05 -05:00
Vincent Laporte 1fd73de1d4 Lua4: adds branch information 2015-01-15 10:28:40 +01:00
Eric Seidel f3c6827373 rename all occurrences of stdenv.cc.gcc to stdenv.cc.cc 2015-01-14 20:27:55 -08:00
Charles Strahan 1a1e6cfc04 ruby: various fixes 2015-01-14 21:19:53 -05:00
Georges Dubus c2f8791e83 pypy: added patch to fix build with gcc 4.9.2 2015-01-14 16:02:08 +01:00
Charles Strahan aaa2e9705a ruby: cache gem files 2015-01-14 04:20:50 -05:00
Charles Strahan 32bae8d09a bundler: update HEAD version 2015-01-14 01:13:51 -05:00
Vladimír Čunát 1575bc652e Merge branch 'master' into staging
Conflicts (simple):
	pkgs/os-specific/linux/util-linux/default.nix

It seems this merge creates a new stdenv hash,
because we had changes on both branches :-/
2015-01-13 18:07:11 +01:00
Maurizio De Santis 5bcd29466e ruby: add 2.2.0 package 2015-01-10 19:25:37 +01:00
Maurizio De Santis 369f04ac96 ruby: update RVM patchsets 2015-01-10 19:25:12 +01:00
lethalman 1e46e8a964 Merge pull request #5567 from ktosiek/test-kitchen
Add test-kitchen gem, with plugins for Ansible and Vagrant
2015-01-08 14:56:55 +01:00
lethalman 7665a97d06 Merge pull request #5601 from robberer/tmp1
php: add optional ZTS support and new PECL module pthreads
2015-01-08 13:22:08 +01:00
William A. Kennington III c82410eeda java: Normalize to the default jre / jdk 2015-01-07 14:55:41 -08:00
Eelco Dolstra 37ac9deb3d Revert "php: Update to 5.4.36"
This reverts commit e7d4d39c6e. The
build fails in a chroot because it tries to download a PEAR from the
network:

http://hydra.nixos.org/build/18517333
2015-01-07 12:53:01 +01:00
Eelco Dolstra e7d4d39c6e php: Update to 5.4.36
CVE-2014-8142
2015-01-07 11:36:01 +01:00
John Wiegley ce59dec5bb python34: as a workaround, explicitly set MACOSX_DEPLOYMENT_TARGET
Otherwise, it crashes with a segfault while running the tests.
2015-01-06 09:56:08 -05:00
Longrin Wischnewski ef3a755c1f php: add optional ZTS support and new PECL module pthreads 2015-01-06 12:08:47 +00:00
Tomasz Kontusz decc019220 Add test-kitchen gem, with plugins for Ansible and Vagrant
test-kitchen is a framework for testing Configuration Management scripts.
2015-01-04 02:06:06 +01:00
Charles Strahan 94dd4b9721 ruby: WIP 2014-12-30 21:05:00 -05:00
Vladimír Čunát d8c5d95330 determinism: change some fixed timestamp to != (time_t)0
vcunat removed the unrelated glib change.
Conflicts:
	pkgs/development/libraries/glib/default.nix
	pkgs/os-specific/linux/kernel/generic.nix
	pkgs/os-specific/linux/kernel/manual-config.nix
2014-12-30 17:03:39 +01:00
Charles Strahan 74a4f01fe4 ruby: add git fetcher 2014-12-29 00:48:01 -05:00
Charles Strahan 145733c479 Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby
Conflicts:
	pkgs/applications/version-management/redmine/default.nix
	pkgs/development/interpreters/ruby/gem.nix
	pkgs/development/interpreters/ruby/generated.nix
	pkgs/development/interpreters/ruby/patches.nix
	pkgs/development/tools/vagrant/default.nix
	pkgs/servers/consul/default.nix
2014-12-28 14:29:52 -05:00
Shea Levy 05edd656f6 Missed gcc refs 2014-12-26 12:28:15 -05:00
John Wiegley 28b6fb61e6 Change occurrences of gcc to the more general cc
This is done for the sake of Yosemite, which does not have gcc, and yet
this change is also compatible with Linux.
2014-12-26 11:06:21 -06:00
Pascal Wittmann f94580da69 Fix license attribute of many bsd-like licensed packages 2014-12-21 00:00:35 +01:00
Evgeny Egorochkin d9dbeeca79 ruby gems: propagate ruby because it contains the hooks to add gem search paths, needed by nix-shell-created environments 2014-12-20 01:01:39 +02:00
Pascal Wittmann 12673d28fa groovy: update from 2.3.8 to 2.3.9 2014-12-19 14:42:31 +01:00
wmertens 6fa7ea0537 Merge pull request #5383 from robberer/tmp1
php: make curl wrappers optional
2014-12-18 17:49:10 +01:00
Longrin Wischnewski 96f4758d09 php: make curl wrappers optional
cURL wrappers are experimental and break any application/library
that rely on $http_response_header
2014-12-18 09:04:26 +01:00
Shea Levy 3cf0677087 Add rubyLibs.redis 2014-12-16 13:10:35 -05:00
Shea Levy 487325a68c Add rubyLibs.rabbitmq_manager 2014-12-16 13:09:46 -05:00
Shea Levy a1e0944263 Add rubyLibs.newrelic_plugin 2014-12-16 13:07:03 -05:00
Domen Kožar 8bfd6af9ed pypy: disable whole ssl test suit instead of a single test
(cherry picked from commit 118fd6f526)
Signed-off-by: Domen Kožar <domen@dev.si>
2014-12-16 17:13:24 +01:00
Domen Kožar 5819f29875 pypy: disable cpickle test.. 2014-12-15 14:17:39 +01:00
Pascal Wittmann 934afff8fb Merge pull request #5306 from sjmackenzie/erlang-bump
Erlang bump from 17.3 to 17.4 as 17.3 has a serious ssl bug
2014-12-15 00:50:46 +01:00
Domen Kožar 272206e706 python: 2.7.8 -> 2.7.9
(cherry picked from commit 1f059cd5a9)
Signed-off-by: Domen Kožar <domen@dev.si>
2014-12-14 19:05:59 +01:00
Michael Raskin fbceebd868 Merge pull request #5288 from mstarzyk/j
j: Fix building libj.so
2014-12-13 10:49:30 +03:00
Pascal Wittmann 377822fb64 mujs: update to latest revision 2014-12-12 12:14:13 +01:00
Stewart Mackenzie 1e7f7edd72 Erlang bump from 17.3 to 17.4 as 17.3 has a serious ssl bug 2014-12-12 15:13:10 +08:00
Maciek Starzyk 8989a32d34 j: Fix building libj.so 2014-12-10 22:43:42 +01:00
Eelco Dolstra 4d918cb6c7 php-5.3: Remove
PHP 5.3 is EOL (see http://php.net/supported-versions.php). NixOS
14.12 is a good opportunity to drop it.
2014-12-10 17:19:37 +01:00
Eelco Dolstra 55d59eefb3 php: Really update to 5.4.34
75738437a4 only updated the version string...
2014-12-10 17:09:47 +01:00
Domen Kožar 4aa3eec330 Merge branch 'master' into staging
Conflicts:
	pkgs/development/libraries/fontconfig/default.nix
2014-12-07 14:02:48 +01:00
Shea Levy b02d059f5d nix-exec: bump 2014-12-03 22:23:47 -05:00
Jaka Hudoklin 61e19d6e81 rubyLibs: add tmuxinator, update 2014-12-01 00:39:40 +01:00
Pascal Wittmann faf6e067d1 add mujs, a lightweight, embeddable Javascript interpreter 2014-11-29 14:21:16 +01:00
Vladimír Čunát e75fe2e528 cairo: pull an upstream patch to fix racket
Close #5165, #5166.
Also enableParallelBuilding in racket.
2014-11-28 20:28:47 +01:00
Vladimír Čunát cbd2305d4d Merge branch 'master' into staging 2014-11-28 18:59:07 +01:00
Pascal Wittmann 02ca1adc05 groovy: update from 2.3.7 to 2.3.8 2014-11-28 11:08:12 +01:00
Vladimír Čunát b5ff06eda4 Merge branch 'master' into staging 2014-11-26 21:48:26 +01:00
Edward Tjörnhammar 456882b142 Merge pull request #5115 from iu-parfunc/racket
racket: add libreadline to ffi libs - enables xrepl.
2014-11-26 12:08:50 +01:00
Vladimír Čunát a9bad25ffe Merge branch 'master' into staging 2014-11-24 22:14:25 +01:00
Ryan Newton fd73e9948d racket: add libreadline to ffi libs - enables xrepl. 2014-11-24 13:58:22 -05:00
Shea Levy 5c9ee48de1 nix-exec: bump 2014-11-24 10:13:31 -05:00