diff --git a/pkgs/applications/plasma-mobile/default.nix b/pkgs/applications/plasma-mobile/default.nix deleted file mode 100644 index 7742b0a13f4b..000000000000 --- a/pkgs/applications/plasma-mobile/default.nix +++ /dev/null @@ -1,74 +0,0 @@ -/* - # New packages - - READ THIS FIRST - - This module is for official packages in the Plasma Mobile Gear. All - available packages are listed in `./srcs.nix`, although some are not yet - packaged in Nixpkgs. - - IF YOUR PACKAGE IS NOT LISTED IN `./srcs.nix`, IT DOES NOT GO HERE. - - See also `pkgs/applications/kde` as this is what this is based on. - - # Updates - - 1. Update the URL in `./fetch.sh`. - 2. Run `./maintainers/scripts/fetch-kde-qt.sh pkgs/applications/plasma-mobile` - from the top of the Nixpkgs tree. - 3. Use `nox-review wip` to check that everything builds. - 4. Commit the changes and open a pull request. -*/ - -{ - lib, - libsForQt5, - fetchurl, -}: - -let - mirror = "mirror://kde"; - srcs = import ./srcs.nix { inherit fetchurl mirror; }; - - mkDerivation = - args: - let - inherit (args) pname; - inherit (srcs.${pname}) src version; - mkDerivation = libsForQt5.callPackage ({ mkDerivation }: mkDerivation) { }; - in - mkDerivation ( - args - // { - inherit pname version src; - - outputs = args.outputs or [ "out" ]; - - meta = - let - meta = args.meta or { }; - in - meta - // { - homepage = meta.homepage or "https://www.plasma-mobile.org/"; - platforms = meta.platforms or lib.platforms.linux; - }; - } - ); - - packages = - self: - let - callPackage = self.newScope { - inherit mkDerivation; - }; - in - { - plasma-dialer = callPackage ./plasma-dialer.nix { }; - plasma-phonebook = callPackage ./plasma-phonebook.nix { }; - plasma-settings = callPackage ./plasma-settings.nix { }; - spacebar = callPackage ./spacebar.nix { }; - }; - -in -lib.makeScope libsForQt5.newScope packages diff --git a/pkgs/applications/plasma-mobile/fetch.sh b/pkgs/applications/plasma-mobile/fetch.sh deleted file mode 100644 index ffcf74a5f715..000000000000 --- a/pkgs/applications/plasma-mobile/fetch.sh +++ /dev/null @@ -1 +0,0 @@ -WGET_ARGS=( https://download.kde.org/stable/plasma-mobile/23.01.0/ -A '*.tar.xz' ) diff --git a/pkgs/applications/plasma-mobile/plasma-dialer.nix b/pkgs/applications/plasma-mobile/plasma-dialer.nix deleted file mode 100644 index 3c24ec7ea8d1..000000000000 --- a/pkgs/applications/plasma-mobile/plasma-dialer.nix +++ /dev/null @@ -1,88 +0,0 @@ -{ - lib, - mkDerivation, - - cmake, - extra-cmake-modules, - - callaudiod, - kcontacts, - kcoreaddons, - kdbusaddons, - ki18n, - kio, - kirigami-addons, - kirigami2, - knotifications, - kpeople, - libphonenumber, - libselinux, - libsepol, - modemmanager-qt, - pcre, - plasma-wayland-protocols, - protobuf, - pulseaudio-qt, - qtfeedback, - qtmpris, - qtquickcontrols2, - util-linux, - wayland, - wayland-protocols, -}: - -mkDerivation { - pname = "plasma-dialer"; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - ]; - - buildInputs = [ - callaudiod - kcontacts - kcoreaddons - kdbusaddons - ki18n - kio - kirigami-addons - kirigami2 - knotifications - kpeople - libphonenumber - libselinux - libsepol - modemmanager-qt - pcre - plasma-wayland-protocols - protobuf # Needed by libphonenumber - pulseaudio-qt - qtfeedback - qtmpris - qtquickcontrols2 - util-linux - wayland - wayland-protocols - ]; - - postPatch = '' - substituteInPlace plasma-dialer/org.kde.phone.dialer.desktop \ - --replace "/usr/bin/" "$out/bin/" - ''; - - # Plasma gear 22.09 shipped before KWin 5.26 was made available. - # This feature requires 5.26. Otherwise plasma-dialer segfaults. - # Note that we may need to keep it disabled until it stops segfaulting outside of KWin. - cmakeFlags = [ - "-DDIALER_BUILD_SHELL_OVERLAY=OFF" - ]; - - meta = with lib; { - description = "Dialer for Plasma Mobile"; - mainProgram = "plasmaphonedialer"; - homepage = "https://invent.kde.org/plasma-mobile/plasma-dialer"; - license = licenses.gpl3Plus; - maintainers = [ ]; - }; -} diff --git a/pkgs/applications/plasma-mobile/plasma-phonebook.nix b/pkgs/applications/plasma-mobile/plasma-phonebook.nix deleted file mode 100644 index bf59be8fd1bf..000000000000 --- a/pkgs/applications/plasma-mobile/plasma-phonebook.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ - lib, - mkDerivation, - - cmake, - extra-cmake-modules, - - kcontacts, - kcoreaddons, - kirigami2, - kirigami-addons, - kpeople, - kpeoplevcard, - qtquickcontrols2, -}: - -mkDerivation { - pname = "plasma-phonebook"; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - ]; - - buildInputs = [ - kcontacts - kcoreaddons - kirigami2 - kirigami-addons - kpeople - kpeoplevcard - qtquickcontrols2 - ]; - - meta = with lib; { - description = "Phone book for Plasma Mobile"; - mainProgram = "plasma-phonebook"; - homepage = "https://invent.kde.org/plasma-mobile/plasma-phonebook"; - # https://invent.kde.org/plasma-mobile/plasma-phonebook/-/commit/3ac27760417e51c051c5dd44155c3f42dd000e4f - license = licenses.gpl3Plus; - maintainers = [ ]; - }; -} diff --git a/pkgs/applications/plasma-mobile/plasma-settings.nix b/pkgs/applications/plasma-mobile/plasma-settings.nix deleted file mode 100644 index 05d98492c3a5..000000000000 --- a/pkgs/applications/plasma-mobile/plasma-settings.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ - lib, - mkDerivation, - - cmake, - extra-cmake-modules, - - kauth, - kconfig, - kcoreaddons, - kdbusaddons, - ki18n, - kirigami-addons, - kirigami2, - kitemmodels, - libselinux, - libsepol, - modemmanager-qt, - networkmanager-qt, - pcre, - plasma-framework, - util-linux, -}: - -mkDerivation { - pname = "plasma-settings"; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - ]; - - buildInputs = [ - kauth - kconfig - kcoreaddons - kdbusaddons - ki18n - kirigami-addons - kirigami2 - kitemmodels - libselinux - libsepol - modemmanager-qt - networkmanager-qt - pcre - plasma-framework - util-linux - ]; - - meta = with lib; { - description = "Settings application for Plasma Mobile"; - mainProgram = "plasma-settings"; - homepage = "https://invent.kde.org/plasma-mobile/plasma-settings"; - # https://invent.kde.org/plasma-mobile/plasma-settings/-/commit/a59007f383308503e59498b3036e1483bca26e35 - license = licenses.gpl2Plus; - maintainers = [ ]; - }; -} diff --git a/pkgs/applications/plasma-mobile/spacebar.nix b/pkgs/applications/plasma-mobile/spacebar.nix deleted file mode 100644 index 2b8b065d63b3..000000000000 --- a/pkgs/applications/plasma-mobile/spacebar.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ - lib, - mkDerivation, - - cmake, - extra-cmake-modules, - wrapQtAppsHook, - - c-ares, - curl, - kcontacts, - ki18n, - kio, - kirigami-addons, - kirigami2, - knotifications, - kpeople, - libphonenumber, - modemmanager-qt, - protobuf, - qcoro, - qtquickcontrols2, -}: - -mkDerivation { - pname = "spacebar"; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - wrapQtAppsHook - ]; - - buildInputs = [ - c-ares - curl - kcontacts - ki18n - kio - kirigami-addons - kirigami2 - knotifications - kpeople - libphonenumber - modemmanager-qt - protobuf # Needed by libphonenumber - qcoro - qtquickcontrols2 - ]; - - meta = with lib; { - description = "SMS application for Plasma Mobile"; - mainProgram = "spacebar"; - homepage = "https://invent.kde.org/plasma-mobile/spacebar"; - license = licenses.gpl2Plus; - maintainers = [ ]; - }; -} diff --git a/pkgs/applications/plasma-mobile/srcs.nix b/pkgs/applications/plasma-mobile/srcs.nix deleted file mode 100644 index 1167bc231a3f..000000000000 --- a/pkgs/applications/plasma-mobile/srcs.nix +++ /dev/null @@ -1,182 +0,0 @@ -# DO NOT EDIT! This file is generated automatically. -# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/applications/plasma-mobile -{ fetchurl, mirror }: - -{ - alligator = { - version = "23.01.0"; - src = fetchurl { - url = "${mirror}/stable/plasma-mobile/23.01.0/alligator-23.01.0.tar.xz"; - sha256 = "00vcj8dvzqj9vhq60ygqj62vx26lnai1j7117q0klp8wc9vngbvc"; - name = "alligator-23.01.0.tar.xz"; - }; - }; - angelfish = { - version = "23.01.0"; - src = fetchurl { - url = "${mirror}/stable/plasma-mobile/23.01.0/angelfish-23.01.0.tar.xz"; - sha256 = "1pzms8xj57r8cv400fbcj9f4v8bs8xlws0f8zgak57jw5yxs073p"; - name = "angelfish-23.01.0.tar.xz"; - }; - }; - audiotube = { - version = "23.01.0"; - src = fetchurl { - url = "${mirror}/stable/plasma-mobile/23.01.0/audiotube-23.01.0.tar.xz"; - sha256 = "0cjyjqin8zmgav3wf96zv2kr0ifn4xk4il1l5ybwf4k73qg1387x"; - name = "audiotube-23.01.0.tar.xz"; - }; - }; - calindori = { - version = "23.01.0"; - src = fetchurl { - url = "${mirror}/stable/plasma-mobile/23.01.0/calindori-23.01.0.tar.xz"; - sha256 = "0jhrxsh6gd20qpq68n2lspfkgq3bam46j6m10jnm3zckb190pfhl"; - name = "calindori-23.01.0.tar.xz"; - }; - }; - kalk = { - version = "23.01.0"; - src = fetchurl { - url = "${mirror}/stable/plasma-mobile/23.01.0/kalk-23.01.0.tar.xz"; - sha256 = "1d5xlinrwjyxfr7ibxjjgbqmy69w6sgxxdpfn1x1wccnjfld4zqf"; - name = "kalk-23.01.0.tar.xz"; - }; - }; - kasts = { - version = "23.01.0"; - src = fetchurl { - url = "${mirror}/stable/plasma-mobile/23.01.0/kasts-23.01.0.tar.xz"; - sha256 = "09xvgd5vdmniqlnaxrim9d0rpv2qkdz91jq168gzl1kczl26pivf"; - name = "kasts-23.01.0.tar.xz"; - }; - }; - kclock = { - version = "23.01.0"; - src = fetchurl { - url = "${mirror}/stable/plasma-mobile/23.01.0/kclock-23.01.0.tar.xz"; - sha256 = "0fxda2cqi9qqj2lkzs08jr8i35jzzy5z76k2mbz2qyfmby7hsz1r"; - name = "kclock-23.01.0.tar.xz"; - }; - }; - keysmith = { - version = "23.01.0"; - src = fetchurl { - url = "${mirror}/stable/plasma-mobile/23.01.0/keysmith-23.01.0.tar.xz"; - sha256 = "0m5gbf3rw1l6qx5aphr57726p6v5nl2g718ainxa689p075smfbf"; - name = "keysmith-23.01.0.tar.xz"; - }; - }; - khealthcertificate = { - version = "23.01.0"; - src = fetchurl { - url = "${mirror}/stable/plasma-mobile/23.01.0/khealthcertificate-23.01.0.tar.xz"; - sha256 = "193agd3jg029vcq1h5hdg3gw6zgqcmszl6ffcrid0ajbbiic4pbm"; - name = "khealthcertificate-23.01.0.tar.xz"; - }; - }; - koko = { - version = "23.01.0"; - src = fetchurl { - url = "${mirror}/stable/plasma-mobile/23.01.0/koko-23.01.0.tar.xz"; - sha256 = "1bfbfwavphj3bnf8icnakbdaa6a7i0fgyhs8xa73clwig54fk4np"; - name = "koko-23.01.0.tar.xz"; - }; - }; - kongress = { - version = "23.01.0"; - src = fetchurl { - url = "${mirror}/stable/plasma-mobile/23.01.0/kongress-23.01.0.tar.xz"; - sha256 = "0yma1b44sjnvhsw31r5bndrpj2sjgwgchpzc8bf9380l6an9k4r5"; - name = "kongress-23.01.0.tar.xz"; - }; - }; - krecorder = { - version = "23.01.0"; - src = fetchurl { - url = "${mirror}/stable/plasma-mobile/23.01.0/krecorder-23.01.0.tar.xz"; - sha256 = "0aja3w8qbp96h43igajs068s89gf6nn7zwf6c813rbyqzl350phn"; - name = "krecorder-23.01.0.tar.xz"; - }; - }; - ktrip = { - version = "23.01.0"; - src = fetchurl { - url = "${mirror}/stable/plasma-mobile/23.01.0/ktrip-23.01.0.tar.xz"; - sha256 = "1l69fd1hhclm9212h6zm4nhkc0dg2wl47jw7wl9s6vy3xvmysihm"; - name = "ktrip-23.01.0.tar.xz"; - }; - }; - kweather = { - version = "23.01.0"; - src = fetchurl { - url = "${mirror}/stable/plasma-mobile/23.01.0/kweather-23.01.0.tar.xz"; - sha256 = "1hcb8jzx2bwcyxphya7kx7q2yri1w0k2753xiibw1hlgmb3qzr7s"; - name = "kweather-23.01.0.tar.xz"; - }; - }; - plasma-dialer = { - version = "23.01.0"; - src = fetchurl { - url = "${mirror}/stable/plasma-mobile/23.01.0/plasma-dialer-23.01.0.tar.xz"; - sha256 = "0n9g3jf71lpcwlwr1ia1i6kh0kiv2vizssni1df3cwskd7hivn7h"; - name = "plasma-dialer-23.01.0.tar.xz"; - }; - }; - plasma-phonebook = { - version = "23.01.0"; - src = fetchurl { - url = "${mirror}/stable/plasma-mobile/23.01.0/plasma-phonebook-23.01.0.tar.xz"; - sha256 = "0pprfgims9h6g1xw48w66bqkmqp7qp7gkc7k4zbj3lgmmnwh6z9i"; - name = "plasma-phonebook-23.01.0.tar.xz"; - }; - }; - plasma-settings = { - version = "23.01.0"; - src = fetchurl { - url = "${mirror}/stable/plasma-mobile/23.01.0/plasma-settings-23.01.0.tar.xz"; - sha256 = "0fz0zjyh15ma6kv79pm0gc92iz6gikxyr4afkyzabzk9559dv1p7"; - name = "plasma-settings-23.01.0.tar.xz"; - }; - }; - plasmatube = { - version = "23.01.0"; - src = fetchurl { - url = "${mirror}/stable/plasma-mobile/23.01.0/plasmatube-23.01.0.tar.xz"; - sha256 = "06hwa1m6gaacjmcyssa63vw43cgx096x9aj87rv1z9k9qsv2qgfj"; - name = "plasmatube-23.01.0.tar.xz"; - }; - }; - qmlkonsole = { - version = "23.01.0"; - src = fetchurl { - url = "${mirror}/stable/plasma-mobile/23.01.0/qmlkonsole-23.01.0.tar.xz"; - sha256 = "07h2pkz9h5lm232jasf6znf0i2p5c5qxnjac1d51qf8rfm0fp1q3"; - name = "qmlkonsole-23.01.0.tar.xz"; - }; - }; - spacebar = { - version = "23.01.0"; - src = fetchurl { - url = "${mirror}/stable/plasma-mobile/23.01.0/spacebar-23.01.0.tar.xz"; - sha256 = "0srwvbnb80cgxkjjq2ch1lrbki7m169i86hig41h368wr9nmjnsl"; - name = "spacebar-23.01.0.tar.xz"; - }; - }; - telly-skout = { - version = "23.01.0"; - src = fetchurl { - url = "${mirror}/stable/plasma-mobile/23.01.0/telly-skout-23.01.0.tar.xz"; - sha256 = "1wcabca1wlxjna4bd1blpwh7hi1wrcmn8bc06g8mpdzm8756d7sk"; - name = "telly-skout-23.01.0.tar.xz"; - }; - }; - vakzination = { - version = "23.01.0"; - src = fetchurl { - url = "${mirror}/stable/plasma-mobile/23.01.0/vakzination-23.01.0.tar.xz"; - sha256 = "1lx46r46xq18a1pxa6qhnwks43w022fkbrvylb84ycy59djq371n"; - name = "vakzination-23.01.0.tar.xz"; - }; - }; -} diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index 39b52bc9257a..df4ad2874a9f 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -60,16 +60,6 @@ makeScopeWithSplicing' { in (lib.makeOverridable mkGear attrs); - plasmaMobileGear = - let - mkPlamoGear = import ../applications/plasma-mobile; - attrs = { - inherit libsForQt5; - inherit (pkgs) lib fetchurl; - }; - in - (lib.makeOverridable mkPlamoGear attrs); - noExtraAttrs = set: lib.attrsets.removeAttrs set [ @@ -82,7 +72,6 @@ makeScopeWithSplicing' { in (noExtraAttrs ( kdeFrameworks - // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGear @@ -91,7 +80,6 @@ makeScopeWithSplicing' { inherit kdeFrameworks - plasmaMobileGear plasma5 kdeGear qt5