treewide: convert patch series files to Nix expressions

Nix expressions provide all the features that Quilt series files have,
so using those instead is pointless. Also, lib.readPathsFromFile
(the function used to read series files) has the following warning:

> NOTE: This function is not performant and should be avoided.

This also removes some orphaned series files, and unused references to
copyPathsToStore (which were probably missed in previous commits
where calls to lib.readPathsFromFile were removed)

V 79921889 c25a7cd8

+63 -54
+1 -1
pkgs/applications/kde/akonadi/default.nix
··· 1 { 2 - mkDerivation, copyPathsToStore, lib, kdepimTeam, 3 extra-cmake-modules, shared-mime-info, 4 boost, kcompletion, kconfigwidgets, kcrash, kdbusaddons, kdesignerplugin, 5 ki18n, kiconthemes, kio, kitemmodels, kwindowsystem, mysql, qttools,
··· 1 { 2 + mkDerivation, lib, kdepimTeam, 3 extra-cmake-modules, shared-mime-info, 4 boost, kcompletion, kconfigwidgets, kcrash, kdbusaddons, kdesignerplugin, 5 ki18n, kiconthemes, kio, kitemmodels, kwindowsystem, mysql, qttools,
+1 -1
pkgs/applications/kde/grantleetheme/default.nix
··· 1 { 2 - mkDerivation, copyPathsToStore, lib, kdepimTeam, 3 extra-cmake-modules, kdoctools, 4 grantlee, ki18n, kiconthemes, knewstuff, kservice, kxmlgui, qtbase, 5 }:
··· 1 { 2 + mkDerivation, lib, kdepimTeam, 3 extra-cmake-modules, kdoctools, 4 grantlee, ki18n, kiconthemes, knewstuff, kservice, kxmlgui, qtbase, 5 }:
+1 -1
pkgs/applications/kde/kdepim-apps-libs/default.nix
··· 1 { 2 - mkDerivation, copyPathsToStore, lib, kdepimTeam, 3 extra-cmake-modules, kdoctools, 4 akonadi, akonadi-contacts, grantlee, grantleetheme, kconfig, kconfigwidgets, 5 kcontacts, ki18n, kiconthemes, kio, libkleo, pimcommon, prison,
··· 1 { 2 + mkDerivation, lib, kdepimTeam, 3 extra-cmake-modules, kdoctools, 4 akonadi, akonadi-contacts, grantlee, grantleetheme, kconfig, kconfigwidgets, 5 kcontacts, ki18n, kiconthemes, kio, libkleo, pimcommon, prison,
+1 -1
pkgs/applications/kde/kdepim-runtime/default.nix
··· 1 { 2 - mkDerivation, copyPathsToStore, lib, kdepimTeam, 3 extra-cmake-modules, kdoctools, 4 shared-mime-info, 5 akonadi, akonadi-calendar, akonadi-contacts, akonadi-mime, akonadi-notes,
··· 1 { 2 + mkDerivation, lib, kdepimTeam, 3 extra-cmake-modules, kdoctools, 4 shared-mime-info, 5 akonadi, akonadi-calendar, akonadi-contacts, akonadi-mime, akonadi-notes,
+3 -2
pkgs/desktops/plasma-5/breeze-plymouth/default.nix
··· 1 { 2 mkDerivation, 3 lib, 4 - copyPathsToStore, 5 extra-cmake-modules, 6 plymouth, 7 nixos-icons, ··· 28 name = "breeze-plymouth"; 29 nativeBuildInputs = [ extra-cmake-modules ] ++ lib.optionals (logoFile != null) [ imagemagick netpbm perl ]; 30 buildInputs = [ plymouth ]; 31 - patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); 32 cmakeFlags = [] 33 ++ lib.optional (osName != null) "-DDISTRO_NAME=${osName}" 34 ++ lib.optional (osVersion != null) "-DDISTRO_VERSION=${osVersion}"
··· 1 { 2 mkDerivation, 3 lib, 4 extra-cmake-modules, 5 plymouth, 6 nixos-icons, ··· 27 name = "breeze-plymouth"; 28 nativeBuildInputs = [ extra-cmake-modules ] ++ lib.optionals (logoFile != null) [ imagemagick netpbm perl ]; 29 buildInputs = [ plymouth ]; 30 + patches = [ 31 + ./install-paths.patch 32 + ]; 33 cmakeFlags = [] 34 ++ lib.optional (osName != null) "-DDISTRO_NAME=${osName}" 35 ++ lib.optional (osVersion != null) "-DDISTRO_VERSION=${osVersion}"
-1
pkgs/desktops/plasma-5/breeze-plymouth/series
··· 1 - install-paths.patch
···
+1 -1
pkgs/desktops/plasma-5/kwin/default.nix
··· 1 { 2 - mkDerivation, lib, copyPathsToStore, 3 extra-cmake-modules, kdoctools, 4 5 epoxy,libICE, libSM, libinput, libxkbcommon, udev, wayland, xcb-util-cursor,
··· 1 { 2 + mkDerivation, lib, 3 extra-cmake-modules, kdoctools, 4 5 epoxy,libICE, libSM, libinput, libxkbcommon, udev, wayland, xcb-util-cursor,
+4 -2
pkgs/desktops/plasma-5/libkscreen/default.nix
··· 1 { 2 - mkDerivation, lib, copyPathsToStore, propagate, 3 extra-cmake-modules, 4 kwayland, libXrandr, qtbase, qtx11extras 5 }: ··· 12 nativeBuildInputs = [ extra-cmake-modules ]; 13 buildInputs = [ kwayland libXrandr qtx11extras ]; 14 outputs = [ "out" "dev" ]; 15 - patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); 16 preConfigure = '' 17 NIX_CFLAGS_COMPILE+=" -DNIXPKGS_LIBKSCREEN_BACKENDS=\"''${!outputBin}/$qtPluginPrefix/kf5/kscreen\"" 18 '';
··· 1 { 2 + mkDerivation, lib, propagate, 3 extra-cmake-modules, 4 kwayland, libXrandr, qtbase, qtx11extras 5 }: ··· 12 nativeBuildInputs = [ extra-cmake-modules ]; 13 buildInputs = [ kwayland libXrandr qtx11extras ]; 14 outputs = [ "out" "dev" ]; 15 + patches = [ 16 + ./libkscreen-backends-path.patch 17 + ]; 18 preConfigure = '' 19 NIX_CFLAGS_COMPILE+=" -DNIXPKGS_LIBKSCREEN_BACKENDS=\"''${!outputBin}/$qtPluginPrefix/kf5/kscreen\"" 20 '';
-1
pkgs/desktops/plasma-5/libkscreen/series
··· 1 - libkscreen-backends-path.patch
···
+5 -2
pkgs/desktops/plasma-5/plasma-desktop/default.nix
··· 1 { 2 - mkDerivation, lib, copyPathsToStore, 3 extra-cmake-modules, kdoctools, 4 5 boost, fontconfig, ibus, libXcursor, libXft, libcanberra_kde, libpulseaudio, ··· 30 ksysguard kwallet kwin plasma-framework plasma-workspace qqc2-desktop-style 31 ]; 32 33 - patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); 34 postPatch = '' 35 sed '1i#include <cmath>' -i kcms/touchpad/src/backends/x11/synapticstouchpad.cpp 36 '';
··· 1 { 2 + mkDerivation, lib, 3 extra-cmake-modules, kdoctools, 4 5 boost, fontconfig, ibus, libXcursor, libXft, libcanberra_kde, libpulseaudio, ··· 30 ksysguard kwallet kwin plasma-framework plasma-workspace qqc2-desktop-style 31 ]; 32 33 + patches = [ 34 + ./hwclock-path.patch 35 + ./tzdir.patch 36 + ]; 37 postPatch = '' 38 sed '1i#include <cmath>' -i kcms/touchpad/src/backends/x11/synapticstouchpad.cpp 39 '';
-2
pkgs/desktops/plasma-5/plasma-desktop/series
··· 1 - hwclock-path.patch 2 - tzdir.patch
···
+5 -2
pkgs/development/libraries/grantlee/5/default.nix
··· 1 - { mkDerivation, lib, copyPathsToStore, fetchurl, qtbase, qtscript, cmake }: 2 3 mkDerivation rec { 4 pname = "grantlee"; ··· 14 buildInputs = [ qtbase qtscript ]; 15 nativeBuildInputs = [ cmake ]; 16 17 - patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); 18 19 outputs = [ "out" "dev" ]; 20 postFixup =
··· 1 + { mkDerivation, lib, fetchurl, qtbase, qtscript, cmake }: 2 3 mkDerivation rec { 4 pname = "grantlee"; ··· 14 buildInputs = [ qtbase qtscript ]; 15 nativeBuildInputs = [ cmake ]; 16 17 + patches = [ 18 + ./grantlee-nix-profiles.patch 19 + ./grantlee-no-canonicalize-filepath.patch 20 + ]; 21 22 outputs = [ "out" "dev" ]; 23 postFixup =
-2
pkgs/development/libraries/grantlee/5/series
··· 1 - grantlee-nix-profiles.patch 2 - grantlee-no-canonicalize-filepath.patch
···
+4 -2
pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix
··· 1 - { mkDerivation, lib, copyPathsToStore, cmake, pkgconfig }: 2 3 mkDerivation { 4 name = "extra-cmake-modules"; 5 6 - patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); 7 8 outputs = [ "out" ]; # this package has no runtime components 9
··· 1 + { mkDerivation, lib, cmake, pkgconfig }: 2 3 mkDerivation { 4 name = "extra-cmake-modules"; 5 6 + patches = [ 7 + ./nix-lib-path.patch 8 + ]; 9 10 outputs = [ "out" ]; # this package has no runtime components 11
-1
pkgs/development/libraries/kde-frameworks/extra-cmake-modules/series
··· 1 - nix-lib-path.patch
···
+4 -2
pkgs/development/libraries/kde-frameworks/kauth/default.nix
··· 1 { 2 - mkDerivation, lib, copyPathsToStore, propagate, 3 extra-cmake-modules, kcoreaddons, polkit-qt, qttools 4 }: 5 ··· 9 nativeBuildInputs = [ extra-cmake-modules ]; 10 buildInputs = [ polkit-qt qttools ]; 11 propagatedBuildInputs = [ kcoreaddons ]; 12 - patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); 13 # library stores reference to plugin path, 14 # separating $out from $bin would create a reference cycle 15 outputs = [ "out" "dev" ];
··· 1 { 2 + mkDerivation, lib, propagate, 3 extra-cmake-modules, kcoreaddons, polkit-qt, qttools 4 }: 5 ··· 9 nativeBuildInputs = [ extra-cmake-modules ]; 10 buildInputs = [ polkit-qt qttools ]; 11 propagatedBuildInputs = [ kcoreaddons ]; 12 + patches = [ 13 + ./cmake-install-paths.patch 14 + ]; 15 # library stores reference to plugin path, 16 # separating $out from $bin would create a reference cycle 17 outputs = [ "out" "dev" ];
-1
pkgs/development/libraries/kde-frameworks/kauth/series
··· 1 - cmake-install-paths.patch
···
+1 -1
pkgs/development/libraries/kde-frameworks/kcmutils/default.nix
··· 1 { 2 - mkDerivation, lib, copyPathsToStore, 3 extra-cmake-modules, 4 kconfigwidgets, kcoreaddons, kdeclarative, ki18n, kiconthemes, kitemviews, 5 kpackage, kservice, kxmlgui, qtdeclarative,
··· 1 { 2 + mkDerivation, lib, 3 extra-cmake-modules, 4 kconfigwidgets, kcoreaddons, kdeclarative, ki18n, kiconthemes, kitemviews, 5 kpackage, kservice, kxmlgui, qtdeclarative,
+4 -2
pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix
··· 1 { 2 - mkDerivation, lib, copyPathsToStore, 3 docbook_xml_dtd_45, extra-cmake-modules, kdoctools, 4 kauth, karchive, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kcrash, 5 kdbusaddons, kded, kdesignerplugin, kemoticons, kglobalaccel, kguiaddons, ··· 11 mkDerivation { 12 name = "kdelibs4support"; 13 meta = { maintainers = [ lib.maintainers.ttuegel ]; }; 14 - patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); 15 setupHook = ./setup-hook.sh; 16 nativeBuildInputs = [ extra-cmake-modules qttools ]; 17 propagatedNativeBuildInputs = [ kdoctools ];
··· 1 { 2 + mkDerivation, lib, 3 docbook_xml_dtd_45, extra-cmake-modules, kdoctools, 4 kauth, karchive, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kcrash, 5 kdbusaddons, kded, kdesignerplugin, kemoticons, kglobalaccel, kguiaddons, ··· 11 mkDerivation { 12 name = "kdelibs4support"; 13 meta = { maintainers = [ lib.maintainers.ttuegel ]; }; 14 + patches = [ 15 + ./nix-kde-include-dir.patch 16 + ]; 17 setupHook = ./setup-hook.sh; 18 nativeBuildInputs = [ extra-cmake-modules qttools ]; 19 propagatedNativeBuildInputs = [ kdoctools ];
-1
pkgs/development/libraries/kde-frameworks/kdelibs4support/series
··· 1 - nix-kde-include-dir.patch
···
+4 -2
pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix
··· 1 { 2 - mkDerivation, lib, copyPathsToStore, 3 extra-cmake-modules, 4 attr, ebook_tools, exiv2, ffmpeg_3, karchive, kcoreaddons, ki18n, poppler, qtbase, qtmultimedia, taglib 5 }: ··· 12 attr ebook_tools exiv2 ffmpeg_3 karchive kcoreaddons ki18n poppler qtbase qtmultimedia 13 taglib 14 ]; 15 - patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); 16 }
··· 1 { 2 + mkDerivation, lib, 3 extra-cmake-modules, 4 attr, ebook_tools, exiv2, ffmpeg_3, karchive, kcoreaddons, ki18n, poppler, qtbase, qtmultimedia, taglib 5 }: ··· 12 attr ebook_tools exiv2 ffmpeg_3 karchive kcoreaddons ki18n poppler qtbase qtmultimedia 13 taglib 14 ]; 15 + patches = [ 16 + ./cmake-install-paths.patch 17 + ]; 18 }
-1
pkgs/development/libraries/kde-frameworks/kfilemetadata/series
··· 1 - cmake-install-paths.patch
···
+4 -2
pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix
··· 1 { 2 - mkDerivation, lib, copyPathsToStore, 3 extra-cmake-modules, 4 breeze-icons, karchive, kcoreaddons, kconfigwidgets, ki18n, kitemviews, 5 qtbase, qtsvg, qttools, ··· 8 mkDerivation { 9 name = "kiconthemes"; 10 meta = { maintainers = [ lib.maintainers.ttuegel ]; }; 11 - patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); 12 nativeBuildInputs = [ extra-cmake-modules ]; 13 buildInputs = [ 14 breeze-icons karchive kcoreaddons kconfigwidgets ki18n kitemviews
··· 1 { 2 + mkDerivation, lib, 3 extra-cmake-modules, 4 breeze-icons, karchive, kcoreaddons, kconfigwidgets, ki18n, kitemviews, 5 qtbase, qtsvg, qttools, ··· 8 mkDerivation { 9 name = "kiconthemes"; 10 meta = { maintainers = [ lib.maintainers.ttuegel ]; }; 11 + patches = [ 12 + ./default-theme-breeze.patch 13 + ]; 14 nativeBuildInputs = [ extra-cmake-modules ]; 15 buildInputs = [ 16 breeze-icons karchive kcoreaddons kconfigwidgets ki18n kitemviews
-1
pkgs/development/libraries/kde-frameworks/kiconthemes/series
··· 1 - default-theme-breeze.patch
···
+1 -1
pkgs/development/libraries/kde-frameworks/kinit/default.nix
··· 1 { 2 - mkDerivation, lib, copyPathsToStore, writeScript, 3 extra-cmake-modules, kdoctools, 4 kconfig, kcrash, ki18n, kio, kparts, kservice, kwindowsystem, plasma-framework 5 }:
··· 1 { 2 + mkDerivation, lib, writeScript, 3 extra-cmake-modules, kdoctools, 4 kconfig, kcrash, ki18n, kio, kparts, kservice, kwindowsystem, plasma-framework 5 }:
-3
pkgs/development/libraries/kde-frameworks/kinit/series
··· 1 - kinit-libpath.patch 2 - start_kdeinit-path.patch 3 - kdeinit-extra_libs.patch
···
+5 -2
pkgs/development/libraries/kde-frameworks/kio/default.nix
··· 1 { 2 - mkDerivation, lib, copyPathsToStore, 3 extra-cmake-modules, kdoctools, qttools, 4 karchive, kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons, 5 kdbusaddons, ki18n, kiconthemes, kitemviews, kjobwidgets, knotifications, ··· 21 kxmlgui qtbase qttools solid 22 ]; 23 outputs = [ "out" "dev" ]; 24 - patches = (copyPathsToStore (lib.readPathsFromFile ./. ./series)); 25 }
··· 1 { 2 + mkDerivation, lib, 3 extra-cmake-modules, kdoctools, qttools, 4 karchive, kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons, 5 kdbusaddons, ki18n, kiconthemes, kitemviews, kjobwidgets, knotifications, ··· 21 kxmlgui qtbase qttools solid 22 ]; 23 outputs = [ "out" "dev" ]; 24 + patches = [ 25 + ./samba-search-path.patch 26 + ./kio-debug-module-loader.patch 27 + ]; 28 }
-2
pkgs/development/libraries/kde-frameworks/kio/series
··· 1 - samba-search-path.patch 2 - kio-debug-module-loader.patch
···
+5 -2
pkgs/development/libraries/kde-frameworks/kpackage/default.nix
··· 1 { 2 - mkDerivation, lib, copyPathsToStore, 3 extra-cmake-modules, kdoctools, 4 karchive, kconfig, kcoreaddons, ki18n, qtbase, 5 }: ··· 9 meta = { maintainers = [ lib.maintainers.ttuegel ]; }; 10 nativeBuildInputs = [ extra-cmake-modules kdoctools ]; 11 buildInputs = [ karchive kconfig kcoreaddons ki18n qtbase ]; 12 - patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); 13 }
··· 1 { 2 + mkDerivation, lib, 3 extra-cmake-modules, kdoctools, 4 karchive, kconfig, kcoreaddons, ki18n, qtbase, 5 }: ··· 9 meta = { maintainers = [ lib.maintainers.ttuegel ]; }; 10 nativeBuildInputs = [ extra-cmake-modules kdoctools ]; 11 buildInputs = [ karchive kconfig kcoreaddons ki18n qtbase ]; 12 + patches = [ 13 + ./allow-external-paths.patch 14 + ./qdiriterator-follow-symlinks.patch 15 + ]; 16 }
-2
pkgs/development/libraries/kde-frameworks/kpackage/series
··· 1 - allow-external-paths.patch 2 - qdiriterator-follow-symlinks.patch
···
+5 -2
pkgs/development/libraries/kde-frameworks/kservice/default.nix
··· 1 { 2 - mkDerivation, lib, copyPathsToStore, 3 bison, extra-cmake-modules, flex, 4 kconfig, kcoreaddons, kcrash, kdbusaddons, kdoctools, ki18n, kwindowsystem, 5 qtbase, shared-mime-info, ··· 15 ]; 16 propagatedBuildInputs = [ kconfig kcoreaddons ]; 17 propagatedUserEnvPkgs = [ shared-mime-info ]; # for kbuildsycoca5 18 - patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); 19 }
··· 1 { 2 + mkDerivation, lib, 3 bison, extra-cmake-modules, flex, 4 kconfig, kcoreaddons, kcrash, kdbusaddons, kdoctools, ki18n, kwindowsystem, 5 qtbase, shared-mime-info, ··· 15 ]; 16 propagatedBuildInputs = [ kconfig kcoreaddons ]; 17 propagatedUserEnvPkgs = [ shared-mime-info ]; # for kbuildsycoca5 18 + patches = [ 19 + ./qdiriterator-follow-symlinks.patch 20 + ./no-canonicalize-path.patch 21 + ]; 22 }
-2
pkgs/development/libraries/kde-frameworks/kservice/series
··· 1 - qdiriterator-follow-symlinks.patch 2 - no-canonicalize-path.patch
···
+4 -2
pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix
··· 1 { 2 - mkDerivation, lib, copyPathsToStore, 3 extra-cmake-modules, 4 libpthreadstubs, libXdmcp, 5 qtbase, qttools, qtx11extras ··· 14 nativeBuildInputs = [ extra-cmake-modules ]; 15 buildInputs = [ libpthreadstubs libXdmcp qttools qtx11extras ]; 16 propagatedBuildInputs = [ qtbase ]; 17 - patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); 18 preConfigure = '' 19 NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QT_PLUGIN_PATH=\"''${!outputBin}/$qtPluginPrefix\"" 20 '';
··· 1 { 2 + mkDerivation, lib, 3 extra-cmake-modules, 4 libpthreadstubs, libXdmcp, 5 qtbase, qttools, qtx11extras ··· 14 nativeBuildInputs = [ extra-cmake-modules ]; 15 buildInputs = [ libpthreadstubs libXdmcp qttools qtx11extras ]; 16 propagatedBuildInputs = [ qtbase ]; 17 + patches = [ 18 + ./platform-plugins-path.patch 19 + ]; 20 preConfigure = '' 21 NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QT_PLUGIN_PATH=\"''${!outputBin}/$qtPluginPrefix\"" 22 '';
-1
pkgs/development/libraries/kde-frameworks/kwindowsystem/series
··· 1 - platform-plugins-path.patch
···