treewide: bump to 6.0 RC 1

maintainers/scripts/kde/generate-sources.py

@@ -54,7 +54,7 @@ def to_sri(hash):
         writable=True,
         path_type=pathlib.Path,
     ),
-    default=pathlib.Path(__file__).parent.parent.parent
+    default=pathlib.Path(__file__).parent.parent.parent.parent
 )
 def main(set: str, version: str, nixpkgs: pathlib.Path):
     root_dir = nixpkgs / "pkgs/kde"

nixos/plasma6.nix

@@ -19,10 +19,10 @@ in {
         description = lib.mdDoc "Enable the Plasma 6 (KDE 6) desktop environment.";
       };
 
-      enableQt5Theme = mkOption {
+      enableQt5Integration = mkOption {
         type = types.bool;
         default = true;
-        description = lib.mdDoc "Enable Qt 5 theme integration. Disable for a pure Qt 6 system.";
+        description = lib.mdDoc "Enable Qt 5 integration (theming, etc). Disable for a pure Qt 6 system.";
       };
 
       notoPackage = mkPackageOptionMD pkgs "Noto fonts" {
@@ -154,10 +154,11 @@ in {
     in
       requiredPackages
       ++ utils.removePackagesByName optionalPackages config.environment.plasma6.excludePackages
-      ++ lib.optionals config.services.xserver.desktopManager.plasma6.enableQt5Theme [
+      ++ lib.optionals config.services.xserver.desktopManager.plasma6.enableQt5Integration [
         breeze.qt5
         plasma-integration.qt5
         pkgs.plasma5Packages.kwayland-integration
+        kio-extras-kf5
       ]
       # Optional hardware support features
       ++ lib.optionals config.hardware.bluetooth.enable [bluedevil bluez-qt pkgs.openobex pkgs.obexftp]

pkgs/kde/default.nix

@@ -78,6 +78,7 @@
             hash = "sha256-8FGZmg2ljSh1DYZfklMTrWN7Sdlk/Atw0qfpbb+GaBc=";
           };
         });
+      alpaka = self.callPackage ./misc/alpaka {};
       kdsoap-ws-discovery-client = self.callPackage ./misc/kdsoap-ws-discovery-client {};
       kirigami-addons = self.callPackage ./misc/kirigami-addons {};
       kunifiedpush = self.callPackage ./misc/kunifiedpush {};

pkgs/kde/gear/akonadi-search/default.nix

@@ -7,7 +7,7 @@
   cargo,
   rustc,
   # provided as callPackage input to enable easier overrides through overlays
-  cargoSha256 ? "sha256-DCN/73vZHqu+U0i9eQYLAqdXVrJQc2QZUWiL43rBnXw=",
+  cargoSha256 ? "sha256-ClmRwSCDXLvK4HdAZ/UX7clj60v4Rh1mUclcnRTQ2rU=",
 }:
 mkKdeDerivation rec {
   pname = "akonadi-search";

pkgs/kde/gear/angelfish/default.nix

@@ -8,7 +8,7 @@
   cargo,
   rustc,
   # provided as callPackage input to enable easier overrides through overlays
-  cargoSha256 ? "sha256-Z6+DzFsYaxNsa2mJqV3Z5x6K9g2oZsHJPHkNp/azR4c=",
+  cargoSha256 ? "sha256-cLYfd0BNmAIUypJ67yCPHhDwKs9DLgEnUacB4GZpn+A=",
   qcoro,
 }:
 mkKdeDerivation rec {

pkgs/kde/gear/audiocd-kio/default.nix

@@ -1,13 +1,24 @@
 {
+  lib,
   mkKdeDerivation,
   cdparanoia,
   flac,
   libogg,
   libvorbis,
+  substituteAll,
+  lame,
+  opusTools,
 }:
-# FIXME: hardcode lame path
 mkKdeDerivation {
   pname = "audiocd-kio";
 
+  patches = [
+    (substituteAll {
+      src = ./encoder-paths.patch;
+      lame = lib.getExe lame;
+      opusenc = "${opusTools}/bin/opusenc";
+    })
+  ];
+
   extraBuildInputs = [cdparanoia flac libogg libvorbis];
 }

pkgs/kde/gear/audiocd-kio/encoder-paths.patch

@@ -0,0 +1,35 @@
+diff --git a/plugins/lame/encoderlame.cpp b/plugins/lame/encoderlame.cpp
+index 48d1d76..2643d6a 100644
+--- a/plugins/lame/encoderlame.cpp
++++ b/plugins/lame/encoderlame.cpp
+@@ -244,7 +244,7 @@ long EncoderLame::readInit(long /*size*/)
+
+     // -r raw/pcm
+     // -s 44.1 (because it is raw you have to specify this)
+-    *(d->currentEncodeProcess) << QStringLiteral("lame") << QStringLiteral("--verbose") << QStringLiteral("-r") << QStringLiteral("-s")
++    *(d->currentEncodeProcess) << QStringLiteral("@lame@") << QStringLiteral("--verbose") << QStringLiteral("-r") << QStringLiteral("-s")
+                                << QStringLiteral("44.1");
+     *(d->currentEncodeProcess) << args;
+     if (Settings::self()->id3_tag())
+diff --git a/plugins/opus/encoderopus.cpp b/plugins/opus/encoderopus.cpp
+index ef297fb..465bb3e 100644
+--- a/plugins/opus/encoderopus.cpp
++++ b/plugins/opus/encoderopus.cpp
+@@ -82,7 +82,7 @@ QWidget *EncoderOpus::getConfigureWidget(KConfigSkeleton **manager) const
+ bool EncoderOpus::init()
+ {
+     // Determine if opusenc is installed on the system or not.
+-    if (QStandardPaths::findExecutable(QStringLiteral("opusenc")).isEmpty())
++    if (QStandardPaths::findExecutable(QStringLiteral("@opusenc@")).isEmpty())
+         return false;
+
+     return true;
+@@ -140,7 +140,7 @@ long EncoderOpus::readInit(long /*size*/)
+
+     // --raw raw/pcm
+     // --raw-rate 44100 (because it is raw you have to specify this)
+-    *(d->currentEncodeProcess) << QStringLiteral("opusenc") << QStringLiteral("--raw") << QStringLiteral("--raw-rate") << QStringLiteral("44100");
++    *(d->currentEncodeProcess) << QStringLiteral("@opusenc@") << QStringLiteral("--raw") << QStringLiteral("--raw-rate") << QStringLiteral("44100");
+     *(d->currentEncodeProcess) << args;
+     *d->currentEncodeProcess << trackInfo;
+

pkgs/kde/gear/audiotube/default.nix

@@ -1,6 +1,41 @@
-{mkKdeDerivation}:
+{
+  mkKdeDerivation,
+  qtdeclarative,
+  qtmultimedia,
+  qtsvg,
+  extra-cmake-modules,
+  futuresql,
+  kcoreaddons,
+  kcrash,
+  ki18n,
+  kirigami-addons,
+  kirigami,
+  kwindowsystem,
+  qcoro,
+  python3,
+}:
 mkKdeDerivation {
   pname = "audiotube";
-  # FIXME(qt5)
-  meta.broken = true;
+
+  extraBuildInputs = [
+    qtdeclarative
+    qtmultimedia
+    qtsvg
+
+    extra-cmake-modules
+    futuresql
+    kirigami
+    kirigami-addons
+    kcoreaddons
+    ki18n
+    kcrash
+    kwindowsystem
+    qcoro
+
+    (python3.withPackages (ps: [
+      ps.pybind11
+      ps.yt-dlp
+      ps.ytmusicapi
+    ]))
+  ];
 }

pkgs/kde/gear/colord-kde/default.nix

@@ -1,6 +1,12 @@
-{mkKdeDerivation}:
+{
+  mkKdeDerivation,
+  pkg-config,
+  lcms2,
+  xorg,
+}:
 mkKdeDerivation {
   pname = "colord-kde";
-  # FIXME(qt5)
-  meta.broken = true;
+
+  extraNativeBuildInputs = [pkg-config];
+  extraBuildInputs = [lcms2 xorg.libXrandr];
 }

pkgs/kde/gear/default.nix

@@ -112,6 +112,7 @@
   kimap = callPackage ./kimap {};
   kio-admin = callPackage ./kio-admin {};
   kio-extras = callPackage ./kio-extras {};
+  kio-extras-kf5 = callPackage ./kio-extras-kf5 {};
   kio-gdrive = callPackage ./kio-gdrive {};
   kio-zeroconf = callPackage ./kio-zeroconf {};
   kipi-plugins = callPackage ./kipi-plugins {};

pkgs/kde/gear/juk/default.nix

@@ -1,6 +1,10 @@
-{mkKdeDerivation}:
+{
+  mkKdeDerivation,
+  qtsvg,
+  taglib,
+}:
 mkKdeDerivation {
   pname = "juk";
-  # FIXME(qt5)
-  meta.broken = true;
+
+  extraBuildInputs = [qtsvg taglib];
 }

pkgs/kde/gear/kaccounts-providers/default.nix

@@ -1,11 +1,12 @@
 {
   mkKdeDerivation,
   intltool,
+  qtdeclarative,
+  qtwebengine,
 }:
 mkKdeDerivation {
   pname = "kaccounts-providers";
 
   extraNativeBuildInputs = [intltool];
-  # FIXME(qt5)
-  meta.broken = true;
+  extraBuildInputs = [qtdeclarative qtwebengine];
 }

pkgs/kde/gear/kde-dev-utils/default.nix

@@ -6,6 +6,4 @@ mkKdeDerivation {
   pname = "kde-dev-utils";
 
   extraBuildInputs = [qttools];
-  # FIXME(qt5)
-  meta.broken = true;
 }

pkgs/kde/gear/kdeconnect-kde/default.nix

@@ -1,6 +1,5 @@
 {
   mkKdeDerivation,
-  fetchpatch,
   qtconnectivity,
   qtmultimedia,
   qtwayland,
@@ -12,15 +11,6 @@
 mkKdeDerivation {
   pname = "kdeconnect-kde";
 
-  # more qt6 porting
-  patches = [
-    (fetchpatch {
-      url = "https://invent.kde.org/network/kdeconnect-kde/-/merge_requests/611.diff";
-      hash = "sha256-HiWCK8sxSIvbvfgXX25j9LYoI2uuwStChe3rqnX0KVY=";
-      excludes = ["CMakeLists.txt"];
-    })
-  ];
-
   extraNativeBuildInputs = [pkg-config];
   extraBuildInputs = [qtconnectivity qtmultimedia qtwayland wayland wayland-protocols libfakekey];
 

pkgs/kde/gear/kdepim-addons/default.nix

@@ -1,5 +1,35 @@
-{mkKdeDerivation}:
-# FIXME: Rust stuff doesn't build, needs Cargo.lock
-mkKdeDerivation {
+{
+  mkKdeDerivation,
+  sources,
+  rustPlatform,
+  cargo,
+  rustc,
+  corrosion,
+  discount,
+  alpaka,
+  # provided as callPackage input to enable easier overrides through overlays
+  cargoSha256 ? "sha256-Dwq7Oisxs6O1sE+Z8NyU7NTGFc5yMRDxP+5kICvge4o=",
+}:
+mkKdeDerivation rec {
   pname = "kdepim-addons";
+
+  inherit (sources.${pname}) version;
+
+  cargoRoot = "plugins/webengineurlinterceptor/adblock";
+
+  cargoDeps = rustPlatform.fetchCargoTarball {
+    # include version in the name so we invalidate the FOD
+    name = "${pname}-${version}";
+    src = sources.${pname};
+    sourceRoot = "${pname}-${version}/${cargoRoot}";
+    sha256 = cargoSha256;
+  };
+
+  extraNativeBuildInputs = [
+    rustPlatform.cargoSetupHook
+    cargo
+    rustc
+  ];
+
+  extraBuildInputs = [corrosion discount alpaka];
 }

pkgs/kde/gear/kget/default.nix

@@ -1,6 +1,10 @@
-{mkKdeDerivation}:
+{
+  mkKdeDerivation,
+  qgpgme,
+  libmms,
+}:
 mkKdeDerivation {
   pname = "kget";
-  # FIXME(qt5)
-  meta.broken = true;
+
+  extraBuildInputs = [qgpgme libmms];
 }

pkgs/kde/gear/kgpg/default.nix

@@ -6,6 +6,6 @@ mkKdeDerivation {
   pname = "kgpg";
 
   extraBuildInputs = [akonadi-contacts];
-  # FIXME: not ported to new akonadi?
+  # FIXME: something broken with gpgme
   meta.broken = true;
 }

pkgs/kde/gear/kio-extras-kf5/default.nix

@@ -0,0 +1,62 @@
+{
+  stdenv,
+  sources,
+  kio-extras,
+  cmake,
+  libsForQt5,
+  samba,
+  libssh,
+  libmtp,
+  libimobiledevice,
+  gperf,
+  libtirpc,
+  openexr,
+  taglib,
+  libappimage,
+}:
+stdenv.mkDerivation rec {
+  pname = "kio-extras-kf5";
+  inherit (sources.${pname}) version;
+
+  src = sources.${pname};
+
+  nativeBuildInputs = with libsForQt5; [
+    cmake
+    extra-cmake-modules
+    wrapQtAppsHook
+  ];
+
+  buildInputs = with libsForQt5; [
+    qtbase
+
+    kactivities
+    kactivities-stats
+    karchive
+    kconfig
+    kconfigwidgets
+    kcoreaddons
+    kdbusaddons
+    kdnssd
+    kdoctools
+    kdsoap
+    kguiaddons
+    ki18n
+    kio
+    libkexiv2
+    phonon
+    solid
+    syntax-highlighting
+
+    samba
+    libssh
+    libmtp
+    libimobiledevice
+    gperf
+    libtirpc
+    openexr
+    taglib
+    libappimage
+  ];
+
+  meta = kio-extras.meta;
+}

pkgs/kde/gear/kio-gdrive/default.nix

@@ -1,6 +1,4 @@
 {mkKdeDerivation}:
 mkKdeDerivation {
   pname = "kio-gdrive";
-  # FIXME(qt5)
-  meta.broken = true;
 }

pkgs/kde/gear/koko/default.nix

@@ -8,7 +8,6 @@
   exiv2,
   kirigami-addons,
   kquickimageeditor,
-  purpose,
 }: let
   # URLs snapshotted through
   # https://web.archive.org/save/$url
@@ -43,6 +42,5 @@ in
       exiv2
       kirigami-addons
       kquickimageeditor
-      purpose
     ];
   }