JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #55378 from DerTim1/tmp/asterisk-update

Browse Source 
asterisk: 15.3.0 -> 15.7.0, 13.20.0 -> 13.24.1, add 16.x
This commit is contained in:
Joachim F 2019-03-26 00:46:16 +00:00 committed by GitHub
commit feb08243cd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 68 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

101
pkgs/servers/asterisk/default.nix
View File

@ -1,8 +1,8 @@
{ stdenv, lib, fetchurl, fetchsvn, { stdenv, lib, fetchurl, fetchsvn,
jansson, libxml2, libxslt, ncurses, openssl, sqlite, jansson, libedit, libxml2, libxslt, ncurses, openssl, sqlite,
utillinux, dmidecode, libuuid, newt, utillinux, dmidecode, libuuid, newt,
lua, speex, lua, speex,
srtp, wget, curl, iksemel srtp, wget, curl, iksemel, pkgconfig
}: }:
let let
@ -10,7 +10,11 @@ let
inherit version; inherit version;
name = "asterisk-${version}"; name = "asterisk-${version}";
buildInputs = [ jansson libxml2 libxslt ncurses openssl sqlite utillinux dmidecode libuuid newt lua speex srtp wget curl iksemel ]; buildInputs = [ jansson libedit libxml2 libxslt ncurses openssl sqlite
dmidecode libuuid newt
lua speex
srtp wget curl iksemel ];
nativeBuildInputs = [ utillinux pkgconfig ];
patches = [ patches = [
# We want the Makefile to install the default /var skeleton # We want the Makefile to install the default /var skeleton
@ -39,8 +43,11 @@ let
# you're likely missing an automatically downloaded dependency # you're likely missing an automatically downloaded dependency
preConfigure = '' preConfigure = ''
mkdir externals_cache mkdir externals_cache
'' + lib.concatStringsSep "\n"
(lib.mapAttrsToList (dst: src: "cp -r --no-preserve=mode ${src} ${dst}") externals) + '' ${lib.concatStringsSep "\n"
(lib.mapAttrsToList (dst: src: "cp -r --no-preserve=mode ${src} ${dst}") externals)}
${lib.optionalString (externals ? "addons/mp3") "bash contrib/scripts/get_mp3_source.sh || true"}
chmod -w externals_cache chmod -w externals_cache
''; '';
@ -53,7 +60,9 @@ let
preBuild = '' preBuild = ''
make menuselect.makeopts make menuselect.makeopts
substituteInPlace menuselect.makeopts --replace 'format_mp3 ' "" ${lib.optionalString (externals ? "addons/mp3") ''
substituteInPlace menuselect.makeopts --replace 'format_mp3 ' ""
''}
''; '';
postInstall = '' postInstall = ''
@ -69,56 +78,78 @@ let
}; };
}; };
pjproject-27 = fetchurl { pjproject_2_7_1 = fetchurl {
url = http://www.pjsip.org/release/2.7.1/pjproject-2.7.1.tar.bz2; url = http://www.pjsip.org/release/2.7.1/pjproject-2.7.1.tar.bz2;
sha256 = "09ii5hgl5s7grx4fiimcl3s77i385h7b3kwpfa2q0arbl1ibryjr"; sha256 = "09ii5hgl5s7grx4fiimcl3s77i385h7b3kwpfa2q0arbl1ibryjr";
}; };
pjproject_2_8 = fetchurl {
url = http://www.pjsip.org/release/2.8/pjproject-2.8.tar.bz2;
sha256 = "0ybg0113rp3fk49rm2v0pcgqb28h3dv1pdy9594w2ggiz7bhngah";
};
mp3-202 = fetchsvn { mp3-202 = fetchsvn {
url = http://svn.digium.com/svn/thirdparty/mp3/trunk; url = http://svn.digium.com/svn/thirdparty/mp3/trunk;
rev = "202"; rev = "202";
sha256 = "1s9idx2miwk178sa731ig9r4fzx4gy1q8xazfqyd7q4lfd70s1cy"; sha256 = "1s9idx2miwk178sa731ig9r4fzx4gy1q8xazfqyd7q4lfd70s1cy";
}; };
in in rec {
{ # Supported releases (as of 2018-11-20).
#
# Series Type Rel. Date Sec. Fixes EOL
# 13.x LTS 2014-10-24 2020-10-24 2021-10-24
# 15.x Standard 2017-10-03 2018-10-03 2019-10-03
asterisk-stable = asterisk_15;
# 16.x LTS 2018-10-09 2022-10-09 2023-10-09
asterisk-lts = asterisk_16;
asterisk = asterisk_16;
asterisk-lts = common { asterisk_13 = common {
version = "13.20.0"; version = "13.24.1";
sha256 = "a3d6d953f844867ea11e0be22ee6225049cd4f5870df6ab23454623bcfbc94d5"; sha256 = "1mclpk7knqjl6jr6mpvhb17wsjah4bk2xqhb3shpx1j4z19xkmm3";
externals = { externals = {
"externals_cache/pjproject-2.7.1.tar.bz2" = pjproject-27; "externals_cache/pjproject-2.7.1.tar.bz2" = pjproject_2_7_1;
"addons/mp3" = mp3-202; "addons/mp3" = mp3-202;
}; };
}; };
asterisk-stable = common { asterisk_15 = common {
version = "15.3.0"; version = "15.7.0";
sha256 = "f424f89f23b72f267ff9baab82d449bebbbf00c54e54fcd06b8fca13788b012c"; sha256 = "1ngs73h4lz94b4f3shy1yb5laqy0z03zf451xa1nihrgp1h3ilyv";
externals = { externals = {
"externals_cache/pjproject-2.7.1.tar.bz2" = pjproject-27; "externals_cache/pjproject-2.8.tar.bz2" = pjproject_2_8;
"addons/mp3" = mp3-202; "addons/mp3" = mp3-202;
}; };
}; };
# asterisk-git = common { asterisk_16 = common {
# version = "15-pre"; version = "16.1.1";
# sha256 = "..."; sha256 = "19bfvqmxphk2608jx7jghfy7rdbj1qj5vw2fyb0fq4xjvx919wmv";
# externals = { externals = {
"externals_cache/pjproject-2.8.tar.bz2" = pjproject_2_8;
"addons/mp3" = mp3-202;
};
};
#asterisk-git = common {
# version = "15-pre";
# sha256 = "...";
# externals = {
# "externals_cache/pjproject-2.5.5.tar.bz2" = pjproject-255; # "externals_cache/pjproject-2.5.5.tar.bz2" = pjproject-255;
# Note that these sounds are included with the release tarball. They are # # Note that these sounds are included with the release tarball. They are
# provided here verbatim for the convenience of anyone wanting to build # # provided here verbatim for the convenience of anyone wanting to build
# Asterisk from other sources. Include in externals. # # Asterisk from other sources. Include in externals.
# "sounds/asterisk-core-sounds-en-gsm-1.5.tar.gz" = fetchurl { # "sounds/asterisk-core-sounds-en-gsm-1.5.tar.gz" = fetchurl {
# url = http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-gsm-1.5.tar.gz; # url = http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-gsm-1.5.tar.gz;
# sha256 = "01xzbg7xy0c5zg7sixjw5025pvr4z64kfzi9zvx19im0w331h4cd"; # sha256 = "01xzbg7xy0c5zg7sixjw5025pvr4z64kfzi9zvx19im0w331h4cd";
# }; # };
# "sounds/asterisk-moh-opsound-wav-2.03.tar.gz" = fetchurl { # "sounds/asterisk-moh-opsound-wav-2.03.tar.gz" = fetchurl {
# url = http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-wav-2.03.tar.gz; # url = http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-wav-2.03.tar.gz;
# sha256 = "449fb810d16502c3052fedf02f7e77b36206ac5a145f3dacf4177843a2fcb538"; # sha256 = "449fb810d16502c3052fedf02f7e77b36206ac5a145f3dacf4177843a2fcb538";
# }; # };
# TODO: Sounds for other languages could be added here # # TODO: Sounds for other languages could be added here
# } # }
# }.overrideDerivation (_: {src = fetchgit {...}}) #}.overrideDerivation (_: {src = fetchgit {...}})
} }

5
pkgs/top-level/all-packages.nix
View File

@ -13604,10 +13604,9 @@ in
apcupsd = callPackage ../servers/apcupsd { }; apcupsd = callPackage ../servers/apcupsd { };
asterisk = asterisk-stable;
inherit (callPackages ../servers/asterisk { }) inherit (callPackages ../servers/asterisk { })
asterisk-stable asterisk-lts; asterisk asterisk-stable asterisk-lts
asterisk_13 asterisk_15 asterisk_16;
sabnzbd = callPackage ../servers/sabnzbd { }; sabnzbd = callPackage ../servers/sabnzbd { };