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

Commits on Oct 2, 2019

  1. Remove pykde4

    @ttuegel
    ttuegel committed Oct 2, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    grahamc Graham Christensen
    GPG key ID: ACA1C1D120C83D5C
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    a3ad16b View commit details

  2. Revert "Remove pykde4" 

    This reverts commit a3ad16b.
    @ttuegel
    ttuegel committed Oct 2, 2019
    Copy the full SHA
    e98b64c View commit details

  3. kdelibs: gnidorah is maintainer

    @ttuegel
    ttuegel committed Oct 2, 2019
    Copy the full SHA
    ee36267 View commit details

  4. pykde4: Do not build on Hydra 

    pykde4 is not used in Nixpkgs, so it is not appropriate to build on Hydra.
    @ttuegel
    ttuegel committed Oct 2, 2019
    Copy the full SHA
    260ef79 View commit details

  5. kdelibs: 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
    9a06742 View commit details

Commits on Oct 3, 2019

  1. Merge pull request #70264 from ttuegel/security--CVE-2019-14744 

    Patch kdelibs for CVE-2019-14744
    @ttuegel
    ttuegel authored Oct 3, 2019
    Copy the full SHA
    629f713 View commit details
Showing with 12 additions and 1 deletion.
  1. +1 −0 pkgs/development/python-modules/pykde4/default.nix
  2. +11 −1 pkgs/development/python-modules/pykde4/kdelibs.nix
1 change: 1 addition & 0 deletions pkgs/development/python-modules/pykde4/default.nix
View file
Original file line number Diff line number Diff line change
@@ -37,6 +37,7 @@ in stdenv.mkDerivation rec {

meta = with stdenv.lib; {
platforms = platforms.linux;
hydraPlatforms = platforms.none;
description = "Python bindings for KDE";
license = with licenses; [ gpl2 lgpl2 ];
homepage = https://api.kde.org/pykde-4.3-api/;
12 changes: 11 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, openssl
@@ -12,6 +12,14 @@ stdenv.mkDerivation rec {
url = "mirror://kde/stable/applications/17.08.3/src/${pname}-${version}.tar.xz";
sha256 = "1zn3yb09sd22bm54is0rn98amj0398zybl550dp406419sil7z9p";
};
patches = [
# https://phabricator.kde.org/D22989
(fetchpatch {
url = "https://cgit.kde.org/kdelibs.git/patch/?id=2c3762feddf7e66cf6b64d9058f625a715694a00";
sha256 = "1wbzywh8lcc66n6y3pxs18h7cwkq6g216faz27san33jpl8ra1i9";
name = "CVE-2019-14744.patch";
})
];

enableParallelBuilding = true;

@@ -32,7 +40,9 @@ stdenv.mkDerivation rec {

meta = with stdenv.lib; {
platforms = platforms.linux;
hydraPlatforms = platforms.none;
homepage = http://www.kde.org;
license = with licenses; [ gpl2 fdl12 lgpl21 ];
maintainers = with maintainers; [ gnidorah ];
};
}