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