summary refs log tree commit diff
diff options
context:
space:
mode:
authorYorick van Pelt <yorick@yorickvanpelt.nl>2022-05-24 13:49:49 +0200
committerYorick van Pelt <yorick@yorickvanpelt.nl>2022-05-24 14:04:17 +0200
commit5d62b7f79fc2f2d83259584cc76d5dbf819c7ee2 (patch)
treec220a7521f90cc84c40fde1335df579144920f72
parent237b5838d3b34b8a48dc6b65f7abd6538e26ec12 (diff)
downloadnixpkgs-5d62b7f79fc2f2d83259584cc76d5dbf819c7ee2.tar
nixpkgs-5d62b7f79fc2f2d83259584cc76d5dbf819c7ee2.tar.gz
nixpkgs-5d62b7f79fc2f2d83259584cc76d5dbf819c7ee2.tar.bz2
nixpkgs-5d62b7f79fc2f2d83259584cc76d5dbf819c7ee2.tar.lz
nixpkgs-5d62b7f79fc2f2d83259584cc76d5dbf819c7ee2.tar.xz
nixpkgs-5d62b7f79fc2f2d83259584cc76d5dbf819c7ee2.tar.zst
nixpkgs-5d62b7f79fc2f2d83259584cc76d5dbf819c7ee2.zip
asterisk: 16.25.1 -> 16.26.1, 18.11.1 -> 18.12.1, 19.3.1 -> 19.4.1
-rw-r--r--pkgs/servers/asterisk/default.nix11
-rw-r--r--pkgs/servers/asterisk/versions.json12
2 files changed, 11 insertions, 12 deletions
diff --git a/pkgs/servers/asterisk/default.nix b/pkgs/servers/asterisk/default.nix
index 8c07b6f91ac..eeefe0dcd14 100644
--- a/pkgs/servers/asterisk/default.nix
+++ b/pkgs/servers/asterisk/default.nix
@@ -93,9 +93,9 @@ let
     };
   };
 
-  pjproject_2_10 = fetchurl {
-    url = "https://raw.githubusercontent.com/asterisk/third-party/master/pjproject/2.10/pjproject-2.10.tar.bz2";
-    sha256 = "14qmddinm4bv51rl0wwg5133r64x5bd6inwbx27ahb2n0151m2if";
+  pjproject_2_12 = fetchurl {
+    url = "https://raw.githubusercontent.com/asterisk/third-party/master/pjproject/2.12/pjproject-2.12.tar.bz2";
+    hash = "sha256-T3q4r/4WCAZCNGnULxMnNKH9wEK7gkseV/sV8IPasHQ=";
   };
 
   mp3-202 = fetchsvn {
@@ -116,7 +116,7 @@ let
   versions = lib.mapAttrs (_: {version, sha256}: common {
     inherit version sha256;
     externals = {
-      "externals_cache/pjproject-2.10.tar.bz2" = pjproject_2_10;
+      "externals_cache/pjproject-2.12.tar.bz2" = pjproject_2_12;
       "addons/mp3" = mp3-202;
     };
   }) (lib.importJSON ./versions.json);
@@ -138,8 +138,7 @@ in {
   # 19.x    Standard   2021-11-02  2022-11-02  2023-11-02
   asterisk-lts = versions.asterisk_18;
   asterisk-stable = versions.asterisk_19;
-  asterisk = versions.asterisk_19.overrideAttrs (o: let
-  in {
+  asterisk = versions.asterisk_19.overrideAttrs (o: {
     passthru = (o.passthru or {}) // { inherit updateScript; };
   });
 
diff --git a/pkgs/servers/asterisk/versions.json b/pkgs/servers/asterisk/versions.json
index f11f5547c3e..77023dac2c2 100644
--- a/pkgs/servers/asterisk/versions.json
+++ b/pkgs/servers/asterisk/versions.json
@@ -1,14 +1,14 @@
 {
   "asterisk_16": {
-    "sha256": "379c5529b9957c28734192999543486a0b0b24f6671b2e02e77cc809774e7ba9",
-    "version": "16.25.1"
+    "sha256": "201c92e591fc1db2c71b264907beef594d62d660168d42b5e83f9dc593b1bce0",
+    "version": "16.26.1"
   },
   "asterisk_18": {
-    "sha256": "9db0e94e005a91a5433fc11173247065a5c40c9a7ca946577908f65d130b888e",
-    "version": "18.11.1"
+    "sha256": "acbb58e5c3cd2b9c7c4506fa80b717c3c3c550ce9722ff0177b4f11f98725563",
+    "version": "18.12.1"
   },
   "asterisk_19": {
-    "sha256": "3e1fa31ef1de7813365dd8b98ef93744ff87902255472814d0232b955c794706",
-    "version": "19.3.1"
+    "sha256": "6b0b985163f20fcc8f8878069b8a9ee725eef4cfbdb1c1031fe3840fb32d7abe",
+    "version": "19.4.1"
   }
 }