Eelco Dolstra
811de3bfaa
Merge remote-tracking branch 'origin/staging' into darwin-clang-stdenv
...
Conflicts:
pkgs/tools/security/gnupg/default.nix
2014-10-09 10:57:57 +02:00
Eelco Dolstra
a85dcf4a00
Merge remote-tracking branch 'origin/master' into staging
...
Conflicts:
pkgs/development/libraries/libav/default.nix
pkgs/shells/bash/bash-4.2-patches.nix
pkgs/stdenv/generic/default.nix
2014-10-07 00:09:37 +02:00
Michael Raskin
02e221eb11
Fix the version
2014-10-06 02:43:57 +04:00
Austin Seipp
5f7d5c09f3
Merge pull request #4298 from daogames/tb/elixir-mix-curl-fix
...
elixir: make curl available to mix
2014-10-01 18:54:24 -05:00
Tino Breddin
4ef1099310
fix double slash in mix binary path
2014-10-01 20:27:55 +02:00
Shea Levy
ee58e82855
nix-exec: set platforms
2014-09-28 20:10:11 -04:00
Shea Levy
d34cd13a31
Add nix-exec package
2014-09-28 15:24:38 -04:00
Tino Breddin
cba717fd7b
elixir: make curl available to mix
2014-09-27 21:58:58 +02:00
Pascal Wittmann
d346a9cc07
fixed some meta.maintainers attributes
2014-09-26 23:44:29 +02:00
Bjørn Forsman
25e726b283
pypy: fix copy-paste error in setup-hook
...
Introduced in 428fdc879f
("pypy: 2.3 -> 2.4").
2014-09-26 20:10:06 +02:00
Domen Kožar
4fa05bdc6f
pypy: disable test_urllib2net and test_urllibnet
2014-09-26 18:12:49 +02:00
Domen Kožar
3aefa63c75
pypy: pytest syntax change
2014-09-26 18:12:37 +02:00
Domen Kožar
428fdc879f
pypy: 2.3 -> 2.4
2014-09-26 18:12:24 +02:00
Pascal Wittmann
10bbdf48ab
groovy: update from 2.3.6 to 2.3.7
2014-09-25 16:49:50 +02:00
Eelco Dolstra
f13b383449
Revert "xulrunner: stick to firefox's src attribute"
...
This reverts commit 04369b6819
.
http://hydra.nixos.org/build/14760897
2014-09-25 16:17:15 +02:00
Pascal Wittmann
3b2ba0ae42
falcon: update to lastest git revision as the lastest release does not build
2014-09-23 23:52:18 +02:00
Eelco Dolstra
cd71f7a2e6
Merge branch 'darwin-stdenv' of github.com:joelteon/nixpkgs into staging
...
Conflicts:
pkgs/development/interpreters/ruby/ruby-19.nix
pkgs/development/libraries/libc++/default.nix
pkgs/development/libraries/libc++abi/default.nix
pkgs/tools/text/sgml/opensp/default.nix
2014-09-23 11:27:53 +02:00
Mathijs Kwik
04369b6819
xulrunner: stick to firefox's src attribute
2014-09-23 09:16:55 +02:00
Jaka Hudoklin
aa7147c31b
rubyLibs: add heroku client
2014-09-22 01:57:01 +02:00
wyvie
4d5336316c
New package: lua-zip-1.2.3
...
Closes #4138
2014-09-20 23:32:17 +01:00
Michael Raskin
18ca33ee7c
Adopt fix from ewemoa to give more memory to acl2 build
2014-09-20 12:13:43 +04:00
Siarhei Zirukin
56106d8e4c
erlang/R17: update to 17.3
2014-09-19 09:23:28 +02:00
Eelco Dolstra
91ec6e0d90
Merge remote-tracking branch 'origin/master' into staging
2014-09-18 22:28:35 +02:00
Eelco Dolstra
f32e964cc4
perl: Fix assertion failure on Darwin
...
This assertion doesn't make sense to me, because a multi-threaded
build on Darwin works fine, despite not having Glibc.
2014-09-18 22:27:20 +02:00
Charles Strahan
e38d7cbfb2
Fix the new Ruby interpreters ( fixes #3509 ).
...
Ruby >= 2.1.0 will try to download config.{sub,guess} if not already present.
This provides both files in a pure manner, and also deletes the download script
to prevent any future confusion.
2014-09-18 11:43:16 -04:00
Cillian de Róiste
a84c2d4357
Re-add rubyLibs.jekyll closes #4096
2014-09-16 15:31:29 +02:00
Jaka Hudoklin
bfa3b28590
rubyLibs: fix bundler
2014-09-16 10:28:04 +02:00
Jaka Hudoklin
782c85ad27
rubyLibs: add compass, regenerate
2014-09-16 10:28:04 +02:00
Charles Strahan
c27a653bba
improve ruby support
...
* add the 2.1.x versions
* include teeny version in passthru
* by default, apply the same patches used by RVM
* clean up file names and attribute names
2014-09-15 23:54:17 -04:00
Gergely Risko
3a2134d46f
Disable perl 5.16 tests
...
They are on the path to stdenv rebuild.
Accidentally re-enabled by conflict resolution in cherry-pick 3196d4f
.
2014-09-14 22:34:51 +02:00
Gergely Risko
c5df246ba9
Cleanup perl logic in stdenvLinux
...
Make thread disabling explicit. This changes the semantics of the perl
derivation, so on other platforms it may require setting
enableThreading = false
This commit doesn't change the derivation or out hash of stdenvLinux.
2014-09-14 21:36:14 +02:00
Vladimír Čunát
d957b4bd78
Merge recent master into staging
...
Hydra nixpkgs: ?compare=1151601
2014-09-13 21:48:29 +02:00
Alexander Kjeldaas
3bf4362381
python: improve library determinism
...
1) Make the core python libraries deterministic.
2) Make the python libraries created by glib deterministic.
@vcunat put back the removal of share/gtk-doc in glib.
2014-09-13 15:03:12 +02:00
Alexander Kjeldaas
3196d4f7c7
perl-5.16: make it binary deterministic
2014-09-13 14:40:04 +02:00
Pascal Wittmann
3c6eceb5fb
Merge pull request #4008 from dbohdan/master
...
Add Jim Tcl interpreter
2014-09-12 21:36:58 +02:00
Danyil Bohdan
2a89610d9a
jimtcl: add dbohdan as maintainer
2014-09-12 22:23:59 +03:00
William A. Kennington III
3141ce3e15
gems: Add rdoc, execjs, uglifier
2014-09-11 15:41:45 -07:00
Domen Kožar
3f441d82f9
rubyLibs: add erubis and yajl
2014-09-12 00:31:37 +02:00
Domen Kožar
aa162b388d
package gim-nix and document it
2014-09-12 00:26:51 +02:00
Rob Vermaas
960b664a13
php: update from 5.4.31 to 5.4.32, potentially fixes CVE-2014-3587, CVE-2014-3597, CVE-2014-5120
2014-09-11 13:30:46 +02:00
Alexander Flatter
c387049c29
Elixir is now 1.0.0!
...
Closes #4027
2014-09-10 17:09:09 +01:00
Joel Taylor
6f949b2e87
get rid of nasty CC stuff
2014-09-09 13:54:26 -07:00
Joel Taylor
3e8344d334
suitable clang stdenv
2014-09-09 13:54:24 -07:00
Vladimír Čunát
d09736b7c1
lua5 sockets: our version only works with lua 5.1
2014-09-09 21:49:35 +02:00
Vladimír Čunát
15cb79e48e
lua-5.1: fix CVE-2014-5461 by upstream+Debian patch
2014-09-09 21:46:44 +02:00
Danyil Bohdan
dee958d3e6
jimtcl: remove end dot from description
2014-09-09 14:30:03 +03:00
Danyil Bohdan
03df715281
Add Jim Tcl interpreter
2014-09-09 14:19:49 +03:00
Vladimír Čunát
82797f98f2
Merge branch 'staging' into modular-stdenv
...
Conflicts:
pkgs/development/interpreters/perl/5.10/setup-hook.sh
pkgs/development/interpreters/perl/5.8/setup-hook.sh
pkgs/stdenv/linux/default.nix
2014-09-08 18:24:58 +02:00
Vladimír Čunát
1e389c976c
merge 'staging' into modular-stdenv
...
In 2c62a36b77
the messages in pkgs/stdenv/generic/default.nix
were not merged correctly.
Conflicts:
pkgs/stdenv/generic/default.nix
2014-09-08 18:16:54 +02:00
Eelco Dolstra
af69fcde47
Fix Nixpkgs evaluation
...
error: attribute `luaversion' missing, at /home/eelco/Dev/nixpkgs/pkgs/development/interpreters/lua-5/expat.nix:16:34
2014-09-08 13:10:13 +02:00