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: 5b5b3176a0a1
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: fb35d792b858
Choose a head ref
  • 4 commits
  • 2 files changed
  • 3 contributors

Commits on Jun 26, 2020

  1. signal-desktop: 1.34.2 -> 1.34.3 

    (cherry picked from commit fdfa609)
    @primeos
    primeos committed Jun 26, 2020
    Copy the full SHA
    81ddbc4 View commit details

  2. ceph: apply patch for CVE-2020-10753 

    Fixes: CVE-2020-10753
(cherry picked from commit f76a83c)
    @mweinelt
    mweinelt committed Jun 26, 2020
    Copy the full SHA
    bf210d8 View commit details

  3. Merge pull request #91610 from mweinelt/20.03/ceph 

    [20.03] ceph: apply patch for CVE-2020-10753
    @srhb
    srhb authored Jun 26, 2020
    Copy the full SHA
    67d0406 View commit details

  4. Merge pull request #91590 from primeos/signal-desktop-backport 

    [20.03] signal-desktop: 1.34.2 -> 1.34.3
    @primeos
    primeos authored Jun 26, 2020
    Copy the full SHA
    fb35d79 View commit details
Showing with 8 additions and 2 deletions.
  1. +2 −2 pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
  2. +6 −0 pkgs/tools/filesystems/ceph/default.nix
4 changes: 2 additions & 2 deletions pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
View file
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ let
else "");
in stdenv.mkDerivation rec {
pname = "signal-desktop";
version = "1.34.2"; # Please backport all updates to the stable channel.
version = "1.34.3"; # Please backport all updates to the stable channel.
# All releases have a limited lifetime and "expire" 90 days after the release.
# When releases "expire" the application becomes unusable until an update is
# applied. The expiration date for the current release can be extracted with:
@@ -33,7 +33,7 @@ in stdenv.mkDerivation rec {

src = fetchurl {
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
sha256 = "0l0i6v6n6iyq1zb2rlgfjnsk37kzjqgglk824vl5kp8qbq0li6b6";
sha256 = "1723h8fwclv07n5lcsqw3snmfhpigkrj609fayg0aycxgi3321h6";
};

nativeBuildInputs = [
6 changes: 6 additions & 0 deletions pkgs/tools/filesystems/ceph/default.nix
View file
Original file line number Diff line number Diff line change
@@ -106,6 +106,12 @@ in rec {

patches = [
./0000-fix-SPDK-build-env.patch
(fetchurl {
# Remove for Ceph > v15.2.3; https://www.openwall.com/lists/oss-security/2020/06/25/5
name = "CVE-2020-10753.patch";
url = "https://github.com/ceph/ceph/pull/35773/commits/1524d3c0c5cb11775313ea1e2bb36a93257947f2.patch";
sha256 = "1c04kirijp4c8a5pgwqx17dzdnzvd29nl2nr3qdvf4fkqwnlf48s";
})
];

nativeBuildInputs = [