Commit Graph

117 Commits

Author SHA1 Message Date
Tuomas Tynkkynen
eda2dd3d2f treewide: Fix more 'lib.optional' misuses 2016-10-02 00:44:10 +03:00
Andrey Pavlov
0a1ae92bb9 erlang: 19.0.2 -> 19.1 2016-09-23 10:20:50 +03:00
Tuomas Tynkkynen
0836f5d3b0 erlangR14: Use dev output of openssl 2016-08-30 02:41:13 +03:00
obadz
78b7529ee3 Merge branch 'master' into staging 2016-08-24 11:57:44 +01:00
Daniel Peebles
3f337a2b23 Merge pull request #17685 from matthewbauer/darwin-misc2
Darwin misc. fixes
2016-08-24 11:52:27 +02:00
obadz
0e8d2725dc Merge branch 'master' into staging 2016-08-23 18:50:06 +01:00
Tuomas Tynkkynen
74a3a2cd7e treewide: Use makeBinPath 2016-08-23 01:18:10 +03:00
Matthew Bauer
fa4b1ee68a erlangR16: fix darwin build 2016-08-16 19:25:39 +00:00
Robin Gloster
f222d98746 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-25 12:47:13 +00:00
Eric Bailey
e6e873beca erlangR19: init at 19.0.2 (#17123)
Add R19.nix, based on @binarin's R18.nix.

N.B. erlang/otp#1023 obviated the need for `rmAndPwdPatch` in R19.
2016-07-23 01:07:41 +02:00
Robin Gloster
5185bc1773 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-15 14:41:01 +00:00
Alexey Lebedeff
54a15fb2e4 erlang: 18.3 -> 18.3.4 (#16244)
Minor OTP releases (and their manpages) are not available for dowload at
http://erlang.org/download
But e.g.:
- 18.3.1 contains an important fix for mnesia
- 18.3.1-18.3.4 has a lot of SSL/TLS fixes

So we have to fetch from GitHub and build everything ourselves.

Also replace explicit path patching with upstream patches:
- https://github.com/erlang/otp/pull/1023
- https://github.com/erlang/otp/pull/1103 - with this patch it's now
  possible to build erlang in sandboxed mode
2016-07-13 19:41:55 +02:00
Eric Merritt
b1cd08246f beamPackages: turn on debug_info for beam packages
This allows you to turn on debug infor for all the beam packages in the
system with a single change at the top level. This is required for
debugging and dialyzer work. It also allows you to switch it on on a
package by package basis.
2016-06-15 07:20:01 -07:00
Robin Gloster
2d382f3d98 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-05-30 19:39:34 +00:00
Tuomas Tynkkynen
2a73de6e6c treewide: Make explicit that 'dev' output of openssl is used 2016-05-19 10:02:23 +02:00
Franz Pletz
f8d481754c
Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-05-18 17:10:02 +02:00
Peter Simons
8e462995ba Bring my stdenv.lib.maintainers user name in line with my github nick. 2016-05-16 22:49:55 +02:00
Robin Gloster
696d85a62d Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-03 11:01:57 +00:00
Eric Bailey
456ce67462 Patch erlang-R17
Fix R17 build on OS X, modeling changes after R18,
i.e. inherit Carbon, Cocoa.
2016-04-01 19:06:20 -05:00
Domen Kožar
a1cfdb9c88 remove erlangR14: outdated and doesn't build 2016-03-30 18:54:58 +01:00
Robin Gloster
f60c9df0ba Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-28 15:16:29 +00:00
Domen Kožar
ba78130c21 remove elrangR15 and riak 1.3.0 as they're outdated
(cherry picked from commit 4452a68425e4eaf9db95e0fc5ac8474a2b19bc71)
Signed-off-by: Domen Kožar <domen@dev.si>
2016-03-22 21:40:07 +00:00
Franz Pletz
aff1f4ab94 Use general hardening flag toggle lists
The following parameters are now available:

  * hardeningDisable
    To disable specific hardening flags
  * hardeningEnable
    To enable specific hardening flags

Only the cc-wrapper supports this right now, but these may be reused by
other wrappers, builders or setup hooks.

cc-wrapper supports the following flags:

  * fortify
  * stackprotector
  * pie (disabled by default)
  * pic
  * strictoverflow
  * format
  * relro
  * bindnow
2016-03-05 18:55:26 +01:00
Robin Gloster
40b7aa3d69 erlangR14: turn off format hardening 2016-02-12 01:04:15 +00:00
Eric Sagnes
b67ac40a82 erlangR18: 18.0 -> 18.2 2015-12-17 09:01:49 +09:00
Domen Kožar
0b4776b6b7 Merge pull request #9182 from greedy/erlang-setup-hook
erlang: add setupHook to set ERL_LIBS
2015-11-16 13:09:26 +01:00
Jude Taylor
56f053120b erlang: remove nested lists 2015-10-28 17:36:27 -07:00
Asko Soukka
a5ac419236 darwin: erlangR18: add needed inputs for Darwin 2015-10-26 22:02:56 +02:00
Vladimír Čunát
88c9f8b574 xlibs: replace occurrences by xorg
This seems to have been confusing people, using both xlibs and xorg, etc.
- Avoided renaming local (and different) xlibs binding in gcc*.
- Fixed cases where both xorg and xlibs were used.
Hopefully everything still works as before.
2015-09-15 12:54:34 +02:00
Geoff Reedy
5a5e86f5cd erlang: add setupHook to set ERL_LIBS 2015-08-09 09:42:24 -06:00
Andrey Pavlov
5506632473 erlang: add Erlang R18, closes #8515 2015-06-26 16:15:14 +02:00
Daiderd Jordan
b66942702b erlang: use wxmac on darwin 2015-06-18 11:34:05 +02:00
Andrey Pavlov
90b1507419 erlang/R17 update to 17.5 2015-04-08 15:18:39 +03: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
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
Siarhei Zirukin
56106d8e4c erlang/R17: update to 17.3 2014-09-19 09:23:28 +02:00
Dmitry Belyaev
93697e85ca Support odbc in erlang R16 and R17 2014-08-26 13:11:24 +10:00
Moritz Ulrich
79c835212b Erlang R17: Bump to 17.1. 2014-08-12 13:47:38 +02:00
Eelco Dolstra
95bbfc957f erlang: Fix name attribute
Versions should not start with a letter.
2014-07-30 12:39:35 +02:00
aszlig
ec65a1e391
erlang: Add manpages to all release packages.
This puts manpages into "$out/lib/erlang/man" and also symlinks them
into "$out/share/man" with an "erl" suffix (similar to how Debian is
handling this) so those manpages are unlikely to collide with any other
manpages, like for example inet(3).

Closes #3396.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Acked-by: Moritz Ulrich <moritz@tarn-vedra.de>
2014-07-29 15:26:13 +02:00
Rok Garbas
4eeb0f10fb erlangR16: updated to R16B03-1
- couchdb: using erlangR16 (fails to build with R17)
 - rename erlang attr names to use only major version in attr name
2014-06-05 01:16:50 +01:00
Michael Raskin
feddcfaf1e Readding Erlang R16B02: R17 is a major update and it breaks Ejabberd. 2014-05-02 20:50:58 +04:00
Moritz Ulrich
a21486d990 Erlang: Update from R16B02 to 17.0. 2014-04-30 23:52:55 +02:00
Jaka Hudoklin
ab53d469f8 erlang: enable and fix builds on darwin 2014-04-29 22:06:53 +02: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
Moritz Ulrich
96552b683e Erlang: Update to R16B02.
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-11-12 20:06:46 +01:00
Moritz Ulrich
45e975abff Wrap Erlang scripts to provide missing 'sed' and 'awk'.
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-08-26 02:43:12 +02:00
Moritz Ulrich
31083cd226 Add myself as a maintainer to erlang R16B1 and elixir.
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-08-09 16:33:51 +02:00
Moritz Ulrich
e32b26c222 Add erlang R16B1
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-08-09 16:29:01 +02:00
Peter Simons
7ef3aea921 erlang: drop obsolete version R15B02 2013-05-25 11:11:37 +02:00
Malcolm Matalka
33eb2832c3 Add R15B03-1 2013-05-23 11:27:49 +02:00
Michael Raskin
1d010bea6d Erlang: fix my typo, too 2012-11-12 23:51:45 +04:00
Michael Raskin
f3a64ff8f9 Erlang: fix a typo 2012-11-12 23:49:30 +04:00
Peter Simons
5ecec6f399 erlang: add meta section 2012-11-11 20:48:33 +01:00
Peter Simons
73533ce2a0 erlang: drop the leading 'R' from the Erlang version number so that nix-env recognizes it and allows "nix-env -i erlang" to work 2012-11-11 20:44:37 +01:00
Peter Simons
724d416fae erlang: drop obsolete R15B01 version 2012-11-11 20:41:50 +01:00
Malcolm
4fbd441418 Adding Erlang R15B02 2012-11-11 20:38:53 +01:00
Cillian de Roiste
4b2c3d52de Adding optional wx (GUI) support for Erlang, which enables the graphical debugger although pman (the process manager) fails to start.
svn path=/nixpkgs/trunk/; revision=34372
2012-06-06 19:05:06 +00:00
Cillian de Roiste
e9548cc845 Upgrading default erlang to R15 and keeping R14 as an older option, removing extra random older versions. I assume they are not of interest.
svn path=/nixpkgs/trunk/; revision=34117
2012-05-15 17:57:50 +00:00
Cillian de Roiste
a5d77fcf2b Updating erlange to R14B04
svn path=/nixpkgs/trunk/; revision=34116
2012-05-15 17:54:05 +00:00
Eelco Dolstra
4585c62aec * Erlang updated to R14B02.
svn path=/nixpkgs/branches/modular-python/; revision=26619
2011-03-31 08:44:11 +00:00
Eelco Dolstra
6609710409 * Get rid of many instances of "args: with args;", and other coding
guidelines violations.
* Updated libsamplerate to 0.1.7.

svn path=/nixpkgs/trunk/; revision=22782
2010-07-28 11:55:54 +00:00
Michael Raskin
6c77fda8c1 Restore R13B version
svn path=/nixpkgs/trunk/; revision=22476
2010-07-05 12:43:59 +00:00
Lluís Batlle i Rossell
5b4e3a5b40 Adding Wings 3D (as a side effect, update erlang, and add esdl).
svn path=/nixpkgs/trunk/; revision=22436
2010-07-01 09:08:37 +00:00
Michael Raskin
67066d1c56 Update erlang
svn path=/nixpkgs/trunk/; revision=15452
2009-05-05 15:46:03 +00:00
Yury G. Kudryashov
dd184fa88d erlang and libsigsegv upgraded
svn path=/nixpkgs/branches/stdenv-updates/; revision=10537
2008-02-07 10:43:05 +00:00
Yury G. Kudryashov
da57804fff Merged with trunk again
svn path=/nixpkgs/branches/stdenv-updates/; revision=10267
2008-01-23 18:11:03 +00:00