kdePackages: nixfmt (NixOS#343189)

tjni · Sep 20, 2024 · e433609 · e433609
2 parents 6ad09ef + a78ad9a
commit e433609
Show file tree

Hide file tree

Showing 397 changed files with 1,857 additions and 1,253 deletions.
diff --git a/maintainers/scripts/kde/generate-sources.py b/maintainers/scripts/kde/generate-sources.py
@@ -16,7 +16,7 @@
 
 
 LEAF_TEMPLATE = jinja2.Template('''
-{mkKdeDerivation}:
+{ mkKdeDerivation }:
 mkKdeDerivation {
   pname = "{{ pname }}";
 }
@@ -25,7 +25,7 @@
 ROOT_TEMPLATE = jinja2.Template('''
 {callPackage}: {
   {%- for p in packages %}
-  {{ p }} = callPackage ./{{ p }} {};
+  {{ p }} = callPackage ./{{ p }} { };
   {%- endfor %}
 }
 '''.strip());

diff --git a/pkgs/kde/default.nix b/pkgs/kde/default.nix
@@ -11,78 +11,89 @@
   wayland-protocols,
   wayland,
   zxing-cpp,
-}: let
-  allPackages = self: let
-    frameworks = import ./frameworks {inherit (self) callPackage;};
-    gear = import ./gear {inherit (self) callPackage;};
-    plasma = import ./plasma {inherit (self) callPackage;};
+}:
+let
+  allPackages =
+    self:
+    let
+      frameworks = import ./frameworks { inherit (self) callPackage; };
+      gear = import ./gear { inherit (self) callPackage; };
+      plasma = import ./plasma { inherit (self) callPackage; };
 
-    sets = ["gear" "frameworks" "plasma"];
+      sets = [
+        "gear"
+        "frameworks"
+        "plasma"
+      ];
 
-    loadUrls = set: lib.importJSON (./generated/sources + "/${set}.json");
-    allUrls = lib.attrsets.mergeAttrsList (map loadUrls sets);
+      loadUrls = set: lib.importJSON (./generated/sources + "/${set}.json");
+      allUrls = lib.attrsets.mergeAttrsList (map loadUrls sets);
 
-    sources = lib.mapAttrs (_: v:
-      (fetchurl {
-        inherit (v) url hash;
-      })
-      // {inherit (v) version;})
-    allUrls;
-  in (
-    qt6Packages
-    // frameworks
-    // gear
-    // plasma
-    // {
-      inherit sources;
+      sources = lib.mapAttrs (
+        _: v:
+        (fetchurl {
+          inherit (v) url hash;
+        })
+        // {
+          inherit (v) version;
+        }
+      ) allUrls;
+    in
+    (
+      qt6Packages
+      // frameworks
+      // gear
+      // plasma
+      // {
+        inherit sources;
 
-      mkKdeDerivation = self.callPackage (import ./lib/mk-kde-derivation.nix self) {};
+        mkKdeDerivation = self.callPackage (import ./lib/mk-kde-derivation.nix self) { };
 
-      # THIRD PARTY
-      inherit
-        cmark
-        gpgme
-        taglib
-        wayland
-        wayland-protocols
-        zxing-cpp
-        ;
+        # THIRD PARTY
+        inherit
+          cmark
+          gpgme
+          taglib
+          wayland
+          wayland-protocols
+          zxing-cpp
+          ;
 
-      # Alias to match metadata
-      kquickimageeditor = self.kquickimageedit;
+        # Alias to match metadata
+        kquickimageeditor = self.kquickimageedit;
 
-      # Alias because it's just data
-      plasma-wayland-protocols = libsForQt5.plasma-wayland-protocols;
+        # Alias because it's just data
+        plasma-wayland-protocols = libsForQt5.plasma-wayland-protocols;
 
-      selenium-webdriver-at-spi = null; # Used for integration tests that we don't run, stub
+        selenium-webdriver-at-spi = null; # Used for integration tests that we don't run, stub
 
-      alpaka = self.callPackage ./misc/alpaka {};
-      kdiagram = self.callPackage ./misc/kdiagram {};
-      kdevelop-pg-qt = self.callPackage ./misc/kdevelop-pg-qt {};
-      kdsoap-ws-discovery-client = self.callPackage ./misc/kdsoap-ws-discovery-client {};
-      kirigami-addons = self.callPackage ./misc/kirigami-addons {};
-      kio-extras-kf5 = self.callPackage ./misc/kio-extras-kf5 {};
-      kio-fuse = self.callPackage ./misc/kio-fuse {};
-      klevernotes = self.callPackage ./misc/klevernotes {};
-      ktextaddons = self.callPackage ./misc/ktextaddons {};
-      kunifiedpush = self.callPackage ./misc/kunifiedpush {};
-      kup = self.callPackage ./misc/kup {};
-      marknote = self.callPackage ./misc/marknote {};
-      mpvqt = self.callPackage ./misc/mpvqt {};
-      oxygen-icons = self.callPackage ./misc/oxygen-icons {};
-      phonon = self.callPackage ./misc/phonon {};
-      phonon-vlc = self.callPackage ./misc/phonon-vlc {};
-      polkit-qt-1 = self.callPackage ./misc/polkit-qt-1 {};
-      pulseaudio-qt = self.callPackage ./misc/pulseaudio-qt {};
+        alpaka = self.callPackage ./misc/alpaka { };
+        kdiagram = self.callPackage ./misc/kdiagram { };
+        kdevelop-pg-qt = self.callPackage ./misc/kdevelop-pg-qt { };
+        kdsoap-ws-discovery-client = self.callPackage ./misc/kdsoap-ws-discovery-client { };
+        kirigami-addons = self.callPackage ./misc/kirigami-addons { };
+        kio-extras-kf5 = self.callPackage ./misc/kio-extras-kf5 { };
+        kio-fuse = self.callPackage ./misc/kio-fuse { };
+        klevernotes = self.callPackage ./misc/klevernotes { };
+        ktextaddons = self.callPackage ./misc/ktextaddons { };
+        kunifiedpush = self.callPackage ./misc/kunifiedpush { };
+        kup = self.callPackage ./misc/kup { };
+        marknote = self.callPackage ./misc/marknote { };
+        mpvqt = self.callPackage ./misc/mpvqt { };
+        oxygen-icons = self.callPackage ./misc/oxygen-icons { };
+        phonon = self.callPackage ./misc/phonon { };
+        phonon-vlc = self.callPackage ./misc/phonon-vlc { };
+        polkit-qt-1 = self.callPackage ./misc/polkit-qt-1 { };
+        pulseaudio-qt = self.callPackage ./misc/pulseaudio-qt { };
 
-      applet-window-buttons6 = self.callPackage ./third-party/applet-window-buttons6 {};
-      karousel = self.callPackage ./third-party/karousel {};
-      krohnkite = self.callPackage ./third-party/krohnkite {};
-      kzones = self.callPackage ./third-party/kzones {};
-    }
-  );
+        applet-window-buttons6 = self.callPackage ./third-party/applet-window-buttons6 { };
+        karousel = self.callPackage ./third-party/karousel { };
+        krohnkite = self.callPackage ./third-party/krohnkite { };
+        kzones = self.callPackage ./third-party/kzones { };
+      }
+    );
 in
-  makeScopeWithSplicing' {
-    otherSplices = generateSplicesForMkScope "kdePackages";
-    f = allPackages;
-  }
+makeScopeWithSplicing' {
+  otherSplices = generateSplicesForMkScope "kdePackages";
+  f = allPackages;
+}
diff --git a/pkgs/kde/frameworks/attica/default.nix b/pkgs/kde/frameworks/attica/default.nix
@@ -1,4 +1,4 @@
-{mkKdeDerivation}:
+{ mkKdeDerivation }:
 mkKdeDerivation {
   pname = "attica";
 }
diff --git a/pkgs/kde/frameworks/baloo/default.nix b/pkgs/kde/frameworks/baloo/default.nix
@@ -11,5 +11,8 @@ mkKdeDerivation {
     substituteInPlace src/file/kde-baloo.service.in --replace-fail @KDE_INSTALL_FULL_BINDIR@/kde-systemd-start-condition /run/current-system/sw/bin/kde-systemd-start-condition
   '';
 
-  extraBuildInputs = [qtdeclarative lmdb];
+  extraBuildInputs = [
+    qtdeclarative
+    lmdb
+  ];
 }
diff --git a/pkgs/kde/frameworks/bluez-qt/default.nix b/pkgs/kde/frameworks/bluez-qt/default.nix
@@ -5,5 +5,5 @@
 mkKdeDerivation {
   pname = "bluez-qt";
 
-  extraBuildInputs = [qtdeclarative];
+  extraBuildInputs = [ qtdeclarative ];
 }
diff --git a/pkgs/kde/frameworks/breeze-icons/default.nix b/pkgs/kde/frameworks/breeze-icons/default.nix
@@ -7,7 +7,7 @@ mkKdeDerivation {
   pname = "breeze-icons";
 
   extraNativeBuildInputs = [
-    (python3.withPackages (ps: [ps.lxml]))
+    (python3.withPackages (ps: [ ps.lxml ]))
     libxml2
   ];
 

diff --git a/pkgs/kde/frameworks/default.nix b/pkgs/kde/frameworks/default.nix
@@ -1,74 +1,75 @@
-{callPackage}: {
-  attica = callPackage ./attica {};
-  baloo = callPackage ./baloo {};
-  bluez-qt = callPackage ./bluez-qt {};
-  breeze-icons = callPackage ./breeze-icons {};
-  extra-cmake-modules = callPackage ./extra-cmake-modules {};
-  frameworkintegration = callPackage ./frameworkintegration {};
-  kapidox = callPackage ./kapidox {};
-  karchive = callPackage ./karchive {};
-  kauth = callPackage ./kauth {};
-  kbookmarks = callPackage ./kbookmarks {};
-  kcalendarcore = callPackage ./kcalendarcore {};
-  kcmutils = callPackage ./kcmutils {};
-  kcodecs = callPackage ./kcodecs {};
-  kcolorscheme = callPackage ./kcolorscheme {};
-  kcompletion = callPackage ./kcompletion {};
-  kconfig = callPackage ./kconfig {};
-  kconfigwidgets = callPackage ./kconfigwidgets {};
-  kcontacts = callPackage ./kcontacts {};
-  kcoreaddons = callPackage ./kcoreaddons {};
-  kcrash = callPackage ./kcrash {};
-  kdav = callPackage ./kdav {};
-  kdbusaddons = callPackage ./kdbusaddons {};
-  kdeclarative = callPackage ./kdeclarative {};
-  kded = callPackage ./kded {};
-  kdesu = callPackage ./kdesu {};
-  kdnssd = callPackage ./kdnssd {};
-  kdoctools = callPackage ./kdoctools {};
-  kfilemetadata = callPackage ./kfilemetadata {};
-  kglobalaccel = callPackage ./kglobalaccel {};
-  kguiaddons = callPackage ./kguiaddons {};
-  kholidays = callPackage ./kholidays {};
-  ki18n = callPackage ./ki18n {};
-  kiconthemes = callPackage ./kiconthemes {};
-  kidletime = callPackage ./kidletime {};
-  kimageformats = callPackage ./kimageformats {};
-  kio = callPackage ./kio {};
-  kirigami = callPackage ./kirigami {};
-  kitemmodels = callPackage ./kitemmodels {};
-  kitemviews = callPackage ./kitemviews {};
-  kjobwidgets = callPackage ./kjobwidgets {};
-  knewstuff = callPackage ./knewstuff {};
-  knotifications = callPackage ./knotifications {};
-  knotifyconfig = callPackage ./knotifyconfig {};
-  kpackage = callPackage ./kpackage {};
-  kparts = callPackage ./kparts {};
-  kpeople = callPackage ./kpeople {};
-  kplotting = callPackage ./kplotting {};
-  kpty = callPackage ./kpty {};
-  kquickcharts = callPackage ./kquickcharts {};
-  krunner = callPackage ./krunner {};
-  kservice = callPackage ./kservice {};
-  kstatusnotifieritem = callPackage ./kstatusnotifieritem {};
-  ksvg = callPackage ./ksvg {};
-  ktexteditor = callPackage ./ktexteditor {};
-  ktexttemplate = callPackage ./ktexttemplate {};
-  ktextwidgets = callPackage ./ktextwidgets {};
-  kunitconversion = callPackage ./kunitconversion {};
-  kuserfeedback = callPackage ./kuserfeedback {};
-  kwallet = callPackage ./kwallet {};
-  kwidgetsaddons = callPackage ./kwidgetsaddons {};
-  kwindowsystem = callPackage ./kwindowsystem {};
-  kxmlgui = callPackage ./kxmlgui {};
-  modemmanager-qt = callPackage ./modemmanager-qt {};
-  networkmanager-qt = callPackage ./networkmanager-qt {};
-  prison = callPackage ./prison {};
-  purpose = callPackage ./purpose {};
-  qqc2-desktop-style = callPackage ./qqc2-desktop-style {};
-  solid = callPackage ./solid {};
-  sonnet = callPackage ./sonnet {};
-  syndication = callPackage ./syndication {};
-  syntax-highlighting = callPackage ./syntax-highlighting {};
-  threadweaver = callPackage ./threadweaver {};
+{ callPackage }:
+{
+  attica = callPackage ./attica { };
+  baloo = callPackage ./baloo { };
+  bluez-qt = callPackage ./bluez-qt { };
+  breeze-icons = callPackage ./breeze-icons { };
+  extra-cmake-modules = callPackage ./extra-cmake-modules { };
+  frameworkintegration = callPackage ./frameworkintegration { };
+  kapidox = callPackage ./kapidox { };
+  karchive = callPackage ./karchive { };
+  kauth = callPackage ./kauth { };
+  kbookmarks = callPackage ./kbookmarks { };
+  kcalendarcore = callPackage ./kcalendarcore { };
+  kcmutils = callPackage ./kcmutils { };
+  kcodecs = callPackage ./kcodecs { };
+  kcolorscheme = callPackage ./kcolorscheme { };
+  kcompletion = callPackage ./kcompletion { };
+  kconfig = callPackage ./kconfig { };
+  kconfigwidgets = callPackage ./kconfigwidgets { };
+  kcontacts = callPackage ./kcontacts { };
+  kcoreaddons = callPackage ./kcoreaddons { };
+  kcrash = callPackage ./kcrash { };
+  kdav = callPackage ./kdav { };
+  kdbusaddons = callPackage ./kdbusaddons { };
+  kdeclarative = callPackage ./kdeclarative { };
+  kded = callPackage ./kded { };
+  kdesu = callPackage ./kdesu { };
+  kdnssd = callPackage ./kdnssd { };
+  kdoctools = callPackage ./kdoctools { };
+  kfilemetadata = callPackage ./kfilemetadata { };
+  kglobalaccel = callPackage ./kglobalaccel { };
+  kguiaddons = callPackage ./kguiaddons { };
+  kholidays = callPackage ./kholidays { };
+  ki18n = callPackage ./ki18n { };
+  kiconthemes = callPackage ./kiconthemes { };
+  kidletime = callPackage ./kidletime { };
+  kimageformats = callPackage ./kimageformats { };
+  kio = callPackage ./kio { };
+  kirigami = callPackage ./kirigami { };
+  kitemmodels = callPackage ./kitemmodels { };
+  kitemviews = callPackage ./kitemviews { };
+  kjobwidgets = callPackage ./kjobwidgets { };
+  knewstuff = callPackage ./knewstuff { };
+  knotifications = callPackage ./knotifications { };
+  knotifyconfig = callPackage ./knotifyconfig { };
+  kpackage = callPackage ./kpackage { };
+  kparts = callPackage ./kparts { };
+  kpeople = callPackage ./kpeople { };
+  kplotting = callPackage ./kplotting { };
+  kpty = callPackage ./kpty { };
+  kquickcharts = callPackage ./kquickcharts { };
+  krunner = callPackage ./krunner { };
+  kservice = callPackage ./kservice { };
+  kstatusnotifieritem = callPackage ./kstatusnotifieritem { };
+  ksvg = callPackage ./ksvg { };
+  ktexteditor = callPackage ./ktexteditor { };
+  ktexttemplate = callPackage ./ktexttemplate { };
+  ktextwidgets = callPackage ./ktextwidgets { };
+  kunitconversion = callPackage ./kunitconversion { };
+  kuserfeedback = callPackage ./kuserfeedback { };
+  kwallet = callPackage ./kwallet { };
+  kwidgetsaddons = callPackage ./kwidgetsaddons { };
+  kwindowsystem = callPackage ./kwindowsystem { };
+  kxmlgui = callPackage ./kxmlgui { };
+  modemmanager-qt = callPackage ./modemmanager-qt { };
+  networkmanager-qt = callPackage ./networkmanager-qt { };
+  prison = callPackage ./prison { };
+  purpose = callPackage ./purpose { };
+  qqc2-desktop-style = callPackage ./qqc2-desktop-style { };
+  solid = callPackage ./solid { };
+  sonnet = callPackage ./sonnet { };
+  syndication = callPackage ./syndication { };
+  syntax-highlighting = callPackage ./syntax-highlighting { };
+  threadweaver = callPackage ./threadweaver { };
 }
diff --git a/pkgs/kde/frameworks/extra-cmake-modules/default.nix b/pkgs/kde/frameworks/extra-cmake-modules/default.nix
@@ -1,5 +1,6 @@
-{ mkKdeDerivation
-, python3
+{
+  mkKdeDerivation,
+  python3,
 }:
 mkKdeDerivation {
   pname = "extra-cmake-modules";

diff --git a/pkgs/kde/frameworks/frameworkintegration/default.nix b/pkgs/kde/frameworks/frameworkintegration/default.nix
@@ -6,6 +6,6 @@
 mkKdeDerivation {
   pname = "frameworkintegration";
 
-  extraNativeBuildInputs = [pkg-config];
-  extraBuildInputs = [packagekit-qt];
+  extraNativeBuildInputs = [ pkg-config ];
+  extraBuildInputs = [ packagekit-qt ];
 }
diff --git a/pkgs/kde/frameworks/kapidox/default.nix b/pkgs/kde/frameworks/kapidox/default.nix
@@ -1,4 +1,4 @@
-{mkKdeDerivation}:
+{ mkKdeDerivation }:
 mkKdeDerivation {
   pname = "kapidox";
 }
diff --git a/pkgs/kde/frameworks/karchive/default.nix b/pkgs/kde/frameworks/karchive/default.nix
@@ -7,6 +7,9 @@
 mkKdeDerivation {
   pname = "karchive";
 
-  extraNativeBuildInputs = [qttools pkg-config];
-  extraBuildInputs = [xz];
+  extraNativeBuildInputs = [
+    qttools
+    pkg-config
+  ];
+  extraBuildInputs = [ xz ];
 }
diff --git a/pkgs/kde/frameworks/kauth/default.nix b/pkgs/kde/frameworks/kauth/default.nix
@@ -7,7 +7,7 @@ mkKdeDerivation {
 
   # Late resolve paths so things end up in their own prefix
   # FIXME(later): discuss with upstream
-  patches = [./fix-paths.patch];
+  patches = [ ./fix-paths.patch ];
 
-  extraNativeBuildInputs = [qttools];
+  extraNativeBuildInputs = [ qttools ];
 }