From 1b2c6b9f402a8464098afdb5bfc84c7d15c7de57 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 30 Jul 2025 18:08:27 +0200 Subject: [PATCH] asterisk: update dependencies --- pkgs/servers/asterisk/default.nix | 32 +++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/pkgs/servers/asterisk/default.nix b/pkgs/servers/asterisk/default.nix index da2845f8ea80..1f4854c0b9c3 100644 --- a/pkgs/servers/asterisk/default.nix +++ b/pkgs/servers/asterisk/default.nix @@ -147,7 +147,7 @@ let postInstall = '' # Install sample configuration files for this version of Asterisk make samples - ${lib.optionalString (lib.versionAtLeast version "17.0.0") "make install-headers"} + make install-headers ''; meta = with lib; { @@ -163,19 +163,20 @@ let }; }; - pjproject_2_14_1 = - fetchurl { - url = "https://raw.githubusercontent.com/asterisk/third-party/master/pjproject/2.14.1/pjproject-2.14.1.tar.bz2"; - hash = "sha256-MtsK8bOc0fT/H/pUydqK/ahMIVg8yiRDt3TSM1uhUFQ="; - } - // { - pjsip_patches = [ ]; - }; + pjproject_2_14_1 = fetchurl { + url = "https://raw.githubusercontent.com/asterisk/third-party/master/pjproject/2.14.1/pjproject-2.14.1.tar.bz2"; + hash = "sha256-MtsK8bOc0fT/H/pUydqK/ahMIVg8yiRDt3TSM1uhUFQ="; + }; - mp3-202 = fetchsvn { + pjproject_2_15_1 = fetchurl { + url = "https://raw.githubusercontent.com/asterisk/third-party/master/pjproject/2.15.1/pjproject-2.15.1.tar.bz2"; + hash = "sha256-WLuDzsTUMfSNAG5FXYIWaEUPjPa2yV8JDe9HBi+jpgw="; + }; + + mp3-204 = fetchsvn { url = "http://svn.digium.com/svn/thirdparty/mp3/trunk"; - rev = "202"; - sha256 = "1s9idx2miwk178sa731ig9r4fzx4gy1q8xazfqyd7q4lfd70s1cy"; + rev = "204"; + hash = "sha256-Viec0LwFPfR7ewy+2hc/LIUR1LiDZfYos3RUbc+tyNk="; }; asterisk-opus = fetchFromGitHub { @@ -183,7 +184,7 @@ let repo = "asterisk-opus"; # No releases, points to master as of 2022-04-06 rev = "a959f072d3f364be983dd27e6e250b038aaef747"; - sha256 = "sha256-CASlTvTahOg9D5jccF/IN10LP/U8rRy9BFCSaHGQfCw="; + hash = "sha256-CASlTvTahOg9D5jccF/IN10LP/U8rRy9BFCSaHGQfCw="; }; # auto-generated by update.py @@ -191,14 +192,13 @@ let _: { version, sha256 }: let - pjsip = pjproject_2_14_1; + pjsip = if lib.versionAtLeast version "20" then pjproject_2_15_1 else pjproject_2_14_1; in common { inherit version sha256; - inherit (pjsip) pjsip_patches; externals = { "externals_cache/${pjsip.name}" = pjsip; - "addons/mp3" = mp3-202; + "addons/mp3" = mp3-204; }; } ) (lib.importJSON ./versions.json);