Merge branch 'master' into staging

pkgs/development/libraries/accelio/default.nix

@@ -47,7 +47,11 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage = http://www.accelio.org/;
-    description = "a high-performance asynchronous reliable messaging and RPC library optimized for hardware acceleration";
+    description = "High-performance messaging and RPC library";
+    longDescription = ''
+      A high-performance asynchronous reliable messaging and RPC library
+      optimized for hardware acceleration.
+    '';
     license = licenses.bsd3;
     platforms = with platforms; linux ++ freebsd;
     maintainers = with maintainers; [ wkennington ];

pkgs/development/libraries/asc-support/default.nix

@@ -1,34 +0,0 @@
-
-{ stdenv
-, fetchurl
-, aterm
-, toolbuslib
-, asfSupport
-, errorSupport
-, ptSupport
-, sglr
-, tideSupport
-, cLibrary
-, configSupport 
-, ptableSupport
-, rstoreSupport
-, pkgconfig
-}:
-let 
-  isMingw = stdenv ? cross && stdenv.cross.config == "i686-pc-mingw32" ;
-in
-stdenv.mkDerivation rec {
-  name = "asc-support-2.6";
-
-  src = fetchurl {
-    url = "http://www.meta-environment.org/releases/${name}.tar.gz";
-    sha256 = "1svq368kdxnmjdfv8sqs0cn9s69c75qcp44mpapfjj6kfhrzkxdc";
-  };
-  
-  patches = if isMingw then [./mingw.patch] else [];
-
-  buildInputs = [aterm toolbuslib asfSupport errorSupport ptSupport sglr tideSupport cLibrary configSupport ptableSupport rstoreSupport ];
-  nativeBuildInputs = [pkgconfig];
-  
-  dontStrip = isMingw;
-}  

pkgs/development/libraries/asc-support/mingw.patch

@@ -1,48 +0,0 @@
-diff -rc asc-support-2.6/lib/asc-main.c asc-support-2.6-new/lib/asc-main.c
-*** asc-support-2.6/lib/asc-main.c	2008-11-10 14:12:47.000000000 +0100
---- asc-support-2.6-new/lib/asc-main.c	2010-08-24 11:02:04.000000000 +0200
-***************
-*** 7,13 ****
-  #include <ctype.h>
-  #include <string.h>
-  #include <sys/time.h>
-- #include <sys/resource.h>
-  #include <unistd.h>
-  #include <aterm2.h>
-  #include <sglrInterface.h>
---- 7,12 ----
-***************
-*** 46,52 ****
-  }
-  
-  static void printStats() {
--   struct rusage usage;
-    FILE *file;
-    char buf[BUFSIZ];
-    int size, resident, shared, trs, lrs, drs, dt;
---- 45,50 ----
-***************
-*** 61,74 ****
-      fprintf(stderr, "could not open %s\n", buf);
-      perror("");
-    }
-!   if (getrusage(RUSAGE_SELF, &usage) == -1) {
-!     perror("rusage");
-!   } else {
-!     fprintf(stderr, "utime       : %ld.%06d sec.\n",
-! 	    (long)usage.ru_utime.tv_sec, (int)usage.ru_utime.tv_usec);
-!     fprintf(stderr, "stime       : %ld.%06d sec.\n",
-! 	    (long)usage.ru_stime.tv_sec, (int)usage.ru_stime.tv_usec);
-!   }
-  }
-  
-  static ATbool toolbusMode(int argc, char* argv[]) {
---- 59,66 ----
-      fprintf(stderr, "could not open %s\n", buf);
-      perror("");
-    }
-!   fprintf(stderr, "utime       : %ld.%06d sec.\n", 0, 0);
-!   fprintf(stderr, "stime       : %ld.%06d sec.\n", 0, 0);
-  }
-  
-  static ATbool toolbusMode(int argc, char* argv[]) {

pkgs/development/libraries/asf-support/default.nix

@@ -1,24 +0,0 @@
-
-{ stdenv
-, fetchurl
-, aterm
-, errorSupport
-, ptSupport
-, pkgconfig
-}:
-let 
-  isMingw = stdenv ? cross && stdenv.cross.config == "i686-pc-mingw32" ;
-in
-stdenv.mkDerivation rec {
-  name = "asf-support-1.8";
-
-  src = fetchurl {
-    url = "http://www.meta-environment.org/releases/${name}.tar.gz";
-    sha256 = "04f7grfadq0si24rs9vlcknlahfa7nb3d6n6pjl1qbxi8m1gwhnc";
-  };
-
-  buildInputs = [aterm errorSupport ptSupport];
-  nativeBuildInputs = [pkgconfig];  
-
-  dontStrip = isMingw;
-} 

pkgs/development/libraries/aterm/2.8.nix

@@ -1,36 +0,0 @@
-{ stdenv, fetchurl }:
-
-let
-  isMingw = stdenv ? cross && stdenv.cross.config == "i686-pc-mingw32" ;
-in
-stdenv.mkDerivation {
-  name = "aterm-2.8";
-
-  src = fetchurl {
-    url = http://www.meta-environment.org/releases/aterm-2.8.tar.gz;
-    sha256 = "1vq4qpmcww3n9v7bklgp7z1yqi9gmk6hcahqjqdzc5ksa089rdms";
-  };
-
-  patches = [
-    # Fix for http://bugzilla.sen.cwi.nl:8080/show_bug.cgi?id=841
-    ./max-long.patch
-  ] ++ ( if isMingw then [./aterm-mingw-asm.patch] else [] );
-
-  # The test programs stress, randgen, fib, and testsafio all fail with
-  # segmentation faults when compiled with GCC 4.8.x, and the code itself many
-  # warnings, complaining "cast from pointer to integer of different size".
-  # This looks really bad. I leave the test suite enabled, because those issue
-  # feel too serious to just ignore.
-  doCheck = true;
-
-  dontStrip = isMingw;
-
-  meta = {
-    homepage = http://www.cwi.nl/htbin/sen1/twiki/bin/view/SEN1/ATerm;
-    license = "LGPL";
-    description = "Library for manipulation of term data structures in C";
-    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
-    maintainers = [ stdenv.lib.maintainers.eelco ];
-    broken = true;
-  };
-}

pkgs/development/libraries/c-library/default.nix

@@ -1,22 +0,0 @@
-{ stdenv
-, fetchurl
-, aterm
-, pkgconfig
-}:
-let 
-  isMingw = stdenv ? cross && stdenv.cross.config == "i686-pc-mingw32" ;
-in
-stdenv.mkDerivation rec {
-  name = "c-library-1.2";
-
-  src = fetchurl {
-    url = "http://www.meta-environment.org/releases/${name}.tar.gz";
-    sha256 = "0rmhag2653nq76n1n49blii9zx0ph58szv1xzw1i551wmw7yrz88";
-  };
-  
-  patches = if isMingw then [./mingw.patch] else [];
-  
-  buildInputs = [aterm];
-  nativeBuildInputs = [pkgconfig];
-  dontStrip = isMingw;
-}  

pkgs/development/libraries/c-library/mingw.patch

@@ -1,114 +0,0 @@
-diff -rc c-library-1.2/statistics/rsrc-usage.c c-library-1.2-new/statistics/rsrc-usage.c
-*** c-library-1.2/statistics/rsrc-usage.c	2008-11-10 14:09:47.000000000 +0100
---- c-library-1.2-new/statistics/rsrc-usage.c	2010-08-24 09:09:13.000000000 +0200
-***************
-*** 2,81 ****
-  
-  #include <unistd.h>
-  #include <stdio.h>
-- #include <sys/time.h>
-- #include <sys/resource.h>
-  #include "rsrc-usage.h"
-  
-  /*static int AT_calcAllocatedSize();*/
-- static struct rusage rsrc_usage;
-- static struct rusage flt_rsrc_usage;
-  
-  void printrusage(struct rusage *rusage) {
--   fprintf(stderr, "maxrss %ld\n", rusage->ru_maxrss);
--   fprintf(stderr, "ixrss %ld\n", rusage->ru_ixrss);
--   fprintf(stderr, "idrss %ld\n", rusage->ru_idrss);
--   fprintf(stderr, "isrss %ld\n", rusage->ru_isrss);
--   fprintf(stderr, "minflt %ld\n", rusage->ru_minflt);
--   fprintf(stderr, "majflt %ld\n", rusage->ru_majflt);
--   fprintf(stderr, "nswap %ld\n", rusage->ru_nswap);
--   fprintf(stderr, "inblock %ld\n", rusage->ru_inblock);
--   fprintf(stderr, "oublock %ld\n", rusage->ru_oublock);
--   fprintf(stderr, "msgsnd %ld\n", rusage->ru_msgsnd);
--   fprintf(stderr, "msgrcv %ld\n", rusage->ru_msgrcv);
--   fprintf(stderr, "nsignals %ld\n", rusage->ru_nsignals);
--   fprintf(stderr, "nvcsw %ld\n", rusage->ru_nvcsw);
--   fprintf(stderr, "nivcsw %ld\n", rusage->ru_nivcsw);
-  }
-  
-  double STATS_Timer(void) {
-!   static double cur = 0;
-!   double prev;
-! 
-!   prev = cur;
-!   if (getrusage(RUSAGE_SELF, &rsrc_usage) == -1) {
-!     perror("getrusage");
-!     return (double)0;
-!   }
-! 
-!   cur  =  (double) (rsrc_usage.ru_utime.tv_sec) +
-!     (double) ((rsrc_usage.ru_utime.tv_usec) * 1.0e-06);
-! 
-!   prev = cur - prev;
-!   return prev > 0 ? prev: 0;
-  }
-  
-  void STATS_PageFlt(long *maj, long *min) {
-!   static long ma, mi, ma_prev, mi_prev;
-! 
-! 
-!   ma_prev = ma;
-!   mi_prev = mi;
-!   getrusage(RUSAGE_SELF, &flt_rsrc_usage);
-! 
-!   /* printrusage(&flt_rsrc_usage); */
-! 
-!   mi = flt_rsrc_usage.ru_minflt - mi_prev;
-!   ma = flt_rsrc_usage.ru_majflt - ma_prev;
-! 
-!   *maj = ma;
-!   *min = mi;
-  }
-  
-  long STATS_Allocated(void) {
-!   static long allocated = 0L;
-!   long tmp;
-! 
-!   tmp = allocated;
-!   /** \todo: AT_calcAllocatedSize() is unreachable. Fix. */
-!   /*allocated = AT_calcAllocatedSize();*/
-! 
-!   return allocated - tmp;
-  }
-  
-  long STATS_ResidentSetSize(void) {
-!   getrusage(RUSAGE_SELF, &rsrc_usage);
-! 
-!   return rsrc_usage.ru_maxrss;
-  }
-  
-  
---- 2,29 ----
-  
-  #include <unistd.h>
-  #include <stdio.h>
-  #include "rsrc-usage.h"
-  
-  /*static int AT_calcAllocatedSize();*/
-  
-  void printrusage(struct rusage *rusage) {
-  }
-  
-  double STATS_Timer(void) {
-!    return 0;
-  }
-  
-  void STATS_PageFlt(long *maj, long *min) {
-!   *maj = 0;
-!   *min = 0;
-  }
-  
-  long STATS_Allocated(void) {
-!   return 0;
-  }
-  
-  long STATS_ResidentSetSize(void) {
-!   return 0;
-  }
-  
-  

pkgs/development/libraries/caelum/default.nix

@@ -1,22 +0,0 @@
-{ stdenv, fetchurl, cmake, pkgconfig, ois, ogre, boost }:
-
-stdenv.mkDerivation rec {
-  name = "caelum-0.6.1";
-
-  src = fetchurl {
-    url = "http://caelum.googlecode.com/files/${name}.tar.gz";
-    sha256 = "1j995q1a88cikqrxdqsrwzm2asid51xbmkl7vn1grfrdadb15303";
-  };
-
-  buildInputs = [ ois ogre boost ];
-  nativeBuildInputs = [ cmake pkgconfig ];
-
-  enableParallelBuilding = true;
-
-  meta = {
-    description = "Add-on for the OGRE, aimed to render atmospheric effects";
-    homepage = http://code.google.com/p/caelum/;
-    license = stdenv.lib.licenses.lgpl21Plus;
-    broken = true;
-  };
-}

pkgs/development/libraries/config-support/default.nix

@@ -1,22 +0,0 @@
-
-{ stdenv
-, fetchurl
-, aterm
-, pkgconfig
-}:
-let 
-  isMingw = stdenv ? cross && stdenv.cross.config == "i686-pc-mingw32" ;
-in
-stdenv.mkDerivation rec {
-  name = "config-support-1.4";
-
-  src = fetchurl {
-    url = "http://www.meta-environment.org/releases/${name}.tar.gz";
-    sha256 = "0klhc7v760aklsy73pwn87snhgalkfxisac8srn8qcd3ljbfdrmi";
-  };
-
-  buildInputs = [aterm];
-  nativeBuildInputs = [pkgconfig];
-
-  dontStrip = isMingw;
-} 

pkgs/development/libraries/cppzmq/default.nix

@@ -1,12 +1,13 @@
-{ stdenv, fetchgit }:
+{ stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "cppzmq-20150926";
+  name = "cppzmq-20151203";
 
-  src = fetchgit {
-    url = "https://github.com/zeromq/cppzmq";
-    rev = "fa2f2c67a79c31d73bfef6862cc8ce12a98dd022";
-    sha256 = "7b46712b5fa7e59cd0ffae190674046c71d5762c064003c125d6cd7a3da19b71";
+  src = fetchFromGitHub {
+    owner = "zeromq";
+    repo = "cppzmq";
+    rev = "7f7c83411d83eafe57ae6ffc2972ad9455ac258e";
+    sha256 = "1h6fl7mgkv98gz0csbp525a4bp1w9nwm059gwmmv1wqc1l741pv7";
   };
 
   installPhase = ''

pkgs/development/libraries/error-support/default.nix

@@ -1,22 +0,0 @@
-{ stdenv
-, fetchurl
-, aterm
-, toolbuslib
-, pkgconfig
-}:
-let 
-  isMingw = stdenv ? cross && stdenv.cross.config == "i686-pc-mingw32" ;
-in
-stdenv.mkDerivation rec {
-  name = "error-support-1.6";
-
-  src = fetchurl {
-    url = "http://www.meta-environment.org/releases/${name}.tar.gz";
-    sha256 = "0sdw3mrh90k76w2pvpdfg7d2cxfxb3s5spbqglkkpvx8bldhlk33";
-  };
-
-  buildInputs = [aterm toolbuslib];
-  nativeBuildInputs = [pkgconfig];
-
-  dontStrip = isMingw;
-} 

pkgs/development/libraries/farbfeld/default.nix

@@ -0,0 +1,23 @@
+{ stdenv, fetchgit, libpng, libjpeg }:
+
+stdenv.mkDerivation rec {
+  name = "farbfeld-${version}";
+  version = "1";
+
+  src = fetchgit {
+    url = "http://git.suckless.org/farbfeld";
+    rev = "refs/tags/${version}";
+    sha256 = "1mgk46lpqqvn4qx37r0jxz2jjsd4nvl6zjl04y4bfyzf4wkkmmln";
+  };
+
+  buildInputs = [ libpng libjpeg ];
+
+  installFlags = "PREFIX=/ DESTDIR=$(out)";
+
+  meta = with stdenv.lib; {
+    description = "Suckless image format with conversion tools";
+    license = licenses.mit;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ pSub ];
+  };
+}

pkgs/development/libraries/goffice/default.nix

@@ -2,11 +2,11 @@
 , libgsf, libxml2, libxslt, cairo, pango, librsvg, libspectre }:
 
 stdenv.mkDerivation rec {
-  name = "goffice-0.10.24";
+  name = "goffice-0.10.26";
 
   src = fetchurl {
     url = "mirror://gnome/sources/goffice/0.10/${name}.tar.xz";
-    sha256 = "cda70eab0b0b0e29c3bea09849bcfca0c2ccc20038ee69e7e14cde664484af5a";
+    sha256 = "2b8dd0a0f84ef4f6bd32bfdae2b68caa0e41631026a74d04c4d2266512a744bb";
   };
 
   nativeBuildInputs = [ pkgconfig intltool ];

pkgs/development/libraries/jemalloc/default.nix

@@ -10,7 +10,11 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage = http://www.canonware.com/jemalloc/index.html;
-    description = "a general purpose malloc(3) implementation that emphasizes fragmentation avoidance and scalable concurrency support";
+    description = "General purpose malloc(3) implementation";
+    longDescription = ''
+      malloc(3)-compatible memory allocator that emphasizes fragmentation
+      avoidance and scalable concurrency support.
+    '';
     license = licenses.bsd2;
     platforms = platforms.all;
     maintainers = with maintainers; [ wkennington ];

pkgs/development/libraries/kde-frameworks-5.17/kpackage/0001-allow-external-paths.patch

@@ -1,25 +0,0 @@
-From a92ac391b4e6ca335bd7fa78f1addd23c9467931 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Wed, 28 Jan 2015 07:15:30 -0600
-Subject: [PATCH 1/2] allow external paths
-
----
- src/kpackage/package.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/kpackage/package.cpp b/src/kpackage/package.cpp
-index 539b21a..977a026 100644
---- a/src/kpackage/package.cpp
-+++ b/src/kpackage/package.cpp
-@@ -789,7 +789,7 @@ PackagePrivate::PackagePrivate()
-     : QSharedData(),
-       fallbackPackage(0),
-       metadata(0),
--      externalPaths(false),
-+      externalPaths(true),
-       valid(false),
-       checkedValid(false)
- {
--- 
-2.5.2
-

pkgs/development/libraries/kde-frameworks-5.17/kpackage/0002-qdiriterator-follow-symlinks.patch

@@ -1,39 +0,0 @@
-From 9fc26c3c0478eb7cb0a531836ba2e3a85d820c88 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Wed, 14 Oct 2015 06:50:28 -0500
-Subject: [PATCH 2/2] qdiriterator follow symlinks
-
----
- src/kpackage/packageloader.cpp            | 2 +-
- src/kpackage/private/packagejobthread.cpp | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/kpackage/packageloader.cpp b/src/kpackage/packageloader.cpp
-index eb5ed47..94217f6 100644
---- a/src/kpackage/packageloader.cpp
-+++ b/src/kpackage/packageloader.cpp
-@@ -241,7 +241,7 @@ QList<KPluginMetaData> PackageLoader::listPackages(const QString &packageFormat,
-         } else {
-             //qDebug() << "Not cached";
-             // If there's no cache file, fall back to listing the directory
--            const QDirIterator::IteratorFlags flags = QDirIterator::Subdirectories;
-+            const QDirIterator::IteratorFlags flags = QDirIterator::Subdirectories | QDirIterator::FollowSymlinks;
-             const QStringList nameFilters = QStringList(QStringLiteral("metadata.desktop"));
- 
-             QDirIterator it(plugindir, nameFilters, QDir::Files, flags);
-diff --git a/src/kpackage/private/packagejobthread.cpp b/src/kpackage/private/packagejobthread.cpp
-index ca523b3..1cfa792 100644
---- a/src/kpackage/private/packagejobthread.cpp
-+++ b/src/kpackage/private/packagejobthread.cpp
-@@ -145,7 +145,7 @@ bool indexDirectory(const QString& dir, const QString& dest)
-     QJsonArray plugins;
- 
-     int i = 0;
--    QDirIterator it(dir, QStringList()<<QStringLiteral("*.desktop"), QDir::Files, QDirIterator::Subdirectories);
-+    QDirIterator it(dir, QStringList()<<QStringLiteral("*.desktop"), QDir::Files, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
-     while (it.hasNext()) {
-         it.next();
-         const QString path = it.fileInfo().absoluteFilePath();
--- 
-2.5.2
-

pkgs/development/libraries/kde-frameworks-5.17/ktexteditor/default.nix

@@ -1,18 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, karchive, kconfig
-, kguiaddons, ki18n, kio, kiconthemes, kparts, perl, qtscript
-, qtxmlpatterns, sonnet
-}:
-
-kdeFramework {
-  name = "ktexteditor";
-  nativeBuildInputs = [ extra-cmake-modules perl ];
-  buildInputs = [
-    karchive kconfig kguiaddons kiconthemes kparts qtscript
-    qtxmlpatterns
-  ];
-  propagatedBuildInputs = [ ki18n kio sonnet ];
-  patches = [ ./0001-no-qcoreapplication.patch ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}

pkgs/development/libraries/kde-frameworks-5.17/srcs.nix

@@ -1,565 +0,0 @@
-# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh
-{ fetchurl, mirror }:
-
-{
-  attica = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/attica-5.17.0.tar.xz";
-      sha256 = "0n5f8754705ga3s158nn56haakajcpx7hms3pjn32jc1n95h06nf";
-      name = "attica-5.17.0.tar.xz";
-    };
-  };
-  baloo = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/baloo-5.17.0.tar.xz";
-      sha256 = "01gkn69i63ppjrswpqw1vdfc590vn4xlld1zmjzprbfs2ryni2k0";
-      name = "baloo-5.17.0.tar.xz";
-    };
-  };
-  bluez-qt = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/bluez-qt-5.17.0.tar.xz";
-      sha256 = "1jh60gs2lqwg1x609lh3lrgqjfg179r40j59wgmzrm5bfvc5zsk5";
-      name = "bluez-qt-5.17.0.tar.xz";
-    };
-  };
-  breeze-icons = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/breeze-icons-5.17.0.tar.xz";
-      sha256 = "120x15mps8gy4c4vzrcwvfcmjv7qka7q92lyqk76g70v6yh29q84";
-      name = "breeze-icons-5.17.0.tar.xz";
-    };
-  };
-  extra-cmake-modules = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/extra-cmake-modules-5.17.0.tar.xz";
-      sha256 = "01blad3rwffsgd21xkkk653kbqv2gvh0ckmvpil9x9fc0w7gwmqs";
-      name = "extra-cmake-modules-5.17.0.tar.xz";
-    };
-  };
-  frameworkintegration = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/frameworkintegration-5.17.0.tar.xz";
-      sha256 = "1f8clq6wszb74qal6402r66izansn9cz1x5j13v8ajwqb7rr8gvl";
-      name = "frameworkintegration-5.17.0.tar.xz";
-    };
-  };
-  kactivities = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/kactivities-5.17.0.tar.xz";
-      sha256 = "0lnx3kbgna9pq1bdzzygng0l7rkwyvr2gkxm5abhbw290dvq0xas";
-      name = "kactivities-5.17.0.tar.xz";
-    };
-  };
-  kapidox = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/kapidox-5.17.0.tar.xz";
-      sha256 = "1cd32n36w8hfggng61m50jflb9lpv4ba74aq1g64c1grbfjad3k1";
-      name = "kapidox-5.17.0.tar.xz";
-    };
-  };
-  karchive = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/karchive-5.17.0.tar.xz";
-      sha256 = "1ry7vwgc1np9pw1b8791lji09n1y6afyifqlv112riifq7ljmld1";
-      name = "karchive-5.17.0.tar.xz";
-    };
-  };
-  kauth = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/kauth-5.17.0.tar.xz";
-      sha256 = "0v7vgh4hmfk3h3083jwx3n11xz22j6vn50naffzwwixqlrqa7qy3";
-      name = "kauth-5.17.0.tar.xz";
-    };
-  };
-  kbookmarks = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/kbookmarks-5.17.0.tar.xz";
-      sha256 = "0rk70ag21lpym9lw4dd9rlq77lfi2v2y076g6000hhrqjnvdbcya";
-      name = "kbookmarks-5.17.0.tar.xz";
-    };
-  };
-  kcmutils = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/kcmutils-5.17.0.tar.xz";
-      sha256 = "176b8ai490ipc1p8zqzi3ymsqzazb7awgnrd81b4fr3fzcm3q8zh";
-      name = "kcmutils-5.17.0.tar.xz";
-    };
-  };
-  kcodecs = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/kcodecs-5.17.0.tar.xz";
-      sha256 = "12nic57sx69zvj9ihw3ifiwnf9giqq57kgp892kcz5q42wjqzvj3";
-      name = "kcodecs-5.17.0.tar.xz";
-    };
-  };
-  kcompletion = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/kcompletion-5.17.0.tar.xz";
-      sha256 = "0d8mx3kr29lp1fk0n8pmmzlzrw9fa3czayn46xdwf1dr2pjj4a2g";
-      name = "kcompletion-5.17.0.tar.xz";
-    };
-  };
-  kconfig = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/kconfig-5.17.0.tar.xz";
-      sha256 = "1kdagw6wisqnfj6iq77r0nkc04cvhj4n454s3w3az0bhk23b4nrj";
-      name = "kconfig-5.17.0.tar.xz";
-    };
-  };
-  kconfigwidgets = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/kconfigwidgets-5.17.0.tar.xz";
-      sha256 = "0fvrk5ap4lr8i2nlphsy3z7kv39h28v33yja2r54pa4207kq4cy2";
-      name = "kconfigwidgets-5.17.0.tar.xz";
-    };
-  };
-  kcoreaddons = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/kcoreaddons-5.17.0.tar.xz";
-      sha256 = "0pd6siicagcjd4vbn30rhrlwy6r3iiyjpl2pim1njr6fvsb0687n";
-      name = "kcoreaddons-5.17.0.tar.xz";
-    };
-  };
-  kcrash = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/kcrash-5.17.0.tar.xz";
-      sha256 = "0v1v4ksfswc3fg7piqiw0fln30vilk5pbqq2wphbwbgn5im91m7d";
-      name = "kcrash-5.17.0.tar.xz";
-    };
-  };
-  kdbusaddons = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/kdbusaddons-5.17.0.tar.xz";
-      sha256 = "1n4k97206v7hdkrd2p8vhy1bnr194zvamw3vpvhfxgq4pr4a96dm";
-      name = "kdbusaddons-5.17.0.tar.xz";
-    };
-  };
-  kdeclarative = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/kdeclarative-5.17.0.tar.xz";
-      sha256 = "12p5dkdww32d5gk71aw7x5xpa3gj1ag60vj17b9v3zmax0a2g84k";
-      name = "kdeclarative-5.17.0.tar.xz";
-    };
-  };
-  kded = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/kded-5.17.0.tar.xz";
-      sha256 = "1sly9dviv0q99045p13xswjr78x2x5fzwj4qad66w6cyv67i0khk";
-      name = "kded-5.17.0.tar.xz";
-    };
-  };
-  kdelibs4support = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/portingAids/kdelibs4support-5.17.0.tar.xz";
-      sha256 = "03i7r60zjd10cam0q0kld0x43a8fn281bgn25fysw7604f92x7rx";
-      name = "kdelibs4support-5.17.0.tar.xz";
-    };
-  };
-  kdesignerplugin = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/kdesignerplugin-5.17.0.tar.xz";
-      sha256 = "0v47sia41gsf9gaf5jgvfgf2wzszfa76abzplqrmlgvrymi1fk1z";
-      name = "kdesignerplugin-5.17.0.tar.xz";
-    };
-  };
-  kdesu = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/kdesu-5.17.0.tar.xz";
-      sha256 = "188k34x4z1s948f3qdy4c5pascdzshrqnbsx0ppnjlgxhv8sx108";
-      name = "kdesu-5.17.0.tar.xz";
-    };
-  };
-  kdewebkit = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/kdewebkit-5.17.0.tar.xz";
-      sha256 = "1p3nanp1i09hpxp9gfvjyqcrfjf7ypxpfhpd381az96pjs35dixc";
-      name = "kdewebkit-5.17.0.tar.xz";
-    };
-  };
-  kdnssd = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/kdnssd-5.17.0.tar.xz";
-      sha256 = "05njhdpmp28c46271laxjy87v6miwzf7xm1886b9q0v47cpin2p1";
-      name = "kdnssd-5.17.0.tar.xz";
-    };
-  };
-  kdoctools = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/kdoctools-5.17.0.tar.xz";
-      sha256 = "0qbzj68rfg9xc3nabhrnaqm9ysgbrdhdgm8ag64ixk6b4x6hjmr8";
-      name = "kdoctools-5.17.0.tar.xz";
-    };
-  };
-  kemoticons = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/kemoticons-5.17.0.tar.xz";
-      sha256 = "0cxzjfsl1ph3nl6ycsgyaz22rb4nc15n2glcgnmrqchh67xxzv13";
-      name = "kemoticons-5.17.0.tar.xz";
-    };
-  };
-  kfilemetadata = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/kfilemetadata-5.17.0.tar.xz";
-      sha256 = "1a6865v1cz31i8a63hhjzp1lw5b78p0r7ypml6syxlblpg2y9mzh";
-      name = "kfilemetadata-5.17.0.tar.xz";
-    };
-  };
-  kglobalaccel = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/kglobalaccel-5.17.0.tar.xz";
-      sha256 = "0dm8xljqgxay98dcqdgvmhcf0fanv3iiw23nk4vyzis6n8nv04hz";
-      name = "kglobalaccel-5.17.0.tar.xz";
-    };
-  };
-  kguiaddons = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/kguiaddons-5.17.0.tar.xz";
-      sha256 = "1r15ll4c27zp78p9i18izxrpmf41hynz16z0fmz8jgcdnxgx0d74";
-      name = "kguiaddons-5.17.0.tar.xz";
-    };
-  };
-  khtml = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/portingAids/khtml-5.17.0.tar.xz";
-      sha256 = "0mz5mb7mh2nxih2avy2ncmchlyzg8pignnl4lbr5cnfc7y79g7i4";
-      name = "khtml-5.17.0.tar.xz";
-    };
-  };
-  ki18n = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/ki18n-5.17.0.tar.xz";
-      sha256 = "07chysr2x579ll6qwxmirmcy5b06wf0578l8xmvgc9q4wk0m0m73";
-      name = "ki18n-5.17.0.tar.xz";
-    };
-  };
-  kiconthemes = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/kiconthemes-5.17.0.tar.xz";
-      sha256 = "1fgwgwmrb0pav30s7wc30src92cvfw6cxqz2q14n5flz7kg1d0k3";
-      name = "kiconthemes-5.17.0.tar.xz";
-    };
-  };
-  kidletime = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/kidletime-5.17.0.tar.xz";
-      sha256 = "06ig3wca3k1kdq0w1pl5syvcgrrshyws6xal7qswr6vsf6jd7n95";
-      name = "kidletime-5.17.0.tar.xz";
-    };
-  };
-  kimageformats = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/kimageformats-5.17.0.tar.xz";
-      sha256 = "0dw007wc50fhgpm1sv8qxs3y8xwwgcz33nd8p7yg8bxqfgjmhzbs";
-      name = "kimageformats-5.17.0.tar.xz";
-    };
-  };
-  kinit = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/kinit-5.17.0.tar.xz";
-      sha256 = "18agcc5z8g0vsk97wh4p09185m5vz52wdsia7rg8f5fb4wkzrn5i";
-      name = "kinit-5.17.0.tar.xz";
-    };
-  };
-  kio = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/kio-5.17.0.tar.xz";
-      sha256 = "1dfh2kbp00kv5b94p4xjimh4fhlwmcgac7wsi1g2pvrbw7gsi48l";
-      name = "kio-5.17.0.tar.xz";
-    };
-  };
-  kitemmodels = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/kitemmodels-5.17.0.tar.xz";
-      sha256 = "19zq1d7ymfzlz3nx4a9hvlfssa7x0rdh8pg8i9rchalals6239ny";
-      name = "kitemmodels-5.17.0.tar.xz";
-    };
-  };
-  kitemviews = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/kitemviews-5.17.0.tar.xz";
-      sha256 = "1k3f1j3sw86jl5y3ak767ldb2fraspldjh6i98926wingqq3y8p3";
-      name = "kitemviews-5.17.0.tar.xz";
-    };
-  };
-  kjobwidgets = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/kjobwidgets-5.17.0.tar.xz";
-      sha256 = "02j7fm0g0dc6grvgjhx269b5p4xil7k8z1m8amkjpc7v3j3vkyrw";
-      name = "kjobwidgets-5.17.0.tar.xz";
-    };
-  };
-  kjs = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/portingAids/kjs-5.17.0.tar.xz";
-      sha256 = "0988qcgiqc4mla3x12mb8xaw0mhy2kmdi94xw634az03mwghljh4";
-      name = "kjs-5.17.0.tar.xz";
-    };
-  };
-  kjsembed = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/portingAids/kjsembed-5.17.0.tar.xz";
-      sha256 = "0am27pdc2pdjisc82iinq68lw8r12a0zb9n6ywa1mlqbrvr5sqgs";
-      name = "kjsembed-5.17.0.tar.xz";
-    };
-  };
-  kmediaplayer = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/portingAids/kmediaplayer-5.17.0.tar.xz";
-      sha256 = "1idzbddyfrf05kbqqm1hcyy53qrnvg9sb0f29rqp33mq36y63rxg";
-      name = "kmediaplayer-5.17.0.tar.xz";
-    };
-  };
-  knewstuff = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/knewstuff-5.17.0.tar.xz";
-      sha256 = "1ljr1syg7810ww0wlqq2p7xdqn9sfz7kkxr8vdw4627gjqr50l5s";
-      name = "knewstuff-5.17.0.tar.xz";
-    };
-  };
-  knotifications = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/knotifications-5.17.0.tar.xz";
-      sha256 = "0k2g0vmlhandp9zihj5sbs06yanmpy06h2pq5d2hn569anvpxr0r";
-      name = "knotifications-5.17.0.tar.xz";
-    };
-  };
-  knotifyconfig = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/knotifyconfig-5.17.0.tar.xz";
-      sha256 = "1lfa23vag5j294ry5c0n59rs04k1mb5yr7vi69al2pw6xmnkbw6n";
-      name = "knotifyconfig-5.17.0.tar.xz";
-    };
-  };
-  kpackage = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/kpackage-5.17.0.tar.xz";
-      sha256 = "03z3hcibzkzymva935gx39bbrl61jw8wnxqxh2f56z7qmm7sj9x7";
-      name = "kpackage-5.17.0.tar.xz";
-    };
-  };
-  kparts = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/kparts-5.17.0.tar.xz";
-      sha256 = "08dh17z5345gmvaacrllpx9zdfayndfxl8ykhzpp3gvx0ssrswwx";
-      name = "kparts-5.17.0.tar.xz";
-    };
-  };
-  kpeople = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/kpeople-5.17.0.tar.xz";
-      sha256 = "0d7j2j92r2iwkabnqm6f6wm5d4j69r4z1859pc9l4rhh4f0qy9g3";
-      name = "kpeople-5.17.0.tar.xz";
-    };
-  };
-  kplotting = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/kplotting-5.17.0.tar.xz";
-      sha256 = "0i8gcvf2fiaxxqjan1lil9is8v5bfd4yi9zyl7bzijcishckrkmx";
-      name = "kplotting-5.17.0.tar.xz";
-    };
-  };
-  kpty = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/kpty-5.17.0.tar.xz";
-      sha256 = "1csgwp9y33sfgzn4mwinqznfmsd2cm1iia6qm0xpmf8n39rassxc";
-      name = "kpty-5.17.0.tar.xz";
-    };
-  };
-  kross = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/portingAids/kross-5.17.0.tar.xz";
-      sha256 = "0bjkp8ibaw1zr71dbfz09qbaragmzh3slyp8mm6ypaixgfvprklx";
-      name = "kross-5.17.0.tar.xz";
-    };
-  };
-  krunner = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/portingAids/krunner-5.17.0.tar.xz";
-      sha256 = "0ghxbmkpi20kbrsn6kib3na3gdnsn5akfzazfwh8q00dhabhin4k";
-      name = "krunner-5.17.0.tar.xz";
-    };
-  };
-  kservice = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/kservice-5.17.0.tar.xz";
-      sha256 = "0nz46n6yj3h6ml0gvn2j7malvxn4p96q9xh9f2i7j1jwl3c5j4b8";
-      name = "kservice-5.17.0.tar.xz";
-    };
-  };
-  ktexteditor = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/ktexteditor-5.17.0.tar.xz";
-      sha256 = "16shf6zq019pmg8avnlvn4l5w71h4y6v3511rckn8kqdrz3wb4pr";
-      name = "ktexteditor-5.17.0.tar.xz";
-    };
-  };
-  ktextwidgets = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/ktextwidgets-5.17.0.tar.xz";
-      sha256 = "1940a2s084hwf359rr3vrlzdz09iyn3nlpch24wgff728i28mc73";
-      name = "ktextwidgets-5.17.0.tar.xz";
-    };
-  };
-  kunitconversion = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/kunitconversion-5.17.0.tar.xz";
-      sha256 = "0yc3k0d91m5ql75azabqqsihy3hai3x0hzwby8wwm5by20mq1bjf";
-      name = "kunitconversion-5.17.0.tar.xz";
-    };
-  };
-  kwallet = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/kwallet-5.17.0.tar.xz";
-      sha256 = "0552cd4m6nf439vrbwljxmb030h1ndmldvnl4p5r0g8h8jd12siv";
-      name = "kwallet-5.17.0.tar.xz";
-    };
-  };
-  kwidgetsaddons = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/kwidgetsaddons-5.17.0.tar.xz";
-      sha256 = "151jywz4z375kgx362i39gf5xb7fdayz9kly738vzwx4vx253xvn";
-      name = "kwidgetsaddons-5.17.0.tar.xz";
-    };
-  };
-  kwindowsystem = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/kwindowsystem-5.17.0.tar.xz";
-      sha256 = "180b567ixiv487fdw2hp0jgs7cckm8f82y0mny5zvi25l39gjq54";
-      name = "kwindowsystem-5.17.0.tar.xz";
-    };
-  };
-  kxmlgui = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/kxmlgui-5.17.0.tar.xz";
-      sha256 = "0rbxk9f918wmq1ijxcpjf6rl31p1f0f85f8rjk5aln3gh65b1zdn";
-      name = "kxmlgui-5.17.0.tar.xz";
-    };
-  };
-  kxmlrpcclient = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/kxmlrpcclient-5.17.0.tar.xz";
-      sha256 = "1zj7c6b72cnnkds73938xyy87padbv0ah3jfqxdfb1yd5zxba7cs";
-      name = "kxmlrpcclient-5.17.0.tar.xz";
-    };
-  };
-  modemmanager-qt = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/modemmanager-qt-5.17.0.tar.xz";
-      sha256 = "1q3abgr527lcrzy40anm3sjy9j8ycga4g1gkqz201lwa1wp22zr3";
-      name = "modemmanager-qt-5.17.0.tar.xz";
-    };
-  };
-  networkmanager-qt = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/networkmanager-qt-5.17.0.tar.xz";
-      sha256 = "08aafz3y2lnnl5dmzj4s1nfjwhy3mda20pkxjyw1vk8l3s8nhs1l";
-      name = "networkmanager-qt-5.17.0.tar.xz";
-    };
-  };
-  oxygen-icons5 = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/oxygen-icons5-5.17.0.tar.xz";
-      sha256 = "18m5hfz4zappnz45f230sgjbl52fsjxli6d5dvm6998bhcyvv1y9";
-      name = "oxygen-icons5-5.17.0.tar.xz";
-    };
-  };
-  plasma-framework = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/plasma-framework-5.17.0.tar.xz";
-      sha256 = "0pi91pg9h0s4xziw9m8mc65b8ryhgjnv14zalmbwyr63qn7bkfjh";
-      name = "plasma-framework-5.17.0.tar.xz";
-    };
-  };
-  solid = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/solid-5.17.0.tar.xz";
-      sha256 = "1igdqk5cgrxq4is55zdskkc0kbcyp9vjfdrvr9xxhs0lxgizccx3";
-      name = "solid-5.17.0.tar.xz";
-    };
-  };
-  sonnet = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/sonnet-5.17.0.tar.xz";
-      sha256 = "0f7bzdcknc7kc4133q0c3zc1j78yf29kh8i7c0qg01zv1iafbbsv";
-      name = "sonnet-5.17.0.tar.xz";
-    };
-  };
-  threadweaver = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/threadweaver-5.17.0.tar.xz";
-      sha256 = "1cf7qrzw4saai0z6l7bzhfc8clhngcgxla5zbpj28l6130lha8sw";
-      name = "threadweaver-5.17.0.tar.xz";
-    };
-  };
-}

pkgs/development/libraries/kde-frameworks-5.18/default.nix

@@ -74,7 +74,7 @@ let
     kidletime = callPackage ./kidletime.nix {};
     kimageformats = callPackage ./kimageformats.nix {};
     kinit = callPackage ./kinit {};
-    kio = callPackage ./kio.nix {};
+    kio = callPackage ./kio {};
     kitemmodels = callPackage ./kitemmodels.nix {};
     kitemviews = callPackage ./kitemviews.nix {};
     kjobwidgets = callPackage ./kjobwidgets.nix {};

pkgs/development/libraries/kde-frameworks-5.18/fetchsrcs.sh

@@ -4,7 +4,7 @@
 set -x
 
 # The trailing slash at the end is necessary!
-RELEASE_URL="http://download.kde.org/stable/frameworks/5.17/"
+RELEASE_URL="http://download.kde.org/stable/frameworks/5.18/"
 EXTRA_WGET_ARGS='-A *.tar.xz'
 
 mkdir tmp; cd tmp

pkgs/development/libraries/kde-frameworks-5.18/kdelibs4support.nix

@@ -1,6 +1,6 @@
 { kdeFramework, lib, extra-cmake-modules, docbook_xml_dtd_45, kauth
 , karchive, kcompletion, kconfig, kconfigwidgets, kcoreaddons
-, kcrash, kdbusaddons, kdesignerplugin, kdoctools, kemoticons
+, kcrash, kdbusaddons, kded, kdesignerplugin, kdoctools, kemoticons
 , kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kitemmodels
 , kinit, knotifications, kparts, kservice, ktextwidgets
 , kunitconversion, kwidgetsaddons, kwindowsystem, kxmlgui
@@ -13,7 +13,7 @@ kdeFramework {
   name = "kdelibs4support";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [
-    kcompletion kconfig kservice kwidgetsaddons
+    kcompletion kconfig kded kservice kwidgetsaddons
     kxmlgui networkmanager qtsvg qtx11extras xlibs.libSM
   ];
   propagatedBuildInputs = [

pkgs/development/libraries/kde-frameworks-5.18/kio/default.nix

@@ -1,4 +1,5 @@
-{ kdeFramework, lib, extra-cmake-modules, acl, karchive
+{ kdeFramework, lib, copyPathsToStore
+, extra-cmake-modules, acl, karchive
 , kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons
 , kdbusaddons, kdoctools, ki18n, kiconthemes, kitemviews
 , kjobwidgets, knotifications, kservice, ktextwidgets, kwallet
@@ -8,6 +9,7 @@
 
 kdeFramework {
   name = "kio";
+  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
   nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
   buildInputs = [
     acl karchive kconfig kcoreaddons kdbusaddons kiconthemes

pkgs/development/libraries/kde-frameworks-5.18/kio/samba-search-path.patch

@@ -0,0 +1,28 @@
+Index: kio-5.17.0/src/core/ksambashare.cpp
+===================================================================
+--- kio-5.17.0.orig/src/core/ksambashare.cpp
++++ kio-5.17.0/src/core/ksambashare.cpp
+@@ -67,13 +67,18 @@ KSambaSharePrivate::~KSambaSharePrivate(
+ 
+ bool KSambaSharePrivate::isSambaInstalled()
+ {
+-    if (QFile::exists(QStringLiteral("/usr/sbin/smbd"))
+-            || QFile::exists(QStringLiteral("/usr/local/sbin/smbd"))) {
+-        return true;
++    const QByteArray pathEnv = qgetenv("PATH");
++    if (!pathEnv.isEmpty()) {
++        QLatin1Char pathSep(':');
++        QStringList paths = QFile::decodeName(pathEnv).split(pathSep, QString::SkipEmptyParts);
++        for (QStringList::iterator it = paths.begin(); it != paths.end(); ++it) {
++            it->append("/smbd");
++            if (QFile::exists(*it)) {
++                return true;
++            }
++        }
+     }
+ 
+-    //qDebug() << "Samba is not installed!";
+-
+     return false;
+ }
+ 

pkgs/development/libraries/kde-frameworks-5.18/kio/series

@@ -0,0 +1 @@
+samba-search-path.patch

pkgs/development/libraries/kde-frameworks-5.18/kpackage/allow-external-paths.patch

@@ -0,0 +1,13 @@
+Index: kpackage-5.18.0/src/kpackage/package.cpp
+===================================================================
+--- kpackage-5.18.0.orig/src/kpackage/package.cpp
++++ kpackage-5.18.0/src/kpackage/package.cpp
+@@ -808,7 +808,7 @@ PackagePrivate::PackagePrivate()
+     : QSharedData(),
+       fallbackPackage(0),
+       metadata(0),
+-      externalPaths(false),
++      externalPaths(true),
+       valid(false),
+       checkedValid(false)
+ {

pkgs/development/libraries/kde-frameworks-5.18/kpackage/default.nix

@@ -1,4 +1,4 @@
-{ kdeFramework, lib
+{ kdeFramework, lib, copyPathsToStore
 , extra-cmake-modules
 , karchive
 , kconfig
@@ -13,10 +13,7 @@ kdeFramework {
   nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
   buildInputs = [ karchive kconfig ];
   propagatedBuildInputs = [ kcoreaddons ki18n ];
-  patches = [
-    ./0001-allow-external-paths.patch
-    ./0002-qdiriterator-follow-symlinks.patch
-  ];
+  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
   postInstall = ''
     wrapQtProgram "$out/bin/kpackagetool5"
   '';

pkgs/development/libraries/kde-frameworks-5.18/kpackage/qdiriterator-follow-symlinks.patch

@@ -0,0 +1,26 @@
+Index: kpackage-5.18.0/src/kpackage/packageloader.cpp
+===================================================================
+--- kpackage-5.18.0.orig/src/kpackage/packageloader.cpp
++++ kpackage-5.18.0/src/kpackage/packageloader.cpp
+@@ -241,7 +241,7 @@ QList<KPluginMetaData> PackageLoader::li
+         } else {
+             //qDebug() << "Not cached";
+             // If there's no cache file, fall back to listing the directory
+-            const QDirIterator::IteratorFlags flags = QDirIterator::Subdirectories;
++            const QDirIterator::IteratorFlags flags = QDirIterator::Subdirectories | QDirIterator::FollowSymlinks;
+             const QStringList nameFilters = QStringList(QStringLiteral("metadata.desktop")) << QStringLiteral("metadata.json");
+ 
+             QDirIterator it(plugindir, nameFilters, QDir::Files, flags);
+Index: kpackage-5.18.0/src/kpackage/private/packagejobthread.cpp
+===================================================================
+--- kpackage-5.18.0.orig/src/kpackage/private/packagejobthread.cpp
++++ kpackage-5.18.0/src/kpackage/private/packagejobthread.cpp
+@@ -146,7 +146,7 @@ bool indexDirectory(const QString& dir,
+ 
+     QJsonArray plugins;
+ 
+-    QDirIterator it(dir, *metaDataFiles, QDir::Files, QDirIterator::Subdirectories);
++    QDirIterator it(dir, *metaDataFiles, QDir::Files, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
+     while (it.hasNext()) {
+         it.next();
+         const QString path = it.fileInfo().absoluteFilePath();

pkgs/development/libraries/kde-frameworks-5.18/kpackage/series

@@ -0,0 +1,2 @@
+allow-external-paths.patch
+qdiriterator-follow-symlinks.patch

pkgs/development/libraries/kde-frameworks-5.18/ktexteditor/default.nix

@@ -0,0 +1,22 @@
+{ kdeFramework, lib, copyPathsToStore
+, extra-cmake-modules, makeQtWrapper, perl
+, karchive, kconfig, kguiaddons, kiconthemes, kparts
+, libgit2
+, qtscript, qtxmlpatterns
+, ki18n, kio, sonnet
+}:
+
+kdeFramework {
+  name = "ktexteditor";
+  nativeBuildInputs = [ extra-cmake-modules makeQtWrapper perl ];
+  buildInputs = [
+    karchive kconfig kguiaddons kiconthemes kparts
+    libgit2
+    qtscript qtxmlpatterns
+  ];
+  propagatedBuildInputs = [ ki18n kio sonnet ];
+  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}

pkgs/development/libraries/kde-frameworks-5.18/ktexteditor/no-qcoreapplication.patch

@@ -1,17 +1,8 @@
-From dc50fffdc72b76498384ce2f9065c3757b786d71 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Wed, 14 Oct 2015 09:08:59 -0500
-Subject: [PATCH] no qcoreapplication
-
----
- src/syntax/data/katehighlightingindexer.cpp | 11 ++++-------
- 1 file changed, 4 insertions(+), 7 deletions(-)
-
-diff --git a/src/syntax/data/katehighlightingindexer.cpp b/src/syntax/data/katehighlightingindexer.cpp
-index 3c63140..e3d5efe 100644
---- a/src/syntax/data/katehighlightingindexer.cpp
-+++ b/src/syntax/data/katehighlightingindexer.cpp
-@@ -51,19 +51,16 @@ QStringList readListing(const QString &fileName)
+Index: ktexteditor-5.18.0/src/syntax/data/katehighlightingindexer.cpp
+===================================================================
+--- ktexteditor-5.18.0.orig/src/syntax/data/katehighlightingindexer.cpp
++++ ktexteditor-5.18.0/src/syntax/data/katehighlightingindexer.cpp
+@@ -55,19 +55,16 @@ QStringList readListing(const QString &f
  
  int main(int argc, char *argv[])
  {
@@ -34,7 +25,7 @@ index 3c63140..e3d5efe 100644
      if (hlFilenamesListing.isEmpty()) {
          return 1;
      }
-@@ -147,7 +144,7 @@ int main(int argc, char *argv[])
+@@ -152,7 +149,7 @@ int main(int argc, char *argv[])
          return anyError;
  
      // create outfile, after all has worked!
@@ -43,6 +34,3 @@ index 3c63140..e3d5efe 100644
      if (!outFile.open(QIODevice::WriteOnly | QIODevice::Truncate))
          return 7;
  
--- 
-2.5.2
-

pkgs/development/libraries/kde-frameworks-5.18/ktexteditor/series

@@ -0,0 +1 @@
+no-qcoreapplication.patch