git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #99961 from helsinki-systems/upd/asterisk

asterisk: Bump all packages

commit178213fad195be8df022ae1a29729152e2b7078d authorajs124 <ajs124@users.noreply.github.com> dateFri 9 Oct 2020, 17:39 (6 years ago) parentd81e10cc5e8dbc
3 files changed+25−47
pkgs/servers/asterisk/default.nix+23−46 pkgs/top-level/aliases.nix+1 pkgs/top-level/all-packages.nix+1−1
pkgs/servers/asterisk/default.nix+23−46
@@ -24,9 +24,8 @@ let
2424 ./runtime-vardirs.patch
2525 ];
2626
27− # Disable MD5 verification for pjsip
2827 postPatch = ''
29− sed -i 's|$(verify_tarball)|true|' third-party/pjproject/Makefile
28+ echo "PJPROJECT_CONFIG_OPTS += --prefix=$out" >> third-party/pjproject/Makefile.rules
3029 '';
3130
3231 src = fetchurl {
@@ -51,6 +50,7 @@ let
5150
5251 chmod -w externals_cache
5352 '';
53+
5454 configureFlags = [
5555 "--libdir=\${out}/lib"
5656 "--with-lua=${lua}/lib"
@@ -68,6 +68,7 @@ let
6868 postInstall = ''
6969 # Install sample configuration files for this version of Asterisk
7070 make samples
71+ ${lib.optionalString (lib.versionAtLeast version "17.0.0") "make install-headers"}
7172 '';
7273
7374 meta = with stdenv.lib; {
@@ -78,14 +79,9 @@ let
7879 };
7980 };
8081
81− pjproject_2_7_1 = fetchurl {
82− url = "https://www.pjsip.org/release/2.7.1/pjproject-2.7.1.tar.bz2";
83− sha256 = "09ii5hgl5s7grx4fiimcl3s77i385h7b3kwpfa2q0arbl1ibryjr";
84− };
85−
86− pjproject_2_8 = fetchurl {
87− url = "https://www.pjsip.org/release/2.8/pjproject-2.8.tar.bz2";
88− sha256 = "0ybg0113rp3fk49rm2v0pcgqb28h3dv1pdy9594w2ggiz7bhngah";
82+ pjproject_2_10 = fetchurl {
83+ url = "https://raw.githubusercontent.com/asterisk/third-party/master/pjproject/2.10/pjproject-2.10.tar.bz2";
84+ sha256 = "14qmddinm4bv51rl0wwg5133r64x5bd6inwbx27ahb2n0151m2if";
8985 };
9086
9187 mp3-202 = fetchsvn {
@@ -95,61 +91,42 @@ let
9591 };
9692
9793in rec {
98− # Supported releases (as of 2018-11-20).
94+ # Supported releases (as of 2020-10-07).
95+ # Source: https://wiki.asterisk.org/wiki/display/AST/Asterisk+Versions
96+ # Exact version can be found at https://www.asterisk.org/downloads/asterisk/all-asterisk-versions/
9997 #
10098 # Series Type Rel. Date Sec. Fixes EOL
10199 # 13.x LTS 2014-10-24 2020-10-24 2021-10-24
102− # 15.x Standard 2017-10-03 2018-10-03 2019-10-03
103− asterisk-stable = asterisk_15;
104100 # 16.x LTS 2018-10-09 2022-10-09 2023-10-09
105101 asterisk-lts = asterisk_16;
106− asterisk = asterisk_16;
102+ # 17.x Standard 2019-10-28 2020-10-28 2021-10-28
103+ asterisk-stable = asterisk_17;
104+ asterisk = asterisk_17;
107105
108106 asterisk_13 = common {
109− version = "13.24.1";
110− sha256 = "1mclpk7knqjl6jr6mpvhb17wsjah4bk2xqhb3shpx1j4z19xkmm3";
107+ version = "13.36.0";
108+ sha256 = "1p41xrxmzpqmjgvrl7f4vbigiqpmg60fd8bqg5rxbf4lxzpvknnp";
111109 externals = {
112− "externals_cache/pjproject-2.7.1.tar.bz2" = pjproject_2_7_1;
110+ "externals_cache/pjproject-2.10.tar.bz2" = pjproject_2_10;
113111 "addons/mp3" = mp3-202;
114112 };
115113 };
116114
117− asterisk_15 = common {
118− version = "15.7.0";
119− sha256 = "1ngs73h4lz94b4f3shy1yb5laqy0z03zf451xa1nihrgp1h3ilyv";
115+ asterisk_16 = common {
116+ version = "16.13.0";
117+ sha256 = "01nja8hd6jk1966awc2vcz3hl46pvhi797k515q87vzmap1khlp9";
120118 externals = {
121− "externals_cache/pjproject-2.8.tar.bz2" = pjproject_2_8;
119+ "externals_cache/pjproject-2.10.tar.bz2" = pjproject_2_10;
122120 "addons/mp3" = mp3-202;
123121 };
124122 };
125123
126− asterisk_16 = common {
127− version = "16.1.1";
128− sha256 = "19bfvqmxphk2608jx7jghfy7rdbj1qj5vw2fyb0fq4xjvx919wmv";
124+ asterisk_17 = common {
125+ version = "17.7.0";
126+ sha256 = "0lsglrh3l823200rmkay3pgy42k0fsij610s3s4vd3zv4jjb1g0s";
129127 externals = {
130− "externals_cache/pjproject-2.8.tar.bz2" = pjproject_2_8;
128+ "externals_cache/pjproject-2.10.tar.bz2" = pjproject_2_10;
131129 "addons/mp3" = mp3-202;
132130 };
133131 };
134−
135− #asterisk-git = common {
136− # version = "15-pre";
137− # sha256 = "...";
138− # externals = {
139− # "externals_cache/pjproject-2.5.5.tar.bz2" = pjproject-255;
140− # # Note that these sounds are included with the release tarball. They are
141− # # provided here verbatim for the convenience of anyone wanting to build
142− # # Asterisk from other sources. Include in externals.
143− # "sounds/asterisk-core-sounds-en-gsm-1.5.tar.gz" = fetchurl {
144− # url = "http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-gsm-1.5.tar.gz";
145− # sha256 = "01xzbg7xy0c5zg7sixjw5025pvr4z64kfzi9zvx19im0w331h4cd";
146− # };
147− # "sounds/asterisk-moh-opsound-wav-2.03.tar.gz" = fetchurl {
148− # url = "http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-wav-2.03.tar.gz";
149− # sha256 = "449fb810d16502c3052fedf02f7e77b36206ac5a145f3dacf4177843a2fcb538";
150− # };
151− # # TODO: Sounds for other languages could be added here
152− # }
153− #}.overrideDerivation (_: {src = fetchgit {...}})
154−
155132}
pkgs/top-level/aliases.nix+1
@@ -46,6 +46,7 @@ mapAliases ({
4646 arduino_core = arduino-core; # added 2015-02-04
4747 arora = throw "arora has been removed."; # added 2020-09-09
4848 asciidocFull = asciidoc-full; # added 2014-06-22
49+ asterisk_15 = throw "Asterisk 15 is end of life and has been removed."; # added 2020-10-07
4950 at_spi2_atk = at-spi2-atk; # added 2018-02-25
5051 at_spi2_core = at-spi2-core; # added 2018-02-25
5152 avldrums-lv2 = x42-avldrums; # added 2020-03-29
pkgs/top-level/all-packages.nix+1−1
@@ -16387,7 +16387,7 @@ in
1638716387
1638816388 inherit (callPackages ../servers/asterisk { })
1638916389 asterisk asterisk-stable asterisk-lts
16390− asterisk_13 asterisk_15 asterisk_16;
16390+ asterisk_13 asterisk_16 asterisk_17;
1639116391
1639216392 asterisk-module-sccp = callPackage ../servers/asterisk/sccp { };
1639316393