From 7f9fabb6eb528cc4de54d09e273af807013790c5 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Sun, 5 Sep 2021 18:27:18 -0400
Subject: [PATCH 01/24] sunxi-tools: 2018-11-13 -> 2021-08-29

---
 pkgs/development/tools/sunxi-tools/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/sunxi-tools/default.nix b/pkgs/development/tools/sunxi-tools/default.nix
index 422969d2c66c..320fcb1b04cd 100644
--- a/pkgs/development/tools/sunxi-tools/default.nix
+++ b/pkgs/development/tools/sunxi-tools/default.nix
@@ -1,18 +1,18 @@
-{ lib, stdenv, fetchFromGitHub, pkg-config, libusb1, zlib }:
+{ lib, stdenv, fetchFromGitHub, pkg-config, dtc, libusb1, zlib }:
 
 stdenv.mkDerivation rec {
   pname = "sunxi-tools";
-  version = "unstable-2018-11-13";
+  version = "unstable-2021-08-29";
 
   src = fetchFromGitHub {
     owner = "linux-sunxi";
     repo = "sunxi-tools";
-    rev = "6d598a0ed714201380e78130213500be6512942b";
-    sha256 = "1yhl6jfl2cws596ymkyhm8h9qkcvp67v8hlh081lsaqv1i8j9yig";
+    rev = "74273b671a3fc34048383c40c85c684423009fb9";
+    sha256 = "1gwamb64vr45iy2ry7jp1k3zc03q5sydmdflrbwr892f0ijh2wjl";
   };
 
   nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ libusb1 zlib ];
+  buildInputs = [ dtc libusb1 zlib ];
 
   makeFlags = [ "PREFIX=$(out)" ];
 

From c1783f6a3a77a03ccabf0da45311db5898dab1e4 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 3 Oct 2021 22:03:56 +0200
Subject: [PATCH 02/24] =?UTF-8?q?ocamlPackages.uuseg:=2011.0.0=20=E2=86=92?=
 =?UTF-8?q?=2014.0.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/ocaml-modules/uuseg/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/ocaml-modules/uuseg/default.nix b/pkgs/development/ocaml-modules/uuseg/default.nix
index c083f5b68f65..1fbcb57f3a6a 100644
--- a/pkgs/development/ocaml-modules/uuseg/default.nix
+++ b/pkgs/development/ocaml-modules/uuseg/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, uchar, uucp, uutf, cmdliner }:
+{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, uucp, uutf, cmdliner }:
 
 let
   pname = "uuseg";
@@ -8,22 +8,22 @@ in
 stdenv.mkDerivation rec {
 
   name = "ocaml${ocaml.version}-${pname}-${version}";
-  version = "11.0.0";
+  version = "14.0.0";
 
   src = fetchurl {
     url = "${webpage}/releases/${pname}-${version}.tbz";
-    sha256 = "17mn8p9pn340kmvfgnl1m64zbpy60r6svkwsdn2lcg3yi2jlbrwp";
+    sha256 = "sha256:1g9zyzjkhqxgbb9mh3cgaawscwdazv6y8kdqvmy6yhnimmfqv25p";
   };
 
   buildInputs = [ ocaml findlib ocamlbuild cmdliner topkg uutf ];
-  propagatedBuildInputs = [ uucp uchar ];
+  propagatedBuildInputs = [ uucp ];
 
   inherit (topkg) buildPhase installPhase;
 
   meta = with lib; {
     description = "An OCaml library for segmenting Unicode text";
     homepage = webpage;
-    platforms = ocaml.meta.platforms or [];
+    inherit (ocaml.meta) platforms;
     license = licenses.bsd3;
     maintainers = [ maintainers.vbgl ];
   };

From 15349e69e4c8eb946af6e97edaec2da6562eb592 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Tue, 5 Oct 2021 22:34:37 -0300
Subject: [PATCH 03/24] beam-modules: webdriver: rename version

---
 .../development/beam-modules/webdriver/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/beam-modules/webdriver/default.nix b/pkgs/development/beam-modules/webdriver/default.nix
index 1255ec59c3a2..131fd03d86dc 100644
--- a/pkgs/development/beam-modules/webdriver/default.nix
+++ b/pkgs/development/beam-modules/webdriver/default.nix
@@ -7,14 +7,14 @@ let
   };
 
   pkg = self: stdenv.mkDerivation {
-    name = "webdriver";
-    version = "0.0.0+build.18.7ceaf1f";
+    pname = "webdriver";
+    version = "0.pre+unstable=2015-02-08";
 
     src = fetchFromGitHub {
-        owner = "Quviq";
-        repo = "webdrv";
-        rev = "7ceaf1f67d834e841ca0133b4bf899a9fa2db6bb";
-        sha256 = "1pq6pmlr6xb4hv2fvmlrvzd8c70kdcidlgjv4p8n9pwvkif0cb87";
+      owner = "Quviq";
+      repo = "webdrv";
+      rev = "7ceaf1f67d834e841ca0133b4bf899a9fa2db6bb";
+      sha256 = "1pq6pmlr6xb4hv2fvmlrvzd8c70kdcidlgjv4p8n9pwvkif0cb87";
     };
 
     setupHook = writeText "setupHook.sh" ''
@@ -36,5 +36,5 @@ let
       env = shell self;
     };
 
-};
+  };
 in lib.fix pkg

From 9b2a54f7d6084c202a23e0f5e4f49a1bb99f09fb Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Tue, 5 Oct 2021 22:45:24 -0300
Subject: [PATCH 04/24] treewide: change 0.0.0 to 0.pre in version attrs

---
 .../editors/emacs/elisp-packages/apheleia/default.nix           | 2 +-
 .../editors/emacs/elisp-packages/bqn-mode/default.nix           | 2 +-
 .../emacs/elisp-packages/color-theme-solarized/default.nix      | 2 +-
 .../editors/emacs/elisp-packages/evil-markdown/default.nix      | 2 +-
 .../editors/emacs/elisp-packages/git-undo/default.nix           | 2 +-
 .../editors/emacs/elisp-packages/helm-words/default.nix         | 2 +-
 .../editors/emacs/elisp-packages/isearch-prop/default.nix       | 2 +-
 .../editors/emacs/elisp-packages/nano-theme/default.nix         | 2 +-
 .../editors/emacs/elisp-packages/power-mode/default.nix         | 2 +-
 .../editors/emacs/elisp-packages/railgun/default.nix            | 2 +-
 .../editors/emacs/elisp-packages/sunrise-commander/default.nix  | 2 +-
 .../editors/emacs/elisp-packages/youtube-dl/default.nix         | 2 +-
 .../graphics/inkscape/extensions/applytransforms/default.nix    | 2 +-
 .../terminal-emulators/st/lukesmithxyz-st/default.nix           | 2 +-
 pkgs/applications/terminal-emulators/st/mcaimi-st.nix           | 2 +-
 pkgs/applications/terminal-emulators/st/siduck76-st.nix         | 2 +-
 pkgs/applications/window-managers/cardboard/default.nix         | 2 +-
 pkgs/applications/window-managers/wio/default.nix               | 2 +-
 pkgs/desktops/arcan/pipeworld.nix                               | 2 +-
 pkgs/desktops/arcan/prio.nix                                    | 2 +-
 pkgs/misc/emulators/emu2/default.nix                            | 2 +-
 pkgs/misc/emulators/uxn/default.nix                             | 2 +-
 22 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/pkgs/applications/editors/emacs/elisp-packages/apheleia/default.nix b/pkgs/applications/editors/emacs/elisp-packages/apheleia/default.nix
index 935533b34ae9..c0fb5680461a 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/apheleia/default.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/apheleia/default.nix
@@ -7,7 +7,7 @@
 
 trivialBuild rec {
   pname = "apheleia";
-  version = "0.0.0+unstable=2021-08-08";
+  version = "0.pre+unstable=2021-08-08";
 
   src = fetchFromGitHub {
     owner = "raxod502";
diff --git a/pkgs/applications/editors/emacs/elisp-packages/bqn-mode/default.nix b/pkgs/applications/editors/emacs/elisp-packages/bqn-mode/default.nix
index ee2a18cd9123..876392c0810a 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/bqn-mode/default.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/bqn-mode/default.nix
@@ -5,7 +5,7 @@
 
 trivialBuild {
   pname = "bqn-mode";
-  version = "0.0.0+unstable=2021-09-27";
+  version = "0.pre+unstable=2021-09-27";
 
   src = fetchFromGitHub {
     owner = "AndersonTorres";
diff --git a/pkgs/applications/editors/emacs/elisp-packages/color-theme-solarized/default.nix b/pkgs/applications/editors/emacs/elisp-packages/color-theme-solarized/default.nix
index feb6c0fa86ca..1ac8b2f70768 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/color-theme-solarized/default.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/color-theme-solarized/default.nix
@@ -7,7 +7,7 @@
 
 trivialBuild {
   pname = "color-theme-solarized";
-  version = "0.0.0+unstable=2017-10-24";
+  version = "0.pre+unstable=2017-10-24";
 
   src = fetchFromGitHub {
     owner = "sellout";
diff --git a/pkgs/applications/editors/emacs/elisp-packages/evil-markdown/default.nix b/pkgs/applications/editors/emacs/elisp-packages/evil-markdown/default.nix
index 58c542a57f4f..a2605f33778d 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/evil-markdown/default.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/evil-markdown/default.nix
@@ -6,7 +6,7 @@
 
 trivialBuild rec {
   pname = "evil-markdown";
-  version = "0.0.0+unstable=2021-07-21";
+  version = "0.pre+unstable=2021-07-21";
 
   src = fetchFromGitHub {
     owner = "Somelauw";
diff --git a/pkgs/applications/editors/emacs/elisp-packages/git-undo/default.nix b/pkgs/applications/editors/emacs/elisp-packages/git-undo/default.nix
index 8b353409c372..503554412b5b 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/git-undo/default.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/git-undo/default.nix
@@ -7,7 +7,7 @@
 
 trivialBuild {
   pname = "git-undo";
-  version = "0.0.0+unstable=2019-12-21";
+  version = "0.pre+unstable=2019-12-21";
 
   src = fetchFromGitHub {
     owner = "jwiegley";
diff --git a/pkgs/applications/editors/emacs/elisp-packages/helm-words/default.nix b/pkgs/applications/editors/emacs/elisp-packages/helm-words/default.nix
index 1cc7a23e17d1..21a65614398a 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/helm-words/default.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/helm-words/default.nix
@@ -8,7 +8,7 @@
 
 trivialBuild rec {
   pname = "helm-words";
-  version = "0.0.0+unstable=2019-03-12";
+  version = "0.pre+unstable=2019-03-12";
 
   src = fetchFromGitHub {
     owner = "emacsmirror";
diff --git a/pkgs/applications/editors/emacs/elisp-packages/isearch-prop/default.nix b/pkgs/applications/editors/emacs/elisp-packages/isearch-prop/default.nix
index 067d6f4481f2..6251fd6932a7 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/isearch-prop/default.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/isearch-prop/default.nix
@@ -7,7 +7,7 @@
 
 trivialBuild {
   pname = "isearch-prop";
-  version = "0.0.0+unstable=2019-05-01";
+  version = "0.pre+unstable=2019-05-01";
 
   src = fetchFromGitHub {
     owner = "emacsmirror";
diff --git a/pkgs/applications/editors/emacs/elisp-packages/nano-theme/default.nix b/pkgs/applications/editors/emacs/elisp-packages/nano-theme/default.nix
index 3bdf1a75f430..1dcf27e64ebc 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/nano-theme/default.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/nano-theme/default.nix
@@ -6,7 +6,7 @@
 
 trivialBuild rec {
   pname = "nano-theme";
-  version = "0.0.0+unstable=2021-06-29";
+  version = "0.pre+unstable=2021-06-29";
 
   src = fetchFromGitHub {
     owner = "rougier";
diff --git a/pkgs/applications/editors/emacs/elisp-packages/power-mode/default.nix b/pkgs/applications/editors/emacs/elisp-packages/power-mode/default.nix
index 75015a959c2b..d02283f25ad8 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/power-mode/default.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/power-mode/default.nix
@@ -6,7 +6,7 @@
 
 trivialBuild rec {
   pname = "power-mode";
-  version = "0.0.0+unstable=2021-06-06";
+  version = "0.pre+unstable=2021-06-06";
 
   src = fetchFromGitHub {
     owner = "elizagamedev";
diff --git a/pkgs/applications/editors/emacs/elisp-packages/railgun/default.nix b/pkgs/applications/editors/emacs/elisp-packages/railgun/default.nix
index e49925e057ce..87a20caf9f07 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/railgun/default.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/railgun/default.nix
@@ -6,7 +6,7 @@
 
 trivialBuild {
   pname = "railgun";
-  version= "0.0.0+unstable=2012-10-17";
+  version= "0.pre+unstable=2012-10-17";
 
   src = fetchFromGitHub {
     owner = "mbriggs";
diff --git a/pkgs/applications/editors/emacs/elisp-packages/sunrise-commander/default.nix b/pkgs/applications/editors/emacs/elisp-packages/sunrise-commander/default.nix
index 09889593fe69..1e1fffe9adbc 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/sunrise-commander/default.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/sunrise-commander/default.nix
@@ -6,7 +6,7 @@
 
 trivialBuild rec {
   pname = "sunrise-commander";
-  version = "0.0.0+unstable=2021-07-22";
+  version = "0.pre+unstable=2021-07-22";
 
   src = fetchFromGitHub {
     owner = pname;
diff --git a/pkgs/applications/editors/emacs/elisp-packages/youtube-dl/default.nix b/pkgs/applications/editors/emacs/elisp-packages/youtube-dl/default.nix
index b0df381b5f95..7b57d69d5595 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/youtube-dl/default.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/youtube-dl/default.nix
@@ -7,7 +7,7 @@
 
 trivialBuild {
   pname = "youtube-dl";
-  version = "0.0.0+unstable=2018-10-12";
+  version = "0.pre+unstable=2018-10-12";
 
   src = fetchFromGitHub {
     owner = "skeeto";
diff --git a/pkgs/applications/graphics/inkscape/extensions/applytransforms/default.nix b/pkgs/applications/graphics/inkscape/extensions/applytransforms/default.nix
index 131daffffb9d..f1bac3dd76c4 100644
--- a/pkgs/applications/graphics/inkscape/extensions/applytransforms/default.nix
+++ b/pkgs/applications/graphics/inkscape/extensions/applytransforms/default.nix
@@ -6,7 +6,7 @@
 
 stdenv.mkDerivation {
   pname = "inkscape-applytransforms";
-  version = "0.0.0+unstable=2021-05-11";
+  version = "0.pre+unstable=2021-05-11";
 
   src = fetchFromGitHub {
     owner = "Klowner";
diff --git a/pkgs/applications/terminal-emulators/st/lukesmithxyz-st/default.nix b/pkgs/applications/terminal-emulators/st/lukesmithxyz-st/default.nix
index f285d0fc73b9..2f1476697ea9 100644
--- a/pkgs/applications/terminal-emulators/st/lukesmithxyz-st/default.nix
+++ b/pkgs/applications/terminal-emulators/st/lukesmithxyz-st/default.nix
@@ -12,7 +12,7 @@
 
 stdenv.mkDerivation rec {
   pname = "lukesmithxyz-st";
-  version = "0.0.0+unstable=2021-08-10";
+  version = "0.pre+unstable=2021-08-10";
 
   src = fetchFromGitHub {
     owner = "LukeSmithxyz";
diff --git a/pkgs/applications/terminal-emulators/st/mcaimi-st.nix b/pkgs/applications/terminal-emulators/st/mcaimi-st.nix
index 847638f304f3..11c89cfab670 100644
--- a/pkgs/applications/terminal-emulators/st/mcaimi-st.nix
+++ b/pkgs/applications/terminal-emulators/st/mcaimi-st.nix
@@ -11,7 +11,7 @@
 
 stdenv.mkDerivation rec {
   pname = "mcaimi-st";
-  version = "0.0.0+unstable=2021-08-30";
+  version = "0.pre+unstable=2021-08-30";
 
   src = fetchFromGitHub {
     owner = "mcaimi";
diff --git a/pkgs/applications/terminal-emulators/st/siduck76-st.nix b/pkgs/applications/terminal-emulators/st/siduck76-st.nix
index 55fcebff0e3d..a6753a105c6d 100644
--- a/pkgs/applications/terminal-emulators/st/siduck76-st.nix
+++ b/pkgs/applications/terminal-emulators/st/siduck76-st.nix
@@ -12,7 +12,7 @@
 
 stdenv.mkDerivation rec {
   pname = "siduck76-st";
-  version = "0.0.0+unstable=2021-08-20";
+  version = "0.pre+unstable=2021-08-20";
 
   src = fetchFromGitHub {
     owner = "siduck76";
diff --git a/pkgs/applications/window-managers/cardboard/default.nix b/pkgs/applications/window-managers/cardboard/default.nix
index 17ef08af5e82..5347b0961a54 100644
--- a/pkgs/applications/window-managers/cardboard/default.nix
+++ b/pkgs/applications/window-managers/cardboard/default.nix
@@ -57,7 +57,7 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "cardboard";
-  version = "0.0.0+unstable=2021-05-10";
+  version = "0.pre+unstable=2021-05-10";
 
   src = fetchFromGitLab {
     owner = "cardboardwm";
diff --git a/pkgs/applications/window-managers/wio/default.nix b/pkgs/applications/window-managers/wio/default.nix
index 03ec26f6fb8b..b5831d757756 100644
--- a/pkgs/applications/window-managers/wio/default.nix
+++ b/pkgs/applications/window-managers/wio/default.nix
@@ -19,7 +19,7 @@
 
 stdenv.mkDerivation rec {
   pname = "wio";
-  version = "0.0.0+unstable=2021-06-27";
+  version = "0.pre+unstable=2021-06-27";
 
   src = fetchFromBitbucket {
     owner = "anderson_torres";
diff --git a/pkgs/desktops/arcan/pipeworld.nix b/pkgs/desktops/arcan/pipeworld.nix
index 78af4ee049ee..359c3a21a67c 100644
--- a/pkgs/desktops/arcan/pipeworld.nix
+++ b/pkgs/desktops/arcan/pipeworld.nix
@@ -5,7 +5,7 @@
 
 stdenv.mkDerivation rec {
   pname = "pipeworld";
-  version = "0.0.0+unstable=2021-08-01";
+  version = "0.pre+unstable=2021-08-01";
 
   src = fetchFromGitHub {
     owner = "letoram";
diff --git a/pkgs/desktops/arcan/prio.nix b/pkgs/desktops/arcan/prio.nix
index 764d82fae9b7..34443baa8017 100644
--- a/pkgs/desktops/arcan/prio.nix
+++ b/pkgs/desktops/arcan/prio.nix
@@ -5,7 +5,7 @@
 
 stdenv.mkDerivation rec {
   pname = "prio";
-  version = "0.0.0+unstable=2018-09-13";
+  version = "0.pre+unstable=2018-09-13";
 
   src = fetchFromGitHub {
     owner = "letoram";
diff --git a/pkgs/misc/emulators/emu2/default.nix b/pkgs/misc/emulators/emu2/default.nix
index 65081153ab32..7949a3f2b051 100644
--- a/pkgs/misc/emulators/emu2/default.nix
+++ b/pkgs/misc/emulators/emu2/default.nix
@@ -5,7 +5,7 @@
 
 stdenv.mkDerivation rec {
   pname = "emu2";
-  version = "0.0.0+unstable=2021-09-22";
+  version = "0.pre+unstable=2021-09-22";
 
   src = fetchFromGitHub {
     owner = "dmsc";
diff --git a/pkgs/misc/emulators/uxn/default.nix b/pkgs/misc/emulators/uxn/default.nix
index 3e4928412b11..0b797e2e160b 100644
--- a/pkgs/misc/emulators/uxn/default.nix
+++ b/pkgs/misc/emulators/uxn/default.nix
@@ -6,7 +6,7 @@
 
 stdenv.mkDerivation rec {
   pname = "uxn";
-  version = "0.0.0+unstable=2021-08-30";
+  version = "0.pre+unstable=2021-08-30";
 
   src = fetchFromSourcehut {
     owner = "~rabbits";

From 22eff15993176cbdfd6f306c479d4c847030c658 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 6 Oct 2021 01:51:55 +0000
Subject: [PATCH 05/24] dt-schema: 2021.7 -> 2021.10

---
 pkgs/development/tools/dt-schema/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/dt-schema/default.nix b/pkgs/development/tools/dt-schema/default.nix
index 12dd9f662caf..6ee649595ae2 100644
--- a/pkgs/development/tools/dt-schema/default.nix
+++ b/pkgs/development/tools/dt-schema/default.nix
@@ -11,11 +11,11 @@
 
 buildPythonPackage rec {
   pname = "dtschema";
-  version = "2021.7";
+  version = "2021.10";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-11eCRY3zptsXI4kAIz3jLrTON4j2QTz/xG7vgUgyVA0=";
+    sha256 = "d09c94d13f46e6674ba11ff31220651ad1b02dae860f5a87905dfac6b8d768d9";
   };
 
   nativeBuildInputs = [ setuptools-scm git ];

From 45be479255d805afa0dd7d8b0aefce6736c2e9ad Mon Sep 17 00:00:00 2001
From: Bernardo Meurer <bernardo@meurer.org>
Date: Tue, 5 Oct 2021 19:17:59 -0700
Subject: [PATCH 06/24] llvmPackages_rocm.compiler-rt: replace dead patch with
 clone

---
 pkgs/development/compilers/llvm/rocm/compiler-rt/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/llvm/rocm/compiler-rt/default.nix b/pkgs/development/compilers/llvm/rocm/compiler-rt/default.nix
index 65a45fdae635..6ea4fb281f8f 100644
--- a/pkgs/development/compilers/llvm/rocm/compiler-rt/default.nix
+++ b/pkgs/development/compilers/llvm/rocm/compiler-rt/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
     ./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory
     (fetchpatch {
       name = "libsanitizer-no-cyclades-rocm.patch";
-      url = "https://reviews.llvm.org/file/data/nrhbpc5axblqwx2xyyzv/PHID-FILE-wwcpjvquusomoddmqcwo/file";
+      url = "https://gist.github.com/lovesegfault/b255dcf2fa4e202411a6a04b61e6cc04/raw";
       sha256 = "sha256-PMMSLr2zHuNDn1OWqumqHwB74ktJSHxhJWkqEKB7Z64=";
       stripLen = 1;
      })

From 5dc009c131f46f590f39df180df386837372e784 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Tue, 13 Jul 2021 20:43:35 -0400
Subject: [PATCH 07/24] aliases: Drop kalk (kalker)

The alias has been present for 40 days, the previous package was present
for not more than 3 days with the `kalk` name.
---
 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 d63dbdfa46f4..de1f397d89bd 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -373,7 +373,6 @@ mapAliases ({
   jikes = throw "jikes was deprecated on 2019-10-07: abandoned by upstream";
   joseki = apache-jena-fuseki; # added 2016-02-28
   json_glib = json-glib; # added 2018-02-25
-  kalk = kalker; # added 2021-06-03
   kdecoration-viewer = throw "kdecoration-viewer has been removed from nixpkgs, as there is no upstream activity"; # 2020-06-16
   k9copy = throw "k9copy has been removed from nixpkgs, as there is no upstream activity"; # 2020-11-06
   kodiGBM = kodi-gbm;

From af47c4717e2ea01496d0e5f90bf0ccb283bfe103 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Mon, 31 May 2021 22:12:14 -0400
Subject: [PATCH 08/24] kirigami-addons: init at 21.05

---
 .../libraries/kirigami-addons/default.nix     | 44 +++++++++++++++++++
 pkgs/top-level/qt5-packages.nix               |  2 +
 2 files changed, 46 insertions(+)
 create mode 100644 pkgs/development/libraries/kirigami-addons/default.nix

diff --git a/pkgs/development/libraries/kirigami-addons/default.nix b/pkgs/development/libraries/kirigami-addons/default.nix
new file mode 100644
index 000000000000..3af1c44bf885
--- /dev/null
+++ b/pkgs/development/libraries/kirigami-addons/default.nix
@@ -0,0 +1,44 @@
+{ lib
+, mkDerivation
+, fetchFromGitLab
+
+, cmake
+, extra-cmake-modules
+
+, ki18n
+, kirigami2
+, qtquickcontrols2
+}:
+
+mkDerivation rec {
+  pname = "kirigami-addons";
+  version = "21.05";
+
+  src = fetchFromGitLab {
+    domain = "invent.kde.org";
+    owner = "libraries";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0pwkpag15mvzhd3hvdwx0a8ajwq9j30r6069vsx85bagnag3zanh";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    extra-cmake-modules
+  ];
+
+  buildInputs = [
+    ki18n
+    kirigami2
+    qtquickcontrols2
+  ];
+
+  meta = with lib; {
+    description = "Add-ons for the Kirigami framework";
+    homepage = "https://invent.kde.org/libraries/kirigami-addons";
+    # https://invent.kde.org/libraries/kirigami-addons/-/blob/b197d98fdd079b6fc651949bd198363872d1be23/src/treeview/treeviewplugin.cpp#L1-5
+    license = licenses.lgpl2Plus;
+    maintainers = with maintainers; [ samueldr ];
+  };
+}
+
diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix
index 0c5cb6622359..170b9e1dc0b9 100644
--- a/pkgs/top-level/qt5-packages.nix
+++ b/pkgs/top-level/qt5-packages.nix
@@ -88,6 +88,8 @@ in (kdeFrameworks // plasma5 // plasma5.thirdParty // kdeGear // qt5 // {
 
   kf5gpgmepp = callPackage ../development/libraries/kf5gpgmepp { };
 
+  kirigami-addons = libsForQt5.callPackage ../development/libraries/kirigami-addons { };
+
   kimageannotator = callPackage ../development/libraries/kimageannotator { };
 
   kproperty = callPackage ../development/libraries/kproperty { };

From b5651798b25f5d4ba8fab012a9007241391e53e4 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Wed, 14 Jul 2021 00:23:24 -0400
Subject: [PATCH 09/24] kpublictransport: init at 21.04.0

---
 pkgs/applications/kde/default.nix          |  1 +
 pkgs/applications/kde/kpublictransport.nix | 13 +++++++++++++
 2 files changed, 14 insertions(+)
 create mode 100644 pkgs/applications/kde/kpublictransport.nix

diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index 686007588410..5f73e50e6fa5 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -174,6 +174,7 @@ let
       ksquares = callPackage ./ksquares.nix {};
       kqtquickcharts = callPackage ./kqtquickcharts.nix {};
       kpkpass = callPackage ./kpkpass.nix {};
+      kpublictransport = callPackage ./kpublictransport.nix {};
       kreversi = callPackage ./kreversi.nix {};
       krdc = callPackage ./krdc.nix {};
       krfb = callPackage ./krfb.nix {};
diff --git a/pkgs/applications/kde/kpublictransport.nix b/pkgs/applications/kde/kpublictransport.nix
new file mode 100644
index 000000000000..fbfd3fcc8a46
--- /dev/null
+++ b/pkgs/applications/kde/kpublictransport.nix
@@ -0,0 +1,13 @@
+{ mkDerivation
+, lib
+, extra-cmake-modules
+}:
+
+mkDerivation {
+  pname = "kpublictransport";
+  meta = with lib; {
+    license = [ licenses.cc0 ];
+    maintainers = [ maintainers.samueldr ];
+  };
+  nativeBuildInputs = [ extra-cmake-modules ];
+}

From 3e9044f4caa0898fd4c5cb576cbb98aaf9031ab7 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Tue, 30 Mar 2021 17:42:16 -0400
Subject: [PATCH 10/24] libqofono: init at 0.103

---
 ...-they-re-shock-full-of-hardcoded-FHS.patch | 29 ++++++++++
 ...-mobile-broadband-provider-info-path.patch | 34 +++++++++++
 .../libraries/libqofono/default.nix           | 58 +++++++++++++++++++
 pkgs/top-level/qt5-packages.nix               |  2 +
 4 files changed, 123 insertions(+)
 create mode 100644 pkgs/development/libraries/libqofono/0001-NixOS-Skip-tests-they-re-shock-full-of-hardcoded-FHS.patch
 create mode 100644 pkgs/development/libraries/libqofono/0001-NixOS-provide-mobile-broadband-provider-info-path.patch
 create mode 100644 pkgs/development/libraries/libqofono/default.nix

diff --git a/pkgs/development/libraries/libqofono/0001-NixOS-Skip-tests-they-re-shock-full-of-hardcoded-FHS.patch b/pkgs/development/libraries/libqofono/0001-NixOS-Skip-tests-they-re-shock-full-of-hardcoded-FHS.patch
new file mode 100644
index 000000000000..b93562a663ce
--- /dev/null
+++ b/pkgs/development/libraries/libqofono/0001-NixOS-Skip-tests-they-re-shock-full-of-hardcoded-FHS.patch
@@ -0,0 +1,29 @@
+From 8b508d427c4fd472639ba8d4a0d3b8ab69e3f2e3 Mon Sep 17 00:00:00 2001
+From: Samuel Dionne-Riel <samuel@dionne-riel.com>
+Date: Tue, 30 Mar 2021 16:37:52 -0400
+Subject: [PATCH] [NixOS] Skip tests, they're shock-full of hardcoded FHS paths
+
+---
+ libqofono.pro | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/libqofono.pro b/libqofono.pro
+index 60d0b89..638a4a8 100644
+--- a/libqofono.pro
++++ b/libqofono.pro
+@@ -1,5 +1,5 @@
+ TEMPLATE = subdirs
+-SUBDIRS += src plugin test ofonotest
++SUBDIRS += src plugin
+ OTHER_FILES += \
+   rpm/libqofono-qt5.spec \
+   TODO \
+@@ -7,5 +7,3 @@ OTHER_FILES += \
+ 
+ src.target = src-target
+ plugin.depends = src-target
+-test.depends = src-target
+-ofonotest.depends = src-target
+-- 
+2.28.0
+
diff --git a/pkgs/development/libraries/libqofono/0001-NixOS-provide-mobile-broadband-provider-info-path.patch b/pkgs/development/libraries/libqofono/0001-NixOS-provide-mobile-broadband-provider-info-path.patch
new file mode 100644
index 000000000000..94b4c61befe5
--- /dev/null
+++ b/pkgs/development/libraries/libqofono/0001-NixOS-provide-mobile-broadband-provider-info-path.patch
@@ -0,0 +1,34 @@
+From 04106010ae2a13b3a2a93e210062998ee51778ca Mon Sep 17 00:00:00 2001
+From: Samuel Dionne-Riel <samuel@dionne-riel.com>
+Date: Tue, 30 Mar 2021 15:47:38 -0400
+Subject: [PATCH] [NixOS] provide mobile-broadband-provider-info path
+
+---
+ src/qofonoconnectioncontext.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/qofonoconnectioncontext.cpp b/src/qofonoconnectioncontext.cpp
+index b5877ed..455167c 100644
+--- a/src/qofonoconnectioncontext.cpp
++++ b/src/qofonoconnectioncontext.cpp
+@@ -346,7 +346,7 @@ bool QOfonoConnectionContext::validateProvisioning(const QString &providerString
+     QXmlQuery query;
+     QString provider = providerString;
+ 
+-    query.setFocus(QUrl("/usr/share/mobile-broadband-provider-info/serviceproviders.xml"));
++    query.setFocus(QUrl("@mobile-broadband-provider-info@/share/mobile-broadband-provider-info/serviceproviders.xml"));
+ 
+     if (provider.contains("\'")) {
+         provider = provider.replace("\'", "&apos;");
+@@ -457,7 +457,7 @@ void QOfonoConnectionContext::provision(const QString &provider, const QString &
+ {
+ #ifdef QOFONO_PROVISIONING
+     QXmlQuery query;
+-    query.setFocus(QUrl("/usr/share/mobile-broadband-provider-info/serviceproviders.xml"));
++    query.setFocus(QUrl("@mobile-broadband-provider-info@/share/mobile-broadband-provider-info/serviceproviders.xml"));
+ 
+     QString providerStr = provider;
+     if (providerStr.contains("\'")) {
+-- 
+2.28.0
+
diff --git a/pkgs/development/libraries/libqofono/default.nix b/pkgs/development/libraries/libqofono/default.nix
new file mode 100644
index 000000000000..361421466e89
--- /dev/null
+++ b/pkgs/development/libraries/libqofono/default.nix
@@ -0,0 +1,58 @@
+{ lib
+, substituteAll
+, mkDerivation
+, fetchFromGitLab
+, mobile-broadband-provider-info
+, qmake
+, qtbase
+, qtdeclarative
+}:
+
+mkDerivation rec {
+  pname = "libqofono";
+  version = "0.103";
+
+  src = fetchFromGitLab {
+    domain = "git.sailfishos.org";
+    owner = "mer-core";
+    repo = "libqofono";
+    rev = version;
+    sha256 = "1ly5aj412ljcjvhqyry6nhiglbzzhczsy1a6w4i4fja60b2m1z45";
+  };
+
+  patches = [
+    (substituteAll {
+      src = ./0001-NixOS-provide-mobile-broadband-provider-info-path.patch;
+      inherit mobile-broadband-provider-info;
+    })
+    ./0001-NixOS-Skip-tests-they-re-shock-full-of-hardcoded-FHS.patch
+  ];
+
+  # Replaces paths from the Qt store path to this library's store path.
+  postPatch = ''
+    substituteInPlace src/src.pro \
+      --replace /usr $out \
+      --replace '$$[QT_INSTALL_PREFIX]' "$out" \
+      --replace 'target.path = $$[QT_INSTALL_LIBS]' "target.path = $out/lib"
+
+    substituteInPlace plugin/plugin.pro \
+      --replace '$$[QT_INSTALL_QML]' $out'/${qtbase.qtQmlPrefix}'
+  '';
+
+  nativeBuildInputs = [
+    qmake
+  ];
+
+  buildInputs = [
+    qtbase
+    qtdeclarative
+  ];
+
+  meta = with lib; {
+    description = "Library for accessing the ofono daemon, and declarative plugin for it";
+    homepage = "https://git.sailfishos.org/mer-core/libqofono/";
+    license = licenses.lgpl21Plus;
+    maintainers = with maintainers; [ samueldr ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix
index 170b9e1dc0b9..05235a01d301 100644
--- a/pkgs/top-level/qt5-packages.nix
+++ b/pkgs/top-level/qt5-packages.nix
@@ -122,6 +122,8 @@ in (kdeFrameworks // plasma5 // plasma5.thirdParty // kdeGear // qt5 // {
     inherit (pkgs.darwin.apple_sdk.frameworks) AGL;
   };
 
+  libqofono = callPackage ../development/libraries/libqofono { };
+
   libqtav = callPackage ../development/libraries/libqtav { };
 
   kpmcore = callPackage ../development/libraries/kpmcore { };

From b77fcd30a9c2c51fbd6c18817461e049a3d8cd27 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Tue, 13 Jul 2021 20:55:54 -0400
Subject: [PATCH 11/24] applications/plasma-mobile: Add fetch script

Used similarly to the KDE Gear scripts:

```
 $ ./maintainers/scripts/fetch-kde-qt.sh pkgs/applications/plasma-mobile/
```
---
 pkgs/applications/plasma-mobile/fetch.sh | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 pkgs/applications/plasma-mobile/fetch.sh

diff --git a/pkgs/applications/plasma-mobile/fetch.sh b/pkgs/applications/plasma-mobile/fetch.sh
new file mode 100644
index 000000000000..29a8e6b4c792
--- /dev/null
+++ b/pkgs/applications/plasma-mobile/fetch.sh
@@ -0,0 +1 @@
+WGET_ARGS=( http://download.kde.org/stable/plasma-mobile/21.05 -A '*.tar.xz' )

From f974dc304bc6bf598f4f6a63197048950ac31403 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Tue, 13 Jul 2021 21:00:55 -0400
Subject: [PATCH 12/24] applications/plasma-mobile: Init srcs.nix

Generated with the fetch script.
---
 pkgs/applications/plasma-mobile/srcs.nix | 118 +++++++++++++++++++++++
 1 file changed, 118 insertions(+)
 create mode 100644 pkgs/applications/plasma-mobile/srcs.nix

diff --git a/pkgs/applications/plasma-mobile/srcs.nix b/pkgs/applications/plasma-mobile/srcs.nix
new file mode 100644
index 000000000000..4df185aa0aec
--- /dev/null
+++ b/pkgs/applications/plasma-mobile/srcs.nix
@@ -0,0 +1,118 @@
+# DO NOT EDIT! This file is generated automatically.
+# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/applications/plasma-mobile/
+{ fetchurl, mirror }:
+
+{
+  alligator = {
+    version = "21.05";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma-mobile/21.05/alligator-21.05.tar.xz";
+      sha256 = "04zgxfx2zmn1p2ap08i5sfsnrly3smip4ylr07ghkhkiyjzbv9w6";
+      name = "alligator-21.05.tar.xz";
+    };
+  };
+  angelfish = {
+    version = "21.05";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma-mobile/21.05/angelfish-21.05.tar.xz";
+      sha256 = "11jd5dwy0xa7kh5z5rc29xy3wfn20hm31908zjax4x83qqjrm075";
+      name = "angelfish-21.05.tar.xz";
+    };
+  };
+  calindori = {
+    version = "21.05";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma-mobile/21.05/calindori-21.05.tar.xz";
+      sha256 = "110f9ri9r1nb6q1ybhkfxljl4q5gqxikh9z0xkzjjbxjjqfscqcj";
+      name = "calindori-21.05.tar.xz";
+    };
+  };
+  kalk = {
+    version = "21.05";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma-mobile/21.05/kalk-21.05.tar.xz";
+      sha256 = "04n65hx0j9rx6b3jq69zgypi8qjd4ig3rfw7d44c3q7dgh4k451l";
+      name = "kalk-21.05.tar.xz";
+    };
+  };
+  kclock = {
+    version = "21.05";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma-mobile/21.05/kclock-21.05.tar.xz";
+      sha256 = "0pa5hvax0y80l8yrqczh9mcknfm3z0vdq3xc35cxdiz1vc6fwqmd";
+      name = "kclock-21.05.tar.xz";
+    };
+  };
+  koko = {
+    version = "21.05";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma-mobile/21.05/koko-21.05.tar.xz";
+      sha256 = "00hnzkl8dvf15psrcfh96b8wfb3pbggd2f7xnadzcb87sbaml035";
+      name = "koko-21.05.tar.xz";
+    };
+  };
+  kongress = {
+    version = "21.05";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma-mobile/21.05/kongress-21.05.tar.xz";
+      sha256 = "0qxgpi04ra9crc6drgbdm9arjbvcx52pprjr1dj8acch07f6i2gs";
+      name = "kongress-21.05.tar.xz";
+    };
+  };
+  krecorder = {
+    version = "21.05";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma-mobile/21.05/krecorder-21.05.tar.xz";
+      sha256 = "0ydaidxx2616bixihyaagvyym1r5s9rjkgg04vq9k4608d4vnn5c";
+      name = "krecorder-21.05.tar.xz";
+    };
+  };
+  ktrip = {
+    version = "21.05";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma-mobile/21.05/ktrip-21.05.tar.xz";
+      sha256 = "0hxgnncyc2ir6i9p6s9fy1r4mhxgm643pxvp8lj3j5y0c5wk2kp9";
+      name = "ktrip-21.05.tar.xz";
+    };
+  };
+  plasma-dialer = {
+    version = "21.05";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma-mobile/21.05/plasma-dialer-21.05.tar.xz";
+      sha256 = "0kwkjn7ry6snc86qi1j7kcq5qa6rbyk5i7v6gqf7a7wywkk9n045";
+      name = "plasma-dialer-21.05.tar.xz";
+    };
+  };
+  plasma-phonebook = {
+    version = "21.05";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma-mobile/21.05/plasma-phonebook-21.05.tar.xz";
+      sha256 = "0aqqi3gvcsh4zg41zf8y0c626lwrabjchhr8pxj4n9la7y0wdvca";
+      name = "plasma-phonebook-21.05.tar.xz";
+    };
+  };
+  plasma-settings = {
+    version = "21.05";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma-mobile/21.05/plasma-settings-21.05.tar.xz";
+      sha256 = "16bhx0i8gvi9ina4jxzx02xyzypyjic9646lahxvzvzmd9hn9ipi";
+      name = "plasma-settings-21.05.tar.xz";
+    };
+  };
+  qmlkonsole = {
+    version = "21.05";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma-mobile/21.05/qmlkonsole-21.05.tar.xz";
+      sha256 = "1ga48n09zlgvf5vvk2m26ak3ih5gjf361xxnyfprimmd7yj23han";
+      name = "qmlkonsole-21.05.tar.xz";
+    };
+  };
+  spacebar = {
+    version = "21.05";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma-mobile/21.05/spacebar-21.05.tar.xz";
+      sha256 = "16lvi5yzmvk6gb5m7csk44y2jbkk7psn1lkljmj1938p2475b94c";
+      name = "spacebar-21.05.tar.xz";
+    };
+  };
+}

From 3f7fa2eca8cf7e1f807f66bf0bb5ac45fe7c7f80 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Tue, 13 Jul 2021 21:01:22 -0400
Subject: [PATCH 13/24] applications/plasma-mobile: Add empty plasma-mobile
 package set

---
 pkgs/applications/plasma-mobile/default.nix | 66 +++++++++++++++++++++
 1 file changed, 66 insertions(+)
 create mode 100644 pkgs/applications/plasma-mobile/default.nix

diff --git a/pkgs/applications/plasma-mobile/default.nix b/pkgs/applications/plasma-mobile/default.nix
new file mode 100644
index 000000000000..8196c92ef815
--- /dev/null
+++ b/pkgs/applications/plasma-mobile/default.nix
@@ -0,0 +1,66 @@
+/*
+
+# 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
+  minQtVersion = "5.15";
+  broken = lib.versionOlder libsForQt5.qtbase.version minQtVersion;
+
+  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;
+            broken = meta.broken or broken;
+          };
+      });
+
+  packages = self: with self;
+    let
+      callPackage = self.newScope {
+        inherit mkDerivation;
+      };
+    in {
+    };
+
+in lib.makeScope libsForQt5.newScope packages

From 546b930bd8dfdc69502e42c4615a83e75f629be7 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Tue, 13 Jul 2021 21:05:20 -0400
Subject: [PATCH 14/24] qt5-packages.nix: Add plasmaMobileGear

Though it is empty, the package set is valid. Next changes introduce
derivations for packages we maintain.
---
 pkgs/top-level/qt5-packages.nix | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix
index 05235a01d301..a5adec5d78f6 100644
--- a/pkgs/top-level/qt5-packages.nix
+++ b/pkgs/top-level/qt5-packages.nix
@@ -43,9 +43,17 @@ let
     };
   in (lib.makeOverridable mkGear attrs);
 
-in (kdeFrameworks // plasma5 // plasma5.thirdParty // kdeGear // qt5 // {
+  plasmaMobileGear = let
+    mkPlamoGear = import ../applications/plasma-mobile;
+    attrs = {
+      inherit libsForQt5;
+      inherit (pkgs) lib fetchurl;
+    };
+  in (lib.makeOverridable mkPlamoGear attrs);
 
-  inherit kdeFrameworks plasma5 kdeGear qt5;
+in (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGear // qt5 // {
+
+  inherit kdeFrameworks plasmaMobileGear plasma5 kdeGear qt5;
 
   # Alias for backwards compatibility. Added 2021-05-07.
   kdeApplications = kdeGear;

From 094eb89b7eaa513284c4aa33512a42dd49890399 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Tue, 16 Mar 2021 17:48:38 -0400
Subject: [PATCH 15/24] kalk: init at 21.05

---
 pkgs/applications/plasma-mobile/default.nix |  1 +
 pkgs/applications/plasma-mobile/kalk.nix    | 50 +++++++++++++++++++++
 2 files changed, 51 insertions(+)
 create mode 100644 pkgs/applications/plasma-mobile/kalk.nix

diff --git a/pkgs/applications/plasma-mobile/default.nix b/pkgs/applications/plasma-mobile/default.nix
index 8196c92ef815..7c57f1d9a9d6 100644
--- a/pkgs/applications/plasma-mobile/default.nix
+++ b/pkgs/applications/plasma-mobile/default.nix
@@ -61,6 +61,7 @@ let
         inherit mkDerivation;
       };
     in {
+      kalk = callPackage ./kalk.nix {};
     };
 
 in lib.makeScope libsForQt5.newScope packages
diff --git a/pkgs/applications/plasma-mobile/kalk.nix b/pkgs/applications/plasma-mobile/kalk.nix
new file mode 100644
index 000000000000..8d63991fb080
--- /dev/null
+++ b/pkgs/applications/plasma-mobile/kalk.nix
@@ -0,0 +1,50 @@
+{ lib
+, mkDerivation
+
+, cmake
+, extra-cmake-modules
+, bison
+, flex
+
+, gmp
+, mpfr
+
+, kconfig
+, kcoreaddons
+, ki18n
+, kirigami2
+, kunitconversion
+, qtfeedback
+, qtquickcontrols2
+}:
+
+mkDerivation rec {
+  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";
+    homepage = "https://invent.kde.org/plasma-mobile/kalk";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ samueldr ];
+  };
+}

From dcbe5b8d126e9c34aa15f032efecc6c6379e9f5f Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Tue, 16 Mar 2021 18:06:39 -0400
Subject: [PATCH 16/24] kclock: init at 21.05

---
 pkgs/applications/plasma-mobile/default.nix |  1 +
 pkgs/applications/plasma-mobile/kclock.nix  | 44 +++++++++++++++++++++
 2 files changed, 45 insertions(+)
 create mode 100644 pkgs/applications/plasma-mobile/kclock.nix

diff --git a/pkgs/applications/plasma-mobile/default.nix b/pkgs/applications/plasma-mobile/default.nix
index 7c57f1d9a9d6..e6458e0d1efd 100644
--- a/pkgs/applications/plasma-mobile/default.nix
+++ b/pkgs/applications/plasma-mobile/default.nix
@@ -62,6 +62,7 @@ let
       };
     in {
       kalk = callPackage ./kalk.nix {};
+      kclock = callPackage ./kclock.nix {};
     };
 
 in lib.makeScope libsForQt5.newScope packages
diff --git a/pkgs/applications/plasma-mobile/kclock.nix b/pkgs/applications/plasma-mobile/kclock.nix
new file mode 100644
index 000000000000..058f536d7904
--- /dev/null
+++ b/pkgs/applications/plasma-mobile/kclock.nix
@@ -0,0 +1,44 @@
+{ lib
+, mkDerivation
+
+, cmake
+, extra-cmake-modules
+
+, kconfig
+, kcoreaddons
+, kdbusaddons
+, ki18n
+, kirigami2
+, knotifications
+, plasma-framework
+, qtmultimedia
+, qtquickcontrols2
+}:
+
+mkDerivation rec {
+  pname = "kclock";
+
+  nativeBuildInputs = [
+    cmake
+    extra-cmake-modules
+  ];
+
+  buildInputs = [
+    kconfig
+    kcoreaddons
+    kdbusaddons
+    ki18n
+    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 = with maintainers; [ samueldr ];
+  };
+}

From 7d8cb8321cd63cc05e02115169c4279c44f6c372 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Mon, 22 Mar 2021 15:53:12 -0400
Subject: [PATCH 17/24] alligator: init at 21.05

---
 pkgs/applications/plasma-mobile/alligator.nix | 40 +++++++++++++++++++
 pkgs/applications/plasma-mobile/default.nix   |  1 +
 2 files changed, 41 insertions(+)
 create mode 100644 pkgs/applications/plasma-mobile/alligator.nix

diff --git a/pkgs/applications/plasma-mobile/alligator.nix b/pkgs/applications/plasma-mobile/alligator.nix
new file mode 100644
index 000000000000..b88c8e3c60ec
--- /dev/null
+++ b/pkgs/applications/plasma-mobile/alligator.nix
@@ -0,0 +1,40 @@
+{ lib
+, mkDerivation
+
+, cmake
+, extra-cmake-modules
+
+, kconfig
+, kcoreaddons
+, ki18n
+, kirigami2
+, qtquickcontrols2
+, syndication
+}:
+
+mkDerivation rec {
+  pname = "alligator";
+
+  nativeBuildInputs = [
+    cmake
+    extra-cmake-modules
+  ];
+
+  buildInputs = [
+    kconfig
+    kcoreaddons
+    ki18n
+    kirigami2
+    qtquickcontrols2
+    syndication
+  ];
+
+  meta = with lib; {
+    description = "RSS reader made with kirigami";
+    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 = with maintainers; [ samueldr ];
+  };
+}
diff --git a/pkgs/applications/plasma-mobile/default.nix b/pkgs/applications/plasma-mobile/default.nix
index e6458e0d1efd..3155f833571e 100644
--- a/pkgs/applications/plasma-mobile/default.nix
+++ b/pkgs/applications/plasma-mobile/default.nix
@@ -61,6 +61,7 @@ let
         inherit mkDerivation;
       };
     in {
+      alligator = callPackage ./alligator.nix {};
       kalk = callPackage ./kalk.nix {};
       kclock = callPackage ./kclock.nix {};
     };

From d07a0aed114f683f761a503b0859fc4aa838280f Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Mon, 22 Mar 2021 16:03:24 -0400
Subject: [PATCH 18/24] calindori: init at 21.05

---
 pkgs/applications/plasma-mobile/calindori.nix | 46 +++++++++++++++++++
 pkgs/applications/plasma-mobile/default.nix   |  1 +
 2 files changed, 47 insertions(+)
 create mode 100644 pkgs/applications/plasma-mobile/calindori.nix

diff --git a/pkgs/applications/plasma-mobile/calindori.nix b/pkgs/applications/plasma-mobile/calindori.nix
new file mode 100644
index 000000000000..bb10fa7bb10c
--- /dev/null
+++ b/pkgs/applications/plasma-mobile/calindori.nix
@@ -0,0 +1,46 @@
+{ lib
+, mkDerivation
+
+, cmake
+, extra-cmake-modules
+
+, kcalendarcore
+, kconfig
+, kcoreaddons
+, kdbusaddons
+, ki18n
+, kirigami2
+, knotifications
+, kpeople
+, kservice
+, qtquickcontrols2
+}:
+
+mkDerivation rec {
+  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 = with maintainers; [ samueldr ];
+  };
+}
diff --git a/pkgs/applications/plasma-mobile/default.nix b/pkgs/applications/plasma-mobile/default.nix
index 3155f833571e..9fbddca3028c 100644
--- a/pkgs/applications/plasma-mobile/default.nix
+++ b/pkgs/applications/plasma-mobile/default.nix
@@ -62,6 +62,7 @@ let
       };
     in {
       alligator = callPackage ./alligator.nix {};
+      calindori = callPackage ./calindori.nix {};
       kalk = callPackage ./kalk.nix {};
       kclock = callPackage ./kclock.nix {};
     };

From 0acc8547bc10e63cc2950f79473af5dd509def8f Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Mon, 22 Mar 2021 16:09:01 -0400
Subject: [PATCH 19/24] krecorder: init at 21.05

---
 pkgs/applications/plasma-mobile/default.nix   |  1 +
 pkgs/applications/plasma-mobile/krecorder.nix | 36 +++++++++++++++++++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/applications/plasma-mobile/krecorder.nix

diff --git a/pkgs/applications/plasma-mobile/default.nix b/pkgs/applications/plasma-mobile/default.nix
index 9fbddca3028c..125e60b997b9 100644
--- a/pkgs/applications/plasma-mobile/default.nix
+++ b/pkgs/applications/plasma-mobile/default.nix
@@ -65,6 +65,7 @@ let
       calindori = callPackage ./calindori.nix {};
       kalk = callPackage ./kalk.nix {};
       kclock = callPackage ./kclock.nix {};
+      krecorder = callPackage ./krecorder.nix {};
     };
 
 in lib.makeScope libsForQt5.newScope packages
diff --git a/pkgs/applications/plasma-mobile/krecorder.nix b/pkgs/applications/plasma-mobile/krecorder.nix
new file mode 100644
index 000000000000..c41413be8842
--- /dev/null
+++ b/pkgs/applications/plasma-mobile/krecorder.nix
@@ -0,0 +1,36 @@
+{ lib
+, mkDerivation
+
+, cmake
+, extra-cmake-modules
+
+, kconfig
+, ki18n
+, kirigami2
+, qtmultimedia
+, qtquickcontrols2
+}:
+
+mkDerivation rec {
+  pname = "krecorder";
+
+  nativeBuildInputs = [
+    cmake
+    extra-cmake-modules
+  ];
+
+  buildInputs = [
+    kconfig
+    ki18n
+    kirigami2
+    qtmultimedia
+    qtquickcontrols2
+  ];
+
+  meta = with lib; {
+    description = "Audio recorder for Plasma Mobile";
+    homepage = "https://invent.kde.org/plasma-mobile/krecorder";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ samueldr ];
+  };
+}

From 211cba432ae2ab1db0e2ddb85fdc0d353e015707 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Mon, 22 Mar 2021 18:45:47 -0400
Subject: [PATCH 20/24] plasma-dialer: init at 21.05

---
 pkgs/applications/plasma-mobile/default.nix   |  1 +
 .../plasma-mobile/plasma-dialer.nix           | 54 +++++++++++++++++++
 2 files changed, 55 insertions(+)
 create mode 100644 pkgs/applications/plasma-mobile/plasma-dialer.nix

diff --git a/pkgs/applications/plasma-mobile/default.nix b/pkgs/applications/plasma-mobile/default.nix
index 125e60b997b9..eedbb8114c80 100644
--- a/pkgs/applications/plasma-mobile/default.nix
+++ b/pkgs/applications/plasma-mobile/default.nix
@@ -66,6 +66,7 @@ let
       kalk = callPackage ./kalk.nix {};
       kclock = callPackage ./kclock.nix {};
       krecorder = callPackage ./krecorder.nix {};
+      plasma-dialer = callPackage ./plasma-dialer.nix {};
     };
 
 in lib.makeScope libsForQt5.newScope packages
diff --git a/pkgs/applications/plasma-mobile/plasma-dialer.nix b/pkgs/applications/plasma-mobile/plasma-dialer.nix
new file mode 100644
index 000000000000..eb71c497084c
--- /dev/null
+++ b/pkgs/applications/plasma-mobile/plasma-dialer.nix
@@ -0,0 +1,54 @@
+{ lib
+, mkDerivation
+
+, cmake
+, extra-cmake-modules
+
+, kcontacts
+, kcoreaddons
+, kdbusaddons
+, ki18n
+, kirigami2
+, knotifications
+, kpeople
+, libphonenumber
+, libpulseaudio
+, libqofono
+, protobuf
+, pulseaudio-qt
+, qtquickcontrols2
+, telepathy
+}:
+
+mkDerivation rec {
+  pname = "plasma-dialer";
+
+  nativeBuildInputs = [
+    cmake
+    extra-cmake-modules
+  ];
+
+  buildInputs = [
+    kcontacts
+    kcoreaddons
+    kdbusaddons
+    ki18n
+    kirigami2
+    knotifications
+    kpeople
+    libphonenumber
+    libpulseaudio
+    libqofono
+    protobuf # Needed by libphonenumber
+    pulseaudio-qt
+    qtquickcontrols2
+    telepathy
+  ];
+
+  meta = with lib; {
+    description = "Dialer for Plasma Mobile";
+    homepage = "https://invent.kde.org/plasma-mobile/plasma-dialer";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ samueldr ];
+  };
+}

From 907976ea4ee4720c907f275395824029b3c4cc2a Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Mon, 22 Mar 2021 18:52:45 -0400
Subject: [PATCH 21/24] plasma-phonebook: init at 21.05

---
 pkgs/applications/plasma-mobile/default.nix   |  1 +
 .../plasma-mobile/plasma-phonebook.nix        | 41 +++++++++++++++++++
 2 files changed, 42 insertions(+)
 create mode 100644 pkgs/applications/plasma-mobile/plasma-phonebook.nix

diff --git a/pkgs/applications/plasma-mobile/default.nix b/pkgs/applications/plasma-mobile/default.nix
index eedbb8114c80..ee36ead901a4 100644
--- a/pkgs/applications/plasma-mobile/default.nix
+++ b/pkgs/applications/plasma-mobile/default.nix
@@ -67,6 +67,7 @@ let
       kclock = callPackage ./kclock.nix {};
       krecorder = callPackage ./krecorder.nix {};
       plasma-dialer = callPackage ./plasma-dialer.nix {};
+      plasma-phonebook = callPackage ./plasma-phonebook.nix {};
     };
 
 in lib.makeScope libsForQt5.newScope packages
diff --git a/pkgs/applications/plasma-mobile/plasma-phonebook.nix b/pkgs/applications/plasma-mobile/plasma-phonebook.nix
new file mode 100644
index 000000000000..7e465260da8d
--- /dev/null
+++ b/pkgs/applications/plasma-mobile/plasma-phonebook.nix
@@ -0,0 +1,41 @@
+{ lib
+, mkDerivation
+
+, cmake
+, extra-cmake-modules
+
+, kcontacts
+, kcoreaddons
+, kirigami2
+, kirigami-addons
+, kpeople
+, kpeoplevcard
+, qtquickcontrols2
+}:
+
+mkDerivation rec {
+  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";
+    homepage = "https://invent.kde.org/plasma-mobile/plasma-phonebook";
+    # https://invent.kde.org/plasma-mobile/plasma-phonebook/-/commit/3ac27760417e51c051c5dd44155c3f42dd000e4f
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ samueldr ];
+  };
+}

From ea73dda9217b1c3ef4d58a9efc3e728568c0b593 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Wed, 24 Mar 2021 16:37:05 -0400
Subject: [PATCH 22/24] spacebar: init at 21.05

---
 pkgs/applications/plasma-mobile/default.nix  |  1 +
 pkgs/applications/plasma-mobile/spacebar.nix | 40 ++++++++++++++++++++
 2 files changed, 41 insertions(+)
 create mode 100644 pkgs/applications/plasma-mobile/spacebar.nix

diff --git a/pkgs/applications/plasma-mobile/default.nix b/pkgs/applications/plasma-mobile/default.nix
index ee36ead901a4..d5295a8b439b 100644
--- a/pkgs/applications/plasma-mobile/default.nix
+++ b/pkgs/applications/plasma-mobile/default.nix
@@ -68,6 +68,7 @@ let
       krecorder = callPackage ./krecorder.nix {};
       plasma-dialer = callPackage ./plasma-dialer.nix {};
       plasma-phonebook = callPackage ./plasma-phonebook.nix {};
+      spacebar = callPackage ./spacebar.nix {};
     };
 
 in lib.makeScope libsForQt5.newScope packages
diff --git a/pkgs/applications/plasma-mobile/spacebar.nix b/pkgs/applications/plasma-mobile/spacebar.nix
new file mode 100644
index 000000000000..1c661041f7ae
--- /dev/null
+++ b/pkgs/applications/plasma-mobile/spacebar.nix
@@ -0,0 +1,40 @@
+{ lib
+, mkDerivation
+
+, cmake
+, extra-cmake-modules
+
+, kcontacts
+, ki18n
+, kirigami2
+, knotifications
+, kpeople
+, libqofono
+, telepathy
+}:
+
+mkDerivation rec {
+  pname = "spacebar";
+
+  nativeBuildInputs = [
+    cmake
+    extra-cmake-modules
+  ];
+
+  buildInputs = [
+    kcontacts
+    ki18n
+    kirigami2
+    knotifications
+    kpeople
+    libqofono
+    telepathy
+  ];
+
+  meta = with lib; {
+    description = "SMS application for Plasma Mobile";
+    homepage = "https://invent.kde.org/plasma-mobile/spacebar";
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ samueldr ];
+  };
+}

From 25a433d286078c90e59fb5dcba9b91dc627708cc Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Tue, 13 Jul 2021 23:52:07 -0400
Subject: [PATCH 23/24] koko: init at 21.05

requires data that is not versioned:

 - https://invent.kde.org/graphics/koko#packaging

Snapshotted because... Obviously that won't do with Nix.
---
 pkgs/applications/plasma-mobile/default.nix |  1 +
 pkgs/applications/plasma-mobile/koko.nix    | 81 +++++++++++++++++++++
 2 files changed, 82 insertions(+)
 create mode 100644 pkgs/applications/plasma-mobile/koko.nix

diff --git a/pkgs/applications/plasma-mobile/default.nix b/pkgs/applications/plasma-mobile/default.nix
index d5295a8b439b..781ca7298a80 100644
--- a/pkgs/applications/plasma-mobile/default.nix
+++ b/pkgs/applications/plasma-mobile/default.nix
@@ -65,6 +65,7 @@ let
       calindori = callPackage ./calindori.nix {};
       kalk = callPackage ./kalk.nix {};
       kclock = callPackage ./kclock.nix {};
+      koko = callPackage ./koko.nix {};
       krecorder = callPackage ./krecorder.nix {};
       plasma-dialer = callPackage ./plasma-dialer.nix {};
       plasma-phonebook = callPackage ./plasma-phonebook.nix {};
diff --git a/pkgs/applications/plasma-mobile/koko.nix b/pkgs/applications/plasma-mobile/koko.nix
new file mode 100644
index 000000000000..3543a7284bff
--- /dev/null
+++ b/pkgs/applications/plasma-mobile/koko.nix
@@ -0,0 +1,81 @@
+{ 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 rec {
+  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";
+    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 = with maintainers; [ samueldr ];
+  };
+}

From 8a2335829c2718cef61967a79bd142c634d4ec67 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Wed, 14 Jul 2021 00:22:40 -0400
Subject: [PATCH 24/24] ktrip: init at 21.05

---
 pkgs/applications/plasma-mobile/default.nix |  1 +
 pkgs/applications/plasma-mobile/ktrip.nix   | 45 +++++++++++++++++++++
 2 files changed, 46 insertions(+)
 create mode 100644 pkgs/applications/plasma-mobile/ktrip.nix

diff --git a/pkgs/applications/plasma-mobile/default.nix b/pkgs/applications/plasma-mobile/default.nix
index 781ca7298a80..18f550955c57 100644
--- a/pkgs/applications/plasma-mobile/default.nix
+++ b/pkgs/applications/plasma-mobile/default.nix
@@ -67,6 +67,7 @@ let
       kclock = callPackage ./kclock.nix {};
       koko = callPackage ./koko.nix {};
       krecorder = callPackage ./krecorder.nix {};
+      ktrip = callPackage ./ktrip.nix {};
       plasma-dialer = callPackage ./plasma-dialer.nix {};
       plasma-phonebook = callPackage ./plasma-phonebook.nix {};
       spacebar = callPackage ./spacebar.nix {};
diff --git a/pkgs/applications/plasma-mobile/ktrip.nix b/pkgs/applications/plasma-mobile/ktrip.nix
new file mode 100644
index 000000000000..cc1404d064fd
--- /dev/null
+++ b/pkgs/applications/plasma-mobile/ktrip.nix
@@ -0,0 +1,45 @@
+{ lib
+, mkDerivation
+
+, cmake
+, extra-cmake-modules
+
+, kconfig
+, kcontacts
+, kcoreaddons
+, ki18n
+, kirigami-addons
+, kirigami2
+, kitemmodels
+, kpublictransport
+, qtquickcontrols2
+}:
+
+mkDerivation rec {
+  pname = "ktrip";
+
+  nativeBuildInputs = [
+    cmake
+    extra-cmake-modules
+  ];
+
+  buildInputs = [
+    kconfig
+    kcontacts
+    kcoreaddons
+    ki18n
+    kirigami-addons
+    kirigami2
+    kitemmodels
+    kpublictransport
+    qtquickcontrols2
+  ];
+
+  meta = with lib; {
+    description = "Public transport trip planner";
+    homepage = "https://apps.kde.org/ktrip/";
+    # GPL-2.0-or-later
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ samueldr ];
+  };
+}