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: a1ccf5ff6ab6
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: ec1070d4d404
Choose a head ref
  • 4 commits
  • 3 files changed
  • 1 contributor

Commits on Oct 2, 2019

  1. kconfig: vulnix: patch name is CVE number

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

  2. kdelibs: vulnix: patch name is CVE number

    @ttuegel
    ttuegel committed Oct 2, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    665e671 View commit details

  3. pykde4: Disable build on Hydra

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

Commits on Oct 3, 2019

  1. Merge pull request #70288 from ttuegel/security--release-19.03--CVE-2… 

    …019-14744

NixOS 19.03: Fix kdelibs and kconfig patch names for vulnix
    @ttuegel
    ttuegel authored Oct 3, 2019
    Copy the full SHA
    ec1070d View commit details
2 changes: 1 addition & 1 deletion pkgs/development/libraries/kde-frameworks/kconfig.nix
View file
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ mkDerivation {
(fetchpatch {
url = "https://cgit.kde.org/kconfig.git/patch/?id=5d3e71b1d2ecd2cb2f910036e614ffdfc895aa22";
sha256 = "0vzrwkv3l8dlr786l6h0hqq208i6i1fbnsifi5b36d3732fqbq89";
name = "kconfig-D22979.patch";
name = "CVE-2019-14744.patch";
})
];
nativeBuildInputs = [ extra-cmake-modules ];
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
@@ -35,6 +35,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/;
3 changes: 2 additions & 1 deletion pkgs/development/python-modules/pykde4/kdelibs.nix
View file
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
(fetchpatch {
url = "https://cgit.kde.org/kdelibs.git/patch/?id=2c3762feddf7e66cf6b64d9058f625a715694a00";
sha256 = "1wbzywh8lcc66n6y3pxs18h7cwkq6g216faz27san33jpl8ra1i9";
name = "kdelibs-D22989.patch";
name = "CVE-2019-14744.patch";
})
];

@@ -40,6 +40,7 @@ stdenv.mkDerivation rec {

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