diff options
| author | nyanloutre <paul@nyanlout.re> | 2019-08-16 10:16:18 +0200 |
|---|---|---|
| committer | nyanloutre <paul@nyanlout.re> | 2019-08-16 11:26:17 +0200 |
| commit | 2ac1e31aeaa6b9b6405091ea6bae3fc190a0af53 (patch) | |
| tree | e59a38b419659b6c449e7cdb3a747c931c8b00fa /pkgs/applications/kde | |
| parent | 7489145b3000f4b5fbf24c2f0f5729ebaa6dc9ec (diff) | |
| download | nixpkgs-2ac1e31aeaa6b9b6405091ea6bae3fc190a0af53.tar nixpkgs-2ac1e31aeaa6b9b6405091ea6bae3fc190a0af53.tar.gz nixpkgs-2ac1e31aeaa6b9b6405091ea6bae3fc190a0af53.tar.bz2 nixpkgs-2ac1e31aeaa6b9b6405091ea6bae3fc190a0af53.tar.lz nixpkgs-2ac1e31aeaa6b9b6405091ea6bae3fc190a0af53.tar.xz nixpkgs-2ac1e31aeaa6b9b6405091ea6bae3fc190a0af53.tar.zst nixpkgs-2ac1e31aeaa6b9b6405091ea6bae3fc190a0af53.zip | |
kde_applications: disable obsolete patches
Diffstat (limited to 'pkgs/applications/kde')
| -rw-r--r-- | pkgs/applications/kde/ark/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/applications/kde/kate.nix | 10 | ||||
| -rw-r--r-- | pkgs/applications/kde/kmail.nix | 12 |
3 files changed, 4 insertions, 28 deletions
diff --git a/pkgs/applications/kde/ark/default.nix b/pkgs/applications/kde/ark/default.nix index 96332cc9168..6015cb69d77 100644 --- a/pkgs/applications/kde/ark/default.nix +++ b/pkgs/applications/kde/ark/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, config, fetchpatch, + mkDerivation, lib, config, extra-cmake-modules, kdoctools, @@ -27,14 +27,6 @@ mkDerivation { maintainers = [ lib.maintainers.ttuegel ]; }; - patches = [ - # This patch should be backported in 19.04.4 KDE applications - (fetchpatch { - url = "https://cgit.kde.org/ark.git/patch/?id=7065c5390c78c2b18807721490f19c62761220e5"; - sha256 = "0sipw5z60gk6l025rk4xsbc10n3bvv9743f4cbvf6hyy4mbm4p1m"; - }) - ]; - outputs = [ "out" "dev" ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ libarchive libzip ] ++ extraTools; diff --git a/pkgs/applications/kde/kate.nix b/pkgs/applications/kde/kate.nix index 7051bac404b..95ff6cf198b 100644 --- a/pkgs/applications/kde/kate.nix +++ b/pkgs/applications/kde/kate.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, fetchpatch, + mkDerivation, lib, extra-cmake-modules, kdoctools, kactivities, kconfig, kcrash, kdbusaddons, kguiaddons, kiconthemes, ki18n, kinit, kio, kitemmodels, kjobwidgets, knewstuff, knotifications, konsole, @@ -14,14 +14,6 @@ mkDerivation { maintainers = [ lib.maintainers.ttuegel ]; }; - patches = [ - # This patch should be backported in 19.04.4 KDE applications - (fetchpatch { - url = "https://cgit.kde.org/kate.git/patch/?id=76ec8b55a86a29a90125b2ff3f512df007789cb1"; - sha256 = "1q0bkb6vl4xvh4aba1rlqii4a75pvl7vbcs4plny8lalzslnbzhj"; - }) - ]; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ libgit2 ]; propagatedBuildInputs = [ diff --git a/pkgs/applications/kde/kmail.nix b/pkgs/applications/kde/kmail.nix index b08444f18bb..a58b3b8c45d 100644 --- a/pkgs/applications/kde/kmail.nix +++ b/pkgs/applications/kde/kmail.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, kdepimTeam, fetchpatch, + mkDerivation, lib, kdepimTeam, extra-cmake-modules, kdoctools, akonadi-search, kbookmarks, kcalutils, kcmutils, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdelibs4support, kdepim-apps-libs, libkdepim, @@ -26,13 +26,5 @@ mkDerivation { libksieve mailcommon messagelib pim-sieve-editor qtscript qtwebengine ]; propagatedUserEnvPkgs = [ kdepim-runtime kwallet ]; - patches = [ - ./kmail.patch - - # This patch should be backported in 19.04.4 KDE applications - (fetchpatch { - url = "https://cgit.kde.org/kmail.git/patch/?id=28a8cf907b3cd903aef0b963314df219afc6b66a"; - sha256 = "1gr94zmxnyhhyqjhcmm8aykvmf15pmn751cvdh4ll59rzbra8h0n"; - }) - ]; + patches = [ ./kmail.patch ]; } |