From f6e74417eb4654c0bc27d2f035c295fcd96d5a1d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 2 Sep 2025 09:59:23 +0000
Subject: [PATCH] asterisk: 20.15.1 -> 20.15.2

This also updates asterisk 18 (18.26.3 -> 18.26.4).
The new version requires pjproject
to be updated: 2.14.1 -> 2.15.1 .
Luckily, this is the version that is also used by
other asterisk version, so we simply drop the old
pjproject and unconditionally use version 2.15.1 .

Co-authored-by: Yarny0 <41838844+Yarny0@users.noreply.github.com>
(cherry picked from commit 9449ada53e2c14626798b54cf60957e37774eeeb)
---
 pkgs/servers/asterisk/default.nix   | 12 ++----------
 pkgs/servers/asterisk/versions.json | 16 ++++++++--------
 2 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/pkgs/servers/asterisk/default.nix b/pkgs/servers/asterisk/default.nix
index 1f4854c0b9c3..bf048d5f4bda 100644
--- a/pkgs/servers/asterisk/default.nix
+++ b/pkgs/servers/asterisk/default.nix
@@ -163,12 +163,7 @@ 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=";
-  };
-
-  pjproject_2_15_1 = fetchurl {
+  pjproject = fetchurl {
     url = "https://raw.githubusercontent.com/asterisk/third-party/master/pjproject/2.15.1/pjproject-2.15.1.tar.bz2";
     hash = "sha256-WLuDzsTUMfSNAG5FXYIWaEUPjPa2yV8JDe9HBi+jpgw=";
   };
@@ -191,13 +186,10 @@ let
   versions = lib.mapAttrs (
     _:
     { version, sha256 }:
-    let
-      pjsip = if lib.versionAtLeast version "20" then pjproject_2_15_1 else pjproject_2_14_1;
-    in
     common {
       inherit version sha256;
       externals = {
-        "externals_cache/${pjsip.name}" = pjsip;
+        "externals_cache/${pjproject.name}" = pjproject;
         "addons/mp3" = mp3-204;
       };
     }
diff --git a/pkgs/servers/asterisk/versions.json b/pkgs/servers/asterisk/versions.json
index 87be36fffdc9..853dfcb4dec4 100644
--- a/pkgs/servers/asterisk/versions.json
+++ b/pkgs/servers/asterisk/versions.json
@@ -1,18 +1,18 @@
 {
   "asterisk_18": {
-    "sha256": "0df8be2f57779019895628363a11f74ea356068cca983462ec0feb72528fc8e9",
-    "version": "18.26.3"
+    "sha256": "a17f511bfa092c8fa9eccd3a5ecf5f728ccdcf2b1a04d2c06e7177d96c3c9ee1",
+    "version": "18.26.4"
   },
   "asterisk_20": {
-    "sha256": "fa286ac7a024e685233af6fde54a68a21c8e9934b438da878fb3cff080a6346c",
-    "version": "20.15.1"
+    "sha256": "4bbe0aaecc0e7294780269a5dc7ff78a85c58cf26ffc63dd63be5406eef0b687",
+    "version": "20.15.2"
   },
   "asterisk_21": {
-    "sha256": "811c5b8c501004ee378e77efd009892b366a03a508cfc51eead52396cbf65b2c",
-    "version": "21.10.1"
+    "sha256": "9624e807a1138cabed14431a326c9870e53fc132738dbbd61314abc027785d94",
+    "version": "21.10.2"
   },
   "asterisk_22": {
-    "sha256": "cbe67229f813ccf5e545fbda1fc05eb221897bf03393917390f8f6235cc62179",
-    "version": "22.5.1"
+    "sha256": "5061c852fd850b17e6be9d866c8e73298471883fc5e3ccd5a24b3e1364e24218",
+    "version": "22.5.2"
   }
 }