From c7cbb23678d66125afa471881140f1a05003c2b0 Mon Sep 17 00:00:00 2001 From: Justin Restivo Date: Wed, 20 Aug 2025 07:30:49 -0400 Subject: [PATCH 001/146] tdf: 0.4.1 -> 0.4.2 --- pkgs/by-name/td/tdf/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/td/tdf/package.nix b/pkgs/by-name/td/tdf/package.nix index e02e0f0ee762..e3a49e93ab94 100644 --- a/pkgs/by-name/td/tdf/package.nix +++ b/pkgs/by-name/td/tdf/package.nix @@ -8,14 +8,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "tdf"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "itsjunetime"; repo = "tdf"; fetchSubmodules = true; tag = "v${finalAttrs.version}"; - hash = "sha256-yttuWWKIrh54eJSdKejDTswoDarNifD5DtfQHSlL3rE="; + hash = "sha256-le2xlSVnYbWMDV9+SbrTFHSFZn/H6N7CEaKr5Zzo/c4="; }; cargoHash = "sha256-UB7G5tl90CNq/aYUaUOpgGJcEL9ND3pJ29/lpIkh2iU="; From 9e6381942e3de598580619d3c42269d3b751daff Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 20 Aug 2025 13:04:51 +0000 Subject: [PATCH 002/146] waydroid-helper: 0.2.3 -> 0.2.5 --- pkgs/by-name/wa/waydroid-helper/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/wa/waydroid-helper/package.nix b/pkgs/by-name/wa/waydroid-helper/package.nix index 81fa878b05ab..7088824e26ba 100644 --- a/pkgs/by-name/wa/waydroid-helper/package.nix +++ b/pkgs/by-name/wa/waydroid-helper/package.nix @@ -25,13 +25,13 @@ }: let - version = "0.2.3"; + version = "0.2.5"; src = fetchFromGitHub { owner = "ayasa520"; repo = "waydroid-helper"; tag = "v${version}"; - hash = "sha256-QxtCxujf7S3YRx/4rRMecFBomP+9tqrIBdYhc3WQT20="; + hash = "sha256-O1QJzv1p+cBAxVB2YXC45EQMsbIC01StmiIXEGdzqGw="; }; in python3Packages.buildPythonApplication { From 3a3d42e077987e7318e5abafa478b91aba234fa5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 20 Aug 2025 14:11:50 +0000 Subject: [PATCH 003/146] overpush: 0.4.5 -> 0.4.6 --- pkgs/by-name/ov/overpush/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ov/overpush/package.nix b/pkgs/by-name/ov/overpush/package.nix index d48f60c2242d..6030c1aa3e52 100644 --- a/pkgs/by-name/ov/overpush/package.nix +++ b/pkgs/by-name/ov/overpush/package.nix @@ -9,13 +9,13 @@ buildGoModule (finalAttrs: { pname = "overpush"; - version = "0.4.5"; + version = "0.4.6"; src = fetchFromGitHub { owner = "mrusme"; repo = "overpush"; tag = "v${finalAttrs.version}"; - hash = "sha256-6tSptrvlaljKMUawGD3Bk1LBwge/Awvvudpr+juuuQQ="; + hash = "sha256-2EIOCeW/PuZFDmLShexnPomvx3PtGzZ6jWNvoJSxO7Q="; }; vendorHash = "sha256-KUfGc4vFfw59mwqR840cbL4ubBH1i+sIniHU0CDCKTg="; From 05a87535497e62092010d8c5a7ff6c27bb1af527 Mon Sep 17 00:00:00 2001 From: Rhys-T <108157737+Rhys-T@users.noreply.github.com> Date: Wed, 20 Aug 2025 10:03:43 -0400 Subject: [PATCH 004/146] mame: remove coreaudio_sound patch (upstreamed) This patch is no longer needed after the most recent update, and is breaking macOS/Darwin builds. --- pkgs/applications/emulators/mame/default.nix | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/pkgs/applications/emulators/mame/default.nix b/pkgs/applications/emulators/mame/default.nix index 742988e13886..0f025c97987c 100644 --- a/pkgs/applications/emulators/mame/default.nix +++ b/pkgs/applications/emulators/mame/default.nix @@ -7,7 +7,6 @@ SDL2_ttf, copyDesktopItems, expat, - fetchpatch, fetchurl, flac, fontconfig, @@ -117,16 +116,6 @@ stdenv.mkDerivation rec { # that you run MAME changing to install directory, so we add absolute paths # here ./001-use-absolute-paths.diff - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - # coreaudio_sound.cpp compares __MAC_OS_X_VERSION_MIN_REQUIRED to 1200 - # instead of 120000, causing it to try to use a constant that isn't - # actually defined yet when targeting macOS 11 like Nixpkgs does. - # Backport mamedev/mame#13890 until the next time we update MAME. - (fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/mamedev/mame/pull/13890.patch"; - hash = "sha256-Fqpw4fHEMns4tSSIjc1p36ss+J9Tc/O0cnN3HI/ratM="; - }) ]; # Since the bug described in https://github.com/NixOS/nixpkgs/issues/135438, From 26b98c05b4e48277488670645a9e22c41896c384 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 20 Aug 2025 16:05:20 +0000 Subject: [PATCH 005/146] protoc-gen-go: 1.36.7 -> 1.36.8 --- pkgs/by-name/pr/protoc-gen-go/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pr/protoc-gen-go/package.nix b/pkgs/by-name/pr/protoc-gen-go/package.nix index 5e2615bb1309..d14b5cbd2c5d 100644 --- a/pkgs/by-name/pr/protoc-gen-go/package.nix +++ b/pkgs/by-name/pr/protoc-gen-go/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "protoc-gen-go"; - version = "1.36.7"; + version = "1.36.8"; src = fetchFromGitHub { owner = "protocolbuffers"; repo = "protobuf-go"; rev = "v${version}"; - hash = "sha256-8ePIQ62ewJ1Bp+rG+R7o8Vx++zp8VK0MeEb8ASGZQ7E="; + hash = "sha256-uDgLBqeyTQavcCF+wcLsc/7VCaOvPPLVGt9isw4O0R8="; }; vendorHash = "sha256-nGI/Bd6eMEoY0sBwWEtyhFowHVvwLKjbT4yfzFz6Z3E="; From 8a58674f5fb0a227cf3020d8538c6f2333716383 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 20 Aug 2025 17:36:15 +0000 Subject: [PATCH 006/146] unpoller: 2.15.3 -> 2.15.4 --- pkgs/by-name/un/unpoller/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/un/unpoller/package.nix b/pkgs/by-name/un/unpoller/package.nix index f8a1515b7c1f..0cb0cd855c30 100644 --- a/pkgs/by-name/un/unpoller/package.nix +++ b/pkgs/by-name/un/unpoller/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "unpoller"; - version = "2.15.3"; + version = "2.15.4"; src = fetchFromGitHub { owner = "unpoller"; repo = "unpoller"; rev = "v${version}"; - hash = "sha256-MqL+V5NVRE/jzOnj1yFVlT1HPjeiUWsNkJyMetWIaj0="; + hash = "sha256-srAskagINMPWG+k6bbUD+8QZyD7C3PbsApQfeEF01NE="; }; - vendorHash = "sha256-w6rU+BV7T8trCd6JBqyXkEgv3qkGTEQpBEq2WsTCo04="; + vendorHash = "sha256-kS+UUD6lexYAy7so7DGq6PiOYHSwLFcOw7+KC2jIlMg="; ldflags = [ "-w" From bce4247fbe77a1920ead781d6a0a3c2cfbbf4a79 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 20 Aug 2025 18:38:19 +0000 Subject: [PATCH 007/146] kubefirst: 2.8.4 -> 2.9.0 --- pkgs/by-name/ku/kubefirst/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ku/kubefirst/package.nix b/pkgs/by-name/ku/kubefirst/package.nix index 35d0ab6c2c07..121d022f26dc 100644 --- a/pkgs/by-name/ku/kubefirst/package.nix +++ b/pkgs/by-name/ku/kubefirst/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "kubefirst"; - version = "2.8.4"; + version = "2.9.0"; src = fetchFromGitHub { owner = "konstructio"; repo = "kubefirst"; tag = "v${version}"; - hash = "sha256-5A5luRvUr5qBua6Jw5/SJqIHLZfEpkXFoqxTnpUjlas="; + hash = "sha256-oPuvkFT3MUv5LY1qhfjFEfgxvZRGziLUyEZhHKVdGrQ="; }; vendorHash = "sha256-1u34cuPUY/5fYd073UhRUu/5/1nhPadTI06+3o+uE7w="; From 96490c0bda9cb85e8636d46a4299a4eb2cbcbee9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 20 Aug 2025 18:45:51 +0000 Subject: [PATCH 008/146] zvm: 0.8.7 -> 0.8.8 --- pkgs/by-name/zv/zvm/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/zv/zvm/package.nix b/pkgs/by-name/zv/zvm/package.nix index c23a578a652d..88710b5a9cde 100644 --- a/pkgs/by-name/zv/zvm/package.nix +++ b/pkgs/by-name/zv/zvm/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "zvm"; - version = "0.8.7"; + version = "0.8.8"; src = fetchFromGitHub { owner = "tristanisham"; repo = "zvm"; tag = "v${version}"; - hash = "sha256-yRdORWnWcVZGUhVnPVDhK4VO1eJHrbPkY00QQB1JwmI="; + hash = "sha256-M1xpE2Lq6XZgvH9J0c2Xj1BJNN+4TTGwp4iluVyVAJs="; }; vendorHash = "sha256-wo+vA9AYXIjv6SGb7hNY6ZIVMyJ5enMd8gpQ6u3F7To="; From 27edff7a462622a03108e392ab95ed33b817310c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 20 Aug 2025 19:54:37 +0000 Subject: [PATCH 009/146] terraform-providers.vault: 5.1.0 -> 5.2.1 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index a2d9ff5f716b..0da14bd1c175 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1427,13 +1427,13 @@ "vendorHash": "sha256-giqZi1CmuyANNwzW+y9BUUUEfBhFZKkVGAvIPVvZnzE=" }, "vault": { - "hash": "sha256-tRKMu9mFyZkVjTMeXccUviWHiW9hPLj5heErRDK9eBw=", + "hash": "sha256-nY8NOE3VJCHkDeisWgxIHG6T1fQ8Jt6Nom2ELexuld0=", "homepage": "https://registry.terraform.io/providers/hashicorp/vault", "owner": "hashicorp", "repo": "terraform-provider-vault", - "rev": "v5.1.0", + "rev": "v5.2.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-GRrU/ARa88EX9kp6UBBhkYrTeX3i94eEQalz5QBHwGc=" + "vendorHash": "sha256-mfageWMx8YM4eipnf7u3CMgMYcY7l2e69vECD3o91rg=" }, "vcd": { "hash": "sha256-W+ffIT70IaePg3xfOaQgCjPTWTN3iSAYwkf+s+zkB84=", From c323dfc72f65a3d918ba3fd6e5647921ae2ca076 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 20 Aug 2025 19:59:50 +0000 Subject: [PATCH 010/146] terramate: 0.14.3 -> 0.14.4 --- pkgs/by-name/te/terramate/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/te/terramate/package.nix b/pkgs/by-name/te/terramate/package.nix index 9672fc9f4e6b..8223d5d96f92 100644 --- a/pkgs/by-name/te/terramate/package.nix +++ b/pkgs/by-name/te/terramate/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "terramate"; - version = "0.14.3"; + version = "0.14.4"; src = fetchFromGitHub { owner = "terramate-io"; repo = "terramate"; rev = "v${version}"; - hash = "sha256-+L86oTpsPpi6RUgh4dPO0AZaTYZg7ue37PbHPSjm+vM="; + hash = "sha256-36AZBi4QYmYc+0e6LsWkGmanf13hyCJZU7kusP/zwlQ="; }; vendorHash = "sha256-u9eXi7FjMsXm0H0y7Gs/Wu2I8tp4rRLxtjUxrrHJkEU="; From 92da943d8ad37ad183416f5ba8f874f279dc2570 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Wed, 20 Aug 2025 22:04:13 +0000 Subject: [PATCH 011/146] python313Packages.mne: 1.10.0 -> 1.10.1 --- pkgs/development/python-modules/mne/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/mne/default.nix b/pkgs/development/python-modules/mne/default.nix index 5ceb159e2e77..1e762305baf5 100644 --- a/pkgs/development/python-modules/mne/default.nix +++ b/pkgs/development/python-modules/mne/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "mne"; - version = "1.10.0"; + version = "1.10.1"; pyproject = true; disabled = pythonOlder "3.10"; @@ -37,7 +37,7 @@ buildPythonPackage rec { owner = "mne-tools"; repo = "mne-python"; tag = "v${version}"; - hash = "sha256-j0kPtw00gV50Nuh/b4+Jq6P7pQVRgr4/xMTwRSyzJcU="; + hash = "sha256-xxkv+8RAkpRyMWznUMpwc6E72mb9DUPW6O5hFHiNz98="; }; postPatch = '' @@ -112,7 +112,7 @@ buildPythonPackage rec { description = "Magnetoencephelography and electroencephalography in Python"; mainProgram = "mne"; homepage = "https://mne.tools"; - changelog = "https://mne.tools/stable/changes/${version}.html"; + changelog = "https://mne.tools/stable/changes/v${lib.versions.majorMinor version}.html"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ bcdarwin From 30d1f7b177a6dbfdf110d2837c1303a87cf36306 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 21 Aug 2025 01:05:04 +0000 Subject: [PATCH 012/146] audiowaveform: 1.10.2 -> 1.10.3 --- pkgs/by-name/au/audiowaveform/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/au/audiowaveform/package.nix b/pkgs/by-name/au/audiowaveform/package.nix index d133507c374e..4416dd8dd556 100644 --- a/pkgs/by-name/au/audiowaveform/package.nix +++ b/pkgs/by-name/au/audiowaveform/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "audiowaveform"; - version = "1.10.2"; + version = "1.10.3"; src = fetchFromGitHub { owner = "bbc"; repo = "audiowaveform"; rev = version; - sha256 = "sha256-GrYShlLUD2vZYN6sJy4FnAMPiV36rOAxZUrK0mxJCRk="; + sha256 = "sha256-7pcYxl6m7mkoXGawA3gr8NTfkJlkgl+DtK79CA8dRec="; }; cmakeFlags = [ From f85a4867bb1c334efc373ed3bfcbe4eaa9e1e3d4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 21 Aug 2025 02:07:56 +0000 Subject: [PATCH 013/146] hddfancontrol: 2.0.4 -> 2.0.5 --- pkgs/by-name/hd/hddfancontrol/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/hd/hddfancontrol/package.nix b/pkgs/by-name/hd/hddfancontrol/package.nix index 5729b418a48c..0ea029465a22 100644 --- a/pkgs/by-name/hd/hddfancontrol/package.nix +++ b/pkgs/by-name/hd/hddfancontrol/package.nix @@ -11,16 +11,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "hddfancontrol"; - version = "2.0.4"; + version = "2.0.5"; src = fetchFromGitHub { owner = "desbma"; repo = "hddfancontrol"; tag = finalAttrs.version; - hash = "sha256-RnqKqXyR3XN/UL70vG/+NtkxxbwvAoIQaFipUtRQOlE="; + hash = "sha256-kKzjg2D/7Thzu6JzmLyu2eJAr+N6Bi95WEBKrqB/vXo="; }; - cargoHash = "sha256-2jwfdUBpzamsbvkpP+Fn5dz8jj9+Wnp2JpoAT6tHUac="; + cargoHash = "sha256-0TRNiRmxwV/p7nLOrU9GHjTzIaan4JV8C6e443nd2zY="; nativeBuildInputs = [ makeWrapper From 815c4526370b9523037a5ccc911b3f152a439c18 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 21 Aug 2025 02:19:21 +0000 Subject: [PATCH 014/146] protolint: 0.55.6 -> 0.56.1 --- pkgs/by-name/pr/protolint/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pr/protolint/package.nix b/pkgs/by-name/pr/protolint/package.nix index cc2eb70c91cb..85c9ec9fe51f 100644 --- a/pkgs/by-name/pr/protolint/package.nix +++ b/pkgs/by-name/pr/protolint/package.nix @@ -5,13 +5,13 @@ }: buildGoModule rec { pname = "protolint"; - version = "0.55.6"; + version = "0.56.1"; src = fetchFromGitHub { owner = "yoheimuta"; repo = "protolint"; rev = "v${version}"; - hash = "sha256-RTej9zVQz6GESAoAAChidiolGEoHabUYlEZSV2gc8KQ="; + hash = "sha256-fz7hypg07okEg0Z4XiA5NGh6I8oLFO4coJscTvxLWFw="; }; vendorHash = "sha256-RS0t7n6pLYVKHluQtXsMjYL1SvN7IZFdKmkxOI8wFoE="; From 0156208e0db51f61567cc44d1cbc5fb07e1dc74c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 21 Aug 2025 02:30:26 +0000 Subject: [PATCH 015/146] step-kms-plugin: 0.14.2 -> 0.15.1 --- pkgs/by-name/st/step-kms-plugin/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/st/step-kms-plugin/package.nix b/pkgs/by-name/st/step-kms-plugin/package.nix index 297f488a677e..8683bafe7c72 100644 --- a/pkgs/by-name/st/step-kms-plugin/package.nix +++ b/pkgs/by-name/st/step-kms-plugin/package.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "step-kms-plugin"; - version = "0.14.2"; + version = "0.15.1"; src = fetchFromGitHub { owner = "smallstep"; repo = "step-kms-plugin"; rev = "v${version}"; - hash = "sha256-0RIAwZbk6DNlJHTmxUd/td94OlrjwcQ86ao7wt7PSdg="; + hash = "sha256-Evi5rXdb/2WDlIUXJcQjQ0d1Zrfg1x00tFonlNmLi6E="; }; - vendorHash = "sha256-YvK3icanE8FoTeACfReVXmV143lcRTyXv8L6+hoFIaM="; + vendorHash = "sha256-CxX4tQRBPtza1PAVeidp+KNeYxIh5y1tJ+RgcBKdORs="; proxyVendor = true; From 444ab892b0b046c26c9edbc442ea5ffdd9e42cb6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 21 Aug 2025 03:35:03 +0000 Subject: [PATCH 016/146] openfga-cli: 0.7.3 -> 0.7.4 --- pkgs/by-name/op/openfga-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/op/openfga-cli/package.nix b/pkgs/by-name/op/openfga-cli/package.nix index 0f40b131de0a..7b6531e71de5 100644 --- a/pkgs/by-name/op/openfga-cli/package.nix +++ b/pkgs/by-name/op/openfga-cli/package.nix @@ -7,7 +7,7 @@ let pname = "openfga-cli"; - version = "0.7.3"; + version = "0.7.4"; in buildGoModule { @@ -17,10 +17,10 @@ buildGoModule { owner = "openfga"; repo = "cli"; rev = "v${version}"; - hash = "sha256-FaEjlZy/Kb9Mchv/6A318GAorxKGDHMy6hM5VWoXoCE="; + hash = "sha256-kskPQyMzFgCOIaHmN/iZbRDPR6wbYp8kBcf+51cniSk="; }; - vendorHash = "sha256-bDEq0Xp/PMs7zLEfmZ62a1e050PmK2bCbwMrZXMEFwY="; + vendorHash = "sha256-e/w1KGVzrZPp8KTP0paCRcE9OYkZMmEmmIZmKmPtx5s="; nativeBuildInputs = [ installShellFiles ]; From 475fa5d426ed41b5a9d34524b7ce9d4ab81ccbb3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 21 Aug 2025 04:33:07 +0000 Subject: [PATCH 017/146] vscode-extensions.detachhead.basedpyright: 1.31.1 -> 1.31.3 --- .../vscode/extensions/detachhead.basedpyright/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/detachhead.basedpyright/default.nix b/pkgs/applications/editors/vscode/extensions/detachhead.basedpyright/default.nix index 3d8d50e05638..27c1a68690c0 100644 --- a/pkgs/applications/editors/vscode/extensions/detachhead.basedpyright/default.nix +++ b/pkgs/applications/editors/vscode/extensions/detachhead.basedpyright/default.nix @@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "basedpyright"; publisher = "detachhead"; - version = "1.31.1"; - hash = "sha256-MlkLoM1415KYCKlwfV67HLLvmF7PRtdyQrPgeNm2nyM="; + version = "1.31.3"; + hash = "sha256-xQ2XvGdQPmls+bkCtfmFYvbr1d4Q1Nhc8mQQyuWPZoQ="; }; meta = { changelog = "https://github.com/detachhead/basedpyright/releases"; From 11bbbda5cd3f80c50475acc827456d188578de0f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 21 Aug 2025 04:59:17 +0000 Subject: [PATCH 018/146] gallery-dl: 1.30.3 -> 1.30.4 --- pkgs/by-name/ga/gallery-dl/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ga/gallery-dl/package.nix b/pkgs/by-name/ga/gallery-dl/package.nix index edb0df4b388c..94f75a7d304d 100644 --- a/pkgs/by-name/ga/gallery-dl/package.nix +++ b/pkgs/by-name/ga/gallery-dl/package.nix @@ -8,7 +8,7 @@ let pname = "gallery-dl"; - version = "1.30.3"; + version = "1.30.4"; in python3Packages.buildPythonApplication { inherit pname version; @@ -18,7 +18,7 @@ python3Packages.buildPythonApplication { owner = "mikf"; repo = "gallery-dl"; tag = "v${version}"; - hash = "sha256-zkyPn18ER6Xlyo4ITC8TDk9vVHubbyfJHKxQF4JodHY="; + hash = "sha256-fDLtB3l682+APcOkvQCPAfxCqWhjEi2E7sEU617fzyg="; }; build-system = [ python3Packages.setuptools ]; From ff09468d9d7540261ed8a140f1f42771cff1c5c5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 21 Aug 2025 05:18:19 +0000 Subject: [PATCH 019/146] terraform-providers.oci: 7.13.0 -> 7.14.0 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index a2d9ff5f716b..f3ce511caeba 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -931,11 +931,11 @@ "vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI=" }, "oci": { - "hash": "sha256-Fh3GSSO+MBumdx5BxmINKhci8x0zHZ1jzMcGLyT0DIQ=", + "hash": "sha256-LoaFc5Ro7l2DOzWIUtcx+ycKwoRORkbBJtF8fu6kMBA=", "homepage": "https://registry.terraform.io/providers/oracle/oci", "owner": "oracle", "repo": "terraform-provider-oci", - "rev": "v7.13.0", + "rev": "v7.14.0", "spdx": "MPL-2.0", "vendorHash": null }, From 111d6fc4c7b332e549da39d25d95b21a6c829000 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 21 Aug 2025 06:36:25 +0000 Subject: [PATCH 020/146] cargo-shear: 1.5.0 -> 1.5.1 --- pkgs/by-name/ca/cargo-shear/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/cargo-shear/package.nix b/pkgs/by-name/ca/cargo-shear/package.nix index b70867f1d155..142beb204997 100644 --- a/pkgs/by-name/ca/cargo-shear/package.nix +++ b/pkgs/by-name/ca/cargo-shear/package.nix @@ -6,7 +6,7 @@ cargo-shear, }: let - version = "1.5.0"; + version = "1.5.1"; in rustPlatform.buildRustPackage { pname = "cargo-shear"; @@ -16,10 +16,10 @@ rustPlatform.buildRustPackage { owner = "Boshen"; repo = "cargo-shear"; rev = "v${version}"; - hash = "sha256-UZOSdCErZ7dT1KiuyupD2KMf8JgPfBOZn1GFWNJFtFU="; + hash = "sha256-4qj+hSoByE5sfT9LTm7hsYsYpOJc5Yxak1V980L/F3c="; }; - cargoHash = "sha256-qVkM2Zg2R3ZzCBEJFMXY7hfptiBvDaA+nVO1SVUuUNg="; + cargoHash = "sha256-btXeytQRZ74S55cbANRGHmLPSXssNPpE/yjA1cJTy7g="; # https://github.com/Boshen/cargo-shear/blob/a0535415a3ea94c86642f39f343f91af5cdc3829/src/lib.rs#L20-L23 SHEAR_VERSION = version; From db393f2a5c31f7bc625d7fbd0d67502a6f25bb9a Mon Sep 17 00:00:00 2001 From: Maxwell Rupp Date: Thu, 21 Aug 2025 04:27:04 -0400 Subject: [PATCH 021/146] vimPlugins.commasemi-nvim: init at 2025-03-06 --- pkgs/applications/editors/vim/plugins/generated.nix | 13 +++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 14 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 90196ace947f..f332559c4459 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -3130,6 +3130,19 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + commasemi-nvim = buildVimPlugin { + pname = "commasemi.nvim"; + version = "2025-03-06"; + src = fetchFromGitHub { + owner = "saifulapm"; + repo = "commasemi.nvim"; + rev = "cbfa3554e554f0534fcd79de273742a532c0068f"; + sha256 = "13b334fx6yn1iyijvm7vb6il1zqpzx112rhw6ajp3lvgqanpz23d"; + }; + meta.homepage = "https://github.com/saifulapm/commasemi.nvim/"; + meta.hydraPlatforms = [ ]; + }; + comment-box-nvim = buildVimPlugin { pname = "comment-box.nvim"; version = "2024-02-03"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index e5f8e333882e..530c56e0394f 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -239,6 +239,7 @@ https://github.com/lilydjwg/colorizer/,, https://github.com/Domeee/com.cloudedmountain.ide.neovim/,HEAD, https://github.com/mluders/comfy-line-numbers.nvim/,HEAD, https://github.com/wincent/command-t/,, +https://github.com/saifulapm/commasemi.nvim/,HEAD, https://github.com/LudoPinelli/comment-box.nvim/,HEAD, https://github.com/numtostr/comment.nvim/,, https://github.com/rhysd/committia.vim/,, From 545ef3d1570375db721ccb36861f64ae01a3f595 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 21 Aug 2025 08:28:31 +0000 Subject: [PATCH 022/146] firebase-tools: 14.12.0 -> 14.13.0 --- pkgs/by-name/fi/firebase-tools/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fi/firebase-tools/package.nix b/pkgs/by-name/fi/firebase-tools/package.nix index 51f00359fced..0da75c4d7efd 100644 --- a/pkgs/by-name/fi/firebase-tools/package.nix +++ b/pkgs/by-name/fi/firebase-tools/package.nix @@ -10,16 +10,16 @@ buildNpmPackage rec { pname = "firebase-tools"; - version = "14.12.0"; + version = "14.13.0"; src = fetchFromGitHub { owner = "firebase"; repo = "firebase-tools"; tag = "v${version}"; - hash = "sha256-LShbjULFhwMOj3h+TFqZJSg1wPP69A222w51M0kFPCk="; + hash = "sha256-3nDile9gDnaCLWqUYiK3TdiPF2gXzurphHawVO3ZQE8="; }; - npmDepsHash = "sha256-MN3kN2NKYak7/BgU9ZYsb/q42xEbFVeOSZxMowmXctU="; + npmDepsHash = "sha256-+T2zfUs8vvHnFtBimQtF4UUyLVwp+RpeklcZQxfHxHM="; postPatch = '' ln -s npm-shrinkwrap.json package-lock.json From 959816531b39b539c9ef3d2691fcfa15cf2bf6c5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 21 Aug 2025 09:15:09 +0000 Subject: [PATCH 023/146] terraform-providers.azurerm: 4.39.0 -> 4.40.0 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 84b977357eef..15983085b044 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -153,11 +153,11 @@ "vendorHash": null }, "azurerm": { - "hash": "sha256-YbnWigxznOZtY/lElLo/SEXnF3LPm6QKflnBoJ1B1Wo=", + "hash": "sha256-gwodjIFYg6BTIz3ORzWD6tUn2QXwXMN1KC5mMvxyjdE=", "homepage": "https://registry.terraform.io/providers/hashicorp/azurerm", "owner": "hashicorp", "repo": "terraform-provider-azurerm", - "rev": "v4.39.0", + "rev": "v4.40.0", "spdx": "MPL-2.0", "vendorHash": null }, From 339c0bf1c6124177bf0b60fe238fc257271df855 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 21 Aug 2025 10:30:56 +0000 Subject: [PATCH 024/146] parca-agent: 0.40.2 -> 0.41.0 --- pkgs/by-name/pa/parca-agent/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pa/parca-agent/package.nix b/pkgs/by-name/pa/parca-agent/package.nix index c6446e3a09aa..87c313b2fb9b 100644 --- a/pkgs/by-name/pa/parca-agent/package.nix +++ b/pkgs/by-name/pa/parca-agent/package.nix @@ -8,18 +8,18 @@ buildGoModule (finalAttrs: { pname = "parca-agent"; - version = "0.40.2"; + version = "0.41.0"; src = fetchFromGitHub { owner = "parca-dev"; repo = "parca-agent"; tag = "v${finalAttrs.version}"; - hash = "sha256-xGqHnnaRViD2HcTjOJoq/GYyw702BCY5hTIkbJm6HjQ="; + hash = "sha256-lWAdi6bgXZ5w68fZpAEUmWvbKmAdz9n92q80gzj21s8="; fetchSubmodules = true; }; proxyVendor = true; - vendorHash = "sha256-prZzLsLbxCCBNQDy4NEwGMcXRM2MFy7D46Kd37dL5bQ="; + vendorHash = "sha256-//a6hjQ+pqhNsuj76gqsJ7QKkbyktfY780i5Rmax7Ls="; buildInputs = [ stdenv.cc.libc.static From 13ce39e2ab2ab5951671026fe9da61bb231e31b4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 21 Aug 2025 10:35:27 +0000 Subject: [PATCH 025/146] ssdfs-utils: 4.57 -> 4.58 --- pkgs/by-name/ss/ssdfs-utils/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ss/ssdfs-utils/package.nix b/pkgs/by-name/ss/ssdfs-utils/package.nix index 9558822ce516..72f21319bf04 100644 --- a/pkgs/by-name/ss/ssdfs-utils/package.nix +++ b/pkgs/by-name/ss/ssdfs-utils/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation { # as ssdfs-utils, not ssdfs-tools. pname = "ssdfs-utils"; # The version is taken from `configure.ac`, there are no tags. - version = "4.57"; + version = "4.58"; src = fetchFromGitHub { owner = "dubeyko"; repo = "ssdfs-tools"; - rev = "fab40f45663ecd03f32ccf891691798db245bd04"; - hash = "sha256-9Eha2tqEBykhlF/GUX5nH1jYQlzEW7ou7mUbTL2A2r0="; + rev = "39d1ec5dc9f1a7ddc9d578d938a2f983191a93ac"; + hash = "sha256-IImfXP3RWljTwc69ll+z8NIR7vIxhVE1FFRmuCxYn9E="; }; strictDeps = true; From aff776b07662ea3861a81cc5c741b4b9965a0bcb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 21 Aug 2025 10:58:38 +0000 Subject: [PATCH 026/146] terraform-providers.baiducloud: 1.22.10 -> 1.22.11 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 84b977357eef..e9e1fe932f34 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -171,11 +171,11 @@ "vendorHash": null }, "baiducloud": { - "hash": "sha256-sF+S14e6o66iJj/X0jm8sVRmuEJv9UsmJvcLFTFTpVY=", + "hash": "sha256-zKkXfSIVVW0QxQB/fJNowy1mQPfXlv6HFcNaNlBSIvY=", "homepage": "https://registry.terraform.io/providers/baidubce/baiducloud", "owner": "baidubce", "repo": "terraform-provider-baiducloud", - "rev": "v1.22.10", + "rev": "v1.22.11", "spdx": "MPL-2.0", "vendorHash": null }, From 369dc8ced2fd36b9321cc48be9d7caa7bbc8bf46 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 21 Aug 2025 11:32:36 +0000 Subject: [PATCH 027/146] flowblade: 2.22.1 -> 2.22.1.1 --- pkgs/by-name/fl/flowblade/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fl/flowblade/package.nix b/pkgs/by-name/fl/flowblade/package.nix index cbb74ef1599f..f1feffd63bcc 100644 --- a/pkgs/by-name/fl/flowblade/package.nix +++ b/pkgs/by-name/fl/flowblade/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "flowblade"; - version = "2.22.1"; + version = "2.22.1.1"; src = fetchFromGitHub { owner = "jliljebl"; repo = "flowblade"; rev = "v${version}"; - sha256 = "sha256-wHZNzGUQ89aDel5DOGIFG+zjF2yrI/JoIumXcTc+APw="; + sha256 = "sha256-I9sh3FCN8zr5TF449rv/Xs8+Sb1xNWBmFcB7aKW3jVQ="; }; buildInputs = [ From f8acee5a749f4884599bdc71587155c7155f429c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 21 Aug 2025 12:30:30 +0000 Subject: [PATCH 028/146] python3Packages.oci: 2.158.0 -> 2.158.2 --- pkgs/development/python-modules/oci/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/oci/default.nix b/pkgs/development/python-modules/oci/default.nix index 10b816f8ba7d..8a2975e72ebf 100644 --- a/pkgs/development/python-modules/oci/default.nix +++ b/pkgs/development/python-modules/oci/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "oci"; - version = "2.158.0"; + version = "2.158.2"; pyproject = true; src = fetchFromGitHub { owner = "oracle"; repo = "oci-python-sdk"; tag = "v${version}"; - hash = "sha256-Xl2LMhIxYoytnrGuGYveCIGGFFJ3Yy4B9YKzrfBKHc4="; + hash = "sha256-ofZAfPqT+hApELG4dcCJj246PT6XWy5W2C4u2gGazwY="; }; pythonRelaxDeps = [ From 6fa9fc1e47de0f7f69198060dbcfbaf6affde118 Mon Sep 17 00:00:00 2001 From: Defelo Date: Thu, 21 Aug 2025 12:28:38 +0000 Subject: [PATCH 029/146] linuxPackages.rtl8821ce: 0-unstable-2025-05-31 -> 0-unstable-2025-08-20 Diff: https://github.com/tomaspinho/rtl8821ce/compare/66c015af7738039a2045b6da755875e126d3fe73...5df613d114d1ca6072aeaf9f64666029896eed61 --- pkgs/os-specific/linux/rtl8821ce/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/rtl8821ce/default.nix b/pkgs/os-specific/linux/rtl8821ce/default.nix index 77414c1a71ce..d3bd7772888a 100644 --- a/pkgs/os-specific/linux/rtl8821ce/default.nix +++ b/pkgs/os-specific/linux/rtl8821ce/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rtl8821ce"; - version = "0-unstable-2025-05-31"; + version = "0-unstable-2025-08-20"; src = fetchFromGitHub { owner = "tomaspinho"; repo = "rtl8821ce"; - rev = "66c015af7738039a2045b6da755875e126d3fe73"; - hash = "sha256-JU8ge2QpoR6nJe5G93iTEP7WOU6tLb4NJ1QrkEYUXRA="; + rev = "5df613d114d1ca6072aeaf9f64666029896eed61"; + hash = "sha256-JEaMfpu2F9Pcg7aLwKEUnRMMqC0Y0r1WRmHMCRba280="; }; hardeningDisable = [ "pic" ]; @@ -47,7 +47,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ defelo ]; broken = stdenv.hostPlatform.isAarch64 - || ((lib.versions.majorMinor kernel.version) == "5.4" && kernel.isHardened) - || kernel.kernelAtLeast "6.16"; + || ((lib.versions.majorMinor kernel.version) == "5.4" && kernel.isHardened); }; }) From 764af5bdd913669964a277db32dc26ea1ce13d49 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 21 Aug 2025 13:11:35 +0000 Subject: [PATCH 030/146] pipes-rs: 1.6.3 -> 1.6.4 --- pkgs/by-name/pi/pipes-rs/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pi/pipes-rs/package.nix b/pkgs/by-name/pi/pipes-rs/package.nix index 2486c143648a..544b4bc4fc6e 100644 --- a/pkgs/by-name/pi/pipes-rs/package.nix +++ b/pkgs/by-name/pi/pipes-rs/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "pipes-rs"; - version = "1.6.3"; + version = "1.6.4"; src = fetchFromGitHub { owner = "lhvy"; repo = "pipes-rs"; rev = "v${version}"; - sha256 = "sha256-NrBmkA7sV1RhfG9KEqQNMR5s0l2u66b7KK0toDjQIps="; + sha256 = "sha256-7FdC/VY1ZO4E/qDdeKzsIai8h5ZgMrSr1C+Ny4fYh38="; }; - cargoHash = "sha256-0up9S3+NjBV8zsvsyVANvITisMSBXsab6jFwt19gnQk="; + cargoHash = "sha256-TIVWl/9xSFsSXD9XzOHBvc/1HvI/radas00p4fZ/AzM="; doInstallCheck = true; From d6a1de56939bd6bd1190049a6662be1e7fbeee99 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Thu, 21 Aug 2025 16:06:07 +0300 Subject: [PATCH 031/146] lpac: add meta.changelog attribute --- pkgs/by-name/lp/lpac/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/lp/lpac/package.nix b/pkgs/by-name/lp/lpac/package.nix index 630ba90a31ab..904bb7941ed0 100644 --- a/pkgs/by-name/lp/lpac/package.nix +++ b/pkgs/by-name/lp/lpac/package.nix @@ -52,6 +52,7 @@ stdenv.mkDerivation (finalAttrs: { description = "C-based eUICC LPA"; homepage = "https://github.com/estkme-group/lpac"; mainProgram = "lpac"; + changelog = "https://github.com/estkme-group/lpac/releases/tag/v${finalAttrs.version}"; license = [ lib.licenses.agpl3Plus ] ++ optional withLibeuicc lib.licenses.lgpl21Plus; maintainers = with lib.maintainers; [ sarcasticadmin ]; platforms = lib.platforms.all; From 321ef47789534a97cbe21b97fa7be01490cd9599 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Thu, 21 Aug 2025 16:03:04 +0300 Subject: [PATCH 032/146] lpac: use cmakeBool --- pkgs/by-name/lp/lpac/package.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/lp/lpac/package.nix b/pkgs/by-name/lp/lpac/package.nix index 904bb7941ed0..3b43a5b4c300 100644 --- a/pkgs/by-name/lp/lpac/package.nix +++ b/pkgs/by-name/lp/lpac/package.nix @@ -30,9 +30,10 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ./lpac-version.patch ]; - cmakeFlags = - optional withDrivers "-DLPAC_DYNAMIC_DRIVERS=on" - ++ optional withLibeuicc "-DLPAC_DYNAMIC_LIBEUICC=on"; + cmakeFlags = [ + (lib.cmakeBool "LPAC_DYNAMIC_DRIVERS" withDrivers) + (lib.cmakeBool "LPAC_DYNAMIC_LIBEUICC" withLibeuicc) + ]; nativeBuildInputs = [ cmake From d6eeba2a3e981d80824992ccd26eac9863b5f7e1 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Thu, 21 Aug 2025 16:04:29 +0300 Subject: [PATCH 033/146] lpac: 2.2.1 -> 2.3.0 See changelog at https://github.com/estkme-group/lpac/releases/tag/v2.3.0 --- pkgs/by-name/lp/lpac/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/lp/lpac/package.nix b/pkgs/by-name/lp/lpac/package.nix index 3b43a5b4c300..4b57a53a441a 100644 --- a/pkgs/by-name/lp/lpac/package.nix +++ b/pkgs/by-name/lp/lpac/package.nix @@ -17,13 +17,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "lpac"; - version = "2.2.1"; + version = "2.3.0"; src = fetchFromGitHub { owner = "estkme-group"; repo = "lpac"; tag = "v${finalAttrs.version}"; - hash = "sha256-dxoYuX3dNj4piXQBqU4w1ICeyOGid35c+6ZITQiN6wA="; + hash = "sha256-ALne5sHB6ff7cHAWe0rFwpP/Yz4EhZBiOrgdM2B8+OE="; }; env.LPAC_VERSION = finalAttrs.version; From ac7a93fb4a4ed9cabb6012c59000bc5218b57c4d Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Thu, 21 Aug 2025 16:10:10 +0300 Subject: [PATCH 034/146] lpac: install docs Regrettably there's no manpages yet, but USAGE.md and ENVVARS.md are super useful. --- pkgs/by-name/lp/lpac/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/lp/lpac/package.nix b/pkgs/by-name/lp/lpac/package.nix index 4b57a53a441a..42eeb48f995e 100644 --- a/pkgs/by-name/lp/lpac/package.nix +++ b/pkgs/by-name/lp/lpac/package.nix @@ -45,6 +45,11 @@ stdenv.mkDerivation (finalAttrs: { pcsclite ]; + postInstall = '' + mkdir -p $out/share/doc/lpac + cp -vr $src/docs/* $out/share/doc/lpac + ''; + passthru = { updateScript = nix-update-script { attrPath = finalAttrs.pname; }; }; From aba5e04b792772ef1d9ddf8d4b271565ea9baadc Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Thu, 21 Aug 2025 16:17:53 +0300 Subject: [PATCH 035/146] lpac: support qmi and mbim With this, I can successfully talk to a 9esim card plugged into a Quectel EC25 LTE modem, setting PAC_APDU_QMI_DEVICE=/dev/cdc-wdm0 and LPAC_APDU=qmi. --- pkgs/by-name/lp/lpac/package.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/lp/lpac/package.nix b/pkgs/by-name/lp/lpac/package.nix index 42eeb48f995e..dec353ca3f32 100644 --- a/pkgs/by-name/lp/lpac/package.nix +++ b/pkgs/by-name/lp/lpac/package.nix @@ -6,8 +6,12 @@ pkg-config, pcsclite, curl, + libmbim, + libqmi, withDrivers ? true, withLibeuicc ? true, + withMbim ? true, + withQmi ? true, nix-update-script, }: @@ -33,6 +37,8 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ (lib.cmakeBool "LPAC_DYNAMIC_DRIVERS" withDrivers) (lib.cmakeBool "LPAC_DYNAMIC_LIBEUICC" withLibeuicc) + (lib.cmakeBool "LPAC_WITH_APDU_MBIM" withMbim) + (lib.cmakeBool "LPAC_WITH_APDU_QMI" withQmi) ]; nativeBuildInputs = [ @@ -43,7 +49,9 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ curl pcsclite - ]; + ] + ++ optional withMbim libmbim + ++ optional withQmi libqmi; postInstall = '' mkdir -p $out/share/doc/lpac From 2237ea17e8a3538ea83051254b1563a812b8e4f7 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 21 Aug 2025 11:41:25 +0200 Subject: [PATCH 036/146] helmfile: move to by-name --- .../helmfile/default.nix => by-name/he/helmfile/package.nix} | 0 pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 1 insertion(+), 3 deletions(-) rename pkgs/{applications/networking/cluster/helmfile/default.nix => by-name/he/helmfile/package.nix} (100%) diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/by-name/he/helmfile/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/helmfile/default.nix rename to pkgs/by-name/he/helmfile/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 556b25890efd..26999dd5ecb3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15371,9 +15371,7 @@ with pkgs; buildGoModule = buildGo123Module; }; - helmfile = callPackage ../applications/networking/cluster/helmfile { }; - - helmfile-wrapped = callPackage ../applications/networking/cluster/helmfile { + helmfile-wrapped = helmfile.override { inherit (kubernetes-helm-wrapped.passthru) pluginsDir; }; From af5e7a53c98d8c8d0f7ceb296c05458255c8dee5 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 21 Aug 2025 11:42:46 +0200 Subject: [PATCH 037/146] gowitness: move to by-name --- .../default.nix => by-name/go/gowitness/package.nix} | 4 ++-- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) rename pkgs/{tools/security/gowitness/default.nix => by-name/go/gowitness/package.nix} (93%) diff --git a/pkgs/tools/security/gowitness/default.nix b/pkgs/by-name/go/gowitness/package.nix similarity index 93% rename from pkgs/tools/security/gowitness/default.nix rename to pkgs/by-name/go/gowitness/package.nix index 58e369c78a25..98283599f457 100644 --- a/pkgs/tools/security/gowitness/default.nix +++ b/pkgs/by-name/go/gowitness/package.nix @@ -1,10 +1,10 @@ { lib, - buildGoModule, + buildGo123Module, fetchFromGitHub, }: -buildGoModule rec { +buildGo123Module rec { pname = "gowitness"; version = "3.0.5"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 26999dd5ecb3..a5d53065ffd2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15367,10 +15367,6 @@ with pkgs; gotrue-supabase = callPackage ../tools/security/gotrue/supabase.nix { }; - gowitness = callPackage ../tools/security/gowitness { - buildGoModule = buildGo123Module; - }; - helmfile-wrapped = helmfile.override { inherit (kubernetes-helm-wrapped.passthru) pluginsDir; }; From 58aa71747c70e63ba53c81dd949d6e2e1853297c Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 21 Aug 2025 11:44:03 +0200 Subject: [PATCH 038/146] gotrue-supabase: move to by-name --- .../supabase.nix => by-name/go/gotrue-supabase/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/security/gotrue/supabase.nix => by-name/go/gotrue-supabase/package.nix} (100%) diff --git a/pkgs/tools/security/gotrue/supabase.nix b/pkgs/by-name/go/gotrue-supabase/package.nix similarity index 100% rename from pkgs/tools/security/gotrue/supabase.nix rename to pkgs/by-name/go/gotrue-supabase/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a5d53065ffd2..1c2b27c1dea4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15365,8 +15365,6 @@ with pkgs; gotrue = callPackage ../tools/security/gotrue { }; - gotrue-supabase = callPackage ../tools/security/gotrue/supabase.nix { }; - helmfile-wrapped = helmfile.override { inherit (kubernetes-helm-wrapped.passthru) pluginsDir; }; From 61b4cfbd6ee992d7c955e97d38ef564b6c4049dd Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 21 Aug 2025 11:44:49 +0200 Subject: [PATCH 039/146] gotrue: move to by-name --- .../gotrue/default.nix => by-name/go/gotrue/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/security/gotrue/default.nix => by-name/go/gotrue/package.nix} (100%) diff --git a/pkgs/tools/security/gotrue/default.nix b/pkgs/by-name/go/gotrue/package.nix similarity index 100% rename from pkgs/tools/security/gotrue/default.nix rename to pkgs/by-name/go/gotrue/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1c2b27c1dea4..dfc514d882da 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15363,8 +15363,6 @@ with pkgs; binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils; }; - gotrue = callPackage ../tools/security/gotrue { }; - helmfile-wrapped = helmfile.override { inherit (kubernetes-helm-wrapped.passthru) pluginsDir; }; From 3b5ed6c7888ac952a4d6fe275fa9a5f1e8d4f79d Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 21 Aug 2025 11:46:28 +0200 Subject: [PATCH 040/146] fahclient: move to by-name --- .../client.nix => by-name/fa/fahclient/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/science/misc/foldingathome/client.nix => by-name/fa/fahclient/package.nix} (100%) diff --git a/pkgs/applications/science/misc/foldingathome/client.nix b/pkgs/by-name/fa/fahclient/package.nix similarity index 100% rename from pkgs/applications/science/misc/foldingathome/client.nix rename to pkgs/by-name/fa/fahclient/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dfc514d882da..ae9960872814 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15351,8 +15351,6 @@ with pkgs; flashprint = libsForQt5.callPackage ../applications/misc/flashprint { }; - fahclient = callPackage ../applications/science/misc/foldingathome/client.nix { }; - gajim = callPackage ../applications/networking/instant-messengers/gajim { inherit (gst_all_1) gstreamer gst-plugins-base gst-libav; gst-plugins-good = gst_all_1.gst-plugins-good.override { gtkSupport = true; }; From abf4e3a84661392ac37d84666754c88899529540 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 21 Aug 2025 11:49:19 +0200 Subject: [PATCH 041/146] gutenprint-bin: move to by-name --- .../bin.nix => by-name/gu/gutenprint-bin/package.nix} | 10 +++++----- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 6 insertions(+), 7 deletions(-) rename pkgs/{misc/drivers/gutenprint/bin.nix => by-name/gu/gutenprint-bin/package.nix} (80%) diff --git a/pkgs/misc/drivers/gutenprint/bin.nix b/pkgs/by-name/gu/gutenprint-bin/package.nix similarity index 80% rename from pkgs/misc/drivers/gutenprint/bin.nix rename to pkgs/by-name/gu/gutenprint-bin/package.nix index 66cf34baa2aa..bfd52df28b88 100644 --- a/pkgs/misc/drivers/gutenprint/bin.nix +++ b/pkgs/by-name/gu/gutenprint-bin/package.nix @@ -11,15 +11,15 @@ usage: (sorry, its still impure but works!) impure directory: - mkdir /opt/gutenprint; sudo cp -r $(nix-build -A gutenprintBin -f $NIXPGS_ALL) /opt/gutenprint + mkdir /opt/gutenprint; sudo cp -r $(nix-build -A gutenprint-bin -f $NIXPGS_ALL) /opt/gutenprint add the following lines to bindirCmds property of printing/cupsd.nix: - ln -s ${pkgs.gutenprintBin}/lib/cups/backend/* $out/lib/cups/backend/ - ln -s ${pkgs.gutenprintBin}/lib/cups/filter/* $out/lib/cups/filter/ + ln -s ${pkgs.gutenprint-bin}/lib/cups/backend/* $out/lib/cups/backend/ + ln -s ${pkgs.gutenprint-bin}/lib/cups/filter/* $out/lib/cups/filter/ mkdir -p $out/lib/cups/model - cat ${pkgs.gutenprintBin}/ppds/Canon/Canon-PIXMA_iP4000-gutenprint.5.0.sim-en.ppd.gz |gunzip > $out/lib/cups/model/Canon-PIXMA_iP4000-gutenprint.5.0.sim-en.ppd - sed -i 's@/opt/gutenprint/cups@${pkgs.gutenprintBin}/cups@' $out/lib/cups/model/Canon-PIXMA_iP4000-gutenprint.5.0.sim-en.ppd + cat ${pkgs.gutenprint-bin}/ppds/Canon/Canon-PIXMA_iP4000-gutenprint.5.0.sim-en.ppd.gz |gunzip > $out/lib/cups/model/Canon-PIXMA_iP4000-gutenprint.5.0.sim-en.ppd + sed -i 's@/opt/gutenprint/cups@${pkgs.gutenprint-bin}/cups@' $out/lib/cups/model/Canon-PIXMA_iP4000-gutenprint.5.0.sim-en.ppd Then rebuild your system and add your printer using the the localhost:603 cups web interface select the extracted .ppd file which can be found in the model directory of diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 420b5c033719..97dcb738c696 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -918,6 +918,7 @@ mapAliases { gtkperf = throw "'gtkperf' has been removed due to lack of maintenance upstream"; # Added 2024-09-14 guardian-agent = throw "'guardian-agent' has been removed, as it hasn't been maintained upstream in years and accumulated many vulnerabilities"; # Added 2024-06-09 guile-disarchive = disarchive; # Added 2023-10-27 + gutenprintBin = gutenprint-bin; # Added 2025-08-21 ### H ### diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ae9960872814..4af2803115eb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15322,8 +15322,6 @@ with pkgs; gutenprint = callPackage ../misc/drivers/gutenprint { }; - gutenprintBin = callPackage ../misc/drivers/gutenprint/bin.nix { }; - dcp375cwlpr = (pkgsi686Linux.callPackage ../misc/cups/drivers/brother/dcp375cw { }).driver; dcp375cw-cupswrapper = (callPackage ../misc/cups/drivers/brother/dcp375cw { }).cupswrapper; From 634dd2f743756b6461f6f89dcb4b3ba880a27d49 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 21 Aug 2025 11:51:35 +0200 Subject: [PATCH 042/146] gutenprint: move to by-name --- .../default.nix => by-name/gu/gutenprint/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{misc/drivers/gutenprint/default.nix => by-name/gu/gutenprint/package.nix} (100%) diff --git a/pkgs/misc/drivers/gutenprint/default.nix b/pkgs/by-name/gu/gutenprint/package.nix similarity index 100% rename from pkgs/misc/drivers/gutenprint/default.nix rename to pkgs/by-name/gu/gutenprint/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4af2803115eb..712827fb410f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15320,8 +15320,6 @@ with pkgs; withNonfreeDb = true; }; - gutenprint = callPackage ../misc/drivers/gutenprint { }; - dcp375cwlpr = (pkgsi686Linux.callPackage ../misc/cups/drivers/brother/dcp375cw { }).driver; dcp375cw-cupswrapper = (callPackage ../misc/cups/drivers/brother/dcp375cw { }).cupswrapper; From f881edd2302b954fc745effb1f1783391bbcd2d3 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 21 Aug 2025 11:52:56 +0200 Subject: [PATCH 043/146] cups-pk-helper: move to by-name --- .../cu/cups-pk-helper/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{misc/cups/cups-pk-helper.nix => by-name/cu/cups-pk-helper/package.nix} (100%) diff --git a/pkgs/misc/cups/cups-pk-helper.nix b/pkgs/by-name/cu/cups-pk-helper/package.nix similarity index 100% rename from pkgs/misc/cups/cups-pk-helper.nix rename to pkgs/by-name/cu/cups-pk-helper/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 712827fb410f..d91bd0710c74 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15314,8 +15314,6 @@ with pkgs; cups-filters = callPackage ../misc/cups/filters.nix { }; - cups-pk-helper = callPackage ../misc/cups/cups-pk-helper.nix { }; - foomatic-db-ppds-withNonfreeDb = callPackage ../by-name/fo/foomatic-db-ppds/package.nix { withNonfreeDb = true; }; From d8cf97574277a3791804181580e0e91b8ef1b879 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 21 Aug 2025 11:54:54 +0200 Subject: [PATCH 044/146] cups-filters: move to by-name --- .../cups/filters.nix => by-name/cu/cups-filters/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{misc/cups/filters.nix => by-name/cu/cups-filters/package.nix} (100%) diff --git a/pkgs/misc/cups/filters.nix b/pkgs/by-name/cu/cups-filters/package.nix similarity index 100% rename from pkgs/misc/cups/filters.nix rename to pkgs/by-name/cu/cups-filters/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d91bd0710c74..01f167d8db79 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15312,8 +15312,6 @@ with pkgs; cups = callPackage ../misc/cups { }; - cups-filters = callPackage ../misc/cups/filters.nix { }; - foomatic-db-ppds-withNonfreeDb = callPackage ../by-name/fo/foomatic-db-ppds/package.nix { withNonfreeDb = true; }; From f6d28c8cc7ed09b710fdebe36b2c8ea0eb857481 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 21 Aug 2025 11:55:56 +0200 Subject: [PATCH 045/146] cups: move to by-name --- pkgs/{misc/cups/default.nix => by-name/cu/cups/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{misc/cups/default.nix => by-name/cu/cups/package.nix} (100%) diff --git a/pkgs/misc/cups/default.nix b/pkgs/by-name/cu/cups/package.nix similarity index 100% rename from pkgs/misc/cups/default.nix rename to pkgs/by-name/cu/cups/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 01f167d8db79..dfa45aa510e5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15310,8 +15310,6 @@ with pkgs; brgenml1lpr = pkgsi686Linux.callPackage ../misc/cups/drivers/brgenml1lpr { }; - cups = callPackage ../misc/cups { }; - foomatic-db-ppds-withNonfreeDb = callPackage ../by-name/fo/foomatic-db-ppds/package.nix { withNonfreeDb = true; }; From 5f7d2e6cc7bff2bb160183d084243bc8891e00d2 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 21 Aug 2025 11:57:28 +0200 Subject: [PATCH 046/146] avell-unofficial-control-center: move to by-name --- .../av/avell-unofficial-control-center/package.nix} | 0 pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 4 deletions(-) rename pkgs/{applications/misc/avell-unofficial-control-center/default.nix => by-name/av/avell-unofficial-control-center/package.nix} (100%) diff --git a/pkgs/applications/misc/avell-unofficial-control-center/default.nix b/pkgs/by-name/av/avell-unofficial-control-center/package.nix similarity index 100% rename from pkgs/applications/misc/avell-unofficial-control-center/default.nix rename to pkgs/by-name/av/avell-unofficial-control-center/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dfa45aa510e5..843981ca7e6b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15304,10 +15304,6 @@ with pkgs; autotiling = python3Packages.callPackage ../misc/autotiling { }; - avell-unofficial-control-center = - callPackage ../applications/misc/avell-unofficial-control-center - { }; - brgenml1lpr = pkgsi686Linux.callPackage ../misc/cups/drivers/brgenml1lpr { }; foomatic-db-ppds-withNonfreeDb = callPackage ../by-name/fo/foomatic-db-ppds/package.nix { From ccdc27d78cad18e5cd5fee8e65656d67b555c631 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 21 Aug 2025 12:02:01 +0200 Subject: [PATCH 047/146] golly: move to by-name --- .../misc/golly/default.nix => by-name/go/golly/package.nix} | 6 +++--- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 3 insertions(+), 7 deletions(-) rename pkgs/{applications/science/misc/golly/default.nix => by-name/go/golly/package.nix} (95%) diff --git a/pkgs/applications/science/misc/golly/default.nix b/pkgs/by-name/go/golly/package.nix similarity index 95% rename from pkgs/applications/science/misc/golly/default.nix rename to pkgs/by-name/go/golly/package.nix index b45a945fec46..1388a41d10b8 100644 --- a/pkgs/applications/science/misc/golly/default.nix +++ b/pkgs/by-name/go/golly/package.nix @@ -3,7 +3,7 @@ stdenv, fetchurl, wrapGAppsHook3, - wxGTK, + wxGTK32, python3, zlib, libGLU, @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { }; buildInputs = [ - wxGTK + wxGTK32 python3 zlib libGLU @@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: { "CXX=${stdenv.cc.targetPrefix}c++" "CXXC=${stdenv.cc.targetPrefix}c++" "LD=${stdenv.cc.targetPrefix}c++" - "WX_CONFIG=${lib.getExe' (lib.getDev wxGTK) "wx-config"}" + "WX_CONFIG=${lib.getExe' (lib.getDev wxGTK32) "wx-config"}" ]; installPhase = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 843981ca7e6b..a39f82402cec 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15260,10 +15260,6 @@ with pkgs; gplates = libsForQt5.callPackage ../applications/science/misc/gplates { }; - golly = callPackage ../applications/science/misc/golly { - wxGTK = wxGTK32; - }; - megam = callPackage ../applications/science/misc/megam { inherit (ocaml-ng.ocamlPackages_4_14) ocaml; }; From aa1a6c5d2e007c2e5b0a2e647394ee428403cda3 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 21 Aug 2025 12:03:34 +0200 Subject: [PATCH 048/146] cytoscape: move to by-name --- .../cy}/cytoscape/gen_vmoptions_to_homedir.patch | 0 .../default.nix => by-name/cy/cytoscape/package.nix} | 8 ++++---- pkgs/top-level/all-packages.nix | 4 ---- 3 files changed, 4 insertions(+), 8 deletions(-) rename pkgs/{applications/science/misc => by-name/cy}/cytoscape/gen_vmoptions_to_homedir.patch (100%) rename pkgs/{applications/science/misc/cytoscape/default.nix => by-name/cy/cytoscape/package.nix} (90%) diff --git a/pkgs/applications/science/misc/cytoscape/gen_vmoptions_to_homedir.patch b/pkgs/by-name/cy/cytoscape/gen_vmoptions_to_homedir.patch similarity index 100% rename from pkgs/applications/science/misc/cytoscape/gen_vmoptions_to_homedir.patch rename to pkgs/by-name/cy/cytoscape/gen_vmoptions_to_homedir.patch diff --git a/pkgs/applications/science/misc/cytoscape/default.nix b/pkgs/by-name/cy/cytoscape/package.nix similarity index 90% rename from pkgs/applications/science/misc/cytoscape/default.nix rename to pkgs/by-name/cy/cytoscape/package.nix index 9be37db1b6d0..42b13f74000f 100644 --- a/pkgs/applications/science/misc/cytoscape/default.nix +++ b/pkgs/by-name/cy/cytoscape/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchurl, - jre, + openjdk17, makeWrapper, replaceVars, coreutils, @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ jre ]; + buildInputs = [ openjdk17 ]; installPhase = '' mkdir -pv $out/{share,bin} @@ -35,8 +35,8 @@ stdenv.mkDerivation rec { ln -s $out/share/cytoscape.sh $out/bin/cytoscape wrapProgram $out/share/cytoscape.sh \ - --set JAVA_HOME "${jre}" \ - --set JAVA "${jre}/bin/java" + --set JAVA_HOME "${openjdk17}" \ + --set JAVA "${openjdk17}/bin/java" chmod +x $out/bin/cytoscape ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a39f82402cec..dacc4a7d7ffd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15250,10 +15250,6 @@ with pkgs; convertall = qt5.callPackage ../applications/science/misc/convertall { }; - cytoscape = callPackage ../applications/science/misc/cytoscape { - jre = openjdk17; - }; - faissWithCuda = faiss.override { cudaSupport = true; }; From 9071245fdff905b64fe574ea36daad615615bd49 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 21 Aug 2025 12:04:38 +0200 Subject: [PATCH 049/146] boinc: move to by-name --- .../misc/boinc/default.nix => by-name/bo/boinc/package.nix} | 0 pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 1 insertion(+), 3 deletions(-) rename pkgs/{applications/science/misc/boinc/default.nix => by-name/bo/boinc/package.nix} (100%) diff --git a/pkgs/applications/science/misc/boinc/default.nix b/pkgs/by-name/bo/boinc/package.nix similarity index 100% rename from pkgs/applications/science/misc/boinc/default.nix rename to pkgs/by-name/bo/boinc/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dacc4a7d7ffd..a9a825ed9ad1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15240,9 +15240,7 @@ with pkgs; ### SCIENCE / MISC - boinc = callPackage ../applications/science/misc/boinc { }; - - boinc-headless = callPackage ../applications/science/misc/boinc { headless = true; }; + boinc-headless = boinc.override { headless = true; }; celestia = callPackage ../applications/science/astronomy/celestia { inherit (gnome2) gtkglext; From 36fa7b12c19d087ed03a270103a538ad781ed06c Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 21 Aug 2025 12:29:59 +0200 Subject: [PATCH 050/146] raspa-data: move to by-name --- .../raspa/data.nix => by-name/ra/raspa-data/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/science/molecular-dynamics/raspa/data.nix => by-name/ra/raspa-data/package.nix} (100%) diff --git a/pkgs/applications/science/molecular-dynamics/raspa/data.nix b/pkgs/by-name/ra/raspa-data/package.nix similarity index 100% rename from pkgs/applications/science/molecular-dynamics/raspa/data.nix rename to pkgs/by-name/ra/raspa-data/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a9a825ed9ad1..85be01257a87 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15227,8 +15227,6 @@ with pkgs; raspa = callPackage ../applications/science/molecular-dynamics/raspa { }; - raspa-data = callPackage ../applications/science/molecular-dynamics/raspa/data.nix { }; - yacas = libsForQt5.callPackage ../applications/science/math/yacas { }; yacas-gui = yacas.override { From 6faab6e866db7bb2844113716c5a73c9f21f2307 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 21 Aug 2025 12:30:22 +0200 Subject: [PATCH 051/146] raspa: move to by-name --- .../raspa/default.nix => by-name/ra/raspa/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/science/molecular-dynamics/raspa/default.nix => by-name/ra/raspa/package.nix} (100%) diff --git a/pkgs/applications/science/molecular-dynamics/raspa/default.nix b/pkgs/by-name/ra/raspa/package.nix similarity index 100% rename from pkgs/applications/science/molecular-dynamics/raspa/default.nix rename to pkgs/by-name/ra/raspa/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 85be01257a87..7a4c2a655d83 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15225,8 +15225,6 @@ with pkgs; pari = callPackage ../applications/science/math/pari { }; gp2c = callPackage ../applications/science/math/pari/gp2c.nix { }; - raspa = callPackage ../applications/science/molecular-dynamics/raspa { }; - yacas = libsForQt5.callPackage ../applications/science/math/yacas { }; yacas-gui = yacas.override { From 7848b51567e942391306484271ad193731266679 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 21 Aug 2025 12:31:46 +0200 Subject: [PATCH 052/146] gp2c: move to by-name --- .../science/math/pari/gp2c.nix => by-name/gp/gp2c/package.nix} | 0 pkgs/top-level/all-packages.nix | 1 - 2 files changed, 1 deletion(-) rename pkgs/{applications/science/math/pari/gp2c.nix => by-name/gp/gp2c/package.nix} (100%) diff --git a/pkgs/applications/science/math/pari/gp2c.nix b/pkgs/by-name/gp/gp2c/package.nix similarity index 100% rename from pkgs/applications/science/math/pari/gp2c.nix rename to pkgs/by-name/gp/gp2c/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7a4c2a655d83..9fa5ae7a5043 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15223,7 +15223,6 @@ with pkgs; }; pari = callPackage ../applications/science/math/pari { }; - gp2c = callPackage ../applications/science/math/pari/gp2c.nix { }; yacas = libsForQt5.callPackage ../applications/science/math/yacas { }; From e63d260e7642c1f25fc4f1f8f342d09660730cad Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 21 Aug 2025 12:32:30 +0200 Subject: [PATCH 053/146] pari: move to by-name --- .../math/pari/default.nix => by-name/pa/pari/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/science/math/pari/default.nix => by-name/pa/pari/package.nix} (100%) diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/by-name/pa/pari/package.nix similarity index 100% rename from pkgs/applications/science/math/pari/default.nix rename to pkgs/by-name/pa/pari/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9fa5ae7a5043..e8fc02fac437 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15222,8 +15222,6 @@ with pkgs; }; }; - pari = callPackage ../applications/science/math/pari { }; - yacas = libsForQt5.callPackage ../applications/science/math/yacas { }; yacas-gui = yacas.override { From 826df19a28ca8a46416ebbfeafbe74748aec14e9 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 21 Aug 2025 12:33:44 +0200 Subject: [PATCH 054/146] geogebra6: move to by-name --- .../geogebra/geogebra6.nix => by-name/ge/geogebra6/package.nix} | 0 pkgs/top-level/all-packages.nix | 1 - 2 files changed, 1 deletion(-) rename pkgs/{applications/science/math/geogebra/geogebra6.nix => by-name/ge/geogebra6/package.nix} (100%) diff --git a/pkgs/applications/science/math/geogebra/geogebra6.nix b/pkgs/by-name/ge/geogebra6/package.nix similarity index 100% rename from pkgs/applications/science/math/geogebra/geogebra6.nix rename to pkgs/by-name/ge/geogebra6/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e8fc02fac437..657de53fc7fb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15207,7 +15207,6 @@ with pkgs; gap-full = lowPrio (gap.override { packageSet = "full"; }); geogebra = callPackage ../applications/science/math/geogebra { }; - geogebra6 = callPackage ../applications/science/math/geogebra/geogebra6.nix { }; maxima = callPackage ../applications/science/math/maxima { lisp-compiler = sbcl; From 54109fef0218697d619a4a14a75c53f3aa15b359 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 21 Aug 2025 12:34:22 +0200 Subject: [PATCH 055/146] geogebra: move to by-name --- .../geogebra/default.nix => by-name/ge/geogebra/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/science/math/geogebra/default.nix => by-name/ge/geogebra/package.nix} (100%) diff --git a/pkgs/applications/science/math/geogebra/default.nix b/pkgs/by-name/ge/geogebra/package.nix similarity index 100% rename from pkgs/applications/science/math/geogebra/default.nix rename to pkgs/by-name/ge/geogebra/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 657de53fc7fb..4cff8eb1308f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15206,8 +15206,6 @@ with pkgs; gap-full = lowPrio (gap.override { packageSet = "full"; }); - geogebra = callPackage ../applications/science/math/geogebra { }; - maxima = callPackage ../applications/science/math/maxima { lisp-compiler = sbcl; }; From 4cba7aaa04c4698336c5f63677171bd7e61a2151 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 21 Aug 2025 12:36:11 +0200 Subject: [PATCH 056/146] avy: move to by-name --- .../science/logic/satallax/default.nix | 2 +- .../{avy => satallax}/minisat-fenv.patch | 0 .../science/logic/vampire/default.nix | 2 +- .../science/logic/vampire/minisat-fenv.patch | 57 +++++++++++++++++++ .../av}/avy/glucose-fenv.patch | 0 pkgs/by-name/av/avy/minisat-fenv.patch | 57 +++++++++++++++++++ .../av/avy/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 - 8 files changed, 116 insertions(+), 4 deletions(-) rename pkgs/applications/science/logic/{avy => satallax}/minisat-fenv.patch (100%) create mode 100644 pkgs/applications/science/logic/vampire/minisat-fenv.patch rename pkgs/{applications/science/logic => by-name/av}/avy/glucose-fenv.patch (100%) create mode 100644 pkgs/by-name/av/avy/minisat-fenv.patch rename pkgs/{applications/science/logic/avy/default.nix => by-name/av/avy/package.nix} (100%) diff --git a/pkgs/applications/science/logic/satallax/default.nix b/pkgs/applications/science/logic/satallax/default.nix index ff1bb99dac34..0c149fdb5be1 100644 --- a/pkgs/applications/science/logic/satallax/default.nix +++ b/pkgs/applications/science/logic/satallax/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ]; prePatch = '' - patch -p1 -i ${../avy/minisat-fenv.patch} -d minisat + patch -p1 -i ${./minisat-fenv.patch} -d minisat ''; preConfigure = '' diff --git a/pkgs/applications/science/logic/avy/minisat-fenv.patch b/pkgs/applications/science/logic/satallax/minisat-fenv.patch similarity index 100% rename from pkgs/applications/science/logic/avy/minisat-fenv.patch rename to pkgs/applications/science/logic/satallax/minisat-fenv.patch diff --git a/pkgs/applications/science/logic/vampire/default.nix b/pkgs/applications/science/logic/vampire/default.nix index 7e8f209702f8..8f73a2cb210d 100644 --- a/pkgs/applications/science/logic/vampire/default.nix +++ b/pkgs/applications/science/logic/vampire/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ]; postPatch = '' - patch -p1 -i ${../avy/minisat-fenv.patch} -d Minisat || true + patch -p1 -i ${./minisat-fenv.patch} -d Minisat || true ''; enableParallelBuilding = true; diff --git a/pkgs/applications/science/logic/vampire/minisat-fenv.patch b/pkgs/applications/science/logic/vampire/minisat-fenv.patch new file mode 100644 index 000000000000..31e481bd6696 --- /dev/null +++ b/pkgs/applications/science/logic/vampire/minisat-fenv.patch @@ -0,0 +1,57 @@ +diff --git a/core/Main.cc b/core/Main.cc +index 2b0d97b..9ba985d 100644 +--- a/core/Main.cc ++++ b/core/Main.cc +@@ -77,9 +77,13 @@ int main(int argc, char** argv) + setUsageHelp("USAGE: %s [options] \n\n where input may be either in plain or gzipped DIMACS.\n"); + // printf("This is MiniSat 2.0 beta\n"); + +-#if defined(__linux__) +- fpu_control_t oldcw, newcw; +- _FPU_GETCW(oldcw); newcw = (oldcw & ~_FPU_EXTENDED) | _FPU_DOUBLE; _FPU_SETCW(newcw); ++#if defined(__linux__) && defined(__x86_64__) ++ fenv_t fenv; ++ ++ fegetenv(&fenv); ++ fenv.__control_word &= ~0x300; /* _FPU_EXTENDED */ ++ fenv.__control_word |= 0x200; /* _FPU_DOUBLE */ ++ fesetenv(&fenv); + printf("WARNING: for repeatability, setting FPU to use double precision\n"); + #endif + // Extra options: +diff --git a/simp/Main.cc b/simp/Main.cc +index 2804d7f..7fbdb33 100644 +--- a/simp/Main.cc ++++ b/simp/Main.cc +@@ -78,9 +78,13 @@ int main(int argc, char** argv) + setUsageHelp("USAGE: %s [options] \n\n where input may be either in plain or gzipped DIMACS.\n"); + // printf("This is MiniSat 2.0 beta\n"); + +-#if defined(__linux__) +- fpu_control_t oldcw, newcw; +- _FPU_GETCW(oldcw); newcw = (oldcw & ~_FPU_EXTENDED) | _FPU_DOUBLE; _FPU_SETCW(newcw); ++#if defined(__linux__) && defined(__x86_64__) ++ fenv_t fenv; ++ ++ fegetenv(&fenv); ++ fenv.__control_word &= ~0x300; /* _FPU_EXTENDED */ ++ fenv.__control_word |= 0x200; /* _FPU_DOUBLE */ ++ fesetenv(&fenv); + printf("WARNING: for repeatability, setting FPU to use double precision\n"); + #endif + // Extra options: +diff --git a/utils/System.h b/utils/System.h +index 1758192..840bee5 100644 +--- a/utils/System.h ++++ b/utils/System.h +@@ -21,8 +21,8 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA + #ifndef Minisat_System_h + #define Minisat_System_h + +-#if defined(__linux__) +-#include ++#if defined(__linux__) && defined(__x86_64__) ++#include + #endif + + #include "mtl/IntTypes.h" diff --git a/pkgs/applications/science/logic/avy/glucose-fenv.patch b/pkgs/by-name/av/avy/glucose-fenv.patch similarity index 100% rename from pkgs/applications/science/logic/avy/glucose-fenv.patch rename to pkgs/by-name/av/avy/glucose-fenv.patch diff --git a/pkgs/by-name/av/avy/minisat-fenv.patch b/pkgs/by-name/av/avy/minisat-fenv.patch new file mode 100644 index 000000000000..31e481bd6696 --- /dev/null +++ b/pkgs/by-name/av/avy/minisat-fenv.patch @@ -0,0 +1,57 @@ +diff --git a/core/Main.cc b/core/Main.cc +index 2b0d97b..9ba985d 100644 +--- a/core/Main.cc ++++ b/core/Main.cc +@@ -77,9 +77,13 @@ int main(int argc, char** argv) + setUsageHelp("USAGE: %s [options] \n\n where input may be either in plain or gzipped DIMACS.\n"); + // printf("This is MiniSat 2.0 beta\n"); + +-#if defined(__linux__) +- fpu_control_t oldcw, newcw; +- _FPU_GETCW(oldcw); newcw = (oldcw & ~_FPU_EXTENDED) | _FPU_DOUBLE; _FPU_SETCW(newcw); ++#if defined(__linux__) && defined(__x86_64__) ++ fenv_t fenv; ++ ++ fegetenv(&fenv); ++ fenv.__control_word &= ~0x300; /* _FPU_EXTENDED */ ++ fenv.__control_word |= 0x200; /* _FPU_DOUBLE */ ++ fesetenv(&fenv); + printf("WARNING: for repeatability, setting FPU to use double precision\n"); + #endif + // Extra options: +diff --git a/simp/Main.cc b/simp/Main.cc +index 2804d7f..7fbdb33 100644 +--- a/simp/Main.cc ++++ b/simp/Main.cc +@@ -78,9 +78,13 @@ int main(int argc, char** argv) + setUsageHelp("USAGE: %s [options] \n\n where input may be either in plain or gzipped DIMACS.\n"); + // printf("This is MiniSat 2.0 beta\n"); + +-#if defined(__linux__) +- fpu_control_t oldcw, newcw; +- _FPU_GETCW(oldcw); newcw = (oldcw & ~_FPU_EXTENDED) | _FPU_DOUBLE; _FPU_SETCW(newcw); ++#if defined(__linux__) && defined(__x86_64__) ++ fenv_t fenv; ++ ++ fegetenv(&fenv); ++ fenv.__control_word &= ~0x300; /* _FPU_EXTENDED */ ++ fenv.__control_word |= 0x200; /* _FPU_DOUBLE */ ++ fesetenv(&fenv); + printf("WARNING: for repeatability, setting FPU to use double precision\n"); + #endif + // Extra options: +diff --git a/utils/System.h b/utils/System.h +index 1758192..840bee5 100644 +--- a/utils/System.h ++++ b/utils/System.h +@@ -21,8 +21,8 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA + #ifndef Minisat_System_h + #define Minisat_System_h + +-#if defined(__linux__) +-#include ++#if defined(__linux__) && defined(__x86_64__) ++#include + #endif + + #include "mtl/IntTypes.h" diff --git a/pkgs/applications/science/logic/avy/default.nix b/pkgs/by-name/av/avy/package.nix similarity index 100% rename from pkgs/applications/science/logic/avy/default.nix rename to pkgs/by-name/av/avy/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4cff8eb1308f..aaf8a4673c77 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15118,8 +15118,6 @@ with pkgs; }; tlaplusToolbox = callPackage ../applications/science/logic/tlaplus/toolbox.nix { }; - avy = callPackage ../applications/science/logic/avy { }; - ### SCIENCE / ENGINEERING ### SCIENCE / ELECTRONICS From e036b87a3b743b69ecd282043e6d71e223c9489f Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 21 Aug 2025 17:59:11 +0200 Subject: [PATCH 057/146] tlaplus18: move to by-name --- .../tlaplus/tlaplus18.nix => by-name/tl/tlaplus18/package.nix} | 0 pkgs/top-level/all-packages.nix | 1 - 2 files changed, 1 deletion(-) rename pkgs/{applications/science/logic/tlaplus/tlaplus18.nix => by-name/tl/tlaplus18/package.nix} (100%) diff --git a/pkgs/applications/science/logic/tlaplus/tlaplus18.nix b/pkgs/by-name/tl/tlaplus18/package.nix similarity index 100% rename from pkgs/applications/science/logic/tlaplus/tlaplus18.nix rename to pkgs/by-name/tl/tlaplus18/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aaf8a4673c77..54fcd4bae61d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15112,7 +15112,6 @@ with pkgs; tlaplus = callPackage ../applications/science/logic/tlaplus { jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; - tlaplus18 = callPackage ../applications/science/logic/tlaplus/tlaplus18.nix { }; tlaps = callPackage ../applications/science/logic/tlaplus/tlaps.nix { inherit (ocaml-ng.ocamlPackages_4_14_unsafe_string) ocaml; }; From d3967f76ddb8eb9343884df540e4e3b19a5f3e63 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 21 Aug 2025 18:01:37 +0200 Subject: [PATCH 058/146] tlaplus-toolbox: move to by-name --- .../toolbox.nix => by-name/tl/tlaplus-toolbox/package.nix} | 0 pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 1 - 3 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/{applications/science/logic/tlaplus/toolbox.nix => by-name/tl/tlaplus-toolbox/package.nix} (100%) diff --git a/pkgs/applications/science/logic/tlaplus/toolbox.nix b/pkgs/by-name/tl/tlaplus-toolbox/package.nix similarity index 100% rename from pkgs/applications/science/logic/tlaplus/toolbox.nix rename to pkgs/by-name/tl/tlaplus-toolbox/package.nix diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 97dcb738c696..3c386be4aed3 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -2032,6 +2032,7 @@ mapAliases { tkcvs = tkrev; # Added 2022-03-07 tkgate = throw "'tkgate' has been removed as it is unmaintained"; # Added 2025-05-17 tkimg = tclPackages.tkimg; # Added 2024-10-02 + tlaplusToolbox = tlaplus-toolbox; # Added 2025-08-21 todiff = throw "'todiff' was removed due to lack of known users"; # Added 2025-01-25 toil = throw "toil was removed as it was broken and requires obsolete versions of libraries"; # Added 2024-09-22 tokodon = plasma5Packages.tokodon; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 54fcd4bae61d..7147770e9cf0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15115,7 +15115,6 @@ with pkgs; tlaps = callPackage ../applications/science/logic/tlaplus/tlaps.nix { inherit (ocaml-ng.ocamlPackages_4_14_unsafe_string) ocaml; }; - tlaplusToolbox = callPackage ../applications/science/logic/tlaplus/toolbox.nix { }; ### SCIENCE / ENGINEERING From 675fbe3ab6a519d0b2e3030bbdd7c4aeafa50b99 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 21 Aug 2025 18:03:52 +0200 Subject: [PATCH 059/146] tlaplus: move to by-name --- .../default.nix => by-name/tl/tlaplus/package.nix} | 11 ++++++----- pkgs/top-level/all-packages.nix | 3 --- 2 files changed, 6 insertions(+), 8 deletions(-) rename pkgs/{applications/science/logic/tlaplus/default.nix => by-name/tl/tlaplus/package.nix} (81%) diff --git a/pkgs/applications/science/logic/tlaplus/default.nix b/pkgs/by-name/tl/tlaplus/package.nix similarity index 81% rename from pkgs/applications/science/logic/tlaplus/default.nix rename to pkgs/by-name/tl/tlaplus/package.nix index 4798e1148fcf..36bf0203b746 100644 --- a/pkgs/applications/science/logic/tlaplus/default.nix +++ b/pkgs/by-name/tl/tlaplus/package.nix @@ -3,7 +3,8 @@ stdenv, fetchurl, makeWrapper, - jre, + # TODO: switch to jre https://github.com/NixOS/nixpkgs/pull/89731 + jre8, }: stdenv.mkDerivation rec { @@ -22,13 +23,13 @@ stdenv.mkDerivation rec { mkdir -p $out/share/java $out/bin cp $src $out/share/java/tla2tools.jar - makeWrapper ${jre}/bin/java $out/bin/tlc \ + makeWrapper ${jre8}/bin/java $out/bin/tlc \ --add-flags "-XX:+UseParallelGC -cp $out/share/java/tla2tools.jar tlc2.TLC" - makeWrapper ${jre}/bin/java $out/bin/tlasany \ + makeWrapper ${jre8}/bin/java $out/bin/tlasany \ --add-flags "-XX:+UseParallelGC -cp $out/share/java/tla2tools.jar tla2sany.SANY" - makeWrapper ${jre}/bin/java $out/bin/pcal \ + makeWrapper ${jre8}/bin/java $out/bin/pcal \ --add-flags "-XX:+UseParallelGC -cp $out/share/java/tla2tools.jar pcal.trans" - makeWrapper ${jre}/bin/java $out/bin/tlatex \ + makeWrapper ${jre8}/bin/java $out/bin/tlatex \ --add-flags "-XX:+UseParallelGC -cp $out/share/java/tla2tools.jar tla2tex.TLA" ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7147770e9cf0..219c66990f05 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15109,9 +15109,6 @@ with pkgs; gmp-static = gmp.override { withStatic = true; }; }; - tlaplus = callPackage ../applications/science/logic/tlaplus { - jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - }; tlaps = callPackage ../applications/science/logic/tlaplus/tlaps.nix { inherit (ocaml-ng.ocamlPackages_4_14_unsafe_string) ocaml; }; From b738a8a90bb5a99cba58f09fb187f56f8ffec92c Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 21 Aug 2025 18:06:01 +0200 Subject: [PATCH 060/146] yices: move to by-name --- .../logic/yices/default.nix => by-name/yi/yices/package.nix} | 5 ++++- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 4 insertions(+), 5 deletions(-) rename pkgs/{applications/science/logic/yices/default.nix => by-name/yi/yices/package.nix} (93%) diff --git a/pkgs/applications/science/logic/yices/default.nix b/pkgs/by-name/yi/yices/package.nix similarity index 93% rename from pkgs/applications/science/logic/yices/default.nix rename to pkgs/by-name/yi/yices/package.nix index 937643c4abde..d47da8915619 100644 --- a/pkgs/applications/science/logic/yices/default.nix +++ b/pkgs/by-name/yi/yices/package.nix @@ -3,12 +3,15 @@ stdenv, fetchFromGitHub, cudd, - gmp-static, + gmp, gperf, autoreconfHook, libpoly, }: +let + gmp-static = gmp.override { withStatic = true; }; +in stdenv.mkDerivation rec { pname = "yices"; version = "2.6.5"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 219c66990f05..f617a48a2f10 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15105,10 +15105,6 @@ with pkgs; why3 = callPackage ../applications/science/logic/why3 { coqPackages = coqPackages_8_20; }; - yices = callPackage ../applications/science/logic/yices { - gmp-static = gmp.override { withStatic = true; }; - }; - tlaps = callPackage ../applications/science/logic/tlaplus/tlaps.nix { inherit (ocaml-ng.ocamlPackages_4_14_unsafe_string) ocaml; }; From 018cff749ccb5fe83e65a590b7b3f9882f69807d Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 21 Aug 2025 18:10:15 +0200 Subject: [PATCH 061/146] verit: move to by-name --- pkgs/by-name/is/isabelle/package.nix | 6 +++--- .../verit/default.nix => by-name/ve/verit/package.nix} | 4 ++-- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 ---- 4 files changed, 6 insertions(+), 9 deletions(-) rename pkgs/{applications/science/logic/verit/default.nix => by-name/ve/verit/package.nix} (95%) diff --git a/pkgs/by-name/is/isabelle/package.nix b/pkgs/by-name/is/isabelle/package.nix index e9d3ec865eca..21edd614080b 100644 --- a/pkgs/by-name/is/isabelle/package.nix +++ b/pkgs/by-name/is/isabelle/package.nix @@ -8,7 +8,7 @@ java, scala_3, polyml, - veriT, + verit, vampire, eprover-ho, rlwrap, @@ -81,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ polyml - veriT + verit vampire' eprover-ho net-tools @@ -103,7 +103,7 @@ stdenv.mkDerivation (finalAttrs: { patchShebangs lib/Tools/ bin/ cat >contrib/verit-*/etc/settings <contrib/e-*/etc/settings < Date: Thu, 21 Aug 2025 18:12:47 +0200 Subject: [PATCH 062/146] spass: move to by-name --- .../logic/spass/default.nix => by-name/sp/spass/package.nix} | 4 ++-- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) rename pkgs/{applications/science/logic/spass/default.nix => by-name/sp/spass/package.nix} (96%) diff --git a/pkgs/applications/science/logic/spass/default.nix b/pkgs/by-name/sp/spass/package.nix similarity index 96% rename from pkgs/applications/science/logic/spass/default.nix rename to pkgs/by-name/sp/spass/package.nix index fff6a6b0858b..2d98238a14ae 100644 --- a/pkgs/applications/science/logic/spass/default.nix +++ b/pkgs/by-name/sp/spass/package.nix @@ -1,6 +1,6 @@ { lib, - stdenv, + gccStdenv, fetchurl, bison, flex, @@ -15,7 +15,7 @@ let + " dfg2ascii dfg2dfg tptp2dfg dimacs2dfg pgen rescmp"; in -stdenv.mkDerivation { +gccStdenv.mkDerivation { pname = "spass"; version = "${baseVersion}.${minorVersion}"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aca6eea8ff3f..c89af425f8dc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15091,10 +15091,6 @@ with pkgs; inherit (ocaml-ng.ocamlPackages_4_14) ocaml; }; - spass = callPackage ../applications/science/logic/spass { - stdenv = gccStdenv; - }; - statverif = callPackage ../applications/science/logic/statverif { ocaml = ocaml-ng.ocamlPackages_4_14_unsafe_string.ocaml; }; From 85693031b6f79fa44132f20700ed81c33e0e0f39 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 21 Aug 2025 18:13:59 +0200 Subject: [PATCH 063/146] leo3-bin: move to by-name --- .../logic/leo3/binary.nix => by-name/le/leo3-bin/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/science/logic/leo3/binary.nix => by-name/le/leo3-bin/package.nix} (100%) diff --git a/pkgs/applications/science/logic/leo3/binary.nix b/pkgs/by-name/le/leo3-bin/package.nix similarity index 100% rename from pkgs/applications/science/logic/leo3/binary.nix rename to pkgs/by-name/le/leo3-bin/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c89af425f8dc..1efd523c152a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15081,8 +15081,6 @@ with pkgs; inherit (ocaml-ng.ocamlPackages_4_14_unsafe_string) ocaml camlp4; }; - leo3-bin = callPackage ../applications/science/logic/leo3/binary.nix { }; - prooftree = callPackage ../applications/science/logic/prooftree { ocamlPackages = ocaml-ng.ocamlPackages_4_12; }; From b4eed221114b54cb7f81f75ee2bf51eca071a66e Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 21 Aug 2025 18:15:30 +0200 Subject: [PATCH 064/146] glucose: move to by-name --- .../glucose/default.nix => by-name/gl/glucose/package.nix} | 0 pkgs/top-level/all-packages.nix | 3 +-- 2 files changed, 1 insertion(+), 2 deletions(-) rename pkgs/{applications/science/logic/glucose/default.nix => by-name/gl/glucose/package.nix} (100%) diff --git a/pkgs/applications/science/logic/glucose/default.nix b/pkgs/by-name/gl/glucose/package.nix similarity index 100% rename from pkgs/applications/science/logic/glucose/default.nix rename to pkgs/by-name/gl/glucose/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1efd523c152a..520e813e9b0b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15051,8 +15051,7 @@ with pkgs; giac-with-xcas = giac.override { enableGUI = true; }; - glucose = callPackage ../applications/science/logic/glucose { }; - glucose-syrup = callPackage ../applications/science/logic/glucose { + glucose-syrup = glucose.override { enableUnfree = true; }; From 713e620c1170677951c45635e480333fbc9d0342 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 21 Aug 2025 18:16:46 +0200 Subject: [PATCH 065/146] eprover: move to by-name --- .../eprover/default.nix => by-name/ep/eprover/package.nix} | 0 pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 1 insertion(+), 3 deletions(-) rename pkgs/{applications/science/logic/eprover/default.nix => by-name/ep/eprover/package.nix} (100%) diff --git a/pkgs/applications/science/logic/eprover/default.nix b/pkgs/by-name/ep/eprover/package.nix similarity index 100% rename from pkgs/applications/science/logic/eprover/default.nix rename to pkgs/by-name/ep/eprover/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 520e813e9b0b..4c0978e95229 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15045,9 +15045,7 @@ with pkgs; ocaml = ocaml-ng.ocamlPackages_4_14_unsafe_string.ocaml; }; - eprover = callPackage ../applications/science/logic/eprover { }; - - eprover-ho = callPackage ../applications/science/logic/eprover { enableHO = true; }; + eprover-ho = eprover.override { enableHO = true; }; giac-with-xcas = giac.override { enableGUI = true; }; From 8544538777dd8e698b2b8fc7e016db7cc748c0f9 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 21 Aug 2025 18:20:13 +0200 Subject: [PATCH 066/146] wolfram-notebook: move to by-name --- .../notebook.nix => by-name/wo/wolfram-notebook/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/science/math/wolfram-engine/notebook.nix => by-name/wo/wolfram-notebook/package.nix} (100%) diff --git a/pkgs/applications/science/math/wolfram-engine/notebook.nix b/pkgs/by-name/wo/wolfram-notebook/package.nix similarity index 100% rename from pkgs/applications/science/math/wolfram-engine/notebook.nix rename to pkgs/by-name/wo/wolfram-notebook/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4c0978e95229..738e71256dc3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14891,8 +14891,6 @@ with pkgs; wolfram-for-jupyter-kernel = callPackage ../applications/editors/jupyter-kernels/wolfram { }; - wolfram-notebook = callPackage ../applications/science/math/wolfram-engine/notebook.nix { }; - ### SCIENCE/MOLECULAR-DYNAMICS gromacs = callPackage ../applications/science/molecular-dynamics/gromacs { From 1815d5ab48cd06011277e806e5a2263d709c93de Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 21 Aug 2025 18:23:23 +0200 Subject: [PATCH 067/146] trilinos: move to by-name --- .../trilinos/default.nix => by-name/tr/trilinos/package.nix} | 0 pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 1 insertion(+), 3 deletions(-) rename pkgs/{development/libraries/science/math/trilinos/default.nix => by-name/tr/trilinos/package.nix} (100%) diff --git a/pkgs/development/libraries/science/math/trilinos/default.nix b/pkgs/by-name/tr/trilinos/package.nix similarity index 100% rename from pkgs/development/libraries/science/math/trilinos/default.nix rename to pkgs/by-name/tr/trilinos/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 738e71256dc3..d5dc4bb0c473 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14883,9 +14883,7 @@ with pkgs; }; suitesparse = suitesparse_5_3; - trilinos = callPackage ../development/libraries/science/math/trilinos { }; - - trilinos-mpi = callPackage ../development/libraries/science/math/trilinos { withMPI = true; }; + trilinos-mpi = trilinos.override { withMPI = true; }; wolfram-engine = libsForQt5.callPackage ../applications/science/math/wolfram-engine { }; From 26b4107088e0b0c6dff0bf09f8c264a937b62c14 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 21 Aug 2025 18:26:04 +0200 Subject: [PATCH 068/146] mathematica: move to by-name --- .../science/math => by-name/ma}/mathematica/generic.nix | 0 .../default.nix => by-name/ma/mathematica/package.nix} | 0 .../science/math => by-name/ma}/mathematica/versions.nix | 0 pkgs/top-level/all-packages.nix | 8 +++----- 4 files changed, 3 insertions(+), 5 deletions(-) rename pkgs/{applications/science/math => by-name/ma}/mathematica/generic.nix (100%) rename pkgs/{applications/science/math/mathematica/default.nix => by-name/ma/mathematica/package.nix} (100%) rename pkgs/{applications/science/math => by-name/ma}/mathematica/versions.nix (100%) diff --git a/pkgs/applications/science/math/mathematica/generic.nix b/pkgs/by-name/ma/mathematica/generic.nix similarity index 100% rename from pkgs/applications/science/math/mathematica/generic.nix rename to pkgs/by-name/ma/mathematica/generic.nix diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/by-name/ma/mathematica/package.nix similarity index 100% rename from pkgs/applications/science/math/mathematica/default.nix rename to pkgs/by-name/ma/mathematica/package.nix diff --git a/pkgs/applications/science/math/mathematica/versions.nix b/pkgs/by-name/ma/mathematica/versions.nix similarity index 100% rename from pkgs/applications/science/math/mathematica/versions.nix rename to pkgs/by-name/ma/mathematica/versions.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d5dc4bb0c473..65fca7e14871 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14855,17 +14855,15 @@ with pkgs; rocmSupport = true; }; - mathematica = callPackage ../applications/science/math/mathematica { }; - - mathematica-webdoc = callPackage ../applications/science/math/mathematica { + mathematica-webdoc = mathematica.override { webdoc = true; }; - mathematica-cuda = callPackage ../applications/science/math/mathematica { + mathematica-cuda = mathematica.override { cudaSupport = true; }; - mathematica-webdoc-cuda = callPackage ../applications/science/math/mathematica { + mathematica-webdoc-cuda = mathematica.override { webdoc = true; cudaSupport = true; }; From 19b88033f346845731cb447bb9faa7dd3161e566 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 21 Aug 2025 18:27:37 +0200 Subject: [PATCH 069/146] sc2-headless: move to by-name --- .../machine-learning => by-name/sc}/sc2-headless/maps.nix | 0 .../default.nix => by-name/sc/sc2-headless/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 2 deletions(-) rename pkgs/{applications/science/machine-learning => by-name/sc}/sc2-headless/maps.nix (100%) rename pkgs/{applications/science/machine-learning/sc2-headless/default.nix => by-name/sc/sc2-headless/package.nix} (100%) diff --git a/pkgs/applications/science/machine-learning/sc2-headless/maps.nix b/pkgs/by-name/sc/sc2-headless/maps.nix similarity index 100% rename from pkgs/applications/science/machine-learning/sc2-headless/maps.nix rename to pkgs/by-name/sc/sc2-headless/maps.nix diff --git a/pkgs/applications/science/machine-learning/sc2-headless/default.nix b/pkgs/by-name/sc/sc2-headless/package.nix similarity index 100% rename from pkgs/applications/science/machine-learning/sc2-headless/default.nix rename to pkgs/by-name/sc/sc2-headless/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 65fca7e14871..41f0920c9bb3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14813,8 +14813,6 @@ with pkgs; ### SCIENCE/MACHINE LEARNING - sc2-headless = callPackage ../applications/science/machine-learning/sc2-headless { }; - streamlit = with python3Packages; toPythonApplication streamlit; ### SCIENCE/MATH From 42f42f268541c37f9a8e26c991cb4a4b81552d47 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 21 Aug 2025 18:28:56 +0200 Subject: [PATCH 070/146] obitools3: move to by-name --- .../obitools/obitools3.nix => by-name/ob/obitools3/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/science/biology/obitools/obitools3.nix => by-name/ob/obitools3/package.nix} (100%) diff --git a/pkgs/applications/science/biology/obitools/obitools3.nix b/pkgs/by-name/ob/obitools3/package.nix similarity index 100% rename from pkgs/applications/science/biology/obitools/obitools3.nix rename to pkgs/by-name/ob/obitools3/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 41f0920c9bb3..d50c4a123674 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14795,8 +14795,6 @@ with pkgs; inherit (perlPackages) perl TextFormat; }; - obitools3 = callPackage ../applications/science/biology/obitools/obitools3.nix { }; - raxml-mpi = raxml.override { useMpi = true; }; trimmomatic = callPackage ../applications/science/biology/trimmomatic { From 47a1c7e207ebb73c1928f330b60286ad925becf7 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 21 Aug 2025 18:29:58 +0200 Subject: [PATCH 071/146] nest: move to by-name --- .../biology/nest/default.nix => by-name/ne/nest/package.nix} | 0 pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 1 insertion(+), 3 deletions(-) rename pkgs/{applications/science/biology/nest/default.nix => by-name/ne/nest/package.nix} (100%) diff --git a/pkgs/applications/science/biology/nest/default.nix b/pkgs/by-name/ne/nest/package.nix similarity index 100% rename from pkgs/applications/science/biology/nest/default.nix rename to pkgs/by-name/ne/nest/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d50c4a123674..b64cc9b1c3b9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14780,9 +14780,7 @@ with pkgs; inherit (llvmPackages) openmp; }; - nest = callPackage ../applications/science/biology/nest { }; - - nest-mpi = callPackage ../applications/science/biology/nest { withMpi = true; }; + nest-mpi = nest.override { withMpi = true; }; neuron-mpi = neuron.override { useMpi = true; }; From cbc026c36ed4c8c1bfca29209b04cab8414260bc Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 21 Aug 2025 18:31:37 +0200 Subject: [PATCH 072/146] blast-bin: move to by-name --- .../biology/blast/bin.nix => by-name/bl/blast-bin/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/science/biology/blast/bin.nix => by-name/bl/blast-bin/package.nix} (100%) diff --git a/pkgs/applications/science/biology/blast/bin.nix b/pkgs/by-name/bl/blast-bin/package.nix similarity index 100% rename from pkgs/applications/science/biology/blast/bin.nix rename to pkgs/by-name/bl/blast-bin/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b64cc9b1c3b9..1ceb6ef03937 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14766,8 +14766,6 @@ with pkgs; blast = callPackage ../applications/science/biology/blast { }; - blast-bin = callPackage ../applications/science/biology/blast/bin.nix { }; - cd-hit = callPackage ../applications/science/biology/cd-hit { inherit (llvmPackages) openmp; }; From 33f763318aa1c95a714fdf22be95c0fe858bc6d8 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 21 Aug 2025 18:32:28 +0200 Subject: [PATCH 073/146] blast: move to by-name --- .../science/biology => by-name/bl}/blast/no_slash_bin.patch | 0 .../biology/blast/default.nix => by-name/bl/blast/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 2 deletions(-) rename pkgs/{applications/science/biology => by-name/bl}/blast/no_slash_bin.patch (100%) rename pkgs/{applications/science/biology/blast/default.nix => by-name/bl/blast/package.nix} (100%) diff --git a/pkgs/applications/science/biology/blast/no_slash_bin.patch b/pkgs/by-name/bl/blast/no_slash_bin.patch similarity index 100% rename from pkgs/applications/science/biology/blast/no_slash_bin.patch rename to pkgs/by-name/bl/blast/no_slash_bin.patch diff --git a/pkgs/applications/science/biology/blast/default.nix b/pkgs/by-name/bl/blast/package.nix similarity index 100% rename from pkgs/applications/science/biology/blast/default.nix rename to pkgs/by-name/bl/blast/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1ceb6ef03937..51bc88c8e523 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14764,8 +14764,6 @@ with pkgs; ### SCIENCE/BIOLOGY - blast = callPackage ../applications/science/biology/blast { }; - cd-hit = callPackage ../applications/science/biology/cd-hit { inherit (llvmPackages) openmp; }; From f75522c6b9f06efe8da5d9fa896b94c923b70e94 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 21 Aug 2025 18:34:06 +0200 Subject: [PATCH 074/146] tetgen_1_4: move to by-name --- .../tetgen/1.4.nix => by-name/te/tetgen_1_4/package.nix} | 0 pkgs/top-level/all-packages.nix | 1 - 2 files changed, 1 deletion(-) rename pkgs/{applications/science/geometry/tetgen/1.4.nix => by-name/te/tetgen_1_4/package.nix} (100%) diff --git a/pkgs/applications/science/geometry/tetgen/1.4.nix b/pkgs/by-name/te/tetgen_1_4/package.nix similarity index 100% rename from pkgs/applications/science/geometry/tetgen/1.4.nix rename to pkgs/by-name/te/tetgen_1_4/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 51bc88c8e523..423e99246a36 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14758,7 +14758,6 @@ with pkgs; ### SCIENCE/GEOMETRY tetgen = callPackage ../applications/science/geometry/tetgen { }; # AGPL3+ - tetgen_1_4 = callPackage ../applications/science/geometry/tetgen/1.4.nix { }; # MIT ### SCIENCE/BENCHMARK From 5226c75abcbea4acd0567b72a64a58169f53c92e Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 21 Aug 2025 18:34:48 +0200 Subject: [PATCH 075/146] tetgen: move to by-name --- .../tetgen/default.nix => by-name/te/tetgen/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/science/geometry/tetgen/default.nix => by-name/te/tetgen/package.nix} (100%) diff --git a/pkgs/applications/science/geometry/tetgen/default.nix b/pkgs/by-name/te/tetgen/package.nix similarity index 100% rename from pkgs/applications/science/geometry/tetgen/default.nix rename to pkgs/by-name/te/tetgen/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 423e99246a36..28e8636f4dbf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14757,8 +14757,6 @@ with pkgs; ### SCIENCE/GEOMETRY - tetgen = callPackage ../applications/science/geometry/tetgen { }; # AGPL3+ - ### SCIENCE/BENCHMARK ### SCIENCE/BIOLOGY From 63a9da2879b5c8d5daf565a5cb614ee05353a4ad Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 21 Aug 2025 16:59:25 +0000 Subject: [PATCH 076/146] bitrise: 2.33.0 -> 2.33.2 --- pkgs/by-name/bi/bitrise/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bi/bitrise/package.nix b/pkgs/by-name/bi/bitrise/package.nix index 6f75e4e69fa1..3eb2e43690b3 100644 --- a/pkgs/by-name/bi/bitrise/package.nix +++ b/pkgs/by-name/bi/bitrise/package.nix @@ -6,13 +6,13 @@ }: buildGoModule rec { pname = "bitrise"; - version = "2.33.0"; + version = "2.33.2"; src = fetchFromGitHub { owner = "bitrise-io"; repo = "bitrise"; rev = "v${version}"; - hash = "sha256-MpXJQHmpE9s3GYpqyrWCTBIzMCdb+nBAw+2DXmnK3Lw="; + hash = "sha256-ckiozGSk8a0bzTzj8PuN55rrL2r95BylYRUHZdQF+Kc="; }; # many tests rely on writable $HOME/.bitrise and require network access From 5c60b33ecbad94eae9d221796ca28f340b843825 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 21 Aug 2025 17:51:02 +0000 Subject: [PATCH 077/146] got: 0.116 -> 0.117 --- pkgs/by-name/go/got/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/go/got/package.nix b/pkgs/by-name/go/got/package.nix index 75a3c3cee44e..719a2c3f07bf 100644 --- a/pkgs/by-name/go/got/package.nix +++ b/pkgs/by-name/go/got/package.nix @@ -25,11 +25,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "got"; - version = "0.116"; + version = "0.117"; src = fetchurl { url = "https://gameoftrees.org/releases/portable/got-portable-${finalAttrs.version}.tar.gz"; - hash = "sha256-6KZK1zuCwbbfnfnaWj6Nqb5gUcNJc3mUCAaHjZWOTf8="; + hash = "sha256-jVP/1vX1dJukdHU+R+RejlPVfeVBvouzsM6Oj8IzwUE="; }; nativeBuildInputs = [ From 95958adc52520b69ec64c61585d35ea2120c57c1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 21 Aug 2025 18:09:49 +0000 Subject: [PATCH 078/146] empire-compiler: 0.3.3 -> 0.3.4 --- pkgs/by-name/em/empire-compiler/deps.json | 45 +++------------------ pkgs/by-name/em/empire-compiler/package.nix | 4 +- 2 files changed, 7 insertions(+), 42 deletions(-) diff --git a/pkgs/by-name/em/empire-compiler/deps.json b/pkgs/by-name/em/empire-compiler/deps.json index 08a7b778e4ab..0ed51e27a4d4 100644 --- a/pkgs/by-name/em/empire-compiler/deps.json +++ b/pkgs/by-name/em/empire-compiler/deps.json @@ -1,19 +1,4 @@ [ - { - "pname": "Microsoft.AspNetCore.App.Ref", - "version": "6.0.36", - "hash": "sha256-9jDkWbjw/nd8yqdzVTagCuqr6owJ/DUMi4BlUZT4hWU=" - }, - { - "pname": "Microsoft.AspNetCore.App.Runtime.linux-arm64", - "version": "6.0.36", - "hash": "sha256-JQULJyF0ivLoUU1JaFfK/HHg+/qzpN7V2RR2Cc+WlQ4=" - }, - { - "pname": "Microsoft.AspNetCore.App.Runtime.linux-x64", - "version": "6.0.36", - "hash": "sha256-zUsVIpV481vMLAXaLEEUpEMA9/f1HGOnvaQnaWdzlyY=" - }, { "pname": "Microsoft.CodeAnalysis.Analyzers", "version": "3.0.0-beta2.20059.3", @@ -29,31 +14,6 @@ "version": "3.5.0", "hash": "sha256-D/1EQqFrTiwACdknW0fpodraz9JaA+ebIrQVLMw8pc8=" }, - { - "pname": "Microsoft.NETCore.App.Host.linux-arm64", - "version": "6.0.36", - "hash": "sha256-9lC/LYnthYhjkWWz2kkFCvlA5LJOv11jdt59SDnpdy0=" - }, - { - "pname": "Microsoft.NETCore.App.Host.linux-x64", - "version": "6.0.36", - "hash": "sha256-VFRDzx7LJuvI5yzKdGmw/31NYVbwHWPKQvueQt5xc10=" - }, - { - "pname": "Microsoft.NETCore.App.Ref", - "version": "6.0.36", - "hash": "sha256-9LZgVoIFF8qNyUu8kdJrYGLutMF/cL2K82HN2ywwlx8=" - }, - { - "pname": "Microsoft.NETCore.App.Runtime.linux-arm64", - "version": "6.0.36", - "hash": "sha256-k3rxvUhCEU0pVH8KgEMtkPiSOibn+nBh+0zT2xIfId8=" - }, - { - "pname": "Microsoft.NETCore.App.Runtime.linux-x64", - "version": "6.0.36", - "hash": "sha256-U8wJ2snSDFqeAgDVLXjnniidC7Cr5aJ1/h/BMSlyu0c=" - }, { "pname": "Microsoft.NETCore.Platforms", "version": "2.1.2", @@ -84,6 +44,11 @@ "version": "1.6.0", "hash": "sha256-JJfgaPav7UfEh4yRAQdGhLZF1brr0tUWPl6qmfNWq/E=" }, + { + "pname": "System.Runtime.CompilerServices.Unsafe", + "version": "4.5.2", + "hash": "sha256-8eUXXGWO2LL7uATMZye2iCpQOETn2jCcjUhG6coR5O8=" + }, { "pname": "System.Runtime.CompilerServices.Unsafe", "version": "4.6.0", diff --git a/pkgs/by-name/em/empire-compiler/package.nix b/pkgs/by-name/em/empire-compiler/package.nix index 4b720aeb0889..af9cec139d07 100644 --- a/pkgs/by-name/em/empire-compiler/package.nix +++ b/pkgs/by-name/em/empire-compiler/package.nix @@ -9,13 +9,13 @@ buildDotnetModule (finalAttrs: { pname = "empire-compiler"; - version = "0.3.3"; + version = "0.3.4"; src = fetchFromGitHub { owner = "bc-security"; repo = "empire-compiler"; tag = "v${finalAttrs.version}"; - hash = "sha256-1SzP3oopmYy2Xv0CFxID4lSVZ65/MARd1O0w2zpdeyc="; + hash = "sha256-HV61N76yNh16TL93L0LlBWBar1/AzHNX5/zsxl65AGM="; }; postPatch = '' From a3654dec49c4d0fe213e8856b6c6d890b452d73b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 21 Aug 2025 18:36:56 +0000 Subject: [PATCH 079/146] isle-portable: 0-unstable-2025-08-12 -> 0-unstable-2025-08-21 --- pkgs/by-name/is/isle-portable/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/is/isle-portable/package.nix b/pkgs/by-name/is/isle-portable/package.nix index e1a4e0624dcc..449bade34ce2 100644 --- a/pkgs/by-name/is/isle-portable/package.nix +++ b/pkgs/by-name/is/isle-portable/package.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; name = "isle-portable"; - version = "0-unstable-2025-08-12"; + version = "0-unstable-2025-08-21"; src = fetchFromGitHub { owner = "isledecomp"; repo = "isle-portable"; - rev = "f4a28f27f9d4b0e3511a86170d5b626c86720841"; - hash = "sha256-IZoX6yu4edA8JR4Q2qsIHeQ4ygW/av2QdPScqJbHUi4="; + rev = "ef2eaf04bf09c8827139ad4c06cea24ea8ab6942"; + hash = "sha256-rOF8DZck3TVvfP4Ho4hvlAZmhAhbGD+Q91yk/pvXv3o="; fetchSubmodules = true; }; From b43e12072474cb390d62d1e1d8d9e602f09ed188 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 21 Aug 2025 19:06:33 +0000 Subject: [PATCH 080/146] gh-f: 1.4.1 -> 1.6.0 --- pkgs/by-name/gh/gh-f/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gh/gh-f/package.nix b/pkgs/by-name/gh/gh-f/package.nix index 22ca4fa5a6de..f51c5ac88ede 100644 --- a/pkgs/by-name/gh/gh-f/package.nix +++ b/pkgs/by-name/gh/gh-f/package.nix @@ -15,13 +15,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "gh-f"; - version = "1.4.1"; + version = "1.6.0"; src = fetchFromGitHub { owner = "gennaro-tedesco"; repo = "gh-f"; tag = "v${finalAttrs.version}"; - hash = "sha256-Jf7sDn/iRB/Lwz21fGLRduvt9/9cs5FFMhazULgj1ik="; + hash = "sha256-kldhK5ChwHRv7joD9uyCAk1Gdc8+2IyubAB04j8/LPA="; }; nativeBuildInputs = [ makeBinaryWrapper ]; From 2c5f6ca3da51bd4c2d9297382c7af59f77a20174 Mon Sep 17 00:00:00 2001 From: Defelo Date: Thu, 21 Aug 2025 19:15:19 +0200 Subject: [PATCH 081/146] hyfetch: 1.99.0 -> 2.0.1 Changelog: https://github.com/hykilpikonna/hyfetch/releases/tag/2.0.1 Diff: https://github.com/hykilpikonna/hyfetch/compare/1.99.0...2.0.1 --- pkgs/by-name/hy/hyfetch/package.nix | 50 ++++++++++++----------------- 1 file changed, 21 insertions(+), 29 deletions(-) diff --git a/pkgs/by-name/hy/hyfetch/package.nix b/pkgs/by-name/hy/hyfetch/package.nix index 2999b9b7285c..064a20cad84c 100644 --- a/pkgs/by-name/hy/hyfetch/package.nix +++ b/pkgs/by-name/hy/hyfetch/package.nix @@ -1,44 +1,28 @@ { lib, + rustPlatform, fetchFromGitHub, - python3Packages, - pciutils, installShellFiles, + makeBinaryWrapper, + pciutils, }: -python3Packages.buildPythonApplication rec { - pname = "hyfetch"; - version = "1.99.0"; - pyproject = true; - outputs = [ - "out" - "man" - ]; +rustPlatform.buildRustPackage (finalAttrs: { + pname = "hyfetch"; + version = "2.0.1"; src = fetchFromGitHub { owner = "hykilpikonna"; repo = "hyfetch"; - tag = version; - hash = "sha256-GL1/V+LgSXJ4b28PfinScDrJhU9VDa4pVi24zWEzbAk="; + tag = finalAttrs.version; + hash = "sha256-OaMwUTBBpFrco2Wcodb7+3ywdD5bXDebBFEoJYsgAbE="; }; - build-system = [ - python3Packages.setuptools - ]; - - dependencies = [ - python3Packages.typing-extensions - ]; + cargoHash = "sha256-xm8q4EG7qfaz/Ru/FVRiWIQW2Tjh9Ar0MquVQVLDSRA="; nativeBuildInputs = [ installShellFiles - ]; - - # No test available - doCheck = false; - - pythonImportsCheck = [ - "hyfetch" + makeBinaryWrapper ]; # NOTE: The HyFetch project maintains an updated version of neofetch renamed @@ -48,6 +32,8 @@ python3Packages.buildPythonApplication rec { postInstall = '' mv ./docs/neofetch.1 ./docs/neowofetch.1 installManPage ./docs/hyfetch.1 ./docs/neowofetch.1 + + install -m 755 neofetch $out/bin/neowofetch ''; postFixup = '' @@ -55,8 +41,13 @@ python3Packages.buildPythonApplication rec { --prefix PATH : ${lib.makeBinPath [ pciutils ]} ''; + outputs = [ + "out" + "man" + ]; + meta = { - description = "Neofetch with pride flags <3"; + description = "Neofetch with LGBTQ+ pride flags"; longDescription = '' HyFetch is a command-line system information tool fork of neofetch. HyFetch displays information about your system next to your OS logo @@ -66,7 +57,8 @@ python3Packages.buildPythonApplication rec { operating system or distribution you are running, what theme or icon set you are using, etc. ''; - homepage = "https://github.com/hykilpikonna/HyFetch"; + homepage = "https://github.com/hykilpikonna/hyfetch"; + changelog = "https://github.com/hykilpikonna/hyfetch/releases/tag/${finalAttrs.version}"; license = lib.licenses.mit; mainProgram = "hyfetch"; maintainers = with lib.maintainers; [ @@ -75,4 +67,4 @@ python3Packages.buildPythonApplication rec { nullcube ]; }; -} +}) From 8c006871445bb891737505c70e36fac7af2e9060 Mon Sep 17 00:00:00 2001 From: Defelo Date: Thu, 21 Aug 2025 20:06:04 +0200 Subject: [PATCH 082/146] hyfetch: add versionCheckHook --- pkgs/by-name/hy/hyfetch/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/hy/hyfetch/package.nix b/pkgs/by-name/hy/hyfetch/package.nix index 064a20cad84c..884e0915c70b 100644 --- a/pkgs/by-name/hy/hyfetch/package.nix +++ b/pkgs/by-name/hy/hyfetch/package.nix @@ -5,6 +5,7 @@ installShellFiles, makeBinaryWrapper, pciutils, + versionCheckHook, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -46,6 +47,11 @@ rustPlatform.buildRustPackage (finalAttrs: { "man" ]; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + versionCheckKeepEnvironment = [ "PATH" ]; + doInstallCheck = true; + meta = { description = "Neofetch with LGBTQ+ pride flags"; longDescription = '' From 0aa642c009b9f4d1c4f7bbae1a4dd4e9174f3a10 Mon Sep 17 00:00:00 2001 From: Defelo Date: Thu, 21 Aug 2025 20:07:19 +0200 Subject: [PATCH 083/146] hyfetch: add updateScript --- pkgs/by-name/hy/hyfetch/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/hy/hyfetch/package.nix b/pkgs/by-name/hy/hyfetch/package.nix index 884e0915c70b..2b3d46dbb8c3 100644 --- a/pkgs/by-name/hy/hyfetch/package.nix +++ b/pkgs/by-name/hy/hyfetch/package.nix @@ -6,6 +6,7 @@ makeBinaryWrapper, pciutils, versionCheckHook, + nix-update-script, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -52,6 +53,8 @@ rustPlatform.buildRustPackage (finalAttrs: { versionCheckKeepEnvironment = [ "PATH" ]; doInstallCheck = true; + passthru.updateScript = nix-update-script { }; + meta = { description = "Neofetch with LGBTQ+ pride flags"; longDescription = '' From c09501bc4d5d1a84b60359fd25a98615613bcaf3 Mon Sep 17 00:00:00 2001 From: Defelo Date: Thu, 21 Aug 2025 20:07:30 +0200 Subject: [PATCH 084/146] hyfetch: add defelo as maintainer --- pkgs/by-name/hy/hyfetch/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/hy/hyfetch/package.nix b/pkgs/by-name/hy/hyfetch/package.nix index 2b3d46dbb8c3..200449a34646 100644 --- a/pkgs/by-name/hy/hyfetch/package.nix +++ b/pkgs/by-name/hy/hyfetch/package.nix @@ -74,6 +74,7 @@ rustPlatform.buildRustPackage (finalAttrs: { yisuidenghua isabelroses nullcube + defelo ]; }; }) From 7c491d6739a748fcf7075cce0b4cfcabb333d70c Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 2 Aug 2025 10:00:57 +0300 Subject: [PATCH 085/146] ci: drop codeowners/labeler config for Plasma 5 --- .github/labeler.yml | 9 +++------ ci/OWNERS | 4 +--- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/.github/labeler.yml b/.github/labeler.yml index 031fead8f534..17f43402f0ca 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -431,12 +431,9 @@ - changed-files: - any-glob-to-any-file: - doc/languages-frameworks/qt.section.md - - nixos/modules/services/x11/desktop-managers/plasma5.nix - - nixos/tests/plasma5.nix - - pkgs/applications/kde/**/* - - pkgs/desktops/plasma-5/**/* - - pkgs/development/libraries/kde-frameworks/**/* - - pkgs/development/libraries/qt-5/**/* + - nixos/modules/services/desktop-managers/plasma6.nix + - nixos/tests/plasma6.nix + - pkgs/kde/**/* "6.topic: R": - any: diff --git a/ci/OWNERS b/ci/OWNERS index 5802a45de03c..856ca93675ca 100644 --- a/ci/OWNERS +++ b/ci/OWNERS @@ -264,9 +264,7 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt /pkgs/development/libraries/qt-5 @K900 @NickCao @SuperSandro2000 @ttuegel /pkgs/development/libraries/qt-6 @K900 @NickCao @SuperSandro2000 @ttuegel -# KDE / Plasma 5 -/pkgs/applications/kde @K900 @NickCao @SuperSandro2000 @ttuegel -/pkgs/desktops/plasma-5 @K900 @NickCao @SuperSandro2000 @ttuegel +# KDE Frameworks 5 /pkgs/development/libraries/kde-frameworks @K900 @NickCao @SuperSandro2000 @ttuegel # KDE / Plasma 6 From 68a3a079c3c84bced219d35eaaf870a1f6ba911b Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 12 Aug 2025 19:40:34 +0300 Subject: [PATCH 086/146] aliases.nix: convert Plasma 5 aliases to hard throws --- pkgs/top-level/aliases.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 420b5c033719..d05e327fa750 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -195,12 +195,9 @@ let makePlasma5Throw = name: throw '' - The top-level ${name} alias has been removed. + The libsForQt5.${name} package and the corresponding top-level ${name} alias have been removed. - Please explicitly use kdePackages.${name} for the latest Qt 6-based version, - or libsForQt5.${name} for the deprecated Qt 5 version. - - Note that Qt 5 versions of most KDE software will be removed in NixOS 25.11. + Please explicitly use kdePackages.${name} for the latest Qt 6-based version. ''; plasma5Throws = lib.mapAttrs (k: _: makePlasma5Throw k) deprecatedPlasma5Packages; From d4fbd4bd55040c69dafac31a1ec2d90419f42023 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 12 Aug 2025 19:40:34 +0300 Subject: [PATCH 087/146] aliases.nix: drop the rest of Maui --- pkgs/top-level/aliases.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index d05e327fa750..ff863f74bc7e 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -387,7 +387,6 @@ mapAliases { buildGoPackage = throw "`buildGoPackage` has been deprecated and removed, see the Go section in the nixpkgs manual for details"; # Added 2024-11-18 buildXenPackage = throw "'buildXenPackage' has been removed as a custom Xen build can now be achieved by simply overriding 'xen'."; # Added 2025-05-12 - inherit (libsForQt5.mauiPackages) buho; # added 2022-05-17 bwidget = tclPackages.bwidget; # Added 2024-10-02 # Shorter names; keep the longer name for back-compat. Added 2023-04-11. Warning added on 2024-12-16. Removed on 2025-05-31 buildFHSUserEnv = throw "'buildFHSUserEnv' has been renamed to 'buildFHSEnv' and was removed in 25.11"; @@ -460,7 +459,6 @@ mapAliases { clang-sierraHack-stdenv = clang-sierraHack; # Added 2024-10-05 cli-visualizer = throw "'cli-visualizer' has been removed as the upstream repository is gone"; # Added 2025-06-05 clipbuzz = throw "clipbuzz has been removed, as it does not build with supported Zig versions"; # Added 2025-08-09 - inherit (libsForQt5.mauiPackages) clip; # added 2022-05-17 cloudlogoffline = throw "cloudlogoffline has been removed"; # added 2025-05-18 clwrapperFunction = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07 CoinMP = coinmp; # Added 2024-06-12 @@ -488,7 +486,6 @@ mapAliases { clubhouse-cli = throw "'clubhouse-cli' has been removed due to lack of interest to maintain it in Nixpkgs and failing to build."; # added 2025-04-21 cockroachdb-bin = cockroachdb; # 2024-03-15 codimd = throw "'codimd' has been renamed to/replaced by 'hedgedoc'"; # Converted to throw 2024-10-17 - inherit (libsForQt5.mauiPackages) communicator; # added 2022-05-17 concurrencykit = throw "'concurrencykit' has been renamed to/replaced by 'libck'"; # Converted to throw 2024-10-17 conduwuit = throw "'conduwuit' has been removed as the upstream repository has been deleted. Consider migrating to 'matrix-conduit', 'matrix-continuwuity' or 'matrix-tuwunel' instead."; # Added 2025-08-08 containerpilot = throw "'containerpilot' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2024-06-09 @@ -955,7 +952,6 @@ mapAliases { inconsolata-nerdfont = lib.warnOnInstantiate "inconsolata-nerdfont is redundant. Use nerd-fonts.inconsolata instead." nerd-fonts.inconsolata; # Added 2024-11-10 incrtcl = tclPackages.incrtcl; # Added 2024-10-02 input-utils = throw "The input-utils package was dropped since it was unmaintained."; # Added 2024-06-21 - index-fm = libsForQt5.mauiPackages.index; # added 2022-05-17 inotifyTools = inotify-tools; insync-emblem-icons = throw "'insync-emblem-icons' has been removed, use 'insync-nautilus' instead"; # Added 2025-05-14 inter-ui = throw "'inter-ui' has been renamed to/replaced by 'inter'"; # Converted to throw 2024-10-17 @@ -1298,8 +1294,6 @@ mapAliases { rust-synapse-compress-state = lib.warnOnInstantiate "`matrix-synapse-tools.rust-synapse-compress-state` has been renamed to `rust-synapse-compress-state`" rust-synapse-compress-state; synadm = lib.warnOnInstantiate "`matrix-synapse-tools.synadm` has been renamed to `synadm`" synadm; }; # Added 2025-02-20 - maui-nota = libsForQt5.mauiPackages.nota; # added 2022-05-17 - maui-shell = throw "maui-shell has been removed from nixpkgs, it was broken"; # Added 2024-07-15 mcomix3 = mcomix; # Added 2022-06-05 mdt = md-tui; # Added 2024-09-03 meme = throw "'meme' has been renamed to/replaced by 'meme-image-generator'"; # Converted to throw 2024-10-17 @@ -1853,7 +1847,6 @@ mapAliases { sexp = sexpp; # Added 2023-07-03 sgrep = throw "'sgrep' has been removed as it was unmaintained upstream since 1998 and broken with gcc 14"; # Added 2025-05-17 shallot = throw "'shallot' has been removed as it is broken and the upstream repository was removed. Consider using 'mkp224o'"; # Added 2025-03-16 - inherit (libsForQt5.mauiPackages) shelf; # added 2022-05-17 shell-hist = throw "'shell-hist' has been removed due to lack of upstream maintenance"; # Added 2025-01-25 shipyard = jumppad; # Added 2023-06-06 siduck76-st = st-snazzy; # Added 2024-12-24 @@ -2153,7 +2146,6 @@ mapAliases { vtk_9_withQt5 = throw "'vtk_9_withQt5' has been removed, Consider using 'vtkWithQt5' instead." vtkWithQt5; # Added 2025-07-18 vuze = throw "'vuze' was removed because it is unmaintained upstream and insecure (CVE-2018-13417). BiglyBT is a maintained fork."; # Added 2024-11-22 vwm = throw "'vwm' was removed as it is broken and not maintained upstream"; # Added 2025-05-17 - inherit (libsForQt5.mauiPackages) vvave; # added 2022-05-17 ### W ### wakatime = wakatime-cli; # 2024-05-30 From 801d52204f0bd5f411557e4a700242d63d65771d Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 12 Aug 2025 19:40:34 +0300 Subject: [PATCH 088/146] aliases.nix: drop tokodon --- pkgs/top-level/aliases.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index ff863f74bc7e..aa4d44746d08 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -2023,7 +2023,6 @@ mapAliases { tkimg = tclPackages.tkimg; # Added 2024-10-02 todiff = throw "'todiff' was removed due to lack of known users"; # Added 2025-01-25 toil = throw "toil was removed as it was broken and requires obsolete versions of libraries"; # Added 2024-09-22 - tokodon = plasma5Packages.tokodon; tokyo-night-gtk = tokyonight-gtk-theme; # Added 2024-01-28 tomcat_connectors = apacheHttpdPackages.mod_jk; # Added 2024-06-07 ton = throw "'ton' has been removed as there were insufficient maintainer resources to keep up with updates"; # Added 2025-04-27 From 0e1071b8be59cee036b811240d22aeca0ce38dfd Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 12 Aug 2025 19:40:34 +0300 Subject: [PATCH 089/146] all-packages.nix: drop Cantor alias --- pkgs/top-level/all-packages.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 556b25890efd..6712de68e5c1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14821,8 +14821,6 @@ with pkgs; blas-ilp64 = blas.override { isILP64 = true; }; - cantor = libsForQt5.cantor; - labplot = libsForQt5.callPackage ../applications/science/math/labplot { }; lapack-ilp64 = lapack.override { isILP64 = true; }; From 35d0bafabfc7befb8fa9e490454c7c0b846f5ff0 Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 2 Aug 2025 10:00:57 +0300 Subject: [PATCH 090/146] nixos/treewide: clean up Plasma 5 references Preparing to drop. --- .../doc/manual/configuration/modularity.section.md | 2 +- .../configuration/profiles/graphical.section.md | 4 ++-- .../doc/manual/configuration/x-windows.chapter.md | 2 +- nixos/modules/i18n/input-method/ibus.nix | 2 +- nixos/modules/profiles/graphical.nix | 4 ++-- nixos/modules/programs/chromium.nix | 2 +- nixos/modules/programs/gnupg.nix | 2 +- nixos/modules/programs/kdeconnect.nix | 2 +- nixos/modules/programs/zoom-us.nix | 4 ---- nixos/modules/security/pam.nix | 4 ++-- .../modules/services/desktop-managers/plasma6.nix | 7 ------- nixos/modules/services/display-managers/sddm.nix | 2 +- nixos/modules/system/boot/plymouth.nix | 14 +------------- nixos/release-combined.nix | 2 +- nixos/release.nix | 2 +- nixos/tests/maestral.nix | 7 ++----- nixos/tests/terminal-emulators.nix | 2 +- 17 files changed, 19 insertions(+), 45 deletions(-) diff --git a/nixos/doc/manual/configuration/modularity.section.md b/nixos/doc/manual/configuration/modularity.section.md index 5ae4f5b56331..ee495bb4bc60 100644 --- a/nixos/doc/manual/configuration/modularity.section.md +++ b/nixos/doc/manual/configuration/modularity.section.md @@ -33,7 +33,7 @@ Here, we include two modules from the same directory, `vpn.nix` and { services.xserver.enable = true; services.displayManager.sddm.enable = true; - services.xserver.desktopManager.plasma5.enable = true; + services.desktopManager.plasma6.enable = true; environment.systemPackages = [ pkgs.vim ]; } ``` diff --git a/nixos/doc/manual/configuration/profiles/graphical.section.md b/nixos/doc/manual/configuration/profiles/graphical.section.md index 84fad5c0a612..f67763811df1 100644 --- a/nixos/doc/manual/configuration/profiles/graphical.section.md +++ b/nixos/doc/manual/configuration/profiles/graphical.section.md @@ -1,10 +1,10 @@ # Graphical {#sec-profile-graphical} -Defines a NixOS configuration with the Plasma 5 desktop. It's used by the +Defines a NixOS configuration with the Plasma 6 desktop. It's used by the graphical installation CD. It sets [](#opt-services.xserver.enable), [](#opt-services.displayManager.sddm.enable), -[](#opt-services.xserver.desktopManager.plasma5.enable), +[](#opt-services.desktopManager.plasma6.enable), and [](#opt-services.libinput.enable) to true. It also includes glxinfo and firefox in the system packages list. diff --git a/nixos/doc/manual/configuration/x-windows.chapter.md b/nixos/doc/manual/configuration/x-windows.chapter.md index 4d779b2ffa42..bf0f541e9688 100644 --- a/nixos/doc/manual/configuration/x-windows.chapter.md +++ b/nixos/doc/manual/configuration/x-windows.chapter.md @@ -23,7 +23,7 @@ Thus you should pick one or more of the following lines: ```nix { - services.xserver.desktopManager.plasma5.enable = true; + services.desktopManager.plasma6.enable = true; services.xserver.desktopManager.xfce.enable = true; services.desktopManager.gnome.enable = true; services.xserver.desktopManager.mate.enable = true; diff --git a/nixos/modules/i18n/input-method/ibus.nix b/nixos/modules/i18n/input-method/ibus.nix index f8a9249b042a..aec11b2362fc 100644 --- a/nixos/modules/i18n/input-method/ibus.nix +++ b/nixos/modules/i18n/input-method/ibus.nix @@ -53,7 +53,7 @@ in panel = lib.mkOption { type = with lib.types; nullOr path; default = null; - example = lib.literalExpression ''"''${pkgs.plasma5Packages.plasma-desktop}/libexec/kimpanel-ibus-panel"''; + example = lib.literalExpression ''"''${pkgs.kdePackages.plasma-desktop}/libexec/kimpanel-ibus-panel"''; description = "Replace the IBus panel with another panel."; }; }; diff --git a/nixos/modules/profiles/graphical.nix b/nixos/modules/profiles/graphical.nix index 82ddc50e423c..d9065d20fe51 100644 --- a/nixos/modules/profiles/graphical.nix +++ b/nixos/modules/profiles/graphical.nix @@ -1,4 +1,4 @@ -# This module defines a NixOS configuration with the Plasma 5 desktop. +# This module defines a NixOS configuration with the Plasma 6 desktop. # It's used by the graphical installation CD. { pkgs, ... }: @@ -6,7 +6,7 @@ { services.xserver = { enable = true; - desktopManager.plasma5.enable = true; + desktopManager.plasma6.enable = true; }; services = { diff --git a/nixos/modules/programs/chromium.nix b/nixos/modules/programs/chromium.nix index 9b07c19ff8c0..9659a186f304 100644 --- a/nixos/modules/programs/chromium.nix +++ b/nixos/modules/programs/chromium.nix @@ -27,7 +27,7 @@ in enablePlasmaBrowserIntegration = lib.mkEnableOption "Native Messaging Host for Plasma Browser Integration"; plasmaBrowserIntegrationPackage = lib.mkPackageOption pkgs [ - "plasma5Packages" + "kdePackages" "plasma-browser-integration" ] { }; diff --git a/nixos/modules/programs/gnupg.nix b/nixos/modules/programs/gnupg.nix index a6fbd081f44a..b8e88aa64023 100644 --- a/nixos/modules/programs/gnupg.nix +++ b/nixos/modules/programs/gnupg.nix @@ -77,7 +77,7 @@ in Which pinentry package to use. The path to the mainProgram as defined in the package's meta attributes will be set in /etc/gnupg/gpg-agent.conf. If not set by the user, it'll pick an appropriate flavor depending on the - system configuration (qt flavor for lxqt and plasma5, gtk2 for xfce, + system configuration (qt flavor for lxqt and plasma, gtk2 for xfce, gnome3 on all other systems with X enabled, curses otherwise). ''; }; diff --git a/nixos/modules/programs/kdeconnect.nix b/nixos/modules/programs/kdeconnect.nix index 17bb384a9fea..f51eeb9c6ced 100644 --- a/nixos/modules/programs/kdeconnect.nix +++ b/nixos/modules/programs/kdeconnect.nix @@ -15,7 +15,7 @@ `gnomeExtensions.gsconnect` as an alternative implementation if you use Gnome ''; - package = lib.mkPackageOption pkgs [ "plasma5Packages" "kdeconnect-kde" ] { + package = lib.mkPackageOption pkgs [ "kdePackages" "kdeconnect-kde" ] { example = "gnomeExtensions.gsconnect"; }; }; diff --git a/nixos/modules/programs/zoom-us.nix b/nixos/modules/programs/zoom-us.nix index b5b6c8acf7b6..9d31c8e3086a 100644 --- a/nixos/modules/programs/zoom-us.nix +++ b/nixos/modules/programs/zoom-us.nix @@ -23,10 +23,6 @@ plasma6XdgDesktopPortalSupport = prev.plasma6XdgDesktopPortalSupport or config.services.desktopManager.plasma6.enable; - # Support Plasma 5 desktop environment if it's enabled on the system. - plasma5XdgDesktopPortalSupport = - prev.plasma5XdgDesktopPortalSupport or config.services.xserver.desktopManager.plasma5.enable; - # Support LXQT desktop environment if it's enabled on the system. # There's also `config.services.xserver.desktopManager.lxqt.enable` lxqtXdgDesktopPortalSupport = prev.lxqtXdgDesktopPortalSupport or config.xdg.portal.lxqt.enable; diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index 53e67873d200..198251bf34e3 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -549,8 +549,8 @@ let ''; }; - package = lib.mkPackageOption pkgs.plasma5Packages "kwallet-pam" { - pkgsText = "pkgs.plasma5Packages"; + package = lib.mkPackageOption pkgs.kdePackages "kwallet-pam" { + pkgsText = "pkgs.kdePackages"; }; forceRun = lib.mkEnableOption null // { diff --git a/nixos/modules/services/desktop-managers/plasma6.nix b/nixos/modules/services/desktop-managers/plasma6.nix index c553da347d79..12bdb2a6db69 100644 --- a/nixos/modules/services/desktop-managers/plasma6.nix +++ b/nixos/modules/services/desktop-managers/plasma6.nix @@ -68,13 +68,6 @@ in ]; config = mkIf cfg.enable { - assertions = [ - { - assertion = cfg.enable -> !config.services.xserver.desktopManager.plasma5.enable; - message = "Cannot enable plasma5 and plasma6 at the same time!"; - } - ]; - qt.enable = true; programs.xwayland.enable = true; environment.systemPackages = diff --git a/nixos/modules/services/display-managers/sddm.nix b/nixos/modules/services/display-managers/sddm.nix index 06516fb76b7a..b9df863d12f9 100644 --- a/nixos/modules/services/display-managers/sddm.nix +++ b/nixos/modules/services/display-managers/sddm.nix @@ -228,7 +228,7 @@ in ''; }; - package = mkPackageOption pkgs [ "plasma5Packages" "sddm" ] { }; + package = mkPackageOption pkgs [ "libsForQt5" "sddm" ] { }; enableHidpi = mkOption { type = types.bool; diff --git a/nixos/modules/system/boot/plymouth.nix b/nixos/modules/system/boot/plymouth.nix index 24861b678769..8636ec7957d2 100644 --- a/nixos/modules/system/boot/plymouth.nix +++ b/nixos/modules/system/boot/plymouth.nix @@ -17,13 +17,6 @@ let cfg = config.boot.plymouth; opt = options.boot.plymouth; - nixosBreezePlymouth = pkgs.plasma5Packages.breeze-plymouth.override { - logoFile = cfg.logo; - logoName = "nixos"; - osName = "NixOS"; - osVersion = config.system.nixos.release; - }; - plymouthLogos = pkgs.runCommand "plymouth-logos" { inherit (cfg) logo; } '' mkdir -p $out @@ -87,12 +80,7 @@ in }; themePackages = mkOption { - default = lib.optional (cfg.theme == "breeze") nixosBreezePlymouth; - defaultText = literalMD '' - A NixOS branded variant of the breeze theme when - `config.${opt.theme} == "breeze"`, otherwise - `[ ]`. - ''; + default = [ ]; type = types.listOf types.package; description = '' Extra theme packages for plymouth. diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index 98519bcab4f7..b9b59e4ab37a 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -171,7 +171,7 @@ rec { (onFullSupported "nixos.tests.php.fpm") (onFullSupported "nixos.tests.php.httpd") (onFullSupported "nixos.tests.php.pcre") - (onFullSupported "nixos.tests.plasma5") + (onFullSupported "nixos.tests.plasma6") (onSystems [ "x86_64-linux" ] "nixos.tests.podman") (onFullSupported "nixos.tests.predictable-interface-names.predictableNetworkd") (onFullSupported "nixos.tests.predictable-interface-names.predictable") diff --git a/nixos/release.nix b/nixos/release.nix index 3bcacf1e471c..1000bf9c6bc7 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -594,7 +594,7 @@ rec { { services.xserver.enable = true; services.displayManager.sddm.enable = true; - services.xserver.desktopManager.plasma5.enable = true; + services.desktopManager.plasma6.enable = true; } ); diff --git a/nixos/tests/maestral.nix b/nixos/tests/maestral.nix index 9b42b2d59e28..30491a496b93 100644 --- a/nixos/tests/maestral.nix +++ b/nixos/tests/maestral.nix @@ -31,11 +31,8 @@ gui = { ... }: common { - services.xserver = { - enable = true; - desktopManager.plasma5.enable = true; - desktopManager.plasma5.runUsingSystemd = true; - }; + services.xserver.enable = true; + services.desktopManager.plasma6.enable = true; services.displayManager = { sddm.enable = true; diff --git a/nixos/tests/terminal-emulators.nix b/nixos/tests/terminal-emulators.nix index 6b209b8b3368..dfa5d9150ba5 100644 --- a/nixos/tests/terminal-emulators.nix +++ b/nixos/tests/terminal-emulators.nix @@ -63,7 +63,7 @@ let kitty.pkg = p: p.kitty; kitty.cmd = "kitty $command"; - konsole.pkg = p: p.plasma5Packages.konsole; + konsole.pkg = p: p.kdePackages.konsole; lxterminal.pkg = p: p.lxterminal; From 4b4aa628da835c05d05ed9afe2304862123fd529 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Wed, 20 Aug 2025 21:41:57 +0200 Subject: [PATCH 091/146] actions/checkout: parallelize checkout of multiple commits on tmpfs Instead of fetching up to 3 times on each new checkout, we now fetch all the commits we're going to need at once. Afterwards, we checkout the different worktrees in parallel, which doesn't give us much, yet, because it would still be IO-bound on its own. Inconsistent IO performance on disk is also the biggest limitation for checkout right now, where checkout times range everywhere from 20s to 40s. By checking out the worktrees on a tmpfs, the actual checkout only takes 1s and benefits from parallelization. The overall checkout time is now 8-11s, depending on the number of commits. That's a reduction of 10-30s and we get this speedup for almost every job in the PR workflow, which is huge. This potentially has a nice side-effect for Eval, too: Because the repo is in RAM, Eval seems to run slightly faster, up to 10 seconds less. --- .github/actions/checkout/action.yml | 111 ++++++++++++++++++++-------- .github/workflows/eval.yml | 4 +- 2 files changed, 82 insertions(+), 33 deletions(-) diff --git a/.github/actions/checkout/action.yml b/.github/actions/checkout/action.yml index a07edb097d7b..1b61b9b0d08d 100644 --- a/.github/actions/checkout/action.yml +++ b/.github/actions/checkout/action.yml @@ -13,39 +13,88 @@ inputs: runs: using: composite steps: - - if: inputs.merged-as-untrusted-at - # Would be great to do the checkouts in git worktrees of the existing spare checkout instead, - # but Nix is broken with them: - # https://github.com/NixOS/nix/issues/6073 - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - with: - ref: ${{ inputs.merged-as-untrusted-at }} - path: untrusted - - - if: inputs.target-as-trusted-at - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - with: - ref: ${{ inputs.target-as-trusted-at }} - path: trusted - - - if: inputs.pinned-from - id: pinned - uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1 + - uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1 env: + MERGED_SHA: ${{ inputs.merged-as-untrusted-at }} PINNED_FROM: ${{ inputs.pinned-from }} + TARGET_SHA: ${{ inputs.target-as-trusted-at }} with: script: | - const path = require('node:path') - const pinned = require(path.resolve(path.join(process.env.PINNED_FROM, 'ci', 'pinned.json'))) - core.setOutput('pinned-at', pinned.pins.nixpkgs.revision) + const { spawn } = require('node:child_process') + const { join } = require('node:path') - - if: steps.pinned.outputs.pinned-at - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - with: - ref: ${{ steps.pinned.outputs.pinned-at }} - path: pinned - sparse-checkout: | - lib - maintainers - nixos/lib - pkgs + async function run(cmd, ...args) { + return new Promise((resolve, reject) => { + const proc = spawn(cmd, args, { + stdio: 'inherit' + }) + proc.on('close', (code) => { + if (code === 0) resolve() + else reject(code) + }) + }) + } + + // These are set automatically by the spare checkout for .github/actions. + // Undo them, otherwise git fetch below will not do anything. + await run('git', 'config', 'unset', 'remote.origin.promisor') + await run('git', 'config', 'unset', 'remote.origin.partialclonefilter') + + // Getting the pinned SHA via API allows us to do one single fetch call for all commits. + // Otherwise we would have to fetch merged/target first, read pinned, fetch again. + // A single fetch call comes with a lot less overhead. The fetch takes essentially the + // same time no matter whether its 1, 2 or 3 commits at once. + async function getPinnedSha(ref) { + const { content, encoding } = (await github.rest.repos.getContent({ + ...context.repo, + path: 'ci/pinned.json', + ref, + })).data + const pinned = JSON.parse(Buffer.from(content, encoding).toString()) + return pinned.pins.nixpkgs.revision + } + + const commits = [ + { + sha: process.env.MERGED_SHA, + path: 'untrusted', + }, + { + sha: process.env.PINNED_FROM === 'untrusted' && (await getPinnedSha(process.env.MERGED_SHA)), + path: 'pinned' + }, + { + sha: process.env.TARGET_SHA, + path: 'trusted', + }, + { + sha: process.env.PINNED_FROM === 'trusted' && (await getPinnedSha(process.env.TARGET_SHA)), + path: 'pinned' + } + ].filter(({ sha }) => Boolean(sha)) + + console.log('Checking out the following commits:', commits) + + // Fetching all commits at once is much faster than doing multiple checkouts. + // This would fail without --refetch, because the we had a partial clone before, but changed it above. + await run('git', 'fetch', '--depth=1', '--refetch', 'origin', ...(commits.map(({ sha }) => sha))) + + // Create all worktrees in parallel. + await Promise.all(commits.map(async ({ sha, path }) => { + // Checking out onto tmpfs takes 1s and is faster by at least factor 10x. + await run('mkdir', path) + switch (process.env.RUNNER_OS) { + case 'macOS': + await run('sudo', 'mount_tmpfs', path) + // macOS creates this hidden folder to log file system activity. + // This trips up git when adding a worktree below, because the target folder is not empty. + await run('sudo', 'rm', '-rf', join(path, '.fseventsd')) + break + case 'Linux': + await run('sudo', 'mount', '-t', 'tmpfs', 'tmpfs', path) + break + } + await run('git', 'worktree', 'add', path, sha, '--no-checkout', '--force') + await run('git', '-C', path, 'sparse-checkout', 'disable') + await run('git', '-C', path, 'checkout', '--progress') + })) diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml index 0b70521d62b3..805303ac679e 100644 --- a/.github/workflows/eval.yml +++ b/.github/workflows/eval.yml @@ -217,6 +217,7 @@ jobs: - name: Check out the PR at the target commit uses: ./.github/actions/checkout with: + merged-as-untrusted-at: ${{ inputs.mergedSha }} target-as-trusted-at: ${{ inputs.targetSha }} pinned-from: trusted @@ -240,7 +241,6 @@ jobs: env: AUTHOR_ID: ${{ github.event.pull_request.user.id }} run: | - git -C trusted fetch --depth 1 origin ${{ inputs.mergedSha }} git -C trusted diff --name-only ${{ inputs.mergedSha }} \ | jq --raw-input --slurp 'split("\n")[:-1]' > touched-files.json @@ -392,7 +392,7 @@ jobs: uses: cachix/install-nix-action@fc6e360bedc9ee72d75e701397f0bb30dce77568 # v31 - name: Ensure flake outputs on all systems still evaluate - run: nix flake check --all-systems --no-build ./untrusted + run: nix flake check --all-systems --no-build './untrusted?shallow=1' - name: Query nixpkgs with aliases enabled to check for basic syntax errors run: | From fbecc923cc5c93278cbb2dbd1b8761a55b153118 Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Thu, 21 Aug 2025 15:44:10 -0400 Subject: [PATCH 092/146] nixos/orca: Be careful about setting the display-manager path Without this `mkIf`, it was accidentally disabling `getty@tty1.service` on non-display-manager systems. --- nixos/modules/services/accessibility/orca.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/accessibility/orca.nix b/nixos/modules/services/accessibility/orca.nix index e624ffa23a33..3fe205498bfe 100644 --- a/nixos/modules/services/accessibility/orca.nix +++ b/nixos/modules/services/accessibility/orca.nix @@ -20,7 +20,9 @@ in config = mkIf cfg.enable { environment.systemPackages = [ cfg.package ]; - systemd.services.display-manager.path = [ cfg.package ]; + systemd.services.display-manager = lib.mkIf config.services.displayManager.enable { + path = [ cfg.package ]; + }; services.speechd.enable = true; }; } From 35acc490c5f1fab0898fb2c12201a37b87ad0461 Mon Sep 17 00:00:00 2001 From: Defelo Date: Thu, 21 Aug 2025 21:56:42 +0200 Subject: [PATCH 093/146] hyfetch: install shell completions --- pkgs/by-name/hy/hyfetch/package.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/by-name/hy/hyfetch/package.nix b/pkgs/by-name/hy/hyfetch/package.nix index 200449a34646..92ac46b0b59f 100644 --- a/pkgs/by-name/hy/hyfetch/package.nix +++ b/pkgs/by-name/hy/hyfetch/package.nix @@ -3,6 +3,7 @@ rustPlatform, fetchFromGitHub, installShellFiles, + stdenv, makeBinaryWrapper, pciutils, versionCheckHook, @@ -36,6 +37,12 @@ rustPlatform.buildRustPackage (finalAttrs: { installManPage ./docs/hyfetch.1 ./docs/neowofetch.1 install -m 755 neofetch $out/bin/neowofetch + '' + + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd hyfetch \ + --bash <($out/bin/hyfetch --bpaf-complete-style-bash) \ + --fish <($out/bin/hyfetch --bpaf-complete-style-fish) \ + --zsh <($out/bin/hyfetch --bpaf-complete-style-zsh) ''; postFixup = '' From 15a586f29d593dfd030dca1c0c6e7c257ca26d15 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 12 Aug 2025 19:36:52 +0300 Subject: [PATCH 094/146] nixos: remove Plasma 5 --- ...llation-cd-graphical-calamares-plasma5.nix | 53 -- ...lation-cd-graphical-plasma5-new-kernel.nix | 7 - .../installation-cd-graphical-plasma5.nix | 50 -- nixos/modules/rename.nix | 6 + .../services/x11/desktop-managers/default.nix | 1 - .../services/x11/desktop-managers/plasma5.nix | 635 ------------------ nixos/tests/all-tests.nix | 2 - nixos/tests/plasma-bigscreen.nix | 41 -- nixos/tests/plasma5-systemd-start.nix | 46 -- nixos/tests/plasma5.nix | 70 -- 10 files changed, 6 insertions(+), 905 deletions(-) delete mode 100644 nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-plasma5.nix delete mode 100644 nixos/modules/installer/cd-dvd/installation-cd-graphical-plasma5-new-kernel.nix delete mode 100644 nixos/modules/installer/cd-dvd/installation-cd-graphical-plasma5.nix delete mode 100644 nixos/modules/services/x11/desktop-managers/plasma5.nix delete mode 100644 nixos/tests/plasma-bigscreen.nix delete mode 100644 nixos/tests/plasma5-systemd-start.nix delete mode 100644 nixos/tests/plasma5.nix diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-plasma5.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-plasma5.nix deleted file mode 100644 index 84d0ea44bb84..000000000000 --- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-plasma5.nix +++ /dev/null @@ -1,53 +0,0 @@ -# This module defines a NixOS installation CD that contains X11 and -# Plasma 5. - -{ lib, pkgs, ... }: - -{ - imports = [ ./installation-cd-graphical-calamares.nix ]; - - isoImage.edition = lib.mkDefault "plasma5"; - - services.xserver.desktopManager.plasma5 = { - enable = true; - }; - - # Automatically login as nixos. - services.displayManager = { - sddm.enable = true; - autoLogin = { - enable = true; - user = "nixos"; - }; - }; - - environment.systemPackages = with pkgs; [ - # Graphical text editor - plasma5Packages.kate - ]; - - system.activationScripts.installerDesktop = - let - - # Comes from documentation.nix when xserver and nixos.enable are true. - manualDesktopFile = "/run/current-system/sw/share/applications/nixos-manual.desktop"; - - homeDir = "/home/nixos/"; - desktopDir = homeDir + "Desktop/"; - - in - '' - mkdir -p ${desktopDir} - chown nixos ${homeDir} ${desktopDir} - - ln -sfT ${manualDesktopFile} ${desktopDir + "nixos-manual.desktop"} - ln -sfT ${pkgs.gparted}/share/applications/gparted.desktop ${desktopDir + "gparted.desktop"} - ln -sfT ${pkgs.plasma5Packages.konsole}/share/applications/org.kde.konsole.desktop ${ - desktopDir + "org.kde.konsole.desktop" - } - ln -sfT ${pkgs.calamares-nixos}/share/applications/calamares.desktop ${ - desktopDir + "calamares.desktop" - } - ''; - -} diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-plasma5-new-kernel.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-plasma5-new-kernel.nix deleted file mode 100644 index d98325a99ac2..000000000000 --- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-plasma5-new-kernel.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ pkgs, ... }: - -{ - imports = [ ./installation-cd-graphical-plasma5.nix ]; - - boot.kernelPackages = pkgs.linuxPackages_latest; -} diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-plasma5.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-plasma5.nix deleted file mode 100644 index f41d34c65e79..000000000000 --- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-plasma5.nix +++ /dev/null @@ -1,50 +0,0 @@ -# This module defines a NixOS installation CD that contains X11 and -# Plasma 5. - -{ lib, pkgs, ... }: - -{ - imports = [ ./installation-cd-graphical-base.nix ]; - - isoImage.edition = lib.mkDefault "plasma5"; - - services.xserver.desktopManager.plasma5 = { - enable = true; - }; - - # Automatically login as nixos. - services.displayManager = { - sddm.enable = true; - autoLogin = { - enable = true; - user = "nixos"; - }; - }; - - environment.systemPackages = with pkgs; [ - # Graphical text editor - plasma5Packages.kate - ]; - - system.activationScripts.installerDesktop = - let - - # Comes from documentation.nix when xserver and nixos.enable are true. - manualDesktopFile = "/run/current-system/sw/share/applications/nixos-manual.desktop"; - - homeDir = "/home/nixos/"; - desktopDir = homeDir + "Desktop/"; - - in - '' - mkdir -p ${desktopDir} - chown nixos ${homeDir} ${desktopDir} - - ln -sfT ${manualDesktopFile} ${desktopDir + "nixos-manual.desktop"} - ln -sfT ${pkgs.gparted}/share/applications/gparted.desktop ${desktopDir + "gparted.desktop"} - ln -sfT ${pkgs.plasma5Packages.konsole}/share/applications/org.kde.konsole.desktop ${ - desktopDir + "org.kde.konsole.desktop" - } - ''; - -} diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 8ab897ecba56..4934df421eeb 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -265,6 +265,12 @@ in LightDM. Please use the services.displayManager.autoLogin options instead, or any other display manager in NixOS as they all support auto-login. '') + (mkRemovedOptionModule [ + "services" + "xserver" + "desktopManager" + "plasma5" + ] "the Plasma 5 desktop environment has been removed from nixpkgs, as it has reached EOL upstream.") (mkRemovedOptionModule [ "services" "xserver" "multitouch" ] '' services.xserver.multitouch (which uses xf86_input_mtrack) has been removed as the underlying package isn't being maintained. Working alternatives are diff --git a/nixos/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix index 9dbb9a42d4fa..6219d11fda05 100644 --- a/nixos/modules/services/x11/desktop-managers/default.nix +++ b/nixos/modules/services/x11/desktop-managers/default.nix @@ -26,7 +26,6 @@ in ./xterm.nix ./phosh.nix ./xfce.nix - ./plasma5.nix ../../desktop-managers/plasma6.nix ./lumina.nix ./lxqt.nix diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix deleted file mode 100644 index db525adc8f7f..000000000000 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ /dev/null @@ -1,635 +0,0 @@ -{ - config, - lib, - pkgs, - utils, - ... -}: - -let - xcfg = config.services.xserver; - cfg = xcfg.desktopManager.plasma5; - - # Use only for **internal** options. - # This is not exactly user-friendly. - kdeConfigurationType = - with types; - let - valueTypes = - (oneOf [ - bool - float - int - str - ]) - // { - description = "KDE Configuration value"; - emptyValue.value = ""; - }; - set = (nullOr (lazyAttrsOf valueTypes)) // { - description = "KDE Configuration set"; - emptyValue.value = { }; - }; - in - (lazyAttrsOf set) - // { - description = "KDE Configuration file"; - emptyValue.value = { }; - }; - - inherit (lib) - getBin - optionalAttrs - literalExpression - mkRemovedOptionModule - mkRenamedOptionModule - mkDefault - mkIf - mkMerge - mkOption - mkPackageOption - types - ; - - activationScript = '' - ${set_XDG_CONFIG_HOME} - - # The KDE icon cache is supposed to update itself automatically, but it uses - # the timestamp on the icon theme directory as a trigger. This doesn't work - # on NixOS because the timestamp never changes. As a workaround, delete the - # icon cache at login and session activation. - # See also: http://lists-archives.org/kde-devel/26175-what-when-will-icon-cache-refresh.html - rm -fv "$HOME"/.cache/icon-cache.kcache - - # xdg-desktop-settings generates this empty file but - # it makes kbuildsyscoca5 fail silently. To fix this - # remove that menu if it exists. - rm -fv "''${XDG_CONFIG_HOME}"/menus/applications-merged/xdg-desktop-menu-dummy.menu - - # Qt writes a weird ‘libraryPath’ line to - # ~/.config/Trolltech.conf that causes the KDE plugin - # paths of previous KDE invocations to be searched. - # Obviously using mismatching KDE libraries is potentially - # disastrous, so here we nuke references to the Nix store - # in Trolltech.conf. A better solution would be to stop - # Qt from doing this wackiness in the first place. - trolltech_conf="''${XDG_CONFIG_HOME}/Trolltech.conf" - if [ -e "$trolltech_conf" ]; then - ${getBin pkgs.gnused}/bin/sed -i "$trolltech_conf" -e '/nix\\store\|nix\/store/ d' - fi - - # Remove the kbuildsyscoca5 cache. It will be regenerated - # immediately after. This is necessary for kbuildsyscoca5 to - # recognize that software that has been removed. - rm -fv "$HOME"/.cache/ksycoca* - - ${pkgs.plasma5Packages.kservice}/bin/kbuildsycoca5 - ''; - - set_XDG_CONFIG_HOME = '' - # Set the default XDG_CONFIG_HOME if it is unset. - # Per the XDG Base Directory Specification: - # https://specifications.freedesktop.org/basedir-spec/latest - # 1. Never export this variable! If it is unset, then child processes are - # expected to set the default themselves. - # 2. Contaminate / if $HOME is unset; do not check if $HOME is set. - XDG_CONFIG_HOME=''${XDG_CONFIG_HOME:-$HOME/.config} - ''; - -in - -{ - options = { - services.xserver.desktopManager.plasma5 = { - enable = mkOption { - type = types.bool; - default = false; - description = "Enable the Plasma 5 (KDE 5) desktop environment."; - }; - - phononBackend = mkOption { - type = types.enum [ - "gstreamer" - "vlc" - ]; - default = "vlc"; - example = "gstreamer"; - description = "Phonon audio backend to install."; - }; - - useQtScaling = mkOption { - type = types.bool; - default = false; - description = "Enable HiDPI scaling in Qt."; - }; - - runUsingSystemd = mkOption { - description = "Use systemd to manage the Plasma session"; - type = types.bool; - default = true; - }; - - notoPackage = mkPackageOption pkgs "Noto fonts" { - default = [ "noto-fonts" ]; - example = "noto-fonts-lgc-plus"; - }; - - # Internally allows configuring kdeglobals globally - kdeglobals = mkOption { - internal = true; - default = { }; - type = kdeConfigurationType; - }; - - # Internally allows configuring kwin globally - kwinrc = mkOption { - internal = true; - default = { }; - type = kdeConfigurationType; - }; - - mobile.enable = mkOption { - type = types.bool; - default = false; - description = '' - Enable support for running the Plasma Mobile shell. - ''; - }; - - mobile.installRecommendedSoftware = mkOption { - type = types.bool; - default = true; - description = '' - Installs software recommended for use with Plasma Mobile, but which - is not strictly required for Plasma Mobile to run. - ''; - }; - - bigscreen.enable = mkOption { - type = types.bool; - default = false; - description = '' - Enable support for running the Plasma Bigscreen session. - ''; - }; - }; - environment.plasma5.excludePackages = mkOption { - description = "List of default packages to exclude from the configuration"; - type = types.listOf types.package; - default = [ ]; - example = literalExpression "[ pkgs.plasma5Packages.oxygen ]"; - }; - }; - - imports = [ - (mkRemovedOptionModule [ - "services" - "xserver" - "desktopManager" - "plasma5" - "enableQt4Support" - ] "Phonon no longer supports Qt 4.") - (mkRemovedOptionModule [ - "services" - "xserver" - "desktopManager" - "plasma5" - "supportDDC" - ] "DDC/CI is no longer supported upstream.") - (mkRenamedOptionModule - [ "services" "xserver" "desktopManager" "kde5" ] - [ "services" "xserver" "desktopManager" "plasma5" ] - ) - (mkRenamedOptionModule - [ "services" "xserver" "desktopManager" "plasma5" "excludePackages" ] - [ "environment" "plasma5" "excludePackages" ] - ) - ]; - - config = mkMerge [ - # Common Plasma dependencies - (mkIf (cfg.enable || cfg.mobile.enable || cfg.bigscreen.enable) { - warnings = [ - "Plasma 5 has been deprecated and will be removed in NixOS 25.11. Please migrate your configuration to Plasma 6." - ]; - - security.wrappers = { - kwin_wayland = { - owner = "root"; - group = "root"; - capabilities = "cap_sys_nice+ep"; - source = "${getBin pkgs.plasma5Packages.kwin}/bin/kwin_wayland"; - }; - } - // optionalAttrs (!cfg.runUsingSystemd) { - start_kdeinit = { - setuid = true; - owner = "root"; - group = "root"; - source = "${getBin pkgs.plasma5Packages.kinit}/libexec/kf5/start_kdeinit"; - }; - }; - - qt.enable = true; - - environment.systemPackages = - with pkgs.plasma5Packages; - let - requiredPackages = [ - frameworkintegration - kactivities - kauth - kcmutils - kconfig - kconfigwidgets - kcoreaddons - kdoctools - kdbusaddons - kdeclarative - kded - kdesu - kdnssd - kemoticons - kfilemetadata - kglobalaccel - kguiaddons - kiconthemes - kidletime - kimageformats - kinit - kirigami2 # In system profile for SDDM theme. TODO: wrapper. - kio - kjobwidgets - knewstuff - knotifications - knotifyconfig - kpackage - kparts - kpeople - krunner - kservice - ktextwidgets - kwallet - kwallet-pam - kwalletmanager - kwayland - kwayland-integration - kwidgetsaddons - kxmlgui - kxmlrpcclient - plasma-framework - solid - sonnet - threadweaver - - breeze-qt5 - kactivitymanagerd - kde-cli-tools - kdecoration - kdeplasma-addons - kgamma5 - khotkeys - kscreen - kscreenlocker - kwayland - kwin - kwrited - libkscreen - libksysguard - milou - plasma-integration - polkit-kde-agent - - qqc2-breeze-style - qqc2-desktop-style - - plasma-desktop - plasma-workspace - plasma-workspace-wallpapers - - oxygen-sounds - - breeze-icons - pkgs.hicolor-icon-theme - - kde-gtk-config - breeze-gtk - - qtvirtualkeyboard - - pkgs.xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/ - ]; - optionalPackages = [ - pkgs.aha # needed by kinfocenter for fwupd support - plasma-browser-integration - konsole - oxygen - (lib.getBin qttools) # Expose qdbus in PATH - ]; - in - requiredPackages - ++ utils.removePackagesByName optionalPackages config.environment.plasma5.excludePackages - - # Phonon audio backend - ++ lib.optional (cfg.phononBackend == "gstreamer") pkgs.plasma5Packages.phonon-backend-gstreamer - ++ lib.optional (cfg.phononBackend == "vlc") pkgs.plasma5Packages.phonon-backend-vlc - - # Optional hardware support features - ++ lib.optionals config.hardware.bluetooth.enable [ - bluedevil - bluez-qt - pkgs.openobex - pkgs.obexftp - ] - ++ lib.optional config.networking.networkmanager.enable plasma-nm - ++ lib.optional config.services.pulseaudio.enable plasma-pa - ++ lib.optional config.services.pipewire.pulse.enable plasma-pa - ++ lib.optional config.powerManagement.enable powerdevil - ++ lib.optional config.services.colord.enable pkgs.colord-kde - ++ lib.optional config.services.hardware.bolt.enable pkgs.plasma5Packages.plasma-thunderbolt - ++ lib.optional config.services.samba.enable kdenetwork-filesharing - ++ lib.optional config.services.xserver.wacom.enable pkgs.wacomtablet - ++ lib.optional config.services.flatpak.enable flatpak-kcm; - - # Extra services for D-Bus activation - services.dbus.packages = [ - pkgs.plasma5Packages.kactivitymanagerd - ]; - - environment.pathsToLink = [ - # FIXME: modules should link subdirs of `/share` rather than relying on this - "/share" - ]; - - environment.etc."X11/xkb".source = xcfg.xkb.dir; - - environment.sessionVariables = { - PLASMA_USE_QT_SCALING = mkIf cfg.useQtScaling "1"; - - # Needed for things that depend on other store.kde.org packages to install correctly, - # notably Plasma look-and-feel packages (a.k.a. Global Themes) - # - # FIXME: this is annoyingly impure and should really be fixed at source level somehow, - # but kpackage is a library so we can't just wrap the one thing invoking it and be done. - # This also means things won't work for people not on Plasma, but at least this way it - # works for SOME people. - KPACKAGE_DEP_RESOLVERS_PATH = "${pkgs.plasma5Packages.frameworkintegration.out}/libexec/kf5/kpackagehandlers"; - }; - - # Enable GTK applications to load SVG icons - programs.gdk-pixbuf.modulePackages = [ pkgs.librsvg ]; - - fonts.packages = with pkgs; [ - cfg.notoPackage - hack-font - ]; - fonts.fontconfig.defaultFonts = { - monospace = [ - "Hack" - "Noto Sans Mono" - ]; - sansSerif = [ "Noto Sans" ]; - serif = [ "Noto Serif" ]; - }; - - programs.gnupg.agent.pinentryPackage = mkDefault pkgs.pinentry-qt; - programs.ssh.askPassword = mkDefault "${pkgs.plasma5Packages.ksshaskpass.out}/bin/ksshaskpass"; - - # Enable helpful DBus services. - services.accounts-daemon.enable = true; - programs.dconf.enable = true; - # when changing an account picture the accounts-daemon reads a temporary file containing the image which systemsettings5 may place under /tmp - systemd.services.accounts-daemon.serviceConfig.PrivateTmp = false; - services.power-profiles-daemon.enable = mkDefault true; - services.system-config-printer.enable = mkIf config.services.printing.enable (mkDefault true); - services.udisks2.enable = true; - services.upower.enable = config.powerManagement.enable; - services.libinput.enable = mkDefault true; - - # Extra UDEV rules used by Solid - services.udev.packages = [ - # libmtp has "bin", "dev", "out" outputs. UDEV rules file is in "out". - pkgs.libmtp.out - pkgs.media-player-info - ]; - - # Enable screen reader by default - services.orca.enable = mkDefault true; - - services.displayManager.sddm = { - theme = mkDefault "breeze"; - }; - - security.pam.services.kde = { - allowNullPassword = true; - }; - - security.pam.services.login.kwallet.enable = true; - - systemd.user.services = { - plasma-early-setup = mkIf cfg.runUsingSystemd { - description = "Early Plasma setup"; - wantedBy = [ "graphical-session-pre.target" ]; - serviceConfig.Type = "oneshot"; - script = activationScript; - }; - }; - - xdg.icons.enable = true; - - xdg.portal.enable = true; - xdg.portal.extraPortals = [ pkgs.plasma5Packages.xdg-desktop-portal-kde ]; - xdg.portal.configPackages = mkDefault [ pkgs.plasma5Packages.xdg-desktop-portal-kde ]; - # xdg-desktop-portal-kde expects PipeWire to be running. - services.pipewire.enable = mkDefault true; - - # Update the start menu for each user that is currently logged in - system.userActivationScripts.plasmaSetup = activationScript; - - programs.firefox.nativeMessagingHosts.packages = [ - pkgs.plasma5Packages.plasma-browser-integration - ]; - programs.chromium.enablePlasmaBrowserIntegration = true; - }) - - (mkIf (cfg.kwinrc != { }) { - environment.etc."xdg/kwinrc".text = lib.generators.toINI { } cfg.kwinrc; - }) - - (mkIf (cfg.kdeglobals != { }) { - environment.etc."xdg/kdeglobals".text = lib.generators.toINI { } cfg.kdeglobals; - }) - - # Plasma Desktop - (mkIf cfg.enable { - - # Seed our configuration into nixos-generate-config - system.nixos-generate-config.desktopConfiguration = [ - '' - # Enable the Plasma 5 Desktop Environment. - services.displayManager.sddm.enable = true; - services.xserver.desktopManager.plasma5.enable = true; - '' - ]; - - services.displayManager.sessionPackages = [ pkgs.plasma5Packages.plasma-workspace ]; - # Default to be `plasma` (X11) instead of `plasmawayland`, since plasma wayland currently has - # many tiny bugs. - # See: https://github.com/NixOS/nixpkgs/issues/143272 - services.displayManager.defaultSession = mkDefault "plasma"; - - environment.systemPackages = - with pkgs.plasma5Packages; - let - requiredPackages = [ - ksystemstats - kinfocenter - kmenuedit - plasma-systemmonitor - spectacle - systemsettings - - dolphin - dolphin-plugins - ffmpegthumbs - kdegraphics-thumbnailers - kde-inotify-survey - kio-admin - kio-extras - ]; - optionalPackages = [ - ark - elisa - gwenview - okular - khelpcenter - print-manager - ]; - in - requiredPackages - ++ utils.removePackagesByName optionalPackages config.environment.plasma5.excludePackages; - - systemd.user.services = { - plasma-run-with-systemd = { - description = "Run KDE Plasma via systemd"; - wantedBy = [ "basic.target" ]; - serviceConfig.Type = "oneshot"; - script = '' - ${set_XDG_CONFIG_HOME} - - ${pkgs.plasma5Packages.kconfig}/bin/kwriteconfig5 \ - --file startkderc --group General --key systemdBoot ${lib.boolToString cfg.runUsingSystemd} - ''; - }; - }; - }) - - # Plasma Mobile - (mkIf cfg.mobile.enable { - assertions = [ - { - # The user interface breaks without NetworkManager - assertion = config.networking.networkmanager.enable; - message = "Plasma Mobile requires NetworkManager."; - } - { - # The user interface breaks without bluetooth - assertion = config.hardware.bluetooth.enable; - message = "Plasma Mobile requires Bluetooth."; - } - { - # The user interface breaks without pulse - assertion = - config.services.pulseaudio.enable - || (config.services.pipewire.enable && config.services.pipewire.pulse.enable); - message = "Plasma Mobile requires a Pulseaudio compatible sound server."; - } - ]; - - environment.systemPackages = - with pkgs.plasma5Packages; - [ - # Basic packages without which Plasma Mobile fails to work properly. - plasma-mobile - plasma-nano - pkgs.maliit-framework - pkgs.maliit-keyboard - ] - ++ lib.optionals (cfg.mobile.installRecommendedSoftware) ( - with pkgs.plasma5Packages.plasmaMobileGear; - [ - # Additional software made for Plasma Mobile. - alligator - angelfish - audiotube - calindori - kalk - kasts - kclock - keysmith - koko - krecorder - ktrip - kweather - plasma-dialer - plasma-phonebook - plasma-settings - spacebar - ] - ); - - # The following services are needed or the UI is broken. - hardware.bluetooth.enable = true; - networking.networkmanager.enable = true; - # Required for autorotate - hardware.sensor.iio.enable = lib.mkDefault true; - - # Recommendations can be found here: - # - https://invent.kde.org/plasma-mobile/plasma-phone-settings/-/tree/master/etc/xdg - # This configuration is the minimum required for Plasma Mobile to *work*. - services.xserver.desktopManager.plasma5 = { - kdeglobals = { - KDE = { - # This forces a numeric PIN for the lockscreen, which is the - # recommendation from upstream. - LookAndFeelPackage = lib.mkDefault "org.kde.plasma.phone"; - }; - }; - kwinrc = { - "Wayland" = { - "InputMethod[$e]" = "/run/current-system/sw/share/applications/com.github.maliit.keyboard.desktop"; - "VirtualKeyboardEnabled" = "true"; - }; - "org.kde.kdecoration2" = { - # No decorations (title bar) - NoPlugin = lib.mkDefault "true"; - }; - }; - }; - - services.displayManager.sessionPackages = [ pkgs.plasma5Packages.plasma-mobile ]; - }) - - # Plasma Bigscreen - (mkIf cfg.bigscreen.enable { - environment.systemPackages = with pkgs.plasma5Packages; [ - plasma-nano - plasma-settings - plasma-bigscreen - plasma-remotecontrollers - - aura-browser - plank-player - - plasma-pa - plasma-nm - kdeconnect-kde - ]; - - services.displayManager.sessionPackages = [ pkgs.plasma5Packages.plasma-bigscreen ]; - - # required for plasma-remotecontrollers to work correctly - hardware.uinput.enable = true; - }) - ]; -} diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index ef183c57b3ac..30972cc6c516 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -1189,9 +1189,7 @@ in pinnwand = runTest ./pinnwand.nix; plantuml-server = runTest ./plantuml-server.nix; plasma-bigscreen = runTest ./plasma-bigscreen.nix; - plasma5 = runTest ./plasma5.nix; plasma6 = runTest ./plasma6.nix; - plasma5-systemd-start = runTest ./plasma5-systemd-start.nix; plausible = runTest ./plausible.nix; playwright-python = runTest ./playwright-python.nix; please = runTest ./please.nix; diff --git a/nixos/tests/plasma-bigscreen.nix b/nixos/tests/plasma-bigscreen.nix deleted file mode 100644 index b429117b3a44..000000000000 --- a/nixos/tests/plasma-bigscreen.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ pkgs, ... }: - -{ - name = "plasma-bigscreen"; - meta = with pkgs.lib.maintainers; { - maintainers = [ - ttuegel - k900 - ]; - }; - - nodes.machine = - { ... }: - - { - imports = [ ./common/user-account.nix ]; - services.xserver.enable = true; - services.displayManager.sddm.enable = true; - services.displayManager.defaultSession = "plasma-bigscreen-x11"; - services.xserver.desktopManager.plasma5.bigscreen.enable = true; - services.displayManager.autoLogin = { - enable = true; - user = "alice"; - }; - - users.users.alice.extraGroups = [ "uinput" ]; - }; - - testScript = - { nodes, ... }: - '' - with subtest("Wait for login"): - start_all() - machine.wait_for_file("/tmp/xauth_*") - machine.succeed("xauth merge /tmp/xauth_*") - - with subtest("Check plasmashell started"): - machine.wait_until_succeeds("pgrep plasmashell") - machine.wait_for_window("Plasma Big Screen") - ''; -} diff --git a/nixos/tests/plasma5-systemd-start.nix b/nixos/tests/plasma5-systemd-start.nix deleted file mode 100644 index 6a62f356f839..000000000000 --- a/nixos/tests/plasma5-systemd-start.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ pkgs, ... }: - -{ - name = "plasma5-systemd-start"; - meta = with pkgs.lib.maintainers; { - maintainers = [ oxalica ]; - }; - - nodes.machine = - { ... }: - - { - imports = [ ./common/user-account.nix ]; - services.xserver = { - enable = true; - desktopManager.plasma5.enable = true; - desktopManager.plasma5.runUsingSystemd = true; - }; - - services.displayManager = { - sddm.enable = true; - defaultSession = "plasma"; - autoLogin = { - enable = true; - user = "alice"; - }; - }; - }; - - testScript = - { nodes, ... }: - '' - with subtest("Wait for login"): - start_all() - machine.wait_for_file("/tmp/xauth_*") - machine.succeed("xauth merge /tmp/xauth_*") - - with subtest("Check plasmashell started"): - machine.wait_until_succeeds("pgrep plasmashell") - machine.wait_for_window("^Desktop ") - - status, result = machine.systemctl('--no-pager show plasma-plasmashell.service', user='alice') - assert status == 0, 'Service not found' - assert 'ActiveState=active' in result.split('\n'), 'Systemd service not active' - ''; -} diff --git a/nixos/tests/plasma5.nix b/nixos/tests/plasma5.nix deleted file mode 100644 index 7fe677feae92..000000000000 --- a/nixos/tests/plasma5.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ pkgs, ... }: - -{ - name = "plasma5"; - meta = with pkgs.lib.maintainers; { - maintainers = [ ttuegel ]; - }; - - nodes.machine = - { ... }: - - { - imports = [ ./common/user-account.nix ]; - services.xserver.enable = true; - services.displayManager.sddm.enable = true; - services.displayManager.defaultSession = "plasma"; - services.xserver.desktopManager.plasma5.enable = true; - environment.plasma5.excludePackages = [ pkgs.plasma5Packages.elisa ]; - services.displayManager.autoLogin = { - enable = true; - user = "alice"; - }; - }; - - testScript = - { nodes, ... }: - let - user = nodes.machine.users.users.alice; - xdo = "${pkgs.xdotool}/bin/xdotool"; - in - '' - with subtest("Wait for login"): - start_all() - machine.wait_for_file("/tmp/xauth_*") - machine.succeed("xauth merge /tmp/xauth_*") - - with subtest("Check plasmashell started"): - machine.wait_until_succeeds("pgrep plasmashell") - machine.wait_for_window("^Desktop ") - - with subtest("Check that KDED is running"): - machine.succeed("pgrep kded5") - - with subtest("Check that logging in has given the user ownership of devices"): - machine.succeed("getfacl -p /dev/snd/timer | grep -q ${user.name}") - - with subtest("Ensure Elisa is not installed"): - machine.fail("which elisa") - - machine.succeed("su - ${user.name} -c 'xauth merge /tmp/xauth_*'") - - with subtest("Run Dolphin"): - machine.execute("su - ${user.name} -c 'DISPLAY=:0.0 dolphin >&2 &'") - machine.wait_for_window(" Dolphin") - - with subtest("Run Konsole"): - machine.execute("su - ${user.name} -c 'DISPLAY=:0.0 konsole >&2 &'") - machine.wait_for_window("Konsole") - - with subtest("Run systemsettings"): - machine.execute("su - ${user.name} -c 'DISPLAY=:0.0 systemsettings5 >&2 &'") - machine.wait_for_window("Settings") - - with subtest("Wait to get a screenshot"): - machine.execute( - "${xdo} key Alt+F1 sleep 10" - ) - machine.screenshot("screen") - ''; -} From 314fe5f12f46e864ed9e41471680d8dba0c77acd Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 12 Aug 2025 19:36:52 +0300 Subject: [PATCH 095/146] nixos: remove Deepin --- nixos/modules/module-list.nix | 4 - nixos/modules/rename.nix | 10 + .../services/desktops/deepin/app-services.nix | 46 ---- .../services/desktops/deepin/dde-api.nix | 51 ---- .../services/desktops/deepin/dde-daemon.nix | 41 --- .../desktops/deepin/deepin-anything.nix | 43 ---- .../services/x11/desktop-managers/deepin.nix | 233 ------------------ .../services/x11/desktop-managers/default.nix | 1 - nixos/release.nix | 9 - nixos/tests/all-tests.nix | 1 - nixos/tests/deepin.nix | 55 ----- nixos/tests/terminal-emulators.nix | 2 - .../src/config/modules/packagechooser.conf | 8 - .../src/modules/nixos/main.py | 11 - 14 files changed, 10 insertions(+), 505 deletions(-) delete mode 100644 nixos/modules/services/desktops/deepin/app-services.nix delete mode 100644 nixos/modules/services/desktops/deepin/dde-api.nix delete mode 100644 nixos/modules/services/desktops/deepin/dde-daemon.nix delete mode 100644 nixos/modules/services/desktops/deepin/deepin-anything.nix delete mode 100644 nixos/modules/services/x11/desktop-managers/deepin.nix delete mode 100644 nixos/tests/deepin.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 8713082efb4c..9415089e180e 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -543,10 +543,6 @@ ./services/desktops/blueman.nix ./services/desktops/bonsaid.nix ./services/desktops/cpupower-gui.nix - ./services/desktops/deepin/app-services.nix - ./services/desktops/deepin/dde-api.nix - ./services/desktops/deepin/dde-daemon.nix - ./services/desktops/deepin/deepin-anything.nix ./services/desktops/dleyna.nix ./services/desktops/espanso.nix ./services/desktops/flatpak.nix diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 4934df421eeb..d2c016861133 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -127,6 +127,10 @@ in "services" "dd-agent" ] "dd-agent was removed from nixpkgs in favor of the newer datadog-agent.") + (mkRemovedOptionModule [ + "services" + "deepin" + ] "the Deepin desktop environment has been removed from nixpkgs due to lack of maintenance.") (mkRemovedOptionModule [ "services" "dnscrypt-proxy" ] "Use services.dnscrypt-proxy2 instead") (mkRemovedOptionModule [ "services" "dnscrypt-wrapper" ] '' The dnscrypt-wrapper module was removed since the project has been effectively unmaintained since 2018; @@ -271,6 +275,12 @@ in "desktopManager" "plasma5" ] "the Plasma 5 desktop environment has been removed from nixpkgs, as it has reached EOL upstream.") + (mkRemovedOptionModule [ + "services" + "xserver" + "desktopManager" + "deepin" + ] "the Deepin desktop environment has been removed from nixpkgs due to lack of maintenance.") (mkRemovedOptionModule [ "services" "xserver" "multitouch" ] '' services.xserver.multitouch (which uses xf86_input_mtrack) has been removed as the underlying package isn't being maintained. Working alternatives are diff --git a/nixos/modules/services/desktops/deepin/app-services.nix b/nixos/modules/services/desktops/deepin/app-services.nix deleted file mode 100644 index 270889b66f92..000000000000 --- a/nixos/modules/services/desktops/deepin/app-services.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ - config, - pkgs, - lib, - ... -}: -{ - - meta = { - maintainers = lib.teams.deepin.members; - }; - - ###### interface - - options = { - - services.deepin.app-services = { - - enable = lib.mkEnableOption "service collection of DDE applications, including dconfig-center"; - - }; - - }; - - ###### implementation - - config = lib.mkIf config.services.deepin.app-services.enable { - - users.groups.dde-dconfig-daemon = { }; - users.users.dde-dconfig-daemon = { - description = "Dconfig daemon user"; - home = "/var/lib/dde-dconfig-daemon"; - createHome = true; - group = "dde-dconfig-daemon"; - isSystemUser = true; - }; - - environment.systemPackages = [ pkgs.deepin.dde-app-services ]; - systemd.packages = [ pkgs.deepin.dde-app-services ]; - services.dbus.packages = [ pkgs.deepin.dde-app-services ]; - - environment.pathsToLink = [ "/share/dsg" ]; - - }; - -} diff --git a/nixos/modules/services/desktops/deepin/dde-api.nix b/nixos/modules/services/desktops/deepin/dde-api.nix deleted file mode 100644 index 9994c4359e9a..000000000000 --- a/nixos/modules/services/desktops/deepin/dde-api.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ - config, - pkgs, - lib, - ... -}: -{ - - meta = { - maintainers = lib.teams.deepin.members; - }; - - ###### interface - - options = { - - services.deepin.dde-api = { - - enable = lib.mkEnableOption '' - the DDE API, which provides some dbus interfaces that is used for screen zone detecting, - thumbnail generating, and sound playing in Deepin Desktop Environment - ''; - - }; - - }; - - ###### implementation - - config = lib.mkIf config.services.deepin.dde-api.enable { - - environment.systemPackages = [ pkgs.deepin.dde-api ]; - - services.dbus.packages = [ pkgs.deepin.dde-api ]; - - systemd.packages = [ pkgs.deepin.dde-api ]; - - environment.pathsToLink = [ "/lib/deepin-api" ]; - - users.groups.deepin-sound-player = { }; - users.users.deepin-sound-player = { - description = "Deepin sound player"; - home = "/var/lib/deepin-sound-player"; - createHome = true; - group = "deepin-sound-player"; - isSystemUser = true; - }; - - }; - -} diff --git a/nixos/modules/services/desktops/deepin/dde-daemon.nix b/nixos/modules/services/desktops/deepin/dde-daemon.nix deleted file mode 100644 index 809b2a3fec6d..000000000000 --- a/nixos/modules/services/desktops/deepin/dde-daemon.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ - config, - pkgs, - lib, - ... -}: -{ - - meta = { - maintainers = lib.teams.deepin.members; - }; - - ###### interface - - options = { - - services.deepin.dde-daemon = { - - enable = lib.mkEnableOption "daemon for handling the deepin session settings"; - - }; - - }; - - ###### implementation - - config = lib.mkIf config.services.deepin.dde-daemon.enable { - - environment.systemPackages = [ pkgs.deepin.dde-daemon ]; - - services.dbus.packages = [ pkgs.deepin.dde-daemon ]; - - services.udev.packages = [ pkgs.deepin.dde-daemon ]; - - systemd.packages = [ pkgs.deepin.dde-daemon ]; - - environment.pathsToLink = [ "/lib/deepin-daemon" ]; - - }; - -} diff --git a/nixos/modules/services/desktops/deepin/deepin-anything.nix b/nixos/modules/services/desktops/deepin/deepin-anything.nix deleted file mode 100644 index 9b69e6442edb..000000000000 --- a/nixos/modules/services/desktops/deepin/deepin-anything.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ - config, - pkgs, - lib, - ... -}: - -{ - - meta = { - maintainers = lib.teams.deepin.members; - }; - - options = { - - services.deepin.deepin-anything = { - - enable = lib.mkEnableOption "deepin anything file search tool"; - - }; - - }; - - config = lib.mkIf config.services.deepin.dde-api.enable { - environment.systemPackages = [ pkgs.deepin.deepin-anything ]; - - services.dbus.packages = [ pkgs.deepin.deepin-anything ]; - - users.groups.deepin-anything = { }; - - users.users.deepin-anything = { - description = "Deepin Anything Server"; - home = "/var/lib/deepin-anything"; - createHome = true; - group = "deepin-anything"; - isSystemUser = true; - }; - - boot.extraModulePackages = [ config.boot.kernelPackages.deepin-anything-module ]; - boot.kernelModules = [ "vfs_monitor" ]; - }; - -} diff --git a/nixos/modules/services/x11/desktop-managers/deepin.nix b/nixos/modules/services/x11/desktop-managers/deepin.nix deleted file mode 100644 index 2735ef19aa77..000000000000 --- a/nixos/modules/services/x11/desktop-managers/deepin.nix +++ /dev/null @@ -1,233 +0,0 @@ -{ - config, - lib, - pkgs, - utils, - ... -}: - -with lib; - -let - xcfg = config.services.xserver; - cfg = xcfg.desktopManager.deepin; - - nixos-gsettings-overrides = pkgs.deepin.dde-gsettings-schemas.override { - extraGSettingsOverridePackages = cfg.extraGSettingsOverridePackages; - extraGSettingsOverrides = cfg.extraGSettingsOverrides; - }; -in -{ - options = { - - services.xserver.desktopManager.deepin = { - enable = mkEnableOption "Deepin desktop manager"; - extraGSettingsOverrides = mkOption { - default = ""; - type = types.lines; - description = "Additional gsettings overrides."; - }; - extraGSettingsOverridePackages = mkOption { - default = [ ]; - type = types.listOf types.path; - description = "List of packages for which gsettings are overridden."; - }; - }; - - environment.deepin.excludePackages = mkOption { - default = [ ]; - type = types.listOf types.package; - description = "List of default packages to exclude from the configuration"; - }; - - }; - - config = mkIf cfg.enable { - services.displayManager.sessionPackages = [ pkgs.deepin.dde-session ]; - services.displayManager.defaultSession = mkDefault "dde-x11"; - - # Update the DBus activation environment after launching the desktop manager. - services.xserver.displayManager.sessionCommands = '' - ${lib.getBin pkgs.dbus}/bin/dbus-update-activation-environment --systemd --all - ''; - - hardware.bluetooth.enable = mkDefault true; - security.polkit.enable = true; - - services.deepin.dde-daemon.enable = mkForce true; - services.deepin.dde-api.enable = mkForce true; - services.deepin.app-services.enable = mkForce true; - - services.colord.enable = mkDefault true; - services.accounts-daemon.enable = mkDefault true; - services.gvfs.enable = mkDefault true; - services.gnome.glib-networking.enable = mkDefault true; - services.gnome.gnome-keyring.enable = mkDefault true; - services.gnome.gcr-ssh-agent.enable = mkDefault true; - services.bamf.enable = mkDefault true; - - services.libinput.enable = mkDefault true; - services.udisks2.enable = true; - services.upower.enable = mkDefault config.powerManagement.enable; - networking.networkmanager.enable = mkDefault true; - programs.dconf.enable = mkDefault true; - programs.gnupg.agent.pinentryPackage = mkDefault pkgs.pinentry-qt; - - fonts.packages = with pkgs; [ noto-fonts ]; - xdg.mime.enable = true; - xdg.menus.enable = true; - xdg.icons.enable = true; - xdg.portal.enable = mkDefault true; - xdg.portal.extraPortals = mkDefault [ - pkgs.xdg-desktop-portal-gtk - ]; - - # https://github.com/NixOS/nixpkgs/pull/247766#issuecomment-1722839259 - xdg.portal.config.deepin.default = mkDefault [ "gtk" ]; - - environment.sessionVariables = { - NIX_GSETTINGS_OVERRIDES_DIR = "${nixos-gsettings-overrides}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas"; - DDE_POLKIT_AGENT_PLUGINS_DIRS = [ "${pkgs.deepin.dpa-ext-gnomekeyring}/lib/polkit-1-dde/plugins" ]; - }; - - environment.pathsToLink = [ - "/lib/dde-dock/plugins" - "/lib/dde-control-center" - "/lib/dde-session-shell" - "/lib/dde-file-manager" - "/share/backgrounds" - "/share/wallpapers" - "/share/dde-daemon" - "/share/dsg" - "/share/deepin-themes" - "/share/deepin" - "/share/dde-shell" - ]; - - environment.etc = { - "deepin-installer.conf".text = '' - system_info_vendor_name="Copyright (c) 2003-2024 NixOS contributors" - ''; - }; - - systemd.tmpfiles.rules = [ - "d /var/lib/AccountsService 0775 root root - -" - "C /var/lib/AccountsService/icons 0775 root root - ${pkgs.deepin.dde-account-faces}/var/lib/AccountsService/icons" - ]; - - security.pam.services.dde-lock.text = '' - # original at {dde-session-shell}/etc/pam.d/dde-lock - auth substack login - account include login - password substack login - session include login - ''; - - environment.systemPackages = - with pkgs; - with deepin; - let - requiredPackages = [ - pciutils # for dtkcore/startdde - xdotool # for dde-daemon - glib # for gsettings program / gdbus - gtk3 # for gtk-launch program - xdg-user-dirs # Update user dirs - util-linux # runuser - polkit_gnome - librsvg # dde-api use rsvg-convert - lshw # for dtkcore - libsForQt5.kde-gtk-config # deepin-api/gtk-thumbnailer need - libsForQt5.kglobalaccel - xsettingsd # lightdm-deepin-greeter - dtkcommon - dtkcore - dtkgui - dtkwidget - dtkdeclarative - qt5platform-plugins - qt6platform-plugins - qt5integration - qt6integration - deepin-pw-check - - dde-account-faces - deepin-icon-theme - deepin-desktop-theme - deepin-sound-theme - deepin-gtk-theme - deepin-wallpapers - deepin-desktop-base - - startdde - dde-shell - dde-launchpad - dde-session-ui - dde-session-shell - dde-file-manager - dde-control-center - dde-network-core - dde-clipboard - dde-polkit-agent - dpa-ext-gnomekeyring - deepin-desktop-schemas - deepin-kwin - dde-session - dde-widgets - dde-appearance - dde-application-manager - deepin-service-manager - dde-api-proxy - dde-tray-loader - ]; - optionalPackages = [ - dde-calendar - dde-grand-search - deepin-terminal - onboard # dde-dock plugin - deepin-calculator - deepin-compressor - deepin-editor - deepin-system-monitor - deepin-shortcut-viewer - ]; - in - requiredPackages - ++ utils.removePackagesByName optionalPackages config.environment.deepin.excludePackages; - - services.dbus.packages = with pkgs.deepin; [ - dde-shell - dde-launchpad - dde-session-ui - dde-session-shell - dde-file-manager - dde-control-center - dde-calendar - dde-clipboard - deepin-kwin - deepin-pw-check - dde-widgets - dde-session - dde-appearance - dde-application-manager - deepin-service-manager - dde-grand-search - dde-api-proxy - ]; - - systemd.packages = with pkgs.deepin; [ - dde-shell - dde-launchpad - dde-file-manager - dde-calendar - dde-clipboard - deepin-kwin - dde-appearance - dde-widgets - dde-session - dde-application-manager - deepin-service-manager - dde-api-proxy - ]; - }; -} diff --git a/nixos/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix index 6219d11fda05..25fc53285aa7 100644 --- a/nixos/modules/services/x11/desktop-managers/default.nix +++ b/nixos/modules/services/x11/desktop-managers/default.nix @@ -38,7 +38,6 @@ in ./cde.nix ./cinnamon.nix ./budgie.nix - ./deepin.nix ../../desktop-managers/lomiri.nix ../../desktop-managers/cosmic.nix ../../desktop-managers/gnome.nix diff --git a/nixos/release.nix b/nixos/release.nix index 1000bf9c6bc7..207d76704b5e 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -623,15 +623,6 @@ rec { } ); - deepin = makeClosure ( - { ... }: - { - services.xserver.enable = true; - services.xserver.displayManager.lightdm.enable = true; - services.xserver.desktopManager.deepin.enable = true; - } - ); - # Linux/Apache/PostgreSQL/PHP stack. lapp = makeClosure ( { pkgs, ... }: diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 30972cc6c516..9631036f035c 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -423,7 +423,6 @@ in dconf = runTest ./dconf.nix; ddns-updater = runTest ./ddns-updater.nix; deconz = runTest ./deconz.nix; - deepin = runTest ./deepin.nix; deluge = runTest ./deluge.nix; dendrite = runTest ./matrix/dendrite.nix; dependency-track = runTest ./dependency-track.nix; diff --git a/nixos/tests/deepin.nix b/nixos/tests/deepin.nix deleted file mode 100644 index 677e58942079..000000000000 --- a/nixos/tests/deepin.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ pkgs, lib, ... }: -{ - name = "deepin"; - - meta.maintainers = lib.teams.deepin.members; - - nodes.machine = - { ... }: - { - imports = [ - ./common/user-account.nix - ]; - - virtualisation.memorySize = 2048; - - services.xserver.enable = true; - - services.xserver.displayManager = { - lightdm.enable = true; - autoLogin = { - enable = true; - user = "alice"; - }; - }; - - services.xserver.desktopManager.deepin.enable = true; - }; - - testScript = - { nodes, ... }: - let - user = nodes.machine.users.users.alice; - in - '' - with subtest("Wait for login"): - machine.wait_for_x() - machine.wait_for_file("${user.home}/.Xauthority") - machine.succeed("xauth merge ${user.home}/.Xauthority") - - with subtest("Check that logging in has given the user ownership of devices"): - machine.succeed("getfacl -p /dev/snd/timer | grep -q ${user.name}") - - with subtest("Check if Deepin session components actually start"): - machine.wait_until_succeeds("pgrep -f dde-session-daemon") - machine.wait_for_window("dde-session-daemon") - machine.wait_until_succeeds("pgrep -f dde-desktop") - machine.wait_for_window("dde-desktop") - - with subtest("Open deepin-terminal"): - machine.succeed("su - ${user.name} -c 'DISPLAY=:0 deepin-terminal >&2 &'") - machine.wait_for_window("deepin-terminal") - machine.sleep(20) - machine.screenshot("screen") - ''; -} diff --git a/nixos/tests/terminal-emulators.nix b/nixos/tests/terminal-emulators.nix index dfa5d9150ba5..fa8ab05fd5ea 100644 --- a/nixos/tests/terminal-emulators.nix +++ b/nixos/tests/terminal-emulators.nix @@ -36,8 +36,6 @@ let darktile.pkg = p: p.darktile; - deepin-terminal.pkg = p: p.deepin.deepin-terminal; - eterm.pkg = p: p.eterm; eterm.executable = "Eterm"; eterm.pinkValue = "#D40055"; diff --git a/pkgs/by-name/ca/calamares-nixos-extensions/src/config/modules/packagechooser.conf b/pkgs/by-name/ca/calamares-nixos-extensions/src/config/modules/packagechooser.conf index de647152fb83..362084beda17 100644 --- a/pkgs/by-name/ca/calamares-nixos-extensions/src/config/modules/packagechooser.conf +++ b/pkgs/by-name/ca/calamares-nixos-extensions/src/config/modules/packagechooser.conf @@ -90,14 +90,6 @@ items: Learn more at buddiesofbudgie.org" screenshot: "images/budgie.jpg" - - id: deepin - packages: [ deepin ] - name: Deepin - description: "The Deepin Desktop Environment is an elegant, easy to use and reliable desktop environment.
-
- Learn more at deepin.org" - screenshot: "images/deepin.jpg" - - id: "" packages: [] name: "No desktop" diff --git a/pkgs/by-name/ca/calamares-nixos-extensions/src/modules/nixos/main.py b/pkgs/by-name/ca/calamares-nixos-extensions/src/modules/nixos/main.py index 017fb01b737d..d947fdf296b8 100644 --- a/pkgs/by-name/ca/calamares-nixos-extensions/src/modules/nixos/main.py +++ b/pkgs/by-name/ca/calamares-nixos-extensions/src/modules/nixos/main.py @@ -201,15 +201,6 @@ cfgbudgie = """ # Enable the X11 windowing system. """ -cfgdeepin = """ # Enable the X11 windowing system. - services.xserver.enable = true; - - # Enable the Deepin Desktop Environment. - services.xserver.displayManager.lightdm.enable = true; - services.xserver.desktopManager.deepin.enable = true; - -""" - cfgkeymap = """ # Configure keymap in X11 services.xserver.xkb = { layout = "@@kblayout@@"; @@ -589,8 +580,6 @@ def run(): cfg += cfglumina elif gs.value("packagechooser_packagechooser") == "budgie": cfg += cfgbudgie - elif gs.value("packagechooser_packagechooser") == "deepin": - cfg += cfgdeepin if ( gs.value("keyboardLayout") is not None From 66dc5c81d4e5f7b81b388bf2e71eb2d9024a9641 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 12 Aug 2025 19:40:34 +0300 Subject: [PATCH 096/146] kgeotag: switch to Qt6 --- pkgs/by-name/kg/kgeotag/package.nix | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/kg/kgeotag/package.nix b/pkgs/by-name/kg/kgeotag/package.nix index ab6174f8dd43..9e29ba873586 100644 --- a/pkgs/by-name/kg/kgeotag/package.nix +++ b/pkgs/by-name/kg/kgeotag/package.nix @@ -1,33 +1,34 @@ { stdenv, cmake, - extra-cmake-modules, fetchFromGitLab, lib, - libsForQt5, + kdePackages, + qt6, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "kgeotag"; - version = "1.7.0"; + version = "1.8.0-unstable-2025-07-25"; src = fetchFromGitLab { domain = "invent.kde.org"; repo = "kgeotag"; owner = "graphics"; - rev = "v${version}"; - hash = "sha256-/NYAR/18Dh+fphCBz/zFWj/xqEl28e77ZtV8LlcGyMI="; + rev = "b2b140e8f72ab37bad3729bea527203324d12131"; + hash = "sha256-jUcKm4IPQt2JiZUmIjMJ9EG0kDjzoPGjzBPMHZ6j9lM="; }; nativeBuildInputs = [ cmake - extra-cmake-modules - libsForQt5.wrapQtAppsHook + kdePackages.extra-cmake-modules + qt6.wrapQtAppsHook ]; buildInputs = [ - libsForQt5.libkexiv2 - libsForQt5.marble + kdePackages.libkexiv2 + kdePackages.marble + qt6.qtwebengine ]; meta = with lib; { From bf4dc80af9bf6cfcf07fa91b9efdb72a7c588938 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 12 Aug 2025 19:40:34 +0300 Subject: [PATCH 097/146] kio-extras-kf5: disable libkexiv2 It will be dropped. --- pkgs/kde/misc/kio-extras-kf5/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/kde/misc/kio-extras-kf5/default.nix b/pkgs/kde/misc/kio-extras-kf5/default.nix index 886ae1a62777..623eb89a127b 100644 --- a/pkgs/kde/misc/kio-extras-kf5/default.nix +++ b/pkgs/kde/misc/kio-extras-kf5/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { kguiaddons ki18n kio - libkexiv2 + # libkexiv2 phonon solid syntax-highlighting From 77e544e57a46073113eec7bd372fa5aa5440bd9d Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 12 Aug 2025 19:40:34 +0300 Subject: [PATCH 098/146] kmymoney, alkimia: switch to Qt6 --- pkgs/applications/office/kmymoney/default.nix | 29 +++++++------------ .../development/libraries/alkimia/default.nix | 12 +++++--- pkgs/top-level/all-packages.nix | 3 +- pkgs/top-level/qt5-packages.nix | 1 - 4 files changed, 21 insertions(+), 24 deletions(-) diff --git a/pkgs/applications/office/kmymoney/default.nix b/pkgs/applications/office/kmymoney/default.nix index f21c568c210c..fd5269818a53 100644 --- a/pkgs/applications/office/kmymoney/default.nix +++ b/pkgs/applications/office/kmymoney/default.nix @@ -2,10 +2,13 @@ stdenv, lib, fetchurl, + + cmake, doxygen, extra-cmake-modules, graphviz, kdoctools, + pkg-config, wrapQtAppsHook, autoPatchelfHook, @@ -14,7 +17,6 @@ aqbanking, gmp, gwenhywfar, - kactivities, karchive, kcmutils, kcontacts, @@ -25,6 +27,7 @@ kitemmodels, libical, libofx, + plasma-activities, qgpgme, sqlcipher, @@ -37,27 +40,24 @@ stdenv.mkDerivation rec { pname = "kmymoney"; - version = "5.1.3"; + version = "5.2.1"; src = fetchurl { - url = "mirror://kde/stable/kmymoney/${version}/src/${pname}-${version}.tar.xz"; - sha256 = "sha256-OTi4B4tzkboy4Su0I5di+uE0aDoMLsGnUQXDAso+Xj8="; + url = "mirror://kde/stable/kmymoney/${version}/${pname}-${version}.tar.xz"; + hash = "sha256-/q30C21MkNd+MnFqhY3SN2kIGGMQTYzqYpELHsPkM2s="; }; cmakeFlags = [ - # Remove this when upgrading to a KMyMoney release that includes - # https://invent.kde.org/office/kmymoney/-/merge_requests/118 - "-DENABLE_WEBENGINE=ON" + "-DBUILD_WITH_QT6=1" ]; - # Hidden dependency that wasn't included in CMakeLists.txt: - env.NIX_CFLAGS_COMPILE = "-I${kitemmodels.dev}/include/KF5"; - nativeBuildInputs = [ + cmake doxygen extra-cmake-modules graphviz kdoctools + pkg-config python3.pkgs.wrapPython wrapQtAppsHook autoPatchelfHook @@ -69,7 +69,6 @@ stdenv.mkDerivation rec { aqbanking gmp gwenhywfar - kactivities karchive kcmutils kcontacts @@ -80,6 +79,7 @@ stdenv.mkDerivation rec { kitemmodels libical libofx + plasma-activities qgpgme sqlcipher @@ -99,13 +99,6 @@ stdenv.mkDerivation rec { "kmymoney/plugins/woob/interface/kmymoneywoob.py" ''; - doInstallCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; - nativeInstallCheckInputs = [ xvfb-run ]; - installCheckPhase = lib.optionalString doInstallCheck '' - xvfb-run -s '-screen 0 1024x768x24' make test \ - ARGS="-E '(reports-chart-test)'" # Test fails, so exclude it for now. - ''; - # libpython is required by the python interpreter embedded in kmymoney, so we # need to explicitly tell autoPatchelf about it. postFixup = '' diff --git a/pkgs/development/libraries/alkimia/default.nix b/pkgs/development/libraries/alkimia/default.nix index a0284ca378fc..abcca04ee5ce 100644 --- a/pkgs/development/libraries/alkimia/default.nix +++ b/pkgs/development/libraries/alkimia/default.nix @@ -2,14 +2,14 @@ lib, stdenv, fetchFromGitLab, + cmake, extra-cmake-modules, doxygen, graphviz, qtbase, qtwebengine, mpir, - kdelibs4support, - plasma-framework, + libplasma, knewstuff, kpackage, wrapQtAppsHook, @@ -27,7 +27,12 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-v5DfnnzOMsoCXr074ydXxBIrSsnbex6G/OqF6psTvPs="; }; + cmakeFlags = [ + "-DBUILD_WITH_QT6=1" + ]; + nativeBuildInputs = [ + cmake extra-cmake-modules doxygen graphviz @@ -40,8 +45,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ qtbase qtwebengine - kdelibs4support - plasma-framework + libplasma knewstuff kpackage ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6712de68e5c1..c716092f7629 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12408,7 +12408,8 @@ with pkgs; kmplayer = libsForQt5.callPackage ../applications/video/kmplayer { }; - kmymoney = libsForQt5.callPackage ../applications/office/kmymoney { }; + alkimia = kdePackages.callPackage ../development/libraries/alkimia { }; + kmymoney = kdePackages.callPackage ../applications/office/kmymoney { }; kotatogram-desktop = callPackage ../applications/networking/instant-messengers/telegram/kotatogram-desktop diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index 2453bc438f00..83054318af0c 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -118,7 +118,6 @@ makeScopeWithSplicing' { accounts-qt = callPackage ../development/libraries/accounts-qt { }; - alkimia = callPackage ../development/libraries/alkimia { }; applet-window-appmenu = callPackage ../development/libraries/applet-window-appmenu { }; From 4c82b088d2b049e279ccbc48a356a72d9b12bb06 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 12 Aug 2025 19:40:34 +0300 Subject: [PATCH 099/146] krita: disable libkdcraw Will be removed as part of Gear 5, we should build the Gear 6 version for Qt5 instead if people want to edit RAW images in Krita. --- pkgs/by-name/kr/krita/generic.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/kr/krita/generic.nix b/pkgs/by-name/kr/krita/generic.nix index 0d2ff279db41..cb34f8c16d24 100644 --- a/pkgs/by-name/kr/krita/generic.nix +++ b/pkgs/by-name/kr/krita/generic.nix @@ -27,7 +27,7 @@ fribidi, libaom, libheif, - libkdcraw, + #libkdcraw, lcms2, gsl, openexr, @@ -109,7 +109,7 @@ mkDerivation rec { lager libaom libheif - libkdcraw + #libkdcraw giflib libjxl mlt From bfc8e3c99a9731289429cc12823fa0497816d259 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 12 Aug 2025 19:40:34 +0300 Subject: [PATCH 100/146] labplot: disable Cantor This uses the old Qt5 version which will be deleted soon. --- pkgs/applications/science/math/labplot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/labplot/default.nix b/pkgs/applications/science/math/labplot/default.nix index a998b1c26016..1866c4eeb78f 100644 --- a/pkgs/applications/science/math/labplot/default.nix +++ b/pkgs/applications/science/math/labplot/default.nix @@ -33,7 +33,7 @@ netcdf, cfitsio, libcerf, - cantor, + # cantor, zlib, lz4, readstat, @@ -97,7 +97,7 @@ stdenv.mkDerivation rec { netcdf cfitsio libcerf - cantor + # cantor zlib lz4 readstat From aef268e8931ed196418588b99a53f9f8ebf5044c Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 12 Aug 2025 19:40:34 +0300 Subject: [PATCH 101/146] libsForQt5.purpose: remove kaccounts-integration dependency About to be dropped, not very useful. --- pkgs/development/libraries/kde-frameworks/purpose.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks/purpose.nix b/pkgs/development/libraries/kde-frameworks/purpose.nix index da2990bff7a4..41de202c3eed 100644 --- a/pkgs/development/libraries/kde-frameworks/purpose.nix +++ b/pkgs/development/libraries/kde-frameworks/purpose.nix @@ -5,7 +5,6 @@ qtbase, accounts-qt, qtdeclarative, - kaccounts-integration, kconfig, kcoreaddons, ki18n, @@ -24,7 +23,6 @@ mkDerivation { qtbase accounts-qt qtdeclarative - kaccounts-integration kconfig kcoreaddons ki18n From 5b6c0c02ef247af9d30d6d169eb04218b1579b46 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 12 Aug 2025 19:40:34 +0300 Subject: [PATCH 102/146] nordic: use Qt6 packages for SDDM theme --- pkgs/by-name/no/nordic/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/no/nordic/package.nix b/pkgs/by-name/no/nordic/package.nix index 0a4bd6ae1626..d27f7ff1a7e1 100644 --- a/pkgs/by-name/no/nordic/package.nix +++ b/pkgs/by-name/no/nordic/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, gtk-engine-murrine, jdupes, - libsForQt5, + kdePackages, }: stdenvNoCC.mkDerivation rec { @@ -154,7 +154,7 @@ stdenvNoCC.mkDerivation rec { mkdir -p $sddm/nix-support - printWords ${libsForQt5.breeze-icons} ${libsForQt5.plasma-framework} ${libsForQt5.plasma-workspace} \ + printWords ${kdePackages.breeze-icons} ${kdePackages.libplasma} ${kdePackages.plasma-workspace} \ >> $sddm/nix-support/propagated-user-env-packages ''; From 80bbc0fe04b8fa709c9159c93a5f85c58eda6c93 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 12 Aug 2025 19:40:34 +0300 Subject: [PATCH 103/146] sddm: allow building without layer-shell-qt We're about to not have it on Qt5. --- pkgs/applications/display-managers/sddm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix index 23ba6006d737..902d0e38d62a 100644 --- a/pkgs/applications/display-managers/sddm/default.nix +++ b/pkgs/applications/display-managers/sddm/default.nix @@ -2,7 +2,7 @@ lib, callPackage, runCommand, - layer-shell-qt, + layer-shell-qt ? null, qtwayland, wrapQtAppsHook, unwrapped ? callPackage ./unwrapped.nix { }, From 8d9a708f89189a73f7c3f194df03badb76251a34 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 12 Aug 2025 19:40:34 +0300 Subject: [PATCH 104/146] tellico: switch to Qt6 --- pkgs/applications/misc/tellico/default.nix | 3 --- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/applications/misc/tellico/default.nix b/pkgs/applications/misc/tellico/default.nix index 3c16eccbde7c..04f77acb293b 100644 --- a/pkgs/applications/misc/tellico/default.nix +++ b/pkgs/applications/misc/tellico/default.nix @@ -2,14 +2,12 @@ lib, stdenv, fetchFromGitLab, - mkDerivation, cmake, exempi, extra-cmake-modules, karchive, kdoctools, kfilemetadata, - khtml, kitemmodels, knewstuff, kxmlgui, @@ -49,7 +47,6 @@ stdenv.mkDerivation rec { exempi karchive kfilemetadata - khtml kitemmodels knewstuff kxmlgui diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c716092f7629..2ee3e6f0b9e2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15689,7 +15689,7 @@ with pkgs; hasktags = haskellPackages.hasktags; }; - tellico = libsForQt5.callPackage ../applications/misc/tellico { }; + tellico = kdePackages.callPackage ../applications/misc/tellico { }; termpdfpy = python3Packages.callPackage ../applications/misc/termpdf.py { }; From 5dc2dbdcb31f0eda259c884c3328783710da3fa9 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 12 Aug 2025 19:40:34 +0300 Subject: [PATCH 105/146] ludusavi: use Qt6 kdialog Qt5 is about to be dropped. --- pkgs/by-name/lu/ludusavi/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/lu/ludusavi/package.nix b/pkgs/by-name/lu/ludusavi/package.nix index 137b8bfe2d18..acc6dc154f3e 100644 --- a/pkgs/by-name/lu/ludusavi/package.nix +++ b/pkgs/by-name/lu/ludusavi/package.nix @@ -20,7 +20,7 @@ vulkan-loader, wayland, zenity, - libsForQt5, + kdePackages, cairo, pango, atkmm, @@ -111,7 +111,7 @@ rustPlatform.buildRustPackage (finalAttrs: { lib.makeBinPath [ rclone zenity - libsForQt5.kdialog + kdePackages.kdialog ] } \ "''${gappsWrapperArgs[@]}" From 6dd718b8ceea99e16617f5aa223e368d602fb246 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 12 Aug 2025 19:40:34 +0300 Subject: [PATCH 106/146] plasticity: remove unused dependency Will be dropped with Qt5. --- pkgs/by-name/pl/plasticity/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/pl/plasticity/package.nix b/pkgs/by-name/pl/plasticity/package.nix index d04a9b4f264f..d0dacbdb3e4f 100644 --- a/pkgs/by-name/pl/plasticity/package.nix +++ b/pkgs/by-name/pl/plasticity/package.nix @@ -16,7 +16,6 @@ libdrm, libglvnd, libnotify, - libsForQt5, libxkbcommon, libgbm, nspr, @@ -64,7 +63,6 @@ stdenv.mkDerivation rec { hicolor-icon-theme libdrm libnotify - libsForQt5.kde-cli-tools libxkbcommon nspr nss From c1d848732150e1960d440b34b3a6c1bd3bfbb082 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 12 Aug 2025 19:40:34 +0300 Subject: [PATCH 107/146] poptracker: use Qt6 kdialog --- pkgs/by-name/po/poptracker/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/po/poptracker/package.nix b/pkgs/by-name/po/poptracker/package.nix index 01fd12f14290..45f5e211d3b1 100644 --- a/pkgs/by-name/po/poptracker/package.nix +++ b/pkgs/by-name/po/poptracker/package.nix @@ -10,7 +10,7 @@ openssl, zlib, which, - libsForQt5, + kdePackages, makeWrapper, makeDesktopItem, copyDesktopItems, @@ -67,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: { wrapProgram $out/bin/poptracker --prefix PATH : ${ lib.makeBinPath [ which - libsForQt5.kdialog + kdePackages.kdialog ] } mkdir -p $out/share/icons/hicolor/{64x64,512x512}/apps From 5e3ed2553b05bd6860b1449e8576eadc7a159c66 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 12 Aug 2025 19:40:34 +0300 Subject: [PATCH 108/146] stereotool: use Qt6 kdialog --- pkgs/by-name/st/stereotool/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/st/stereotool/package.nix b/pkgs/by-name/st/stereotool/package.nix index e76be7a5629c..ae514189b79b 100644 --- a/pkgs/by-name/st/stereotool/package.nix +++ b/pkgs/by-name/st/stereotool/package.nix @@ -8,7 +8,7 @@ alsa-lib, bzip2, zlib, - libsForQt5, + kdePackages, libgcc, makeWrapper, copyDesktopItems, @@ -162,9 +162,9 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall install -Dm755 alsa $out/bin/stereo_tool_gui - wrapProgram $out/bin/stereo_tool_gui --prefix PATH : ${lib.makeBinPath [ libsForQt5.kdialog ]} + wrapProgram $out/bin/stereo_tool_gui --prefix PATH : ${lib.makeBinPath [ kdePackages.kdialog ]} install -Dm755 jack $out/bin/stereo_tool_gui_jack - wrapProgram $out/bin/stereo_tool_gui_jack --prefix PATH : ${lib.makeBinPath [ libsForQt5.kdialog ]} + wrapProgram $out/bin/stereo_tool_gui_jack --prefix PATH : ${lib.makeBinPath [ kdePackages.kdialog ]} install -Dm755 cmd $out/bin/stereo_tool_cmd mkdir -p $out/share/icons/hicolor/48x48/apps cp stereo-tool-icon.png $out/share/icons/hicolor/48x48/apps/stereo-tool-icon.png From c32c678d612264f8844bf027be5bc70054f74e74 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 12 Aug 2025 19:40:34 +0300 Subject: [PATCH 109/146] wemeet: remove unused dependency Will be dropped with Qt5. --- pkgs/by-name/we/wemeet/package.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/by-name/we/wemeet/package.nix b/pkgs/by-name/we/wemeet/package.nix index 2afddc259ab2..53f9dcc3522b 100644 --- a/pkgs/by-name/we/wemeet/package.nix +++ b/pkgs/by-name/we/wemeet/package.nix @@ -66,7 +66,6 @@ let libportal xdg-desktop-portal libsForQt5.qtwayland - libsForQt5.xwaylandvideobridge opencv4WithoutCuda pipewire xorg.libXdamage From 23850b966a2c46122c71ce60b607daab5a552e69 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 12 Aug 2025 19:40:34 +0300 Subject: [PATCH 110/146] zoom-us: remove Plasma 5 code paths --- pkgs/by-name/zo/zoom-us/package.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/by-name/zo/zoom-us/package.nix b/pkgs/by-name/zo/zoom-us/package.nix index 544974f145e0..584e0e08c9e4 100644 --- a/pkgs/by-name/zo/zoom-us/package.nix +++ b/pkgs/by-name/zo/zoom-us/package.nix @@ -15,7 +15,6 @@ # Whether to support XDG portals at all xdgDesktopPortalSupport ? ( plasma6XdgDesktopPortalSupport - || plasma5XdgDesktopPortalSupport || lxqtXdgDesktopPortalSupport || gnomeXdgDesktopPortalSupport || hyprlandXdgDesktopPortalSupport @@ -26,9 +25,6 @@ # This is Plasma 6 (KDE) XDG portal support plasma6XdgDesktopPortalSupport ? false, - # This is Plasma 5 (KDE) XDG portal support - plasma5XdgDesktopPortalSupport ? false, - # This is LXQT XDG portal support lxqtXdgDesktopPortalSupport ? false, @@ -222,7 +218,6 @@ let ] ++ lib.optional xdgDesktopPortalSupport pkgs.xdg-desktop-portal ++ lib.optional plasma6XdgDesktopPortalSupport pkgs.kdePackages.xdg-desktop-portal-kde - ++ lib.optional plasma5XdgDesktopPortalSupport pkgs.plasma5Packages.xdg-desktop-portal-kde ++ lib.optional lxqtXdgDesktopPortalSupport pkgs.lxqt.xdg-desktop-portal-lxqt ++ lib.optionals gnomeXdgDesktopPortalSupport [ pkgs.xdg-desktop-portal-gnome From 97987134de940962a015258bd16ca6682e8df206 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 12 Aug 2025 19:40:34 +0300 Subject: [PATCH 111/146] applet-window-appmenu: drop Not ported to Plasma 6. --- .../applet-window-appmenu/default.nix | 55 ------------------- pkgs/top-level/qt5-packages.nix | 3 - 2 files changed, 58 deletions(-) delete mode 100644 pkgs/development/libraries/applet-window-appmenu/default.nix diff --git a/pkgs/development/libraries/applet-window-appmenu/default.nix b/pkgs/development/libraries/applet-window-appmenu/default.nix deleted file mode 100644 index ea4507b52d0b..000000000000 --- a/pkgs/development/libraries/applet-window-appmenu/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - cmake, - extra-cmake-modules, - kcoreaddons, - kdeclarative, - kdecoration, - plasma-framework, - plasma-workspace, - libSM, - qtx11extras, - kwindowsystem, - libdbusmenu, - wrapQtAppsHook, -}: - -stdenv.mkDerivation { - pname = "applet-window-appmenu"; - version = "unstable-2022-06-27"; - - src = fetchFromGitHub { - owner = "psifidotos"; - repo = "applet-window-appmenu"; - rev = "1de99c93b0004b80898081a1acfd1e0be807326a"; - hash = "sha256-PLlZ2qgdge8o1mZOiPOXSmTQv1r34IUmWTmYFGEzNTI="; - }; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - wrapQtAppsHook - ]; - - buildInputs = [ - kcoreaddons - kdeclarative - kdecoration - kwindowsystem - plasma-framework - plasma-workspace - libSM - qtx11extras - libdbusmenu - ]; - - meta = with lib; { - description = "Plasma 5 applet in order to show window menu in your panels"; - homepage = "https://github.com/psifidotos/applet-window-appmenu"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ greydot ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index 83054318af0c..1624ace0a2c0 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -118,9 +118,6 @@ makeScopeWithSplicing' { accounts-qt = callPackage ../development/libraries/accounts-qt { }; - - applet-window-appmenu = callPackage ../development/libraries/applet-window-appmenu { }; - applet-window-buttons = callPackage ../development/libraries/applet-window-buttons { }; appstream-qt = callPackage ../development/libraries/appstream/qt.nix { }; From f1bdbd2b30f3c063636366d871ff0e41d6e977d9 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 12 Aug 2025 19:40:34 +0300 Subject: [PATCH 112/146] breath-theme: drop Not ported to Plasma 6. --- pkgs/data/themes/breath-theme/default.nix | 48 ----------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 50 deletions(-) delete mode 100644 pkgs/data/themes/breath-theme/default.nix diff --git a/pkgs/data/themes/breath-theme/default.nix b/pkgs/data/themes/breath-theme/default.nix deleted file mode 100644 index 1c3206515099..000000000000 --- a/pkgs/data/themes/breath-theme/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitLab, - cmake, - extra-cmake-modules, - kdecoration, - plasma-workspace, - qtbase, -}: - -stdenv.mkDerivation { - pname = "breath-theme"; - version = "unstable-2022-12-22"; - - src = fetchFromGitLab { - domain = "gitlab.manjaro.org"; - owner = "themes"; - group = "artwork"; - repo = "breath"; - rev = "98822e7d903f16116bfb02ff9921824c139d7bbc"; - sha256 = "sha256-gvzhHOuOhxV3TC3UZeVpxeSDLpCJV+SaapcJ5mbHskY="; - }; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - - kdecoration - plasma-workspace - qtbase - ]; - - dontWrapQtApps = true; - - cmakeFlags = [ - "-DBUILD_PLASMA_THEMES=ON" - "-DBUILD_SDDM_THEME=ON" - ]; - - meta = with lib; { - description = "Manjaro KDE default theme"; - homepage = "https://gitlab.manjaro.org/artwork/themes/breath"; - license = licenses.cc-by-sa-40; - maintainers = with maintainers; [ huantian ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index aa4d44746d08..aece44a19e8e 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -376,6 +376,7 @@ mapAliases { bpb = throw "bpb has been removed as it is unmaintained and not compatible with recent Rust versions"; # Added 2024-04-30 bpftool = throw "'bpftool' has been renamed to/replaced by 'bpftools'"; # Converted to throw 2024-10-17 brasero-original = lib.warnOnInstantiate "Use 'brasero-unwrapped' instead of 'brasero-original'" brasero-unwrapped; # Added 2024-09-29 + breath-theme = throw "'breath-theme' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20 bridgand = throw "'brigand' has been removed due to being unmaintained"; # Added 2025-04-30 bs-platform = throw "'bs-platform' was removed as it was broken, development ended and 'melange' has superseded it"; # Added 2024-07-29 buf-language-server = throw "'buf-language-server' was removed as its development has moved to the 'buf' package"; # Added 2024-11-15 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2ee3e6f0b9e2..eb6fd1131fef 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11155,8 +11155,6 @@ with pkgs; bibata-cursors-translucent = callPackage ../data/icons/bibata-cursors/translucent.nix { }; - breath-theme = libsForQt5.callPackage ../data/themes/breath-theme { }; - colloid-kde = libsForQt5.callPackage ../data/themes/colloid-kde { }; dejavu_fonts = lowPrio (callPackage ../data/fonts/dejavu-fonts { }); From 659ab6b83a61bf8b713721cce7266865d7d56b82 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 12 Aug 2025 19:40:34 +0300 Subject: [PATCH 113/146] colloid-kde: drop Not ported to Plasma 6. --- pkgs/data/themes/colloid-kde/default.nix | 77 ------------------------ pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 79 deletions(-) delete mode 100644 pkgs/data/themes/colloid-kde/default.nix diff --git a/pkgs/data/themes/colloid-kde/default.nix b/pkgs/data/themes/colloid-kde/default.nix deleted file mode 100644 index ef620f4e3270..000000000000 --- a/pkgs/data/themes/colloid-kde/default.nix +++ /dev/null @@ -1,77 +0,0 @@ -{ - lib, - stdenvNoCC, - fetchFromGitHub, - kdeclarative, - plasma-framework, - plasma-workspace, - gitUpdater, -}: - -stdenvNoCC.mkDerivation rec { - pname = "colloid-kde"; - version = "unstable-2023-07-04"; - - src = fetchFromGitHub { - owner = "vinceliuice"; - repo = pname; - rev = "0b79befdad9b442b5a8287342c4b7e47ff87d555"; - hash = "sha256-AYH9fW20/p+mq6lxR1lcCV1BQ/kgcsjHncpMvYWXnWA="; - }; - - outputs = [ - "out" - "sddm" - ]; - - postPatch = '' - patchShebangs install.sh - - substituteInPlace install.sh \ - --replace '$HOME/.local' $out \ - --replace '$HOME/.config' $out/share - - substituteInPlace sddm/install.sh \ - --replace /usr $sddm \ - --replace '$(cd $(dirname $0) && pwd)' . \ - --replace '"$UID" -eq "$ROOT_UID"' true - - substituteInPlace sddm/Colloid/Main.qml \ - --replace /usr $sddm - ''; - - installPhase = '' - runHook preInstall - - mkdir -p $out/share/latte - - name= HOME="$TMPDIR" \ - ./install.sh --dest $out/share/themes - - mkdir -p $sddm/share/sddm/themes - cd sddm - source install.sh - - runHook postInstall - ''; - - postFixup = '' - # Propagate sddm theme dependencies to user env otherwise sddm - # does not find them. Putting them in buildInputs is not enough. - - mkdir -p $sddm/nix-support - - printWords ${kdeclarative.bin} ${plasma-framework} ${plasma-workspace} \ - >> $sddm/nix-support/propagated-user-env-packages - ''; - - passthru.updateScript = gitUpdater { }; - - meta = with lib; { - description = "Clean and concise theme for KDE Plasma desktop"; - homepage = "https://github.com/vinceliuice/Colloid-kde-theme"; - license = licenses.gpl3Only; - platforms = platforms.all; - maintainers = [ maintainers.romildo ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index aece44a19e8e..bb458d617b13 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -464,6 +464,7 @@ mapAliases { clwrapperFunction = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07 CoinMP = coinmp; # Added 2024-06-12 collada-dom = opencollada; # added 2024-02-21 + colloid-kde = throw "'colloid-kde' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20 colorpicker = throw "'colorpicker' has been removed due to lack of maintenance upstream. Consider using 'xcolor', 'gcolor3', 'eyedropper' or 'gpick' instead"; # Added 2024-10-19 colorstorm = throw "'colorstorm' has been removed because it was unmaintained in nixpkgs and upstream was rewritten."; # Added 2025-06-15 connman-ncurses = throw "'connman-ncurses' has been removed due to lack of maintenance upstream."; # Added 2025-05-27 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eb6fd1131fef..95ed0193511a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11155,8 +11155,6 @@ with pkgs; bibata-cursors-translucent = callPackage ../data/icons/bibata-cursors/translucent.nix { }; - colloid-kde = libsForQt5.callPackage ../data/themes/colloid-kde { }; - dejavu_fonts = lowPrio (callPackage ../data/fonts/dejavu-fonts { }); # solve collision for nix-env before https://github.com/NixOS/nix/pull/815 From 20b86355fd7d89f0daec230dc8f41d7906393ae1 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 12 Aug 2025 19:40:34 +0300 Subject: [PATCH 114/146] graphite-kde-theme: drop Not ported to Plasma 6. --- .../themes/graphite-kde-theme/default.nix | 61 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 63 deletions(-) delete mode 100644 pkgs/data/themes/graphite-kde-theme/default.nix diff --git a/pkgs/data/themes/graphite-kde-theme/default.nix b/pkgs/data/themes/graphite-kde-theme/default.nix deleted file mode 100644 index 7d1d548f9031..000000000000 --- a/pkgs/data/themes/graphite-kde-theme/default.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - kdeclarative, - plasma-framework, - plasma-workspace, - gitUpdater, -}: - -stdenv.mkDerivation rec { - pname = "graphite-kde-theme"; - version = "unstable-2023-10-25"; - - src = fetchFromGitHub { - owner = "vinceliuice"; - repo = pname; - rev = "33cc85c49c424dfcba73e6ee84b0dc7fb9e52566"; - hash = "sha256-iQGT2x0wY2EIuYw/a1MB8rT9BxiqWrOyBo6EGIJwsFw="; - }; - - # Propagate sddm theme dependencies to user env otherwise sddm does - # not find them. Putting them in buildInputs is not enough. - propagatedUserEnvPkgs = [ - kdeclarative.bin - plasma-framework - plasma-workspace - ]; - - postPatch = '' - patchShebangs install.sh - - substituteInPlace install.sh \ - --replace '$HOME/.local' $out \ - --replace '$HOME/.config' $out/share - - substituteInPlace sddm/*/Main.qml \ - --replace /usr $out - ''; - - installPhase = '' - runHook preInstall - - name= ./install.sh - - mkdir -p $out/share/sddm/themes - cp -a sddm/Graphite* $out/share/sddm/themes/ - - runHook postInstall - ''; - - passthru.updateScript = gitUpdater { }; - - meta = with lib; { - description = "Flat Design theme for KDE Plasma desktop"; - homepage = "https://github.com/vinceliuice/Graphite-kde-theme"; - license = licenses.gpl3Only; - platforms = platforms.all; - maintainers = [ maintainers.romildo ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index bb458d617b13..f262b3bfb2f7 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -875,6 +875,7 @@ mapAliases { gradle_6 = throw "Gradle 6 has been removed, as it is end-of-life (https://endoflife.date/gradle) and has many vulnerabilities that are not resolved until Gradle 7."; # Added 2024-10-30 gradle_6-unwrapped = throw "Gradle 6 has been removed, as it is end-of-life (https://endoflife.date/gradle) and has many vulnerabilities that are not resolved until Gradle 7."; # Added 2024-10-30 grafana-agent = throw "'grafana-agent' has been removed, as it only works with an EOL compiler and will become EOL during the 25.05 release. Consider migrating to 'grafana-alloy' instead"; # Added 2025-04-02 + graphite-kde-theme = throw "'graphite-kde-theme' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20 #godot godot_4_3-export-templates = lib.warnOnInstantiate "godot_4_3-export-templates has been renamed to godot_4_3-export-templates-bin" godot_4_3-export-templates-bin; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 95ed0193511a..7a6cb7b3e606 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11202,8 +11202,6 @@ with pkgs; font-awesome_6 = (callPackage ../data/fonts/font-awesome { }).v6; font-awesome = font-awesome_6; - graphite-kde-theme = libsForQt5.callPackage ../data/themes/graphite-kde-theme { }; - palenight-theme = callPackage ../data/themes/gtk-theme-framework { theme = "palenight"; }; amarena-theme = callPackage ../data/themes/gtk-theme-framework { theme = "amarena"; }; From 12f2b218ffe9bef18ad6bccf3dfc2241ea053be2 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 12 Aug 2025 19:40:34 +0300 Subject: [PATCH 115/146] kde2-decoration: drop Not ported to Plasma 6. --- pkgs/data/themes/kde2/default.nix | 46 ------------------------------- pkgs/top-level/qt5-packages.nix | 2 -- 2 files changed, 48 deletions(-) delete mode 100644 pkgs/data/themes/kde2/default.nix diff --git a/pkgs/data/themes/kde2/default.nix b/pkgs/data/themes/kde2/default.nix deleted file mode 100644 index 4eab64997811..000000000000 --- a/pkgs/data/themes/kde2/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ - lib, - fetchFromGitHub, - mkDerivation, - cmake, - extra-cmake-modules, - qtbase, - kcoreaddons, - kdecoration, -}: - -mkDerivation rec { - pname = "kde2-decoration"; - version = "1.1"; - - src = fetchFromGitHub { - owner = "repos-holder"; - repo = "kdecoration2-kde2"; - rev = version; - sha256 = "y2q1j36EURJc7k1huqhEH1Z82PnVSKlfx20bpQWY28c="; - }; - - outputs = [ - "out" - "dev" - ]; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - ]; - - buildInputs = [ - qtbase - kcoreaddons - kdecoration - ]; - - meta = with lib; { - description = "KDE 2 window decoration ported to Plasma 5"; - homepage = "https://github.com/repos-holder/kdecoration2-kde2"; - license = licenses.bsd2; - platforms = platforms.linux; - maintainers = [ ]; - }; -} diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index 1624ace0a2c0..f7364604ea29 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -150,8 +150,6 @@ makeScopeWithSplicing' { kdb = callPackage ../development/libraries/kdb { }; - kde2-decoration = callPackage ../data/themes/kde2 { }; - kcolorpicker = callPackage ../development/libraries/kcolorpicker { }; kdiagram = callPackage ../development/libraries/kdiagram { }; From 2a2fd793209f1ee6887b717bfa9981e55c689ccc Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 12 Aug 2025 19:40:34 +0300 Subject: [PATCH 116/146] kexi: drop Old Qt5 version. --- pkgs/applications/office/kexi/default.nix | 112 ---------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 114 deletions(-) delete mode 100644 pkgs/applications/office/kexi/default.nix diff --git a/pkgs/applications/office/kexi/default.nix b/pkgs/applications/office/kexi/default.nix deleted file mode 100644 index 5b07dff5b925..000000000000 --- a/pkgs/applications/office/kexi/default.nix +++ /dev/null @@ -1,112 +0,0 @@ -{ - mkDerivation, - lib, - fetchurl, - fetchpatch, - extra-cmake-modules, - kdoctools, - boost, - qttools, - qtwebkit, - breeze-icons, - karchive, - kcodecs, - kcompletion, - kconfig, - kconfigwidgets, - kcoreaddons, - kcrash, - kguiaddons, - ki18n, - kiconthemes, - kitemviews, - kio, - ktexteditor, - ktextwidgets, - kwidgetsaddons, - kxmlgui, - kdb, - kproperty, - kreport, - lcms2, - libmysqlclient, - libpq, - marble, -}: - -mkDerivation rec { - pname = "kexi"; - version = "3.2.0"; - - src = fetchurl { - url = "mirror://kde/stable/${pname}/src/${pname}-${version}.tar.xz"; - sha256 = "1zy1q7q9rfdaws3rwf3my22ywkn6g747s3ixfcg9r80mm2g3z0bs"; - }; - - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - - buildInputs = [ - boost - qttools - qtwebkit - breeze-icons - karchive - kcodecs - kcompletion - kconfig - kconfigwidgets - kcoreaddons - kcrash - kguiaddons - ki18n - kiconthemes - kitemviews - kio - ktexteditor - ktextwidgets - kwidgetsaddons - kxmlgui - kdb - kproperty - kreport - lcms2 - libmysqlclient - libpq - marble - ]; - - propagatedUserEnvPkgs = [ kproperty ]; - - patches = [ - # Changes in Qt 5.13 mean that QDate isn't exported from certain places, - # which the build was relying on. This patch explicitly imports QDate where - # needed. - # Should be unnecessary with kexi >= 3.3 - (fetchpatch { - url = "https://cgit.kde.org/kexi.git/patch/src/plugins/forms/widgets/kexidbdatepicker.cpp?id=511d99b7745a6ce87a208bdbf69e631f1f136d53"; - sha256 = "0m5cwq2v46gb1b12p7acck6dadvn7sw4xf8lkqikj9hvzq3r1dnj"; - }) - ]; - - meta = with lib; { - description = "Open source visual database applications creator, a long-awaited competitor for programs like MS Access or Filemaker"; - longDescription = '' - Kexi is a visual database applications creator. - It can be used for creating database schemas, - inserting data, performing queries, and processing data. - Forms can be created to provide a custom interface to your data. - All database objects - tables, queries and forms - are stored in the database, - making it easy to share data and design. - ''; - homepage = "https://kexi-project.org/"; - maintainers = with maintainers; [ zraexy ]; - platforms = platforms.linux; - license = with licenses; [ - gpl2 - lgpl2 - ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index f262b3bfb2f7..17d058342536 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1011,6 +1011,7 @@ mapAliases { keepkey_agent = keepkey-agent; # added 2024-01-06 kerberos = throw "'kerberos' has been renamed to/replaced by 'krb5'"; # Converted to throw 2024-10-17 kexectools = throw "'kexectools' has been renamed to/replaced by 'kexec-tools'"; # Converted to throw 2024-10-17 + kexi = makePlasma5Throw "kexi"; keyfinger = throw "keyfinder has been removed as it was abandoned upstream and did not build; consider using mixxx or keyfinder-cli"; # Addd 2024-08-25 keysmith = throw "'keysmith' has been renamed to/replaced by 'libsForQt5.kdeGear.keysmith'"; # Converted to throw 2024-10-17 kgx = gnome-console; # Added 2022-02-19 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7a6cb7b3e606..1518a659a41e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12388,8 +12388,6 @@ with pkgs; kbibtex = libsForQt5.callPackage ../applications/office/kbibtex { }; - kexi = libsForQt5.callPackage ../applications/office/kexi { }; - kiwix = libsForQt5.callPackage ../applications/misc/kiwix { }; kiwix-tools = callPackage ../applications/misc/kiwix/tools.nix { }; From 70628c4834ee05c2c631236e315e83e8d2cbbda5 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 12 Aug 2025 19:40:34 +0300 Subject: [PATCH 117/146] kreport: drop Uses old Qt5 things, unused otherwise. --- .../development/libraries/kreport/default.nix | 46 ------------------- pkgs/top-level/qt5-packages.nix | 2 - 2 files changed, 48 deletions(-) delete mode 100644 pkgs/development/libraries/kreport/default.nix diff --git a/pkgs/development/libraries/kreport/default.nix b/pkgs/development/libraries/kreport/default.nix deleted file mode 100644 index ec2d52647523..000000000000 --- a/pkgs/development/libraries/kreport/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ - mkDerivation, - lib, - fetchurl, - extra-cmake-modules, - qtdeclarative, - qtwebkit, - kconfig, - kcoreaddons, - kwidgetsaddons, - kguiaddons, - kproperty, - marble, - python3, -}: - -mkDerivation rec { - pname = "kreport"; - version = "3.2.0"; - - src = fetchurl { - url = "mirror://kde/stable/${pname}/src/${pname}-${version}.tar.xz"; - sha256 = "1mycsvkz5rphi9df2i4ch4ykvprd4m76acsdzs3zis2ljrqnsw92"; - }; - - nativeBuildInputs = [ extra-cmake-modules ]; - - buildInputs = [ - qtdeclarative - qtwebkit - kconfig - kcoreaddons - kwidgetsaddons - kguiaddons - kproperty - marble - python3 - ]; - - meta = with lib; { - description = "Framework for creation and generation of reports in multiple formats"; - license = licenses.lgpl2; - platforms = platforms.linux; - maintainers = with maintainers; [ zraexy ]; - }; -} diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index f7364604ea29..826a465dade5 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -166,8 +166,6 @@ makeScopeWithSplicing' { kpeoplevcard = callPackage ../development/libraries/kpeoplevcard { }; - kreport = callPackage ../development/libraries/kreport { }; - kquickimageedit = callPackage ../development/libraries/kquickimageedit/0.3.0.nix { }; kuserfeedback = callPackage ../development/libraries/kuserfeedback { }; From 926cc0bb37289e75f03f6742f849469291c4d55a Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 12 Aug 2025 19:40:34 +0300 Subject: [PATCH 118/146] latte-dock: drop Not ported to Plasma 6. --- .../latte-dock/0001-Disable-autostart.patch | 34 --------- pkgs/applications/misc/latte-dock/default.nix | 75 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 4 files changed, 1 insertion(+), 111 deletions(-) delete mode 100644 pkgs/applications/misc/latte-dock/0001-Disable-autostart.patch delete mode 100644 pkgs/applications/misc/latte-dock/default.nix diff --git a/pkgs/applications/misc/latte-dock/0001-Disable-autostart.patch b/pkgs/applications/misc/latte-dock/0001-Disable-autostart.patch deleted file mode 100644 index a639b465c92c..000000000000 --- a/pkgs/applications/misc/latte-dock/0001-Disable-autostart.patch +++ /dev/null @@ -1,34 +0,0 @@ -From ad3f083de2dca2b2c5189430d33a78acfbd9d694 Mon Sep 17 00:00:00 2001 -From: Lana Black -Date: Wed, 8 Jun 2022 12:42:31 +0000 -Subject: [PATCH] Disable autostart. - ---- - app/settings/universalsettings.cpp | 11 ----------- - 1 file changed, 11 deletions(-) - -diff --git a/app/settings/universalsettings.cpp b/app/settings/universalsettings.cpp -index c95371db..4efd3ffe 100644 ---- a/app/settings/universalsettings.cpp -+++ b/app/settings/universalsettings.cpp -@@ -74,17 +74,6 @@ UniversalSettings::~UniversalSettings() - - void UniversalSettings::load() - { -- //! check if user has set the autostart option -- bool autostartUserSet = m_universalGroup.readEntry("userConfiguredAutostart", false); -- -- if (!autostartUserSet && !autostart()) { -- //! the first time the application is running and autostart is not set, autostart is enabled -- //! and from now own it will not be recreated in the beginning -- -- setAutostart(true); -- m_universalGroup.writeEntry("userConfiguredAutostart", true); -- } -- - //! init screen scales - m_screenScalesGroup = m_universalGroup.group("ScreenScales"); - --- -2.36.1 - diff --git a/pkgs/applications/misc/latte-dock/default.nix b/pkgs/applications/misc/latte-dock/default.nix deleted file mode 100644 index c7f6946926c7..000000000000 --- a/pkgs/applications/misc/latte-dock/default.nix +++ /dev/null @@ -1,75 +0,0 @@ -{ - lib, - mkDerivation, - fetchFromGitLab, - cmake, - extra-cmake-modules, - karchive, - kwindowsystem, - qtx11extras, - kcrash, - knewstuff, - wayland-scanner, - plasma-framework, - plasma-wayland-protocols, - plasma-workspace, - plasma-desktop, - qtwayland, - wayland, - xorg, -}: - -mkDerivation { - pname = "latte-dock"; - version = "unstable-2024-01-31"; - - src = fetchFromGitLab { - domain = "invent.kde.org"; - owner = "plasma"; - repo = "latte-dock"; - rev = "131ee4d39ce8913b2de8f9a673903225345c7a38"; - sha256 = "sha256-C1FvgkdxCzny+F6igS2YjsHOpkK34wl6je2tHlGQwU0="; - }; - - buildInputs = [ - plasma-framework - plasma-wayland-protocols - qtwayland - xorg.libpthreadstubs - xorg.libXdmcp - xorg.libSM - wayland - plasma-workspace - plasma-desktop - ]; - - nativeBuildInputs = [ - extra-cmake-modules - cmake - karchive - kwindowsystem - qtx11extras - kcrash - knewstuff - wayland-scanner - ]; - - patches = [ - ./0001-Disable-autostart.patch - ]; - - postInstall = '' - mkdir -p $out/etc/xdg/autostart - cp $out/share/applications/org.kde.latte-dock.desktop $out/etc/xdg/autostart - ''; - - meta = with lib; { - description = "Dock-style app launcher based on Plasma frameworks"; - mainProgram = "latte-dock"; - homepage = "https://invent.kde.org/plasma/latte-dock"; - license = licenses.gpl2; - platforms = platforms.unix; - maintainers = [ maintainers.ysndr ]; - }; - -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 17d058342536..e2b3420761ff 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1040,6 +1040,7 @@ mapAliases { lanzaboote-tool = throw "lanzaboote-tool has been removed due to lack of integration maintenance with nixpkgs. Consider using the Nix expressions provided by https://github.com/nix-community/lanzaboote"; # Added 2025-07-23 latencytop = throw "'latencytop' has been removed due to lack of maintenance upstream."; # Added 2024-12-04 latinmodern-math = lmmath; + latte-dock = throw "'latte-dock' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20 lazarus-qt = lazarus-qt5; # Added 2024-12-25 leafpad = throw "'leafpad' has been removed due to lack of maintenance upstream. Consider using 'xfce.mousepad' instead"; # Added 2024-10-19 ledger_agent = ledger-agent; # Added 2024-01-07 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1518a659a41e..386a6aaf61c9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14719,8 +14719,6 @@ with pkgs; redshift-plasma-applet = libsForQt5.callPackage ../applications/misc/redshift-plasma-applet { }; - latte-dock = libsForQt5.callPackage ../applications/misc/latte-dock { }; - ### SCIENCE/CHEMISTY avogadrolibs = libsForQt5.callPackage ../development/libraries/science/chemistry/avogadrolibs { }; From ac817e245b4a63362bc7fbef51741309546f5a8d Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 12 Aug 2025 19:40:34 +0300 Subject: [PATCH 119/146] layan-kde: drop Not ported to Plasma 6. --- pkgs/data/themes/layan-kde/default.nix | 61 -------------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 63 deletions(-) delete mode 100644 pkgs/data/themes/layan-kde/default.nix diff --git a/pkgs/data/themes/layan-kde/default.nix b/pkgs/data/themes/layan-kde/default.nix deleted file mode 100644 index 2f08b5ccdcaa..000000000000 --- a/pkgs/data/themes/layan-kde/default.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - kdeclarative, - plasma-framework, - plasma-workspace, - gitUpdater, -}: - -stdenv.mkDerivation rec { - pname = "layan-kde"; - version = "unstable-2023-09-30"; - - src = fetchFromGitHub { - owner = "vinceliuice"; - repo = pname; - rev = "7ab7cd7461dae8d8d6228d3919efbceea5f4272c"; - hash = "sha256-Wh8tZcQEdTTlgtBf4ovapojHcpPBZDDkWOclmxZv9zA="; - }; - - # Propagate sddm theme dependencies to user env otherwise sddm does - # not find them. Putting them in buildInputs is not enough. - propagatedUserEnvPkgs = [ - kdeclarative.bin - plasma-framework - plasma-workspace - ]; - - postPatch = '' - patchShebangs install.sh - - substituteInPlace install.sh \ - --replace '$HOME/.local' $out \ - --replace '$HOME/.config' $out/share - - substituteInPlace sddm/*/Main.qml \ - --replace /usr $out - ''; - - installPhase = '' - runHook preInstall - - name= ./install.sh --dest $out/share/themes - - mkdir -p $out/share/sddm/themes - cp -a sddm/Layan* $out/share/sddm/themes/ - - runHook postInstall - ''; - - passthru.updateScript = gitUpdater { }; - - meta = with lib; { - description = "Flat Design theme for KDE Plasma desktop"; - homepage = "https://github.com/vinceliuice/Layan-kde"; - license = licenses.gpl3Only; - platforms = platforms.all; - maintainers = [ maintainers.romildo ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index e2b3420761ff..86be9646e305 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1041,6 +1041,7 @@ mapAliases { latencytop = throw "'latencytop' has been removed due to lack of maintenance upstream."; # Added 2024-12-04 latinmodern-math = lmmath; latte-dock = throw "'latte-dock' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20 + layan-kde = throw "'layan-kde' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20 lazarus-qt = lazarus-qt5; # Added 2024-12-25 leafpad = throw "'leafpad' has been removed due to lack of maintenance upstream. Consider using 'xfce.mousepad' instead"; # Added 2024-10-19 ledger_agent = ledger-agent; # Added 2024-01-07 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 386a6aaf61c9..71760a537d25 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11251,8 +11251,6 @@ with pkgs; inherit (pantheon) elementary-icon-theme; }; - layan-kde = libsForQt5.callPackage ../data/themes/layan-kde { }; - inherit (callPackages ../data/fonts/liberation-fonts { }) liberation_ttf_v1 liberation_ttf_v2 From f164d0957817033e61638ab5822ec9bebf4ca878 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 12 Aug 2025 19:40:34 +0300 Subject: [PATCH 120/146] lightly-boehs: drop Not ported to Plasma 6. --- pkgs/data/themes/lightly-boehs/default.nix | 44 ---------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 46 deletions(-) delete mode 100644 pkgs/data/themes/lightly-boehs/default.nix diff --git a/pkgs/data/themes/lightly-boehs/default.nix b/pkgs/data/themes/lightly-boehs/default.nix deleted file mode 100644 index 145b7a22037d..000000000000 --- a/pkgs/data/themes/lightly-boehs/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ - mkDerivation, - lib, - kdecoration, - fetchFromGitHub, - cmake, - extra-cmake-modules, - plasma-workspace, - qtbase, - qt5, -}: - -mkDerivation { - pname = "lightly-boehs"; - version = "0.4.1"; - - src = fetchFromGitHub { - owner = "boehs"; - repo = "Lightly"; - rev = "1a831f7ff19ce93c04489faec74e389a216fdf11"; - sha256 = "Icw+xVmuCB59ltyZJKyIeHI/yGfM2SbPrVzTVLqHWd4="; - }; - - buildInputs = [ - kdecoration - plasma-workspace - qtbase - qt5.qtx11extras - ]; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - ]; - - meta = with lib; { - description = "Fork of the Lightly breeze theme style that aims to be visually modern and minimalistic"; - mainProgram = "lightly-settings5"; - homepage = "https://github.com/boehs/Lightly"; - license = licenses.gpl2Plus; - maintainers = [ maintainers.hikari ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 86be9646e305..55bee8a74ee4 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1071,6 +1071,7 @@ mapAliases { libgadu = throw "'libgadu' has been removed as upstream is unmaintained and has no dependents or maintainers in Nixpkgs"; # Added 2025-05-17 libgcrypt_1_8 = throw "'libgcrypt_1_8' is end-of-life. Consider using 'libgcrypt' instead"; # Added 2025-01-05 libgda = lib.warnOnInstantiate "‘libgda’ has been renamed to ‘libgda5’" libgda5; # Added 2025-01-21 + lightly-boehs = throw "'lightly-boehs' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20 libgme = game-music-emu; # Added 2022-07-20 libgnome-keyring3 = libgnome-keyring; # Added 2024-06-22 libgpgerror = throw "'libgpgerror' has been renamed to/replaced by 'libgpg-error'"; # Converted to throw 2024-10-17 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 71760a537d25..1056256dc7a9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11259,8 +11259,6 @@ with pkgs; lightly-qt = libsForQt5.callPackage ../data/themes/lightly-qt { }; - lightly-boehs = libsForQt5.callPackage ../data/themes/lightly-boehs { }; - # ltunifi and solaar both provide udev rules but solaar's rules are more # up-to-date so we simply use that instead of having to maintain our own rules logitech-udev-rules = solaar.udev; From d9cdfc5a8275750d0ade6df1c75d801b83a1533d Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 12 Aug 2025 19:40:34 +0300 Subject: [PATCH 121/146] lightly-qt: drop Not ported to Plasma 6. --- pkgs/data/themes/lightly-qt/default.nix | 44 ------------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 46 deletions(-) delete mode 100644 pkgs/data/themes/lightly-qt/default.nix diff --git a/pkgs/data/themes/lightly-qt/default.nix b/pkgs/data/themes/lightly-qt/default.nix deleted file mode 100644 index 6b6729c9cbb7..000000000000 --- a/pkgs/data/themes/lightly-qt/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ - mkDerivation, - lib, - fetchFromGitHub, - cmake, - extra-cmake-modules, - kdecoration, - plasma-workspace, - qtbase, - qt5, -}: - -mkDerivation rec { - pname = "lightly-qt"; - version = "0.4.1"; - - src = fetchFromGitHub { - owner = "Luwx"; - repo = "Lightly"; - rev = "v${version}"; - sha256 = "0qkjzgjplgwczhk6959iah4ilvazpprv7yb809jy75kkp1jw8mwk"; - }; - - buildInputs = [ - kdecoration - plasma-workspace - qtbase - qt5.qtx11extras - ]; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - ]; - - meta = with lib; { - description = "Fork of breeze theme style that aims to be visually modern and minimalistic"; - mainProgram = "lightly-settings5"; - homepage = "https://github.com/Luwx/Lightly"; - license = licenses.gpl2Plus; - maintainers = [ maintainers.pwoelfel ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 55bee8a74ee4..87c2f4fcd3ae 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1072,6 +1072,7 @@ mapAliases { libgcrypt_1_8 = throw "'libgcrypt_1_8' is end-of-life. Consider using 'libgcrypt' instead"; # Added 2025-01-05 libgda = lib.warnOnInstantiate "‘libgda’ has been renamed to ‘libgda5’" libgda5; # Added 2025-01-21 lightly-boehs = throw "'lightly-boehs' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20 + lightly-qt = throw "'lightly-qt' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20 libgme = game-music-emu; # Added 2022-07-20 libgnome-keyring3 = libgnome-keyring; # Added 2024-06-22 libgpgerror = throw "'libgpgerror' has been renamed to/replaced by 'libgpg-error'"; # Converted to throw 2024-10-17 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1056256dc7a9..adc750bec6ef 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11257,8 +11257,6 @@ with pkgs; ; liberation_ttf = liberation_ttf_v2; - lightly-qt = libsForQt5.callPackage ../data/themes/lightly-qt { }; - # ltunifi and solaar both provide udev rules but solaar's rules are more # up-to-date so we simply use that instead of having to maintain our own rules logitech-udev-rules = solaar.udev; From 94c0b938f0e594c2d5873a9380087f0eaee3b02a Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 12 Aug 2025 19:40:34 +0300 Subject: [PATCH 122/146] littlenavmap: drop Not ported to Qt6, depends on Marble which depends on most of Gear 5. --- pkgs/by-name/li/littlenavmap/atools.nix | 46 -------- pkgs/by-name/li/littlenavmap/deploy.patch | 108 ------------------ pkgs/by-name/li/littlenavmap/package.nix | 129 ---------------------- pkgs/top-level/aliases.nix | 1 + 4 files changed, 1 insertion(+), 283 deletions(-) delete mode 100644 pkgs/by-name/li/littlenavmap/atools.nix delete mode 100644 pkgs/by-name/li/littlenavmap/deploy.patch delete mode 100644 pkgs/by-name/li/littlenavmap/package.nix diff --git a/pkgs/by-name/li/littlenavmap/atools.nix b/pkgs/by-name/li/littlenavmap/atools.nix deleted file mode 100644 index 96f92a39c369..000000000000 --- a/pkgs/by-name/li/littlenavmap/atools.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - libsForQt5, -}: - -stdenv.mkDerivation rec { - pname = "atools"; - version = "4.0.17"; - - src = fetchFromGitHub { - owner = "albar965"; - repo = "atools"; - tag = "v${version}"; - hash = "sha256-R5CbMdT8UsPiiIXFhmdAmNa1fKLPfUrWunlbwsHOVow="; - }; - - nativeBuildInputs = [ - libsForQt5.qmake - ]; - - buildInputs = [ - libsForQt5.qtsvg - ]; - - env.ATOOLS_NO_CRASHHANDLER = "true"; - - installTargets = "deploy"; - - postInstall = '' - rmdir $out - mv D/atools $out - ''; - - dontWrapQtApps = true; - - meta = { - description = "Static library extending Qt for exception handling, a log4j like logging framework, Flight Simulator related utilities like BGL reader and more"; - homepage = "https://github.com/albar965/atools"; - changelog = "https://github.com/albar965/atools/blob/${src.rev}/CHANGELOG.txt"; - license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ ck3d ]; - platforms = lib.platforms.all; - }; -} diff --git a/pkgs/by-name/li/littlenavmap/deploy.patch b/pkgs/by-name/li/littlenavmap/deploy.patch deleted file mode 100644 index d35674f7c2e1..000000000000 --- a/pkgs/by-name/li/littlenavmap/deploy.patch +++ /dev/null @@ -1,108 +0,0 @@ -diff --git a/littlenavmap.pro b/littlenavmap.pro -index 7c8ed0c6..31590e2c 100644 ---- a/littlenavmap.pro -+++ b/littlenavmap.pro -@@ -777,18 +777,6 @@ OTHER_FILES += \ - # Linux - Copy help and Marble plugins and data - unix:!macx { - copydata.commands = mkdir -p $$OUT_PWD/plugins && -- copydata.commands += cp -avfu \ -- $$MARBLE_LIB_PATH/marble/plugins/libCachePlugin.so \ -- $$MARBLE_LIB_PATH/marble/plugins/libAtmospherePlugin.so \ -- $$MARBLE_LIB_PATH/marble/plugins/libCompassFloatItem.so \ -- $$MARBLE_LIB_PATH/marble/plugins/libGraticulePlugin.so \ -- $$MARBLE_LIB_PATH/marble/plugins/libKmlPlugin.so \ -- $$MARBLE_LIB_PATH/marble/plugins/libLatLonPlugin.so \ -- $$MARBLE_LIB_PATH/marble/plugins/libPn2Plugin.so \ -- $$MARBLE_LIB_PATH/marble/plugins/libMapScaleFloatItem.so \ -- $$MARBLE_LIB_PATH/marble/plugins/libNavigationFloatItem.so \ -- $$MARBLE_LIB_PATH/marble/plugins/libOverviewMap.so \ -- $$OUT_PWD/plugins && - copydata.commands += mkdir -p $$OUT_PWD/translations && - copydata.commands += cp -avfu $$PWD/*.qm $$OUT_PWD/translations && - copydata.commands += cp -avfu $$ATOOLS_INC_PATH/../*.qm $$OUT_PWD/translations && -@@ -796,8 +784,7 @@ unix:!macx { - copydata.commands += cp -avfu $$PWD/web $$OUT_PWD && - copydata.commands += cp -avfu $$PWD/customize $$OUT_PWD && - copydata.commands += cp -avfu $$PWD/marble/data $$OUT_PWD && -- copydata.commands += cp -vf $$PWD/desktop/littlenavmap*.sh $$OUT_PWD && -- copydata.commands += chmod -v a+x $$OUT_PWD/littlenavmap*.sh -+ copydata.commands += true - } - - # Mac OS X - Copy help and Marble plugins and data -@@ -820,73 +807,20 @@ unix:!macx { - - deploy.commands += rm -Rfv $$DEPLOY_DIR && - deploy.commands += mkdir -pv $$DEPLOY_DIR/translations && -- deploy.commands += mkdir -pv $$DEPLOY_DIR_LIB && -- deploy.commands += mkdir -pv $$DEPLOY_DIR_LIB/iconengines && -- deploy.commands += mkdir -pv $$DEPLOY_DIR_LIB/imageformats && -- deploy.commands += mkdir -pv $$DEPLOY_DIR_LIB/platforms && -- deploy.commands += mkdir -pv $$DEPLOY_DIR_LIB/platformthemes && -- deploy.commands += mkdir -pv $$DEPLOY_DIR_LIB/printsupport && -- deploy.commands += mkdir -pv $$DEPLOY_DIR_LIB/sqldrivers && - deploy.commands += echo $$VERSION_NUMBER > $$DEPLOY_DIR/version.txt && -- deploy.commands += echo $$GIT_REVISION_FULL > $$DEPLOY_DIR/revision.txt && -- deploy.commands += cp -Rvf $$MARBLE_LIB_PATH/*.so* $$DEPLOY_DIR_LIB && -- deploy.commands += patchelf --set-rpath \'\$\$ORIGIN/.\' $$DEPLOY_DIR_LIB/libmarblewidget-qt5.so* && -- deploy.commands += patchelf --set-rpath \'\$\$ORIGIN/.\' $$DEPLOY_DIR_LIB/libastro.so* && -- deploy.commands += cp -Rvf $$OUT_PWD/plugins $$DEPLOY_DIR && - deploy.commands += cp -Rvf $$OUT_PWD/data $$DEPLOY_DIR && - deploy.commands += cp -Rvf $$OUT_PWD/help $$DEPLOY_DIR && - deploy.commands += cp -Rvf $$OUT_PWD/web $$DEPLOY_DIR && - deploy.commands += cp -Rvf $$OUT_PWD/customize $$DEPLOY_DIR && - deploy.commands += cp -Rvf $$OUT_PWD/littlenavmap $$DEPLOY_DIR && -- deploy.commands += cp -vfa $$[QT_INSTALL_TRANSLATIONS]/qt_??.qm $$DEPLOY_DIR/translations && -- deploy.commands += cp -vfa $$[QT_INSTALL_TRANSLATIONS]/qt_??_??.qm $$DEPLOY_DIR/translations && -- deploy.commands += cp -vfa $$[QT_INSTALL_TRANSLATIONS]/qtbase*.qm $$DEPLOY_DIR/translations && - deploy.commands += cp -Rvf $$OUT_PWD/translations $$DEPLOY_DIR && - exists($$DATABASE_BASE) : deploy.commands += cp -Rvf $$DATABASE_BASE $$DEPLOY_DIR && - exists($$HELP_BASE) : deploy.commands += cp -Rvf $$HELP_BASE/* $$DEPLOY_DIR/help && -- deploy.commands += cp -vf $$PWD/desktop/\"Little Navmap Portable Linux.sh\" $$DEPLOY_DIR/\"Little Navmap Portable.sh\" && -- deploy.commands += cp -vf $$PWD/desktop/linux-qt.conf $$DEPLOY_DIR/qt.conf && - deploy.commands += cp -vf $$PWD/CHANGELOG.txt $$DEPLOY_DIR && - deploy.commands += cp -vf $$PWD/README.txt $$DEPLOY_DIR && - deploy.commands += cp -vf $$PWD/LICENSE.txt $$DEPLOY_DIR && - deploy.commands += cp -vf $$PWD/resources/icons/littlenavmap.svg $$DEPLOY_DIR && -- deploy.commands += cp -vf \"$$PWD/desktop/Little Navmap.desktop\" $$DEPLOY_DIR && -- exists(/usr/lib/x86_64-linux-gnu/libssl.so.1.1) : deploy.commands += cp -vfaL /usr/lib/x86_64-linux-gnu/libssl.so.1.1 $$DEPLOY_DIR_LIB && -- exists(/usr/lib/x86_64-linux-gnu/libcrypto.so.1.1) : deploy.commands += cp -vfaL /usr/lib/x86_64-linux-gnu/libcrypto.so.1.1 $$DEPLOY_DIR_LIB && -- deploy.commands += cp -vfa $$[QT_INSTALL_PLUGINS]/iconengines/libqsvgicon.so* $$DEPLOY_DIR_LIB/iconengines && -- deploy.commands += cp -vfa $$[QT_INSTALL_PLUGINS]/imageformats/libqgif.so* $$DEPLOY_DIR_LIB/imageformats && -- deploy.commands += cp -vfa $$[QT_INSTALL_PLUGINS]/imageformats/libqjpeg.so* $$DEPLOY_DIR_LIB/imageformats && -- deploy.commands += cp -vfa $$[QT_INSTALL_PLUGINS]/imageformats/libqsvg.so* $$DEPLOY_DIR_LIB/imageformats && -- deploy.commands += cp -vfa $$[QT_INSTALL_PLUGINS]/imageformats/libqwbmp.so* $$DEPLOY_DIR_LIB/imageformats && -- deploy.commands += cp -vfa $$[QT_INSTALL_PLUGINS]/imageformats/libqwebp.so* $$DEPLOY_DIR_LIB/imageformats && -- deploy.commands += cp -vfa $$[QT_INSTALL_PLUGINS]/platforms/libqeglfs.so* $$DEPLOY_DIR_LIB/platforms && -- deploy.commands += cp -vfa $$[QT_INSTALL_PLUGINS]/platforms/libqlinuxfb.so* $$DEPLOY_DIR_LIB/platforms && -- deploy.commands += cp -vfa $$[QT_INSTALL_PLUGINS]/platforms/libqminimal.so* $$DEPLOY_DIR_LIB/platforms && -- deploy.commands += cp -vfa $$[QT_INSTALL_PLUGINS]/platforms/libqminimalegl.so* $$DEPLOY_DIR_LIB/platforms && -- deploy.commands += cp -vfa $$[QT_INSTALL_PLUGINS]/platforms/libqoffscreen.so* $$DEPLOY_DIR_LIB/platforms && -- deploy.commands += cp -vfa $$[QT_INSTALL_PLUGINS]/platforms/libqxcb.so* $$DEPLOY_DIR_LIB/platforms && -- deploy.commands += cp -vfa $$[QT_INSTALL_PLUGINS]/platformthemes/libqgtk*.so* $$DEPLOY_DIR_LIB/platformthemes && -- deploy.commands += cp -vfa $$[QT_INSTALL_PLUGINS]/printsupport/libcupsprintersupport.so* $$DEPLOY_DIR_LIB/printsupport && -- deploy.commands += cp -vfa $$[QT_INSTALL_PLUGINS]/sqldrivers/libqsqlite.so* $$DEPLOY_DIR_LIB/sqldrivers && -- deploy.commands += cp -vfa $$[QT_INSTALL_LIBS]/libicudata.so* $$DEPLOY_DIR_LIB && -- deploy.commands += cp -vfa $$[QT_INSTALL_LIBS]/libicui18n.so* $$DEPLOY_DIR_LIB && -- deploy.commands += cp -vfa $$[QT_INSTALL_LIBS]/libicuuc.so* $$DEPLOY_DIR_LIB && -- deploy.commands += cp -vfa $$[QT_INSTALL_LIBS]/libQt5Concurrent.so* $$DEPLOY_DIR_LIB && -- deploy.commands += cp -vfa $$[QT_INSTALL_LIBS]/libQt5Core.so* $$DEPLOY_DIR_LIB && -- deploy.commands += cp -vfa $$[QT_INSTALL_LIBS]/libQt5DBus.so* $$DEPLOY_DIR_LIB && -- deploy.commands += cp -vfa $$[QT_INSTALL_LIBS]/libQt5Gui.so* $$DEPLOY_DIR_LIB && -- deploy.commands += cp -vfa $$[QT_INSTALL_LIBS]/libQt5Network.so* $$DEPLOY_DIR_LIB && -- deploy.commands += cp -vfa $$[QT_INSTALL_LIBS]/libQt5PrintSupport.so* $$DEPLOY_DIR_LIB && -- deploy.commands += cp -vfa $$[QT_INSTALL_LIBS]/libQt5Qml.so* $$DEPLOY_DIR_LIB && -- deploy.commands += cp -vfa $$[QT_INSTALL_LIBS]/libQt5Quick.so* $$DEPLOY_DIR_LIB && -- deploy.commands += cp -vfa $$[QT_INSTALL_LIBS]/libQt5Sql.so* $$DEPLOY_DIR_LIB && -- deploy.commands += cp -vfa $$[QT_INSTALL_LIBS]/libQt5Svg.so* $$DEPLOY_DIR_LIB && -- deploy.commands += cp -vfa $$[QT_INSTALL_LIBS]/libQt5Widgets.so* $$DEPLOY_DIR_LIB && -- deploy.commands += cp -vfa $$[QT_INSTALL_LIBS]/libQt5X11Extras.so* $$DEPLOY_DIR_LIB && -- deploy.commands += cp -vfa $$[QT_INSTALL_LIBS]/libQt5XcbQpa.so* $$DEPLOY_DIR_LIB && -- deploy.commands += cp -vfa $$[QT_INSTALL_LIBS]/libQt5QmlModels.so* $$DEPLOY_DIR_LIB && -- deploy.commands += cp -vfa $$[QT_INSTALL_LIBS]/libQt5Xml.so* $$DEPLOY_DIR_LIB && -- deploy.commands += rm -fv $$DEPLOY_DIR_LIB/lib*.so.*.debug $$DEPLOY_DIR_LIB/*/lib*.so.*.debug -+ deploy.commands += true - } - - # Mac specific deploy target diff --git a/pkgs/by-name/li/littlenavmap/package.nix b/pkgs/by-name/li/littlenavmap/package.nix deleted file mode 100644 index f01cdeee5494..000000000000 --- a/pkgs/by-name/li/littlenavmap/package.nix +++ /dev/null @@ -1,129 +0,0 @@ -{ - lib, - stdenv, - callPackage, - fetchFromGitHub, - libsForQt5, - makeDesktopItem, -}: -let - atools = callPackage ./atools.nix { }; - marble = libsForQt5.marble.overrideAttrs (self: { - version = "0.25.5"; - - src = fetchFromGitHub { - owner = "albar965"; - repo = "marble"; - rev = "722acf7f8d79023f6c6a761063645a1470bb3935"; # branch lnm/1.1 - hash = "sha256-5GSa+xIQS9EgJXxMFUOA5jTtHJ6Dl4C9yAkFPIOrgo8="; - }; - - # https://github.com/albar965/littlenavmap/wiki/Compiling#compile-marble - cmakeFlags = - let - disable = n: lib.cmakeBool n false; - enable = n: lib.cmakeBool n true; - in - map enable [ - "STATIC_BUILD" - "MARBLE_EMPTY_MAPTHEME" - "QTONLY" - ] - ++ map disable [ - "BUILD_MARBLE_EXAMPLES" - "BUILD_INHIBIT_SCREENSAVER_PLUGIN" - "BUILD_MARBLE_APPS" - "BUILD_MARBLE_EXAMPLES" - "BUILD_MARBLE_TESTS" - "BUILD_MARBLE_TOOLS" - "BUILD_TESTING" - "BUILD_WITH_DBUS" - "MOBILE" - "WITH_DESIGNER_PLUGIN" - "WITH_Phonon" - "WITH_Qt5Location" - "WITH_Qt5Positioning" - "WITH_Qt5SerialPort" - "WITH_ZLIB" - "WITH_libgps" - "WITH_libshp" - "WITH_libwlocate" - ]; - }); - - desktopItem = makeDesktopItem { - name = "Little Navmap"; - desktopName = "Little Navmap"; - icon = "littlenavmap"; - terminal = false; - exec = "littlenavmap"; - categories = [ - "Qt" - "Utility" - "Geography" - "Maps" - ]; - }; -in -stdenv.mkDerivation (finalAttrs: { - pname = "littlenavmap"; - version = "3.0.17"; - - src = fetchFromGitHub { - owner = "albar965"; - repo = "littlenavmap"; - tag = "v${finalAttrs.version}"; - hash = "sha256-/1YB2uEQzT0K6IylpWDqOaMSENDR9GuyJNty+2C8kXM="; - }; - - nativeBuildInputs = [ - libsForQt5.qmake - libsForQt5.wrapQtAppsHook - ]; - - # https://github.com/albar965/littlenavmap/wiki/Compiling#default-paths-and-environment-variables-2 - env = { - ATOOLS_INC_PATH = "${atools}/include"; - ATOOLS_LIB_PATH = "${atools}/lib"; - MARBLE_INC_PATH = "${marble.dev}/include"; - MARBLE_LIB_PATH = "${marble}/lib"; - inherit (atools) ATOOLS_NO_CRASHHANDLER; - }; - - patches = [ ./deploy.patch ]; - - configurePhase = '' - runHook preConfigure - - # we have to build out of source tree - cd build - qmake "''${flagsArray[@]}" .. - - runHook postConfigure - ''; - - postInstall = '' - mkdir -p $out/bin $out/lib $out/share/icons/scaleable/apps - mv "../../deploy/Little Navmap" $out/lib/littlenavmap - ln -s $out/lib/littlenavmap/littlenavmap $out/bin - cp -ra ${desktopItem}/* $out - mv $out/lib/littlenavmap/littlenavmap.svg $out/share/icons/scaleable/apps - ''; - - enableParallelBuilding = true; - enableParallelInstalling = true; - - installTargets = "deploy"; - - passthru.local-packages = { inherit atools marble; }; - - meta = { - description = "Free flight planner, navigation tool, moving map, airport search and airport information system for Flight Simulator X, Microsoft Flight Simulator 2020, Prepar3D and X-Plane"; - homepage = "https://github.com/albar965/littlenavmap"; - changelog = "https://github.com/albar965/littlenavmap/blob/${finalAttrs.src.tag}/CHANGELOG.txt"; - license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ ck3d ]; - mainProgram = "littlenavmap"; - platforms = lib.platforms.linux; - }; -}) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 87c2f4fcd3ae..a17e755f1070 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1131,6 +1131,7 @@ mapAliases { litecoin = throw "litecoin has been removed as nobody was maintaining it and the packaged version had known vulnerabilities"; # Added 2024-11-24 litecoind = throw "litecoind has been removed as nobody was maintaining it and the packaged version had known vulnerabilities"; # Added 2024-11-24 Literate = literate; # Added 2024-06-12 + littlenavmap = throw "littlenavmap has been removed as it depends on KDE Gear 5, which has reached EOL"; # Added 2025-08-20 llama = walk; # Added 2023-01-23 # Linux kernels From 9344fa43259410109f1c8fcaf89d99e08bc43108 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 12 Aug 2025 19:40:34 +0300 Subject: [PATCH 123/146] material-kwin-decoration: drop Not ported to Plasma 6. --- .../ma/material-kwin-decoration/package.nix | 59 ------------------- pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 59 deletions(-) delete mode 100644 pkgs/by-name/ma/material-kwin-decoration/package.nix diff --git a/pkgs/by-name/ma/material-kwin-decoration/package.nix b/pkgs/by-name/ma/material-kwin-decoration/package.nix deleted file mode 100644 index 6d005b7a838d..000000000000 --- a/pkgs/by-name/ma/material-kwin-decoration/package.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - cmake, - libsForQt5, - unstableGitUpdater, -}: - -stdenv.mkDerivation { - pname = "material-kwin-decoration"; - version = "7-unstable-2023-01-15"; - - src = fetchFromGitHub { - owner = "Zren"; - repo = "material-decoration"; - rev = "0e989e5b815b64ee5bca989f983da68fa5556644"; - hash = "sha256-Ncn5jxkuN4ZBWihfycdQwpJ0j4sRpBGMCl6RNiH4mXg="; - }; - - # Remove -Werror since it uses deprecated methods - postPatch = '' - substituteInPlace ./CMakeLists.txt \ - --replace "add_definitions (-Wall -Werror)" "add_definitions (-Wall)" - ''; - - nativeBuildInputs = [ - cmake - ] - ++ (with libsForQt5; [ - extra-cmake-modules - wrapQtAppsHook - ]); - - buildInputs = with libsForQt5; [ - qtx11extras - kcoreaddons - kguiaddons - kdecoration - kconfig - kconfigwidgets - kwindowsystem - kiconthemes - kwayland - ]; - - passthru = { - updateScript = unstableGitUpdater { - tagPrefix = "v"; - }; - }; - - meta = { - description = "Material-ish window decoration theme for KWin"; - homepage = "https://github.com/Zren/material-decoration"; - license = lib.licenses.gpl2; - maintainers = with lib.maintainers; [ nickcao ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a17e755f1070..a2b4cb1308a9 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1291,6 +1291,7 @@ mapAliases { marwaita-ubuntu = lib.warnOnInstantiate "marwaita-ubuntu has been renamed to marwaita-orange" marwaita-orange; # Added 2024-07-08 marwaita-pop_os = lib.warnOnInstantiate "marwaita-pop_os has been renamed to marwaita-yellow" marwaita-yellow; # Added 2024-10-29 masari = throw "masari has been removed as it was abandoned upstream"; # Added 2024-07-11 + material-kwin-decoration = throw "'material-kwin-decoration' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20 mathematica9 = throw "mathematica9 has been removed as it was obsolete, broken, and depended on OpenCV 2"; # Added 2024-08-20 mathematica10 = throw "mathematica10 has been removed as it was obsolete, broken, and depended on OpenCV 2"; # Added 2024-08-20 mathematica11 = throw "mathematica11 has been removed as it was obsolete, broken, and depended on OpenCV 2"; # Added 2024-08-20 From 92641e253958557d97c20ca63b26550d5d2bd894 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 12 Aug 2025 19:40:34 +0300 Subject: [PATCH 124/146] peruse: drop Old, Qt5, unmaintained. --- pkgs/tools/misc/peruse/default.nix | 63 ------------------------------ pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 65 deletions(-) delete mode 100644 pkgs/tools/misc/peruse/default.nix diff --git a/pkgs/tools/misc/peruse/default.nix b/pkgs/tools/misc/peruse/default.nix deleted file mode 100644 index ece14a96056d..000000000000 --- a/pkgs/tools/misc/peruse/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ - stdenv, - fetchurl, - lib, - extra-cmake-modules, - kdoctools, - wrapQtAppsHook, - baloo, - karchive, - kconfig, - kcrash, - kfilemetadata, - kinit, - kirigami2, - knewstuff, - okular, - plasma-framework, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "peruse"; - # while technically a beta, the latest release is from 2016 and doesn't build without a lot of - # patching - version = "1.80"; - - src = fetchurl { - url = "mirror://kde/stable/peruse/peruse-${finalAttrs.version}.tar.xz"; - hash = "sha256-xnSVnKF20jbxVoFW41A22NZWVZUry/F7G+Ts5NK6M1E="; - }; - - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - wrapQtAppsHook - ]; - - propagatedBuildInputs = [ - baloo - karchive - kconfig - kcrash - kfilemetadata - kinit - kirigami2 - knewstuff - okular - plasma-framework - ]; - - # the build is otherwise crazy loud - cmakeFlags = [ "-Wno-dev" ]; - - pathsToLink = [ "/etc/xdg/peruse.knsrc" ]; - - meta = with lib; { - description = "Comic book reader"; - homepage = "https://peruse.kde.org"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ peterhoeg ]; - mainProgram = "peruse"; - inherit (kirigami2.meta) platforms; - }; -}) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a2b4cb1308a9..dd2a91d05ca8 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1598,6 +1598,7 @@ mapAliases { pentablet-driver = xp-pen-g430-driver; # Added 2022-06-23 perldevel = throw "'perldevel' has been dropped due to lack of updates in nixpkgs and lack of consistent support for devel versions by 'perl-cross' releases, use 'perl' instead"; perldevelPackages = perldevel; + peruse = throw "'peruse' has been removed as it depends on KDE Gear 5, which has reached EOL"; # Added 2025-08-20 petrinizer = throw "'petrinizer' has been removed, as it was broken and unmaintained"; # added 2024-05-09 pg-gvm = throw "pg-gvm has been moved to postgresql.pkgs.pg-gvm to make it work with all versions of PostgreSQL"; # added 2024-11-30 pgadmin = pgadmin4; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index adc750bec6ef..1979d5de80a8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3347,8 +3347,6 @@ with pkgs; kwalletcli = libsForQt5.callPackage ../tools/security/kwalletcli { }; - peruse = libsForQt5.callPackage ../tools/misc/peruse { }; - ksmoothdock = libsForQt5.callPackage ../applications/misc/ksmoothdock { }; libcoap = callPackage ../applications/networking/libcoap { From 980598e8f6b93931d343ce45a0414b0233997173 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 12 Aug 2025 19:40:34 +0300 Subject: [PATCH 125/146] plasma-applet-volumewin7mixer: drop Not ported to Plasma 6. --- .../plasma-applet-volumewin7mixer/cmake.patch | 20 --------- .../plasma-applet-volumewin7mixer/default.nix | 45 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 -- 4 files changed, 1 insertion(+), 69 deletions(-) delete mode 100644 pkgs/applications/misc/plasma-applet-volumewin7mixer/cmake.patch delete mode 100644 pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix diff --git a/pkgs/applications/misc/plasma-applet-volumewin7mixer/cmake.patch b/pkgs/applications/misc/plasma-applet-volumewin7mixer/cmake.patch deleted file mode 100644 index b33a3e174bc4..000000000000 --- a/pkgs/applications/misc/plasma-applet-volumewin7mixer/cmake.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -Naur org.kde.plasma.volumewin7mixer/CMakeLists.txt org.kde.plasma.volumewin7mixer.patch/CMakeLists.txt ---- org.kde.plasma.volumewin7mixer/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 -+++ org.kde.plasma.volumewin7mixer.patch/CMakeLists.txt 2016-04-19 11:23:35.137866949 +0200 -@@ -0,0 +1,15 @@ -+# Set minimum CMake version (required for CMake 3.0 or later) -+cmake_minimum_required(VERSION 2.8.12) -+ -+# Use Extra CMake Modules (ECM) for common functionality. -+# See http://api.kde.org/ecm/manual/ecm.7.html -+# and http://api.kde.org/ecm/manual/ecm-kde-modules.7.html -+find_package(ECM REQUIRED NO_MODULE) -+# Needed by find_package(KF5Plasma) below. -+set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_MODULE_PATH}) -+ -+# Locate plasma_install_package macro. -+find_package(KF5Plasma REQUIRED) -+ -+# Add installatation target ("make install"). -+plasma_install_package(package org.kde.plasma.volumewin7mixer) - diff --git a/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix b/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix deleted file mode 100644 index cba463516a68..000000000000 --- a/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ - lib, - stdenv, - cmake, - extra-cmake-modules, - plasma-framework, - kwindowsystem, - plasma-pa, - fetchFromGitHub, -}: - -stdenv.mkDerivation rec { - pname = "plasma-applet-volumewin7mixer"; - version = "26"; - - src = fetchFromGitHub { - owner = "Zren"; - repo = "plasma-applet-volumewin7mixer"; - rev = "v${version}"; - sha256 = "sha256-VMOUNtAURTHDuJBOGz2N0+3VzxBmVNC1O8dVuyUZAa4="; - }; - - # Adds the CMakeLists.txt not provided by upstream - patches = [ ./cmake.patch ]; - postPatch = "rm build"; - nativeBuildInputs = [ - cmake - extra-cmake-modules - ]; - buildInputs = [ - plasma-framework - kwindowsystem - plasma-pa - ]; - - dontWrapQtApps = true; - - meta = with lib; { - description = "Fork of the default volume plasmoid with a Windows 7 theme (vertical sliders)"; - homepage = "https://github.com/Zren/plasma-applet-volumewin7mixer"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ mdevlamynck ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index dd2a91d05ca8..e4ef54826899 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1685,6 +1685,7 @@ mapAliases { pivx = throw "pivx has been removed as it was marked as broken"; # Added 2024-07-15 pivxd = throw "pivxd has been removed as it was marked as broken"; # Added 2024-07-15 + plasma-applet-volumewin7mixer = throw "'plasma-applet-volumewin7mixer' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20 PlistCpp = plistcpp; # Added 2024-01-05 pocket-updater-utility = pupdate; # Added 2024-01-25 polipo = throw "'polipo' has been removed as it is unmaintained upstream"; # Added 2025-05-18 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1979d5de80a8..7f1bdb5be245 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14687,10 +14687,6 @@ with pkgs; xfce = recurseIntoAttrs (callPackage ../desktops/xfce { }); - plasma-applet-volumewin7mixer = - libsForQt5.callPackage ../applications/misc/plasma-applet-volumewin7mixer - { }; - plasma-theme-switcher = libsForQt5.callPackage ../applications/misc/plasma-theme-switcher { }; plasma-pass = libsForQt5.callPackage ../tools/security/plasma-pass { }; From 1bcecd979433810a6eff8950dec0203f9d6ab3aa Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 12 Aug 2025 19:40:34 +0300 Subject: [PATCH 126/146] plasma-pass: drop Not ported to Plasma 6. --- pkgs/tools/security/plasma-pass/default.nix | 49 --------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 51 deletions(-) delete mode 100644 pkgs/tools/security/plasma-pass/default.nix diff --git a/pkgs/tools/security/plasma-pass/default.nix b/pkgs/tools/security/plasma-pass/default.nix deleted file mode 100644 index 5ab24a28b7ce..000000000000 --- a/pkgs/tools/security/plasma-pass/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ - mkDerivation, - lib, - fetchFromGitLab, - cmake, - extra-cmake-modules, - ki18n, - kitemmodels, - oath-toolkit, - qgpgme, - plasma-framework, - qt5, -}: - -mkDerivation rec { - pname = "plasma-pass"; - version = "1.2.2"; - - src = fetchFromGitLab { - domain = "invent.kde.org"; - owner = "plasma"; - repo = "plasma-pass"; - sha256 = "sha256-fEYH3cvDZzEKpYqkTVqxxh3rhV75af8dZUHxQq8fPNg="; - rev = "v${version}"; - }; - - buildInputs = [ - ki18n - kitemmodels - oath-toolkit - qgpgme - plasma-framework - qt5.qtbase - qt5.qtdeclarative - ]; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - ]; - - meta = with lib; { - description = "Plasma applet to access passwords from pass, the standard UNIX password manager"; - homepage = "https://invent.kde.org/plasma/plasma-pass"; - license = licenses.lgpl21Plus; - maintainers = with maintainers; [ matthiasbeyer ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index e4ef54826899..2e442e625a5a 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1686,6 +1686,7 @@ mapAliases { pivxd = throw "pivxd has been removed as it was marked as broken"; # Added 2024-07-15 plasma-applet-volumewin7mixer = throw "'plasma-applet-volumewin7mixer' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20 + plasma-pass = throw "'plasma-pass' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20 PlistCpp = plistcpp; # Added 2024-01-05 pocket-updater-utility = pupdate; # Added 2024-01-25 polipo = throw "'polipo' has been removed as it is unmaintained upstream"; # Added 2025-05-18 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7f1bdb5be245..cc400a75ea13 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14689,8 +14689,6 @@ with pkgs; plasma-theme-switcher = libsForQt5.callPackage ../applications/misc/plasma-theme-switcher { }; - plasma-pass = libsForQt5.callPackage ../tools/security/plasma-pass { }; - inherit (callPackages ../applications/misc/redshift { inherit (python3Packages) From 97bcfc37758a4fdde42ffe5ce98ca62c377e843e Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 12 Aug 2025 19:40:34 +0300 Subject: [PATCH 127/146] plasma-theme-switcher: drop Not ported to Plasma 6. --- .../misc/plasma-theme-switcher/default.nix | 49 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 51 deletions(-) delete mode 100644 pkgs/applications/misc/plasma-theme-switcher/default.nix diff --git a/pkgs/applications/misc/plasma-theme-switcher/default.nix b/pkgs/applications/misc/plasma-theme-switcher/default.nix deleted file mode 100644 index 324cca93099f..000000000000 --- a/pkgs/applications/misc/plasma-theme-switcher/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ - stdenv, - lib, - cmake, - extra-cmake-modules, - fetchFromGitHub, - qtbase, - kdeFrameworks, -}: - -stdenv.mkDerivation rec { - pname = "plasma-theme-switcher"; - version = "0.1"; - dontWrapQtApps = true; - - src = fetchFromGitHub { - owner = "maldoinc"; - repo = "plasma-theme-switcher"; - rev = "v${version}"; - sha256 = "sdcJ6K5QmglJEDIEl4sd8x7DuCPCqMHRxdYbcToM46Q="; - }; - - buildInputs = [ - qtbase - kdeFrameworks.plasma-framework - ]; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - ]; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin - cp plasma-theme $out/bin - - runHook postInstall - ''; - - meta = with lib; { - homepage = "https://github.com/maldoinc/plasma-theme-switcher/"; - description = "KDE Plasma theme switcher"; - license = with licenses; [ gpl2Only ]; - maintainers = with maintainers; [ kevink ]; - mainProgram = "plasma-theme"; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 2e442e625a5a..ef67b6f9b243 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1687,6 +1687,7 @@ mapAliases { plasma-applet-volumewin7mixer = throw "'plasma-applet-volumewin7mixer' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20 plasma-pass = throw "'plasma-pass' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20 + plasma-theme-switcher = throw "'plasma-theme-switcher' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20 PlistCpp = plistcpp; # Added 2024-01-05 pocket-updater-utility = pupdate; # Added 2024-01-25 polipo = throw "'polipo' has been removed as it is unmaintained upstream"; # Added 2025-05-18 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cc400a75ea13..372f34fb8282 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14687,8 +14687,6 @@ with pkgs; xfce = recurseIntoAttrs (callPackage ../desktops/xfce { }); - plasma-theme-switcher = libsForQt5.callPackage ../applications/misc/plasma-theme-switcher { }; - inherit (callPackages ../applications/misc/redshift { inherit (python3Packages) From 051cea054811b987d5091d2e209662004a4c3750 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 12 Aug 2025 19:40:34 +0300 Subject: [PATCH 128/146] qcachegrind: drop Builds on old Qt5 version of kcachegrind, which itself is getting dropped. --- .../tools/analysis/qcachegrind/default.nix | 66 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 68 deletions(-) delete mode 100644 pkgs/development/tools/analysis/qcachegrind/default.nix diff --git a/pkgs/development/tools/analysis/qcachegrind/default.nix b/pkgs/development/tools/analysis/qcachegrind/default.nix deleted file mode 100644 index b8bda7488a40..000000000000 --- a/pkgs/development/tools/analysis/qcachegrind/default.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ - lib, - stdenv, - qmake, - qtbase, - perl, - php, - kcachegrind, - wrapQtAppsHook, -}: - -stdenv.mkDerivation { - pname = "qcachegrind"; - version = kcachegrind.version; - - src = kcachegrind.src; - - buildInputs = [ - qtbase - perl - php - ]; - - nativeBuildInputs = [ - qmake - wrapQtAppsHook - ]; - - dontWrapQtApps = true; - - postInstall = '' - mkdir -p $out/bin - cp -p converters/dprof2calltree $out/bin/dprof2calltree - cp -p converters/memprof2calltree $out/bin/memprof2calltree - cp -p converters/op2calltree $out/bin/op2calltree - cp -p converters/pprof2calltree $out/bin/pprof2calltree - chmod -R +x $out/bin/ - '' - + ( - if stdenv.hostPlatform.isDarwin then - '' - mkdir -p $out/Applications - cp cgview/cgview.app/Contents/MacOS/cgview $out/bin - cp -a qcachegrind/qcachegrind.app $out/Applications - '' - else - '' - install qcachegrind/qcachegrind cgview/cgview -t "$out/bin" - install -Dm644 qcachegrind/qcachegrind.desktop -t "$out/share/applications" - install -Dm644 kcachegrind/32-apps-kcachegrind.png "$out/share/icons/hicolor/32x32/apps/kcachegrind.png" - install -Dm644 kcachegrind/48-apps-kcachegrind.png "$out/share/icons/hicolor/48x48/apps/kcachegrind.png" - '' - ); - - preFixup = '' - wrapQtApp "$out/bin/qcachegrind" - ''; - - meta = with lib; { - broken = stdenv.hostPlatform.isDarwin; - description = "Qt GUI to visualize profiling data"; - license = licenses.gpl2Plus; - platforms = platforms.unix; - maintainers = with maintainers; [ periklis ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index ef67b6f9b243..b25fd55b9371 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1739,6 +1739,7 @@ mapAliases { ### Q ### qbittorrent-qt5 = throw "'qbittorrent-qt5' has been removed as qBittorrent 5 dropped support for Qt 5. Please use 'qbittorrent'"; # Added 2024-09-30 + qcachegrind = throw "'qcachegrind' has been removed, as it depends on KDE Gear 5, which has reached EOL"; # Added 2025-08-20 qcsxcad = throw "'qcsxcad' has been renamed to/replaced by 'libsForQt5.qcsxcad'"; # Converted to throw 2024-10-17 qflipper = qFlipper; # Added 2022-02-11 qnial = throw "'qnial' has been removed due to failing to build and being unmaintained"; # Added 2025-06-26 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 372f34fb8282..72458ea3807a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7455,8 +7455,6 @@ with pkgs; }; }); - qcachegrind = libsForQt5.callPackage ../development/tools/analysis/qcachegrind { }; - vcpkg-tool-unwrapped = vcpkg-tool.override { doWrap = false; }; whatstyle = callPackage ../development/tools/misc/whatstyle { From 9b307321989297cc0f5b64db3a5acdc3f8664edf Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 12 Aug 2025 19:40:34 +0300 Subject: [PATCH 129/146] qt-video-wlr: drop Not ported to Qt6. --- .../misc/qt-video-wlr/default.nix | 69 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 71 deletions(-) delete mode 100644 pkgs/applications/misc/qt-video-wlr/default.nix diff --git a/pkgs/applications/misc/qt-video-wlr/default.nix b/pkgs/applications/misc/qt-video-wlr/default.nix deleted file mode 100644 index 0c0b766ef817..000000000000 --- a/pkgs/applications/misc/qt-video-wlr/default.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - pkg-config, - meson, - cmake, - ninja, - gst_all_1, - wrapQtAppsHook, - qtbase, - qtmultimedia, - layer-shell-qt, - wayland-scanner, -}: -let - gstreamerPath = - with gst_all_1; - lib.makeSearchPathOutput "lib" "lib/gstreamer-1.0" [ - gstreamer - gst-plugins-base - gst-plugins-good - gst-plugins-bad - gst-plugins-ugly - ]; -in -stdenv.mkDerivation { - pname = "qt-video-wlr"; - version = "2023-07-22"; - - src = fetchFromGitHub { - owner = "xdavidwu"; - repo = "qt-video-wlr"; - rev = "1373c8eeb0a5d867927ba30a9a9bb2d5b0057a87"; - hash = "sha256-mg0ROD9kV88I5uCm+niAI5tJuhkmYC7Z8dixxrNow4c="; - }; - - nativeBuildInputs = [ - pkg-config - meson - cmake # only used for find layer-shell-qt - ninja - wrapQtAppsHook - wayland-scanner - ]; - - buildInputs = [ - qtbase - qtmultimedia - layer-shell-qt - ]; - - qtWrapperArgs = [ - "--prefix PATH : $out/bin/qt-video-wlr" - "--prefix GST_PLUGIN_PATH : ${gstreamerPath}" - ]; - - meta = with lib; { - description = "Qt pip-mode-like video player for wlroots-based wayland compositors"; - mainProgram = "qt-video-wlr"; - homepage = "https://github.com/xdavidwu/qt-video-wlr"; - license = licenses.mit; - maintainers = with maintainers; [ - fionera - rewine - ]; - platforms = with platforms; linux; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index b25fd55b9371..8b109118aa07 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1745,6 +1745,7 @@ mapAliases { qnial = throw "'qnial' has been removed due to failing to build and being unmaintained"; # Added 2025-06-26 qscintilla = libsForQt5.qscintilla; # Added 2023-09-20 qscintilla-qt6 = qt6Packages.qscintilla; # Added 2023-09-20 + qt-video-wlr = throw "'qt-video-wlr' has been removed, as it depends on KDE Gear 5, which has reached EOL"; # Added 2025-08-20 qt515 = qt5; # Added 2022-11-24 qt5ct = throw "'qt5ct' has been renamed to/replaced by 'libsForQt5.qt5ct'"; # Converted to throw 2024-10-17 qt6ct = qt6Packages.qt6ct; # Added 2023-03-07 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 72458ea3807a..d60379d6d759 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2084,8 +2084,6 @@ with pkgs; futhark = haskell.lib.compose.justStaticExecutables haskellPackages.futhark; - qt-video-wlr = libsForQt5.callPackage ../applications/misc/qt-video-wlr { }; - g2o = libsForQt5.callPackage ../development/libraries/g2o { }; inherit (go-containerregistry) crane gcrane; From cc6479b738810d2a5b53e1b36de9a2dae2e6d069 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 12 Aug 2025 19:40:34 +0300 Subject: [PATCH 130/146] sierra-breeze-enhanced: drop Qt5 build --- .../sierra-breeze-enhanced/default.nix | 12 ++---------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 ---- pkgs/top-level/qt5-packages.nix | 4 ---- 4 files changed, 3 insertions(+), 18 deletions(-) diff --git a/pkgs/data/themes/kwin-decorations/sierra-breeze-enhanced/default.nix b/pkgs/data/themes/kwin-decorations/sierra-breeze-enhanced/default.nix index ea98b567fd0b..6b3331ccd613 100644 --- a/pkgs/data/themes/kwin-decorations/sierra-breeze-enhanced/default.nix +++ b/pkgs/data/themes/kwin-decorations/sierra-breeze-enhanced/default.nix @@ -6,24 +6,16 @@ wrapQtAppsHook, kwin, lib, - useQt5 ? false, }: -let - latestVersion = "2.1.1"; - latestSha256 = "sha256-7mQnJCQr/zm9zEdg2JPr7jQn8uajyCXvyYRQZWxG+Q8="; - - qt5Version = "1.3.3"; - qt5Sha256 = "sha256-zTUTsSzy4p0Y7RPOidCtxTjjyvPRyWSQCxA5sUzXcLc="; -in stdenv.mkDerivation rec { pname = "sierra-breeze-enhanced"; - version = if useQt5 then qt5Version else latestVersion; + version = "2.1.1"; src = fetchFromGitHub { owner = "kupiqu"; repo = "SierraBreezeEnhanced"; rev = if version == "2.1.1" then "V.2.1.1" else "V${version}"; - sha256 = if useQt5 then qt5Sha256 else latestSha256; + hash = "sha256-7mQnJCQr/zm9zEdg2JPr7jQn8uajyCXvyYRQZWxG+Q8="; }; nativeBuildInputs = [ diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 8b109118aa07..80f4186a94bc 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1866,6 +1866,7 @@ mapAliases { shell-hist = throw "'shell-hist' has been removed due to lack of upstream maintenance"; # Added 2025-01-25 shipyard = jumppad; # Added 2023-06-06 siduck76-st = st-snazzy; # Added 2024-12-24 + sierra-breeze-enhanced = throw "'sierra-breeze-enhanced' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20 signald = throw "'signald' has been removed due to lack of upstream maintenance"; # Added 2025-05-17 signaldctl = throw "'signaldctl' has been removed due to lack of upstream maintenance"; # Added 2025-05-17 signal-desktop-beta = throw "signal-desktop-beta has been removed to make the signal-desktop package easier to maintain"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d60379d6d759..3d003af18b1a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11328,10 +11328,6 @@ with pkgs; inherit (darwin) autoSignDarwinBinariesHook; }; - sierra-breeze-enhanced = - libsForQt5.callPackage ../data/themes/kwin-decorations/sierra-breeze-enhanced - { useQt5 = true; }; - scheherazade-new = scheherazade.override { version = "4.300"; }; diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index 826a465dade5..4abfa6f877c4 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -291,10 +291,6 @@ makeScopeWithSplicing' { callPackage ../development/libraries/sailfish-access-control-plugin { }; - sierra-breeze-enhanced = callPackage ../data/themes/kwin-decorations/sierra-breeze-enhanced { - useQt5 = true; - }; - soqt = callPackage ../development/libraries/soqt { }; telepathy = callPackage ../development/libraries/telepathy/qt { }; From c469aa12187d65c7e66bf8d2dbe90fc3b9400f4a Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 12 Aug 2025 19:40:34 +0300 Subject: [PATCH 131/146] soundkonverter: drop Upstream is dead, depends on very EOL KDE Gear libraries --- .../audio/soundkonverter/default.nix | 174 ------------------ pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - pkgs/top-level/qt5-packages.nix | 2 - 4 files changed, 1 insertion(+), 178 deletions(-) delete mode 100644 pkgs/applications/audio/soundkonverter/default.nix diff --git a/pkgs/applications/audio/soundkonverter/default.nix b/pkgs/applications/audio/soundkonverter/default.nix deleted file mode 100644 index 60e175984780..000000000000 --- a/pkgs/applications/audio/soundkonverter/default.nix +++ /dev/null @@ -1,174 +0,0 @@ -# currently needs to be installed into an environment and needs a `kbuildsycoca5` run afterwards for plugin discovery -{ - mkDerivation, - fetchFromGitHub, - fetchpatch, - lib, - makeWrapper, - cmake, - extra-cmake-modules, - pkg-config, - libkcddb, - kconfig, - kconfigwidgets, - ki18n, - kdelibs4support, - kio, - solid, - kwidgetsaddons, - kxmlgui, - qtbase, - phonon, - taglib_1, - # optional backends - withCD ? true, - cdparanoia, - withFlac ? true, - flac, - withMidi ? true, - fluidsynth, - timidity, - withSpeex ? false, - speex, - withVorbis ? true, - vorbis-tools, - vorbisgain, - withMp3 ? true, - lame, - mp3gain, - withAac ? true, - faad2, - aacgain, - withUnfreeAac ? false, - faac, - withFfmpeg ? true, - ffmpeg-full, - withMplayer ? false, - mplayer, - withSox ? true, - sox, - withOpus ? true, - opusTools, - withTwolame ? false, - twolame, - withApe ? false, - monkeysAudio, - withWavpack ? false, - wavpack, -}: - -assert withAac -> withFfmpeg || withUnfreeAac; -assert withUnfreeAac -> withAac; - -let - runtimeDeps = - [ ] - ++ lib.optional withCD cdparanoia - ++ lib.optional withFlac flac - ++ lib.optional withSpeex speex - ++ lib.optional withFfmpeg ffmpeg-full - ++ lib.optional withMplayer mplayer - ++ lib.optional withSox sox - ++ lib.optional withOpus opusTools - ++ lib.optional withTwolame twolame - ++ lib.optional withApe monkeysAudio - ++ lib.optional withWavpack wavpack - ++ lib.optional withUnfreeAac faac - ++ lib.optionals withMidi [ - fluidsynth - timidity - ] - ++ lib.optionals withVorbis [ - vorbis-tools - vorbisgain - ] - ++ lib.optionals withMp3 [ - lame - mp3gain - ] - ++ lib.optionals withAac [ - faad2 - aacgain - ]; - -in -mkDerivation rec { - pname = "soundkonverter"; - version = "3.0.1"; - src = fetchFromGitHub { - owner = "dfaust"; - repo = "soundkonverter"; - rev = "v" + version; - sha256 = "1g2khdsjmsi4zzynkq8chd11cbdhjzmi37r9jhpal0b730nq9x7l"; - }; - patches = [ - # already merged into master, so it can go during the next release - (fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/dfaust/soundkonverter/pull/87.patch"; - sha256 = "sha256-XIpD4ZMTZVcu+F27OtpRy51H+uQgpd5l22IZ6XsD64w="; - name = "soundkonverter_taglib.patch"; - stripLen = 1; - }) - ]; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - pkg-config - kdelibs4support - makeWrapper - ]; - propagatedBuildInputs = [ - libkcddb - kconfig - kconfigwidgets - ki18n - kdelibs4support - kio - solid - kwidgetsaddons - kxmlgui - qtbase - phonon - ]; - buildInputs = [ taglib_1 ] ++ runtimeDeps; - # encoder plugins go to ${out}/lib so they're found by kbuildsycoca5 - cmakeFlags = [ "-DCMAKE_INSTALL_PREFIX=$out" ]; - sourceRoot = "${src.name}/src"; - # add runt-time deps to PATH - postInstall = '' - wrapProgram $out/bin/soundkonverter --prefix PATH : ${lib.makeBinPath runtimeDeps} - ''; - meta = { - homepage = "https://github.com/dfaust/soundkonverter"; - license = lib.licenses.gpl2; - maintainers = [ lib.maintainers.schmittlauch ]; - description = "Audio file converter, CD ripper and Replay Gain tool"; - mainProgram = "soundkonverter"; - longDescription = '' - soundKonverter is a frontend to various audio converters. - - The key features are: - - Audio file conversion - - Replay Gain calculation - - CD ripping - - soundKonverter supports reading and writing tags and covers for many formats, so they are preserved when converting files. - - It is extendable by plugins and supports many backends including: - - - Audio file conversion - Backends: faac, faad, ffmpeg, flac, lame, mplayer, neroaac, timidity, fluidsynth, vorbistools, opustools, sox, twolame, - flake, mac, shorten, wavpack and speex - Formats: ogg vorbis, mp3, flac, wma, aac, ac3, opus, alac, mp2, als, amr nb, amr wb, ape, speex, m4a, mp1, musepack shorten, - tta, wavpack, ra, midi, mod, 3gp, rm, avi, mkv, ogv, mpeg, mov, mp4, flv, wmv and rv - - - Replay Gain calculation - Backends: aacgain, metaflac, mp3gain, vorbisgain, wvgain, mpcgain - Formats: aac, mp3, flac, ogg vorbis, wavpack, musepack - - - CD ripping - Backends: cdparanoia - ''; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 80f4186a94bc..5c27c1a617bb 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1890,6 +1890,7 @@ mapAliases { snort2 = throw "snort2 has been removed as it is deprecated and unmaintained by upstream. Consider using snort (snort3) package instead."; # 2025-05-21 soldat-unstable = opensoldat; # Added 2022-07-02 soulseekqt = throw "'soulseekqt' has been removed due to lack of maintenance in Nixpkgs in a long time. Consider using 'nicotine-plus' or 'slskd' instead."; # Added 2025-06-07 + soundkonverter = throw "'soundkonverter' has been dropped as it depends on KDE Gear 5, and is unmaintained"; # Added 2025-08-20 soundOfSorting = sound-of-sorting; # Added 2023-07-07 SP800-90B_EntropyAssessment = sp800-90b-entropyassessment; # Added on 2024-06-12 SPAdes = spades; # Added 2024-06-12 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3d003af18b1a..4e1cd9c6dd66 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4226,8 +4226,6 @@ with pkgs; spoof-mac = python3Packages.callPackage ../tools/networking/spoof-mac { }; - soundkonverter = libsForQt5.soundkonverter; - stm32loader = with python3Packages; toPythonApplication stm32loader; solc-select = with python3Packages; toPythonApplication solc-select; diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index 4abfa6f877c4..5ae8023b6b20 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -303,8 +303,6 @@ makeScopeWithSplicing' { signond = callPackage ../development/libraries/signond { }; - soundkonverter = callPackage ../applications/audio/soundkonverter { }; - timed = callPackage ../applications/system/timed { }; xp-pen-deco-01-v2-driver = callPackage ../os-specific/linux/xp-pen-drivers/deco-01-v2 { }; From 5e1e6488ee606009e0899eeabb96b4a27bbabb45 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 12 Aug 2025 19:40:34 +0300 Subject: [PATCH 132/146] trojita: drop Upstream is dead, not ported to Qt6. --- .../mailreaders/trojita/default.nix | 83 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 85 deletions(-) delete mode 100644 pkgs/applications/networking/mailreaders/trojita/default.nix diff --git a/pkgs/applications/networking/mailreaders/trojita/default.nix b/pkgs/applications/networking/mailreaders/trojita/default.nix deleted file mode 100644 index 685d78b0f50b..000000000000 --- a/pkgs/applications/networking/mailreaders/trojita/default.nix +++ /dev/null @@ -1,83 +0,0 @@ -{ - akonadi-contacts, - cmake, - fetchFromGitLab, - fetchsvn, - gnupg, - gpgme, - kcontacts, - kf5gpgmepp, - lib, - libsecret, - mimetic, - mkDerivation, - pkg-config, - qgpgme, - qtbase, - qtkeychain, - qttools, - qtwebkit, - withI18n ? false, -}: - -let - l10n = fetchsvn { - url = "svn://anonsvn.kde.org/home/kde/trunk/l10n-kf5"; - rev = "1566642"; - sha256 = "0y45fjib153za085la3hqpryycx33dkj3cz8kwzn2w31kvldfl1q"; - }; -in -mkDerivation rec { - pname = "trojita"; - version = "unstable-2022-08-22"; - - src = fetchFromGitLab { - domain = "invent.kde.org"; - owner = "pim"; - repo = "trojita"; - rev = "91087933c5e7a03a8097c0ffe5f7289abcfc123b"; - sha256 = "sha256-15G9YjT3qBKbeOKfb/IgXOO+DaJaTULP9NJn/MFYZS8="; - }; - - buildInputs = [ - akonadi-contacts - gpgme - kcontacts - libsecret - mimetic - qgpgme - qtbase - qtkeychain - qtwebkit - mimetic - kf5gpgmepp - ]; - - nativeBuildInputs = [ - cmake - pkg-config - qttools - gnupg - ]; - - postPatch = - "echo ${version} > src/trojita-version" - + lib.optionalString withI18n '' - mkdir -p po - for f in `find ${l10n} -name "trojita_common.po"`; do - cp $f po/trojita_common_$(echo $f | cut -d/ -f5).po - done - ''; - - meta = with lib; { - description = "Qt IMAP e-mail client"; - homepage = "http://trojita.flaska.net/"; - license = with licenses; [ - gpl2 - gpl3 - ]; - maintainers = with maintainers; [ ehmry ]; - platforms = platforms.linux; - }; - -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 5c27c1a617bb..6bf5cb4dfbc7 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -2070,6 +2070,7 @@ mapAliases { transifex-client = transifex-cli; # Added 2023-12-29 trfl = throw "trfl has been removed, because it has not received an update for 3 years and was broken"; # Added 2024-07-25 trezor_agent = trezor-agent; # Added 2024-01-07 + trojita = throw "'trojita' has been dropped as it depends on KDE Gear 5, and is unmaintained"; # Added 2025-08-20 trust-dns = hickory-dns; # Added 2024-08-07 ttyrec = throw "'ttyrec' has been renamed to/replaced by 'ovh-ttyrec'"; # Converted to throw 2024-10-17 tuic = throw "`tuic` has been removed due to lack of upstream maintenance, consider using other tuic implementations"; # Added 2025-02-08 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4e1cd9c6dd66..314d778cb83a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13505,8 +13505,6 @@ with pkgs; wlroots = wlroots_0_19; }; - trojita = libsForQt5.callPackage ../applications/networking/mailreaders/trojita { }; - tuxclocker = libsForQt5.callPackage ../applications/misc/tuxclocker { tuxclocker-plugins = tuxclocker-plugins-with-unfree; }; From 55f6142a563d590b7a31c0ae694bf6fa1c17e47f Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 12 Aug 2025 19:40:34 +0300 Subject: [PATCH 133/146] virt-manager-qt: drop Upstream is dead, not ported to Qt6. --- .../virtualization/virt-manager/qt.nix | 75 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 - 3 files changed, 1 insertion(+), 79 deletions(-) delete mode 100644 pkgs/applications/virtualization/virt-manager/qt.nix diff --git a/pkgs/applications/virtualization/virt-manager/qt.nix b/pkgs/applications/virtualization/virt-manager/qt.nix deleted file mode 100644 index c05dbb1444c3..000000000000 --- a/pkgs/applications/virtualization/virt-manager/qt.nix +++ /dev/null @@ -1,75 +0,0 @@ -{ - mkDerivation, - lib, - fetchFromGitHub, - cmake, - pkg-config, - qtbase, - qtmultimedia, - qtsvg, - qttools, - krdc, - libvncserver, - libvirt, - pcre, - pixman, - qtermwidget, - spice-gtk, - spice-protocol, - libselinux, - libsepol, - util-linux, -}: - -mkDerivation rec { - pname = "virt-manager-qt"; - version = "0.72.99"; - - src = fetchFromGitHub { - owner = "F1ash"; - repo = "qt-virt-manager"; - rev = version; - hash = "sha256-1aXlGlK+YPOe2X51xycWvSu8YC9uCywyL6ItiScFA04="; - }; - - cmakeFlags = [ - "-DBUILD_QT_VERSION=5" - "-DQTERMWIDGET_INCLUDE_DIRS=${qtermwidget}/include/qtermwidget5" - ]; - - buildInputs = [ - qtbase - qtmultimedia - qtsvg - krdc - libvirt - libvncserver - pcre - pixman - qtermwidget - spice-gtk - spice-protocol - libselinux - libsepol - util-linux - ]; - - nativeBuildInputs = [ - cmake - pkg-config - qttools - ]; - - meta = with lib; { - homepage = "https://f1ash.github.io/qt-virt-manager"; - description = "Desktop user interface for managing virtual machines (QT)"; - longDescription = '' - The virt-manager application is a desktop user interface for managing - virtual machines through libvirt. It primarily targets KVM VMs, but also - manages Xen and LXC (linux containers). - ''; - license = licenses.gpl2; - maintainers = with maintainers; [ peterhoeg ]; - inherit (qtbase.meta) platforms; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 6bf5cb4dfbc7..3939c09cdc61 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -2149,6 +2149,7 @@ mapAliases { vimix-cursor-theme = throw "'vimix-cursor-theme' has been superseded by 'vimix-cursors'"; # Added 2025-03-04 viper4linux-gui = throw "'viper4linux-gui' was removed as it is broken and not maintained upstream"; # Added 2024-12-16 viper4linux = throw "'viper4linux' was removed as it is broken and not maintained upstream"; # Added 2024-12-16 + virt-manager-qt = throw "'virt-manager-qt' has been dropped as it depends on KDE Gear 5, and is unmaintained"; # Added 2025-08-20 virtscreen = throw "'virtscreen' has been removed, as it was broken and unmaintained"; # Added 2024-10-17 vistafonts = vista-fonts; # Added 2025-02-03 vistafonts-chs = vista-fonts-chs; # Added 2025-02-03 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 314d778cb83a..a983549f0c02 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13606,10 +13606,6 @@ with pkgs; virt-manager = callPackage ../applications/virtualization/virt-manager { }; - virt-manager-qt = libsForQt5.callPackage ../applications/virtualization/virt-manager/qt.nix { - qtermwidget = lxqt.qtermwidget_1_4; - }; - virtualbox = libsForQt5.callPackage ../applications/virtualization/virtualbox { stdenv = stdenv_32bit; From 97b63ce4bb98722c27c2ee38d76ae6a65d6babf9 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 12 Aug 2025 19:40:34 +0300 Subject: [PATCH 134/146] wacomtablet: drop Old Qt5 version. --- pkgs/tools/misc/wacomtablet/default.nix | 47 ------------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 49 deletions(-) delete mode 100644 pkgs/tools/misc/wacomtablet/default.nix diff --git a/pkgs/tools/misc/wacomtablet/default.nix b/pkgs/tools/misc/wacomtablet/default.nix deleted file mode 100644 index 6529ec029908..000000000000 --- a/pkgs/tools/misc/wacomtablet/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ - lib, - mkDerivation, - fetchurl, - fetchpatch, - extra-cmake-modules, - qtx11extras, - plasma-workspace, - libwacom, - xf86_input_wacom, -}: - -mkDerivation rec { - pname = "wacomtablet"; - version = "3.2.0"; - src = fetchurl { - url = "mirror://kde/stable/wacomtablet/${version}/wacomtablet-${version}.tar.xz"; - sha256 = "197pwpl87gqlnza36bp68jvw8ww25znk08acmi8bpz7n84xfc368"; - }; - patches = [ - (fetchpatch { - url = "https://invent.kde.org/system/wacomtablet/commit/4f73ff02b3efd5e8728b18fcf1067eca166704ee.patch"; - sha256 = "0185gbh1vywfz8a3wnvncmzdk0dd189my4bzimkbh85rlrqq2nf8"; - }) - ]; - - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - qtx11extras - plasma-workspace - libwacom - xf86_input_wacom - ]; - - meta = { - description = "KDE Configuration Module for Wacom Graphics Tablets"; - mainProgram = "kde_wacom_tabletfinder"; - longDescription = '' - This module implements a GUI for the Wacom Linux Drivers and extends it - with profile support to handle different button / pen layouts per profile. - ''; - homepage = "https://invent.kde.org/system/wacomtablet"; - license = lib.licenses.gpl2Plus; - maintainers = [ lib.maintainers.Thra11 ]; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a983549f0c02..10e0970bcbe2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15683,8 +15683,6 @@ with pkgs; py-wacz = with python3Packages; toPythonApplication wacz; - wacomtablet = libsForQt5.callPackage ../tools/misc/wacomtablet { }; - wibo = pkgsi686Linux.callPackage ../applications/emulators/wibo { }; winePackagesFor = From 270bd9c48108b6088bc426d4ffef319cfa9609bb Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 12 Aug 2025 19:40:34 +0300 Subject: [PATCH 135/146] libsForQt5.xwaylandvideobridge: drop --- pkgs/top-level/qt5-packages.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index 5ae8023b6b20..c9486eacd3eb 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -306,8 +306,6 @@ makeScopeWithSplicing' { timed = callPackage ../applications/system/timed { }; xp-pen-deco-01-v2-driver = callPackage ../os-specific/linux/xp-pen-drivers/deco-01-v2 { }; - - xwaylandvideobridge = callPackage ../tools/wayland/xwaylandvideobridge { }; } )) ); From 04da94cb38f40e240913738bd96eae01f92fb3ef Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 12 Aug 2025 19:40:34 +0300 Subject: [PATCH 136/146] zombietrackergps: drop Upstream is dead, not ported to Qt6. --- pkgs/by-name/zo/zombietrackergps/package.nix | 56 -------------------- pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 56 deletions(-) delete mode 100644 pkgs/by-name/zo/zombietrackergps/package.nix diff --git a/pkgs/by-name/zo/zombietrackergps/package.nix b/pkgs/by-name/zo/zombietrackergps/package.nix deleted file mode 100644 index 46660eef0d97..000000000000 --- a/pkgs/by-name/zo/zombietrackergps/package.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitLab, - gitUpdater, - cmake, - libsForQt5, -}: -stdenv.mkDerivation { - pname = "zombietrackergps"; - version = "1.15"; - - src = fetchFromGitLab { - owner = "ldutils-projects"; - repo = "zombietrackergps"; - # latest revision is not tagged upstream, use commit sha in the meantime - #rev = "v_${version}"; - rev = "cc75d5744965cc6973323f5bb77f00b0b0153dce"; - hash = "sha256-z/LFNRFdQQFxEWyAjcuGezRbTsv8z6Q6fK8NLjP4HNM="; - }; - - buildInputs = with libsForQt5; [ - marble.dev - qtbase - qtcharts - qtsvg - qtwebengine - ldutils - ]; - - nativeBuildInputs = [ - cmake - libsForQt5.wrapQtAppsHook - ]; - - preConfigure = '' - export LANG=en_US.UTF-8 - ''; - - cmakeFlags = [ - "-DLDUTILS_ROOT=${libsForQt5.ldutils}" - ]; - - passthru.updateScript = gitUpdater { - rev-prefix = "v_"; - }; - - meta = { - description = "GPS track manager for Qt using KDE Marble maps"; - homepage = "https://www.zombietrackergps.net/ztgps/"; - changelog = "https://www.zombietrackergps.net/ztgps/history.html"; - license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ sohalt ]; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 3939c09cdc61..8ddfc146e531 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -2291,6 +2291,7 @@ mapAliases { zimlib = throw "'zimlib' has been removed because it was an outdated and unused version of 'libzim'"; # Added 2025-03-07 zinc = zincsearch; # Added 2023-05-28 zint = zint-qt; # Added 2025-05-15 + zombietrackergps = throw "'zombietrackergps' has been dropped, as it depends on KDE Gear 5 and is unmaintained"; # Added 2025-08-20 zplugin = throw "'zplugin' has been renamed to/replaced by 'zinit'"; # Converted to throw 2024-10-17 zk-shell = throw "zk-shell has been removed as it was broken and unmaintained"; # Added 2024-08-10 zkg = throw "'zkg' has been replaced by 'zeek'"; From ecc7580c6c90199439e92e47287bc30a2ec1d346 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 21 Aug 2025 22:58:07 +0300 Subject: [PATCH 137/146] aliases.nix: prepare for KDE 5 drops --- pkgs/top-level/aliases.nix | 172 ++++++++++++++++++++++++++++++++++--- 1 file changed, 162 insertions(+), 10 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 8ddfc146e531..eefd41f4d9a2 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -44,132 +44,284 @@ let deprecatedPlasma5Packages = { inherit (plasma5Packages) akonadi + akonadi-calendar + akonadi-calendar-tools + akonadi-contacts + akonadi-import-wizard + akonadi-mime + akonadi-notes + akonadi-search + akonadiconsole akregator + alkimia + alligator + analitza + angelfish + applet-window-appmenu + applet-window-buttons arianna ark + audiotube + aura-browser + baloo-widgets + bismuth bluedevil bomber + booth bovo breeze-grub breeze-gtk - breeze-icons breeze-plymouth breeze-qt5 + buho + calendarsupport + calindori + cantor + clip colord-kde - discover + communicator dolphin + dolphin-plugins dragon elisa + eventviews falkon ffmpegthumbs filelight + flatpak-kcm + ghostwriter granatier + grantleetheme gwenview - k3b + incidenceeditor + index + juk + kaccounts-integration + kaccounts-providers kactivitymanagerd kaddressbook + kalarm + kalgebra + kalk kalzium + kamoso kapman kapptemplate + kasts kate katomic kblackbox kblocks kbounce + kbreakout kcachegrind kcalc + kcalutils kcharselect + kclock kcolorchooser kde-cli-tools kde-gtk-config + kde-inotify-survey + kde2-decoration + kdebugsettings + kdeconnect-kde + kdecoration + kdegraphics-mobipocket + kdegraphics-thumbnailers + kdenetwork-filesharing kdenlive + kdepim-runtime kdeplasma-addons - kdevelop-pg-qt - kdevelop-unwrapped kdev-php kdev-python kdevelop + kdevelop-pg-qt + kdevelop-unwrapped kdf kdialog kdiamond keditbookmarks + keysmith kfind kgamma5 + kgeography kget kgpg khelpcenter + khotkeys + kidentitymanagement kig kigo killbots + kimap kinfocenter - kitinerary + kio-admin + kio-extras + kio-gdrive + kipi-plugins + kirigami-gallery + kldap kleopatra klettres klines kmag - kmail + kmahjongg + kmail-account-wizard + kmailtransport + kmbox kmenuedit + kmime kmines kmix + kmousetool kmplot knavalbattle knetwalk knights + knotes + koko + kolf kollision kolourpaint kompare + kongress + konqueror + konquest konsole - kontact + kontactinterface konversation + kopeninghours korganizer + kosmindoormap + kpat + kpimtextedit + kpipewire kpkpass + kpmcore + kpublictransport + kqtquickcharts krdc + krecorder + kreport kreversi krfb + kruler + ksanecore kscreen kscreenlocker kshisen + ksmtp + kspaceduel ksquares ksshaskpass + ksudoku ksystemlog + ksystemstats kteatime ktimer + ktnef ktorrent - ktouch + ktrip kturtle kwallet-pam kwalletmanager kwave kwayland-integration + kweather kwin kwrited + kzones + layer-shell-qt + libgravatar + libkcddb + libkdcraw + libkdegames + libkdepim + libkexiv2 + libkgapi + libkipi + libkleo + libkmahjongg + libkomparediff2 + libksane + libkscreen + libksieve + libksysguard + libktorrent + lightly + mailcommon + mailimporter marble + mauikit + mauikit-accounts + mauikit-calendar + mauikit-documents + mauikit-filebrowsing + mauikit-imagetools + mauikit-terminal + mauikit-texteditor + mauiman + mbox-importer merkuro + messagelib milou minuet + nota okular oxygen + oxygen-sounds + palapeli + parachute + partitionmanager picmi + pim-data-exporter + pim-sieve-editor + pimcommon + plank-player + plasma-bigscreen plasma-browser-integration plasma-desktop + plasma-dialer + plasma-disks + plasma-firewall plasma-integration + plasma-mobile plasma-nano plasma-nm plasma-pa - plasma-mobile + plasma-phonebook + plasma-remotecontrollers + plasma-sdk + plasma-settings plasma-systemmonitor plasma-thunderbolt plasma-vault + plasma-welcome plasma-workspace plasma-workspace-wallpapers + plasmatube + polkit-kde-agent powerdevil + print-manager + qmlkonsole qqc2-breeze-style + rocs sddm-kcm + shelf + sierra-breeze-enhanced skanlite skanpage + soundkonverter spectacle + station systemsettings + telly-skout + tokodon + umbrello + vvave xdg-desktop-portal-kde + xwaylandvideobridge yakuake zanshin ; From bb4ebb76c191e9c7c438f61a0eb23c000ab855ef Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 12 Aug 2025 19:40:23 +0300 Subject: [PATCH 138/146] mauiPackages: drop --- pkgs/applications/maui/booth.nix | 57 ----- pkgs/applications/maui/buho.nix | 50 ----- pkgs/applications/maui/clip.nix | 50 ----- pkgs/applications/maui/communicator.nix | 59 ----- pkgs/applications/maui/default.nix | 92 -------- pkgs/applications/maui/fetch.sh | 1 - pkgs/applications/maui/index.nix | 49 ----- pkgs/applications/maui/mauikit-accounts.nix | 31 --- .../maui/mauikit-calendar/default.nix | 39 ---- pkgs/applications/maui/mauikit-documents.nix | 48 ---- .../maui/mauikit-filebrowsing.nix | 31 --- pkgs/applications/maui/mauikit-imagetools.nix | 43 ---- pkgs/applications/maui/mauikit-terminal.nix | 33 --- pkgs/applications/maui/mauikit-texteditor.nix | 33 --- pkgs/applications/maui/mauikit.nix | 39 ---- pkgs/applications/maui/mauiman.nix | 27 --- pkgs/applications/maui/nota.nix | 48 ---- pkgs/applications/maui/pix.nix | 75 ------- pkgs/applications/maui/shelf.nix | 52 ----- pkgs/applications/maui/srcs.nix | 206 ------------------ pkgs/applications/maui/station.nix | 44 ---- pkgs/applications/maui/vvave.nix | 50 ----- pkgs/top-level/qt5-packages.nix | 12 - 23 files changed, 1169 deletions(-) delete mode 100644 pkgs/applications/maui/booth.nix delete mode 100644 pkgs/applications/maui/buho.nix delete mode 100644 pkgs/applications/maui/clip.nix delete mode 100644 pkgs/applications/maui/communicator.nix delete mode 100644 pkgs/applications/maui/default.nix delete mode 100644 pkgs/applications/maui/fetch.sh delete mode 100644 pkgs/applications/maui/index.nix delete mode 100644 pkgs/applications/maui/mauikit-accounts.nix delete mode 100644 pkgs/applications/maui/mauikit-calendar/default.nix delete mode 100644 pkgs/applications/maui/mauikit-documents.nix delete mode 100644 pkgs/applications/maui/mauikit-filebrowsing.nix delete mode 100644 pkgs/applications/maui/mauikit-imagetools.nix delete mode 100644 pkgs/applications/maui/mauikit-terminal.nix delete mode 100644 pkgs/applications/maui/mauikit-texteditor.nix delete mode 100644 pkgs/applications/maui/mauikit.nix delete mode 100644 pkgs/applications/maui/mauiman.nix delete mode 100644 pkgs/applications/maui/nota.nix delete mode 100644 pkgs/applications/maui/pix.nix delete mode 100644 pkgs/applications/maui/shelf.nix delete mode 100644 pkgs/applications/maui/srcs.nix delete mode 100644 pkgs/applications/maui/station.nix delete mode 100644 pkgs/applications/maui/vvave.nix diff --git a/pkgs/applications/maui/booth.nix b/pkgs/applications/maui/booth.nix deleted file mode 100644 index d38f4b47dfbb..000000000000 --- a/pkgs/applications/maui/booth.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ - lib, - mkDerivation, - cmake, - extra-cmake-modules, - kcoreaddons, - ki18n, - kirigami2, - mauikit, - mauikit-filebrowsing, - prison, - qtgraphicaleffects, - qtmultimedia, - qtquickcontrols2, - gst_all_1, -}: - -mkDerivation { - pname = "booth"; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - ]; - - buildInputs = [ - kcoreaddons - ki18n - kirigami2 - mauikit - mauikit-filebrowsing - prison - qtgraphicaleffects - qtmultimedia - qtquickcontrols2 - ] - ++ (with gst_all_1; [ - gst-plugins-bad - gst-plugins-base - gst-plugins-good - gstreamer - ]); - - preFixup = '' - qtWrapperArgs+=( - --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" - ) - ''; - - meta = with lib; { - description = "Camera application"; - mainProgram = "booth"; - homepage = "https://invent.kde.org/maui/booth"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ ]; - }; -} diff --git a/pkgs/applications/maui/buho.nix b/pkgs/applications/maui/buho.nix deleted file mode 100644 index d207955ad4b9..000000000000 --- a/pkgs/applications/maui/buho.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ - lib, - mkDerivation, - cmake, - extra-cmake-modules, - applet-window-buttons, - karchive, - kcoreaddons, - ki18n, - kio, - kirigami2, - mauikit, - mauikit-filebrowsing, - mauikit-accounts, - mauikit-texteditor, - qtmultimedia, - qtquickcontrols2, -}: - -mkDerivation { - pname = "buho"; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - ]; - - buildInputs = [ - applet-window-buttons - karchive - kcoreaddons - ki18n - kio - kirigami2 - mauikit - mauikit-filebrowsing - mauikit-accounts - mauikit-texteditor - qtmultimedia - qtquickcontrols2 - ]; - - meta = with lib; { - description = "Task and Note Keeper"; - mainProgram = "buho"; - homepage = "https://invent.kde.org/maui/buho"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ onny ]; - }; -} diff --git a/pkgs/applications/maui/clip.nix b/pkgs/applications/maui/clip.nix deleted file mode 100644 index 901a798252b7..000000000000 --- a/pkgs/applications/maui/clip.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ - lib, - mkDerivation, - cmake, - extra-cmake-modules, - applet-window-buttons, - karchive, - kcoreaddons, - ki18n, - kio, - kirigami2, - mauikit, - mauikit-filebrowsing, - qtmultimedia, - qtquickcontrols2, - taglib, - ffmpeg, -}: - -mkDerivation { - pname = "clip"; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - ]; - - buildInputs = [ - applet-window-buttons - karchive - kcoreaddons - ki18n - kio - kirigami2 - mauikit - mauikit-filebrowsing - qtmultimedia - qtquickcontrols2 - taglib - ffmpeg - ]; - - meta = with lib; { - description = "Video player and video collection manager"; - mainProgram = "clip"; - homepage = "https://invent.kde.org/maui/clip"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ onny ]; - }; -} diff --git a/pkgs/applications/maui/communicator.nix b/pkgs/applications/maui/communicator.nix deleted file mode 100644 index c239a1c84296..000000000000 --- a/pkgs/applications/maui/communicator.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ - lib, - mkDerivation, - cmake, - extra-cmake-modules, - applet-window-buttons, - karchive, - kcoreaddons, - ki18n, - kio, - kirigami2, - mauikit, - mauikit-accounts, - mauikit-filebrowsing, - mauikit-texteditor, - qtmultimedia, - qtquickcontrols2, - kpeople, - kcontacts, -}: - -mkDerivation { - pname = "communicator"; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - ]; - - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace "/usr/share/maui-accounts/manifests" "$out/usr/share/maui-accounts/manifests" - ''; - - buildInputs = [ - applet-window-buttons - karchive - kcoreaddons - ki18n - kio - kirigami2 - mauikit - mauikit-accounts - mauikit-filebrowsing - mauikit-texteditor - qtmultimedia - qtquickcontrols2 - kpeople - kcontacts - ]; - - meta = with lib; { - description = "Contacts and dialer application"; - mainProgram = "communicator"; - homepage = "https://invent.kde.org/maui/communicator"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ onny ]; - }; -} diff --git a/pkgs/applications/maui/default.nix b/pkgs/applications/maui/default.nix deleted file mode 100644 index 6a4e20bd02a1..000000000000 --- a/pkgs/applications/maui/default.nix +++ /dev/null @@ -1,92 +0,0 @@ -/* - # New packages - - READ THIS FIRST - - This module is for the MauiKit framework and official Maui applications. All - available packages are listed in `callPackage ./srcs.nix`, although some are not yet - packaged in Nixpkgs. - - IF YOUR PACKAGE IS NOT LISTED IN `callPackage ./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/maui` - from the top of the Nixpkgs tree. - 3. Use `nixpkgs-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://mauikit.org/"; - platforms = meta.platforms or lib.platforms.linux; - }; - } - ); - - packages = - self: - let - callPackage = self.newScope { - inherit mkDerivation; - }; - in - { - # libraries - mauikit = callPackage ./mauikit.nix { }; - mauikit-accounts = callPackage ./mauikit-accounts.nix { }; - mauikit-calendar = callPackage ./mauikit-calendar { }; - mauikit-documents = callPackage ./mauikit-documents.nix { }; - mauikit-filebrowsing = callPackage ./mauikit-filebrowsing.nix { }; - mauikit-imagetools = callPackage ./mauikit-imagetools.nix { }; - mauikit-terminal = callPackage ./mauikit-terminal.nix { }; - mauikit-texteditor = callPackage ./mauikit-texteditor.nix { }; - mauiman = callPackage ./mauiman.nix { }; - - # applications - booth = callPackage ./booth.nix { }; - buho = callPackage ./buho.nix { }; - clip = callPackage ./clip.nix { }; - communicator = callPackage ./communicator.nix { }; - index = callPackage ./index.nix { }; - nota = callPackage ./nota.nix { }; - pix = callPackage ./pix.nix { }; - shelf = callPackage ./shelf.nix { }; - station = callPackage ./station.nix { }; - vvave = callPackage ./vvave.nix { }; - }; - -in -lib.makeScope libsForQt5.newScope packages diff --git a/pkgs/applications/maui/fetch.sh b/pkgs/applications/maui/fetch.sh deleted file mode 100644 index f84a2dc2c231..000000000000 --- a/pkgs/applications/maui/fetch.sh +++ /dev/null @@ -1 +0,0 @@ -WGET_ARGS=( https://download.kde.org/stable/maui/ -A '*.tar.xz' ) diff --git a/pkgs/applications/maui/index.nix b/pkgs/applications/maui/index.nix deleted file mode 100644 index c16603490d18..000000000000 --- a/pkgs/applications/maui/index.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ - lib, - mkDerivation, - cmake, - extra-cmake-modules, - karchive, - kcoreaddons, - ki18n, - kio, - kirigami2, - mauikit, - mauikit-filebrowsing, - qtmultimedia, - qtquickcontrols2, -}: - -mkDerivation { - pname = "index-fm"; - - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace "-Werror" "" - ''; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - ]; - - buildInputs = [ - karchive - kcoreaddons - ki18n - kio - kirigami2 - mauikit - mauikit-filebrowsing - qtmultimedia - qtquickcontrols2 - ]; - - meta = with lib; { - description = "Multi-platform file manager"; - mainProgram = "index"; - homepage = "https://invent.kde.org/maui/index-fm"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ dotlambda ]; - }; -} diff --git a/pkgs/applications/maui/mauikit-accounts.nix b/pkgs/applications/maui/mauikit-accounts.nix deleted file mode 100644 index e04ab551f087..000000000000 --- a/pkgs/applications/maui/mauikit-accounts.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ - lib, - mkDerivation, - cmake, - extra-cmake-modules, - kconfig, - kio, - mauikit, -}: - -mkDerivation { - pname = "mauikit-accounts"; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - ]; - - buildInputs = [ - kconfig - kio - mauikit - ]; - - meta = with lib; { - homepage = "https://invent.kde.org/maui/mauikit-accounts"; - description = "MauiKit utilities to handle User Accounts"; - license = licenses.lgpl21Plus; - maintainers = with maintainers; [ onny ]; - }; -} diff --git a/pkgs/applications/maui/mauikit-calendar/default.nix b/pkgs/applications/maui/mauikit-calendar/default.nix deleted file mode 100644 index 42aaff0f386c..000000000000 --- a/pkgs/applications/maui/mauikit-calendar/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ - lib, - mkDerivation, - cmake, - extra-cmake-modules, - mauikit, - qtquickcontrols2, - akonadi, - akonadi-contacts, - akonadi-calendar, - calendarsupport, - eventviews, -}: - -mkDerivation { - pname = "mauikit-calendar"; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - ]; - - buildInputs = [ - akonadi - akonadi-contacts - akonadi-calendar - calendarsupport - eventviews - mauikit - qtquickcontrols2 - ]; - - meta = with lib; { - homepage = "https://invent.kde.org/maui/mauikit-calendar"; - description = "Calendar support components for Maui applications"; - license = licenses.lgpl21Plus; - maintainers = with maintainers; [ onny ]; - }; -} diff --git a/pkgs/applications/maui/mauikit-documents.nix b/pkgs/applications/maui/mauikit-documents.nix deleted file mode 100644 index 4ec7e6892bfb..000000000000 --- a/pkgs/applications/maui/mauikit-documents.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ - lib, - mkDerivation, - cmake, - extra-cmake-modules, - karchive, - kconfig, - kcoreaddons, - kfilemetadata, - kguiaddons, - ki18n, - kiconthemes, - kio, - mauikit, - poppler, -}: - -mkDerivation { - pname = "mauikit-documents"; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - ]; - - buildInputs = [ - karchive - kconfig - kcoreaddons - kfilemetadata - kguiaddons - ki18n - kiconthemes - kio - mauikit - poppler - ]; - - meta = { - homepage = "https://invent.kde.org/maui/mauikit-documents"; - description = "MauiKit QtQuick plugins for text editing"; - license = with lib.licenses; [ - bsd2 - lgpl21Plus - ]; - maintainers = with lib.maintainers; [ dotlambda ]; - }; -} diff --git a/pkgs/applications/maui/mauikit-filebrowsing.nix b/pkgs/applications/maui/mauikit-filebrowsing.nix deleted file mode 100644 index 13a98b37e03b..000000000000 --- a/pkgs/applications/maui/mauikit-filebrowsing.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ - lib, - mkDerivation, - cmake, - extra-cmake-modules, - kconfig, - kio, - mauikit, -}: - -mkDerivation { - pname = "mauikit-filebrowsing"; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - ]; - - buildInputs = [ - kconfig - kio - mauikit - ]; - - meta = with lib; { - homepage = "https://invent.kde.org/maui/mauikit-filebrowsing"; - description = "MauiKit File Browsing utilities and controls"; - license = licenses.lgpl21Plus; - maintainers = with maintainers; [ dotlambda ]; - }; -} diff --git a/pkgs/applications/maui/mauikit-imagetools.nix b/pkgs/applications/maui/mauikit-imagetools.nix deleted file mode 100644 index 8b96c55002fc..000000000000 --- a/pkgs/applications/maui/mauikit-imagetools.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ - lib, - mkDerivation, - cmake, - extra-cmake-modules, - kconfig, - kio, - leptonica, - mauikit, - opencv, - qtlocation, - exiv2, - kquickimageedit, - tesseract, -}: - -mkDerivation { - pname = "mauikit-imagetools"; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - ]; - - buildInputs = [ - kconfig - kio - leptonica - mauikit - opencv - qtlocation - exiv2 - kquickimageedit - tesseract - ]; - - meta = with lib; { - homepage = "https://invent.kde.org/maui/mauikit-imagetools"; - description = "MauiKit Image Tools Components"; - license = licenses.lgpl21Plus; - maintainers = with maintainers; [ onny ]; - }; -} diff --git a/pkgs/applications/maui/mauikit-terminal.nix b/pkgs/applications/maui/mauikit-terminal.nix deleted file mode 100644 index 905132a9d7a5..000000000000 --- a/pkgs/applications/maui/mauikit-terminal.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ - lib, - mkDerivation, - cmake, - extra-cmake-modules, - kconfig, - kcoreaddons, - ki18n, - mauikit, -}: - -mkDerivation { - pname = "mauikit-terminal"; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - ]; - - buildInputs = [ - kconfig - kcoreaddons - ki18n - mauikit - ]; - - meta = with lib; { - homepage = "https://invent.kde.org/maui/mauikit-terminal"; - description = "Terminal support components for Maui applications"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ dotlambda ]; - }; -} diff --git a/pkgs/applications/maui/mauikit-texteditor.nix b/pkgs/applications/maui/mauikit-texteditor.nix deleted file mode 100644 index c38ba401d060..000000000000 --- a/pkgs/applications/maui/mauikit-texteditor.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ - lib, - mkDerivation, - cmake, - extra-cmake-modules, - kconfig, - kio, - mauikit, - syntax-highlighting, -}: - -mkDerivation { - pname = "mauikit-texteditor"; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - ]; - - buildInputs = [ - kconfig - kio - mauikit - syntax-highlighting - ]; - - meta = with lib; { - homepage = "https://invent.kde.org/maui/mauikit-texteditor"; - description = "MauiKit Text Editor components"; - license = licenses.lgpl21Plus; - maintainers = with maintainers; [ onny ]; - }; -} diff --git a/pkgs/applications/maui/mauikit.nix b/pkgs/applications/maui/mauikit.nix deleted file mode 100644 index 60b795604c83..000000000000 --- a/pkgs/applications/maui/mauikit.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ - lib, - mkDerivation, - cmake, - extra-cmake-modules, - kconfig, - kcoreaddons, - ki18n, - knotifications, - mauiman, - qtquickcontrols2, - qtx11extras, -}: - -mkDerivation { - pname = "mauikit"; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - ]; - - buildInputs = [ - kconfig - kcoreaddons - ki18n - knotifications - mauiman - qtquickcontrols2 - qtx11extras - ]; - - meta = with lib; { - homepage = "https://mauikit.org/"; - description = "Free and modular front-end framework for developing fast and compelling user experiences"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ dotlambda ]; - }; -} diff --git a/pkgs/applications/maui/mauiman.nix b/pkgs/applications/maui/mauiman.nix deleted file mode 100644 index c90a02055450..000000000000 --- a/pkgs/applications/maui/mauiman.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ - lib, - mkDerivation, - cmake, - extra-cmake-modules, - qtsystems, -}: - -mkDerivation { - pname = "mauiman"; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - ]; - - buildInputs = [ - qtsystems - ]; - - meta = with lib; { - homepage = "https://invent.kde.org/maui/mauiman"; - description = "Maui Manager Library. Server and public library API"; - mainProgram = "MauiManServer3"; - maintainers = with maintainers; [ dotlambda ]; - }; -} diff --git a/pkgs/applications/maui/nota.nix b/pkgs/applications/maui/nota.nix deleted file mode 100644 index 0c72106795fe..000000000000 --- a/pkgs/applications/maui/nota.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ - lib, - mkDerivation, - cmake, - extra-cmake-modules, - applet-window-buttons, - karchive, - kcoreaddons, - ki18n, - kio, - kirigami2, - mauikit, - mauikit-filebrowsing, - mauikit-texteditor, - qtmultimedia, - qtquickcontrols2, -}: - -mkDerivation { - pname = "nota"; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - ]; - - buildInputs = [ - applet-window-buttons - karchive - kcoreaddons - ki18n - kio - kirigami2 - mauikit - mauikit-filebrowsing - mauikit-texteditor - qtmultimedia - qtquickcontrols2 - ]; - - meta = with lib; { - description = "Multi-platform text editor"; - mainProgram = "nota"; - homepage = "https://invent.kde.org/maui/nota"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ onny ]; - }; -} diff --git a/pkgs/applications/maui/pix.nix b/pkgs/applications/maui/pix.nix deleted file mode 100644 index de57aaedbccf..000000000000 --- a/pkgs/applications/maui/pix.nix +++ /dev/null @@ -1,75 +0,0 @@ -{ - lib, - mkDerivation, - cmake, - extra-cmake-modules, - applet-window-buttons, - karchive, - kcoreaddons, - ki18n, - kio, - kirigami2, - mauikit, - mauikit-filebrowsing, - mauikit-imagetools, - qtmultimedia, - qtquickcontrols2, - qtlocation, - exiv2, - kquickimageedit, - fetchFromGitHub, -}: - -let - src-kdtree = fetchFromGitHub { - owner = "cdalitz"; - repo = "kdtree-cpp"; - rev = "refs/tags/v1.3"; - hash = "sha256-h3cmndvjMlp/MTk/Ve3R183BLrE7VbL7GQx8YkOHEgU="; - }; -in -mkDerivation { - pname = "pix"; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - ]; - - postPatch = '' - cp ${src-kdtree}/kdtree.cpp src/ - substituteInPlace src/CMakeLists.txt \ - --replace-fail "main.cpp" "main.cpp kdtree.cpp" - ''; - - env = { - NIX_CFLAGS_COMPILE = toString [ - "-I${src-kdtree}" - ]; - }; - - buildInputs = [ - applet-window-buttons - karchive - kcoreaddons - ki18n - kio - kirigami2 - mauikit - mauikit-filebrowsing - mauikit-imagetools - qtmultimedia - qtquickcontrols2 - qtlocation - exiv2 - kquickimageedit - ]; - - meta = { - description = "Image gallery application"; - mainProgram = "pix"; - homepage = "https://invent.kde.org/maui/pix"; - license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ onny ]; - }; -} diff --git a/pkgs/applications/maui/shelf.nix b/pkgs/applications/maui/shelf.nix deleted file mode 100644 index e82c8afb6fe0..000000000000 --- a/pkgs/applications/maui/shelf.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ - lib, - mkDerivation, - cmake, - extra-cmake-modules, - applet-window-buttons, - karchive, - kcoreaddons, - ki18n, - kio, - kirigami2, - mauikit, - mauikit-documents, - mauikit-filebrowsing, - mauikit-texteditor, - qtmultimedia, - qtquickcontrols2, - poppler, -}: - -mkDerivation { - pname = "shelf"; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - ]; - - buildInputs = [ - applet-window-buttons - karchive - kcoreaddons - ki18n - kio - kirigami2 - mauikit - mauikit-documents - mauikit-filebrowsing - mauikit-texteditor - qtmultimedia - qtquickcontrols2 - poppler - ]; - - meta = with lib; { - description = "Document and EBook collection manager"; - mainProgram = "shelf"; - homepage = "https://invent.kde.org/maui/shelf"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ onny ]; - }; -} diff --git a/pkgs/applications/maui/srcs.nix b/pkgs/applications/maui/srcs.nix deleted file mode 100644 index 63d89ec6941d..000000000000 --- a/pkgs/applications/maui/srcs.nix +++ /dev/null @@ -1,206 +0,0 @@ -# DO NOT EDIT! This file is generated automatically. -# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/applications/maui -{ fetchurl, mirror }: - -{ - agenda = { - version = "0.5.3"; - src = fetchurl { - url = "${mirror}/stable/maui/agenda/0.5.3/agenda-0.5.3.tar.xz"; - sha256 = "0kx5adv8w0dm84hibaazik6y9bcxw7w7zikw546d4dlaq13pk97i"; - name = "agenda-0.5.3.tar.xz"; - }; - }; - arca = { - version = "0.5.3"; - src = fetchurl { - url = "${mirror}/stable/maui/arca/0.5.3/arca-0.5.3.tar.xz"; - sha256 = "0mgn3y2jh9ifxg41fb6z14gp27f1pwfk9y8492qfp3wqfhhmycmk"; - name = "arca-0.5.3.tar.xz"; - }; - }; - bonsai = { - version = "1.1.3"; - src = fetchurl { - url = "${mirror}/stable/maui/bonsai/1.1.3/bonsai-1.1.3.tar.xz"; - sha256 = "0xyfqaihzjdbgcd0mg81qpd12w304zlhdw8mmiyqfamxh33xksql"; - name = "bonsai-1.1.3.tar.xz"; - }; - }; - booth = { - version = "1.1.3"; - src = fetchurl { - url = "${mirror}/stable/maui/booth/1.1.3/booth-1.1.3.tar.xz"; - sha256 = "0l7bjlpm3m2wc528c6y5s5yf9rlxrl5h0c1lk9s90zzkmyhzpxrl"; - name = "booth-1.1.3.tar.xz"; - }; - }; - buho = { - version = "3.1.0"; - src = fetchurl { - url = "${mirror}/stable/maui/buho/3.1.0/buho-3.1.0.tar.xz"; - sha256 = "0pw8ljnhb3xsbsls6ynihvb5vargk13bija02s963kkbyvcrka0a"; - name = "buho-3.1.0.tar.xz"; - }; - }; - clip = { - version = "3.1.0"; - src = fetchurl { - url = "${mirror}/stable/maui/clip/3.1.0/clip-3.1.0.tar.xz"; - sha256 = "1pcka3z5ik5s9hv0np83f6g1fp1pgzq14h83k4l38wfcvbmnjngb"; - name = "clip-3.1.0.tar.xz"; - }; - }; - communicator = { - version = "3.1.0"; - src = fetchurl { - url = "${mirror}/stable/maui/communicator/3.1.0/communicator-3.1.0.tar.xz"; - sha256 = "0207jz891d8hs36ma51jbm9af53423lvfir41xmbw5k8j1wi925p"; - name = "communicator-3.1.0.tar.xz"; - }; - }; - era = { - version = "0.1.0"; - src = fetchurl { - url = "${mirror}/stable/maui/era/0.1.0/era-0.1.0.tar.xz"; - sha256 = "0qllnpibkhrr52gsngrkzrxcaj68hngsaavdwkds3rbaq4a5by9g"; - name = "era-0.1.0.tar.xz"; - }; - }; - fiery = { - version = "1.1.3"; - src = fetchurl { - url = "${mirror}/stable/maui/fiery/1.1.3/fiery-1.1.3.tar.xz"; - sha256 = "1wkvrp1b0y0b7mppwymxmlfrbczxqgxaws10y2001mdxryjf160b"; - name = "fiery-1.1.3.tar.xz"; - }; - }; - index-fm = { - version = "3.1.0"; - src = fetchurl { - url = "${mirror}/stable/maui/index/3.1.0/index-fm-3.1.0.tar.xz"; - sha256 = "13pvx4rildnc0yqb3km9r9spd2wf6vwayfh0i6bai2vfklv405yg"; - name = "index-fm-3.1.0.tar.xz"; - }; - }; - mauikit = { - version = "3.1.0"; - src = fetchurl { - url = "${mirror}/stable/maui/mauikit/3.1.0/mauikit-3.1.0.tar.xz"; - sha256 = "1v7nas1mdkpfyz6580y1z1rk3ad0azh047y19bjy0rrpp75iclmz"; - name = "mauikit-3.1.0.tar.xz"; - }; - }; - mauikit-accounts = { - version = "3.1.0"; - src = fetchurl { - url = "${mirror}/stable/maui/mauikit-accounts/3.1.0/mauikit-accounts-3.1.0.tar.xz"; - sha256 = "0blzmjdv4cs2m4967mksj0pxpd1gvgjpkgwbwkhya36qc443yfya"; - name = "mauikit-accounts-3.1.0.tar.xz"; - }; - }; - mauikit-calendar = { - version = "3.1.0"; - src = fetchurl { - url = "${mirror}/stable/maui/mauikit-calendar/3.1.0/mauikit-calendar-3.1.0.tar.xz"; - sha256 = "13hf6z99ibly4cbaf4n4r54qc2vcbmf8i8qjndf35z6kxjc4iwpd"; - name = "mauikit-calendar-3.1.0.tar.xz"; - }; - }; - mauikit-documents = { - version = "3.1.0"; - src = fetchurl { - url = "${mirror}/stable/maui/mauikit-documents/3.1.0/mauikit-documents-3.1.0.tar.xz"; - sha256 = "1v1hbzb84rkva5icmynh87h979xgv8a8da6pfzlf1y7h6syw1wf4"; - name = "mauikit-documents-3.1.0.tar.xz"; - }; - }; - mauikit-filebrowsing = { - version = "3.1.0"; - src = fetchurl { - url = "${mirror}/stable/maui/mauikit-filebrowsing/3.1.0/mauikit-filebrowsing-3.1.0.tar.xz"; - sha256 = "146iflqb4kq25f1azajlbwlbphbk754vvf6w7fzl75pdwhqsbxvp"; - name = "mauikit-filebrowsing-3.1.0.tar.xz"; - }; - }; - mauikit-imagetools = { - version = "3.1.0"; - src = fetchurl { - url = "${mirror}/stable/maui/mauikit-imagetools/3.1.0/mauikit-imagetools-3.1.0.tar.xz"; - sha256 = "1r7j9lg19s63325xyz6i8hzfn751s14mlpxym533mpzpx6yg784q"; - name = "mauikit-imagetools-3.1.0.tar.xz"; - }; - }; - mauikit-terminal = { - version = "3.1.0"; - src = fetchurl { - url = "${mirror}/stable/maui/mauikit-terminal/3.1.0/mauikit-terminal-3.1.0.tar.xz"; - sha256 = "0q2d8lxzhmncassnl043vrgz9am25yk060v7l7bwm6fp9vv5ix5f"; - name = "mauikit-terminal-3.1.0.tar.xz"; - }; - }; - mauikit-texteditor = { - version = "3.1.0"; - src = fetchurl { - url = "${mirror}/stable/maui/mauikit-texteditor/3.1.0/mauikit-texteditor-3.1.0.tar.xz"; - sha256 = "0fsjqfvg2fnfmrsz9hfcw20l5yv0pi5jiww2aqyqqpy09q7jxphv"; - name = "mauikit-texteditor-3.1.0.tar.xz"; - }; - }; - mauiman = { - version = "3.1.0"; - src = fetchurl { - url = "${mirror}/stable/maui/mauiman/3.1.0/mauiman-3.1.0.tar.xz"; - sha256 = "1462j8xbla6jra3qpxgp5hi580lk53a6ry4fzmllqpzprwgiyx2w"; - name = "mauiman-3.1.0.tar.xz"; - }; - }; - nota = { - version = "3.1.0"; - src = fetchurl { - url = "${mirror}/stable/maui/nota/3.1.0/nota-3.1.0.tar.xz"; - sha256 = "0x9xaas86rhbqs7wsc7chxc4iijg73wnzj2125dgdwcridmdfxix"; - name = "nota-3.1.0.tar.xz"; - }; - }; - pix = { - version = "3.1.0"; - src = fetchurl { - url = "${mirror}/stable/maui/pix/3.1.0/pix-3.1.0.tar.xz"; - sha256 = "0j3xwdscjqyisv5zn8pb0mqarpfkknz3wxgzd7yl2g1gxdpl502h"; - name = "pix-3.1.0.tar.xz"; - }; - }; - shelf = { - version = "3.1.0"; - src = fetchurl { - url = "${mirror}/stable/maui/shelf/3.1.0/shelf-3.1.0.tar.xz"; - sha256 = "166l6f5ifv5yz3sgds50bi9swdr3zl7m499myy5x8ph2jw1i2dvq"; - name = "shelf-3.1.0.tar.xz"; - }; - }; - station = { - version = "3.1.0"; - src = fetchurl { - url = "${mirror}/stable/maui/station/3.1.0/station-3.1.0.tar.xz"; - sha256 = "0skwagzwd4v24ldrww727zs3chzfb1spbynzdjb0yc7pggzxn8nf"; - name = "station-3.1.0.tar.xz"; - }; - }; - strike = { - version = "1.1.3"; - src = fetchurl { - url = "${mirror}/stable/maui/strike/1.1.3/strike-1.1.3.tar.xz"; - sha256 = "1b0n56mfchcf37j33i3kxp3pd9sc2f1fq5hjfhy1s34dk8gfv947"; - name = "strike-1.1.3.tar.xz"; - }; - }; - vvave = { - version = "3.1.0"; - src = fetchurl { - url = "${mirror}/stable/maui/vvave/3.1.0/vvave-3.1.0.tar.xz"; - sha256 = "1ig6vzrqrq4h8y69xm6hxppzspa4vrawpn4rk6rva26j5qm7dh1l"; - name = "vvave-3.1.0.tar.xz"; - }; - }; -} diff --git a/pkgs/applications/maui/station.nix b/pkgs/applications/maui/station.nix deleted file mode 100644 index 6389576a125c..000000000000 --- a/pkgs/applications/maui/station.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ - lib, - mkDerivation, - cmake, - extra-cmake-modules, - kconfig, - kcoreaddons, - ki18n, - kirigami2, - mauikit, - mauikit-filebrowsing, - mauikit-terminal, - qmltermwidget, - qtmultimedia, -}: - -mkDerivation { - pname = "station"; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - ]; - - buildInputs = [ - kconfig - kcoreaddons - ki18n - kirigami2 - mauikit - mauikit-filebrowsing - mauikit-terminal - qmltermwidget - qtmultimedia - ]; - - meta = with lib; { - description = "Convergent terminal emulator"; - mainProgram = "station"; - homepage = "https://invent.kde.org/maui/station"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ onny ]; - }; -} diff --git a/pkgs/applications/maui/vvave.nix b/pkgs/applications/maui/vvave.nix deleted file mode 100644 index d30a747a87e5..000000000000 --- a/pkgs/applications/maui/vvave.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ - lib, - mkDerivation, - cmake, - extra-cmake-modules, - applet-window-buttons, - karchive, - kcoreaddons, - ki18n, - kio, - kirigami2, - mauikit, - mauikit-accounts, - mauikit-filebrowsing, - qtmultimedia, - qtquickcontrols2, - taglib, -}: - -mkDerivation { - pname = "vvave"; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - ]; - - buildInputs = [ - applet-window-buttons - karchive - kcoreaddons - ki18n - kio - kirigami2 - mauikit - mauikit-accounts - mauikit-filebrowsing - qtmultimedia - qtquickcontrols2 - taglib - ]; - - meta = with lib; { - description = "Multi-platform media player"; - mainProgram = "vvave"; - homepage = "https://invent.kde.org/maui/vvave"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ onny ]; - }; -} diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index c9486eacd3eb..31659dc93ad8 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -70,16 +70,6 @@ makeScopeWithSplicing' { in (lib.makeOverridable mkPlamoGear attrs); - mauiPackages = - let - mkMaui = import ../applications/maui; - attrs = { - inherit libsForQt5; - inherit (pkgs) lib fetchurl; - }; - in - (lib.makeOverridable mkMaui attrs); - noExtraAttrs = set: lib.attrsets.removeAttrs set [ @@ -96,7 +86,6 @@ makeScopeWithSplicing' { // plasma5 // plasma5.thirdParty // kdeGear - // mauiPackages // qt5 // { @@ -105,7 +94,6 @@ makeScopeWithSplicing' { plasmaMobileGear plasma5 kdeGear - mauiPackages qt5 ; From dd94d15f938795853d60e442d7f695920d4c3842 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 12 Aug 2025 19:40:34 +0300 Subject: [PATCH 139/146] applet-window-buttons: drop Not ported to Plasma 6. --- .../applet-window-buttons/default.nix | 51 ------------------- pkgs/top-level/qt5-packages.nix | 2 - 2 files changed, 53 deletions(-) delete mode 100644 pkgs/development/libraries/applet-window-buttons/default.nix diff --git a/pkgs/development/libraries/applet-window-buttons/default.nix b/pkgs/development/libraries/applet-window-buttons/default.nix deleted file mode 100644 index ed67ddd197af..000000000000 --- a/pkgs/development/libraries/applet-window-buttons/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ - lib, - mkDerivation, - fetchFromGitHub, - fetchpatch, - cmake, - extra-cmake-modules, - kcoreaddons, - kdeclarative, - kdecoration, - plasma-framework, -}: - -mkDerivation rec { - pname = "applet-window-buttons"; - version = "0.11.1"; - - src = fetchFromGitHub { - owner = "psifidotos"; - repo = "applet-window-buttons"; - rev = version; - hash = "sha256-Qww/22bEmjuq+R3o0UDcS6U+34qjaeSEy+g681/hcfE="; - }; - - patches = [ - # FIXME: cherry-pick Plasma 5.27 build fix, remove for next release - (fetchpatch { - url = "https://github.com/psifidotos/applet-window-buttons/commit/924994e10402921bf22fefc099bca2914989081c.diff"; - hash = "sha256-4ErqmkIbkvKwns50LhI8Et1EMyvrXYcNRL1rXCxau2w="; - }) - ]; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - ]; - - buildInputs = [ - kcoreaddons - kdeclarative - kdecoration - plasma-framework - ]; - - meta = with lib; { - description = "Plasma 5 applet in order to show window buttons in your panels"; - homepage = "https://github.com/psifidotos/applet-window-buttons"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ dotlambda ]; - }; -} diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index 31659dc93ad8..39b52bc9257a 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -106,8 +106,6 @@ makeScopeWithSplicing' { accounts-qt = callPackage ../development/libraries/accounts-qt { }; - applet-window-buttons = callPackage ../development/libraries/applet-window-buttons { }; - appstream-qt = callPackage ../development/libraries/appstream/qt.nix { }; dxflib = callPackage ../development/libraries/dxflib { }; From 96e751adaf2f25ec90275a1b59942dc2bdc0e316 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 12 Aug 2025 19:40:34 +0300 Subject: [PATCH 140/146] linuxPackages.deepin-anything-module: drop The rest of Deepin will also be dropped. --- .../linux/deepin-anything-module/default.nix | 29 ------------------- pkgs/top-level/linux-kernels.nix | 2 -- 2 files changed, 31 deletions(-) delete mode 100644 pkgs/os-specific/linux/deepin-anything-module/default.nix diff --git a/pkgs/os-specific/linux/deepin-anything-module/default.nix b/pkgs/os-specific/linux/deepin-anything-module/default.nix deleted file mode 100644 index 416260f3a6e6..000000000000 --- a/pkgs/os-specific/linux/deepin-anything-module/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ - stdenv, - deepin, - kernel, -}: - -stdenv.mkDerivation { - pname = "deepin-anything-module"; - inherit (deepin.deepin-anything) version src; - sourceRoot = "${deepin.deepin-anything.src.name}/src/kernelmod"; - - nativeBuildInputs = kernel.moduleBuildDependencies; - - buildPhase = '' - runHook preBuild - make kdir=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - install -D -t $out/lib/modules/${kernel.modDirVersion}/extra *.ko - runHook postInstall - ''; - - meta = deepin.deepin-anything.meta // { - description = "Deepin Anything file search tool (kernel modules)"; - }; -} diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 05e6ff2ef64d..8e87e80b1a65 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -395,8 +395,6 @@ in cpupower = callPackage ../os-specific/linux/cpupower { }; - deepin-anything-module = callPackage ../os-specific/linux/deepin-anything-module { }; - ddcci-driver = callPackage ../os-specific/linux/ddcci { }; dddvb = callPackage ../os-specific/linux/dddvb { }; From 25303238b95d1eef8109aa76f8de084bf8eeb178 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 12 Aug 2025 19:39:37 +0300 Subject: [PATCH 141/146] deepin: drop --- .../deepin/apps/deepin-calculator/default.nix | 54 ---- .../deepin/apps/deepin-compressor/default.nix | 71 ----- .../deepin/apps/deepin-draw/default.nix | 56 ---- .../deepin/apps/deepin-editor/default.nix | 63 ----- .../deepin/apps/deepin-music/default.nix | 82 ------ .../deepin/apps/deepin-picker/default.nix | 57 ---- .../0001-build-tests-with-cpp-14.patch | 13 - .../deepin/apps/deepin-reader/default.nix | 72 ------ .../apps/deepin-screensaver/default.nix | 65 ----- .../apps/deepin-shortcut-viewer/default.nix | 50 ---- .../apps/deepin-system-monitor/default.nix | 98 ------- .../deepin/apps/deepin-terminal/default.nix | 61 ----- .../artwork/dde-account-faces/default.nix | 30 --- .../artwork/deepin-desktop-theme/default.nix | 61 ----- .../artwork/deepin-gtk-theme/default.nix | 30 --- .../artwork/deepin-icon-theme/default.nix | 50 ---- .../artwork/deepin-sound-theme/default.nix | 27 -- .../artwork/deepin-wallpapers/default.nix | 47 ---- .../deepin/core/dde-api-proxy/default.nix | 51 ---- .../deepin/core/dde-app-services/default.nix | 70 ----- .../deepin/core/dde-appearance/default.nix | 76 ------ .../core/dde-application-manager/default.nix | 41 --- .../deepin/core/dde-calendar/default.nix | 66 ----- .../fix-wrapped-name-not-in-whitelist.diff | 13 - .../deepin/core/dde-clipboard/default.nix | 54 ---- .../core/dde-control-center/default.nix | 89 ------- .../deepin/core/dde-file-manager/default.nix | 155 ----------- .../patch_check_v23_interface.diff | 13 - .../deepin/core/dde-grand-search/default.nix | 82 ------ .../fix-dbus-path-for-daemon.diff | 9 - .../core/dde-gsettings-schemas/default.nix | 49 ---- .../deepin/core/dde-launchpad/default.nix | 55 ---- .../deepin/core/dde-network-core/default.nix | 55 ---- .../deepin/core/dde-polkit-agent/default.nix | 51 ---- .../deepin/core/dde-session-shell/default.nix | 111 -------- .../deepin/core/dde-session-ui/default.nix | 72 ------ .../deepin/core/dde-session/default.nix | 72 ------ .../deepin/core/dde-shell/default.nix | 106 -------- .../core/dde-shell/fix-path-for-nixos.diff | 17 -- .../deepin/core/dde-tray-loader/default.nix | 69 ----- .../deepin/core/dde-widgets/default.nix | 48 ---- .../0001-hardcode-fallback-background.diff | 15 -- .../deepin/core/deepin-kwin/default.nix | 98 ------- .../core/deepin-service-manager/default.nix | 41 --- .../core/dpa-ext-gnomekeyring/default.nix | 51 ---- pkgs/desktops/deepin/default.nix | 121 --------- .../deepin/go-package/dde-api/default.nix | 100 ------- .../dde-daemon/0001-dont-set-PATH.diff | 15 -- .../0002-fix-custom-wallpapers-path.diff | 25 -- .../0003-aviod-use-hardcode-path.diff | 92 ------- .../deepin/go-package/dde-daemon/default.nix | 165 ------------ .../deepin-desktop-schemas/default.nix | 57 ---- .../go-package/deepin-pw-check/default.nix | 74 ------ .../deepin/go-package/startdde/default.nix | 82 ------ .../library/dde-qt-dbus-factory/default.nix | 51 ---- .../deepin/library/deepin-pdfium/default.nix | 49 ---- .../deepin-wayland-protocols/default.nix | 32 --- .../deepin/library/disomaster/default.nix | 39 --- .../deepin/library/docparser/default.nix | 51 ---- .../deepin/library/dtk6core/default.nix | 98 ------- .../library/dtk6core/fix-pkgconfig-path.patch | 14 - .../library/dtk6core/fix-pri-path.patch | 17 -- .../library/dtk6declarative/default.nix | 76 ------ .../dtk6declarative/fix-pkgconfig-path.patch | 14 - .../dtk6declarative/fix-pri-path.patch | 15 -- .../deepin/library/dtk6gui/default.nix | 93 ------- .../library/dtk6gui/fix-pkgconfig-path.patch | 16 -- .../deepin/library/dtk6gui/fix-pri-path.patch | 17 -- .../deepin/library/dtk6log/default.nix | 61 ----- .../library/dtk6systemsettings/default.nix | 67 ----- .../deepin/library/dtk6widget/default.nix | 94 ------- .../dtk6widget/fix-pkgconfig-path.patch | 14 - .../library/dtk6widget/fix-pri-path.patch | 17 -- .../deepin/library/dtkcommon/default.nix | 30 --- .../deepin/library/dtkcore/default.nix | 95 ------- .../library/dtkcore/fix-pkgconfig-path.patch | 14 - .../deepin/library/dtkcore/fix-pri-path.patch | 17 -- .../deepin/library/dtkdeclarative/default.nix | 73 ------ .../dtkdeclarative/fix-pkgconfig-path.patch | 14 - .../library/dtkdeclarative/fix-pri-path.patch | 15 -- .../deepin/library/dtkgui/default.nix | 86 ------- .../library/dtkgui/fix-pkgconfig-path.patch | 16 -- .../deepin/library/dtkgui/fix-pri-path.patch | 17 -- .../deepin/library/dtklog/default.nix | 51 ---- .../deepin/library/dtkwidget/default.nix | 91 ------- .../dtkwidget/fix-pkgconfig-path.patch | 14 - .../library/dtkwidget/fix-pri-path.patch | 17 -- .../deepin/library/dwayland/default.nix | 54 ---- .../deepin/library/gio-qt/default.nix | 62 ----- .../deepin/library/qt5integration/default.nix | 55 ---- .../library/qt5platform-plugins/default.nix | 60 ----- .../deepin/library/qt6integration/default.nix | 62 ----- .../deepin/library/qt6mpris/default.nix | 46 ---- .../library/qt6platform-plugins/default.nix | 55 ---- .../library/treeland-protocols/default.nix | 34 --- .../deepin/library/udisks2-qt5/default.nix | 38 --- .../deepin/library/util-dfm/default.nix | 54 ---- .../misc/deepin-desktop-base/default.nix | 50 ---- .../distribution_logo_transparent.svg | 243 ------------------ .../tools/dde-device-formatter/default.nix | 59 ----- .../deepin/tools/deepin-anything/default.nix | 56 ---- .../tools/deepin-gettext-tools/default.nix | 49 ---- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - pkgs/top-level/linux-kernels.nix | 1 + 105 files changed, 2 insertions(+), 5711 deletions(-) delete mode 100644 pkgs/desktops/deepin/apps/deepin-calculator/default.nix delete mode 100644 pkgs/desktops/deepin/apps/deepin-compressor/default.nix delete mode 100644 pkgs/desktops/deepin/apps/deepin-draw/default.nix delete mode 100644 pkgs/desktops/deepin/apps/deepin-editor/default.nix delete mode 100644 pkgs/desktops/deepin/apps/deepin-music/default.nix delete mode 100644 pkgs/desktops/deepin/apps/deepin-picker/default.nix delete mode 100644 pkgs/desktops/deepin/apps/deepin-reader/0001-build-tests-with-cpp-14.patch delete mode 100644 pkgs/desktops/deepin/apps/deepin-reader/default.nix delete mode 100644 pkgs/desktops/deepin/apps/deepin-screensaver/default.nix delete mode 100644 pkgs/desktops/deepin/apps/deepin-shortcut-viewer/default.nix delete mode 100644 pkgs/desktops/deepin/apps/deepin-system-monitor/default.nix delete mode 100644 pkgs/desktops/deepin/apps/deepin-terminal/default.nix delete mode 100644 pkgs/desktops/deepin/artwork/dde-account-faces/default.nix delete mode 100644 pkgs/desktops/deepin/artwork/deepin-desktop-theme/default.nix delete mode 100644 pkgs/desktops/deepin/artwork/deepin-gtk-theme/default.nix delete mode 100644 pkgs/desktops/deepin/artwork/deepin-icon-theme/default.nix delete mode 100644 pkgs/desktops/deepin/artwork/deepin-sound-theme/default.nix delete mode 100644 pkgs/desktops/deepin/artwork/deepin-wallpapers/default.nix delete mode 100644 pkgs/desktops/deepin/core/dde-api-proxy/default.nix delete mode 100644 pkgs/desktops/deepin/core/dde-app-services/default.nix delete mode 100644 pkgs/desktops/deepin/core/dde-appearance/default.nix delete mode 100644 pkgs/desktops/deepin/core/dde-application-manager/default.nix delete mode 100644 pkgs/desktops/deepin/core/dde-calendar/default.nix delete mode 100644 pkgs/desktops/deepin/core/dde-calendar/fix-wrapped-name-not-in-whitelist.diff delete mode 100644 pkgs/desktops/deepin/core/dde-clipboard/default.nix delete mode 100644 pkgs/desktops/deepin/core/dde-control-center/default.nix delete mode 100644 pkgs/desktops/deepin/core/dde-file-manager/default.nix delete mode 100644 pkgs/desktops/deepin/core/dde-file-manager/patch_check_v23_interface.diff delete mode 100644 pkgs/desktops/deepin/core/dde-grand-search/default.nix delete mode 100644 pkgs/desktops/deepin/core/dde-grand-search/fix-dbus-path-for-daemon.diff delete mode 100644 pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix delete mode 100644 pkgs/desktops/deepin/core/dde-launchpad/default.nix delete mode 100644 pkgs/desktops/deepin/core/dde-network-core/default.nix delete mode 100644 pkgs/desktops/deepin/core/dde-polkit-agent/default.nix delete mode 100644 pkgs/desktops/deepin/core/dde-session-shell/default.nix delete mode 100644 pkgs/desktops/deepin/core/dde-session-ui/default.nix delete mode 100644 pkgs/desktops/deepin/core/dde-session/default.nix delete mode 100644 pkgs/desktops/deepin/core/dde-shell/default.nix delete mode 100644 pkgs/desktops/deepin/core/dde-shell/fix-path-for-nixos.diff delete mode 100644 pkgs/desktops/deepin/core/dde-tray-loader/default.nix delete mode 100644 pkgs/desktops/deepin/core/dde-widgets/default.nix delete mode 100644 pkgs/desktops/deepin/core/deepin-kwin/0001-hardcode-fallback-background.diff delete mode 100644 pkgs/desktops/deepin/core/deepin-kwin/default.nix delete mode 100644 pkgs/desktops/deepin/core/deepin-service-manager/default.nix delete mode 100644 pkgs/desktops/deepin/core/dpa-ext-gnomekeyring/default.nix delete mode 100644 pkgs/desktops/deepin/default.nix delete mode 100644 pkgs/desktops/deepin/go-package/dde-api/default.nix delete mode 100644 pkgs/desktops/deepin/go-package/dde-daemon/0001-dont-set-PATH.diff delete mode 100644 pkgs/desktops/deepin/go-package/dde-daemon/0002-fix-custom-wallpapers-path.diff delete mode 100644 pkgs/desktops/deepin/go-package/dde-daemon/0003-aviod-use-hardcode-path.diff delete mode 100644 pkgs/desktops/deepin/go-package/dde-daemon/default.nix delete mode 100644 pkgs/desktops/deepin/go-package/deepin-desktop-schemas/default.nix delete mode 100644 pkgs/desktops/deepin/go-package/deepin-pw-check/default.nix delete mode 100644 pkgs/desktops/deepin/go-package/startdde/default.nix delete mode 100644 pkgs/desktops/deepin/library/dde-qt-dbus-factory/default.nix delete mode 100644 pkgs/desktops/deepin/library/deepin-pdfium/default.nix delete mode 100644 pkgs/desktops/deepin/library/deepin-wayland-protocols/default.nix delete mode 100644 pkgs/desktops/deepin/library/disomaster/default.nix delete mode 100644 pkgs/desktops/deepin/library/docparser/default.nix delete mode 100644 pkgs/desktops/deepin/library/dtk6core/default.nix delete mode 100644 pkgs/desktops/deepin/library/dtk6core/fix-pkgconfig-path.patch delete mode 100644 pkgs/desktops/deepin/library/dtk6core/fix-pri-path.patch delete mode 100644 pkgs/desktops/deepin/library/dtk6declarative/default.nix delete mode 100644 pkgs/desktops/deepin/library/dtk6declarative/fix-pkgconfig-path.patch delete mode 100644 pkgs/desktops/deepin/library/dtk6declarative/fix-pri-path.patch delete mode 100644 pkgs/desktops/deepin/library/dtk6gui/default.nix delete mode 100644 pkgs/desktops/deepin/library/dtk6gui/fix-pkgconfig-path.patch delete mode 100644 pkgs/desktops/deepin/library/dtk6gui/fix-pri-path.patch delete mode 100644 pkgs/desktops/deepin/library/dtk6log/default.nix delete mode 100644 pkgs/desktops/deepin/library/dtk6systemsettings/default.nix delete mode 100644 pkgs/desktops/deepin/library/dtk6widget/default.nix delete mode 100644 pkgs/desktops/deepin/library/dtk6widget/fix-pkgconfig-path.patch delete mode 100644 pkgs/desktops/deepin/library/dtk6widget/fix-pri-path.patch delete mode 100644 pkgs/desktops/deepin/library/dtkcommon/default.nix delete mode 100644 pkgs/desktops/deepin/library/dtkcore/default.nix delete mode 100644 pkgs/desktops/deepin/library/dtkcore/fix-pkgconfig-path.patch delete mode 100644 pkgs/desktops/deepin/library/dtkcore/fix-pri-path.patch delete mode 100644 pkgs/desktops/deepin/library/dtkdeclarative/default.nix delete mode 100644 pkgs/desktops/deepin/library/dtkdeclarative/fix-pkgconfig-path.patch delete mode 100644 pkgs/desktops/deepin/library/dtkdeclarative/fix-pri-path.patch delete mode 100644 pkgs/desktops/deepin/library/dtkgui/default.nix delete mode 100644 pkgs/desktops/deepin/library/dtkgui/fix-pkgconfig-path.patch delete mode 100644 pkgs/desktops/deepin/library/dtkgui/fix-pri-path.patch delete mode 100644 pkgs/desktops/deepin/library/dtklog/default.nix delete mode 100644 pkgs/desktops/deepin/library/dtkwidget/default.nix delete mode 100644 pkgs/desktops/deepin/library/dtkwidget/fix-pkgconfig-path.patch delete mode 100644 pkgs/desktops/deepin/library/dtkwidget/fix-pri-path.patch delete mode 100644 pkgs/desktops/deepin/library/dwayland/default.nix delete mode 100644 pkgs/desktops/deepin/library/gio-qt/default.nix delete mode 100644 pkgs/desktops/deepin/library/qt5integration/default.nix delete mode 100644 pkgs/desktops/deepin/library/qt5platform-plugins/default.nix delete mode 100644 pkgs/desktops/deepin/library/qt6integration/default.nix delete mode 100644 pkgs/desktops/deepin/library/qt6mpris/default.nix delete mode 100644 pkgs/desktops/deepin/library/qt6platform-plugins/default.nix delete mode 100644 pkgs/desktops/deepin/library/treeland-protocols/default.nix delete mode 100644 pkgs/desktops/deepin/library/udisks2-qt5/default.nix delete mode 100644 pkgs/desktops/deepin/library/util-dfm/default.nix delete mode 100644 pkgs/desktops/deepin/misc/deepin-desktop-base/default.nix delete mode 100644 pkgs/desktops/deepin/misc/deepin-desktop-base/distribution_logo_transparent.svg delete mode 100644 pkgs/desktops/deepin/tools/dde-device-formatter/default.nix delete mode 100644 pkgs/desktops/deepin/tools/deepin-anything/default.nix delete mode 100644 pkgs/desktops/deepin/tools/deepin-gettext-tools/default.nix diff --git a/pkgs/desktops/deepin/apps/deepin-calculator/default.nix b/pkgs/desktops/deepin/apps/deepin-calculator/default.nix deleted file mode 100644 index b3df5e8e6837..000000000000 --- a/pkgs/desktops/deepin/apps/deepin-calculator/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - dtk6widget, - qt6integration, - qt6platform-plugins, - qt6Packages, - cmake, - pkg-config, - gtest, -}: - -stdenv.mkDerivation rec { - pname = "deepin-calculator"; - version = "6.5.7"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-p3tEUIM7rxYUVLl7ZaEm20IZWRMNi12AIj9mQe6iB5I="; - }; - - nativeBuildInputs = [ - cmake - qt6Packages.qttools - pkg-config - qt6Packages.wrapQtAppsHook - ]; - - buildInputs = [ - dtk6widget - qt6integration - qt6platform-plugins - qt6Packages.qtbase - qt6Packages.qtsvg - gtest - ]; - - # qtsvg can't not be found with strictDeps - strictDeps = false; - - cmakeFlags = [ "-DVERSION=${version}" ]; - - meta = { - description = "Easy to use calculator for ordinary users"; - mainProgram = "deepin-calculator"; - homepage = "https://github.com/linuxdeepin/deepin-calculator"; - license = lib.licenses.gpl3Plus; - platforms = lib.platforms.linux; - teams = [ lib.teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/apps/deepin-compressor/default.nix b/pkgs/desktops/deepin/apps/deepin-compressor/default.nix deleted file mode 100644 index 4fb62057f649..000000000000 --- a/pkgs/desktops/deepin/apps/deepin-compressor/default.nix +++ /dev/null @@ -1,71 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - dtkwidget, - qt5integration, - qt5platform-plugins, - udisks2-qt5, - cmake, - pkg-config, - libsForQt5, - minizip, - libzip, - libuuid, - libarchive, -}: - -stdenv.mkDerivation rec { - pname = "deepin-compressor"; - version = "6.0.1"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-DUpYb1xNmWpBcKo9kajeVm/+z4yj2OBE+qOyEkCHbUI="; - }; - - postPatch = '' - substituteInPlace src/source/common/pluginmanager.cpp \ - --replace-fail "/usr/lib" "$out/lib" - substituteInPlace src/desktop/deepin-compressor.desktop \ - --replace-fail "/usr" "$out" - ''; - - nativeBuildInputs = [ - cmake - libsForQt5.qttools - pkg-config - libsForQt5.wrapQtAppsHook - ]; - - buildInputs = [ - dtkwidget - qt5integration - qt5platform-plugins - udisks2-qt5 - libsForQt5.kcodecs - libsForQt5.karchive - minizip - libzip - libuuid - libarchive - ]; - - cmakeFlags = [ - "-DVERSION=${version}" - "-DUSE_TEST=OFF" - ]; - - strictDeps = true; - - meta = with lib; { - description = "Fast and lightweight application for creating and extracting archives"; - mainProgram = "deepin-compressor"; - homepage = "https://github.com/linuxdeepin/deepin-compressor"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - teams = [ teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/apps/deepin-draw/default.nix b/pkgs/desktops/deepin/apps/deepin-draw/default.nix deleted file mode 100644 index 87e3e2221b2d..000000000000 --- a/pkgs/desktops/deepin/apps/deepin-draw/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - cmake, - pkg-config, - libsForQt5, - dtkwidget, - qt5integration, - qt5platform-plugins, -}: - -stdenv.mkDerivation rec { - pname = "deepin-draw"; - version = "7.0.2"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-WeubXsshN4tUlIwEHTxHXv1L2dvJ2DZ6qtSPyiVtc98="; - }; - - postPatch = '' - substituteInPlace com.deepin.Draw.service \ - --replace "/usr/bin/deepin-draw" "$out/bin/deepin-draw" - ''; - - nativeBuildInputs = [ - cmake - libsForQt5.qttools - pkg-config - libsForQt5.wrapQtAppsHook - ]; - - buildInputs = [ - libsForQt5.qtbase - qt5integration - libsForQt5.qtsvg - dtkwidget - qt5platform-plugins - ]; - - cmakeFlags = [ "-DVERSION=${version}" ]; - - strictDeps = true; - - meta = { - description = "Lightweight drawing tool for users to freely draw and simply edit images"; - mainProgram = "deepin-draw"; - homepage = "https://github.com/linuxdeepin/deepin-draw"; - license = lib.licenses.gpl3Plus; - platforms = lib.platforms.linux; - teams = [ lib.teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/apps/deepin-editor/default.nix b/pkgs/desktops/deepin/apps/deepin-editor/default.nix deleted file mode 100644 index 6c8a108b60a8..000000000000 --- a/pkgs/desktops/deepin/apps/deepin-editor/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - cmake, - pkg-config, - dtkwidget, - qt5integration, - qt5platform-plugins, - dde-qt-dbus-factory, - libchardet, - libuchardet, - libiconv, - libsForQt5, -}: - -stdenv.mkDerivation rec { - pname = "deepin-editor"; - version = "6.5.15"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-aMxEESZ/noGtEDpQZz1asR0M+wnAfQT1FXLaQB6B0Zs="; - }; - - nativeBuildInputs = [ - cmake - pkg-config - libsForQt5.qttools - libsForQt5.wrapQtAppsHook - ]; - - buildInputs = [ - dtkwidget - qt5integration - qt5platform-plugins - libsForQt5.qtbase - libsForQt5.qtsvg - dde-qt-dbus-factory - libsForQt5.kcodecs - libsForQt5.syntax-highlighting - libchardet - libuchardet - libiconv - ]; - - strictDeps = true; - - cmakeFlags = [ "-DVERSION=${version}" ]; - - # Fix build with icu4c: "error: parameter declared 'auto'" - env.NIX_CFLAGS_COMPILE = toString [ "--std=c++17" ]; - - meta = { - description = "Desktop text editor that supports common text editing features"; - homepage = "https://github.com/linuxdeepin/deepin-editor"; - license = lib.licenses.gpl3Plus; - platforms = lib.platforms.linux; - teams = [ lib.teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/apps/deepin-music/default.nix b/pkgs/desktops/deepin/apps/deepin-music/default.nix deleted file mode 100644 index 1eeb0eb03bed..000000000000 --- a/pkgs/desktops/deepin/apps/deepin-music/default.nix +++ /dev/null @@ -1,82 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - cmake, - pkg-config, - dtk6widget, - dtk6declarative, - qt6integration, - qt6platform-plugins, - qt6mpris, - ffmpeg_6, - libvlc, - qt6Packages, - taglib_1, - SDL2, - gst_all_1, -}: - -stdenv.mkDerivation rec { - pname = "deepin-music"; - version = "7.0.9"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-tj0XICmp7sM2m6aSf/DgxS7JXO3Wy/83sZIPGV17gFo="; - }; - - patches = [ "${src}/patches/fix-library-path.patch" ]; - - nativeBuildInputs = [ - cmake - pkg-config - qt6Packages.qttools - qt6Packages.wrapQtAppsHook - ]; - - buildInputs = [ - dtk6widget - dtk6declarative - qt6integration - qt6platform-plugins - qt6mpris - qt6Packages.qtbase - qt6Packages.qt5compat - qt6Packages.qtmultimedia - ffmpeg_6 - libvlc - taglib_1 - SDL2 - ] - ++ (with gst_all_1; [ - gstreamer - gst-plugins-base - gst-plugins-good - ]); - - cmakeFlags = [ "-DVERSION=${version}" ]; - - env.NIX_CFLAGS_COMPILE = toString [ - "-I${libvlc}/include/vlc/plugins" - "-I${libvlc}/include/vlc" - ]; - - # qtmultimedia can't not be found with strictDeps - strictDeps = false; - - preFixup = '' - qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") - ''; - - meta = { - description = "Awesome music player with brilliant and tweakful UI Deepin-UI based"; - mainProgram = "deepin-music"; - homepage = "https://github.com/linuxdeepin/deepin-music"; - license = lib.licenses.gpl3Plus; - platforms = lib.platforms.linux; - teams = [ lib.teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/apps/deepin-picker/default.nix b/pkgs/desktops/deepin/apps/deepin-picker/default.nix deleted file mode 100644 index f69914782a1c..000000000000 --- a/pkgs/desktops/deepin/apps/deepin-picker/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - pkg-config, - qt6Packages, - dtk6widget, - xorg, -}: - -stdenv.mkDerivation rec { - pname = "deepin-picker"; - version = "6.0.4"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-TeUhDEldte5PJJe1l0q4wUTnnaXY052YP1JAhpLz/sA="; - }; - - nativeBuildInputs = [ - qt6Packages.qmake - qt6Packages.qttools - pkg-config - qt6Packages.wrapQtAppsHook - ]; - - buildInputs = [ - qt6Packages.qtbase - dtk6widget - qt6Packages.qtsvg - xorg.libXtst - ]; - - postPatch = '' - substituteInPlace com.deepin.Picker.service \ - --replace "/usr/bin/deepin-picker" "$out/bin/deepin-picker" - ''; - - qmakeFlags = [ - "BINDIR=${placeholder "out"}/bin" - "ICONDIR=${placeholder "out"}/share/icons/hicolor/scalable/apps" - "APPDIR=${placeholder "out"}/share/applications" - "DSRDIR=${placeholder "out"}/share/deepin-picker" - "DOCDIR=${placeholder "out"}/share/dman/deepin-picker" - ]; - - meta = { - description = "Color picker application"; - mainProgram = "deepin-picker"; - homepage = "https://github.com/linuxdeepin/deepin-picker"; - license = lib.licenses.gpl3Plus; - platforms = lib.platforms.linux; - teams = [ lib.teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/apps/deepin-reader/0001-build-tests-with-cpp-14.patch b/pkgs/desktops/deepin/apps/deepin-reader/0001-build-tests-with-cpp-14.patch deleted file mode 100644 index cf88eb6db074..000000000000 --- a/pkgs/desktops/deepin/apps/deepin-reader/0001-build-tests-with-cpp-14.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/tests/tests.pro b/tests/tests2.pro -index 314cad227646..48f1c66ee3f7 100644 ---- a/tests/tests.pro -+++ b/tests/tests.pro -@@ -6,7 +6,7 @@ QT += core gui sql printsupport dbus testlib widgets - #QMAKE_CXXFLAGS += -g -fsanitize=undefined,address -O2 - #QMAKE_LFLAGS += -g -fsanitize=undefined,address -O2 - --CONFIG += c++11 link_pkgconfig resources_big testcase no_testcase_installs -+CONFIG += c++14 link_pkgconfig resources_big testcase no_testcase_installs - - #访问私有方法 -fno-access-control - QMAKE_CXXFLAGS += -g -Wall -fprofile-arcs -ftest-coverage -fno-access-control -O0 -fno-inline diff --git a/pkgs/desktops/deepin/apps/deepin-reader/default.nix b/pkgs/desktops/deepin/apps/deepin-reader/default.nix deleted file mode 100644 index d9b50da42a19..000000000000 --- a/pkgs/desktops/deepin/apps/deepin-reader/default.nix +++ /dev/null @@ -1,72 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - pkg-config, - libsForQt5, - dtkwidget, - qt5integration, - qt5platform-plugins, - dde-qt-dbus-factory, - poppler, - libchardet, - libspectre, - openjpeg, - djvulibre, - gtest, -}: - -stdenv.mkDerivation rec { - pname = "deepin-reader"; - version = "6.0.5"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-G5UZ8lBrUo5G3jMae70p/zi9kOVqHWMNCedOy45L1PA="; - }; - - patches = [ ./0001-build-tests-with-cpp-14.patch ]; - - # don't use vendored htmltopdf - postPatch = '' - substituteInPlace deepin_reader.pro \ - --replace "SUBDIRS += htmltopdf" " " - substituteInPlace reader/document/Model.cpp \ - --replace "/usr/lib/deepin-reader/htmltopdf" "htmltopdf" - ''; - - nativeBuildInputs = [ - libsForQt5.qmake - pkg-config - libsForQt5.qttools - libsForQt5.wrapQtAppsHook - ]; - - buildInputs = [ - dtkwidget - qt5integration - qt5platform-plugins - dde-qt-dbus-factory - libsForQt5.qtwebengine - libsForQt5.karchive - poppler - libchardet - libspectre - djvulibre - openjpeg - gtest - ]; - - qmakeFlags = [ "DEFINES+=VERSION=${version}" ]; - - meta = with lib; { - description = "Simple memo software with texts and voice recordings"; - mainProgram = "deepin-reader"; - homepage = "https://github.com/linuxdeepin/deepin-reader"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - teams = [ teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/apps/deepin-screensaver/default.nix b/pkgs/desktops/deepin/apps/deepin-screensaver/default.nix deleted file mode 100644 index 8162fef12ae5..000000000000 --- a/pkgs/desktops/deepin/apps/deepin-screensaver/default.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - pkg-config, - libsForQt5, - dtkwidget, - dde-qt-dbus-factory, - xorg, - xscreensaver, -}: - -stdenv.mkDerivation rec { - pname = "deepin-screensaver"; - version = "5.0.18"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-7lyHPE/x7rmwh7FtCPkuA8JgYpy90jRXhUWoaeZpVag="; - }; - - postPatch = '' - patchShebangs {src,customscreensaver/deepin-custom-screensaver}/{generate_translations.sh,update_translations.sh} - - substituteInPlace src/{dbusscreensaver.cpp,com.deepin.ScreenSaver.service,src.pro} \ - customscreensaver/deepin-custom-screensaver/deepin-custom-screensaver.pro \ - --replace "/usr" "$out" \ - --replace "/etc" "$out/etc" - - substituteInPlace tools/preview/main.cpp \ - --replace "/usr/lib/xscreensaver" "${xscreensaver}/libexec/xscreensaver" - ''; - - nativeBuildInputs = [ - libsForQt5.qmake - libsForQt5.qttools - pkg-config - libsForQt5.wrapQtAppsHook - ]; - - buildInputs = [ - libsForQt5.qtbase - libsForQt5.qtx11extras - libsForQt5.qtdeclarative - dtkwidget - dde-qt-dbus-factory - xorg.libXScrnSaver - ]; - - qmakeFlags = [ - "XSCREENSAVER_DATA_PATH=${xscreensaver}/libexec/xscreensaver" - "COMPILE_ON_V23=true" - ]; - - meta = with lib; { - description = "Screensaver service developed by deepin"; - mainProgram = "deepin-screensaver"; - homepage = "https://github.com/linuxdeepin/deepin-screensaver"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - teams = [ teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/apps/deepin-shortcut-viewer/default.nix b/pkgs/desktops/deepin/apps/deepin-shortcut-viewer/default.nix deleted file mode 100644 index 5a1b6123352c..000000000000 --- a/pkgs/desktops/deepin/apps/deepin-shortcut-viewer/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - dtkwidget, - qt5integration, - qt5platform-plugins, - pkg-config, - libsForQt5, -}: - -stdenv.mkDerivation rec { - pname = "deepin-shortcut-viewer"; - version = "5.0.9"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "sha256-A4LFi0KcqChjgYrO90paMBAivv02TsRjYQ26I0k71x0="; - }; - - nativeBuildInputs = [ - libsForQt5.qmake - libsForQt5.qttools - pkg-config - libsForQt5.wrapQtAppsHook - ]; - - buildInputs = [ - libsForQt5.qtbase - dtkwidget - qt5integration - qt5platform-plugins - ]; - - qmakeFlags = [ - "VERSION=${version}" - "PREFIX=${placeholder "out"}" - ]; - - meta = with lib; { - description = "Deepin Shortcut Viewer"; - mainProgram = "deepin-shortcut-viewer"; - homepage = "https://github.com/linuxdeepin/deepin-shortcut-viewer"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - teams = [ teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/apps/deepin-system-monitor/default.nix b/pkgs/desktops/deepin/apps/deepin-system-monitor/default.nix deleted file mode 100644 index 08ef482ed783..000000000000 --- a/pkgs/desktops/deepin/apps/deepin-system-monitor/default.nix +++ /dev/null @@ -1,98 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - cmake, - pkg-config, - deepin-gettext-tools, - libsForQt5, - dtkwidget, - qt5integration, - qt5platform-plugins, - dde-qt-dbus-factory, - dde-tray-loader, - gsettings-qt, - procps, - libpcap, - libnl, - util-linux, - systemd, - polkit, - wayland, - dwayland, -}: - -stdenv.mkDerivation rec { - pname = "deepin-system-monitor"; - version = "6.5.4"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-xLlWQaoKC+/jgDD9sBikh5Z1QqDuCFcMulo0vqxJM7k="; - }; - - postPatch = '' - substituteInPlace deepin-system-monitor-main/process/process_controller.cpp \ - deepin-system-monitor-main/process/priority_controller.cpp \ - deepin-system-monitor-main/service/service_manager.cpp \ - deepin-system-monitor-main/translations/policy/com.deepin.pkexec.deepin-system-monitor.policy \ - --replace "/usr/bin/kill" "${lib.getBin util-linux}/bin/kill" \ - --replace "/usr/bin/renice" "${lib.getBin util-linux}/bin/renice" \ - --replace '/usr/bin/systemctl' '${lib.getBin systemd}/systemctl' - - substituteInPlace deepin-system-monitor-main/{service/service_manager.cpp,process/{priority_controller.cpp,process_controller.cpp}} \ - --replace "/usr/bin/pkexec" "${lib.getBin polkit}/bin/pkexec" - - for file in $(grep -rl "/usr") - do - substituteInPlace $file \ - --replace "/usr" "$out" - done - ''; - - nativeBuildInputs = [ - cmake - pkg-config - libsForQt5.qttools - deepin-gettext-tools - libsForQt5.wrapQtAppsHook - ]; - - buildInputs = [ - dtkwidget - qt5integration - qt5platform-plugins - libsForQt5.qtbase - libsForQt5.qtsvg - libsForQt5.qtx11extras - dde-qt-dbus-factory - dde-tray-loader - gsettings-qt - libsForQt5.polkit-qt - procps - libpcap - libnl - wayland - dwayland - ]; - - cmakeFlags = [ "-DVERSION=${version}" ]; - - # To build with icu4c need at least c++17 - env.NIX_CFLAGS_COMPILE = toString [ - "-Wno-error=incompatible-pointer-types" - "--std=c++17" - ]; - - strictDeps = true; - - meta = with lib; { - description = "More user-friendly system monitor"; - homepage = "https://github.com/linuxdeepin/deepin-system-monitor"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - teams = [ teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/apps/deepin-terminal/default.nix b/pkgs/desktops/deepin/apps/deepin-terminal/default.nix deleted file mode 100644 index a17f588dea23..000000000000 --- a/pkgs/desktops/deepin/apps/deepin-terminal/default.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - nixosTests, - dtkwidget, - qt5integration, - qt5platform-plugins, - cmake, - libsForQt5, - pkg-config, - libsecret, - chrpath, - lxqt, -}: - -stdenv.mkDerivation rec { - pname = "deepin-terminal"; - version = "6.0.17"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-T5tjjbNYUaiG9a5zMoKN6I0ec/WLftF2xwUPczlNwB8="; - }; - - cmakeFlags = [ "-DVERSION=${version}" ]; - - nativeBuildInputs = [ - cmake - libsForQt5.qttools - pkg-config - libsForQt5.wrapQtAppsHook - lxqt.lxqt-build-tools_0_13 - ]; - - buildInputs = [ - qt5integration - qt5platform-plugins - libsForQt5.qtbase - libsForQt5.qtsvg - dtkwidget - libsForQt5.qtx11extras - libsecret - chrpath - ]; - - strictDeps = true; - - passthru.tests.test = nixosTests.terminal-emulators.deepin-terminal; - - meta = { - description = "Terminal emulator with workspace, multiple windows, remote management, quake mode and other features"; - mainProgram = "deepin-terminal"; - homepage = "https://github.com/linuxdeepin/deepin-terminal"; - license = lib.licenses.gpl3Plus; - platforms = lib.platforms.linux; - teams = [ lib.teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/artwork/dde-account-faces/default.nix b/pkgs/desktops/deepin/artwork/dde-account-faces/default.nix deleted file mode 100644 index f65580e40852..000000000000 --- a/pkgs/desktops/deepin/artwork/dde-account-faces/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ - stdenvNoCC, - lib, - fetchFromGitHub, -}: - -stdenvNoCC.mkDerivation rec { - pname = "dde-account-faces"; - version = "1.0.16"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-PtbEsFQl6M5Ouadxy9CTVh1Bmmect83NODO4Ks+ckKU="; - }; - - makeFlags = [ "PREFIX=${placeholder "out"}/var" ]; - - meta = with lib; { - description = "Account faces of deepin desktop environment"; - homepage = "https://github.com/linuxdeepin/dde-account-faces"; - license = with licenses; [ - gpl3Plus - cc0 - ]; - platforms = platforms.linux; - teams = [ teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/artwork/deepin-desktop-theme/default.nix b/pkgs/desktops/deepin/artwork/deepin-desktop-theme/default.nix deleted file mode 100644 index d52b7cb3b2f6..000000000000 --- a/pkgs/desktops/deepin/artwork/deepin-desktop-theme/default.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - cmake, - gtk3, - xcursorgen, - papirus-icon-theme, - libsForQt5, - hicolor-icon-theme, - deepin-icon-theme, -}: - -stdenv.mkDerivation rec { - pname = "deepin-desktop-theme"; - version = "1.0.13"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-uNeRAsPbgC7IHHBIlczPXhnwZI65Le70D9MsbH+6Fwk="; - }; - - makeFlags = [ "PREFIX=${placeholder "out"}" ]; - - nativeBuildInputs = [ - cmake - gtk3 - xcursorgen - ]; - - propagatedBuildInputs = [ - libsForQt5.breeze-icons - papirus-icon-theme - hicolor-icon-theme - deepin-icon-theme - ]; - - # breeze-icons propagates qtbase - dontWrapQtApps = true; - - dontDropIconThemeCache = true; - - preFixup = '' - for theme in $out/share/icons/*; do - gtk-update-icon-cache $theme - done - ''; - - meta = with lib; { - description = "Provides a variety of well-designed theme resources"; - homepage = "https://github.com/linuxdeepin/deepin-desktop-theme"; - license = with licenses; [ - gpl3Plus - cc-by-sa-40 - ]; - platforms = platforms.linux; - teams = [ teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/artwork/deepin-gtk-theme/default.nix b/pkgs/desktops/deepin/artwork/deepin-gtk-theme/default.nix deleted file mode 100644 index 29ada16a2af6..000000000000 --- a/pkgs/desktops/deepin/artwork/deepin-gtk-theme/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ - stdenvNoCC, - lib, - fetchFromGitHub, - gtk-engine-murrine, -}: - -stdenvNoCC.mkDerivation rec { - pname = "deepin-gtk-theme"; - version = "23.11.23"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = "deepin-gtk-theme"; - rev = version; - hash = "sha256-2B2BtbPeg3cEbnEIgdGFzy8MjCMWlbP/Sq4jzG5cjmc="; - }; - - propagatedUserEnvPkgs = [ gtk-engine-murrine ]; - - makeFlags = [ "PREFIX=${placeholder "out"}" ]; - - meta = with lib; { - description = "Deepin GTK Theme"; - homepage = "https://github.com/linuxdeepin/deepin-gtk-theme"; - license = licenses.gpl3Plus; - platforms = platforms.unix; - teams = [ teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/artwork/deepin-icon-theme/default.nix b/pkgs/desktops/deepin/artwork/deepin-icon-theme/default.nix deleted file mode 100644 index 34e6cb0a7079..000000000000 --- a/pkgs/desktops/deepin/artwork/deepin-icon-theme/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ - stdenvNoCC, - lib, - fetchFromGitHub, - gtk3, - xcursorgen, - papirus-icon-theme, -}: - -stdenvNoCC.mkDerivation rec { - pname = "deepin-icon-theme"; - version = "2024.07.31"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-Vt2rYZthGelXVUp8/L57ZlDsVEjjZhCv+kSGeU6nC2s="; - }; - - makeFlags = [ "PREFIX=${placeholder "out"}" ]; - - nativeBuildInputs = [ - gtk3 - xcursorgen - ]; - - propagatedBuildInputs = [ papirus-icon-theme ]; - - # breeze-icons propagates qtbase - dontWrapQtApps = true; - - dontDropIconThemeCache = true; - - # Remove broken symbolic link(https://github.com/linuxdeepin/developer-center/issues/11245) - preFixup = '' - rm $out/share/icons/bloom/actions/24/{draw-triangle1.svg,draw-triangle2.svg,draw-triangle3.svg,draw-triangle4.svg} - for theme in $out/share/icons/*; do - gtk-update-icon-cache $theme - done - ''; - - meta = with lib; { - description = "Provides the base icon themes on deepin"; - homepage = "https://github.com/linuxdeepin/deepin-icon-theme"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - teams = [ teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/artwork/deepin-sound-theme/default.nix b/pkgs/desktops/deepin/artwork/deepin-sound-theme/default.nix deleted file mode 100644 index 2256b8f1aba8..000000000000 --- a/pkgs/desktops/deepin/artwork/deepin-sound-theme/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ - stdenvNoCC, - lib, - fetchFromGitHub, -}: - -stdenvNoCC.mkDerivation rec { - pname = "deepin-sound-theme"; - version = "15.10.6"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "sha256-BvG/ygZfM6sDuDSzAqwCzDXGT/bbA6Srlpg3br117OU="; - }; - - makeFlags = [ "PREFIX=${placeholder "out"}" ]; - - meta = with lib; { - description = "Freedesktop sound theme for Deepin"; - homepage = "https://github.com/linuxdeepin/deepin-sound-theme"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - teams = [ teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/artwork/deepin-wallpapers/default.nix b/pkgs/desktops/deepin/artwork/deepin-wallpapers/default.nix deleted file mode 100644 index 10203fc02f07..000000000000 --- a/pkgs/desktops/deepin/artwork/deepin-wallpapers/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - dde-api, -}: - -stdenv.mkDerivation rec { - pname = "deepin-wallpapers"; - version = "1.7.16"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-o5rg1l8N6Ch+BdBLp+HMbVBBvrTdRtn8NSgH/9AnB2Q="; - }; - - nativeBuildInputs = [ dde-api ]; - - postPatch = '' - substituteInPlace Makefile \ - --replace /usr/lib/deepin-api/image-blur ${dde-api}/lib/deepin-api/image-blur - ''; - - installPhase = '' - runHook preInstall - mkdir -p $out/share/wallpapers/deepin - cp deepin/* $out/share/wallpapers/deepin - mkdir -p $out/share/wallpapers/image-blur - cp image-blur/* $out/share/wallpapers/image-blur - mkdir -p $out/share/backgrounds - ln -s $out/share/wallpapers/deepin/desktop.jpg $out/share/backgrounds/default_background.jpg - runHook postInstall - ''; - - meta = with lib; { - description = "Deepin-wallpapers provides wallpapers of dde"; - homepage = "https://github.com/linuxdeepin/deepin-wallpapers"; - license = with licenses; [ - gpl3Plus - cc-by-sa-30 - ]; - platforms = platforms.linux; - teams = [ teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/core/dde-api-proxy/default.nix b/pkgs/desktops/deepin/core/dde-api-proxy/default.nix deleted file mode 100644 index 80af772b00c4..000000000000 --- a/pkgs/desktops/deepin/core/dde-api-proxy/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - cmake, - pkg-config, - libsForQt5, - dtkcore, - coreutils, -}: - -stdenv.mkDerivation rec { - pname = "dde-api-proxy"; - version = "1.0.20"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = "dde-api-proxy"; - rev = version; - hash = "sha256-QE31BOh2LFlY6te+2+nSHGbhLsikSX8V7xSvcLzCWRA="; - }; - - postPatch = '' - for file in $(grep -rl "/usr/bin/false"); do - substituteInPlace $file --replace-fail "/usr/bin/false" "${coreutils}/bin/false" - done - for file in $(grep -rl "/usr/lib/dde-api-proxy"); do - substituteInPlace $file --replace-fail "/usr/lib/dde-api-proxy" "$out/lib/dde-api-proxy" - done - ''; - - nativeBuildInputs = [ - cmake - pkg-config - libsForQt5.wrapQtAppsHook - libsForQt5.polkit-qt - ]; - - buildInputs = [ - dtkcore - libsForQt5.qtbase - ]; - - meta = { - description = "Proxy service for dde"; - homepage = "https://github.com/linuxdeepin/dde-api-proxy"; - license = lib.licenses.gpl3Plus; - platforms = lib.platforms.linux; - teams = [ lib.teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/core/dde-app-services/default.nix b/pkgs/desktops/deepin/core/dde-app-services/default.nix deleted file mode 100644 index 9d3187e653b0..000000000000 --- a/pkgs/desktops/deepin/core/dde-app-services/default.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - dtkwidget, - qt5integration, - qt5platform-plugins, - cmake, - libsForQt5, - doxygen, -}: - -stdenv.mkDerivation rec { - pname = "dde-app-services"; - version = "1.0.25"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-/lHiSUOTD8nC0WDLAHAFzm1YC0WjSS5W5JNC0cjeVEo="; - }; - - postPatch = '' - substituteInPlace dconfig-center/dde-dconfig-daemon/services/org.desktopspec.ConfigManager.service \ - --replace "/usr/bin/dde-dconfig-daemon" "$out/bin/dde-dconfig-daemon" - substituteInPlace dconfig-center/dde-dconfig/main.cpp \ - --replace "/bin/dde-dconfig-editor" "dde-dconfig-editor" - substituteInPlace dconfig-center/CMakeLists.txt \ - --replace 'add_subdirectory("example")' " " \ - --replace 'add_subdirectory("tests")' " " - - substituteInPlace dconfig-center/dde-dconfig-daemon/services/dde-dconfig-daemon.service \ - --replace "/usr/bin" "$out/bin" \ - --replace "/usr/share" "/run/current-system/sw/share" - ''; - - nativeBuildInputs = [ - cmake - libsForQt5.qttools - doxygen - libsForQt5.wrapQtAppsHook - ]; - - buildInputs = [ - dtkwidget - qt5integration - qt5platform-plugins - ]; - - cmakeFlags = [ - "-DDVERSION=${version}" - "-DDSG_DATA_DIR=/run/current-system/sw/share/dsg" - "-DQCH_INSTALL_DESTINATION=${placeholder "out"}/${libsForQt5.qtbase.qtDocPrefix}" - ]; - - preConfigure = '' - # qt.qpa.plugin: Could not find the Qt platform plugin "minimal" - # A workaround is to set QT_PLUGIN_PATH explicitly - export QT_PLUGIN_PATH=${libsForQt5.qtbase.bin}/${libsForQt5.qtbase.qtPluginPrefix} - ''; - - meta = with lib; { - description = "Provids dbus service for reading and writing DSG configuration"; - homepage = "https://github.com/linuxdeepin/dde-app-services"; - license = licenses.lgpl3Plus; - platforms = platforms.linux; - teams = [ teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/core/dde-appearance/default.nix b/pkgs/desktops/deepin/core/dde-appearance/default.nix deleted file mode 100644 index e40b9b287a31..000000000000 --- a/pkgs/desktops/deepin/core/dde-appearance/default.nix +++ /dev/null @@ -1,76 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - cmake, - pkg-config, - libsForQt5, - dtkgui, - gsettings-qt, - gtk3, - xorg, - iconv, -}: - -stdenv.mkDerivation rec { - pname = "dde-appearance"; - version = "1.1.29"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-M39EugV0uGCIaXK4isTQpHd6Rh2Vl6sg3Jp8JIEFEE4="; - }; - - postPatch = '' - substituteInPlace src/service/impl/appearancemanager.cpp \ - src/service/modules/{api/compatibleengine.cpp,subthemes/customtheme.cpp,background/backgrounds.cpp} \ - misc/dconfig/org.deepin.dde.appearance.json \ - fakewm/dbus/deepinwmfaker.cpp \ - --replace "/usr/share" "/run/current-system/sw/share" - - for file in $(grep -rl "/usr/bin/dde-appearance"); do - substituteInPlace $file --replace "/usr/bin/dde-appearance" "$out/bin/dde-appearance" - done - - substituteInPlace src/service/modules/api/themethumb.cpp \ - --replace "/usr/lib/deepin-api" "/run/current-system/sw/lib/deepin-api" - - substituteInPlace fakewm/dbus/deepinwmfaker.cpp \ - --replace "/usr/lib/deepin-daemon" "/run/current-system/sw/lib/deepin-daemon" - - substituteInPlace src/service/modules/api/locale.cpp \ - --replace "/usr/share/locale/locale.alias" "${iconv}/share/locale/locale.alias" - ''; - - nativeBuildInputs = [ - cmake - pkg-config - libsForQt5.wrapQtAppsHook - ]; - - buildInputs = [ - dtkgui - gsettings-qt - gtk3 - libsForQt5.kconfig - libsForQt5.kwindowsystem - libsForQt5.kglobalaccel - xorg.libXcursor - xorg.xcbutilcursor - ]; - - cmakeFlags = [ - "-DDSG_DATA_DIR=/run/current-system/sw/share/dsg" - "-DSYSTEMD_USER_UNIT_DIR=${placeholder "out"}/lib/systemd/user" - ]; - - meta = with lib; { - description = "Program used to set the theme and appearance of deepin desktop"; - homepage = "https://github.com/linuxdeepin/dde-appearance"; - license = licenses.lgpl3Plus; - platforms = platforms.linux; - teams = [ teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/core/dde-application-manager/default.nix b/pkgs/desktops/deepin/core/dde-application-manager/default.nix deleted file mode 100644 index 70806aacaa3c..000000000000 --- a/pkgs/desktops/deepin/core/dde-application-manager/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - cmake, - pkg-config, - qt6Packages, - dtk6core, -}: - -stdenv.mkDerivation rec { - pname = "dde-application-manager"; - version = "1.2.19"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-KUwX7oilV562WDxkBhTQhwz2lgcQIYwkmRRglWj0zh8="; - }; - - nativeBuildInputs = [ - cmake - pkg-config - qt6Packages.wrapQtAppsNoGuiHook - ]; - - buildInputs = [ - qt6Packages.qtbase - dtk6core - ]; - - meta = with lib; { - description = "Application manager for DDE"; - mainProgram = "dde-application-manager"; - homepage = "https://github.com/linuxdeepin/dde-application-manager"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - teams = [ teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/core/dde-calendar/default.nix b/pkgs/desktops/deepin/core/dde-calendar/default.nix deleted file mode 100644 index 7ff4a3ff4ebf..000000000000 --- a/pkgs/desktops/deepin/core/dde-calendar/default.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - cmake, - pkg-config, - libsForQt5, - dtkwidget, - qt5integration, - qt5platform-plugins, - dde-qt-dbus-factory, - libical, - sqlite, - runtimeShell, -}: - -stdenv.mkDerivation rec { - pname = "dde-calendar"; - version = "5.14.4"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-bZxNOBtLjop0eYxpMeoomaWYvPcMyDfQfgGPK9m+ARo="; - }; - - patches = [ ./fix-wrapped-name-not-in-whitelist.diff ]; - - postPatch = '' - for file in $(grep -rl "/bin/bash"); do - substituteInPlace $file --replace "/bin/bash" "${runtimeShell}" - done - ''; - - nativeBuildInputs = [ - cmake - libsForQt5.qttools - pkg-config - libsForQt5.wrapQtAppsHook - ]; - - buildInputs = [ - qt5integration - qt5platform-plugins - dtkwidget - libsForQt5.qtbase - libsForQt5.qtsvg - dde-qt-dbus-factory - libical - sqlite - ]; - - cmakeFlags = [ "-DVERSION=${version}" ]; - - strictDeps = true; - - meta = with lib; { - description = "Calendar for Deepin Desktop Environment"; - mainProgram = "dde-calendar"; - homepage = "https://github.com/linuxdeepin/dde-calendar"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - teams = [ teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/core/dde-calendar/fix-wrapped-name-not-in-whitelist.diff b/pkgs/desktops/deepin/core/dde-calendar/fix-wrapped-name-not-in-whitelist.diff deleted file mode 100644 index a139c4690a89..000000000000 --- a/pkgs/desktops/deepin/core/dde-calendar/fix-wrapped-name-not-in-whitelist.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/calendar-service/src/dbusservice/dservicebase.cpp b/calendar-service/src/dbusservice/dservicebase.cpp -index ac182881..93a9c2d8 100644 ---- a/calendar-service/src/dbusservice/dservicebase.cpp -+++ b/calendar-service/src/dbusservice/dservicebase.cpp -@@ -52,6 +52,8 @@ bool DServiceBase::clientWhite(const int index) - return true; - } - } -+ if (getClientName().contains("dde-calendar")) -+ return true; - return false; - #else - Q_UNUSED(index) diff --git a/pkgs/desktops/deepin/core/dde-clipboard/default.nix b/pkgs/desktops/deepin/core/dde-clipboard/default.nix deleted file mode 100644 index e49d55388557..000000000000 --- a/pkgs/desktops/deepin/core/dde-clipboard/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - dtkwidget, - gio-qt, - cmake, - extra-cmake-modules, - libsForQt5, - wayland, - dwayland, - pkg-config, - glibmm, - gtest, -}: - -stdenv.mkDerivation rec { - pname = "dde-clipboard"; - version = "6.0.11"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-VSwip3WgpOYvqGw7/A8bqsYrVSACrVgoIp/pjXSAKcU="; - }; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - pkg-config - libsForQt5.qttools - libsForQt5.wrapQtAppsHook - ]; - - buildInputs = [ - dtkwidget - gio-qt - wayland - dwayland - glibmm - gtest - ]; - - cmakeFlags = [ "-DSYSTEMD_USER_UNIT_DIR=${placeholder "out"}/lib/systemd/user" ]; - - meta = with lib; { - description = "DDE optional clipboard manager componment"; - homepage = "https://github.com/linuxdeepin/dde-clipboard"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - teams = [ teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/core/dde-control-center/default.nix b/pkgs/desktops/deepin/core/dde-control-center/default.nix deleted file mode 100644 index a3f6e7ea28c5..000000000000 --- a/pkgs/desktops/deepin/core/dde-control-center/default.nix +++ /dev/null @@ -1,89 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - cmake, - pkg-config, - doxygen, - wayland-scanner, - wayland, - dtkwidget, - qt5integration, - qt5platform-plugins, - libsForQt5, - deepin-pw-check, - libxcrypt, - gtest, - runtimeShell, -}: - -stdenv.mkDerivation rec { - pname = "dde-control-center"; - version = "6.0.65"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-9v2UtLjQQ3OX69UxMknLlrQhorahDI4Z4EEHItBs7G0="; - }; - - postPatch = '' - substituteInPlace src/plugin-accounts/operation/accountsworker.cpp \ - --replace "/bin/bash" "${runtimeShell}" - ''; - - nativeBuildInputs = [ - cmake - pkg-config - libsForQt5.qttools - doxygen - libsForQt5.wrapQtAppsHook - wayland-scanner - ]; - - buildInputs = [ - wayland - dtkwidget - qt5platform-plugins - qt5integration - deepin-pw-check - libsForQt5.qtbase - libsForQt5.qtmultimedia - libsForQt5.polkit-qt - libxcrypt - gtest - ]; - - env.PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user"; - - cmakeFlags = [ - "-DCVERSION=${version}" - "-DDISABLE_AUTHENTICATION=YES" - "-DDISABLE_UPDATE=YES" - "-DDISABLE_LANGUAGE=YES" - "-DBUILD_DOCS=OFF" - "-DMODULE_READ_DIR=/run/current-system/sw/lib/dde-control-center/modules" - "-DLOCALSTATE_READ_DIR=/var" - ]; - - preConfigure = '' - # qt.qpa.plugin: Could not find the Qt platform plugin "minimal" - # A workaround is to set QT_PLUGIN_PATH explicitly - export QT_PLUGIN_PATH=${libsForQt5.qtbase.bin}/${libsForQt5.qtbase.qtPluginPrefix} - ''; - - outputs = [ - "out" - "dev" - ]; - - meta = { - description = "Control panel of Deepin Desktop Environment"; - mainProgram = "dde-control-center"; - homepage = "https://github.com/linuxdeepin/dde-control-center"; - license = lib.licenses.gpl3Plus; - platforms = lib.platforms.linux; - teams = [ lib.teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/core/dde-file-manager/default.nix b/pkgs/desktops/deepin/core/dde-file-manager/default.nix deleted file mode 100644 index 39ad39418075..000000000000 --- a/pkgs/desktops/deepin/core/dde-file-manager/default.nix +++ /dev/null @@ -1,155 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - fetchpatch, - runtimeShell, - dtkwidget, - qt5integration, - qt5platform-plugins, - dde-qt-dbus-factory, - docparser, - dde-tray-loader, - cmake, - libsForQt5, - pkg-config, - ffmpegthumbnailer, - libsecret, - libmediainfo, - mediainfo, - libzen, - poppler, - polkit, - wrapGAppsHook3, - lucenepp, - boost, - taglib, - cryptsetup, - glib, - util-dfm, - deepin-pdfium, - libuuid, - libselinux, - glibmm, - pcre, - udisks2, - libisoburn, - gsettings-qt, -}: - -stdenv.mkDerivation rec { - pname = "dde-file-manager"; - version = "6.0.57"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-laM6PgNdUNbsqbzKFGWk7DPuAWR+XHo0eXKG0CDuc9c="; - }; - - nativeBuildInputs = [ - cmake - libsForQt5.qttools - pkg-config - libsForQt5.wrapQtAppsHook - wrapGAppsHook3 - ]; - dontWrapGApps = true; - - patches = [ - ./patch_check_v23_interface.diff - (fetchpatch { - name = "fix-permission-to-execute-dde-file-manager.patch"; - url = "https://github.com/linuxdeepin/dde-file-manager/commit/b78cc4bd08dd487f67c5a332a2a2f4d20b3798c7.patch"; - hash = "sha256-Tw3iu6sU0rrsM78WGMBpBgvA9YdRTM1ObjCxyM928F4="; - }) - ]; - - postPatch = '' - patchShebangs tests/*.sh \ - assets/scripts \ - src/*.sh \ - src/plugins/daemon/daemonplugin-accesscontrol/help.sh \ - src/apps/dde-file-manager/dde-property-dialog \ - src/apps/dde-desktop/data/applications/dfm-open.sh - - substituteInPlace assets/scripts/file-manager.sh \ - --replace-fail "/usr/libexec/dde-file-manager" "$out/libexec/dde-file-manager" - - substituteInPlace src/plugins/filemanager/dfmplugin-vault/utils/vaultdefine.h \ - --replace-fail "/usr/bin/deepin-compressor" "deepin-compressor" - - substituteInPlace src/plugins/filemanager/dfmplugin-avfsbrowser/utils/avfsutils.cpp \ - --replace-fail "/usr/bin/mountavfs" "mountavfs" \ - --replace-fail "/usr/bin/umountavfs" "umountavfs" - - substituteInPlace src/plugins/common/core/dfmplugin-menu/{extendmenuscene/extendmenu/dcustomactionparser.cpp,oemmenuscene/oemmenu.cpp} \ - --replace-fail "/usr" "$out" - - substituteInPlace src/tools/upgrade/dialog/processdialog.cpp \ - --replace-fail "/usr/bin/dde-file-manager" "dde-file-manager" \ - --replace-fail "/usr/bin/dde-desktop" "dde-desktop" - - substituteInPlace src/dfm-base/file/local/localfilehandler.cpp \ - --replace-fail "/usr/lib/deepin-daemon" "/run/current-system/sw/lib/deepin-daemon" - - substituteInPlace src/plugins/desktop/ddplugin-background/backgroundservice.cpp \ - src/plugins/desktop/ddplugin-wallpapersetting/wallpapersettings.cpp \ - --replace-fail "/usr/share/backgrounds" "/run/current-system/sw/share/backgrounds" - - find . -type f -regex ".*\\.\\(service\\|policy\\|desktop\\)" -exec sed -i -e "s|/usr/|$out/|g" {} \; - ''; - - buildInputs = [ - dtkwidget - qt5integration - qt5platform-plugins - deepin-pdfium - util-dfm - dde-qt-dbus-factory - glibmm - docparser - dde-tray-loader - libsForQt5.qtx11extras - libsForQt5.qtmultimedia - libsForQt5.kcodecs - ffmpegthumbnailer - libsecret - libmediainfo - mediainfo - poppler - libsForQt5.polkit-qt - polkit - lucenepp - boost - taglib - cryptsetup - libuuid - libselinux - pcre - udisks2 - libisoburn - gsettings-qt - ]; - - cmakeFlags = [ - "-DVERSION=${version}" - "-DNIX_DEEPIN_VERSION=23" - "-DSYSTEMD_USER_UNIT_DIR=${placeholder "out"}/lib/systemd/user" - ]; - - enableParallelBuilding = true; - - preFixup = '' - qtWrapperArgs+=("''${gappsWrapperArgs[@]}") - ''; - - meta = with lib; { - description = "File manager for deepin desktop environment"; - homepage = "https://github.com/linuxdeepin/dde-file-manager"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - teams = [ teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/core/dde-file-manager/patch_check_v23_interface.diff b/pkgs/desktops/deepin/core/dde-file-manager/patch_check_v23_interface.diff deleted file mode 100644 index c41306f59031..000000000000 --- a/pkgs/desktops/deepin/core/dde-file-manager/patch_check_v23_interface.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8a8cfb079..34092aa57 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -31,7 +31,7 @@ if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) - endif() - - #Indentify the version --if (${DEEPIN_OS_VERSION} MATCHES "23") -+if (${NIX_DEEPIN_VERSION} MATCHES "23") - add_definitions(-DCOMPILE_ON_V23) - set(COMPLIE_ON_V23 TRUE) - message("COMPILE ON v23") diff --git a/pkgs/desktops/deepin/core/dde-grand-search/default.nix b/pkgs/desktops/deepin/core/dde-grand-search/default.nix deleted file mode 100644 index 2acc258f6247..000000000000 --- a/pkgs/desktops/deepin/core/dde-grand-search/default.nix +++ /dev/null @@ -1,82 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - cmake, - libsForQt5, - pkg-config, - dtkwidget, - dde-qt-dbus-factory, - dde-tray-loader, - deepin-pdfium, - qt5integration, - qt5platform-plugins, - taglib_1, - ffmpeg, - ffmpegthumbnailer, - pcre, - lucenepp, - boost, -}: - -stdenv.mkDerivation rec { - pname = "dde-grand-search"; - version = "5.5.2"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-6s6M0cL8gjq1B5tuIRGPi8D69p4T8hPJv5QvBIvsO1w="; - }; - - nativeBuildInputs = [ - cmake - libsForQt5.qttools - pkg-config - libsForQt5.wrapQtAppsHook - ]; - - buildInputs = [ - dtkwidget - dde-tray-loader - dde-qt-dbus-factory - deepin-pdfium - qt5integration - qt5platform-plugins - taglib_1 - ffmpeg - ffmpegthumbnailer - pcre - lucenepp - boost - ]; - - patches = [ - # This patch revert the commit e6735e7 - # FIXME: why StartManager can't work, is dde-api-proxy still required? - ./fix-dbus-path-for-daemon.diff - ]; - - postPatch = '' - # fix access permit to daemon - substituteInPlace src/libgrand-search-daemon/dbusservice/grandsearchinterface.cpp \ - --replace-fail "/usr/bin/dde-grand-search" "$out/bin/.dde-grand-search-wrapped" - - for file in $(grep -rl "/usr/bin/dde-grand-search"); do - substituteInPlace $file --replace-fail "/usr/bin/dde-grand-search" "$out/bin/dde-grand-search" - done - - substituteAllInPlace src/grand-search-daemon/data/com.deepin.dde.daemon.GrandSearch.service - ''; - - cmakeFlags = [ "-DVERSION=${version}" ]; - - meta = { - description = "System-wide desktop search for DDE"; - homepage = "https://github.com/linuxdeepin/dde-grand-search"; - license = lib.licenses.gpl3Plus; - platforms = lib.platforms.linux; - teams = [ lib.teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/core/dde-grand-search/fix-dbus-path-for-daemon.diff b/pkgs/desktops/deepin/core/dde-grand-search/fix-dbus-path-for-daemon.diff deleted file mode 100644 index dd036bf6ec5e..000000000000 --- a/pkgs/desktops/deepin/core/dde-grand-search/fix-dbus-path-for-daemon.diff +++ /dev/null @@ -1,9 +0,0 @@ -diff --git a/src/grand-search-daemon/data/com.deepin.dde.daemon.GrandSearch.service b/src/grand-search-daemon/data/com.deepin.dde.daemon.GrandSearch.service -index 14823cb..33dd51e 100644 ---- a/src/grand-search-daemon/data/com.deepin.dde.daemon.GrandSearch.service -+++ b/src/grand-search-daemon/data/com.deepin.dde.daemon.GrandSearch.service -@@ -1,3 +1,3 @@ - [D-BUS Service] - Name=com.deepin.dde.daemon.GrandSearch --Exec=/usr/bin/dbus-send --print-reply --session --dest=com.deepin.SessionManager /com/deepin/StartManager com.deepin.StartManager.Launch string:/usr/share/applications/dde-grand-search-daemon.desktop -+Exec=@out@/bin/dde-grand-search-daemon diff --git a/pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix b/pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix deleted file mode 100644 index 6b8f892ed39b..000000000000 --- a/pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ - lib, - runCommand, - glib, - dde-grand-search, - startdde, - dde-session-shell, - dde-file-manager, - dde-tray-loader, - deepin-desktop-schemas, - deepin-system-monitor, - gsettings-desktop-schemas, - extraGSettingsOverrides ? "", - extraGSettingsOverridePackages ? [ ], -}: - -let - gsettingsOverridePackages = [ - dde-grand-search - startdde - dde-session-shell - dde-file-manager - dde-tray-loader - deepin-desktop-schemas - deepin-system-monitor - gsettings-desktop-schemas # dde-appearance need org.gnome.desktop.background - ] - ++ extraGSettingsOverridePackages; - -in -# TODO: Having https://github.com/NixOS/nixpkgs/issues/54150 would supersede this -runCommand "nixos-gsettings-desktop-schemas" { preferLocalBuild = true; } '' - data_dir="$out/share/gsettings-schemas/nixos-gsettings-overrides" - schema_dir="$data_dir/glib-2.0/schemas" - - mkdir -p $schema_dir - - ${lib.concatMapStringsSep "\n" ( - pkg: "cp -rf \"${glib.getSchemaPath pkg}\"/*.xml \"$schema_dir\"" - ) gsettingsOverridePackages} - - chmod -R a+w "$data_dir" - - cat - > "$schema_dir/nixos-defaults.gschema.override" <<- EOF - ${extraGSettingsOverrides} - EOF - - ${glib.dev}/bin/glib-compile-schemas $schema_dir -'' diff --git a/pkgs/desktops/deepin/core/dde-launchpad/default.nix b/pkgs/desktops/deepin/core/dde-launchpad/default.nix deleted file mode 100644 index a8d8cbbd5042..000000000000 --- a/pkgs/desktops/deepin/core/dde-launchpad/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - cmake, - pkg-config, - qt6Packages, - qt6integration, - qt6platform-plugins, - dtk6declarative, - dde-shell, -}: - -stdenv.mkDerivation rec { - pname = "dde-launchpad"; - version = "1.0.8"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-2arO1WSILY5TVPBvdyhttssddwhMYIBcCGq/pW/DnB0="; - }; - - nativeBuildInputs = [ - cmake - pkg-config - qt6Packages.qttools - qt6Packages.wrapQtAppsHook - ]; - - buildInputs = [ - qt6integration - qt6platform-plugins - dtk6declarative - dde-shell - ] - ++ (with qt6Packages; [ - qtbase - qtsvg - qtwayland - appstream-qt - ]); - - cmakeFlags = [ "-DSYSTEMD_USER_UNIT_DIR=${placeholder "out"}/lib/systemd/user" ]; - - meta = { - description = "'launcher' or 'start menu' component for DDE"; - mainProgram = "dde-launchpad"; - homepage = "https://github.com/linuxdeepin/dde-launchpad"; - license = lib.licenses.gpl3Plus; - platforms = lib.platforms.linux; - teams = [ lib.teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/core/dde-network-core/default.nix b/pkgs/desktops/deepin/core/dde-network-core/default.nix deleted file mode 100644 index 03e3173e6325..000000000000 --- a/pkgs/desktops/deepin/core/dde-network-core/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - cmake, - pkg-config, - dtkwidget, - dde-control-center, - dde-session-shell, - libsForQt5, - glib, - gtest, -}: - -stdenv.mkDerivation rec { - pname = "dde-network-core"; - version = "2.0.34"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-bS/PkutP5BQtqZ6MzeImFyGKoztoTswXhXaEftEv0FI="; - }; - - nativeBuildInputs = [ - cmake - libsForQt5.qttools - pkg-config - libsForQt5.wrapQtAppsHook - ]; - - buildInputs = [ - libsForQt5.qtbase - libsForQt5.qtsvg - dtkwidget - dde-control-center - dde-session-shell - libsForQt5.networkmanager-qt - glib - gtest - ]; - - cmakeFlags = [ "-DVERSION=${version}" ]; - - strictDeps = true; - - meta = { - description = "DDE network library framework"; - homepage = "https://github.com/linuxdeepin/dde-network-core"; - license = lib.licenses.gpl3Plus; - platforms = lib.platforms.linux; - teams = [ lib.teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/core/dde-polkit-agent/default.nix b/pkgs/desktops/deepin/core/dde-polkit-agent/default.nix deleted file mode 100644 index 39bd5fa8ea42..000000000000 --- a/pkgs/desktops/deepin/core/dde-polkit-agent/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - dtkwidget, - qt5integration, - qt5platform-plugins, - dde-qt-dbus-factory, - pkg-config, - cmake, - libsForQt5, -}: - -stdenv.mkDerivation rec { - pname = "dde-polkit-agent"; - version = "6.0.7"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-r2WVyy1lqcBJIQnRsPWlBFWQtSeZkq98J1S4dkipCys="; - }; - - nativeBuildInputs = [ - cmake - pkg-config - libsForQt5.qttools - libsForQt5.wrapQtAppsHook - ]; - - buildInputs = [ - dtkwidget - qt5integration - qt5platform-plugins - dde-qt-dbus-factory - libsForQt5.polkit-qt - ]; - - postFixup = '' - wrapQtApp $out/lib/polkit-1-dde/dde-polkit-agent - ''; - - meta = with lib; { - description = "PolicyKit agent for Deepin Desktop Environment"; - homepage = "https://github.com/linuxdeepin/dde-polkit-agent"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - teams = [ teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/core/dde-session-shell/default.nix b/pkgs/desktops/deepin/core/dde-session-shell/default.nix deleted file mode 100644 index e2ffff5407a5..000000000000 --- a/pkgs/desktops/deepin/core/dde-session-shell/default.nix +++ /dev/null @@ -1,111 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - linkFarm, - cmake, - pkg-config, - libsForQt5, - wrapGAppsHook3, - dtkwidget, - qt5integration, - qt5platform-plugins, - deepin-pw-check, - gsettings-qt, - lightdm_qt, - linux-pam, - xorg, - gtest, - xkeyboard_config, - dbus, - dde-session-shell, -}: - -stdenv.mkDerivation rec { - pname = "dde-session-shell"; - version = "6.0.21"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - # DDE 23 releases has moved to `linuxdeepin/dde-session-shell-snipe` - repo = "dde-session-shell-snipe"; - rev = version; - hash = "sha256-v0+Bz6J77Kgf4YV1iDhCqhmcNn493GFq1IEQbXBAVUU="; - }; - - postPatch = '' - substituteInPlace scripts/lightdm-deepin-greeter files/wayland/lightdm-deepin-greeter-wayland \ - --replace "/usr/lib/deepin-daemon" "/run/current-system/sw/lib/deepin-daemon" - - substituteInPlace src/session-widgets/auth_module.h \ - --replace "/usr/lib/dde-control-center" "/run/current-system/sw/lib/dde-control-center" - - substituteInPlace src/global_util/modules_loader.cpp \ - --replace "/usr/lib/dde-session-shell/modules" "/run/current-system/sw/lib/dde-session-shell/modules" - - substituteInPlace src/{session-widgets/{lockcontent.cpp,userinfo.cpp},widgets/fullscreenbackground.cpp} \ - --replace "/usr/share/backgrounds" "/run/current-system/sw/share/backgrounds" - - substituteInPlace src/global_util/xkbparser.h \ - --replace "/usr/share/X11/xkb/rules/base.xml" "${xkeyboard_config}/share/X11/xkb/rules/base.xml" - - substituteInPlace files/{org.deepin.dde.ShutdownFront1.service,org.deepin.dde.LockFront1.service} \ - --replace "/usr/bin/dbus-send" "${dbus}/bin/dbus-send" \ - --replace "/usr/share" "$out/share" - - substituteInPlace src/global_util/{public_func.cpp,constants.h} scripts/lightdm-deepin-greeter files/{dde-lock.desktop,lightdm-deepin-greeter.desktop,wayland/lightdm-deepin-greeter-wayland.desktop} \ - --replace "/usr" "$out" - - patchShebangs files/deepin-greeter - ''; - - nativeBuildInputs = [ - cmake - pkg-config - libsForQt5.qttools - libsForQt5.wrapQtAppsHook - wrapGAppsHook3 - ]; - dontWrapGApps = true; - - buildInputs = [ - libsForQt5.qtbase - dtkwidget - qt5integration - qt5platform-plugins - deepin-pw-check - gsettings-qt - lightdm_qt - libsForQt5.qtx11extras - linux-pam - xorg.libXcursor - xorg.libXtst - xorg.libXrandr - xorg.libXdmcp - gtest - ]; - - outputs = [ - "out" - "dev" - ]; - - preFixup = '' - qtWrapperArgs+=("''${gappsWrapperArgs[@]}") - ''; - - passthru.xgreeters = linkFarm "deepin-greeter-xgreeters" [ - { - path = "${dde-session-shell}/share/xgreeters/lightdm-deepin-greeter.desktop"; - name = "lightdm-deepin-greeter.desktop"; - } - ]; - - meta = with lib; { - description = "Deepin desktop-environment - session-shell module"; - homepage = "https://github.com/linuxdeepin/dde-session-shell"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - teams = [ teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/core/dde-session-ui/default.nix b/pkgs/desktops/deepin/core/dde-session-ui/default.nix deleted file mode 100644 index 106e8fe80e52..000000000000 --- a/pkgs/desktops/deepin/core/dde-session-ui/default.nix +++ /dev/null @@ -1,72 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - cmake, - pkg-config, - libsForQt5, - dtkwidget, - qt5integration, - qt5platform-plugins, - dde-tray-loader, - gsettings-qt, - gtest, -}: - -stdenv.mkDerivation rec { - pname = "dde-session-ui"; - version = "6.0.20"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-3twtJ1KT7TqpyLopHqPY2Lo8oZsH9liir0SJUV/k3OU="; - }; - - postPatch = '' - substituteInPlace widgets/fullscreenbackground.cpp \ - --replace "/usr/share/backgrounds" "/run/current-system/sw/share/backgrounds" \ - --replace "/usr/share/wallpapers" "/run/current-system/sw/share/wallpapers" - - substituteInPlace dde-warning-dialog/src/org.deepin.dde.WarningDialog1.service dde-welcome/src/org.deepin.dde.Welcome1.service \ - --replace "/usr/lib/deepin-daemon" "/run/current-system/sw/lib/deepin-daemon" - - substituteInPlace dmemory-warning-dialog/src/org.deepin.dde.MemoryWarningDialog1.service \ - --replace "/usr" "$out" - ''; - - nativeBuildInputs = [ - cmake - pkg-config - libsForQt5.qttools - libsForQt5.wrapQtAppsHook - ]; - - buildInputs = [ - libsForQt5.qtbase - dtkwidget - qt5platform-plugins - qt5integration - dde-tray-loader - gsettings-qt - libsForQt5.qtx11extras - gtest - ]; - - cmakeFlags = [ "-DDISABLE_SYS_UPDATE=ON" ]; - - postFixup = '' - for binary in $out/lib/deepin-daemon/*; do - wrapProgram $binary "''${qtWrapperArgs[@]}" - done - ''; - - meta = with lib; { - description = "Deepin desktop-environment - Session UI module"; - homepage = "https://github.com/linuxdeepin/dde-session-ui"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - teams = [ teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/core/dde-session/default.nix b/pkgs/desktops/deepin/core/dde-session/default.nix deleted file mode 100644 index 6a69822abbb5..000000000000 --- a/pkgs/desktops/deepin/core/dde-session/default.nix +++ /dev/null @@ -1,72 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - cmake, - pkg-config, - libsForQt5, - dtkcore, - gsettings-qt, - libsecret, - xorg, - systemd, - dde-polkit-agent, -}: - -stdenv.mkDerivation rec { - pname = "dde-session"; - version = "1.2.12"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-WiWG4f+vMgAYDBp/porjiV9a6ZqqdmxdXAqX1ISdlfU="; - }; - - postPatch = '' - substituteInPlace misc/CMakeLists.txt \ - --replace "/etc" "$out/etc" - - # Avoid using absolute path to distinguish applications - substituteInPlace src/dde-session/impl/sessionmanager.cpp \ - --replace 'file.readAll().startsWith("/usr/bin/dde-lock")' 'file.readAll().contains("dde-lock")' \ - - substituteInPlace systemd/dde-session-initialized.target.wants/dde-polkit-agent.service \ - --replace "/usr/lib/polkit-1-dde" "${dde-polkit-agent}/lib/polkit-1-dde" - - for file in $(grep -rl "/usr/lib/deepin-daemon"); do - substituteInPlace $file --replace "/usr/lib/deepin-daemon" "/run/current-system/sw/lib/deepin-daemon" - done - - for file in $(grep -rl "/usr/bin"); do - substituteInPlace $file --replace "/usr/bin/" "/run/current-system/sw/bin/" - done - ''; - - nativeBuildInputs = [ - cmake - pkg-config - libsForQt5.wrapQtAppsHook - ]; - - buildInputs = [ - libsForQt5.qtbase - dtkcore - gsettings-qt - libsecret - xorg.libXcursor - systemd - ]; - - # FIXME: dde-wayland always exits abnormally - passthru.providedSessions = [ "dde-x11" ]; - - meta = with lib; { - description = "New deepin session based on systemd and existing projects"; - homepage = "https://github.com/linuxdeepin/dde-session"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - teams = [ teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/core/dde-shell/default.nix b/pkgs/desktops/deepin/core/dde-shell/default.nix deleted file mode 100644 index 026e2da584bf..000000000000 --- a/pkgs/desktops/deepin/core/dde-shell/default.nix +++ /dev/null @@ -1,106 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - fetchpatch, - cmake, - extra-cmake-modules, - pkg-config, - wayland-scanner, - dtk6declarative, - dtk6widget, - dde-qt-dbus-factory, - qt6Packages, - qt6integration, - qt6platform-plugins, - dde-tray-loader, - dde-application-manager, - wayland, - wayland-protocols, - treeland-protocols, - yaml-cpp, - xorg, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "dde-shell"; - version = "1.0.10"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = "dde-shell"; - rev = finalAttrs.version; - hash = "sha256-0nyTvSIJglx8raehPi6pYfQcxIjsCAaD1hVbuGvtfY8="; - }; - - patches = [ - ./fix-path-for-nixos.diff - (fetchpatch { - name = "resolve-compilation-issues-on-Qt-6_9.patch"; - url = "https://github.com/linuxdeepin/dde-shell/commit/936d62a2c20398b9ca6ae28f9101dd288c8b1678.patch"; - hash = "sha256-u5TcPy2kZsOLGUgjTGZ5JX3mWnr/rOQ3SWBRyjWEiw4="; - }) - (fetchpatch { - name = "adapt-import-change-of-QtQml-Models-in-Qt-6_9.patch"; - url = "https://github.com/linuxdeepin/dde-shell/commit/ad92c160508a5eb53fd5af558ef1b1ba881b97ac.patch"; - hash = "sha256-3GdkbFEt51EP04RQN54EDsGyXkeZoWhbnQAHkwjUeGY="; - }) - - ]; - - postPatch = '' - for file in $(grep -rl "/usr/lib/dde-dock"); do - substituteInPlace $file --replace-fail "/usr/lib/dde-dock" "/run/current-system/sw/lib/dde-dock" - done - - for file in $(grep -rl "/usr/lib/deepin-daemon"); do - substituteInPlace $file --replace-fail "/usr/lib/deepin-daemon" "/run/current-system/sw/lib/deepin-daemon" - done - ''; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - pkg-config - qt6Packages.wrapQtAppsHook - qt6Packages.qttools - wayland-scanner - ]; - - buildInputs = [ - dde-tray-loader - dde-application-manager - dtk6declarative - dtk6widget - dde-qt-dbus-factory - qt6Packages.qtbase - qt6Packages.qtwayland - qt6Packages.qtsvg - qt6platform-plugins - qt6integration - wayland - wayland-protocols - treeland-protocols - yaml-cpp - xorg.libXcursor - xorg.libXres - ]; - - env.PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user"; - - cmakeFlags = [ "-DQML_INSTALL_DIR=${placeholder "out"}/${qt6Packages.qtbase.qtQmlPrefix}" ]; - - qtWrapperArgs = [ - "--prefix TRAY_LOADER_EXECUTE_PATH : ${dde-tray-loader}/libexec/trayplugin-loader" - "--suffix DDE_SHELL_PLUGIN_PATH : /run/current-system/sw/lib/dde-shell" - "--suffix DDE_SHELL_PACKAGE_PATH : /run/current-system/sw/share/dde-shell" - ]; - - meta = { - description = "Plugin system that integrates plugins developed on DDE"; - homepage = "https://github.com/linuxdeepin/dde-shell"; - license = with lib.licenses; [ gpl3Plus ]; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ rewine ]; - }; -}) diff --git a/pkgs/desktops/deepin/core/dde-shell/fix-path-for-nixos.diff b/pkgs/desktops/deepin/core/dde-shell/fix-path-for-nixos.diff deleted file mode 100644 index cc334a3220a4..000000000000 --- a/pkgs/desktops/deepin/core/dde-shell/fix-path-for-nixos.diff +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/misc/DDEShellConfig.cmake.in b/misc/DDEShellConfig.cmake.in -index e28cc2f..3875769 100644 ---- a/misc/DDEShellConfig.cmake.in -+++ b/misc/DDEShellConfig.cmake.in -@@ -5,9 +5,9 @@ find_dependency(Dtk@DTK_VERSION_MAJOR@Gui) - find_package(Qt@QT_VERSION_MAJOR@ COMPONENTS Qml Quick REQUIRED) - - include(${CMAKE_CURRENT_LIST_DIR}/DDEShellTargets.cmake) --set(DDE_SHELL_PACKAGE_INSTALL_DIR @CMAKE_INSTALL_PREFIX@/@DDE_SHELL_PACKAGE_INSTALL_DIR@) --set(DDE_SHELL_PLUGIN_INSTALL_DIR @CMAKE_INSTALL_PREFIX@/@DDE_SHELL_PLUGIN_INSTALL_DIR@) --set(DDE_SHELL_TRANSLATION_INSTALL_DIR @CMAKE_INSTALL_PREFIX@/@DDE_SHELL_TRANSLATION_INSTALL_DIR@) -+set(DDE_SHELL_PACKAGE_INSTALL_DIR ${CMAKE_INSTALL_DATADIR}/dde-shell) -+set(DDE_SHELL_PLUGIN_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/dde-shell) -+set(DDE_SHELL_TRANSLATION_INSTALL_DIR ${CMAKE_INSTALL_DATADIR}/dde-shell) - check_required_components(Dtk@DTK_VERSION_MAJOR@Core) - - include("${CMAKE_CURRENT_LIST_DIR}/DDEShellPackageMacros.cmake") diff --git a/pkgs/desktops/deepin/core/dde-tray-loader/default.nix b/pkgs/desktops/deepin/core/dde-tray-loader/default.nix deleted file mode 100644 index 858924b5d140..000000000000 --- a/pkgs/desktops/deepin/core/dde-tray-loader/default.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - fetchpatch, - cmake, - extra-cmake-modules, - pkg-config, - dtkwidget, - dde-qt-dbus-factory, - qt5integration, - qt5platform-plugins, - wayland, - wayland-scanner, - xorg, - libsForQt5, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "dde-tray-loader"; - version = "1.0.9"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = "dde-tray-loader"; - rev = finalAttrs.version; - hash = "sha256-3rmLQRGtBLASr0VSsIfGP0R9HDxFlea+iNbVjkqKTVg="; - }; - - patches = [ - (fetchpatch { - name = "remove-useless-function.patch"; - url = "https://github.com/linuxdeepin/dde-tray-loader/commit/cf85f68db52472a0291bbbc3c298d7a2b701e4bc.patch"; - hash = "sha256-ks7Rg5kLQvo03XKbfQaqu/heP2yoVEbNO6UhDv99JBY="; - }) - ]; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - pkg-config - libsForQt5.wrapQtAppsHook - libsForQt5.qttools - wayland-scanner - ]; - - buildInputs = [ - dtkwidget - dde-qt-dbus-factory - qt5integration - qt5platform-plugins - libsForQt5.qtbase - libsForQt5.qtsvg - libsForQt5.qtwayland - libsForQt5.networkmanager-qt - libsForQt5.libdbusmenu - wayland - xorg.libXcursor - xorg.libXtst - ]; - - meta = { - description = "Tray plugins that integrated into task bar"; - homepage = "https://github.com/linuxdeepin/dde-tray-loader"; - license = with lib.licenses; [ gpl3Plus ]; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ rewine ]; - }; -}) diff --git a/pkgs/desktops/deepin/core/dde-widgets/default.nix b/pkgs/desktops/deepin/core/dde-widgets/default.nix deleted file mode 100644 index c63886c43ab4..000000000000 --- a/pkgs/desktops/deepin/core/dde-widgets/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - cmake, - pkg-config, - dde-qt-dbus-factory, - dtkwidget, - libsForQt5, - qt5integration, - gtest, -}: - -stdenv.mkDerivation rec { - pname = "dde-widgets"; - version = "6.0.23"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-aeWQdWi1mMche7AJhAvchRXu89hiZ+CM/RR9HvvbXTw="; - }; - - nativeBuildInputs = [ - cmake - pkg-config - dde-qt-dbus-factory - libsForQt5.wrapQtAppsHook - ]; - - buildInputs = [ - libsForQt5.qtbase - libsForQt5.qtx11extras - dtkwidget - qt5integration - gtest - ]; - - meta = with lib; { - description = "Desktop widgets service/implementation for DDE"; - mainProgram = "dde-widgets"; - homepage = "https://github.com/linuxdeepin/dde-widgets"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - teams = [ teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/core/deepin-kwin/0001-hardcode-fallback-background.diff b/pkgs/desktops/deepin/core/deepin-kwin/0001-hardcode-fallback-background.diff deleted file mode 100644 index 872fa26c5e55..000000000000 --- a/pkgs/desktops/deepin/core/deepin-kwin/0001-hardcode-fallback-background.diff +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/src/effects/multitaskview/multitaskview.cpp b/src/effects/multitaskview/multitaskview.cpp -index 268bc42..d41f7bf 100644 ---- a/src/effects/multitaskview/multitaskview.cpp -+++ b/src/effects/multitaskview/multitaskview.cpp -@@ -50,8 +50,8 @@ - #define SCISSOR_HOFFD 400 - - const char screen_recorder[] = "deepin-screen-recorder deepin-screen-recorder"; --const char fallback_background_name[] = "file:///usr/share/wallpapers/deepin/desktop.jpg"; --const char previous_default_background_name[] = "file:///usr/share/backgrounds/default_background.jpg"; -+const char fallback_background_name[] = "file:///run/current-system/sw/share/wallpapers/deepin/desktop.jpg"; -+const char previous_default_background_name[] = "file:///run/current-system/sw/share/backgrounds/default_background.jpg"; - const char add_workspace_png[] = ":/effects/multitaskview/buttons/add-light.png";//":/resources/themes/add-light.svg"; - const char delete_workspace_png[] = ":/effects/multitaskview/buttons/workspace_delete.png"; - diff --git a/pkgs/desktops/deepin/core/deepin-kwin/default.nix b/pkgs/desktops/deepin/core/deepin-kwin/default.nix deleted file mode 100644 index 8cf6180f3652..000000000000 --- a/pkgs/desktops/deepin/core/deepin-kwin/default.nix +++ /dev/null @@ -1,98 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - cmake, - pkg-config, - wayland, - dwayland, - libsForQt5, - extra-cmake-modules, - gsettings-qt, - libepoxy, - libinput, - libgbm, - lcms2, - xorg, -}: - -stdenv.mkDerivation rec { - pname = "deepin-kwin"; - version = "5.25.27"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-EjPPjdxa+iL/nXhuccoM3NiLmGXh7Un2aGz8O3sP6xE="; - }; - - patches = [ ./0001-hardcode-fallback-background.diff ]; - - # Avoid using absolute path to distinguish applications - postPatch = '' - substituteInPlace src/effects/screenshot/screenshotdbusinterface1.cpp \ - --replace 'file.readAll().startsWith(DEFINE_DDE_DOCK_PATH"dde-dock")' 'file.readAll().contains("dde-dock")' - ''; - - nativeBuildInputs = [ - cmake - pkg-config - extra-cmake-modules - libsForQt5.wrapQtAppsHook - libsForQt5.qttools - ]; - - buildInputs = [ - wayland - dwayland - libepoxy - gsettings-qt - - libinput - libgbm - lcms2 - - xorg.libxcb - xorg.libXdmcp - xorg.libXcursor - xorg.xcbutilcursor - xorg.libXtst - xorg.libXScrnSaver - ] - ++ (with libsForQt5; [ - qtbase - qtx11extras - kconfig - kconfigwidgets - kcoreaddons - kcrash - kdbusaddons - kiconthemes - kglobalaccel - kidletime - knotifications - kpackage - plasma-framework - kcmutils - knewstuff - kdecoration - kscreenlocker - breeze-qt5 - ]); - - cmakeFlags = [ "-DKWIN_BUILD_RUNNERS=OFF" ]; - - outputs = [ - "out" - "dev" - ]; - - meta = { - description = "Fork of kwin, an easy to use, but flexible, composited Window Manager"; - homepage = "https://github.com/linuxdeepin/deepin-kwin"; - license = lib.licenses.lgpl21Plus; - platforms = lib.platforms.linux; - teams = [ lib.teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/core/deepin-service-manager/default.nix b/pkgs/desktops/deepin/core/deepin-service-manager/default.nix deleted file mode 100644 index 5e06cc3c6a70..000000000000 --- a/pkgs/desktops/deepin/core/deepin-service-manager/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - cmake, - pkg-config, - libsForQt5, -}: - -stdenv.mkDerivation rec { - pname = "deepin-service-manager"; - version = "1.0.3"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-gTzyQHFPyn2+A+o+4VYySDBCZftfG2WnTXuqzeF+QhA="; - }; - - postPatch = '' - for file in $(grep -rl "/usr/bin/deepin-service-manager"); do - substituteInPlace $file --replace "/usr/bin/deepin-service-manager" "$out/bin/deepin-service-manager" - done - ''; - - nativeBuildInputs = [ - cmake - pkg-config - libsForQt5.wrapQtAppsHook - ]; - - meta = with lib; { - description = "Manage DBus service on Deepin"; - mainProgram = "deepin-service-manager"; - homepage = "https://github.com/linuxdeepin/deepin-service-manager"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - teams = [ teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/core/dpa-ext-gnomekeyring/default.nix b/pkgs/desktops/deepin/core/dpa-ext-gnomekeyring/default.nix deleted file mode 100644 index 69a503b887ed..000000000000 --- a/pkgs/desktops/deepin/core/dpa-ext-gnomekeyring/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - cmake, - pkg-config, - libsForQt5, - dtkwidget, - dde-polkit-agent, - qt5integration, - libsecret, -}: - -stdenv.mkDerivation rec { - pname = "dpa-ext-gnomekeyring"; - version = "6.0.1"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-SyoahSdGPkWitDek4RD5M2hTR78GFpuijryteKVAx6k="; - }; - - postPatch = '' - substituteInPlace gnomekeyringextention.cpp \ - --replace "/usr/share/dpa-ext-gnomekeyring" "$out/share/dpa-ext-gnomekeyring" - ''; - - nativeBuildInputs = [ - cmake - pkg-config - libsForQt5.qttools - libsForQt5.wrapQtAppsHook - ]; - - buildInputs = [ - dtkwidget - dde-polkit-agent - qt5integration - libsecret - ]; - - meta = with lib; { - description = "GNOME keyring extension for dde-polkit-agent"; - homepage = "https://github.com/linuxdeepin/dpa-ext-gnomekeyring"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - teams = [ teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix deleted file mode 100644 index a7e01c215d11..000000000000 --- a/pkgs/desktops/deepin/default.nix +++ /dev/null @@ -1,121 +0,0 @@ -{ - lib, - config, - pkgs, -}: -let - packages = - self: - let - inherit (self) callPackage; - in - { - #### LIBRARIES - dtkcommon = callPackage ./library/dtkcommon { }; - dtkcore = callPackage ./library/dtkcore { }; - dtkgui = callPackage ./library/dtkgui { }; - dtkwidget = callPackage ./library/dtkwidget { }; - dtkdeclarative = callPackage ./library/dtkdeclarative { }; - dtklog = callPackage ./library/dtklog { }; - deepin-pdfium = callPackage ./library/deepin-pdfium { }; - qt5platform-plugins = callPackage ./library/qt5platform-plugins { }; - qt5integration = callPackage ./library/qt5integration { }; - deepin-wayland-protocols = callPackage ./library/deepin-wayland-protocols { }; - dwayland = callPackage ./library/dwayland { }; - dde-qt-dbus-factory = callPackage ./library/dde-qt-dbus-factory { }; - disomaster = callPackage ./library/disomaster { }; - docparser = callPackage ./library/docparser { }; - gio-qt = callPackage ./library/gio-qt { }; - udisks2-qt5 = callPackage ./library/udisks2-qt5 { }; - util-dfm = callPackage ./library/util-dfm { }; - dtk6core = callPackage ./library/dtk6core { }; - dtk6gui = callPackage ./library/dtk6gui { }; - dtk6widget = callPackage ./library/dtk6widget { }; - dtk6declarative = callPackage ./library/dtk6declarative { }; - dtk6systemsettings = callPackage ./library/dtk6systemsettings { }; - dtk6log = callPackage ./library/dtk6log { }; - qt6platform-plugins = callPackage ./library/qt6platform-plugins { }; - qt6integration = callPackage ./library/qt6integration { }; - qt6mpris = callPackage ./library/qt6mpris { }; - treeland-protocols = callPackage ./library/treeland-protocols { }; - - #### CORE - deepin-kwin = callPackage ./core/deepin-kwin { }; - dde-appearance = callPackage ./core/dde-appearance { }; - dde-app-services = callPackage ./core/dde-app-services { }; - dde-application-manager = callPackage ./core/dde-application-manager { }; - dde-control-center = callPackage ./core/dde-control-center { }; - dde-calendar = callPackage ./core/dde-calendar { }; - dde-clipboard = callPackage ./core/dde-clipboard { }; - dde-file-manager = callPackage ./core/dde-file-manager { }; - dde-launchpad = callPackage ./core/dde-launchpad { }; - dde-network-core = callPackage ./core/dde-network-core { }; - dde-session = callPackage ./core/dde-session { }; - dde-session-shell = callPackage ./core/dde-session-shell { }; - dde-session-ui = callPackage ./core/dde-session-ui { }; - deepin-service-manager = callPackage ./core/deepin-service-manager { }; - dde-polkit-agent = callPackage ./core/dde-polkit-agent { }; - dpa-ext-gnomekeyring = callPackage ./core/dpa-ext-gnomekeyring { }; - dde-gsettings-schemas = callPackage ./core/dde-gsettings-schemas { }; - dde-widgets = callPackage ./core/dde-widgets { }; - dde-shell = callPackage ./core/dde-shell { }; - dde-grand-search = callPackage ./core/dde-grand-search { }; - dde-tray-loader = callPackage ./core/dde-tray-loader { }; - dde-api-proxy = callPackage ./core/dde-api-proxy { }; - - #### Dtk Application - deepin-calculator = callPackage ./apps/deepin-calculator { }; - deepin-compressor = callPackage ./apps/deepin-compressor { }; - deepin-draw = callPackage ./apps/deepin-draw { }; - deepin-editor = callPackage ./apps/deepin-editor { }; - deepin-music = callPackage ./apps/deepin-music { }; - deepin-picker = callPackage ./apps/deepin-picker { }; - deepin-shortcut-viewer = callPackage ./apps/deepin-shortcut-viewer { }; - deepin-system-monitor = callPackage ./apps/deepin-system-monitor { }; - deepin-terminal = callPackage ./apps/deepin-terminal { }; - deepin-reader = callPackage ./apps/deepin-reader { }; - deepin-screensaver = callPackage ./apps/deepin-screensaver { }; - - #### Go Packages - dde-api = callPackage ./go-package/dde-api { }; - dde-daemon = callPackage ./go-package/dde-daemon { }; - deepin-pw-check = callPackage ./go-package/deepin-pw-check { }; - deepin-desktop-schemas = callPackage ./go-package/deepin-desktop-schemas { }; - startdde = callPackage ./go-package/startdde { }; - - #### TOOLS - dde-device-formatter = callPackage ./tools/dde-device-formatter { }; - deepin-gettext-tools = callPackage ./tools/deepin-gettext-tools { }; - deepin-anything = callPackage ./tools/deepin-anything { }; - - #### ARTWORK - dde-account-faces = callPackage ./artwork/dde-account-faces { }; - deepin-icon-theme = callPackage ./artwork/deepin-icon-theme { }; - deepin-wallpapers = callPackage ./artwork/deepin-wallpapers { }; - deepin-gtk-theme = callPackage ./artwork/deepin-gtk-theme { }; - deepin-sound-theme = callPackage ./artwork/deepin-sound-theme { }; - deepin-desktop-theme = callPackage ./artwork/deepin-desktop-theme { }; - - #### MISC - deepin-desktop-base = callPackage ./misc/deepin-desktop-base { }; - } - // lib.optionalAttrs config.allowAliases { - dde-kwin = throw "The 'deepin.dde-kwin' package was removed as it is outdated and no longer relevant."; # added 2023-09-27 - dde-launcher = throw "The 'deepin.dde-launcher' is no longer maintained. Please use 'deepin.dde-launchpad' instead."; # added 2023-11-23 - dde-dock = throw "The 'deepin.dde-dock' is no longer maintained. Please use 'deepin.dde-tray-loader' instead."; # added 2024-08-28 - deepin-clone = throw "The 'deepin.deepin-clone' package was removed as it is broken and unmaintained."; # added 2024-08-23 - deepin-turbo = throw "The 'deepin.deepin-turbo' package was removed as it is outdated and no longer relevant."; # added 2024-12-06 - go-lib = throw "Then 'deepin.go-lib' package was removed, use 'go mod' to manage it"; # added 2024-05-31 - go-gir-generator = throw "Then 'deepin.go-gir-generator' package was removed, use 'go mod' to manage it"; # added 2024-05-31 - go-dbus-factory = throw "Then 'deepin.go-dbus-factory' package was removed, use 'go mod' to manage it"; # added 2024-05-31 - deepin-movie-reborn = throw "'deepin.deepin-movie-reborn' has been removed as it was broken and unmaintained in nixpkgs, Please use 'vlc' instead"; # added 2025-01-16; - deepin-album = throw "'deepin.deepin-album' has been removed as it was broken and unmaintained in nixpkgs, Please use 'kdePackages.gwenview' instead"; # added 2025-01-16 - deepin-voice-note = throw "'deepin.deepin-voice-note' has been removed as it depending on deepin-movie-reborn which was broken"; # added 2025-01-16 - deepin-screen-recorder = throw "'deepin.deepin-screen-recorder' has been removed as it was broken and unmaintained in nixpkgs, Please use 'flameshot' or 'simplescreenrecorder' instead"; # added 2025-01-16 - deepin-ocr-plugin-manager = throw "'deepin.deepin-ocr-plugin-manager' has been removed as it was outdated"; # added 2025-01-16 - deepin-camera = throw "'deepin.deepin-camera' has been removed as it was unmaintained in nixpkgs, Please use 'snapshot' instead"; # added 2025-01-16 - deepin-image-viewer = throw "'deepin.deepin-image-viewer' has been removed as it was broken and unmaintained in nixpkgs, Please use 'kdePackages.gwenview' instead"; # added 2025-01-16 - image-editor = throw "'deepin.image-editor' has been removed as it was unmaintained in nixpkgs"; # added 2025-01-16 - }; -in -lib.makeScope pkgs.newScope packages diff --git a/pkgs/desktops/deepin/go-package/dde-api/default.nix b/pkgs/desktops/deepin/go-package/dde-api/default.nix deleted file mode 100644 index e93b47bc9c1c..000000000000 --- a/pkgs/desktops/deepin/go-package/dde-api/default.nix +++ /dev/null @@ -1,100 +0,0 @@ -{ - lib, - fetchFromGitHub, - buildGoModule, - pkg-config, - deepin-gettext-tools, - wrapGAppsHook3, - alsa-lib, - gtk3, - libcanberra, - libgudev, - librsvg, - poppler, - pulseaudio, - gdk-pixbuf-xlib, - coreutils, - dbus, -}: - -buildGoModule rec { - pname = "dde-api"; - version = "6.0.11"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-VpZwVNXxdi8ODwxbksQpT0nnUuLOTJ9h0JYucEKdGYM="; - }; - - vendorHash = "sha256-zrtUsCF2+301DKwgWectw+UbOehOp8h8u/IMf09XQ8Q="; - - postPatch = '' - substituteInPlace misc/systemd/system/deepin-shutdown-sound.service \ - --replace-fail "/usr/bin/true" "${coreutils}/bin/true" - - substituteInPlace sound-theme-player/main.go \ - --replace-fail "/usr/sbin/alsactl" "alsactl" - - substituteInPlace misc/{scripts/deepin-boot-sound.sh,systemd/system/deepin-login-sound.service} \ - --replace-fail "/usr/bin/dbus-send" "${dbus}/bin/dbus-send" - - substituteInPlace lunar-calendar/huangli.go adjust-grub-theme/main.go \ - --replace-fail "/usr/share/dde-api" "$out/share/dde-api" - - substituteInPlace themes/{theme.go,settings.go} \ - --replace-fail "/usr/share" "/run/current-system/sw/share" - - for file in $(grep "/usr/lib/deepin-api" * -nR |awk -F: '{print $1}') - do - sed -i 's|/usr/lib/deepin-api|/run/current-system/sw/lib/deepin-api|g' $file - done - ''; - - nativeBuildInputs = [ - pkg-config - deepin-gettext-tools - wrapGAppsHook3 - ]; - - buildInputs = [ - alsa-lib - gtk3 - libcanberra - libgudev - librsvg - poppler - pulseaudio - gdk-pixbuf-xlib - ]; - - buildPhase = '' - runHook preBuild - make GOBUILD_OPTIONS="$GOFLAGS" - runHook postBuild - ''; - - doCheck = false; - - installPhase = '' - runHook preInstall - make install DESTDIR="$out" PREFIX="/" - runHook postInstall - ''; - - postFixup = '' - for binary in $out/lib/deepin-api/*; do - wrapProgram $binary "''${gappsWrapperArgs[@]}" - done - ''; - - meta = with lib; { - description = "Dbus interfaces used for screen zone detecting, thumbnail generating, sound playing, etc"; - mainProgram = "dde-open"; - homepage = "https://github.com/linuxdeepin/dde-api"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - teams = [ teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/go-package/dde-daemon/0001-dont-set-PATH.diff b/pkgs/desktops/deepin/go-package/dde-daemon/0001-dont-set-PATH.diff deleted file mode 100644 index f1d9f8017af6..000000000000 --- a/pkgs/desktops/deepin/go-package/dde-daemon/0001-dont-set-PATH.diff +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/grub2/modify_manger.go b/grub2/modify_manger.go -index a811770b..30e9561e 100644 ---- a/grub2/modify_manger.go -+++ b/grub2/modify_manger.go -@@ -21,7 +21,6 @@ const ( - ) - - func init() { -- _ = os.Setenv("PATH", "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin") - } - - type modifyManager struct { --- -2.39.2 - diff --git a/pkgs/desktops/deepin/go-package/dde-daemon/0002-fix-custom-wallpapers-path.diff b/pkgs/desktops/deepin/go-package/dde-daemon/0002-fix-custom-wallpapers-path.diff deleted file mode 100644 index 5d4bddd08009..000000000000 --- a/pkgs/desktops/deepin/go-package/dde-daemon/0002-fix-custom-wallpapers-path.diff +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/bin/dde-system-daemon/wallpaper.go b/bin/dde-system-daemon/wallpaper.go -index 6ee26e27..67dc77dc 100644 ---- a/bin/dde-system-daemon/wallpaper.go -+++ b/bin/dde-system-daemon/wallpaper.go -@@ -24,7 +24,7 @@ import ( - - const maxCount = 5 - const maxSize = 32 * 1024 * 1024 --const wallPaperDir = "/usr/share/wallpapers/custom-wallpapers/" -+const wallPaperDir = "/var/lib/dde-daemon/wallpapers/custom-wallpapers/" - - func GetUserDir(username string) (string, error) { - dir := filepath.Join(wallPaperDir, username) -@@ -136,7 +136,7 @@ func (d *Daemon) SaveCustomWallPaper(sender dbus.Sender, username string, file s - "-u", - username, - "--", -- "head", -+ "@coreutils@/bin/head", - "-c", - "0", - file, --- -2.40.1 - diff --git a/pkgs/desktops/deepin/go-package/dde-daemon/0003-aviod-use-hardcode-path.diff b/pkgs/desktops/deepin/go-package/dde-daemon/0003-aviod-use-hardcode-path.diff deleted file mode 100644 index ca508e772556..000000000000 --- a/pkgs/desktops/deepin/go-package/dde-daemon/0003-aviod-use-hardcode-path.diff +++ /dev/null @@ -1,92 +0,0 @@ -diff --git a/accounts1/user.go b/accounts1/user.go -index 8101d9c6..16c7f15f 100644 ---- a/accounts1/user.go -+++ b/accounts1/user.go -@@ -482,7 +482,7 @@ func (u *User) checkIsControlCenter(sender dbus.Sender) bool { - return false - } - -- if exe == controlCenterPath { -+ if strings.Contains(exe, "dde-control-center") { - return true - } - -diff --git a/accounts1/user_chpwd_union_id.go b/accounts1/user_chpwd_union_id.go -index 61a691d9..47d2163e 100644 ---- a/accounts1/user_chpwd_union_id.go -+++ b/accounts1/user_chpwd_union_id.go -@@ -89,14 +89,13 @@ func newCaller(service *dbusutil.Service, sender dbus.Sender) (ret *caller, err - - // 只允许来自控制中心, 锁屏和 greetter 的调用 - var app string -- switch exe { -- case "/usr/bin/dde-control-center": -+ if (strings.Contains(exe, "dde-control-center")) { - app = "control-center" -- case "/usr/bin/dde-lock": -+ } else if (strings.Contains(exe, "dde-lock")) { - app = "lock" -- case "/usr/bin/lightdm-deepin-greeter": -+ } else if (strings.Contains(exe, "lightdm-deepin-greeter")) { - app = "greeter" -- default: -+ } else { - err = fmt.Errorf("set password with Union ID called by %s, which is not allow", exe) - return - } -diff --git a/bin/dde-authority/fprint_transaction.go b/bin/dde-authority/fprint_transaction.go -index ca2951a0..3223ad25 100644 ---- a/bin/dde-authority/fprint_transaction.go -+++ b/bin/dde-authority/fprint_transaction.go -@@ -461,7 +461,7 @@ func (tx *FPrintTransaction) End(sender dbus.Sender) *dbus.Error { - - func killFPrintDaemon() { - logger.Debug("kill fprintd") -- err := exec.Command("pkill", "-f", "/usr/lib/fprintd/fprintd").Run() -+ err := exec.Command("pkill", "fprintd").Run() - if err != nil { - logger.Warning("failed to kill fprintd:", err) - } -diff --git a/grub2/grub2.go b/grub2/grub2.go -index 085b7157..10cb8256 100644 ---- a/grub2/grub2.go -+++ b/grub2/grub2.go -@@ -603,7 +603,7 @@ func checkInvokePermission(service *dbusutil.Service, sender dbus.Sender) error - if err != nil { - return err - } -- if cmd == "/usr/bin/dde-control-center" { -+ if strings.Contains(cmd, "dde-control-center") { - return nil - } - uid, err := service.GetConnUID(string(sender)) -diff --git a/misc/etc/acpi/powerbtn.sh b/misc/etc/acpi/powerbtn.sh -index 5c536b9e..39c28987 100755 ---- a/misc/etc/acpi/powerbtn.sh -+++ b/misc/etc/acpi/powerbtn.sh -@@ -58,4 +58,4 @@ elif test "$XUSER" != "" && test -x /usr/bin/qdbus; then - fi - - # If all else failed, just initiate a plain shutdown. --/sbin/shutdown -h now "Power button pressed" -+shutdown -h now "Power button pressed" -diff --git a/misc/udev-rules/80-deepin-fprintd.rules b/misc/udev-rules/80-deepin-fprintd.rules -index 7063a40c..c4c6103a 100644 ---- a/misc/udev-rules/80-deepin-fprintd.rules -+++ b/misc/udev-rules/80-deepin-fprintd.rules -@@ -1 +1 @@ --SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_interface", ACTION=="add|remove", ENV{LIBFPRINT_DRIVER}!="", RUN+="/usr/bin/dbus-send --system --dest=org.deepin.dde.Fprintd1 --print-reply /org/deepin/dde/Fprintd1 org.deepin.dde.Fprintd1.TriggerUDevEvent" -+SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_interface", ACTION=="add|remove", ENV{LIBFPRINT_DRIVER}!="", RUN+="@dbus@/bin/dbus-send --system --dest=org.deepin.dde.Fprintd1 --print-reply /org/deepin/dde/Fprintd1 org.deepin.dde.Fprintd1.TriggerUDevEvent" -diff --git a/system/display/displaycfg.go b/system/display/displaycfg.go -index cda69a77..e394ae07 100644 ---- a/system/display/displaycfg.go -+++ b/system/display/displaycfg.go -@@ -255,7 +255,7 @@ func (d *Display) doDetectSupportWayland(sender dbus.Sender) (bool, error) { - return false, err - } - var cmd *exec.Cmd -- if execPath == "/usr/bin/lightdm-deepin-greeter" { -+ if strings.Contains(execPath, "lightdm-deepin-greeter") { - cmd = exec.Command("runuser", "-u", "lightdm", "glxinfo") // runuser -u lightdm glxinfo - } else { - cmd = exec.Command("glxinfo") diff --git a/pkgs/desktops/deepin/go-package/dde-daemon/default.nix b/pkgs/desktops/deepin/go-package/dde-daemon/default.nix deleted file mode 100644 index 56c6b7a8eade..000000000000 --- a/pkgs/desktops/deepin/go-package/dde-daemon/default.nix +++ /dev/null @@ -1,165 +0,0 @@ -{ - lib, - fetchFromGitHub, - replaceVars, - buildGoModule, - pkg-config, - deepin-gettext-tools, - gettext, - python3, - wrapGAppsHook3, - ddcutil, - alsa-lib, - glib, - gtk3, - libgudev, - libinput, - libnl, - librsvg, - linux-pam, - libxcrypt, - networkmanager, - pulseaudio, - gdk-pixbuf-xlib, - tzdata, - xkeyboard_config, - runtimeShell, - dbus, - util-linux, - dde-session-ui, - coreutils, - lshw, - dmidecode, - systemd, - udevCheckHook, -}: - -buildGoModule rec { - pname = "dde-daemon"; - version = "6.0.43"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-3BzFFlcNwNWNcysD3qRYfdyGaX7gW2XJZ4HzdGiK7jU="; - }; - - vendorHash = "sha256-3kUAaVXERqNZhBFytzVbWY6/a8M0jIkWrN+QHdWp1HU="; - - patches = [ - ./0001-dont-set-PATH.diff - (replaceVars ./0002-fix-custom-wallpapers-path.diff { - inherit coreutils; - }) - (replaceVars ./0003-aviod-use-hardcode-path.diff { - inherit dbus; - }) - ]; - - postPatch = '' - substituteInPlace session/eventlog/{app_event.go,login_event.go} \ - --replace-fail "/bin/bash" "${runtimeShell}" - - substituteInPlace inputdevices/layout_list.go \ - --replace-fail "/usr/share/X11/xkb" "${xkeyboard_config}/share/X11/xkb" - - substituteInPlace accounts1/user.go \ - --replace-fail "/usr/share/wallpapers" "/run/current-system/sw/share/wallpapers" - - substituteInPlace timedate1/zoneinfo/zone.go \ - --replace-fail "/usr/share/dde" "$out/share/dde" \ - --replace-fail "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" - - substituteInPlace accounts1/image_blur.go grub2/modify_manger.go \ - --replace-fail "/usr/lib/deepin-api" "/run/current-system/sw/lib/deepin-api" - - substituteInPlace accounts1/user_chpwd_union_id.go \ - --replace-fail "/usr/lib/dde-control-center" "/run/current-system/sw/lib/dde-control-center" - - substituteInPlace system/uadp1/crypto.go \ - --replace-fail "/usr/share/uadp" "/var/lib/dde-daemon/uadp" - - for file in $(grep "/usr/lib/deepin-daemon" * -nR |awk -F: '{print $1}') - do - sed -i 's|/usr/lib/deepin-daemon|/run/current-system/sw/lib/deepin-daemon|g' $file - done - - patchShebangs . - ''; - - nativeBuildInputs = [ - pkg-config - deepin-gettext-tools - gettext - python3 - wrapGAppsHook3 - udevCheckHook - ]; - - buildInputs = [ - ddcutil - linux-pam - libxcrypt - alsa-lib - glib - libgudev - gtk3 - gdk-pixbuf-xlib - networkmanager - libinput - libnl - librsvg - pulseaudio - tzdata - xkeyboard_config - ]; - - buildPhase = '' - runHook preBuild - make GOBUILD_OPTIONS="$GOFLAGS" - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - make install DESTDIR="$out" PREFIX="/" - runHook postInstall - ''; - - doCheck = false; - - doInstallCheck = true; - - preFixup = '' - gappsWrapperArgs+=( - --prefix PATH : "${ - lib.makeBinPath [ - util-linux - dde-session-ui - glib - lshw - dmidecode - systemd - ] - }" - ) - ''; - - postFixup = '' - for binary in $out/lib/deepin-daemon/*; do - if [ "$binary" == "$out/lib/deepin-daemon/service-trigger" ] ; then - continue; - fi - wrapGApp $binary - done - ''; - - meta = with lib; { - description = "Daemon for handling the deepin session settings"; - homepage = "https://github.com/linuxdeepin/dde-daemon"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - teams = [ teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/go-package/deepin-desktop-schemas/default.nix b/pkgs/desktops/deepin/go-package/deepin-desktop-schemas/default.nix deleted file mode 100644 index 8cbfc4d47e01..000000000000 --- a/pkgs/desktops/deepin/go-package/deepin-desktop-schemas/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ - stdenv, - lib, - buildGoModule, - fetchFromGitHub, - glib, -}: - -buildGoModule rec { - pname = "deepin-desktop-schemas"; - version = "6.0.7"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-Zp80Yz0qkFAwpQJPgs/gcfCG2DMtvpKdVKRlqOTmaCk="; - }; - - vendorHash = "sha256-q6ugetchJLv2JjZ9+nevUI0ptizh2V+6SByoY/eFJJQ="; - - postPatch = '' - # Relocate files path for backgrounds and wallpapers - for file in $(grep -rl "/usr/share") - do - substituteInPlace $file \ - --replace-fail "/usr/share" "/run/current-system/sw/share" - done - ''; - - buildPhase = '' - runHook preBuild - make ARCH=${stdenv.hostPlatform.linuxArch} - runHook postBuild - ''; - - nativeCheckInputs = [ glib ]; - checkPhase = '' - runHook preCheck - make test - runHook postCheck - ''; - - installPhase = '' - runHook preInstall - make install DESTDIR="$out" PREFIX="/" - runHook postInstall - ''; - - meta = { - description = "GSettings deepin desktop-wide schemas"; - homepage = "https://github.com/linuxdeepin/deepin-desktop-schemas"; - license = lib.licenses.gpl3Plus; - platforms = lib.platforms.linux; - teams = [ lib.teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/go-package/deepin-pw-check/default.nix b/pkgs/desktops/deepin/go-package/deepin-pw-check/default.nix deleted file mode 100644 index 3ca39dba0d55..000000000000 --- a/pkgs/desktops/deepin/go-package/deepin-pw-check/default.nix +++ /dev/null @@ -1,74 +0,0 @@ -{ - lib, - fetchFromGitHub, - buildGoModule, - pkg-config, - deepin-gettext-tools, - gtk3, - glib, - libxcrypt, - gettext, - iniparser, - cracklib, - linux-pam, -}: - -buildGoModule rec { - pname = "deepin-pw-check"; - version = "6.0.2"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-kBrkcB0IWGUV4ZrkFzwdPglRgDcnVvYDFhTXS20pKOk="; - }; - - patches = [ "${src}/rpm/0001-Mangle-Suit-Cracklib2.9.6.patch" ]; - - vendorHash = "sha256-L0vUEkUN70Hrx5roIvTfaZBHbbq7mf3WpQJeFAMU5HY="; - - nativeBuildInputs = [ - pkg-config - gettext - deepin-gettext-tools - ]; - - buildInputs = [ - glib - libxcrypt - gtk3 - iniparser - cracklib - linux-pam - ]; - - postPatch = '' - sed -i '1i#include \n#include ' tool/pwd_conf_update.c - substituteInPlace misc/{pkgconfig/libdeepin_pw_check.pc,system-services/org.deepin.dde.PasswdConf1.service} \ - --replace-fail "/usr" "$out" - ''; - - buildPhase = '' - runHook preBuild - make - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - make install PREFIX="$out" PKG_FILE_DIR=$out/lib/pkgconfig PAM_MODULE_DIR=$out/etc/pam.d - # https://github.com/linuxdeepin/deepin-pw-check/blob/d5597482678a489077a506a87f06d2b6c4e7e4ed/debian/rules#L21 - ln -s $out/lib/libdeepin_pw_check.so $out/lib/libdeepin_pw_check.so.1 - runHook postInstall - ''; - - meta = with lib; { - description = "Tool to verify the validity of the password"; - mainProgram = "pwd-conf-update"; - homepage = "https://github.com/linuxdeepin/deepin-pw-check"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - teams = [ teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/go-package/startdde/default.nix b/pkgs/desktops/deepin/go-package/startdde/default.nix deleted file mode 100644 index a85b50b4a3ce..000000000000 --- a/pkgs/desktops/deepin/go-package/startdde/default.nix +++ /dev/null @@ -1,82 +0,0 @@ -{ - lib, - buildGoModule, - fetchFromGitHub, - gettext, - pkg-config, - jq, - wrapGAppsHook3, - glib, - libgnome-keyring, - gtk3, - alsa-lib, - pulseaudio, - libgudev, - libsecret, - runtimeShell, - dbus, -}: - -buildGoModule rec { - pname = "startdde"; - version = "6.0.15"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-RSfdlLT2v3fM4P8E0mIyZZ8A1MWVIS0N0MDczqq7Y64="; - }; - - vendorHash = "sha256-Y81p3yPQayXbvyUI7N6PvFDO3hSU3SL0AuUKxvZkZNE="; - - postPatch = '' - substituteInPlace display/manager.go \ - --replace "/bin/bash" "${runtimeShell}" - - substituteInPlace misc/systemd_task/dde-display-task-refresh-brightness.service \ - --replace "/usr/bin/dbus-send" "${dbus}/bin/dbus-send" - - substituteInPlace display/manager.go \ - --replace "/usr/lib/deepin-daemon" "/run/current-system/sw/lib/deepin-daemon" - - substituteInPlace misc/lightdm.conf --replace "/usr" "$out" - ''; - - nativeBuildInputs = [ - gettext - pkg-config - jq - wrapGAppsHook3 - glib - ]; - - buildInputs = [ - libgnome-keyring - gtk3 - alsa-lib - pulseaudio - libgudev - libsecret - ]; - - buildPhase = '' - runHook preBuild - make GO_BUILD_FLAGS="$GOFLAGS" - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - make install DESTDIR="$out" PREFIX="/" - runHook postInstall - ''; - - meta = with lib; { - description = "Starter of deepin desktop environment"; - homepage = "https://github.com/linuxdeepin/startdde"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - teams = [ teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/library/dde-qt-dbus-factory/default.nix b/pkgs/desktops/deepin/library/dde-qt-dbus-factory/default.nix deleted file mode 100644 index 1c3ba4fdea41..000000000000 --- a/pkgs/desktops/deepin/library/dde-qt-dbus-factory/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - libsForQt5, - python3, - dtkcore, -}: - -stdenv.mkDerivation rec { - pname = "dde-qt-dbus-factory"; - version = "6.0.1"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-B9SrApvjTIW2g9VayrmCsWXS9Gkg55Voi1kPP+KYp3s="; - }; - - nativeBuildInputs = [ - libsForQt5.qmake - libsForQt5.wrapQtAppsHook - python3 - ]; - - buildInputs = [ - libsForQt5.qtbase - dtkcore - ]; - - qmakeFlags = [ - "INSTALL_ROOT=${placeholder "out"}" - "LIB_INSTALL_DIR=${placeholder "out"}/lib" - ]; - - postPatch = '' - substituteInPlace libdframeworkdbus/libdframeworkdbus.pro \ - --replace-fail "/usr" "" - substituteInPlace libdframeworkdbus/DFrameworkdbusConfig.in \ - --replace-fail "/usr/include" "$out/include" - ''; - - meta = { - description = "Repo of auto-generated D-Bus source code which DDE used"; - homepage = "https://github.com/linuxdeepin/dde-qt-dbus-factory"; - license = lib.licenses.gpl3Plus; - platforms = lib.platforms.linux; - teams = [ lib.teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/library/deepin-pdfium/default.nix b/pkgs/desktops/deepin/library/deepin-pdfium/default.nix deleted file mode 100644 index c7342c3f6f43..000000000000 --- a/pkgs/desktops/deepin/library/deepin-pdfium/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - freetype, - icu, - libsForQt5, - pkg-config, - libchardet, - libjpeg, - lcms2, - openjpeg, -}: - -stdenv.mkDerivation rec { - pname = "deepin-pdfium"; - version = "1.0.2"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-ymJSTAccwRumXrh4VjwarKYgaqadMBrtXM1rjWNfe8o="; - }; - - nativeBuildInputs = [ - libsForQt5.qmake - pkg-config - ]; - - dontWrapQtApps = true; - - buildInputs = [ - freetype - icu - libchardet - libjpeg - lcms2 - openjpeg - ]; - - meta = with lib; { - description = "Development library for PDF on deepin"; - homepage = "https://github.com/linuxdeepin/deepin-pdfium"; - license = licenses.lgpl3Plus; - platforms = platforms.linux; - teams = [ teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/library/deepin-wayland-protocols/default.nix b/pkgs/desktops/deepin/library/deepin-wayland-protocols/default.nix deleted file mode 100644 index c13f02c2c68c..000000000000 --- a/pkgs/desktops/deepin/library/deepin-wayland-protocols/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - cmake, - extra-cmake-modules, -}: - -stdenv.mkDerivation rec { - pname = "deepin-wayland-protocols"; - version = "1.6.0-deepin.1.2"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "sha256-8Im3CueC8sYA5mwRU/Z7z8HA4mPQvVSqcTD813QCYxo="; - }; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - ]; - - meta = with lib; { - description = "XML files of the non-standard wayland protocols use in deepin"; - homepage = "https://github.com/linuxdeepin/deepin-wayland-protocols"; - license = licenses.lgpl21Plus; - platforms = platforms.linux; - teams = [ teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/library/disomaster/default.nix b/pkgs/desktops/deepin/library/disomaster/default.nix deleted file mode 100644 index ad462fc6c755..000000000000 --- a/pkgs/desktops/deepin/library/disomaster/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - pkg-config, - libsForQt5, - libisoburn, -}: - -stdenv.mkDerivation rec { - pname = "disomaster"; - version = "5.0.8"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "sha256-wN8mhddqqzYXkT6rRWsHVCWzaG2uRcF2iiFHlZx2LfY="; - }; - - nativeBuildInputs = [ - libsForQt5.qmake - libsForQt5.qttools - pkg-config - libsForQt5.wrapQtAppsHook - ]; - - buildInputs = [ libisoburn ]; - - qmakeFlags = [ "VERSION=${version}" ]; - - meta = with lib; { - description = "Libisoburn wrapper class for Qt"; - homepage = "https://github.com/linuxdeepin/disomaster"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - teams = [ teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/library/docparser/default.nix b/pkgs/desktops/deepin/library/docparser/default.nix deleted file mode 100644 index f9fff425ac10..000000000000 --- a/pkgs/desktops/deepin/library/docparser/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - pkg-config, - libsForQt5, - poppler, - pugixml, - libzip, - libuuid, - libxml2, - tinyxml-2, -}: - -stdenv.mkDerivation rec { - pname = "docparser"; - version = "1.0.11"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-shZXhs9ncgm6rECvCWrLi26RO1WAc1gRowoYmeKesfk="; - }; - - nativeBuildInputs = [ - libsForQt5.qmake - libsForQt5.qttools - pkg-config - libsForQt5.wrapQtAppsHook - ]; - - buildInputs = [ - poppler - pugixml - libzip - libuuid - libxml2 - tinyxml-2 - ]; - - qmakeFlags = [ "VERSION=${version}" ]; - - meta = { - description = "Document parser library ported from document2html"; - homepage = "https://github.com/linuxdeepin/docparser"; - license = lib.licenses.gpl3Plus; - platforms = lib.platforms.linux; - teams = [ lib.teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/library/dtk6core/default.nix b/pkgs/desktops/deepin/library/dtk6core/default.nix deleted file mode 100644 index ff753a81ecf2..000000000000 --- a/pkgs/desktops/deepin/library/dtk6core/default.nix +++ /dev/null @@ -1,98 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - fetchpatch, - cmake, - pkg-config, - doxygen, - qt6Packages, - lshw, - libuchardet, - dtkcommon, - dtk6log, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "dtk6core"; - version = "6.0.33"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = "dtk6core"; - rev = finalAttrs.version; - hash = "sha256-AmGQoDt9qp0m0iV7WrR16DPTt80Y5leRUVXPOtHeugs="; - }; - - patches = [ - ./fix-pkgconfig-path.patch - ./fix-pri-path.patch - (fetchpatch { - name = "resolve-compilation-issues-on-Qt-6_9.patch"; - url = "https://github.com/linuxdeepin/dtkcore/commit/8f523a8b387a006b942268e2143d0d58c574f7c5.patch"; - hash = "sha256-x8BfWCdsz8Bf/sAM7PymZWqlPyEabwP0e6ybfz/2oZ4="; - }) - ]; - - postPatch = '' - substituteInPlace misc/DtkCoreConfig.cmake.in \ - --subst-var-by PACKAGE_TOOL_INSTALL_DIR ${placeholder "out"}/libexec/dtk6/DCore/bin - ''; - - nativeBuildInputs = [ - cmake - pkg-config - doxygen - qt6Packages.qttools - qt6Packages.wrapQtAppsHook - ]; - - dontWrapQtApps = true; - - buildInputs = [ - qt6Packages.qtbase - lshw - libuchardet - ]; - - propagatedBuildInputs = [ - dtkcommon - dtk6log - ]; - - cmakeFlags = [ - "-DDTK_VERSION=${finalAttrs.version}" - "-DBUILD_DOCS=ON" - "-DBUILD_EXAMPLES=OFF" - "-DQCH_INSTALL_DESTINATION=${placeholder "doc"}/share/doc" - "-DDSG_PREFIX_PATH='/run/current-system/sw'" - "-DMKSPECS_INSTALL_DIR=${placeholder "out"}/mkspecs/modules" - "-DD_DSG_APP_DATA_FALLBACK=/var/dsg/appdata" - ]; - - preConfigure = '' - # qt.qpa.plugin: Could not find the Qt platform plugin "minimal" - # A workaround is to set QT_PLUGIN_PATH explicitly - export QT_PLUGIN_PATH=${lib.getBin qt6Packages.qtbase}/${qt6Packages.qtbase.qtPluginPrefix} - ''; - - outputs = [ - "out" - "dev" - "doc" - ]; - - postFixup = '' - for binary in $out/libexec/dtk6/DCore/bin/*; do - wrapQtApp $binary - done - ''; - - meta = { - description = "Deepin tool kit core library"; - homepage = "https://github.com/linuxdeepin/dtk6core"; - license = lib.licenses.lgpl3Plus; - platforms = lib.platforms.linux; - teams = [ lib.teams.deepin ]; - }; -}) diff --git a/pkgs/desktops/deepin/library/dtk6core/fix-pkgconfig-path.patch b/pkgs/desktops/deepin/library/dtk6core/fix-pkgconfig-path.patch deleted file mode 100644 index 570e34c06147..000000000000 --- a/pkgs/desktops/deepin/library/dtk6core/fix-pkgconfig-path.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/misc/dtkcore.pc.in b/misc/dtkcore.pc.in -index 83eecb7..da24ce8 100644 ---- a/misc/dtkcore.pc.in -+++ b/misc/dtkcore.pc.in -@@ -1,7 +1,7 @@ - prefix=@CMAKE_INSTALL_PREFIX@ - exec_prefix=${prefix} --libdir=${prefix}/@LIBRARY_INSTALL_DIR@ --includedir=${prefix}/@INCLUDE_INSTALL_DIR@ -+libdir=@LIBRARY_INSTALL_DIR@ -+includedir=@INCLUDE_INSTALL_DIR@ - - Name: dtk@DTK_VERSION_MAJOR@core - Description: Deepin Tool Kit dtkcore header files diff --git a/pkgs/desktops/deepin/library/dtk6core/fix-pri-path.patch b/pkgs/desktops/deepin/library/dtk6core/fix-pri-path.patch deleted file mode 100644 index 19953ed1733d..000000000000 --- a/pkgs/desktops/deepin/library/dtk6core/fix-pri-path.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/misc/qt_lib_dtkcore.pri.in b/misc/qt_lib_dtkcore.pri.in -index a331f52..ce01dc0 100644 ---- a/misc/qt_lib_dtkcore.pri.in -+++ b/misc/qt_lib_dtkcore.pri.in -@@ -4,9 +4,9 @@ QT.dtkcore.MINOR_VERSION = @PROJECT_VERSION_MINOR@ - QT.dtkcore.PATCH_VERSION = @PROJECT_VERSION_PATCH@ - QT.dtkcore.name = dtkcore - QT.dtkcore.module = dtk@DTK_VERSION_MAJOR@core --QT.dtkcore.tools = @CMAKE_INSTALL_PREFIX@/@TOOL_INSTALL_DIR@ --QT.dtkcore.libs = @CMAKE_INSTALL_PREFIX@/@LIBRARY_INSTALL_DIR@ --QT.dtkcore.includes = @CMAKE_INSTALL_PREFIX@/@INCLUDE_INSTALL_DIR@ -+QT.dtkcore.tools = @TOOL_INSTALL_DIR@ -+QT.dtkcore.libs = @LIBRARY_INSTALL_DIR@ -+QT.dtkcore.includes = @INCLUDE_INSTALL_DIR@ - QT.dtkcore.frameworks = - QT.dtkcore.depends = core dbus xml - QT.dtkcore.module_config = v2 ltcg diff --git a/pkgs/desktops/deepin/library/dtk6declarative/default.nix b/pkgs/desktops/deepin/library/dtk6declarative/default.nix deleted file mode 100644 index 57c58dceccb4..000000000000 --- a/pkgs/desktops/deepin/library/dtk6declarative/default.nix +++ /dev/null @@ -1,76 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - cmake, - pkg-config, - doxygen, - qt6Packages, - dtk6gui, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "dtk6declarative"; - version = "6.0.33"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = "dtk6declarative"; - rev = finalAttrs.version; - hash = "sha256-hFH5XCeNs31hslaPMyuXBLe0Du3s6STs9kltwL+/F1s="; - }; - - patches = [ - ./fix-pkgconfig-path.patch - ./fix-pri-path.patch - ]; - - nativeBuildInputs = [ - cmake - pkg-config - doxygen - qt6Packages.qttools - qt6Packages.wrapQtAppsHook - ]; - - propagatedBuildInputs = [ - dtk6gui - ] - ++ (with qt6Packages; [ - qtbase - qtdeclarative - qtshadertools - qt5compat - ]); - - cmakeFlags = [ - "-DDTK_VERSION=${finalAttrs.version}" - "-DBUILD_DOCS=ON" - "-DBUILD_EXAMPLES=ON" - "-DMKSPECS_INSTALL_DIR=${placeholder "dev"}/mkspecs/modules" - "-DQCH_INSTALL_DESTINATION=${placeholder "doc"}/share/doc" - "-DQML_INSTALL_DIR=${placeholder "out"}/${qt6Packages.qtbase.qtQmlPrefix}" - ]; - - preConfigure = '' - # qt.qpa.plugin: Could not find the Qt platform plugin "minimal" - # A workaround is to set QT_PLUGIN_PATH explicitly - export QT_PLUGIN_PATH=${lib.getBin qt6Packages.qtbase}/${qt6Packages.qtbase.qtPluginPrefix} - export QML2_IMPORT_PATH=${lib.getBin qt6Packages.qtdeclarative}/${qt6Packages.qtbase.qtQmlPrefix} - ''; - - outputs = [ - "out" - "dev" - "doc" - ]; - - meta = { - description = "Widget development toolkit based on QtQuick/QtQml"; - mainProgram = "dtk-exhibition"; - homepage = "https://github.com/linuxdeepin/dtk6declarative"; - license = lib.licenses.lgpl3Plus; - platforms = lib.platforms.linux; - teams = [ lib.teams.deepin ]; - }; -}) diff --git a/pkgs/desktops/deepin/library/dtk6declarative/fix-pkgconfig-path.patch b/pkgs/desktops/deepin/library/dtk6declarative/fix-pkgconfig-path.patch deleted file mode 100644 index e15ee2f7a0b8..000000000000 --- a/pkgs/desktops/deepin/library/dtk6declarative/fix-pkgconfig-path.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/misc/dtkdeclarative.pc.in b/misc/dtkdeclarative.pc.in -index dc3827f..fd0949e 100644 ---- a/misc/dtkdeclarative.pc.in -+++ b/misc/dtkdeclarative.pc.in -@@ -1,7 +1,7 @@ - prefix=@CMAKE_INSTALL_PREFIX@ - exec_prefix=${prefix} --libdir=${prefix}/@LIB_INSTALL_DIR@ --includedir=${prefix}/@INCLUDE_INSTALL_DIR@ -+libdir=@LIB_INSTALL_DIR@ -+includedir=@INCLUDE_INSTALL_DIR@ - - Name: DtkDeclarative - Description: Deepin Tool Kit DtkDeclarative header files diff --git a/pkgs/desktops/deepin/library/dtk6declarative/fix-pri-path.patch b/pkgs/desktops/deepin/library/dtk6declarative/fix-pri-path.patch deleted file mode 100644 index e622809c3936..000000000000 --- a/pkgs/desktops/deepin/library/dtk6declarative/fix-pri-path.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/misc/qt_lib_dtkdeclarative.pri.in b/misc/qt_lib_dtkdeclarative.pri.in -index 8797802..44e32a3 100644 ---- a/misc/qt_lib_dtkdeclarative.pri.in -+++ b/misc/qt_lib_dtkdeclarative.pri.in -@@ -4,8 +4,8 @@ QT.dtkdeclarative.MINOR_VERSION = @PROJECT_VERSION_MINOR@ - QT.dtkdeclarative.PATCH_VERSION = @PROJECT_VERSION_PATCH@ - QT.dtkdeclarative.name = dtkdeclarative - QT.dtkdeclarative.module = dtk@DTK_VERSION_MAJOR@declarative --QT.dtkdeclarative.libs = @CMAKE_INSTALL_PREFIX@/@LIB_INSTALL_DIR@ --QT.dtkdeclarative.includes = @CMAKE_INSTALL_PREFIX@/@INCLUDE_INSTALL_DIR@ -+QT.dtkdeclarative.libs = @LIB_INSTALL_DIR@ -+QT.dtkdeclarative.includes = @INCLUDE_INSTALL_DIR@ - QT.dtkdeclarative.frameworks = - QT.dtkdeclarative.depends = core dbus xml gui dtkcore dtkgui quick quick_private - QT.dtkdeclarative.module_config = v2 ltcg diff --git a/pkgs/desktops/deepin/library/dtk6gui/default.nix b/pkgs/desktops/deepin/library/dtk6gui/default.nix deleted file mode 100644 index e66063f416b5..000000000000 --- a/pkgs/desktops/deepin/library/dtk6gui/default.nix +++ /dev/null @@ -1,93 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - fetchpatch, - cmake, - pkg-config, - doxygen, - qt6Packages, - dtk6core, - librsvg, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "dtk6gui"; - version = "6.0.33"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = "dtk6gui"; - rev = finalAttrs.version; - hash = "sha256-ZnRhrlgrQ7Vusod2diFwVEVnNGHYNq5Ij12GbW6LXWc="; - }; - - patches = [ - ./fix-pkgconfig-path.patch - ./fix-pri-path.patch - (fetchpatch { - name = "resolve-compilation-issues-on-Qt-6_9.patch"; - url = "https://gitlab.archlinux.org/archlinux/packaging/packages/dtk6gui/-/raw/ae64c77a73cdea069579ecf6833be63635237180/qt-6.9.patch"; - hash = "sha256-45L3ZQ9Hv7tLdDjtazLhVl8XgKBtcHL3CT2nw6GkqgM="; - }) - ]; - - postPatch = '' - substituteInPlace src/util/dsvgrenderer.cpp \ - --replace-fail 'QLibrary("rsvg-2", "2")' 'QLibrary("${lib.getLib librsvg}/lib/librsvg-2.so")' - sed '1i#include ' \ - -i 'src/kernel/dguiapplicationhelper.cpp' - ''; - - nativeBuildInputs = [ - cmake - pkg-config - doxygen - qt6Packages.qttools - qt6Packages.wrapQtAppsHook - ]; - - buildInputs = [ - qt6Packages.qtbase - qt6Packages.qtwayland - librsvg - ]; - - propagatedBuildInputs = [ - dtk6core - qt6Packages.qtimageformats - ]; - - cmakeFlags = [ - "-DDTK_VERSION=${finalAttrs.version}" - "-DBUILD_DOCS=ON" - "-DMKSPECS_INSTALL_DIR=${placeholder "out"}/mkspecs/modules" - "-DQCH_INSTALL_DESTINATION=${placeholder "doc"}/share/doc" - ]; - - preConfigure = '' - # qt.qpa.plugin: Could not find the Qt platform plugin "minimal" - # A workaround is to set QT_PLUGIN_PATH explicitly - export QT_PLUGIN_PATH=${lib.getBin qt6Packages.qtbase}/${qt6Packages.qtbase.qtPluginPrefix} - ''; - - outputs = [ - "out" - "dev" - "doc" - ]; - - postFixup = '' - for binary in $out/libexec/dtk6/DGui/bin/*; do - wrapQtApp $binary - done - ''; - - meta = { - description = "Deepin Toolkit, gui module for DDE look and feel"; - homepage = "https://github.com/linuxdeepin/dtk6gui"; - license = lib.licenses.lgpl3Plus; - platforms = lib.platforms.linux; - teams = [ lib.teams.deepin ]; - }; -}) diff --git a/pkgs/desktops/deepin/library/dtk6gui/fix-pkgconfig-path.patch b/pkgs/desktops/deepin/library/dtk6gui/fix-pkgconfig-path.patch deleted file mode 100644 index 1485baccc204..000000000000 --- a/pkgs/desktops/deepin/library/dtk6gui/fix-pkgconfig-path.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/misc/dtkgui.pc.in b/misc/dtkgui.pc.in -index 89fdbbf..ad817c4 100644 ---- a/misc/dtkgui.pc.in -+++ b/misc/dtkgui.pc.in -@@ -1,8 +1,8 @@ - prefix=@CMAKE_INSTALL_PREFIX@ - exec_prefix=${prefix} --libdir=${prefix}/@LIBRARY_INSTALL_DIR@ --includedir=${prefix}/@INCLUDE_INSTALL_DIR@ --tooldir=${prefix}/@PACKAGE_TOOL_INSTALL_DIR@ -+libdir=@LIBRARY_INSTALL_DIR@ -+includedir=@INCLUDE_INSTALL_DIR@ -+tooldir=@PACKAGE_TOOL_INSTALL_DIR@ - - Name: dtk@DTK_VERSION_MAJOR@gui - Description: Deepin Tool Kit dtkgui header files diff --git a/pkgs/desktops/deepin/library/dtk6gui/fix-pri-path.patch b/pkgs/desktops/deepin/library/dtk6gui/fix-pri-path.patch deleted file mode 100644 index b746d34b1c79..000000000000 --- a/pkgs/desktops/deepin/library/dtk6gui/fix-pri-path.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/misc/qt_lib_dtkgui.pri.in b/misc/qt_lib_dtkgui.pri.in -index 28308ee..9fb25e6 100644 ---- a/misc/qt_lib_dtkgui.pri.in -+++ b/misc/qt_lib_dtkgui.pri.in -@@ -4,9 +4,9 @@ QT.dtkgui.MINOR_VERSION = @PROJECT_VERSION_MINOR@ - QT.dtkgui.PATCH_VERSION = @PROJECT_VERSION_PATCH@ - QT.dtkgui.name = dtkgui - QT.dtkgui.module = dtk@DTK_VERSION_MAJOR@gui --QT.dtkgui.tools = @CMAKE_INSTALL_PREFIX@/@TOOL_INSTALL_DIR@ --QT.dtkgui.libs = @CMAKE_INSTALL_PREFIX@/@LIBRARY_INSTALL_DIR@ --QT.dtkgui.includes = @CMAKE_INSTALL_PREFIX@/@INCLUDE_INSTALL_DIR@ -+QT.dtkgui.tools = @TOOL_INSTALL_DIR@ -+QT.dtkgui.libs = @LIBRARY_INSTALL_DIR@ -+QT.dtkgui.includes = @INCLUDE_INSTALL_DIR@ - QT.dtkgui.frameworks = - QT.dtkgui.depends = core gui dtkcore gui_private dbus network - QT.dtkgui.module_config = v2 internal_module ltcg diff --git a/pkgs/desktops/deepin/library/dtk6log/default.nix b/pkgs/desktops/deepin/library/dtk6log/default.nix deleted file mode 100644 index 6e89449f7d0d..000000000000 --- a/pkgs/desktops/deepin/library/dtk6log/default.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - fetchpatch, - cmake, - pkg-config, - qt6Packages, - spdlog, - systemd, - withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "dtk6log"; - version = "0.0.2"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = "dtk6log"; - rev = finalAttrs.version; - hash = "sha256-uPuka+uVCcl2sBMr1SpgqLpcIqZm6BDZyGd7FOraHVM="; - }; - - patches = [ - (fetchpatch { - name = "resolve-compilation-issues-on-Qt-6_9.patch"; - url = "https://github.com/linuxdeepin/dtklog/commit/ab7ed5aa8433c726470f2aecc1d99f118eae8b63.patch"; - hash = "sha256-QK4MOAzTZjjK5qfmzguXAgHO9guMCRN/5y+llBSY2vk="; - }) - ]; - - nativeBuildInputs = [ - cmake - pkg-config - qt6Packages.wrapQtAppsHook - ]; - - dontWrapQtApps = true; - - buildInputs = [ - qt6Packages.qtbase - spdlog - ] - ++ lib.optional withSystemd systemd; - - cmakeFlags = [ - (lib.cmakeBool "BUILD_WITH_QT6" true) - (lib.cmakeBool "BUILD_WITH_SYSTEMD" withSystemd) - (lib.cmakeFeature "CMAKE_INSTALL_LIBDIR" "lib") - (lib.cmakeFeature "CMAKE_INSTALL_INCLUDEDIR" "include") - ]; - - meta = { - description = "Simple, convinient and thread safe logger for Qt-based C++ apps"; - homepage = "https://github.com/linuxdeepin/dtk6log"; - license = lib.licenses.lgpl21Plus; - platforms = lib.platforms.linux; - teams = [ lib.teams.deepin ]; - }; -}) diff --git a/pkgs/desktops/deepin/library/dtk6systemsettings/default.nix b/pkgs/desktops/deepin/library/dtk6systemsettings/default.nix deleted file mode 100644 index 1049dfe422f4..000000000000 --- a/pkgs/desktops/deepin/library/dtk6systemsettings/default.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - cmake, - pkg-config, - doxygen, - qt6Packages, - dtk6core, - libxcrypt, -}: - -stdenv.mkDerivation rec { - pname = "dtk6systemsettings"; - version = "6.0.2"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-b/iI2OKQQoFj3vWatfGdDP9z+SEsK5XBra9KqjlGzqs="; - }; - - nativeBuildInputs = [ - cmake - pkg-config - doxygen - qt6Packages.qttools - ]; - - dontWrapQtApps = true; - - buildInputs = [ - qt6Packages.qtbase - dtk6core - libxcrypt - ]; - - cmakeFlags = [ - "-DDTK_VERSION=${version}" - "-DBUILD_DOCS=ON" - "-DBUILD_EXAMPLES=OFF" - "-DQCH_INSTALL_DESTINATION=${placeholder "doc"}/share/doc" - "-DMKSPECS_INSTALL_DIR=${placeholder "out"}/mkspecs/modules" - "-DDTK_INCLUDE_INSTALL_DIR=${placeholder "dev"}/include/dtk/DSystemSettings" - ]; - - preConfigure = '' - # qt.qpa.plugin: Could not find the Qt platform plugin "minimal" - # A workaround is to set QT_PLUGIN_PATH explicitly - export QT_PLUGIN_PATH=${lib.getBin qt6Packages.qtbase}/${qt6Packages.qtbase.qtPluginPrefix} - ''; - - outputs = [ - "out" - "dev" - "doc" - ]; - - meta = { - description = "Qt-based development library for system settings"; - homepage = "https://github.com/linuxdeepin/dtk6systemsettings"; - license = lib.licenses.lgpl3Plus; - platforms = lib.platforms.linux; - teams = [ lib.teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/library/dtk6widget/default.nix b/pkgs/desktops/deepin/library/dtk6widget/default.nix deleted file mode 100644 index d44097fe6050..000000000000 --- a/pkgs/desktops/deepin/library/dtk6widget/default.nix +++ /dev/null @@ -1,94 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - fetchpatch, - cmake, - pkg-config, - doxygen, - qt6Packages, - dtk6gui, - cups, - libstartup_notification, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "dtk6widget"; - version = "6.0.33"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = "dtk6widget"; - rev = finalAttrs.version; - hash = "sha256-CSsN/6Geban/l6Rp5NuxIUomgTlqXyvttafTbjZIwSc="; - }; - - patches = [ - ./fix-pkgconfig-path.patch - ./fix-pri-path.patch - (fetchpatch { - name = "resolve-compilation-issues-on-Qt-6_9.patch"; - url = "https://gitlab.archlinux.org/archlinux/packaging/packages/dtk6widget/-/raw/ce8f89bbed6ebd4659c7f964f158857ebfdee01c/qt-6.9.patch"; - hash = "sha256-LlFBXuoPxuszO9bkXK1Cy6zMTSnlh33UnmlKMJk3QH0="; - }) - ]; - - postPatch = '' - substituteInPlace src/widgets/dapplication.cpp \ - --replace-fail "auto dataDirs = DStandardPaths::standardLocations(QStandardPaths::GenericDataLocation);" \ - "auto dataDirs = DStandardPaths::standardLocations(QStandardPaths::GenericDataLocation) << \"$out/share\";" - ''; - - nativeBuildInputs = [ - cmake - doxygen - pkg-config - qt6Packages.qttools - qt6Packages.wrapQtAppsHook - ]; - - buildInputs = [ - cups - libstartup_notification - ] - ++ (with qt6Packages; [ - qtbase - qtmultimedia - qtsvg - ]); - - propagatedBuildInputs = [ dtk6gui ]; - - cmakeFlags = [ - "-DDTK_VERSION=${finalAttrs.version}" - "-DBUILD_DOCS=ON" - "-DMKSPECS_INSTALL_DIR=${placeholder "dev"}/mkspecs/modules" - "-DQCH_INSTALL_DESTINATION=${placeholder "doc"}/share/doc" - ]; - - preConfigure = '' - # qt.qpa.plugin: Could not find the Qt platform plugin "minimal" - # A workaround is to set QT_PLUGIN_PATH explicitly - export QT_PLUGIN_PATH=${lib.getBin qt6Packages.qtbase}/${qt6Packages.qtbase.qtPluginPrefix} - ''; - - outputs = [ - "out" - "dev" - "doc" - ]; - - postFixup = '' - for binary in $out/lib/dtk6/DWidget/bin/*; do - wrapQtApp $binary - done - ''; - - meta = { - description = "Deepin graphical user interface library"; - homepage = "https://github.com/linuxdeepin/dtk6widget"; - license = lib.licenses.lgpl3Plus; - platforms = lib.platforms.linux; - teams = [ lib.teams.deepin ]; - }; -}) diff --git a/pkgs/desktops/deepin/library/dtk6widget/fix-pkgconfig-path.patch b/pkgs/desktops/deepin/library/dtk6widget/fix-pkgconfig-path.patch deleted file mode 100644 index df4452259580..000000000000 --- a/pkgs/desktops/deepin/library/dtk6widget/fix-pkgconfig-path.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/misc/DtkWidget.pc.in b/misc/DtkWidget.pc.in -index 3c610669..b6ed04ca 100644 ---- a/misc/DtkWidget.pc.in -+++ b/misc/DtkWidget.pc.in -@@ -1,7 +1,7 @@ - prefix=@CMAKE_INSTALL_PREFIX@ - exec_prefix=${prefix} --libdir=${prefix}/@LIBRARY_INSTALL_DIR@ --includedir=${prefix}/@INCLUDE_INSTALL_DIR@ -+libdir=@LIBRARY_INSTALL_DIR@ -+includedir=@INCLUDE_INSTALL_DIR@ - - Name: dtk@DTK_VERSION_MAJOR@widget - Description: Deepin Tool Kit dtkwidget header files diff --git a/pkgs/desktops/deepin/library/dtk6widget/fix-pri-path.patch b/pkgs/desktops/deepin/library/dtk6widget/fix-pri-path.patch deleted file mode 100644 index cf2faac94855..000000000000 --- a/pkgs/desktops/deepin/library/dtk6widget/fix-pri-path.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/misc/qt_lib_DtkWidget.pri.in b/misc/qt_lib_DtkWidget.pri.in -index 623878d3..561f5186 100644 ---- a/misc/qt_lib_DtkWidget.pri.in -+++ b/misc/qt_lib_DtkWidget.pri.in -@@ -4,9 +4,9 @@ QT.dtkwidget.MINOR_VERSION = @PROJECT_VERSION_MINOR@ - QT.dtkwidget.PATCH_VERSION = @PROJECT_VERSION_PATCH@ - QT.dtkwidget.name = dtkwidget - QT.dtkwidget.module = dtk@DTK_VERSION_MAJOR@widget --QT.dtkwidget.tools = @CMAKE_INSTALL_PREFIX@/@TOOL_INSTALL_DIR@ --QT.dtkwidget.libs = @CMAKE_INSTALL_PREFIX@/@LIBRARY_INSTALL_DIR@ --QT.dtkwidget.includes = @CMAKE_INSTALL_PREFIX@/@INCLUDE_INSTALL_DIR@ -+QT.dtkwidget.tools = @TOOL_INSTALL_DIR@ -+QT.dtkwidget.libs = @LIBRARY_INSTALL_DIR@ -+QT.dtkwidget.includes = @INCLUDE_INSTALL_DIR@ - QT.dtkwidget.frameworks = - QT.dtkwidget.depends = core gui dtkcore network concurrent dtkgui printsupport printsupport_private widgets widgets_private gui_private x11extras dbus - QT.dtkwidget.module_config = v2 internal_module ltcg diff --git a/pkgs/desktops/deepin/library/dtkcommon/default.nix b/pkgs/desktops/deepin/library/dtkcommon/default.nix deleted file mode 100644 index 552be6223f97..000000000000 --- a/pkgs/desktops/deepin/library/dtkcommon/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - cmake, -}: - -stdenv.mkDerivation rec { - pname = "dtkcommon"; - version = "5.7.13"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-yQKkqHL5W2mHPE3zchAwtWUH55zrCEJwcVWCheC0rW4="; - }; - - nativeBuildInputs = [ cmake ]; - - dontWrapQtApps = true; - - meta = with lib; { - description = "Public project for building DTK Library"; - homepage = "https://github.com/linuxdeepin/dtkcommon"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - teams = [ teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/library/dtkcore/default.nix b/pkgs/desktops/deepin/library/dtkcore/default.nix deleted file mode 100644 index 9e39ccb3d4f0..000000000000 --- a/pkgs/desktops/deepin/library/dtkcore/default.nix +++ /dev/null @@ -1,95 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - cmake, - pkg-config, - doxygen, - libsForQt5, - gsettings-qt, - lshw, - libuchardet, - dtkcommon, - dtklog, -}: - -stdenv.mkDerivation rec { - pname = "dtkcore"; - version = "5.6.32"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-APuBVgewr701wzfTRwaQIg/ERFIhabEs5Jd6+GvD04k="; - }; - - patches = [ - ./fix-pkgconfig-path.patch - ./fix-pri-path.patch - ]; - - postPatch = '' - substituteInPlace misc/DtkCoreConfig.cmake.in \ - --subst-var-by PACKAGE_TOOL_INSTALL_DIR ${placeholder "out"}/libexec/dtk5/DCore/bin - ''; - - nativeBuildInputs = [ - cmake - pkg-config - doxygen - libsForQt5.qttools - libsForQt5.wrapQtAppsHook - ]; - - dontWrapQtApps = true; - - buildInputs = [ - libsForQt5.qtbase - gsettings-qt - lshw - libuchardet - ]; - - propagatedBuildInputs = [ - dtkcommon - dtklog - ]; - - cmakeFlags = [ - "-DDTK_VERSION=${version}" - "-DBUILD_DOCS=ON" - "-DBUILD_EXAMPLES=OFF" - "-DQCH_INSTALL_DESTINATION=${placeholder "doc"}/${libsForQt5.qtbase.qtDocPrefix}" - "-DDSG_PREFIX_PATH='/run/current-system/sw'" - "-DMKSPECS_INSTALL_DIR=${placeholder "out"}/mkspecs/modules" - "-DTOOL_INSTALL_DIR=${placeholder "out"}/libexec/dtk5/DCore/bin" - "-DD_DSG_APP_DATA_FALLBACK=/var/dsg/appdata" - ]; - - preConfigure = '' - # qt.qpa.plugin: Could not find the Qt platform plugin "minimal" - # A workaround is to set QT_PLUGIN_PATH explicitly - export QT_PLUGIN_PATH=${libsForQt5.qtbase.bin}/${libsForQt5.qtbase.qtPluginPrefix} - ''; - - outputs = [ - "out" - "dev" - "doc" - ]; - - postFixup = '' - for binary in $out/libexec/dtk5/DCore/bin/*; do - wrapQtApp $binary - done - ''; - - meta = with lib; { - description = "Deepin tool kit core library"; - homepage = "https://github.com/linuxdeepin/dtkcore"; - license = licenses.lgpl3Plus; - platforms = platforms.linux; - teams = [ teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/library/dtkcore/fix-pkgconfig-path.patch b/pkgs/desktops/deepin/library/dtkcore/fix-pkgconfig-path.patch deleted file mode 100644 index 570e34c06147..000000000000 --- a/pkgs/desktops/deepin/library/dtkcore/fix-pkgconfig-path.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/misc/dtkcore.pc.in b/misc/dtkcore.pc.in -index 83eecb7..da24ce8 100644 ---- a/misc/dtkcore.pc.in -+++ b/misc/dtkcore.pc.in -@@ -1,7 +1,7 @@ - prefix=@CMAKE_INSTALL_PREFIX@ - exec_prefix=${prefix} --libdir=${prefix}/@LIBRARY_INSTALL_DIR@ --includedir=${prefix}/@INCLUDE_INSTALL_DIR@ -+libdir=@LIBRARY_INSTALL_DIR@ -+includedir=@INCLUDE_INSTALL_DIR@ - - Name: dtk@DTK_VERSION_MAJOR@core - Description: Deepin Tool Kit dtkcore header files diff --git a/pkgs/desktops/deepin/library/dtkcore/fix-pri-path.patch b/pkgs/desktops/deepin/library/dtkcore/fix-pri-path.patch deleted file mode 100644 index 19953ed1733d..000000000000 --- a/pkgs/desktops/deepin/library/dtkcore/fix-pri-path.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/misc/qt_lib_dtkcore.pri.in b/misc/qt_lib_dtkcore.pri.in -index a331f52..ce01dc0 100644 ---- a/misc/qt_lib_dtkcore.pri.in -+++ b/misc/qt_lib_dtkcore.pri.in -@@ -4,9 +4,9 @@ QT.dtkcore.MINOR_VERSION = @PROJECT_VERSION_MINOR@ - QT.dtkcore.PATCH_VERSION = @PROJECT_VERSION_PATCH@ - QT.dtkcore.name = dtkcore - QT.dtkcore.module = dtk@DTK_VERSION_MAJOR@core --QT.dtkcore.tools = @CMAKE_INSTALL_PREFIX@/@TOOL_INSTALL_DIR@ --QT.dtkcore.libs = @CMAKE_INSTALL_PREFIX@/@LIBRARY_INSTALL_DIR@ --QT.dtkcore.includes = @CMAKE_INSTALL_PREFIX@/@INCLUDE_INSTALL_DIR@ -+QT.dtkcore.tools = @TOOL_INSTALL_DIR@ -+QT.dtkcore.libs = @LIBRARY_INSTALL_DIR@ -+QT.dtkcore.includes = @INCLUDE_INSTALL_DIR@ - QT.dtkcore.frameworks = - QT.dtkcore.depends = core dbus xml - QT.dtkcore.module_config = v2 ltcg diff --git a/pkgs/desktops/deepin/library/dtkdeclarative/default.nix b/pkgs/desktops/deepin/library/dtkdeclarative/default.nix deleted file mode 100644 index ff667f83b65e..000000000000 --- a/pkgs/desktops/deepin/library/dtkdeclarative/default.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - cmake, - pkg-config, - doxygen, - libsForQt5, - dtkgui, -}: - -stdenv.mkDerivation rec { - pname = "dtkdeclarative"; - version = "5.6.32"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-MOiNpuvYwJi9rNKx6TuUuWnlGhmZrRbL48EFapy442M="; - }; - - patches = [ - ./fix-pkgconfig-path.patch - ./fix-pri-path.patch - ]; - - nativeBuildInputs = [ - cmake - pkg-config - doxygen - libsForQt5.qttools - libsForQt5.wrapQtAppsHook - ]; - - propagatedBuildInputs = [ - dtkgui - libsForQt5.qtdeclarative - libsForQt5.qtquickcontrols2 - libsForQt5.qtgraphicaleffects - ]; - - cmakeFlags = [ - "-DDTK_VERSION=${version}" - "-DBUILD_DOCS=ON" - "-DBUILD_EXAMPLES=ON" - "-DMKSPECS_INSTALL_DIR=${placeholder "dev"}/mkspecs/modules" - "-DQCH_INSTALL_DESTINATION=${placeholder "doc"}/${libsForQt5.qtbase.qtDocPrefix}" - "-DQML_INSTALL_DIR=${placeholder "out"}/${libsForQt5.qtbase.qtQmlPrefix}" - ]; - - preConfigure = '' - # qt.qpa.plugin: Could not find the Qt platform plugin "minimal" - # A workaround is to set QT_PLUGIN_PATH explicitly - export QT_PLUGIN_PATH=${libsForQt5.qtbase.bin}/${libsForQt5.qtbase.qtPluginPrefix} - export QML2_IMPORT_PATH=${libsForQt5.qtdeclarative.bin}/${libsForQt5.qtbase.qtQmlPrefix} - ''; - - outputs = [ - "out" - "dev" - "doc" - ]; - - meta = with lib; { - description = "Widget development toolkit based on QtQuick/QtQml"; - mainProgram = "dtk-exhibition"; - homepage = "https://github.com/linuxdeepin/dtkdeclarative"; - license = licenses.lgpl3Plus; - platforms = platforms.linux; - teams = [ teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/library/dtkdeclarative/fix-pkgconfig-path.patch b/pkgs/desktops/deepin/library/dtkdeclarative/fix-pkgconfig-path.patch deleted file mode 100644 index e15ee2f7a0b8..000000000000 --- a/pkgs/desktops/deepin/library/dtkdeclarative/fix-pkgconfig-path.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/misc/dtkdeclarative.pc.in b/misc/dtkdeclarative.pc.in -index dc3827f..fd0949e 100644 ---- a/misc/dtkdeclarative.pc.in -+++ b/misc/dtkdeclarative.pc.in -@@ -1,7 +1,7 @@ - prefix=@CMAKE_INSTALL_PREFIX@ - exec_prefix=${prefix} --libdir=${prefix}/@LIB_INSTALL_DIR@ --includedir=${prefix}/@INCLUDE_INSTALL_DIR@ -+libdir=@LIB_INSTALL_DIR@ -+includedir=@INCLUDE_INSTALL_DIR@ - - Name: DtkDeclarative - Description: Deepin Tool Kit DtkDeclarative header files diff --git a/pkgs/desktops/deepin/library/dtkdeclarative/fix-pri-path.patch b/pkgs/desktops/deepin/library/dtkdeclarative/fix-pri-path.patch deleted file mode 100644 index e622809c3936..000000000000 --- a/pkgs/desktops/deepin/library/dtkdeclarative/fix-pri-path.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/misc/qt_lib_dtkdeclarative.pri.in b/misc/qt_lib_dtkdeclarative.pri.in -index 8797802..44e32a3 100644 ---- a/misc/qt_lib_dtkdeclarative.pri.in -+++ b/misc/qt_lib_dtkdeclarative.pri.in -@@ -4,8 +4,8 @@ QT.dtkdeclarative.MINOR_VERSION = @PROJECT_VERSION_MINOR@ - QT.dtkdeclarative.PATCH_VERSION = @PROJECT_VERSION_PATCH@ - QT.dtkdeclarative.name = dtkdeclarative - QT.dtkdeclarative.module = dtk@DTK_VERSION_MAJOR@declarative --QT.dtkdeclarative.libs = @CMAKE_INSTALL_PREFIX@/@LIB_INSTALL_DIR@ --QT.dtkdeclarative.includes = @CMAKE_INSTALL_PREFIX@/@INCLUDE_INSTALL_DIR@ -+QT.dtkdeclarative.libs = @LIB_INSTALL_DIR@ -+QT.dtkdeclarative.includes = @INCLUDE_INSTALL_DIR@ - QT.dtkdeclarative.frameworks = - QT.dtkdeclarative.depends = core dbus xml gui dtkcore dtkgui quick quick_private - QT.dtkdeclarative.module_config = v2 ltcg diff --git a/pkgs/desktops/deepin/library/dtkgui/default.nix b/pkgs/desktops/deepin/library/dtkgui/default.nix deleted file mode 100644 index 16d176b5ff59..000000000000 --- a/pkgs/desktops/deepin/library/dtkgui/default.nix +++ /dev/null @@ -1,86 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - pkg-config, - cmake, - doxygen, - libsForQt5, - dtkcore, - lxqt, - librsvg, -}: - -stdenv.mkDerivation rec { - pname = "dtkgui"; - version = "5.6.32"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-F3tuLV1hWoUZle0O66MQ+Ew9LRnP6N++HaqS88xBLRY="; - }; - - patches = [ - ./fix-pkgconfig-path.patch - ./fix-pri-path.patch - ]; - - postPatch = '' - substituteInPlace src/util/dsvgrenderer.cpp \ - --replace-fail 'QLibrary("rsvg-2", "2")' 'QLibrary("${lib.getLib librsvg}/lib/librsvg-2.so")' - ''; - - nativeBuildInputs = [ - cmake - doxygen - pkg-config - libsForQt5.qttools - libsForQt5.wrapQtAppsHook - ]; - - buildInputs = [ - libsForQt5.qtbase - lxqt.libqtxdg - librsvg - ]; - - propagatedBuildInputs = [ - dtkcore - libsForQt5.qtimageformats - ]; - - cmakeFlags = [ - "-DDTK_VERSION=${version}" - "-DBUILD_DOCS=ON" - "-DMKSPECS_INSTALL_DIR=${placeholder "out"}/mkspecs/modules" - "-DQCH_INSTALL_DESTINATION=${placeholder "doc"}/${libsForQt5.qtbase.qtDocPrefix}" - ]; - - preConfigure = '' - # qt.qpa.plugin: Could not find the Qt platform plugin "minimal" - # A workaround is to set QT_PLUGIN_PATH explicitly - export QT_PLUGIN_PATH=${libsForQt5.qtbase.bin}/${libsForQt5.qtbase.qtPluginPrefix} - ''; - - outputs = [ - "out" - "dev" - "doc" - ]; - - postFixup = '' - for binary in $out/libexec/dtk5/DGui/bin/*; do - wrapQtApp $binary - done - ''; - - meta = with lib; { - description = "Deepin Toolkit, gui module for DDE look and feel"; - homepage = "https://github.com/linuxdeepin/dtkgui"; - license = licenses.lgpl3Plus; - platforms = platforms.linux; - teams = [ teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/library/dtkgui/fix-pkgconfig-path.patch b/pkgs/desktops/deepin/library/dtkgui/fix-pkgconfig-path.patch deleted file mode 100644 index 1485baccc204..000000000000 --- a/pkgs/desktops/deepin/library/dtkgui/fix-pkgconfig-path.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/misc/dtkgui.pc.in b/misc/dtkgui.pc.in -index 89fdbbf..ad817c4 100644 ---- a/misc/dtkgui.pc.in -+++ b/misc/dtkgui.pc.in -@@ -1,8 +1,8 @@ - prefix=@CMAKE_INSTALL_PREFIX@ - exec_prefix=${prefix} --libdir=${prefix}/@LIBRARY_INSTALL_DIR@ --includedir=${prefix}/@INCLUDE_INSTALL_DIR@ --tooldir=${prefix}/@PACKAGE_TOOL_INSTALL_DIR@ -+libdir=@LIBRARY_INSTALL_DIR@ -+includedir=@INCLUDE_INSTALL_DIR@ -+tooldir=@PACKAGE_TOOL_INSTALL_DIR@ - - Name: dtk@DTK_VERSION_MAJOR@gui - Description: Deepin Tool Kit dtkgui header files diff --git a/pkgs/desktops/deepin/library/dtkgui/fix-pri-path.patch b/pkgs/desktops/deepin/library/dtkgui/fix-pri-path.patch deleted file mode 100644 index b746d34b1c79..000000000000 --- a/pkgs/desktops/deepin/library/dtkgui/fix-pri-path.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/misc/qt_lib_dtkgui.pri.in b/misc/qt_lib_dtkgui.pri.in -index 28308ee..9fb25e6 100644 ---- a/misc/qt_lib_dtkgui.pri.in -+++ b/misc/qt_lib_dtkgui.pri.in -@@ -4,9 +4,9 @@ QT.dtkgui.MINOR_VERSION = @PROJECT_VERSION_MINOR@ - QT.dtkgui.PATCH_VERSION = @PROJECT_VERSION_PATCH@ - QT.dtkgui.name = dtkgui - QT.dtkgui.module = dtk@DTK_VERSION_MAJOR@gui --QT.dtkgui.tools = @CMAKE_INSTALL_PREFIX@/@TOOL_INSTALL_DIR@ --QT.dtkgui.libs = @CMAKE_INSTALL_PREFIX@/@LIBRARY_INSTALL_DIR@ --QT.dtkgui.includes = @CMAKE_INSTALL_PREFIX@/@INCLUDE_INSTALL_DIR@ -+QT.dtkgui.tools = @TOOL_INSTALL_DIR@ -+QT.dtkgui.libs = @LIBRARY_INSTALL_DIR@ -+QT.dtkgui.includes = @INCLUDE_INSTALL_DIR@ - QT.dtkgui.frameworks = - QT.dtkgui.depends = core gui dtkcore gui_private dbus network - QT.dtkgui.module_config = v2 internal_module ltcg diff --git a/pkgs/desktops/deepin/library/dtklog/default.nix b/pkgs/desktops/deepin/library/dtklog/default.nix deleted file mode 100644 index 7c448ee8e8a8..000000000000 --- a/pkgs/desktops/deepin/library/dtklog/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - cmake, - pkg-config, - libsForQt5, - spdlog, - systemd, - withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "dtklog"; - version = "0.0.1"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = "dtklog"; - rev = finalAttrs.version; - hash = "sha256-8c3KL6pjAFPC4jRpOpPEbEDRBMWnDptwBSbEtcQcf5E="; - }; - - nativeBuildInputs = [ - cmake - pkg-config - libsForQt5.wrapQtAppsHook - ]; - - dontWrapQtApps = true; - - buildInputs = [ - libsForQt5.qtbase - spdlog - ] - ++ lib.optional withSystemd systemd; - - cmakeFlags = [ - (lib.cmakeBool "BUILD_WITH_SYSTEMD" withSystemd) - (lib.cmakeFeature "CMAKE_INSTALL_LIBDIR" "lib") - (lib.cmakeFeature "CMAKE_INSTALL_INCLUDEDIR" "include") - ]; - - meta = { - description = "Simple, convinient and thread safe logger for Qt-based C++ apps"; - homepage = "https://github.com/linuxdeepin/dtklog"; - license = lib.licenses.lgpl21Plus; - platforms = lib.platforms.linux; - teams = [ lib.teams.deepin ]; - }; -}) diff --git a/pkgs/desktops/deepin/library/dtkwidget/default.nix b/pkgs/desktops/deepin/library/dtkwidget/default.nix deleted file mode 100644 index cc81862d49dd..000000000000 --- a/pkgs/desktops/deepin/library/dtkwidget/default.nix +++ /dev/null @@ -1,91 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - cmake, - pkg-config, - doxygen, - libsForQt5, - dtkgui, - cups, - gsettings-qt, - libstartup_notification, - xorg, -}: - -stdenv.mkDerivation rec { - pname = "dtkwidget"; - version = "5.6.31"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-FAF66FsmUX0dhFlbT5wAUWkxY0TOU6dcKNwlY10Qou0="; - }; - - patches = [ - ./fix-pkgconfig-path.patch - ./fix-pri-path.patch - ]; - - postPatch = '' - substituteInPlace src/widgets/dapplication.cpp \ - --replace "auto dataDirs = DStandardPaths::standardLocations(QStandardPaths::GenericDataLocation);" \ - "auto dataDirs = DStandardPaths::standardLocations(QStandardPaths::GenericDataLocation) << \"$out/share\";" - ''; - - nativeBuildInputs = [ - cmake - doxygen - pkg-config - libsForQt5.qttools - libsForQt5.wrapQtAppsHook - ]; - - buildInputs = [ - libsForQt5.qtbase - libsForQt5.qtmultimedia - libsForQt5.qtsvg - libsForQt5.qtx11extras - cups - gsettings-qt - libstartup_notification - xorg.libXdmcp - ]; - - propagatedBuildInputs = [ dtkgui ]; - - cmakeFlags = [ - "-DDTK_VERSION=${version}" - "-DBUILD_DOCS=ON" - "-DMKSPECS_INSTALL_DIR=${placeholder "dev"}/mkspecs/modules" - "-DQCH_INSTALL_DESTINATION=${placeholder "doc"}/${libsForQt5.qtbase.qtDocPrefix}" - ]; - - preConfigure = '' - # qt.qpa.plugin: Could not find the Qt platform plugin "minimal" - # A workaround is to set QT_PLUGIN_PATH explicitly - export QT_PLUGIN_PATH=${libsForQt5.qtbase.bin}/${libsForQt5.qtbase.qtPluginPrefix} - ''; - - outputs = [ - "out" - "dev" - "doc" - ]; - - postFixup = '' - for binary in $out/lib/dtk5/DWidget/bin/*; do - wrapQtApp $binary - done - ''; - - meta = with lib; { - description = "Deepin graphical user interface library"; - homepage = "https://github.com/linuxdeepin/dtkwidget"; - license = licenses.lgpl3Plus; - platforms = platforms.linux; - teams = [ teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/library/dtkwidget/fix-pkgconfig-path.patch b/pkgs/desktops/deepin/library/dtkwidget/fix-pkgconfig-path.patch deleted file mode 100644 index df4452259580..000000000000 --- a/pkgs/desktops/deepin/library/dtkwidget/fix-pkgconfig-path.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/misc/DtkWidget.pc.in b/misc/DtkWidget.pc.in -index 3c610669..b6ed04ca 100644 ---- a/misc/DtkWidget.pc.in -+++ b/misc/DtkWidget.pc.in -@@ -1,7 +1,7 @@ - prefix=@CMAKE_INSTALL_PREFIX@ - exec_prefix=${prefix} --libdir=${prefix}/@LIBRARY_INSTALL_DIR@ --includedir=${prefix}/@INCLUDE_INSTALL_DIR@ -+libdir=@LIBRARY_INSTALL_DIR@ -+includedir=@INCLUDE_INSTALL_DIR@ - - Name: dtk@DTK_VERSION_MAJOR@widget - Description: Deepin Tool Kit dtkwidget header files diff --git a/pkgs/desktops/deepin/library/dtkwidget/fix-pri-path.patch b/pkgs/desktops/deepin/library/dtkwidget/fix-pri-path.patch deleted file mode 100644 index cf2faac94855..000000000000 --- a/pkgs/desktops/deepin/library/dtkwidget/fix-pri-path.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/misc/qt_lib_DtkWidget.pri.in b/misc/qt_lib_DtkWidget.pri.in -index 623878d3..561f5186 100644 ---- a/misc/qt_lib_DtkWidget.pri.in -+++ b/misc/qt_lib_DtkWidget.pri.in -@@ -4,9 +4,9 @@ QT.dtkwidget.MINOR_VERSION = @PROJECT_VERSION_MINOR@ - QT.dtkwidget.PATCH_VERSION = @PROJECT_VERSION_PATCH@ - QT.dtkwidget.name = dtkwidget - QT.dtkwidget.module = dtk@DTK_VERSION_MAJOR@widget --QT.dtkwidget.tools = @CMAKE_INSTALL_PREFIX@/@TOOL_INSTALL_DIR@ --QT.dtkwidget.libs = @CMAKE_INSTALL_PREFIX@/@LIBRARY_INSTALL_DIR@ --QT.dtkwidget.includes = @CMAKE_INSTALL_PREFIX@/@INCLUDE_INSTALL_DIR@ -+QT.dtkwidget.tools = @TOOL_INSTALL_DIR@ -+QT.dtkwidget.libs = @LIBRARY_INSTALL_DIR@ -+QT.dtkwidget.includes = @INCLUDE_INSTALL_DIR@ - QT.dtkwidget.frameworks = - QT.dtkwidget.depends = core gui dtkcore network concurrent dtkgui printsupport printsupport_private widgets widgets_private gui_private x11extras dbus - QT.dtkwidget.module_config = v2 internal_module ltcg diff --git a/pkgs/desktops/deepin/library/dwayland/default.nix b/pkgs/desktops/deepin/library/dwayland/default.nix deleted file mode 100644 index 7ea30f488df9..000000000000 --- a/pkgs/desktops/deepin/library/dwayland/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - cmake, - libsForQt5, - wayland, - wayland-protocols, - wayland-scanner, - extra-cmake-modules, - deepin-wayland-protocols, -}: - -stdenv.mkDerivation rec { - pname = "dwayland"; - version = "5.25.0"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-XZvL3lauVW5D3r3kybpS3SiitvwEScqgYe2h9c1DuCs="; - }; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - libsForQt5.qttools - wayland-scanner - ]; - - buildInputs = [ - libsForQt5.qtbase - libsForQt5.qtwayland - wayland - wayland-protocols - deepin-wayland-protocols - ]; - - dontWrapQtApps = true; - - # cmake requires that the kf5 directory must not empty - postInstall = '' - mkdir $out/include/KF5 - ''; - - meta = with lib; { - description = "Qt-style API to interact with the wayland-client and wayland-server"; - homepage = "https://github.com/linuxdeepin/dwayland"; - license = licenses.lgpl21Plus; - platforms = platforms.linux; - teams = [ teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/library/gio-qt/default.nix b/pkgs/desktops/deepin/library/gio-qt/default.nix deleted file mode 100644 index 2865174cd041..000000000000 --- a/pkgs/desktops/deepin/library/gio-qt/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - cmake, - pkg-config, - libsForQt5, - glibmm, - doxygen, - buildDocs ? true, -}: - -stdenv.mkDerivation rec { - pname = "gio-qt"; - version = "0.0.14"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-qDkkLqGsrw+otUy3/iZJJZ2RtpNYPGc/wktdVpw2weg="; - }; - - # Upstream compiles both qt5 and qt6 versions, which is not possible in nixpkgs - # because of the conflict between qt5 hooks and qt6 hooks - postPatch = '' - substituteInPlace {gio-qt,qgio-tools}/CMakeLists.txt \ - --replace "include(qt6.cmake)" " " - ''; - - nativeBuildInputs = [ - cmake - pkg-config - libsForQt5.wrapQtAppsHook - ] - ++ lib.optionals buildDocs [ - doxygen - libsForQt5.qttools - ]; - - cmakeFlags = [ - "-DCMAKE_INSTALL_LIBDIR=lib" - "-DPROJECT_VERSION=${version}" - ] - ++ lib.optionals (!buildDocs) [ "-DBUILD_DOCS=OFF" ]; - - propagatedBuildInputs = [ glibmm ]; - - preConfigure = '' - # qt.qpa.plugin: Could not find the Qt platform plugin "minimal" - # A workaround is to set QT_PLUGIN_PATH explicitly - export QT_PLUGIN_PATH=${libsForQt5.qtbase.bin}/${libsForQt5.qtbase.qtPluginPrefix} - ''; - - meta = with lib; { - description = "Gio wrapper for Qt applications"; - homepage = "https://github.com/linuxdeepin/gio-qt"; - license = licenses.lgpl3Plus; - platforms = platforms.linux; - teams = [ teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/library/qt5integration/default.nix b/pkgs/desktops/deepin/library/qt5integration/default.nix deleted file mode 100644 index cd1582acddc7..000000000000 --- a/pkgs/desktops/deepin/library/qt5integration/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - dtkwidget, - cmake, - pkg-config, - libsForQt5, - lxqt, - mtdev, - xorg, - gtest, -}: - -stdenv.mkDerivation rec { - pname = "qt5integration"; - version = "5.6.32"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-WRMeH66X21Z6TBKPEabnWqzC95+OR9M5azxvAp6K7T4="; - }; - - nativeBuildInputs = [ - cmake - pkg-config - ]; - - buildInputs = [ - dtkwidget - libsForQt5.qtbase - libsForQt5.qtsvg - libsForQt5.qtx11extras - mtdev - lxqt.libqtxdg_3_12 - xorg.xcbutilrenderutil - gtest - ]; - - cmakeFlags = [ - "-DPLUGIN_INSTALL_BASE_DIR=${placeholder "out"}/${libsForQt5.qtbase.qtPluginPrefix}" - ]; - - dontWrapQtApps = true; - - meta = with lib; { - description = "Qt platform theme integration plugins for DDE"; - homepage = "https://github.com/linuxdeepin/qt5integration"; - license = licenses.lgpl3Plus; - platforms = platforms.linux; - teams = [ teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/library/qt5platform-plugins/default.nix b/pkgs/desktops/deepin/library/qt5platform-plugins/default.nix deleted file mode 100644 index 1f6b059b1c92..000000000000 --- a/pkgs/desktops/deepin/library/qt5platform-plugins/default.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - cmake, - extra-cmake-modules, - pkg-config, - dtkcommon, - libsForQt5, - mtdev, - cairo, - xorg, - wayland, - dwayland, -}: - -stdenv.mkDerivation rec { - pname = "qt5platform-plugins"; - version = "5.6.32"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-jbt+ym6TQX3tecFCSlz8Z2ZnqOa69zYgaB5ohQM3lQg="; - }; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - pkg-config - ]; - - buildInputs = [ - dtkcommon - mtdev - cairo - libsForQt5.qtbase - libsForQt5.qtx11extras - xorg.libSM - wayland - dwayland - libsForQt5.qtwayland - ]; - - cmakeFlags = [ - "-DINSTALL_PATH=${placeholder "out"}/${libsForQt5.qtbase.qtPluginPrefix}/platforms" - "-DQT_XCB_PRIVATE_HEADERS=${libsForQt5.qtbase.src}/src/plugins/platforms/xcb" - ]; - - dontWrapQtApps = true; - - meta = with lib; { - description = "Qt platform plugins for DDE"; - homepage = "https://github.com/linuxdeepin/qt5platform-plugins"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - teams = [ teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/library/qt6integration/default.nix b/pkgs/desktops/deepin/library/qt6integration/default.nix deleted file mode 100644 index a4796ea96599..000000000000 --- a/pkgs/desktops/deepin/library/qt6integration/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - fetchpatch, - cmake, - pkg-config, - dtk6widget, - qt6Packages, - gtest, -}: - -stdenv.mkDerivation rec { - pname = "qt6integration"; - version = "6.0.33"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-fxeXjUn1hJUE1Le24sqVEvKBX9Uo8qUVjr3sfz/5cQQ="; - }; - - patches = [ - (fetchpatch { - name = "resolve-compilation-issues-on-Qt-6_9.patch"; - url = "https://gitlab.archlinux.org/archlinux/packaging/packages/deepin-qt6integration/-/raw/e85e6836919d8e8424e800d7d4c8681bb23c29f9/qt-6.9.patch"; - hash = "sha256-GJH25cOEcA5Zep6FABwlRXU7HfpgMXNJzsbmWQdzx+Y="; - }) - (fetchpatch { - name = "missing-include.patch"; - url = "https://gitlab.archlinux.org/archlinux/packaging/packages/deepin-qt6integration/-/raw/300e6ac2a166ce214d64c9b16acc57d31de0604a/missing-include.patch"; - hash = "sha256-IFSfnIFcXAcmzfAOId2ew+YUHxHK6+JfJ/t96FR7rhk="; - }) - ]; - - nativeBuildInputs = [ - cmake - pkg-config - ]; - - buildInputs = [ - dtk6widget - qt6Packages.qtbase - gtest - ]; - - cmakeFlags = [ - "-DDTK_VERSION=${version}" - "-DPLUGIN_INSTALL_BASE_DIR=${placeholder "out"}/${qt6Packages.qtbase.qtPluginPrefix}" - ]; - - dontWrapQtApps = true; - - meta = { - description = "Qt platform theme integration plugins for DDE"; - homepage = "https://github.com/linuxdeepin/qt6integration"; - license = lib.licenses.lgpl3Plus; - platforms = lib.platforms.linux; - teams = [ lib.teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/library/qt6mpris/default.nix b/pkgs/desktops/deepin/library/qt6mpris/default.nix deleted file mode 100644 index a61bc797fa0b..000000000000 --- a/pkgs/desktops/deepin/library/qt6mpris/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - qt6Packages, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "qt6mpris"; - version = "1.0.0.1-1deepin1"; - - src = fetchFromGitHub { - owner = "deepin-community"; - repo = "qt6mpris"; - rev = finalAttrs.version; - hash = "sha256-PCdA9q/txaL2Fbr2/4+Z7L4zxWeULl3bq8MVH3i1g3g="; - }; - - postPatch = '' - substituteInPlace src/src.pro \ - --replace-fail '$$[QT_INSTALL_LIBS]' "$out/lib" \ - --replace-fail '$$[QT_INSTALL_HEADERS]' "$out/include" \ - --replace-fail '$$[QMAKE_MKSPECS]' "$out/mkspecs" - substituteInPlace declarative/declarative.pro \ - --replace-fail '$$[QT_INSTALL_QML]' "$out/${qt6Packages.qtbase.qtQmlPrefix}" - ''; - - nativeBuildInputs = [ - qt6Packages.qmake - ]; - - dontWrapQtApps = true; - - buildInputs = [ - qt6Packages.qtbase - qt6Packages.qtdeclarative - ]; - - meta = { - description = "Qt and QML MPRIS interface and adaptor"; - homepage = "https://github.com/deepin-community/qt6mpris"; - license = lib.licenses.lgpl21Plus; - platforms = lib.platforms.linux; - teams = [ lib.teams.deepin ]; - }; -}) diff --git a/pkgs/desktops/deepin/library/qt6platform-plugins/default.nix b/pkgs/desktops/deepin/library/qt6platform-plugins/default.nix deleted file mode 100644 index 47dcbb28139d..000000000000 --- a/pkgs/desktops/deepin/library/qt6platform-plugins/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - cmake, - pkg-config, - mtdev, - cairo, - xorg, - qt6Packages, -}: - -stdenv.mkDerivation rec { - pname = "qt6platform-plugins"; - version = "6.0.33"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-uQ/dfk/HEvngTjHDLQOg965Jy+fH2YNfhKwXB+1BoUM="; - }; - - postUnpack = '' - tar -xf ${qt6Packages.qtbase.src} - mv qtbase-everywhere-src-${qt6Packages.qtbase.version}/src/plugins/platforms/xcb ${src.name}/xcb/libqt6xcbqpa-dev/${qt6Packages.qtbase.version} - ''; - - nativeBuildInputs = [ - cmake - pkg-config - ]; - - buildInputs = [ - mtdev - cairo - xorg.libSM - qt6Packages.qtbase - ]; - - cmakeFlags = [ - "-DDTK_VERSION=${version}" - "-DINSTALL_PATH=${placeholder "out"}/${qt6Packages.qtbase.qtPluginPrefix}/platforms" - ]; - - dontWrapQtApps = true; - - meta = { - description = "Qt platform plugins for DDE"; - homepage = "https://github.com/linuxdeepin/qt6platform-plugins"; - license = lib.licenses.gpl3Plus; - platforms = lib.platforms.linux; - teams = [ lib.teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/library/treeland-protocols/default.nix b/pkgs/desktops/deepin/library/treeland-protocols/default.nix deleted file mode 100644 index d95ced544e04..000000000000 --- a/pkgs/desktops/deepin/library/treeland-protocols/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - cmake, -}: - -stdenv.mkDerivation rec { - pname = "treeland-protocols"; - version = "0.4.5"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-SS4jnfr/9Ec3qpnHS4EjQViekBRMix5oz7b9qhNZpfY="; - }; - - nativeBuildInputs = [ - cmake - ]; - - meta = { - description = "Wayland protocol extensions for treeland"; - homepage = "https://github.com/linuxdeepin/treeland-protocols"; - license = with lib.licenses; [ - gpl3Only - lgpl3Only - asl20 - ]; - platforms = lib.platforms.linux; - teams = [ lib.teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/library/udisks2-qt5/default.nix b/pkgs/desktops/deepin/library/udisks2-qt5/default.nix deleted file mode 100644 index 4a39a16f6331..000000000000 --- a/pkgs/desktops/deepin/library/udisks2-qt5/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - libsForQt5, - pkg-config, - udisks, -}: - -stdenv.mkDerivation rec { - pname = "udisks2-qt5"; - version = "5.0.6"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "sha256-WS4fmqEYXi5dkn8RvyJBzy3+r+UgFcGDFFpQlbblLu4="; - }; - - nativeBuildInputs = [ - libsForQt5.qmake - pkg-config - libsForQt5.wrapQtAppsHook - ]; - - buildInputs = [ udisks ]; - - qmakeFlags = [ "VERSION=${version}" ]; - - meta = with lib; { - description = "UDisks2 D-Bus interfaces binding for Qt5"; - homepage = "https://github.com/linuxdeepin/udisks2-qt5"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - teams = [ teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/library/util-dfm/default.nix b/pkgs/desktops/deepin/library/util-dfm/default.nix deleted file mode 100644 index 977fe68edbc4..000000000000 --- a/pkgs/desktops/deepin/library/util-dfm/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - cmake, - pkg-config, - libsForQt5, - libmediainfo, - libsecret, - libisoburn, - libuuid, - udisks, -}: - -stdenv.mkDerivation rec { - pname = "util-dfm"; - version = "1.3.2"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-ngDjjdwuYqvyhaUcMNV5PRmGKC3lmY/nJQGOQgRMIQE="; - }; - - nativeBuildInputs = [ - cmake - pkg-config - ]; - - dontWrapQtApps = true; - - buildInputs = [ - libsForQt5.qtbase - libmediainfo - libsecret - libuuid - libisoburn - udisks - ]; - - cmakeFlags = [ - "-DCMAKE_INSTALL_LIBDIR=lib" - "-DPROJECT_VERSION=${version}" - ]; - - meta = with lib; { - description = "Toolkits of libdfm-io,libdfm-mount and libdfm-burn"; - homepage = "https://github.com/linuxdeepin/util-dfm"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - teams = [ teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/misc/deepin-desktop-base/default.nix b/pkgs/desktops/deepin/misc/deepin-desktop-base/default.nix deleted file mode 100644 index 12316288eaf8..000000000000 --- a/pkgs/desktops/deepin/misc/deepin-desktop-base/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ - stdenvNoCC, - lib, - fetchFromGitHub, - nixos-icons, -}: -stdenvNoCC.mkDerivation rec { - pname = "deepin-desktop-base"; - version = "2024.07.24"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-JOC8nQ/YgUpY93FcniO2uypAfsL/SNU+KfTrthoZfQo="; - }; - - makeFlags = [ "DESTDIR=${placeholder "out"}" ]; - - # distribution_logo_transparent.svg come form nixos-artwork(https://github.com/NixOS/nixos-artwork)/logo/nixos-white.svg under CC-BY license, used for dde-lock - postInstall = '' - rm -r $out/etc - rm -r $out/usr/share/python-apt - rm -r $out/usr/share/plymouth - rm -r $out/usr/share/distro-info - mv $out/usr/* $out/ - rm -r $out/usr - install -D ${./distribution_logo_transparent.svg} $out/share/pixmaps/distribution_logo_transparent.svg - cat > $out/share/deepin/distribution.info < - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pkgs/desktops/deepin/tools/dde-device-formatter/default.nix b/pkgs/desktops/deepin/tools/dde-device-formatter/default.nix deleted file mode 100644 index 8781925b5805..000000000000 --- a/pkgs/desktops/deepin/tools/dde-device-formatter/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - pkg-config, - deepin-gettext-tools, - libsForQt5, - dtkwidget, - udisks2-qt5, - qt5platform-plugins, - qt5integration, -}: - -stdenv.mkDerivation rec { - pname = "dde-device-formatter"; - version = "0.0.1.16"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-l2D+j+u5Q6G45KTM7eg1QNEakEPtEJ0tzlDlQO5/08I="; - }; - - postPatch = '' - substituteInPlace translate_desktop2ts.sh translate_ts2desktop.sh \ - --replace "/usr/bin/deepin-desktop-ts-convert" "deepin-desktop-ts-convert" - substituteInPlace dde-device-formatter.pro dde-device-formatter.desktop \ - --replace "/usr" "$out" - patchShebangs *.sh - ''; - - nativeBuildInputs = [ - libsForQt5.qmake - libsForQt5.qttools - libsForQt5.wrapQtAppsHook - pkg-config - deepin-gettext-tools - ]; - - buildInputs = [ - dtkwidget - udisks2-qt5 - qt5platform-plugins - qt5integration - libsForQt5.qtx11extras - ]; - - cmakeFlags = [ "-DVERSION=${version}" ]; - - meta = { - description = "Simple graphical interface for creating file system in a block device"; - mainProgram = "dde-device-formatter"; - homepage = "https://github.com/linuxdeepin/dde-device-formatter"; - license = lib.licenses.gpl3Plus; - platforms = lib.platforms.linux; - teams = [ lib.teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/tools/deepin-anything/default.nix b/pkgs/desktops/deepin/tools/deepin-anything/default.nix deleted file mode 100644 index 0e0bdb7ffa4e..000000000000 --- a/pkgs/desktops/deepin/tools/deepin-anything/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - cmake, - pkg-config, - libsForQt5, - udisks2-qt5, - util-linux, - libnl, - glib, - pcre, -}: - -stdenv.mkDerivation rec { - pname = "deepin-anything"; - version = "6.2.10"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = "deepin-anything"; - rev = version; - hash = "sha256-eGel+pLAYHYkPXQxzTz+lMPSlgNiDFAev2bzGjj4ZFw="; - }; - - postPatch = '' - substituteInPlace src/CMakeLists.txt \ - --replace-fail 'add_subdirectory("kernelmod")' " " - substituteInPlace src/server/backend/CMakeLists.txt \ - --replace-fail "/usr" "$out" \ - --replace-fail "/etc" "$out/etc" - ''; - - nativeBuildInputs = [ - cmake - pkg-config - libsForQt5.wrapQtAppsHook - ]; - - buildInputs = [ - udisks2-qt5 - util-linux - libnl - libsForQt5.polkit-qt - glib - pcre - ]; - - meta = { - description = "Deepin Anything file search tool"; - homepage = "https://github.com/linuxdeepin/deepin-anything"; - license = lib.licenses.gpl3Plus; - platforms = lib.platforms.linux; - teams = [ lib.teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/tools/deepin-gettext-tools/default.nix b/pkgs/desktops/deepin/tools/deepin-gettext-tools/default.nix deleted file mode 100644 index b558c4e963e6..000000000000 --- a/pkgs/desktops/deepin/tools/deepin-gettext-tools/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - gettext, - python3Packages, - perlPackages, -}: - -stdenv.mkDerivation rec { - pname = "deepin-gettext-tools"; - version = "1.0.11"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "sha256-V6X0E80352Vb6zwaBTRfZZnXEVCmBRbO2bca9A9OL6c="; - }; - - postPatch = '' - substituteInPlace src/generate_mo.py --replace "sudo cp" "cp" - ''; - - nativeBuildInputs = [ python3Packages.wrapPython ]; - - buildInputs = [ - gettext - perlPackages.perl - perlPackages.ConfigTiny - perlPackages.XMLLibXML - ]; - - makeFlags = [ "PREFIX=${placeholder "out"}" ]; - - postFixup = '' - wrapPythonPrograms - wrapPythonProgramsIn "$out/lib/${pname}" - wrapProgram $out/bin/deepin-desktop-ts-convert --set PERL5LIB $PERL5LIB - ''; - - meta = with lib; { - description = "Translation file processing utils for DDE development"; - homepage = "https://github.com/linuxdeepin/deepin-gettext-tools"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - teams = [ teams.deepin ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index eefd41f4d9a2..e3cc1f13656b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -700,6 +700,7 @@ mapAliases { deadpixi-sam = deadpixi-sam-unstable; debugedit-unstable = throw "'debugedit-unstable' has been renamed to/replaced by 'debugedit'"; # Converted to throw 2024-10-17 + deepin = throw "the Deepin desktop environment and associated tools have been removed from nixpkgs due to lack of maintenance"; # Added 2025-08-21 degit-rs = throw "'degit-rs' has been removed because it is unmaintained upstream and has vulnerable dependencies."; # Added 2025-07-11 deltachat-cursed = arcanechat-tui; # added 2025-02-25 deltachat-electron = throw "'deltachat-electron' has been renamed to/replaced by 'deltachat-desktop'"; # Converted to throw 2024-10-17 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 10e0970bcbe2..c00a8540435e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14604,8 +14604,6 @@ with pkgs; appls = [ prio ]; }; - deepin = recurseIntoAttrs (callPackage ../desktops/deepin { }); - enlightenment = recurseIntoAttrs (callPackage ../desktops/enlightenment { }); expidus = recurseIntoAttrs ( diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 8e87e80b1a65..2c9d32830b84 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -715,6 +715,7 @@ in zfs = throw "linuxPackages.zfs has been removed, use zfs_* instead, or linuxPackages.\${pkgs.zfs.kernelModuleAttribute}"; # added 2025-01-23 zfs_2_1 = throw "zfs_2_1 has been removed"; # added 2024-12-25; ati_drivers_x11 = throw "ati drivers are no longer supported by any kernel >=4.1"; # added 2021-05-18; + deepin-anything-module = throw "the Deepin desktop environment and associated tools have been removed from nixpkgs due to lack of maintenance"; hid-nintendo = throw "hid-nintendo was added in mainline kernel version 5.16"; # Added 2023-07-30 sch_cake = throw "sch_cake was added in mainline kernel version 4.19"; # Added 2023-06-14 rtl8723bs = throw "rtl8723bs was added in mainline kernel version 4.12"; # Added 2023-06-14 From efce08af166f021e3302bc4c7bb0a78f6f4a2060 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 12 Aug 2025 19:40:13 +0300 Subject: [PATCH 142/146] plasmaMobileGear: drop --- pkgs/applications/plasma-mobile/default.nix | 74 ------- pkgs/applications/plasma-mobile/fetch.sh | 1 - .../plasma-mobile/plasma-dialer.nix | 88 --------- .../plasma-mobile/plasma-phonebook.nix | 43 ----- .../plasma-mobile/plasma-settings.nix | 59 ------ pkgs/applications/plasma-mobile/spacebar.nix | 58 ------ pkgs/applications/plasma-mobile/srcs.nix | 182 ------------------ pkgs/top-level/qt5-packages.nix | 12 -- 8 files changed, 517 deletions(-) delete mode 100644 pkgs/applications/plasma-mobile/default.nix delete mode 100644 pkgs/applications/plasma-mobile/fetch.sh delete mode 100644 pkgs/applications/plasma-mobile/plasma-dialer.nix delete mode 100644 pkgs/applications/plasma-mobile/plasma-phonebook.nix delete mode 100644 pkgs/applications/plasma-mobile/plasma-settings.nix delete mode 100644 pkgs/applications/plasma-mobile/spacebar.nix delete mode 100644 pkgs/applications/plasma-mobile/srcs.nix 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 From ee897e6fb5033eb7dc2fc675b15cc95717850295 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 12 Aug 2025 19:39:28 +0300 Subject: [PATCH 143/146] plasma5: drop --- .../addons/bismuth/0001-esbuild-config.patch | 13 - .../3rdparty/addons/bismuth/default.nix | 54 -- .../3rdparty/addons/caffeine-plus.nix | 39 -- .../plasma-5/3rdparty/addons/krunner-ssh.nix | 53 -- .../3rdparty/addons/krunner-symbols.nix | 57 -- .../3rdparty/addons/virtual-desktop-bar.nix | 43 -- .../kwin/scripts/dynamic-workspaces.nix | 49 -- .../3rdparty/kwin/scripts/krohnkite.nix | 49 -- .../plasma-5/3rdparty/kwin/scripts/kzones.nix | 54 -- .../3rdparty/kwin/scripts/parachute.nix | 47 -- .../plasma-5/3rdparty/kwin/scripts/tiling.nix | 54 -- .../plasma-5/3rdparty/lightly/default.nix | 50 -- pkgs/desktops/plasma-5/aura-browser.nix | 18 - pkgs/desktops/plasma-5/bluedevil.nix | 43 -- pkgs/desktops/plasma-5/breeze-grub.nix | 15 - pkgs/desktops/plasma-5/breeze-gtk.nix | 24 - .../plasma-5/breeze-plymouth/default.nix | 69 --- .../breeze-plymouth/install-paths.patch | 19 - pkgs/desktops/plasma-5/breeze-qt5.nix | 44 -- pkgs/desktops/plasma-5/default.nix | 218 -------- pkgs/desktops/plasma-5/discover.nix | 76 --- pkgs/desktops/plasma-5/fetch.sh | 1 - pkgs/desktops/plasma-5/flatpak-kcm.nix | 21 - pkgs/desktops/plasma-5/kactivitymanagerd.nix | 32 -- pkgs/desktops/plasma-5/kde-cli-tools.nix | 54 -- .../0001-gsettings-schemas-path.patch | 21 - .../plasma-5/kde-gtk-config/default.nix | 52 -- pkgs/desktops/plasma-5/kdecoration.nix | 21 - pkgs/desktops/plasma-5/kdeplasma-addons.nix | 51 -- pkgs/desktops/plasma-5/kgamma5.nix | 25 - pkgs/desktops/plasma-5/khotkeys.nix | 40 -- .../kinfocenter/0001-tool-paths.patch | 51 -- .../desktops/plasma-5/kinfocenter/default.nix | 107 ---- pkgs/desktops/plasma-5/kmenuedit.nix | 29 -- pkgs/desktops/plasma-5/kpipewire.nix | 29 -- pkgs/desktops/plasma-5/kscreen.nix | 45 -- pkgs/desktops/plasma-5/kscreenlocker.nix | 49 -- pkgs/desktops/plasma-5/ksshaskpass.nix | 25 - pkgs/desktops/plasma-5/ksystemstats.nix | 21 - pkgs/desktops/plasma-5/kwallet-pam.nix | 36 -- .../plasma-5/kwayland-integration.nix | 34 -- ...er-CAP_SYS_NICE-from-the-ambient-set.patch | 40 -- ...-executable-name-for-.desktop-search.patch | 114 ---- .../plasma-5/kwin/0001-follow-symlinks.patch | 25 - .../plasma-5/kwin/0002-xwayland.patch | 25 - ...lugins-qpa-allow-using-nixos-wrapper.patch | 26 - pkgs/desktops/plasma-5/kwin/default.nix | 166 ------ pkgs/desktops/plasma-5/kwrited.nix | 23 - pkgs/desktops/plasma-5/layer-shell-qt.nix | 27 - pkgs/desktops/plasma-5/libkscreen/default.nix | 41 -- .../libkscreen/libkscreen-backends-path.patch | 28 - .../0001-qdiriterator-follow-symlinks.patch | 24 - .../plasma-5/libksysguard/default.nix | 57 -- pkgs/desktops/plasma-5/milou.nix | 29 -- pkgs/desktops/plasma-5/oxygen-sounds.nix | 9 - pkgs/desktops/plasma-5/oxygen.nix | 44 -- .../patches/0001-fix-add-executable-bit.patch | 25 - pkgs/desktops/plasma-5/plank-player.nix | 18 - pkgs/desktops/plasma-5/plasma-bigscreen.nix | 51 -- .../plasma-5/plasma-browser-integration.nix | 43 -- .../plasma-5/plasma-desktop/default.nix | 149 ------ .../plasma-desktop/hwclock-path.patch | 24 - .../plasma-5/plasma-desktop/kcm-access.patch | 13 - .../plasma-desktop/no-discover-shortcut.patch | 13 - .../plasma-5/plasma-desktop/tzdir.patch | 18 - pkgs/desktops/plasma-5/plasma-disks.nix | 58 --- pkgs/desktops/plasma-5/plasma-firewall.nix | 22 - .../plasma-5/plasma-integration/default.nix | 46 -- .../plasma-5/plasma-mobile/default.nix | 80 --- .../desktops/plasma-5/plasma-nano/default.nix | 13 - .../plasma-nm/0002-openvpn-binary-path.patch | 13 - pkgs/desktops/plasma-5/plasma-nm/default.nix | 82 --- pkgs/desktops/plasma-5/plasma-pa.nix | 45 -- .../plasma-5/plasma-remotecontrollers.nix | 51 -- pkgs/desktops/plasma-5/plasma-sdk.nix | 46 -- .../plasma-5/plasma-systemmonitor.nix | 40 -- pkgs/desktops/plasma-5/plasma-thunderbolt.nix | 17 - .../plasma-vault/0001-encfs-path.patch | 31 -- .../plasma-vault/0002-cryfs-path.patch | 25 - .../plasma-vault/0003-fusermount-path.patch | 25 - .../plasma-vault/0004-gocryptfs-path.patch | 13 - .../plasma-5/plasma-vault/default.nix | 43 -- pkgs/desktops/plasma-5/plasma-welcome.nix | 45 -- .../plasma-5/plasma-workspace-wallpapers.nix | 6 - .../plasma-workspace/0001-startkde.patch | 74 --- .../0002-absolute-wallpaper-install-dir.patch | 9 - .../plasma-5/plasma-workspace/default.nix | 191 ------- pkgs/desktops/plasma-5/polkit-kde-agent.nix | 35 -- pkgs/desktops/plasma-5/powerdevil.nix | 49 -- pkgs/desktops/plasma-5/qqc2-breeze-style.nix | 29 -- pkgs/desktops/plasma-5/sddm-kcm.nix | 37 -- pkgs/desktops/plasma-5/srcs.nix | 486 ------------------ pkgs/desktops/plasma-5/systemsettings.nix | 59 --- .../plasma-5/xdg-desktop-portal-kde.nix | 57 -- pkgs/top-level/qt5-packages.nix | 14 - 95 files changed, 4605 deletions(-) delete mode 100644 pkgs/desktops/plasma-5/3rdparty/addons/bismuth/0001-esbuild-config.patch delete mode 100644 pkgs/desktops/plasma-5/3rdparty/addons/bismuth/default.nix delete mode 100644 pkgs/desktops/plasma-5/3rdparty/addons/caffeine-plus.nix delete mode 100644 pkgs/desktops/plasma-5/3rdparty/addons/krunner-ssh.nix delete mode 100644 pkgs/desktops/plasma-5/3rdparty/addons/krunner-symbols.nix delete mode 100644 pkgs/desktops/plasma-5/3rdparty/addons/virtual-desktop-bar.nix delete mode 100644 pkgs/desktops/plasma-5/3rdparty/kwin/scripts/dynamic-workspaces.nix delete mode 100644 pkgs/desktops/plasma-5/3rdparty/kwin/scripts/krohnkite.nix delete mode 100644 pkgs/desktops/plasma-5/3rdparty/kwin/scripts/kzones.nix delete mode 100644 pkgs/desktops/plasma-5/3rdparty/kwin/scripts/parachute.nix delete mode 100644 pkgs/desktops/plasma-5/3rdparty/kwin/scripts/tiling.nix delete mode 100644 pkgs/desktops/plasma-5/3rdparty/lightly/default.nix delete mode 100644 pkgs/desktops/plasma-5/aura-browser.nix delete mode 100644 pkgs/desktops/plasma-5/bluedevil.nix delete mode 100644 pkgs/desktops/plasma-5/breeze-grub.nix delete mode 100644 pkgs/desktops/plasma-5/breeze-gtk.nix delete mode 100644 pkgs/desktops/plasma-5/breeze-plymouth/default.nix delete mode 100644 pkgs/desktops/plasma-5/breeze-plymouth/install-paths.patch delete mode 100644 pkgs/desktops/plasma-5/breeze-qt5.nix delete mode 100644 pkgs/desktops/plasma-5/default.nix delete mode 100644 pkgs/desktops/plasma-5/discover.nix delete mode 100644 pkgs/desktops/plasma-5/fetch.sh delete mode 100644 pkgs/desktops/plasma-5/flatpak-kcm.nix delete mode 100644 pkgs/desktops/plasma-5/kactivitymanagerd.nix delete mode 100644 pkgs/desktops/plasma-5/kde-cli-tools.nix delete mode 100644 pkgs/desktops/plasma-5/kde-gtk-config/0001-gsettings-schemas-path.patch delete mode 100644 pkgs/desktops/plasma-5/kde-gtk-config/default.nix delete mode 100644 pkgs/desktops/plasma-5/kdecoration.nix delete mode 100644 pkgs/desktops/plasma-5/kdeplasma-addons.nix delete mode 100644 pkgs/desktops/plasma-5/kgamma5.nix delete mode 100644 pkgs/desktops/plasma-5/khotkeys.nix delete mode 100644 pkgs/desktops/plasma-5/kinfocenter/0001-tool-paths.patch delete mode 100644 pkgs/desktops/plasma-5/kinfocenter/default.nix delete mode 100644 pkgs/desktops/plasma-5/kmenuedit.nix delete mode 100644 pkgs/desktops/plasma-5/kpipewire.nix delete mode 100644 pkgs/desktops/plasma-5/kscreen.nix delete mode 100644 pkgs/desktops/plasma-5/kscreenlocker.nix delete mode 100644 pkgs/desktops/plasma-5/ksshaskpass.nix delete mode 100644 pkgs/desktops/plasma-5/ksystemstats.nix delete mode 100644 pkgs/desktops/plasma-5/kwallet-pam.nix delete mode 100644 pkgs/desktops/plasma-5/kwayland-integration.nix delete mode 100644 pkgs/desktops/plasma-5/kwin/0001-Lower-CAP_SYS_NICE-from-the-ambient-set.patch delete mode 100644 pkgs/desktops/plasma-5/kwin/0001-NixOS-Unwrap-executable-name-for-.desktop-search.patch delete mode 100644 pkgs/desktops/plasma-5/kwin/0001-follow-symlinks.patch delete mode 100644 pkgs/desktops/plasma-5/kwin/0002-xwayland.patch delete mode 100644 pkgs/desktops/plasma-5/kwin/0003-plugins-qpa-allow-using-nixos-wrapper.patch delete mode 100644 pkgs/desktops/plasma-5/kwin/default.nix delete mode 100644 pkgs/desktops/plasma-5/kwrited.nix delete mode 100644 pkgs/desktops/plasma-5/layer-shell-qt.nix delete mode 100644 pkgs/desktops/plasma-5/libkscreen/default.nix delete mode 100644 pkgs/desktops/plasma-5/libkscreen/libkscreen-backends-path.patch delete mode 100644 pkgs/desktops/plasma-5/libksysguard/0001-qdiriterator-follow-symlinks.patch delete mode 100644 pkgs/desktops/plasma-5/libksysguard/default.nix delete mode 100644 pkgs/desktops/plasma-5/milou.nix delete mode 100644 pkgs/desktops/plasma-5/oxygen-sounds.nix delete mode 100644 pkgs/desktops/plasma-5/oxygen.nix delete mode 100644 pkgs/desktops/plasma-5/patches/0001-fix-add-executable-bit.patch delete mode 100644 pkgs/desktops/plasma-5/plank-player.nix delete mode 100644 pkgs/desktops/plasma-5/plasma-bigscreen.nix delete mode 100644 pkgs/desktops/plasma-5/plasma-browser-integration.nix delete mode 100644 pkgs/desktops/plasma-5/plasma-desktop/default.nix delete mode 100644 pkgs/desktops/plasma-5/plasma-desktop/hwclock-path.patch delete mode 100644 pkgs/desktops/plasma-5/plasma-desktop/kcm-access.patch delete mode 100644 pkgs/desktops/plasma-5/plasma-desktop/no-discover-shortcut.patch delete mode 100644 pkgs/desktops/plasma-5/plasma-desktop/tzdir.patch delete mode 100644 pkgs/desktops/plasma-5/plasma-disks.nix delete mode 100644 pkgs/desktops/plasma-5/plasma-firewall.nix delete mode 100644 pkgs/desktops/plasma-5/plasma-integration/default.nix delete mode 100644 pkgs/desktops/plasma-5/plasma-mobile/default.nix delete mode 100644 pkgs/desktops/plasma-5/plasma-nano/default.nix delete mode 100644 pkgs/desktops/plasma-5/plasma-nm/0002-openvpn-binary-path.patch delete mode 100644 pkgs/desktops/plasma-5/plasma-nm/default.nix delete mode 100644 pkgs/desktops/plasma-5/plasma-pa.nix delete mode 100644 pkgs/desktops/plasma-5/plasma-remotecontrollers.nix delete mode 100644 pkgs/desktops/plasma-5/plasma-sdk.nix delete mode 100644 pkgs/desktops/plasma-5/plasma-systemmonitor.nix delete mode 100644 pkgs/desktops/plasma-5/plasma-thunderbolt.nix delete mode 100644 pkgs/desktops/plasma-5/plasma-vault/0001-encfs-path.patch delete mode 100644 pkgs/desktops/plasma-5/plasma-vault/0002-cryfs-path.patch delete mode 100644 pkgs/desktops/plasma-5/plasma-vault/0003-fusermount-path.patch delete mode 100644 pkgs/desktops/plasma-5/plasma-vault/0004-gocryptfs-path.patch delete mode 100644 pkgs/desktops/plasma-5/plasma-vault/default.nix delete mode 100644 pkgs/desktops/plasma-5/plasma-welcome.nix delete mode 100644 pkgs/desktops/plasma-5/plasma-workspace-wallpapers.nix delete mode 100644 pkgs/desktops/plasma-5/plasma-workspace/0001-startkde.patch delete mode 100644 pkgs/desktops/plasma-5/plasma-workspace/0002-absolute-wallpaper-install-dir.patch delete mode 100644 pkgs/desktops/plasma-5/plasma-workspace/default.nix delete mode 100644 pkgs/desktops/plasma-5/polkit-kde-agent.nix delete mode 100644 pkgs/desktops/plasma-5/powerdevil.nix delete mode 100644 pkgs/desktops/plasma-5/qqc2-breeze-style.nix delete mode 100644 pkgs/desktops/plasma-5/sddm-kcm.nix delete mode 100644 pkgs/desktops/plasma-5/srcs.nix delete mode 100644 pkgs/desktops/plasma-5/systemsettings.nix delete mode 100644 pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix diff --git a/pkgs/desktops/plasma-5/3rdparty/addons/bismuth/0001-esbuild-config.patch b/pkgs/desktops/plasma-5/3rdparty/addons/bismuth/0001-esbuild-config.patch deleted file mode 100644 index 8ec7a34d9760..000000000000 --- a/pkgs/desktops/plasma-5/3rdparty/addons/bismuth/0001-esbuild-config.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/kwinscript/CMakeLists.txt b/src/kwinscript/CMakeLists.txt -index 9e2f7054..ed607027 100644 ---- a/src/kwinscript/CMakeLists.txt -+++ b/src/kwinscript/CMakeLists.txt -@@ -39,7 +39,7 @@ endif() - set(ESBUILD_COMMAND - "esbuild" "--bundle" "${CMAKE_CURRENT_SOURCE_DIR}/index.ts" - "--outfile=${CMAKE_CURRENT_BINARY_DIR}/bismuth/contents/code/index.mjs" -- "--format=esm" "--platform=neutral") -+ "--format=esm" "--platform=neutral" "--target=es6") - if(USE_NPM) - list(PREPEND ESBUILD_COMMAND "npx") - endif() diff --git a/pkgs/desktops/plasma-5/3rdparty/addons/bismuth/default.nix b/pkgs/desktops/plasma-5/3rdparty/addons/bismuth/default.nix deleted file mode 100644 index 56e684794817..000000000000 --- a/pkgs/desktops/plasma-5/3rdparty/addons/bismuth/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ - lib, - mkDerivation, - fetchFromGitHub, - kcoreaddons, - kwindowsystem, - plasma-framework, - systemsettings, - cmake, - extra-cmake-modules, - esbuild, -}: - -mkDerivation rec { - pname = "bismuth"; - version = "3.1.4"; - - src = fetchFromGitHub { - owner = "Bismuth-Forge"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-c13OFEw6E/I8j/mqeLnuc9Chi6pc3+AgwAMPpCzh974="; - }; - - patches = [ - ./0001-esbuild-config.patch - ]; - - cmakeFlags = [ - "-DUSE_TSC=OFF" - "-DUSE_NPM=OFF" - ]; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - esbuild - ]; - - buildInputs = [ - kcoreaddons - kwindowsystem - plasma-framework - systemsettings - ]; - - meta = with lib; { - description = "Dynamic tiling extension for KWin"; - license = licenses.mit; - maintainers = with maintainers; [ pasqui23 ]; - homepage = "https://bismuth-forge.github.io/bismuth/"; - inherit (kwindowsystem.meta) platforms; - }; -} diff --git a/pkgs/desktops/plasma-5/3rdparty/addons/caffeine-plus.nix b/pkgs/desktops/plasma-5/3rdparty/addons/caffeine-plus.nix deleted file mode 100644 index 7f85fa9f0fc7..000000000000 --- a/pkgs/desktops/plasma-5/3rdparty/addons/caffeine-plus.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ - lib, - mkDerivation, - fetchFromGitHub, - extra-cmake-modules, - kwindowsystem, - plasma-framework, -}: - -mkDerivation rec { - pname = "plasma-applet-caffeine-plus"; - version = "1.4"; - - src = fetchFromGitHub { - owner = "qunxyz"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-/Nz0kSDGok7GjqSQtjH/8q/u6blVTFPO6kfjEyt/jEo="; - }; - - buildInputs = [ - kwindowsystem - plasma-framework - ]; - - nativeBuildInputs = [ extra-cmake-modules ]; - - cmakeFlags = [ - "-Wno-dev" - ]; - - meta = with lib; { - description = "Disable screensaver and auto suspend"; - license = licenses.gpl2; - maintainers = with maintainers; [ peterhoeg ]; - inherit (src.meta) homepage; - inherit (kwindowsystem.meta) platforms; - }; -} diff --git a/pkgs/desktops/plasma-5/3rdparty/addons/krunner-ssh.nix b/pkgs/desktops/plasma-5/3rdparty/addons/krunner-ssh.nix deleted file mode 100644 index 17c4f36cd1b6..000000000000 --- a/pkgs/desktops/plasma-5/3rdparty/addons/krunner-ssh.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitLab, - python3, -}: -let - pythonEnv = python3.withPackages ( - p: with p; [ - dbus-python - pygobject3 - ] - ); -in -stdenv.mkDerivation rec { - pname = "krunner-ssh"; - version = "1.0"; - - src = fetchFromGitLab { - owner = "Programie"; - repo = "krunner-ssh"; - rev = version; - hash = "sha256-rFTTvmetDeN6t0axVc+8t1TRiuyPBpwqhvsq2IFxa/A="; - }; - - postPatch = '' - sed -e "s|Exec=.*|Exec=$out/libexec/runner.py|" -i ssh-runner.service - ''; - - nativeBuildInputs = [ - pythonEnv - ]; - - installPhase = '' - runHook preInstall - - patchShebangs runner.py - - install -m 0755 -D runner.py $out/libexec/runner.py - install -m 0755 -D ssh-runner.desktop $out/share/kservices5/ssh-runner.desktop - install -m 0755 -D ssh-runner.service $out/share/dbus-1/services/com.selfcoders.ssh-runner.service - - runHook postInstall - ''; - - meta = with lib; { - description = "Simple backend for KRunner providing SSH hosts from your .ssh/known_hosts file as search results"; - homepage = "https://selfcoders.com/projects/krunner-ssh"; - license = licenses.mit; - maintainers = with maintainers; [ aanderse ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/plasma-5/3rdparty/addons/krunner-symbols.nix b/pkgs/desktops/plasma-5/3rdparty/addons/krunner-symbols.nix deleted file mode 100644 index 6703944b01ff..000000000000 --- a/pkgs/desktops/plasma-5/3rdparty/addons/krunner-symbols.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ - lib, - stdenv, - cmake, - fetchFromGitHub, - extra-cmake-modules, - qtbase, - wrapQtAppsHook, - ki18n, - kdelibs4support, - krunner, -}: - -stdenv.mkDerivation rec { - pname = "krunner-symbols"; - version = "1.1.0"; - - src = fetchFromGitHub { - owner = "domschrei"; - repo = "krunner-symbols"; - rev = version; - sha256 = "sha256-YsoZdPTWpk3/YERwerrVEcaf2IfGVJwpq32onhP8Exo="; - }; - - buildInputs = [ - qtbase - ki18n - kdelibs4support - krunner - ]; - nativeBuildInputs = [ - cmake - wrapQtAppsHook - extra-cmake-modules - ]; - - postPatch = '' - # symbols.cpp hardcodes the location of configuration files - substituteInPlace symbols.cpp \ - --replace "/usr/share/config/krunner-symbol" "$out/share/config/krunner-symbol" - - # change cmake flag names to output using the correct qt-plugin prefix and kservice location - substituteInPlace CMakeLists.txt \ - --replace "LOCATION_PLUGIN" "KDE_INSTALL_PLUGINDIR" \ - --replace "LOCATION_DESKTOP" "KDE_INSTALL_KSERVICES5DIR" - ''; - - cmakeFlags = [ "-DLOCATION_CONFIG=share/config" ]; - - meta = with lib; { - description = "Little krunner plugin (Plasma 5) to retrieve unicode symbols, or any other string, based on a corresponding keyword"; - homepage = "https://github.com/domschrei/krunner-symbols"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ hqurve ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/plasma-5/3rdparty/addons/virtual-desktop-bar.nix b/pkgs/desktops/plasma-5/3rdparty/addons/virtual-desktop-bar.nix deleted file mode 100644 index f68df7b7b642..000000000000 --- a/pkgs/desktops/plasma-5/3rdparty/addons/virtual-desktop-bar.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ - lib, - mkDerivation, - fetchFromGitHub, - extra-cmake-modules, - kwindowsystem, - plasma-framework, - qtx11extras, -}: - -mkDerivation { - pname = "plasma-applet-virtual-desktop-bar"; - version = "unstable-2021-02-20"; - - src = fetchFromGitHub { - owner = "wsdfhjxc"; - repo = "virtual-desktop-bar"; - rev = "3e9bbddb8def8da65071a1c325eaa06598e8a473"; - sha256 = "192ns6c2brzq46pg385n0v1ydbz52aaa8f5dgfw5251hrw9c7bxg"; - }; - - buildInputs = [ - kwindowsystem - plasma-framework - qtx11extras - ]; - - nativeBuildInputs = [ - extra-cmake-modules - ]; - - cmakeFlags = [ - "-Wno-dev" - ]; - - meta = with lib; { - description = "Manage virtual desktops dynamically in a convenient way"; - homepage = "https://github.com/wsdfhjxc/virtual-desktop-bar"; - license = licenses.gpl3Only; - platforms = platforms.linux; - maintainers = with maintainers; [ peterhoeg ]; - }; -} diff --git a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/dynamic-workspaces.nix b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/dynamic-workspaces.nix deleted file mode 100644 index 676ea18d2e9f..000000000000 --- a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/dynamic-workspaces.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ - lib, - mkDerivation, - fetchFromGitHub, - kcoreaddons, - kwindowsystem, - plasma-framework, - systemsettings, -}: - -mkDerivation rec { - pname = "dynamic_workspaces"; - version = "1.0.1"; - - src = fetchFromGitHub { - owner = "d86leader"; - repo = pname; - rev = "v${version}"; - sha256 = "1mnwh489i6l8z9s5a1zl7zybkw76pp9fdmmis41mym7r4wz4iznm"; - }; - - buildInputs = [ - kcoreaddons - kwindowsystem - plasma-framework - systemsettings - ]; - - dontBuild = true; - - # 1. --global still installs to $HOME/.local/share so we use --packageroot - # 2. plasmapkg2 doesn't copy metadata.desktop into place, so we do that manually - installPhase = '' - runHook preInstall - - plasmapkg2 --type kwinscript --install ${src} --packageroot $out/share/kwin/scripts - install -Dm644 ${src}/metadata.desktop $out/share/kservices5/dynamic_workspaces.desktop - - runHook postInstall - ''; - - meta = with lib; { - description = "KWin script that automatically adds/removes virtual desktops"; - license = licenses.bsd3; - maintainers = [ ]; - inherit (src.meta) homepage; - inherit (kwindowsystem.meta) platforms; - }; -} diff --git a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/krohnkite.nix b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/krohnkite.nix deleted file mode 100644 index 0d62bdf32869..000000000000 --- a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/krohnkite.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ - lib, - mkDerivation, - fetchFromGitHub, - kcoreaddons, - kwindowsystem, - plasma-framework, - systemsettings, -}: - -mkDerivation rec { - pname = "krohnkite"; - version = "0.8.2"; - - src = fetchFromGitHub { - owner = "esjeon"; - repo = "krohnkite"; - rev = "v${version}"; - hash = "sha256-HZCD5884pHuHey+d+HRx/F/Sp1b6ZUy7MdqqZ08H0lU="; - }; - - buildInputs = [ - kcoreaddons - kwindowsystem - plasma-framework - systemsettings - ]; - - dontBuild = true; - - # 1. --global still installs to $HOME/.local/share so we use --packageroot - # 2. plasmapkg2 doesn't copy metadata.desktop into place, so we do that manually - installPhase = '' - runHook preInstall - - plasmapkg2 --type kwinscript --install ${src}/res/ --packageroot $out/share/kwin/scripts - install -Dm644 ${src}/res/metadata.desktop $out/share/kservices5/krohnkite.desktop - - runHook postInstall - ''; - - meta = with lib; { - description = "Dynamic tiling extension for KWin"; - license = licenses.mit; - maintainers = with maintainers; [ seqizz ]; - inherit (src.meta) homepage; - inherit (kwindowsystem.meta) platforms; - }; -} diff --git a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/kzones.nix b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/kzones.nix deleted file mode 100644 index 813ff8d335a7..000000000000 --- a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/kzones.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - kcoreaddons, - kwindowsystem, - plasma-framework, - systemsettings, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "kzones"; - version = "0.6"; - - src = fetchFromGitHub { - owner = "gerritdevriese"; - repo = "kzones"; - rev = "v${finalAttrs.version}"; - sha256 = "sha256-OAgzuX05dvotjRWiyPPeUieVJbQoy/opGYu6uVKQM60="; - }; - - nativeBuildInputs = [ plasma-framework ]; - - buildInputs = [ - kcoreaddons - kwindowsystem - plasma-framework - systemsettings - ]; - - dontBuild = true; - - # we don't have anything to wrap anyway - dontWrapQtApps = true; - - # 1. --global still installs to $HOME/.local/share so we use --packageroot - # 2. plasmapkg2 doesn't copy metadata.desktop into place, so we do that manually - installPhase = '' - runHook preInstall - - plasmapkg2 --type kwinscript --install ${finalAttrs.src} --packageroot $out/share/kwin/scripts - install -Dm644 ${finalAttrs.src}/metadata.desktop $out/share/kservices5/kwin-script-kzones.desktop - - runHook postInstall - ''; - - meta = with lib; { - description = "KWin Script for snapping windows into zones"; - maintainers = with maintainers; [ matthiasbeyer ]; - license = licenses.gpl3Plus; - inherit (finalAttrs.src.meta) homepage; - inherit (kwindowsystem.meta) platforms; - }; -}) diff --git a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/parachute.nix b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/parachute.nix deleted file mode 100644 index 698af1cadd00..000000000000 --- a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/parachute.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ - lib, - mkDerivation, - fetchFromGitHub, - kcoreaddons, - kwindowsystem, - plasma-framework, - systemsettings, -}: - -mkDerivation rec { - pname = "parachute"; - version = "0.9.1"; - - src = fetchFromGitHub { - owner = "tcorreabr"; - repo = "parachute"; - rev = "v${version}"; - sha256 = "QIWb1zIGfkS+Bef7LK+JA6XpwGUW+79XZY47j75nlCE="; - }; - - buildInputs = [ - kcoreaddons - kwindowsystem - plasma-framework - systemsettings - ]; - - dontBuild = true; - - # 1. --global still installs to $HOME/.local/share so we use --packageroot - # 2. plasmapkg2 doesn't copy metadata.desktop into place, so we do that manually - installPhase = '' - runHook preInstall - plasmapkg2 --type kwinscript --install ${src} --packageroot $out/share/kwin/scripts - install -Dm644 ${src}/metadata.desktop $out/share/kservices5/Parachute.desktop - runHook postInstall - ''; - - meta = with lib; { - description = "Look at your windows and desktops from above"; - license = licenses.gpl3Only; - maintainers = [ ]; - inherit (src.meta) homepage; - inherit (kwindowsystem.meta) platforms; - }; -} diff --git a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/tiling.nix b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/tiling.nix deleted file mode 100644 index 384635ad9423..000000000000 --- a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/tiling.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ - lib, - mkDerivation, - fetchFromGitHub, - kcoreaddons, - kwindowsystem, - plasma-framework, - systemsettings, -}: - -mkDerivation rec { - pname = "kwin-tiling"; - version = "2.4"; - - src = fetchFromGitHub { - owner = "kwin-scripts"; - repo = "kwin-tiling"; - rev = "v${version}"; - sha256 = "095slpvipy0zcmbn0l7mdnl9g74jaafkr2gqi09b0by5fkvnbh37"; - }; - - # This is technically not needed, but we might as well clean up - postPatch = '' - rm release.sh - ''; - - buildInputs = [ - kcoreaddons - kwindowsystem - plasma-framework - systemsettings - ]; - - dontBuild = true; - - # 1. --global still installs to $HOME/.local/share so we use --packageroot - # 2. plasmapkg2 doesn't copy metadata.desktop into place, so we do that manually - installPhase = '' - runHook preInstall - - plasmapkg2 --type kwinscript --install ${src} --packageroot $out/share/kwin/scripts - install -Dm644 ${src}/metadata.desktop $out/share/kservices5/kwin-script-tiling.desktop - - runHook postInstall - ''; - - meta = with lib; { - description = "Tiling script for kwin"; - license = licenses.gpl2; - maintainers = with maintainers; [ peterhoeg ]; - inherit (src.meta) homepage; - inherit (kwindowsystem.meta) platforms; - }; -} diff --git a/pkgs/desktops/plasma-5/3rdparty/lightly/default.nix b/pkgs/desktops/plasma-5/3rdparty/lightly/default.nix deleted file mode 100644 index cb8189b994ea..000000000000 --- a/pkgs/desktops/plasma-5/3rdparty/lightly/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ - lib, - mkDerivation, - fetchFromGitHub, - cmake, - extra-cmake-modules, - kdecoration, - kcoreaddons, - kguiaddons, - kconfigwidgets, - kwindowsystem, - kiconthemes, - qtx11extras, -}: - -mkDerivation rec { - pname = "lightly"; - version = "0.4.1"; - src = fetchFromGitHub { - owner = "Luwx"; - repo = pname; - rev = "v${version}"; - sha256 = "k1fEZbhzluNlAmj5s/O9X20aCVQxlWQm/Iw/euX7cmI="; - }; - - extraCmakeFlags = [ "-DBUILD_TESTING=OFF" ]; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - ]; - - buildInputs = [ - kcoreaddons - kguiaddons - kconfigwidgets - kwindowsystem - kiconthemes - qtx11extras - kdecoration - ]; - - meta = with lib; { - description = "Modern style for qt applications"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ pasqui23 ]; - homepage = "https://github.com/Luwx/Lightly/"; - inherit (kwindowsystem.meta) platforms; - }; -} diff --git a/pkgs/desktops/plasma-5/aura-browser.nix b/pkgs/desktops/plasma-5/aura-browser.nix deleted file mode 100644 index b012417a6bc7..000000000000 --- a/pkgs/desktops/plasma-5/aura-browser.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ - mkDerivation, - extra-cmake-modules, - qtwebengine, - qtquickcontrols2, - kirigami2, - ki18n, -}: -mkDerivation { - pname = "aura-browser"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - qtwebengine - qtquickcontrols2 - kirigami2 - ki18n - ]; -} diff --git a/pkgs/desktops/plasma-5/bluedevil.nix b/pkgs/desktops/plasma-5/bluedevil.nix deleted file mode 100644 index 0ad806520c53..000000000000 --- a/pkgs/desktops/plasma-5/bluedevil.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ - mkDerivation, - extra-cmake-modules, - shared-mime-info, - qtbase, - qtdeclarative, - bluez-qt, - kcoreaddons, - kcmutils, - kdbusaddons, - kded, - ki18n, - kiconthemes, - kio, - knotifications, - kwidgetsaddons, - kwindowsystem, - plasma-framework, -}: - -mkDerivation { - pname = "bluedevil"; - nativeBuildInputs = [ - extra-cmake-modules - shared-mime-info - ]; - buildInputs = [ - qtbase - qtdeclarative - bluez-qt - ki18n - kio - kwindowsystem - plasma-framework - kcoreaddons - kdbusaddons - kded - kiconthemes - knotifications - kwidgetsaddons - kcmutils - ]; -} diff --git a/pkgs/desktops/plasma-5/breeze-grub.nix b/pkgs/desktops/plasma-5/breeze-grub.nix deleted file mode 100644 index cbfb47efade7..000000000000 --- a/pkgs/desktops/plasma-5/breeze-grub.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ - mkDerivation, -}: - -mkDerivation { - pname = "breeze-grub"; - installPhase = '' - runHook preInstall - - mkdir -p "$out/grub/themes" - mv breeze "$out/grub/themes" - - runHook postInstall - ''; -} diff --git a/pkgs/desktops/plasma-5/breeze-gtk.nix b/pkgs/desktops/plasma-5/breeze-gtk.nix deleted file mode 100644 index 2974ff51798a..000000000000 --- a/pkgs/desktops/plasma-5/breeze-gtk.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ - mkDerivation, - extra-cmake-modules, - qtbase, - sassc, - python3, - breeze-qt5, -}: - -mkDerivation { - pname = "breeze-gtk"; - nativeBuildInputs = [ - extra-cmake-modules - sassc - python3 - python3.pkgs.pycairo - breeze-qt5 - ]; - buildInputs = [ qtbase ]; - patches = [ - ./patches/0001-fix-add-executable-bit.patch - ]; - cmakeFlags = [ "-DWITH_GTK3_VERSION=3.22" ]; -} diff --git a/pkgs/desktops/plasma-5/breeze-plymouth/default.nix b/pkgs/desktops/plasma-5/breeze-plymouth/default.nix deleted file mode 100644 index 164394cfa3a4..000000000000 --- a/pkgs/desktops/plasma-5/breeze-plymouth/default.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - plymouth, - imagemagick, - netpbm, - perl, - logoName ? null, - logoFile ? null, - osName ? null, - osVersion ? null, - topColor ? "black", - bottomColor ? "black", -}: - -let - validColors = [ - "black" - "cardboard_grey" - "charcoal_grey" - "icon_blue" - "paper_white" - "plasma_blue" - "neon_blue" - "neon_green" - ]; - resolvedLogoName = - if (logoFile != null && logoName == null) then - lib.strings.removeSuffix ".png" (baseNameOf (toString logoFile)) - else - logoName; -in -assert lib.asserts.assertOneOf "topColor" topColor validColors; -assert lib.asserts.assertOneOf "bottomColor" bottomColor validColors; - -mkDerivation { - pname = "breeze-plymouth"; - nativeBuildInputs = [ - extra-cmake-modules - ] - ++ lib.optionals (logoFile != null) [ - imagemagick - netpbm - perl - ]; - buildInputs = [ plymouth ]; - patches = [ - ./install-paths.patch - ]; - cmakeFlags = - [ ] - ++ lib.optional (osName != null) "-DDISTRO_NAME=${osName}" - ++ lib.optional (osVersion != null) "-DDISTRO_VERSION=${osVersion}" - ++ lib.optional (logoName != null) "-DDISTRO_LOGO=${logoName}" - ++ lib.optional (topColor != null) "-DBACKGROUND_TOP_COLOR=${topColor}" - ++ lib.optional (bottomColor != null) "-DBACKGROUND_BOTTOM_COLOR=${bottomColor}"; - - postPatch = '' - substituteInPlace cmake/FindPlymouth.cmake --subst-var out - '' - + lib.optionalString (logoFile != null) '' - cp ${logoFile} breeze/images/${resolvedLogoName}.logo.png - - # conversion for 16bit taken from the breeze-plymouth readme - convert ${logoFile} -alpha Background -background "#000000" -fill "#000000" -flatten tmp.png - pngtopnm tmp.png | pnmquant 16 | pnmtopng > breeze/images/16bit/${resolvedLogoName}.logo.png - ''; -} diff --git a/pkgs/desktops/plasma-5/breeze-plymouth/install-paths.patch b/pkgs/desktops/plasma-5/breeze-plymouth/install-paths.patch deleted file mode 100644 index 5d5856d122dd..000000000000 --- a/pkgs/desktops/plasma-5/breeze-plymouth/install-paths.patch +++ /dev/null @@ -1,19 +0,0 @@ -Index: breeze-plymouth-5.7.3/cmake/FindPlymouth.cmake -=================================================================== ---- breeze-plymouth-5.7.3.orig/cmake/FindPlymouth.cmake -+++ breeze-plymouth-5.7.3/cmake/FindPlymouth.cmake -@@ -24,12 +24,8 @@ - include(FindPkgConfig) - - pkg_check_modules(Plymouth ply-boot-client ply-splash-core) --exec_program(${PKG_CONFIG_EXECUTABLE} -- ARGS ply-splash-core --variable=pluginsdir -- OUTPUT_VARIABLE Plymouth_PLUGINSDIR) --exec_program(${PKG_CONFIG_EXECUTABLE} -- ARGS ply-splash-core --variable=themesdir -- OUTPUT_VARIABLE Plymouth_THEMESDIR) -+set(Plymouth_PLUGINSDIR "@out@/lib/plymouth") -+set(Plymouth_THEMESDIR "@out@/share/plymouth/themes") - - find_package_handle_standard_args(Plymouth - FOUND_VAR diff --git a/pkgs/desktops/plasma-5/breeze-qt5.nix b/pkgs/desktops/plasma-5/breeze-qt5.nix deleted file mode 100644 index 2d50f89e1d39..000000000000 --- a/pkgs/desktops/plasma-5/breeze-qt5.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ - mkDerivation, - extra-cmake-modules, - frameworkintegration, - kcmutils, - kconfigwidgets, - kcoreaddons, - kdecoration, - kguiaddons, - ki18n, - kwayland, - kwindowsystem, - plasma-framework, - qtdeclarative, - qtx11extras, - fftw, -}: - -mkDerivation { - pname = "breeze-qt5"; - sname = "breeze"; - nativeBuildInputs = [ extra-cmake-modules ]; - propagatedBuildInputs = [ - frameworkintegration - kcmutils - kconfigwidgets - kcoreaddons - kdecoration - kguiaddons - ki18n - kwayland - kwindowsystem - plasma-framework - qtdeclarative - qtx11extras - fftw - ]; - outputs = [ - "bin" - "dev" - "out" - ]; - cmakeFlags = [ "-DUSE_Qt4=OFF" ]; -} diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix deleted file mode 100644 index db92d5734049..000000000000 --- a/pkgs/desktops/plasma-5/default.nix +++ /dev/null @@ -1,218 +0,0 @@ -/* - # New packages - - READ THIS FIRST - - This module is for official packages in KDE Plasma 5. All available packages are - listed in `./srcs.nix`, although a few are not yet packaged in Nixpkgs (see - below). - - IF YOUR PACKAGE IS NOT LISTED IN `./srcs.nix`, IT DOES NOT GO HERE. - - Many of the packages released upstream are not yet built in Nixpkgs due to lack - of demand. To add a Nixpkgs build for an upstream package, copy one of the - existing packages here and modify it as necessary. - - # Updates - - 1. Update the URL in `./fetch.sh`. - 2. Run `./maintainers/scripts/fetch-kde-qt.sh pkgs/desktops/plasma-5` - 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. -*/ - -{ - libsForQt5, - lib, - config, - fetchurl, - gsettings-desktop-schemas, -}: - -let - maintainers = with lib.maintainers; [ - ttuegel - nyanloutre - ]; - license = with lib.licenses; [ - lgpl21Plus - lgpl3Plus - bsd2 - mit - gpl2Plus - gpl3Plus - fdl12Plus - ]; - - srcs = import ./srcs.nix { - inherit fetchurl; - mirror = "mirror://kde"; - }; - - qtStdenv = libsForQt5.callPackage ({ stdenv }: stdenv) { }; - - packages = - self: - let - - propagate = - out: - let - setupHook = - { writeScript }: - writeScript "setup-hook" '' - if [[ "''${hookName-}" != postHook ]]; then - postHooks+=("source @dev@/nix-support/setup-hook") - else - # Propagate $${out} output - appendToVar propagatedUserEnvPkgs "@${out}@" - - if [ -z "$outputDev" ]; then - echo "error: \$outputDev is unset!" >&2 - exit 1 - fi - - # Propagate $dev so that this setup hook is propagated - # But only if there is a separate $dev output - if [ "$outputDev" != out ]; then - appendToVar propagatedBuildInputs "@dev@" - fi - fi - ''; - in - callPackage setupHook { }; - - propagateBin = propagate "bin"; - - callPackage = self.newScope { - inherit propagate propagateBin; - - mkDerivation = - args: - let - inherit (args) pname; - sname = args.sname or pname; - inherit (srcs.${sname}) src version; - - outputs = args.outputs or [ "out" ]; - hasBin = lib.elem "bin" outputs; - hasDev = lib.elem "dev" outputs; - - defaultSetupHook = if hasBin && hasDev then propagateBin else null; - setupHook = args.setupHook or defaultSetupHook; - nativeBuildInputs = (args.nativeBuildInputs or [ ]) ++ [ libsForQt5.wrapQtAppsHook ]; - - meta = - let - meta = args.meta or { }; - in - meta - // { - homepage = meta.homepage or "http://www.kde.org"; - license = meta.license or license; - maintainers = (meta.maintainers or [ ]) ++ maintainers; - platforms = meta.platforms or lib.platforms.linux; - }; - in - qtStdenv.mkDerivation ( - args - // { - inherit - pname - version - meta - outputs - setupHook - src - nativeBuildInputs - ; - } - ); - }; - - in - { - aura-browser = callPackage ./aura-browser.nix { }; - bluedevil = callPackage ./bluedevil.nix { }; - breeze-gtk = callPackage ./breeze-gtk.nix { }; - breeze-qt5 = callPackage ./breeze-qt5.nix { }; - breeze-grub = callPackage ./breeze-grub.nix { }; - breeze-plymouth = callPackage ./breeze-plymouth { }; - discover = callPackage ./discover.nix { }; - flatpak-kcm = callPackage ./flatpak-kcm.nix { }; - kactivitymanagerd = callPackage ./kactivitymanagerd.nix { }; - kde-cli-tools = callPackage ./kde-cli-tools.nix { }; - kde-gtk-config = callPackage ./kde-gtk-config { inherit gsettings-desktop-schemas; }; - kdecoration = callPackage ./kdecoration.nix { }; - kdeplasma-addons = callPackage ./kdeplasma-addons.nix { }; - kgamma5 = callPackage ./kgamma5.nix { }; - khotkeys = callPackage ./khotkeys.nix { }; - kinfocenter = callPackage ./kinfocenter { }; - kmenuedit = callPackage ./kmenuedit.nix { }; - kpipewire = callPackage ./kpipewire.nix { }; - kscreen = callPackage ./kscreen.nix { }; - kscreenlocker = callPackage ./kscreenlocker.nix { }; - ksshaskpass = callPackage ./ksshaskpass.nix { }; - ksystemstats = callPackage ./ksystemstats.nix { }; - kwallet-pam = callPackage ./kwallet-pam.nix { }; - kwayland-integration = callPackage ./kwayland-integration.nix { }; - kwin = callPackage ./kwin { }; - kwrited = callPackage ./kwrited.nix { }; - layer-shell-qt = callPackage ./layer-shell-qt.nix { }; - libkscreen = callPackage ./libkscreen { }; - libksysguard = callPackage ./libksysguard { }; - milou = callPackage ./milou.nix { }; - oxygen = callPackage ./oxygen.nix { }; - oxygen-sounds = callPackage ./oxygen-sounds.nix { }; - plank-player = callPackage ./plank-player.nix { }; - plasma-bigscreen = callPackage ./plasma-bigscreen.nix { }; - plasma-browser-integration = callPackage ./plasma-browser-integration.nix { }; - plasma-desktop = callPackage ./plasma-desktop { }; - plasma-disks = callPackage ./plasma-disks.nix { }; - plasma-firewall = callPackage ./plasma-firewall.nix { }; - plasma-integration = callPackage ./plasma-integration { }; - plasma-mobile = callPackage ./plasma-mobile { }; - plasma-nano = callPackage ./plasma-nano { }; - plasma-nm = callPackage ./plasma-nm { }; - plasma-pa = callPackage ./plasma-pa.nix { }; - plasma-remotecontrollers = callPackage ./plasma-remotecontrollers.nix { }; - plasma-sdk = callPackage ./plasma-sdk.nix { }; - plasma-systemmonitor = callPackage ./plasma-systemmonitor.nix { }; - plasma-thunderbolt = callPackage ./plasma-thunderbolt.nix { }; - plasma-vault = callPackage ./plasma-vault { }; - plasma-welcome = callPackage ./plasma-welcome.nix { }; - plasma-workspace = callPackage ./plasma-workspace { }; - plasma-workspace-wallpapers = callPackage ./plasma-workspace-wallpapers.nix { }; - polkit-kde-agent = callPackage ./polkit-kde-agent.nix { }; - powerdevil = callPackage ./powerdevil.nix { }; - qqc2-breeze-style = callPackage ./qqc2-breeze-style.nix { }; - sddm-kcm = callPackage ./sddm-kcm.nix { }; - systemsettings = callPackage ./systemsettings.nix { }; - xdg-desktop-portal-kde = callPackage ./xdg-desktop-portal-kde.nix { }; - - thirdParty = - let - inherit (libsForQt5) callPackage; - in - { - plasma-applet-caffeine-plus = callPackage ./3rdparty/addons/caffeine-plus.nix { }; - plasma-applet-virtual-desktop-bar = callPackage ./3rdparty/addons/virtual-desktop-bar.nix { }; - bismuth = callPackage ./3rdparty/addons/bismuth { }; - kwin-dynamic-workspaces = callPackage ./3rdparty/kwin/scripts/dynamic-workspaces.nix { }; - kwin-tiling = callPackage ./3rdparty/kwin/scripts/tiling.nix { }; - krohnkite = callPackage ./3rdparty/kwin/scripts/krohnkite.nix { }; - krunner-ssh = callPackage ./3rdparty/addons/krunner-ssh.nix { }; - krunner-symbols = callPackage ./3rdparty/addons/krunner-symbols.nix { }; - kzones = callPackage ./3rdparty/kwin/scripts/kzones.nix { }; - lightly = callPackage ./3rdparty/lightly { }; - parachute = callPackage ./3rdparty/kwin/scripts/parachute.nix { }; - }; - - } - // lib.optionalAttrs config.allowAliases { - ksysguard = throw "ksysguard has been replaced with plasma-systemmonitor"; - plasma-phone-components = throw "'plasma-phone-components' has been renamed to/replaced by 'plasma-mobile'"; - }; -in -lib.makeScope libsForQt5.newScope packages diff --git a/pkgs/desktops/plasma-5/discover.nix b/pkgs/desktops/plasma-5/discover.nix deleted file mode 100644 index d5a48a11d8dc..000000000000 --- a/pkgs/desktops/plasma-5/discover.nix +++ /dev/null @@ -1,76 +0,0 @@ -{ - mkDerivation, - extra-cmake-modules, - gettext, - kdoctools, - python3, - appstream-qt, - discount, - flatpak, - fwupd, - ostree, - pcre, - util-linux, - qtquickcontrols2, - qtwebview, - qtx11extras, - karchive, - kcmutils, - kconfig, - kcrash, - kdbusaddons, - kdeclarative, - kidletime, - kio, - kirigami2, - kitemmodels, - knewstuff, - kpurpose, - kuserfeedback, - kwindowsystem, - kxmlgui, - plasma-framework, -}: - -mkDerivation { - pname = "discover"; - nativeBuildInputs = [ - extra-cmake-modules - gettext - kdoctools - python3 - ]; - buildInputs = [ - # discount is needed for libmarkdown - appstream-qt - discount - flatpak - fwupd - ostree - pcre - util-linux - qtquickcontrols2 - qtwebview - qtx11extras - karchive - kcmutils - kconfig - kcrash - kdbusaddons - kdeclarative - kidletime - kio - kirigami2 - kitemmodels - knewstuff - kpurpose - kuserfeedback - kwindowsystem - kxmlgui - plasma-framework - ]; - - # Incompatible with our current version of fwupd: - # error: 'fwupd_release_get_uri' was not declared in this scope - meta.broken = true; -} diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh deleted file mode 100644 index a64e0ec1581d..000000000000 --- a/pkgs/desktops/plasma-5/fetch.sh +++ /dev/null @@ -1 +0,0 @@ -WGET_ARGS=( https://download.kde.org/stable/plasma/5.27.11/ -A '*.tar.xz' ) diff --git a/pkgs/desktops/plasma-5/flatpak-kcm.nix b/pkgs/desktops/plasma-5/flatpak-kcm.nix deleted file mode 100644 index 3cf54431898c..000000000000 --- a/pkgs/desktops/plasma-5/flatpak-kcm.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ - mkDerivation, - extra-cmake-modules, - flatpak, - kcmutils, - kconfig, - kdeclarative, - kitemmodels, -}: - -mkDerivation { - pname = "flatpak-kcm"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - flatpak - kcmutils - kconfig - kdeclarative - kitemmodels - ]; -} diff --git a/pkgs/desktops/plasma-5/kactivitymanagerd.nix b/pkgs/desktops/plasma-5/kactivitymanagerd.nix deleted file mode 100644 index 8fa5be590a20..000000000000 --- a/pkgs/desktops/plasma-5/kactivitymanagerd.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ - mkDerivation, - extra-cmake-modules, - boost, - kconfig, - kcoreaddons, - kdbusaddons, - ki18n, - kio, - kglobalaccel, - kwindowsystem, - kxmlgui, - kcrash, - qtbase, -}: - -mkDerivation { - pname = "kactivitymanagerd"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - boost - kconfig - kcoreaddons - kdbusaddons - kglobalaccel - ki18n - kio - kwindowsystem - kxmlgui - kcrash - ]; -} diff --git a/pkgs/desktops/plasma-5/kde-cli-tools.nix b/pkgs/desktops/plasma-5/kde-cli-tools.nix deleted file mode 100644 index 506d20318067..000000000000 --- a/pkgs/desktops/plasma-5/kde-cli-tools.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ - lib, - mkDerivation, - extra-cmake-modules, - kdoctools, - kcmutils, - kconfig, - kdesu, - ki18n, - kiconthemes, - kinit, - kio, - kwindowsystem, - qtsvg, - qtx11extras, - kactivities, - plasma-workspace, -}: - -mkDerivation { - pname = "kde-cli-tools"; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - kcmutils - kconfig - kdesu - ki18n - kiconthemes - kinit - kio - kwindowsystem - qtsvg - qtx11extras - kactivities - plasma-workspace - ]; - postInstall = '' - # install a symlink in bin so that kdesu can eventually be found in PATH - mkdir -p $out/bin - ln -s $out/libexec/kf5/kdesu $out/bin - ''; - dontWrapQtApps = true; - preFixup = '' - for program in $out/bin/*; do - wrapQtApp $program - done - - # kdesu looks for kdeinit5 in PATH - wrapQtApp $out/libexec/kf5/kdesu --suffix PATH : ${lib.getBin kinit}/bin - ''; -} diff --git a/pkgs/desktops/plasma-5/kde-gtk-config/0001-gsettings-schemas-path.patch b/pkgs/desktops/plasma-5/kde-gtk-config/0001-gsettings-schemas-path.patch deleted file mode 100644 index 2fe4672f6757..000000000000 --- a/pkgs/desktops/plasma-5/kde-gtk-config/0001-gsettings-schemas-path.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/kded/gtkconfig.cpp b/kded/gtkconfig.cpp -index 5303636..199c4d5 100644 ---- a/kded/gtkconfig.cpp -+++ b/kded/gtkconfig.cpp -@@ -41,6 +41,16 @@ GtkConfig::GtkConfig(QObject *parent, const QVariantList&) : - kdeglobalsConfigWatcher(KConfigWatcher::create(KSharedConfig::openConfig(QStringLiteral("kdeglobals")))), - kwinConfigWatcher(KConfigWatcher::create(KSharedConfig::openConfig(QStringLiteral("kwinrc")))) - { -+ // Add GSETTINGS_SCHEMAS_PATH to the front of XDG_DATA_DIRS. -+ // Normally this would be done by wrapGAppsHook, but this plugin -+ // (shared object) cannot be wrapped. -+ QByteArray xdgdata = qgetenv("XDG_DATA_DIRS"); -+ if (!xdgdata.isEmpty()) { -+ xdgdata.push_front(":"); -+ } -+ xdgdata.push_front(QByteArray(GSETTINGS_SCHEMAS_PATH)); -+ qputenv("XDG_DATA_DIRS", xdgdata); -+ - QDBusConnection dbus = QDBusConnection::sessionBus(); - dbus.registerService(QStringLiteral("org.kde.GtkConfig")); - dbus.registerObject(QStringLiteral("/GtkConfig"), this, QDBusConnection::ExportScriptableSlots); diff --git a/pkgs/desktops/plasma-5/kde-gtk-config/default.nix b/pkgs/desktops/plasma-5/kde-gtk-config/default.nix deleted file mode 100644 index 83442c3359ae..000000000000 --- a/pkgs/desktops/plasma-5/kde-gtk-config/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ - mkDerivation, - extra-cmake-modules, - wrapGAppsHook3, - glib, - gtk3, - karchive, - kcmutils, - kconfigwidgets, - ki18n, - kiconthemes, - kio, - knewstuff, - gsettings-desktop-schemas, - xsettingsd, - kdecoration, - sass, -}: - -mkDerivation { - pname = "kde-gtk-config"; - nativeBuildInputs = [ - extra-cmake-modules - wrapGAppsHook3 - ]; - dontWrapGApps = true; # There is nothing to wrap - buildInputs = [ - ki18n - kio - glib - gtk3 - karchive - kcmutils - kconfigwidgets - kiconthemes - knewstuff - gsettings-desktop-schemas - xsettingsd - kdecoration - sass - ]; - cmakeFlags = [ - "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include" - "-DGLIB_SCHEMAS_DIR=${gsettings-desktop-schemas.out}/" - ]; - # The gtkconfig KDED module will crash the daemon if the GSettings schemas - # aren't found. - patches = [ ./0001-gsettings-schemas-path.patch ]; - preConfigure = '' - NIX_CFLAGS_COMPILE+=" -DGSETTINGS_SCHEMAS_PATH=\"$GSETTINGS_SCHEMAS_PATH\"" - ''; -} diff --git a/pkgs/desktops/plasma-5/kdecoration.nix b/pkgs/desktops/plasma-5/kdecoration.nix deleted file mode 100644 index e1290656352c..000000000000 --- a/pkgs/desktops/plasma-5/kdecoration.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ - mkDerivation, - extra-cmake-modules, - qtbase, - ki18n, - kcoreaddons, -}: - -mkDerivation { - pname = "kdecoration"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - qtbase - ki18n - kcoreaddons - ]; - outputs = [ - "out" - "dev" - ]; -} diff --git a/pkgs/desktops/plasma-5/kdeplasma-addons.nix b/pkgs/desktops/plasma-5/kdeplasma-addons.nix deleted file mode 100644 index 1f737ec8dedf..000000000000 --- a/pkgs/desktops/plasma-5/kdeplasma-addons.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ - mkDerivation, - extra-cmake-modules, - kdoctools, - kconfig, - kconfigwidgets, - kcoreaddons, - kcmutils, - kholidays, - kio, - knewstuff, - kpurpose, - kross, - krunner, - kservice, - kunitconversion, - ibus, - plasma-framework, - plasma-workspace, - qtdeclarative, - qtwebengine, - qtx11extras, -}: - -mkDerivation { - pname = "kdeplasma-addons"; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - kconfig - kconfigwidgets - kcoreaddons - kcmutils - kholidays - kio - knewstuff - kpurpose - kross - krunner - kservice - kunitconversion - ibus - plasma-framework - plasma-workspace - qtdeclarative - qtwebengine - qtx11extras - ]; -} diff --git a/pkgs/desktops/plasma-5/kgamma5.nix b/pkgs/desktops/plasma-5/kgamma5.nix deleted file mode 100644 index 80a8ebb880f1..000000000000 --- a/pkgs/desktops/plasma-5/kgamma5.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ - mkDerivation, - extra-cmake-modules, - kdoctools, - kconfig, - kconfigwidgets, - ki18n, - qtx11extras, - libXxf86vm, -}: - -mkDerivation { - pname = "kgamma5"; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - kconfig - kconfigwidgets - ki18n - qtx11extras - libXxf86vm - ]; -} diff --git a/pkgs/desktops/plasma-5/khotkeys.nix b/pkgs/desktops/plasma-5/khotkeys.nix deleted file mode 100644 index af2299c1adeb..000000000000 --- a/pkgs/desktops/plasma-5/khotkeys.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ - mkDerivation, - extra-cmake-modules, - kdoctools, - kcmutils, - kdbusaddons, - kdelibs4support, - kglobalaccel, - ki18n, - kio, - kxmlgui, - plasma-framework, - plasma-workspace, - qtx11extras, -}: - -mkDerivation { - pname = "khotkeys"; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - kcmutils - kdbusaddons - kdelibs4support - kglobalaccel - ki18n - kio - kxmlgui - plasma-framework - plasma-workspace - qtx11extras - ]; - outputs = [ - "bin" - "dev" - "out" - ]; -} diff --git a/pkgs/desktops/plasma-5/kinfocenter/0001-tool-paths.patch b/pkgs/desktops/plasma-5/kinfocenter/0001-tool-paths.patch deleted file mode 100644 index c6cf9bd8d6df..000000000000 --- a/pkgs/desktops/plasma-5/kinfocenter/0001-tool-paths.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff --git a/Modules/kwinsupportinfo/kcm_kwinsupportinfo.json.in b/Modules/kwinsupportinfo/kcm_kwinsupportinfo.json.in -index f591b9c..e883212 100644 ---- a/Modules/kwinsupportinfo/kcm_kwinsupportinfo.json.in -+++ b/Modules/kwinsupportinfo/kcm_kwinsupportinfo.json.in -@@ -63,6 +63,6 @@ - "Name[x-test]": "xxWindow Managerxx", - "Name[zh_CN]": "窗口管理器" - }, -- "TryExec": "@QtBinariesDir@/qdbus", -+ "TryExec": "@qdbus@", - "X-KDE-KInfoCenter-Category": "graphical_information" - } -diff --git a/Modules/kwinsupportinfo/main.cpp b/Modules/kwinsupportinfo/main.cpp -index 667c079..b727b67 100644 ---- a/Modules/kwinsupportinfo/main.cpp -+++ b/Modules/kwinsupportinfo/main.cpp -@@ -19,7 +19,7 @@ public: - explicit KCMKWinSupportInfo(QObject *parent, const KPluginMetaData &data, const QVariantList &args) - : ConfigModule(parent, data, args) - { -- auto outputContext = new CommandOutputContext(QLibraryInfo::location(QLibraryInfo::BinariesPath) + QStringLiteral("/qdbus"), -+ auto outputContext = new CommandOutputContext(QStringLiteral("@qdbus@"), - {QStringLiteral("org.kde.KWin"), QStringLiteral("/KWin"), QStringLiteral("supportInformation")}, - parent); - qmlRegisterSingletonInstance("org.kde.kinfocenter.kwinsupportinfo.private", 1, 0, "InfoOutputContext", outputContext); -diff --git a/Modules/xserver/kcm_xserver.json b/Modules/xserver/kcm_xserver.json -index 04acd6b..24b8f36 100644 ---- a/Modules/xserver/kcm_xserver.json -+++ b/Modules/xserver/kcm_xserver.json -@@ -130,7 +130,7 @@ - "Name[zh_CN]": "X 服务器", - "Name[zh_TW]": "X 伺服器" - }, -- "TryExec": "xdpyinfo", -+ "TryExec": "@xdpyinfo@", - "X-DocPath": "kinfocenter/graphical.html#xserver", - "X-KDE-KInfoCenter-Category": "graphical_information", - "X-KDE-Keywords": "X,X-Server,XServer,XFree86,Display,VideoCard,System Information", -diff --git a/Modules/xserver/main.cpp b/Modules/xserver/main.cpp -index c406ff7..a261b90 100644 ---- a/Modules/xserver/main.cpp -+++ b/Modules/xserver/main.cpp -@@ -17,7 +17,7 @@ public: - explicit KCMXServer(QObject *parent, const KPluginMetaData &data, const QVariantList &args) - : ConfigModule(parent, data, args) - { -- auto outputContext = new CommandOutputContext(QStringLiteral("xdpyinfo"), {}, parent); -+ auto outputContext = new CommandOutputContext(QStringLiteral("@xdpyinfo@"), {}, parent); - qmlRegisterSingletonInstance("org.kde.kinfocenter.xserver.private", 1, 0, "InfoOutputContext", outputContext); - - auto *about = new KAboutData(QStringLiteral("kcm_xserver"), i18nc("@label kcm name", "X-Server"), QStringLiteral("1.0"), QString(), KAboutLicense::GPL); diff --git a/pkgs/desktops/plasma-5/kinfocenter/default.nix b/pkgs/desktops/plasma-5/kinfocenter/default.nix deleted file mode 100644 index ac9964eb4315..000000000000 --- a/pkgs/desktops/plasma-5/kinfocenter/default.nix +++ /dev/null @@ -1,107 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - kdoctools, - qttools, - kcmutils, - kcompletion, - kconfig, - kconfigwidgets, - kcoreaddons, - kdbusaddons, - kdeclarative, - ki18n, - kiconthemes, - kio, - kirigami2, - kpackage, - kservice, - kwayland, - kwidgetsaddons, - kxmlgui, - solid, - systemsettings, - dmidecode, - fwupd, - libraw1394, - libusb1, - libGLU, - pciutils, - smartmontools, - util-linux, - vulkan-tools, - wayland-utils, - xdpyinfo, -}: - -let - inherit (lib) getBin getExe; - - qdbus = "${getBin qttools}/bin/qdbus"; - -in -mkDerivation { - pname = "kinfocenter"; - - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - - buildInputs = [ - kcmutils - kcompletion - kconfig - kconfigwidgets - kcoreaddons - kdbusaddons - kdeclarative - ki18n - kiconthemes - kio - kirigami2 - kpackage - kservice - kwayland - kwidgetsaddons - kxmlgui - solid - systemsettings - - dmidecode - fwupd - libraw1394 - libusb1 - libGLU - pciutils - smartmontools - util-linux - vulkan-tools - wayland-utils - xdpyinfo - ]; - - patches = [ - ./0001-tool-paths.patch - ]; - - postPatch = '' - for f in Modules/kwinsupportinfo/{kcm_kwinsupportinfo.json.in,main.cpp}; do - substituteInPlace $f \ - --replace "@qdbus@" "${qdbus}" - done - - for f in Modules/xserver/{kcm_xserver.json,main.cpp}; do - substituteInPlace $f \ - --replace "@xdpyinfo@" "${getExe xdpyinfo}" - done - ''; - - # fix wrong symlink of infocenter pointing to a 'systemsettings5' binary in - # the same directory, while it is actually located in a completely different - # store path - preFixup = '' - ln -sf ${systemsettings}/bin/systemsettings $out/bin/kinfocenter - ''; -} diff --git a/pkgs/desktops/plasma-5/kmenuedit.nix b/pkgs/desktops/plasma-5/kmenuedit.nix deleted file mode 100644 index d22002f3ebcf..000000000000 --- a/pkgs/desktops/plasma-5/kmenuedit.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ - mkDerivation, - extra-cmake-modules, - kdoctools, - kdbusaddons, - khotkeys, - ki18n, - kiconthemes, - kio, - kxmlgui, - sonnet, -}: - -mkDerivation { - pname = "kmenuedit"; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - kdbusaddons - khotkeys - ki18n - kiconthemes - kio - kxmlgui - sonnet - ]; -} diff --git a/pkgs/desktops/plasma-5/kpipewire.nix b/pkgs/desktops/plasma-5/kpipewire.nix deleted file mode 100644 index 0b961199d036..000000000000 --- a/pkgs/desktops/plasma-5/kpipewire.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ - mkDerivation, - extra-cmake-modules, - kwayland, - ki18n, - kcoreaddons, - plasma-wayland-protocols, - libepoxy, - ffmpeg, - libgbm, - pipewire, - wayland, -}: - -mkDerivation { - pname = "kpipewire"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - kwayland - ki18n - kcoreaddons - plasma-wayland-protocols - ffmpeg - libgbm - pipewire - wayland - ]; - propagatedBuildInputs = [ libepoxy ]; -} diff --git a/pkgs/desktops/plasma-5/kscreen.nix b/pkgs/desktops/plasma-5/kscreen.nix deleted file mode 100644 index a731051096dd..000000000000 --- a/pkgs/desktops/plasma-5/kscreen.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ - mkDerivation, - extra-cmake-modules, - kconfig, - kcmutils, - kconfigwidgets, - kdbusaddons, - kglobalaccel, - ki18n, - kwidgetsaddons, - kxmlgui, - libkscreen, - qtdeclarative, - qtgraphicaleffects, - qtsensors, - kwindowsystem, - kdeclarative, - plasma-framework, - qtx11extras, - layer-shell-qt, -}: - -mkDerivation { - pname = "kscreen"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - kconfig - kcmutils - kconfigwidgets - kdbusaddons - kglobalaccel - ki18n - kwidgetsaddons - kxmlgui - libkscreen - qtdeclarative - qtgraphicaleffects - qtsensors - kwindowsystem - kdeclarative - plasma-framework - qtx11extras - layer-shell-qt - ]; -} diff --git a/pkgs/desktops/plasma-5/kscreenlocker.nix b/pkgs/desktops/plasma-5/kscreenlocker.nix deleted file mode 100644 index 98212a45df79..000000000000 --- a/pkgs/desktops/plasma-5/kscreenlocker.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ - mkDerivation, - extra-cmake-modules, - kdoctools, - wayland-scanner, - kcmutils, - kcrash, - kdeclarative, - kglobalaccel, - kidletime, - libkscreen, - kwayland, - libXcursor, - pam, - plasma-framework, - qtdeclarative, - qtx11extras, - wayland, - layer-shell-qt, -}: - -mkDerivation { - pname = "kscreenlocker"; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - wayland-scanner - ]; - buildInputs = [ - kcmutils - kcrash - kdeclarative - kglobalaccel - kidletime - libkscreen - kwayland - libXcursor - pam - plasma-framework - qtdeclarative - qtx11extras - wayland - layer-shell-qt - ]; - outputs = [ - "out" - "dev" - ]; -} diff --git a/pkgs/desktops/plasma-5/ksshaskpass.nix b/pkgs/desktops/plasma-5/ksshaskpass.nix deleted file mode 100644 index d112a2579457..000000000000 --- a/pkgs/desktops/plasma-5/ksshaskpass.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ - mkDerivation, - extra-cmake-modules, - kdoctools, - kcoreaddons, - ki18n, - kwallet, - kwidgetsaddons, - qtbase, -}: - -mkDerivation { - pname = "ksshaskpass"; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - kcoreaddons - ki18n - kwallet - kwidgetsaddons - qtbase - ]; -} diff --git a/pkgs/desktops/plasma-5/ksystemstats.nix b/pkgs/desktops/plasma-5/ksystemstats.nix deleted file mode 100644 index 97591f6cdb14..000000000000 --- a/pkgs/desktops/plasma-5/ksystemstats.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - libksysguard, - libnl, - lm_sensors, - networkmanager-qt, -}: - -mkDerivation { - pname = "ksystemstats"; - env.NIX_CFLAGS_COMPILE = toString [ "-I${lib.getBin libksysguard}/share" ]; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - libksysguard - libnl - lm_sensors - networkmanager-qt - ]; -} diff --git a/pkgs/desktops/plasma-5/kwallet-pam.nix b/pkgs/desktops/plasma-5/kwallet-pam.nix deleted file mode 100644 index 629b64f79b9e..000000000000 --- a/pkgs/desktops/plasma-5/kwallet-pam.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - pam, - socat, - libgcrypt, - qtbase, - kwallet, -}: - -mkDerivation { - pname = "kwallet-pam"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - pam - socat - libgcrypt - qtbase - kwallet - ]; - postPatch = '' - sed -i pam_kwallet_init -e "s|socat|${lib.getBin socat}/bin/socat|" - ''; - - # We get a crash when QT_PLUGIN_PATH is more than 1000 characters. - # pam_kwallet_init passes its environment to kwalletd5, but - # wrapQtApps gives our environment a huge QT_PLUGIN_PATH value. We - # are able to unset it here since kwalletd5 will have its own - # QT_PLUGIN_PATH. - postFixup = '' - wrapProgram $out/libexec/pam_kwallet_init --unset QT_PLUGIN_PATH - ''; - - dontWrapQtApps = true; -} diff --git a/pkgs/desktops/plasma-5/kwayland-integration.nix b/pkgs/desktops/plasma-5/kwayland-integration.nix deleted file mode 100644 index e97bdf5c0ec4..000000000000 --- a/pkgs/desktops/plasma-5/kwayland-integration.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ - mkDerivation, - extra-cmake-modules, - kguiaddons, - kidletime, - kwayland, - kwindowsystem, - qtbase, - wayland-protocols, - wayland-scanner, - wayland, -}: - -mkDerivation { - pname = "kwayland-integration"; - nativeBuildInputs = [ - extra-cmake-modules - wayland-scanner - ]; - buildInputs = [ - kguiaddons - kidletime - kwindowsystem - kwayland - qtbase - wayland-protocols - wayland - ]; - - meta = { - description = "Integration plugins for various KDE frameworks for the Wayland windowing system"; - homepage = "https://invent.kde.org/plasma/kwayland-integration"; - }; -} diff --git a/pkgs/desktops/plasma-5/kwin/0001-Lower-CAP_SYS_NICE-from-the-ambient-set.patch b/pkgs/desktops/plasma-5/kwin/0001-Lower-CAP_SYS_NICE-from-the-ambient-set.patch deleted file mode 100644 index e6408605aa43..000000000000 --- a/pkgs/desktops/plasma-5/kwin/0001-Lower-CAP_SYS_NICE-from-the-ambient-set.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 232e480ab1303f37d37d295b57fdcbb6b6648bca Mon Sep 17 00:00:00 2001 -From: Alois Wohlschlager -Date: Sun, 7 Aug 2022 16:12:31 +0200 -Subject: [PATCH] Lower CAP_SYS_NICE from the ambient set - -The capabilities wrapper raises CAP_SYS_NICE into the ambient set so it -is inherited by the wrapped program. However, we don't want it to leak -into the entire desktop environment. - -Lower the capability again at startup so that the kernel will clear it -on exec. ---- - src/main_wayland.cpp | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/main_wayland.cpp b/src/main_wayland.cpp -index 1720e14e7..f2bb446b0 100644 ---- a/src/main_wayland.cpp -+++ b/src/main_wayland.cpp -@@ -39,7 +39,9 @@ - #include - #include - -+#include - #include -+#include - #include - - #include -@@ -285,6 +287,7 @@ static QString automaticBackendSelection() - - int main(int argc, char *argv[]) - { -+ prctl(PR_CAP_AMBIENT, PR_CAP_AMBIENT_LOWER, CAP_SYS_NICE, 0, 0); - KWin::Application::setupMalloc(); - KWin::Application::setupLocalizedString(); - KWin::gainRealTime(); --- -2.37.1 - diff --git a/pkgs/desktops/plasma-5/kwin/0001-NixOS-Unwrap-executable-name-for-.desktop-search.patch b/pkgs/desktops/plasma-5/kwin/0001-NixOS-Unwrap-executable-name-for-.desktop-search.patch deleted file mode 100644 index cdc8245ce5b5..000000000000 --- a/pkgs/desktops/plasma-5/kwin/0001-NixOS-Unwrap-executable-name-for-.desktop-search.patch +++ /dev/null @@ -1,114 +0,0 @@ -From 29ec6fada935ef966e5859082435ed57daa9522d Mon Sep 17 00:00:00 2001 -From: Samuel Dionne-Riel -Date: Tue, 16 Mar 2021 15:03:59 -0400 -Subject: [PATCH] [NixOS] Unwrap executable name for .desktop search - -Why is this necessary even though -a "$0" is used in the wrapper? -Because it's completely bypassing argv0! This looks at the executable -file in-use according to the kernel! - -Wrappers cannot affect the `/proc/.../exe` symlink! - -Co-authored-by: Yaroslav Bolyukin ---- - src/nixos_utils.h | 41 +++++++++++++++++++++++++++++++++++++++++ - src/service_utils.h | 4 +++- - src/waylandwindow.cpp | 5 ++++- - 3 files changed, 48 insertions(+), 2 deletions(-) - create mode 100644 src/nixos_utils.h - -diff --git a/src/nixos_utils.h b/src/nixos_utils.h -new file mode 100644 -index 0000000..726065d ---- /dev/null -+++ b/src/nixos_utils.h -@@ -0,0 +1,41 @@ -+#ifndef NIXOS_UTILS_H -+#define NIXOS_UTILS_H -+ -+// kwin -+#include -+ -+namespace KWin -+{ -+ -+static QString unwrapExecutablePath(const QString &in_executablePath) -+{ -+ // NixOS fixes many packaging issues through "wrapper" scripts that manipulates the environment or does -+ // miscellaneous trickeries and mischievous things to make the programs work. -+ // In turn, programs often employs different mischievous schemes and trickeries to do *other things. -+ // It often happens that they conflict. -+ // Here, `kwin` tries to detect the .desktop file for a given process. -+ // `kwin` followed the process `/proc/.../exe` up to the actual binary running. -+ // It normally would be fine, e.g. /usr/bin/foobar is what's in the desktop file. -+ // But it's not the truth here! It's extremely likely the resolved path is /nix/store/.../bin/.foobar-wrapped -+ // rather than what the desktop file points to, something like /nix/store/.../bin/foobar !! -+ // Since the wrappers for Nixpkgs *always* prepend a dot and append -wrapped, we assume here that we can keep -+ // `/^(.*)\/\.([^/]*)-wrapped/` until the (equivalent) regex does not match. -+ // This should canonicalize the wrapper name to the expected name to look for in the desktop file. -+ -+ // Use a copy of the const string -+ QString executablePath(in_executablePath); -+ -+ // While the parts needed are present, "unwrap" one layer of wrapper names. -+ while (executablePath.endsWith("-wrapped") && executablePath[executablePath.lastIndexOf("/")+1] == QChar('.')) { -+ // Approximately equivalent to s/-wrapped$// -+ executablePath.remove(executablePath.length() - 8, 8); -+ // Approximately equivalent to s;/\.;/; -+ executablePath.remove(executablePath.lastIndexOf("/")+1, 1); -+ } -+ -+ return executablePath; -+} -+ -+}// namespace -+ -+#endif // NIXOS_UTILS_H -diff --git a/src/utils/serviceutils.h b/src/utils/serviceutils.h -index 8a70c1f..475b15d 100644 ---- a/src/utils/serviceutils.h -+++ b/src/utils/serviceutils.h -@@ -19,6 +19,7 @@ - #include - //KF - #include -+#include "nixos_utils.h" - - namespace KWin - { -@@ -26,8 +27,9 @@ namespace KWin - const static QString s_waylandInterfaceName = QStringLiteral("X-KDE-Wayland-Interfaces"); - const static QString s_dbusRestrictedInterfaceName = QStringLiteral("X-KDE-DBUS-Restricted-Interfaces"); - --static QStringList fetchProcessServiceField(const QString &executablePath, const QString &fieldName) -+static QStringList fetchProcessServiceField(const QString &in_executablePath, const QString &fieldName) - { -+ const QString executablePath = unwrapExecutablePath(in_executablePath); - // needed to be able to use the logging category in a header static function - static QLoggingCategory KWIN_UTILS ("KWIN_UTILS", QtWarningMsg); - const auto servicesFound = KApplicationTrader::query([&executablePath] (const KService::Ptr &service) { -diff --git a/src/waylandwindow.cpp b/src/waylandwindow.cpp -index fd2c0c1..ae8cf96 100644 ---- a/src/waylandwindow.cpp -+++ b/src/waylandwindow.cpp -@@ -10,6 +10,7 @@ - #include "screens.h" - #include "wayland_server.h" - #include "workspace.h" -+#include "nixos_utils.h" - - #include - #include -@@ -173,7 +174,9 @@ void WaylandWindow::updateIcon() - - void WaylandWindow::updateResourceName() - { -- const QFileInfo fileInfo(surface()->client()->executablePath()); -+ const QString in_path = surface()->client()->executablePath(); -+ const QString path = unwrapExecutablePath(in_path); -+ const QFileInfo fileInfo(path); - if (fileInfo.exists()) { - const QByteArray executableFileName = fileInfo.fileName().toUtf8(); - setResourceClass(executableFileName, executableFileName); --- -2.32.0 diff --git a/pkgs/desktops/plasma-5/kwin/0001-follow-symlinks.patch b/pkgs/desktops/plasma-5/kwin/0001-follow-symlinks.patch deleted file mode 100644 index efde4f4dcf04..000000000000 --- a/pkgs/desktops/plasma-5/kwin/0001-follow-symlinks.patch +++ /dev/null @@ -1,25 +0,0 @@ -From af569c9ed8079169b524b31461e2789baa09ef7a Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Mon, 27 Jan 2020 05:31:13 -0600 -Subject: [PATCH 1/3] follow symlinks - ---- - src/plugins/kdecorations/aurorae/src/aurorae.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/plugins/kdecorations/aurorae/src/aurorae.cpp b/src/plugins/kdecorations/aurorae/src/aurorae.cpp -index 5242cb7..2e4ddae 100644 ---- a/src/plugins/kdecorations/aurorae/src/aurorae.cpp -+++ b/src/plugins/kdecorations/aurorae/src/aurorae.cpp -@@ -201,7 +201,7 @@ void Helper::init() - // so let's try to locate our plugin: - QString pluginPath; - for (const QString &path : m_engine->importPathList()) { -- QDirIterator it(path, QDirIterator::Subdirectories); -+ QDirIterator it(path, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); - while (it.hasNext()) { - it.next(); - QFileInfo fileInfo = it.fileInfo(); --- -2.29.2 - diff --git a/pkgs/desktops/plasma-5/kwin/0002-xwayland.patch b/pkgs/desktops/plasma-5/kwin/0002-xwayland.patch deleted file mode 100644 index dfd25e727f94..000000000000 --- a/pkgs/desktops/plasma-5/kwin/0002-xwayland.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 5c90dd84f541bd4789525f12f12ad24411b99018 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Mon, 27 Jan 2020 05:31:23 -0600 -Subject: [PATCH 2/3] xwayland - ---- - src/xwayland/xwaylandlauncher.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/xwayland/xwaylandlauncher.cpp b/src/xwayland/xwaylandlauncher.cpp -index 57efdde..a211a58 100644 ---- a/src/xwayland/xwaylandlauncher.cpp -+++ b/src/xwayland/xwaylandlauncher.cpp -@@ -163,7 +163,7 @@ void Xwayland::start() - - m_xwaylandProcess = new QProcess(this); - m_xwaylandProcess->setProcessChannelMode(QProcess::ForwardedErrorChannel); -- m_xwaylandProcess->setProgram(QStringLiteral("Xwayland")); -+ m_xwaylandProcess->setProgram(QLatin1String(NIXPKGS_XWAYLAND)); - QProcessEnvironment env = QProcessEnvironment::systemEnvironment(); - env.insert("WAYLAND_SOCKET", QByteArray::number(wlfd)); - if (qEnvironmentVariableIsSet("KWIN_XWAYLAND_DEBUG")) { --- -2.29.2 - diff --git a/pkgs/desktops/plasma-5/kwin/0003-plugins-qpa-allow-using-nixos-wrapper.patch b/pkgs/desktops/plasma-5/kwin/0003-plugins-qpa-allow-using-nixos-wrapper.patch deleted file mode 100644 index d0be721b044c..000000000000 --- a/pkgs/desktops/plasma-5/kwin/0003-plugins-qpa-allow-using-nixos-wrapper.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 8d49f5ef8692c352a62f4f8b1bc68e6e210bbee6 Mon Sep 17 00:00:00 2001 -From: Yaroslav Bolyukin -Date: Wed, 23 Dec 2020 18:02:14 +0300 -Subject: [PATCH 3/3] plugins/qpa: allow using nixos wrapper - -Signed-off-by: Yaroslav Bolyukin ---- - src/plugins/qpa/main.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/plugins/qpa/main.cpp b/src/plugins/qpa/main.cpp -index efd236b..a69c046 100644 ---- a/src/plugins/qpa/main.cpp -+++ b/src/plugins/qpa/main.cpp -@@ -23,7 +23,7 @@ public: - - QPlatformIntegration *KWinIntegrationPlugin::create(const QString &system, const QStringList ¶mList) - { -- if (!QCoreApplication::applicationFilePath().endsWith(QLatin1String("kwin_wayland")) && !qEnvironmentVariableIsSet("KWIN_FORCE_OWN_QPA")) { -+ if (!QCoreApplication::applicationFilePath().endsWith(QLatin1String("kwin_wayland")) && !QCoreApplication::applicationFilePath().endsWith(QLatin1String(".kwin_wayland-wrapped")) && !qEnvironmentVariableIsSet("KWIN_FORCE_OWN_QPA")) { - // Not KWin - return nullptr; - } --- -2.29.2 - diff --git a/pkgs/desktops/plasma-5/kwin/default.nix b/pkgs/desktops/plasma-5/kwin/default.nix deleted file mode 100644 index 405a7c0a576e..000000000000 --- a/pkgs/desktops/plasma-5/kwin/default.nix +++ /dev/null @@ -1,166 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - kdoctools, - wayland-scanner, - fetchpatch, - libepoxy, - lcms2, - libICE, - libSM, - libcap, - libdrm, - libinput, - libxkbcommon, - libgbm, - pipewire, - udev, - wayland, - xcb-util-cursor, - xwayland, - plasma-wayland-protocols, - wayland-protocols, - libxcvt, - qtdeclarative, - qtmultimedia, - qtquickcontrols2, - qtscript, - qtsensors, - qtvirtualkeyboard, - qtx11extras, - breeze-qt5, - kactivities, - kcompletion, - kcmutils, - kconfig, - kconfigwidgets, - kcoreaddons, - kcrash, - kdeclarative, - kdecoration, - kglobalaccel, - ki18n, - kiconthemes, - kidletime, - kinit, - kio, - knewstuff, - knotifications, - kpackage, - krunner, - kscreenlocker, - kservice, - kwayland, - kwidgetsaddons, - kwindowsystem, - kxmlgui, - plasma-framework, - libqaccessibilityclient, -}: - -# TODO (ttuegel): investigate qmlplugindump failure - -mkDerivation { - pname = "kwin"; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - wayland-scanner - ]; - buildInputs = [ - libepoxy - lcms2 - libICE - libSM - libcap - libdrm - libinput - libxkbcommon - libgbm - pipewire - udev - wayland - xcb-util-cursor - xwayland - libxcvt - plasma-wayland-protocols - wayland-protocols - - qtdeclarative - qtmultimedia - qtquickcontrols2 - qtscript - qtsensors - qtvirtualkeyboard - qtx11extras - - breeze-qt5 - kactivities - kcmutils - kcompletion - kconfig - kconfigwidgets - kcoreaddons - kcrash - kdeclarative - kdecoration - kglobalaccel - ki18n - kiconthemes - kidletime - kinit - kio - knewstuff - knotifications - kpackage - krunner - kscreenlocker - kservice - kwayland - kwidgetsaddons - kwindowsystem - kxmlgui - plasma-framework - libqaccessibilityclient - - ]; - outputs = [ - "out" - "dev" - ]; - - postPatch = '' - patchShebangs src/effects/strip-effect-metadata.py - ''; - - patches = [ - ./0001-follow-symlinks.patch - ./0002-xwayland.patch - ./0003-plugins-qpa-allow-using-nixos-wrapper.patch - ./0001-NixOS-Unwrap-executable-name-for-.desktop-search.patch - ./0001-Lower-CAP_SYS_NICE-from-the-ambient-set.patch - # Pass special environments through arguments to `kwin_wayland`, bypassing - # ld.so(8) environment stripping due to `kwin_wayland`'s capabilities. - # We need this to have `TZDIR` correctly set for `plasmashell`, or - # everything related to timezone, like clock widgets, will be broken. - # https://invent.kde.org/plasma/kwin/-/merge_requests/1590 - (fetchpatch { - url = "https://invent.kde.org/plasma/kwin/-/commit/9a008b223ad696db3bf5692750f2b74e578e08b8.diff"; - sha256 = "sha256-f35G+g2MVABLDbAkCed3ZmtDWrzYn1rdD08mEx35j4k="; - }) - ]; - - CXXFLAGS = [ - ''-DNIXPKGS_XWAYLAND=\"${lib.getExe xwayland}\"'' - ]; - - postInstall = '' - # Some package(s) refer to these service types by the wrong name. - # I would prefer to patch those packages, but I cannot find them! - ln -s ''${!outputBin}/share/kservicetypes5/kwineffect.desktop \ - ''${!outputBin}/share/kservicetypes5/kwin-effect.desktop - ln -s ''${!outputBin}/share/kservicetypes5/kwinscript.desktop \ - ''${!outputBin}/share/kservicetypes5/kwin-script.desktop - ''; -} diff --git a/pkgs/desktops/plasma-5/kwrited.nix b/pkgs/desktops/plasma-5/kwrited.nix deleted file mode 100644 index 02375111f93d..000000000000 --- a/pkgs/desktops/plasma-5/kwrited.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ - mkDerivation, - extra-cmake-modules, - kcoreaddons, - kdbusaddons, - ki18n, - knotifications, - kpty, - qtbase, -}: - -mkDerivation { - pname = "kwrited"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - kcoreaddons - kdbusaddons - ki18n - knotifications - kpty - qtbase - ]; -} diff --git a/pkgs/desktops/plasma-5/layer-shell-qt.nix b/pkgs/desktops/plasma-5/layer-shell-qt.nix deleted file mode 100644 index 17ea2317c8ad..000000000000 --- a/pkgs/desktops/plasma-5/layer-shell-qt.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ - mkDerivation, - extra-cmake-modules, - kguiaddons, - kidletime, - kwayland, - kwindowsystem, - qtbase, - wayland-scanner, - wayland, - wayland-protocols, -}: - -mkDerivation { - pname = "layer-shell-qt"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - kguiaddons - kidletime - kwindowsystem - kwayland - qtbase - wayland-scanner - wayland - wayland-protocols - ]; -} diff --git a/pkgs/desktops/plasma-5/libkscreen/default.nix b/pkgs/desktops/plasma-5/libkscreen/default.nix deleted file mode 100644 index 93c17f96e3ef..000000000000 --- a/pkgs/desktops/plasma-5/libkscreen/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ - mkDerivation, - propagate, - extra-cmake-modules, - wayland-scanner, - kconfig, - kwayland, - plasma-wayland-protocols, - wayland, - libXrandr, - qtx11extras, - qttools, -}: - -mkDerivation { - pname = "libkscreen"; - nativeBuildInputs = [ - extra-cmake-modules - wayland-scanner - ]; - buildInputs = [ - kconfig - kwayland - plasma-wayland-protocols - wayland - libXrandr - qtx11extras - qttools - ]; - outputs = [ - "out" - "dev" - ]; - patches = [ - ./libkscreen-backends-path.patch - ]; - preConfigure = '' - NIX_CFLAGS_COMPILE+=" -DNIXPKGS_LIBKSCREEN_BACKENDS=\"''${!outputBin}/$qtPluginPrefix/kf5/kscreen\"" - ''; - setupHook = propagate "out"; -} diff --git a/pkgs/desktops/plasma-5/libkscreen/libkscreen-backends-path.patch b/pkgs/desktops/plasma-5/libkscreen/libkscreen-backends-path.patch deleted file mode 100644 index 948c045db4b1..000000000000 --- a/pkgs/desktops/plasma-5/libkscreen/libkscreen-backends-path.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/src/backendmanager.cpp b/src/backendmanager.cpp -index e1013d5..4bded53 100644 ---- a/src/backendmanager.cpp -+++ b/src/backendmanager.cpp -@@ -164,18 +164,11 @@ QFileInfo BackendManager::preferredBackend(const QString &backend) - - QFileInfoList BackendManager::listBackends() - { -- // Compile a list of installed backends first -- const QString backendFilter = QStringLiteral("KSC_*"); -- const QStringList paths = QCoreApplication::libraryPaths(); -- QFileInfoList finfos; -- for (const QString &path : paths) { -- const QDir dir(path + QStringLiteral("/kf" QT_STRINGIFY(QT_VERSION_MAJOR) "/kscreen/"), -- backendFilter, -- QDir::SortFlags(QDir::QDir::Name), -- QDir::NoDotAndDotDot | QDir::Files); -- finfos.append(dir.entryInfoList()); -- } -- return finfos; -+ const QDir dir(QLatin1String(NIXPKGS_LIBKSCREEN_BACKENDS), -+ QStringLiteral("KSC_*"), -+ QDir::SortFlags(QDir::QDir::Name), -+ QDir::NoDotAndDotDot | QDir::Files); -+ return dir.entryInfoList(); - } - - void BackendManager::setBackendArgs(const QVariantMap &arguments) diff --git a/pkgs/desktops/plasma-5/libksysguard/0001-qdiriterator-follow-symlinks.patch b/pkgs/desktops/plasma-5/libksysguard/0001-qdiriterator-follow-symlinks.patch deleted file mode 100644 index ec4a34037dcb..000000000000 --- a/pkgs/desktops/plasma-5/libksysguard/0001-qdiriterator-follow-symlinks.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 46164a50de4102d02ae9d1d480acdd4b12303db8 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Wed, 14 Oct 2015 07:07:22 -0500 -Subject: [PATCH] qdiriterator follow symlinks - ---- - processui/scripting.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/processui/scripting.cpp b/processui/scripting.cpp -index efed8ff..841761a 100644 ---- a/processui/scripting.cpp -+++ b/processui/scripting.cpp -@@ -293,7 +293,7 @@ void Scripting::loadContextMenu() - const QStringList dirs = - QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral("ksysguard/scripts/"), QStandardPaths::LocateDirectory); - for (const QString &dir : dirs) { -- QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories); -+ QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); - while (it.hasNext()) { - scripts.append(it.next()); - } --- -2.5.2 diff --git a/pkgs/desktops/plasma-5/libksysguard/default.nix b/pkgs/desktops/plasma-5/libksysguard/default.nix deleted file mode 100644 index 1ebd1c38c5a2..000000000000 --- a/pkgs/desktops/plasma-5/libksysguard/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ - mkDerivation, - extra-cmake-modules, - kauth, - kcompletion, - kconfig, - kconfigwidgets, - kcoreaddons, - ki18n, - kiconthemes, - knewstuff, - kservice, - kwidgetsaddons, - kwindowsystem, - plasma-framework, - qtscript, - qtwebengine, - qtx11extras, - libnl, - libpcap, - qtsensors, - lm_sensors, -}: - -mkDerivation { - pname = "libksysguard"; - patches = [ - ./0001-qdiriterator-follow-symlinks.patch - ]; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - kauth - kconfig - ki18n - kiconthemes - kwindowsystem - kcompletion - kconfigwidgets - kcoreaddons - kservice - kwidgetsaddons - plasma-framework - qtscript - qtx11extras - qtwebengine - knewstuff - libnl - libpcap - qtsensors - lm_sensors - ]; - outputs = [ - "bin" - "dev" - "out" - ]; -} diff --git a/pkgs/desktops/plasma-5/milou.nix b/pkgs/desktops/plasma-5/milou.nix deleted file mode 100644 index faf8352400d0..000000000000 --- a/pkgs/desktops/plasma-5/milou.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ - mkDerivation, - extra-cmake-modules, - kcoreaddons, - kdeclarative, - ki18n, - kitemmodels, - krunner, - kservice, - plasma-framework, - qtscript, - qtdeclarative, -}: - -mkDerivation { - pname = "milou"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - kcoreaddons - kdeclarative - ki18n - kitemmodels - krunner - kservice - plasma-framework - qtdeclarative - qtscript - ]; -} diff --git a/pkgs/desktops/plasma-5/oxygen-sounds.nix b/pkgs/desktops/plasma-5/oxygen-sounds.nix deleted file mode 100644 index ddb5be869bea..000000000000 --- a/pkgs/desktops/plasma-5/oxygen-sounds.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ - mkDerivation, - extra-cmake-modules, -}: - -mkDerivation { - pname = "oxygen-sounds"; - nativeBuildInputs = [ extra-cmake-modules ]; -} diff --git a/pkgs/desktops/plasma-5/oxygen.nix b/pkgs/desktops/plasma-5/oxygen.nix deleted file mode 100644 index 8308cc827591..000000000000 --- a/pkgs/desktops/plasma-5/oxygen.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ - mkDerivation, - extra-cmake-modules, - frameworkintegration, - kcmutils, - kcompletion, - kconfig, - kdecoration, - kguiaddons, - ki18n, - kwidgetsaddons, - kservice, - kwayland, - kwindowsystem, - qtdeclarative, - qtx11extras, - libXdmcp, -}: - -mkDerivation { - pname = "oxygen"; - nativeBuildInputs = [ extra-cmake-modules ]; - propagatedBuildInputs = [ - frameworkintegration - kcmutils - kcompletion - kconfig - kdecoration - kguiaddons - ki18n - kservice - kwayland - kwidgetsaddons - kwindowsystem - qtdeclarative - qtx11extras - libXdmcp - ]; - outputs = [ - "bin" - "dev" - "out" - ]; -} diff --git a/pkgs/desktops/plasma-5/patches/0001-fix-add-executable-bit.patch b/pkgs/desktops/plasma-5/patches/0001-fix-add-executable-bit.patch deleted file mode 100644 index 8ed822220598..000000000000 --- a/pkgs/desktops/plasma-5/patches/0001-fix-add-executable-bit.patch +++ /dev/null @@ -1,25 +0,0 @@ -From da6a4651f74625f4c7f3c31f1125cfa4e774780b Mon Sep 17 00:00:00 2001 -From: Yaroslav Bolyukin -Date: Mon, 27 Sep 2021 22:45:58 +0300 -Subject: [PATCH] fix: add executable bit - -Signed-off-by: Yaroslav Bolyukin ---- - src/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 79ff12d..4f3d746 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -2,7 +2,7 @@ file(GLOB_RECURSE SCSS_SOURCES "*.scss") - file(GLOB CSS_SOURCES "*.css") - file(GLOB_RECURSE GTK2_SOURCES "gtk2/*") - --configure_file(build_theme.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/build_theme.sh @ONLY) -+configure_file(build_theme.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/build_theme.sh FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE @ONLY) - - set(SOURCES - ${SCSS_SOURCES} --- -2.33.0 diff --git a/pkgs/desktops/plasma-5/plank-player.nix b/pkgs/desktops/plasma-5/plank-player.nix deleted file mode 100644 index 536db96ef3c3..000000000000 --- a/pkgs/desktops/plasma-5/plank-player.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ - mkDerivation, - extra-cmake-modules, - qtquickcontrols2, - qtmultimedia, - kirigami2, - ki18n, -}: -mkDerivation { - pname = "plank-player"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - qtquickcontrols2 - qtmultimedia - kirigami2 - ki18n - ]; -} diff --git a/pkgs/desktops/plasma-5/plasma-bigscreen.nix b/pkgs/desktops/plasma-5/plasma-bigscreen.nix deleted file mode 100644 index dc6024a1e210..000000000000 --- a/pkgs/desktops/plasma-5/plasma-bigscreen.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ - mkDerivation, - extra-cmake-modules, - kactivities, - kactivities-stats, - plasma-framework, - ki18n, - kirigami2, - kdeclarative, - kcmutils, - knotifications, - kio, - kwayland, - kwindowsystem, - plasma-workspace, - qtmultimedia, -}: -mkDerivation { - pname = "plasma-bigscreen"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - kactivities - kactivities-stats - plasma-framework - ki18n - kirigami2 - kdeclarative - kcmutils - knotifications - kio - kwayland - kwindowsystem - plasma-workspace - qtmultimedia - ]; - - postPatch = '' - substituteInPlace bin/plasma-bigscreen-wayland.in \ - --replace @KDE_INSTALL_FULL_LIBEXECDIR@ "${plasma-workspace}/libexec" - ''; - - preFixup = '' - wrapQtApp $out/bin/plasma-bigscreen-x11 - wrapQtApp $out/bin/plasma-bigscreen-wayland - ''; - - passthru.providedSessions = [ - "plasma-bigscreen-x11" - "plasma-bigscreen-wayland" - ]; -} diff --git a/pkgs/desktops/plasma-5/plasma-browser-integration.nix b/pkgs/desktops/plasma-5/plasma-browser-integration.nix deleted file mode 100644 index 3694282ce348..000000000000 --- a/pkgs/desktops/plasma-5/plasma-browser-integration.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ - mkDerivation, - extra-cmake-modules, - qtbase, - kfilemetadata, - kio, - ki18n, - kconfig, - kdbusaddons, - knotifications, - kpurpose, - krunner, - kwindowsystem, - kactivities, - plasma-workspace, -}: - -mkDerivation { - pname = "plasma-browser-integration"; - nativeBuildInputs = [ - extra-cmake-modules - ]; - buildInputs = [ - qtbase - kfilemetadata - kio - ki18n - kconfig - kdbusaddons - knotifications - kpurpose - krunner - kwindowsystem - kactivities - plasma-workspace - ]; - - meta = { - description = "Components necessary to integrate browsers into the Plasma Desktop"; - mainProgram = "plasma-browser-integration-host"; - homepage = "https://community.kde.org/Plasma/Browser_Integration"; - }; -} diff --git a/pkgs/desktops/plasma-5/plasma-desktop/default.nix b/pkgs/desktops/plasma-5/plasma-desktop/default.nix deleted file mode 100644 index 616c52b886e8..000000000000 --- a/pkgs/desktops/plasma-5/plasma-desktop/default.nix +++ /dev/null @@ -1,149 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - kdoctools, - wayland-scanner, - boost, - fontconfig, - ibus, - libXcursor, - libXft, - libcanberra_kde, - libpulseaudio, - libxkbfile, - xf86inputevdev, - xf86inputsynaptics, - xinput, - xkeyboard_config, - xorgserver, - util-linux, - wayland, - wayland-protocols, - accounts-qt, - qtdeclarative, - qtquickcontrols, - qtquickcontrols2, - qtsvg, - qtx11extras, - attica, - baloo, - kaccounts-integration, - kactivities, - kactivities-stats, - kauth, - kcmutils, - kdbusaddons, - kdeclarative, - kded, - kdelibs4support, - kemoticons, - kglobalaccel, - ki18n, - kitemmodels, - knewstuff, - knotifications, - knotifyconfig, - kpeople, - krunner, - kscreenlocker, - kwallet, - kwin, - phonon, - plasma-framework, - plasma-workspace, - qqc2-desktop-style, - xf86inputlibinput, - glib, - gsettings-desktop-schemas, - runCommandLocal, - makeWrapper, -}: -let - # run gsettings with desktop schemas for using in "kcm_access" kcm - # and in kaccess - gsettings-wrapper = runCommandLocal "gsettings-wrapper" { nativeBuildInputs = [ makeWrapper ]; } '' - mkdir -p $out/bin - makeWrapper ${glib}/bin/gsettings $out/bin/gsettings --prefix XDG_DATA_DIRS : ${gsettings-desktop-schemas.out}/share/gsettings-schemas/${gsettings-desktop-schemas.name} - ''; -in -mkDerivation { - pname = "plasma-desktop"; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - wayland-scanner - ]; - buildInputs = [ - boost - fontconfig - ibus - libcanberra_kde - libpulseaudio - libXcursor - libXft - xorgserver - libxkbfile - phonon - xf86inputlibinput - xf86inputevdev - xf86inputsynaptics - xinput - xkeyboard_config - wayland - wayland-protocols - - accounts-qt - qtdeclarative - qtquickcontrols - qtquickcontrols2 - qtsvg - qtx11extras - - attica - baloo - kaccounts-integration - kactivities - kactivities-stats - kauth - kcmutils - kdbusaddons - kdeclarative - kded - kdelibs4support - kemoticons - kglobalaccel - ki18n - kitemmodels - knewstuff - knotifications - knotifyconfig - kpeople - krunner - kscreenlocker - kwallet - kwin - plasma-framework - plasma-workspace - qqc2-desktop-style - ]; - - patches = [ - ./hwclock-path.patch - ./tzdir.patch - ./kcm-access.patch - ./no-discover-shortcut.patch - ]; - CXXFLAGS = [ - ''-DNIXPKGS_HWCLOCK=\"${lib.getBin util-linux}/bin/hwclock\"'' - ''-DNIXPKGS_GSETTINGS=\"${gsettings-wrapper}/bin/gsettings\"'' - ]; - postInstall = '' - # Display ~/Desktop contents on the desktop by default. - sed -i "''${!outputBin}/share/plasma/shells/org.kde.plasma.desktop/contents/defaults" \ - -e 's/Containment=org.kde.desktopcontainment/Containment=org.kde.plasma.folder/' - ''; - - # wrap kaccess with wrapped gsettings so it can access accessibility schemas - qtWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ gsettings-wrapper ]}" ]; -} diff --git a/pkgs/desktops/plasma-5/plasma-desktop/hwclock-path.patch b/pkgs/desktops/plasma-5/plasma-desktop/hwclock-path.patch deleted file mode 100644 index c85d66ad0031..000000000000 --- a/pkgs/desktops/plasma-5/plasma-desktop/hwclock-path.patch +++ /dev/null @@ -1,24 +0,0 @@ -Index: plasma-desktop-5.8.5/kcms/dateandtime/helper.cpp -=================================================================== ---- plasma-desktop-5.8.5.orig/kcms/dateandtime/helper.cpp -+++ plasma-desktop-5.8.5/kcms/dateandtime/helper.cpp -@@ -48,10 +48,6 @@ - #include - #endif - --// We cannot rely on the $PATH environment variable, because D-Bus activation --// clears it. So we have to use a reasonable default. --static const QString exePath = QStringLiteral("/usr/sbin:/usr/bin:/sbin:/bin"); -- - int ClockHelper::ntp(const QStringList &ntpServers, bool ntpEnabled) - { - int ret = 0; -@@ -227,7 +223,7 @@ int ClockHelper::tzreset() - - void ClockHelper::toHwclock() - { -- QString hwclock = QStandardPaths::findExecutable(QStringLiteral("hwclock"), exePath.split(QLatin1Char(':'))); -+ QString hwclock = QLatin1String(NIXPKGS_HWCLOCK); - if (!hwclock.isEmpty()) { - KProcess::execute(hwclock, QStringList() << QStringLiteral("--systohc")); - } diff --git a/pkgs/desktops/plasma-5/plasma-desktop/kcm-access.patch b/pkgs/desktops/plasma-5/plasma-desktop/kcm-access.patch deleted file mode 100644 index 89f6dd8b84f7..000000000000 --- a/pkgs/desktops/plasma-5/plasma-desktop/kcm-access.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/kcms/access/kcmaccess.cpp b/kcms/access/kcmaccess.cpp -index 4f8d3e2..a96f755 100644 ---- a/kcms/access/kcmaccess.cpp -+++ b/kcms/access/kcmaccess.cpp -@@ -176,7 +176,7 @@ void KAccessConfig::launchOrcaConfiguration() - QStringLiteral("screen-reader-enabled"), - QStringLiteral("true")}; - -- int ret = QProcess::execute(QStringLiteral("gsettings"), gsettingArgs); -+ int ret = QProcess::execute(QStringLiteral(NIXPKGS_GSETTINGS), gsettingArgs); - if (ret) { - const QString errorStr = QLatin1String("gsettings ") + gsettingArgs.join(QLatin1Char(' ')); - setOrcaLaunchFeedback(i18n("Could not set gsettings for Orca: \"%1\" failed", errorStr)); diff --git a/pkgs/desktops/plasma-5/plasma-desktop/no-discover-shortcut.patch b/pkgs/desktops/plasma-5/plasma-desktop/no-discover-shortcut.patch deleted file mode 100644 index f186671c9cc5..000000000000 --- a/pkgs/desktops/plasma-5/plasma-desktop/no-discover-shortcut.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/applets/taskmanager/package/contents/config/main.xml b/applets/taskmanager/package/contents/config/main.xml -index 6bb27695d..25e621810 100644 ---- a/applets/taskmanager/package/contents/config/main.xml -+++ b/applets/taskmanager/package/contents/config/main.xml -@@ -85,7 +85,7 @@ - - - -- applications:systemsettings.desktop,applications:org.kde.discover.desktop,preferred://filemanager,preferred://browser -+ applications:systemsettings.desktop,preferred://filemanager,preferred://browser - - - diff --git a/pkgs/desktops/plasma-5/plasma-desktop/tzdir.patch b/pkgs/desktops/plasma-5/plasma-desktop/tzdir.patch deleted file mode 100644 index 97504b330fed..000000000000 --- a/pkgs/desktops/plasma-5/plasma-desktop/tzdir.patch +++ /dev/null @@ -1,18 +0,0 @@ -Index: plasma-desktop-5.8.5/kcms/dateandtime/helper.cpp -=================================================================== ---- plasma-desktop-5.8.5.orig/kcms/dateandtime/helper.cpp -+++ plasma-desktop-5.8.5/kcms/dateandtime/helper.cpp -@@ -181,7 +181,12 @@ int ClockHelper::tz( const QString& sele - - val = selectedzone; - #else -- QString tz = "/usr/share/zoneinfo/" + selectedzone; -+ QString tzdir = QString::fromLocal8Bit(qgetenv("TZDIR")); -+ QString tz = tzdir + "/" + selectedzone; -+ if (tzdir.isEmpty()) { -+ // Standard Linux path -+ tz = "/usr/share/zoneinfo/" + selectedzone; -+ } - - if (QFile::exists(tz)) { // make sure the new TZ really exists - QFile::remove(QStringLiteral("/etc/localtime")); diff --git a/pkgs/desktops/plasma-5/plasma-disks.nix b/pkgs/desktops/plasma-5/plasma-disks.nix deleted file mode 100644 index 8f179c9da132..000000000000 --- a/pkgs/desktops/plasma-5/plasma-disks.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ - mkDerivation, - extra-cmake-modules, - kdoctools, - kcmutils, - kconfig, - kdbusaddons, - khtml, - ki18n, - kiconthemes, - kio, - kitemviews, - kservice, - kwindowsystem, - kxmlgui, - qtquickcontrols, - qtquickcontrols2, - kactivities, - kactivities-stats, - kirigami2, - kcrash, - plasma-workspace, - systemsettings, -}: - -mkDerivation { - pname = "plasma-disks"; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - kcmutils - kconfig - kdbusaddons - khtml - ki18n - kiconthemes - kio - kitemviews - kservice - kwindowsystem - kxmlgui - qtquickcontrols - qtquickcontrols2 - kactivities - kactivities-stats - kirigami2 - kcrash - plasma-workspace - systemsettings - ]; - outputs = [ - "bin" - "dev" - "out" - ]; -} diff --git a/pkgs/desktops/plasma-5/plasma-firewall.nix b/pkgs/desktops/plasma-5/plasma-firewall.nix deleted file mode 100644 index 2f19a9c86789..000000000000 --- a/pkgs/desktops/plasma-5/plasma-firewall.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ - mkDerivation, - extra-cmake-modules, - python3, - plasma-framework, - kcmutils, -}: -mkDerivation { - pname = "plasma-firewall"; - - outputs = [ "out" ]; - - nativeBuildInputs = [ - extra-cmake-modules - ]; - - buildInputs = [ - kcmutils - plasma-framework - python3 - ]; -} diff --git a/pkgs/desktops/plasma-5/plasma-integration/default.nix b/pkgs/desktops/plasma-5/plasma-integration/default.nix deleted file mode 100644 index 79390b6ed53c..000000000000 --- a/pkgs/desktops/plasma-5/plasma-integration/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ - mkDerivation, - extra-cmake-modules, - wayland-scanner, - breeze-qt5, - kconfig, - kconfigwidgets, - kiconthemes, - kio, - knotifications, - kwayland, - libXcursor, - qtquickcontrols2, - wayland, - wayland-protocols, - plasma-wayland-protocols, -}: - -# TODO: install Noto Sans and Oxygen Mono fonts with plasma-integration - -mkDerivation { - pname = "plasma-integration"; - nativeBuildInputs = [ - extra-cmake-modules - wayland-scanner - ]; - buildInputs = [ - breeze-qt5 - kconfig - kconfigwidgets - kiconthemes - kio - knotifications - kwayland - libXcursor - qtquickcontrols2 - wayland - wayland-protocols - plasma-wayland-protocols - ]; - - meta = { - description = "Set of plugins responsible for better integration of Qt applications when running on a KDE Plasma workspace"; - homepage = "https://invent.kde.org/plasma/plasma-integration"; - }; -} diff --git a/pkgs/desktops/plasma-5/plasma-mobile/default.nix b/pkgs/desktops/plasma-5/plasma-mobile/default.nix deleted file mode 100644 index 90acebb762c5..000000000000 --- a/pkgs/desktops/plasma-5/plasma-mobile/default.nix +++ /dev/null @@ -1,80 +0,0 @@ -{ - mkDerivation, - extra-cmake-modules, - kdoctools, - libdbusmenu, - pam, - wayland, - appstream, - kdeclarative, - kdelibs4support, - kpeople, - kconfig, - krunner, - kinit, - kirigami-addons, - kwayland, - kwin, - plasma-framework, - telepathy, - libphonenumber, - protobuf, - libqofono, - modemmanager-qt, - networkmanager-qt, - plasma-workspace, - maliit-framework, - maliit-keyboard, - qtfeedback, - qttools, -}: - -mkDerivation { - pname = "plasma-mobile"; - - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - appstream - libdbusmenu - pam - wayland - kdeclarative - kdelibs4support - kpeople - kconfig - krunner - kinit - kirigami-addons - kwayland - kwin - plasma-framework - telepathy - libphonenumber - protobuf - libqofono - modemmanager-qt - networkmanager-qt - maliit-framework - maliit-keyboard - plasma-workspace - qtfeedback - ]; - - postPatch = '' - substituteInPlace bin/startplasmamobile.in \ - --replace @KDE_INSTALL_FULL_LIBEXECDIR@ "${plasma-workspace}/libexec" - - substituteInPlace bin/plasma-mobile.desktop.cmake \ - --replace @CMAKE_INSTALL_FULL_LIBEXECDIR@ "${plasma-workspace}/libexec" - ''; - - # Ensures dependencies like libqofono (at the very least) are present for the shell. - preFixup = '' - wrapQtApp "$out/bin/startplasmamobile" - ''; - - passthru.providedSessions = [ "plasma-mobile" ]; -} diff --git a/pkgs/desktops/plasma-5/plasma-nano/default.nix b/pkgs/desktops/plasma-5/plasma-nano/default.nix deleted file mode 100644 index f66163104d61..000000000000 --- a/pkgs/desktops/plasma-5/plasma-nano/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ - mkDerivation, - extra-cmake-modules, - plasma-framework, -}: - -mkDerivation { - pname = "plasma-nano"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - plasma-framework - ]; -} diff --git a/pkgs/desktops/plasma-5/plasma-nm/0002-openvpn-binary-path.patch b/pkgs/desktops/plasma-5/plasma-nm/0002-openvpn-binary-path.patch deleted file mode 100644 index c32e73bc2c6c..000000000000 --- a/pkgs/desktops/plasma-5/plasma-nm/0002-openvpn-binary-path.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/vpn/openvpn/openvpnadvancedwidget.cpp b/vpn/openvpn/openvpnadvancedwidget.cpp -index 2f11ba1d..310f11b4 100644 ---- a/vpn/openvpn/openvpnadvancedwidget.cpp -+++ b/vpn/openvpn/openvpnadvancedwidget.cpp -@@ -75,7 +75,7 @@ OpenVpnAdvancedWidget::OpenVpnAdvancedWidget(const NetworkManager::VpnSetting::P - connect(m_ui->cmbProxyType, static_cast(&QComboBox::currentIndexChanged), this, &OpenVpnAdvancedWidget::proxyTypeChanged); - - // start openVPN process and get its cipher list -- const QString openVpnBinary = QStandardPaths::findExecutable("openvpn", QStringList{"/sbin", "/usr/sbin"}); -+ const QString openVpnBinary = "@openvpn@/bin/openvpn"; - const QStringList ciphersArgs(QLatin1String("--show-ciphers")); - const QStringList versionArgs(QLatin1String("--version")); - diff --git a/pkgs/desktops/plasma-5/plasma-nm/default.nix b/pkgs/desktops/plasma-5/plasma-nm/default.nix deleted file mode 100644 index 55818dffbe25..000000000000 --- a/pkgs/desktops/plasma-5/plasma-nm/default.nix +++ /dev/null @@ -1,82 +0,0 @@ -{ - mkDerivation, - replaceVars, - extra-cmake-modules, - kdoctools, - kcmutils, - kcompletion, - kconfigwidgets, - kcoreaddons, - kdbusaddons, - kdeclarative, - ki18n, - kiconthemes, - kinit, - kio, - kitemviews, - knotifications, - kservice, - kwallet, - kwidgetsaddons, - kwindowsystem, - kxmlgui, - plasma-framework, - prison, - solid, - mobile-broadband-provider-info, - openconnect, - openvpn, - modemmanager-qt, - networkmanager-qt, - qca-qt5, - qtdeclarative, - qttools, -}: - -mkDerivation { - pname = "plasma-nm"; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - qttools - ]; - buildInputs = [ - kdeclarative - ki18n - kio - kwindowsystem - plasma-framework - kcompletion - kcmutils - kconfigwidgets - kcoreaddons - kdbusaddons - kiconthemes - kinit - kitemviews - knotifications - kservice - kwallet - kwidgetsaddons - kxmlgui - prison - solid - - qtdeclarative - modemmanager-qt - networkmanager-qt - qca-qt5 - mobile-broadband-provider-info - openconnect - ]; - - cmakeFlags = [ - "-DBUILD_MOBILE=ON" - ]; - - patches = [ - (replaceVars ./0002-openvpn-binary-path.patch { - inherit openvpn; - }) - ]; -} diff --git a/pkgs/desktops/plasma-5/plasma-pa.nix b/pkgs/desktops/plasma-5/plasma-pa.nix deleted file mode 100644 index 7b37c98f8337..000000000000 --- a/pkgs/desktops/plasma-5/plasma-pa.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ - mkDerivation, - extra-cmake-modules, - kdoctools, - kcmutils, - kconfigwidgets, - kcoreaddons, - kdeclarative, - kglobalaccel, - ki18n, - kwindowsystem, - plasma-framework, - qtbase, - qtdeclarative, - glib, - libcanberra-gtk3, - libpulseaudio, - sound-theme-freedesktop, -}: - -mkDerivation { - pname = "plasma-pa"; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - glib - libcanberra-gtk3 - libpulseaudio - sound-theme-freedesktop - - kcmutils - kconfigwidgets - kcoreaddons - kdeclarative - kglobalaccel - ki18n - plasma-framework - kwindowsystem - - qtbase - qtdeclarative - ]; -} diff --git a/pkgs/desktops/plasma-5/plasma-remotecontrollers.nix b/pkgs/desktops/plasma-5/plasma-remotecontrollers.nix deleted file mode 100644 index 1e6b4b2707d4..000000000000 --- a/pkgs/desktops/plasma-5/plasma-remotecontrollers.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ - mkDerivation, - extra-cmake-modules, - kconfig, - knotifications, - ki18n, - solid, - kcoreaddons, - kdeclarative, - kcmutils, - kpackage, - kscreenlocker, - kwindowsystem, - udevCheckHook, - wayland, - wayland-scanner, - pkg-config, - libcec, - libcec_platform, - libevdev, - plasma-workspace, - plasma-wayland-protocols, -}: -mkDerivation { - pname = "plasma-remotecontrollers"; - nativeBuildInputs = [ - extra-cmake-modules - pkg-config - udevCheckHook - wayland-scanner - ]; - buildInputs = [ - kconfig - knotifications - ki18n - solid - kcoreaddons - kdeclarative - kcmutils - kpackage - kscreenlocker - kwindowsystem - wayland - libcec - libcec_platform - libevdev - plasma-workspace - plasma-wayland-protocols - ]; - doInstallCheck = true; -} diff --git a/pkgs/desktops/plasma-5/plasma-sdk.nix b/pkgs/desktops/plasma-5/plasma-sdk.nix deleted file mode 100644 index 465284aca798..000000000000 --- a/pkgs/desktops/plasma-5/plasma-sdk.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ - mkDerivation, - extra-cmake-modules, - karchive, - kcompletion, - kconfig, - kconfigwidgets, - kcoreaddons, - kdbusaddons, - kdeclarative, - ki18n, - kiconthemes, - kio, - kitemmodels, - plasma-framework, - kservice, - ktexteditor, - kwidgetsaddons, - kdoctools, -}: - -mkDerivation { - pname = "plasma-sdk"; - - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - karchive - kcompletion - kconfig - kconfigwidgets - kcoreaddons - kdbusaddons - kdeclarative - ki18n - kiconthemes - kio - kitemmodels - plasma-framework - kservice - ktexteditor - kwidgetsaddons - ]; -} diff --git a/pkgs/desktops/plasma-5/plasma-systemmonitor.nix b/pkgs/desktops/plasma-5/plasma-systemmonitor.nix deleted file mode 100644 index a9d9e9f1596c..000000000000 --- a/pkgs/desktops/plasma-5/plasma-systemmonitor.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ - mkDerivation, - extra-cmake-modules, - kdoctools, - qtquickcontrols2, - kconfig, - kcoreaddons, - ki18n, - kiconthemes, - kitemmodels, - kitemviews, - knewstuff, - libksysguard, - kquickcharts, - ksystemstats, - qqc2-desktop-style, - qtbase, -}: - -mkDerivation { - pname = "plasma-systemmonitor"; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - qtquickcontrols2 - kconfig - kcoreaddons - ki18n - kitemmodels - kitemviews - knewstuff - kiconthemes - libksysguard - kquickcharts - ksystemstats - qqc2-desktop-style - ]; -} diff --git a/pkgs/desktops/plasma-5/plasma-thunderbolt.nix b/pkgs/desktops/plasma-5/plasma-thunderbolt.nix deleted file mode 100644 index f9908439e992..000000000000 --- a/pkgs/desktops/plasma-5/plasma-thunderbolt.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ - mkDerivation, - extra-cmake-modules, - kcmutils, - kcoreaddons, - bolt, -}: - -mkDerivation { - pname = "plasma-thunderbolt"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - kcmutils - kcoreaddons - bolt - ]; -} diff --git a/pkgs/desktops/plasma-5/plasma-vault/0001-encfs-path.patch b/pkgs/desktops/plasma-5/plasma-vault/0001-encfs-path.patch deleted file mode 100644 index a5e9d8c531e1..000000000000 --- a/pkgs/desktops/plasma-5/plasma-vault/0001-encfs-path.patch +++ /dev/null @@ -1,31 +0,0 @@ -From fef6bfe87db4411e3dda2f96741cd8204fe41d85 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Tue, 2 Nov 2021 05:57:50 -0500 -Subject: [PATCH 1/3] encfs path - ---- - kded/engine/backends/encfs/encfsbackend.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/kded/engine/backends/encfs/encfsbackend.cpp b/kded/engine/backends/encfs/encfsbackend.cpp -index 2d15fa2..3f49867 100644 ---- a/kded/engine/backends/encfs/encfsbackend.cpp -+++ b/kded/engine/backends/encfs/encfsbackend.cpp -@@ -101,12 +101,12 @@ QProcess *EncFsBackend::encfs(const QStringList &arguments) const - auto config = KSharedConfig::openConfig(PLASMAVAULT_CONFIG_FILE); - KConfigGroup backendConfig(config, "EncfsBackend"); - -- return process("encfs", arguments + backendConfig.readEntry("extraMountOptions", QStringList{}), {}); -+ return process(NIXPKGS_ENCFS, arguments + backendConfig.readEntry("extraMountOptions", QStringList{}), {}); - } - - QProcess *EncFsBackend::encfsctl(const QStringList &arguments) const - { -- return process("encfsctl", arguments, {}); -+ return process(NIXPKGS_ENCFSCTL, arguments, {}); - } - - } // namespace PlasmaVault --- -2.33.1 - diff --git a/pkgs/desktops/plasma-5/plasma-vault/0002-cryfs-path.patch b/pkgs/desktops/plasma-5/plasma-vault/0002-cryfs-path.patch deleted file mode 100644 index 4c7567b15076..000000000000 --- a/pkgs/desktops/plasma-5/plasma-vault/0002-cryfs-path.patch +++ /dev/null @@ -1,25 +0,0 @@ -From a89a0d3f9088d272c01ccb9b730d1dbb500f9cb8 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Tue, 2 Nov 2021 05:59:34 -0500 -Subject: [PATCH 2/3] cryfs path - ---- - kded/engine/backends/cryfs/cryfsbackend.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/kded/engine/backends/cryfs/cryfsbackend.cpp b/kded/engine/backends/cryfs/cryfsbackend.cpp -index 64138b6..1a9fde2 100644 ---- a/kded/engine/backends/cryfs/cryfsbackend.cpp -+++ b/kded/engine/backends/cryfs/cryfsbackend.cpp -@@ -207,7 +207,7 @@ QProcess *CryFsBackend::cryfs(const QStringList &arguments) const - auto config = KSharedConfig::openConfig(PLASMAVAULT_CONFIG_FILE); - KConfigGroup backendConfig(config, "CryfsBackend"); - -- return process("cryfs", arguments + backendConfig.readEntry("extraMountOptions", QStringList{}), {{"CRYFS_FRONTEND", "noninteractive"}}); -+ return process(NIXPKGS_CRYFS, arguments + backendConfig.readEntry("extraMountOptions", QStringList{}), {{"CRYFS_FRONTEND", "noninteractive"}}); - } - - } // namespace PlasmaVault --- -2.33.1 - diff --git a/pkgs/desktops/plasma-5/plasma-vault/0003-fusermount-path.patch b/pkgs/desktops/plasma-5/plasma-vault/0003-fusermount-path.patch deleted file mode 100644 index 0d4481c70541..000000000000 --- a/pkgs/desktops/plasma-5/plasma-vault/0003-fusermount-path.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 63571e28c65935f32567c0b179a096d62726b778 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Tue, 2 Nov 2021 06:00:32 -0500 -Subject: [PATCH 3/3] fusermount path - ---- - kded/engine/fusebackend_p.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/kded/engine/fusebackend_p.cpp b/kded/engine/fusebackend_p.cpp -index 91f3523..1c19d88 100644 ---- a/kded/engine/fusebackend_p.cpp -+++ b/kded/engine/fusebackend_p.cpp -@@ -86,7 +86,7 @@ QProcess *FuseBackend::process(const QString &executable, const QStringList &arg - - QProcess *FuseBackend::fusermount(const QStringList &arguments) const - { -- return process("fusermount", arguments, {}); -+ return process(NIXPKGS_FUSERMOUNT, arguments, {}); - } - - FutureResult<> FuseBackend::initialize(const QString &name, const Device &device, const MountPoint &mountPoint, const Vault::Payload &payload) --- -2.33.1 - diff --git a/pkgs/desktops/plasma-5/plasma-vault/0004-gocryptfs-path.patch b/pkgs/desktops/plasma-5/plasma-vault/0004-gocryptfs-path.patch deleted file mode 100644 index 8790f877ff07..000000000000 --- a/pkgs/desktops/plasma-5/plasma-vault/0004-gocryptfs-path.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/kded/engine/backends/gocryptfs/gocryptfsbackend.cpp b/kded/engine/backends/gocryptfs/gocryptfsbackend.cpp -index 2d6df94..3e8ec9a 100644 ---- a/kded/engine/backends/gocryptfs/gocryptfsbackend.cpp -+++ b/kded/engine/backends/gocryptfs/gocryptfsbackend.cpp -@@ -202,7 +202,7 @@ QProcess *GocryptfsBackend::gocryptfs(const QStringList &arguments) const - auto config = KSharedConfig::openConfig(PLASMAVAULT_CONFIG_FILE); - KConfigGroup backendConfig(config, "GocryptfsBackend"); - -- return process("gocryptfs", arguments + backendConfig.readEntry("extraMountOptions", QStringList{}), {}); -+ return process(NIXPKGS_GOCRYPTFS, arguments + backendConfig.readEntry("extraMountOptions", QStringList{}), {}); - } - - QString GocryptfsBackend::getConfigFilePath(const Device &device) const diff --git a/pkgs/desktops/plasma-5/plasma-vault/default.nix b/pkgs/desktops/plasma-5/plasma-vault/default.nix deleted file mode 100644 index 20408af392a9..000000000000 --- a/pkgs/desktops/plasma-5/plasma-vault/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - kactivities, - plasma-framework, - kwindowsystem, - networkmanager-qt, - libksysguard, - encfs, - cryfs, - fuse, - gocryptfs, -}: - -mkDerivation { - pname = "plasma-vault"; - nativeBuildInputs = [ extra-cmake-modules ]; - - patches = [ - ./0001-encfs-path.patch - ./0002-cryfs-path.patch - ./0003-fusermount-path.patch - ./0004-gocryptfs-path.patch - ]; - - buildInputs = [ - kactivities - plasma-framework - kwindowsystem - libksysguard - networkmanager-qt - ]; - - CXXFLAGS = [ - ''-DNIXPKGS_ENCFS=\"${lib.getBin encfs}/bin/encfs\"'' - ''-DNIXPKGS_ENCFSCTL=\"${lib.getBin encfs}/bin/encfsctl\"'' - ''-DNIXPKGS_CRYFS=\"${lib.getBin cryfs}/bin/cryfs\"'' - ''-DNIXPKGS_FUSERMOUNT=\"${lib.getBin fuse}/bin/fusermount\"'' - ''-DNIXPKGS_GOCRYPTFS=\"${lib.getBin gocryptfs}/bin/gocryptfs\"'' - ]; - -} diff --git a/pkgs/desktops/plasma-5/plasma-welcome.nix b/pkgs/desktops/plasma-5/plasma-welcome.nix deleted file mode 100644 index 219db4ea756b..000000000000 --- a/pkgs/desktops/plasma-5/plasma-welcome.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ - mkDerivation, - extra-cmake-modules, - qtquickcontrols2, - accounts-qt, - kaccounts-integration, - kcoreaddons, - kconfigwidgets, - kdbusaddons, - kdeclarative, - ki18n, - kio, - kirigami2, - knewstuff, - knotifications, - kservice, - kuserfeedback, - kwindowsystem, - plasma-framework, - signond, -}: - -mkDerivation { - pname = "plasma-welcome"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - qtquickcontrols2 - accounts-qt - kaccounts-integration - kcoreaddons - kconfigwidgets - kdbusaddons - kdeclarative - ki18n - kio - kirigami2 - knewstuff - knotifications - kservice - kuserfeedback - kwindowsystem - plasma-framework - signond - ]; -} diff --git a/pkgs/desktops/plasma-5/plasma-workspace-wallpapers.nix b/pkgs/desktops/plasma-5/plasma-workspace-wallpapers.nix deleted file mode 100644 index 799973c21538..000000000000 --- a/pkgs/desktops/plasma-5/plasma-workspace-wallpapers.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ mkDerivation, extra-cmake-modules }: - -mkDerivation { - pname = "plasma-workspace-wallpapers"; - nativeBuildInputs = [ extra-cmake-modules ]; -} diff --git a/pkgs/desktops/plasma-5/plasma-workspace/0001-startkde.patch b/pkgs/desktops/plasma-5/plasma-workspace/0001-startkde.patch deleted file mode 100644 index 6a33742dad86..000000000000 --- a/pkgs/desktops/plasma-5/plasma-workspace/0001-startkde.patch +++ /dev/null @@ -1,74 +0,0 @@ -diff --git a/kcms/krdb/krdb.cpp b/kcms/krdb/krdb.cpp -index 46363ddcb..d787f9993 100644 ---- a/kcms/krdb/krdb.cpp -+++ b/kcms/krdb/krdb.cpp -@@ -468,7 +468,7 @@ void runRdb(unsigned int flags) - proc.execute(); - - // Needed for applications that don't set their own cursor. -- QProcess::execute(QStringLiteral("xsetroot"), {QStringLiteral("-cursor_name"), QStringLiteral("left_ptr")}); -+ QProcess::execute(QStringLiteral(NIXPKGS_XSETROOT), {QStringLiteral("-cursor_name"), QStringLiteral("left_ptr")}); - - applyGtkStyles(1); - applyGtkStyles(2); -diff --git a/startkde/plasma-session/startup.cpp b/startkde/plasma-session/startup.cpp -index ffec07ebf..11e70fef8 100644 ---- a/startkde/plasma-session/startup.cpp -+++ b/startkde/plasma-session/startup.cpp -@@ -176,7 +176,7 @@ Startup::Startup(QObject *parent) - } - - // Keep for KF5; remove in KF6 (KInit will be gone then) -- QProcess::execute(QStringLiteral(CMAKE_INSTALL_FULL_LIBEXECDIR_KF5 "/start_kdeinit_wrapper"), QStringList()); -+ QProcess::execute(QStringLiteral(NIXPKGS_START_KDEINIT_WRAPPER), QStringList()); - - KJob *phase1 = nullptr; - m_lock.reset(new QEventLoopLocker); -diff --git a/startkde/startplasma-wayland.cpp b/startkde/startplasma-wayland.cpp -index 04875c358..5822af37c 100644 ---- a/startkde/startplasma-wayland.cpp -+++ b/startkde/startplasma-wayland.cpp -@@ -89,7 +89,7 @@ int main(int argc, char **argv) - out << "startplasma-wayland: Shutting down...\n"; - - // Keep for KF5; remove in KF6 (KInit will be gone then) -- runSync(QStringLiteral("kdeinit5_shutdown"), {}); -+ runSync(QStringLiteral(NIXPKGS_KDEINIT5_SHUTDOWN), {}); - - out << "startplasmacompositor: Shutting down...\n"; - cleanupPlasmaEnvironment(oldSystemdEnvironment); -diff --git a/startkde/startplasma-x11.cpp b/startkde/startplasma-x11.cpp -index 8e82e29c3..1ed176706 100644 ---- a/startkde/startplasma-x11.cpp -+++ b/startkde/startplasma-x11.cpp -@@ -87,7 +87,7 @@ int main(int argc, char **argv) - out << "startkde: Shutting down...\n"; - - // Keep for KF5; remove in KF6 (KInit will be gone then) -- runSync(QStringLiteral("kdeinit5_shutdown"), {}); -+ runSync(QStringLiteral(NIXPKGS_KDEINIT5_SHUTDOWN), {}); - - cleanupPlasmaEnvironment(oldSystemdEnvironment); - -diff --git a/startkde/startplasma.cpp b/startkde/startplasma.cpp -index b0158c97d..c8f7fe223 100644 ---- a/startkde/startplasma.cpp -+++ b/startkde/startplasma.cpp -@@ -50,7 +50,7 @@ void sigtermHandler(int signalNumber) - void messageBox(const QString &text) - { - out << text; -- runSync(QStringLiteral("xmessage"), {QStringLiteral("-geometry"), QStringLiteral("500x100"), text}); -+ runSync(QStringLiteral(NIXPKGS_XMESSAGE), {QStringLiteral("-geometry"), QStringLiteral("500x100"), text}); - } - - QStringList allServices(const QLatin1String &prefix) -@@ -484,7 +484,7 @@ QProcess *setupKSplash() - if (ksplashCfg.readEntry("Engine", QStringLiteral("KSplashQML")) == QLatin1String("KSplashQML")) { - p = new QProcess; - p->setProcessChannelMode(QProcess::ForwardedChannels); -- p->start(QStringLiteral("ksplashqml"), {ksplashCfg.readEntry("Theme", QStringLiteral("Breeze"))}); -+ p->start(QStringLiteral(CMAKE_INSTALL_FULL_BINDIR "/ksplashqml"), {ksplashCfg.readEntry("Theme", QStringLiteral("Breeze"))}); - } - } - return p; diff --git a/pkgs/desktops/plasma-5/plasma-workspace/0002-absolute-wallpaper-install-dir.patch b/pkgs/desktops/plasma-5/plasma-workspace/0002-absolute-wallpaper-install-dir.patch deleted file mode 100644 index 45c9f695b452..000000000000 --- a/pkgs/desktops/plasma-5/plasma-workspace/0002-absolute-wallpaper-install-dir.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- a/lookandfeel/sddm-theme/theme.conf.cmake -+++ b/lookandfeel/sddm-theme/theme.conf.cmake -@@ -4,5 +4,5 @@ logo=${KDE_INSTALL_FULL_DATADIR}/sddm/themes/breeze/default-logo.svg - type=image - color=#1d99f3 - fontSize=10 --background=${KDE_INSTALL_FULL_WALLPAPERDIR}/Next/contents/images/5120x2880.png -+background=${NIXPKGS_BREEZE_WALLPAPERS}/Next/contents/images/5120x2880.png - needsFullUserModel=false diff --git a/pkgs/desktops/plasma-5/plasma-workspace/default.nix b/pkgs/desktops/plasma-5/plasma-workspace/default.nix deleted file mode 100644 index 41263142c5bd..000000000000 --- a/pkgs/desktops/plasma-5/plasma-workspace/default.nix +++ /dev/null @@ -1,191 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - kdoctools, - wayland-scanner, - isocodes, - libdbusmenu, - libSM, - libXcursor, - libXtst, - libXft, - pam, - wayland, - xmessage, - xsetroot, - baloo, - breeze-qt5, - kactivities, - kactivities-stats, - kcmutils, - kconfig, - kcrash, - kdbusaddons, - kdeclarative, - kdelibs4support, - kdesu, - kglobalaccel, - kidletime, - kinit, - kjsembed, - knewstuff, - knotifyconfig, - kpackage, - kpeople, - krunner, - kscreenlocker, - ktexteditor, - ktextwidgets, - kwallet, - kwayland, - kwin, - kxmlrpcclient, - libkscreen, - libksysguard, - libqalculate, - networkmanager-qt, - phonon, - plasma-framework, - prison, - solid, - kholidays, - kquickcharts, - appstream-qt, - plasma-wayland-protocols, - kpipewire, - libkexiv2, - kuserfeedback, - qtgraphicaleffects, - qtquickcontrols, - qtquickcontrols2, - qtscript, - qttools, - qtwayland, - qtx11extras, - qqc2-desktop-style, - polkit-qt, - pipewire, - libdrm, - fetchpatch, -}: - -let - inherit (lib) getBin getLib; -in - -mkDerivation { - pname = "plasma-workspace"; - passthru.providedSessions = [ - "plasma" - "plasmawayland" - ]; - - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - wayland-scanner - ]; - buildInputs = [ - isocodes - libdbusmenu - libSM - libXcursor - libXtst - libXft - pam - wayland - - baloo - kactivities - kactivities-stats - kcmutils - kconfig - kcrash - kdbusaddons - kdeclarative - kdelibs4support - kdesu - kglobalaccel - kidletime - kjsembed - knewstuff - knotifyconfig - kpackage - kpeople - krunner - kscreenlocker - ktexteditor - ktextwidgets - kwallet - kwayland - kwin - kxmlrpcclient - libkscreen - libksysguard - libqalculate - networkmanager-qt - phonon - plasma-framework - prison - solid - kholidays - kquickcharts - appstream-qt - plasma-wayland-protocols - kpipewire - libkexiv2 - - kuserfeedback - qtgraphicaleffects - qtquickcontrols - qtquickcontrols2 - qtscript - qtwayland - qtx11extras - qqc2-desktop-style - polkit-qt - - pipewire - libdrm - ]; - propagatedUserEnvPkgs = [ qtgraphicaleffects ]; - outputs = [ - "out" - "dev" - ]; - - cmakeFlags = [ - ''-DNIXPKGS_BREEZE_WALLPAPERS=${getBin breeze-qt5}/share/wallpapers'' - ]; - - patches = [ - ./0001-startkde.patch - ./0002-absolute-wallpaper-install-dir.patch - - # Backport patch for cleaner shutdowns - (fetchpatch { - url = "https://invent.kde.org/plasma/plasma-workspace/-/commit/6ce8f434139f47e6a71bf0b68beae92be8845ce4.patch"; - hash = "sha256-cYw/4/9tSnCbArLr72O8F8V0NLkVXdCVnJGoGxSzZMg="; - }) - ]; - - # QT_INSTALL_BINS refers to qtbase, and qdbus is in qttools - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace 'ecm_query_qt(QtBinariesDir QT_INSTALL_BINS)' 'set(QtBinariesDir "${lib.getBin qttools}/bin")' - ''; - - # work around wrapQtAppsHook double-wrapping kcminit_startup, - # which is a symlink to kcminit - postFixup = '' - ln -sf $out/bin/kcminit $out/bin/kcminit_startup - ''; - - env.NIX_CFLAGS_COMPILE = toString [ - ''-DNIXPKGS_XMESSAGE="${getBin xmessage}/bin/xmessage"'' - ''-DNIXPKGS_XSETROOT="${getBin xsetroot}/bin/xsetroot"'' - ''-DNIXPKGS_START_KDEINIT_WRAPPER="${getLib kinit}/libexec/kf5/start_kdeinit_wrapper"'' - ''-DNIXPKGS_KDEINIT5_SHUTDOWN="${getBin kinit}/bin/kdeinit5_shutdown"'' - ]; -} diff --git a/pkgs/desktops/plasma-5/polkit-kde-agent.nix b/pkgs/desktops/plasma-5/polkit-kde-agent.nix deleted file mode 100644 index 5f35fc7e4cac..000000000000 --- a/pkgs/desktops/plasma-5/polkit-kde-agent.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ - mkDerivation, - extra-cmake-modules, - kcoreaddons, - kconfig, - kcrash, - kdbusaddons, - ki18n, - kiconthemes, - knotifications, - kwidgetsaddons, - kwindowsystem, - polkit-qt, -}: - -mkDerivation { - pname = "polkit-kde-agent"; - nativeBuildInputs = [ extra-cmake-modules ]; - propagatedBuildInputs = [ - kdbusaddons - kwidgetsaddons - kcoreaddons - kcrash - kconfig - ki18n - kiconthemes - knotifications - kwindowsystem - polkit-qt - ]; - outputs = [ - "out" - "dev" - ]; -} diff --git a/pkgs/desktops/plasma-5/powerdevil.nix b/pkgs/desktops/plasma-5/powerdevil.nix deleted file mode 100644 index fe24fdf01f09..000000000000 --- a/pkgs/desktops/plasma-5/powerdevil.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ - mkDerivation, - extra-cmake-modules, - kdoctools, - bluez-qt, - kactivities, - kauth, - kconfig, - kdbusaddons, - kglobalaccel, - ki18n, - kidletime, - kio, - knotifyconfig, - kwayland, - libkscreen, - networkmanager-qt, - plasma-workspace, - qtx11extras, - solid, - udev, -}: - -mkDerivation { - pname = "powerdevil"; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - kconfig - kdbusaddons - knotifyconfig - solid - udev - bluez-qt - kactivities - kauth - kglobalaccel - ki18n - kio - kidletime - kwayland - libkscreen - networkmanager-qt - plasma-workspace - qtx11extras - ]; -} diff --git a/pkgs/desktops/plasma-5/qqc2-breeze-style.nix b/pkgs/desktops/plasma-5/qqc2-breeze-style.nix deleted file mode 100644 index 36bd9382ad1d..000000000000 --- a/pkgs/desktops/plasma-5/qqc2-breeze-style.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ - mkDerivation, - extra-cmake-modules, - kconfig, - kconfigwidgets, - kdoctools, - kguiaddons, - kiconthemes, - kirigami2, - qtquickcontrols2, - qtx11extras, -}: - -mkDerivation { - pname = "qqc2-breeze-style"; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - kconfig - kconfigwidgets - kguiaddons - kiconthemes - kirigami2 - qtquickcontrols2 - qtx11extras - ]; -} diff --git a/pkgs/desktops/plasma-5/sddm-kcm.nix b/pkgs/desktops/plasma-5/sddm-kcm.nix deleted file mode 100644 index a89ba50418e4..000000000000 --- a/pkgs/desktops/plasma-5/sddm-kcm.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ - mkDerivation, - extra-cmake-modules, - shared-mime-info, - libpthreadstubs, - libXcursor, - libXdmcp, - qtquickcontrols2, - qtx11extras, - karchive, - kcmutils, - kdeclarative, - ki18n, - kio, - knewstuff, -}: - -mkDerivation { - pname = "sddm-kcm"; - nativeBuildInputs = [ - extra-cmake-modules - shared-mime-info - ]; - buildInputs = [ - libpthreadstubs - libXcursor - libXdmcp - qtquickcontrols2 - qtx11extras - karchive - kcmutils - kdeclarative - ki18n - kio - knewstuff - ]; -} diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix deleted file mode 100644 index be39fe59556e..000000000000 --- a/pkgs/desktops/plasma-5/srcs.nix +++ /dev/null @@ -1,486 +0,0 @@ -# DO NOT EDIT! This file is generated automatically. -# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/desktops/plasma-5/ -{ fetchurl, mirror }: - -{ - aura-browser = { - version = "5.27.11"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.27.11/aura-browser-5.27.11.tar.xz"; - sha256 = "098s0r3lr5svdysc93nvv8xqj3dlslly733hf8pz1nlp621dhx7k"; - name = "aura-browser-5.27.11.tar.xz"; - }; - }; - bluedevil = { - version = "5.27.11"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.27.11/bluedevil-5.27.11.tar.xz"; - sha256 = "1134pm16db70h79q55c9ir1d1amqscdd8bvkf92nmmk6s2zsimdl"; - name = "bluedevil-5.27.11.tar.xz"; - }; - }; - breeze = { - version = "5.27.11"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.27.11/breeze-5.27.11.tar.xz"; - sha256 = "1ascvlkycbn4h0bi2cdjljnpi3cfp7whvzslm4fb2gdwwlpnlx8l"; - name = "breeze-5.27.11.tar.xz"; - }; - }; - breeze-grub = { - version = "5.27.11"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.27.11/breeze-grub-5.27.11.tar.xz"; - sha256 = "03l6lpqj1fp2645qy23fcngfzwzhdgyj3xw563gx3gcgqwrc84h6"; - name = "breeze-grub-5.27.11.tar.xz"; - }; - }; - breeze-gtk = { - version = "5.27.11"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.27.11/breeze-gtk-5.27.11.tar.xz"; - sha256 = "1vkzyv65m37jg436brscgn61dd6mil50s8jyn2szwka0hyzx7gfw"; - name = "breeze-gtk-5.27.11.tar.xz"; - }; - }; - breeze-plymouth = { - version = "5.27.11"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.27.11/breeze-plymouth-5.27.11.tar.xz"; - sha256 = "16vp6a2bp6s57wb9cb4dhac650m93829xp7q44n172564lz0pn8d"; - name = "breeze-plymouth-5.27.11.tar.xz"; - }; - }; - discover = { - version = "5.27.11"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.27.11/discover-5.27.11.tar.xz"; - sha256 = "0b79x5xfggymxmh0fr45ndc3k3xd2gjryhmy8xd370bd5d964arl"; - name = "discover-5.27.11.tar.xz"; - }; - }; - drkonqi = { - version = "5.27.11"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.27.11/drkonqi-5.27.11.tar.xz"; - sha256 = "0g2q959wswjwpn2vj4mmfy3xr6yj4mch55lr8b2xyd0bxw4vb810"; - name = "drkonqi-5.27.11.tar.xz"; - }; - }; - flatpak-kcm = { - version = "5.27.11"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.27.11/flatpak-kcm-5.27.11.tar.xz"; - sha256 = "0jnzxk9fhpck19k48fw2mcvr5512xnw3jss9c7xp5h27jhml8b4p"; - name = "flatpak-kcm-5.27.11.tar.xz"; - }; - }; - kactivitymanagerd = { - version = "5.27.11"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.27.11/kactivitymanagerd-5.27.11.tar.xz"; - sha256 = "1mawqh3vkbibyjijh5797fzj5ldadzvbmkck23v6s34516rpgfxj"; - name = "kactivitymanagerd-5.27.11.tar.xz"; - }; - }; - kde-cli-tools = { - version = "5.27.11"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.27.11/kde-cli-tools-5.27.11.tar.xz"; - sha256 = "0mc2n91124cxgfhdz6l0x87665q2jamiq14qlzapynjflvzgh9ca"; - name = "kde-cli-tools-5.27.11.tar.xz"; - }; - }; - kde-gtk-config = { - version = "5.27.11"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.27.11/kde-gtk-config-5.27.11.tar.xz"; - sha256 = "02hdy55vp6yvx8p877jdr5l5hs46k1rxrwj90m93m2vv0ysib2d4"; - name = "kde-gtk-config-5.27.11.tar.xz"; - }; - }; - kdecoration = { - version = "5.27.11"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.27.11/kdecoration-5.27.11.tar.xz"; - sha256 = "0f7qy5y0352ib6lqq8fv22y3f5zvfbzm9ydn8li3m4lk3531gi3i"; - name = "kdecoration-5.27.11.tar.xz"; - }; - }; - kdeplasma-addons = { - version = "5.27.11"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.27.11/kdeplasma-addons-5.27.11.tar.xz"; - sha256 = "016dsfg54gyjk4l0qr8s7rdmyhrvf7b2n9nfkx65cb5ja2x6h875"; - name = "kdeplasma-addons-5.27.11.tar.xz"; - }; - }; - kgamma = { - version = "5.27.11"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.27.11/kgamma-5.27.11.tar.xz"; - sha256 = "0y6n2dp0d7snj72vhm63612a5649qscfv7zcgvdmz3mb8h1xhm5n"; - name = "kgamma-5.27.11.tar.xz"; - }; - }; - kgamma5 = { - version = "5.27.11"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.27.11/kgamma5-5.27.11.tar.xz"; - sha256 = "0y6n2dp0d7snj72vhm63612a5649qscfv7zcgvdmz3mb8h1xhm5n"; - name = "kgamma5-5.27.11.tar.xz"; - }; - }; - khotkeys = { - version = "5.27.11"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.27.11/khotkeys-5.27.11.tar.xz"; - sha256 = "0na4h225yrjfivyw3d1c3p2db1djymyz3wahjgmlz1s6wml7qjcb"; - name = "khotkeys-5.27.11.tar.xz"; - }; - }; - kinfocenter = { - version = "5.27.11"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.27.11/kinfocenter-5.27.11.tar.xz"; - sha256 = "01qdyklvr1ff83zlpgysa7qlkzv9m6ff1hjjnxcp007k5cal79r9"; - name = "kinfocenter-5.27.11.tar.xz"; - }; - }; - kmenuedit = { - version = "5.27.11"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.27.11/kmenuedit-5.27.11.tar.xz"; - sha256 = "0mrvqif3k7lsvwn7slmm7b4k27v2km04r7v5jr9dsl865h3dwkch"; - name = "kmenuedit-5.27.11.tar.xz"; - }; - }; - kpipewire = { - version = "5.27.11"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.27.11/kpipewire-5.27.11.tar.xz"; - sha256 = "1h2czy5qz026gqid2klfnqim4j1p5r526vrp44jxrf1fjhj0z6mc"; - name = "kpipewire-5.27.11.tar.xz"; - }; - }; - kscreen = { - version = "5.27.11"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.27.11/kscreen-5.27.11.tar.xz"; - sha256 = "0ly7rd519glhv25a4dsxnnxjizqj6j62gf2kfrbcimg7yj77lzvy"; - name = "kscreen-5.27.11.tar.xz"; - }; - }; - kscreenlocker = { - version = "5.27.11"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.27.11/kscreenlocker-5.27.11.tar.xz"; - sha256 = "1pynfzms3iihfpzhlma7769zaaslk9jnfpgmhx6kah227gmcxf1k"; - name = "kscreenlocker-5.27.11.tar.xz"; - }; - }; - ksshaskpass = { - version = "5.27.11"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.27.11/ksshaskpass-5.27.11.tar.xz"; - sha256 = "1fqrw6n9fggdz6rhg0985s6dg6x2h1a8i9zic5zsv24wnbqvsy4y"; - name = "ksshaskpass-5.27.11.tar.xz"; - }; - }; - ksystemstats = { - version = "5.27.11"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.27.11/ksystemstats-5.27.11.tar.xz"; - sha256 = "1mawh8icgrx18z7dyqzxxikl0z9fq87z5a1hx6ykimcri345z3ip"; - name = "ksystemstats-5.27.11.tar.xz"; - }; - }; - kwallet-pam = { - version = "5.27.11"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.27.11/kwallet-pam-5.27.11.tar.xz"; - sha256 = "0h6qmrl4qa5m4csqvn3rvkvlqi6aa606bnfaxx77kqc65a7vhlvz"; - name = "kwallet-pam-5.27.11.tar.xz"; - }; - }; - kwayland-integration = { - version = "5.27.11"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.27.11/kwayland-integration-5.27.11.tar.xz"; - sha256 = "1dmwd3mw5s67pngb0gd6ki0vfzj0aamkyxiqagn06jkvwsxlfjcb"; - name = "kwayland-integration-5.27.11.tar.xz"; - }; - }; - kwin = { - version = "5.27.11"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.27.11/kwin-5.27.11.tar.xz"; - sha256 = "0vxmj50wran5glgzs3cwpyjk9qwgwnzlmq0gb4kcsm5x54xv40l9"; - name = "kwin-5.27.11.tar.xz"; - }; - }; - kwrited = { - version = "5.27.11"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.27.11/kwrited-5.27.11.tar.xz"; - sha256 = "18f054ya2kkxsivh5pdfl7ja5g26m337bkp65famwd94gsnca487"; - name = "kwrited-5.27.11.tar.xz"; - }; - }; - layer-shell-qt = { - version = "5.27.11"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.27.11/layer-shell-qt-5.27.11.tar.xz"; - sha256 = "0l6kfqg0v5gm4dp9xs5kvhw4ahx45gr8ymp3x7zsxj8r2q4j3hzl"; - name = "layer-shell-qt-5.27.11.tar.xz"; - }; - }; - libkscreen = { - version = "5.27.11"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.27.11/libkscreen-5.27.11.tar.xz"; - sha256 = "1m8xl9z000pjbgk18mpaz8cfpx7prvlfx8p5i0wk0clz90fz848d"; - name = "libkscreen-5.27.11.tar.xz"; - }; - }; - libksysguard = { - version = "5.27.11"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.27.11/libksysguard-5.27.11.tar.xz"; - sha256 = "0ncnrg5g1h7c1w66mks73md3fz5n4axmxw5jb85a3kg8vm6gbx11"; - name = "libksysguard-5.27.11.tar.xz"; - }; - }; - milou = { - version = "5.27.11"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.27.11/milou-5.27.11.tar.xz"; - sha256 = "06iyb2zn19xz837wfz86xz5i3rkfkyvyy6xgywhjknvsvi06k08b"; - name = "milou-5.27.11.tar.xz"; - }; - }; - oxygen = { - version = "5.27.11"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.27.11/oxygen-5.27.11.tar.xz"; - sha256 = "0w7mnh4ds7avv3xdgd4rb6b5612krbpzm8dx3fgpr2yp7c1lfbxs"; - name = "oxygen-5.27.11.tar.xz"; - }; - }; - oxygen-sounds = { - version = "5.27.11"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.27.11/oxygen-sounds-5.27.11.tar.xz"; - sha256 = "1ppikl4b9rldj9d0cgn52vi7jhjrkqkj0blq7c11x52ibb2lk8kg"; - name = "oxygen-sounds-5.27.11.tar.xz"; - }; - }; - plank-player = { - version = "5.27.11"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.27.11/plank-player-5.27.11.tar.xz"; - sha256 = "1sg6zk97qawpmizdykl6q27h5aha6cfj0qcqx4l606mcixf4gskc"; - name = "plank-player-5.27.11.tar.xz"; - }; - }; - plasma-bigscreen = { - version = "5.27.11"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.27.11/plasma-bigscreen-5.27.11.tar.xz"; - sha256 = "0rv0hcff6z6xnxpx10by5mxmi6pm16wsa9akd9nf8m5jbm1b7r43"; - name = "plasma-bigscreen-5.27.11.tar.xz"; - }; - }; - plasma-browser-integration = { - version = "5.27.11"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.27.11/plasma-browser-integration-5.27.11.tar.xz"; - sha256 = "0k0jbhhvmgv1xqw8bz4kn7j1r8d69n1r1mbb1px8ibl6d4famrn4"; - name = "plasma-browser-integration-5.27.11.tar.xz"; - }; - }; - plasma-desktop = { - version = "5.27.11"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.27.11/plasma-desktop-5.27.11.tar.xz"; - sha256 = "18s4zh8z1x0519xlh156xfay865hpyyhf172znvb9rsic9bix7yh"; - name = "plasma-desktop-5.27.11.tar.xz"; - }; - }; - plasma-disks = { - version = "5.27.11"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.27.11/plasma-disks-5.27.11.tar.xz"; - sha256 = "1js1m46bh7hshcqx90b97rc5k9gk9rg4kyqc8h3bs767fbvp9l4q"; - name = "plasma-disks-5.27.11.tar.xz"; - }; - }; - plasma-firewall = { - version = "5.27.11"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.27.11/plasma-firewall-5.27.11.tar.xz"; - sha256 = "01f1429ks9rkh8wsmjw91ryrmifnsxq3q8mxawcwaswiykyykkil"; - name = "plasma-firewall-5.27.11.tar.xz"; - }; - }; - plasma-integration = { - version = "5.27.11"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.27.11/plasma-integration-5.27.11.tar.xz"; - sha256 = "0ydzy1fy6j6ais1y5zgfai6kxhinf8478jcsa7blg43061zsj55j"; - name = "plasma-integration-5.27.11.tar.xz"; - }; - }; - plasma-mobile = { - version = "5.27.11"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.27.11/plasma-mobile-5.27.11.tar.xz"; - sha256 = "167hm5p3bhpnf8c5xn4f4r6grldv31wcfbrpyfvkf4kv94pspsq4"; - name = "plasma-mobile-5.27.11.tar.xz"; - }; - }; - plasma-nano = { - version = "5.27.11"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.27.11/plasma-nano-5.27.11.tar.xz"; - sha256 = "1yrgfhhj6vdc6ppnc8iys1b8wj3mfsf1p9w81d05fy5ka8ykjh0c"; - name = "plasma-nano-5.27.11.tar.xz"; - }; - }; - plasma-nm = { - version = "5.27.11"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.27.11/plasma-nm-5.27.11.tar.xz"; - sha256 = "0mlybqjnx9xgdmdbhzh65is62x8mwy6h8aw21n31g3nlwafq2spz"; - name = "plasma-nm-5.27.11.tar.xz"; - }; - }; - plasma-pa = { - version = "5.27.11"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.27.11/plasma-pa-5.27.11.tar.xz"; - sha256 = "1cr0lywxpidhmn0n62xsf4gs94g723rxv5lwdf26jfqnlwg6gaix"; - name = "plasma-pa-5.27.11.tar.xz"; - }; - }; - plasma-remotecontrollers = { - version = "5.27.11"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.27.11/plasma-remotecontrollers-5.27.11.tar.xz"; - sha256 = "0w77bh27d948sznbs22j5jzlp06711x0g0v3sbm7cy3r6dw7rwsr"; - name = "plasma-remotecontrollers-5.27.11.tar.xz"; - }; - }; - plasma-sdk = { - version = "5.27.11.1"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.27.11/plasma-sdk-5.27.11.1.tar.xz"; - sha256 = "0i073qv2drnjixv7p8kzzq05wggdsj2jdckhz1i46dwsd65s38lh"; - name = "plasma-sdk-5.27.11.1.tar.xz"; - }; - }; - plasma-systemmonitor = { - version = "5.27.11"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.27.11/plasma-systemmonitor-5.27.11.tar.xz"; - sha256 = "1zaxddrjhypf7pc40gyanymf0l5bbdijc3lf5bkl6p8vjaywpjha"; - name = "plasma-systemmonitor-5.27.11.tar.xz"; - }; - }; - plasma-thunderbolt = { - version = "5.27.11"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.27.11/plasma-thunderbolt-5.27.11.tar.xz"; - sha256 = "1yw9bampcbjxqrxiri3ac933gk29rmn2jcfbxqsb5kcb6gbc5rsz"; - name = "plasma-thunderbolt-5.27.11.tar.xz"; - }; - }; - plasma-vault = { - version = "5.27.11"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.27.11/plasma-vault-5.27.11.tar.xz"; - sha256 = "1hkn4a61kwnhscl1cq3nza323p4l513d0c3va70vqa7psxwrsn8b"; - name = "plasma-vault-5.27.11.tar.xz"; - }; - }; - plasma-welcome = { - version = "5.27.11"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.27.11/plasma-welcome-5.27.11.tar.xz"; - sha256 = "02rjm23qqfwnasiqj4ksl4yayg0xijmdxzqqc4f5by17vplcmgng"; - name = "plasma-welcome-5.27.11.tar.xz"; - }; - }; - plasma-workspace = { - version = "5.27.11.1"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.27.11/plasma-workspace-5.27.11.1.tar.xz"; - sha256 = "1bib8z7pmb5mscw2p07mbfsphzpvwsiib84s0g25fz4mma6l4hn7"; - name = "plasma-workspace-5.27.11.1.tar.xz"; - }; - }; - plasma-workspace-wallpapers = { - version = "5.27.11"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.27.11/plasma-workspace-wallpapers-5.27.11.tar.xz"; - sha256 = "02p59m54g453pl3cjx932xpfhz73lc8yq1hxq9pzsyhjd3y2fg12"; - name = "plasma-workspace-wallpapers-5.27.11.tar.xz"; - }; - }; - plymouth-kcm = { - version = "5.27.11"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.27.11/plymouth-kcm-5.27.11.tar.xz"; - sha256 = "1m645zw0vi1zj6sqplc7x23ycwkh9x41nxq413njz5sgmb76k8ig"; - name = "plymouth-kcm-5.27.11.tar.xz"; - }; - }; - polkit-kde-agent = { - version = "1-5.27.11"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.27.11/polkit-kde-agent-1-5.27.11.tar.xz"; - sha256 = "06swprc498fjbk0aw2ac6x4g7sx5whzbaci12nwl068h9y4hisf9"; - name = "polkit-kde-agent-1-5.27.11.tar.xz"; - }; - }; - powerdevil = { - version = "5.27.11"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.27.11/powerdevil-5.27.11.tar.xz"; - sha256 = "0wvmdjrmlphxx2jcabsnqzayz50chvrgxsp5ynw3kgdw0lpapli8"; - name = "powerdevil-5.27.11.tar.xz"; - }; - }; - qqc2-breeze-style = { - version = "5.27.11"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.27.11/qqc2-breeze-style-5.27.11.tar.xz"; - sha256 = "03v1wdl3wq5xn185b28ljj62qggjllw6s8xzi91s0g3sxfvp3fgx"; - name = "qqc2-breeze-style-5.27.11.tar.xz"; - }; - }; - sddm-kcm = { - version = "5.27.11"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.27.11/sddm-kcm-5.27.11.tar.xz"; - sha256 = "1h3lg25hrggwd8f3ivgndwd9vwkvhxh22jgfmsvjxqcv6n0zx6rv"; - name = "sddm-kcm-5.27.11.tar.xz"; - }; - }; - systemsettings = { - version = "5.27.11"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.27.11/systemsettings-5.27.11.tar.xz"; - sha256 = "0jlj3wcf3npwi83yhgczkz116p0fiwvgkwnk39zmdba4kqkj8pqg"; - name = "systemsettings-5.27.11.tar.xz"; - }; - }; - xdg-desktop-portal-kde = { - version = "5.27.11"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.27.11/xdg-desktop-portal-kde-5.27.11.tar.xz"; - sha256 = "1cyr2scjrdvx0x2qcpky7qr5rxxjlsavwvyjwajlfm0l3s5qjxin"; - name = "xdg-desktop-portal-kde-5.27.11.tar.xz"; - }; - }; -} diff --git a/pkgs/desktops/plasma-5/systemsettings.nix b/pkgs/desktops/plasma-5/systemsettings.nix deleted file mode 100644 index 363038744186..000000000000 --- a/pkgs/desktops/plasma-5/systemsettings.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ - mkDerivation, - extra-cmake-modules, - kdoctools, - kcmutils, - kconfig, - kdbusaddons, - khtml, - ki18n, - kiconthemes, - kio, - kitemviews, - kservice, - kwindowsystem, - kxmlgui, - qtquickcontrols, - qtquickcontrols2, - kactivities, - kactivities-stats, - kirigami2, - kirigami-addons, - kcrash, - plasma-workspace, -}: - -mkDerivation { - pname = "systemsettings"; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - kcmutils - kconfig - kdbusaddons - khtml - ki18n - kiconthemes - kio - kitemviews - kservice - kwindowsystem - kxmlgui - qtquickcontrols - qtquickcontrols2 - kactivities - kactivities-stats - kirigami2 - kirigami-addons - kcrash - plasma-workspace - ]; - outputs = [ - "bin" - "dev" - "out" - ]; - meta.mainProgram = "systemsettings5"; -} diff --git a/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix b/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix deleted file mode 100644 index 3e520dd2ef04..000000000000 --- a/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ - mkDerivation, - extra-cmake-modules, - gettext, - kdoctools, - wayland-scanner, - cups, - libepoxy, - libgbm, - pcre, - pipewire, - wayland, - wayland-protocols, - kcoreaddons, - knotifications, - kwayland, - kwidgetsaddons, - kwindowsystem, - kirigami2, - kdeclarative, - plasma-framework, - plasma-wayland-protocols, - plasma-workspace, - kio, - qtbase, -}: - -mkDerivation { - pname = "xdg-desktop-portal-kde"; - nativeBuildInputs = [ - extra-cmake-modules - gettext - kdoctools - wayland-scanner - ]; - buildInputs = [ - cups - libepoxy - libgbm - pcre - pipewire - wayland - wayland-protocols - - kio - kcoreaddons - knotifications - kwayland - kwidgetsaddons - kwindowsystem - kirigami2 - kdeclarative - plasma-framework - plasma-wayland-protocols - plasma-workspace - ]; -} diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index df4ad2874a9f..050efba1c446 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -39,17 +39,6 @@ makeScopeWithSplicing' { in (lib.makeOverridable mkFrameworks attrs); - plasma5 = - let - mkPlasma5 = import ../desktops/plasma-5; - attrs = { - inherit libsForQt5; - inherit (pkgs) config lib fetchurl; - inherit (pkgs) gsettings-desktop-schemas; - }; - in - (lib.makeOverridable mkPlasma5 attrs); - kdeGear = let mkGear = import ../applications/kde; @@ -72,15 +61,12 @@ makeScopeWithSplicing' { in (noExtraAttrs ( kdeFrameworks - // plasma5 - // plasma5.thirdParty // kdeGear // qt5 // { inherit kdeFrameworks - plasma5 kdeGear qt5 ; From 9d94c5649c60e9aa70125f90b06c6a29842549b3 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 12 Aug 2025 19:39:49 +0300 Subject: [PATCH 144/146] kdeGear: drop --- .../kde/akonadi-calendar-tools.nix | 34 - pkgs/applications/kde/akonadi-calendar.nix | 50 - pkgs/applications/kde/akonadi-contacts.nix | 62 - .../kde/akonadi-import-wizard.nix | 55 - pkgs/applications/kde/akonadi-mime.nix | 44 - pkgs/applications/kde/akonadi-notes.nix | 45 - pkgs/applications/kde/akonadi-search.nix | 55 - .../kde/akonadi/0001-akonadi-paths.patch | 190 -- .../kde/akonadi/0002-akonadi-timestamps.patch | 26 - ...0003-akonadi-revert-make-relocatable.patch | 45 - pkgs/applications/kde/akonadi/default.nix | 90 - pkgs/applications/kde/akonadiconsole.nix | 59 - pkgs/applications/kde/akregator.nix | 70 - pkgs/applications/kde/alligator.nix | 47 - pkgs/applications/kde/analitza.nix | 39 - pkgs/applications/kde/angelfish.nix | 80 - pkgs/applications/kde/arianna.nix | 63 - pkgs/applications/kde/ark/default.nix | 96 - pkgs/applications/kde/audiotube.nix | 79 - pkgs/applications/kde/baloo-widgets.nix | 36 - pkgs/applications/kde/bomber.nix | 35 - pkgs/applications/kde/bovo.nix | 33 - pkgs/applications/kde/calendarsupport.nix | 55 - pkgs/applications/kde/calindori.nix | 47 - pkgs/applications/kde/cantor.nix | 131 -- pkgs/applications/kde/colord-kde.nix | 56 - pkgs/applications/kde/default.nix | 284 --- pkgs/applications/kde/dolphin-plugins.nix | 32 - pkgs/applications/kde/dolphin.nix | 82 - pkgs/applications/kde/dragon.nix | 74 - pkgs/applications/kde/elisa.nix | 56 - pkgs/applications/kde/eventviews.nix | 49 - pkgs/applications/kde/falkon.nix | 64 - pkgs/applications/kde/fetch.sh | 1 - pkgs/applications/kde/ffmpegthumbs.nix | 25 - pkgs/applications/kde/filelight.nix | 45 - pkgs/applications/kde/ghostwriter.nix | 56 - pkgs/applications/kde/granatier.nix | 28 - .../kde/grantleetheme/default.nix | 59 - pkgs/applications/kde/gwenview/default.nix | 77 - .../kde/gwenview/kimageannotator.patch | 56 - pkgs/applications/kde/incidenceeditor.nix | 51 - pkgs/applications/kde/juk.nix | 39 - .../kde/kaccounts-integration.nix | 35 - pkgs/applications/kde/kaccounts-providers.nix | 45 - pkgs/applications/kde/kaddressbook.nix | 74 - pkgs/applications/kde/kalarm.nix | 103 - pkgs/applications/kde/kalgebra.nix | 50 - pkgs/applications/kde/kalk.nix | 52 - pkgs/applications/kde/kalzium.nix | 39 - pkgs/applications/kde/kamoso.nix | 60 - pkgs/applications/kde/kapman.nix | 30 - pkgs/applications/kde/kapptemplate.nix | 31 - pkgs/applications/kde/kasts.nix | 83 - pkgs/applications/kde/kate.nix | 87 - pkgs/applications/kde/katomic.nix | 32 - pkgs/applications/kde/kblackbox.nix | 30 - pkgs/applications/kde/kblocks.nix | 30 - pkgs/applications/kde/kbounce.nix | 32 - pkgs/applications/kde/kbreakout.nix | 41 - pkgs/applications/kde/kcachegrind.nix | 45 - pkgs/applications/kde/kcalc.nix | 42 - pkgs/applications/kde/kcalutils.nix | 47 - pkgs/applications/kde/kcharselect.nix | 40 - pkgs/applications/kde/kclock.nix | 47 - pkgs/applications/kde/kcolorchooser.nix | 25 - pkgs/applications/kde/kde-inotify-survey.nix | 32 - pkgs/applications/kde/kdebugsettings.nix | 42 - pkgs/applications/kde/kdeconnect-kde.nix | 87 - .../kde/kdegraphics-mobipocket.nix | 20 - .../kde/kdegraphics-thumbnailers/default.nix | 36 - .../kdegraphics-thumbnailers/gs-paths.patch | 22 - .../kde/kdenetwork-filesharing.nix | 37 - pkgs/applications/kde/kdenlive/default.nix | 124 -- .../kde/kdenlive/dependency-paths.patch | 52 - pkgs/applications/kde/kdepim-addons.nix | 78 - .../kde/kdepim-runtime/default.nix | 88 - pkgs/applications/kde/kdevelop/kdev-php.nix | 35 - .../applications/kde/kdevelop/kdev-python.nix | 38 - .../kde/kdevelop/kdevelop-pg-qt.nix | 42 - pkgs/applications/kde/kdevelop/kdevelop.nix | 145 -- pkgs/applications/kde/kdevelop/wrapper.nix | 12 - pkgs/applications/kde/kdf.nix | 32 - pkgs/applications/kde/kdialog.nix | 34 - pkgs/applications/kde/kdiamond.nix | 34 - pkgs/applications/kde/keditbookmarks.nix | 33 - pkgs/applications/kde/keysmith.nix | 43 - pkgs/applications/kde/kfind.nix | 35 - pkgs/applications/kde/kgeography.nix | 35 - pkgs/applications/kde/kget.nix | 54 - pkgs/applications/kde/kgpg.nix | 66 - pkgs/applications/kde/khelpcenter.nix | 49 - pkgs/applications/kde/kidentitymanagement.nix | 51 - pkgs/applications/kde/kig.nix | 38 - pkgs/applications/kde/kigo.nix | 32 - pkgs/applications/kde/killbots.nix | 30 - pkgs/applications/kde/kimap.nix | 47 - pkgs/applications/kde/kio-admin.nix | 29 - pkgs/applications/kde/kio-extras.nix | 92 - pkgs/applications/kde/kio-gdrive.nix | 37 - pkgs/applications/kde/kipi-plugins.nix | 44 - pkgs/applications/kde/kirigami-gallery.nix | 34 - pkgs/applications/kde/kitinerary.nix | 42 - pkgs/applications/kde/kldap.nix | 49 - pkgs/applications/kde/kleopatra.nix | 56 - pkgs/applications/kde/klettres.nix | 32 - pkgs/applications/kde/klines.nix | 30 - pkgs/applications/kde/kmag.nix | 28 - pkgs/applications/kde/kmahjongg.nix | 31 - .../applications/kde/kmail-account-wizard.nix | 63 - pkgs/applications/kde/kmail.nix | 138 -- pkgs/applications/kde/kmailtransport.nix | 63 - pkgs/applications/kde/kmbox.nix | 39 - pkgs/applications/kde/kmime.nix | 31 - pkgs/applications/kde/kmines.nix | 34 - pkgs/applications/kde/kmix.nix | 41 - pkgs/applications/kde/kmousetool.nix | 42 - pkgs/applications/kde/kmplot.nix | 38 - pkgs/applications/kde/knavalbattle.nix | 32 - pkgs/applications/kde/knetwalk.nix | 30 - pkgs/applications/kde/knights.nix | 34 - pkgs/applications/kde/knotes.nix | 85 - pkgs/applications/kde/koko.nix | 86 - pkgs/applications/kde/kolf.nix | 29 - pkgs/applications/kde/kollision.nix | 30 - pkgs/applications/kde/kolourpaint.nix | 34 - pkgs/applications/kde/kompare.nix | 36 - pkgs/applications/kde/kongress.nix | 37 - pkgs/applications/kde/konqueror.nix | 47 - pkgs/applications/kde/konquest.nix | 41 - pkgs/applications/kde/konsole.nix | 76 - pkgs/applications/kde/kontact.nix | 66 - pkgs/applications/kde/kontactinterface.nix | 39 - pkgs/applications/kde/konversation.nix | 74 - pkgs/applications/kde/kopeninghours.nix | 36 - pkgs/applications/kde/korganizer.nix | 70 - pkgs/applications/kde/kosmindoormap.nix | 42 - pkgs/applications/kde/kpat.nix | 32 - pkgs/applications/kde/kpimtextedit.nix | 59 - pkgs/applications/kde/kpkpass.nix | 28 - pkgs/applications/kde/kpmcore/default.nix | 53 - .../kde/kpmcore/nixostrustedprefix.patch | 13 - pkgs/applications/kde/kpublictransport.nix | 23 - pkgs/applications/kde/kqtquickcharts.nix | 24 - pkgs/applications/kde/krdc.nix | 55 - pkgs/applications/kde/krecorder.nix | 44 - pkgs/applications/kde/kreversi.nix | 26 - pkgs/applications/kde/krfb.nix | 65 - pkgs/applications/kde/kruler.nix | 31 - pkgs/applications/kde/ksanecore.nix | 22 - pkgs/applications/kde/kshisen.nix | 32 - pkgs/applications/kde/ksmtp/default.nix | 37 - pkgs/applications/kde/kspaceduel.nix | 41 - pkgs/applications/kde/ksquares.nix | 32 - pkgs/applications/kde/ksudoku.nix | 29 - pkgs/applications/kde/ksystemlog.nix | 33 - pkgs/applications/kde/kteatime.nix | 34 - pkgs/applications/kde/ktimer.nix | 28 - pkgs/applications/kde/ktnef.nix | 39 - pkgs/applications/kde/ktorrent.nix | 47 - pkgs/applications/kde/ktrip.nix | 49 - pkgs/applications/kde/kturtle.nix | 30 - pkgs/applications/kde/kwalletmanager.nix | 37 - pkgs/applications/kde/kwave.nix | 61 - pkgs/applications/kde/kweather.nix | 53 - pkgs/applications/kde/libgravatar.nix | 43 - pkgs/applications/kde/libkcddb.nix | 40 - pkgs/applications/kde/libkdcraw.nix | 26 - pkgs/applications/kde/libkdegames.nix | 34 - pkgs/applications/kde/libkdepim.nix | 59 - pkgs/applications/kde/libkexiv2.nix | 26 - pkgs/applications/kde/libkgapi.nix | 35 - pkgs/applications/kde/libkipi.nix | 32 - pkgs/applications/kde/libkleo.nix | 55 - pkgs/applications/kde/libkmahjongg.nix | 36 - pkgs/applications/kde/libkomparediff2.nix | 19 - pkgs/applications/kde/libksane.nix | 32 - pkgs/applications/kde/libksieve.nix | 57 - pkgs/applications/kde/libktorrent.nix | 43 - pkgs/applications/kde/mailcommon.nix | 69 - pkgs/applications/kde/mailimporter.nix | 51 - pkgs/applications/kde/marble.nix | 53 - pkgs/applications/kde/mbox-importer.nix | 41 - pkgs/applications/kde/merkuro.nix | 114 - pkgs/applications/kde/messagelib.nix | 92 - pkgs/applications/kde/minuet.nix | 53 - pkgs/applications/kde/okular.nix | 113 - pkgs/applications/kde/palapeli.nix | 31 - .../kde/partitionmanager/default.nix | 116 - pkgs/applications/kde/picmi.nix | 33 - pkgs/applications/kde/pim-data-exporter.nix | 75 - pkgs/applications/kde/pim-sieve-editor.nix | 49 - pkgs/applications/kde/pimcommon.nix | 85 - pkgs/applications/kde/plasmatube/default.nix | 60 - pkgs/applications/kde/print-manager.nix | 53 - pkgs/applications/kde/qmlkonsole.nix | 48 - pkgs/applications/kde/rocs.nix | 54 - pkgs/applications/kde/skanlite.nix | 30 - pkgs/applications/kde/skanpage.nix | 34 - pkgs/applications/kde/spectacle.nix | 92 - pkgs/applications/kde/srcs.nix | 1942 ----------------- pkgs/applications/kde/telly-skout.nix | 32 - pkgs/applications/kde/tokodon.nix | 63 - pkgs/applications/kde/umbrello.nix | 31 - pkgs/applications/kde/yakuake.nix | 70 - pkgs/applications/kde/zanshin.nix | 27 - pkgs/top-level/qt5-packages.nix | 15 - 207 files changed, 12340 deletions(-) delete mode 100644 pkgs/applications/kde/akonadi-calendar-tools.nix delete mode 100644 pkgs/applications/kde/akonadi-calendar.nix delete mode 100644 pkgs/applications/kde/akonadi-contacts.nix delete mode 100644 pkgs/applications/kde/akonadi-import-wizard.nix delete mode 100644 pkgs/applications/kde/akonadi-mime.nix delete mode 100644 pkgs/applications/kde/akonadi-notes.nix delete mode 100644 pkgs/applications/kde/akonadi-search.nix delete mode 100644 pkgs/applications/kde/akonadi/0001-akonadi-paths.patch delete mode 100644 pkgs/applications/kde/akonadi/0002-akonadi-timestamps.patch delete mode 100644 pkgs/applications/kde/akonadi/0003-akonadi-revert-make-relocatable.patch delete mode 100644 pkgs/applications/kde/akonadi/default.nix delete mode 100644 pkgs/applications/kde/akonadiconsole.nix delete mode 100644 pkgs/applications/kde/akregator.nix delete mode 100644 pkgs/applications/kde/alligator.nix delete mode 100644 pkgs/applications/kde/analitza.nix delete mode 100644 pkgs/applications/kde/angelfish.nix delete mode 100644 pkgs/applications/kde/arianna.nix delete mode 100644 pkgs/applications/kde/ark/default.nix delete mode 100644 pkgs/applications/kde/audiotube.nix delete mode 100644 pkgs/applications/kde/baloo-widgets.nix delete mode 100644 pkgs/applications/kde/bomber.nix delete mode 100644 pkgs/applications/kde/bovo.nix delete mode 100644 pkgs/applications/kde/calendarsupport.nix delete mode 100644 pkgs/applications/kde/calindori.nix delete mode 100644 pkgs/applications/kde/cantor.nix delete mode 100644 pkgs/applications/kde/colord-kde.nix delete mode 100644 pkgs/applications/kde/default.nix delete mode 100644 pkgs/applications/kde/dolphin-plugins.nix delete mode 100644 pkgs/applications/kde/dolphin.nix delete mode 100644 pkgs/applications/kde/dragon.nix delete mode 100644 pkgs/applications/kde/elisa.nix delete mode 100644 pkgs/applications/kde/eventviews.nix delete mode 100644 pkgs/applications/kde/falkon.nix delete mode 100644 pkgs/applications/kde/fetch.sh delete mode 100644 pkgs/applications/kde/ffmpegthumbs.nix delete mode 100644 pkgs/applications/kde/filelight.nix delete mode 100644 pkgs/applications/kde/ghostwriter.nix delete mode 100644 pkgs/applications/kde/granatier.nix delete mode 100644 pkgs/applications/kde/grantleetheme/default.nix delete mode 100644 pkgs/applications/kde/gwenview/default.nix delete mode 100644 pkgs/applications/kde/gwenview/kimageannotator.patch delete mode 100644 pkgs/applications/kde/incidenceeditor.nix delete mode 100644 pkgs/applications/kde/juk.nix delete mode 100644 pkgs/applications/kde/kaccounts-integration.nix delete mode 100644 pkgs/applications/kde/kaccounts-providers.nix delete mode 100644 pkgs/applications/kde/kaddressbook.nix delete mode 100644 pkgs/applications/kde/kalarm.nix delete mode 100644 pkgs/applications/kde/kalgebra.nix delete mode 100644 pkgs/applications/kde/kalk.nix delete mode 100644 pkgs/applications/kde/kalzium.nix delete mode 100644 pkgs/applications/kde/kamoso.nix delete mode 100644 pkgs/applications/kde/kapman.nix delete mode 100644 pkgs/applications/kde/kapptemplate.nix delete mode 100644 pkgs/applications/kde/kasts.nix delete mode 100644 pkgs/applications/kde/kate.nix delete mode 100644 pkgs/applications/kde/katomic.nix delete mode 100644 pkgs/applications/kde/kblackbox.nix delete mode 100644 pkgs/applications/kde/kblocks.nix delete mode 100644 pkgs/applications/kde/kbounce.nix delete mode 100644 pkgs/applications/kde/kbreakout.nix delete mode 100644 pkgs/applications/kde/kcachegrind.nix delete mode 100644 pkgs/applications/kde/kcalc.nix delete mode 100644 pkgs/applications/kde/kcalutils.nix delete mode 100644 pkgs/applications/kde/kcharselect.nix delete mode 100644 pkgs/applications/kde/kclock.nix delete mode 100644 pkgs/applications/kde/kcolorchooser.nix delete mode 100644 pkgs/applications/kde/kde-inotify-survey.nix delete mode 100644 pkgs/applications/kde/kdebugsettings.nix delete mode 100644 pkgs/applications/kde/kdeconnect-kde.nix delete mode 100644 pkgs/applications/kde/kdegraphics-mobipocket.nix delete mode 100644 pkgs/applications/kde/kdegraphics-thumbnailers/default.nix delete mode 100644 pkgs/applications/kde/kdegraphics-thumbnailers/gs-paths.patch delete mode 100644 pkgs/applications/kde/kdenetwork-filesharing.nix delete mode 100644 pkgs/applications/kde/kdenlive/default.nix delete mode 100644 pkgs/applications/kde/kdenlive/dependency-paths.patch delete mode 100644 pkgs/applications/kde/kdepim-addons.nix delete mode 100644 pkgs/applications/kde/kdepim-runtime/default.nix delete mode 100644 pkgs/applications/kde/kdevelop/kdev-php.nix delete mode 100644 pkgs/applications/kde/kdevelop/kdev-python.nix delete mode 100644 pkgs/applications/kde/kdevelop/kdevelop-pg-qt.nix delete mode 100644 pkgs/applications/kde/kdevelop/kdevelop.nix delete mode 100644 pkgs/applications/kde/kdevelop/wrapper.nix delete mode 100644 pkgs/applications/kde/kdf.nix delete mode 100644 pkgs/applications/kde/kdialog.nix delete mode 100644 pkgs/applications/kde/kdiamond.nix delete mode 100644 pkgs/applications/kde/keditbookmarks.nix delete mode 100644 pkgs/applications/kde/keysmith.nix delete mode 100644 pkgs/applications/kde/kfind.nix delete mode 100644 pkgs/applications/kde/kgeography.nix delete mode 100644 pkgs/applications/kde/kget.nix delete mode 100644 pkgs/applications/kde/kgpg.nix delete mode 100644 pkgs/applications/kde/khelpcenter.nix delete mode 100644 pkgs/applications/kde/kidentitymanagement.nix delete mode 100644 pkgs/applications/kde/kig.nix delete mode 100644 pkgs/applications/kde/kigo.nix delete mode 100644 pkgs/applications/kde/killbots.nix delete mode 100644 pkgs/applications/kde/kimap.nix delete mode 100644 pkgs/applications/kde/kio-admin.nix delete mode 100644 pkgs/applications/kde/kio-extras.nix delete mode 100644 pkgs/applications/kde/kio-gdrive.nix delete mode 100644 pkgs/applications/kde/kipi-plugins.nix delete mode 100644 pkgs/applications/kde/kirigami-gallery.nix delete mode 100644 pkgs/applications/kde/kitinerary.nix delete mode 100644 pkgs/applications/kde/kldap.nix delete mode 100644 pkgs/applications/kde/kleopatra.nix delete mode 100644 pkgs/applications/kde/klettres.nix delete mode 100644 pkgs/applications/kde/klines.nix delete mode 100644 pkgs/applications/kde/kmag.nix delete mode 100644 pkgs/applications/kde/kmahjongg.nix delete mode 100644 pkgs/applications/kde/kmail-account-wizard.nix delete mode 100644 pkgs/applications/kde/kmail.nix delete mode 100644 pkgs/applications/kde/kmailtransport.nix delete mode 100644 pkgs/applications/kde/kmbox.nix delete mode 100644 pkgs/applications/kde/kmime.nix delete mode 100644 pkgs/applications/kde/kmines.nix delete mode 100644 pkgs/applications/kde/kmix.nix delete mode 100644 pkgs/applications/kde/kmousetool.nix delete mode 100644 pkgs/applications/kde/kmplot.nix delete mode 100644 pkgs/applications/kde/knavalbattle.nix delete mode 100644 pkgs/applications/kde/knetwalk.nix delete mode 100644 pkgs/applications/kde/knights.nix delete mode 100644 pkgs/applications/kde/knotes.nix delete mode 100644 pkgs/applications/kde/koko.nix delete mode 100644 pkgs/applications/kde/kolf.nix delete mode 100644 pkgs/applications/kde/kollision.nix delete mode 100644 pkgs/applications/kde/kolourpaint.nix delete mode 100644 pkgs/applications/kde/kompare.nix delete mode 100644 pkgs/applications/kde/kongress.nix delete mode 100644 pkgs/applications/kde/konqueror.nix delete mode 100644 pkgs/applications/kde/konquest.nix delete mode 100644 pkgs/applications/kde/konsole.nix delete mode 100644 pkgs/applications/kde/kontact.nix delete mode 100644 pkgs/applications/kde/kontactinterface.nix delete mode 100644 pkgs/applications/kde/konversation.nix delete mode 100644 pkgs/applications/kde/kopeninghours.nix delete mode 100644 pkgs/applications/kde/korganizer.nix delete mode 100644 pkgs/applications/kde/kosmindoormap.nix delete mode 100644 pkgs/applications/kde/kpat.nix delete mode 100644 pkgs/applications/kde/kpimtextedit.nix delete mode 100644 pkgs/applications/kde/kpkpass.nix delete mode 100644 pkgs/applications/kde/kpmcore/default.nix delete mode 100644 pkgs/applications/kde/kpmcore/nixostrustedprefix.patch delete mode 100644 pkgs/applications/kde/kpublictransport.nix delete mode 100644 pkgs/applications/kde/kqtquickcharts.nix delete mode 100644 pkgs/applications/kde/krdc.nix delete mode 100644 pkgs/applications/kde/krecorder.nix delete mode 100644 pkgs/applications/kde/kreversi.nix delete mode 100644 pkgs/applications/kde/krfb.nix delete mode 100644 pkgs/applications/kde/kruler.nix delete mode 100644 pkgs/applications/kde/ksanecore.nix delete mode 100644 pkgs/applications/kde/kshisen.nix delete mode 100644 pkgs/applications/kde/ksmtp/default.nix delete mode 100644 pkgs/applications/kde/kspaceduel.nix delete mode 100644 pkgs/applications/kde/ksquares.nix delete mode 100644 pkgs/applications/kde/ksudoku.nix delete mode 100644 pkgs/applications/kde/ksystemlog.nix delete mode 100644 pkgs/applications/kde/kteatime.nix delete mode 100644 pkgs/applications/kde/ktimer.nix delete mode 100644 pkgs/applications/kde/ktnef.nix delete mode 100644 pkgs/applications/kde/ktorrent.nix delete mode 100644 pkgs/applications/kde/ktrip.nix delete mode 100644 pkgs/applications/kde/kturtle.nix delete mode 100644 pkgs/applications/kde/kwalletmanager.nix delete mode 100644 pkgs/applications/kde/kwave.nix delete mode 100644 pkgs/applications/kde/kweather.nix delete mode 100644 pkgs/applications/kde/libgravatar.nix delete mode 100644 pkgs/applications/kde/libkcddb.nix delete mode 100644 pkgs/applications/kde/libkdcraw.nix delete mode 100644 pkgs/applications/kde/libkdegames.nix delete mode 100644 pkgs/applications/kde/libkdepim.nix delete mode 100644 pkgs/applications/kde/libkexiv2.nix delete mode 100644 pkgs/applications/kde/libkgapi.nix delete mode 100644 pkgs/applications/kde/libkipi.nix delete mode 100644 pkgs/applications/kde/libkleo.nix delete mode 100644 pkgs/applications/kde/libkmahjongg.nix delete mode 100644 pkgs/applications/kde/libkomparediff2.nix delete mode 100644 pkgs/applications/kde/libksane.nix delete mode 100644 pkgs/applications/kde/libksieve.nix delete mode 100644 pkgs/applications/kde/libktorrent.nix delete mode 100644 pkgs/applications/kde/mailcommon.nix delete mode 100644 pkgs/applications/kde/mailimporter.nix delete mode 100644 pkgs/applications/kde/marble.nix delete mode 100644 pkgs/applications/kde/mbox-importer.nix delete mode 100644 pkgs/applications/kde/merkuro.nix delete mode 100644 pkgs/applications/kde/messagelib.nix delete mode 100644 pkgs/applications/kde/minuet.nix delete mode 100644 pkgs/applications/kde/okular.nix delete mode 100644 pkgs/applications/kde/palapeli.nix delete mode 100644 pkgs/applications/kde/partitionmanager/default.nix delete mode 100644 pkgs/applications/kde/picmi.nix delete mode 100644 pkgs/applications/kde/pim-data-exporter.nix delete mode 100644 pkgs/applications/kde/pim-sieve-editor.nix delete mode 100644 pkgs/applications/kde/pimcommon.nix delete mode 100644 pkgs/applications/kde/plasmatube/default.nix delete mode 100644 pkgs/applications/kde/print-manager.nix delete mode 100644 pkgs/applications/kde/qmlkonsole.nix delete mode 100644 pkgs/applications/kde/rocs.nix delete mode 100644 pkgs/applications/kde/skanlite.nix delete mode 100644 pkgs/applications/kde/skanpage.nix delete mode 100644 pkgs/applications/kde/spectacle.nix delete mode 100644 pkgs/applications/kde/srcs.nix delete mode 100644 pkgs/applications/kde/telly-skout.nix delete mode 100644 pkgs/applications/kde/tokodon.nix delete mode 100644 pkgs/applications/kde/umbrello.nix delete mode 100644 pkgs/applications/kde/yakuake.nix delete mode 100644 pkgs/applications/kde/zanshin.nix diff --git a/pkgs/applications/kde/akonadi-calendar-tools.nix b/pkgs/applications/kde/akonadi-calendar-tools.nix deleted file mode 100644 index 204fe6f46a0a..000000000000 --- a/pkgs/applications/kde/akonadi-calendar-tools.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - kdoctools, - akonadi, - calendarsupport, -}: - -mkDerivation { - pname = "akonadi-calendar-tools"; - meta = { - homepage = "https://github.com/KDE/akonadi-calendar-tools"; - description = "Console applications and utilities for managing calendars in Akonadi"; - license = with lib.licenses; [ - gpl2Plus - cc0 - ]; - maintainers = with lib.maintainers; [ kennyballou ]; - platforms = lib.platforms.linux; - }; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - propagatedBuildInputs = [ - akonadi - calendarsupport - ]; - outputs = [ - "out" - "dev" - ]; -} diff --git a/pkgs/applications/kde/akonadi-calendar.nix b/pkgs/applications/kde/akonadi-calendar.nix deleted file mode 100644 index 6b4a248d88dd..000000000000 --- a/pkgs/applications/kde/akonadi-calendar.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ - mkDerivation, - lib, - kdepimTeam, - extra-cmake-modules, - kdoctools, - akonadi, - akonadi-contacts, - kcalendarcore, - kcalutils, - kcontacts, - kidentitymanagement, - kio, - kmailtransport, - messagelib, -}: - -mkDerivation { - pname = "akonadi-calendar"; - meta = { - license = with lib.licenses; [ - gpl2 - lgpl21 - ]; - maintainers = kdepimTeam; - }; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - propagatedBuildInputs = [ - akonadi - akonadi-contacts - kcalendarcore - kcalutils - kcontacts - kidentitymanagement - kio - kmailtransport - messagelib - ]; - outputs = [ - "out" - "dev" - ]; - postInstall = '' - # added as an include directory by cmake files and fails to compile if it's missing - mkdir -p "$dev/include/KF5" - ''; -} diff --git a/pkgs/applications/kde/akonadi-contacts.nix b/pkgs/applications/kde/akonadi-contacts.nix deleted file mode 100644 index d00fe2e8f56b..000000000000 --- a/pkgs/applications/kde/akonadi-contacts.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ - mkDerivation, - lib, - kdepimTeam, - extra-cmake-modules, - qtwebengine, - grantlee, - grantleetheme, - kcmutils, - kdbusaddons, - ki18n, - kiconthemes, - kio, - kitemmodels, - ktextwidgets, - prison, - akonadi, - akonadi-mime, - kcontacts, - kmime, - libkleo, -}: - -mkDerivation { - pname = "akonadi-contacts"; - meta = { - license = with lib.licenses; [ - gpl2 - lgpl21 - ]; - maintainers = kdepimTeam; - }; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - qtwebengine - grantlee - kcmutils - kdbusaddons - ki18n - kiconthemes - kio - kitemmodels - ktextwidgets - prison - akonadi-mime - kcontacts - kmime - libkleo - ]; - propagatedBuildInputs = [ - akonadi - grantleetheme - ]; - outputs = [ - "out" - "dev" - ]; - postInstall = '' - # added as an include directory by cmake files and fails to compile if it's missing - mkdir -p "$dev/include/KF5" - ''; -} diff --git a/pkgs/applications/kde/akonadi-import-wizard.nix b/pkgs/applications/kde/akonadi-import-wizard.nix deleted file mode 100644 index fcdab9b52858..000000000000 --- a/pkgs/applications/kde/akonadi-import-wizard.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ - mkDerivation, - lib, - kdepimTeam, - extra-cmake-modules, - kdoctools, - akonadi, - karchive, - kcontacts, - kcrash, - kidentitymanagement, - kio, - kmailtransport, - kwallet, - mailcommon, - mailimporter, - messagelib, - qtkeychain, - libsecret, -}: - -mkDerivation { - pname = "akonadi-import-wizard"; - meta = { - license = with lib.licenses; [ - gpl2Plus - lgpl21Plus - fdl12Plus - ]; - maintainers = kdepimTeam; - }; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - akonadi - karchive - kcontacts - kcrash - kidentitymanagement - kio - kmailtransport - kwallet - mailcommon - mailimporter - messagelib - qtkeychain - libsecret - ]; - outputs = [ - "out" - "dev" - ]; -} diff --git a/pkgs/applications/kde/akonadi-mime.nix b/pkgs/applications/kde/akonadi-mime.nix deleted file mode 100644 index fb5385743493..000000000000 --- a/pkgs/applications/kde/akonadi-mime.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ - mkDerivation, - lib, - kdepimTeam, - extra-cmake-modules, - shared-mime-info, - akonadi, - kdbusaddons, - ki18n, - kio, - kitemmodels, - kmime, -}: - -mkDerivation { - pname = "akonadi-mime"; - meta = { - license = with lib.licenses; [ - gpl2 - lgpl21 - ]; - maintainers = kdepimTeam; - }; - nativeBuildInputs = [ - extra-cmake-modules - shared-mime-info - ]; - buildInputs = [ - akonadi - kdbusaddons - ki18n - kio - kitemmodels - kmime - ]; - outputs = [ - "out" - "dev" - ]; - postInstall = '' - # added as an include directory by cmake files and fails to compile if it's missing - mkdir -p "$dev/include/KF5" - ''; -} diff --git a/pkgs/applications/kde/akonadi-notes.nix b/pkgs/applications/kde/akonadi-notes.nix deleted file mode 100644 index f40d588ff687..000000000000 --- a/pkgs/applications/kde/akonadi-notes.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ - mkDerivation, - lib, - kdepimTeam, - extra-cmake-modules, - kdoctools, - akonadi, - kcompletion, - ki18n, - kitemmodels, - kmime, - kxmlgui, -}: - -mkDerivation { - pname = "akonadi-notes"; - meta = { - license = with lib.licenses; [ - gpl2Plus - lgpl21Plus - fdl12Plus - ]; - maintainers = kdepimTeam; - }; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - akonadi - kcompletion - ki18n - kitemmodels - kmime - kxmlgui - ]; - outputs = [ - "out" - "dev" - ]; - postInstall = '' - # added as an include directory by cmake files and fails to compile if it's missing - mkdir -p "$dev/include/KF5" - ''; -} diff --git a/pkgs/applications/kde/akonadi-search.nix b/pkgs/applications/kde/akonadi-search.nix deleted file mode 100644 index 5050d2ae3ddc..000000000000 --- a/pkgs/applications/kde/akonadi-search.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ - mkDerivation, - lib, - kdepimTeam, - extra-cmake-modules, - kdoctools, - akonadi, - akonadi-mime, - kcalendarcore, - kcmutils, - kcontacts, - kcoreaddons, - kmime, - krunner, - qtbase, - xapian, -}: - -mkDerivation { - pname = "akonadi-search"; - meta = { - license = with lib.licenses; [ - gpl2Plus - lgpl21Plus - fdl12Plus - ]; - maintainers = kdepimTeam; - }; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - kcmutils - krunner - xapian - ]; - propagatedBuildInputs = [ - akonadi - akonadi-mime - kcalendarcore - kcontacts - kcoreaddons - kmime - qtbase - ]; - outputs = [ - "out" - "dev" - ]; - postInstall = '' - # added as an include directory by cmake files and fails to compile if it's missing - mkdir -p "$dev/include/KF5" - ''; -} diff --git a/pkgs/applications/kde/akonadi/0001-akonadi-paths.patch b/pkgs/applications/kde/akonadi/0001-akonadi-paths.patch deleted file mode 100644 index d5e4fe1ee728..000000000000 --- a/pkgs/applications/kde/akonadi/0001-akonadi-paths.patch +++ /dev/null @@ -1,190 +0,0 @@ -From ca8ff6e6d527ee968300cce5e8cd148f6a4d256b Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Sun, 25 Apr 2021 08:00:10 -0500 -Subject: [PATCH 1/3] akonadi paths - ---- - src/akonadicontrol/agentmanager.cpp | 4 ++-- - src/akonadicontrol/agentprocessinstance.cpp | 2 +- - src/server/storage/dbconfigmysql.cpp | 26 ++++----------------- - src/server/storage/dbconfigpostgresql.cpp | 19 +++------------ - 4 files changed, 11 insertions(+), 40 deletions(-) - -diff --git a/src/akonadicontrol/agentmanager.cpp b/src/akonadicontrol/agentmanager.cpp -index 44ceec5..eb5fa50 100644 ---- a/src/akonadicontrol/agentmanager.cpp -+++ b/src/akonadicontrol/agentmanager.cpp -@@ -47,7 +47,7 @@ public: - connect(this, &Akonadi::ProcessControl::unableToStart, this, []() { - QCoreApplication::instance()->exit(255); - }); -- start(QStringLiteral("akonadiserver"), args, RestartOnCrash); -+ start(QStringLiteral(NIX_OUT "/bin/akonadiserver"), args, RestartOnCrash); - } - - ~StorageProcessControl() override -@@ -69,7 +69,7 @@ public: - connect(this, &Akonadi::ProcessControl::unableToStart, this, []() { - qCCritical(AKONADICONTROL_LOG) << "Failed to start AgentServer!"; - }); -- start(QStringLiteral("akonadi_agent_server"), args, RestartOnCrash); -+ start(QStringLiteral(NIX_OUT "/bin/akonadi_agent_server"), args, RestartOnCrash); - } - - ~AgentServerProcessControl() override -diff --git a/src/akonadicontrol/agentprocessinstance.cpp b/src/akonadicontrol/agentprocessinstance.cpp -index 8e92e08..f98dfd8 100644 ---- a/src/akonadicontrol/agentprocessinstance.cpp -+++ b/src/akonadicontrol/agentprocessinstance.cpp -@@ -47,7 +47,7 @@ bool AgentProcessInstance::start(const AgentType &agentInfo) - } else { - Q_ASSERT(agentInfo.launchMethod == AgentType::Launcher); - const QStringList arguments = QStringList() << executable << identifier(); -- const QString agentLauncherExec = Akonadi::StandardDirs::findExecutable(QStringLiteral("akonadi_agent_launcher")); -+ const QString agentLauncherExec = QLatin1String(NIX_OUT "/bin/akonadi_agent_launcher"); - mController->start(agentLauncherExec, arguments); - } - return true; -diff --git a/src/server/storage/dbconfigmysql.cpp b/src/server/storage/dbconfigmysql.cpp -index 1a437ac..3550f9d 100644 ---- a/src/server/storage/dbconfigmysql.cpp -+++ b/src/server/storage/dbconfigmysql.cpp -@@ -72,7 +72,6 @@ bool DbConfigMysql::init(QSettings &settings, bool storeSettings) - // determine default settings depending on the driver - QString defaultHostName; - QString defaultOptions; -- QString defaultServerPath; - QString defaultCleanShutdownCommand; - - #ifndef Q_OS_WIN -@@ -80,16 +79,7 @@ bool DbConfigMysql::init(QSettings &settings, bool storeSettings) - #endif - - const bool defaultInternalServer = true; --#ifdef MYSQLD_EXECUTABLE -- if (QFile::exists(QStringLiteral(MYSQLD_EXECUTABLE))) { -- defaultServerPath = QStringLiteral(MYSQLD_EXECUTABLE); -- } --#endif -- if (defaultServerPath.isEmpty()) { -- defaultServerPath = findExecutable(QStringLiteral("mysqld")); -- } -- -- const QString mysqladminPath = findExecutable(QStringLiteral("mysqladmin")); -+ const QString mysqladminPath = QLatin1String(NIXPKGS_MYSQL_MYSQLADMIN); - if (!mysqladminPath.isEmpty()) { - #ifndef Q_OS_WIN - defaultCleanShutdownCommand = QStringLiteral("%1 --defaults-file=%2/mysql.conf --socket=%3/%4 shutdown") -@@ -99,10 +89,10 @@ bool DbConfigMysql::init(QSettings &settings, bool storeSettings) - #endif - } - -- mMysqlInstallDbPath = findExecutable(QStringLiteral("mysql_install_db")); -+ mMysqlInstallDbPath = QLatin1String(NIXPKGS_MYSQL_MYSQL_INSTALL_DB); - qCDebug(AKONADISERVER_LOG) << "Found mysql_install_db: " << mMysqlInstallDbPath; - -- mMysqlCheckPath = findExecutable(QStringLiteral("mysqlcheck")); -+ mMysqlCheckPath = QLatin1String(NIXPKGS_MYSQL_MYSQLCHECK); - qCDebug(AKONADISERVER_LOG) << "Found mysqlcheck: " << mMysqlCheckPath; - - mInternalServer = settings.value(QStringLiteral("QMYSQL/StartServer"), defaultInternalServer).toBool(); -@@ -119,7 +109,7 @@ bool DbConfigMysql::init(QSettings &settings, bool storeSettings) - mUserName = settings.value(QStringLiteral("User")).toString(); - mPassword = settings.value(QStringLiteral("Password")).toString(); - mConnectionOptions = settings.value(QStringLiteral("Options"), defaultOptions).toString(); -- mMysqldPath = settings.value(QStringLiteral("ServerPath"), defaultServerPath).toString(); -+ mMysqldPath = QLatin1String(NIXPKGS_MYSQL_MYSQLD); - mCleanServerShutdownCommand = settings.value(QStringLiteral("CleanServerShutdownCommand"), defaultCleanShutdownCommand).toString(); - settings.endGroup(); - -@@ -129,9 +119,6 @@ bool DbConfigMysql::init(QSettings &settings, bool storeSettings) - // intentionally not namespaced as we are the only one in this db instance when using internal mode - mDatabaseName = QStringLiteral("akonadi"); - } -- if (mInternalServer && (mMysqldPath.isEmpty() || !QFile::exists(mMysqldPath))) { -- mMysqldPath = defaultServerPath; -- } - - qCDebug(AKONADISERVER_LOG) << "Using mysqld:" << mMysqldPath; - -@@ -141,9 +128,6 @@ bool DbConfigMysql::init(QSettings &settings, bool storeSettings) - settings.setValue(QStringLiteral("Name"), mDatabaseName); - settings.setValue(QStringLiteral("Host"), mHostName); - settings.setValue(QStringLiteral("Options"), mConnectionOptions); -- if (!mMysqldPath.isEmpty()) { -- settings.setValue(QStringLiteral("ServerPath"), mMysqldPath); -- } - settings.setValue(QStringLiteral("StartServer"), mInternalServer); - settings.endGroup(); - settings.sync(); -@@ -215,7 +199,7 @@ bool DbConfigMysql::startInternalServer() - #endif - - // generate config file -- const QString globalConfig = StandardDirs::locateResourceFile("config", QStringLiteral("mysql-global.conf")); -+ const QString globalConfig = QLatin1String(NIX_OUT "/etc/xdg/akonadi/mysql-global.conf"); - const QString localConfig = StandardDirs::locateResourceFile("config", QStringLiteral("mysql-local.conf")); - const QString actualConfig = StandardDirs::saveDir("data") + QLatin1String("/mysql.conf"); - if (globalConfig.isEmpty()) { -diff --git a/src/server/storage/dbconfigpostgresql.cpp b/src/server/storage/dbconfigpostgresql.cpp -index 4df61da..e3469c4 100644 ---- a/src/server/storage/dbconfigpostgresql.cpp -+++ b/src/server/storage/dbconfigpostgresql.cpp -@@ -125,9 +125,7 @@ bool DbConfigPostgresql::init(QSettings &settings, bool storeSettings) - // determine default settings depending on the driver - QString defaultHostName; - QString defaultOptions; -- QString defaultServerPath; - QString defaultInitDbPath; -- QString defaultPgUpgradePath; - QString defaultPgData; - - #ifndef Q_WS_WIN // We assume that PostgreSQL is running as service on Windows -@@ -138,12 +136,8 @@ bool DbConfigPostgresql::init(QSettings &settings, bool storeSettings) - - mInternalServer = settings.value(QStringLiteral("QPSQL/StartServer"), defaultInternalServer).toBool(); - if (mInternalServer) { -- const auto paths = postgresSearchPaths(QStringLiteral("/usr/lib/postgresql")); -- -- defaultServerPath = QStandardPaths::findExecutable(QStringLiteral("pg_ctl"), paths); -- defaultInitDbPath = QStandardPaths::findExecutable(QStringLiteral("initdb"), paths); -+ defaultInitDbPath = QLatin1String(NIXPKGS_POSTGRES_INITDB); - defaultHostName = Utils::preferredSocketDirectory(StandardDirs::saveDir("data", QStringLiteral("db_misc"))); -- defaultPgUpgradePath = QStandardPaths::findExecutable(QStringLiteral("pg_upgrade"), paths); - defaultPgData = StandardDirs::saveDir("data", QStringLiteral("db_data")); - } - -@@ -162,20 +156,14 @@ bool DbConfigPostgresql::init(QSettings &settings, bool storeSettings) - mUserName = settings.value(QStringLiteral("User")).toString(); - mPassword = settings.value(QStringLiteral("Password")).toString(); - mConnectionOptions = settings.value(QStringLiteral("Options"), defaultOptions).toString(); -- mServerPath = settings.value(QStringLiteral("ServerPath"), defaultServerPath).toString(); -- if (mInternalServer && mServerPath.isEmpty()) { -- mServerPath = defaultServerPath; -- } -+ mServerPath = QLatin1String(NIXPKGS_POSTGRES_PG_CTL); - qCDebug(AKONADISERVER_LOG) << "Found pg_ctl:" << mServerPath; - mInitDbPath = settings.value(QStringLiteral("InitDbPath"), defaultInitDbPath).toString(); - if (mInternalServer && mInitDbPath.isEmpty()) { - mInitDbPath = defaultInitDbPath; - } - qCDebug(AKONADISERVER_LOG) << "Found initdb:" << mServerPath; -- mPgUpgradePath = settings.value(QStringLiteral("UpgradePath"), defaultPgUpgradePath).toString(); -- if (mInternalServer && mPgUpgradePath.isEmpty()) { -- mPgUpgradePath = defaultPgUpgradePath; -- } -+ mPgUpgradePath = QLatin1String(NIXPKGS_POSTGRES_PG_UPGRADE); - qCDebug(AKONADISERVER_LOG) << "Found pg_upgrade:" << mPgUpgradePath; - mPgData = settings.value(QStringLiteral("PgData"), defaultPgData).toString(); - if (mPgData.isEmpty()) { -@@ -192,7 +180,6 @@ bool DbConfigPostgresql::init(QSettings &settings, bool storeSettings) - settings.setValue(QStringLiteral("Port"), mHostPort); - } - settings.setValue(QStringLiteral("Options"), mConnectionOptions); -- settings.setValue(QStringLiteral("ServerPath"), mServerPath); - settings.setValue(QStringLiteral("InitDbPath"), mInitDbPath); - settings.setValue(QStringLiteral("StartServer"), mInternalServer); - settings.endGroup(); --- -2.31.1 - diff --git a/pkgs/applications/kde/akonadi/0002-akonadi-timestamps.patch b/pkgs/applications/kde/akonadi/0002-akonadi-timestamps.patch deleted file mode 100644 index 1da52dbad0e1..000000000000 --- a/pkgs/applications/kde/akonadi/0002-akonadi-timestamps.patch +++ /dev/null @@ -1,26 +0,0 @@ -From f6c446cf6fab2edbd2606b4c6100903e9437362a Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Sun, 25 Apr 2021 08:01:02 -0500 -Subject: [PATCH 2/3] akonadi timestamps - ---- - src/server/storage/dbconfigmysql.cpp | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/src/server/storage/dbconfigmysql.cpp b/src/server/storage/dbconfigmysql.cpp -index 3550f9d..e9e8887 100644 ---- a/src/server/storage/dbconfigmysql.cpp -+++ b/src/server/storage/dbconfigmysql.cpp -@@ -241,8 +241,7 @@ bool DbConfigMysql::startInternalServer() - bool confUpdate = false; - QFile actualFile(actualConfig); - // update conf only if either global (or local) is newer than actual -- if ((QFileInfo(globalConfig).lastModified() > QFileInfo(actualFile).lastModified()) -- || (QFileInfo(localConfig).lastModified() > QFileInfo(actualFile).lastModified())) { -+ if (true) { - QFile globalFile(globalConfig); - QFile localFile(localConfig); - if (globalFile.open(QFile::ReadOnly) && actualFile.open(QFile::WriteOnly)) { --- -2.31.1 - diff --git a/pkgs/applications/kde/akonadi/0003-akonadi-revert-make-relocatable.patch b/pkgs/applications/kde/akonadi/0003-akonadi-revert-make-relocatable.patch deleted file mode 100644 index 6d4d5a4b363b..000000000000 --- a/pkgs/applications/kde/akonadi/0003-akonadi-revert-make-relocatable.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 4b90a0bd4411a66bbe6ecf85ce89a60a58bee969 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Sun, 25 Apr 2021 08:01:21 -0500 -Subject: [PATCH 3/3] akonadi revert make relocatable - ---- - CMakeLists.txt | 3 --- - KPimAkonadiConfig.cmake.in | 6 +++--- - 2 files changed, 3 insertions(+), 6 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4e8cc81..63161b7 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -368,9 +368,6 @@ configure_package_config_file( - "${CMAKE_CURRENT_SOURCE_DIR}/KPimAkonadiConfig.cmake.in" - "${CMAKE_CURRENT_BINARY_DIR}/KPimAkonadiConfig.cmake" - INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} -- PATH_VARS AKONADI_DBUS_INTERFACES_INSTALL_DIR -- AKONADI_INCLUDE_DIR -- KF5Akonadi_DATA_DIR - ) - - install(FILES -diff --git a/KPimAkonadiConfig.cmake.in b/KPimAkonadiConfig.cmake.in -index bcf7320..1574319 100644 ---- a/KPimAkonadiConfig.cmake.in -+++ b/KPimAkonadiConfig.cmake.in -@@ -1,10 +1,10 @@ - @PACKAGE_INIT@ - --set_and_check(AKONADI_DBUS_INTERFACES_DIR "@PACKAGE_AKONADI_DBUS_INTERFACES_INSTALL_DIR@") --set_and_check(AKONADI_INCLUDE_DIR "@PACKAGE_AKONADI_INCLUDE_DIR@") -+set_and_check(AKONADI_DBUS_INTERFACES_DIR "@AKONADI_DBUS_INTERFACES_INSTALL_DIR@") -+set_and_check(AKONADI_INCLUDE_DIR "@AKONADI_INCLUDE_DIR@") - - # The directory where akonadi-xml.xsd and kcfg2dbus.xsl are installed --set(KF5Akonadi_DATA_DIR "@PACKAGE_KF5Akonadi_DATA_DIR@") -+set(KF5Akonadi_DATA_DIR "@KF5Akonadi_DATA_DIR@") - - # set the directories - if(NOT AKONADI_INSTALL_DIR) --- -2.31.1 - diff --git a/pkgs/applications/kde/akonadi/default.nix b/pkgs/applications/kde/akonadi/default.nix deleted file mode 100644 index fc3fd063720d..000000000000 --- a/pkgs/applications/kde/akonadi/default.nix +++ /dev/null @@ -1,90 +0,0 @@ -{ - mkDerivation, - lib, - kdepimTeam, - extra-cmake-modules, - shared-mime-info, - accounts-qt, - boost, - kaccounts-integration, - kcompletion, - kconfigwidgets, - kcrash, - kdbusaddons, - kdesignerplugin, - ki18n, - kiconthemes, - kio, - kitemmodels, - kwindowsystem, - mariadb, - postgresql, - qttools, - signond, - xz, - - mysqlSupport ? true, - postgresSupport ? false, - defaultDriver ? if mysqlSupport then "MYSQL" else "POSTGRES", -}: - -assert mysqlSupport || postgresSupport; - -mkDerivation { - pname = "akonadi"; - meta = { - license = [ lib.licenses.lgpl21 ]; - maintainers = kdepimTeam; - }; - patches = [ - ./0001-akonadi-paths.patch - ./0002-akonadi-timestamps.patch - ./0003-akonadi-revert-make-relocatable.patch - ]; - nativeBuildInputs = [ - extra-cmake-modules - shared-mime-info - ]; - buildInputs = [ - kaccounts-integration - kcompletion - kconfigwidgets - kcrash - kdbusaddons - kdesignerplugin - ki18n - kiconthemes - kio - kwindowsystem - xz - accounts-qt - qttools - signond - ]; - propagatedBuildInputs = [ - boost - kitemmodels - ]; - outputs = [ - "out" - "dev" - ]; - CXXFLAGS = [ - ''-DNIXPKGS_MYSQL_MYSQLD=\"${lib.optionalString mysqlSupport "${lib.getBin mariadb}/bin/mysqld"}\"'' - ''-DNIXPKGS_MYSQL_MYSQLADMIN=\"${lib.optionalString mysqlSupport "${lib.getBin mariadb}/bin/mysqladmin"}\"'' - ''-DNIXPKGS_MYSQL_MYSQL_INSTALL_DB=\"${lib.optionalString mysqlSupport "${lib.getBin mariadb}/bin/mysql_install_db"}\"'' - ''-DNIXPKGS_MYSQL_MYSQLCHECK=\"${lib.optionalString mysqlSupport "${lib.getBin mariadb}/bin/mysqlcheck"}\"'' - ''-DNIXPKGS_POSTGRES_PG_CTL=\"${lib.optionalString postgresSupport "${lib.getBin postgresql}/bin/pg_ctl"}\"'' - ''-DNIXPKGS_POSTGRES_PG_UPGRADE=\"${lib.optionalString postgresSupport "${lib.getBin postgresql}/bin/pg_upgrade"}\"'' - ''-DNIXPKGS_POSTGRES_INITDB=\"${lib.optionalString postgresSupport "${lib.getBin postgresql}/bin/initdb"}\"'' - ''-DNIX_OUT=\"${placeholder "out"}\"'' - ''-I${lib.getDev kio}/include/KF5'' # Fixes: kio_version.h: No such file or directory - ]; - - cmakeFlags = lib.optional (defaultDriver != "MYSQL") "-DDATABASE_BACKEND=${defaultDriver}"; - - postInstall = '' - # added as an include directory by cmake files and fails to compile if it's missing - mkdir -p "$dev/include/KF5" - ''; -} diff --git a/pkgs/applications/kde/akonadiconsole.nix b/pkgs/applications/kde/akonadiconsole.nix deleted file mode 100644 index da5f1ec023cd..000000000000 --- a/pkgs/applications/kde/akonadiconsole.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ - mkDerivation, - lib, - kdepimTeam, - extra-cmake-modules, - kdoctools, - akonadi, - akonadi-contacts, - calendarsupport, - kcalendarcore, - kcompletion, - kconfigwidgets, - kcontacts, - kdbusaddons, - kitemmodels, - kpimtextedit, - libkdepim, - ktextwidgets, - kxmlgui, - messagelib, - qtbase, - akonadi-search, - xapian, -}: - -mkDerivation { - pname = "akonadiconsole"; - meta = { - license = with lib.licenses; [ - gpl2Plus - lgpl21Plus - fdl12Plus - ]; - maintainers = kdepimTeam; - }; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - akonadi - akonadi-contacts - calendarsupport - kcalendarcore - kcompletion - kconfigwidgets - kcontacts - kdbusaddons - kitemmodels - kpimtextedit - ktextwidgets - kxmlgui - messagelib - qtbase - libkdepim - akonadi-search - xapian - ]; -} diff --git a/pkgs/applications/kde/akregator.nix b/pkgs/applications/kde/akregator.nix deleted file mode 100644 index 1d86d93a73b1..000000000000 --- a/pkgs/applications/kde/akregator.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ - mkDerivation, - lib, - kdepimTeam, - extra-cmake-modules, - kdoctools, - qtwebengine, - grantlee, - kcmutils, - kcrash, - kiconthemes, - knotifyconfig, - kparts, - ktexteditor, - kuserfeedback, - kwindowsystem, - akonadi, - akonadi-mime, - grantleetheme, - kontactinterface, - libkdepim, - libkleo, - messagelib, - syndication, -}: - -mkDerivation { - pname = "akregator"; - meta = { - homepage = "https://apps.kde.org/akregator/"; - description = "KDE feed reader"; - license = with lib.licenses; [ - gpl2Plus - lgpl21Plus - fdl12Plus - ]; - maintainers = kdepimTeam; - }; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - qtwebengine - - grantlee - - kcmutils - kcrash - kiconthemes - knotifyconfig - kparts - ktexteditor - kuserfeedback - kwindowsystem - - akonadi - akonadi-mime - grantleetheme - kontactinterface - libkdepim - libkleo - messagelib - syndication - ]; - outputs = [ - "out" - "dev" - ]; -} diff --git a/pkgs/applications/kde/alligator.nix b/pkgs/applications/kde/alligator.nix deleted file mode 100644 index 0a57cece717e..000000000000 --- a/pkgs/applications/kde/alligator.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ - lib, - mkDerivation, - - cmake, - extra-cmake-modules, - - kconfig, - kcoreaddons, - ki18n, - kirigami-addons, - kirigami2, - qtquickcontrols2, - syndication, -}: - -mkDerivation { - pname = "alligator"; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - ]; - - buildInputs = [ - kconfig - kcoreaddons - ki18n - kirigami-addons - kirigami2 - qtquickcontrols2 - syndication - ]; - - meta = with lib; { - description = "RSS reader made with kirigami"; - mainProgram = "alligator"; - homepage = "https://invent.kde.org/plasma-mobile/alligator"; - # https://invent.kde.org/plasma-mobile/alligator/-/commit/db30f159c4700244532b17a260deb95551045b7a - # * SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL - license = with licenses; [ - gpl2Only - gpl3Only - ]; - maintainers = [ ]; - }; -} diff --git a/pkgs/applications/kde/analitza.nix b/pkgs/applications/kde/analitza.nix deleted file mode 100644 index 74d1b4f816f0..000000000000 --- a/pkgs/applications/kde/analitza.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ - lib, - mkDerivation, - cmake, - extra-cmake-modules, - qtbase, - qtsvg, - eigen, - kdoctools, - qttools, -}: - -mkDerivation { - pname = "analitza"; - - nativeBuildInputs = [ - cmake - eigen - extra-cmake-modules - kdoctools - qttools - ]; - - buildInputs = [ - qtbase - qtsvg - ]; - - meta = with lib; { - description = "Front end to powerful mathematics and statistics packages"; - homepage = "https://cantor.kde.org/"; - license = with licenses; [ - gpl2Only - lgpl2Only - fdl12Only - ]; - maintainers = with maintainers; [ hqurve ]; - }; -} diff --git a/pkgs/applications/kde/angelfish.nix b/pkgs/applications/kde/angelfish.nix deleted file mode 100644 index 43f1241c66ad..000000000000 --- a/pkgs/applications/kde/angelfish.nix +++ /dev/null @@ -1,80 +0,0 @@ -{ - lib, - mkDerivation, - cargo, - cmake, - corrosion, - extra-cmake-modules, - fetchpatch2, - futuresql, - kconfig, - kcoreaddons, - kdbusaddons, - ki18n, - kirigami-addons, - kirigami2, - knotifications, - kpurpose, - kwindowsystem, - qcoro, - qtfeedback, - qtquickcontrols2, - qqc2-desktop-style, - qtwebengine, - rustPlatform, - rustc, - srcs, -}: - -mkDerivation rec { - pname = "angelfish"; - - patches = [ - (fetchpatch2 { - name = "fix-build-with-corrosion-0.5.patch"; - url = "https://invent.kde.org/network/angelfish/-/commit/b04928e3b62a11b647622b81fb67b7c0db656ac8.patch"; - hash = "sha256-9rpkMKQKrvGJFIQDwSIeeZyk4/vd348r660mBOKzM2E="; - }) - ]; - - cargoDeps = rustPlatform.fetchCargoVendor { - # include version in the name so we invalidate the FOD - name = "${pname}-${srcs.angelfish.version}"; - inherit (srcs.angelfish) src; - hash = "sha256-M3CtP7eWqOxMvnak6K3QvB/diu4jAfMmlsa6ySFIHCU="; - }; - - nativeBuildInputs = [ - cmake - corrosion - extra-cmake-modules - rustPlatform.cargoSetupHook - cargo - rustc - ]; - - buildInputs = [ - futuresql - kconfig - kcoreaddons - kdbusaddons - ki18n - kirigami-addons - kirigami2 - knotifications - kpurpose - kwindowsystem - qcoro - qtfeedback - qtquickcontrols2 - qqc2-desktop-style - qtwebengine - ]; - - meta = with lib; { - description = "Web browser for Plasma Mobile"; - homepage = "https://invent.kde.org/plasma-mobile/angelfish"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ dotlambda ]; - }; -} diff --git a/pkgs/applications/kde/arianna.nix b/pkgs/applications/kde/arianna.nix deleted file mode 100644 index 79cb3670895f..000000000000 --- a/pkgs/applications/kde/arianna.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ - lib, - mkDerivation, - cmake, - extra-cmake-modules, - qtbase, - qtdeclarative, - qtquickcontrols2, - qtwebchannel, - qtwebengine, - qtwebsockets, - baloo, - karchive, - kconfig, - kcoreaddons, - kdbusaddons, - kfilemetadata, - ki18n, - kirigami-addons, - kitemmodels, - kquickcharts, - kwindowsystem, - qqc2-desktop-style, -}: - -mkDerivation { - pname = "arianna"; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - ]; - - buildInputs = [ - qtbase - qtdeclarative - qtquickcontrols2 - qtwebchannel - qtwebengine - qtwebsockets - baloo - karchive - kconfig - kcoreaddons - kdbusaddons - kfilemetadata - ki18n - kirigami-addons - kitemmodels - kquickcharts - kwindowsystem - qqc2-desktop-style - ]; - - meta = with lib; { - description = "Epub Reader for Plasma and Plasma Mobile"; - mainProgram = "arianna"; - homepage = "https://invent.kde.org/graphics/arianna"; - license = licenses.gpl3Plus; - platforms = platforms.unix; - maintainers = with maintainers; [ Thra11 ]; - }; -} diff --git a/pkgs/applications/kde/ark/default.nix b/pkgs/applications/kde/ark/default.nix deleted file mode 100644 index 3a3a5810e8b7..000000000000 --- a/pkgs/applications/kde/ark/default.nix +++ /dev/null @@ -1,96 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - kdoctools, - breeze-icons, - karchive, - kconfig, - kcrash, - kdbusaddons, - ki18n, - kiconthemes, - kitemmodels, - khtml, - kio, - kparts, - kpty, - kservice, - kwidgetsaddons, - libarchive, - libzip, - # Archive tools - p7zip, - lrzip, - unar, - # Unfree tools - unfreeEnableUnrar ? false, - unrar, -}: - -let - extraTools = [ - p7zip - lrzip - unar - ] - ++ lib.optional unfreeEnableUnrar unrar; -in - -mkDerivation { - pname = "ark"; - - outputs = [ - "out" - "dev" - ]; - - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - - buildInputs = [ - libarchive - libzip - ] - ++ extraTools; - - propagatedBuildInputs = [ - breeze-icons - karchive - kconfig - kcrash - kdbusaddons - khtml - ki18n - kiconthemes - kio - kitemmodels - kparts - kpty - kservice - kwidgetsaddons - ]; - - qtWrapperArgs = [ - "--prefix" - "PATH" - ":" - (lib.makeBinPath extraTools) - ]; - - meta = with lib; { - homepage = "https://apps.kde.org/ark/"; - description = "Graphical file compression/decompression utility"; - mainProgram = "ark"; - license = - with licenses; - [ - gpl2 - lgpl3 - ] - ++ optional unfreeEnableUnrar unfree; - maintainers = [ maintainers.ttuegel ]; - }; -} diff --git a/pkgs/applications/kde/audiotube.nix b/pkgs/applications/kde/audiotube.nix deleted file mode 100644 index f2b815c9699d..000000000000 --- a/pkgs/applications/kde/audiotube.nix +++ /dev/null @@ -1,79 +0,0 @@ -{ - lib, - mkDerivation, - - extra-cmake-modules, - wrapGAppsHook3, - - futuresql, - gst_all_1, - kcoreaddons, - kcrash, - ki18n, - kirigami2, - kirigami-addons, - kpurpose, - qcoro, - qtimageformats, - qtmultimedia, - qtquickcontrols2, - python3Packages, -}: - -mkDerivation rec { - pname = "audiotube"; - - nativeBuildInputs = [ - extra-cmake-modules - wrapGAppsHook3 - python3Packages.wrapPython - python3Packages.pybind11 - ]; - - buildInputs = [ - futuresql - kcoreaddons - kcrash - ki18n - kirigami2 - kirigami-addons - kpurpose - qcoro - qtimageformats - qtmultimedia - qtquickcontrols2 - ] - ++ (with gst_all_1; [ - gst-plugins-bad - gst-plugins-base - gst-plugins-good - gstreamer - ]) - ++ pythonPath; - - pythonPath = with python3Packages; [ - yt-dlp - ytmusicapi - ]; - - preFixup = '' - buildPythonPath "$pythonPath" - qtWrapperArgs+=(--prefix PYTHONPATH : "$program_PYTHONPATH") - qtWrapperArgs+=("''${gappsWrapperArgs[@]}") - ''; - dontWrapGApps = true; - - meta = with lib; { - description = "Client for YouTube Music"; - mainProgram = "audiotube"; - homepage = "https://invent.kde.org/plasma-mobile/audiotube"; - # https://invent.kde.org/plasma-mobile/audiotube/-/tree/c503d0607a3386112beaa9cf990ab85fe33ef115/LICENSES - license = with licenses; [ - bsd2 - cc0 - gpl2Only - gpl3Only - ]; - maintainers = [ ]; - }; -} diff --git a/pkgs/applications/kde/baloo-widgets.nix b/pkgs/applications/kde/baloo-widgets.nix deleted file mode 100644 index 646a4582a5e2..000000000000 --- a/pkgs/applications/kde/baloo-widgets.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - kdoctools, - baloo, - kconfig, - kfilemetadata, - ki18n, - kio, - kservice, -}: - -mkDerivation { - pname = "baloo-widgets"; - meta = { - license = [ lib.licenses.lgpl21 ]; - maintainers = [ lib.maintainers.ttuegel ]; - }; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - propagatedBuildInputs = [ - baloo - kconfig - kfilemetadata - ki18n - kio - kservice - ]; - outputs = [ - "out" - "dev" - ]; -} diff --git a/pkgs/applications/kde/bomber.nix b/pkgs/applications/kde/bomber.nix deleted file mode 100644 index 9e84dc1edfa3..000000000000 --- a/pkgs/applications/kde/bomber.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ - mkDerivation, - lib, - libkdegames, - extra-cmake-modules, - kdeclarative, - knewstuff, -}: - -mkDerivation { - pname = "bomber"; - meta = with lib; { - homepage = "https://apps.kde.org/bomber/"; - description = "Single player arcade game"; - mainProgram = "bomber"; - longDescription = '' - Bomber is a single player arcade game. The player is invading various - cities in a plane that is decreasing in height. - - The goal of the game is to destroy all the buildings and advance to the next level. - Each level gets a bit harder by increasing the speed of the plane and the height of the buildings. - ''; - maintainers = with maintainers; [ freezeboy ]; - license = licenses.gpl2Plus; - platforms = platforms.linux; - }; - nativeBuildInputs = [ - extra-cmake-modules - ]; - buildInputs = [ - kdeclarative - knewstuff - libkdegames - ]; -} diff --git a/pkgs/applications/kde/bovo.nix b/pkgs/applications/kde/bovo.nix deleted file mode 100644 index b441234d65fe..000000000000 --- a/pkgs/applications/kde/bovo.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ - mkDerivation, - lib, - libkdegames, - extra-cmake-modules, - kdeclarative, - knewstuff, -}: - -mkDerivation { - pname = "bovo"; - meta = with lib; { - homepage = "https://apps.kde.org/bovo/"; - description = "Five in a row application"; - mainProgram = "bovo"; - longDescription = '' - Bovo is a Gomoku (from Japanese 五目並べ - lit. "five points") like game for two players, - where the opponents alternate in placing their respective pictogram on the game board. - (Also known as: Connect Five, Five in a row, X and O, Naughts and Crosses) - ''; - maintainers = with maintainers; [ freezeboy ]; - license = licenses.gpl2Plus; - platforms = platforms.linux; - }; - nativeBuildInputs = [ - extra-cmake-modules - ]; - buildInputs = [ - kdeclarative - knewstuff - libkdegames - ]; -} diff --git a/pkgs/applications/kde/calendarsupport.nix b/pkgs/applications/kde/calendarsupport.nix deleted file mode 100644 index f28eb200ce68..000000000000 --- a/pkgs/applications/kde/calendarsupport.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ - mkDerivation, - lib, - kdepimTeam, - extra-cmake-modules, - kdoctools, - akonadi, - akonadi-calendar, - akonadi-mime, - akonadi-notes, - kcalutils, - kholidays, - kidentitymanagement, - kmime, - pimcommon, - qttools, -}: - -mkDerivation { - pname = "calendarsupport"; - meta = { - license = with lib.licenses; [ - gpl2Plus - lgpl21Plus - fdl12Plus - ]; - maintainers = kdepimTeam; - }; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - akonadi - akonadi-mime - akonadi-notes - kcalutils - kholidays - pimcommon - qttools - ]; - propagatedBuildInputs = [ - akonadi-calendar - kidentitymanagement - kmime - ]; - outputs = [ - "out" - "dev" - ]; - postInstall = '' - # added as an include directory by cmake files and fails to compile if it's missing - mkdir -p "$dev/include/KF5" - ''; -} diff --git a/pkgs/applications/kde/calindori.nix b/pkgs/applications/kde/calindori.nix deleted file mode 100644 index fd8626c9d224..000000000000 --- a/pkgs/applications/kde/calindori.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ - lib, - mkDerivation, - - cmake, - extra-cmake-modules, - - kcalendarcore, - kconfig, - kcoreaddons, - kdbusaddons, - ki18n, - kirigami2, - knotifications, - kpeople, - kservice, - qtquickcontrols2, -}: - -mkDerivation { - pname = "calindori"; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - ]; - - buildInputs = [ - kcalendarcore - kconfig - kcoreaddons - kdbusaddons - ki18n - kirigami2 - knotifications - kpeople - kservice - qtquickcontrols2 - ]; - - meta = with lib; { - description = "Calendar for Plasma Mobile"; - homepage = "https://invent.kde.org/plasma-mobile/calindori"; - license = licenses.gpl3Plus; - maintainers = [ ]; - }; -} diff --git a/pkgs/applications/kde/cantor.nix b/pkgs/applications/kde/cantor.nix deleted file mode 100644 index cd9d8751ba8c..000000000000 --- a/pkgs/applications/kde/cantor.nix +++ /dev/null @@ -1,131 +0,0 @@ -{ - lib, - mkDerivation, - - cmake, - extra-cmake-modules, - makeWrapper, - shared-mime-info, - - fetchpatch, - qtbase, - qtsvg, - qttools, - qtwebengine, - qtxmlpatterns, - - poppler, - - karchive, - kcompletion, - kconfig, - kcoreaddons, - kcrash, - kdoctools, - ki18n, - kiconthemes, - kio, - knewstuff, - kparts, - kpty, - ktexteditor, - ktextwidgets, - kxmlgui, - syntax-highlighting, - - libspectre, - - # Backends. Set to null if you want to omit from the build - withAnalitza ? true, - analitza, - wtihJulia ? true, - julia, - withQalculate ? true, - libqalculate, - withLua ? true, - luajit, - withPython ? true, - python3, - withR ? true, - R, - withSage ? true, - sage, - sage-with-env ? sage.with-env, -}: - -mkDerivation { - pname = "cantor"; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - makeWrapper - shared-mime-info - qttools - ]; - - buildInputs = [ - qtbase - qtsvg - qtwebengine - qtxmlpatterns - - poppler - - karchive - kcompletion - kconfig - kcoreaddons - kcrash - kdoctools - ki18n - kiconthemes - kio - knewstuff - kparts - kpty - ktexteditor - ktextwidgets - kxmlgui - syntax-highlighting - - libspectre - ] - # backends - ++ lib.optional withAnalitza analitza - ++ lib.optional wtihJulia julia - ++ lib.optional withQalculate libqalculate - ++ lib.optional withLua luajit - ++ lib.optional withPython python3 - ++ lib.optional withR R - ++ lib.optional withSage sage-with-env; - - qtWrapperArgs = [ - "--prefix PATH : ${placeholder "out"}/bin" - ] - ++ lib.optional withSage "--prefix PATH : ${sage-with-env}/bin"; - - # Causes failures on Hydra and ofborg from some reason - enableParallelBuilding = false; - - patches = [ - # fix build for julia 1.1 from upstream - (fetchpatch { - url = "https://github.com/KDE/cantor/commit/ed9525ec7895c2251668d11218f16f186db48a59.patch?full_index=1"; - hash = "sha256-paq0e7Tl2aiUjBf1bDHLLUpShwdCQLICNTPNsXSoe5M="; - }) - ]; - - meta = { - description = "Front end to powerful mathematics and statistics packages"; - homepage = "https://cantor.kde.org/"; - license = with lib.licenses; [ - bsd3 - cc0 - gpl2Only - gpl2Plus - gpl3Only - ]; - maintainers = with lib.maintainers; [ hqurve ]; - }; -} diff --git a/pkgs/applications/kde/colord-kde.nix b/pkgs/applications/kde/colord-kde.nix deleted file mode 100644 index 02fe456061d7..000000000000 --- a/pkgs/applications/kde/colord-kde.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - ki18n, - kconfig, - kconfigwidgets, - kcoreaddons, - kdbusaddons, - kiconthemes, - kirigami-addons, - kcmutils, - kio, - knotifications, - plasma-framework, - kwidgetsaddons, - kwindowsystem, - kitemmodels, - kitemviews, - lcms2, - libXrandr, - qtx11extras, -}: - -mkDerivation { - pname = "colord-kde"; - - nativeBuildInputs = [ extra-cmake-modules ]; - - buildInputs = [ - kconfig - kconfigwidgets - kcoreaddons - kdbusaddons - kiconthemes - kirigami-addons - kcmutils - ki18n - kio - knotifications - plasma-framework - kwidgetsaddons - kwindowsystem - kitemmodels - kitemviews - lcms2 - libXrandr - qtx11extras - ]; - - meta = with lib; { - homepage = "https://projects.kde.org/projects/playground/graphics/colord-kde"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ ttuegel ]; - }; -} diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix deleted file mode 100644 index f87b8c7eae15..000000000000 --- a/pkgs/applications/kde/default.nix +++ /dev/null @@ -1,284 +0,0 @@ -/* - # New packages - - READ THIS FIRST - - This module is for official packages in the KDE Gear. All available - packages are listed in `./srcs.nix`, although some are not yet - packaged in Nixpkgs (see below). - - IF YOUR PACKAGE IS NOT LISTED IN `./srcs.nix`, IT DOES NOT GO HERE. - - Many of the packages released upstream are not yet built in Nixpkgs due to lack - of demand. To add a Nixpkgs build for an upstream package, copy one of the - existing packages here and modify it as necessary. A simple example package that - still shows most of the available features is in `./gwenview`. - - # Updates - - 1. Update the URL in `./fetch.sh`. - 2. Run `./maintainers/scripts/fetch-kde-qt.sh pkgs/applications/kde` - 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, - config, - 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 "http://www.kde.org"; - platforms = meta.platforms or lib.platforms.linux; - }; - } - ); - - packages = - self: - with self; - let - callPackage = self.newScope { - inherit mkDerivation; - - # Team of maintainers assigned to the KDE PIM suite - kdepimTeam = with lib.maintainers; [ - ttuegel - vandenoever - nyanloutre - ]; - }; - in - { - akonadi = callPackage ./akonadi { }; - akonadi-calendar = callPackage ./akonadi-calendar.nix { }; - akonadi-calendar-tools = callPackage ./akonadi-calendar-tools.nix { }; - akonadi-contacts = callPackage ./akonadi-contacts.nix { }; - akonadi-import-wizard = callPackage ./akonadi-import-wizard.nix { }; - akonadi-mime = callPackage ./akonadi-mime.nix { }; - akonadi-notes = callPackage ./akonadi-notes.nix { }; - akonadi-search = callPackage ./akonadi-search.nix { }; - akonadiconsole = callPackage ./akonadiconsole.nix { }; - akregator = callPackage ./akregator.nix { }; - analitza = callPackage ./analitza.nix { }; - arianna = callPackage ./arianna.nix { }; - ark = callPackage ./ark { }; - baloo-widgets = callPackage ./baloo-widgets.nix { }; - bomber = callPackage ./bomber.nix { }; - bovo = callPackage ./bovo.nix { }; - calendarsupport = callPackage ./calendarsupport.nix { }; - colord-kde = callPackage ./colord-kde.nix { }; - cantor = callPackage ./cantor.nix { }; - dolphin = callPackage ./dolphin.nix { }; - dolphin-plugins = callPackage ./dolphin-plugins.nix { }; - dragon = callPackage ./dragon.nix { }; - elisa = callPackage ./elisa.nix { }; - eventviews = callPackage ./eventviews.nix { }; - falkon = callPackage ./falkon.nix { }; - ffmpegthumbs = callPackage ./ffmpegthumbs.nix { }; - filelight = callPackage ./filelight.nix { }; - ghostwriter = callPackage ./ghostwriter.nix { }; - granatier = callPackage ./granatier.nix { }; - grantleetheme = callPackage ./grantleetheme { }; - gwenview = callPackage ./gwenview { }; - incidenceeditor = callPackage ./incidenceeditor.nix { }; - juk = callPackage ./juk.nix { }; - kaccounts-integration = callPackage ./kaccounts-integration.nix { }; - kaccounts-providers = callPackage ./kaccounts-providers.nix { }; - kaddressbook = callPackage ./kaddressbook.nix { }; - kalarm = callPackage ./kalarm.nix { }; - kalgebra = callPackage ./kalgebra.nix { }; - merkuro = callPackage ./merkuro.nix { }; - kalzium = callPackage ./kalzium.nix { }; - kamoso = callPackage ./kamoso.nix { }; - kapman = callPackage ./kapman.nix { }; - kapptemplate = callPackage ./kapptemplate.nix { }; - kate = callPackage ./kate.nix { }; - katomic = callPackage ./katomic.nix { }; - kblackbox = callPackage ./kblackbox.nix { }; - kblocks = callPackage ./kblocks.nix { }; - kbounce = callPackage ./kbounce.nix { }; - kbreakout = callPackage ./kbreakout.nix { }; - kcachegrind = callPackage ./kcachegrind.nix { }; - kcalc = callPackage ./kcalc.nix { }; - kcalutils = callPackage ./kcalutils.nix { }; - kcharselect = callPackage ./kcharselect.nix { }; - kcolorchooser = callPackage ./kcolorchooser.nix { }; - kde-inotify-survey = callPackage ./kde-inotify-survey.nix { }; - kdebugsettings = callPackage ./kdebugsettings.nix { }; - kdeconnect-kde = callPackage ./kdeconnect-kde.nix { }; - kdegraphics-mobipocket = callPackage ./kdegraphics-mobipocket.nix { }; - kdegraphics-thumbnailers = callPackage ./kdegraphics-thumbnailers { }; - kdenetwork-filesharing = callPackage ./kdenetwork-filesharing.nix { }; - kdenlive = callPackage ./kdenlive { }; - kdepim-addons = callPackage ./kdepim-addons.nix { }; - kdepim-runtime = callPackage ./kdepim-runtime { }; - kdev-php = callPackage ./kdevelop/kdev-php.nix { }; - kdev-python = callPackage ./kdevelop/kdev-python.nix { }; - kdevelop = callPackage ./kdevelop/wrapper.nix { }; - kdevelop-pg-qt = callPackage ./kdevelop/kdevelop-pg-qt.nix { }; - kdevelop-unwrapped = callPackage ./kdevelop/kdevelop.nix { }; - kdf = callPackage ./kdf.nix { }; - kdialog = callPackage ./kdialog.nix { }; - kdiamond = callPackage ./kdiamond.nix { }; - keditbookmarks = callPackage ./keditbookmarks.nix { }; - kfind = callPackage ./kfind.nix { }; - kgeography = callPackage ./kgeography.nix { }; - kget = callPackage ./kget.nix { }; - kgpg = callPackage ./kgpg.nix { }; - khelpcenter = callPackage ./khelpcenter.nix { }; - kidentitymanagement = callPackage ./kidentitymanagement.nix { }; - kig = callPackage ./kig.nix { }; - kigo = callPackage ./kigo.nix { }; - killbots = callPackage ./killbots.nix { }; - kimap = callPackage ./kimap.nix { }; - kio-admin = callPackage ./kio-admin.nix { }; - kio-extras = callPackage ./kio-extras.nix { }; - kio-gdrive = callPackage ./kio-gdrive.nix { }; - kipi-plugins = callPackage ./kipi-plugins.nix { }; - kirigami-gallery = callPackage ./kirigami-gallery.nix { }; - kitinerary = callPackage ./kitinerary.nix { }; - kldap = callPackage ./kldap.nix { }; - kleopatra = callPackage ./kleopatra.nix { }; - klettres = callPackage ./klettres.nix { }; - klines = callPackage ./klines.nix { }; - kmag = callPackage ./kmag.nix { }; - kmahjongg = callPackage ./kmahjongg.nix { }; - kmail = callPackage ./kmail.nix { }; - kmail-account-wizard = callPackage ./kmail-account-wizard.nix { }; - kmailtransport = callPackage ./kmailtransport.nix { }; - kmbox = callPackage ./kmbox.nix { }; - kmime = callPackage ./kmime.nix { }; - kmines = callPackage ./kmines.nix { }; - kmix = callPackage ./kmix.nix { }; - kmousetool = callPackage ./kmousetool.nix { }; - kmplot = callPackage ./kmplot.nix { }; - knavalbattle = callPackage ./knavalbattle.nix { }; - knetwalk = callPackage ./knetwalk.nix { }; - knights = callPackage ./knights.nix { }; - knotes = callPackage ./knotes.nix { }; - kolf = callPackage ./kolf.nix { }; - kollision = callPackage ./kollision.nix { }; - kolourpaint = callPackage ./kolourpaint.nix { }; - kompare = callPackage ./kompare.nix { }; - konqueror = callPackage ./konqueror.nix { }; - konquest = callPackage ./konquest.nix { }; - konsole = callPackage ./konsole.nix { }; - kontact = callPackage ./kontact.nix { }; - konversation = callPackage ./konversation.nix { }; - kontactinterface = callPackage ./kontactinterface.nix { }; - kopeninghours = callPackage ./kopeninghours.nix { }; - korganizer = callPackage ./korganizer.nix { }; - kosmindoormap = callPackage ./kosmindoormap.nix { }; - kpat = callPackage ./kpat.nix { }; - kpimtextedit = callPackage ./kpimtextedit.nix { }; - kpkpass = callPackage ./kpkpass.nix { }; - kpmcore = callPackage ./kpmcore { }; - kpublictransport = callPackage ./kpublictransport.nix { }; - kqtquickcharts = callPackage ./kqtquickcharts.nix { }; - krdc = callPackage ./krdc.nix { }; - kreversi = callPackage ./kreversi.nix { }; - krfb = callPackage ./krfb.nix { }; - kruler = callPackage ./kruler.nix { }; - ksanecore = callPackage ./ksanecore.nix { }; - kshisen = callPackage ./kshisen.nix { }; - ksmtp = callPackage ./ksmtp { }; - kspaceduel = callPackage ./kspaceduel.nix { }; - ksquares = callPackage ./ksquares.nix { }; - ksudoku = callPackage ./ksudoku.nix { }; - ksystemlog = callPackage ./ksystemlog.nix { }; - kteatime = callPackage ./kteatime.nix { }; - ktimer = callPackage ./ktimer.nix { }; - ktnef = callPackage ./ktnef.nix { }; - ktorrent = callPackage ./ktorrent.nix { }; - kturtle = callPackage ./kturtle.nix { }; - kwalletmanager = callPackage ./kwalletmanager.nix { }; - kwave = callPackage ./kwave.nix { }; - libgravatar = callPackage ./libgravatar.nix { }; - libkcddb = callPackage ./libkcddb.nix { }; - libkdcraw = callPackage ./libkdcraw.nix { }; - libkdegames = callPackage ./libkdegames.nix { }; - libkdepim = callPackage ./libkdepim.nix { }; - libkexiv2 = callPackage ./libkexiv2.nix { }; - libkgapi = callPackage ./libkgapi.nix { }; - libkipi = callPackage ./libkipi.nix { }; - libkleo = callPackage ./libkleo.nix { }; - libkmahjongg = callPackage ./libkmahjongg.nix { }; - libkomparediff2 = callPackage ./libkomparediff2.nix { }; - libksane = callPackage ./libksane.nix { }; - libksieve = callPackage ./libksieve.nix { }; - libktorrent = callPackage ./libktorrent.nix { }; - mailcommon = callPackage ./mailcommon.nix { }; - mailimporter = callPackage ./mailimporter.nix { }; - marble = callPackage ./marble.nix { }; - mbox-importer = callPackage ./mbox-importer.nix { }; - messagelib = callPackage ./messagelib.nix { }; - minuet = callPackage ./minuet.nix { }; - okular = callPackage ./okular.nix { }; - palapeli = callPackage ./palapeli.nix { }; - partitionmanager = callPackage ./partitionmanager { }; - picmi = callPackage ./picmi.nix { }; - pim-data-exporter = callPackage ./pim-data-exporter.nix { }; - pim-sieve-editor = callPackage ./pim-sieve-editor.nix { }; - pimcommon = callPackage ./pimcommon.nix { }; - print-manager = callPackage ./print-manager.nix { }; - rocs = callPackage ./rocs.nix { }; - skanlite = callPackage ./skanlite.nix { }; - skanpage = callPackage ./skanpage.nix { }; - spectacle = callPackage ./spectacle.nix { }; - umbrello = callPackage ./umbrello.nix { }; - yakuake = callPackage ./yakuake.nix { }; - zanshin = callPackage ./zanshin.nix { }; - - # Plasma Mobile Gear - alligator = callPackage ./alligator.nix { }; - angelfish = callPackage ./angelfish.nix { inherit srcs; }; - audiotube = callPackage ./audiotube.nix { }; - calindori = callPackage ./calindori.nix { }; - kalk = callPackage ./kalk.nix { }; - kasts = callPackage ./kasts.nix { }; - kclock = callPackage ./kclock.nix { }; - keysmith = callPackage ./keysmith.nix { }; - koko = callPackage ./koko.nix { }; - kongress = callPackage ./kongress.nix { }; - krecorder = callPackage ./krecorder.nix { }; - ktrip = callPackage ./ktrip.nix { }; - kweather = callPackage ./kweather.nix { }; - plasmatube = callPackage ./plasmatube { }; - qmlkonsole = callPackage ./qmlkonsole.nix { }; - telly-skout = callPackage ./telly-skout.nix { }; - tokodon = callPackage ./tokodon.nix { }; - } - // lib.optionalAttrs config.allowAliases { - k3b = throw "libsForQt5.k3b has been dropped in favor of kdePackages.k3b"; - ktouch = throw "ktouch has been dropped due keyboard layout issues"; - }; - -in -lib.makeScope libsForQt5.newScope packages diff --git a/pkgs/applications/kde/dolphin-plugins.nix b/pkgs/applications/kde/dolphin-plugins.nix deleted file mode 100644 index 946fcd4143dd..000000000000 --- a/pkgs/applications/kde/dolphin-plugins.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - kdoctools, - dolphin, - ki18n, - kio, - kxmlgui, -}: - -mkDerivation { - pname = "dolphin-plugins"; - meta = { - license = [ lib.licenses.gpl2 ]; - maintainers = [ lib.maintainers.ttuegel ]; - }; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - propagatedBuildInputs = [ - dolphin - ki18n - kio - kxmlgui - ]; - outputs = [ - "out" - "dev" - ]; -} diff --git a/pkgs/applications/kde/dolphin.nix b/pkgs/applications/kde/dolphin.nix deleted file mode 100644 index 69ce5b03e455..000000000000 --- a/pkgs/applications/kde/dolphin.nix +++ /dev/null @@ -1,82 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - kdoctools, - baloo, - baloo-widgets, - kactivities, - kbookmarks, - kcmutils, - kcompletion, - kconfig, - kcoreaddons, - kdbusaddons, - kfilemetadata, - ki18n, - kiconthemes, - kinit, - kio, - knewstuff, - knotifications, - kparts, - ktexteditor, - kwindowsystem, - phonon, - solid, - kuserfeedback, - wayland, - qtwayland, - qtx11extras, - qtimageformats, -}: - -mkDerivation { - pname = "dolphin"; - meta = { - homepage = "https://apps.kde.org/dolphin/"; - description = "KDE file manager"; - license = with lib.licenses; [ - gpl2Plus - fdl12Plus - ]; - maintainers = [ lib.maintainers.ttuegel ]; - }; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - propagatedUserEnvPkgs = [ baloo ]; - propagatedBuildInputs = [ - baloo - baloo-widgets - kactivities - kbookmarks - kcmutils - kcompletion - kconfig - kcoreaddons - kdbusaddons - kfilemetadata - ki18n - kiconthemes - kinit - kio - knewstuff - knotifications - kparts - ktexteditor - kwindowsystem - phonon - solid - kuserfeedback - wayland - qtwayland - qtx11extras - qtimageformats - ]; - outputs = [ - "out" - "dev" - ]; -} diff --git a/pkgs/applications/kde/dragon.nix b/pkgs/applications/kde/dragon.nix deleted file mode 100644 index d1bc7233a5f8..000000000000 --- a/pkgs/applications/kde/dragon.nix +++ /dev/null @@ -1,74 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - kdoctools, - baloo, - baloo-widgets, - kactivities, - kbookmarks, - kcmutils, - kcompletion, - kconfig, - kcoreaddons, - kdbusaddons, - kfilemetadata, - ki18n, - kiconthemes, - kinit, - kio, - knewstuff, - knotifications, - kparts, - ktexteditor, - kwindowsystem, - phonon, - solid, - phonon-backend-gstreamer, -}: - -mkDerivation { - pname = "dragon"; - meta = { - homepage = "https://apps.kde.org/dragonplayer/"; - license = with lib.licenses; [ - gpl2Plus - fdl12Plus - ]; - description = "Simple media player for KDE"; - mainProgram = "dragon"; - maintainers = [ lib.maintainers.jonathanreeve ]; - }; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - propagatedBuildInputs = [ - baloo - baloo-widgets - kactivities - kbookmarks - kcmutils - kcompletion - kconfig - kcoreaddons - kdbusaddons - kfilemetadata - ki18n - kiconthemes - kinit - kio - knewstuff - knotifications - kparts - ktexteditor - kwindowsystem - phonon - solid - phonon-backend-gstreamer - ]; - outputs = [ - "out" - "dev" - ]; -} diff --git a/pkgs/applications/kde/elisa.nix b/pkgs/applications/kde/elisa.nix deleted file mode 100644 index f920f4811ae4..000000000000 --- a/pkgs/applications/kde/elisa.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - kdoctools, - qtmultimedia, - qtquickcontrols2, - qtwebsockets, - kconfig, - kcmutils, - kcrash, - kdeclarative, - kfilemetadata, - kinit, - kirigami2, - baloo, - libvlc, -}: - -mkDerivation { - pname = "elisa"; - - outputs = [ - "out" - "dev" - ]; - - buildInputs = [ libvlc ]; - - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - - propagatedBuildInputs = [ - baloo - kcmutils - kconfig - kcrash - kdeclarative - kfilemetadata - kinit - kirigami2 - qtmultimedia - qtquickcontrols2 - qtwebsockets - ]; - - meta = with lib; { - homepage = "https://apps.kde.org/elisa/"; - description = "Simple media player for KDE"; - mainProgram = "elisa"; - license = licenses.gpl3; - maintainers = with maintainers; [ peterhoeg ]; - }; -} diff --git a/pkgs/applications/kde/eventviews.nix b/pkgs/applications/kde/eventviews.nix deleted file mode 100644 index 12fbe28e6148..000000000000 --- a/pkgs/applications/kde/eventviews.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ - mkDerivation, - lib, - kdepimTeam, - extra-cmake-modules, - kdoctools, - akonadi, - calendarsupport, - kcalutils, - kdiagram, - libkdepim, - qtbase, - qttools, - kholidays, -}: - -mkDerivation { - pname = "eventviews"; - meta = { - license = with lib.licenses; [ - gpl2Plus - lgpl21Plus - fdl12Plus - ]; - maintainers = kdepimTeam; - }; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - akonadi - calendarsupport - kcalutils - kdiagram - libkdepim - qtbase - qttools - kholidays - ]; - outputs = [ - "out" - "dev" - ]; - postInstall = '' - # added as an include directory by cmake files and fails to compile if it's missing - mkdir -p "$dev/include/KF5" - ''; -} diff --git a/pkgs/applications/kde/falkon.nix b/pkgs/applications/kde/falkon.nix deleted file mode 100644 index e696acd20077..000000000000 --- a/pkgs/applications/kde/falkon.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ - stdenv, - mkDerivation, - lib, - cmake, - extra-cmake-modules, - pkg-config, - libpthreadstubs, - libxcb, - libXdmcp, - qtsvg, - qttools, - qtwebengine, - qtx11extras, - qtwayland, - wrapQtAppsHook, - kwallet, - kpurpose, - karchive, - kio, -}: - -mkDerivation { - pname = "falkon"; - - preConfigure = '' - export NONBLOCK_JS_DIALOGS=true - export KDE_INTEGRATION=true - export GNOME_INTEGRATION=false - export FALKON_PREFIX=$out - ''; - - buildInputs = [ - libpthreadstubs - libxcb - libXdmcp - qtsvg - qttools - qtwebengine - qtx11extras - kwallet - kpurpose - karchive - kio - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland ]; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - pkg-config - qttools - wrapQtAppsHook - ]; - - meta = with lib; { - description = "QtWebEngine based cross-platform web browser"; - mainProgram = "falkon"; - homepage = "https://www.falkon.org"; - license = licenses.gpl3; - maintainers = with maintainers; [ peterhoeg ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh deleted file mode 100644 index de4f09e09a0c..000000000000 --- a/pkgs/applications/kde/fetch.sh +++ /dev/null @@ -1 +0,0 @@ -WGET_ARGS=( https://download.kde.org/stable/release-service/23.08.5/src -A '*.tar.xz' ) diff --git a/pkgs/applications/kde/ffmpegthumbs.nix b/pkgs/applications/kde/ffmpegthumbs.nix deleted file mode 100644 index 76d04046d741..000000000000 --- a/pkgs/applications/kde/ffmpegthumbs.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - ffmpeg, - kio, - taglib, -}: - -mkDerivation { - pname = "ffmpegthumbs"; - meta = { - license = with lib.licenses; [ - gpl2 - bsd3 - ]; - maintainers = [ lib.maintainers.ttuegel ]; - }; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - ffmpeg - kio - taglib - ]; -} diff --git a/pkgs/applications/kde/filelight.nix b/pkgs/applications/kde/filelight.nix deleted file mode 100644 index b64add65981d..000000000000 --- a/pkgs/applications/kde/filelight.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - kdoctools, - kio, - kparts, - kxmlgui, - qtscript, - solid, - qtquickcontrols2, - kdeclarative, - kirigami2, - kquickcharts, -}: - -mkDerivation { - pname = "filelight"; - meta = { - description = "Disk usage statistics"; - mainProgram = "filelight"; - homepage = "https://apps.kde.org/filelight/"; - license = with lib.licenses; [ gpl2 ]; - maintainers = with lib.maintainers; [ vcunat ]; - }; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - propagatedBuildInputs = [ - kio - kparts - kxmlgui - qtscript - solid - qtquickcontrols2 - kdeclarative - kirigami2 - kquickcharts - ]; - outputs = [ - "out" - "dev" - ]; -} diff --git a/pkgs/applications/kde/ghostwriter.nix b/pkgs/applications/kde/ghostwriter.nix deleted file mode 100644 index 3541de3df6c4..000000000000 --- a/pkgs/applications/kde/ghostwriter.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ - lib, - mkDerivation, - extra-cmake-modules, - qttools, - qtwebengine, - kcoreaddons, - kconfigwidgets, - sonnet, - kxmlgui, - hunspell, - cmark, - multimarkdown, - pandoc, -}: - -mkDerivation { - pname = "ghostwriter"; - - nativeBuildInputs = [ - extra-cmake-modules - qttools - ]; - - buildInputs = [ - qtwebengine - hunspell - kcoreaddons - kconfigwidgets - sonnet - kxmlgui - ]; - - qtWrapperArgs = [ - "--prefix" - "PATH" - ":" - (lib.makeBinPath [ - cmark - multimarkdown - pandoc - ]) - ]; - - meta = with lib; { - description = "Cross-platform, aesthetic, distraction-free Markdown editor"; - mainProgram = "ghostwriter"; - homepage = "https://ghostwriter.kde.org/"; - changelog = "https://invent.kde.org/office/ghostwriter/-/blob/master/CHANGELOG.md"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ - dotlambda - erictapen - ]; - }; -} diff --git a/pkgs/applications/kde/granatier.nix b/pkgs/applications/kde/granatier.nix deleted file mode 100644 index 35683214a721..000000000000 --- a/pkgs/applications/kde/granatier.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ - mkDerivation, - lib, - libkdegames, - extra-cmake-modules, - kdeclarative, - knewstuff, -}: - -mkDerivation { - pname = "granatier"; - meta = with lib; { - homepage = "https://kde.org/applications/en/games/org.kde.granatier"; - description = "Clone of the classic Bomberman game"; - mainProgram = "granatier"; - maintainers = with maintainers; [ freezeboy ]; - license = licenses.gpl2Plus; - platforms = platforms.linux; - }; - nativeBuildInputs = [ - extra-cmake-modules - ]; - buildInputs = [ - kdeclarative - knewstuff - libkdegames - ]; -} diff --git a/pkgs/applications/kde/grantleetheme/default.nix b/pkgs/applications/kde/grantleetheme/default.nix deleted file mode 100644 index 7e5aa89f128e..000000000000 --- a/pkgs/applications/kde/grantleetheme/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ - mkDerivation, - lib, - kdepimTeam, - extra-cmake-modules, - kdoctools, - grantlee, - ki18n, - kiconthemes, - knewstuff, - kservice, - kxmlgui, - qtbase, -}: - -mkDerivation { - pname = "grantleetheme"; - meta = { - license = with lib.licenses; [ - gpl2Plus - lgpl21Plus - fdl12Plus - ]; - maintainers = kdepimTeam; - }; - outputs = [ - "out" - "dev" - ]; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - grantlee - ki18n - kiconthemes - knewstuff - kservice - kxmlgui - qtbase - ]; - propagatedBuildInputs = [ - grantlee - kiconthemes - knewstuff - ]; - postInstall = '' - # added as an include directory by cmake files and fails to compile if it's missing - mkdir -p "$dev/include/KF5" - - # This is a really disgusting hack, no idea how search paths work for kde, - # but apparently kde is looking in $out/$out rather than $out for this library. - # Having this symlink fixes kmail finding it and makes my html work (Yay!). - mkdir -p $out/$out/lib/grantlee/ - libpath=$(echo $out/lib/grantlee/*) - ln -s $libpath $out/$out/lib/grantlee/$(basename $libpath) - ''; -} diff --git a/pkgs/applications/kde/gwenview/default.nix b/pkgs/applications/kde/gwenview/default.nix deleted file mode 100644 index 13dc1b52a60b..000000000000 --- a/pkgs/applications/kde/gwenview/default.nix +++ /dev/null @@ -1,77 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - kdoctools, - exiv2, - lcms2, - cfitsio, - baloo, - kactivities, - kio, - kipi-plugins, - kitemmodels, - kparts, - libkdcraw, - libkipi, - phonon, - qtimageformats, - qtsvg, - qtx11extras, - kinit, - kpurpose, - kcolorpicker, - kimageannotator, - wayland, - wayland-protocols, - wayland-scanner, -}: - -mkDerivation { - pname = "gwenview"; - meta = { - homepage = "https://apps.kde.org/gwenview/"; - description = "KDE image viewer"; - license = with lib.licenses; [ - gpl2Plus - fdl12Plus - ]; - maintainers = [ lib.maintainers.ttuegel ]; - mainProgram = "gwenview"; - }; - - # Fix build with versioned kImageAnnotator - patches = [ ./kimageannotator.patch ]; - - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - wayland-scanner - ]; - buildInputs = [ - baloo - kactivities - kio - kitemmodels - kparts - libkdcraw - libkipi - phonon - exiv2 - lcms2 - cfitsio - qtimageformats - qtsvg - qtx11extras - kpurpose - kcolorpicker - kimageannotator - wayland - wayland-protocols - ]; - propagatedUserEnvPkgs = [ - kipi-plugins - libkipi - (lib.getBin kinit) - ]; -} diff --git a/pkgs/applications/kde/gwenview/kimageannotator.patch b/pkgs/applications/kde/gwenview/kimageannotator.patch deleted file mode 100644 index 83cba93e49c1..000000000000 --- a/pkgs/applications/kde/gwenview/kimageannotator.patch +++ /dev/null @@ -1,56 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 01db0fb1..06319c54 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -166,12 +166,12 @@ if(NOT WITHOUT_X11) - endif() - - if (QT_MAJOR_VERSION STREQUAL "5") -- find_package(kImageAnnotator) -- set_package_properties(kImageAnnotator PROPERTIES URL "https://github.com/ksnip/kImageAnnotator" DESCRIPTION "The kImageAnnotator library provides tools to annotate" TYPE REQUIRED) -- if(kImageAnnotator_FOUND) -+ find_package(kImageAnnotator-Qt5) -+ set_package_properties(kImageAnnotator-Qt5 PROPERTIES URL "https://github.com/ksnip/kImageAnnotator" DESCRIPTION "The kImageAnnotator library provides tools to annotate" TYPE REQUIRED) -+ if(kImageAnnotator-Qt5_FOUND) - set(KIMAGEANNOTATOR_FOUND 1) -- find_package(kColorPicker REQUIRED) -- if(NOT kImageAnnotator_VERSION VERSION_LESS 0.5.0) -+ find_package(kColorPicker-Qt5 REQUIRED) -+ if(NOT kImageAnnotator-Qt5_VERSION VERSION_LESS 0.5.0) - set(KIMAGEANNOTATOR_CAN_LOAD_TRANSLATIONS 1) - endif() - endif() -diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt -index 8c136835..ef4cff74 100644 ---- a/app/CMakeLists.txt -+++ b/app/CMakeLists.txt -@@ -157,6 +157,6 @@ target_link_libraries(slideshowfileitemaction - KF${QT_MAJOR_VERSION}::KIOWidgets - KF${QT_MAJOR_VERSION}::Notifications) - --if(kImageAnnotator_FOUND) -+if(kImageAnnotator-Qt5_FOUND) - target_link_libraries(gwenview kImageAnnotator::kImageAnnotator) - endif() -diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt -index 05a2ea67..4167a1bb 100644 ---- a/lib/CMakeLists.txt -+++ b/lib/CMakeLists.txt -@@ -157,7 +157,7 @@ set(gwenviewlib_SRCS - touch/touch_helper.cpp - ${GV_JPEG_DIR}/transupp.c - ) --if (kImageAnnotator_FOUND) -+if (kImageAnnotator-Qt5_FOUND) - set(gwenviewlib_SRCS ${gwenviewlib_SRCS} - annotate/annotatedialog.cpp - annotate/annotateoperation.cpp -@@ -338,7 +338,7 @@ if (GWENVIEW_SEMANTICINFO_BACKEND_BALOO) - ) - endif() - --if(kImageAnnotator_FOUND) -+if(kImageAnnotator-Qt5_FOUND) - target_link_libraries(gwenviewlib kImageAnnotator::kImageAnnotator) - endif() - diff --git a/pkgs/applications/kde/incidenceeditor.nix b/pkgs/applications/kde/incidenceeditor.nix deleted file mode 100644 index 36b056280992..000000000000 --- a/pkgs/applications/kde/incidenceeditor.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ - mkDerivation, - lib, - kdepimTeam, - extra-cmake-modules, - kdoctools, - akonadi, - akonadi-mime, - calendarsupport, - eventviews, - kdiagram, - kldap, - kmime, - pimcommon, - qtbase, -}: - -mkDerivation { - pname = "incidenceeditor"; - meta = { - license = with lib.licenses; [ - gpl2Plus - lgpl21Plus - fdl12Plus - ]; - maintainers = kdepimTeam; - }; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - akonadi - akonadi-mime - calendarsupport - eventviews - kdiagram - kldap - kmime - pimcommon - qtbase - ]; - outputs = [ - "out" - "dev" - ]; - postInstall = '' - # added as an include directory by cmake files and fails to compile if it's missing - mkdir -p "$dev/include/KF5" - ''; -} diff --git a/pkgs/applications/kde/juk.nix b/pkgs/applications/kde/juk.nix deleted file mode 100644 index 4e887562b070..000000000000 --- a/pkgs/applications/kde/juk.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ - lib, - mkDerivation, - extra-cmake-modules, - wrapQtAppsHook, - kdoctools, - kcoreaddons, - kxmlgui, - kio, - phonon, - taglib, -}: - -mkDerivation { - pname = "juk"; - - nativeBuildInputs = [ - extra-cmake-modules - wrapQtAppsHook - kdoctools - ]; - - buildInputs = [ - kcoreaddons - kxmlgui - kio - phonon - taglib - ]; - - meta = with lib; { - homepage = "https://invent.kde.org/multimedia/juk"; - description = "Audio jukebox app, supporting collections of MP3, Ogg Vorbis and FLAC audio files"; - mainProgram = "juk"; - license = licenses.gpl2Only; - platforms = platforms.linux; - maintainers = with maintainers; [ zendo ]; - }; -} diff --git a/pkgs/applications/kde/kaccounts-integration.nix b/pkgs/applications/kde/kaccounts-integration.nix deleted file mode 100644 index ef9b3deb2d19..000000000000 --- a/pkgs/applications/kde/kaccounts-integration.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - kdoctools, - kcmutils, - kcoreaddons, - kwallet, - accounts-qt, - signond, - qcoro, -}: - -mkDerivation { - pname = "kaccounts-integration"; - meta = with lib; { - homepage = "https://community.kde.org/KTp/Setting_up_KAccounts"; - description = "Online accounts integration"; - maintainers = with maintainers; [ freezeboy ]; - license = licenses.gpl2Plus; - platforms = platforms.linux; - }; - nativeBuildInputs = [ - extra-cmake-modules - ]; - buildInputs = [ - kcmutils - kcoreaddons - kdoctools - kwallet - accounts-qt - signond - qcoro - ]; -} diff --git a/pkgs/applications/kde/kaccounts-providers.nix b/pkgs/applications/kde/kaccounts-providers.nix deleted file mode 100644 index 3e265c376778..000000000000 --- a/pkgs/applications/kde/kaccounts-providers.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ - mkDerivation, - lib, - accounts-qt, - extra-cmake-modules, - intltool, - kaccounts-integration, - kcmutils, - kcoreaddons, - kdeclarative, - kdoctools, - kio, - kpackage, - kwallet, - qtwebengine, - signond, -}: - -mkDerivation { - pname = "kaccounts-providers"; - meta = with lib; { - homepage = "https://community.kde.org/KTp/Setting_up_KAccounts"; - description = "Online account providers"; - maintainers = with maintainers; [ kennyballou ]; - license = licenses.gpl2Plus; - platforms = platforms.linux; - }; - nativeBuildInputs = [ - extra-cmake-modules - intltool - kdoctools - ]; - buildInputs = [ - accounts-qt - kaccounts-integration - kcmutils - kcoreaddons - kdeclarative - kio - kpackage - kwallet - qtwebengine - signond - ]; -} diff --git a/pkgs/applications/kde/kaddressbook.nix b/pkgs/applications/kde/kaddressbook.nix deleted file mode 100644 index 9e01da6d5a19..000000000000 --- a/pkgs/applications/kde/kaddressbook.nix +++ /dev/null @@ -1,74 +0,0 @@ -{ - mkDerivation, - lib, - kdepimTeam, - extra-cmake-modules, - kdoctools, - akonadi, - akonadi-search, - grantlee, - grantleetheme, - kcmutils, - kcompletion, - kcrash, - kdbusaddons, - ki18n, - kontactinterface, - kparts, - kpimtextedit, - kuserfeedback, - kxmlgui, - libkdepim, - libkleo, - mailcommon, - pimcommon, - prison, - qgpgme, - qtbase, -}: - -mkDerivation { - pname = "kaddressbook"; - meta = { - homepage = "https://apps.kde.org/kaddressbook/"; - description = "KDE contact manager"; - mainProgram = "kaddressbook"; - license = with lib.licenses; [ - gpl2Plus - lgpl21Plus - fdl12Plus - ]; - maintainers = kdepimTeam; - }; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - akonadi - akonadi-search - grantlee - grantleetheme - kcmutils - kcompletion - kcrash - kdbusaddons - ki18n - kontactinterface - kparts - kpimtextedit - kuserfeedback - kxmlgui - libkdepim - libkleo - mailcommon - pimcommon - prison - qgpgme - qtbase - ]; - postInstall = '' - # added as an include directory by cmake files and fails to compile if it's missing - mkdir -p "$out/include/KF5" - ''; -} diff --git a/pkgs/applications/kde/kalarm.nix b/pkgs/applications/kde/kalarm.nix deleted file mode 100644 index 6a546c8f2355..000000000000 --- a/pkgs/applications/kde/kalarm.nix +++ /dev/null @@ -1,103 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - - kauth, - kcodecs, - kcompletion, - kconfig, - kconfigwidgets, - kdbusaddons, - kdoctools, - kguiaddons, - ki18n, - kiconthemes, - kidletime, - kjobwidgets, - kcmutils, - kio, - knotifications, - knotifyconfig, - kservice, - kwidgetsaddons, - kwindowsystem, - kxmlgui, - phonon, - - kimap, - akonadi, - akonadi-contacts, - akonadi-mime, - kcalendarcore, - kcalutils, - kholidays, - kidentitymanagement, - libkdepim, - mailcommon, - kmailtransport, - kmime, - pimcommon, - kpimtextedit, - messagelib, - - qtx11extras, - - kdepim-runtime, -}: - -mkDerivation { - pname = "kalarm"; - meta = { - homepage = "https://apps.kde.org/kalarm/"; - description = "Personal alarm scheduler"; - license = with lib.licenses; [ gpl2 ]; - maintainers = [ ]; - }; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - kauth - kcodecs - kcompletion - kconfig - kconfigwidgets - kdbusaddons - kdoctools - kguiaddons - ki18n - kiconthemes - kidletime - kjobwidgets - kcmutils - kio - knotifications - knotifyconfig - kservice - kwidgetsaddons - kwindowsystem - kxmlgui - phonon - - kimap - akonadi - akonadi-contacts - akonadi-mime - kcalendarcore - kcalutils - kholidays - kidentitymanagement - libkdepim - mailcommon - kmailtransport - kmime - pimcommon - kpimtextedit - messagelib - - qtx11extras - ]; - propagatedUserEnvPkgs = [ kdepim-runtime ]; -} diff --git a/pkgs/applications/kde/kalgebra.nix b/pkgs/applications/kde/kalgebra.nix deleted file mode 100644 index b3d6e7b76df4..000000000000 --- a/pkgs/applications/kde/kalgebra.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - kdoctools, - analitza, - ki18n, - kinit, - kirigami2, - kconfigwidgets, - kwidgetsaddons, - kio, - kxmlgui, - qtwebengine, - plasma-framework, -}: - -mkDerivation { - pname = "kalgebra"; - - outputs = [ - "out" - "dev" - ]; - - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - - buildInputs = [ - ki18n - analitza - kinit - kirigami2 - kconfigwidgets - kwidgetsaddons - kio - kxmlgui - qtwebengine - plasma-framework - ]; - - meta = { - homepage = "https://apps.kde.org/kalgebra/"; - description = "2D and 3D Graph Calculator"; - license = with lib.licenses; [ gpl2Plus ]; - maintainers = with lib.maintainers; [ ninjafb ]; - }; -} diff --git a/pkgs/applications/kde/kalk.nix b/pkgs/applications/kde/kalk.nix deleted file mode 100644 index 87fe82a281df..000000000000 --- a/pkgs/applications/kde/kalk.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ - lib, - mkDerivation, - - cmake, - extra-cmake-modules, - bison, - flex, - - gmp, - mpfr, - - kconfig, - kcoreaddons, - ki18n, - kirigami2, - kunitconversion, - qtfeedback, - qtquickcontrols2, -}: - -mkDerivation { - pname = "kalk"; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - bison - flex - ]; - - buildInputs = [ - gmp - mpfr - - kconfig - kcoreaddons - ki18n - kirigami2 - kunitconversion - qtfeedback - qtquickcontrols2 - ]; - - meta = with lib; { - description = "Calculator built with kirigami"; - mainProgram = "kalk"; - homepage = "https://invent.kde.org/plasma-mobile/kalk"; - license = licenses.gpl3Plus; - maintainers = [ ]; - }; -} diff --git a/pkgs/applications/kde/kalzium.nix b/pkgs/applications/kde/kalzium.nix deleted file mode 100644 index 8565fc6d8d72..000000000000 --- a/pkgs/applications/kde/kalzium.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - kdoctools, - ki18n, - kio, - openbabel, - qtscript, - kparts, - kplotting, - kunitconversion, -}: - -mkDerivation { - pname = "kalzium"; - meta = with lib; { - homepage = "https://edu.kde.org/kalzium/"; - description = "Program that shows you the Periodic Table of Elements"; - mainProgram = "kalzium"; - maintainers = with maintainers; [ freezeboy ]; - license = licenses.gpl2Plus; - platforms = platforms.linux; - }; - nativeBuildInputs = [ - extra-cmake-modules - ]; - buildInputs = [ - qtscript - #avogadro - kdoctools - ki18n - kio - openbabel - kparts - kplotting - kunitconversion - ]; -} diff --git a/pkgs/applications/kde/kamoso.nix b/pkgs/applications/kde/kamoso.nix deleted file mode 100644 index 42de6ca81e9f..000000000000 --- a/pkgs/applications/kde/kamoso.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - kdoctools, - wrapQtAppsHook, - qtdeclarative, - qtgraphicaleffects, - qtquickcontrols2, - kirigami2, - kpurpose, - gst_all_1, - pcre, -}: - -let - gst = with gst_all_1; [ - gstreamer - gst-libav - gst-plugins-base - gst-plugins-good - gst-plugins-bad - ]; - -in -mkDerivation { - pname = "kamoso"; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - wrapQtAppsHook - ]; - buildInputs = [ pcre ] ++ gst; - propagatedBuildInputs = [ - qtdeclarative - qtgraphicaleffects - qtquickcontrols2 - kirigami2 - kpurpose - ]; - - cmakeFlags = [ - "-DOpenGL_GL_PREFERENCE=GLVND" - "-DGSTREAMER_VIDEO_INCLUDE_DIR=${gst_all_1.gst-plugins-base.dev}/include/gstreamer-1.0" - ]; - - qtWrapperArgs = [ - "--prefix GST_PLUGIN_PATH : ${lib.makeSearchPathOutput "lib" "lib/gstreamer-1.0" gst}" - ]; - - meta = { - homepage = "https://apps.kde.org/kamoso/"; - description = "Simple and friendly program to use your camera"; - mainProgram = "kamoso"; - license = with lib.licenses; [ - lgpl21Only - gpl3Only - ]; - }; -} diff --git a/pkgs/applications/kde/kapman.nix b/pkgs/applications/kde/kapman.nix deleted file mode 100644 index 2d736f974cdc..000000000000 --- a/pkgs/applications/kde/kapman.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - kdoctools, - ki18n, - kio, - libkdegames, -}: - -mkDerivation { - pname = "kapman"; - meta = with lib; { - homepage = "https://kde.org/applications/en/games/org.kde.kapman"; - description = "Clone of the well known game Pac-Man"; - mainProgram = "kapman"; - maintainers = with maintainers; [ freezeboy ]; - license = licenses.gpl2Plus; - platforms = platforms.linux; - }; - nativeBuildInputs = [ - extra-cmake-modules - ]; - buildInputs = [ - libkdegames - kdoctools - ki18n - kio - ]; -} diff --git a/pkgs/applications/kde/kapptemplate.nix b/pkgs/applications/kde/kapptemplate.nix deleted file mode 100644 index 278e14a24427..000000000000 --- a/pkgs/applications/kde/kapptemplate.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ - lib, - mkDerivation, - cmake, - extra-cmake-modules, - qtbase, - kactivities, -}: -mkDerivation { - - pname = "kapptemplate"; - - nativeBuildInputs = [ - extra-cmake-modules - cmake - ]; - - buildInputs = [ - kactivities - qtbase - ]; - - meta = with lib; { - description = "KDE App Code Template Generator"; - mainProgram = "kapptemplate"; - license = licenses.gpl2; - homepage = "https://kde.org/applications/en/development/org.kde.kapptemplate"; - maintainers = [ maintainers.shamilton ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/kde/kasts.nix b/pkgs/applications/kde/kasts.nix deleted file mode 100644 index 63913df1bb2c..000000000000 --- a/pkgs/applications/kde/kasts.nix +++ /dev/null @@ -1,83 +0,0 @@ -{ - lib, - mkDerivation, - - cmake, - extra-cmake-modules, - wrapGAppsHook3, - - gst_all_1, - kconfig, - kcoreaddons, - ki18n, - kirigami-addons, - kirigami2, - networkmanager-qt, - qtkeychain, - qtmultimedia, - qtquickcontrols2, - syndication, - taglib, - threadweaver, -}: - -let - inherit (gst_all_1) - gstreamer - gst-plugins-base - gst-plugins-good - gst-plugins-bad - ; -in -mkDerivation { - pname = "kasts"; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - wrapGAppsHook3 - ]; - - buildInputs = [ - gst-plugins-bad - gst-plugins-base - gst-plugins-good - gstreamer - - kconfig - kcoreaddons - ki18n - kirigami-addons - kirigami2 - networkmanager-qt - qtkeychain - qtmultimedia - qtquickcontrols2 - syndication - taglib - threadweaver - ]; - - preFixup = '' - qtWrapperArgs+=("''${gappsWrapperArgs[@]}") - ''; - dontWrapGApps = true; - - meta = with lib; { - description = "Mobile podcast application"; - mainProgram = "kasts"; - homepage = "https://apps.kde.org/kasts/"; - # https://invent.kde.org/plasma-mobile/kasts/-/tree/master/LICENSES - license = with licenses; [ - bsd2 - cc-by-sa-40 - cc0 - gpl2Only - gpl2Plus - gpl3Only - gpl3Plus - lgpl3Plus - ]; - maintainers = [ ]; - }; -} diff --git a/pkgs/applications/kde/kate.nix b/pkgs/applications/kde/kate.nix deleted file mode 100644 index 6ac890208f57..000000000000 --- a/pkgs/applications/kde/kate.nix +++ /dev/null @@ -1,87 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - kdoctools, - kactivities, - kconfig, - kcrash, - kdbusaddons, - kguiaddons, - kiconthemes, - ki18n, - kinit, - kio, - kitemmodels, - kjobwidgets, - knewstuff, - knotifications, - konsole, - kparts, - ktexteditor, - kwindowsystem, - kwallet, - kxmlgui, - libgit2, - kuserfeedback, - plasma-framework, - qtscript, - threadweaver, - qtx11extras, -}: - -mkDerivation { - pname = "kate"; - meta = { - homepage = "https://apps.kde.org/kate/"; - description = "Advanced text editor"; - license = with lib.licenses; [ - gpl3 - lgpl3 - lgpl2 - ]; - maintainers = [ lib.maintainers.ttuegel ]; - }; - - # InitialPreference values are too high and end up making kate & - # kwrite defaults for anything considered text/plain. Resetting to - # 1, which is the default. - postPatch = '' - substituteInPlace apps/kate/data/org.kde.kate.desktop \ - --replace InitialPreference=9 InitialPreference=1 - substituteInPlace apps/kwrite/data/org.kde.kwrite.desktop \ - --replace InitialPreference=8 InitialPreference=1 - ''; - - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - libgit2 - kactivities - ki18n - kio - ktexteditor - kwindowsystem - plasma-framework - qtscript - kconfig - kcrash - kguiaddons - kiconthemes - kinit - kjobwidgets - kparts - kxmlgui - kdbusaddons - kwallet - kitemmodels - knotifications - threadweaver - knewstuff - kuserfeedback - qtx11extras - ]; - propagatedUserEnvPkgs = [ konsole ]; -} diff --git a/pkgs/applications/kde/katomic.nix b/pkgs/applications/kde/katomic.nix deleted file mode 100644 index b6b39e04365c..000000000000 --- a/pkgs/applications/kde/katomic.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - kdoctools, - ki18n, - kio, - libkdegames, - knewstuff, -}: - -mkDerivation { - pname = "katomic"; - meta = with lib; { - homepage = "https://kde.org/applications/en/games/org.kde.katomic"; - description = "Fun educational game built around molecular geometry"; - mainProgram = "katomic"; - maintainers = with maintainers; [ freezeboy ]; - license = licenses.gpl2Plus; - platforms = platforms.linux; - }; - nativeBuildInputs = [ - extra-cmake-modules - ]; - buildInputs = [ - knewstuff - libkdegames - kdoctools - ki18n - kio - ]; -} diff --git a/pkgs/applications/kde/kblackbox.nix b/pkgs/applications/kde/kblackbox.nix deleted file mode 100644 index 167a2d833011..000000000000 --- a/pkgs/applications/kde/kblackbox.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - kdoctools, - ki18n, - kio, - libkdegames, -}: - -mkDerivation { - pname = "kblackbox"; - meta = with lib; { - homepage = "https://kde.org/applications/en/games/org.kde.kblackbox"; - description = "Game of hide and seek played on a grid of boxes"; - mainProgram = "kblackbox"; - maintainers = with maintainers; [ freezeboy ]; - license = licenses.gpl2Plus; - platforms = platforms.linux; - }; - nativeBuildInputs = [ - extra-cmake-modules - ]; - buildInputs = [ - libkdegames - kdoctools - ki18n - kio - ]; -} diff --git a/pkgs/applications/kde/kblocks.nix b/pkgs/applications/kde/kblocks.nix deleted file mode 100644 index 80107c310a39..000000000000 --- a/pkgs/applications/kde/kblocks.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - kdoctools, - ki18n, - kio, - libkdegames, -}: - -mkDerivation { - pname = "kblocks"; - meta = with lib; { - homepage = "https://kde.org/applications/en/games/org.kde.kblocks"; - description = "Classic falling blocks game"; - mainProgram = "kblocks"; - maintainers = with maintainers; [ freezeboy ]; - license = licenses.gpl2Plus; - platforms = platforms.linux; - }; - nativeBuildInputs = [ - extra-cmake-modules - ]; - buildInputs = [ - libkdegames - kdoctools - ki18n - kio - ]; -} diff --git a/pkgs/applications/kde/kbounce.nix b/pkgs/applications/kde/kbounce.nix deleted file mode 100644 index 531f703489f9..000000000000 --- a/pkgs/applications/kde/kbounce.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - libkdegames, - kconfig, - kcrash, - kio, - ki18n, -}: - -mkDerivation { - pname = "kbounce"; - meta = with lib; { - homepage = "https://kde.org/applications/en/games/org.kde.kbounce"; - description = "Single player arcade game with the elements of puzzle"; - mainProgram = "kbounce"; - maintainers = with maintainers; [ freezeboy ]; - license = licenses.gpl2Plus; - platforms = platforms.linux; - }; - nativeBuildInputs = [ - extra-cmake-modules - ]; - buildInputs = [ - libkdegames - kconfig - kcrash - kio - ki18n - ]; -} diff --git a/pkgs/applications/kde/kbreakout.nix b/pkgs/applications/kde/kbreakout.nix deleted file mode 100644 index 71ce5517667a..000000000000 --- a/pkgs/applications/kde/kbreakout.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - cmake, - kdbusaddons, - ki18n, - kconfigwidgets, - kcrash, - kxmlgui, - libkdegames, -}: - -mkDerivation { - pname = "kbreakout"; - meta = { - homepage = "https://apps.kde.org/kbreakout/"; - description = "Breakout-like game"; - mainProgram = "kbreakout"; - license = with lib.licenses; [ - lgpl21 - gpl3 - ]; - }; - outputs = [ - "out" - "dev" - ]; - nativeBuildInputs = [ - cmake - extra-cmake-modules - ]; - propagatedBuildInputs = [ - kdbusaddons - ki18n - kconfigwidgets - kcrash - kxmlgui - libkdegames - ]; -} diff --git a/pkgs/applications/kde/kcachegrind.nix b/pkgs/applications/kde/kcachegrind.nix deleted file mode 100644 index db65a3ef4c29..000000000000 --- a/pkgs/applications/kde/kcachegrind.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - kdoctools, - karchive, - ki18n, - kio, - perl, - python3, - php, - qttools, - kdbusaddons, - makeBinaryWrapper, - graphviz, -}: - -mkDerivation { - pname = "kcachegrind"; - meta = { - homepage = "https://apps.kde.org/kcachegrind/"; - description = "Profiler frontend"; - license = with lib.licenses; [ gpl2 ]; - maintainers = with lib.maintainers; [ orivej ]; - }; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - makeBinaryWrapper - ]; - buildInputs = [ - karchive - ki18n - kio - perl - python3 - php - qttools - kdbusaddons - ]; - postInstall = '' - wrapProgram $out/bin/kcachegrind \ - --suffix PATH : "${lib.makeBinPath [ graphviz ]}" - ''; -} diff --git a/pkgs/applications/kde/kcalc.nix b/pkgs/applications/kde/kcalc.nix deleted file mode 100644 index bbfc5661ebac..000000000000 --- a/pkgs/applications/kde/kcalc.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - kdoctools, - gmp, - kconfig, - kconfigwidgets, - kcrash, - kguiaddons, - ki18n, - kinit, - knotifications, - kxmlgui, - mpfr, -}: - -mkDerivation { - pname = "kcalc"; - meta = { - homepage = "https://apps.kde.org/kcalc/"; - description = "Scientific calculator"; - mainProgram = "kcalc"; - license = with lib.licenses; [ gpl2 ]; - }; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - gmp - kconfig - kconfigwidgets - kcrash - kguiaddons - ki18n - kinit - knotifications - kxmlgui - mpfr - ]; -} diff --git a/pkgs/applications/kde/kcalutils.nix b/pkgs/applications/kde/kcalutils.nix deleted file mode 100644 index 3cfbc789a508..000000000000 --- a/pkgs/applications/kde/kcalutils.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ - mkDerivation, - lib, - kdepimTeam, - extra-cmake-modules, - kdoctools, - grantlee, - kcalendarcore, - kconfig, - kontactinterface, - kcoreaddons, - kidentitymanagement, - kpimtextedit, -}: - -mkDerivation { - pname = "kcalutils"; - meta = { - license = with lib.licenses; [ - gpl2Plus - lgpl21Plus - fdl12Plus - ]; - maintainers = kdepimTeam; - }; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - grantlee - kcalendarcore - kconfig - kontactinterface - kcoreaddons - kidentitymanagement - kpimtextedit - ]; - outputs = [ - "out" - "dev" - ]; - postInstall = '' - # added as an include directory by cmake files and fails to compile if it's missing - mkdir -p "$dev/include/KF5" - ''; -} diff --git a/pkgs/applications/kde/kcharselect.nix b/pkgs/applications/kde/kcharselect.nix deleted file mode 100644 index 5f92632cda85..000000000000 --- a/pkgs/applications/kde/kcharselect.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - kdoctools, - kbookmarks, - kconfig, - kconfigwidgets, - kcrash, - kcoreaddons, - ki18n, - kwidgetsaddons, - kxmlgui, -}: - -mkDerivation { - pname = "kcharselect"; - meta = { - homepage = "https://apps.kde.org/kcharselect/"; - license = lib.licenses.gpl2Plus; - maintainers = [ lib.maintainers.schmittlauch ]; - description = "Tool to select special characters from all installed fonts and copy them into the clipboard"; - mainProgram = "kcharselect"; - }; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - kbookmarks - kconfig - kconfigwidgets - kcoreaddons - kcrash - ki18n - kwidgetsaddons - kxmlgui - ]; - enableParallelBuilding = true; -} diff --git a/pkgs/applications/kde/kclock.nix b/pkgs/applications/kde/kclock.nix deleted file mode 100644 index 9a2abb608294..000000000000 --- a/pkgs/applications/kde/kclock.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ - lib, - mkDerivation, - - cmake, - extra-cmake-modules, - - kconfig, - kcoreaddons, - kdbusaddons, - ki18n, - kirigami-addons, - kirigami2, - knotifications, - plasma-framework, - qtmultimedia, - qtquickcontrols2, -}: - -mkDerivation { - pname = "kclock"; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - ]; - - buildInputs = [ - kconfig - kcoreaddons - kdbusaddons - ki18n - kirigami-addons - kirigami2 - knotifications - plasma-framework - qtmultimedia - qtquickcontrols2 - ]; - - meta = with lib; { - description = "Clock app for plasma mobile"; - homepage = "https://invent.kde.org/plasma-mobile/kclock"; - license = licenses.gpl2Plus; - maintainers = [ ]; - }; -} diff --git a/pkgs/applications/kde/kcolorchooser.nix b/pkgs/applications/kde/kcolorchooser.nix deleted file mode 100644 index 2a9777388b1c..000000000000 --- a/pkgs/applications/kde/kcolorchooser.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - ki18n, - kwidgetsaddons, - kxmlgui, -}: - -mkDerivation { - pname = "kcolorchooser"; - meta = { - homepage = "https://apps.kde.org/kcolorchooser/"; - description = "Color chooser"; - mainProgram = "kcolorchooser"; - license = with lib.licenses; [ mit ]; - maintainers = [ lib.maintainers.ttuegel ]; - }; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - ki18n - kwidgetsaddons - kxmlgui - ]; -} diff --git a/pkgs/applications/kde/kde-inotify-survey.nix b/pkgs/applications/kde/kde-inotify-survey.nix deleted file mode 100644 index 9fa9c91758e8..000000000000 --- a/pkgs/applications/kde/kde-inotify-survey.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - kauth, - kcoreaddons, - kdbusaddons, - ki18n, - knotifications, -}: - -mkDerivation { - pname = "kde-inotify-survey"; - - nativeBuildInputs = [ extra-cmake-modules ]; - - buildInputs = [ - kauth - kcoreaddons - kdbusaddons - ki18n - knotifications - ]; - - meta = { - description = "Tooling for monitoring inotify limits and informing the user when they have been or about to be reached"; - mainProgram = "kde-inotify-survey"; - homepage = "https://invent.kde.org/system/kde-inotify-survey"; - license = lib.licenses.gpl2Plus; - maintainers = [ ]; - }; -} diff --git a/pkgs/applications/kde/kdebugsettings.nix b/pkgs/applications/kde/kdebugsettings.nix deleted file mode 100644 index 968096d66871..000000000000 --- a/pkgs/applications/kde/kdebugsettings.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - kdoctools, - gettext, - kcoreaddons, - kconfig, - kdbusaddons, - kwidgetsaddons, - kitemviews, - kcompletion, - kxmlgui, - python3, -}: - -mkDerivation { - pname = "kdebugsettings"; - meta = { - homepage = "https://apps.kde.org/kdebugsettings/"; - description = "KDE debug settings"; - mainProgram = "kdebugsettings"; - license = with lib.licenses; [ gpl2 ]; - maintainers = [ ]; - }; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - gettext - kcoreaddons - kconfig - kdbusaddons - kwidgetsaddons - kitemviews - kcompletion - kxmlgui - python3 - ]; - propagatedUserEnvPkgs = [ ]; -} diff --git a/pkgs/applications/kde/kdeconnect-kde.nix b/pkgs/applications/kde/kdeconnect-kde.nix deleted file mode 100644 index 736a25ec58fd..000000000000 --- a/pkgs/applications/kde/kdeconnect-kde.nix +++ /dev/null @@ -1,87 +0,0 @@ -{ - mkDerivation, - extra-cmake-modules, - kcmutils, - kconfigwidgets, - kdbusaddons, - kdoctools, - ki18n, - kiconthemes, - kio, - kirigami2, - kirigami-addons, - knotifications, - kpeople, - kpeoplevcard, - kwayland, - lib, - libXtst, - libfakekey, - makeWrapper, - modemmanager-qt, - pulseaudio-qt, - qca-qt5, - qqc2-desktop-style, - qtgraphicaleffects, - qtmultimedia, - qtquickcontrols2, - qtx11extras, - breeze-icons, - sshfs, - wayland, - wayland-protocols, - wayland-scanner, - plasma-wayland-protocols, -}: - -mkDerivation { - pname = "kdeconnect-kde"; - - buildInputs = [ - kcmutils - kconfigwidgets - kdbusaddons - ki18n - kiconthemes - kio - kirigami2 - kirigami-addons - knotifications - kpeople - kpeoplevcard - kwayland - libXtst - libfakekey - modemmanager-qt - pulseaudio-qt - qca-qt5 - qqc2-desktop-style - qtgraphicaleffects - qtmultimedia - qtquickcontrols2 - qtx11extras - wayland - wayland-protocols - wayland-scanner - plasma-wayland-protocols - # otherwise buttons are blank on non-kde - breeze-icons - ]; - - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - makeWrapper - ]; - - qtWrapperArgs = [ - "--prefix PATH : ${lib.makeBinPath [ sshfs ]}" - ]; - - meta = with lib; { - description = "KDE Connect provides several features to integrate your phone and your computer"; - homepage = "https://community.kde.org/KDEConnect"; - license = with licenses; [ gpl2 ]; - mainProgram = "kdeconnect-app"; - }; -} diff --git a/pkgs/applications/kde/kdegraphics-mobipocket.nix b/pkgs/applications/kde/kdegraphics-mobipocket.nix deleted file mode 100644 index 221e8bbabcf1..000000000000 --- a/pkgs/applications/kde/kdegraphics-mobipocket.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - kio, -}: - -mkDerivation { - pname = "kdegraphics-mobipocket"; - meta = { - license = [ lib.licenses.gpl2Plus ]; - maintainers = [ lib.maintainers.ttuegel ]; - }; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ kio ]; - outputs = [ - "out" - "dev" - ]; -} diff --git a/pkgs/applications/kde/kdegraphics-thumbnailers/default.nix b/pkgs/applications/kde/kdegraphics-thumbnailers/default.nix deleted file mode 100644 index f3b59d245338..000000000000 --- a/pkgs/applications/kde/kdegraphics-thumbnailers/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ - mkDerivation, - lib, - ghostscript, - replaceVars, - extra-cmake-modules, - karchive, - kio, - libkexiv2, - libkdcraw, - kdegraphics-mobipocket, -}: - -mkDerivation { - pname = "kdegraphics-thumbnailers"; - meta = { - license = [ lib.licenses.lgpl21 ]; - maintainers = [ lib.maintainers.ttuegel ]; - }; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - karchive - kio - libkexiv2 - libkdcraw - kdegraphics-mobipocket - ]; - - patches = [ - # Hardcode patches to Ghostscript so PDF thumbnails work OOTB. - # Intentionally not doing the same for dvips because TeX is big. - (replaceVars ./gs-paths.patch { - gs = "${ghostscript}/bin/gs"; - }) - ]; -} diff --git a/pkgs/applications/kde/kdegraphics-thumbnailers/gs-paths.patch b/pkgs/applications/kde/kdegraphics-thumbnailers/gs-paths.patch deleted file mode 100644 index 5aa4a8d7444c..000000000000 --- a/pkgs/applications/kde/kdegraphics-thumbnailers/gs-paths.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/ps/gscreator.cpp b/ps/gscreator.cpp -index 5b84e49..cbb7c25 100644 ---- a/ps/gscreator.cpp -+++ b/ps/gscreator.cpp -@@ -101,7 +101,7 @@ static const char *epsprolog = - "[ ] 0 setdash newpath false setoverprint false setstrokeadjust\n"; - - static const char * gsargs_ps[] = { -- "gs", -+ "@gs@", - "-sDEVICE=png16m", - "-sOutputFile=-", - "-dSAFER", -@@ -120,7 +120,7 @@ static const char * gsargs_ps[] = { - }; - - static const char * gsargs_eps[] = { -- "gs", -+ "@gs@", - "-sDEVICE=png16m", - "-sOutputFile=-", - "-dSAFER", diff --git a/pkgs/applications/kde/kdenetwork-filesharing.nix b/pkgs/applications/kde/kdenetwork-filesharing.nix deleted file mode 100644 index 8300986b634e..000000000000 --- a/pkgs/applications/kde/kdenetwork-filesharing.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - kdoctools, - kcoreaddons, - kdeclarative, - ki18n, - kio, - kwidgetsaddons, - samba, - qcoro, -}: - -mkDerivation { - pname = "kdenetwork-filesharing"; - meta = { - license = [ - lib.licenses.gpl2 - lib.licenses.lgpl21 - ]; - maintainers = [ lib.maintainers.ttuegel ]; - }; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - kcoreaddons - kdeclarative - ki18n - kio - kwidgetsaddons - samba - qcoro - ]; -} diff --git a/pkgs/applications/kde/kdenlive/default.nix b/pkgs/applications/kde/kdenlive/default.nix deleted file mode 100644 index 5aa4c40fef19..000000000000 --- a/pkgs/applications/kde/kdenlive/default.nix +++ /dev/null @@ -1,124 +0,0 @@ -{ - mkDerivation, - replaceVars, - lib, - extra-cmake-modules, - breeze-icons, - breeze-qt5, - kdoctools, - kconfig, - kcrash, - kguiaddons, - kiconthemes, - ki18n, - kinit, - kdbusaddons, - knotifications, - knewstuff, - karchive, - knotifyconfig, - kplotting, - ktextwidgets, - mediainfo, - mlt, - shared-mime-info, - libv4l, - kfilemetadata, - ffmpeg-full, - frei0r, - phonon-backend-gstreamer, - qtdeclarative, - qtmultimedia, - qtnetworkauth, - qtquickcontrols2, - qtscript, - rttr, - kpurpose, - kdeclarative, - wrapGAppsHook3, - glaxnimate, -}: - -let - mlt-full = mlt.override { - ffmpeg = ffmpeg-full; - }; -in -mkDerivation { - pname = "kdenlive"; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - breeze-icons - breeze-qt5 - kconfig - kcrash - kdbusaddons - kfilemetadata - kguiaddons - ki18n - kiconthemes - kinit - knotifications - knewstuff - karchive - knotifyconfig - kplotting - ktextwidgets - mediainfo - mlt-full - phonon-backend-gstreamer - qtdeclarative - qtmultimedia - qtnetworkauth - qtquickcontrols2 - qtscript - shared-mime-info - libv4l - ffmpeg-full - frei0r - rttr - kpurpose - kdeclarative - wrapGAppsHook3 - ]; - - # Both MLT and FFMpeg paths must be set or Kdenlive will complain that it - # doesn't find them. See: - # https://github.com/NixOS/nixpkgs/issues/83885 - patches = [ - (replaceVars ./dependency-paths.patch { - inherit mediainfo glaxnimate; - ffmpeg = ffmpeg-full; - mlt = mlt-full; - }) - ]; - - postPatch = - # Module Qt5::Concurrent must be included in `find_package` before it is used. - '' - sed -i CMakeLists.txt -e '/find_package(Qt5 REQUIRED/ s|)| Concurrent)|' - ''; - - dontWrapGApps = true; - - # Frei0r path needs to be set too or Kdenlive will complain. See: - # https://github.com/NixOS/nixpkgs/issues/83885 - # https://github.com/NixOS/nixpkgs/issues/29614#issuecomment-488849325 - qtWrapperArgs = [ - "--set FREI0R_PATH ${frei0r}/lib/frei0r-1" - ]; - - preFixup = '' - qtWrapperArgs+=("''${gappsWrapperArgs[@]}") - ''; - - meta = { - homepage = "https://apps.kde.org/kdenlive/"; - description = "Video editor"; - license = with lib.licenses; [ gpl2Plus ]; - maintainers = with lib.maintainers; [ turion ]; - }; -} diff --git a/pkgs/applications/kde/kdenlive/dependency-paths.patch b/pkgs/applications/kde/kdenlive/dependency-paths.patch deleted file mode 100644 index 013960377268..000000000000 --- a/pkgs/applications/kde/kdenlive/dependency-paths.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff -u b/src/kdenlivesettings.kcfg b/src/kdenlivesettings.kcfg ---- b/src/kdenlivesettings.kcfg -+++ b/src/kdenlivesettings.kcfg -@@ -517,7 +517,7 @@ - - - -- -+ @mlt@/share/mlt/profiles - - - -@@ -527,27 +527,27 @@ - - - -- -+ @mlt@/bin/melt - - - - -- -+ @ffmpeg@/bin/ffmpeg - - - - -- -+ @ffmpeg@/bin/ffplay - - - - -- -+ @ffmpeg@/bin/ffprobe - - - - -- -+ @mediainfo@/bin/mediainfo - - - -@@ -657,5 +657,5 @@ - - -- -+ @glaxnimate@/bin/glaxnimate - - diff --git a/pkgs/applications/kde/kdepim-addons.nix b/pkgs/applications/kde/kdepim-addons.nix deleted file mode 100644 index e86e774416eb..000000000000 --- a/pkgs/applications/kde/kdepim-addons.nix +++ /dev/null @@ -1,78 +0,0 @@ -{ - mkDerivation, - lib, - kdepimTeam, - extra-cmake-modules, - shared-mime-info, - akonadi-import-wizard, - akonadi-notes, - calendarsupport, - eventviews, - incidenceeditor, - kcalendarcore, - kcalutils, - kconfig, - kdbusaddons, - kdeclarative, - kholidays, - ki18n, - kmime, - ktexteditor, - ktnef, - libgravatar, - libksieve, - mailcommon, - mailimporter, - messagelib, - poppler, - prison, - kpkpass, - kitinerary, - kontactinterface, - kaddressbook, - discount, -}: - -mkDerivation { - pname = "kdepim-addons"; - meta = { - license = with lib.licenses; [ - gpl2Plus - lgpl21Plus - ]; - maintainers = kdepimTeam; - }; - nativeBuildInputs = [ - extra-cmake-modules - shared-mime-info - ]; - buildInputs = [ - akonadi-import-wizard - akonadi-notes - calendarsupport - eventviews - incidenceeditor - kcalendarcore - kcalutils - kconfig - kdbusaddons - kdeclarative - kholidays - ki18n - kmime - ktexteditor - ktnef - libgravatar - libksieve - mailcommon - mailimporter - messagelib - poppler - prison - kpkpass - kitinerary - kontactinterface - kaddressbook - discount - ]; -} diff --git a/pkgs/applications/kde/kdepim-runtime/default.nix b/pkgs/applications/kde/kdepim-runtime/default.nix deleted file mode 100644 index 5287737fb4b1..000000000000 --- a/pkgs/applications/kde/kdepim-runtime/default.nix +++ /dev/null @@ -1,88 +0,0 @@ -{ - mkDerivation, - lib, - kdepimTeam, - extra-cmake-modules, - kdoctools, - shared-mime-info, - akonadi, - akonadi-calendar, - akonadi-contacts, - akonadi-mime, - akonadi-notes, - cyrus_sasl, - kholidays, - kcalutils, - kcontacts, - kdav, - kidentitymanagement, - kimap, - kldap, - kmailtransport, - kmbox, - kmime, - knotifications, - knotifyconfig, - pimcommon, - libkgapi, - libsecret, - qca-qt5, - qtkeychain, - qtnetworkauth, - qtspeech, - qtwebengine, - qtxmlpatterns, -}: - -mkDerivation { - pname = "kdepim-runtime"; - meta = { - license = with lib.licenses; [ - gpl2Plus - lgpl21Plus - fdl12Plus - ]; - maintainers = kdepimTeam; - }; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - shared-mime-info - ]; - buildInputs = [ - akonadi - akonadi-calendar - akonadi-contacts - akonadi-mime - akonadi-notes - kholidays - kcalutils - kcontacts - kdav - kidentitymanagement - kimap - kldap - kmailtransport - kmbox - kmime - knotifications - knotifyconfig - qtwebengine - pimcommon - libkgapi - libsecret - qca-qt5 - qtkeychain - qtnetworkauth - qtspeech - qtxmlpatterns - ]; - qtWrapperArgs = [ - "--prefix SASL_PATH : ${ - lib.makeSearchPath "lib/sasl2" [ - cyrus_sasl.out - libkgapi - ] - }" - ]; -} diff --git a/pkgs/applications/kde/kdevelop/kdev-php.nix b/pkgs/applications/kde/kdevelop/kdev-php.nix deleted file mode 100644 index b8b3cff36bc9..000000000000 --- a/pkgs/applications/kde/kdevelop/kdev-php.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ - mkDerivation, - lib, - cmake, - extra-cmake-modules, - threadweaver, - ktexteditor, - kdevelop-unwrapped, - kdevelop-pg-qt, -}: - -mkDerivation { - pname = "kdev-php"; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - ]; - buildInputs = [ - kdevelop-pg-qt - threadweaver - ktexteditor - kdevelop-unwrapped - ]; - - dontWrapQtApps = true; - - meta = with lib; { - maintainers = [ maintainers.aanderse ]; - platforms = platforms.linux; - description = "PHP support for KDevelop"; - homepage = "https://www.kdevelop.org"; - license = [ licenses.gpl2 ]; - }; -} diff --git a/pkgs/applications/kde/kdevelop/kdev-python.nix b/pkgs/applications/kde/kdevelop/kdev-python.nix deleted file mode 100644 index 284732de3037..000000000000 --- a/pkgs/applications/kde/kdevelop/kdev-python.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ - mkDerivation, - lib, - cmake, - extra-cmake-modules, - threadweaver, - ktexteditor, - kdevelop-unwrapped, - python3, -}: - -mkDerivation { - pname = "kdev-python"; - - cmakeFlags = [ - "-DPYTHON_EXECUTABLE=${lib.getExe python3}" - ]; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - ]; - buildInputs = [ - threadweaver - ktexteditor - kdevelop-unwrapped - ]; - - dontWrapQtApps = true; - - meta = with lib; { - maintainers = [ maintainers.aanderse ]; - platforms = platforms.linux; - description = "Python support for KDevelop"; - homepage = "https://www.kdevelop.org"; - license = [ licenses.gpl2 ]; - }; -} diff --git a/pkgs/applications/kde/kdevelop/kdevelop-pg-qt.nix b/pkgs/applications/kde/kdevelop/kdevelop-pg-qt.nix deleted file mode 100644 index f164e3f2e96f..000000000000 --- a/pkgs/applications/kde/kdevelop/kdevelop-pg-qt.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - cmake, - pkg-config, - extra-cmake-modules, - qtbase, -}: - -stdenv.mkDerivation rec { - pname = "kdevelop-pg-qt"; - version = "2.2.2"; - - src = fetchurl { - url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz"; - sha256 = "sha256-PVZgTEefjwSuMqUj7pHzB4xxcRfQ3rOelz4iSUy7ZfE="; - }; - - nativeBuildInputs = [ - cmake - pkg-config - extra-cmake-modules - ]; - - buildInputs = [ qtbase ]; - - dontWrapQtApps = true; - - meta = with lib; { - maintainers = [ maintainers.ambrop72 ]; - platforms = platforms.linux; - description = "Parser-generator from KDevplatform"; - mainProgram = "kdev-pg-qt"; - longDescription = '' - KDevelop-PG-Qt is the parser-generator from KDevplatform. - It is used for some KDevelop-languagesupport-plugins (Ruby, PHP, CSS...). - ''; - homepage = "https://www.kdevelop.org"; - license = with lib.licenses; [ lgpl2Plus ]; - }; -} diff --git a/pkgs/applications/kde/kdevelop/kdevelop.nix b/pkgs/applications/kde/kdevelop/kdevelop.nix deleted file mode 100644 index f1380474496b..000000000000 --- a/pkgs/applications/kde/kdevelop/kdevelop.nix +++ /dev/null @@ -1,145 +0,0 @@ -{ - mkDerivation, - lib, - cmake, - gettext, - pkg-config, - extra-cmake-modules, - qtquickcontrols, - qttools, - kde-cli-tools, - kconfig, - kdeclarative, - kdoctools, - kiconthemes, - ki18n, - kitemmodels, - kitemviews, - kjobwidgets, - kcmutils, - kio, - knewstuff, - knotifyconfig, - kparts, - ktexteditor, - threadweaver, - kxmlgui, - kwindowsystem, - grantlee, - kcrash, - karchive, - kguiaddons, - plasma-framework, - krunner, - kdevelop-pg-qt, - shared-mime-info, - libkomparediff2, - libksysguard, - konsole, - llvmPackages_13, - makeWrapper, - kpurpose, - boost, - qtwebengine, - cppcheck, -}: - -let - llvmPackages = llvmPackages_13; -in -mkDerivation { - pname = "kdevelop"; - - nativeBuildInputs = [ - cmake - gettext - pkg-config - extra-cmake-modules - makeWrapper - ]; - - buildInputs = [ - kdevelop-pg-qt - llvmPackages.llvm - llvmPackages.libclang - ]; - - propagatedBuildInputs = [ - qtquickcontrols - boost - libkomparediff2 - kconfig - kdeclarative - kdoctools - kiconthemes - ki18n - kitemmodels - kitemviews - kjobwidgets - kcmutils - kio - knewstuff - knotifyconfig - kparts - ktexteditor - threadweaver - kxmlgui - kwindowsystem - grantlee - plasma-framework - krunner - shared-mime-info - libksysguard - konsole - kcrash - karchive - kguiaddons - kpurpose - cppcheck - qtwebengine - ]; - - # https://cgit.kde.org/kdevelop.git/commit/?id=716372ae2e8dff9c51e94d33443536786e4bd85b - # required as nixos seems to be unable to find CLANG_BUILTIN_DIR - cmakeFlags = [ - "-DCLANG_BUILTIN_DIR=${lib.getLib llvmPackages.libclang}/lib/clang/${lib.getVersion llvmPackages.clang}/include" - ]; - - dontWrapQtApps = true; - - postInstall = '' - # The kdevelop! script (shell environment) needs qdbus and kioclient5 in PATH. - wrapProgram "$out/bin/kdevelop!" \ - --prefix PATH ":" "${ - lib.makeBinPath [ - qttools - kde-cli-tools - ] - }" - - wrapQtApp "$out/bin/kdevelop" - - # Fix the (now wrapped) kdevelop! to find things in right places: - # - Fixup the one use where KDEV_BASEDIR is assumed to contain kdevelop. - kdev_fixup_sed+=";s|\\\$KDEV_BASEDIR/kdevelop|$out/bin/kdevelop|" - sed -E -i "$kdev_fixup_sed" "$out/bin/.kdevelop!-wrapped" - ''; - - meta = with lib; { - maintainers = [ maintainers.ambrop72 ]; - platforms = platforms.linux; - description = "KDE official IDE"; - longDescription = '' - A free, opensource IDE (Integrated Development Environment) - for MS Windows, Mac OsX, Linux, Solaris and FreeBSD. It is a - feature-full, plugin extendable IDE for C/C++ and other - programming languages. It is based on KDevPlatform, KDE and Qt - libraries and is under development since 1998. - ''; - homepage = "https://www.kdevelop.org"; - license = with licenses; [ - gpl2Plus - lgpl2Plus - ]; - }; -} diff --git a/pkgs/applications/kde/kdevelop/wrapper.nix b/pkgs/applications/kde/kdevelop/wrapper.nix deleted file mode 100644 index 757e4d5db8d3..000000000000 --- a/pkgs/applications/kde/kdevelop/wrapper.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ - lib, - symlinkJoin, - kdevelop-unwrapped, - plugins ? null, -}: - -symlinkJoin { - name = "kdevelop-with-plugins"; - - paths = [ kdevelop-unwrapped ] ++ (lib.optionals (plugins != null) plugins); -} diff --git a/pkgs/applications/kde/kdf.nix b/pkgs/applications/kde/kdf.nix deleted file mode 100644 index 931d0ce88feb..000000000000 --- a/pkgs/applications/kde/kdf.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - kdoctools, - kcmutils, - ki18n, - kiconthemes, - kio, - knotifications, - kxmlgui, -}: - -mkDerivation { - pname = "kdf"; - meta = { - license = with lib.licenses; [ gpl2 ]; - maintainers = [ lib.maintainers.peterhoeg ]; - }; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - kcmutils - ki18n - kiconthemes - kio - knotifications - kxmlgui - ]; -} diff --git a/pkgs/applications/kde/kdialog.nix b/pkgs/applications/kde/kdialog.nix deleted file mode 100644 index 857ce19890f5..000000000000 --- a/pkgs/applications/kde/kdialog.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - kdoctools, - kinit, - kguiaddons, - kwindowsystem, -}: - -mkDerivation { - pname = "kdialog"; - - meta = { - homepage = "https://apps.kde.org/kdialog/"; - description = "Display dialog boxes from shell scripts"; - license = with lib.licenses; [ - gpl2Plus - fdl12Plus - ]; - maintainers = with lib.maintainers; [ peterhoeg ]; - }; - - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - - propagatedBuildInputs = [ - kinit - kguiaddons - kwindowsystem - ]; -} diff --git a/pkgs/applications/kde/kdiamond.nix b/pkgs/applications/kde/kdiamond.nix deleted file mode 100644 index 8415deb26180..000000000000 --- a/pkgs/applications/kde/kdiamond.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - kdoctools, - ki18n, - kio, - libkdegames, - kconfig, - knotifyconfig, -}: - -mkDerivation { - pname = "kdiamond"; - meta = with lib; { - homepage = "https://kde.org/applications/en/games/org.kde.kdiamond"; - description = "Single player puzzle game"; - mainProgram = "kdiamond"; - maintainers = with maintainers; [ freezeboy ]; - license = licenses.gpl2Plus; - platforms = platforms.linux; - }; - nativeBuildInputs = [ - extra-cmake-modules - ]; - buildInputs = [ - libkdegames - knotifyconfig - kconfig - kdoctools - ki18n - kio - ]; -} diff --git a/pkgs/applications/kde/keditbookmarks.nix b/pkgs/applications/kde/keditbookmarks.nix deleted file mode 100644 index f5fa35591c80..000000000000 --- a/pkgs/applications/kde/keditbookmarks.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - kdoctools, - kio, - kparts, - kwindowsystem, -}: - -mkDerivation { - pname = "keditbookmarks"; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - kio - kparts - kwindowsystem - ]; - meta = with lib; { - homepage = "http://www.kde.org"; - license = with licenses; [ - gpl2Plus - lgpl21Plus - fdl12Plus - bsd3 - ]; - maintainers = with maintainers; [ peterhoeg ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/kde/keysmith.nix b/pkgs/applications/kde/keysmith.nix deleted file mode 100644 index 06de93c408f7..000000000000 --- a/pkgs/applications/kde/keysmith.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ - lib, - mkDerivation, - - cmake, - extra-cmake-modules, - - kdbusaddons, - ki18n, - kirigami2, - kirigami-addons, - kwindowsystem, - libsodium, - qtquickcontrols2, -}: - -mkDerivation { - pname = "keysmith"; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - ]; - - buildInputs = [ - kdbusaddons - ki18n - kirigami2 - kirigami-addons - kwindowsystem - libsodium - qtquickcontrols2 - ]; - - meta = with lib; { - description = "OTP client for Plasma Mobile and Desktop"; - mainProgram = "keysmith"; - license = licenses.gpl3; - homepage = "https://github.com/KDE/keysmith"; - maintainers = with maintainers; [ shamilton ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/kde/kfind.nix b/pkgs/applications/kde/kfind.nix deleted file mode 100644 index 70b79716dc3d..000000000000 --- a/pkgs/applications/kde/kfind.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - kdoctools, - karchive, - kcoreaddons, - kfilemetadata, - ktextwidgets, - kwidgetsaddons, - kio, -}: - -mkDerivation { - pname = "kfind"; - meta = { - homepage = "https://apps.kde.org/kfind/"; - description = "Find files/folders"; - mainProgram = "kfind"; - license = with lib.licenses; [ gpl2 ]; - maintainers = [ lib.maintainers.iblech ]; - }; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - karchive - kcoreaddons - kfilemetadata - ktextwidgets - kwidgetsaddons - kio - ]; -} diff --git a/pkgs/applications/kde/kgeography.nix b/pkgs/applications/kde/kgeography.nix deleted file mode 100644 index e38c3a12bf92..000000000000 --- a/pkgs/applications/kde/kgeography.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ - mkDerivation, - lib, - cmake, - extra-cmake-modules, - qtbase, - kconfigwidgets, - kxmlgui, - kcrash, - kdoctools, - kitemviews, -}: - -mkDerivation { - pname = "kgeography"; - meta = { - homepage = "https://apps.kde.org/kgeography/"; - description = "Geography trainer"; - mainProgram = "kgeography"; - license = with lib.licenses; [ gpl2 ]; - maintainers = [ lib.maintainers.globin ]; - }; - nativeBuildInputs = [ - cmake - extra-cmake-modules - ]; - buildInputs = [ - qtbase - kconfigwidgets - kxmlgui - kcrash - kdoctools - kitemviews - ]; -} diff --git a/pkgs/applications/kde/kget.nix b/pkgs/applications/kde/kget.nix deleted file mode 100644 index d086b193cf80..000000000000 --- a/pkgs/applications/kde/kget.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - kdoctools, - kdelibs4support, - libgcrypt, - libktorrent, - qca-qt5, - qgpgme, - kcmutils, - kcompletion, - kcoreaddons, - knotifyconfig, - kparts, - kwallet, - kwidgetsaddons, - kwindowsystem, - kxmlgui, -}: - -mkDerivation { - pname = "kget"; - - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - - buildInputs = [ - kdelibs4support - libgcrypt - libktorrent - qca-qt5 - qgpgme - kcmutils - kcompletion - kcoreaddons - knotifyconfig - kparts - kwallet - kwidgetsaddons - kwindowsystem - kxmlgui - ]; - - meta = with lib; { - homepage = "https://apps.kde.org/kget/"; - description = "Download manager"; - mainProgram = "kget"; - license = with licenses; [ gpl2 ]; - maintainers = with maintainers; [ peterhoeg ]; - }; -} diff --git a/pkgs/applications/kde/kgpg.nix b/pkgs/applications/kde/kgpg.nix deleted file mode 100644 index 8c4faa87f727..000000000000 --- a/pkgs/applications/kde/kgpg.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - kdoctools, - ki18n, - makeWrapper, - akonadi-contacts, - gnupg, - karchive, - kcodecs, - kcontacts, - kcoreaddons, - kcrash, - kdbusaddons, - kiconthemes, - kjobwidgets, - kio, - knotifications, - kservice, - ktextwidgets, - kxmlgui, - kwidgetsaddons, - kwindowsystem, - qgpgme, -}: - -mkDerivation { - pname = "kgpg"; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - makeWrapper - ]; - buildInputs = [ - akonadi-contacts - gnupg - karchive - kcodecs - kcontacts - kcoreaddons - kcrash - kdbusaddons - ki18n - kiconthemes - kjobwidgets - kio - knotifications - kservice - ktextwidgets - kxmlgui - kwidgetsaddons - kwindowsystem - qgpgme - ]; - postFixup = '' - wrapProgram "$out/bin/kgpg" --prefix PATH : "${lib.makeBinPath [ gnupg ]}" - ''; - meta = { - homepage = "https://apps.kde.org/kgpg/"; - description = "KDE based interface for GnuPG, a powerful encryption utility"; - mainProgram = "kgpg"; - license = [ lib.licenses.gpl2 ]; - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/applications/kde/khelpcenter.nix b/pkgs/applications/kde/khelpcenter.nix deleted file mode 100644 index 838705a3812e..000000000000 --- a/pkgs/applications/kde/khelpcenter.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ - lib, - mkDerivation, - extra-cmake-modules, - kdoctools, - grantlee, - kcmutils, - kconfig, - kcoreaddons, - kdbusaddons, - ki18n, - kinit, - khtml, - kservice, - xapian, -}: - -mkDerivation { - pname = "khelpcenter"; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - grantlee - kcmutils - kconfig - kcoreaddons - kdbusaddons - khtml - ki18n - kinit - kservice - xapian - ]; - - preFixup = '' - qtWrapperArgs+=( - --prefix MANPATH : /nix/var/nix/profiles/system/sw/share/man - ) - ''; - - meta = with lib; { - homepage = "https://apps.kde.org/help/"; - description = "Help center"; - mainProgram = "khelpcenter"; - license = licenses.gpl2Plus; - }; -} diff --git a/pkgs/applications/kde/kidentitymanagement.nix b/pkgs/applications/kde/kidentitymanagement.nix deleted file mode 100644 index 024bed81044b..000000000000 --- a/pkgs/applications/kde/kidentitymanagement.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ - mkDerivation, - lib, - kdepimTeam, - extra-cmake-modules, - kdoctools, - kcompletion, - kcoreaddons, - kemoticons, - kiconthemes, - kio, - kpimtextedit, - ktextwidgets, - kxmlgui, -}: - -mkDerivation { - pname = "kidentitymanagement"; - meta = { - license = with lib.licenses; [ - gpl2Plus - lgpl21Plus - fdl12Plus - ]; - maintainers = kdepimTeam; - }; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - kcompletion - kemoticons - kiconthemes - kio - ktextwidgets - kxmlgui - ]; - propagatedBuildInputs = [ - kcoreaddons - kpimtextedit - ]; - outputs = [ - "out" - "dev" - ]; - postInstall = '' - # added as an include directory by cmake files and fails to compile if it's missing - mkdir -p "$dev/include/KF5" - ''; -} diff --git a/pkgs/applications/kde/kig.nix b/pkgs/applications/kde/kig.nix deleted file mode 100644 index 9eb9c3e7a853..000000000000 --- a/pkgs/applications/kde/kig.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - kdoctools, - boost, - karchive, - kcrash, - kiconthemes, - kparts, - ktexteditor, - qtsvg, - qtxmlpatterns, -}: - -mkDerivation { - pname = "kig"; - meta = { - homepage = "https://apps.kde.org/kig/"; - description = "Interactive geometry"; - license = with lib.licenses; [ gpl2 ]; - maintainers = with lib.maintainers; [ raskin ]; - }; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - boost - karchive - kcrash - kiconthemes - kparts - ktexteditor - qtsvg - qtxmlpatterns - ]; -} diff --git a/pkgs/applications/kde/kigo.nix b/pkgs/applications/kde/kigo.nix deleted file mode 100644 index d6780752c546..000000000000 --- a/pkgs/applications/kde/kigo.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - kdoctools, - ki18n, - kio, - libkdegames, - knewstuff, -}: - -mkDerivation { - pname = "kigo"; - meta = with lib; { - homepage = "https://kde.org/applications/en/games/org.kde.kigo"; - description = "Open-source implementation of the popular Go game"; - mainProgram = "kigo"; - maintainers = with maintainers; [ freezeboy ]; - license = licenses.gpl2Plus; - platforms = platforms.linux; - }; - nativeBuildInputs = [ - extra-cmake-modules - ]; - buildInputs = [ - libkdegames - knewstuff - kdoctools - ki18n - kio - ]; -} diff --git a/pkgs/applications/kde/killbots.nix b/pkgs/applications/kde/killbots.nix deleted file mode 100644 index dd3500be7ffa..000000000000 --- a/pkgs/applications/kde/killbots.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - kdoctools, - ki18n, - kio, - libkdegames, -}: - -mkDerivation { - pname = "killbots"; - meta = with lib; { - homepage = "https://kde.org/applications/en/games/org.kde.killbots"; - description = "Game where you avoid robots"; - mainProgram = "killbots"; - maintainers = with maintainers; [ freezeboy ]; - license = licenses.gpl2Plus; - platforms = platforms.linux; - }; - nativeBuildInputs = [ - extra-cmake-modules - ]; - buildInputs = [ - libkdegames - kdoctools - ki18n - kio - ]; -} diff --git a/pkgs/applications/kde/kimap.nix b/pkgs/applications/kde/kimap.nix deleted file mode 100644 index fd0a21d4312e..000000000000 --- a/pkgs/applications/kde/kimap.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ - mkDerivation, - lib, - kdepimTeam, - extra-cmake-modules, - kdoctools, - cyrus_sasl, - kcoreaddons, - ki18n, - kio, - kmime, - kitemmodels, -}: - -mkDerivation { - pname = "kimap"; - meta = { - license = with lib.licenses; [ - gpl2Plus - lgpl21Plus - fdl12Plus - ]; - maintainers = kdepimTeam; - }; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - ki18n - kio - ]; - propagatedBuildInputs = [ - cyrus_sasl - kcoreaddons - kmime - kitemmodels - ]; - outputs = [ - "out" - "dev" - ]; - postInstall = '' - # added as an include directory by cmake files and fails to compile if it's missing - mkdir -p "$dev/include/KF5" - ''; -} diff --git a/pkgs/applications/kde/kio-admin.nix b/pkgs/applications/kde/kio-admin.nix deleted file mode 100644 index 824ef5edb66e..000000000000 --- a/pkgs/applications/kde/kio-admin.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - qtbase, - kio, - ki18n, - polkit-qt, -}: - -mkDerivation { - pname = "kio-admin"; - - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - qtbase - kio - ki18n - polkit-qt - ]; - - meta = with lib; { - description = "Manage files as administrator using the admin:// KIO protocol"; - homepage = "https://invent.kde.org/system/kio-admin"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ k900 ]; - }; -} diff --git a/pkgs/applications/kde/kio-extras.nix b/pkgs/applications/kde/kio-extras.nix deleted file mode 100644 index 918c74301ad5..000000000000 --- a/pkgs/applications/kde/kio-extras.nix +++ /dev/null @@ -1,92 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - kdoctools, - shared-mime-info, - exiv2, - kactivities, - kactivities-stats, - karchive, - kbookmarks, - kconfig, - kconfigwidgets, - kcoreaddons, - kdbusaddons, - kdsoap, - kguiaddons, - kdnssd, - kiconthemes, - ki18n, - kio, - khtml, - kpty, - syntax-highlighting, - libmtp, - libssh, - openexr, - libtirpc, - phonon, - qtsvg, - samba, - solid, - gperf, - taglib, - libX11, - libXcursor, -}: - -mkDerivation { - pname = "kio-extras"; - meta = { - license = with lib.licenses; [ - gpl2 - lgpl21 - ]; - maintainers = [ lib.maintainers.ttuegel ]; - }; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - shared-mime-info - ]; - buildInputs = [ - exiv2 - kactivities - kactivities-stats - karchive - kbookmarks - kconfig - kconfigwidgets - kcoreaddons - kdbusaddons - kdsoap - kguiaddons - kdnssd - kiconthemes - ki18n - kio - khtml - kpty - syntax-highlighting - libmtp - libssh - openexr - libtirpc - phonon - qtsvg - samba - solid - gperf - taglib - libX11 - libXcursor - ]; - - # org.kde.kmtpd5 DBUS service launches kiod5 binary from kio derivation, not from kio-extras - postInstall = '' - substituteInPlace $out/share/dbus-1/services/org.kde.kmtpd5.service \ - --replace Exec=$out Exec=${kio} - ''; - -} diff --git a/pkgs/applications/kde/kio-gdrive.nix b/pkgs/applications/kde/kio-gdrive.nix deleted file mode 100644 index 13076e58987c..000000000000 --- a/pkgs/applications/kde/kio-gdrive.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - kdoctools, - kio, - libkgapi, - kcalendarcore, - kcontacts, - qtkeychain, - libsecret, - kaccounts-integration, -}: - -mkDerivation { - pname = "kio-gdrive"; - meta = with lib; { - homepage = "https://github.com/KDE/kio-gdrive"; - description = "KIO slave for Google APIs"; - maintainers = with maintainers; [ kennyballou ]; - license = licenses.gpl2Plus; - platforms = platforms.linux; - }; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - kcalendarcore - kcontacts - kaccounts-integration - libkgapi - libsecret - kio - qtkeychain - ]; -} diff --git a/pkgs/applications/kde/kipi-plugins.nix b/pkgs/applications/kde/kipi-plugins.nix deleted file mode 100644 index a9de8cf2dabb..000000000000 --- a/pkgs/applications/kde/kipi-plugins.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - karchive, - kconfig, - ki18n, - kiconthemes, - kio, - kservice, - kwindowsystem, - kxmlgui, - libkipi, - qtbase, - qtsvg, - qtxmlpatterns, -}: - -mkDerivation { - pname = "kipi-plugins"; - - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - karchive - kconfig - ki18n - kiconthemes - kio - kservice - kwindowsystem - kxmlgui - libkipi - qtbase - qtsvg - qtxmlpatterns - ]; - - meta = { - description = "Plugins for KDE-based image applications"; - license = lib.licenses.gpl2; - homepage = "https://github.com/KDE/kipi-plugins"; - maintainers = with lib.maintainers; [ ttuegel ]; - }; -} diff --git a/pkgs/applications/kde/kirigami-gallery.nix b/pkgs/applications/kde/kirigami-gallery.nix deleted file mode 100644 index 34ce15ffc6d1..000000000000 --- a/pkgs/applications/kde/kirigami-gallery.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ - mkDerivation, - lib, - kirigami2, - extra-cmake-modules, - kitemmodels, - qtgraphicaleffects, - qtquickcontrols2, - qttools, -}: - -mkDerivation { - pname = "kirigami-gallery"; - - nativeBuildInputs = [ - extra-cmake-modules - qttools - ]; - - buildInputs = [ - qtgraphicaleffects - qtquickcontrols2 - kirigami2 - kitemmodels - ]; - - meta = with lib; { - homepage = "https://apps.kde.org/kirigami2.gallery/"; - description = "View examples of Kirigami components"; - mainProgram = "kirigami2gallery"; - license = licenses.lgpl2; - maintainers = with maintainers; [ shadowrz ]; - }; -} diff --git a/pkgs/applications/kde/kitinerary.nix b/pkgs/applications/kde/kitinerary.nix deleted file mode 100644 index d0376e1030f3..000000000000 --- a/pkgs/applications/kde/kitinerary.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - qtdeclarative, - ki18n, - kmime, - kpkpass, - poppler, - kcontacts, - kcalendarcore, - shared-mime-info, - zxing-cpp, -}: - -mkDerivation { - pname = "kitinerary"; - meta = { - license = with lib.licenses; [ lgpl21 ]; - maintainers = [ lib.maintainers.bkchr ]; - broken = true; # doesn't build with latest Poppler - }; - nativeBuildInputs = [ - extra-cmake-modules - shared-mime-info # for update-mime-database - ]; - buildInputs = [ - qtdeclarative - kmime - kpkpass - poppler - kcontacts - kcalendarcore - ki18n - zxing-cpp - ]; - - outputs = [ - "out" - "dev" - ]; -} diff --git a/pkgs/applications/kde/kldap.nix b/pkgs/applications/kde/kldap.nix deleted file mode 100644 index 2cd16f9235f7..000000000000 --- a/pkgs/applications/kde/kldap.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ - mkDerivation, - lib, - kdepimTeam, - extra-cmake-modules, - kdoctools, - cyrus_sasl, - ki18n, - kio, - kmbox, - libsecret, - openldap, - qtkeychain, -}: - -mkDerivation { - pname = "kldap"; - meta = { - license = with lib.licenses; [ - gpl2Plus - lgpl21Plus - fdl12Plus - ]; - maintainers = kdepimTeam; - }; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - ki18n - kio - kmbox - libsecret - qtkeychain - ]; - propagatedBuildInputs = [ - cyrus_sasl - openldap - ]; - outputs = [ - "out" - "dev" - ]; - postInstall = '' - # added as an include directory by cmake files and fails to compile if it's missing - mkdir -p "$dev/include/KF5" - ''; -} diff --git a/pkgs/applications/kde/kleopatra.nix b/pkgs/applications/kde/kleopatra.nix deleted file mode 100644 index 1b07daee7a33..000000000000 --- a/pkgs/applications/kde/kleopatra.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ - mkDerivation, - lib, - kdepimTeam, - extra-cmake-modules, - kdoctools, - boost, - gpgme, - kcmutils, - kdbusaddons, - kiconthemes, - kitemmodels, - kmime, - knotifications, - kwindowsystem, - kxmlgui, - libkleo, - kcrash, - kpipewire, -}: - -mkDerivation { - pname = "kleopatra"; - - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - - buildInputs = [ - boost - gpgme - kcmutils - kdbusaddons - kiconthemes - kitemmodels - kmime - knotifications - kwindowsystem - kxmlgui - libkleo - kcrash - kpipewire - ]; - - meta = { - homepage = "https://apps.kde.org/kleopatra/"; - description = "Certificate manager and unified crypto GUI"; - license = with lib.licenses; [ - gpl2Plus - lgpl21Plus - fdl12Plus - ]; - maintainers = kdepimTeam; - }; -} diff --git a/pkgs/applications/kde/klettres.nix b/pkgs/applications/kde/klettres.nix deleted file mode 100644 index 6e87d5651985..000000000000 --- a/pkgs/applications/kde/klettres.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - kdoctools, - ki18n, - kio, - phonon, - knewstuff, -}: - -mkDerivation { - pname = "klettres"; - meta = with lib; { - homepage = "https://invent.kde.org/education/klettres"; - description = "Application specially designed to help the user to learn an alphabet"; - mainProgram = "klettres"; - maintainers = with maintainers; [ freezeboy ]; - license = licenses.gpl2Plus; - platforms = platforms.linux; - }; - nativeBuildInputs = [ - extra-cmake-modules - ]; - buildInputs = [ - phonon - knewstuff - kdoctools - ki18n - kio - ]; -} diff --git a/pkgs/applications/kde/klines.nix b/pkgs/applications/kde/klines.nix deleted file mode 100644 index 36d76211c81d..000000000000 --- a/pkgs/applications/kde/klines.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - kdoctools, - ki18n, - kio, - libkdegames, -}: - -mkDerivation { - pname = "klines"; - meta = with lib; { - homepage = "https://kde.org/applications/en/games/org.kde.klines"; - description = "Simple but highly addictive one player game"; - mainProgram = "klines"; - maintainers = with maintainers; [ freezeboy ]; - license = licenses.gpl2Plus; - platforms = platforms.linux; - }; - nativeBuildInputs = [ - extra-cmake-modules - ]; - buildInputs = [ - libkdegames - kdoctools - ki18n - kio - ]; -} diff --git a/pkgs/applications/kde/kmag.nix b/pkgs/applications/kde/kmag.nix deleted file mode 100644 index b12e36917623..000000000000 --- a/pkgs/applications/kde/kmag.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - kdoctools, - ki18n, - kio, -}: - -mkDerivation { - pname = "kmag"; - meta = with lib; { - homepage = "https://kde.org/applications/en/utilities/org.kde.kmag"; - description = "Small Linux utility to magnify a part of the screen"; - mainProgram = "kmag"; - maintainers = with maintainers; [ freezeboy ]; - license = licenses.gpl2Plus; - platforms = platforms.linux; - }; - nativeBuildInputs = [ - extra-cmake-modules - ]; - buildInputs = [ - kdoctools - ki18n - kio - ]; -} diff --git a/pkgs/applications/kde/kmahjongg.nix b/pkgs/applications/kde/kmahjongg.nix deleted file mode 100644 index 9d3bef13e588..000000000000 --- a/pkgs/applications/kde/kmahjongg.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ - lib, - mkDerivation, - extra-cmake-modules, - kdoctools, - kdeclarative, - knewstuff, - libkdegames, - libkmahjongg, -}: - -mkDerivation { - pname = "kmahjongg"; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - kdeclarative - libkmahjongg - knewstuff - libkdegames - ]; - meta = { - description = "Mahjongg solitaire"; - mainProgram = "kmahjongg"; - homepage = "https://apps.kde.org/kmahjongg/"; - license = with lib.licenses; [ gpl2 ]; - maintainers = [ ]; - }; -} diff --git a/pkgs/applications/kde/kmail-account-wizard.nix b/pkgs/applications/kde/kmail-account-wizard.nix deleted file mode 100644 index 6a2e867fa346..000000000000 --- a/pkgs/applications/kde/kmail-account-wizard.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ - mkDerivation, - lib, - kdepimTeam, - extra-cmake-modules, - kdoctools, - shared-mime-info, - akonadi, - kcmutils, - kcrash, - kdbusaddons, - kidentitymanagement, - kldap, - kmailtransport, - knewstuff, - knotifications, - knotifyconfig, - kparts, - kross, - ktexteditor, - kwallet, - libkdepim, - libkleo, - pimcommon, - qttools, -}: - -mkDerivation { - pname = "kmail-account-wizard"; - meta = { - license = with lib.licenses; [ - gpl2Plus - lgpl21Plus - fdl12Plus - ]; - maintainers = kdepimTeam; - }; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - shared-mime-info - ]; - buildInputs = [ - akonadi - kcmutils - kcrash - kdbusaddons - kidentitymanagement - kldap - kmailtransport - knewstuff - knotifications - knotifyconfig - kparts - kross - ktexteditor - kwallet - libkdepim - libkleo - pimcommon - qttools - ]; -} diff --git a/pkgs/applications/kde/kmail.nix b/pkgs/applications/kde/kmail.nix deleted file mode 100644 index d8876da285a5..000000000000 --- a/pkgs/applications/kde/kmail.nix +++ /dev/null @@ -1,138 +0,0 @@ -{ - mkDerivation, - lib, - akonadi, - akonadi-import-wizard, - akonadi-search, - extra-cmake-modules, - kaddressbook, - kbookmarks, - kcalutils, - kcmutils, - kcompletion, - kconfig, - kconfigwidgets, - kcoreaddons, - kdepim-addons, - kdepim-runtime, - kdepimTeam, - kdoctools, - kguiaddons, - ki18n, - kiconthemes, - kinit, - kio, - kldap, - kleopatra, - kmail-account-wizard, - kmailtransport, - knotifications, - knotifyconfig, - kontactinterface, - kparts, - kpty, - kservice, - ktextwidgets, - ktnef, - kuserfeedback, - kwallet, - kwidgetsaddons, - kwindowsystem, - kxmlgui, - libgravatar, - libkdepim, - libksieve, - libsecret, - mailcommon, - messagelib, - pim-data-exporter, - pim-sieve-editor, - qtkeychain, - qtscript, - qtwebengine, -}: - -mkDerivation { - pname = "kmail"; - meta = { - homepage = "https://apps.kde.org/kmail2/"; - description = "Mail client"; - license = with lib.licenses; [ - gpl2Plus - lgpl21Plus - fdl12Plus - ]; - maintainers = kdepimTeam; - }; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - akonadi-search - kbookmarks - kcalutils - kcmutils - kcompletion - kconfig - kconfigwidgets - kcoreaddons - kdepim-addons - kguiaddons - ki18n - kiconthemes - kinit - kio - kldap - kmail-account-wizard - kmailtransport - knotifications - knotifyconfig - kontactinterface - kparts - kpty - kservice - ktextwidgets - ktnef - kuserfeedback - kwidgetsaddons - kwindowsystem - kxmlgui - libgravatar - libkdepim - libksieve - libsecret - mailcommon - messagelib - pim-sieve-editor - qtkeychain - qtscript - qtwebengine - akonadi-import-wizard - kaddressbook - kleopatra - pim-data-exporter - ]; - outputs = [ - "out" - "doc" - ]; - propagatedUserEnvPkgs = [ - kdepim-runtime - kwallet - akonadi - ]; - postFixup = '' - wrapProgram "$out/bin/kmail" \ - --prefix PATH : "${ - lib.makeBinPath [ - akonadi - akonadi-import-wizard - kaddressbook - kleopatra - kmail-account-wizard - pim-data-exporter - ] - }" - ''; -} diff --git a/pkgs/applications/kde/kmailtransport.nix b/pkgs/applications/kde/kmailtransport.nix deleted file mode 100644 index 335e4a42b663..000000000000 --- a/pkgs/applications/kde/kmailtransport.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ - mkDerivation, - lib, - kdepimTeam, - extra-cmake-modules, - kdoctools, - akonadi, - akonadi-mime, - cyrus_sasl, - kcmutils, - ki18n, - kio, - kmime, - kwallet, - ksmtp, - libkgapi, - kcalendarcore, - kcontacts, - qtkeychain, - libsecret, -}: - -mkDerivation { - pname = "kmailtransport"; - meta = { - license = with lib.licenses; [ - gpl2Plus - lgpl21Plus - fdl12Plus - ]; - maintainers = kdepimTeam; - }; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - akonadi - kcmutils - ki18n - kio - ksmtp - libkgapi - kcalendarcore - kcontacts - qtkeychain - libsecret - ]; - propagatedBuildInputs = [ - akonadi-mime - cyrus_sasl - kmime - kwallet - ]; - outputs = [ - "out" - "dev" - ]; - postInstall = '' - # added as an include directory by cmake files and fails to compile if it's missing - mkdir -p "$dev/include/KF5" - ''; -} diff --git a/pkgs/applications/kde/kmbox.nix b/pkgs/applications/kde/kmbox.nix deleted file mode 100644 index d14d3dba08b5..000000000000 --- a/pkgs/applications/kde/kmbox.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ - mkDerivation, - lib, - kdepimTeam, - extra-cmake-modules, - kdoctools, - kmime, - qtbase, - kcodecs, -}: - -mkDerivation { - pname = "kmbox"; - meta = { - license = with lib.licenses; [ - gpl2Plus - lgpl21Plus - fdl12Plus - ]; - maintainers = kdepimTeam; - }; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - kmime - qtbase - kcodecs - ]; - outputs = [ - "out" - "dev" - ]; - postInstall = '' - # added as an include directory by cmake files and fails to compile if it's missing - mkdir -p "$dev/include/KF5" - ''; -} diff --git a/pkgs/applications/kde/kmime.nix b/pkgs/applications/kde/kmime.nix deleted file mode 100644 index 6e2ad294db1c..000000000000 --- a/pkgs/applications/kde/kmime.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ - mkDerivation, - lib, - kdepimTeam, - extra-cmake-modules, - ki18n, - kcodecs, - qtbase, -}: - -mkDerivation { - pname = "kmime"; - meta = { - license = [ lib.licenses.lgpl21 ]; - maintainers = kdepimTeam; - }; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - kcodecs - ki18n - qtbase - ]; - outputs = [ - "out" - "dev" - ]; - postInstall = '' - # added as an include directory by cmake files and fails to compile if it's missing - mkdir -p "$dev/include/KF5" - ''; -} diff --git a/pkgs/applications/kde/kmines.nix b/pkgs/applications/kde/kmines.nix deleted file mode 100644 index d527f9f0aff2..000000000000 --- a/pkgs/applications/kde/kmines.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - libkdegames, - kconfig, - kcrash, - kdoctools, - ki18n, - kio, -}: - -mkDerivation { - pname = "kmines"; - meta = with lib; { - homepage = "https://kde.org/applications/en/games/org.kde.kmines"; - description = "Classic Minesweeper game"; - mainProgram = "kmines"; - maintainers = with maintainers; [ freezeboy ]; - license = licenses.gpl2Plus; - platforms = platforms.linux; - }; - nativeBuildInputs = [ - extra-cmake-modules - ]; - buildInputs = [ - libkdegames - kconfig - kcrash - kio - kdoctools - ki18n - ]; -} diff --git a/pkgs/applications/kde/kmix.nix b/pkgs/applications/kde/kmix.nix deleted file mode 100644 index 1c433395dc24..000000000000 --- a/pkgs/applications/kde/kmix.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - kdoctools, - kglobalaccel, - kxmlgui, - kcoreaddons, - plasma-framework, - libpulseaudio, - alsa-lib, - libcanberra_kde, -}: - -mkDerivation { - pname = "kmix"; - meta = { - homepage = "https://apps.kde.org/kmix/"; - description = "Sound mixer"; - license = with lib.licenses; [ - gpl2Plus - lgpl21Plus - fdl12Plus - ]; - maintainers = [ lib.maintainers.rongcuid ]; - }; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - alsa-lib - kglobalaccel - kxmlgui - kcoreaddons - libcanberra_kde - libpulseaudio - plasma-framework - ]; - cmakeFlags = [ "-DKMIX_KF5_BUILD=1" ]; -} diff --git a/pkgs/applications/kde/kmousetool.nix b/pkgs/applications/kde/kmousetool.nix deleted file mode 100644 index b750a34d1899..000000000000 --- a/pkgs/applications/kde/kmousetool.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - kdoctools, - ki18n, - kiconthemes, - knotifications, - kxmlgui, - kwindowsystem, - phonon, - libXtst, - libXt, -}: - -mkDerivation { - pname = "kmousetool"; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - ki18n - kiconthemes - knotifications - kxmlgui - kwindowsystem - phonon - libXtst - libXt - ]; - meta = { - homepage = "https://github.com/KDE/kmousetool"; - description = "Program that clicks the mouse for you"; - mainProgram = "kmousetool"; - license = with lib.licenses; [ - gpl2Plus - fdl12Plus - ]; - maintainers = [ lib.maintainers.jayesh-bhoot ]; - }; -} diff --git a/pkgs/applications/kde/kmplot.nix b/pkgs/applications/kde/kmplot.nix deleted file mode 100644 index b4a35a8bbc09..000000000000 --- a/pkgs/applications/kde/kmplot.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - kdoctools, - kcrash, - kguiaddons, - ki18n, - kparts, - kwidgetsaddons, - kdbusaddons, -}: - -mkDerivation { - pname = "kmplot"; - meta = { - homepage = "https://apps.kde.org/kmplot/"; - description = "Mathematical function plotter"; - mainProgram = "kmplot"; - license = with lib.licenses; [ - gpl2Plus - fdl12Plus - ]; - maintainers = [ lib.maintainers.orivej ]; - }; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - kcrash - kguiaddons - ki18n - kparts - kwidgetsaddons - kdbusaddons - ]; -} diff --git a/pkgs/applications/kde/knavalbattle.nix b/pkgs/applications/kde/knavalbattle.nix deleted file mode 100644 index dce8ac5f0515..000000000000 --- a/pkgs/applications/kde/knavalbattle.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - kdoctools, - ki18n, - kio, - libkdegames, - kdnssd, -}: - -mkDerivation { - pname = "knavalbattle"; - meta = with lib; { - homepage = "https://kde.org/applications/en/games/org.kde.knavalbattle"; - description = "Naval Battle is a ship sinking game"; - mainProgram = "knavalbattle"; - maintainers = with maintainers; [ freezeboy ]; - license = licenses.gpl2Plus; - platforms = platforms.linux; - }; - nativeBuildInputs = [ - extra-cmake-modules - ]; - buildInputs = [ - libkdegames - kdoctools - ki18n - kio - kdnssd - ]; -} diff --git a/pkgs/applications/kde/knetwalk.nix b/pkgs/applications/kde/knetwalk.nix deleted file mode 100644 index 14c301c06521..000000000000 --- a/pkgs/applications/kde/knetwalk.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - kdoctools, - ki18n, - kio, - libkdegames, -}: - -mkDerivation { - pname = "knetwalk"; - meta = with lib; { - homepage = "https://kde.org/applications/en/games/org.kde.knetwalk"; - description = "Single player logic game"; - mainProgram = "knetwalk"; - maintainers = with maintainers; [ freezeboy ]; - license = licenses.gpl2Plus; - platforms = platforms.linux; - }; - nativeBuildInputs = [ - extra-cmake-modules - ]; - buildInputs = [ - libkdegames - kdoctools - ki18n - kio - ]; -} diff --git a/pkgs/applications/kde/knights.nix b/pkgs/applications/kde/knights.nix deleted file mode 100644 index a96486d62dbf..000000000000 --- a/pkgs/applications/kde/knights.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - kdoctools, - ki18n, - kio, - kplotting, - plasma-framework, - libkdegames, -}: - -mkDerivation { - pname = "knights"; - meta = with lib; { - homepage = "https://kde.org/applications/en/games/org.kde.knights"; - description = "Chess game"; - mainProgram = "knights"; - maintainers = with maintainers; [ freezeboy ]; - license = licenses.gpl2Plus; - platforms = platforms.linux; - }; - nativeBuildInputs = [ - extra-cmake-modules - ]; - buildInputs = [ - libkdegames - plasma-framework - kplotting - kdoctools - ki18n - kio - ]; -} diff --git a/pkgs/applications/kde/knotes.nix b/pkgs/applications/kde/knotes.nix deleted file mode 100644 index cf8bf1658bb7..000000000000 --- a/pkgs/applications/kde/knotes.nix +++ /dev/null @@ -1,85 +0,0 @@ -{ - lib, - mkDerivation, - extra-cmake-modules, - kdoctools, - kcompletion, - kconfig, - kconfigwidgets, - kcoreaddons, - kcrash, - kdbusaddons, - kdnssd, - kglobalaccel, - kiconthemes, - kitemmodels, - kitemviews, - kcmutils, - knewstuff, - knotifications, - knotifyconfig, - kparts, - ktextwidgets, - kwidgetsaddons, - kwindowsystem, - grantlee, - grantleetheme, - qtx11extras, - akonadi, - akonadi-notes, - akonadi-search, - kcalutils, - kontactinterface, - libkdepim, - kmime, - pimcommon, - kpimtextedit, - kcalendarcore, -}: - -mkDerivation { - pname = "knotes"; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - kcompletion - kconfig - kconfigwidgets - kcoreaddons - kcrash - kdbusaddons - kdnssd - kglobalaccel - kiconthemes - kitemmodels - kitemviews - kcmutils - knewstuff - knotifications - knotifyconfig - kparts - ktextwidgets - kwidgetsaddons - kwindowsystem - grantlee - grantleetheme - qtx11extras - akonadi - akonadi-notes - kcalutils - kontactinterface - libkdepim - kmime - pimcommon - kpimtextedit - akonadi-search - kcalendarcore - ]; - meta = with lib; { - homepage = "https://apps.kde.org/knotes/"; - description = "Popup notes"; - license = licenses.gpl2Plus; - }; -} diff --git a/pkgs/applications/kde/koko.nix b/pkgs/applications/kde/koko.nix deleted file mode 100644 index 524aeba87ed3..000000000000 --- a/pkgs/applications/kde/koko.nix +++ /dev/null @@ -1,86 +0,0 @@ -{ - lib, - mkDerivation, - - fetchurl, - cmake, - extra-cmake-modules, - - exiv2, - kconfig, - kcoreaddons, - kdeclarative, - kfilemetadata, - kguiaddons, - ki18n, - kio, - kirigami2, - knotifications, - kpurpose, - kquickimageedit, - qtgraphicaleffects, - qtlocation, - qtquickcontrols2, -}: - -let - # URLs snapshotted through - # https://web.archive.org/save/$url - # Update when stale enough I guess? - admin1 = fetchurl { - url = "https://web.archive.org/web/20210714035424if_/http://download.geonames.org/export/dump/admin1CodesASCII.txt"; - sha256 = "0r783yzajs26hvccdy4jv2v06xfgadx2g90fz3yn7lx8flz4nhwm"; - }; - admin2 = fetchurl { - url = "https://web.archive.org/web/20210714035427if_/http://download.geonames.org/export/dump/admin2Codes.txt"; - sha256 = "1n5nzp3xblhr93rb1sadi5vfbw29slv5lc6cxq21h3x3cg0mwqh3"; - }; - cities1000 = fetchurl { - url = "https://web.archive.org/web/20210714035406if_/http://download.geonames.org/export/dump/cities1000.zip"; - sha256 = "0cwbfff8gzci5zrahh6d53b9b3bfv1cbwlv0k6076531i1c7md9p"; - }; -in -mkDerivation { - pname = "koko"; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - ]; - - buildInputs = [ - exiv2 - kconfig - kcoreaddons - kdeclarative - kfilemetadata - kguiaddons - ki18n - kio - kirigami2 - knotifications - kpurpose - kquickimageedit - qtgraphicaleffects - qtlocation - qtquickcontrols2 - ]; - - prePatch = '' - ln -s ${admin1} src/admin1CodesASCII.txt - ln -s ${admin2} src/admin2Codes.txt - ln -s ${cities1000} src/cities1000.zip - ''; - - meta = with lib; { - description = "Image gallery mobile application"; - mainProgram = "koko"; - homepage = "https://apps.kde.org/koko/"; - # LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL - license = [ - licenses.lgpl3Only - licenses.lgpl21Only - ]; - maintainers = [ ]; - }; -} diff --git a/pkgs/applications/kde/kolf.nix b/pkgs/applications/kde/kolf.nix deleted file mode 100644 index eeddcf100710..000000000000 --- a/pkgs/applications/kde/kolf.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ - lib, - mkDerivation, - extra-cmake-modules, - kdoctools, - libkdegames, - kio, - ktextwidgets, -}: - -mkDerivation { - pname = "kolf"; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - libkdegames - kio - ktextwidgets - ]; - meta = { - homepage = "https://apps.kde.org/kolf/"; - description = "Miniature golf"; - mainProgram = "kolf"; - license = with lib.licenses; [ gpl2 ]; - maintainers = with lib.maintainers; [ peterhoeg ]; - }; -} diff --git a/pkgs/applications/kde/kollision.nix b/pkgs/applications/kde/kollision.nix deleted file mode 100644 index eced7728016e..000000000000 --- a/pkgs/applications/kde/kollision.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - kdoctools, - ki18n, - kio, - libkdegames, -}: - -mkDerivation { - pname = "kollision"; - meta = with lib; { - homepage = "https://kde.org/applications/en/games/org.kde.kollision"; - description = "Casual game"; - mainProgram = "kollision"; - maintainers = with maintainers; [ freezeboy ]; - license = licenses.gpl2Plus; - platforms = platforms.linux; - }; - nativeBuildInputs = [ - extra-cmake-modules - ]; - buildInputs = [ - libkdegames - kdoctools - ki18n - kio - ]; -} diff --git a/pkgs/applications/kde/kolourpaint.nix b/pkgs/applications/kde/kolourpaint.nix deleted file mode 100644 index 1182cdf8d6be..000000000000 --- a/pkgs/applications/kde/kolourpaint.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ - lib, - mkDerivation, - extra-cmake-modules, - kdoctools, - kguiaddons, - kio, - ktextwidgets, - kwidgetsaddons, - kxmlgui, - libkexiv2, -}: - -mkDerivation { - pname = "kolourpaint"; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - kguiaddons - kio - ktextwidgets - kwidgetsaddons - kxmlgui - libkexiv2 - ]; - meta = { - homepage = "https://apps.kde.org/kolourpaint/"; - description = "Paint program"; - mainProgram = "kolourpaint"; - license = with lib.licenses; [ gpl2 ]; - }; -} diff --git a/pkgs/applications/kde/kompare.nix b/pkgs/applications/kde/kompare.nix deleted file mode 100644 index efcc37a33903..000000000000 --- a/pkgs/applications/kde/kompare.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - kdoctools, - kiconthemes, - kparts, - ktexteditor, - kwidgetsaddons, - libkomparediff2, -}: - -mkDerivation { - pname = "kompare"; - meta = { - homepage = "https://apps.kde.org/kompare/"; - description = "Diff/patch frontend"; - mainProgram = "kompare"; - license = with lib.licenses; [ gpl2 ]; - }; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - kiconthemes - kparts - ktexteditor - kwidgetsaddons - libkomparediff2 - ]; - outputs = [ - "out" - "dev" - ]; -} diff --git a/pkgs/applications/kde/kongress.nix b/pkgs/applications/kde/kongress.nix deleted file mode 100644 index 75c650c2c85f..000000000000 --- a/pkgs/applications/kde/kongress.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - qtquickcontrols2, - kcalendarcore, - kconfig, - kcoreaddons, - kdbusaddons, - kirigami2, - ki18n, - knotifications, -}: - -mkDerivation { - pname = "kongress"; - - nativeBuildInputs = [ extra-cmake-modules ]; - - buildInputs = [ - qtquickcontrols2 - kcalendarcore - kconfig - kcoreaddons - kdbusaddons - kirigami2 - ki18n - knotifications - ]; - - meta = { - description = "Companion application for conferences"; - homepage = "https://apps.kde.org/kongress/"; - license = lib.licenses.gpl3; - maintainers = [ ]; - }; -} diff --git a/pkgs/applications/kde/konqueror.nix b/pkgs/applications/kde/konqueror.nix deleted file mode 100644 index ce734cb3024a..000000000000 --- a/pkgs/applications/kde/konqueror.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ - lib, - mkDerivation, - extra-cmake-modules, - kdoctools, - kinit, - kcmutils, - khtml, - kdesu, - qtwebengine, - qtx11extras, - qtscript, - qtwayland, -}: - -mkDerivation { - pname = "konqueror"; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - kcmutils - khtml - kinit - kdesu - qtwebengine - qtx11extras - qtscript - qtwayland - ]; - - # InitialPreference values are too high and any text/html ends up - # opening konqueror, even if firefox or chromium are also available. - # Resetting to 1, which is the default. - postPatch = '' - substituteInPlace kfmclient_html.desktop \ - --replace InitialPreference=9 InitialPreference=1 - ''; - - meta = { - homepage = "https://apps.kde.org/konqueror/"; - description = "Web browser, file manager and viewer"; - license = with lib.licenses; [ gpl2 ]; - maintainers = [ ]; - }; -} diff --git a/pkgs/applications/kde/konquest.nix b/pkgs/applications/kde/konquest.nix deleted file mode 100644 index 5de5fc7eb5df..000000000000 --- a/pkgs/applications/kde/konquest.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ - lib, - mkDerivation, - extra-cmake-modules, - kdoctools, - kconfig, - kcoreaddons, - kcrash, - kdbusaddons, - kguiaddons, - kxmlgui, - kwidgetsaddons, - libkdegames, - qtquickcontrols, -}: - -mkDerivation { - pname = "konquest"; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - kconfig - kcoreaddons - kcrash - kdbusaddons - kguiaddons - kxmlgui - kwidgetsaddons - libkdegames - qtquickcontrols - ]; - meta = { - homepage = "https://apps.kde.org/konquest/"; - description = "Galactic strategy game"; - mainProgram = "konquest"; - license = with lib.licenses; [ gpl2 ]; - maintainers = [ ]; - }; -} diff --git a/pkgs/applications/kde/konsole.nix b/pkgs/applications/kde/konsole.nix deleted file mode 100644 index 3a5ba815b956..000000000000 --- a/pkgs/applications/kde/konsole.nix +++ /dev/null @@ -1,76 +0,0 @@ -{ - mkDerivation, - lib, - nixosTests, - extra-cmake-modules, - kdoctools, - kbookmarks, - kcompletion, - kconfig, - kconfigwidgets, - kcoreaddons, - kguiaddons, - ki18n, - kiconthemes, - kinit, - kio, - knotifications, - knotifyconfig, - kparts, - kpty, - kservice, - ktextwidgets, - kwidgetsaddons, - kwindowsystem, - kxmlgui, - qtscript, - knewstuff, - qtmultimedia, -}: - -mkDerivation { - pname = "konsole"; - meta = { - homepage = "https://apps.kde.org/konsole/"; - description = "KDE terminal emulator"; - license = with lib.licenses; [ - gpl2Plus - lgpl21Plus - fdl12Plus - ]; - maintainers = with lib.maintainers; [ ttuegel ]; - mainProgram = "konsole"; - }; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - kbookmarks - kcompletion - kconfig - kconfigwidgets - kcoreaddons - kguiaddons - ki18n - kiconthemes - kinit - kio - knotifications - knotifyconfig - kparts - kpty - kservice - ktextwidgets - kwidgetsaddons - kwindowsystem - kxmlgui - qtscript - knewstuff - qtmultimedia - ]; - - passthru.tests.test = nixosTests.terminal-emulators.konsole; - - propagatedUserEnvPkgs = [ (lib.getBin kinit) ]; -} diff --git a/pkgs/applications/kde/kontact.nix b/pkgs/applications/kde/kontact.nix deleted file mode 100644 index 7923157c96f4..000000000000 --- a/pkgs/applications/kde/kontact.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ - mkDerivation, - lib, - kdepimTeam, - extra-cmake-modules, - kdoctools, - qtwebengine, - kcmutils, - kcrash, - kdbusaddons, - kparts, - kwindowsystem, - akonadi, - grantleetheme, - kontactinterface, - kpimtextedit, - mailcommon, - libkdepim, - pimcommon, - akregator, - kaddressbook, - kmail, - knotes, - korganizer, - zanshin, -}: - -mkDerivation { - pname = "kontact"; - meta = { - homepage = "https://apps.kde.org/kontact/"; - description = "Personal information manager"; - mainProgram = "kontact"; - license = with lib.licenses; [ - gpl2Plus - lgpl21Plus - fdl12Plus - ]; - maintainers = kdepimTeam; - }; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - qtwebengine - kcmutils - kcrash - kdbusaddons - kparts - kwindowsystem - akonadi - grantleetheme - kontactinterface - kpimtextedit - mailcommon - libkdepim - pimcommon - akregator - kaddressbook - kmail - knotes - korganizer - zanshin - ]; -} diff --git a/pkgs/applications/kde/kontactinterface.nix b/pkgs/applications/kde/kontactinterface.nix deleted file mode 100644 index c1b7957dee4e..000000000000 --- a/pkgs/applications/kde/kontactinterface.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ - mkDerivation, - lib, - kdepimTeam, - extra-cmake-modules, - kdoctools, - kiconthemes, - kparts, - kwindowsystem, - kxmlgui, - qtx11extras, -}: - -mkDerivation { - pname = "kontactinterface"; - meta = { - license = with lib.licenses; [ - gpl2Plus - lgpl21Plus - fdl12Plus - ]; - maintainers = kdepimTeam; - }; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - kiconthemes - kwindowsystem - kxmlgui - qtx11extras - ]; - propagatedBuildInputs = [ kparts ]; - postInstall = '' - # added as an include directory by cmake files and fails to compile if it's missing - mkdir -p "$out/include/KF5" - ''; -} diff --git a/pkgs/applications/kde/konversation.nix b/pkgs/applications/kde/konversation.nix deleted file mode 100644 index 0752c253f7f4..000000000000 --- a/pkgs/applications/kde/konversation.nix +++ /dev/null @@ -1,74 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - kdoctools, - kbookmarks, - karchive, - kconfig, - kconfigwidgets, - kcoreaddons, - kcrash, - kdbusaddons, - kemoticons, - kglobalaccel, - ki18n, - kiconthemes, - kidletime, - kitemviews, - knewstuff, - knotifications, - knotifyconfig, - kwindowsystem, - kio, - kparts, - kwallet, - solid, - sonnet, - phonon, - qtmultimedia, -}: - -mkDerivation { - pname = "konversation"; - - buildInputs = [ - kbookmarks - karchive - kconfig - kconfigwidgets - kcoreaddons - kcrash - kdbusaddons - kdoctools - kemoticons - kglobalaccel - ki18n - kiconthemes - kidletime - kitemviews - knewstuff - knotifications - knotifyconfig - kwindowsystem - kio - kparts - kwallet - solid - sonnet - phonon - qtmultimedia - ]; - - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - - meta = { - description = "Integrated IRC client for KDE"; - mainProgram = "konversation"; - license = with lib.licenses; [ gpl2 ]; - homepage = "https://konversation.kde.org"; - }; -} diff --git a/pkgs/applications/kde/kopeninghours.nix b/pkgs/applications/kde/kopeninghours.nix deleted file mode 100644 index a35fa19dc56c..000000000000 --- a/pkgs/applications/kde/kopeninghours.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ - mkDerivation, - lib, - bison, - extra-cmake-modules, - flex, - kholidays, - ki18n, -}: - -mkDerivation { - pname = "kopeninghours"; - outputs = [ - "out" - "dev" - ]; - - nativeBuildInputs = [ - bison - extra-cmake-modules - flex - ]; - - buildInputs = [ - kholidays - ki18n - ]; - - meta = { - license = with lib.licenses; [ - bsd3 - cc0 - lgpl2Plus - ]; - }; -} diff --git a/pkgs/applications/kde/korganizer.nix b/pkgs/applications/kde/korganizer.nix deleted file mode 100644 index 811b67345eeb..000000000000 --- a/pkgs/applications/kde/korganizer.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ - mkDerivation, - lib, - kdepimTeam, - extra-cmake-modules, - kdoctools, - qtbase, - qttools, - phonon, - knewstuff, - akonadi-calendar, - akonadi-contacts, - akonadi-notes, - akonadi-search, - calendarsupport, - eventviews, - incidenceeditor, - kcalutils, - kholidays, - kidentitymanagement, - kldap, - kmailtransport, - kontactinterface, - kparts, - kpimtextedit, - kuserfeedback, - pimcommon, -}: - -mkDerivation { - pname = "korganizer"; - meta = { - homepage = "https://apps.kde.org/korganizer/"; - description = "Personal organizer"; - mainProgram = "korganizer"; - license = with lib.licenses; [ - gpl2Plus - lgpl21Plus - fdl12Plus - ]; - maintainers = kdepimTeam; - }; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - propagatedBuildInputs = [ - qtbase - qttools - phonon - knewstuff - akonadi-calendar - akonadi-contacts - akonadi-notes - akonadi-search - calendarsupport - eventviews - incidenceeditor - kcalutils - kholidays - kidentitymanagement - kldap - kmailtransport - kontactinterface - kparts - kpimtextedit - kuserfeedback - pimcommon - ]; -} diff --git a/pkgs/applications/kde/kosmindoormap.nix b/pkgs/applications/kde/kosmindoormap.nix deleted file mode 100644 index 6569615eb6b0..000000000000 --- a/pkgs/applications/kde/kosmindoormap.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ - mkDerivation, - lib, - bison, - extra-cmake-modules, - flex, - ki18n, - kopeninghours, - kpublictransport, -}: - -mkDerivation { - pname = "kosmindoormap"; - outputs = [ - "out" - "dev" - ]; - - nativeBuildInputs = [ - bison - extra-cmake-modules - flex - ]; - - buildInputs = [ - ki18n - kopeninghours - kpublictransport - ]; - - meta = { - license = with lib.licenses; [ - bsd2 - bsd3 - cc0 - lgpl2Plus - lgpl3Plus - mit - odbl - ]; - }; -} diff --git a/pkgs/applications/kde/kpat.nix b/pkgs/applications/kde/kpat.nix deleted file mode 100644 index 077a6ea5b4e3..000000000000 --- a/pkgs/applications/kde/kpat.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ - lib, - mkDerivation, - extra-cmake-modules, - knewstuff, - shared-mime-info, - libkdegames, - freecell-solver, - black-hole-solver, -}: - -mkDerivation { - pname = "kpat"; - nativeBuildInputs = [ - extra-cmake-modules - shared-mime-info - ]; - buildInputs = [ - black-hole-solver - knewstuff - libkdegames - freecell-solver - ]; - meta = { - license = with lib.licenses; [ - gpl2Plus - lgpl21Plus - fdl12Plus - ]; - maintainers = with lib.maintainers; [ rnhmjoj ]; - }; -} diff --git a/pkgs/applications/kde/kpimtextedit.nix b/pkgs/applications/kde/kpimtextedit.nix deleted file mode 100644 index 634cc2ab26fe..000000000000 --- a/pkgs/applications/kde/kpimtextedit.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ - mkDerivation, - lib, - kdepimTeam, - extra-cmake-modules, - kdoctools, - grantlee, - kcodecs, - kconfigwidgets, - kemoticons, - ki18n, - kiconthemes, - kio, - kdesignerplugin, - ktextwidgets, - sonnet, - syntax-highlighting, - qttools, - qtspeech, -}: - -mkDerivation { - pname = "kpimtextedit"; - meta = { - license = with lib.licenses; [ - gpl2Plus - lgpl21Plus - fdl12Plus - ]; - maintainers = kdepimTeam; - }; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - grantlee - kcodecs - kconfigwidgets - kemoticons - ki18n - kiconthemes - kio - kdesignerplugin - sonnet - syntax-highlighting - qttools - qtspeech - ]; - propagatedBuildInputs = [ ktextwidgets ]; - outputs = [ - "out" - "dev" - ]; - postInstall = '' - # added as an include directory by cmake files and fails to compile if it's missing - mkdir -p "$dev/include/KF5" - ''; -} diff --git a/pkgs/applications/kde/kpkpass.nix b/pkgs/applications/kde/kpkpass.nix deleted file mode 100644 index 94dd6381a0d5..000000000000 --- a/pkgs/applications/kde/kpkpass.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - qtbase, - karchive, - shared-mime-info, -}: - -mkDerivation { - pname = "kpkpass"; - meta = { - license = with lib.licenses; [ lgpl21 ]; - maintainers = [ lib.maintainers.bkchr ]; - }; - nativeBuildInputs = [ - extra-cmake-modules - shared-mime-info - ]; - buildInputs = [ - qtbase - karchive - ]; - outputs = [ - "out" - "dev" - ]; -} diff --git a/pkgs/applications/kde/kpmcore/default.nix b/pkgs/applications/kde/kpmcore/default.nix deleted file mode 100644 index 2f8de5b853ad..000000000000 --- a/pkgs/applications/kde/kpmcore/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - qca-qt5, - kauth, - kio, - polkit-qt, - util-linux, -}: - -mkDerivation { - pname = "kpmcore"; - - patches = [ - ./nixostrustedprefix.patch - ]; - - nativeBuildInputs = [ extra-cmake-modules ]; - - buildInputs = [ - qca-qt5 - kauth - kio - polkit-qt - - util-linux # Needs blkid in configure script (note that this is not provided by util-linux-compat) - ]; - - dontWrapQtApps = true; - - preConfigure = '' - substituteInPlace src/util/CMakeLists.txt \ - --replace \$\{POLKITQT-1_POLICY_FILES_INSTALL_DIR\} $out/share/polkit-1/actions - substituteInPlace src/backend/corebackend.cpp \ - --replace /usr/share/polkit-1/actions/org.kde.kpmcore.externalcommand.policy $out/share/polkit-1/actions/org.kde.kpmcore.externalcommand.policy - ''; - - meta = with lib; { - description = "KDE Partition Manager core library"; - homepage = "https://invent.kde.org/system/kpmcore"; - license = with licenses; [ - cc-by-40 - cc0 - gpl3Plus - mit - ]; - maintainers = with maintainers; [ - peterhoeg - oxalica - ]; - }; -} diff --git a/pkgs/applications/kde/kpmcore/nixostrustedprefix.patch b/pkgs/applications/kde/kpmcore/nixostrustedprefix.patch deleted file mode 100644 index cb1eb68364dd..000000000000 --- a/pkgs/applications/kde/kpmcore/nixostrustedprefix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/util/externalcommandhelper.cpp b/src/util/externalcommandhelper.cpp -index a879c8d..3d7863b 100644 ---- a/src/util/externalcommandhelper.cpp -+++ b/src/util/externalcommandhelper.cpp -@@ -387,7 +387,7 @@ QVariantMap ExternalCommandHelper::RunCommand(const QString& command, const QStr - if (dirname == QStringLiteral("bin") || dirname == QStringLiteral("sbin")) { - prefix.cdUp(); - } -- if (trustedPrefixes.find(prefix.path()) == trustedPrefixes.end()) { // TODO: C++20: replace with contains -+ if (!prefix.path().startsWith(QStringLiteral("/nix/store")) && !prefix.path().startsWith(QStringLiteral("/run/current-system/sw"))) { // TODO: C++20: replace with contains - qInfo() << prefix.path() << "prefix is not one of the trusted command prefixes"; - reply[QStringLiteral("success")] = false; - return reply; diff --git a/pkgs/applications/kde/kpublictransport.nix b/pkgs/applications/kde/kpublictransport.nix deleted file mode 100644 index 87cc7e65bc88..000000000000 --- a/pkgs/applications/kde/kpublictransport.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - qtquickcontrols2, - networkmanager-qt, - ki18n, -}: - -mkDerivation { - pname = "kpublictransport"; - meta = with lib; { - license = [ licenses.cc0 ]; - maintainers = [ ]; - }; - nativeBuildInputs = [ extra-cmake-modules ]; - - buildInputs = [ - qtquickcontrols2 - networkmanager-qt - ki18n - ]; -} diff --git a/pkgs/applications/kde/kqtquickcharts.nix b/pkgs/applications/kde/kqtquickcharts.nix deleted file mode 100644 index 16b4432cb934..000000000000 --- a/pkgs/applications/kde/kqtquickcharts.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - qtbase, - qtdeclarative, -}: - -mkDerivation { - pname = "kqtquickcharts"; - meta = { - license = with lib.licenses; [ - gpl2Plus - lgpl21Plus - fdl12Plus - ]; - maintainers = [ lib.maintainers.ttuegel ]; - }; - nativeBuildInputs = [ extra-cmake-modules ]; - propagatedBuildInputs = [ - qtbase - qtdeclarative - ]; -} diff --git a/pkgs/applications/kde/krdc.nix b/pkgs/applications/kde/krdc.nix deleted file mode 100644 index 2c6f4106ec53..000000000000 --- a/pkgs/applications/kde/krdc.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - kdoctools, - makeWrapper, - kcmutils, - kcompletion, - kconfig, - kdnssd, - knotifyconfig, - kwallet, - kwidgetsaddons, - kwindowsystem, - libvncserver, - freerdp, -}: - -mkDerivation { - pname = "krdc"; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - makeWrapper - ]; - buildInputs = [ - kcmutils - kcompletion - kconfig - kdnssd - knotifyconfig - kwallet - kwidgetsaddons - kwindowsystem - freerdp - libvncserver - ]; - postFixup = '' - wrapProgram $out/bin/krdc \ - --prefix PATH : ${lib.makeBinPath [ freerdp ]} - ''; - meta = with lib; { - homepage = "http://www.kde.org"; - description = "Remote desktop client"; - mainProgram = "krdc"; - license = with licenses; [ - gpl2Plus - lgpl21Plus - fdl12Plus - bsd3 - ]; - maintainers = with maintainers; [ peterhoeg ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/kde/krecorder.nix b/pkgs/applications/kde/krecorder.nix deleted file mode 100644 index 39fd2a71ea0e..000000000000 --- a/pkgs/applications/kde/krecorder.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ - lib, - mkDerivation, - - cmake, - extra-cmake-modules, - - kconfig, - kcoreaddons, - ki18n, - kirigami2, - kirigami-addons, - kwindowsystem, - qtmultimedia, - qtquickcontrols2, -}: - -mkDerivation { - pname = "krecorder"; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - ]; - - buildInputs = [ - kconfig - kcoreaddons - ki18n - kirigami2 - kirigami-addons - kwindowsystem - qtmultimedia - qtquickcontrols2 - ]; - - meta = with lib; { - description = "Audio recorder for Plasma Mobile"; - mainProgram = "krecorder"; - homepage = "https://invent.kde.org/plasma-mobile/krecorder"; - license = licenses.gpl3Plus; - maintainers = [ ]; - }; -} diff --git a/pkgs/applications/kde/kreversi.nix b/pkgs/applications/kde/kreversi.nix deleted file mode 100644 index 0afc0a8eef87..000000000000 --- a/pkgs/applications/kde/kreversi.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - libkdegames, - kdeclarative, -}: - -mkDerivation { - pname = "kreversi"; - meta = with lib; { - homepage = "https://kde.org/applications/en/games/org.kde.kreversi"; - description = "Simple one player strategy game played against the computer"; - mainProgram = "kreversi"; - maintainers = with maintainers; [ freezeboy ]; - license = licenses.gpl2Plus; - platforms = platforms.linux; - }; - nativeBuildInputs = [ - extra-cmake-modules - ]; - buildInputs = [ - kdeclarative - libkdegames - ]; -} diff --git a/pkgs/applications/kde/krfb.nix b/pkgs/applications/kde/krfb.nix deleted file mode 100644 index efd564de083f..000000000000 --- a/pkgs/applications/kde/krfb.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - kdoctools, - wayland-scanner, - kconfig, - kcoreaddons, - kcrash, - kdbusaddons, - kdnssd, - knotifications, - kwallet, - kwidgetsaddons, - kwindowsystem, - kxmlgui, - kwayland, - kpipewire, - libvncserver, - libXtst, - libXdamage, - qtx11extras, - pipewire, - plasma-wayland-protocols, - wayland, -}: - -mkDerivation { - pname = "krfb"; - meta = { - homepage = "https://apps.kde.org/krfb/"; - description = "Desktop sharing (VNC)"; - license = with lib.licenses; [ - gpl2Plus - fdl12Plus - ]; - maintainers = with lib.maintainers; [ jerith666 ]; - }; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - wayland-scanner - ]; - buildInputs = [ - libvncserver - libXtst - libXdamage - kconfig - kcoreaddons - kcrash - kdbusaddons - knotifications - kwallet - kwidgetsaddons - kwindowsystem - kxmlgui - kwayland - kpipewire - qtx11extras - pipewire - plasma-wayland-protocols - wayland - ]; - propagatedBuildInputs = [ kdnssd ]; -} diff --git a/pkgs/applications/kde/kruler.nix b/pkgs/applications/kde/kruler.nix deleted file mode 100644 index fe905d37cd0a..000000000000 --- a/pkgs/applications/kde/kruler.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - kdoctools, - knotifications, - kwindowsystem, - kxmlgui, - qtx11extras, -}: - -mkDerivation { - pname = "kruler"; - meta = { - homepage = "https://apps.kde.org/kruler/"; - description = "Screen ruler"; - mainProgram = "kruler"; - license = with lib.licenses; [ gpl2 ]; - maintainers = [ lib.maintainers.vandenoever ]; - }; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - kwindowsystem - knotifications - kxmlgui - qtx11extras - ]; -} diff --git a/pkgs/applications/kde/ksanecore.nix b/pkgs/applications/kde/ksanecore.nix deleted file mode 100644 index ae9ec9dfebcd..000000000000 --- a/pkgs/applications/kde/ksanecore.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - qtbase, - ki18n, - sane-backends, -}: - -mkDerivation { - pname = "ksanecore"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - qtbase - ki18n - sane-backends - ]; - meta = with lib; { - license = licenses.gpl2; - maintainers = with maintainers; [ andrevmatos ]; - }; -} diff --git a/pkgs/applications/kde/kshisen.nix b/pkgs/applications/kde/kshisen.nix deleted file mode 100644 index 3ec0dc535025..000000000000 --- a/pkgs/applications/kde/kshisen.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - kdoctools, - ki18n, - kio, - libkdegames, - libkmahjongg, -}: - -mkDerivation { - pname = "kshisen"; - meta = with lib; { - homepage = "https://kde.org/applications/en/games/org.kde.kshisen"; - description = "Solitaire-like game played using the standard set of Mahjong tiles"; - mainProgram = "kshisen"; - maintainers = with maintainers; [ freezeboy ]; - license = licenses.gpl2Plus; - platforms = platforms.linux; - }; - nativeBuildInputs = [ - extra-cmake-modules - ]; - buildInputs = [ - libkdegames - libkmahjongg - kdoctools - ki18n - kio - ]; -} diff --git a/pkgs/applications/kde/ksmtp/default.nix b/pkgs/applications/kde/ksmtp/default.nix deleted file mode 100644 index f25110706d65..000000000000 --- a/pkgs/applications/kde/ksmtp/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ - mkDerivation, - lib, - kdepimTeam, - extra-cmake-modules, - kdoctools, - kcoreaddons, - kio, - kmime, - cyrus_sasl, -}: - -mkDerivation { - pname = "ksmtp"; - meta = { - license = with lib.licenses; [ - gpl2Plus - lgpl21Plus - fdl12Plus - ]; - maintainers = kdepimTeam; - }; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - kcoreaddons - kio - kmime - ]; - propagatedBuildInputs = [ cyrus_sasl ]; - postInstall = '' - # added as an include directory by cmake files and fails to compile if it's missing - mkdir -p "$out/include/KF5" - ''; -} diff --git a/pkgs/applications/kde/kspaceduel.nix b/pkgs/applications/kde/kspaceduel.nix deleted file mode 100644 index 15adbd15a87b..000000000000 --- a/pkgs/applications/kde/kspaceduel.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - cmake, - kdbusaddons, - ki18n, - kconfigwidgets, - kcrash, - kxmlgui, - libkdegames, -}: - -mkDerivation { - pname = "kspaceduel"; - meta = { - homepage = "https://apps.kde.org/kspaceduel/"; - description = "Space arcade game"; - mainProgram = "kspaceduel"; - license = with lib.licenses; [ - lgpl21 - gpl3 - ]; - }; - outputs = [ - "out" - "dev" - ]; - nativeBuildInputs = [ - cmake - extra-cmake-modules - ]; - propagatedBuildInputs = [ - kdbusaddons - ki18n - kconfigwidgets - kcrash - kxmlgui - libkdegames - ]; -} diff --git a/pkgs/applications/kde/ksquares.nix b/pkgs/applications/kde/ksquares.nix deleted file mode 100644 index cdd2ce84afad..000000000000 --- a/pkgs/applications/kde/ksquares.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - kdoctools, - libkdegames, - kconfig, - kcrash, - kxmlgui, -}: - -mkDerivation { - pname = "ksquares"; - meta = with lib; { - homepage = "https://kde.org/applications/en/games/org.kde.ksquares"; - description = "Game of Dots and Boxes"; - mainProgram = "ksquares"; - maintainers = with maintainers; [ freezeboy ]; - license = licenses.gpl2Plus; - platforms = platforms.linux; - }; - nativeBuildInputs = [ - extra-cmake-modules - ]; - buildInputs = [ - kdoctools - libkdegames - kconfig - kcrash - kxmlgui - ]; -} diff --git a/pkgs/applications/kde/ksudoku.nix b/pkgs/applications/kde/ksudoku.nix deleted file mode 100644 index dd5744c7aa9a..000000000000 --- a/pkgs/applications/kde/ksudoku.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ - lib, - mkDerivation, - extra-cmake-modules, - libGLU, - kdoctools, - kdeclarative, - libkdegames, -}: - -mkDerivation { - pname = "ksudoku"; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - libGLU - kdeclarative - libkdegames - ]; - meta = { - homepage = "https://apps.kde.org/ksudoku/"; - description = "Suduko game"; - mainProgram = "ksudoku"; - license = with lib.licenses; [ gpl2 ]; - maintainers = [ ]; - }; -} diff --git a/pkgs/applications/kde/ksystemlog.nix b/pkgs/applications/kde/ksystemlog.nix deleted file mode 100644 index f3e88e6e0352..000000000000 --- a/pkgs/applications/kde/ksystemlog.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - gettext, - kdoctools, - karchive, - kconfig, - kio, -}: - -mkDerivation { - pname = "ksystemlog"; - - nativeBuildInputs = [ - extra-cmake-modules - gettext - kdoctools - ]; - propagatedBuildInputs = [ - karchive - kconfig - kio - ]; - - meta = with lib; { - homepage = "https://apps.kde.org/ksystemlog/"; - description = "System log viewer"; - mainProgram = "ksystemlog"; - license = with licenses; [ gpl2 ]; - maintainers = with maintainers; [ peterhoeg ]; - }; -} diff --git a/pkgs/applications/kde/kteatime.nix b/pkgs/applications/kde/kteatime.nix deleted file mode 100644 index 0f48b6c8b45a..000000000000 --- a/pkgs/applications/kde/kteatime.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - kdoctools, - ki18n, - kconfig, - kcrash, - kiconthemes, - knotifyconfig, -}: - -mkDerivation { - pname = "kteatime"; - meta = with lib; { - homepage = "https://kde.org/applications/en/utilities/org.kde.kteatime"; - description = "Handy timer for steeping tea"; - mainProgram = "kteatime"; - maintainers = with maintainers; [ freezeboy ]; - license = licenses.gpl2Plus; - platforms = platforms.linux; - }; - nativeBuildInputs = [ - extra-cmake-modules - ]; - buildInputs = [ - kdoctools - ki18n - kconfig - kcrash - kiconthemes - knotifyconfig - ]; -} diff --git a/pkgs/applications/kde/ktimer.nix b/pkgs/applications/kde/ktimer.nix deleted file mode 100644 index a4034b83f474..000000000000 --- a/pkgs/applications/kde/ktimer.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - kdoctools, - ki18n, - kio, -}: - -mkDerivation { - pname = "ktimer"; - meta = with lib; { - homepage = "https://kde.org/applications/en/utilities/org.kde.ktimer"; - description = "Little tool to execute programs after some time"; - mainProgram = "ktimer"; - maintainers = with maintainers; [ freezeboy ]; - license = licenses.gpl2Plus; - platforms = platforms.linux; - }; - nativeBuildInputs = [ - extra-cmake-modules - ]; - buildInputs = [ - kdoctools - ki18n - kio - ]; -} diff --git a/pkgs/applications/kde/ktnef.nix b/pkgs/applications/kde/ktnef.nix deleted file mode 100644 index 0bde31a482e0..000000000000 --- a/pkgs/applications/kde/ktnef.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ - mkDerivation, - lib, - kdepimTeam, - extra-cmake-modules, - kdoctools, - kcalendarcore, - kcalutils, - kcontacts, -}: - -mkDerivation { - pname = "ktnef"; - meta = { - license = with lib.licenses; [ - gpl2Plus - lgpl21Plus - fdl12Plus - ]; - maintainers = kdepimTeam; - }; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - propagatedBuildInputs = [ - kcalendarcore - kcalutils - kcontacts - ]; - outputs = [ - "out" - "dev" - ]; - postInstall = '' - # added as an include directory by cmake files and fails to compile if it's missing - mkdir -p "$dev/include/KF5" - ''; -} diff --git a/pkgs/applications/kde/ktorrent.nix b/pkgs/applications/kde/ktorrent.nix deleted file mode 100644 index b2e5118bee8e..000000000000 --- a/pkgs/applications/kde/ktorrent.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - kdoctools, - karchive, - kcmutils, - kcrash, - kdnssd, - ki18n, - knotifications, - knotifyconfig, - kplotting, - kross, - libgcrypt, - libktorrent, - taglib, -}: - -mkDerivation { - pname = "ktorrent"; - meta = with lib; { - description = "KDE integrated BtTorrent client"; - homepage = "https://apps.kde.org/ktorrent/"; - license = licenses.gpl2Plus; - maintainers = [ ]; - }; - - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - karchive - kcmutils - kcrash - kdnssd - ki18n - knotifications - knotifyconfig - kplotting - kross - libgcrypt - libktorrent - taglib - ]; -} diff --git a/pkgs/applications/kde/ktrip.nix b/pkgs/applications/kde/ktrip.nix deleted file mode 100644 index f1b931ffdc4e..000000000000 --- a/pkgs/applications/kde/ktrip.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ - lib, - mkDerivation, - - cmake, - extra-cmake-modules, - - kconfig, - kcontacts, - kcoreaddons, - ki18n, - kirigami-addons, - kirigami2, - kitemmodels, - kpublictransport, - qqc2-desktop-style, - qtquickcontrols2, -}: - -mkDerivation { - pname = "ktrip"; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - ]; - - buildInputs = [ - kconfig - kcontacts - kcoreaddons - ki18n - kirigami-addons - kirigami2 - kitemmodels - kpublictransport - qqc2-desktop-style - qtquickcontrols2 - ]; - - meta = with lib; { - description = "Public transport trip planner"; - mainProgram = "ktrip"; - homepage = "https://apps.kde.org/ktrip/"; - # GPL-2.0-or-later - license = licenses.gpl2Plus; - maintainers = [ ]; - }; -} diff --git a/pkgs/applications/kde/kturtle.nix b/pkgs/applications/kde/kturtle.nix deleted file mode 100644 index af0b867ae988..000000000000 --- a/pkgs/applications/kde/kturtle.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - kdoctools, - ki18n, - kio, - knewstuff, -}: - -mkDerivation { - pname = "kturtle"; - meta = with lib; { - homepage = "https://invent.kde.org/education/kturtle"; - description = "Educational programming environment for learning how to program"; - mainProgram = "kturtle"; - maintainers = with maintainers; [ freezeboy ]; - license = licenses.gpl2Plus; - platforms = platforms.linux; - }; - nativeBuildInputs = [ - extra-cmake-modules - ]; - buildInputs = [ - kdoctools - ki18n - kio - knewstuff - ]; -} diff --git a/pkgs/applications/kde/kwalletmanager.nix b/pkgs/applications/kde/kwalletmanager.nix deleted file mode 100644 index 8edc210f2e06..000000000000 --- a/pkgs/applications/kde/kwalletmanager.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ - lib, - mkDerivation, - extra-cmake-modules, - kdoctools, - kauth, - kcmutils, - kconfigwidgets, - kcoreaddons, - kdbusaddons, - kwallet, - kxmlgui, -}: - -mkDerivation { - pname = "kwalletmanager"; - meta = { - homepage = "https://apps.kde.org/kwalletmanager5/"; - - description = "KDE wallet management tool"; - mainProgram = "kwalletmanager5"; - license = with lib.licenses; [ gpl2 ]; - }; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - kauth - kcmutils - kconfigwidgets - kcoreaddons - kdbusaddons - kwallet - kxmlgui - ]; -} diff --git a/pkgs/applications/kde/kwave.nix b/pkgs/applications/kde/kwave.nix deleted file mode 100644 index 899b0177da98..000000000000 --- a/pkgs/applications/kde/kwave.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - kdoctools, - qtmultimedia, - kcompletion, - kconfig, - kcrash, - kiconthemes, - kio, - audiofile, - libsamplerate, - alsa-lib, - libpulseaudio, - flac, - id3lib, - libogg, - libmad, - libopus, - libvorbis, - fftw, - librsvg, -}: - -mkDerivation { - pname = "kwave"; - - meta = with lib; { - homepage = "https://kde.org/applications/en/multimedia/org.kde.kwave"; - description = "Simple media player"; - mainProgram = "kwave"; - maintainers = with maintainers; [ freezeboy ]; - license = licenses.gpl2Plus; - platforms = platforms.linux; - }; - nativeBuildInputs = [ - extra-cmake-modules - ]; - buildInputs = [ - alsa-lib - audiofile - kcrash - kdoctools - qtmultimedia - kcompletion - kconfig - kiconthemes - kio - libpulseaudio - libsamplerate - flac - fftw - id3lib - libogg - libmad - libopus - libvorbis - librsvg - ]; -} diff --git a/pkgs/applications/kde/kweather.nix b/pkgs/applications/kde/kweather.nix deleted file mode 100644 index 3c3283f43d62..000000000000 --- a/pkgs/applications/kde/kweather.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ - lib, - mkDerivation, - - cmake, - extra-cmake-modules, - - kconfig, - kholidays, - ki18n, - kirigami-addons, - kirigami2, - knotifications, - kquickcharts, - kweathercore, - plasma-framework, - qtcharts, - qtquickcontrols2, -}: - -mkDerivation { - pname = "kweather"; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - ]; - - buildInputs = [ - kconfig - kholidays - ki18n - kirigami-addons - kirigami2 - knotifications - kquickcharts - kweathercore - plasma-framework - qtcharts - qtquickcontrols2 - ]; - - meta = with lib; { - description = "Weather application for Plasma Mobile"; - mainProgram = "kweather"; - homepage = "https://invent.kde.org/plasma-mobile/kweather"; - license = with licenses; [ - gpl2Plus - cc-by-40 - ]; - maintainers = [ ]; - }; -} diff --git a/pkgs/applications/kde/libgravatar.nix b/pkgs/applications/kde/libgravatar.nix deleted file mode 100644 index b444d0488e33..000000000000 --- a/pkgs/applications/kde/libgravatar.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ - mkDerivation, - lib, - kdepimTeam, - extra-cmake-modules, - kdoctools, - kconfig, - kio, - ktextwidgets, - kwidgetsaddons, - pimcommon, -}: - -mkDerivation { - pname = "libgravatar"; - meta = { - license = with lib.licenses; [ - gpl2Plus - lgpl21Plus - fdl12Plus - ]; - maintainers = kdepimTeam; - }; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - propagatedBuildInputs = [ - kconfig - kio - ktextwidgets - kwidgetsaddons - pimcommon - ]; - outputs = [ - "out" - "dev" - ]; - postInstall = '' - # added as an include directory by cmake files and fails to compile if it's missing - mkdir -p "$dev/include/KF5" - ''; -} diff --git a/pkgs/applications/kde/libkcddb.nix b/pkgs/applications/kde/libkcddb.nix deleted file mode 100644 index 1a634fd44532..000000000000 --- a/pkgs/applications/kde/libkcddb.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - qtbase, - kdoctools, - kcodecs, - ki18n, - kio, - kwidgetsaddons, - kcmutils, - libmusicbrainz5, -}: - -mkDerivation { - pname = "libkcddb"; - meta = with lib; { - license = with licenses; [ - gpl2 - lgpl21 - bsd3 - ]; - maintainers = with maintainers; [ peterhoeg ]; - }; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - qtbase - kcmutils - ]; - propagatedBuildInputs = [ - kcodecs - ki18n - kio - kwidgetsaddons - libmusicbrainz5 - ]; -} diff --git a/pkgs/applications/kde/libkdcraw.nix b/pkgs/applications/kde/libkdcraw.nix deleted file mode 100644 index 545233d970f9..000000000000 --- a/pkgs/applications/kde/libkdcraw.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - libraw, - qtbase, -}: - -mkDerivation { - pname = "libkdcraw"; - meta = { - license = with lib.licenses; [ - gpl2 - lgpl21 - bsd3 - ]; - maintainers = [ lib.maintainers.ttuegel ]; - }; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ qtbase ]; - propagatedBuildInputs = [ libraw ]; - outputs = [ - "out" - "dev" - ]; -} diff --git a/pkgs/applications/kde/libkdegames.nix b/pkgs/applications/kde/libkdegames.nix deleted file mode 100644 index dc667eb75a97..000000000000 --- a/pkgs/applications/kde/libkdegames.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ - lib, - mkDerivation, - extra-cmake-modules, - kdoctools, - qtdeclarative, - kdeclarative, - kdnssd, - knewstuff, - openal, - libsndfile, - qtquickcontrols, -}: - -mkDerivation { - pname = "libkdegames"; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - qtdeclarative - kdeclarative - kdnssd - knewstuff - openal - libsndfile - qtquickcontrols - ]; - meta = { - license = with lib.licenses; [ gpl2 ]; - maintainers = [ ]; - }; -} diff --git a/pkgs/applications/kde/libkdepim.nix b/pkgs/applications/kde/libkdepim.nix deleted file mode 100644 index 63eb02658501..000000000000 --- a/pkgs/applications/kde/libkdepim.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ - mkDerivation, - lib, - kdepimTeam, - extra-cmake-modules, - kdoctools, - akonadi, - akonadi-contacts, - akonadi-search, - kcmutils, - kcodecs, - kcompletion, - kconfigwidgets, - kcontacts, - ki18n, - kiconthemes, - kio, - kitemviews, - kjobwidgets, - kldap, - kwallet, -}: - -mkDerivation { - pname = "libkdepim"; - meta = { - license = with lib.licenses; [ - gpl2Plus - lgpl21Plus - fdl12Plus - ]; - maintainers = kdepimTeam; - }; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - akonadi - akonadi-contacts - akonadi-search - kcmutils - kcodecs - kcompletion - kconfigwidgets - kcontacts - ki18n - kiconthemes - kio - kitemviews - kjobwidgets - kldap - kwallet - ]; - postInstall = '' - # added as an include directory by cmake files and fails to compile if it's missing - mkdir -p "$out/include/KF5" - ''; -} diff --git a/pkgs/applications/kde/libkexiv2.nix b/pkgs/applications/kde/libkexiv2.nix deleted file mode 100644 index 3017618fcaa5..000000000000 --- a/pkgs/applications/kde/libkexiv2.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ - mkDerivation, - lib, - exiv2, - extra-cmake-modules, - qtbase, -}: - -mkDerivation { - pname = "libkexiv2"; - meta = { - license = with lib.licenses; [ - gpl2 - lgpl21 - bsd3 - ]; - maintainers = [ lib.maintainers.ttuegel ]; - }; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ qtbase ]; - propagatedBuildInputs = [ exiv2 ]; - outputs = [ - "out" - "dev" - ]; -} diff --git a/pkgs/applications/kde/libkgapi.nix b/pkgs/applications/kde/libkgapi.nix deleted file mode 100644 index 3e3678d58812..000000000000 --- a/pkgs/applications/kde/libkgapi.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ - mkDerivation, - lib, - kdepimTeam, - extra-cmake-modules, - kdoctools, - qtwebengine, - kio, - kcalendarcore, - kcontacts, - cyrus_sasl, -}: - -mkDerivation { - pname = "libkgapi"; - meta = { - license = with lib.licenses; [ - gpl2Plus - lgpl21Plus - fdl12Plus - ]; - maintainers = kdepimTeam; - }; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - qtwebengine - kio - kcalendarcore - kcontacts - cyrus_sasl - ]; -} diff --git a/pkgs/applications/kde/libkipi.nix b/pkgs/applications/kde/libkipi.nix deleted file mode 100644 index 79fd1eed63b9..000000000000 --- a/pkgs/applications/kde/libkipi.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - kconfig, - ki18n, - kservice, - kxmlgui, -}: - -mkDerivation { - pname = "libkipi"; - meta = { - license = with lib.licenses; [ - gpl2 - lgpl21 - bsd3 - ]; - maintainers = [ lib.maintainers.ttuegel ]; - }; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - kconfig - ki18n - kservice - kxmlgui - ]; - outputs = [ - "out" - "dev" - ]; -} diff --git a/pkgs/applications/kde/libkleo.nix b/pkgs/applications/kde/libkleo.nix deleted file mode 100644 index ac13ea5ae853..000000000000 --- a/pkgs/applications/kde/libkleo.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ - mkDerivation, - lib, - kdepimTeam, - extra-cmake-modules, - kdoctools, - boost, - qgpgme, - kcodecs, - kcompletion, - kconfig, - kcoreaddons, - ki18n, - kitemmodels, - kpimtextedit, - kwidgetsaddons, - kwindowsystem, -}: - -mkDerivation { - pname = "libkleo"; - meta = { - license = with lib.licenses; [ - gpl2Plus - lgpl21Plus - fdl12Plus - ]; - maintainers = kdepimTeam; - }; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - boost - kcodecs - kcompletion - kconfig - kcoreaddons - ki18n - kitemmodels - kpimtextedit - kwidgetsaddons - kwindowsystem - ]; - propagatedBuildInputs = [ qgpgme ]; - outputs = [ - "out" - "dev" - ]; - postInstall = '' - # added as an include directory by cmake files and fails to compile if it's missing - mkdir -p "$dev/include/KF5" - ''; -} diff --git a/pkgs/applications/kde/libkmahjongg.nix b/pkgs/applications/kde/libkmahjongg.nix deleted file mode 100644 index 97ff358b9b54..000000000000 --- a/pkgs/applications/kde/libkmahjongg.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - kdoctools, - kcompletion, - kconfig, - kconfigwidgets, - kcoreaddons, - ki18n, - kwidgetsaddons, -}: - -mkDerivation { - pname = "libkmahjongg"; - meta = { - license = with lib.licenses; [ gpl2 ]; - maintainers = [ ]; - }; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - kcompletion - kconfig - kconfigwidgets - kcoreaddons - ki18n - kwidgetsaddons - ]; - outputs = [ - "out" - "dev" - ]; -} diff --git a/pkgs/applications/kde/libkomparediff2.nix b/pkgs/applications/kde/libkomparediff2.nix deleted file mode 100644 index 8f18cd0b3b2e..000000000000 --- a/pkgs/applications/kde/libkomparediff2.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ - mkDerivation, - extra-cmake-modules, - ki18n, - kxmlgui, - kcodecs, - kio, -}: - -mkDerivation { - pname = "libkomparediff2"; - nativeBuildInputs = [ extra-cmake-modules ]; - propagatedBuildInputs = [ - kcodecs - ki18n - kxmlgui - kio - ]; -} diff --git a/pkgs/applications/kde/libksane.nix b/pkgs/applications/kde/libksane.nix deleted file mode 100644 index 241a9e284b86..000000000000 --- a/pkgs/applications/kde/libksane.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - qtbase, - ki18n, - ktextwidgets, - kwallet, - kwidgetsaddons, - ksanecore, - sane-backends, -}: - -mkDerivation { - pname = "libksane"; - meta = with lib; { - license = licenses.gpl2; - maintainers = with maintainers; [ polendri ]; - }; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - qtbase - ki18n - ktextwidgets - kwallet - kwidgetsaddons - ]; - propagatedBuildInputs = [ - ksanecore - sane-backends - ]; -} diff --git a/pkgs/applications/kde/libksieve.nix b/pkgs/applications/kde/libksieve.nix deleted file mode 100644 index f6e3d3252b3b..000000000000 --- a/pkgs/applications/kde/libksieve.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ - mkDerivation, - lib, - kdepimTeam, - extra-cmake-modules, - kdoctools, - akonadi, - karchive, - kcompletion, - kiconthemes, - kidentitymanagement, - kio, - kmailtransport, - knewstuff, - kwindowsystem, - kxmlgui, - libkdepim, - pimcommon, - qtwebengine, - syntax-highlighting, -}: - -mkDerivation { - pname = "libksieve"; - meta = { - license = with lib.licenses; [ - gpl2Plus - lgpl21Plus - fdl12Plus - ]; - maintainers = kdepimTeam; - }; - outputs = [ - "out" - "dev" - ]; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - akonadi - karchive - kcompletion - kiconthemes - kidentitymanagement - kio - kmailtransport - knewstuff - kwindowsystem - kxmlgui - libkdepim - pimcommon - qtwebengine - ]; - propagatedBuildInputs = [ syntax-highlighting ]; -} diff --git a/pkgs/applications/kde/libktorrent.nix b/pkgs/applications/kde/libktorrent.nix deleted file mode 100644 index c7432bb0f1d3..000000000000 --- a/pkgs/applications/kde/libktorrent.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ - mkDerivation, - extra-cmake-modules, - karchive, - kcrash, - ki18n, - kio, - libgcrypt, - qca-qt5, - solid, - boost, - gmp, -}: - -mkDerivation { - pname = "libktorrent"; - meta = { - description = "BitTorrent library used by KTorrent"; - homepage = "https://apps.kde.org/ktorrent/"; - maintainers = [ ]; - }; - - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - karchive - kcrash - ki18n - kio - libgcrypt - qca-qt5 - solid - ]; - propagatedBuildInputs = [ - boost - gmp - ]; - outputs = [ - "out" - "dev" - ]; - - dontWrapQtApps = true; -} diff --git a/pkgs/applications/kde/mailcommon.nix b/pkgs/applications/kde/mailcommon.nix deleted file mode 100644 index b703f056488b..000000000000 --- a/pkgs/applications/kde/mailcommon.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ - mkDerivation, - lib, - kdepimTeam, - extra-cmake-modules, - kdoctools, - akonadi, - akonadi-mime, - karchive, - kcodecs, - kcompletion, - kconfigwidgets, - kdbusaddons, - kdesignerplugin, - kiconthemes, - kio, - kitemmodels, - kldap, - kmailtransport, - kwindowsystem, - mailimporter, - messagelib, - phonon, - libkdepim, -}: - -mkDerivation { - pname = "mailcommon"; - meta = { - license = with lib.licenses; [ - gpl2Plus - lgpl21Plus - fdl12Plus - ]; - maintainers = kdepimTeam; - }; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - akonadi - akonadi-mime - karchive - kcodecs - kcompletion - kconfigwidgets - kdbusaddons - kdesignerplugin - kiconthemes - kio - kitemmodels - kldap - kmailtransport - kwindowsystem - mailimporter - messagelib - phonon - libkdepim - ]; - outputs = [ - "out" - "dev" - ]; - postInstall = '' - # added as an include directory by cmake files and fails to compile if it's missing - mkdir -p "$dev/include/KF5" - ''; -} diff --git a/pkgs/applications/kde/mailimporter.nix b/pkgs/applications/kde/mailimporter.nix deleted file mode 100644 index 270c515f5fe8..000000000000 --- a/pkgs/applications/kde/mailimporter.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ - mkDerivation, - lib, - kdepimTeam, - extra-cmake-modules, - kdoctools, - akonadi, - akonadi-mime, - karchive, - kcompletion, - kconfig, - kcoreaddons, - ki18n, - kmime, - kxmlgui, - libkdepim, - pimcommon, -}: - -mkDerivation { - pname = "mailimporter"; - meta = { - license = with lib.licenses; [ - gpl2Plus - lgpl21Plus - fdl12Plus - ]; - maintainers = kdepimTeam; - }; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - akonadi - akonadi-mime - karchive - kcompletion - kconfig - kcoreaddons - ki18n - kmime - kxmlgui - libkdepim - pimcommon - ]; - postInstall = '' - # added as an include directory by cmake files and fails to compile if it's missing - mkdir -p "$out/include/KF5" - ''; -} diff --git a/pkgs/applications/kde/marble.nix b/pkgs/applications/kde/marble.nix deleted file mode 100644 index e4a06dcd7a5d..000000000000 --- a/pkgs/applications/kde/marble.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - kdoctools, - qtscript, - qtsvg, - qtquickcontrols, - qtwebengine, - krunner, - shared-mime-info, - kparts, - knewstuff, - gpsd, - perl, - protobuf_21, -}: - -mkDerivation { - pname = "marble"; - meta = { - homepage = "https://apps.kde.org/marble/"; - description = "Virtual globe"; - license = with lib.licenses; [ - lgpl21 - gpl3 - ]; - }; - outputs = [ - "out" - "dev" - ]; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - perl - ]; - propagatedBuildInputs = [ - protobuf_21 - qtscript - qtsvg - qtquickcontrols - qtwebengine - shared-mime-info - krunner - kparts - knewstuff - gpsd - ]; - cmakeFlags = [ - "-DINCLUDE_INSTALL_DIR=${placeholder "dev"}/include" - ]; -} diff --git a/pkgs/applications/kde/mbox-importer.nix b/pkgs/applications/kde/mbox-importer.nix deleted file mode 100644 index fe1864b11e84..000000000000 --- a/pkgs/applications/kde/mbox-importer.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ - mkDerivation, - lib, - kdepimTeam, - extra-cmake-modules, - kdoctools, - akonadi, - akonadi-search, - kconfig, - kservice, - kio, - mailcommon, - mailimporter, - messagelib, -}: - -mkDerivation { - pname = "mbox-importer"; - meta = { - license = with lib.licenses; [ - gpl2Plus - lgpl21Plus - fdl12Plus - ]; - maintainers = kdepimTeam; - }; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - akonadi - akonadi-search - kconfig - kservice - kio - mailcommon - mailimporter - messagelib - ]; -} diff --git a/pkgs/applications/kde/merkuro.nix b/pkgs/applications/kde/merkuro.nix deleted file mode 100644 index 89220319be13..000000000000 --- a/pkgs/applications/kde/merkuro.nix +++ /dev/null @@ -1,114 +0,0 @@ -{ - lib, - mkDerivation, - cmake, - extra-cmake-modules, - makeWrapper, - - qtbase, - qtquickcontrols2, - qtsvg, - qtlocation, - qtdeclarative, - qqc2-desktop-style, - - kirigami2, - kirigami-addons, - kdbusaddons, - ki18n, - kcalendarcore, - kconfigwidgets, - kwindowsystem, - kcoreaddons, - kcontacts, - kitemmodels, - kxmlgui, - knotifications, - kiconthemes, - kservice, - kmime, - kpackage, - eventviews, - calendarsupport, - - akonadi, - akonadi-search, - akonadi-contacts, - akonadi-calendar-tools, - kdepim-runtime, - gpgme, - pimcommon, - mailcommon, - messagelib, -}: - -mkDerivation { - pname = "merkuro"; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - makeWrapper - ]; - - buildInputs = [ - qtbase - qtquickcontrols2 - qtsvg - qtlocation - qtdeclarative - qqc2-desktop-style - - kirigami2 - kirigami-addons - kdbusaddons - ki18n - kcalendarcore - kconfigwidgets - kwindowsystem - kcoreaddons - kcontacts - kitemmodels - kxmlgui - knotifications - kiconthemes - kservice - kmime - kpackage - eventviews - calendarsupport - - akonadi-search - akonadi-contacts - akonadi-calendar-tools - kdepim-runtime - - gpgme - pimcommon - mailcommon - messagelib - ]; - - propagatedUserEnvPkgs = [ - akonadi - kdepim-runtime - akonadi-search - ]; - qtWrapperArgs = [ - ''--prefix PATH : "${ - lib.makeBinPath [ - akonadi - kdepim-runtime - akonadi-search - ] - }"'' - ]; - - meta = with lib; { - description = "Calendar application using Akonadi to sync with external services (Nextcloud, GMail, ...)"; - homepage = "https://invent.kde.org/pim/merkuro"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ Thra11 ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/kde/messagelib.nix b/pkgs/applications/kde/messagelib.nix deleted file mode 100644 index 8c1e91e9f6f2..000000000000 --- a/pkgs/applications/kde/messagelib.nix +++ /dev/null @@ -1,92 +0,0 @@ -{ - mkDerivation, - lib, - kdepimTeam, - extra-cmake-modules, - kdoctools, - akonadi, - akonadi-mime, - akonadi-notes, - akonadi-search, - gpgme, - grantlee, - grantleetheme, - karchive, - kcodecs, - kconfig, - kconfigwidgets, - kcontacts, - kiconthemes, - kidentitymanagement, - kio, - kjobwidgets, - kldap, - kmailtransport, - kmbox, - kmime, - kwindowsystem, - libgravatar, - libkdepim, - libkleo, - pimcommon, - qca-qt5, - qtwebengine, - syntax-highlighting, -}: - -mkDerivation { - pname = "messagelib"; - meta = { - license = with lib.licenses; [ - gpl2Plus - lgpl21Plus - fdl12Plus - ]; - maintainers = kdepimTeam; - }; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - akonadi-notes - akonadi-search - gpgme - grantlee - grantleetheme - karchive - kcodecs - kconfig - kconfigwidgets - kiconthemes - kio - kjobwidgets - kldap - kmailtransport - kmbox - kmime - kwindowsystem - libgravatar - libkdepim - qca-qt5 - syntax-highlighting - ]; - propagatedBuildInputs = [ - akonadi - akonadi-mime - kcontacts - kidentitymanagement - kmime - libkleo - pimcommon - qtwebengine - ]; - outputs = [ - "out" - "dev" - ]; - postInstall = '' - # added as an include directory by cmake files and fails to compile if it's missing - mkdir -p "$dev/include/KF5" - ''; -} diff --git a/pkgs/applications/kde/minuet.nix b/pkgs/applications/kde/minuet.nix deleted file mode 100644 index c3000bdec25d..000000000000 --- a/pkgs/applications/kde/minuet.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - gettext, - python3, - drumstick, - fluidsynth, - kcoreaddons, - kcrash, - kdoctools, - qtquickcontrols2, - qtsvg, - qttools, - qtdeclarative, -}: - -mkDerivation { - pname = "minuet"; - meta = with lib; { - homepage = "https://apps.kde.org/minuet/"; - description = "Music Education Software"; - mainProgram = "minuet"; - license = with licenses; [ - lgpl21 - gpl3 - ]; - maintainers = with maintainers; [ - peterhoeg - HaoZeke - ]; - }; - - nativeBuildInputs = [ - extra-cmake-modules - gettext - kdoctools - python3 - qtdeclarative - ]; - - propagatedBuildInputs = [ - drumstick - fluidsynth - kcoreaddons - kcrash - qtquickcontrols2 - qtsvg - qttools - ]; - - enableParallelBuilding = true; -} diff --git a/pkgs/applications/kde/okular.nix b/pkgs/applications/kde/okular.nix deleted file mode 100644 index 10ed1ebb0a96..000000000000 --- a/pkgs/applications/kde/okular.nix +++ /dev/null @@ -1,113 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - kdoctools, - breeze-icons, - chmlib, - discount, - djvulibre, - ebook_tools, - kactivities, - karchive, - kbookmarks, - kcompletion, - kconfig, - kconfigwidgets, - kcoreaddons, - kdbusaddons, - kdegraphics-mobipocket, - kiconthemes, - kjs, - khtml, - kio, - kparts, - kpty, - kpurpose, - kwallet, - kwindowsystem, - libkexiv2, - libspectre, - libzip, - phonon, - poppler, - qca-qt5, - qtdeclarative, - qtsvg, - threadweaver, - kcrash, - withSpeech ? true, - qtspeech, - qtx11extras, -}: - -mkDerivation { - pname = "okular"; - - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - - buildInputs = [ - breeze-icons - discount - djvulibre - ebook_tools - kactivities - karchive - kbookmarks - kcompletion - kconfig - kconfigwidgets - kcoreaddons - kdbusaddons - kdegraphics-mobipocket - kiconthemes - kjs - khtml - kio - kparts - kpty - kpurpose - kwallet - kwindowsystem - libkexiv2 - libspectre - libzip - phonon - poppler - qca-qt5 - qtdeclarative - qtsvg - threadweaver - kcrash - chmlib - qtx11extras - ] - ++ lib.optional withSpeech qtspeech; - - # InitialPreference values are too high and end up making okular - # default for anything considered text/plain. Resetting to 1, which - # is the default. - postPatch = '' - substituteInPlace generators/txt/okularApplication_txt.desktop \ - --replace InitialPreference=3 InitialPreference=1 - ''; - - cmakeFlags = lib.optional (!withSpeech) "-DFORCE_NOT_REQUIRED_DEPENDENCIES=Qt5TextToSpeech"; - - meta = with lib; { - homepage = "http://www.kde.org"; - description = "KDE document viewer"; - mainProgram = "okular"; - license = with licenses; [ - gpl2Plus - lgpl21Plus - fdl12Plus - bsd3 - ]; - maintainers = with maintainers; [ ttuegel ]; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/applications/kde/palapeli.nix b/pkgs/applications/kde/palapeli.nix deleted file mode 100644 index b6752063f539..000000000000 --- a/pkgs/applications/kde/palapeli.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ - lib, - mkDerivation, - extra-cmake-modules, - shared-mime-info, - kdoctools, - kio, - ktextwidgets, - libkdegames, -}: - -mkDerivation { - pname = "palapeli"; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - shared-mime-info - ]; - buildInputs = [ - libkdegames - kio - ktextwidgets - ]; - meta = { - homepage = "https://apps.kde.org/palapeli/"; - description = "Single-player jigsaw puzzle game"; - mainProgram = "palapeli"; - license = with lib.licenses; [ gpl2 ]; - maintainers = with lib.maintainers; [ municorn ]; - }; -} diff --git a/pkgs/applications/kde/partitionmanager/default.nix b/pkgs/applications/kde/partitionmanager/default.nix deleted file mode 100644 index 049348429534..000000000000 --- a/pkgs/applications/kde/partitionmanager/default.nix +++ /dev/null @@ -1,116 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - kdoctools, - wrapGAppsHook3, - kconfig, - kcrash, - kinit, - kpmcore, - polkit-qt, - cryptsetup, - lvm2, - mdadm, - smartmontools, - systemdMinimal, - util-linux, - btrfs-progs, - dosfstools, - e2fsprogs, - exfat, - f2fs-tools, - fatresize, - jfsutils, - nilfs-utils, - ntfs3g, - udftools, - xfsprogs, - zfs, -}: - -let - # External programs are resolved by `partition-manager` and then - # invoked by `kpmcore_externalcommand` from `kpmcore` as root. - # So these packages should be in PATH of `partition-manager`. - # https://github.com/KDE/kpmcore/blob/06f15334ecfbe871730a90dbe2b694ba060ee998/src/util/externalcommand_whitelist.h - runtimeDeps = lib.makeBinPath [ - cryptsetup - lvm2 - mdadm - smartmontools - systemdMinimal - util-linux - - btrfs-progs - dosfstools - e2fsprogs - exfat - f2fs-tools - fatresize - # hfsprogs intentionally omitted due to being unmaintained - jfsutils - nilfs-utils - ntfs3g - # reiser{4,fs}progs intentionally omitted due to filesystem removal from Linux. - udftools - xfsprogs - zfs - - # FIXME: Missing command: tune.exfat hfsck hformat fsck.nilfs2 {fsck,mkfs,debugfs,tunefs}.ocfs2 - ]; - -in -mkDerivation { - pname = "partitionmanager"; - - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - wrapGAppsHook3 - ]; - - propagatedBuildInputs = [ - kconfig - kcrash - kinit - kpmcore - polkit-qt - ]; - - dontWrapGApps = true; - preFixup = '' - qtWrapperArgs+=( - "''${gappsWrapperArgs[@]}" - --prefix PATH : "${runtimeDeps}" - ) - ''; - - passthru = { - inherit kpmcore; - }; - - meta = with lib; { - description = "KDE Partition Manager"; - longDescription = '' - KDE Partition Manager is a utility to help you manage the disks, partitions, and file systems on your computer. - It allows you to easily create, copy, move, delete, back up, restore, and resize them without losing data. - It supports a large number of file systems, including ext2/3/4, btrfs, NTFS, FAT16/32, JFS, XFS and more. - - To install on NixOS, use the option `programs.partition-manager.enable = true`. - ''; - license = with licenses; [ - cc-by-40 - cc0 - gpl3Plus - lgpl3Plus - mit - ]; - homepage = "https://www.kde.org/applications/system/kdepartitionmanager/"; - maintainers = with maintainers; [ - peterhoeg - oxalica - ]; - mainProgram = "partitionmanager"; - }; -} diff --git a/pkgs/applications/kde/picmi.nix b/pkgs/applications/kde/picmi.nix deleted file mode 100644 index 7261f1f39256..000000000000 --- a/pkgs/applications/kde/picmi.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ - mkDerivation, - lib, - libkdegames, - extra-cmake-modules, - kdeclarative, - knewstuff, -}: - -mkDerivation { - pname = "picmi"; - meta = with lib; { - homepage = "https://apps.kde.org/picmi/"; - description = "Nonogram game"; - mainProgram = "picmi"; - longDescription = '' - The goal is to reveal the hidden pattern in the board by coloring or - leaving blank the cells in a grid according to numbers given at the side of the grid. - ''; - maintainers = with maintainers; [ freezeboy ]; - license = licenses.gpl2Plus; - platforms = platforms.linux; - }; - - nativeBuildInputs = [ - extra-cmake-modules - ]; - buildInputs = [ - kdeclarative - knewstuff - libkdegames - ]; -} diff --git a/pkgs/applications/kde/pim-data-exporter.nix b/pkgs/applications/kde/pim-data-exporter.nix deleted file mode 100644 index f40365eb36da..000000000000 --- a/pkgs/applications/kde/pim-data-exporter.nix +++ /dev/null @@ -1,75 +0,0 @@ -{ - mkDerivation, - lib, - kdepimTeam, - extra-cmake-modules, - kdoctools, - akonadi, - akonadi-notes, - kcalendarcore, - kcmutils, - kcrash, - kdbusaddons, - kidentitymanagement, - kldap, - kmailtransport, - knewstuff, - knotifications, - knotifyconfig, - kparts, - kross, - ktexteditor, - kuserfeedback, - kwallet, - libkdepim, - libkleo, - pimcommon, - qttools, - karchive, - mailcommon, - messagelib, -}: - -mkDerivation { - pname = "pim-data-exporter"; - meta = { - homepage = "https://apps.kde.org/pimdataexporter/"; - description = "Saves and restores all data from PIM apps"; - license = with lib.licenses; [ - gpl2Plus - lgpl21Plus - fdl12Plus - ]; - maintainers = kdepimTeam; - }; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - akonadi - akonadi-notes - kcalendarcore - kcmutils - kcrash - kdbusaddons - kidentitymanagement - kldap - kmailtransport - knewstuff - knotifications - knotifyconfig - kparts - kross - ktexteditor - kuserfeedback - kwallet - libkdepim - libkleo - pimcommon - qttools - karchive - mailcommon - messagelib - ]; -} diff --git a/pkgs/applications/kde/pim-sieve-editor.nix b/pkgs/applications/kde/pim-sieve-editor.nix deleted file mode 100644 index def5908a205d..000000000000 --- a/pkgs/applications/kde/pim-sieve-editor.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ - mkDerivation, - lib, - kdepimTeam, - extra-cmake-modules, - kdoctools, - kdbusaddons, - kcrash, - kbookmarks, - kiconthemes, - kio, - kpimtextedit, - kmailtransport, - kuserfeedback, - libksieve, - pimcommon, - qtkeychain, - libsecret, -}: - -mkDerivation { - pname = "pim-sieve-editor"; - meta = { - license = with lib.licenses; [ - gpl2Plus - lgpl21Plus - fdl12Plus - ]; - maintainers = kdepimTeam; - }; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - kdbusaddons - kcrash - kbookmarks - kiconthemes - kio - kpimtextedit - kmailtransport - kuserfeedback - libksieve - pimcommon - qtkeychain - libsecret - ]; -} diff --git a/pkgs/applications/kde/pimcommon.nix b/pkgs/applications/kde/pimcommon.nix deleted file mode 100644 index 1fa03b02b5c6..000000000000 --- a/pkgs/applications/kde/pimcommon.nix +++ /dev/null @@ -1,85 +0,0 @@ -{ - mkDerivation, - lib, - kdepimTeam, - extra-cmake-modules, - kdoctools, - akonadi, - akonadi-contacts, - akonadi-mime, - akonadi-search, - grantlee, - karchive, - kcmutils, - kcodecs, - kcompletion, - kconfig, - kconfigwidgets, - kcontacts, - kdbusaddons, - kiconthemes, - kimap, - kio, - kitemmodels, - kjobwidgets, - kldap, - knewstuff, - kpimtextedit, - kpurpose, - kwallet, - kwindowsystem, - libkdepim, - qtwebengine, - ktextaddons, -}: - -mkDerivation { - pname = "pimcommon"; - meta = { - license = with lib.licenses; [ - gpl2Plus - lgpl21Plus - fdl12Plus - ]; - maintainers = kdepimTeam; - }; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - akonadi-mime - grantlee - karchive - kcmutils - kcodecs - kcompletion - kconfigwidgets - kdbusaddons - kiconthemes - kio - kitemmodels - kjobwidgets - knewstuff - kldap - kpurpose - kwallet - kwindowsystem - libkdepim - qtwebengine - ktextaddons - ]; - propagatedBuildInputs = [ - akonadi - akonadi-contacts - akonadi-search - kconfig - kcontacts - kimap - kpimtextedit - ]; - outputs = [ - "out" - "dev" - ]; -} diff --git a/pkgs/applications/kde/plasmatube/default.nix b/pkgs/applications/kde/plasmatube/default.nix deleted file mode 100644 index b9f4602a731f..000000000000 --- a/pkgs/applications/kde/plasmatube/default.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ - lib, - mkDerivation, - extra-cmake-modules, - wrapGAppsHook3, - gst_all_1, - kcoreaddons, - kdeclarative, - ki18n, - kirigami2, - mpv, - qtmultimedia, - qtquickcontrols2, - yt-dlp, -}: - -mkDerivation { - pname = "plasmatube"; - - nativeBuildInputs = [ - extra-cmake-modules - wrapGAppsHook3 - ]; - - buildInputs = [ - kcoreaddons - kdeclarative - ki18n - kirigami2 - mpv - qtmultimedia - qtquickcontrols2 - ] - ++ (with gst_all_1; [ - gst-plugins-bad - gst-plugins-base - gst-plugins-good - gstreamer - ]); - - qtWrapperArgs = [ - "--prefix" - "PATH" - ":" - (lib.makeBinPath [ yt-dlp ]) - ]; - - preFixup = '' - qtWrapperArgs+=("''${gappsWrapperArgs[@]}") - ''; - dontWrapGApps = true; - - meta = { - description = "Youtube player powered by an invidious server"; - mainProgram = "plasmatube"; - homepage = "https://invent.kde.org/plasma-mobile/plasmatube"; - license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ dotlambda ]; - }; -} diff --git a/pkgs/applications/kde/print-manager.nix b/pkgs/applications/kde/print-manager.nix deleted file mode 100644 index 5b213cc914ee..000000000000 --- a/pkgs/applications/kde/print-manager.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - cups, - ki18n, - kconfig, - kconfigwidgets, - kdbusaddons, - kiconthemes, - kcmutils, - kio, - knotifications, - kwidgetsaddons, - kwindowsystem, - kitemviews, - plasma-framework, - qtdeclarative, -}: - -mkDerivation { - pname = "print-manager"; - meta = { - license = [ lib.licenses.gpl2 ]; - maintainers = [ lib.maintainers.ttuegel ]; - }; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - cups - ki18n - ]; - propagatedBuildInputs = [ - kconfig - kconfigwidgets - kdbusaddons - kiconthemes - kcmutils - knotifications - kwidgetsaddons - kitemviews - kio - kwindowsystem - plasma-framework - qtdeclarative - ]; - outputs = [ - "out" - "dev" - ]; - # Fix build with cups deprecations etc. - # See: https://github.com/NixOS/nixpkgs/issues/73334 - env.NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations -Wno-error=format-security"; -} diff --git a/pkgs/applications/kde/qmlkonsole.nix b/pkgs/applications/kde/qmlkonsole.nix deleted file mode 100644 index 5cf001eb1ed1..000000000000 --- a/pkgs/applications/kde/qmlkonsole.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ - lib, - mkDerivation, - - cmake, - extra-cmake-modules, - - kconfig, - ki18n, - kirigami-addons, - kirigami2, - kcoreaddons, - qtquickcontrols2, - kwindowsystem, - qmltermwidget, -}: - -mkDerivation { - pname = "qmlkonsole"; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - ]; - - buildInputs = [ - kconfig - ki18n - kirigami-addons - kirigami2 - qtquickcontrols2 - kcoreaddons - kwindowsystem - qmltermwidget - ]; - - meta = with lib; { - description = "Terminal app for Plasma Mobile"; - mainProgram = "qmlkonsole"; - homepage = "https://invent.kde.org/plasma-mobile/qmlkonsole"; - license = with licenses; [ - gpl2Plus - gpl3Plus - cc0 - ]; - maintainers = with maintainers; [ balsoft ]; - }; -} diff --git a/pkgs/applications/kde/rocs.nix b/pkgs/applications/kde/rocs.nix deleted file mode 100644 index 6742ad2182c7..000000000000 --- a/pkgs/applications/kde/rocs.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - boost, - qtbase, - qtscript, - qtquickcontrols, - qtxmlpatterns, - grantlee, - kdoctools, - karchive, - kxmlgui, - kcrash, - kdeclarative, - ktexteditor, - kguiaddons, -}: - -mkDerivation { - pname = "rocs"; - - meta = with lib; { - homepage = "https://edu.kde.org/rocs/"; - description = "Graph theory IDE"; - mainProgram = "rocs"; - license = with licenses; [ - gpl2Plus - lgpl21Plus - fdl12Plus - ]; - platforms = lib.platforms.linux; - maintainers = with maintainers; [ knairda ]; - }; - - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - boost - qtbase - qtscript - qtquickcontrols - qtxmlpatterns - grantlee - kxmlgui - kcrash - kdeclarative - karchive - ktexteditor - kguiaddons - ]; -} diff --git a/pkgs/applications/kde/skanlite.nix b/pkgs/applications/kde/skanlite.nix deleted file mode 100644 index 6dcba10e0897..000000000000 --- a/pkgs/applications/kde/skanlite.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ - mkDerivation, - lib, - wrapGAppsHook3, - extra-cmake-modules, - kdoctools, - kio, - libksane, -}: - -mkDerivation { - pname = "skanlite"; - meta = with lib; { - description = "KDE simple image scanning application"; - mainProgram = "skanlite"; - homepage = "https://apps.kde.org/skanlite"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ polendri ]; - }; - - nativeBuildInputs = [ - wrapGAppsHook3 - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - kio - libksane - ]; -} diff --git a/pkgs/applications/kde/skanpage.nix b/pkgs/applications/kde/skanpage.nix deleted file mode 100644 index 8f4a636f5cb1..000000000000 --- a/pkgs/applications/kde/skanpage.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ - lib, - mkDerivation, - extra-cmake-modules, - kirigami2, - ktextwidgets, - libksane, - qtquickcontrols2, - kpurpose, - kquickimageedit, -}: - -mkDerivation { - pname = "skanpage"; - - nativeBuildInputs = [ extra-cmake-modules ]; - - buildInputs = [ - kirigami2 - ktextwidgets - libksane - qtquickcontrols2 - kpurpose - kquickimageedit - ]; - - meta = with lib; { - description = "KDE utility to scan images and multi-page documents"; - mainProgram = "skanpage"; - homepage = "https://apps.kde.org/skanpage"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/kde/spectacle.nix b/pkgs/applications/kde/spectacle.nix deleted file mode 100644 index 657af4cbc26b..000000000000 --- a/pkgs/applications/kde/spectacle.nix +++ /dev/null @@ -1,92 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - kdoctools, - ki18n, - xcb-util-cursor, - kconfig, - kcoreaddons, - kdbusaddons, - kdeclarative, - kio, - kipi-plugins, - knotifications, - kscreen, - kwidgetsaddons, - kwindowsystem, - kxmlgui, - libkipi, - qtx11extras, - knewstuff, - kwayland, - qttools, - kcolorpicker, - kimageannotator, - qcoro, - qtquickcontrols2, - wayland, - plasma-wayland-protocols, - kpurpose, - kpipewire, - wrapGAppsHook3, - wayland-scanner, -}: - -mkDerivation { - pname = "spectacle"; - - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - wrapGAppsHook3 - wayland-scanner - ]; - buildInputs = [ - kconfig - kcoreaddons - kdbusaddons - kdeclarative - ki18n - kio - knotifications - kscreen - kwidgetsaddons - kwindowsystem - kxmlgui - libkipi - qtx11extras - xcb-util-cursor - knewstuff - kwayland - kcolorpicker - kimageannotator - qcoro - qtquickcontrols2 - wayland - plasma-wayland-protocols - kpurpose - kpipewire - ]; - postPatch = '' - substituteInPlace desktop/org.kde.spectacle.desktop.cmake \ - --replace "Exec=@QtBinariesDir@/qdbus" "Exec=${lib.getBin qttools}/bin/qdbus" - ''; - - dontWrapGApps = true; - - preFixup = '' - qtWrapperArgs+=("''${gappsWrapperArgs[@]}") - ''; - - propagatedUserEnvPkgs = [ - kipi-plugins - libkipi - ]; - meta = with lib; { - homepage = "https://apps.kde.org/spectacle/"; - description = "Screenshot capture utility"; - mainProgram = "spectacle"; - maintainers = with maintainers; [ ttuegel ]; - }; -} diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix deleted file mode 100644 index 58f9d0e73b8c..000000000000 --- a/pkgs/applications/kde/srcs.nix +++ /dev/null @@ -1,1942 +0,0 @@ -# DO NOT EDIT! This file is generated automatically. -# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/applications/kde -{ fetchurl, mirror }: - -{ - akonadi = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/akonadi-23.08.5.tar.xz"; - sha256 = "0f2gkifli8aslcrcqclai6kv9vrimmsj2afp378nljh8q4ldpnxb"; - name = "akonadi-23.08.5.tar.xz"; - }; - }; - akonadi-calendar = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/akonadi-calendar-23.08.5.tar.xz"; - sha256 = "1jirjckcix5ny3dqqk7qf1089kwfvzibk2jaxr437v8jji0ak3fg"; - name = "akonadi-calendar-23.08.5.tar.xz"; - }; - }; - akonadi-calendar-tools = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/akonadi-calendar-tools-23.08.5.tar.xz"; - sha256 = "1al0b11cln9axh3fhv4hlns73v7z36yq24z1v8i6ka4n81445fw3"; - name = "akonadi-calendar-tools-23.08.5.tar.xz"; - }; - }; - akonadi-contacts = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/akonadi-contacts-23.08.5.tar.xz"; - sha256 = "0la2rxcngxffm7pz6xmmv3zv2qzand88194q8c3xpnxlddyb7977"; - name = "akonadi-contacts-23.08.5.tar.xz"; - }; - }; - akonadi-import-wizard = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/akonadi-import-wizard-23.08.5.tar.xz"; - sha256 = "19jdk7bcb0cyd28lwzfm1nyzsvh9wm664c27mhfadsin0jy9dj9w"; - name = "akonadi-import-wizard-23.08.5.tar.xz"; - }; - }; - akonadi-mime = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/akonadi-mime-23.08.5.tar.xz"; - sha256 = "0cy8wl6r9arzy6zb4mmzy7nxy7j647kklrwms43q3zkkxacyah7x"; - name = "akonadi-mime-23.08.5.tar.xz"; - }; - }; - akonadi-notes = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/akonadi-notes-23.08.5.tar.xz"; - sha256 = "13l3wnmbips201xpa8wk7gj35m4fnw1aqd8js15sinc7r768wfpy"; - name = "akonadi-notes-23.08.5.tar.xz"; - }; - }; - akonadi-search = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/akonadi-search-23.08.5.tar.xz"; - sha256 = "1d5dh5jn1a7l1w0ab0vabrcbhj3sy18g9ya9p50agvk8fh5ka8gg"; - name = "akonadi-search-23.08.5.tar.xz"; - }; - }; - akonadiconsole = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/akonadiconsole-23.08.5.tar.xz"; - sha256 = "171apc4vdwlg4904am5cnb3rcsv4f9bfcpk4y46ki0dvi3x4vj31"; - name = "akonadiconsole-23.08.5.tar.xz"; - }; - }; - akregator = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/akregator-23.08.5.tar.xz"; - sha256 = "12q2d3w4jk6mzglabzx8djmsd6y5b5bfx02gnncgpm2n5a3iydsj"; - name = "akregator-23.08.5.tar.xz"; - }; - }; - alligator = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/alligator-23.08.5.tar.xz"; - sha256 = "17h0h2gl3ybawnnlj1v1mz7izb6vj3rkan3fkdvjb1w63fm7pgaa"; - name = "alligator-23.08.5.tar.xz"; - }; - }; - analitza = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/analitza-23.08.5.tar.xz"; - sha256 = "1h06nr5fclkp6f98pdw45ibn03bv29js294czi0y7n3w729kxzs6"; - name = "analitza-23.08.5.tar.xz"; - }; - }; - angelfish = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/angelfish-23.08.5.tar.xz"; - sha256 = "0rpc4kqvmxmx393vbj92303phzf72k5djgy1c6fmmbx87myj2aic"; - name = "angelfish-23.08.5.tar.xz"; - }; - }; - arianna = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/arianna-23.08.5.tar.xz"; - sha256 = "0rf3538940zxkgfsi34zha0k0k1895dj9sbl86kr0bsqjsjvpzgg"; - name = "arianna-23.08.5.tar.xz"; - }; - }; - ark = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/ark-23.08.5.tar.xz"; - sha256 = "1sygmsbrd6ps8zjy29n7nsfilij3737x50qld49m3qnlw9jcb0b0"; - name = "ark-23.08.5.tar.xz"; - }; - }; - artikulate = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/artikulate-23.08.5.tar.xz"; - sha256 = "18bb67l0hklmyaxciwpfd92n4xyqlmr6qismf7kzsksjv2k9n2d7"; - name = "artikulate-23.08.5.tar.xz"; - }; - }; - audiocd-kio = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/audiocd-kio-23.08.5.tar.xz"; - sha256 = "1ir383qwfcabdc0x3203x60k6vpkzcjmay5dk6vk4ra5hglvrj2m"; - name = "audiocd-kio-23.08.5.tar.xz"; - }; - }; - audiotube = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/audiotube-23.08.5.tar.xz"; - sha256 = "06bx8bsz784z19937vf723dylpfk7xah2w0p4c1vhv47mznqn991"; - name = "audiotube-23.08.5.tar.xz"; - }; - }; - baloo-widgets = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/baloo-widgets-23.08.5.tar.xz"; - sha256 = "1m1q77qagyiv9bnnsyzwi6mh48slwdgb725k1awkisyzfiznq6a9"; - name = "baloo-widgets-23.08.5.tar.xz"; - }; - }; - blinken = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/blinken-23.08.5.tar.xz"; - sha256 = "1im3gci81bdh3il0fyf9d2pxdkdcp1pkn9ib5z8isyy9ffclpl2a"; - name = "blinken-23.08.5.tar.xz"; - }; - }; - bomber = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/bomber-23.08.5.tar.xz"; - sha256 = "12mk93y3y006n6rm4p1n9xcx6wq84rnxgjc9rnvf46hg99fb37kn"; - name = "bomber-23.08.5.tar.xz"; - }; - }; - bovo = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/bovo-23.08.5.tar.xz"; - sha256 = "0jqy3yjq9qjl52bcph3pycslqs7rbw40axzmznr4h4wzj36b6yfv"; - name = "bovo-23.08.5.tar.xz"; - }; - }; - calendarsupport = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/calendarsupport-23.08.5.tar.xz"; - sha256 = "1wrydz0nn6k9f8vwcfcsd95dc9b0y5y6xycwaynmsl8rgskmryk5"; - name = "calendarsupport-23.08.5.tar.xz"; - }; - }; - calindori = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/calindori-23.08.5.tar.xz"; - sha256 = "03ls91vr495i3qxs49whl4ks7sx8frnfqw4prs9nxpx9gjysn13a"; - name = "calindori-23.08.5.tar.xz"; - }; - }; - cantor = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/cantor-23.08.5.tar.xz"; - sha256 = "07fq3zfcd3hxgi1pa6ma7gw852ry4x9fzj1yy7a2bk2lz2b0p5mz"; - name = "cantor-23.08.5.tar.xz"; - }; - }; - cervisia = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/cervisia-23.08.5.tar.xz"; - sha256 = "07vzn6g87m737nbxb8qqsds3bc5spkn9z060jjwyzdpjj3sld2b0"; - name = "cervisia-23.08.5.tar.xz"; - }; - }; - colord-kde = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/colord-kde-23.08.5.tar.xz"; - sha256 = "1f80dqax0wk4g94140qd0lij2vf9083kbsdl7hkc19ric6y2fss6"; - name = "colord-kde-23.08.5.tar.xz"; - }; - }; - dolphin = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/dolphin-23.08.5.tar.xz"; - sha256 = "1wziw71xyjz2457hb5l8f9sg5l4f340z341pd87qkzkdavdan2b3"; - name = "dolphin-23.08.5.tar.xz"; - }; - }; - dolphin-plugins = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/dolphin-plugins-23.08.5.tar.xz"; - sha256 = "0pf0ddg8dz8l959yd6sig54411gylp8il1wjpfr7ihcd8zm8wi1g"; - name = "dolphin-plugins-23.08.5.tar.xz"; - }; - }; - dragon = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/dragon-23.08.5.tar.xz"; - sha256 = "0w8ml7087z4vikp92mh6cm2mzxp4zjk0cr8mxzvap745vbxj21j1"; - name = "dragon-23.08.5.tar.xz"; - }; - }; - elisa = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/elisa-23.08.5.tar.xz"; - sha256 = "1hml0bmp1cfqc9x9q2a1lz2f6ab7ygblf6xz0qlwjxripvqw8b47"; - name = "elisa-23.08.5.tar.xz"; - }; - }; - eventviews = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/eventviews-23.08.5.tar.xz"; - sha256 = "06qwmzxayfxsyzmg90j1xycvfs6ynyggvk0xkrf7gfp682ckba99"; - name = "eventviews-23.08.5.tar.xz"; - }; - }; - falkon = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/falkon-23.08.5.tar.xz"; - sha256 = "0xxhhdqlxfs97qphfpkb8gfmsi1gk3cbpd2y4rj0zrd668a5y2l0"; - name = "falkon-23.08.5.tar.xz"; - }; - }; - ffmpegthumbs = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/ffmpegthumbs-23.08.5.tar.xz"; - sha256 = "1pz5bc52z5lkydl1w9c6bhvbdjn07p3r4qgx36xl3wfc5zi3rn6s"; - name = "ffmpegthumbs-23.08.5.tar.xz"; - }; - }; - filelight = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/filelight-23.08.5.tar.xz"; - sha256 = "08kmy39r6l6akkkl00snjvw5zf5115gc5czf1m5xr189zjp4vz5p"; - name = "filelight-23.08.5.tar.xz"; - }; - }; - ghostwriter = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/ghostwriter-23.08.5.tar.xz"; - sha256 = "1nfhnjf627p3qgfamy1nb09dvqavv0qh5cs6czpy4ghz8i4mddx0"; - name = "ghostwriter-23.08.5.tar.xz"; - }; - }; - granatier = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/granatier-23.08.5.tar.xz"; - sha256 = "1vi9cws499g9962k4hyjzl13sbsrga0qyjqdp9i0v5pr3mi4l1zh"; - name = "granatier-23.08.5.tar.xz"; - }; - }; - grantlee-editor = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/grantlee-editor-23.08.5.tar.xz"; - sha256 = "130a57bmg6ydcj0jn21i39ilf61prsisz2f2lw9gcq5g1s2xbk9j"; - name = "grantlee-editor-23.08.5.tar.xz"; - }; - }; - grantleetheme = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/grantleetheme-23.08.5.tar.xz"; - sha256 = "1xa2y8zxn6s9hvs6nsf2bzkifg1xcdk9mz7r2pj2h3gvl2rq2qv8"; - name = "grantleetheme-23.08.5.tar.xz"; - }; - }; - gwenview = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/gwenview-23.08.5.tar.xz"; - sha256 = "0f4h2vf8nkz1jcrxw98n52divvdmxh434659m1pd4l5pag0d3z54"; - name = "gwenview-23.08.5.tar.xz"; - }; - }; - incidenceeditor = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/incidenceeditor-23.08.5.tar.xz"; - sha256 = "153kh0syw4v67sfjfhq45s34mlsz6lz96mvmfrl9lm9dn5bwyq6z"; - name = "incidenceeditor-23.08.5.tar.xz"; - }; - }; - juk = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/juk-23.08.5.tar.xz"; - sha256 = "0wddl5sp2sbi8c8vxrqikipv2d6b65w28nxzsinz703cliyjcx67"; - name = "juk-23.08.5.tar.xz"; - }; - }; - k3b = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/k3b-23.08.5.tar.xz"; - sha256 = "16ihb7xnzjbcywfki6vx932m3wi691n70ribzl85fl688n5m32f7"; - name = "k3b-23.08.5.tar.xz"; - }; - }; - kaccounts-integration = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kaccounts-integration-23.08.5.tar.xz"; - sha256 = "1f99s7hiix1ccp8zz2z6vb1xf13ffpaan6sqqz4xz1y3jmaf4bn0"; - name = "kaccounts-integration-23.08.5.tar.xz"; - }; - }; - kaccounts-providers = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kaccounts-providers-23.08.5.tar.xz"; - sha256 = "1ig5k4aalqcq6jjj0y6kg914zj2a0bc3pvws6kjhcyc1kq1q0g88"; - name = "kaccounts-providers-23.08.5.tar.xz"; - }; - }; - kaddressbook = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kaddressbook-23.08.5.tar.xz"; - sha256 = "08lbkbscqaa5ir7knby457zi0ig79280rcan1fak7gapvpipwhd8"; - name = "kaddressbook-23.08.5.tar.xz"; - }; - }; - kajongg = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kajongg-23.08.5.tar.xz"; - sha256 = "05ji28lld3y80smj6krwrv5hb74j4wchv65b2q046snk5i5hlf0p"; - name = "kajongg-23.08.5.tar.xz"; - }; - }; - kalarm = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kalarm-23.08.5.tar.xz"; - sha256 = "1g85pm0l5wjd1hp10klsz8prnic9g7jcbp56a1wkf0f25pzg1pq9"; - name = "kalarm-23.08.5.tar.xz"; - }; - }; - kalgebra = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kalgebra-23.08.5.tar.xz"; - sha256 = "0fjkx5m34qwgad9amjbgql4awbl8irqhfyrfrxjpwp773lhifbq4"; - name = "kalgebra-23.08.5.tar.xz"; - }; - }; - kalk = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kalk-23.08.5.tar.xz"; - sha256 = "1q4p6f4xrd73iqw1dqk2z65sly123dh9gwvi07i71dk49r9ykrfr"; - name = "kalk-23.08.5.tar.xz"; - }; - }; - kalzium = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kalzium-23.08.5.tar.xz"; - sha256 = "1134q2z6vx8p244grk8szxnlw942ry50a72j2qfyf96ksrs5bz4v"; - name = "kalzium-23.08.5.tar.xz"; - }; - }; - kamera = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kamera-23.08.5.tar.xz"; - sha256 = "1chddpy4larjavd2c2blzxk23kay7hbpsm06fxfa052344qqd5j6"; - name = "kamera-23.08.5.tar.xz"; - }; - }; - kamoso = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kamoso-23.08.5.tar.xz"; - sha256 = "00cdy2yyaw3p6vv0hg4zgc70yyggy6v6yzp97m8c21i9v8w4bk44"; - name = "kamoso-23.08.5.tar.xz"; - }; - }; - kanagram = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kanagram-23.08.5.tar.xz"; - sha256 = "0163sja60kysny0zbq76q438hxfmv2a9hxrbzhqsniy38w5zr44j"; - name = "kanagram-23.08.5.tar.xz"; - }; - }; - kapman = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kapman-23.08.5.tar.xz"; - sha256 = "1rx1rrka76r4y5d71kxin8zb8b4xgfndf8g5875ygfij0l05yxg3"; - name = "kapman-23.08.5.tar.xz"; - }; - }; - kapptemplate = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kapptemplate-23.08.5.tar.xz"; - sha256 = "0lan9219l29vdg974cpnchndwsl9g59w13kdkz8hmcb1fycxcy4v"; - name = "kapptemplate-23.08.5.tar.xz"; - }; - }; - kasts = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kasts-23.08.5.tar.xz"; - sha256 = "1n5n2rlfsp4fn34xsmcsvmacgy3h88md5aynsxaw8hf8mhl7hrwh"; - name = "kasts-23.08.5.tar.xz"; - }; - }; - kate = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kate-23.08.5.tar.xz"; - sha256 = "0dsfiwd0v0chmcc0v2s193fdyals4ijpnq0bcssd9axjqkcljg38"; - name = "kate-23.08.5.tar.xz"; - }; - }; - katomic = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/katomic-23.08.5.tar.xz"; - sha256 = "0hmc873kydzgrz0shz53qaii5bqm4rwh2c12w1d9xrml38yxpchd"; - name = "katomic-23.08.5.tar.xz"; - }; - }; - kbackup = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kbackup-23.08.5.tar.xz"; - sha256 = "0pxyqvn2m9q6qh77156vx7spjj53a4shn3sqqyvlqv7acxd4sv51"; - name = "kbackup-23.08.5.tar.xz"; - }; - }; - kblackbox = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kblackbox-23.08.5.tar.xz"; - sha256 = "0n918g1146fpi2h86sphaxjqpad3ff9mawkh8wzr9jqb91bjw200"; - name = "kblackbox-23.08.5.tar.xz"; - }; - }; - kblocks = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kblocks-23.08.5.tar.xz"; - sha256 = "09xadysjcxpkab805a4hdg9qsp9wv1jkbrmmy4dmbghv7rl9fjcg"; - name = "kblocks-23.08.5.tar.xz"; - }; - }; - kbounce = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kbounce-23.08.5.tar.xz"; - sha256 = "1yxcy10bkz3wj48dys9ag4nm2r7acn7syfj76ss508mdysxw00gi"; - name = "kbounce-23.08.5.tar.xz"; - }; - }; - kbreakout = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kbreakout-23.08.5.tar.xz"; - sha256 = "0j5gcqvbpr9973bkzxsl0pcic4rbc3x5f9ry20cqb3z311mkhbyh"; - name = "kbreakout-23.08.5.tar.xz"; - }; - }; - kbruch = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kbruch-23.08.5.tar.xz"; - sha256 = "10hiw23kpil059vsscpz0xssxj5x7036jvm84icgzj9vhbklfzfv"; - name = "kbruch-23.08.5.tar.xz"; - }; - }; - kcachegrind = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kcachegrind-23.08.5.tar.xz"; - sha256 = "1dmpvg1h6zfwg25zl4rkkf43n7q5lyawyf1pa2q9s15hmnvqfrh5"; - name = "kcachegrind-23.08.5.tar.xz"; - }; - }; - kcalc = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kcalc-23.08.5.tar.xz"; - sha256 = "0zj32xipmzq7bipdi5yj2wkig5sfgdhl0b7z9q5lhnzji5rxcig5"; - name = "kcalc-23.08.5.tar.xz"; - }; - }; - kcalutils = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kcalutils-23.08.5.tar.xz"; - sha256 = "0gbahhzx14zd0rkwkpxxfhvs6dd9m3ajzajwrqyy6kd9zbfwgdlx"; - name = "kcalutils-23.08.5.tar.xz"; - }; - }; - kcharselect = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kcharselect-23.08.5.tar.xz"; - sha256 = "11k3x06r9p7jgjl2rpkm10gkqkjj0ysrb7116482d20i09n348mz"; - name = "kcharselect-23.08.5.tar.xz"; - }; - }; - kclock = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kclock-23.08.5.tar.xz"; - sha256 = "1cdqpcngg096vig7q04n0p9blrrxynphmkhq9y13vaywjvq744yx"; - name = "kclock-23.08.5.tar.xz"; - }; - }; - kcolorchooser = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kcolorchooser-23.08.5.tar.xz"; - sha256 = "08dvjaczf88kv8ii754v30b6r1p8cm0l4r81jds7ffs23wcphan6"; - name = "kcolorchooser-23.08.5.tar.xz"; - }; - }; - kcron = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kcron-23.08.5.tar.xz"; - sha256 = "0hnwkn2pvmmx9cqfchbwiw1pka893izs9pw7ina2am7x6x0y7s82"; - name = "kcron-23.08.5.tar.xz"; - }; - }; - kde-dev-scripts = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kde-dev-scripts-23.08.5.tar.xz"; - sha256 = "1wn1g8sgxw2hhc4w2xs0fh45yr6vbfizx5npxsr7qqnl9d2q5c8c"; - name = "kde-dev-scripts-23.08.5.tar.xz"; - }; - }; - kde-dev-utils = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kde-dev-utils-23.08.5.tar.xz"; - sha256 = "10zfdznf0n57q18q9nqn3ckgx200m10laylyl20qv65kh4zzbp96"; - name = "kde-dev-utils-23.08.5.tar.xz"; - }; - }; - kde-inotify-survey = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kde-inotify-survey-23.08.5.tar.xz"; - sha256 = "0qwcwzx25hvvais13bq2mdvhk0lsj8k8mw34h075rkhrbgir5j1q"; - name = "kde-inotify-survey-23.08.5.tar.xz"; - }; - }; - kdebugsettings = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kdebugsettings-23.08.5.tar.xz"; - sha256 = "042bw5jmdg9ahwxv24yg8yzcd7fr2xdnph4r83z4jiz7z8f01ccq"; - name = "kdebugsettings-23.08.5.tar.xz"; - }; - }; - kdeconnect-kde = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kdeconnect-kde-23.08.5.tar.xz"; - sha256 = "0r0d604nki60g0x06131hsn0fqdy59xi9iq9vlnvmf94z1kcshjb"; - name = "kdeconnect-kde-23.08.5.tar.xz"; - }; - }; - kdeedu-data = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kdeedu-data-23.08.5.tar.xz"; - sha256 = "0d139xqm3iv5h7ns57wgxxm3rynvb80f991aa1dsc768170nbnli"; - name = "kdeedu-data-23.08.5.tar.xz"; - }; - }; - kdegraphics-mobipocket = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kdegraphics-mobipocket-23.08.5.tar.xz"; - sha256 = "1z53132pll7w0z2p4iifcny19ahgvqnk0bm0pdgi815hqwdsjkvi"; - name = "kdegraphics-mobipocket-23.08.5.tar.xz"; - }; - }; - kdegraphics-thumbnailers = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kdegraphics-thumbnailers-23.08.5.tar.xz"; - sha256 = "0c3gk3badbparz327a1d2i78qwg335i2k36y4sh9s1zs74008nmh"; - name = "kdegraphics-thumbnailers-23.08.5.tar.xz"; - }; - }; - kdenetwork-filesharing = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kdenetwork-filesharing-23.08.5.tar.xz"; - sha256 = "1pkq11dn0gf841am57bg0i3m8dzx8bkbh2n3fp9452qbg0i6319z"; - name = "kdenetwork-filesharing-23.08.5.tar.xz"; - }; - }; - kdenlive = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kdenlive-23.08.5.tar.xz"; - sha256 = "1nw338bfak806p77329z1wk401ql190l2lw4z4iw6mx2wrc69scs"; - name = "kdenlive-23.08.5.tar.xz"; - }; - }; - kdepim-addons = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kdepim-addons-23.08.5.tar.xz"; - sha256 = "1c24vlvqvfk0rfbq7z9mvjywjmf52h8xdziha8drgzk64spyklsq"; - name = "kdepim-addons-23.08.5.tar.xz"; - }; - }; - kdepim-runtime = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kdepim-runtime-23.08.5.tar.xz"; - sha256 = "1xvpqlx1n3hcigdd19q3g1l86wvz1bdr0d9szilc2yqn5zb0f6zy"; - name = "kdepim-runtime-23.08.5.tar.xz"; - }; - }; - kdesdk-kio = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kdesdk-kio-23.08.5.tar.xz"; - sha256 = "0dfgzm8q4raycjwc38g651gkz3m4jfl0hhc3ppvnpq71wapdjdvy"; - name = "kdesdk-kio-23.08.5.tar.xz"; - }; - }; - kdesdk-thumbnailers = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kdesdk-thumbnailers-23.08.5.tar.xz"; - sha256 = "1yz44jf3sm7ja2ifqqjdiipjz4g77dj9ywkzjrcbh0qby56497i5"; - name = "kdesdk-thumbnailers-23.08.5.tar.xz"; - }; - }; - kdev-php = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kdev-php-23.08.5.tar.xz"; - sha256 = "0xrfgrs14mq7dkw4k90srkxxhrwq0r321s006qfpjyd4za7jjqr6"; - name = "kdev-php-23.08.5.tar.xz"; - }; - }; - kdev-python = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kdev-python-23.08.5.tar.xz"; - sha256 = "02knvrppybs76xmsyyz1q21lacdkxna14ws6mfcmb1rhpghlkgvs"; - name = "kdev-python-23.08.5.tar.xz"; - }; - }; - kdevelop = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kdevelop-23.08.5.tar.xz"; - sha256 = "1y71rvz19akdzsq7ky6w5aarj65lpbwa47nyyabi0vicyy3z4d6n"; - name = "kdevelop-23.08.5.tar.xz"; - }; - }; - kdf = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kdf-23.08.5.tar.xz"; - sha256 = "0zqpxam34s22wv08cd4x49raswyqpvx0pcbszhgng8bb162bi3ma"; - name = "kdf-23.08.5.tar.xz"; - }; - }; - kdialog = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kdialog-23.08.5.tar.xz"; - sha256 = "1p56dmndvaqbm9mw6hki5k4jr4p5w9sg26wvr13s7jcnyca21hqj"; - name = "kdialog-23.08.5.tar.xz"; - }; - }; - kdiamond = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kdiamond-23.08.5.tar.xz"; - sha256 = "19kjg5r0260rim4gl5d1bi547p4mm2ac56pn6w423my8cjzdrgri"; - name = "kdiamond-23.08.5.tar.xz"; - }; - }; - keditbookmarks = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/keditbookmarks-23.08.5.tar.xz"; - sha256 = "1h8al2kryvfm7a45axxg0n72nr5myampbqyjgfqm1ibzkfgf4skd"; - name = "keditbookmarks-23.08.5.tar.xz"; - }; - }; - keysmith = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/keysmith-23.08.5.tar.xz"; - sha256 = "0nix18xvy3kdz1kw9a7annl8yy43f1x9a50him85dbkk9bn7731g"; - name = "keysmith-23.08.5.tar.xz"; - }; - }; - kfind = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kfind-23.08.5.tar.xz"; - sha256 = "1j1fihfhdg1x5glayfz57xz2k9j54lyrnkj3i9x8pzvrkznfj55s"; - name = "kfind-23.08.5.tar.xz"; - }; - }; - kfourinline = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kfourinline-23.08.5.tar.xz"; - sha256 = "1fnprcpm6jpdl0kzwjq2jq36swv3z3vvmxcnz5mzjl5gnh51223d"; - name = "kfourinline-23.08.5.tar.xz"; - }; - }; - kgeography = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kgeography-23.08.5.tar.xz"; - sha256 = "1wcy2fxrj73sa283n0xbj6zyrbgmhkxw4dn01w7kqix2afwa1wdm"; - name = "kgeography-23.08.5.tar.xz"; - }; - }; - kget = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kget-23.08.5.tar.xz"; - sha256 = "13pkvcp8sfl23l34lwnrgl80d8wcg7k5rvvzvzyafvkjy1xjpaif"; - name = "kget-23.08.5.tar.xz"; - }; - }; - kgoldrunner = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kgoldrunner-23.08.5.tar.xz"; - sha256 = "032v02z825d363yhbbyb6blaff7zwrg41k2jlzhhqldcnd814qpc"; - name = "kgoldrunner-23.08.5.tar.xz"; - }; - }; - kgpg = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kgpg-23.08.5.tar.xz"; - sha256 = "14l51g4m9vfwzmja3qknb6jdx43sqhgrdy5xnng401gfjhir2b1q"; - name = "kgpg-23.08.5.tar.xz"; - }; - }; - khangman = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/khangman-23.08.5.tar.xz"; - sha256 = "1xjnrlgwpccgjf0cawy7vh554l6jpnp4b2x3lp6s226s39y021s3"; - name = "khangman-23.08.5.tar.xz"; - }; - }; - khelpcenter = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/khelpcenter-23.08.5.tar.xz"; - sha256 = "1mvzflhiqgpvgk7a1av9hf6x2halxb32ppcy7f34q3m8apxnj3sc"; - name = "khelpcenter-23.08.5.tar.xz"; - }; - }; - kidentitymanagement = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kidentitymanagement-23.08.5.tar.xz"; - sha256 = "00bjswh55aciphzifmakw118v1pknk4bsfbpi8cjsjx24vpzgmxw"; - name = "kidentitymanagement-23.08.5.tar.xz"; - }; - }; - kig = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kig-23.08.5.tar.xz"; - sha256 = "0pkh5l5nn70ag5fcld30n43i6mwfk9wxdq1bpm741pa0ji6vsq5g"; - name = "kig-23.08.5.tar.xz"; - }; - }; - kigo = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kigo-23.08.5.tar.xz"; - sha256 = "1x4anmxcgd7jb39cmfc1klg1vqmp9lxpbwlab1m60542r5s7rh0a"; - name = "kigo-23.08.5.tar.xz"; - }; - }; - killbots = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/killbots-23.08.5.tar.xz"; - sha256 = "0j1m8f3zmskk7m47i9vqfvrf3c7fd6bi23pwhlhraabixpd9wv9i"; - name = "killbots-23.08.5.tar.xz"; - }; - }; - kimagemapeditor = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kimagemapeditor-23.08.5.tar.xz"; - sha256 = "036zj278mpfnh35h0qvwcjgb7661xkxnqccib3v55w0vdpn8y9hg"; - name = "kimagemapeditor-23.08.5.tar.xz"; - }; - }; - kimap = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kimap-23.08.5.tar.xz"; - sha256 = "0gbq8pc91a1ak0yg55m4xpi4zgz2dfajvxgwq0simnm7mhcj1za2"; - name = "kimap-23.08.5.tar.xz"; - }; - }; - kio-admin = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kio-admin-23.08.5.tar.xz"; - sha256 = "0bksn8vpqwp0qfwyapbm33karf46hlmcmkhsybn6d8wljb44cq48"; - name = "kio-admin-23.08.5.tar.xz"; - }; - }; - kio-extras = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kio-extras-23.08.5.tar.xz"; - sha256 = "0gr63gmnivxz5rfhfmky1skx8r5krqljdjyq8vxd97r3qwffrq0s"; - name = "kio-extras-23.08.5.tar.xz"; - }; - }; - kio-gdrive = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kio-gdrive-23.08.5.tar.xz"; - sha256 = "19pdspi0ysx9589zqrdlkj3hly9rxl80pgqvas1iwhw4aahkx66m"; - name = "kio-gdrive-23.08.5.tar.xz"; - }; - }; - kio-zeroconf = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kio-zeroconf-23.08.5.tar.xz"; - sha256 = "0d0an6i63gkrr2gxpi6xdzdpzwav9wvghcy299dc1xqipdk939h9"; - name = "kio-zeroconf-23.08.5.tar.xz"; - }; - }; - kipi-plugins = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kipi-plugins-23.08.5.tar.xz"; - sha256 = "0sjkxsaxhns0d21n36zlzhxzysr3y3675z9vbc4ji10gjlskxq10"; - name = "kipi-plugins-23.08.5.tar.xz"; - }; - }; - kirigami-gallery = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kirigami-gallery-23.08.5.tar.xz"; - sha256 = "0my44hmjgn551bm1j3ij6dynmxag7pxlkxvvvdizr1imcd0p1qy4"; - name = "kirigami-gallery-23.08.5.tar.xz"; - }; - }; - kiriki = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kiriki-23.08.5.tar.xz"; - sha256 = "1mnyd9w5cf0sm4m8fg6fhg1cxrwmhmbjhn2k8h7zxp1k80k4gcy6"; - name = "kiriki-23.08.5.tar.xz"; - }; - }; - kiten = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kiten-23.08.5.tar.xz"; - sha256 = "0fk264sm6yfiwikrjpva8ybxh2bnwh42mqsyryng76vwxdmm3s0y"; - name = "kiten-23.08.5.tar.xz"; - }; - }; - kitinerary = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kitinerary-23.08.5.tar.xz"; - sha256 = "1a3qw7s5qwd4x4f4phxwis0y13yf5j463wjai2awr641zq121gdf"; - name = "kitinerary-23.08.5.tar.xz"; - }; - }; - kjournald = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kjournald-23.08.5.tar.xz"; - sha256 = "1l7d4zqsxak2c2yvsqx1x1mw8b6sxx54svg0lxznjrk4va1h55zp"; - name = "kjournald-23.08.5.tar.xz"; - }; - }; - kjumpingcube = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kjumpingcube-23.08.5.tar.xz"; - sha256 = "0w4wsc1n6qlz8m3kjdqbjw6ccfqzc3fpa2n11k5vhb1vysxa3vld"; - name = "kjumpingcube-23.08.5.tar.xz"; - }; - }; - kldap = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kldap-23.08.5.tar.xz"; - sha256 = "1gkc31028fqdvf5yf7nwhyqii1zy3sxggnid74xxwfknr0pxqacx"; - name = "kldap-23.08.5.tar.xz"; - }; - }; - kleopatra = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kleopatra-23.08.5.tar.xz"; - sha256 = "19pivdjnq6b0m79gy4mfqyrl604mnlhd41c3zr432xnkkrcidi59"; - name = "kleopatra-23.08.5.tar.xz"; - }; - }; - klettres = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/klettres-23.08.5.tar.xz"; - sha256 = "0zl1r4b84a5yq593lbla6wfw823l1qnqg9zxpzip10vrzji2gjga"; - name = "klettres-23.08.5.tar.xz"; - }; - }; - klickety = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/klickety-23.08.5.tar.xz"; - sha256 = "11wir03ci5x4s2m4j14qbmid5m9grgd4n7zqrvjrsr9mipbm5p39"; - name = "klickety-23.08.5.tar.xz"; - }; - }; - klines = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/klines-23.08.5.tar.xz"; - sha256 = "07ipifmjpfszifi8jy8g1rmbi0jx4l4jqf81wvhv80llbna48ypx"; - name = "klines-23.08.5.tar.xz"; - }; - }; - kmag = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kmag-23.08.5.tar.xz"; - sha256 = "1jaf97dyc8lcdmmlva11ivkylkcpbim48lrrm08cvsvs3iw66vr5"; - name = "kmag-23.08.5.tar.xz"; - }; - }; - kmahjongg = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kmahjongg-23.08.5.tar.xz"; - sha256 = "0id838z75xppc7lwg94w1a7xy5jzy331xz2x80nsdn425fhgyhw7"; - name = "kmahjongg-23.08.5.tar.xz"; - }; - }; - kmail = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kmail-23.08.5.tar.xz"; - sha256 = "0mdp5ax7215x3mfi90cspp181l1cmhdwlhpijcnqq842gdjaqf3i"; - name = "kmail-23.08.5.tar.xz"; - }; - }; - kmail-account-wizard = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kmail-account-wizard-23.08.5.tar.xz"; - sha256 = "1fjxzyg8sb16kd85nqrw6xql143mmm4wz463flc0hsjdpcnfb297"; - name = "kmail-account-wizard-23.08.5.tar.xz"; - }; - }; - kmailtransport = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kmailtransport-23.08.5.tar.xz"; - sha256 = "05f4kp4rwb4lk82av4aqzllbcizam25994wsvyxcpddfv37jpd63"; - name = "kmailtransport-23.08.5.tar.xz"; - }; - }; - kmbox = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kmbox-23.08.5.tar.xz"; - sha256 = "007lrmzbm44mrp46n7j510hqgg9wq947g0b7zbxfp5dr1rxvi0z5"; - name = "kmbox-23.08.5.tar.xz"; - }; - }; - kmime = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kmime-23.08.5.tar.xz"; - sha256 = "1nizvbjn3prbcgzgg03vfgffpjqmpxy7pqvxzjs8yfmz79rlx2dn"; - name = "kmime-23.08.5.tar.xz"; - }; - }; - kmines = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kmines-23.08.5.tar.xz"; - sha256 = "0lwkiq5vcw10h8lvqsb4jri8pghdsp3b8jp4c5ihwawjzwl29cyb"; - name = "kmines-23.08.5.tar.xz"; - }; - }; - kmix = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kmix-23.08.5.tar.xz"; - sha256 = "10415kj94d63fpx2i5xhbrj93i4d91hn8d1bbj484375vflsqwc6"; - name = "kmix-23.08.5.tar.xz"; - }; - }; - kmousetool = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kmousetool-23.08.5.tar.xz"; - sha256 = "01wmhd0kb0xbyg5lr0vbj8nrk1ri5nllq5fd9pyq9whxvsar4fyz"; - name = "kmousetool-23.08.5.tar.xz"; - }; - }; - kmouth = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kmouth-23.08.5.tar.xz"; - sha256 = "15sa5q37fd9228m78d7w7xdfsy18hyd43snvrngiiw4317x9km4n"; - name = "kmouth-23.08.5.tar.xz"; - }; - }; - kmplot = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kmplot-23.08.5.tar.xz"; - sha256 = "05rdpjc7hlwkh2klhvybjjq73g15apysk31wph2pljg46mwh9sc4"; - name = "kmplot-23.08.5.tar.xz"; - }; - }; - knavalbattle = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/knavalbattle-23.08.5.tar.xz"; - sha256 = "09s7lax3yd4vx6rp29540vzy555b2yp1m7lq5pd8ighiww78pznb"; - name = "knavalbattle-23.08.5.tar.xz"; - }; - }; - knetwalk = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/knetwalk-23.08.5.tar.xz"; - sha256 = "0d47650cc4cabycilhbc6zbrbbbsn4awiswsk91lzkp47jpvjfqb"; - name = "knetwalk-23.08.5.tar.xz"; - }; - }; - knights = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/knights-23.08.5.tar.xz"; - sha256 = "10xy3cr2z10l6zp2fp5kv8s94wbizz39afcg2i7n30w1r9pj6csn"; - name = "knights-23.08.5.tar.xz"; - }; - }; - knotes = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/knotes-23.08.5.tar.xz"; - sha256 = "1bh2f10z2djvf77rsdlrwg0s4crkirjqaw0cwjapv2d2y03blgx6"; - name = "knotes-23.08.5.tar.xz"; - }; - }; - koko = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/koko-23.08.5.tar.xz"; - sha256 = "0drs0yj7r5qm762x2y5ixczvcnlk8gy7qsh3h88k0cb95wxgz7dq"; - name = "koko-23.08.5.tar.xz"; - }; - }; - kolf = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kolf-23.08.5.tar.xz"; - sha256 = "1cfmdbplhabaz62zs0jrf0p146rm688riiapckg19mcqzcvqq8cq"; - name = "kolf-23.08.5.tar.xz"; - }; - }; - kollision = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kollision-23.08.5.tar.xz"; - sha256 = "15amfmyma1p0gpq0xx3yix6n0wj469gws8pydpynmn75z89r61zz"; - name = "kollision-23.08.5.tar.xz"; - }; - }; - kolourpaint = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kolourpaint-23.08.5.tar.xz"; - sha256 = "1kjaxab9iasszgn7zfq5lhb2nkxrkd42x16y6pqs9ar4ixc6nbwl"; - name = "kolourpaint-23.08.5.tar.xz"; - }; - }; - kompare = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kompare-23.08.5.tar.xz"; - sha256 = "0yajvzm98rqs214lp2rfrzz925ddgqgjmdxq7zm74qarixq3kyic"; - name = "kompare-23.08.5.tar.xz"; - }; - }; - kongress = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kongress-23.08.5.tar.xz"; - sha256 = "04mb4siivza5gjcyb68cv34vlkd9xsk79nv0z6g7f2l7ir7q9l42"; - name = "kongress-23.08.5.tar.xz"; - }; - }; - konqueror = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/konqueror-23.08.5.tar.xz"; - sha256 = "1yhc6yyw8549qmask70rqja1p70wcwbkg8hiln16bxsb6ngl9aw4"; - name = "konqueror-23.08.5.tar.xz"; - }; - }; - konquest = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/konquest-23.08.5.tar.xz"; - sha256 = "0c04lzmacmx5ch5awsxn2wx0vyv632qazypak0vp45jm885fg059"; - name = "konquest-23.08.5.tar.xz"; - }; - }; - konsole = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/konsole-23.08.5.tar.xz"; - sha256 = "1jn1c01cc6xsgd5b6c2q0fbr9fdn0nqzfc9fwsy4cyn279sj1yy6"; - name = "konsole-23.08.5.tar.xz"; - }; - }; - kontact = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kontact-23.08.5.tar.xz"; - sha256 = "1p205y9z0y7khvpbl9lq9yl1z6pvnpl98yj8baj42rfynnvj5sx6"; - name = "kontact-23.08.5.tar.xz"; - }; - }; - kontactinterface = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kontactinterface-23.08.5.tar.xz"; - sha256 = "1gxjb3g3a2prbiki6f980vm9jdkiicnw138p8clvarw1zqr6vwgd"; - name = "kontactinterface-23.08.5.tar.xz"; - }; - }; - kontrast = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kontrast-23.08.5.tar.xz"; - sha256 = "1azx1x3136z2qzf3drw52k9l8g8vffc0jx0pvfpqhgkpi471l4vy"; - name = "kontrast-23.08.5.tar.xz"; - }; - }; - konversation = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/konversation-23.08.5.tar.xz"; - sha256 = "1gi57pk10cs8cnaw26xjp8ffyqi77azvns99c5mmk29pfwb6ymv0"; - name = "konversation-23.08.5.tar.xz"; - }; - }; - kopeninghours = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kopeninghours-23.08.5.tar.xz"; - sha256 = "0ihrjdyxaw5a5wvyjx6n0gl5l37djrqlc30mwaf9ihwrbvvlqb16"; - name = "kopeninghours-23.08.5.tar.xz"; - }; - }; - kopete = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kopete-23.08.5.tar.xz"; - sha256 = "0ccf3flphc1zh59np8y0pl6rvq0ff9qfrqqmaqzfqmn2y02piy0a"; - name = "kopete-23.08.5.tar.xz"; - }; - }; - korganizer = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/korganizer-23.08.5.tar.xz"; - sha256 = "1hgdrnax7m5ngjh8qcxsxr2aq3cdx56bkzl747byh08klrmbx9n4"; - name = "korganizer-23.08.5.tar.xz"; - }; - }; - kosmindoormap = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kosmindoormap-23.08.5.tar.xz"; - sha256 = "00xb91x3d3r3wmlyw83975f4h2igmbybi3ac951jal1nfpix8yv4"; - name = "kosmindoormap-23.08.5.tar.xz"; - }; - }; - kpat = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kpat-23.08.5.tar.xz"; - sha256 = "1grilk4jdaygfi63h7km8q1iv82sz2azsmgzbzz67alg4add1k6m"; - name = "kpat-23.08.5.tar.xz"; - }; - }; - kpimtextedit = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kpimtextedit-23.08.5.tar.xz"; - sha256 = "1ir7wxlbfmagnnmh15b0k7gqhvlrl2mzmin9nf9c20l21hmrdp2f"; - name = "kpimtextedit-23.08.5.tar.xz"; - }; - }; - kpkpass = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kpkpass-23.08.5.tar.xz"; - sha256 = "1cfsgky40zszyjbil7xjf12dbg1aymza2db70ghkvjjsp2xn17nn"; - name = "kpkpass-23.08.5.tar.xz"; - }; - }; - kpmcore = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kpmcore-23.08.5.tar.xz"; - sha256 = "0yj1hpg53w3rfahhchslhgiw7yakxc99jyf59kzdv4z55mql0jml"; - name = "kpmcore-23.08.5.tar.xz"; - }; - }; - kpublictransport = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kpublictransport-23.08.5.tar.xz"; - sha256 = "0n2s4l5vrsnmyj0p2icqrjc8qc3g5cm8nkhq4q6k29lbkrpfbxz3"; - name = "kpublictransport-23.08.5.tar.xz"; - }; - }; - kqtquickcharts = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kqtquickcharts-23.08.5.tar.xz"; - sha256 = "1zikypr3v8kqs2qxc1x09acr25i6blcqfhqlgy65k26gb9qk1xk2"; - name = "kqtquickcharts-23.08.5.tar.xz"; - }; - }; - krdc = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/krdc-23.08.5.tar.xz"; - sha256 = "1x2ry209mqazv2l9cx51x86ivpw5wia5cc3cbp7034ianbmprif2"; - name = "krdc-23.08.5.tar.xz"; - }; - }; - krecorder = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/krecorder-23.08.5.tar.xz"; - sha256 = "0198wy6pa9nc1lly4szfxyma2np693pkg408iljxx3pxxi8vvvn8"; - name = "krecorder-23.08.5.tar.xz"; - }; - }; - kreversi = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kreversi-23.08.5.tar.xz"; - sha256 = "1mddxiawjyzjpwvb72jrh10012kq3q7nlvi33v02xs4qlw1npyy0"; - name = "kreversi-23.08.5.tar.xz"; - }; - }; - krfb = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/krfb-23.08.5.tar.xz"; - sha256 = "0xmkzrg408qab1nrv48kkpghxds6vm981iipqrfc2fv8b2khmr46"; - name = "krfb-23.08.5.tar.xz"; - }; - }; - kross-interpreters = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kross-interpreters-23.08.5.tar.xz"; - sha256 = "0yzs6y42m9dx02ig9i2m932q6qcclg0r67sd4k53c038giri0y1m"; - name = "kross-interpreters-23.08.5.tar.xz"; - }; - }; - kruler = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kruler-23.08.5.tar.xz"; - sha256 = "0gilrz96yidqx698vs42gymb552d16vjwynmnpxs8hsr2z8snsqs"; - name = "kruler-23.08.5.tar.xz"; - }; - }; - ksanecore = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/ksanecore-23.08.5.tar.xz"; - sha256 = "18lv3lvh4cx4jwsdwa2ip9qngf7bd1vdf62xhfyb969py75c869x"; - name = "ksanecore-23.08.5.tar.xz"; - }; - }; - kshisen = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kshisen-23.08.5.tar.xz"; - sha256 = "1xa6nmgcavxxsiw0igjqfkzlr6qv5d620mp606afi890qw2firzj"; - name = "kshisen-23.08.5.tar.xz"; - }; - }; - ksirk = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/ksirk-23.08.5.tar.xz"; - sha256 = "0rggnzv6kaabqb6nhr6ldxfbn4lndr60vfch34lhwwgpb5f06d3a"; - name = "ksirk-23.08.5.tar.xz"; - }; - }; - ksmtp = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/ksmtp-23.08.5.tar.xz"; - sha256 = "1i8vmk1cmill8arglq1af0ck2r0j3bzx4sfz8r94bh0ybfarh1nx"; - name = "ksmtp-23.08.5.tar.xz"; - }; - }; - ksnakeduel = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/ksnakeduel-23.08.5.tar.xz"; - sha256 = "1whqx45pg8kzhwvip20i408j6qk622cvisbpv91kfd0ab76p2k4b"; - name = "ksnakeduel-23.08.5.tar.xz"; - }; - }; - kspaceduel = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kspaceduel-23.08.5.tar.xz"; - sha256 = "0cf1yi05l0s05p8p38m6ygqjxb9zyiijf89raw8y2kjhp30cnjsn"; - name = "kspaceduel-23.08.5.tar.xz"; - }; - }; - ksquares = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/ksquares-23.08.5.tar.xz"; - sha256 = "055wkwr7nhwlzzqbz8m34yi4zgsnnw8pbxdn30d2rndra9kxmmx0"; - name = "ksquares-23.08.5.tar.xz"; - }; - }; - ksudoku = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/ksudoku-23.08.5.tar.xz"; - sha256 = "0rhpjhmqk4xhcjxi2l0v7yzhsa8b8mmgsylmxl4hw4lsvp7vx5lj"; - name = "ksudoku-23.08.5.tar.xz"; - }; - }; - ksystemlog = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/ksystemlog-23.08.5.tar.xz"; - sha256 = "0mn36n3g5g7sihw2r2y1a79ggmxpwikvxkh1rlhpavx721jh7rl0"; - name = "ksystemlog-23.08.5.tar.xz"; - }; - }; - kteatime = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kteatime-23.08.5.tar.xz"; - sha256 = "1rn23hlnn9grjrx5kh2c9dsx8pm3gd0rg6i49wwrml2hvmkmg1af"; - name = "kteatime-23.08.5.tar.xz"; - }; - }; - ktimer = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/ktimer-23.08.5.tar.xz"; - sha256 = "05nxbzh4ka0w8f40q15wm7lj0vpgq70q2qb3vfliv7xdz4b59yjm"; - name = "ktimer-23.08.5.tar.xz"; - }; - }; - ktnef = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/ktnef-23.08.5.tar.xz"; - sha256 = "0a5ld53az9k8csb6psb622xx4nm96f6wz96z5rfdbnamqmyci7rp"; - name = "ktnef-23.08.5.tar.xz"; - }; - }; - ktorrent = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/ktorrent-23.08.5.tar.xz"; - sha256 = "10npi12qdibzpxjx102fh8fxiv5gk89xlp1s43aq01mckcnsvf0n"; - name = "ktorrent-23.08.5.tar.xz"; - }; - }; - ktouch = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/ktouch-23.08.5.tar.xz"; - sha256 = "0pcwypzfn5kh1byvj902vcsxsiyqqbp8w4xv51k6g90darrjl41d"; - name = "ktouch-23.08.5.tar.xz"; - }; - }; - ktrip = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/ktrip-23.08.5.tar.xz"; - sha256 = "17kn0jqhraxp5anj18lhv4v6xwjx3qybnsvz47biwbfiy8b715yl"; - name = "ktrip-23.08.5.tar.xz"; - }; - }; - ktuberling = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/ktuberling-23.08.5.tar.xz"; - sha256 = "1263qkjvbg0dcrrr7w847vm9mq249glwgvxn9i5yck5qdk3cb4wm"; - name = "ktuberling-23.08.5.tar.xz"; - }; - }; - kturtle = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kturtle-23.08.5.tar.xz"; - sha256 = "1mhd8b4rdysvvcjh37vr36ykg2avzdl3sgdsn5svzdga808vc8z4"; - name = "kturtle-23.08.5.tar.xz"; - }; - }; - kubrick = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kubrick-23.08.5.tar.xz"; - sha256 = "000cc8rf63y2km0zzykpdxv24d5jp83p71kf4f3jxqr1lan2gxbm"; - name = "kubrick-23.08.5.tar.xz"; - }; - }; - kwalletmanager = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kwalletmanager-23.08.5.tar.xz"; - sha256 = "1f45jqzn5j23adxb8p7z468klbn42kg2idcjqjm616kia348l7rr"; - name = "kwalletmanager-23.08.5.tar.xz"; - }; - }; - kwave = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kwave-23.08.5.tar.xz"; - sha256 = "0264rz92198pa6rdjiim95z50wlp0myyr2f56m82cig5x69kl666"; - name = "kwave-23.08.5.tar.xz"; - }; - }; - kweather = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kweather-23.08.5.tar.xz"; - sha256 = "04qab954y4mlz7ng1giyc20ndmihi0plli4wqjl6clzip7wi99l7"; - name = "kweather-23.08.5.tar.xz"; - }; - }; - kwordquiz = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/kwordquiz-23.08.5.tar.xz"; - sha256 = "1w5hczhn0cv7r89s5kq1smwc1kkpsxrd7bqan4v26jd0d4r28jjy"; - name = "kwordquiz-23.08.5.tar.xz"; - }; - }; - libgravatar = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/libgravatar-23.08.5.tar.xz"; - sha256 = "15ynbjn2lrz08iriqf2il2b7hqwvypb758p24z1d6hj68hjgl9dc"; - name = "libgravatar-23.08.5.tar.xz"; - }; - }; - libkcddb = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/libkcddb-23.08.5.tar.xz"; - sha256 = "1igrrhzvs1rvn8p1cmiwl68h3bza4wc1pkllphksq5vjb9w9plj3"; - name = "libkcddb-23.08.5.tar.xz"; - }; - }; - libkcompactdisc = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/libkcompactdisc-23.08.5.tar.xz"; - sha256 = "1zwn9nic6fm2wkyhdc8ssyq0jjc6jrvc7aym422fzkmhr104llkg"; - name = "libkcompactdisc-23.08.5.tar.xz"; - }; - }; - libkdcraw = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/libkdcraw-23.08.5.tar.xz"; - sha256 = "04cgjz0f580v8nszki2qk6ms7p0wp8zj0pxsnwr80ipz97j8045b"; - name = "libkdcraw-23.08.5.tar.xz"; - }; - }; - libkdegames = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/libkdegames-23.08.5.tar.xz"; - sha256 = "1vggyamhr15k29zkyyjp0kgvq8n9a4yyxaal41w06q3x6bs87i8a"; - name = "libkdegames-23.08.5.tar.xz"; - }; - }; - libkdepim = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/libkdepim-23.08.5.tar.xz"; - sha256 = "17yvnpgrmwi23b3ia3c73nzma2n46jh7n9a1vjgivjx32rs2w7kf"; - name = "libkdepim-23.08.5.tar.xz"; - }; - }; - libkeduvocdocument = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/libkeduvocdocument-23.08.5.tar.xz"; - sha256 = "05lyycpx6yz6xg0z88fmlf1zzlxwiy9nkk1ma88p8f06kz1qkbmx"; - name = "libkeduvocdocument-23.08.5.tar.xz"; - }; - }; - libkexiv2 = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/libkexiv2-23.08.5.tar.xz"; - sha256 = "1wlv3byg8lkc57mr1mf1ymc1ghg49im6xr6bgvqzlrchg4q30h9i"; - name = "libkexiv2-23.08.5.tar.xz"; - }; - }; - libkgapi = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/libkgapi-23.08.5.tar.xz"; - sha256 = "18yp81mbq0dvpmi1yiab6nnjg65n89fl3l2iw9rnm8m8lcr9y90h"; - name = "libkgapi-23.08.5.tar.xz"; - }; - }; - libkipi = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/libkipi-23.08.5.tar.xz"; - sha256 = "11b2c3qwb47ijr7q04hcc50kwdclig9n72injadw7df6fnp18h3j"; - name = "libkipi-23.08.5.tar.xz"; - }; - }; - libkleo = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/libkleo-23.08.5.tar.xz"; - sha256 = "09a6ihlia4wpj5lwwih94w92xw277fk6bdj1ngbzix8cnzjd6c23"; - name = "libkleo-23.08.5.tar.xz"; - }; - }; - libkmahjongg = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/libkmahjongg-23.08.5.tar.xz"; - sha256 = "0rf37nbxr6m2l7dgj8alfh57zmp39d76swrvv98k9hn5dh5v923s"; - name = "libkmahjongg-23.08.5.tar.xz"; - }; - }; - libkomparediff2 = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/libkomparediff2-23.08.5.tar.xz"; - sha256 = "1l2awsm0ikf1kba72j67k0x5jfc48398pw406saq86l1mcfl23fr"; - name = "libkomparediff2-23.08.5.tar.xz"; - }; - }; - libksane = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/libksane-23.08.5.tar.xz"; - sha256 = "0vig4iws3c1kl1749gfig9g7fjz31g35lysb9ijdbzck46czzpfy"; - name = "libksane-23.08.5.tar.xz"; - }; - }; - libksieve = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/libksieve-23.08.5.tar.xz"; - sha256 = "0p422lvgvm1ma0vm4wf24d1bhjj4jns7qaxp8nkhwhsvs0nlh1js"; - name = "libksieve-23.08.5.tar.xz"; - }; - }; - libktorrent = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/libktorrent-23.08.5.tar.xz"; - sha256 = "1gcpsa49g35jymy9162pjanx8ih0q7viygqwdvvylslfb8zkr8hg"; - name = "libktorrent-23.08.5.tar.xz"; - }; - }; - lokalize = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/lokalize-23.08.5.tar.xz"; - sha256 = "0v1yhcljbzlm4jgk5bc7d6bp13s6si7issi7h4mz92awpp0a6fc5"; - name = "lokalize-23.08.5.tar.xz"; - }; - }; - lskat = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/lskat-23.08.5.tar.xz"; - sha256 = "1qg1y9lhk9x573gwzs6c84bcx7nsmn80il29w5gxf88hkngznlsd"; - name = "lskat-23.08.5.tar.xz"; - }; - }; - mailcommon = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/mailcommon-23.08.5.tar.xz"; - sha256 = "1h0gsrgxxvyhjy7vsh21wch1j1lwadjnyvssvvdzncw2ky63ppb5"; - name = "mailcommon-23.08.5.tar.xz"; - }; - }; - mailimporter = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/mailimporter-23.08.5.tar.xz"; - sha256 = "0njkw27ag6z21n6sp1395mv4khf9r6qi5333nfspqw690gfjp5wl"; - name = "mailimporter-23.08.5.tar.xz"; - }; - }; - marble = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/marble-23.08.5.tar.xz"; - sha256 = "120b987irps4i80amri7d7ci28vi6zjd74nc0m5n9y954wqzyv45"; - name = "marble-23.08.5.tar.xz"; - }; - }; - markdownpart = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/markdownpart-23.08.5.tar.xz"; - sha256 = "1wpbspb5xhxqybanc5ckwrb2h5fqa3ivj564i31jbxlkwdvmp41j"; - name = "markdownpart-23.08.5.tar.xz"; - }; - }; - mbox-importer = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/mbox-importer-23.08.5.tar.xz"; - sha256 = "1ar06iz73qs81k6bd2n77qj4390ql37j37w50jvjpbysbxk2knjz"; - name = "mbox-importer-23.08.5.tar.xz"; - }; - }; - merkuro = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/merkuro-23.08.5.tar.xz"; - sha256 = "15s2hwwh9b4jf11am6v7llsgvix11y6qnlwdspyzpq45378hwpcs"; - name = "merkuro-23.08.5.tar.xz"; - }; - }; - messagelib = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/messagelib-23.08.5.tar.xz"; - sha256 = "1y6xa3z6j04gxdwcfk3y4pskx7blvpxwrixxgjadba51x4lsydys"; - name = "messagelib-23.08.5.tar.xz"; - }; - }; - minuet = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/minuet-23.08.5.tar.xz"; - sha256 = "1bk5y99gb1qmvyf48vk6gfwyqi6nk535868k3jm375bvd956sd3m"; - name = "minuet-23.08.5.tar.xz"; - }; - }; - okular = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/okular-23.08.5.tar.xz"; - sha256 = "0r73ki98lv3293s7zvz3rq2xgj9z2jbqy3p7gs8518knn5lizmfm"; - name = "okular-23.08.5.tar.xz"; - }; - }; - palapeli = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/palapeli-23.08.5.tar.xz"; - sha256 = "1lc9dc25bbagqz6iklwvk81pknwvc2a7kjicmyj8zz5432d7psps"; - name = "palapeli-23.08.5.tar.xz"; - }; - }; - parley = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/parley-23.08.5.tar.xz"; - sha256 = "0rr0dn714khrrgda0lmsd81l0fyc84q3f3xc4fhblz6icj37b5an"; - name = "parley-23.08.5.tar.xz"; - }; - }; - partitionmanager = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/partitionmanager-23.08.5.tar.xz"; - sha256 = "0d08sgml90minr2y1k8niz6d74hh5lavaaa1j0bvyj8gfgkdwflq"; - name = "partitionmanager-23.08.5.tar.xz"; - }; - }; - picmi = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/picmi-23.08.5.tar.xz"; - sha256 = "0f1zvl7sidpaw1y93xrqg704s44l8wg405c5pas4yahl6nrs1i1x"; - name = "picmi-23.08.5.tar.xz"; - }; - }; - pim-data-exporter = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/pim-data-exporter-23.08.5.tar.xz"; - sha256 = "0axzlzam82c70868dc93lwljbc5rllkrslyn4cnc33fvz1xf41kc"; - name = "pim-data-exporter-23.08.5.tar.xz"; - }; - }; - pim-sieve-editor = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/pim-sieve-editor-23.08.5.tar.xz"; - sha256 = "1r756987lwzl27mcdsb0k2wa8crm2lw1xvr197f73j3bnd4a3njx"; - name = "pim-sieve-editor-23.08.5.tar.xz"; - }; - }; - pimcommon = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/pimcommon-23.08.5.tar.xz"; - sha256 = "0bjdbz89141rh1895c4ghx3s2v93wpdghpymi50203rark1iqnsz"; - name = "pimcommon-23.08.5.tar.xz"; - }; - }; - plasmatube = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/plasmatube-23.08.5.tar.xz"; - sha256 = "178vgir5j2535q6gh2p11c7gjsm61f368lmysr8jdmsr43f4zjk6"; - name = "plasmatube-23.08.5.tar.xz"; - }; - }; - poxml = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/poxml-23.08.5.tar.xz"; - sha256 = "1i371b4x4a1ciklxicpwghajzzg7qnvssqgzr6lqnfy9gi8p4p3s"; - name = "poxml-23.08.5.tar.xz"; - }; - }; - print-manager = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/print-manager-23.08.5.tar.xz"; - sha256 = "0jssp0nczr928v1dz9fg5ycsr5s1f0x9yr60lpxa33mgmyrrkvgp"; - name = "print-manager-23.08.5.tar.xz"; - }; - }; - qmlkonsole = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/qmlkonsole-23.08.5.tar.xz"; - sha256 = "0fjw7781a5qzfbkamcvfz3dl1sf793phmjlcp8bdgj3ha4kk9ffl"; - name = "qmlkonsole-23.08.5.tar.xz"; - }; - }; - rocs = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/rocs-23.08.5.tar.xz"; - sha256 = "1c9yrn42bs3r50nzdmib3v6z80kykd271paqbgj4isi2hamw3g7r"; - name = "rocs-23.08.5.tar.xz"; - }; - }; - signon-kwallet-extension = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/signon-kwallet-extension-23.08.5.tar.xz"; - sha256 = "1z4vwmgh102jxbacf40sp9x1bjy2bvnamhi6lv387rpx7snwlmp5"; - name = "signon-kwallet-extension-23.08.5.tar.xz"; - }; - }; - skanlite = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/skanlite-23.08.5.tar.xz"; - sha256 = "1fhd10gr7pya08l98cylc4dkh0hisa0zgj32djkzb64pr16wlyk6"; - name = "skanlite-23.08.5.tar.xz"; - }; - }; - skanpage = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/skanpage-23.08.5.tar.xz"; - sha256 = "1fvj1ckh67sch4m0dfz8wficmsr12b8jk74q66skpi362h731qiq"; - name = "skanpage-23.08.5.tar.xz"; - }; - }; - spectacle = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/spectacle-23.08.5.tar.xz"; - sha256 = "0g3n3n42jp2vi1jv3d8j8rf9362axf9pfpsphbsag15jdppk1y2l"; - name = "spectacle-23.08.5.tar.xz"; - }; - }; - step = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/step-23.08.5.tar.xz"; - sha256 = "0lafzlnjaiqvkz4jcyc6nghiv182x5rlwrn5qrhhvmf5r4qlxnxm"; - name = "step-23.08.5.tar.xz"; - }; - }; - svgpart = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/svgpart-23.08.5.tar.xz"; - sha256 = "1fbqfzn9nppvx51kvam08w9kcfz9y3l86bddvlmyj1j0v26kf6ll"; - name = "svgpart-23.08.5.tar.xz"; - }; - }; - sweeper = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/sweeper-23.08.5.tar.xz"; - sha256 = "1mf1s8725pfbh4s6cl4nmi6dk0kl5l9ldjkwgb7dh15dli37gpss"; - name = "sweeper-23.08.5.tar.xz"; - }; - }; - telly-skout = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/telly-skout-23.08.5.tar.xz"; - sha256 = "1a196ychw81k1m5kql3nnzkzhz98cpn35d257sa8qah0hz3ad4bx"; - name = "telly-skout-23.08.5.tar.xz"; - }; - }; - tokodon = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/tokodon-23.08.5.tar.xz"; - sha256 = "0r8jx2k5znv6pi3wnss0rng870ky3d1c8bd7lhd7fakihsjpm22b"; - name = "tokodon-23.08.5.tar.xz"; - }; - }; - umbrello = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/umbrello-23.08.5.tar.xz"; - sha256 = "1067chdyxfb6h5ma628dia1fjrs8yz3204jn5iprfhasxqi44h2c"; - name = "umbrello-23.08.5.tar.xz"; - }; - }; - yakuake = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/yakuake-23.08.5.tar.xz"; - sha256 = "097bl6rjs5pj7arypcmncwb8ji9jfd8gli0y65454b0aafa5hnac"; - name = "yakuake-23.08.5.tar.xz"; - }; - }; - zanshin = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/zanshin-23.08.5.tar.xz"; - sha256 = "0vpmcmik362b6i232awd0f695w5q82bi4x2lq3x3plnh0wf5xyf0"; - name = "zanshin-23.08.5.tar.xz"; - }; - }; -} diff --git a/pkgs/applications/kde/telly-skout.nix b/pkgs/applications/kde/telly-skout.nix deleted file mode 100644 index 12496afe9dbf..000000000000 --- a/pkgs/applications/kde/telly-skout.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - qtquickcontrols2, - kcoreaddons, - kconfig, - ki18n, - kirigami2, -}: - -mkDerivation { - pname = "telly-skout"; - - nativeBuildInputs = [ extra-cmake-modules ]; - - buildInputs = [ - qtquickcontrols2 - kcoreaddons - kconfig - ki18n - kirigami2 - ]; - - meta = { - description = "Convergent Kirigami TV guide"; - mainProgram = "telly-skout"; - homepage = "https://apps.kde.org/telly-skout/"; - license = lib.licenses.gpl2Plus; - maintainers = [ ]; - }; -} diff --git a/pkgs/applications/kde/tokodon.nix b/pkgs/applications/kde/tokodon.nix deleted file mode 100644 index 5771ce5c60e5..000000000000 --- a/pkgs/applications/kde/tokodon.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ - lib, - mkDerivation, - - cmake, - extra-cmake-modules, - pkg-config, - - kconfig, - kdbusaddons, - ki18n, - kirigami2, - kirigami-addons, - knotifications, - qqc2-desktop-style, - qtbase, - qtkeychain, - qtmultimedia, - qtquickcontrols2, - qttools, - qtwebsockets, - kitemmodels, - pimcommon, - mpv, -}: - -mkDerivation { - pname = "tokodon"; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - pkg-config - ]; - - buildInputs = [ - kconfig - kdbusaddons - ki18n - kirigami2 - kirigami-addons - knotifications - qqc2-desktop-style - qtbase - qtkeychain - qtmultimedia - qtquickcontrols2 - qttools - qtwebsockets - kitemmodels - pimcommon - mpv - ]; - - meta = with lib; { - description = "Mastodon client for Plasma and Plasma Mobile"; - mainProgram = "tokodon"; - homepage = "https://invent.kde.org/network/tokodon"; - license = licenses.gpl3Plus; - platforms = platforms.unix; - maintainers = with maintainers; [ matthiasbeyer ]; - }; -} diff --git a/pkgs/applications/kde/umbrello.nix b/pkgs/applications/kde/umbrello.nix deleted file mode 100644 index e6ee77742877..000000000000 --- a/pkgs/applications/kde/umbrello.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - cmake, - karchive, - ki18n, - kiconthemes, - kdelibs4support, - ktexteditor, -}: - -mkDerivation { - pname = "umbrello"; - meta = { - homepage = "https://umbrello.kde.org/"; - description = "Unified Modelling Language (UML) diagram program"; - license = [ lib.licenses.gpl2 ]; - }; - nativeBuildInputs = [ - cmake - extra-cmake-modules - ]; - propagatedBuildInputs = [ - karchive - ki18n - kiconthemes - kdelibs4support - ktexteditor - ]; -} diff --git a/pkgs/applications/kde/yakuake.nix b/pkgs/applications/kde/yakuake.nix deleted file mode 100644 index b64a7aac6964..000000000000 --- a/pkgs/applications/kde/yakuake.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ - mkDerivation, - lib, - kdoctools, - extra-cmake-modules, - karchive, - kcrash, - kdbusaddons, - ki18n, - kiconthemes, - knewstuff, - knotifications, - knotifyconfig, - konsole, - kparts, - kwayland, - kwindowsystem, - qtx11extras, -}: - -mkDerivation { - pname = "yakuake"; - - buildInputs = [ - karchive - kcrash - kdbusaddons - ki18n - kiconthemes - knewstuff - knotifications - knotifyconfig - kparts - kwayland - kwindowsystem - qtx11extras - ]; - - propagatedBuildInputs = [ - karchive - kcrash - kdbusaddons - ki18n - kiconthemes - knewstuff - knotifications - knotifyconfig - kparts - kwindowsystem - ]; - - propagatedUserEnvPkgs = [ konsole ]; - - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - - outputs = [ - "out" - "dev" - ]; - - meta = { - homepage = "https://yakuake.kde.org"; - description = "Quad-style terminal emulator for KDE"; - mainProgram = "yakuake"; - license = lib.licenses.gpl2; - }; -} diff --git a/pkgs/applications/kde/zanshin.nix b/pkgs/applications/kde/zanshin.nix deleted file mode 100644 index 137f7fc02c55..000000000000 --- a/pkgs/applications/kde/zanshin.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - akonadi-calendar, - boost, - kontactinterface, - krunner, -}: - -mkDerivation { - pname = "zanshin"; - meta = with lib; { - description = "Powerful yet simple application to manage your day to day actions, getting your mind like water"; - homepage = "https://zanshin.kde.org/"; - maintainers = with maintainers; [ zraexy ]; - license = licenses.gpl2Plus; - }; - - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - akonadi-calendar - boost - kontactinterface - krunner - ]; -} diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index 050efba1c446..9200d884c129 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -39,16 +39,6 @@ makeScopeWithSplicing' { in (lib.makeOverridable mkFrameworks attrs); - kdeGear = - let - mkGear = import ../applications/kde; - attrs = { - inherit config libsForQt5; - inherit (pkgs) lib fetchurl; - }; - in - (lib.makeOverridable mkGear attrs); - noExtraAttrs = set: lib.attrsets.removeAttrs set [ @@ -61,19 +51,14 @@ makeScopeWithSplicing' { in (noExtraAttrs ( kdeFrameworks - // kdeGear // qt5 // { inherit kdeFrameworks - kdeGear qt5 ; - # Alias for backwards compatibility. Added 2021-05-07. - kdeApplications = kdeGear; - ### LIBRARIES accounts-qml-module = callPackage ../development/libraries/accounts-qml-module { }; From e103989b1005ee20448ffc637a0264e16d29f24f Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 21 Aug 2025 22:58:15 +0300 Subject: [PATCH 145/146] aliases.nix: be smarter about throw messages --- pkgs/top-level/aliases.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index e3cc1f13656b..a4e8e6844fa5 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -346,11 +346,14 @@ let makePlasma5Throw = name: - throw '' - The libsForQt5.${name} package and the corresponding top-level ${name} alias have been removed. - - Please explicitly use kdePackages.${name} for the latest Qt 6-based version. - ''; + throw ( + '' + The libsForQt5.${name} package and the corresponding top-level ${name} alias have been removed, as KDE Gear 5 and Plasma 5 have reached end of life. + '' + + lib.optionalString (kdePackages ? ${name}) '' + Please explicitly use kdePackages.${name} for the latest Qt 6-based version. + '' + ); plasma5Throws = lib.mapAttrs (k: _: makePlasma5Throw k) deprecatedPlasma5Packages; From 9913dd115ddcf298a0e65022a6816c2fca209d5f Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 21 Aug 2025 23:05:53 +0300 Subject: [PATCH 146/146] nixos/doc/rl-2511: relnote Plasma/Gear 5 removal --- nixos/doc/manual/release-notes/rl-2511.section.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md index b13dac4e5e6e..3bd80f616f12 100644 --- a/nixos/doc/manual/release-notes/rl-2511.section.md +++ b/nixos/doc/manual/release-notes/rl-2511.section.md @@ -12,6 +12,8 @@ - The NetworkManager module does not ship with a default set of VPN plugins anymore. All required VPN plugins must now be explicitly configured in [`networking.networkmanager.plugins`](#opt-networking.networkmanager.plugins). +- The Qt 5-based versions of KDE Gear, Plasma, Maui and Deepin have been removed. Users are advised to migrate to Plasma 6 and Gear 25.08, available under `kdePackages`. + ## New Modules {#sec-release-25.11-new-modules}