diff options
| author | Erlend Hamberg <erlend@hamberg.no> | 2019-06-18 10:56:32 +0200 |
|---|---|---|
| committer | Daiderd Jordan <daiderd@gmail.com> | 2019-06-22 11:01:25 +0200 |
| commit | 19c29796771f07d213328d8b4a66edb550e7aef3 (patch) | |
| tree | 1366ff9b2bf7c5a4aaa45aa088bc81013567ea5c | |
| parent | 10a25e9b52e11da86ea3c1a29e33d871424feb91 (diff) | |
| download | nixpkgs-19c29796771f07d213328d8b4a66edb550e7aef3.tar nixpkgs-19c29796771f07d213328d8b4a66edb550e7aef3.tar.gz nixpkgs-19c29796771f07d213328d8b4a66edb550e7aef3.tar.bz2 nixpkgs-19c29796771f07d213328d8b4a66edb550e7aef3.tar.lz nixpkgs-19c29796771f07d213328d8b4a66edb550e7aef3.tar.xz nixpkgs-19c29796771f07d213328d8b4a66edb550e7aef3.tar.zst nixpkgs-19c29796771f07d213328d8b4a66edb550e7aef3.zip | |
erlangR22: init at 22.0.4
| -rw-r--r-- | pkgs/development/interpreters/erlang/R22.nix | 11 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/beam-packages.nix | 10 |
3 files changed, 22 insertions, 1 deletions
diff --git a/pkgs/development/interpreters/erlang/R22.nix b/pkgs/development/interpreters/erlang/R22.nix new file mode 100644 index 00000000000..1af047f43bd --- /dev/null +++ b/pkgs/development/interpreters/erlang/R22.nix @@ -0,0 +1,11 @@ +{ mkDerivation }: + +mkDerivation rec { + version = "22.0.4"; + sha256 = "1aqkhd6nwdn4xp5yz02zbymd4x8ij8fjw9ji8kh860n1a513k9ai"; + + prePatch = '' + substituteInPlace make/configure.in --replace '`sw_vers -productVersion`' '10.10' + substituteInPlace erts/configure.in --replace '-Wl,-no_weak_imports' "" + ''; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fecf53c3f4d..3e78ddffafd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8233,7 +8233,7 @@ in beam = callPackage ./beam-packages.nix { }; inherit (beam.interpreters) - erlang erlangR18 erlangR19 erlangR20 erlangR21 + erlang erlangR18 erlangR19 erlangR20 erlangR21 erlangR22 erlang_odbc erlang_javac erlang_odbc_javac erlang_nox erlang_basho_R16B02 elixir elixir_1_8 elixir_1_7 elixir_1_6 elixir_1_5 elixir_1_4 lfe lfe_1_2; diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix index f05cf3d9290..70a21c830f5 100644 --- a/pkgs/top-level/beam-packages.nix +++ b/pkgs/top-level/beam-packages.nix @@ -50,6 +50,15 @@ rec { javacSupport = true; odbcSupport = true; }; erlangR21_nox = erlangR21.override { wxSupport = false; }; + erlangR22 = lib.callErlang ../development/interpreters/erlang/R22.nix { + wxGTK = wxGTK30; + }; + erlangR22_odbc = erlangR22.override { odbcSupport = true; }; + erlangR22_javac = erlangR22.override { javacSupport = true; }; + erlangR22_odbc_javac = erlangR22.override { + javacSupport = true; odbcSupport = true; + }; + erlangR22_nox = erlangR22.override { wxSupport = false; }; # Basho fork, using custom builder. erlang_basho_R16B02 = lib.callErlang ../development/interpreters/erlang/R16B02-basho.nix { @@ -79,6 +88,7 @@ rec { erlangR19 = packagesWith interpreters.erlangR19; erlangR20 = packagesWith interpreters.erlangR20; erlangR21 = packagesWith interpreters.erlangR21; + erlangR22 = packagesWith interpreters.erlangR22; }; } |