Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 4749cb399fa5
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d202d4e491a8
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Apr 20, 2021

  1. asterisk: 13.38.0 -> 13.38.2, 16.15.0 -> 16.17.0, 17.9.0 -> 17.9.3 

    Security fixes

(cherry picked from commit ae79547, minus the 18.x.x bump)
    @yorickvP @erictapen
    yorickvP authored and erictapen committed Apr 20, 2021
    Copy the full SHA
    594e6a7 View commit details

  2. asterisk: clarify license 

    (cherry picked from commit 4f8cfd1)
    @yorickvP @erictapen
    yorickvP authored and erictapen committed Apr 20, 2021
    Copy the full SHA
    d202d4e View commit details
Showing with 7 additions and 7 deletions.
  1. +7 −7 pkgs/servers/asterisk/default.nix
14 changes: 7 additions & 7 deletions pkgs/servers/asterisk/default.nix
View file
Original file line number Diff line number Diff line change
@@ -74,7 +74,7 @@ let
meta = with stdenv.lib; {
description = "Software implementation of a telephone private branch exchange (PBX)";
homepage = "https://www.asterisk.org/";
license = licenses.gpl2;
license = licenses.gpl2Only;
maintainers = with maintainers; [ auntie DerTim1 yorickvp ];
};
};
@@ -104,26 +104,26 @@ in rec {
asterisk = asterisk_17;

asterisk_13 = common {
version = "13.38.0";
sha256 = "1kxff6pbry8nydkspi0mqllidz2lw3d3g3r127x8jwgx021x0rik";
version = "13.38.2";
sha256 = "1v7wgsa9vf7qycg3xpvmn2bkandkfh3x15pr8ylg0w0gvfkkf5b9";
externals = {
"externals_cache/pjproject-2.10.tar.bz2" = pjproject_2_10;
"addons/mp3" = mp3-202;
};
};

asterisk_16 = common {
version = "16.15.0";
sha256 = "12nc7ywm6w1xyn720kdc1sqz5wkjjrkxr25wisl02f4v5wz8py7m";
version = "16.17.0";
sha256 = "1bzlsk9k735qf8a693b6sa548my7m9ahavmdicwmc14px70wrvnw";
externals = {
"externals_cache/pjproject-2.10.tar.bz2" = pjproject_2_10;
"addons/mp3" = mp3-202;
};
};

asterisk_17 = common {
version = "17.9.0";
sha256 = "1fnm1z7g45m883ivkm36r4kqb7163bzazi70mwf0fc2rc28jd1z4";
version = "17.9.3";
sha256 = "0nhk0izrxx24pz806fwnhidjmciwrkcrsvxvhrdvibiqyvfk8yk7";
externals = {
"externals_cache/pjproject-2.10.tar.bz2" = pjproject_2_10;
"addons/mp3" = mp3-202;