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: add5529b3ee2
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: 1a92d0abfcdb
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jul 12, 2020

  1. trojita: apply patch for CVE-2020-15047

    @ehmry
    ehmry committed Jul 12, 2020
    Copy the full SHA
    5fe4954 View commit details

Commits on Jul 14, 2020

  1. Merge pull request #92890 from ehmry/nixos-20.03 

    [20.03] trojita: apply patch for CVE-2020-15047
    Christian Kauhaus authored Jul 14, 2020
    Copy the full SHA
    1a92d0a View commit details
Showing with 9 additions and 0 deletions.
  1. +9 −0 pkgs/applications/networking/mailreaders/trojita/default.nix
9 changes: 9 additions & 0 deletions pkgs/applications/networking/mailreaders/trojita/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{ akonadi-contacts
, cmake
, fetchgit
, fetchpatch
, gnupg
, gpgme
, kcontacts
@@ -27,6 +28,14 @@ mkDerivation rec {
sha256 = "0xpxq5bzqaa68lkz90wima5q2m0mdcn0rvnigb66lylb4n20mnql";
};

patches = [
(fetchpatch {
name = "CVE-2020-15047.patch";
url = "https://invent.kde.org/pim/trojita/-/commit/77ddd5d44f2bf4155d0c9b6f7d05f01713b32d5d.diff";
sha256 = "1pjmy5yvca8sm3nn5p4fxrhhpn6srnfa36fyfspvbfaxpn1n1n1l";
})
];

buildInputs = [
akonadi-contacts
gpgme