summary refs log tree commit diff
path: root/pkgs/top-level/beam-packages.nix
diff options
context:
space:
mode:
authorErlend Hamberg <erlend@hamberg.no>2019-06-18 10:56:32 +0200
committerDaiderd Jordan <daiderd@gmail.com>2019-06-22 11:01:25 +0200
commit19c29796771f07d213328d8b4a66edb550e7aef3 (patch)
tree1366ff9b2bf7c5a4aaa45aa088bc81013567ea5c /pkgs/top-level/beam-packages.nix
parent10a25e9b52e11da86ea3c1a29e33d871424feb91 (diff)
downloadnixpkgs-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
Diffstat (limited to 'pkgs/top-level/beam-packages.nix')
-rw-r--r--pkgs/top-level/beam-packages.nix10
1 files changed, 10 insertions, 0 deletions
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;
 
   };
 }