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: 7035462ddefd
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a1ccf5ff6ab6
Choose a head ref
  • 3 commits
  • 2 files changed
  • 1 contributor

Commits on Oct 2, 2019

  1. kconfig: Patch for CVE-2019-14744 

    See also: https://phabricator.kde.org/D22979
See also: #70102
    @ttuegel
    ttuegel committed Oct 2, 2019
    Copy the full SHA
    a7417eb View commit details

  2. pykde4: Patch for CVE-2019-14744 

    See also: https://phabricator.kde.org/D22989
See also: #70102
    @ttuegel
    ttuegel committed Oct 2, 2019
    Copy the full SHA
    3879ac8 View commit details

  3. Merge pull request #70263 from ttuegel/security--release-19.03--CVE-2… 

    …019-14744

NixOS 19.03: Patches for CVE-2019-14744
    @ttuegel
    ttuegel authored Oct 2, 2019
    Copy the full SHA
    a1ccf5f View commit details
Showing with 18 additions and 2 deletions.
  1. +9 −1 pkgs/development/libraries/kde-frameworks/kconfig.nix
  2. +9 −1 pkgs/development/python-modules/pykde4/kdelibs.nix
10 changes: 9 additions & 1 deletion pkgs/development/libraries/kde-frameworks/kconfig.nix
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,19 @@
{ mkDerivation, lib, extra-cmake-modules, qtbase, qttools }:
{ mkDerivation, lib, fetchpatch, extra-cmake-modules, qtbase, qttools }:

mkDerivation {
name = "kconfig";
meta = {
maintainers = [ lib.maintainers.ttuegel ];
broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
};
patches = [
# https://phabricator.kde.org/D22979
(fetchpatch {
url = "https://cgit.kde.org/kconfig.git/patch/?id=5d3e71b1d2ecd2cb2f910036e614ffdfc895aa22";
sha256 = "0vzrwkv3l8dlr786l6h0hqq208i6i1fbnsifi5b36d3732fqbq89";
name = "kconfig-D22979.patch";
})
];
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ qttools ];
propagatedBuildInputs = [ qtbase ];
10 changes: 9 additions & 1 deletion pkgs/development/python-modules/pykde4/kdelibs.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
stdenv, fetchurl,
stdenv, fetchurl, fetchpatch,
automoc4, cmake_2_8, libxslt, perl, pkgconfig, shared-mime-info,
attica, docbook_xml_dtd_42, docbook_xsl, giflib,
libdbusmenu_qt, libjpeg, phonon, qt4
@@ -12,6 +12,14 @@ stdenv.mkDerivation rec {
url = "mirror://kde/stable/applications/17.08.3/src/${name}.tar.xz";
sha256 = "1zn3yb09sd22bm54is0rn98amj0398zybl550dp406419sil7z9p";
};
patches = [
# https://phabricator.kde.org/D22989
(fetchpatch {
url = "https://cgit.kde.org/kdelibs.git/patch/?id=2c3762feddf7e66cf6b64d9058f625a715694a00";
sha256 = "1wbzywh8lcc66n6y3pxs18h7cwkq6g216faz27san33jpl8ra1i9";
name = "kdelibs-D22989.patch";
})
];

enableParallelBuilding = true;