Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 64565f9d8ffe
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3b9b10e49bec
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Mar 14, 2020

  1. skypeforlinux: 8.51.0.92 -> 8.56.0.103 

    cherry-picked 4665c94

Closes #81868
    @r-ryantm @FRidh
    r-ryantm authored and FRidh committed Mar 14, 2020
    Copy the full SHA
    68ad45f View commit details

  2. openjpeg: add patch for CVE-2020-6851 

    (cherry picked from commit 773462c3aacdd2eb50457c7949dae6dd91e3684d)
    @mmilata @alyssais
    mmilata authored and alyssais committed Mar 14, 2020
    Copy the full SHA
    1524ffc View commit details

  3. openjpeg: add patch for CVE-2020-8112 

    (cherry picked from commit 41d8bb133efeade8d25a634ca68c32f0f62f6a41)
    @mmilata @alyssais
    mmilata authored and alyssais committed Mar 14, 2020
    Copy the full SHA
    3b9b10e View commit details
Showing with 12 additions and 2 deletions.
  1. +2 −2 pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
  2. +10 −0 pkgs/development/libraries/openjpeg/2.x.nix
4 changes: 2 additions & 2 deletions pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
View file
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ let

# Please keep the version x.y.0.z and do not update to x.y.76.z because the
# source of the latter disappears much faster.
version = "8.51.0.92";
version = "8.56.0.103";

rpath = stdenv.lib.makeLibraryPath [
alsaLib
@@ -63,7 +63,7 @@ let
"https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb"
"https://web.archive.org/web/https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb"
];
sha256 = "11x13c7z70iaq86pyy5nqc0mcfdr7vjpjkxw6kdyjhqyxs6q6ipf";
sha256 = "01qyi92dh4xalzaqzj9n3bz59y91rx45gkyw4k9ckjknbjwb3c90";
}
else
throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}";
10 changes: 10 additions & 0 deletions pkgs/development/libraries/openjpeg/2.x.nix
View file
Original file line number Diff line number Diff line change
@@ -23,5 +23,15 @@ callPackage ./generic.nix (args // rec {
name = "CVE-2019-12973-2.patch";
sha256 = "1jkkfw13l7nx4hxdhc7z17f4vfgqcaf09zpl235kypbxx1ygc7vq";
})
(fetchpatch {
url = "https://github.com/uclouvain/openjpeg/commit/024b8407392cb0b82b04b58ed256094ed5799e04.patch";
name = "CVE-2020-6851.patch";
sha256 = "1lfwlzqxb69cwzjp8v9lijz4c2qhf3b8m6sq1khipqlgrb3l58xw";
})
(fetchpatch {
url = "https://github.com/uclouvain/openjpeg/commit/05f9b91e60debda0e83977e5e63b2e66486f7074.patch";
name = "CVE-2020-8112.patch";
sha256 = "16kykc8wbq9kx9w9kkf3i7snak82m184qrl9bpxvkjl7h0n9aw49";
})
];
})