From c0f50f3179366199e770f84066eb5b55ab669069 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 2 Oct 2015 12:48:51 -0700 Subject: zeroc_ice: 3.6.0 -> 3.6.1 --- pkgs/development/libraries/zeroc-ice/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/zeroc-ice/default.nix b/pkgs/development/libraries/zeroc-ice/default.nix index d89fae5c964..144af122d73 100644 --- a/pkgs/development/libraries/zeroc-ice/default.nix +++ b/pkgs/development/libraries/zeroc-ice/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "zeroc-ice-${version}"; - version = "3.6.0"; + version = "3.6.1"; src = fetchFromGitHub { owner = "zeroc-ice"; repo = "ice"; rev = "v${version}"; - sha256 = "192lhynf369bbrvbb9nldc49n09kyxp8vg8j9d7w5h2c1yxpjgjq"; + sha256 = "044511zbhwiach1867r3xjz8i4931wn7c1l3nz4kcpgks16kqhhz"; }; buildInputs = [ mcpp bzip2 expat openssl db5 ]; -- cgit 1.4.1 From 3e5dbb7b782004702b9b3d091a692fd1ef2eb857 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sat, 3 Oct 2015 12:56:11 +0200 Subject: neon: Re-add version 0.29.6 --- pkgs/development/libraries/neon/0.29.nix | 44 ++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 ++++ 2 files changed, 49 insertions(+) create mode 100644 pkgs/development/libraries/neon/0.29.nix (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/neon/0.29.nix b/pkgs/development/libraries/neon/0.29.nix new file mode 100644 index 00000000000..1be9f453bb4 --- /dev/null +++ b/pkgs/development/libraries/neon/0.29.nix @@ -0,0 +1,44 @@ +{ stdenv, fetchurl, libxml2, pkgconfig +, compressionSupport ? true, zlib ? null +, sslSupport ? true, openssl ? null +, static ? false +, shared ? true +}: + +assert compressionSupport -> zlib != null; +assert sslSupport -> openssl != null; +assert static || shared; + +let + inherit (stdenv.lib) optionals; +in + +stdenv.mkDerivation rec { + version = "0.29.6"; + name = "neon-${version}"; + + src = fetchurl { + url = "http://www.webdav.org/neon/${name}.tar.gz"; + sha256 = "0hzbjqdx1z8zw0vmbknf159wjsxbcq8ii0wgwkqhxj3dimr0nr4w"; + }; + + patches = optionals stdenv.isDarwin [ ./0.29.6-darwin-fix-configure.patch ]; + + buildInputs = [libxml2 pkgconfig openssl] + ++ stdenv.lib.optional compressionSupport zlib; + + configureFlags = '' + ${if shared then "--enable-shared" else "--disable-shared"} + ${if static then "--enable-static" else "--disable-static"} + ${if compressionSupport then "--with-zlib" else "--without-zlib"} + ${if sslSupport then "--with-ssl" else "--without-ssl"} + --enable-shared + ''; + + passthru = {inherit compressionSupport sslSupport;}; + + meta = { + description = "An HTTP and WebDAV client library"; + homepage = http://www.webdav.org/neon/; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9d77849bbb7..05c6737139a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7658,6 +7658,11 @@ let sslSupport = true; }; + neon_0_29 = callPackage ../development/libraries/neon/0.29.nix { + compressionSupport = true; + sslSupport = true; + }; + nethack = callPackage ../games/nethack { }; nettle = callPackage ../development/libraries/nettle { }; -- cgit 1.4.1 From bff59c5f00f6cde0cd00bedf5cc8cd95e23153aa Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Fri, 2 Oct 2015 15:59:06 +0200 Subject: jquery: 1.11.2 -> 1.11.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [Bjørn: add 2nd hash (for the "uncompressed" download)] --- pkgs/development/libraries/javascript/jquery/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/javascript/jquery/default.nix b/pkgs/development/libraries/javascript/jquery/default.nix index 3491b2b3970..103721cadc3 100644 --- a/pkgs/development/libraries/javascript/jquery/default.nix +++ b/pkgs/development/libraries/javascript/jquery/default.nix @@ -3,17 +3,17 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "jquery-1.11.2"; + name = "jquery-1.11.3"; src = if compressed then fetchurl { url = "http://code.jquery.com/${name}.min.js"; - sha256 = "1h09zz6cjm66g30wa7c41by1jswx9gjpgqgbxln0dv2v55fjkk9f"; + sha256 = "1f4glgxxn3jnvry3dpzmazj3207baacnap5w20gr2xlk789idfgc"; } else fetchurl { url = "http://code.jquery.com/${name}.js"; - sha256 = "098gnzndmmjygpsfywxgmb0vi42b882pwpby77gqkrd2nwsp1hjq"; + sha256 = "1v956yf5spw0156rni5z77hzqwmby7ajwdcd6mkhb6zvl36awr90"; }; unpackPhase = "true"; -- cgit 1.4.1 From f91c5bcc7a1e171ea19c55cdf45bb3de9bcaf396 Mon Sep 17 00:00:00 2001 From: Bjørn Forsman Date: Sun, 4 Oct 2015 17:57:42 +0200 Subject: jquery-ui: 1.11.1 -> 1.11.4 --- pkgs/development/libraries/javascript/jquery-ui/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/javascript/jquery-ui/default.nix b/pkgs/development/libraries/javascript/jquery-ui/default.nix index fd7f5367c8e..e65107a3c2f 100644 --- a/pkgs/development/libraries/javascript/jquery-ui/default.nix +++ b/pkgs/development/libraries/javascript/jquery-ui/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { - name = "jquery-ui-1.11.1"; + name = "jquery-ui-1.11.4"; src = fetchurl { url = "http://jqueryui.com/resources/download/${name}.zip"; - sha256 = "05dlcfwklymx94fb4n88l5syf80l6zrs862zzmla477vd8ndk537"; + sha256 = "0ciyaj1acg08g8hpzqx6whayq206fvf4whksz2pjgxlv207lqgjh"; }; buildInputs = [ unzip ]; -- cgit 1.4.1 From c9043e0c55cb39ea476939776f9ed863c5512def Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Fri, 2 Oct 2015 11:08:04 +0200 Subject: libnetfilter_conntrack: fix hash The version was bumped but the hash wasn't updated. --- pkgs/development/libraries/libnetfilter_conntrack/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/libnetfilter_conntrack/default.nix b/pkgs/development/libraries/libnetfilter_conntrack/default.nix index 874d9000712..72aaa1593cc 100644 --- a/pkgs/development/libraries/libnetfilter_conntrack/default.nix +++ b/pkgs/development/libraries/libnetfilter_conntrack/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://netfilter.org/projects/libnetfilter_conntrack/files/${name}.tar.bz2"; - sha256 = "0zcwjav1qgr7ikmvfmy7g3nc7s1kj4j4939d18mpyha9mwy4mv6r"; + sha256 = "0fnpja3g8s38cp7ipija5pvhfgna1gybn0z2bl276nk08fppv7gw"; }; buildInputs = [ libmnl ]; -- cgit 1.4.1 From a3e7a84d36e52e37f1aeeee6f561c4a3992a76fa Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 5 Oct 2015 11:05:56 -0700 Subject: libev: 4.19 -> 4.20 Tested using stdenv and clangStdenv --- pkgs/development/libraries/libev/default.nix | 11 +++-------- pkgs/development/libraries/libev/noreturn.patch | 13 ------------- 2 files changed, 3 insertions(+), 21 deletions(-) delete mode 100644 pkgs/development/libraries/libev/noreturn.patch (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/libev/default.nix b/pkgs/development/libraries/libev/default.nix index d27df16eb94..0472aeef694 100644 --- a/pkgs/development/libraries/libev/default.nix +++ b/pkgs/development/libraries/libev/default.nix @@ -2,18 +2,13 @@ stdenv.mkDerivation rec { name = "libev-${version}"; - version="4.19"; + version="4.20"; + src = fetchurl { url = "http://dist.schmorp.de/libev/Attic/${name}.tar.gz"; - sha256 = "1jyw7qbl0spxqa0dccj9x1jsw7cj7szff43cq4acmklnra4mzz48"; + sha256 = "17j47pbkr65a18mfvy2861p5k7w4pxmdgiw723ryfqd9gx636w7q"; }; - patches = [ ./noreturn.patch ]; - - # Version 4.19 is not valid C11 (which Clang default to) - # Check if this is still necessary on upgrade - NIX_CFLAGS_COMPILE = if stdenv.cc.isClang then "-std=c99" else null; - meta = { description = "A high-performance event loop/event model with lots of features"; maintainers = [ stdenv.lib.maintainers.raskin ]; diff --git a/pkgs/development/libraries/libev/noreturn.patch b/pkgs/development/libraries/libev/noreturn.patch deleted file mode 100644 index 85e2eaee6b4..00000000000 --- a/pkgs/development/libraries/libev/noreturn.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/ev.c b/ev.c -index 6f36c6d..b8a1c5f 100644 ---- a/ev.c -+++ b/ev.c -@@ -1026,7 +1026,7 @@ ecb_inline uint64_t ecb_rotr64 (uint64_t x, unsigned int count) { return (x << ( - #define ecb_unreachable() __builtin_unreachable () - #else - /* this seems to work fine, but gcc always emits a warning for it :/ */ -- ecb_inline void ecb_unreachable (void) ecb_noreturn; -+ ecb_inline ecb_noreturn void ecb_unreachable (void); - ecb_inline void ecb_unreachable (void) { } - #endif - -- cgit 1.4.1 From 004448ca47c05dd8dfdb4687f53f1674c90f5010 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 2 Oct 2015 08:45:56 -0500 Subject: kf514: init at 5.14 --- .../libraries/kde-frameworks-5.13/attica.nix | 11 - .../libraries/kde-frameworks-5.13/baloo.nix | 49 -- .../libraries/kde-frameworks-5.13/bluez-qt.nix | 17 - .../libraries/kde-frameworks-5.13/default.nix | 112 ----- .../0001-extra-cmake-modules-paths.patch | 74 --- .../extra-cmake-modules/default.nix | 17 - .../extra-cmake-modules/setup-hook.sh | 4 - .../libraries/kde-frameworks-5.13/fetchsrcs.sh | 47 -- .../kde-frameworks-5.13/frameworkintegration.nix | 34 -- .../libraries/kde-frameworks-5.13/kactivities.nix | 42 -- .../libraries/kde-frameworks-5.13/kapidox.nix | 12 - .../libraries/kde-frameworks-5.13/karchive.nix | 11 - .../kde-frameworks-5.13/kauth/default.nix | 16 - .../kauth/kauth-policy-install.patch | 13 - .../libraries/kde-frameworks-5.13/kbookmarks.nix | 25 - .../kde-frameworks-5.13/kcmutils/default.nix | 31 -- .../kcmutils-pluginselector-follow-symlinks.patch | 13 - .../libraries/kde-frameworks-5.13/kcodecs.nix | 11 - .../libraries/kde-frameworks-5.13/kcompletion.nix | 14 - .../libraries/kde-frameworks-5.13/kconfig.nix | 15 - .../kde-frameworks-5.13/kconfigwidgets/default.nix | 24 - ...kconfigwidgets-helpclient-follow-symlinks.patch | 13 - .../libraries/kde-frameworks-5.13/kcoreaddons.nix | 13 - .../libraries/kde-frameworks-5.13/kcrash.nix | 15 - .../libraries/kde-frameworks-5.13/kdbusaddons.nix | 16 - .../libraries/kde-frameworks-5.13/kdeclarative.nix | 30 -- .../libraries/kde-frameworks-5.13/kded.nix | 19 - .../kde-frameworks-5.13/kdelibs4support.nix | 58 --- .../kde-frameworks-5.13/kdesignerplugin.nix | 30 -- .../libraries/kde-frameworks-5.13/kdesu.nix | 17 - .../libraries/kde-frameworks-5.13/kdewebkit.nix | 22 - .../libraries/kde-frameworks-5.13/kdnssd.nix | 13 - .../kde-frameworks-5.13/kdoctools/default.nix | 24 - .../kdoctools/kdoctools-no-find-docbook-xml.patch | 12 - .../libraries/kde-frameworks-5.13/kemoticons.nix | 17 - .../kde-frameworks-5.13/kfilemetadata.nix | 22 - .../libraries/kde-frameworks-5.13/kglobalaccel.nix | 21 - .../libraries/kde-frameworks-5.13/kguiaddons.nix | 13 - .../libraries/kde-frameworks-5.13/khtml.nix | 35 -- .../libraries/kde-frameworks-5.13/ki18n.nix | 16 - .../libraries/kde-frameworks-5.13/kiconthemes.nix | 16 - .../libraries/kde-frameworks-5.13/kidletime.nix | 15 - .../kde-frameworks-5.13/kimageformats.nix | 13 - .../kinit/0001-kinit-libpath.patch | 42 -- .../kde-frameworks-5.13/kinit/default.nix | 24 - .../libraries/kde-frameworks-5.13/kio.nix | 48 -- .../libraries/kde-frameworks-5.13/kitemmodels.nix | 11 - .../libraries/kde-frameworks-5.13/kitemviews.nix | 11 - .../libraries/kde-frameworks-5.13/kjobwidgets.nix | 15 - .../libraries/kde-frameworks-5.13/kjs.nix | 15 - .../libraries/kde-frameworks-5.13/kjsembed.nix | 21 - .../libraries/kde-frameworks-5.13/kmediaplayer.nix | 15 - .../libraries/kde-frameworks-5.13/knewstuff.nix | 29 -- .../kde-frameworks-5.13/knotifications.nix | 21 - .../kde-frameworks-5.13/knotifyconfig.nix | 17 - .../kpackage/0001-allow-external-paths.patch | 25 - .../kde-frameworks-5.13/kpackage/default.nix | 22 - .../libraries/kde-frameworks-5.13/kparts.nix | 27 - .../libraries/kde-frameworks-5.13/kpeople.nix | 20 - .../libraries/kde-frameworks-5.13/kplotting.nix | 11 - .../libraries/kde-frameworks-5.13/kpty.nix | 15 - .../libraries/kde-frameworks-5.13/kross.nix | 23 - .../libraries/kde-frameworks-5.13/krunner.nix | 24 - .../kde-frameworks-5.13/kservice/default.nix | 25 - .../kservice-kbuildsycoca-follow-symlinks.patch | 13 - ...service-kbuildsycoca-no-canonicalize-path.patch | 13 - .../kde-frameworks-5.13/kservice/setup-hook.sh | 13 - .../ktexteditor/0001-no-qcoreapplication.patch | 48 -- .../kde-frameworks-5.13/ktexteditor/default.nix | 27 - .../libraries/kde-frameworks-5.13/ktextwidgets.nix | 23 - .../kde-frameworks-5.13/kunitconversion.nix | 13 - .../libraries/kde-frameworks-5.13/kwallet.nix | 30 -- .../kde-frameworks-5.13/kwidgetsaddons.nix | 11 - .../kde-frameworks-5.13/kwindowsystem.nix | 13 - .../libraries/kde-frameworks-5.13/kxmlgui.nix | 25 - .../kde-frameworks-5.13/kxmlrpcclient.nix | 15 - .../kde-frameworks-5.13/modemmanager-qt.nix | 13 - .../kde-frameworks-5.13/networkmanager-qt.nix | 13 - .../plasma-framework/default.nix | 40 -- .../libraries/kde-frameworks-5.13/solid.nix | 14 - .../libraries/kde-frameworks-5.13/sonnet.nix | 13 - .../libraries/kde-frameworks-5.13/srcs.nix | 549 --------------------- .../libraries/kde-frameworks-5.13/threadweaver.nix | 11 - .../libraries/kde-frameworks-5.14/attica.nix | 11 + .../libraries/kde-frameworks-5.14/baloo.nix | 49 ++ .../libraries/kde-frameworks-5.14/bluez-qt.nix | 17 + .../libraries/kde-frameworks-5.14/default.nix | 112 +++++ .../0001-extra-cmake-modules-paths.patch | 74 +++ .../extra-cmake-modules/default.nix | 17 + .../extra-cmake-modules/setup-hook.sh | 4 + .../libraries/kde-frameworks-5.14/fetchsrcs.sh | 57 +++ .../kde-frameworks-5.14/frameworkintegration.nix | 34 ++ .../libraries/kde-frameworks-5.14/kactivities.nix | 42 ++ .../libraries/kde-frameworks-5.14/kapidox.nix | 12 + .../libraries/kde-frameworks-5.14/karchive.nix | 11 + .../kde-frameworks-5.14/kauth/default.nix | 16 + .../kauth/kauth-policy-install.patch | 13 + .../libraries/kde-frameworks-5.14/kbookmarks.nix | 25 + .../kde-frameworks-5.14/kcmutils/default.nix | 31 ++ .../kcmutils-pluginselector-follow-symlinks.patch | 13 + .../libraries/kde-frameworks-5.14/kcodecs.nix | 11 + .../libraries/kde-frameworks-5.14/kcompletion.nix | 14 + .../libraries/kde-frameworks-5.14/kconfig.nix | 15 + .../kde-frameworks-5.14/kconfigwidgets/default.nix | 24 + ...kconfigwidgets-helpclient-follow-symlinks.patch | 13 + .../libraries/kde-frameworks-5.14/kcoreaddons.nix | 13 + .../libraries/kde-frameworks-5.14/kcrash.nix | 15 + .../libraries/kde-frameworks-5.14/kdbusaddons.nix | 16 + .../libraries/kde-frameworks-5.14/kdeclarative.nix | 30 ++ .../libraries/kde-frameworks-5.14/kded.nix | 19 + .../kde-frameworks-5.14/kdelibs4support.nix | 58 +++ .../kde-frameworks-5.14/kdesignerplugin.nix | 30 ++ .../libraries/kde-frameworks-5.14/kdesu.nix | 17 + .../libraries/kde-frameworks-5.14/kdewebkit.nix | 22 + .../libraries/kde-frameworks-5.14/kdnssd.nix | 13 + .../kde-frameworks-5.14/kdoctools/default.nix | 24 + .../kdoctools/kdoctools-no-find-docbook-xml.patch | 12 + .../libraries/kde-frameworks-5.14/kemoticons.nix | 17 + .../kde-frameworks-5.14/kfilemetadata.nix | 22 + .../libraries/kde-frameworks-5.14/kglobalaccel.nix | 21 + .../libraries/kde-frameworks-5.14/kguiaddons.nix | 13 + .../libraries/kde-frameworks-5.14/khtml.nix | 35 ++ .../libraries/kde-frameworks-5.14/ki18n.nix | 16 + .../libraries/kde-frameworks-5.14/kiconthemes.nix | 16 + .../libraries/kde-frameworks-5.14/kidletime.nix | 15 + .../kde-frameworks-5.14/kimageformats.nix | 13 + .../kinit/0001-kinit-libpath.patch | 42 ++ .../kde-frameworks-5.14/kinit/default.nix | 24 + .../libraries/kde-frameworks-5.14/kio.nix | 48 ++ .../libraries/kde-frameworks-5.14/kitemmodels.nix | 11 + .../libraries/kde-frameworks-5.14/kitemviews.nix | 11 + .../libraries/kde-frameworks-5.14/kjobwidgets.nix | 15 + .../libraries/kde-frameworks-5.14/kjs.nix | 15 + .../libraries/kde-frameworks-5.14/kjsembed.nix | 21 + .../libraries/kde-frameworks-5.14/kmediaplayer.nix | 15 + .../libraries/kde-frameworks-5.14/knewstuff.nix | 29 ++ .../kde-frameworks-5.14/knotifications.nix | 21 + .../kde-frameworks-5.14/knotifyconfig.nix | 17 + .../kpackage/0001-allow-external-paths.patch | 25 + .../kde-frameworks-5.14/kpackage/default.nix | 22 + .../libraries/kde-frameworks-5.14/kparts.nix | 27 + .../libraries/kde-frameworks-5.14/kpeople.nix | 20 + .../libraries/kde-frameworks-5.14/kplotting.nix | 11 + .../libraries/kde-frameworks-5.14/kpty.nix | 15 + .../libraries/kde-frameworks-5.14/kross.nix | 23 + .../libraries/kde-frameworks-5.14/krunner.nix | 24 + .../kde-frameworks-5.14/kservice/default.nix | 25 + .../kservice-kbuildsycoca-follow-symlinks.patch | 13 + ...service-kbuildsycoca-no-canonicalize-path.patch | 13 + .../kde-frameworks-5.14/kservice/setup-hook.sh | 13 + .../ktexteditor/0001-no-qcoreapplication.patch | 48 ++ .../kde-frameworks-5.14/ktexteditor/default.nix | 27 + .../libraries/kde-frameworks-5.14/ktextwidgets.nix | 23 + .../kde-frameworks-5.14/kunitconversion.nix | 13 + .../libraries/kde-frameworks-5.14/kwallet.nix | 30 ++ .../kde-frameworks-5.14/kwidgetsaddons.nix | 11 + .../kde-frameworks-5.14/kwindowsystem.nix | 13 + .../libraries/kde-frameworks-5.14/kxmlgui.nix | 25 + .../kde-frameworks-5.14/kxmlrpcclient.nix | 15 + .../kde-frameworks-5.14/modemmanager-qt.nix | 13 + .../kde-frameworks-5.14/networkmanager-qt.nix | 13 + .../plasma-framework/default.nix | 40 ++ .../libraries/kde-frameworks-5.14/solid.nix | 14 + .../libraries/kde-frameworks-5.14/sonnet.nix | 13 + .../libraries/kde-frameworks-5.14/srcs.nix | 549 +++++++++++++++++++++ .../libraries/kde-frameworks-5.14/threadweaver.nix | 11 + pkgs/top-level/all-packages.nix | 2 +- 167 files changed, 2411 insertions(+), 2401 deletions(-) delete mode 100644 pkgs/development/libraries/kde-frameworks-5.13/attica.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.13/baloo.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.13/bluez-qt.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.13/default.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.13/extra-cmake-modules/0001-extra-cmake-modules-paths.patch delete mode 100644 pkgs/development/libraries/kde-frameworks-5.13/extra-cmake-modules/default.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.13/extra-cmake-modules/setup-hook.sh delete mode 100755 pkgs/development/libraries/kde-frameworks-5.13/fetchsrcs.sh delete mode 100644 pkgs/development/libraries/kde-frameworks-5.13/frameworkintegration.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kactivities.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kapidox.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.13/karchive.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kauth/default.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kauth/kauth-policy-install.patch delete mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kbookmarks.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kcmutils/default.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kcmutils/kcmutils-pluginselector-follow-symlinks.patch delete mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kcodecs.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kcompletion.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kconfig.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kconfigwidgets/default.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch delete mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kcoreaddons.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kcrash.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kdbusaddons.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kdeclarative.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kded.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kdelibs4support.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kdesignerplugin.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kdesu.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kdewebkit.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kdnssd.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kdoctools/default.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kdoctools/kdoctools-no-find-docbook-xml.patch delete mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kemoticons.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kfilemetadata.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kglobalaccel.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kguiaddons.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.13/khtml.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.13/ki18n.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kiconthemes.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kidletime.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kimageformats.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kinit/0001-kinit-libpath.patch delete mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kinit/default.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kio.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kitemmodels.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kitemviews.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kjobwidgets.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kjs.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kjsembed.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kmediaplayer.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.13/knewstuff.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.13/knotifications.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.13/knotifyconfig.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kpackage/0001-allow-external-paths.patch delete mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kpackage/default.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kparts.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kpeople.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kplotting.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kpty.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kross.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.13/krunner.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kservice/default.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kservice/kservice-kbuildsycoca-follow-symlinks.patch delete mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch delete mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kservice/setup-hook.sh delete mode 100644 pkgs/development/libraries/kde-frameworks-5.13/ktexteditor/0001-no-qcoreapplication.patch delete mode 100644 pkgs/development/libraries/kde-frameworks-5.13/ktexteditor/default.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.13/ktextwidgets.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kunitconversion.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kwallet.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kwidgetsaddons.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kwindowsystem.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kxmlgui.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kxmlrpcclient.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.13/modemmanager-qt.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.13/networkmanager-qt.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.13/plasma-framework/default.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.13/solid.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.13/sonnet.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.13/srcs.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.13/threadweaver.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.14/attica.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.14/baloo.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.14/bluez-qt.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.14/default.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.14/extra-cmake-modules/0001-extra-cmake-modules-paths.patch create mode 100644 pkgs/development/libraries/kde-frameworks-5.14/extra-cmake-modules/default.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.14/extra-cmake-modules/setup-hook.sh create mode 100755 pkgs/development/libraries/kde-frameworks-5.14/fetchsrcs.sh create mode 100644 pkgs/development/libraries/kde-frameworks-5.14/frameworkintegration.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.14/kactivities.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.14/kapidox.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.14/karchive.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.14/kauth/default.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.14/kauth/kauth-policy-install.patch create mode 100644 pkgs/development/libraries/kde-frameworks-5.14/kbookmarks.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.14/kcmutils/default.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.14/kcmutils/kcmutils-pluginselector-follow-symlinks.patch create mode 100644 pkgs/development/libraries/kde-frameworks-5.14/kcodecs.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.14/kcompletion.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.14/kconfig.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.14/kconfigwidgets/default.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.14/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch create mode 100644 pkgs/development/libraries/kde-frameworks-5.14/kcoreaddons.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.14/kcrash.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.14/kdbusaddons.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.14/kdeclarative.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.14/kded.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.14/kdelibs4support.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.14/kdesignerplugin.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.14/kdesu.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.14/kdewebkit.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.14/kdnssd.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.14/kdoctools/default.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.14/kdoctools/kdoctools-no-find-docbook-xml.patch create mode 100644 pkgs/development/libraries/kde-frameworks-5.14/kemoticons.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.14/kfilemetadata.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.14/kglobalaccel.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.14/kguiaddons.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.14/khtml.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.14/ki18n.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.14/kiconthemes.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.14/kidletime.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.14/kimageformats.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.14/kinit/0001-kinit-libpath.patch create mode 100644 pkgs/development/libraries/kde-frameworks-5.14/kinit/default.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.14/kio.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.14/kitemmodels.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.14/kitemviews.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.14/kjobwidgets.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.14/kjs.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.14/kjsembed.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.14/kmediaplayer.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.14/knewstuff.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.14/knotifications.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.14/knotifyconfig.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.14/kpackage/0001-allow-external-paths.patch create mode 100644 pkgs/development/libraries/kde-frameworks-5.14/kpackage/default.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.14/kparts.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.14/kpeople.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.14/kplotting.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.14/kpty.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.14/kross.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.14/krunner.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.14/kservice/default.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.14/kservice/kservice-kbuildsycoca-follow-symlinks.patch create mode 100644 pkgs/development/libraries/kde-frameworks-5.14/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch create mode 100644 pkgs/development/libraries/kde-frameworks-5.14/kservice/setup-hook.sh create mode 100644 pkgs/development/libraries/kde-frameworks-5.14/ktexteditor/0001-no-qcoreapplication.patch create mode 100644 pkgs/development/libraries/kde-frameworks-5.14/ktexteditor/default.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.14/ktextwidgets.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.14/kunitconversion.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.14/kwallet.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.14/kwidgetsaddons.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.14/kwindowsystem.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.14/kxmlgui.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.14/kxmlrpcclient.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.14/modemmanager-qt.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.14/networkmanager-qt.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.14/plasma-framework/default.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.14/solid.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.14/sonnet.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.14/srcs.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.14/threadweaver.nix (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/kde-frameworks-5.13/attica.nix b/pkgs/development/libraries/kde-frameworks-5.13/attica.nix deleted file mode 100644 index 98721876c12..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.13/attica.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -}: - -kdeFramework { - name = "attica"; - nativeBuildInputs = [ extra-cmake-modules ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/baloo.nix b/pkgs/development/libraries/kde-frameworks-5.13/baloo.nix deleted file mode 100644 index 8b6b3509f0d..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.13/baloo.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kauth -, kconfig -, kcoreaddons -, kcrash -, kdbusaddons -, kfilemetadata -, ki18n -, kidletime -, kio -, lmdb -, qtbase -, qtquick1 -, solid -}: - -kdeFramework { - name = "baloo"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - kauth - kconfig - kcrash - kdbusaddons - ki18n - kidletime - kio - lmdb - qtquick1 - solid - ]; - propagatedBuildInputs = [ - kcoreaddons - kfilemetadata - qtbase - ]; - postInstall = '' - wrapKDEProgram "$out/bin/baloo_file" - wrapKDEProgram "$out/bin/baloo_file_extractor" - wrapKDEProgram "$out/bin/balooctl" - wrapKDEProgram "$out/bin/baloosearch" - wrapKDEProgram "$out/bin/balooshow" - wrapKDEProgram "$out/bin/baloo-monitor" - ''; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/bluez-qt.nix b/pkgs/development/libraries/kde-frameworks-5.13/bluez-qt.nix deleted file mode 100644 index f981b0516f7..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.13/bluez-qt.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, qtdeclarative -}: - -kdeFramework { - name = "bluez-qt"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ qtdeclarative ]; - preConfigure = '' - substituteInPlace CMakeLists.txt \ - --replace /lib/udev/rules.d "$out/lib/udev/rules.d" - ''; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/default.nix b/pkgs/development/libraries/kde-frameworks-5.13/default.nix deleted file mode 100644 index 1ff433c13c8..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.13/default.nix +++ /dev/null @@ -1,112 +0,0 @@ -# Maintainer's Notes: -# -# How To Update -# 1. Edit the URL in ./manifest.sh -# 2. Run ./manifest.sh -# 3. Fix build errors. - -{ pkgs, debug ? false }: - -let - - inherit (pkgs) lib stdenv; - - mirror = "mirror://kde"; - srcs = import ./srcs.nix { inherit (pkgs) fetchurl; inherit mirror; }; - - kdeFramework = args: - let - inherit (args) name; - inherit (srcs."${name}") src version; - in stdenv.mkDerivation (args // { - name = "${name}-${version}"; - inherit src; - - cmakeFlags = - (args.cmakeFlags or []) - ++ [ "-DBUILD_TESTING=OFF" ] - ++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug"; - - meta = { - license = with lib.licenses; [ - lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12 - ]; - platforms = lib.platforms.linux; - homepage = "http://www.kde.org"; - } // (args.meta or {}); - }); - - addPackages = self: with self; { - attica = callPackage ./attica.nix {}; - baloo = callPackage ./baloo.nix {}; - bluez-qt = callPackage ./bluez-qt.nix {}; - extra-cmake-modules = callPackage ./extra-cmake-modules {}; - frameworkintegration = callPackage ./frameworkintegration.nix {}; - kactivities = callPackage ./kactivities.nix {}; - kapidox = callPackage ./kapidox.nix {}; - karchive = callPackage ./karchive.nix {}; - kauth = callPackage ./kauth {}; - kbookmarks = callPackage ./kbookmarks.nix {}; - kcmutils = callPackage ./kcmutils {}; - kcodecs = callPackage ./kcodecs.nix {}; - kcompletion = callPackage ./kcompletion.nix {}; - kconfig = callPackage ./kconfig.nix {}; - kconfigwidgets = callPackage ./kconfigwidgets {}; - kcoreaddons = callPackage ./kcoreaddons.nix {}; - kcrash = callPackage ./kcrash.nix {}; - kdbusaddons = callPackage ./kdbusaddons.nix {}; - kdeclarative = callPackage ./kdeclarative.nix {}; - kded = callPackage ./kded.nix {}; - kdelibs4support = callPackage ./kdelibs4support.nix {}; - kdesignerplugin = callPackage ./kdesignerplugin.nix {}; - kdewebkit = callPackage ./kdewebkit.nix {}; - kdesu = callPackage ./kdesu.nix {}; - kdnssd = callPackage ./kdnssd.nix {}; - kdoctools = callPackage ./kdoctools {}; - kemoticons = callPackage ./kemoticons.nix {}; - kfilemetadata = callPackage ./kfilemetadata.nix {}; - kglobalaccel = callPackage ./kglobalaccel.nix {}; - kguiaddons = callPackage ./kguiaddons.nix {}; - khtml = callPackage ./khtml.nix {}; - ki18n = callPackage ./ki18n.nix {}; - kiconthemes = callPackage ./kiconthemes.nix {}; - kidletime = callPackage ./kidletime.nix {}; - kimageformats = callPackage ./kimageformats.nix {}; - kinit = callPackage ./kinit {}; - kio = callPackage ./kio.nix {}; - kitemmodels = callPackage ./kitemmodels.nix {}; - kitemviews = callPackage ./kitemviews.nix {}; - kjobwidgets = callPackage ./kjobwidgets.nix {}; - kjs = callPackage ./kjs.nix {}; - kjsembed = callPackage ./kjsembed.nix {}; - kmediaplayer = callPackage ./kmediaplayer.nix {}; - knewstuff = callPackage ./knewstuff.nix {}; - knotifications = callPackage ./knotifications.nix {}; - knotifyconfig = callPackage ./knotifyconfig.nix {}; - kpackage = callPackage ./kpackage {}; - kparts = callPackage ./kparts.nix {}; - kpeople = callPackage ./kpeople.nix {}; - kplotting = callPackage ./kplotting.nix {}; - kpty = callPackage ./kpty.nix {}; - kross = callPackage ./kross.nix {}; - krunner = callPackage ./krunner.nix {}; - kservice = callPackage ./kservice {}; - ktexteditor = callPackage ./ktexteditor {}; - ktextwidgets = callPackage ./ktextwidgets.nix {}; - kunitconversion = callPackage ./kunitconversion.nix {}; - kwallet = callPackage ./kwallet.nix {}; - kwidgetsaddons = callPackage ./kwidgetsaddons.nix {}; - kwindowsystem = callPackage ./kwindowsystem.nix {}; - kxmlgui = callPackage ./kxmlgui.nix {}; - kxmlrpcclient = callPackage ./kxmlrpcclient.nix {}; - modemmanager-qt = callPackage ./modemmanager-qt.nix {}; - networkmanager-qt = callPackage ./networkmanager-qt.nix {}; - plasma-framework = callPackage ./plasma-framework {}; - solid = callPackage ./solid.nix {}; - sonnet = callPackage ./sonnet.nix {}; - threadweaver = callPackage ./threadweaver.nix {}; - }; - - newScope = scope: pkgs.qt55Libs.newScope ({ inherit kdeFramework; } // scope); - -in lib.makeScope newScope addPackages diff --git a/pkgs/development/libraries/kde-frameworks-5.13/extra-cmake-modules/0001-extra-cmake-modules-paths.patch b/pkgs/development/libraries/kde-frameworks-5.13/extra-cmake-modules/0001-extra-cmake-modules-paths.patch deleted file mode 100644 index 9717716faf5..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.13/extra-cmake-modules/0001-extra-cmake-modules-paths.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 3cc148e878b69fc3e0228f3e3bf1bbe689dad87c Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Fri, 20 Feb 2015 23:17:39 -0600 -Subject: [PATCH] extra-cmake-modules paths - ---- - kde-modules/KDEInstallDirs.cmake | 37 ++++--------------------------------- - 1 file changed, 4 insertions(+), 33 deletions(-) - -diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake -index b7cd34d..2f868ac 100644 ---- a/kde-modules/KDEInstallDirs.cmake -+++ b/kde-modules/KDEInstallDirs.cmake -@@ -193,37 +193,8 @@ - # (To distribute this file outside of extra-cmake-modules, substitute the full - # License text for the above reference.) - --# Figure out what the default install directory for libraries should be. --# This is based on the logic in GNUInstallDirs, but simplified (the --# GNUInstallDirs code deals with re-configuring, but that is dealt with --# by the _define_* macros in this module). -+# The default library directory on NixOS is *always* /lib. - set(_LIBDIR_DEFAULT "lib") --# Override this default 'lib' with 'lib64' iff: --# - we are on a Linux, kFreeBSD or Hurd system but NOT cross-compiling --# - we are NOT on debian --# - we are on a 64 bits system --# reason is: amd64 ABI: http://www.x86-64.org/documentation/abi.pdf --# For Debian with multiarch, use 'lib/${CMAKE_LIBRARY_ARCHITECTURE}' if --# CMAKE_LIBRARY_ARCHITECTURE is set (which contains e.g. "i386-linux-gnu" --# See http://wiki.debian.org/Multiarch --if((CMAKE_SYSTEM_NAME MATCHES "Linux|kFreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "GNU") -- AND NOT CMAKE_CROSSCOMPILING) -- if (EXISTS "/etc/debian_version") # is this a debian system ? -- if(CMAKE_LIBRARY_ARCHITECTURE) -- set(_LIBDIR_DEFAULT "lib/${CMAKE_LIBRARY_ARCHITECTURE}") -- endif() -- else() # not debian, rely on CMAKE_SIZEOF_VOID_P: -- if(NOT DEFINED CMAKE_SIZEOF_VOID_P) -- message(AUTHOR_WARNING -- "Unable to determine default LIB_INSTALL_LIBDIR directory because no target architecture is known. " -- "Please enable at least one language before including KDEInstallDirs.") -- else() -- if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8") -- set(_LIBDIR_DEFAULT "lib64") -- endif() -- endif() -- endif() --endif() - - set(_gnu_install_dirs_vars - BINDIR -@@ -445,15 +416,15 @@ if(KDE_INSTALL_USE_QT_SYS_PATHS) - "QtQuick2 imports" - QML_INSTALL_DIR) - else() -- _define_relative(QTPLUGINDIR LIBDIR "plugins" -+ _define_relative(QTPLUGINDIR LIBDIR "qt5/plugins" - "Qt plugins" - QT_PLUGIN_INSTALL_DIR) - -- _define_relative(QTQUICKIMPORTSDIR QTPLUGINDIR "imports" -+ _define_relative(QTQUICKIMPORTSDIR QTPLUGINDIR "qt5/imports" - "QtQuick1 imports" - IMPORTS_INSTALL_DIR) - -- _define_relative(QMLDIR LIBDIR "qml" -+ _define_relative(QMLDIR LIBDIR "qt5/qml" - "QtQuick2 imports" - QML_INSTALL_DIR) - endif() --- -2.3.0 - diff --git a/pkgs/development/libraries/kde-frameworks-5.13/extra-cmake-modules/default.nix b/pkgs/development/libraries/kde-frameworks-5.13/extra-cmake-modules/default.nix deleted file mode 100644 index 4d669b72a89..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.13/extra-cmake-modules/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ kdeFramework, lib, stdenv, cmake, pkgconfig, qttools }: - -kdeFramework { - name = "extra-cmake-modules"; - setupHook = ./setup-hook.sh; - patches = [ ./0001-extra-cmake-modules-paths.patch ]; - - # It is OK to propagate these inputs as long as - # extra-cmake-modules is never a propagated input - # of some other derivation. - propagatedNativeBuildInputs = [ cmake pkgconfig qttools ]; - - meta = { - license = stdenv.lib.licenses.bsd2; - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/extra-cmake-modules/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.13/extra-cmake-modules/setup-hook.sh deleted file mode 100644 index ce9aafb90e8..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.13/extra-cmake-modules/setup-hook.sh +++ /dev/null @@ -1,4 +0,0 @@ -wrapKDEProgram() { - KSERVICE_BUILD_KDESYCOCA=${KDESYCOCA:+1} - wrapQtProgram "$1" ${KDESYCOCA:+--set KDESYCOCA "$KDESYCOCA"} "$@" -} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/fetchsrcs.sh b/pkgs/development/libraries/kde-frameworks-5.13/fetchsrcs.sh deleted file mode 100755 index a329d8b8562..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.13/fetchsrcs.sh +++ /dev/null @@ -1,47 +0,0 @@ -#! /usr/bin/env nix-shell -#! nix-shell -i bash -p coreutils findutils gnused nix wget - -set -x - -# The trailing slash at the end is necessary! -RELEASE_URL="http://download.kde.org/stable/frameworks/5.13/" -EXTRA_WGET_ARGS='-A *.tar.xz' - -mkdir tmp; cd tmp - -wget -nH -r -c --no-parent $RELEASE_URL $EXTRA_WGET_ARGS - -cat >../srcs.nix <>../srcs.nix <>../srcs.nix - -cd .. diff --git a/pkgs/development/libraries/kde-frameworks-5.13/frameworkintegration.nix b/pkgs/development/libraries/kde-frameworks-5.13/frameworkintegration.nix deleted file mode 100644 index ad30cc87ecf..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.13/frameworkintegration.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kbookmarks -, kcompletion -, kconfig -, kconfigwidgets -, ki18n -, kiconthemes -, kio -, knotifications -, kwidgetsaddons -, libXcursor -, qtx11extras -}: - -kdeFramework { - name = "frameworkintegration"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - kbookmarks - kcompletion - kconfig - ki18n - kio - knotifications - kwidgetsaddons - libXcursor - qtx11extras - ]; - propagatedBuildInputs = [ kconfigwidgets kiconthemes ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kactivities.nix b/pkgs/development/libraries/kde-frameworks-5.13/kactivities.nix deleted file mode 100644 index c8e296bad80..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.13/kactivities.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, boost -, kcmutils -, kconfig -, kcoreaddons -, kdbusaddons -, kdeclarative -, kglobalaccel -, ki18n -, kio -, kservice -, kwindowsystem -, kxmlgui -, qtdeclarative -}: - -kdeFramework { - name = "kactivities"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - boost - kcmutils - kconfig - kcoreaddons - kdbusaddons - kdeclarative - kglobalaccel - ki18n - kio - kservice - kwindowsystem - kxmlgui - qtdeclarative - ]; - postInstall = '' - wrapKDEProgram "$out/bin/kactivitymanagerd" - ''; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kapidox.nix b/pkgs/development/libraries/kde-frameworks-5.13/kapidox.nix deleted file mode 100644 index 647be8f052c..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.13/kapidox.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, python -}: - -kdeFramework { - name = "kapidox"; - nativeBuildInputs = [ extra-cmake-modules python ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/karchive.nix b/pkgs/development/libraries/kde-frameworks-5.13/karchive.nix deleted file mode 100644 index a8d9a0003c3..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.13/karchive.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -}: - -kdeFramework { - name = "karchive"; - nativeBuildInputs = [ extra-cmake-modules ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kauth/default.nix b/pkgs/development/libraries/kde-frameworks-5.13/kauth/default.nix deleted file mode 100644 index 42a10019334..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.13/kauth/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kcoreaddons -, polkitQt -}: - -kdeFramework { - name = "kauth"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ polkitQt ]; - propagatedBuildInputs = [ kcoreaddons ]; - patches = [ ./kauth-policy-install.patch ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kauth/kauth-policy-install.patch b/pkgs/development/libraries/kde-frameworks-5.13/kauth/kauth-policy-install.patch deleted file mode 100644 index 340155256f2..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.13/kauth/kauth-policy-install.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/KF5AuthConfig.cmake.in b/KF5AuthConfig.cmake.in -index e859ec7..9a8ab18 100644 ---- a/KF5AuthConfig.cmake.in -+++ b/KF5AuthConfig.cmake.in -@@ -4,7 +4,7 @@ set(KAUTH_STUB_FILES_DIR "${PACKAGE_PREFIX_DIR}/@KF5_DATA_INSTALL_DIR@/kauth/") - - set(KAUTH_BACKEND_NAME "@KAUTH_BACKEND_NAME@") - set(KAUTH_HELPER_BACKEND_NAME "@KAUTH_HELPER_BACKEND_NAME@") --set(KAUTH_POLICY_FILES_INSTALL_DIR "@KAUTH_POLICY_FILES_INSTALL_DIR@") -+set(KAUTH_POLICY_FILES_INSTALL_DIR "\${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions") - set(KAUTH_HELPER_INSTALL_DIR "@KAUTH_HELPER_INSTALL_DIR@") - - find_dependency(KF5CoreAddons "@KF5_DEP_VERSION@") diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kbookmarks.nix b/pkgs/development/libraries/kde-frameworks-5.13/kbookmarks.nix deleted file mode 100644 index 1a469ab4db6..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.13/kbookmarks.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kcodecs -, kconfig -, kconfigwidgets -, kcoreaddons -, kiconthemes -, kxmlgui -}: - -kdeFramework { - name = "kbookmarks"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - kcodecs - kconfig - kconfigwidgets - kcoreaddons - kiconthemes - kxmlgui - ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kcmutils/default.nix b/pkgs/development/libraries/kde-frameworks-5.13/kcmutils/default.nix deleted file mode 100644 index ac7a5af06a4..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.13/kcmutils/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kconfigwidgets -, kcoreaddons -, kdeclarative -, ki18n -, kiconthemes -, kitemviews -, kpackage -, kservice -, kxmlgui -}: - -kdeFramework { - name = "kcmutils"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - kcoreaddons - kdeclarative - ki18n - kiconthemes - kitemviews - kpackage - kxmlgui - ]; - propagatedBuildInputs = [ kconfigwidgets kservice ]; - patches = [ ./kcmutils-pluginselector-follow-symlinks.patch ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kcmutils/kcmutils-pluginselector-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.13/kcmutils/kcmutils-pluginselector-follow-symlinks.patch deleted file mode 100644 index 47b8dfad180..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.13/kcmutils/kcmutils-pluginselector-follow-symlinks.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/kpluginselector.cpp b/src/kpluginselector.cpp -index c63241b..2243f94 100644 ---- a/src/kpluginselector.cpp -+++ b/src/kpluginselector.cpp -@@ -304,7 +304,7 @@ void KPluginSelector::addPlugins(const QString &componentName, - QStringList desktopFileNames; - const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, componentName + QStringLiteral("/kpartplugins"), QStandardPaths::LocateDirectory); - Q_FOREACH (const QString &dir, dirs) { -- QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories); -+ QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); - while (it.hasNext()) { - desktopFileNames.append(it.next()); - } diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kcodecs.nix b/pkgs/development/libraries/kde-frameworks-5.13/kcodecs.nix deleted file mode 100644 index 53a69a69b69..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.13/kcodecs.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -}: - -kdeFramework { - name = "kcodecs"; - nativeBuildInputs = [ extra-cmake-modules ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kcompletion.nix b/pkgs/development/libraries/kde-frameworks-5.13/kcompletion.nix deleted file mode 100644 index e393774f16a..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.13/kcompletion.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kconfig -, kwidgetsaddons -}: - -kdeFramework { - name = "kcompletion"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ kconfig kwidgetsaddons ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kconfig.nix b/pkgs/development/libraries/kde-frameworks-5.13/kconfig.nix deleted file mode 100644 index ce890745767..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.13/kconfig.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -}: - -kdeFramework { - name = "kconfig"; - nativeBuildInputs = [ extra-cmake-modules ]; - postInstall = '' - wrapKDEProgram "$out/bin/kreadconfig5" - wrapKDEProgram "$out/bin/kwriteconfig5" - ''; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kconfigwidgets/default.nix b/pkgs/development/libraries/kde-frameworks-5.13/kconfigwidgets/default.nix deleted file mode 100644 index d16f7f92bea..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.13/kconfigwidgets/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kauth -, kcodecs -, kconfig -, kdoctools -, kguiaddons -, ki18n -, kwidgetsaddons -}: - -kdeFramework { - name = "kconfigwidgets"; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - buildInputs = [ kguiaddons ki18n ]; - propagatedBuildInputs = [ kauth kconfig kcodecs kwidgetsaddons ]; - patches = [ ./kconfigwidgets-helpclient-follow-symlinks.patch ]; - postInstall = '' - wrapKDEProgram "$out/bin/preparetips5" - ''; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.13/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch deleted file mode 100644 index 3bd946cbd84..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.13/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/khelpclient.cpp b/src/khelpclient.cpp -index 53a331e..80fbb01 100644 ---- a/src/khelpclient.cpp -+++ b/src/khelpclient.cpp -@@ -48,7 +48,7 @@ void KHelpClient::invokeHelp(const QString &anchor, const QString &_appname) - QString docPath; - const QStringList desktopDirs = QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation); - Q_FOREACH (const QString &dir, desktopDirs) { -- QDirIterator it(dir, QStringList() << appname + QLatin1String(".desktop"), QDir::NoFilter, QDirIterator::Subdirectories); -+ QDirIterator it(dir, QStringList() << appname + QLatin1String(".desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); - while (it.hasNext()) { - const QString desktopPath(it.next()); - KDesktopFile desktopFile(desktopPath); diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kcoreaddons.nix b/pkgs/development/libraries/kde-frameworks-5.13/kcoreaddons.nix deleted file mode 100644 index 43c21bb51ef..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.13/kcoreaddons.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, shared_mime_info -}: - -kdeFramework { - name = "kcoreaddons"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ shared_mime_info ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kcrash.nix b/pkgs/development/libraries/kde-frameworks-5.13/kcrash.nix deleted file mode 100644 index b919c7ad222..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.13/kcrash.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kcoreaddons -, kwindowsystem -, qtx11extras -}: - -kdeFramework { - name = "kcrash"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ kcoreaddons kwindowsystem qtx11extras ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kdbusaddons.nix b/pkgs/development/libraries/kde-frameworks-5.13/kdbusaddons.nix deleted file mode 100644 index eb76e14705e..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.13/kdbusaddons.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, qtx11extras -}: - -kdeFramework { - name = "kdbusaddons"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ qtx11extras ]; - postInstall = '' - wrapKDEProgram "$out/bin/kquitapp5" - ''; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kdeclarative.nix b/pkgs/development/libraries/kde-frameworks-5.13/kdeclarative.nix deleted file mode 100644 index b62a13f8fa9..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.13/kdeclarative.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, epoxy -, kconfig -, kglobalaccel -, kguiaddons -, ki18n -, kiconthemes -, kio -, kpackage -, kwidgetsaddons -, kwindowsystem -, pkgconfig -, qtdeclarative -}: - -kdeFramework { - name = "kdeclarative"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - epoxy kglobalaccel kguiaddons ki18n kiconthemes kio kwidgetsaddons kwindowsystem - ]; - propagatedBuildInputs = [ kconfig kpackage qtdeclarative ]; - postInstall = '' - wrapKDEProgram "$out/bin/kpackagelauncherqml" - ''; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kded.nix b/pkgs/development/libraries/kde-frameworks-5.13/kded.nix deleted file mode 100644 index 47ae2d68c68..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.13/kded.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kconfig -, kcoreaddons -, kcrash -, kdbusaddons -, kdoctools -, kinit -, kservice -}: - -kdeFramework { - name = "kded"; - buildInputs = [ kconfig kcoreaddons kcrash kdbusaddons kinit kservice ]; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kdelibs4support.nix b/pkgs/development/libraries/kde-frameworks-5.13/kdelibs4support.nix deleted file mode 100644 index f54fa3e9be6..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.13/kdelibs4support.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, docbook_xml_dtd_45 -, kauth -, karchive -, kcompletion -, kconfig -, kconfigwidgets -, kcoreaddons -, kcrash -, kdbusaddons -, kdesignerplugin -, kdoctools -, kemoticons -, kglobalaccel -, kguiaddons -, ki18n -, kiconthemes -, kio -, kitemmodels -, kinit -, knotifications -, kparts -, kservice -, ktextwidgets -, kunitconversion -, kwidgetsaddons -, kwindowsystem -, kxmlgui -, networkmanager -, qtsvg -, qtx11extras -, xlibs -}: - -# TODO: debug docbook detection - -kdeFramework { - name = "kdelibs4support"; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - buildInputs = [ - kcompletion kconfig kglobalaccel ki18n kio kservice kwidgetsaddons - kxmlgui networkmanager qtsvg qtx11extras xlibs.libSM - ]; - propagatedBuildInputs = [ - kauth karchive kconfigwidgets kcoreaddons kcrash kdbusaddons - kdesignerplugin kemoticons kguiaddons kiconthemes kitemmodels - kinit knotifications kparts ktextwidgets kunitconversion - kwindowsystem - ]; - cmakeFlags = [ - "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook" - "-DDocBookXML4_DTD_VERSION=4.5" - ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kdesignerplugin.nix b/pkgs/development/libraries/kde-frameworks-5.13/kdesignerplugin.nix deleted file mode 100644 index 100d16d64bc..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.13/kdesignerplugin.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kcompletion -, kconfig -, kconfigwidgets -, kcoreaddons -, kdewebkit -, kdoctools -, kiconthemes -, kio -, kitemviews -, kplotting -, ktextwidgets -, kwidgetsaddons -, kxmlgui -, sonnet -}: - -kdeFramework { - name = "kdesignerplugin"; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - buildInputs = [ - kcompletion kconfig kconfigwidgets kcoreaddons kdewebkit - kiconthemes kio kitemviews kplotting ktextwidgets kwidgetsaddons - kxmlgui sonnet - ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kdesu.nix b/pkgs/development/libraries/kde-frameworks-5.13/kdesu.nix deleted file mode 100644 index 4503d8bcd10..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.13/kdesu.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kcoreaddons -, ki18n -, kpty -, kservice -}: - -kdeFramework { - name = "kdesu"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ kcoreaddons ki18n kservice ]; - propagatedBuildInputs = [ kpty ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kdewebkit.nix b/pkgs/development/libraries/kde-frameworks-5.13/kdewebkit.nix deleted file mode 100644 index 52ae0162b86..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.13/kdewebkit.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kconfig -, kcoreaddons -, ki18n -, kio -, kjobwidgets -, kparts -, kservice -, kwallet -, qtwebkit -}: - -kdeFramework { - name = "kdewebkit"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ kconfig kcoreaddons ki18n kio kjobwidgets kparts kservice kwallet ]; - propagatedBuildInputs = [ qtwebkit ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kdnssd.nix b/pkgs/development/libraries/kde-frameworks-5.13/kdnssd.nix deleted file mode 100644 index f00432b0c9c..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.13/kdnssd.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, avahi -}: - -kdeFramework { - name = "kdnssd"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ avahi ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kdoctools/default.nix b/pkgs/development/libraries/kde-frameworks-5.13/kdoctools/default.nix deleted file mode 100644 index 0ec13d1a15c..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.13/kdoctools/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, docbook_xml_dtd_45 -, docbook5_xsl -, karchive -, ki18n -, perl -, perlPackages -}: - -kdeFramework { - name = "kdoctools"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ karchive ki18n ]; - propagatedNativeBuildInputs = [ perl perlPackages.URI ]; - cmakeFlags = [ - "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook" - "-DDocBookXSL_DIR=${docbook5_xsl}/xml/xsl/docbook" - ]; - patches = [ ./kdoctools-no-find-docbook-xml.patch ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kdoctools/kdoctools-no-find-docbook-xml.patch b/pkgs/development/libraries/kde-frameworks-5.13/kdoctools/kdoctools-no-find-docbook-xml.patch deleted file mode 100644 index 4e3a33efab3..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.13/kdoctools/kdoctools-no-find-docbook-xml.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5c4863c..f731775 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -46,7 +46,6 @@ set_package_properties(LibXml2 PROPERTIES - ) - - --find_package(DocBookXML4 "4.5") - - set_package_properties(DocBookXML4 PROPERTIES - TYPE REQUIRED diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kemoticons.nix b/pkgs/development/libraries/kde-frameworks-5.13/kemoticons.nix deleted file mode 100644 index d165f84e3a2..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.13/kemoticons.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, karchive -, kconfig -, kcoreaddons -, kservice -}: - -kdeFramework { - name = "kemoticons"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ karchive kconfig kcoreaddons ]; - propagatedBuildInputs = [ kservice ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kfilemetadata.nix b/pkgs/development/libraries/kde-frameworks-5.13/kfilemetadata.nix deleted file mode 100644 index 53c509417f2..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.13/kfilemetadata.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, attr -, ebook_tools -, exiv2 -, ffmpeg -, karchive -, ki18n -, popplerQt -, qtbase -, taglib -}: - -kdeFramework { - name = "kfilemetadata"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ attr ebook_tools exiv2 ffmpeg karchive ki18n popplerQt taglib ]; - propagatedBuildInputs = [ qtbase ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kglobalaccel.nix b/pkgs/development/libraries/kde-frameworks-5.13/kglobalaccel.nix deleted file mode 100644 index f7c5ea56266..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.13/kglobalaccel.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kconfig -, kcoreaddons -, kcrash -, kdbusaddons -, kwindowsystem -, qtx11extras -}: - -kdeFramework { - name = "kglobalaccel"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ kconfig kcoreaddons kcrash kdbusaddons kwindowsystem qtx11extras ]; - postInstall = '' - wrapKDEProgram "$out/bin/kglobalaccel5" - ''; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kguiaddons.nix b/pkgs/development/libraries/kde-frameworks-5.13/kguiaddons.nix deleted file mode 100644 index bc4e9ab1184..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.13/kguiaddons.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, qtx11extras -}: - -kdeFramework { - name = "kguiaddons"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ qtx11extras ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/khtml.nix b/pkgs/development/libraries/kde-frameworks-5.13/khtml.nix deleted file mode 100644 index 45dd45089c4..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.13/khtml.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, giflib -, karchive -, kcodecs -, kglobalaccel -, ki18n -, kiconthemes -, kio -, kjs -, knotifications -, kparts -, ktextwidgets -, kwallet -, kwidgetsaddons -, kwindowsystem -, kxmlgui -, perl -, phonon -, qtx11extras -, sonnet -}: - -kdeFramework { - name = "khtml"; - nativeBuildInputs = [ extra-cmake-modules perl ]; - buildInputs = [ - giflib karchive kglobalaccel kiconthemes knotifications kwallet - kwidgetsaddons kwindowsystem kxmlgui phonon qtx11extras sonnet - ]; - propagatedBuildInputs = [ kcodecs ki18n kio kjs kparts ktextwidgets ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/ki18n.nix b/pkgs/development/libraries/kde-frameworks-5.13/ki18n.nix deleted file mode 100644 index 915e3294b46..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.13/ki18n.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, gettext -, python -, qtscript -}: - -kdeFramework { - name = "ki18n"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ qtscript ]; - propagatedNativeBuildInputs = [ gettext python ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kiconthemes.nix b/pkgs/development/libraries/kde-frameworks-5.13/kiconthemes.nix deleted file mode 100644 index 862c17f104f..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.13/kiconthemes.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kconfigwidgets -, ki18n -, kitemviews -, qtsvg -}: - -kdeFramework { - name = "kiconthemes"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ kconfigwidgets ki18n kitemviews qtsvg ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kidletime.nix b/pkgs/development/libraries/kde-frameworks-5.13/kidletime.nix deleted file mode 100644 index fc086560023..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.13/kidletime.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, qtbase -, qtx11extras -}: - -kdeFramework { - name = "kidletime"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ qtx11extras ]; - propagatedBuildInputs = [ qtbase ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kimageformats.nix b/pkgs/development/libraries/kde-frameworks-5.13/kimageformats.nix deleted file mode 100644 index 49d66bbcc2c..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.13/kimageformats.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, ilmbase -}: - -kdeFramework { - name = "kimageformats"; - nativeBuildInputs = [ extra-cmake-modules ]; - NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR"; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kinit/0001-kinit-libpath.patch b/pkgs/development/libraries/kde-frameworks-5.13/kinit/0001-kinit-libpath.patch deleted file mode 100644 index 9c76079a382..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.13/kinit/0001-kinit-libpath.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 723c9b1268a04127647a1c20eebe9804150566dd Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Sat, 13 Jun 2015 08:57:55 -0500 -Subject: [PATCH] kinit libpath - ---- - src/kdeinit/kinit.cpp | 18 ++++++++++-------- - 1 file changed, 10 insertions(+), 8 deletions(-) - -diff --git a/src/kdeinit/kinit.cpp b/src/kdeinit/kinit.cpp -index 9e775b6..0ac5646 100644 ---- a/src/kdeinit/kinit.cpp -+++ b/src/kdeinit/kinit.cpp -@@ -660,15 +660,17 @@ static pid_t launch(int argc, const char *_name, const char *args, - if (!libpath.isEmpty()) { - if (!l.load()) { - if (libpath_relative) { -- // NB: Because Qt makes the actual dlopen() call, the -- // RUNPATH of kdeinit is *not* respected - see -- // https://sourceware.org/bugzilla/show_bug.cgi?id=13945 -- // - so we try hacking it in ourselves -- QString install_lib_dir = QFile::decodeName( -- CMAKE_INSTALL_PREFIX "/" LIB_INSTALL_DIR "/"); -- libpath = install_lib_dir + libpath; -- l.setFileName(libpath); -+ // Use QT_PLUGIN_PATH to find shared library directories -+ // For KF5, the plugin path is /lib/qt5/plugins/, so kdeinit5 -+ // shared libraries should be in /lib/qt5/plugins/../../ -+ const QRegExp pathSepRegExp(QString::fromLatin1("[:\b]")); -+ const QString up = QString::fromLocal8Bit("/../../"); -+ const QStringList paths = QString::fromLocal8Bit(qgetenv("QT_PLUGIN_PATH")).split(pathSepRegExp, QString::KeepEmptyParts); -+ Q_FOREACH (const QString &path, paths) { -+ l.setFileName(path + up + libpath); - l.load(); -+ if (l.isLoaded()) break; -+ } - } - } - if (!l.isLoaded()) { --- -2.4.2 - diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kinit/default.nix b/pkgs/development/libraries/kde-frameworks-5.13/kinit/default.nix deleted file mode 100644 index 47f1aec72de..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.13/kinit/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kconfig -, kcrash -, kdoctools -, ki18n -, kio -, kservice -, kwindowsystem -, libcap -, libcap_progs -}: - -# TODO: setuid wrapper - -kdeFramework { - name = "kinit"; - nativeBuildInputs = [ extra-cmake-modules kdoctools libcap_progs ]; - buildInputs = [ kconfig kcrash ki18n kio kservice kwindowsystem libcap ]; - patches = [ ./0001-kinit-libpath.patch ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kio.nix b/pkgs/development/libraries/kde-frameworks-5.13/kio.nix deleted file mode 100644 index 6605de03e38..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.13/kio.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, acl -, karchive -, kbookmarks -, kcompletion -, kconfig -, kconfigwidgets -, kcoreaddons -, kdbusaddons -, kdoctools -, ki18n -, kiconthemes -, kitemviews -, kjobwidgets -, knotifications -, kservice -, ktextwidgets -, kwallet -, kwidgetsaddons -, kwindowsystem -, kxmlgui -, qtscript -, qtx11extras -, solid -}: - -kdeFramework { - name = "kio"; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - buildInputs = [ - acl karchive kconfig kcoreaddons kdbusaddons ki18n kiconthemes - knotifications ktextwidgets kwallet kwidgetsaddons kwindowsystem - qtscript qtx11extras - ]; - propagatedBuildInputs = [ - kbookmarks kcompletion kconfigwidgets kitemviews kjobwidgets kservice kxmlgui solid - ]; - postInstall = '' - wrapKDEProgram "$out/bin/kcookiejar5" - wrapKDEProgram "$out/bin/ktelnetservice5" - wrapKDEProgram "$out/bin/ktrash5" - wrapKDEProgram "$out/bin/kmailservice5" - ''; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kitemmodels.nix b/pkgs/development/libraries/kde-frameworks-5.13/kitemmodels.nix deleted file mode 100644 index a9024d771cc..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.13/kitemmodels.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -}: - -kdeFramework { - name = "kitemmodels"; - nativeBuildInputs = [ extra-cmake-modules ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kitemviews.nix b/pkgs/development/libraries/kde-frameworks-5.13/kitemviews.nix deleted file mode 100644 index 931019ce495..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.13/kitemviews.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -}: - -kdeFramework { - name = "kitemviews"; - nativeBuildInputs = [ extra-cmake-modules ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kjobwidgets.nix b/pkgs/development/libraries/kde-frameworks-5.13/kjobwidgets.nix deleted file mode 100644 index c3f1d37f858..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.13/kjobwidgets.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kcoreaddons -, kwidgetsaddons -, qtx11extras -}: - -kdeFramework { - name = "kjobwidgets"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ kcoreaddons kwidgetsaddons qtx11extras ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kjs.nix b/pkgs/development/libraries/kde-frameworks-5.13/kjs.nix deleted file mode 100644 index 902674d49b7..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.13/kjs.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kdoctools -}: - -kdeFramework { - name = "kjs"; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - postInstall = '' - wrapKDEProgram "$out/bin/kjs5" - ''; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kjsembed.nix b/pkgs/development/libraries/kde-frameworks-5.13/kjsembed.nix deleted file mode 100644 index bbc5169a1cc..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.13/kjsembed.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kdoctools -, ki18n -, kjs -, qtsvg -}: - -kdeFramework { - name = "kjsembed"; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - buildInputs = [ qtsvg ]; - propagatedBuildInputs = [ ki18n kjs ]; - postInstall = '' - wrapKDEProgram "$out/bin/kjscmd5" - wrapKDEProgram "$out/bin/kjsconsole" - ''; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kmediaplayer.nix b/pkgs/development/libraries/kde-frameworks-5.13/kmediaplayer.nix deleted file mode 100644 index 460458b2232..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.13/kmediaplayer.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kparts -, kxmlgui -}: - -kdeFramework { - name = "kmediaplayer"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ kxmlgui ]; - propagatedBuildInputs = [ kparts ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/knewstuff.nix b/pkgs/development/libraries/kde-frameworks-5.13/knewstuff.nix deleted file mode 100644 index d0b884f8f68..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.13/knewstuff.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, attica -, karchive -, kcompletion -, kconfig -, kcoreaddons -, ki18n -, kiconthemes -, kio -, kitemviews -, kservice -, ktextwidgets -, kwidgetsaddons -, kxmlgui -}: - -kdeFramework { - name = "knewstuff"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - karchive kcompletion kconfig kcoreaddons ki18n kiconthemes kio - kitemviews ktextwidgets kwidgetsaddons - ]; - propagatedBuildInputs = [ attica kservice kxmlgui ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/knotifications.nix b/pkgs/development/libraries/kde-frameworks-5.13/knotifications.nix deleted file mode 100644 index f3aa29f018c..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.13/knotifications.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kcodecs -, kconfig -, kcoreaddons -, kwindowsystem -, phonon -, qtx11extras -}: - -kdeFramework { - name = "knotifications"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - kcodecs kconfig kcoreaddons kwindowsystem - phonon qtx11extras - ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/knotifyconfig.nix b/pkgs/development/libraries/kde-frameworks-5.13/knotifyconfig.nix deleted file mode 100644 index f6509a166d4..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.13/knotifyconfig.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kcompletion -, kconfig -, ki18n -, kio -, phonon -}: - -kdeFramework { - name = "knotifyconfig"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ kcompletion kconfig ki18n kio phonon ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kpackage/0001-allow-external-paths.patch b/pkgs/development/libraries/kde-frameworks-5.13/kpackage/0001-allow-external-paths.patch deleted file mode 100644 index 440e979c008..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.13/kpackage/0001-allow-external-paths.patch +++ /dev/null @@ -1,25 +0,0 @@ -From fbf10d2059fa1f19a0f0cfa2fda0abb6c435fa78 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Wed, 28 Jan 2015 07:15:30 -0600 -Subject: [PATCH] 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 eb4a09b..f70f1a1 100644 ---- a/src/kpackage/package.cpp -+++ b/src/kpackage/package.cpp -@@ -758,7 +758,7 @@ PackagePrivate::PackagePrivate() - : QSharedData(), - fallbackPackage(0), - metadata(0), -- externalPaths(false), -+ externalPaths(true), - valid(false), - checkedValid(false) - { --- -2.1.4 - diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kpackage/default.nix b/pkgs/development/libraries/kde-frameworks-5.13/kpackage/default.nix deleted file mode 100644 index f7c3689503b..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.13/kpackage/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, karchive -, kconfig -, kcoreaddons -, kdoctools -, ki18n -}: - -kdeFramework { - name = "kpackage"; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - buildInputs = [ karchive kconfig ki18n ]; - propagatedBuildInputs = [ kcoreaddons ]; - patches = [ ./0001-allow-external-paths.patch ]; - postInstall = '' - wrapKDEProgram "$out/bin/kpackagetool5" - ''; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kparts.nix b/pkgs/development/libraries/kde-frameworks-5.13/kparts.nix deleted file mode 100644 index 96c1b984ab7..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.13/kparts.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kconfig -, kcoreaddons -, ki18n -, kiconthemes -, kio -, kjobwidgets -, knotifications -, kservice -, ktextwidgets -, kwidgetsaddons -, kxmlgui -}: - -kdeFramework { - name = "kparts"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - kconfig kcoreaddons ki18n kiconthemes kjobwidgets knotifications - kservice kwidgetsaddons - ]; - propagatedBuildInputs = [ kio ktextwidgets kxmlgui ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kpeople.nix b/pkgs/development/libraries/kde-frameworks-5.13/kpeople.nix deleted file mode 100644 index ffc028d97c3..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.13/kpeople.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kcoreaddons -, ki18n -, kitemviews -, kservice -, kwidgetsaddons -, qtdeclarative -}: - -kdeFramework { - name = "kpeople"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - kcoreaddons ki18n kitemviews kservice kwidgetsaddons qtdeclarative - ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kplotting.nix b/pkgs/development/libraries/kde-frameworks-5.13/kplotting.nix deleted file mode 100644 index c16f51b5ac3..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.13/kplotting.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -}: - -kdeFramework { - name = "kplotting"; - nativeBuildInputs = [ extra-cmake-modules ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kpty.nix b/pkgs/development/libraries/kde-frameworks-5.13/kpty.nix deleted file mode 100644 index 72ac842a00a..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.13/kpty.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kcoreaddons -, ki18n -}: - -kdeFramework { - name = "kpty"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ ki18n ]; - propagatedBuildInputs = [ kcoreaddons ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kross.nix b/pkgs/development/libraries/kde-frameworks-5.13/kross.nix deleted file mode 100644 index ca14e9827e2..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.13/kross.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kcompletion -, kcoreaddons -, kdoctools -, ki18n -, kiconthemes -, kio -, kparts -, kwidgetsaddons -, kxmlgui -, qtscript -}: - -kdeFramework { - name = "kross"; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - buildInputs = [ kcompletion kcoreaddons kxmlgui ]; - propagatedBuildInputs = [ ki18n kiconthemes kio kparts kwidgetsaddons qtscript ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/krunner.nix b/pkgs/development/libraries/kde-frameworks-5.13/krunner.nix deleted file mode 100644 index 618494ef5c5..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.13/krunner.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kconfig -, kcoreaddons -, ki18n -, kio -, kservice -, plasma-framework -, qtquick1 -, solid -, threadweaver -}: - -kdeFramework { - name = "krunner"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - kconfig kcoreaddons ki18n kio kservice qtquick1 solid threadweaver - ]; - propagatedBuildInputs = [ plasma-framework ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kservice/default.nix b/pkgs/development/libraries/kde-frameworks-5.13/kservice/default.nix deleted file mode 100644 index b46797f5e0e..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.13/kservice/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kconfig -, kcoreaddons -, kcrash -, kdbusaddons -, kdoctools -, ki18n -, kwindowsystem -}: - -kdeFramework { - name = "kservice"; - setupHook = ./setup-hook.sh; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - buildInputs = [ kcoreaddons kcrash kdbusaddons ki18n kwindowsystem ]; - propagatedBuildInputs = [ kconfig ]; - patches = [ - ./kservice-kbuildsycoca-follow-symlinks.patch - ./kservice-kbuildsycoca-no-canonicalize-path.patch - ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kservice/kservice-kbuildsycoca-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.13/kservice/kservice-kbuildsycoca-follow-symlinks.patch deleted file mode 100644 index e9bc418544a..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.13/kservice/kservice-kbuildsycoca-follow-symlinks.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/kbuildsycoca/kbuildsycoca.cpp b/src/kbuildsycoca/kbuildsycoca.cpp -index 69b1427..9c37a49 100644 ---- a/src/kbuildsycoca/kbuildsycoca.cpp -+++ b/src/kbuildsycoca/kbuildsycoca.cpp -@@ -227,7 +227,7 @@ bool KBuildSycoca::build() - QStringList relFiles; - const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, g_resourceSubdir, QStandardPaths::LocateDirectory); - Q_FOREACH (const QString &dir, dirs) { -- QDirIterator it(dir, QDirIterator::Subdirectories); -+ QDirIterator it(dir, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); - while (it.hasNext()) { - const QString filePath = it.next(); - Q_ASSERT(filePath.startsWith(dir)); // due to the line below... diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch b/pkgs/development/libraries/kde-frameworks-5.13/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch deleted file mode 100644 index 7e21ebfe86f..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.13/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/kbuildsycoca/vfolder_menu.cpp b/src/kbuildsycoca/vfolder_menu.cpp -index 2eb1275..e39a36f 100644 ---- a/src/kbuildsycoca/vfolder_menu.cpp -+++ b/src/kbuildsycoca/vfolder_menu.cpp -@@ -412,7 +412,7 @@ VFolderMenu::absoluteDir(const QString &_dir, const QString &baseDir, bool keepR - } - - if (!relative) { -- QString resolved = QDir(dir).canonicalPath(); -+ QString resolved = QDir::cleanPath(dir); - if (!resolved.isEmpty()) { - dir = resolved; - } diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kservice/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.13/kservice/setup-hook.sh deleted file mode 100644 index 007876a0b30..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.13/kservice/setup-hook.sh +++ /dev/null @@ -1,13 +0,0 @@ -export KDESYCOCA="$out/var/cache/kservices5/$name.sycoca" - -KSERVICE_BUILD_KDESYCOCA= - -buildKdeSycoca() { - if [[ -n "$KSERVICE_BUILD_KDESYCOCA" ]]; then - echo "building kdesycoca database in $KDESYCOCA" - mkdir -p "$(dirname $KDESYCOCA)" - kbuildsycoca5 --nosignal - fi -} - -preFixupPhases+=" buildKdeSycoca" diff --git a/pkgs/development/libraries/kde-frameworks-5.13/ktexteditor/0001-no-qcoreapplication.patch b/pkgs/development/libraries/kde-frameworks-5.13/ktexteditor/0001-no-qcoreapplication.patch deleted file mode 100644 index c2e77a537c5..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.13/ktexteditor/0001-no-qcoreapplication.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 71e28c7c6fdd1142f04c662f45cc8f779e457cda Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Sun, 15 Feb 2015 19:09:17 -0600 -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 3f02e8c..d1a865b 100644 ---- a/src/syntax/data/katehighlightingindexer.cpp -+++ b/src/syntax/data/katehighlightingindexer.cpp -@@ -49,19 +49,16 @@ QStringList readListing(const QString &fileName) - - int main(int argc, char *argv[]) - { -- // get app instance -- QCoreApplication app(argc, argv); -- - // ensure enough arguments are passed -- if (app.arguments().size() < 3) -+ if (argc < 3) - return 1; - - // open schema - QXmlSchema schema; -- if (!schema.load(QUrl::fromLocalFile(app.arguments().at(2)))) -+ if (!schema.load(QUrl::fromLocalFile(QString::fromLocal8Bit(argv[2])))) - return 2; - -- const QString hlFilenamesListing = app.arguments().value(3); -+ const QString hlFilenamesListing = QString::fromLocal8Bit(argv[3]); - if (hlFilenamesListing.isEmpty()) { - return 1; - } -@@ -127,7 +124,7 @@ int main(int argc, char *argv[]) - return anyError; - - // create outfile, after all has worked! -- QFile outFile(app.arguments().at(1)); -+ QFile outFile(QString::fromLocal8Bit(argv[1])); - if (!outFile.open(QIODevice::WriteOnly | QIODevice::Truncate)) - return 7; - --- -2.1.4 - diff --git a/pkgs/development/libraries/kde-frameworks-5.13/ktexteditor/default.nix b/pkgs/development/libraries/kde-frameworks-5.13/ktexteditor/default.nix deleted file mode 100644 index 8c02e602c5d..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.13/ktexteditor/default.nix +++ /dev/null @@ -1,27 +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 ki18n kiconthemes kio kparts - qtscript qtxmlpatterns sonnet - ]; - patches = [ ./0001-no-qcoreapplication.patch ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/ktextwidgets.nix b/pkgs/development/libraries/kde-frameworks-5.13/ktextwidgets.nix deleted file mode 100644 index e27839162ef..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.13/ktextwidgets.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kcompletion -, kconfig -, kconfigwidgets -, ki18n -, kiconthemes -, kservice -, kwindowsystem -, sonnet -}: - -kdeFramework { - name = "ktextwidgets"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - kcompletion kconfig kconfigwidgets kiconthemes kservice kwindowsystem - ]; - propagatedBuildInputs = [ ki18n sonnet ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kunitconversion.nix b/pkgs/development/libraries/kde-frameworks-5.13/kunitconversion.nix deleted file mode 100644 index 6c6a4caeb98..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.13/kunitconversion.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, ki18n -}: - -kdeFramework { - name = "kunitconversion"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ ki18n ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kwallet.nix b/pkgs/development/libraries/kde-frameworks-5.13/kwallet.nix deleted file mode 100644 index 267ddf8303d..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.13/kwallet.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kconfig -, kcoreaddons -, kdbusaddons -, kdoctools -, ki18n -, kiconthemes -, knotifications -, kservice -, kwidgetsaddons -, kwindowsystem -, libgcrypt -}: - -kdeFramework { - name = "kwallet"; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - buildInputs = [ - kconfig kcoreaddons kdbusaddons ki18n kiconthemes knotifications - kservice kwidgetsaddons kwindowsystem libgcrypt - ]; - postInstall = '' - wrapKDEProgram "$out/bin/kwalletd5" - wrapKDEProgram "$out/bin/kwallet-query" - ''; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kwidgetsaddons.nix b/pkgs/development/libraries/kde-frameworks-5.13/kwidgetsaddons.nix deleted file mode 100644 index d95f44d3fec..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.13/kwidgetsaddons.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -}: - -kdeFramework { - name = "kwidgetsaddons"; - nativeBuildInputs = [ extra-cmake-modules ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kwindowsystem.nix b/pkgs/development/libraries/kde-frameworks-5.13/kwindowsystem.nix deleted file mode 100644 index 09ab1f2200d..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.13/kwindowsystem.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, qtx11extras -}: - -kdeFramework { - name = "kwindowsystem"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ qtx11extras ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kxmlgui.nix b/pkgs/development/libraries/kde-frameworks-5.13/kxmlgui.nix deleted file mode 100644 index 6e1398d2f84..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.13/kxmlgui.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, attica -, kconfig -, kconfigwidgets -, kglobalaccel -, ki18n -, kiconthemes -, kitemviews -, ktextwidgets -, kwindowsystem -, sonnet -}: - -kdeFramework { - name = "kxmlgui"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - attica kconfig kconfigwidgets kglobalaccel ki18n kiconthemes - kitemviews ktextwidgets kwindowsystem sonnet - ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kxmlrpcclient.nix b/pkgs/development/libraries/kde-frameworks-5.13/kxmlrpcclient.nix deleted file mode 100644 index b28c00a33be..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.13/kxmlrpcclient.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, ki18n -, kio -}: - -kdeFramework { - name = "kxmlrpcclient"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ ki18n ]; - propagatedBuildInputs = [ kio ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/modemmanager-qt.nix b/pkgs/development/libraries/kde-frameworks-5.13/modemmanager-qt.nix deleted file mode 100644 index 7d7f769d6a9..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.13/modemmanager-qt.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, modemmanager -}: - -kdeFramework { - name = "modemmanager-qt"; - nativeBuildInputs = [ extra-cmake-modules ]; - propagatedBuildInputs = [ modemmanager ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/networkmanager-qt.nix b/pkgs/development/libraries/kde-frameworks-5.13/networkmanager-qt.nix deleted file mode 100644 index 333378bd143..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.13/networkmanager-qt.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, networkmanager -}: - -kdeFramework { - name = "networkmanager-qt"; - nativeBuildInputs = [ extra-cmake-modules ]; - propagatedBuildInputs = [ networkmanager ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/plasma-framework/default.nix b/pkgs/development/libraries/kde-frameworks-5.13/plasma-framework/default.nix deleted file mode 100644 index d838996f99c..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.13/plasma-framework/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kactivities -, karchive -, kconfig -, kconfigwidgets -, kcoreaddons -, kdbusaddons -, kdeclarative -, kdoctools -, kglobalaccel -, kguiaddons -, ki18n -, kiconthemes -, kio -, knotifications -, kpackage -, kservice -, kwindowsystem -, kxmlgui -, qtscript -, qtx11extras -}: - -kdeFramework { - name = "plasma-framework"; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - buildInputs = [ - kactivities karchive kconfig kconfigwidgets kcoreaddons - kdbusaddons kdeclarative kglobalaccel kguiaddons ki18n kiconthemes - kio knotifications kwindowsystem kxmlgui qtscript qtx11extras - ]; - propagatedBuildInputs = [ kpackage kservice ]; - postInstall = '' - wrapKDEProgram "$out/bin/plasmapkg2" - ''; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/solid.nix b/pkgs/development/libraries/kde-frameworks-5.13/solid.nix deleted file mode 100644 index 06b0797cbc1..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.13/solid.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -}: - -kdeFramework { - name = "solid"; - nativeBuildInputs = [ extra-cmake-modules ]; - postInstall = '' - wrapKDEProgram "$out/bin/solid-hardware5" - ''; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/sonnet.nix b/pkgs/development/libraries/kde-frameworks-5.13/sonnet.nix deleted file mode 100644 index 943fe04a1c9..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.13/sonnet.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, hunspell -}: - -kdeFramework { - name = "sonnet"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ hunspell ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/srcs.nix b/pkgs/development/libraries/kde-frameworks-5.13/srcs.nix deleted file mode 100644 index 9cfb9c2006a..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.13/srcs.nix +++ /dev/null @@ -1,549 +0,0 @@ -# DO NOT EDIT! This file is generated automatically by manifest.sh -{ fetchurl, mirror }: - -{ - kiconthemes = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/kiconthemes-5.13.0.tar.xz"; - sha256 = "1zsqmq1vzpiflnhr4ydwyg84cfima2hh0m61pgsxki98a8cfjz78"; - name = "kiconthemes-5.13.0.tar.xz"; - }; - }; - kitemmodels = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/kitemmodels-5.13.0.tar.xz"; - sha256 = "1bcnssm0sp4xs2wm9x65705671y97bhgjlbqvngdw95qr8mjalda"; - name = "kitemmodels-5.13.0.tar.xz"; - }; - }; - kactivities = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/kactivities-5.13.0.tar.xz"; - sha256 = "0k1f3iliwws30f9d3gfrx3cxqcmr3v9w0p4nxnk35qa7bflkw2jp"; - name = "kactivities-5.13.0.tar.xz"; - }; - }; - threadweaver = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/threadweaver-5.13.0.tar.xz"; - sha256 = "06hvraianc559plk50rfg4a7rwykq7s9ak343xylm37mg3sx3myn"; - name = "threadweaver-5.13.0.tar.xz"; - }; - }; - bluez-qt = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/bluez-qt-5.13.0.tar.xz"; - sha256 = "0ccylfkph8kxni2kfbdk7zzvywsn447kkvfx5xm63l19acff74c8"; - name = "bluez-qt-5.13.0.tar.xz"; - }; - }; - plasma-framework = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/plasma-framework-5.13.0.tar.xz"; - sha256 = "0fk3a7xzhi761kl2xwxhxv2kp4cblqzn7ylk6q60x2cr3vd3jxgb"; - name = "plasma-framework-5.13.0.tar.xz"; - }; - }; - kguiaddons = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/kguiaddons-5.13.0.tar.xz"; - sha256 = "0p33i1hwzcbczxdw8mnkknb35v7n8m6x9jr9gysvzhg76l2z6ca7"; - name = "kguiaddons-5.13.0.tar.xz"; - }; - }; - ktexteditor = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/ktexteditor-5.13.0.tar.xz"; - sha256 = "1paiqpi73pvhqjcgk9l7agqk4s9pw9fghh1ipfw6clklrkpwjy2f"; - name = "ktexteditor-5.13.0.tar.xz"; - }; - }; - kinit = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/kinit-5.13.0.tar.xz"; - sha256 = "06jcznxw346g6cr08ykgl2bc8wfann5s4rs0py6ah1al5py87jbq"; - name = "kinit-5.13.0.tar.xz"; - }; - }; - kxmlgui = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/kxmlgui-5.13.0.tar.xz"; - sha256 = "06i873lsy0k67jdipzakc5gxmya82s8mkprkzb7pvac2ird2y66q"; - name = "kxmlgui-5.13.0.tar.xz"; - }; - }; - kdbusaddons = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/kdbusaddons-5.13.0.tar.xz"; - sha256 = "1w118l5qc0kn5fmv5dqaxidxjsgzzq4ak9pk6vgafrdf7f79dy82"; - name = "kdbusaddons-5.13.0.tar.xz"; - }; - }; - kunitconversion = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/kunitconversion-5.13.0.tar.xz"; - sha256 = "1cff7ighx6r64vv5wc88gnnq4k0c6c18k92nlj56b61g94sjx5xp"; - name = "kunitconversion-5.13.0.tar.xz"; - }; - }; - kemoticons = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/kemoticons-5.13.0.tar.xz"; - sha256 = "0cxi6gldp9qpi47g0chg6bhr17w43bv36pf2gg2dsy5mymnw1iaj"; - name = "kemoticons-5.13.0.tar.xz"; - }; - }; - kcompletion = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/kcompletion-5.13.0.tar.xz"; - sha256 = "0j47bwi7sw2khyi3qp0b77npgf40wfax1j9zic68xg1yjf4y52b4"; - name = "kcompletion-5.13.0.tar.xz"; - }; - }; - kpackage = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/kpackage-5.13.0.tar.xz"; - sha256 = "0ybdzx33gcpb4j18vnv99hbycrlwxzhwblz07m1a0q1k2x004hla"; - name = "kpackage-5.13.0.tar.xz"; - }; - }; - kpty = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/kpty-5.13.0.tar.xz"; - sha256 = "0c37zv1lrdma4659chmh27naxflhjz614h385im0m717hx67v5v0"; - name = "kpty-5.13.0.tar.xz"; - }; - }; - kservice = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/kservice-5.13.0.tar.xz"; - sha256 = "1a7pz9m948xfiqphm29k7wnc24qv5xm8zb7f61mfbmzic18p4076"; - name = "kservice-5.13.0.tar.xz"; - }; - }; - kwidgetsaddons = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/kwidgetsaddons-5.13.0.tar.xz"; - sha256 = "19s31brrqhb1vncc4rkik42l4si28ky3d5ysvnyx7mw2jip4929i"; - name = "kwidgetsaddons-5.13.0.tar.xz"; - }; - }; - kimageformats = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/kimageformats-5.13.0.tar.xz"; - sha256 = "0lqraljikwkp88wnb1zxmylk7gn7rsp9301jn2qff3i0aa8m56ly"; - name = "kimageformats-5.13.0.tar.xz"; - }; - }; - kwindowsystem = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/kwindowsystem-5.13.0.tar.xz"; - sha256 = "18ihvj1s4apsb647gbp8ghl083f3idpld693vwi138fsk89nhn67"; - name = "kwindowsystem-5.13.0.tar.xz"; - }; - }; - kxmlrpcclient = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/kxmlrpcclient-5.13.0.tar.xz"; - sha256 = "18gdfb2yqzyid6zhx98xwd3vk2bnvxgpsk0dmy0098b9jl5gi39h"; - name = "kxmlrpcclient-5.13.0.tar.xz"; - }; - }; - kconfig = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/kconfig-5.13.0.tar.xz"; - sha256 = "0qhymvqccl568ib975fx2jpm91ydsixx8lmf2803m89nad3bi77p"; - name = "kconfig-5.13.0.tar.xz"; - }; - }; - kdeclarative = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/kdeclarative-5.13.0.tar.xz"; - sha256 = "1c65ls02pqg1apmxvw3xhi8d7i4pwvx777jp755zbz6f0k2q5h14"; - name = "kdeclarative-5.13.0.tar.xz"; - }; - }; - kapidox = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/kapidox-5.13.0.tar.xz"; - sha256 = "0gg72qli7yix0v6riywbw0iw3y28jzk84p161lh7izql8kb463zj"; - name = "kapidox-5.13.0.tar.xz"; - }; - }; - knotifyconfig = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/knotifyconfig-5.13.0.tar.xz"; - sha256 = "19my0x60vhhngdzb5nr0cdi5yby4113pzqzg39wslbb1n5mcfqky"; - name = "knotifyconfig-5.13.0.tar.xz"; - }; - }; - kcodecs = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/kcodecs-5.13.0.tar.xz"; - sha256 = "0b1jaxkkqmi7r013vpyhhqaqbg6hwc4nb0bm23nr1az9qasdvxzm"; - name = "kcodecs-5.13.0.tar.xz"; - }; - }; - kdnssd = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/kdnssd-5.13.0.tar.xz"; - sha256 = "1jaa8lwqq4y1rl381j85qzxxyqw2if95rs8q5lsm14xq9jgwrf6r"; - name = "kdnssd-5.13.0.tar.xz"; - }; - }; - ktextwidgets = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/ktextwidgets-5.13.0.tar.xz"; - sha256 = "1p38j96z19fy1pdc249myl5mm0nbs7nrrhkmgfjig24lamivy98h"; - name = "ktextwidgets-5.13.0.tar.xz"; - }; - }; - kauth = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/kauth-5.13.0.tar.xz"; - sha256 = "1j1kx9dypirpw41i8cx8dylwqaqm8rdbkxb0xmvyi7x8pax7rmkk"; - name = "kauth-5.13.0.tar.xz"; - }; - }; - kplotting = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/kplotting-5.13.0.tar.xz"; - sha256 = "0f4vafy4b473407lm2kazllxzdiq1blvmypab7jlk0bj206vmdhq"; - name = "kplotting-5.13.0.tar.xz"; - }; - }; - ki18n = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/ki18n-5.13.0.tar.xz"; - sha256 = "1izriaip8r7cgm36mid6fxsvg661311lm6aalqaxq9xa70lkq3xm"; - name = "ki18n-5.13.0.tar.xz"; - }; - }; - knotifications = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/knotifications-5.13.0.tar.xz"; - sha256 = "04n50hkg6h3j49l1bi0igr79vgb8xfw74mbaw5s20nw55y2xyziv"; - name = "knotifications-5.13.0.tar.xz"; - }; - }; - kitemviews = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/kitemviews-5.13.0.tar.xz"; - sha256 = "0iazr2fyhksa3wsfrqaknxs74h66fb6drg9vcg18dml9mv0v9jgw"; - name = "kitemviews-5.13.0.tar.xz"; - }; - }; - kcoreaddons = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/kcoreaddons-5.13.0.tar.xz"; - sha256 = "0qc9lmc90bhrzaaf611vn7x5z549yvl1dk2ba726qaxb8hf5fhmx"; - name = "kcoreaddons-5.13.0.tar.xz"; - }; - }; - kwallet = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/kwallet-5.13.0.tar.xz"; - sha256 = "0p7as0ma40dssd171mpi68sdih5fr03lcwvhy3zazhhpf5gjfwv8"; - name = "kwallet-5.13.0.tar.xz"; - }; - }; - modemmanager-qt = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/modemmanager-qt-5.13.0.tar.xz"; - sha256 = "17a4d7pp2qj7zvxfd8qicj332n25nj6d8xs585fkqlwsk5qvv5mh"; - name = "modemmanager-qt-5.13.0.tar.xz"; - }; - }; - kio = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/kio-5.13.0.tar.xz"; - sha256 = "1m6vids0ahdvqw1wgiss11cb6z2x81acig8x38jgjna8al6dw7y3"; - name = "kio-5.13.0.tar.xz"; - }; - }; - baloo = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/baloo-5.13.0.tar.xz"; - sha256 = "159gkr4xsyj7sb6dqvjlldyl8hdm0sgzhbczb24q182dnwqrmmbq"; - name = "baloo-5.13.0.tar.xz"; - }; - }; - karchive = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/karchive-5.13.0.tar.xz"; - sha256 = "0qg90h4iiyb3frnqs01r440pan1m0mn6y0b4025ync1g50iyf1jz"; - name = "karchive-5.13.0.tar.xz"; - }; - }; - kdoctools = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/kdoctools-5.13.0.tar.xz"; - sha256 = "0604rmrg6b8h4pw14kwal04s21f9gkrf495csj3jsm7042z5p6rf"; - name = "kdoctools-5.13.0.tar.xz"; - }; - }; - kparts = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/kparts-5.13.0.tar.xz"; - sha256 = "1mqklszbhlk8pdwig88yqa5jpjbdzkz9q618c4029aqiazzjqs39"; - name = "kparts-5.13.0.tar.xz"; - }; - }; - kdewebkit = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/kdewebkit-5.13.0.tar.xz"; - sha256 = "1n8x0biy5s73qihx9niivhmfdfglnai360k4llpjq9vhd8fassjx"; - name = "kdewebkit-5.13.0.tar.xz"; - }; - }; - kidletime = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/kidletime-5.13.0.tar.xz"; - sha256 = "1d6p4ld8wday3sb3gdvivigw7vk33akawf531ghc8rhmi7mr2db2"; - name = "kidletime-5.13.0.tar.xz"; - }; - }; - extra-cmake-modules = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/extra-cmake-modules-5.13.0.tar.xz"; - sha256 = "1hnmsghfnl99ihgnp90pbh3ngh4l6n6d5g7ial6bfzrlfn588lms"; - name = "extra-cmake-modules-5.13.0.tar.xz"; - }; - }; - frameworkintegration = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/frameworkintegration-5.13.0.tar.xz"; - sha256 = "03pzic63vi1bmcf4vlk2kfcs6fbc9p0plzydizqmm34iiv8k48jb"; - name = "frameworkintegration-5.13.0.tar.xz"; - }; - }; - kjs = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/portingAids/kjs-5.13.0.tar.xz"; - sha256 = "1ij3f303k1higj5l7l3pxl6qlp8arf3qizbar2d36f3qczyql5r8"; - name = "kjs-5.13.0.tar.xz"; - }; - }; - krunner = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/portingAids/krunner-5.13.0.tar.xz"; - sha256 = "1yj97lp6ny9m45nankgkq7zdw929mw218pq7yalr21vqqxwvd84a"; - name = "krunner-5.13.0.tar.xz"; - }; - }; - khtml = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/portingAids/khtml-5.13.0.tar.xz"; - sha256 = "0mykidqkhs0hd6s4i8li25gk8dzysw6imc2lfjbwvyyvx6lyd55m"; - name = "khtml-5.13.0.tar.xz"; - }; - }; - kmediaplayer = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/portingAids/kmediaplayer-5.13.0.tar.xz"; - sha256 = "19kazkjsc2s1wfcslmi46ic1h7jvwdbbc6y9713jb1yymp6jzz30"; - name = "kmediaplayer-5.13.0.tar.xz"; - }; - }; - kross = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/portingAids/kross-5.13.0.tar.xz"; - sha256 = "18237mj3bzwj4vdxjxqn1b865syi3z3f1zlrnfslijssgw6qs41m"; - name = "kross-5.13.0.tar.xz"; - }; - }; - kjsembed = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/portingAids/kjsembed-5.13.0.tar.xz"; - sha256 = "0inlb47rkfriwnbkkhgb20kc86b38yl9xxwn8cjx80m61sj8ici8"; - name = "kjsembed-5.13.0.tar.xz"; - }; - }; - kdelibs4support = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/portingAids/kdelibs4support-5.13.0.tar.xz"; - sha256 = "1hlniaw259yz6vs42w0q7mjycq1vf8ggvsigc09ij8bj7k7ih3s3"; - name = "kdelibs4support-5.13.0.tar.xz"; - }; - }; - kcrash = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/kcrash-5.13.0.tar.xz"; - sha256 = "07cb6jmf1w74ndcfj4mcpc60xkpnl69jzdd5ljxsi2k1awvjs58n"; - name = "kcrash-5.13.0.tar.xz"; - }; - }; - kcmutils = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/kcmutils-5.13.0.tar.xz"; - sha256 = "13jc3053jf3lg2zrrqi4mcsnma6xd6p56ilaw86bgvdsq1fkr84b"; - name = "kcmutils-5.13.0.tar.xz"; - }; - }; - knewstuff = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/knewstuff-5.13.0.tar.xz"; - sha256 = "12pyxdb9rq60hcw7k8sh79mq6l5h5zdrixn778yps27ckf69icsr"; - name = "knewstuff-5.13.0.tar.xz"; - }; - }; - kded = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/kded-5.13.0.tar.xz"; - sha256 = "0yfpx2dc2x7jzyxmj0k92ar2rvzabz75dwh09rr93wyzyjr1l7i9"; - name = "kded-5.13.0.tar.xz"; - }; - }; - kconfigwidgets = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/kconfigwidgets-5.13.0.tar.xz"; - sha256 = "1m5n24c34sdr9hfap2riws0n58pka0a0n23gxdzxwbk9z1fj97zy"; - name = "kconfigwidgets-5.13.0.tar.xz"; - }; - }; - solid = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/solid-5.13.0.tar.xz"; - sha256 = "1s06qbicni2g99kmp7kd06xrps0pqb9d9q04pmmlqdg24fcm0aik"; - name = "solid-5.13.0.tar.xz"; - }; - }; - kjobwidgets = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/kjobwidgets-5.13.0.tar.xz"; - sha256 = "0vjqidawgca5zr5vfm55lqnvzr9pk0dp1w85pdpp576rsjg34404"; - name = "kjobwidgets-5.13.0.tar.xz"; - }; - }; - kdesignerplugin = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/kdesignerplugin-5.13.0.tar.xz"; - sha256 = "0iibam8d34kyvq0qpbfx1ligwcyp84x4ycr01bydnbc58qz6hg3y"; - name = "kdesignerplugin-5.13.0.tar.xz"; - }; - }; - kglobalaccel = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/kglobalaccel-5.13.0.tar.xz"; - sha256 = "1fdfcyb93p39gbkvmzv43hg33vjsr9g2y9vbr07j38q9vgjipynl"; - name = "kglobalaccel-5.13.0.tar.xz"; - }; - }; - attica = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/attica-5.13.0.tar.xz"; - sha256 = "0fxqf8ab8y7lkj0c09zrshwykx2na5yqb3wxlfd8ngd6cyk34r8h"; - name = "attica-5.13.0.tar.xz"; - }; - }; - kdesu = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/kdesu-5.13.0.tar.xz"; - sha256 = "0413lddgrwhx3jn2xhmi6gllv4cg2136f00bg0zxdnvgjbavj50g"; - name = "kdesu-5.13.0.tar.xz"; - }; - }; - sonnet = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/sonnet-5.13.0.tar.xz"; - sha256 = "05j79i2aq6cy2crjwsifsfj5kb74ca0bz9yl1302gkdn6qy3lx57"; - name = "sonnet-5.13.0.tar.xz"; - }; - }; - kfilemetadata = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/kfilemetadata-5.13.0.tar.xz"; - sha256 = "0c7m1ha1s020jbb5925s859lknq10df1162aal8g99nxvadvkafx"; - name = "kfilemetadata-5.13.0.tar.xz"; - }; - }; - networkmanager-qt = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/networkmanager-qt-5.13.0.tar.xz"; - sha256 = "16v2vr92yfins23h2h6ddlvlf2iasbz67dr8gzyhwa9kcwr23a19"; - name = "networkmanager-qt-5.13.0.tar.xz"; - }; - }; - kbookmarks = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/kbookmarks-5.13.0.tar.xz"; - sha256 = "0gmsvhphilv7aqci51hlvaikgpxhbgi6f41qb1ybkjjh6gfcz6lg"; - name = "kbookmarks-5.13.0.tar.xz"; - }; - }; - kpeople = { - version = "5.13.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.13/kpeople-5.13.0.tar.xz"; - sha256 = "1fw9jgkqv1hx5llpkws0v0pcfjjbh7z9b7z474y7ix2ycg9ikxqn"; - name = "kpeople-5.13.0.tar.xz"; - }; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/threadweaver.nix b/pkgs/development/libraries/kde-frameworks-5.13/threadweaver.nix deleted file mode 100644 index 52817921cc7..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.13/threadweaver.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -}: - -kdeFramework { - name = "threadweaver"; - nativeBuildInputs = [ extra-cmake-modules ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.14/attica.nix b/pkgs/development/libraries/kde-frameworks-5.14/attica.nix new file mode 100644 index 00000000000..98721876c12 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.14/attica.nix @@ -0,0 +1,11 @@ +{ kdeFramework, lib +, extra-cmake-modules +}: + +kdeFramework { + name = "attica"; + nativeBuildInputs = [ extra-cmake-modules ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.14/baloo.nix b/pkgs/development/libraries/kde-frameworks-5.14/baloo.nix new file mode 100644 index 00000000000..8b6b3509f0d --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.14/baloo.nix @@ -0,0 +1,49 @@ +{ kdeFramework, lib +, extra-cmake-modules +, kauth +, kconfig +, kcoreaddons +, kcrash +, kdbusaddons +, kfilemetadata +, ki18n +, kidletime +, kio +, lmdb +, qtbase +, qtquick1 +, solid +}: + +kdeFramework { + name = "baloo"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ + kauth + kconfig + kcrash + kdbusaddons + ki18n + kidletime + kio + lmdb + qtquick1 + solid + ]; + propagatedBuildInputs = [ + kcoreaddons + kfilemetadata + qtbase + ]; + postInstall = '' + wrapKDEProgram "$out/bin/baloo_file" + wrapKDEProgram "$out/bin/baloo_file_extractor" + wrapKDEProgram "$out/bin/balooctl" + wrapKDEProgram "$out/bin/baloosearch" + wrapKDEProgram "$out/bin/balooshow" + wrapKDEProgram "$out/bin/baloo-monitor" + ''; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.14/bluez-qt.nix b/pkgs/development/libraries/kde-frameworks-5.14/bluez-qt.nix new file mode 100644 index 00000000000..f981b0516f7 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.14/bluez-qt.nix @@ -0,0 +1,17 @@ +{ kdeFramework, lib +, extra-cmake-modules +, qtdeclarative +}: + +kdeFramework { + name = "bluez-qt"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ qtdeclarative ]; + preConfigure = '' + substituteInPlace CMakeLists.txt \ + --replace /lib/udev/rules.d "$out/lib/udev/rules.d" + ''; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.14/default.nix b/pkgs/development/libraries/kde-frameworks-5.14/default.nix new file mode 100644 index 00000000000..1ff433c13c8 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.14/default.nix @@ -0,0 +1,112 @@ +# Maintainer's Notes: +# +# How To Update +# 1. Edit the URL in ./manifest.sh +# 2. Run ./manifest.sh +# 3. Fix build errors. + +{ pkgs, debug ? false }: + +let + + inherit (pkgs) lib stdenv; + + mirror = "mirror://kde"; + srcs = import ./srcs.nix { inherit (pkgs) fetchurl; inherit mirror; }; + + kdeFramework = args: + let + inherit (args) name; + inherit (srcs."${name}") src version; + in stdenv.mkDerivation (args // { + name = "${name}-${version}"; + inherit src; + + cmakeFlags = + (args.cmakeFlags or []) + ++ [ "-DBUILD_TESTING=OFF" ] + ++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug"; + + meta = { + license = with lib.licenses; [ + lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12 + ]; + platforms = lib.platforms.linux; + homepage = "http://www.kde.org"; + } // (args.meta or {}); + }); + + addPackages = self: with self; { + attica = callPackage ./attica.nix {}; + baloo = callPackage ./baloo.nix {}; + bluez-qt = callPackage ./bluez-qt.nix {}; + extra-cmake-modules = callPackage ./extra-cmake-modules {}; + frameworkintegration = callPackage ./frameworkintegration.nix {}; + kactivities = callPackage ./kactivities.nix {}; + kapidox = callPackage ./kapidox.nix {}; + karchive = callPackage ./karchive.nix {}; + kauth = callPackage ./kauth {}; + kbookmarks = callPackage ./kbookmarks.nix {}; + kcmutils = callPackage ./kcmutils {}; + kcodecs = callPackage ./kcodecs.nix {}; + kcompletion = callPackage ./kcompletion.nix {}; + kconfig = callPackage ./kconfig.nix {}; + kconfigwidgets = callPackage ./kconfigwidgets {}; + kcoreaddons = callPackage ./kcoreaddons.nix {}; + kcrash = callPackage ./kcrash.nix {}; + kdbusaddons = callPackage ./kdbusaddons.nix {}; + kdeclarative = callPackage ./kdeclarative.nix {}; + kded = callPackage ./kded.nix {}; + kdelibs4support = callPackage ./kdelibs4support.nix {}; + kdesignerplugin = callPackage ./kdesignerplugin.nix {}; + kdewebkit = callPackage ./kdewebkit.nix {}; + kdesu = callPackage ./kdesu.nix {}; + kdnssd = callPackage ./kdnssd.nix {}; + kdoctools = callPackage ./kdoctools {}; + kemoticons = callPackage ./kemoticons.nix {}; + kfilemetadata = callPackage ./kfilemetadata.nix {}; + kglobalaccel = callPackage ./kglobalaccel.nix {}; + kguiaddons = callPackage ./kguiaddons.nix {}; + khtml = callPackage ./khtml.nix {}; + ki18n = callPackage ./ki18n.nix {}; + kiconthemes = callPackage ./kiconthemes.nix {}; + kidletime = callPackage ./kidletime.nix {}; + kimageformats = callPackage ./kimageformats.nix {}; + kinit = callPackage ./kinit {}; + kio = callPackage ./kio.nix {}; + kitemmodels = callPackage ./kitemmodels.nix {}; + kitemviews = callPackage ./kitemviews.nix {}; + kjobwidgets = callPackage ./kjobwidgets.nix {}; + kjs = callPackage ./kjs.nix {}; + kjsembed = callPackage ./kjsembed.nix {}; + kmediaplayer = callPackage ./kmediaplayer.nix {}; + knewstuff = callPackage ./knewstuff.nix {}; + knotifications = callPackage ./knotifications.nix {}; + knotifyconfig = callPackage ./knotifyconfig.nix {}; + kpackage = callPackage ./kpackage {}; + kparts = callPackage ./kparts.nix {}; + kpeople = callPackage ./kpeople.nix {}; + kplotting = callPackage ./kplotting.nix {}; + kpty = callPackage ./kpty.nix {}; + kross = callPackage ./kross.nix {}; + krunner = callPackage ./krunner.nix {}; + kservice = callPackage ./kservice {}; + ktexteditor = callPackage ./ktexteditor {}; + ktextwidgets = callPackage ./ktextwidgets.nix {}; + kunitconversion = callPackage ./kunitconversion.nix {}; + kwallet = callPackage ./kwallet.nix {}; + kwidgetsaddons = callPackage ./kwidgetsaddons.nix {}; + kwindowsystem = callPackage ./kwindowsystem.nix {}; + kxmlgui = callPackage ./kxmlgui.nix {}; + kxmlrpcclient = callPackage ./kxmlrpcclient.nix {}; + modemmanager-qt = callPackage ./modemmanager-qt.nix {}; + networkmanager-qt = callPackage ./networkmanager-qt.nix {}; + plasma-framework = callPackage ./plasma-framework {}; + solid = callPackage ./solid.nix {}; + sonnet = callPackage ./sonnet.nix {}; + threadweaver = callPackage ./threadweaver.nix {}; + }; + + newScope = scope: pkgs.qt55Libs.newScope ({ inherit kdeFramework; } // scope); + +in lib.makeScope newScope addPackages diff --git a/pkgs/development/libraries/kde-frameworks-5.14/extra-cmake-modules/0001-extra-cmake-modules-paths.patch b/pkgs/development/libraries/kde-frameworks-5.14/extra-cmake-modules/0001-extra-cmake-modules-paths.patch new file mode 100644 index 00000000000..9717716faf5 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.14/extra-cmake-modules/0001-extra-cmake-modules-paths.patch @@ -0,0 +1,74 @@ +From 3cc148e878b69fc3e0228f3e3bf1bbe689dad87c Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Fri, 20 Feb 2015 23:17:39 -0600 +Subject: [PATCH] extra-cmake-modules paths + +--- + kde-modules/KDEInstallDirs.cmake | 37 ++++--------------------------------- + 1 file changed, 4 insertions(+), 33 deletions(-) + +diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake +index b7cd34d..2f868ac 100644 +--- a/kde-modules/KDEInstallDirs.cmake ++++ b/kde-modules/KDEInstallDirs.cmake +@@ -193,37 +193,8 @@ + # (To distribute this file outside of extra-cmake-modules, substitute the full + # License text for the above reference.) + +-# Figure out what the default install directory for libraries should be. +-# This is based on the logic in GNUInstallDirs, but simplified (the +-# GNUInstallDirs code deals with re-configuring, but that is dealt with +-# by the _define_* macros in this module). ++# The default library directory on NixOS is *always* /lib. + set(_LIBDIR_DEFAULT "lib") +-# Override this default 'lib' with 'lib64' iff: +-# - we are on a Linux, kFreeBSD or Hurd system but NOT cross-compiling +-# - we are NOT on debian +-# - we are on a 64 bits system +-# reason is: amd64 ABI: http://www.x86-64.org/documentation/abi.pdf +-# For Debian with multiarch, use 'lib/${CMAKE_LIBRARY_ARCHITECTURE}' if +-# CMAKE_LIBRARY_ARCHITECTURE is set (which contains e.g. "i386-linux-gnu" +-# See http://wiki.debian.org/Multiarch +-if((CMAKE_SYSTEM_NAME MATCHES "Linux|kFreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "GNU") +- AND NOT CMAKE_CROSSCOMPILING) +- if (EXISTS "/etc/debian_version") # is this a debian system ? +- if(CMAKE_LIBRARY_ARCHITECTURE) +- set(_LIBDIR_DEFAULT "lib/${CMAKE_LIBRARY_ARCHITECTURE}") +- endif() +- else() # not debian, rely on CMAKE_SIZEOF_VOID_P: +- if(NOT DEFINED CMAKE_SIZEOF_VOID_P) +- message(AUTHOR_WARNING +- "Unable to determine default LIB_INSTALL_LIBDIR directory because no target architecture is known. " +- "Please enable at least one language before including KDEInstallDirs.") +- else() +- if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8") +- set(_LIBDIR_DEFAULT "lib64") +- endif() +- endif() +- endif() +-endif() + + set(_gnu_install_dirs_vars + BINDIR +@@ -445,15 +416,15 @@ if(KDE_INSTALL_USE_QT_SYS_PATHS) + "QtQuick2 imports" + QML_INSTALL_DIR) + else() +- _define_relative(QTPLUGINDIR LIBDIR "plugins" ++ _define_relative(QTPLUGINDIR LIBDIR "qt5/plugins" + "Qt plugins" + QT_PLUGIN_INSTALL_DIR) + +- _define_relative(QTQUICKIMPORTSDIR QTPLUGINDIR "imports" ++ _define_relative(QTQUICKIMPORTSDIR QTPLUGINDIR "qt5/imports" + "QtQuick1 imports" + IMPORTS_INSTALL_DIR) + +- _define_relative(QMLDIR LIBDIR "qml" ++ _define_relative(QMLDIR LIBDIR "qt5/qml" + "QtQuick2 imports" + QML_INSTALL_DIR) + endif() +-- +2.3.0 + diff --git a/pkgs/development/libraries/kde-frameworks-5.14/extra-cmake-modules/default.nix b/pkgs/development/libraries/kde-frameworks-5.14/extra-cmake-modules/default.nix new file mode 100644 index 00000000000..4d669b72a89 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.14/extra-cmake-modules/default.nix @@ -0,0 +1,17 @@ +{ kdeFramework, lib, stdenv, cmake, pkgconfig, qttools }: + +kdeFramework { + name = "extra-cmake-modules"; + setupHook = ./setup-hook.sh; + patches = [ ./0001-extra-cmake-modules-paths.patch ]; + + # It is OK to propagate these inputs as long as + # extra-cmake-modules is never a propagated input + # of some other derivation. + propagatedNativeBuildInputs = [ cmake pkgconfig qttools ]; + + meta = { + license = stdenv.lib.licenses.bsd2; + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.14/extra-cmake-modules/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.14/extra-cmake-modules/setup-hook.sh new file mode 100644 index 00000000000..ce9aafb90e8 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.14/extra-cmake-modules/setup-hook.sh @@ -0,0 +1,4 @@ +wrapKDEProgram() { + KSERVICE_BUILD_KDESYCOCA=${KDESYCOCA:+1} + wrapQtProgram "$1" ${KDESYCOCA:+--set KDESYCOCA "$KDESYCOCA"} "$@" +} diff --git a/pkgs/development/libraries/kde-frameworks-5.14/fetchsrcs.sh b/pkgs/development/libraries/kde-frameworks-5.14/fetchsrcs.sh new file mode 100755 index 00000000000..a402d406b8a --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.14/fetchsrcs.sh @@ -0,0 +1,57 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i bash -p coreutils findutils gnused nix wget + +set -x + +# The trailing slash at the end is necessary! +RELEASE_URL="http://download.kde.org/stable/frameworks/5.14/" +EXTRA_WGET_ARGS='-A *.tar.xz' + +mkdir tmp; cd tmp + +rm -f ../srcs.csv + +wget -nH -r -c --no-parent $RELEASE_URL $EXTRA_WGET_ARGS + +find . | while read src; do + if [[ -f "${src}" ]]; then + # Sanitize file name + filename=$(basename "$src" | tr '@' '_') + nameVersion="${filename%.tar.*}" + name=$(echo "$nameVersion" | sed -e 's,-[[:digit:]].*,,' | sed -e 's,-opensource-src$,,') + version=$(echo "$nameVersion" | sed -e 's,^\([[:alpha:]][[:alnum:]]*-\)\+,,') + echo "$name,$version,$src,$filename" >>../srcs.csv + fi +done + +cat >../srcs.nix <>../srcs.nix <>../srcs.nix + +rm -f ../srcs.csv + +cd .. diff --git a/pkgs/development/libraries/kde-frameworks-5.14/frameworkintegration.nix b/pkgs/development/libraries/kde-frameworks-5.14/frameworkintegration.nix new file mode 100644 index 00000000000..ad30cc87ecf --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.14/frameworkintegration.nix @@ -0,0 +1,34 @@ +{ kdeFramework, lib +, extra-cmake-modules +, kbookmarks +, kcompletion +, kconfig +, kconfigwidgets +, ki18n +, kiconthemes +, kio +, knotifications +, kwidgetsaddons +, libXcursor +, qtx11extras +}: + +kdeFramework { + name = "frameworkintegration"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ + kbookmarks + kcompletion + kconfig + ki18n + kio + knotifications + kwidgetsaddons + libXcursor + qtx11extras + ]; + propagatedBuildInputs = [ kconfigwidgets kiconthemes ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kactivities.nix b/pkgs/development/libraries/kde-frameworks-5.14/kactivities.nix new file mode 100644 index 00000000000..c8e296bad80 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.14/kactivities.nix @@ -0,0 +1,42 @@ +{ kdeFramework, lib +, extra-cmake-modules +, boost +, kcmutils +, kconfig +, kcoreaddons +, kdbusaddons +, kdeclarative +, kglobalaccel +, ki18n +, kio +, kservice +, kwindowsystem +, kxmlgui +, qtdeclarative +}: + +kdeFramework { + name = "kactivities"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ + boost + kcmutils + kconfig + kcoreaddons + kdbusaddons + kdeclarative + kglobalaccel + ki18n + kio + kservice + kwindowsystem + kxmlgui + qtdeclarative + ]; + postInstall = '' + wrapKDEProgram "$out/bin/kactivitymanagerd" + ''; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kapidox.nix b/pkgs/development/libraries/kde-frameworks-5.14/kapidox.nix new file mode 100644 index 00000000000..647be8f052c --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.14/kapidox.nix @@ -0,0 +1,12 @@ +{ kdeFramework, lib +, extra-cmake-modules +, python +}: + +kdeFramework { + name = "kapidox"; + nativeBuildInputs = [ extra-cmake-modules python ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.14/karchive.nix b/pkgs/development/libraries/kde-frameworks-5.14/karchive.nix new file mode 100644 index 00000000000..a8d9a0003c3 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.14/karchive.nix @@ -0,0 +1,11 @@ +{ kdeFramework, lib +, extra-cmake-modules +}: + +kdeFramework { + name = "karchive"; + nativeBuildInputs = [ extra-cmake-modules ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kauth/default.nix b/pkgs/development/libraries/kde-frameworks-5.14/kauth/default.nix new file mode 100644 index 00000000000..42a10019334 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.14/kauth/default.nix @@ -0,0 +1,16 @@ +{ kdeFramework, lib +, extra-cmake-modules +, kcoreaddons +, polkitQt +}: + +kdeFramework { + name = "kauth"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ polkitQt ]; + propagatedBuildInputs = [ kcoreaddons ]; + patches = [ ./kauth-policy-install.patch ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kauth/kauth-policy-install.patch b/pkgs/development/libraries/kde-frameworks-5.14/kauth/kauth-policy-install.patch new file mode 100644 index 00000000000..340155256f2 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.14/kauth/kauth-policy-install.patch @@ -0,0 +1,13 @@ +diff --git a/KF5AuthConfig.cmake.in b/KF5AuthConfig.cmake.in +index e859ec7..9a8ab18 100644 +--- a/KF5AuthConfig.cmake.in ++++ b/KF5AuthConfig.cmake.in +@@ -4,7 +4,7 @@ set(KAUTH_STUB_FILES_DIR "${PACKAGE_PREFIX_DIR}/@KF5_DATA_INSTALL_DIR@/kauth/") + + set(KAUTH_BACKEND_NAME "@KAUTH_BACKEND_NAME@") + set(KAUTH_HELPER_BACKEND_NAME "@KAUTH_HELPER_BACKEND_NAME@") +-set(KAUTH_POLICY_FILES_INSTALL_DIR "@KAUTH_POLICY_FILES_INSTALL_DIR@") ++set(KAUTH_POLICY_FILES_INSTALL_DIR "\${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions") + set(KAUTH_HELPER_INSTALL_DIR "@KAUTH_HELPER_INSTALL_DIR@") + + find_dependency(KF5CoreAddons "@KF5_DEP_VERSION@") diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kbookmarks.nix b/pkgs/development/libraries/kde-frameworks-5.14/kbookmarks.nix new file mode 100644 index 00000000000..1a469ab4db6 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.14/kbookmarks.nix @@ -0,0 +1,25 @@ +{ kdeFramework, lib +, extra-cmake-modules +, kcodecs +, kconfig +, kconfigwidgets +, kcoreaddons +, kiconthemes +, kxmlgui +}: + +kdeFramework { + name = "kbookmarks"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ + kcodecs + kconfig + kconfigwidgets + kcoreaddons + kiconthemes + kxmlgui + ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kcmutils/default.nix b/pkgs/development/libraries/kde-frameworks-5.14/kcmutils/default.nix new file mode 100644 index 00000000000..ac7a5af06a4 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.14/kcmutils/default.nix @@ -0,0 +1,31 @@ +{ kdeFramework, lib +, extra-cmake-modules +, kconfigwidgets +, kcoreaddons +, kdeclarative +, ki18n +, kiconthemes +, kitemviews +, kpackage +, kservice +, kxmlgui +}: + +kdeFramework { + name = "kcmutils"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ + kcoreaddons + kdeclarative + ki18n + kiconthemes + kitemviews + kpackage + kxmlgui + ]; + propagatedBuildInputs = [ kconfigwidgets kservice ]; + patches = [ ./kcmutils-pluginselector-follow-symlinks.patch ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kcmutils/kcmutils-pluginselector-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.14/kcmutils/kcmutils-pluginselector-follow-symlinks.patch new file mode 100644 index 00000000000..47b8dfad180 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.14/kcmutils/kcmutils-pluginselector-follow-symlinks.patch @@ -0,0 +1,13 @@ +diff --git a/src/kpluginselector.cpp b/src/kpluginselector.cpp +index c63241b..2243f94 100644 +--- a/src/kpluginselector.cpp ++++ b/src/kpluginselector.cpp +@@ -304,7 +304,7 @@ void KPluginSelector::addPlugins(const QString &componentName, + QStringList desktopFileNames; + const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, componentName + QStringLiteral("/kpartplugins"), QStandardPaths::LocateDirectory); + Q_FOREACH (const QString &dir, dirs) { +- QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories); ++ QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); + while (it.hasNext()) { + desktopFileNames.append(it.next()); + } diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kcodecs.nix b/pkgs/development/libraries/kde-frameworks-5.14/kcodecs.nix new file mode 100644 index 00000000000..53a69a69b69 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.14/kcodecs.nix @@ -0,0 +1,11 @@ +{ kdeFramework, lib +, extra-cmake-modules +}: + +kdeFramework { + name = "kcodecs"; + nativeBuildInputs = [ extra-cmake-modules ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kcompletion.nix b/pkgs/development/libraries/kde-frameworks-5.14/kcompletion.nix new file mode 100644 index 00000000000..e393774f16a --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.14/kcompletion.nix @@ -0,0 +1,14 @@ +{ kdeFramework, lib +, extra-cmake-modules +, kconfig +, kwidgetsaddons +}: + +kdeFramework { + name = "kcompletion"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ kconfig kwidgetsaddons ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kconfig.nix b/pkgs/development/libraries/kde-frameworks-5.14/kconfig.nix new file mode 100644 index 00000000000..ce890745767 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.14/kconfig.nix @@ -0,0 +1,15 @@ +{ kdeFramework, lib +, extra-cmake-modules +}: + +kdeFramework { + name = "kconfig"; + nativeBuildInputs = [ extra-cmake-modules ]; + postInstall = '' + wrapKDEProgram "$out/bin/kreadconfig5" + wrapKDEProgram "$out/bin/kwriteconfig5" + ''; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kconfigwidgets/default.nix b/pkgs/development/libraries/kde-frameworks-5.14/kconfigwidgets/default.nix new file mode 100644 index 00000000000..d16f7f92bea --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.14/kconfigwidgets/default.nix @@ -0,0 +1,24 @@ +{ kdeFramework, lib +, extra-cmake-modules +, kauth +, kcodecs +, kconfig +, kdoctools +, kguiaddons +, ki18n +, kwidgetsaddons +}: + +kdeFramework { + name = "kconfigwidgets"; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ kguiaddons ki18n ]; + propagatedBuildInputs = [ kauth kconfig kcodecs kwidgetsaddons ]; + patches = [ ./kconfigwidgets-helpclient-follow-symlinks.patch ]; + postInstall = '' + wrapKDEProgram "$out/bin/preparetips5" + ''; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.14/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch new file mode 100644 index 00000000000..3bd946cbd84 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.14/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch @@ -0,0 +1,13 @@ +diff --git a/src/khelpclient.cpp b/src/khelpclient.cpp +index 53a331e..80fbb01 100644 +--- a/src/khelpclient.cpp ++++ b/src/khelpclient.cpp +@@ -48,7 +48,7 @@ void KHelpClient::invokeHelp(const QString &anchor, const QString &_appname) + QString docPath; + const QStringList desktopDirs = QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation); + Q_FOREACH (const QString &dir, desktopDirs) { +- QDirIterator it(dir, QStringList() << appname + QLatin1String(".desktop"), QDir::NoFilter, QDirIterator::Subdirectories); ++ QDirIterator it(dir, QStringList() << appname + QLatin1String(".desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); + while (it.hasNext()) { + const QString desktopPath(it.next()); + KDesktopFile desktopFile(desktopPath); diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kcoreaddons.nix b/pkgs/development/libraries/kde-frameworks-5.14/kcoreaddons.nix new file mode 100644 index 00000000000..43c21bb51ef --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.14/kcoreaddons.nix @@ -0,0 +1,13 @@ +{ kdeFramework, lib +, extra-cmake-modules +, shared_mime_info +}: + +kdeFramework { + name = "kcoreaddons"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ shared_mime_info ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kcrash.nix b/pkgs/development/libraries/kde-frameworks-5.14/kcrash.nix new file mode 100644 index 00000000000..b919c7ad222 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.14/kcrash.nix @@ -0,0 +1,15 @@ +{ kdeFramework, lib +, extra-cmake-modules +, kcoreaddons +, kwindowsystem +, qtx11extras +}: + +kdeFramework { + name = "kcrash"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ kcoreaddons kwindowsystem qtx11extras ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kdbusaddons.nix b/pkgs/development/libraries/kde-frameworks-5.14/kdbusaddons.nix new file mode 100644 index 00000000000..eb76e14705e --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.14/kdbusaddons.nix @@ -0,0 +1,16 @@ +{ kdeFramework, lib +, extra-cmake-modules +, qtx11extras +}: + +kdeFramework { + name = "kdbusaddons"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ qtx11extras ]; + postInstall = '' + wrapKDEProgram "$out/bin/kquitapp5" + ''; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kdeclarative.nix b/pkgs/development/libraries/kde-frameworks-5.14/kdeclarative.nix new file mode 100644 index 00000000000..b62a13f8fa9 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.14/kdeclarative.nix @@ -0,0 +1,30 @@ +{ kdeFramework, lib +, extra-cmake-modules +, epoxy +, kconfig +, kglobalaccel +, kguiaddons +, ki18n +, kiconthemes +, kio +, kpackage +, kwidgetsaddons +, kwindowsystem +, pkgconfig +, qtdeclarative +}: + +kdeFramework { + name = "kdeclarative"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ + epoxy kglobalaccel kguiaddons ki18n kiconthemes kio kwidgetsaddons kwindowsystem + ]; + propagatedBuildInputs = [ kconfig kpackage qtdeclarative ]; + postInstall = '' + wrapKDEProgram "$out/bin/kpackagelauncherqml" + ''; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kded.nix b/pkgs/development/libraries/kde-frameworks-5.14/kded.nix new file mode 100644 index 00000000000..47ae2d68c68 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.14/kded.nix @@ -0,0 +1,19 @@ +{ kdeFramework, lib +, extra-cmake-modules +, kconfig +, kcoreaddons +, kcrash +, kdbusaddons +, kdoctools +, kinit +, kservice +}: + +kdeFramework { + name = "kded"; + buildInputs = [ kconfig kcoreaddons kcrash kdbusaddons kinit kservice ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kdelibs4support.nix b/pkgs/development/libraries/kde-frameworks-5.14/kdelibs4support.nix new file mode 100644 index 00000000000..f54fa3e9be6 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.14/kdelibs4support.nix @@ -0,0 +1,58 @@ +{ kdeFramework, lib +, extra-cmake-modules +, docbook_xml_dtd_45 +, kauth +, karchive +, kcompletion +, kconfig +, kconfigwidgets +, kcoreaddons +, kcrash +, kdbusaddons +, kdesignerplugin +, kdoctools +, kemoticons +, kglobalaccel +, kguiaddons +, ki18n +, kiconthemes +, kio +, kitemmodels +, kinit +, knotifications +, kparts +, kservice +, ktextwidgets +, kunitconversion +, kwidgetsaddons +, kwindowsystem +, kxmlgui +, networkmanager +, qtsvg +, qtx11extras +, xlibs +}: + +# TODO: debug docbook detection + +kdeFramework { + name = "kdelibs4support"; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + kcompletion kconfig kglobalaccel ki18n kio kservice kwidgetsaddons + kxmlgui networkmanager qtsvg qtx11extras xlibs.libSM + ]; + propagatedBuildInputs = [ + kauth karchive kconfigwidgets kcoreaddons kcrash kdbusaddons + kdesignerplugin kemoticons kguiaddons kiconthemes kitemmodels + kinit knotifications kparts ktextwidgets kunitconversion + kwindowsystem + ]; + cmakeFlags = [ + "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook" + "-DDocBookXML4_DTD_VERSION=4.5" + ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kdesignerplugin.nix b/pkgs/development/libraries/kde-frameworks-5.14/kdesignerplugin.nix new file mode 100644 index 00000000000..100d16d64bc --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.14/kdesignerplugin.nix @@ -0,0 +1,30 @@ +{ kdeFramework, lib +, extra-cmake-modules +, kcompletion +, kconfig +, kconfigwidgets +, kcoreaddons +, kdewebkit +, kdoctools +, kiconthemes +, kio +, kitemviews +, kplotting +, ktextwidgets +, kwidgetsaddons +, kxmlgui +, sonnet +}: + +kdeFramework { + name = "kdesignerplugin"; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + kcompletion kconfig kconfigwidgets kcoreaddons kdewebkit + kiconthemes kio kitemviews kplotting ktextwidgets kwidgetsaddons + kxmlgui sonnet + ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kdesu.nix b/pkgs/development/libraries/kde-frameworks-5.14/kdesu.nix new file mode 100644 index 00000000000..4503d8bcd10 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.14/kdesu.nix @@ -0,0 +1,17 @@ +{ kdeFramework, lib +, extra-cmake-modules +, kcoreaddons +, ki18n +, kpty +, kservice +}: + +kdeFramework { + name = "kdesu"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ kcoreaddons ki18n kservice ]; + propagatedBuildInputs = [ kpty ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kdewebkit.nix b/pkgs/development/libraries/kde-frameworks-5.14/kdewebkit.nix new file mode 100644 index 00000000000..52ae0162b86 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.14/kdewebkit.nix @@ -0,0 +1,22 @@ +{ kdeFramework, lib +, extra-cmake-modules +, kconfig +, kcoreaddons +, ki18n +, kio +, kjobwidgets +, kparts +, kservice +, kwallet +, qtwebkit +}: + +kdeFramework { + name = "kdewebkit"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ kconfig kcoreaddons ki18n kio kjobwidgets kparts kservice kwallet ]; + propagatedBuildInputs = [ qtwebkit ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kdnssd.nix b/pkgs/development/libraries/kde-frameworks-5.14/kdnssd.nix new file mode 100644 index 00000000000..f00432b0c9c --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.14/kdnssd.nix @@ -0,0 +1,13 @@ +{ kdeFramework, lib +, extra-cmake-modules +, avahi +}: + +kdeFramework { + name = "kdnssd"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ avahi ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kdoctools/default.nix b/pkgs/development/libraries/kde-frameworks-5.14/kdoctools/default.nix new file mode 100644 index 00000000000..0ec13d1a15c --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.14/kdoctools/default.nix @@ -0,0 +1,24 @@ +{ kdeFramework, lib +, extra-cmake-modules +, docbook_xml_dtd_45 +, docbook5_xsl +, karchive +, ki18n +, perl +, perlPackages +}: + +kdeFramework { + name = "kdoctools"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ karchive ki18n ]; + propagatedNativeBuildInputs = [ perl perlPackages.URI ]; + cmakeFlags = [ + "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook" + "-DDocBookXSL_DIR=${docbook5_xsl}/xml/xsl/docbook" + ]; + patches = [ ./kdoctools-no-find-docbook-xml.patch ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kdoctools/kdoctools-no-find-docbook-xml.patch b/pkgs/development/libraries/kde-frameworks-5.14/kdoctools/kdoctools-no-find-docbook-xml.patch new file mode 100644 index 00000000000..4e3a33efab3 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.14/kdoctools/kdoctools-no-find-docbook-xml.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5c4863c..f731775 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -46,7 +46,6 @@ set_package_properties(LibXml2 PROPERTIES + ) + + +-find_package(DocBookXML4 "4.5") + + set_package_properties(DocBookXML4 PROPERTIES + TYPE REQUIRED diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kemoticons.nix b/pkgs/development/libraries/kde-frameworks-5.14/kemoticons.nix new file mode 100644 index 00000000000..d165f84e3a2 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.14/kemoticons.nix @@ -0,0 +1,17 @@ +{ kdeFramework, lib +, extra-cmake-modules +, karchive +, kconfig +, kcoreaddons +, kservice +}: + +kdeFramework { + name = "kemoticons"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ karchive kconfig kcoreaddons ]; + propagatedBuildInputs = [ kservice ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kfilemetadata.nix b/pkgs/development/libraries/kde-frameworks-5.14/kfilemetadata.nix new file mode 100644 index 00000000000..53c509417f2 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.14/kfilemetadata.nix @@ -0,0 +1,22 @@ +{ kdeFramework, lib +, extra-cmake-modules +, attr +, ebook_tools +, exiv2 +, ffmpeg +, karchive +, ki18n +, popplerQt +, qtbase +, taglib +}: + +kdeFramework { + name = "kfilemetadata"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ attr ebook_tools exiv2 ffmpeg karchive ki18n popplerQt taglib ]; + propagatedBuildInputs = [ qtbase ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kglobalaccel.nix b/pkgs/development/libraries/kde-frameworks-5.14/kglobalaccel.nix new file mode 100644 index 00000000000..f7c5ea56266 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.14/kglobalaccel.nix @@ -0,0 +1,21 @@ +{ kdeFramework, lib +, extra-cmake-modules +, kconfig +, kcoreaddons +, kcrash +, kdbusaddons +, kwindowsystem +, qtx11extras +}: + +kdeFramework { + name = "kglobalaccel"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ kconfig kcoreaddons kcrash kdbusaddons kwindowsystem qtx11extras ]; + postInstall = '' + wrapKDEProgram "$out/bin/kglobalaccel5" + ''; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kguiaddons.nix b/pkgs/development/libraries/kde-frameworks-5.14/kguiaddons.nix new file mode 100644 index 00000000000..bc4e9ab1184 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.14/kguiaddons.nix @@ -0,0 +1,13 @@ +{ kdeFramework, lib +, extra-cmake-modules +, qtx11extras +}: + +kdeFramework { + name = "kguiaddons"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ qtx11extras ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.14/khtml.nix b/pkgs/development/libraries/kde-frameworks-5.14/khtml.nix new file mode 100644 index 00000000000..45dd45089c4 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.14/khtml.nix @@ -0,0 +1,35 @@ +{ kdeFramework, lib +, extra-cmake-modules +, giflib +, karchive +, kcodecs +, kglobalaccel +, ki18n +, kiconthemes +, kio +, kjs +, knotifications +, kparts +, ktextwidgets +, kwallet +, kwidgetsaddons +, kwindowsystem +, kxmlgui +, perl +, phonon +, qtx11extras +, sonnet +}: + +kdeFramework { + name = "khtml"; + nativeBuildInputs = [ extra-cmake-modules perl ]; + buildInputs = [ + giflib karchive kglobalaccel kiconthemes knotifications kwallet + kwidgetsaddons kwindowsystem kxmlgui phonon qtx11extras sonnet + ]; + propagatedBuildInputs = [ kcodecs ki18n kio kjs kparts ktextwidgets ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.14/ki18n.nix b/pkgs/development/libraries/kde-frameworks-5.14/ki18n.nix new file mode 100644 index 00000000000..915e3294b46 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.14/ki18n.nix @@ -0,0 +1,16 @@ +{ kdeFramework, lib +, extra-cmake-modules +, gettext +, python +, qtscript +}: + +kdeFramework { + name = "ki18n"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ qtscript ]; + propagatedNativeBuildInputs = [ gettext python ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kiconthemes.nix b/pkgs/development/libraries/kde-frameworks-5.14/kiconthemes.nix new file mode 100644 index 00000000000..862c17f104f --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.14/kiconthemes.nix @@ -0,0 +1,16 @@ +{ kdeFramework, lib +, extra-cmake-modules +, kconfigwidgets +, ki18n +, kitemviews +, qtsvg +}: + +kdeFramework { + name = "kiconthemes"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ kconfigwidgets ki18n kitemviews qtsvg ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kidletime.nix b/pkgs/development/libraries/kde-frameworks-5.14/kidletime.nix new file mode 100644 index 00000000000..fc086560023 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.14/kidletime.nix @@ -0,0 +1,15 @@ +{ kdeFramework, lib +, extra-cmake-modules +, qtbase +, qtx11extras +}: + +kdeFramework { + name = "kidletime"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ qtx11extras ]; + propagatedBuildInputs = [ qtbase ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kimageformats.nix b/pkgs/development/libraries/kde-frameworks-5.14/kimageformats.nix new file mode 100644 index 00000000000..49d66bbcc2c --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.14/kimageformats.nix @@ -0,0 +1,13 @@ +{ kdeFramework, lib +, extra-cmake-modules +, ilmbase +}: + +kdeFramework { + name = "kimageformats"; + nativeBuildInputs = [ extra-cmake-modules ]; + NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR"; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kinit/0001-kinit-libpath.patch b/pkgs/development/libraries/kde-frameworks-5.14/kinit/0001-kinit-libpath.patch new file mode 100644 index 00000000000..9c76079a382 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.14/kinit/0001-kinit-libpath.patch @@ -0,0 +1,42 @@ +From 723c9b1268a04127647a1c20eebe9804150566dd Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Sat, 13 Jun 2015 08:57:55 -0500 +Subject: [PATCH] kinit libpath + +--- + src/kdeinit/kinit.cpp | 18 ++++++++++-------- + 1 file changed, 10 insertions(+), 8 deletions(-) + +diff --git a/src/kdeinit/kinit.cpp b/src/kdeinit/kinit.cpp +index 9e775b6..0ac5646 100644 +--- a/src/kdeinit/kinit.cpp ++++ b/src/kdeinit/kinit.cpp +@@ -660,15 +660,17 @@ static pid_t launch(int argc, const char *_name, const char *args, + if (!libpath.isEmpty()) { + if (!l.load()) { + if (libpath_relative) { +- // NB: Because Qt makes the actual dlopen() call, the +- // RUNPATH of kdeinit is *not* respected - see +- // https://sourceware.org/bugzilla/show_bug.cgi?id=13945 +- // - so we try hacking it in ourselves +- QString install_lib_dir = QFile::decodeName( +- CMAKE_INSTALL_PREFIX "/" LIB_INSTALL_DIR "/"); +- libpath = install_lib_dir + libpath; +- l.setFileName(libpath); ++ // Use QT_PLUGIN_PATH to find shared library directories ++ // For KF5, the plugin path is /lib/qt5/plugins/, so kdeinit5 ++ // shared libraries should be in /lib/qt5/plugins/../../ ++ const QRegExp pathSepRegExp(QString::fromLatin1("[:\b]")); ++ const QString up = QString::fromLocal8Bit("/../../"); ++ const QStringList paths = QString::fromLocal8Bit(qgetenv("QT_PLUGIN_PATH")).split(pathSepRegExp, QString::KeepEmptyParts); ++ Q_FOREACH (const QString &path, paths) { ++ l.setFileName(path + up + libpath); + l.load(); ++ if (l.isLoaded()) break; ++ } + } + } + if (!l.isLoaded()) { +-- +2.4.2 + diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kinit/default.nix b/pkgs/development/libraries/kde-frameworks-5.14/kinit/default.nix new file mode 100644 index 00000000000..47f1aec72de --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.14/kinit/default.nix @@ -0,0 +1,24 @@ +{ kdeFramework, lib +, extra-cmake-modules +, kconfig +, kcrash +, kdoctools +, ki18n +, kio +, kservice +, kwindowsystem +, libcap +, libcap_progs +}: + +# TODO: setuid wrapper + +kdeFramework { + name = "kinit"; + nativeBuildInputs = [ extra-cmake-modules kdoctools libcap_progs ]; + buildInputs = [ kconfig kcrash ki18n kio kservice kwindowsystem libcap ]; + patches = [ ./0001-kinit-libpath.patch ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kio.nix b/pkgs/development/libraries/kde-frameworks-5.14/kio.nix new file mode 100644 index 00000000000..6605de03e38 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.14/kio.nix @@ -0,0 +1,48 @@ +{ kdeFramework, lib +, extra-cmake-modules +, acl +, karchive +, kbookmarks +, kcompletion +, kconfig +, kconfigwidgets +, kcoreaddons +, kdbusaddons +, kdoctools +, ki18n +, kiconthemes +, kitemviews +, kjobwidgets +, knotifications +, kservice +, ktextwidgets +, kwallet +, kwidgetsaddons +, kwindowsystem +, kxmlgui +, qtscript +, qtx11extras +, solid +}: + +kdeFramework { + name = "kio"; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + acl karchive kconfig kcoreaddons kdbusaddons ki18n kiconthemes + knotifications ktextwidgets kwallet kwidgetsaddons kwindowsystem + qtscript qtx11extras + ]; + propagatedBuildInputs = [ + kbookmarks kcompletion kconfigwidgets kitemviews kjobwidgets kservice kxmlgui solid + ]; + postInstall = '' + wrapKDEProgram "$out/bin/kcookiejar5" + wrapKDEProgram "$out/bin/ktelnetservice5" + wrapKDEProgram "$out/bin/ktrash5" + wrapKDEProgram "$out/bin/kmailservice5" + ''; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kitemmodels.nix b/pkgs/development/libraries/kde-frameworks-5.14/kitemmodels.nix new file mode 100644 index 00000000000..a9024d771cc --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.14/kitemmodels.nix @@ -0,0 +1,11 @@ +{ kdeFramework, lib +, extra-cmake-modules +}: + +kdeFramework { + name = "kitemmodels"; + nativeBuildInputs = [ extra-cmake-modules ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kitemviews.nix b/pkgs/development/libraries/kde-frameworks-5.14/kitemviews.nix new file mode 100644 index 00000000000..931019ce495 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.14/kitemviews.nix @@ -0,0 +1,11 @@ +{ kdeFramework, lib +, extra-cmake-modules +}: + +kdeFramework { + name = "kitemviews"; + nativeBuildInputs = [ extra-cmake-modules ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kjobwidgets.nix b/pkgs/development/libraries/kde-frameworks-5.14/kjobwidgets.nix new file mode 100644 index 00000000000..c3f1d37f858 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.14/kjobwidgets.nix @@ -0,0 +1,15 @@ +{ kdeFramework, lib +, extra-cmake-modules +, kcoreaddons +, kwidgetsaddons +, qtx11extras +}: + +kdeFramework { + name = "kjobwidgets"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ kcoreaddons kwidgetsaddons qtx11extras ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kjs.nix b/pkgs/development/libraries/kde-frameworks-5.14/kjs.nix new file mode 100644 index 00000000000..902674d49b7 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.14/kjs.nix @@ -0,0 +1,15 @@ +{ kdeFramework, lib +, extra-cmake-modules +, kdoctools +}: + +kdeFramework { + name = "kjs"; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + postInstall = '' + wrapKDEProgram "$out/bin/kjs5" + ''; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kjsembed.nix b/pkgs/development/libraries/kde-frameworks-5.14/kjsembed.nix new file mode 100644 index 00000000000..bbc5169a1cc --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.14/kjsembed.nix @@ -0,0 +1,21 @@ +{ kdeFramework, lib +, extra-cmake-modules +, kdoctools +, ki18n +, kjs +, qtsvg +}: + +kdeFramework { + name = "kjsembed"; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ qtsvg ]; + propagatedBuildInputs = [ ki18n kjs ]; + postInstall = '' + wrapKDEProgram "$out/bin/kjscmd5" + wrapKDEProgram "$out/bin/kjsconsole" + ''; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kmediaplayer.nix b/pkgs/development/libraries/kde-frameworks-5.14/kmediaplayer.nix new file mode 100644 index 00000000000..460458b2232 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.14/kmediaplayer.nix @@ -0,0 +1,15 @@ +{ kdeFramework, lib +, extra-cmake-modules +, kparts +, kxmlgui +}: + +kdeFramework { + name = "kmediaplayer"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ kxmlgui ]; + propagatedBuildInputs = [ kparts ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.14/knewstuff.nix b/pkgs/development/libraries/kde-frameworks-5.14/knewstuff.nix new file mode 100644 index 00000000000..d0b884f8f68 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.14/knewstuff.nix @@ -0,0 +1,29 @@ +{ kdeFramework, lib +, extra-cmake-modules +, attica +, karchive +, kcompletion +, kconfig +, kcoreaddons +, ki18n +, kiconthemes +, kio +, kitemviews +, kservice +, ktextwidgets +, kwidgetsaddons +, kxmlgui +}: + +kdeFramework { + name = "knewstuff"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ + karchive kcompletion kconfig kcoreaddons ki18n kiconthemes kio + kitemviews ktextwidgets kwidgetsaddons + ]; + propagatedBuildInputs = [ attica kservice kxmlgui ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.14/knotifications.nix b/pkgs/development/libraries/kde-frameworks-5.14/knotifications.nix new file mode 100644 index 00000000000..f3aa29f018c --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.14/knotifications.nix @@ -0,0 +1,21 @@ +{ kdeFramework, lib +, extra-cmake-modules +, kcodecs +, kconfig +, kcoreaddons +, kwindowsystem +, phonon +, qtx11extras +}: + +kdeFramework { + name = "knotifications"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ + kcodecs kconfig kcoreaddons kwindowsystem + phonon qtx11extras + ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.14/knotifyconfig.nix b/pkgs/development/libraries/kde-frameworks-5.14/knotifyconfig.nix new file mode 100644 index 00000000000..f6509a166d4 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.14/knotifyconfig.nix @@ -0,0 +1,17 @@ +{ kdeFramework, lib +, extra-cmake-modules +, kcompletion +, kconfig +, ki18n +, kio +, phonon +}: + +kdeFramework { + name = "knotifyconfig"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ kcompletion kconfig ki18n kio phonon ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kpackage/0001-allow-external-paths.patch b/pkgs/development/libraries/kde-frameworks-5.14/kpackage/0001-allow-external-paths.patch new file mode 100644 index 00000000000..440e979c008 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.14/kpackage/0001-allow-external-paths.patch @@ -0,0 +1,25 @@ +From fbf10d2059fa1f19a0f0cfa2fda0abb6c435fa78 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Wed, 28 Jan 2015 07:15:30 -0600 +Subject: [PATCH] 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 eb4a09b..f70f1a1 100644 +--- a/src/kpackage/package.cpp ++++ b/src/kpackage/package.cpp +@@ -758,7 +758,7 @@ PackagePrivate::PackagePrivate() + : QSharedData(), + fallbackPackage(0), + metadata(0), +- externalPaths(false), ++ externalPaths(true), + valid(false), + checkedValid(false) + { +-- +2.1.4 + diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kpackage/default.nix b/pkgs/development/libraries/kde-frameworks-5.14/kpackage/default.nix new file mode 100644 index 00000000000..f7c3689503b --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.14/kpackage/default.nix @@ -0,0 +1,22 @@ +{ kdeFramework, lib +, extra-cmake-modules +, karchive +, kconfig +, kcoreaddons +, kdoctools +, ki18n +}: + +kdeFramework { + name = "kpackage"; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ karchive kconfig ki18n ]; + propagatedBuildInputs = [ kcoreaddons ]; + patches = [ ./0001-allow-external-paths.patch ]; + postInstall = '' + wrapKDEProgram "$out/bin/kpackagetool5" + ''; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kparts.nix b/pkgs/development/libraries/kde-frameworks-5.14/kparts.nix new file mode 100644 index 00000000000..96c1b984ab7 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.14/kparts.nix @@ -0,0 +1,27 @@ +{ kdeFramework, lib +, extra-cmake-modules +, kconfig +, kcoreaddons +, ki18n +, kiconthemes +, kio +, kjobwidgets +, knotifications +, kservice +, ktextwidgets +, kwidgetsaddons +, kxmlgui +}: + +kdeFramework { + name = "kparts"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ + kconfig kcoreaddons ki18n kiconthemes kjobwidgets knotifications + kservice kwidgetsaddons + ]; + propagatedBuildInputs = [ kio ktextwidgets kxmlgui ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kpeople.nix b/pkgs/development/libraries/kde-frameworks-5.14/kpeople.nix new file mode 100644 index 00000000000..ffc028d97c3 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.14/kpeople.nix @@ -0,0 +1,20 @@ +{ kdeFramework, lib +, extra-cmake-modules +, kcoreaddons +, ki18n +, kitemviews +, kservice +, kwidgetsaddons +, qtdeclarative +}: + +kdeFramework { + name = "kpeople"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ + kcoreaddons ki18n kitemviews kservice kwidgetsaddons qtdeclarative + ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kplotting.nix b/pkgs/development/libraries/kde-frameworks-5.14/kplotting.nix new file mode 100644 index 00000000000..c16f51b5ac3 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.14/kplotting.nix @@ -0,0 +1,11 @@ +{ kdeFramework, lib +, extra-cmake-modules +}: + +kdeFramework { + name = "kplotting"; + nativeBuildInputs = [ extra-cmake-modules ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kpty.nix b/pkgs/development/libraries/kde-frameworks-5.14/kpty.nix new file mode 100644 index 00000000000..72ac842a00a --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.14/kpty.nix @@ -0,0 +1,15 @@ +{ kdeFramework, lib +, extra-cmake-modules +, kcoreaddons +, ki18n +}: + +kdeFramework { + name = "kpty"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ ki18n ]; + propagatedBuildInputs = [ kcoreaddons ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kross.nix b/pkgs/development/libraries/kde-frameworks-5.14/kross.nix new file mode 100644 index 00000000000..ca14e9827e2 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.14/kross.nix @@ -0,0 +1,23 @@ +{ kdeFramework, lib +, extra-cmake-modules +, kcompletion +, kcoreaddons +, kdoctools +, ki18n +, kiconthemes +, kio +, kparts +, kwidgetsaddons +, kxmlgui +, qtscript +}: + +kdeFramework { + name = "kross"; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ kcompletion kcoreaddons kxmlgui ]; + propagatedBuildInputs = [ ki18n kiconthemes kio kparts kwidgetsaddons qtscript ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.14/krunner.nix b/pkgs/development/libraries/kde-frameworks-5.14/krunner.nix new file mode 100644 index 00000000000..618494ef5c5 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.14/krunner.nix @@ -0,0 +1,24 @@ +{ kdeFramework, lib +, extra-cmake-modules +, kconfig +, kcoreaddons +, ki18n +, kio +, kservice +, plasma-framework +, qtquick1 +, solid +, threadweaver +}: + +kdeFramework { + name = "krunner"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ + kconfig kcoreaddons ki18n kio kservice qtquick1 solid threadweaver + ]; + propagatedBuildInputs = [ plasma-framework ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kservice/default.nix b/pkgs/development/libraries/kde-frameworks-5.14/kservice/default.nix new file mode 100644 index 00000000000..b46797f5e0e --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.14/kservice/default.nix @@ -0,0 +1,25 @@ +{ kdeFramework, lib +, extra-cmake-modules +, kconfig +, kcoreaddons +, kcrash +, kdbusaddons +, kdoctools +, ki18n +, kwindowsystem +}: + +kdeFramework { + name = "kservice"; + setupHook = ./setup-hook.sh; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ kcoreaddons kcrash kdbusaddons ki18n kwindowsystem ]; + propagatedBuildInputs = [ kconfig ]; + patches = [ + ./kservice-kbuildsycoca-follow-symlinks.patch + ./kservice-kbuildsycoca-no-canonicalize-path.patch + ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kservice/kservice-kbuildsycoca-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.14/kservice/kservice-kbuildsycoca-follow-symlinks.patch new file mode 100644 index 00000000000..e9bc418544a --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.14/kservice/kservice-kbuildsycoca-follow-symlinks.patch @@ -0,0 +1,13 @@ +diff --git a/src/kbuildsycoca/kbuildsycoca.cpp b/src/kbuildsycoca/kbuildsycoca.cpp +index 69b1427..9c37a49 100644 +--- a/src/kbuildsycoca/kbuildsycoca.cpp ++++ b/src/kbuildsycoca/kbuildsycoca.cpp +@@ -227,7 +227,7 @@ bool KBuildSycoca::build() + QStringList relFiles; + const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, g_resourceSubdir, QStandardPaths::LocateDirectory); + Q_FOREACH (const QString &dir, dirs) { +- QDirIterator it(dir, QDirIterator::Subdirectories); ++ QDirIterator it(dir, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); + while (it.hasNext()) { + const QString filePath = it.next(); + Q_ASSERT(filePath.startsWith(dir)); // due to the line below... diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch b/pkgs/development/libraries/kde-frameworks-5.14/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch new file mode 100644 index 00000000000..7e21ebfe86f --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.14/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch @@ -0,0 +1,13 @@ +diff --git a/src/kbuildsycoca/vfolder_menu.cpp b/src/kbuildsycoca/vfolder_menu.cpp +index 2eb1275..e39a36f 100644 +--- a/src/kbuildsycoca/vfolder_menu.cpp ++++ b/src/kbuildsycoca/vfolder_menu.cpp +@@ -412,7 +412,7 @@ VFolderMenu::absoluteDir(const QString &_dir, const QString &baseDir, bool keepR + } + + if (!relative) { +- QString resolved = QDir(dir).canonicalPath(); ++ QString resolved = QDir::cleanPath(dir); + if (!resolved.isEmpty()) { + dir = resolved; + } diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kservice/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.14/kservice/setup-hook.sh new file mode 100644 index 00000000000..007876a0b30 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.14/kservice/setup-hook.sh @@ -0,0 +1,13 @@ +export KDESYCOCA="$out/var/cache/kservices5/$name.sycoca" + +KSERVICE_BUILD_KDESYCOCA= + +buildKdeSycoca() { + if [[ -n "$KSERVICE_BUILD_KDESYCOCA" ]]; then + echo "building kdesycoca database in $KDESYCOCA" + mkdir -p "$(dirname $KDESYCOCA)" + kbuildsycoca5 --nosignal + fi +} + +preFixupPhases+=" buildKdeSycoca" diff --git a/pkgs/development/libraries/kde-frameworks-5.14/ktexteditor/0001-no-qcoreapplication.patch b/pkgs/development/libraries/kde-frameworks-5.14/ktexteditor/0001-no-qcoreapplication.patch new file mode 100644 index 00000000000..c2e77a537c5 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.14/ktexteditor/0001-no-qcoreapplication.patch @@ -0,0 +1,48 @@ +From 71e28c7c6fdd1142f04c662f45cc8f779e457cda Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Sun, 15 Feb 2015 19:09:17 -0600 +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 3f02e8c..d1a865b 100644 +--- a/src/syntax/data/katehighlightingindexer.cpp ++++ b/src/syntax/data/katehighlightingindexer.cpp +@@ -49,19 +49,16 @@ QStringList readListing(const QString &fileName) + + int main(int argc, char *argv[]) + { +- // get app instance +- QCoreApplication app(argc, argv); +- + // ensure enough arguments are passed +- if (app.arguments().size() < 3) ++ if (argc < 3) + return 1; + + // open schema + QXmlSchema schema; +- if (!schema.load(QUrl::fromLocalFile(app.arguments().at(2)))) ++ if (!schema.load(QUrl::fromLocalFile(QString::fromLocal8Bit(argv[2])))) + return 2; + +- const QString hlFilenamesListing = app.arguments().value(3); ++ const QString hlFilenamesListing = QString::fromLocal8Bit(argv[3]); + if (hlFilenamesListing.isEmpty()) { + return 1; + } +@@ -127,7 +124,7 @@ int main(int argc, char *argv[]) + return anyError; + + // create outfile, after all has worked! +- QFile outFile(app.arguments().at(1)); ++ QFile outFile(QString::fromLocal8Bit(argv[1])); + if (!outFile.open(QIODevice::WriteOnly | QIODevice::Truncate)) + return 7; + +-- +2.1.4 + diff --git a/pkgs/development/libraries/kde-frameworks-5.14/ktexteditor/default.nix b/pkgs/development/libraries/kde-frameworks-5.14/ktexteditor/default.nix new file mode 100644 index 00000000000..8c02e602c5d --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.14/ktexteditor/default.nix @@ -0,0 +1,27 @@ +{ 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 ki18n kiconthemes kio kparts + qtscript qtxmlpatterns sonnet + ]; + patches = [ ./0001-no-qcoreapplication.patch ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.14/ktextwidgets.nix b/pkgs/development/libraries/kde-frameworks-5.14/ktextwidgets.nix new file mode 100644 index 00000000000..e27839162ef --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.14/ktextwidgets.nix @@ -0,0 +1,23 @@ +{ kdeFramework, lib +, extra-cmake-modules +, kcompletion +, kconfig +, kconfigwidgets +, ki18n +, kiconthemes +, kservice +, kwindowsystem +, sonnet +}: + +kdeFramework { + name = "ktextwidgets"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ + kcompletion kconfig kconfigwidgets kiconthemes kservice kwindowsystem + ]; + propagatedBuildInputs = [ ki18n sonnet ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kunitconversion.nix b/pkgs/development/libraries/kde-frameworks-5.14/kunitconversion.nix new file mode 100644 index 00000000000..6c6a4caeb98 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.14/kunitconversion.nix @@ -0,0 +1,13 @@ +{ kdeFramework, lib +, extra-cmake-modules +, ki18n +}: + +kdeFramework { + name = "kunitconversion"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ ki18n ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kwallet.nix b/pkgs/development/libraries/kde-frameworks-5.14/kwallet.nix new file mode 100644 index 00000000000..267ddf8303d --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.14/kwallet.nix @@ -0,0 +1,30 @@ +{ kdeFramework, lib +, extra-cmake-modules +, kconfig +, kcoreaddons +, kdbusaddons +, kdoctools +, ki18n +, kiconthemes +, knotifications +, kservice +, kwidgetsaddons +, kwindowsystem +, libgcrypt +}: + +kdeFramework { + name = "kwallet"; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + kconfig kcoreaddons kdbusaddons ki18n kiconthemes knotifications + kservice kwidgetsaddons kwindowsystem libgcrypt + ]; + postInstall = '' + wrapKDEProgram "$out/bin/kwalletd5" + wrapKDEProgram "$out/bin/kwallet-query" + ''; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kwidgetsaddons.nix b/pkgs/development/libraries/kde-frameworks-5.14/kwidgetsaddons.nix new file mode 100644 index 00000000000..d95f44d3fec --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.14/kwidgetsaddons.nix @@ -0,0 +1,11 @@ +{ kdeFramework, lib +, extra-cmake-modules +}: + +kdeFramework { + name = "kwidgetsaddons"; + nativeBuildInputs = [ extra-cmake-modules ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kwindowsystem.nix b/pkgs/development/libraries/kde-frameworks-5.14/kwindowsystem.nix new file mode 100644 index 00000000000..09ab1f2200d --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.14/kwindowsystem.nix @@ -0,0 +1,13 @@ +{ kdeFramework, lib +, extra-cmake-modules +, qtx11extras +}: + +kdeFramework { + name = "kwindowsystem"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ qtx11extras ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kxmlgui.nix b/pkgs/development/libraries/kde-frameworks-5.14/kxmlgui.nix new file mode 100644 index 00000000000..6e1398d2f84 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.14/kxmlgui.nix @@ -0,0 +1,25 @@ +{ kdeFramework, lib +, extra-cmake-modules +, attica +, kconfig +, kconfigwidgets +, kglobalaccel +, ki18n +, kiconthemes +, kitemviews +, ktextwidgets +, kwindowsystem +, sonnet +}: + +kdeFramework { + name = "kxmlgui"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ + attica kconfig kconfigwidgets kglobalaccel ki18n kiconthemes + kitemviews ktextwidgets kwindowsystem sonnet + ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kxmlrpcclient.nix b/pkgs/development/libraries/kde-frameworks-5.14/kxmlrpcclient.nix new file mode 100644 index 00000000000..b28c00a33be --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.14/kxmlrpcclient.nix @@ -0,0 +1,15 @@ +{ kdeFramework, lib +, extra-cmake-modules +, ki18n +, kio +}: + +kdeFramework { + name = "kxmlrpcclient"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ ki18n ]; + propagatedBuildInputs = [ kio ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.14/modemmanager-qt.nix b/pkgs/development/libraries/kde-frameworks-5.14/modemmanager-qt.nix new file mode 100644 index 00000000000..7d7f769d6a9 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.14/modemmanager-qt.nix @@ -0,0 +1,13 @@ +{ kdeFramework, lib +, extra-cmake-modules +, modemmanager +}: + +kdeFramework { + name = "modemmanager-qt"; + nativeBuildInputs = [ extra-cmake-modules ]; + propagatedBuildInputs = [ modemmanager ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.14/networkmanager-qt.nix b/pkgs/development/libraries/kde-frameworks-5.14/networkmanager-qt.nix new file mode 100644 index 00000000000..333378bd143 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.14/networkmanager-qt.nix @@ -0,0 +1,13 @@ +{ kdeFramework, lib +, extra-cmake-modules +, networkmanager +}: + +kdeFramework { + name = "networkmanager-qt"; + nativeBuildInputs = [ extra-cmake-modules ]; + propagatedBuildInputs = [ networkmanager ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.14/plasma-framework/default.nix b/pkgs/development/libraries/kde-frameworks-5.14/plasma-framework/default.nix new file mode 100644 index 00000000000..d838996f99c --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.14/plasma-framework/default.nix @@ -0,0 +1,40 @@ +{ kdeFramework, lib +, extra-cmake-modules +, kactivities +, karchive +, kconfig +, kconfigwidgets +, kcoreaddons +, kdbusaddons +, kdeclarative +, kdoctools +, kglobalaccel +, kguiaddons +, ki18n +, kiconthemes +, kio +, knotifications +, kpackage +, kservice +, kwindowsystem +, kxmlgui +, qtscript +, qtx11extras +}: + +kdeFramework { + name = "plasma-framework"; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + kactivities karchive kconfig kconfigwidgets kcoreaddons + kdbusaddons kdeclarative kglobalaccel kguiaddons ki18n kiconthemes + kio knotifications kwindowsystem kxmlgui qtscript qtx11extras + ]; + propagatedBuildInputs = [ kpackage kservice ]; + postInstall = '' + wrapKDEProgram "$out/bin/plasmapkg2" + ''; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.14/solid.nix b/pkgs/development/libraries/kde-frameworks-5.14/solid.nix new file mode 100644 index 00000000000..06b0797cbc1 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.14/solid.nix @@ -0,0 +1,14 @@ +{ kdeFramework, lib +, extra-cmake-modules +}: + +kdeFramework { + name = "solid"; + nativeBuildInputs = [ extra-cmake-modules ]; + postInstall = '' + wrapKDEProgram "$out/bin/solid-hardware5" + ''; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.14/sonnet.nix b/pkgs/development/libraries/kde-frameworks-5.14/sonnet.nix new file mode 100644 index 00000000000..943fe04a1c9 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.14/sonnet.nix @@ -0,0 +1,13 @@ +{ kdeFramework, lib +, extra-cmake-modules +, hunspell +}: + +kdeFramework { + name = "sonnet"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ hunspell ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.14/srcs.nix b/pkgs/development/libraries/kde-frameworks-5.14/srcs.nix new file mode 100644 index 00000000000..f9923e3645f --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.14/srcs.nix @@ -0,0 +1,549 @@ +# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh +{ fetchurl, mirror }: + +{ + attica = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/attica-5.14.0.tar.xz"; + sha256 = "0n5znf19112i1j2mwvyzc3g75bc83fdr1p7vljw670fjy2wm1fjy"; + name = "attica-5.14.0.tar.xz"; + }; + }; + baloo = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/baloo-5.14.0.tar.xz"; + sha256 = "0q72ij44r827259mw26q9f6518nj6jbawa94m8m2vrqdhcfjn25d"; + name = "baloo-5.14.0.tar.xz"; + }; + }; + bluez-qt = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/bluez-qt-5.14.0.tar.xz"; + sha256 = "136kjw4d91k85pkj90hs01nnqq51apppzbhjl7mx3xjqd2f15ljz"; + name = "bluez-qt-5.14.0.tar.xz"; + }; + }; + extra-cmake-modules = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/extra-cmake-modules-5.14.0.tar.xz"; + sha256 = "1c6frrvs8j56fyj0d9gcbqq3phhxmvn5ciy6bvj8vch3lynxrvyg"; + name = "extra-cmake-modules-5.14.0.tar.xz"; + }; + }; + frameworkintegration = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/frameworkintegration-5.14.0.tar.xz"; + sha256 = "194vhbjbjpdc8v69g1i08qcm8ywxfxm4ryc75dpp20117jfy9xy8"; + name = "frameworkintegration-5.14.0.tar.xz"; + }; + }; + kactivities = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/kactivities-5.14.0.tar.xz"; + sha256 = "0q6c06qjypg3iy8x60wvyhm5n8fvdkcw5ibvns0zxxa8vw13l6z9"; + name = "kactivities-5.14.0.tar.xz"; + }; + }; + kapidox = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/kapidox-5.14.0.tar.xz"; + sha256 = "14ai2n5ajm8sqdv0yy5hr0fg1ks9mvkf3diij7zjfzqi315wav6q"; + name = "kapidox-5.14.0.tar.xz"; + }; + }; + karchive = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/karchive-5.14.0.tar.xz"; + sha256 = "1sary49lwp09vrgwndaz3lhp6j3zkllxklbvm5s05i9mjxzgqww4"; + name = "karchive-5.14.0.tar.xz"; + }; + }; + kauth = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/kauth-5.14.0.tar.xz"; + sha256 = "1kfqp6jrgx1wlznplr29spi08927cmiln718wzpzvzy8h3sfjc0l"; + name = "kauth-5.14.0.tar.xz"; + }; + }; + kbookmarks = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/kbookmarks-5.14.0.tar.xz"; + sha256 = "12kv62ykys5rvmsia955nxv7m4xd551z762bjvvwjq3zds8pj5p3"; + name = "kbookmarks-5.14.0.tar.xz"; + }; + }; + kcmutils = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/kcmutils-5.14.0.tar.xz"; + sha256 = "0c71b8gqja1qv8lkb7yn0z7qrgvnmhvhb751k9xsiabp306apx5f"; + name = "kcmutils-5.14.0.tar.xz"; + }; + }; + kcodecs = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/kcodecs-5.14.0.tar.xz"; + sha256 = "0prhj43h7dh4811f3kfp6n0wvskczg42q17lbfn6p0d5qa0bz07y"; + name = "kcodecs-5.14.0.tar.xz"; + }; + }; + kcompletion = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/kcompletion-5.14.0.tar.xz"; + sha256 = "14ba77fmcf4ldqbwc86frai9hz9jsz9663b0v8r3aca0mg7k096v"; + name = "kcompletion-5.14.0.tar.xz"; + }; + }; + kconfig = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/kconfig-5.14.0.tar.xz"; + sha256 = "1c2rw3blgc7rmkaybr9jc3dfc1vzhvskrll7bc8xdm82b5m1850x"; + name = "kconfig-5.14.0.tar.xz"; + }; + }; + kconfigwidgets = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/kconfigwidgets-5.14.0.tar.xz"; + sha256 = "103c2vd05ccmyzqf7yznz8d0vhd94c1381p5ajvibvzfv9cs4djg"; + name = "kconfigwidgets-5.14.0.tar.xz"; + }; + }; + kcoreaddons = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/kcoreaddons-5.14.0.tar.xz"; + sha256 = "0xm2n7gvzq674cwi8gb8zkawj9pkaiv1qi63a76hl9vylidrm26q"; + name = "kcoreaddons-5.14.0.tar.xz"; + }; + }; + kcrash = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/kcrash-5.14.0.tar.xz"; + sha256 = "18cc444wwfdfbr0m1064l34azl6f560f5npcz5spvz0yydlh0fs4"; + name = "kcrash-5.14.0.tar.xz"; + }; + }; + kdbusaddons = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/kdbusaddons-5.14.0.tar.xz"; + sha256 = "009rzlr5a8znn4f31gz6zwi93mla09jy3rs336i7f6b111ha4yqy"; + name = "kdbusaddons-5.14.0.tar.xz"; + }; + }; + kdeclarative = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/kdeclarative-5.14.0.tar.xz"; + sha256 = "1d87s26crv94w0g88xkqand3a1d02dcr9glbvpx1xxpz64mybvr4"; + name = "kdeclarative-5.14.0.tar.xz"; + }; + }; + kded = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/kded-5.14.0.tar.xz"; + sha256 = "03s95pq283vjng106bs9lrj1i2fcb1pnp58cnk1fr6w3w8fp6daq"; + name = "kded-5.14.0.tar.xz"; + }; + }; + kdelibs4support = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/portingAids/kdelibs4support-5.14.0.tar.xz"; + sha256 = "1qdw5alnf643bw0pzq3yjwajl87000xpbs8h4k2c1872rmqq1m8r"; + name = "kdelibs4support-5.14.0.tar.xz"; + }; + }; + kdesignerplugin = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/kdesignerplugin-5.14.0.tar.xz"; + sha256 = "1bb79szygplysckx7p4x66inbn9i2hmf6p7ikynbvkzph33zm375"; + name = "kdesignerplugin-5.14.0.tar.xz"; + }; + }; + kdesu = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/kdesu-5.14.0.tar.xz"; + sha256 = "1l232jhl6x7b6xqw21qw0s342c6n2gnldsdd5fmh6grx4vv556nn"; + name = "kdesu-5.14.0.tar.xz"; + }; + }; + kdewebkit = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/kdewebkit-5.14.0.tar.xz"; + sha256 = "0pz0z43mgcp4m5kdcqjl6x0cwafl0j2nidayj3vhaxcj40kn4k8l"; + name = "kdewebkit-5.14.0.tar.xz"; + }; + }; + kdnssd = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/kdnssd-5.14.0.tar.xz"; + sha256 = "0cc0adzn4pc0s6mdv71bv6h8k7x0q941f6xdmj7jpcz2q6lycav1"; + name = "kdnssd-5.14.0.tar.xz"; + }; + }; + kdoctools = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/kdoctools-5.14.0.tar.xz"; + sha256 = "06477pk0wni40c88c1v6rcl1yy91msfs399djb0i0ipkjnbj8gbs"; + name = "kdoctools-5.14.0.tar.xz"; + }; + }; + kemoticons = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/kemoticons-5.14.0.tar.xz"; + sha256 = "1dsr9hbqjrwn44zm9i5anm8sy8jb90yjyv4s219kll5rkrbxk0zr"; + name = "kemoticons-5.14.0.tar.xz"; + }; + }; + kfilemetadata = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/kfilemetadata-5.14.0.tar.xz"; + sha256 = "1ixn5yc7j4s3nvn03h7whkxsg15gf1cqnd3z2qxngvyvchzqhsd2"; + name = "kfilemetadata-5.14.0.tar.xz"; + }; + }; + kglobalaccel = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/kglobalaccel-5.14.0.tar.xz"; + sha256 = "0cr62as4n3k34dbdcarmhkxkcznnkp65q57sy6k29a68jxgxq6c3"; + name = "kglobalaccel-5.14.0.tar.xz"; + }; + }; + kguiaddons = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/kguiaddons-5.14.0.tar.xz"; + sha256 = "0658nn4lb59vzn6b9kmasl2a4g58c81cran6kz0fwc82d2310ncn"; + name = "kguiaddons-5.14.0.tar.xz"; + }; + }; + khtml = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/portingAids/khtml-5.14.0.tar.xz"; + sha256 = "1hj406v06isggbzvsw47ws510iz128jv5ggxw64p9pcibs3wb5j2"; + name = "khtml-5.14.0.tar.xz"; + }; + }; + ki18n = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/ki18n-5.14.0.tar.xz"; + sha256 = "0pwpxda5k7hl6njzzaj68brm1slfffprncgwknhaxksizprdh1qz"; + name = "ki18n-5.14.0.tar.xz"; + }; + }; + kiconthemes = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/kiconthemes-5.14.0.tar.xz"; + sha256 = "0mhykdhzab112h5pb2s2sma821x57mnr3ydwq96qjr7xhdib8dwr"; + name = "kiconthemes-5.14.0.tar.xz"; + }; + }; + kidletime = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/kidletime-5.14.0.tar.xz"; + sha256 = "07qhmyld01xcidbhkwscz5x8xvnnbphz7hfiqkn20d0n6kmlfbr8"; + name = "kidletime-5.14.0.tar.xz"; + }; + }; + kimageformats = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/kimageformats-5.14.0.tar.xz"; + sha256 = "13s25pxxjddbbzvf9l0pcrjcwkkc108318v7yglqrm58ankq8pyy"; + name = "kimageformats-5.14.0.tar.xz"; + }; + }; + kinit = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/kinit-5.14.0.tar.xz"; + sha256 = "1g6wvpd7kzmnayfax2ph7sng1blaa91fclzfxpvwnxqpayzj2z6a"; + name = "kinit-5.14.0.tar.xz"; + }; + }; + kio = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/kio-5.14.0.tar.xz"; + sha256 = "1brirg53khh8wyyd3sbnas82924idxbbc81wqk8433ryv645i8ra"; + name = "kio-5.14.0.tar.xz"; + }; + }; + kitemmodels = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/kitemmodels-5.14.0.tar.xz"; + sha256 = "0phf2278fpiyippz347l18gw3kgfvmdm2mv2wx56rsfy5inih8qf"; + name = "kitemmodels-5.14.0.tar.xz"; + }; + }; + kitemviews = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/kitemviews-5.14.0.tar.xz"; + sha256 = "1yk8djnrw4z5dw7xmwwsgz3fw1n3c1yjkggkgjy75659656psac1"; + name = "kitemviews-5.14.0.tar.xz"; + }; + }; + kjobwidgets = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/kjobwidgets-5.14.0.tar.xz"; + sha256 = "0ibxbhh335b8j5603z500fw4mnk776jj364ha9c1n4qdd7ar5yi0"; + name = "kjobwidgets-5.14.0.tar.xz"; + }; + }; + kjs = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/portingAids/kjs-5.14.0.tar.xz"; + sha256 = "1xwp9jpwmkc5h1rab6bda6ffib064qn1wpmz6hdhrgzp77v5ljw4"; + name = "kjs-5.14.0.tar.xz"; + }; + }; + kjsembed = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/portingAids/kjsembed-5.14.0.tar.xz"; + sha256 = "09vlq2d0nzhw1fiy7nww0ixa15ciwc6i9f4xqay746xy9f5i30vl"; + name = "kjsembed-5.14.0.tar.xz"; + }; + }; + kmediaplayer = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/portingAids/kmediaplayer-5.14.0.tar.xz"; + sha256 = "1mcvrffg9lfvhy6qs9v1caxf523zh2jy1mhd88m34p7sfdxp8azm"; + name = "kmediaplayer-5.14.0.tar.xz"; + }; + }; + knewstuff = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/knewstuff-5.14.0.tar.xz"; + sha256 = "0yprn590g5y0gcvmlk5p79v2svn29zyhgq9lmp5qzhh7wgz8jp26"; + name = "knewstuff-5.14.0.tar.xz"; + }; + }; + knotifications = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/knotifications-5.14.0.tar.xz"; + sha256 = "0w0b9wb5zpwjhzph5cqfvcgxz2dafi33f3jgwmdw9sm2cgmwavgb"; + name = "knotifications-5.14.0.tar.xz"; + }; + }; + knotifyconfig = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/knotifyconfig-5.14.0.tar.xz"; + sha256 = "04872agypbnj3kc6q0xa5ndzd7lzny5zp1llad0x10k7spvwk0rb"; + name = "knotifyconfig-5.14.0.tar.xz"; + }; + }; + kpackage = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/kpackage-5.14.0.tar.xz"; + sha256 = "0rvm9vwlirk38wbjyp8kkvs2m03mb1bby63zakbd7y2x5l26hyd5"; + name = "kpackage-5.14.0.tar.xz"; + }; + }; + kparts = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/kparts-5.14.0.tar.xz"; + sha256 = "149mck84rlbvw0am7jqbs6irhhabp8xd49m1b5avgdqfrkjsrrz5"; + name = "kparts-5.14.0.tar.xz"; + }; + }; + kpeople = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/kpeople-5.14.0.tar.xz"; + sha256 = "08khnnywj7f3xkgr7yclz7wdhq4lyi9xfm7f7lzsfk6vpvzn84p5"; + name = "kpeople-5.14.0.tar.xz"; + }; + }; + kplotting = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/kplotting-5.14.0.tar.xz"; + sha256 = "1d3fii89ziqnjv864qp7v9r5wd9v2qb56n6m5v9j0pz8gysc2fyp"; + name = "kplotting-5.14.0.tar.xz"; + }; + }; + kpty = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/kpty-5.14.0.tar.xz"; + sha256 = "0lyayl4z6a1fn1lr1plikx22crdalnr1sv66nwhld7dh9j3lgd6j"; + name = "kpty-5.14.0.tar.xz"; + }; + }; + kross = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/portingAids/kross-5.14.0.tar.xz"; + sha256 = "1s7icj7xsnj8sxg99ahv3h8rbv6xnkyqpybxgaj9xs6k738rjclv"; + name = "kross-5.14.0.tar.xz"; + }; + }; + krunner = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/portingAids/krunner-5.14.0.tar.xz"; + sha256 = "0lxsbg4r0hxq9cgj2c8bs5yyzaxbpn73nsxhh1a9ivjcdbdz52x3"; + name = "krunner-5.14.0.tar.xz"; + }; + }; + kservice = { + version = "5.14.3"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/kservice-5.14.3.tar.xz"; + sha256 = "0x3lbzs39vxyndh3v3kcwbp9127llfxyjgbm6yga1mff29ld57g7"; + name = "kservice-5.14.3.tar.xz"; + }; + }; + ktexteditor = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/ktexteditor-5.14.0.tar.xz"; + sha256 = "1r3zshqn7f7z81i2zzswc0a4158q21jgk5ydlx82v5w41lgsng9z"; + name = "ktexteditor-5.14.0.tar.xz"; + }; + }; + ktextwidgets = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/ktextwidgets-5.14.0.tar.xz"; + sha256 = "0nm6jaqx2jrwmqds3hdpkxmzl03vz46f147q0q659gashq9i6nlr"; + name = "ktextwidgets-5.14.0.tar.xz"; + }; + }; + kunitconversion = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/kunitconversion-5.14.0.tar.xz"; + sha256 = "080y8lxggb1dm4hjv0qb6baklb42mngz7ic3fdp9nc7jrsfbn4qq"; + name = "kunitconversion-5.14.0.tar.xz"; + }; + }; + kwallet = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/kwallet-5.14.0.tar.xz"; + sha256 = "1sk1mami15wygx7rmq2p445qdvx7yq10rhvbxgwclmvd4lj8vnly"; + name = "kwallet-5.14.0.tar.xz"; + }; + }; + kwidgetsaddons = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/kwidgetsaddons-5.14.0.tar.xz"; + sha256 = "0vqrz54f57qz2jls7iw3hsfgglidfjhk88rkpr0sam449hmqxw2v"; + name = "kwidgetsaddons-5.14.0.tar.xz"; + }; + }; + kwindowsystem = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/kwindowsystem-5.14.0.tar.xz"; + sha256 = "0fgqbrm1ngisjz11ccwvjb05v9v8fy85hvxaqnak0xysmvsw4sq1"; + name = "kwindowsystem-5.14.0.tar.xz"; + }; + }; + kxmlgui = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/kxmlgui-5.14.0.tar.xz"; + sha256 = "1j3m37h6lxkk3bs2klqqlqlpnrlqvc1a3yd1hn8sr5sn279src30"; + name = "kxmlgui-5.14.0.tar.xz"; + }; + }; + kxmlrpcclient = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/kxmlrpcclient-5.14.0.tar.xz"; + sha256 = "13s1np7sjjkmnih5r6rszqs3pvq0m4wq9za73cwhwnmlha7m3q0s"; + name = "kxmlrpcclient-5.14.0.tar.xz"; + }; + }; + modemmanager-qt = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/modemmanager-qt-5.14.0.tar.xz"; + sha256 = "1njg0gmzmj6g1w6d7id44g6dw7bki8xsq3sk0p7jqh1lcnsww4ck"; + name = "modemmanager-qt-5.14.0.tar.xz"; + }; + }; + networkmanager-qt = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/networkmanager-qt-5.14.0.tar.xz"; + sha256 = "1j2srgz4z2jd6b0iyb1rj979k0jz9hk8k7wx23146cvgrr4h4s86"; + name = "networkmanager-qt-5.14.0.tar.xz"; + }; + }; + plasma-framework = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/plasma-framework-5.14.0.tar.xz"; + sha256 = "16yghp353l9apndwqcaa310cxhm6vn0c2amggzvpr5fdwa3jb6mh"; + name = "plasma-framework-5.14.0.tar.xz"; + }; + }; + solid = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/solid-5.14.0.tar.xz"; + sha256 = "0znrmpw9nr2yccqs1xr0kai3sfhi175gfr006h4h88kfr0gc9s4i"; + name = "solid-5.14.0.tar.xz"; + }; + }; + sonnet = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/sonnet-5.14.0.tar.xz"; + sha256 = "06nn9zxxvj7sf6pdg35vay1f022c2binhl8p7i29w7vmxnxdg4w9"; + name = "sonnet-5.14.0.tar.xz"; + }; + }; + threadweaver = { + version = "5.14.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.14/threadweaver-5.14.0.tar.xz"; + sha256 = "01vdqhlg5jp14dhalpggy359hw9620309zbssp0pdv7bflnwl0n3"; + name = "threadweaver-5.14.0.tar.xz"; + }; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.14/threadweaver.nix b/pkgs/development/libraries/kde-frameworks-5.14/threadweaver.nix new file mode 100644 index 00000000000..52817921cc7 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.14/threadweaver.nix @@ -0,0 +1,11 @@ +{ kdeFramework, lib +, extra-cmake-modules +}: + +kdeFramework { + name = "threadweaver"; + nativeBuildInputs = [ extra-cmake-modules ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 84d90b18ef6..524aaa3fc40 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6640,9 +6640,9 @@ let kf510 = recurseIntoAttrs (callPackage ../development/libraries/kde-frameworks-5.10 { }); kf512 = recurseIntoAttrs (callPackage ../development/libraries/kde-frameworks-5.12 { }); + kf514 = recurseIntoAttrs (import ../development/libraries/kde-frameworks-5.14 { inherit pkgs; }); kf5_latest = kf512; kf5_stable = kf510; - kf513 = recurseIntoAttrs (import ../development/libraries/kde-frameworks-5.13 { inherit pkgs; }); kf5PackagesFun = self: with self; { -- cgit 1.4.1 From a5a031c8ffba4639c1f9dcabc7a8a306a5e7dc0a Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 5 Oct 2015 06:28:45 -0500 Subject: wrapQtProgram: --set does not take separator The --set flag to wrapProgram does not take a separator character, just a value. --- pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh b/pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh index d9690559b42..9f1bafc9f49 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh +++ b/pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh @@ -62,9 +62,9 @@ setQMakePath() { wrapQtProgram() { wrapProgram "$1" \ - --set QT_PLUGIN_PATH : "$QT_PLUGIN_PATH" \ - --set QML_IMPORT_PATH : "$QML_IMPORT_PATH" \ - --set QML2_IMPORT_PATH : "$QML2_IMPORT_PATH" \ + --set QT_PLUGIN_PATH "$QT_PLUGIN_PATH" \ + --set QML_IMPORT_PATH "$QML_IMPORT_PATH" \ + --set QML2_IMPORT_PATH "$QML2_IMPORT_PATH" \ "$@" } -- cgit 1.4.1 From 8db98ceb010e550ebc3a6cae475bf7723c691c37 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 7 Oct 2015 15:11:39 +0300 Subject: glibc_multi: fix ldd for 64-bit ELFs --- pkgs/development/libraries/glibc/multi.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/glibc/multi.nix b/pkgs/development/libraries/glibc/multi.nix index e0a9fa46b96..b5b4eabe9c7 100644 --- a/pkgs/development/libraries/glibc/multi.nix +++ b/pkgs/development/libraries/glibc/multi.nix @@ -23,7 +23,7 @@ runCommand "${nameVersion.name}-multi-${nameVersion.version}" cp -rs $glibc64/bin $out chmod u+w $out/bin rm $out/bin/ldd - sed -e "s|^RTLDLIST=.*$|RTLDLIST=\"$out/lib/ld-2.19.so $out/lib/32/ld-linux.so.2\"|g" \ + sed -e "s|^RTLDLIST=.*$|RTLDLIST=\"$out/lib/ld-linux-x86-64.so.2 $out/lib/32/ld-linux.so.2\"|g" \ $glibc64/bin/ldd > $out/bin/ldd chmod 555 $out/bin/ldd -- cgit 1.4.1 From c90d26140e917687e4cfe698eaa67c6d3f9d5743 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 8 Oct 2015 00:53:32 +0200 Subject: opensubdiv: Add --- pkgs/development/libraries/opensubdiv/default.nix | 47 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 49 insertions(+) create mode 100644 pkgs/development/libraries/opensubdiv/default.nix (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/opensubdiv/default.nix b/pkgs/development/libraries/opensubdiv/default.nix new file mode 100644 index 00000000000..91ebc7cc661 --- /dev/null +++ b/pkgs/development/libraries/opensubdiv/default.nix @@ -0,0 +1,47 @@ +{ lib, stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig, xorg, mesa, glew +, cudaSupport ? false, cudatoolkit +}: + +stdenv.mkDerivation { + name = "opensubdiv-3.0.3"; + + src = fetchFromGitHub { + owner = "PixarAnimationStudios"; + repo = "OpenSubdiv"; + rev = "v3_0_3"; + sha256 = "1pd7xsz4lx5l2hdixfgqx9yijchw108wqkvxj78rbblkkawvqhmx"; + }; + + patches = + [ # Fix for building with cudatoolkit 7. + (fetchurl { + url = "https://github.com/opeca64/OpenSubdiv/commit/c3c258d00feaeffe1123f6077179c155e71febfb.patch"; + sha256 = "0vazhp35v8vsgnvprkzwvfkbalr0kzcwlin9ygyfb77cz7mwicnf"; + }) + ]; + + buildInputs = + [ cmake pkgconfig mesa + # FIXME: these are not actually needed, but the configure script wants them. + glew xorg.libX11 xorg.libXrandr xorg.libXxf86vm xorg.libXcursor xorg.libXinerama + ] + ++ lib.optional cudaSupport cudatoolkit; + + cmakeFlags = + [ "-DNO_TUTORIALS=1" + "-DNO_REGRESSION=1" + "-DNO_EXAMPLES=1" + "-DGLEW_INCLUDE_DIR=${glew}/include" + "-DGLEW_LIBRARY=${glew}/lib" + ]; + + enableParallelBuilding = true; + + meta = { + description = "An Open-Source subdivision surface library"; + homepage = http://graphics.pixar.com/opensubdiv; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.eelco ]; + license = lib.licenses.asl20; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 78a4dc1d996..6cde4386cab 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7794,6 +7794,8 @@ let }; }; + opensubdiv = callPackage ../development/libraries/opensubdiv { }; + openwsman = callPackage ../development/libraries/openwsman {}; ortp = callPackage ../development/libraries/ortp { }; -- cgit 1.4.1 From 0e9bc968892657b1588666d63ce83293508995c6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 6 Oct 2015 15:21:24 +0200 Subject: libwps 0.4.1 -> 0.4.2 --- pkgs/development/libraries/libwps/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/libwps/default.nix b/pkgs/development/libraries/libwps/default.nix index e17540e96a4..798284c3b89 100644 --- a/pkgs/development/libraries/libwps/default.nix +++ b/pkgs/development/libraries/libwps/default.nix @@ -1,17 +1,18 @@ { stdenv, fetchurl, boost, pkgconfig, librevenge, zlib }: +let version = "0.4.2"; in stdenv.mkDerivation rec { name = "libwps-${version}"; - version = "0.4.1"; src = fetchurl { url = "mirror://sourceforge/libwps/${name}.tar.gz"; - sha256 = "0nc44ia5sn9mmhkq5hjacz0vm520wldq03whc5psgcb9dahvsjsc"; + sha256 = "0c90i3zafxxsj989bd9bs577blx3mrb90rj52iv6ijc4qivi4wkr"; }; buildInputs = [ boost pkgconfig librevenge zlib ]; meta = with stdenv.lib; { + inherit version; homepage = http://libwps.sourceforge.net/; description = "Microsoft Works file word processor format import filter library"; platforms = platforms.linux; -- cgit 1.4.1 From 69e1bec7164c4181a84d44101aeb0499a86e0780 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 7 Oct 2015 13:41:20 +0200 Subject: libuv: Get rid of unused versions Building dozens of unused versions is a bit excessive. --- pkgs/development/libraries/libuv/default.nix | 26 -------------------------- 1 file changed, 26 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index 158152abade..48d12321248 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -76,33 +76,7 @@ in with lib; - mapAttrs (v: h: mkWithoutAutotools stable (toVersion v) h) { - v0_10_27 = "0i00v216ha74xi374yhgmfrb4h84q2w4y1ync3y1qsngbm8irjhg"; - } - // mapAttrs (v: h: mkWithAutotools unstable (toVersion v) h) { - # Versions >= 0.11.1 and < 0.11.6 do not build a dynamic library - v0_11_6 = "15h903hz6kn8j1lp1160ia7llx0ypa5ch8ygkwpmrm31p50ng8r4"; - v0_11_7 = "1l6hrz3g2c7qspy28inbrcd7byn2sncd42ncf4pr0ifpkkj083hh"; - v0_11_8 = "0aag2v7bfi7kksna0867srlqcjxn8m287bpl2j5k11d07m382zs1"; - v0_11_9 = "12ap0ix5ra24f30adgdr48l175vxfmh398mlilm8kdkld0dqfx24"; - v0_11_10 = "17mn9xbygc2jpqv4a068i57rcp585bmcalpb9jpyz1jf030lllyy"; - v0_11_11 = "1l06sznvd5nxzg3fqqb451g4fzygyb37apqyhyvbdb6dmklcm7xk"; - v0_11_12 = "1kwqd3wk06mffhglawx7b2g4yddkg5597aa5jyw2zhzwkz2z4a27"; - v0_11_13 = "0z30ljwgxbm120dy0i4knhj5zw6q7jcx5wi9v0v51ax6mhdgqy8a"; - v0_11_14 = "0bk1bchfkbyyry3d4ggv754w5fyj6qbivbd42ggcr0hq55h49iwg"; - v0_11_15 = "09qayz2k0337h7jbf8zs9lyxgp3ln0gq37r43wixfll7jjjkacvd"; - v0_11_16 = "06jrwwnliqadqgp7fn2093xxljiz8iwdyywh2yljyp4zk8r4vzis"; - v0_11_17 = "0i6nlxnlxwzpib0sp1191h9yymfvgwjwciiq9avcqljiklfg432r"; - v0_11_18 = "0jxrfxf4iq34fjgbwdrvi36hqzgph87928n4q4gchpahywf2pjxk"; - v0_11_19 = "16aw8jx571xxc6am4sbz17j2wb9pylv1svsmwxbczb3vd624vm32"; - v0_11_20 = "0r7cyzxysgcfl4h9xis050b7x8cvmrwzwh1rr545q53j0gjxvzvi"; - v0_11_21 = "0bxjzrlcs2f0va26i0ahvcpjbb0j66rq74smi95s6q73zl99n326"; - v0_11_22 = "0r6nfavsndm1dzinzzxndr2h75g33vigx21z3f7w2x7qwa8a8hpp"; - v0_11_23 = "01dlmpk8a4zvq6lm88bsfi7dzhl7xvma7q5ygi2x5ghdm4svki1m"; - v0_11_24 = "1hygn81iwbdshzrq603qm6k1r7pjflx9qqazmlb72c3vy1hq21c6"; - v0_11_25 = "1abszivlxf0sddwvcj3jywfsip5q9vz6axvn40qqyl8sjs80zcvj"; - v0_11_26 = "1pfjdwrxhqz1vqcdm42g3j45ghrb4yl7wsngvraclhgqicff1sc3"; v0_11_29 = "1z07phfwryfy2155p3lxcm2a33h20sfl96lds5dghn157x6csz7m"; } // -- cgit 1.4.1 From 3436c78fc38719ab2d2b5641760188afdcf22381 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 9 Oct 2015 19:02:01 -0500 Subject: openlibm: init at 0.4.1 --- .../libraries/science/math/openlibm/default.nix | 22 ++++++++++++++++++++++ .../science/math/openlibm/openlibm-prefix.patch | 13 +++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 37 insertions(+) create mode 100644 pkgs/development/libraries/science/math/openlibm/default.nix create mode 100644 pkgs/development/libraries/science/math/openlibm/openlibm-prefix.patch (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/science/math/openlibm/default.nix b/pkgs/development/libraries/science/math/openlibm/default.nix new file mode 100644 index 00000000000..ad0eab88c51 --- /dev/null +++ b/pkgs/development/libraries/science/math/openlibm/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation { + name = "openlibm-0.4.1"; + src = fetchurl { + url = "https://github.com/JuliaLang/openlibm/archive/v0.4.1.tar.gz"; + sha256 = "0cwqqqlblj3kzp9aq1wnpfs1fl0qd1wp1xzm5shb09w06i4rh9nn"; + }; + + patches = [ ./openlibm-prefix.patch ]; + postPatch = '' + substituteAllInPlace Make.inc + ''; + + meta = { + description = "High quality system independent, portable, open source libm implementation"; + homepage = "http://www.openlibm.org/"; + license = stdenv.lib.licenses.mit; + maintainers = [ stdenv.lib.maintainers.ttuegel ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/libraries/science/math/openlibm/openlibm-prefix.patch b/pkgs/development/libraries/science/math/openlibm/openlibm-prefix.patch new file mode 100644 index 00000000000..0c000497994 --- /dev/null +++ b/pkgs/development/libraries/science/math/openlibm/openlibm-prefix.patch @@ -0,0 +1,13 @@ +diff --git a/Make.inc b/Make.inc +index 83d9612..e951c56 100644 +--- a/Make.inc ++++ b/Make.inc +@@ -7,7 +7,7 @@ VERSION = 0.4 + SOMAJOR = 1 + SOMINOR = 0 + DESTDIR = +-prefix = /usr/local ++prefix = @out@ + bindir = $(prefix)/bin + libdir = $(prefix)/lib + includedir = $(prefix)/include diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ae18eea6949..f6363adfeb2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14266,6 +14266,8 @@ let # standard BLAS and LAPACK. openblasCompat = openblas.override { blas64 = false; }; + openlibm = callPackage ../development/libraries/science/math/openlibm {}; + mathematica = callPackage ../applications/science/math/mathematica { }; mathematica9 = callPackage ../applications/science/math/mathematica/9.nix { }; -- cgit 1.4.1 From 7061b6819a27632fc0f4ca240a43369b8b683f5e Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 9 Oct 2015 19:08:25 -0500 Subject: pcre2: init at 10.20 --- pkgs/development/libraries/pcre2/default.nix | 17 +++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 19 insertions(+) create mode 100644 pkgs/development/libraries/pcre2/default.nix (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/pcre2/default.nix b/pkgs/development/libraries/pcre2/default.nix new file mode 100644 index 00000000000..71435b6d0ba --- /dev/null +++ b/pkgs/development/libraries/pcre2/default.nix @@ -0,0 +1,17 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation { + name = "pcre2-10.20"; + src = fetchurl { + url = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre2-10.20.tar.bz2"; + sha256 = "0yj8mm9ll9zj3v47rvmmqmr1ybxk72rr2lym3rymdsf905qjhbik"; + }; + + meta = { + description = "Perl Compatible Regular Expressions"; + homepage = "http://www.pcre.org/"; + license = stdenv.lib.licenses.bsd3; + maintainers = [ stdenv.lib.maintainers.ttuegel ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f6363adfeb2..63e0cf17a6f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7824,6 +7824,8 @@ let unicodeSupport = config.pcre.unicode or true; }; + pcre2 = callPackage ../development/libraries/pcre2 { }; + pdf2xml = callPackage ../development/libraries/pdf2xml {} ; phonon = callPackage ../development/libraries/phonon/qt4 {}; -- cgit 1.4.1 From 4c7ef76862221031ff96283ac9a24cae78a0793b Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sat, 10 Oct 2015 11:11:56 +0200 Subject: libeb: s/licence/license --- pkgs/development/libraries/libeb/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/libeb/default.nix b/pkgs/development/libraries/libeb/default.nix index 9315a8f12b5..ba3c6fb1a8f 100644 --- a/pkgs/development/libraries/libeb/default.nix +++ b/pkgs/development/libraries/libeb/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { common way to distribute electronic dictionaries in Japan. It supports the EB, EBG, EBXA, EBXA-C, S-EBXA and EPWING formats. ''; - licence = licenses.bsd3; + license = licenses.bsd3; maintainers = with maintainers; [ gebner ]; }; } -- cgit 1.4.1 From f9e701162672114d6c86dcd7841e916b91f10dd5 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 10 Oct 2015 12:55:08 -0500 Subject: fixup! openlibm: init at 0.4.1 --- .../development/libraries/science/math/openlibm/default.nix | 5 +---- .../libraries/science/math/openlibm/openlibm-prefix.patch | 13 ------------- 2 files changed, 1 insertion(+), 17 deletions(-) delete mode 100644 pkgs/development/libraries/science/math/openlibm/openlibm-prefix.patch (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/science/math/openlibm/default.nix b/pkgs/development/libraries/science/math/openlibm/default.nix index ad0eab88c51..e38e6c9e31f 100644 --- a/pkgs/development/libraries/science/math/openlibm/default.nix +++ b/pkgs/development/libraries/science/math/openlibm/default.nix @@ -7,10 +7,7 @@ stdenv.mkDerivation { sha256 = "0cwqqqlblj3kzp9aq1wnpfs1fl0qd1wp1xzm5shb09w06i4rh9nn"; }; - patches = [ ./openlibm-prefix.patch ]; - postPatch = '' - substituteAllInPlace Make.inc - ''; + makeFlags = [ "prefix=$(out)" ]; meta = { description = "High quality system independent, portable, open source libm implementation"; diff --git a/pkgs/development/libraries/science/math/openlibm/openlibm-prefix.patch b/pkgs/development/libraries/science/math/openlibm/openlibm-prefix.patch deleted file mode 100644 index 0c000497994..00000000000 --- a/pkgs/development/libraries/science/math/openlibm/openlibm-prefix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Make.inc b/Make.inc -index 83d9612..e951c56 100644 ---- a/Make.inc -+++ b/Make.inc -@@ -7,7 +7,7 @@ VERSION = 0.4 - SOMAJOR = 1 - SOMINOR = 0 - DESTDIR = --prefix = /usr/local -+prefix = @out@ - bindir = $(prefix)/bin - libdir = $(prefix)/lib - includedir = $(prefix)/include -- cgit 1.4.1 From cd2c0e4e86d3eddeb701ee08ea5794517f5ff369 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 10 Oct 2015 12:55:30 -0500 Subject: openspecfun: init at 0.4 --- .../libraries/science/math/openspecfun/default.nix | 21 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/libraries/science/math/openspecfun/default.nix (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/science/math/openspecfun/default.nix b/pkgs/development/libraries/science/math/openspecfun/default.nix new file mode 100644 index 00000000000..1988c0c07af --- /dev/null +++ b/pkgs/development/libraries/science/math/openspecfun/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, gfortran }: + +stdenv.mkDerivation { + name = "openspecfun-0.4"; + src = fetchurl { + url = "https://github.com/JuliaLang/openspecfun/archive/v0.4.tar.gz"; + sha256 = "0nsa3jjmlhcqkw5ba5ypbn3n0c8b6lc22zzlxnmxkxi9shhdx65z"; + }; + + makeFlags = [ "prefix=$(out)" ]; + + nativeBuildInputs = [ gfortran ]; + + meta = { + description = "A collection of special mathematical functions"; + homepage = "https://github.com/JuliaLang/openspecfun"; + license = stdenv.lib.licenses.mit; + maintainers = [ stdenv.lib.maintainers.ttuegel ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 81c8021e207..b4c0b61c4a3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14271,6 +14271,8 @@ let openlibm = callPackage ../development/libraries/science/math/openlibm {}; + openspecfun = callPackage ../development/libraries/science/math/openspecfun {}; + mathematica = callPackage ../applications/science/math/mathematica { }; mathematica9 = callPackage ../applications/science/math/mathematica/9.nix { }; -- cgit 1.4.1 From 32bef7253d54c7d66f539e45fc2fd8dfe9d561aa Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 10 Oct 2015 12:56:43 -0500 Subject: utf8proc: 1.2 -> 1.3 --- pkgs/development/libraries/utf8proc/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/utf8proc/default.nix b/pkgs/development/libraries/utf8proc/default.nix index c8a2fd6a4e9..4b7d06fe8c7 100644 --- a/pkgs/development/libraries/utf8proc/default.nix +++ b/pkgs/development/libraries/utf8proc/default.nix @@ -1,14 +1,12 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { name = "utf8proc-${version}"; - version = "v1.2"; + version = "1.3"; - src = fetchFromGitHub { - owner = "JuliaLang"; - repo = "utf8proc"; - rev = "${version}"; - sha256 = "1ryjlcnpfm7fpkq6444ybi576hbnh2l0w7kjhbqady5lxwjyg3pf"; + src = fetchurl { + url = "https://github.com/JuliaLang/utf8proc/archive/v${version}.tar.gz"; + sha256 = "07r7djkmd399wl9cn0s2iqjhmm7l5iifp5h1yf2in9s366mlhkkg"; }; makeFlags = [ "prefix=$(out)" ]; -- cgit 1.4.1 From d2a855b6063dd5ad8b65fd6ade2ae806e4ab897b Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 10 Oct 2015 13:56:24 -0500 Subject: pcre2: enable JIT --- pkgs/development/libraries/pcre2/default.nix | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/pcre2/default.nix b/pkgs/development/libraries/pcre2/default.nix index 71435b6d0ba..77e91a60175 100644 --- a/pkgs/development/libraries/pcre2/default.nix +++ b/pkgs/development/libraries/pcre2/default.nix @@ -7,6 +7,10 @@ stdenv.mkDerivation { sha256 = "0yj8mm9ll9zj3v47rvmmqmr1ybxk72rr2lym3rymdsf905qjhbik"; }; + configureFlags = [ + "--enable-jit" + ]; + meta = { description = "Perl Compatible Regular Expressions"; homepage = "http://www.pcre.org/"; -- cgit 1.4.1 From 840f4b0b550e1c7a75c60aec6469528343c071a7 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 10 Oct 2015 13:56:34 -0500 Subject: pcre2: enable alternate character widths --- pkgs/development/libraries/pcre2/default.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/pcre2/default.nix b/pkgs/development/libraries/pcre2/default.nix index 77e91a60175..4f8d5cf1aaa 100644 --- a/pkgs/development/libraries/pcre2/default.nix +++ b/pkgs/development/libraries/pcre2/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation { }; configureFlags = [ + "--enable-pcre2-16" + "--enable-pcre2-32" "--enable-jit" ]; -- cgit 1.4.1 From eb300443f04a8679e58157f5eb73a944541685f9 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 11 Oct 2015 09:16:27 -0500 Subject: openblas: run tests --- .../libraries/science/math/openblas/default.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index a4bf1efbb73..7a1a860b9e4 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -6,6 +6,8 @@ with stdenv.lib; +let blas64_ = blas64; in + let local = config.openblas.preferLocalBuild or false; binary = { i686-linux = "32"; @@ -18,11 +20,11 @@ let local = config.openblas.preferLocalBuild or false; ]; localFlags = config.openblas.flags or optionals (hasAttr "target" config.openblas) [ "TARGET=${config.openblas.target}" ]; - blas64Orig = blas64; -in -stdenv.mkDerivation rec { - version = "0.2.14"; + blas64 = if blas64_ != null then blas64_ else hasPrefix "x86_64" stdenv.system; + version = "0.2.14"; +in +stdenv.mkDerivation { name = "openblas-${version}"; src = fetchurl { url = "https://github.com/xianyi/OpenBLAS/tarball/v${version}"; @@ -30,6 +32,8 @@ stdenv.mkDerivation rec { name = "openblas-${version}.tar.gz"; }; + inherit blas64; + preBuild = "cp ${liblapack.src} lapack-${liblapack.meta.version}.tgz"; nativeBuildInputs = optionals stdenv.isDarwin [coreutils] ++ [gfortran perl]; @@ -50,7 +54,8 @@ stdenv.mkDerivation rec { "INTERFACE64=${if blas64 then "1" else "0"}" ]; - blas64 = if blas64Orig != null then blas64Orig else hasPrefix "x86_64" stdenv.system; + doCheck = true; + checkTarget = "tests"; meta = with stdenv.lib; { description = "Basic Linear Algebra Subprograms"; -- cgit 1.4.1 From 0daee71b1ca734d82ae5c35cc7eee7ead49dbadb Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 11 Oct 2015 09:16:34 -0500 Subject: suitesparse: link shared library against openblas --- pkgs/development/libraries/science/math/suitesparse/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/science/math/suitesparse/default.nix b/pkgs/development/libraries/science/math/suitesparse/default.nix index f30db472b0d..e32b8b34426 100644 --- a/pkgs/development/libraries/science/math/suitesparse/default.nix +++ b/pkgs/development/libraries/science/math/suitesparse/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation { for i in "$out"/lib/lib*.a; do ar -x $i done - gcc *.o --shared -o "$out/lib/libsuitesparse.so" + gcc *.o --shared -o "$out/lib/libsuitesparse.so" -lopenblas ) for i in umfpack cholmod amd camd colamd spqr; do ln -s libsuitesparse.so "$out"/lib/lib$i.so; -- cgit 1.4.1 From 4908be3259225b44cf2799abacb988fd6794a50f Mon Sep 17 00:00:00 2001 From: James ‘Twey’ Kay Date: Thu, 8 Oct 2015 22:24:04 +0100 Subject: swiften: init at 3.0beta2 --- pkgs/development/libraries/swiften/default.nix | 30 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/libraries/swiften/default.nix (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/swiften/default.nix b/pkgs/development/libraries/swiften/default.nix new file mode 100644 index 00000000000..3978461d0ca --- /dev/null +++ b/pkgs/development/libraries/swiften/default.nix @@ -0,0 +1,30 @@ +{ stdenv, python, fetchurl, openssl, boost }: +stdenv.mkDerivation rec { + name = "swiften-${version}"; + version = "3.0beta2"; + + buildInputs = [ python ]; + propagatedBuildInputs = [ openssl boost ]; + + src = fetchurl { + url = "http://swift.im/downloads/releases/swift-${version}/swift-${version}.tar.gz"; + sha256 = "0i6ks122rry9wvg6qahk3yiggi7nlkpgws1z0r41vi4i1siq0ls0"; + }; + + buildPhase = '' + ./scons openssl=${openssl} \ + boost_includedir=${boost.dev}/include \ + boost_libdir=${boost.lib}/lib \ + boost_bundled_enable=false \ + SWIFTEN_INSTALLDIR=$out $out + ''; + installPhase = "true"; + + meta = with stdenv.lib; { + description = "An XMPP library for C++, used by the Swift client"; + homepage = http://swift.im/swiften.html; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = [ maintainers.twey ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b83861392fa..7d5108658d5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3110,6 +3110,8 @@ let swaks = callPackage ../tools/networking/swaks { }; + swiften = callPackage ../development/libraries/swiften { }; + t = callPackage ../tools/misc/t { }; t1utils = callPackage ../tools/misc/t1utils { }; -- cgit 1.4.1 From 18a32bd8cd93277c0d7e1b230b492448ad7bc85b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 12 Oct 2015 15:57:02 +0200 Subject: libmp3splt: enable libid3tag support --- pkgs/development/libraries/libmp3splt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/libmp3splt/default.nix b/pkgs/development/libraries/libmp3splt/default.nix index 9ad2498dfa0..9074eb470b6 100644 --- a/pkgs/development/libraries/libmp3splt/default.nix +++ b/pkgs/development/libraries/libmp3splt/default.nix @@ -1,14 +1,14 @@ -{stdenv, fetchurl, libtool, libmad }: +{ stdenv, fetchurl, libtool, libmad, libid3tag }: stdenv.mkDerivation rec { name = "libmp3splt-0.9.1"; - + src = fetchurl { url = "http://prdownloads.sourceforge.net/mp3splt/${name}.tar.gz"; sha256 = "17ar9d669cnirkz1kdrim687wzi36y8inapnj4svlsvr00vdzfxa"; }; - buildInputs = [ libtool libmad ]; + buildInputs = [ libtool libmad libid3tag ]; configureFlags = "--disable-pcre"; -- cgit 1.4.1 From da5ffe8cb40d3bf072788d474a6163dd748ae9e1 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Mon, 12 Oct 2015 15:16:27 -0700 Subject: GLFW: 3.1.1 -> 3.1.2 --- pkgs/development/libraries/glfw/3.x.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/glfw/3.x.nix b/pkgs/development/libraries/glfw/3.x.nix index 02d26759834..681137cd590 100644 --- a/pkgs/development/libraries/glfw/3.x.nix +++ b/pkgs/development/libraries/glfw/3.x.nix @@ -1,13 +1,16 @@ -{ stdenv, fetchurl, cmake, mesa, libXrandr, libXi, libXxf86vm, libXfixes, xlibsWrapper +{ stdenv, fetchFromGitHub, cmake, mesa, libXrandr, libXi, libXxf86vm, libXfixes, xlibsWrapper , libXinerama, libXcursor }: stdenv.mkDerivation rec { - name = "glfw-3.1.1"; + version = "3.1.2"; + name = "glfw-${version}"; - src = fetchurl { - url = "mirror://sourceforge/glfw/${name}.tar.bz2"; - sha256 = "0q9dhbj2az7jwwi556zai0qr8zmg6d2lyxcqngppkw0x7hi1d1aa"; + src = fetchFromGitHub { + owner = "glfw"; + repo = "GLFW"; + rev = "${version}"; + sha256 = "1aj1dfyyd0170gpz32j2xlqbvbsxwbg028xiqai3mqc44xfp10kw"; }; enableParallelBuilding = true; @@ -21,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Multi-platform library for creating OpenGL contexts and managing input, including keyboard, mouse, joystick and time"; - homepage = "http://glfw.sourceforge.net/"; + homepage = "http://www.glfw.org/"; license = licenses.zlib; maintainers = with maintainers; [ marcweber ]; platforms = platforms.linux; -- cgit 1.4.1 From 3680198bb91649c239ae163bd30b84dbe1040d25 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 13 Oct 2015 18:43:12 +0200 Subject: libpsl list 2015-09-25 -> 2015-10-11 --- pkgs/development/libraries/libpsl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix index 25bd92add38..ebdce2bfc48 100644 --- a/pkgs/development/libraries/libpsl/default.nix +++ b/pkgs/development/libraries/libpsl/default.nix @@ -5,10 +5,10 @@ let version = "${libVersion}-list-${listVersion}"; - listVersion = "2015-09-25"; + listVersion = "2015-10-11"; listSources = fetchFromGitHub { - sha256 = "045snl0pz8ma5rk51xxbjcamm28hi4z2v7gd8zkkv8yrjyg9yp82"; - rev = "509db00ef21795e58bfc2c576cebf72c8ee7a6f9"; + sha256 = "1zvfywi43kyh7b6hsm8ldmdypk9n36jzp0s1lf2rzd4yzcyxwgzy"; + rev = "8952c0c398ba44d507a8ed430fd1cff7b92dfde8"; repo = "list"; owner = "publicsuffix"; }; -- cgit 1.4.1 From 2e098d58d2b845b19fffefbbc54f405ef2d79d8a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 14 Oct 2015 11:54:43 +0200 Subject: libmicrohttpd: Update to 0.9.44 Also move the info pages to a separate output, significantly reducing the size of the main output. --- pkgs/development/libraries/libmicrohttpd/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/libmicrohttpd/default.nix b/pkgs/development/libraries/libmicrohttpd/default.nix index fb6ba1761b5..3ef4ba77c31 100644 --- a/pkgs/development/libraries/libmicrohttpd/default.nix +++ b/pkgs/development/libraries/libmicrohttpd/default.nix @@ -1,13 +1,15 @@ { lib, stdenv, fetchurl, libgcrypt }: stdenv.mkDerivation rec { - name = "libmicrohttpd-0.9.43"; + name = "libmicrohttpd-0.9.44"; src = fetchurl { url = "mirror://gnu/libmicrohttpd/${name}.tar.gz"; - sha256 = "17q6v5q0jpg57vylby6rx1qkil72bdx8gij1g9m694gxf5sb6js1"; + sha256 = "07j1p21rvbrrfpxngk8xswzkmjkh94bp1971xfjh1p0ja709qwzj"; }; + outputs = [ "out" "info" ]; + buildInputs = [ libgcrypt ]; preCheck = -- cgit 1.4.1 From bb15c81597efceb615a276a97a678406dd36b8a8 Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Wed, 14 Oct 2015 20:27:36 +0100 Subject: libtermkey: 0.17 -> 0.18 --- pkgs/development/libraries/libtermkey/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/libtermkey/default.nix b/pkgs/development/libraries/libtermkey/default.nix index c59542fdfed..bbc7c9a6094 100644 --- a/pkgs/development/libraries/libtermkey/default.nix +++ b/pkgs/development/libraries/libtermkey/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "libtermkey-${version}"; - version = "0.17"; + version = "0.18"; src = fetchzip { url = "http://www.leonerd.org.uk/code/libtermkey/libtermkey-${version}.tar.gz"; - sha256 = "085mdshgqsn76gfnnzfns7awv6lals9mgv5a6bybd9f9aj7lvrm5"; + sha256 = "0a0ih1a114phzmyq6jzgbp03x97463fwvrp1cgnl26awqw3f8sbf"; }; makeFlags = [ "PREFIX=$(out)" ] -- cgit 1.4.1 From a8ae9b2e4206a25c6f3139ded84110d6e041ac0f Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Tue, 13 Oct 2015 15:28:17 +0300 Subject: libbluray: 0.8.1 -> 0.9.0 --- pkgs/development/libraries/libbluray/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/libbluray/default.nix b/pkgs/development/libraries/libbluray/default.nix index d8571254967..77fa6dec43e 100644 --- a/pkgs/development/libraries/libbluray/default.nix +++ b/pkgs/development/libraries/libbluray/default.nix @@ -19,12 +19,12 @@ assert withFonts -> freetype != null; stdenv.mkDerivation rec { baseName = "libbluray"; - version = "0.8.1"; + version = "0.9.0"; name = "${baseName}-${version}"; src = fetchurl { url = "ftp://ftp.videolan.org/pub/videolan/${baseName}/${version}/${name}.tar.bz2"; - sha256 = "13zvkrwy2fr877gkifgwnqfsb3krbz7hklfcwqfjbhmvqn0cdgnd"; + sha256 = "0kb9znxk6610vi0fjhqxn4z5i98nvxlsz1f8dakj99rg42livdl4"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ] -- cgit 1.4.1 From d54a45906384929a6a9910cb559a6aa952d3199f Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Tue, 13 Oct 2015 15:30:49 +0300 Subject: ipopt: 3.12.3 -> 3.12.4 --- pkgs/development/libraries/science/math/ipopt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/science/math/ipopt/default.nix b/pkgs/development/libraries/science/math/ipopt/default.nix index 89d2a242f96..f9897e4add3 100644 --- a/pkgs/development/libraries/science/math/ipopt/default.nix +++ b/pkgs/development/libraries/science/math/ipopt/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, unzip, openblas, gfortran }: stdenv.mkDerivation rec { - version = "3.12.3"; + version = "3.12.4"; name = "ipopt-${version}"; src = fetchurl { url = "http://www.coin-or.org/download/source/Ipopt/Ipopt-${version}.zip"; - sha256 = "0h8qx3hq2m21qrg4v3n26v2qbhl6saxrpa7rbhnmkkcfj5s942yr"; + sha256 = "0hxmpi3zx5zgv2ijscdvc40xf88hx5if0d9sgch155z70g15wx0l"; }; preConfigure = '' -- cgit 1.4.1 From 786b657031904e3a2b2a7c646a22f1a75a2744fb Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Tue, 13 Oct 2015 15:31:11 +0300 Subject: cppzmq: 2015-07-06 -> 20150926 --- pkgs/development/libraries/cppzmq/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/cppzmq/default.nix b/pkgs/development/libraries/cppzmq/default.nix index 282ad7bfcd7..f74ee51cab2 100644 --- a/pkgs/development/libraries/cppzmq/default.nix +++ b/pkgs/development/libraries/cppzmq/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - name = "cppzmq-2015-07-06"; + name = "cppzmq-20150926"; src = fetchgit { url = "https://github.com/zeromq/cppzmq"; - rev = "a88bf3e0b0bc6ed5f5b25a58f8997a1dae374c8b"; - sha256 = "75a6630b870c1f0d5b9d6a0ba03e83ceee47aaa2a253894e75a8a93a6d65d3aa"; + rev = "fa2f2c67a79c31d73bfef6862cc8ce12a98dd022"; + sha256 = "7b46712b5fa7e59cd0ffae190674046c71d5762c064003c125d6cd7a3da19b71"; }; installPhase = '' -- cgit 1.4.1 From f2ce7bb0a595f2bb49aa90a2266b433c16d5264a Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Tue, 13 Oct 2015 16:09:32 +0300 Subject: folly: 2015-09-17 -> 0.57.0 --- pkgs/development/libraries/folly/default.nix | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index 4659ba21123..046b7f97ba4 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -1,21 +1,29 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, boost, libevent, double_conversion, glog +{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, boost, libevent, double_conversion, glog , google-gflags, python, libiberty, openssl }: stdenv.mkDerivation rec { - version = "2015-09-17"; + version = "0.57.0"; name = "folly-${version}"; src = fetchFromGitHub { owner = "facebook"; repo = "folly"; - rev = "e4527fb5d04f5fec823bd6a2402b620a6e1a64e3"; - sha256 = "0iicq19yylafr7qs221xgk8pcwf6nnyx6srgsx9y9cyf72siadcb"; + rev = "v${version}"; + sha256 = "12b9bkwmndfwmsknc209kpplxn9wqmwr3p2h0l2szrppq4qqyfq9"; }; + patches = [ + # Fix compatibility with Boost 1.59 + (fetchpatch { + url = "https://github.com/facebook/folly/commit/29193aca605bb93d82a3c92acd95bb342115f3a4.patch"; + sha256 = "1ixpgq1wjr3i7madx4faw72n17ilc9cr435k5w1x95jr954m9j7b"; + }) + ]; + nativeBuildInputs = [ autoreconfHook python ]; buildInputs = [ libiberty boost libevent double_conversion glog google-gflags openssl ]; - postUnpack = "sourceRoot=\${sourceRoot}/folly"; + postPatch = "cd folly"; preBuild = '' patchShebangs build ''; -- cgit 1.4.1