From 58f53dc4d4b8b87172956e3658d24f158f9abaa4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <git@kchr.de>
Date: Sat, 21 Apr 2018 14:40:10 +0200
Subject: [PATCH] okteta: Move into own package

Okteta was removed from kde applications and will now be released
independently. So, we currently use the released version from 17.12.3.
---
 .../{kde/okteta.nix => editors/okteta/default.nix}   | 12 +++++++++---
 pkgs/top-level/all-packages.nix                      |  4 +++-
 2 files changed, 12 insertions(+), 4 deletions(-)
 rename pkgs/applications/{kde/okteta.nix => editors/okteta/default.nix} (58%)

diff --git a/pkgs/applications/kde/okteta.nix b/pkgs/applications/editors/okteta/default.nix
similarity index 58%
rename from pkgs/applications/kde/okteta.nix
rename to pkgs/applications/editors/okteta/default.nix
index 0ac8ddebc75d..770eb63dc69e 100644
--- a/pkgs/applications/kde/okteta.nix
+++ b/pkgs/applications/editors/okteta/default.nix
@@ -1,16 +1,22 @@
 {
-  mkDerivation, lib,
+  mkDerivation, lib, fetchurl,
   extra-cmake-modules, kdoctools,
   qtscript, kconfig, kinit, karchive, kcrash,
   kcmutils, kconfigwidgets, knewstuff, kparts, qca-qt5,
   shared-mime-info
 }:
 
-mkDerivation {
+let
+  version = "17.12.3";
+in mkDerivation rec {
   name = "okteta";
+  src = fetchurl {
+    url    = "mirror://kde/stable/applications/${version}/src/${name}-${version}.tar.xz";
+    sha256 = "03wsv83l1cay2dpcsksad124wzan7kh8zxdw1h0yicn398kdbck4";
+  };
   meta = {
     license = with lib.licenses; [ gpl2 ];
-    maintainers = with lib.maintainers; [ peterhoeg ];
+    maintainers = with lib.maintainers; [ peterhoeg bkchr ];
   };
   nativeBuildInputs = [ qtscript extra-cmake-modules kdoctools ];
   buildInputs = [ shared-mime-info ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 78b8cff8215c..a82de21279b6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16419,7 +16419,9 @@ with pkgs;
     akonadi akregator ark dolphin ffmpegthumbs filelight gwenview k3b
     kaddressbook kate kcachegrind kcalc kcolorchooser kcontacts kdenlive kdf kdialog keditbookmarks
     kget kgpg khelpcenter kig kleopatra kmail kmix kolourpaint kompare konsole
-    kontact korganizer krdc krfb ksystemlog kwalletmanager marble minuet okteta okular spectacle;
+    kontact korganizer krdc krfb ksystemlog kwalletmanager marble minuet okular spectacle;
+
+  okteta = libsForQt5.callPackage ../applications/editors/okteta { };
 
   kdeconnect = libsForQt5.callPackage ../applications/misc/kdeconnect { };