From 5405ff960292269c01c96212a1e8591254509c14 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Tue, 4 Jun 2024 20:28:37 -0300 Subject: [PATCH 1/4] erlang_{24,25,26}_{odbc,javac,odbc_javac}: remove --- pkgs/top-level/all-packages.nix | 1 - pkgs/top-level/beam-packages.nix | 21 --------------------- 2 files changed, 22 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2c8cad1325ba..9d0c00ca3583 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17180,7 +17180,6 @@ with pkgs; inherit (beam.interpreters) erlang erlang_27 erlang_26 erlang_25 erlang_24 - erlang_odbc erlang_javac erlang_odbc_javac elixir elixir_1_16 elixir_1_15 elixir_1_14 elixir_1_13 elixir_1_12 elixir_1_11 elixir_1_10 elixir-ls; diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix index 2eba6dc4ea7d..1a477ba53611 100644 --- a/pkgs/top-level/beam-packages.nix +++ b/pkgs/top-level/beam-packages.nix @@ -23,9 +23,6 @@ in interpreters = { erlang = self.interpreters.${self.latestVersion}; - erlang_odbc = self.interpreters."${self.latestVersion}_odbc"; - erlang_javac = self.interpreters."${self.latestVersion}_javac"; - erlang_odbc_javac = self.interpreters."${self.latestVersion}_odbc_javac"; # Standard Erlang versions, using the generic builder. @@ -44,12 +41,6 @@ in 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; @@ -57,12 +48,6 @@ in autoconf = buildPackages.autoconf269; inherit wxSupport systemdSupport; }; - erlang_25_odbc = self.interpreters.erlang_25.override { odbcSupport = true; }; - erlang_25_javac = self.interpreters.erlang_25.override { javacSupport = true; }; - erlang_25_odbc_javac = self.interpreters.erlang_25.override { - javacSupport = true; - odbcSupport = true; - }; erlang_24 = self.beamLib.callErlang ../development/interpreters/erlang/24.nix { wxGTK = wxGTK32; @@ -71,12 +56,6 @@ in autoconf = buildPackages.autoconf269; inherit wxSupport systemdSupport; }; - erlang_24_odbc = self.interpreters.erlang_24.override { odbcSupport = true; }; - erlang_24_javac = self.interpreters.erlang_24.override { javacSupport = true; }; - erlang_24_odbc_javac = self.interpreters.erlang_24.override { - javacSupport = true; - odbcSupport = true; - }; # Other Beam languages. These are built with `beam.interpreters.erlang`. To # access for example elixir built with different version of Erlang, use From e73d7ffc6b9c2524a3ee172f0c0eb745890db70e Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Tue, 4 Jun 2024 19:32:57 -0300 Subject: [PATCH 2/4] erlang_27: fix missing reference --- pkgs/top-level/beam-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix index 1a477ba53611..d0b8b276812d 100644 --- a/pkgs/top-level/beam-packages.nix +++ b/pkgs/top-level/beam-packages.nix @@ -72,7 +72,7 @@ in # appropriate Erlang/OTP version. packages = { erlang = self.packages.${self.latestVersion}; - + erlang_27 = self.packagesWith self.interpreters.erlang_27; erlang_26 = self.packagesWith self.interpreters.erlang_26; erlang_25 = self.packagesWith self.interpreters.erlang_25; erlang_24 = self.packagesWith self.interpreters.erlang_24; From 8ee0212aba4222d5ca1228a0424698a4552e0cc1 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Tue, 4 Jun 2024 20:01:09 -0300 Subject: [PATCH 3/4] lfe: 2.1.3 -> 2.1.4 https://github.com/lfe/lfe/releases/tag/v2.1.4 --- pkgs/development/interpreters/lfe/2.1.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/lfe/2.1.nix b/pkgs/development/interpreters/lfe/2.1.nix index 2270c0a219d6..7ac2d6eef2b5 100644 --- a/pkgs/development/interpreters/lfe/2.1.nix +++ b/pkgs/development/interpreters/lfe/2.1.nix @@ -1,7 +1,7 @@ { mkDerivation }: mkDerivation { - version = "2.1.3"; - hash = "sha256-HUOVBzUaU0ixIfPPctwR2TPijxJjcFY3dJ8Z7Ot2bpE="; - maximumOTPVersion = "26"; + version = "2.1.4"; + hash = "sha256-mDavRI2it0SrSR0iBItm2MfjI+F/zCy38YSd2KpE0Hs="; + maximumOTPVersion = "27"; } From 4a4839a2ea237a144fec17ad2f77cc84782248c7 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Tue, 4 Jun 2024 20:23:40 -0300 Subject: [PATCH 4/4] rabbitmq-server: 3.12.13 -> 3.13.3 --- pkgs/servers/amqp/rabbitmq-server/default.nix | 12 ++++++------ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix index b2348730ebe8..ce7151618c65 100644 --- a/pkgs/servers/amqp/rabbitmq-server/default.nix +++ b/pkgs/servers/amqp/rabbitmq-server/default.nix @@ -38,12 +38,12 @@ in stdenv.mkDerivation rec { pname = "rabbitmq-server"; - version = "3.12.13"; + version = "3.13.3"; # when updating, consider bumping elixir version in all-packages.nix src = fetchurl { url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${version}/${pname}-${version}.tar.xz"; - hash = "sha256-UjUkiS8ay66DDzeW9EXOJPQVHHxC1sXT8mCn+KVXSQ4="; + hash = "sha256-CPnoPK3tBKKmIo8IioUCUWkw6+sdvzRaAngseRZ8eUM="; }; nativeBuildInputs = [ unzip xmlto docbook_xml_dtd_45 docbook_xsl zip rsync python3 ]; @@ -85,12 +85,12 @@ stdenv.mkDerivation rec { vm-test = nixosTests.rabbitmq; }; - meta = with lib; { + meta = { homepage = "https://www.rabbitmq.com/"; description = "An implementation of the AMQP messaging protocol"; changelog = "https://github.com/rabbitmq/rabbitmq-server/releases/tag/v${version}"; - license = licenses.mpl20; - platforms = platforms.unix; - maintainers = with maintainers; [ turion ]; + license = lib.licenses.mpl20; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ turion ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9d0c00ca3583..b340bb65e483 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26432,7 +26432,7 @@ with pkgs; rabbitmq-server = callPackage ../servers/amqp/rabbitmq-server { inherit (darwin.apple_sdk.frameworks) AppKit Carbon Cocoa; - elixir = elixir_1_14; + erlang = erlang_26; }; radicale2 = callPackage ../servers/radicale/2.x.nix { };