Commit 7a7b0862 authored by Shane Sveller's avatar Shane Sveller Committed by Yt
Browse files
parent 42e7d26c
Loading
Loading
Loading
Loading
+7 −0
Original line number Diff line number Diff line
{ lib, mkDerivation }:

mkDerivation {
  version = "26.0";
  sha256 = "sha256-7z5LkCLyjqGlo48XlcwAUiu1FkmAAewEGnP30QDDme8=";
}
+1 −1
Original line number Diff line number Diff line
@@ -459,7 +459,7 @@ mapAliases ({
  enyo-doom = enyo-launcher; # Added 2022-09-09
  epoxy = libepoxy; # Added 2021-11-11
  epsxe = throw "epsxe has been removed from nixpkgs, as it was unmaintained."; # added 2021-12-15
  inherit (beam.interpreters) erlangR25 erlangR24 erlangR23; # added 2023-03-21
  inherit (beam.interpreters) erlangR26 erlangR25 erlangR24 erlangR23; # added 2023-03-21
  erlang_21 = throw "erlangR21 has been removed in favor of newer versions."; # added 2023-03-21
  erlangR21 = erlang_21;
  erlang_22 = throw "erlangR22 has been removed in favor of newer versions."; # added 2023-03-21
+15 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ let
  self = beam;

  # Aliases added 2023-03-21
  versionLoop = f: lib.lists.foldr (version: acc: (f version) // acc) { } [ "25" "24" "23" ];
  versionLoop = f: lib.lists.foldr (version: acc: (f version) // acc) { } [ "26" "25" "24" "23" ];

  interpretersAliases = versionLoop (version: {
    "erlangR${version}" = self.interpreters."erlang_${version}";
@@ -42,6 +42,19 @@ in

    # Standard Erlang versions, using the generic builder.

    erlang_26 = self.beamLib.callErlang ../development/interpreters/erlang/26.nix {
      wxGTK = wxGTK32;
      parallelBuild = true;
      autoconf = buildPackages.autoconf269;
      inherit wxSupport systemdSupport;
    };
    erlang_26_odbc = self.interpreters.erlang_26.override { odbcSupport = true; };
    erlang_26_javac = self.interpreters.erlang_26.override { javacSupport = true; };
    erlang_26_odbc_javac = self.interpreters.erlang_26.override {
      javacSupport = true;
      odbcSupport = true;
    };

    erlang_25 = self.beamLib.callErlang ../development/interpreters/erlang/25.nix {
      wxGTK = wxGTK32;
      parallelBuild = true;
@@ -100,6 +113,7 @@ in
  packages = {
    erlang = self.packages.${self.latestVersion};

    erlang_26 = self.packagesWith self.interpreters.erlang_26;
    erlang_25 = self.packagesWith self.interpreters.erlang_25;
    erlang_24 = self.packagesWith self.interpreters.erlang_24;
    erlang_23 = self.packagesWith self.interpreters.erlang_23;