Commit graph

192 commits

Author SHA1 Message Date
cw 1cb60e4dab erlangR22: 22.0.4 -> 22.1.7 2019-11-15 13:35:55 +01:00
volth 08f68313a4 treewide: remove redundant rec 2019-08-28 11:07:32 +00:00
Lily Ballard 63259057a8 erlang: Fix build error on darwin
Stop hardcoding 10.10 as the platform when building. Instead we'll use
$MACOSX_DEPLOYMENT_TARGET so erlang doesn't have to be updated again the
next time that's changed.
2019-08-14 15:56:29 -07:00
Daiderd Jordan 574cb4a8df
erlang: remove wx conditional
The wxmac build has been fixed and there's erlang_nox now.
2019-07-18 23:42:32 +02:00
Ryan Mulligan 508ae42a0f treewide: fix redirect URLs 2019-07-10 12:52:51 -07:00
Daiderd Jordan 811f35d8cd
Merge pull request #63296 from ehamberg/erlang-otp-22
Erlang/OTP 22
2019-06-22 11:47:43 +02:00
Erlend Hamberg 19c2979677
erlangR22: init at 22.0.4 2019-06-22 11:01:25 +02:00
Erlend Hamberg d4d19e34db
Don't use autoreconfHook for building Erlang/OTP
This is in preparation for adding Erlang/OTP 22 which no longer has a
`configure.in` and fails to build with the current
`generic-builder.nix`, but it should work for all supported, previous
versions of Erlang (R18–R21) as well.

Fixes #62775
2019-06-17 09:54:44 +02:00
Justin Wood db004aa0f9 erlangR21: 21.3.7.1 -> 21.3.8.3 (#62952) 2019-06-11 09:45:27 -04:00
Erlend Hamberg 0b37cf8db6
erlangR21: 21.2.3 -> 21.3.7.1 2019-06-06 13:06:11 +02:00
Jean-Philippe Cugnet 6750dd66f9
erlangR21: 21.2 -> 21.2.3 2019-01-17 10:50:41 +01:00
Jan Tojnar aead6e12f9
Merge remote-tracking branch 'upstream/master' into staging 2018-12-16 22:55:06 +01:00
Jean-Philippe Cugnet 08e7fe7cb9
erlangR21: 21.1.3 -> 21.2 2018-12-11 21:14:40 +01:00
Ivan Kozik 82e55907ae erlang: disable parallel building
This fixes build errors like

 GEN    asn1ct_eval_ext.erl
{"init terminating in do_boot",{undef,[{asn1ct_func,start_link,[],[]},{prepare_templates,gen_asn1ct_eval,1,[{file,"prepare_templates.erl"},{line,58}]},{init,start_em,1,[]},{init,do_boot,3,[]}]}}
init terminating in do_boot ({undef,[{asn1ct_func,start_link,[],[]},{prepare_templates,gen_asn1ct_eval,1,[{_},{_}]},{init,start_em,1,[]},{init,do_boot,3,[]}]})

that occur on some machines but not others.
2018-12-08 00:59:56 +00:00
Jean-Philippe Cugnet 48518b481d
erlangR21: 21.1.2 -> 21.1.3 2018-11-24 12:30:51 +01:00
Timo Kaufmann 73d83ba7a8 erlang: remove aarch64 from platforms
The build is failing.
2018-11-18 12:45:54 +01:00
Jean-Philippe Cugnet bdc04a7a72
erlangR21: 21.1.1 -> 21.1.2 2018-11-16 20:04:10 +01:00
Jean-Philippe Cugnet d3b7476278 erlangR21: 21.0 -> 21.1.1 (#47371)
* erlangR21: 21.0 -> 21.1
* erlangR21: 21.1 -> 21.1.1
2018-10-16 17:55:51 +02:00
Daiderd Jordan 9fd53e02ad erlang: temporarily disable wxSupport on darwin
Workaround for #48065
2018-10-10 20:15:14 +02:00
Sarah Brofeldt a0ddf291cb
Merge pull request #47367 from ejpcmac/update-erlangR19
erlangR19: 19.3.6.6 -> 19.3.6.11
2018-09-27 10:44:10 +02:00
Jean-Philippe Cugnet 6e5682ab41
erlangR20: 20.3.8 -> 20.3.8.9 2018-09-25 23:21:06 +02:00
Jean-Philippe Cugnet bf22712993
erlangR19: 19.3.6.6 -> 19.3.6.11 2018-09-25 22:39:54 +02:00
Andrew Dunham c987ed0896 erlangR18: apply upstream patches to fix nondeterministic build failures (#47202)
As per the following bug report, sometimes erts/start_scripts will fail
to compile because of a Makefile ordering issue. Apply the upstream
patches to fix this.
  https://bugs.erlang.org/browse/ERL-241
2018-09-23 11:01:57 +02:00
Peter Hoeg 3904016a3d
Merge pull request #43812 from binarin/epmd-systemd-pr
epmd: Introduce erlang port mapper daemon service
2018-09-17 11:33:09 +08:00
Jean-Philippe Cugnet cd691380cc
erlang: Enable parallel building 2018-08-22 23:02:13 +02:00
volth 52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
Alexey Lebedeff 16cccc2513 erlang: Build with systemd support
That way 'epmd' can be started by systemd using socket
activation. This is important to have when there is more than one
Erlang system used on the same host.

Support for this exists since 17.0:
b7c95eabf6

Configure flag was added in 17.1:
12cd5e5b39
2018-07-19 17:32:19 +02:00
Daniel Goertzen 4001a680cc erlangR21: init at 21.0 2018-06-21 09:36:54 -05:00
Eric Bailey 34b7abada4 erlangR20: 20.3.2 -> 20.3.8 (#42170) 2018-06-18 23:06:05 +02:00
Jonathan C. Otsuka db1ac62e45 update erlangR20 from 20.3.1 to 20.3.2 2018-04-09 08:41:56 -05:00
Daiderd Jordan ac318bc8eb
Merge pull request #37580 from dtzWill/update/erlangs
erlang R18-20: updates
2018-03-25 20:59:25 +02:00
Moritz Ulrich 3e61f3b911 erlang: Change order of commands in postPach and postInstall.
Erlang's generic-builder isn't using the right /bin/sh in some
situations, causing build errors either in the erlang build itself or
in derivations depending on it.

This patch runs `patchShebangs make/` before running the rest of the
`postPatch` phase, hopefully using the right shell early enough.

This might be a solution for #36853, #36823 and #37638.
2018-03-23 10:41:42 +01:00
Will Dietz f967d23403 erlang R18-20: updates 2018-03-21 11:12:14 -05:00
Alexander V. Nikolaev 0acec7e984 treewide: transition mesa to libGLU_combined 2018-02-24 17:06:49 +02:00
adisbladis c2316114bc
stdenv: Kill off ensureDir 2018-01-09 11:14:48 +08:00
John Ericson 4d2b763817
Merge pull request #26805 from obsidiansystems/cross-elegant
Make cross compilation elegant
2017-12-30 22:58:02 -05:00
John Ericson 046f091e0d treewide: Don't use envHook anymore
This commits needs a MAJOR audit as I oftentimes just guessed which of
`$hostOffset`, `$targetOffset`, or a fixed offset should be used.
2017-12-30 22:04:22 -05:00
Justin Wood c6496aea49 erlang: 20.1.7 -> 20.2.2 2017-12-19 22:05:12 +00:00
Andreas Rammhold 14f1698649
erlangR17: removed outdated & unused version
erlangR17 doesn't receive any upstream updates anymore and none of our
packages depend on it.
2017-12-08 15:06:01 +01:00
Andreas Rammhold 9f39d0ef68
erlang_basho_R16B02: OTP_16B02_basho8 -> OTP_16B02_basho10
Also renamed the file since it is no longer version 8.
2017-12-08 15:06:00 +01:00
Andreas Rammhold b8b4d7ebf2
erlang: removed R16.nix, was a leftover from #32443 2017-12-08 15:06:00 +01:00
Daiderd Jordan 42d437129f
R16B02-8-basho: mark insecure 2017-12-08 13:03:54 +01:00
Daiderd Jordan 7d85f1b0e2
erlangR17: mark insecure 2017-12-08 13:03:54 +01:00
Andreas Rammhold 2107291346
erlangR18: 18.3.4.4 -> 18.3.4.7 (fixes CVE-2017-1000385) 2017-12-08 10:27:17 +01:00
Andreas Rammhold 366355f7eb
erlangR19: 19.3 -> 19.3.6.4 (fixes CVE-2017-1000385) 2017-12-08 10:27:14 +01:00
Andreas Rammhold 175f2e147f
erlangR20: 20.1 -> 20.1.7 (fixes CVE-2017-1000385) 2017-12-08 10:27:09 +01:00
Orivej Desh 587642bddc erlangR18: fix patch hashes with fetchpatch 2017-11-17 17:04:23 +00:00
Jonathan C. Otsuka 442e238234 erlang: 20.0 -> 20.1 2017-11-07 23:36:13 -06:00
Daiderd Jordan 60a7a4db83
erlang: fix ssl on darwin 2017-10-14 12:36:15 +02:00
John Ericson f8a18cd4cf misc pkgs: Manual fixup pkgconfig nativeBuildInputs after sed
Importantly, this included regenerating pkgs/servers/x11/xorg, to
clobber the old sed.
2017-09-21 15:49:54 -04:00
John Ericson 531e4b80c9 misc pkgs: Basic sed to get fix pkgconfig and autoreconfHook buildInputs
Only acts on one-line dependency lists.
2017-09-21 15:49:53 -04:00
Daiderd Jordan eaf9faef60
erlang: remove explicit gcc dependency 2017-08-03 21:22:30 +02:00
Silvan Mosberger f5fa5fa4d6 pkgs: refactor needless quoting of homepage meta attribute (#27809)
* pkgs: refactor needless quoting of homepage meta attribute

A lot of packages are needlessly quoting the homepage meta attribute
(about 1400, 22%), this commit refactors all of those instances.

* pkgs: Fixing some links that were wrongfully unquoted in the previous
commit

* Fixed some instances
2017-08-01 22:03:30 +02:00
Matthew Daiter d79b4766a5 erlangR20: init 2017-06-23 12:51:58 +02:00
Gleb Peregud c9cb6403d3 erlang: move erlang_basho_R16B02 to Erlang's general builder. 2017-06-11 13:31:25 +02:00
Gleb Peregud 3426c88bff erlang: Generalize Erlang/OTP derivations.
Switch official Erlang versions to use a common builder.
2017-06-08 11:29:47 +02:00
Dan Peebles de0849d180 erlangR14: delete unreferenced ancient file 2017-03-19 14:59:58 -04:00
Dan Peebles 5a81c66906 erlang: patch all versions to work with clang 4 2017-03-19 14:59:58 -04:00
Eric Bailey a91afef89e
erlangR19: update maintainers
Use the list of direct committers:
https://github.com/NixOS/nixpkgs/commits/master/pkgs/development/interpreters/erlang/R19.nix

Originally, I just copied and pasted from R18.nix, I think.
2017-03-18 00:36:57 -05:00
Eric Bailey 05b1f8276b
erlangR19: 19.2.3 -> 19.3 2017-03-18 00:24:18 -05:00
Eric Bailey 6e9133fec1
erlangR19: 19.2 -> 19.2.3
This fixes dialyzer for me.

- http://erlang.org/pipermail/erlang-bugs/2017-January/005213.html
- e27119948f
2017-03-01 05:52:23 -06:00
Eric Bailey ad3e589c6d
erlangR19: 19.1.6 -> 19.2
Include sw_vers patch as discussed on #21775.
2017-01-11 01:43:56 -06:00
Matthew Daiter 46fc2db7df erlang_basho_R16: add explicit Carbon and Cocoa support 2016-12-15 17:16:00 +01:00
Matthew Daiter d331e538c2 erlang_basho_R16: B03-1 -> B02-8 2016-12-02 16:12:14 +01:00
Daiderd Jordan dcb37919f7 Merge pull request #20610 from mdaiter/erlang18EnableDirtySchedulers
erlang: added dirty scheduler support
2016-11-21 20:36:16 +01:00
Daiderd Jordan a76076e7d6 Merge pull request #20611 from mdaiter/erlang17EnableDirtySchedulers
erlang17: enable dirty schedulers
2016-11-21 20:34:42 +01:00
Matthew Daiter 89ca3425b0 erlang19: enable dirty schedulers 2016-11-21 18:23:15 +01:00
Matthew Daiter fd0f247658 erlang17: enable dirty schedulers 2016-11-21 18:18:45 +01:00
Matthew Daiter bbb3299409 erlang: added dirty scheduler support
erlang: formatting
2016-11-21 18:16:38 +01:00
Matthew Daiter b1be1eee51 erlang_basho_R16B03: Limit platforms to x86_64 2016-11-20 16:06:00 +01:00
Tim Steinbach 29356a3ac1 Merge pull request #20457 from DerTim1/erlang
erlang: 18.3.4 -> 18.3.4.4, erlang: 19.1 -> 19.1.6
2016-11-17 22:18:30 -05:00
Matthew Daiter 8f765490e4 erlang_basho: Init at R16B03
erlang_basho_R16B03: added package file

erlang_basho_R16B03: added to top-level/all-packages.nix file

erlang_basho_R16B03_odbc: added to top-level/all-packages.nix file

erlang_basho_R16B03: Added the Carbon and Cocoa fields

erlang_basho_R16B03: Removed faulty maintainer

erlang_basho_R16B03: Added license as APL20

erlang_basho_R16B03: Made long and short description more informative

erlang_basho: added myself as a maintainer

erlang_basho: made configureFlags into an array

erlang_basho: added gcc as a dependency

erlang_basho: added escript replacement

erlang_basho: removed debugging cat statement

erlang_basho: changed subsitituteInPlace command to sed command

erlang_basho: added package

erlang_basho: Init at <R16B03
2016-11-17 12:25:04 +01:00
Tim Digel 2bcaa93aa7 erlang: 19.1 -> 19.1.6 2016-11-16 09:25:04 +01:00
Tim Digel 4c70064cc5 erlang: 18.3.4 -> 18.3.4.4 2016-11-15 15:13:22 +01:00
Peter Simons 6b964d953a erlang-R14: remove invalid meta.maintainer 2016-11-07 12:05:26 +01:00
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