diff options
Diffstat (limited to 'pkgs/development/libraries')
301 files changed, 3471 insertions, 7307 deletions
diff --git a/pkgs/development/libraries/CGAL/default.nix b/pkgs/development/libraries/CGAL/default.nix index a903d5e4678..1f964388cbd 100644 --- a/pkgs/development/libraries/CGAL/default.nix +++ b/pkgs/development/libraries/CGAL/default.nix @@ -1,13 +1,12 @@ { stdenv, fetchurl, cmake, boost, gmp, mpfr }: stdenv.mkDerivation rec { - version = "4.6.1"; - - name = "cgal-${version}"; + version = "4.7"; + name = "cgal-" + version; src = fetchurl { url = "https://github.com/CGAL/releases/archive/CGAL-${version}.tar.gz"; - sha256 = "05vk4l62d7g6cz19q36h1an5krxdbgq1fbs5hi0x2l7blsja1z6g"; + sha256 = "1hbp4qpfqvpggvv79yxr6z3w7y0nwd31zavb1s57y55yl9z3zfxy"; }; # note: optional component libCGAL_ImageIO would need zlib and opengl; @@ -18,9 +17,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Computational Geometry Algorithms Library"; - homepage = "http://cgal.org/"; + homepage = http://cgal.org; license = licenses.gpl3Plus; # some parts are GPLv3+, some are LGPLv3+ - platforms = platforms.linux; + platforms = platforms.all; maintainers = [ maintainers.raskin ]; }; } diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix index 0d0ed70bc1e..92d7779ba34 100644 --- a/pkgs/development/libraries/SDL/default.nix +++ b/pkgs/development/libraries/SDL/default.nix @@ -3,6 +3,7 @@ , alsaSupport ? true, alsaLib ? null , x11Support ? true, xlibsWrapper ? null, libXrandr ? null , pulseaudioSupport ? true, libpulseaudio ? null +, OpenGL, CoreAudio, CoreServices, AudioUnit, Kernel, Cocoa }: # OSS is no longer supported, for it's much crappier than ALSA and @@ -41,7 +42,8 @@ stdenv.mkDerivation rec { buildInputs = let notMingw = !(stdenv ? cross) || stdenv.cross.libc != "msvcrt"; - in optional notMingw audiofile; + in optional notMingw audiofile + ++ optionals stdenv.isDarwin [ OpenGL CoreAudio CoreServices AudioUnit Kernel Cocoa ]; # XXX: By default, SDL wants to dlopen() PulseAudio, in which case # we must arrange to add it to its RPATH; however, `patchelf' seems diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index ad4cce30c64..1c260c2ba91 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -3,6 +3,7 @@ , alsaSupport ? true, alsaLib ? null , x11Support ? true, xlibsWrapper ? null, libXrandr ? null , pulseaudioSupport ? true, libpulseaudio ? null +, AudioUnit, Cocoa, CoreAudio, CoreServices, ForceFeedback, OpenGL }: # OSS is no longer supported, for it's much crappier than ALSA and @@ -36,7 +37,8 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig audiofile ] ++ stdenv.lib.optional openglSupport mesa ++ - stdenv.lib.optional alsaSupport alsaLib; + stdenv.lib.optional alsaSupport alsaLib ++ + stdenv.lib.optionals stdenv.isDarwin [ AudioUnit Cocoa CoreAudio CoreServices ForceFeedback OpenGL ]; # https://bugzilla.libsdl.org/show_bug.cgi?id=1431 dontDisableStatic = true; diff --git a/pkgs/development/libraries/accelio/default.nix b/pkgs/development/libraries/accelio/default.nix index a8fddad2d88..80b0eba60bd 100644 --- a/pkgs/development/libraries/accelio/default.nix +++ b/pkgs/development/libraries/accelio/default.nix @@ -6,12 +6,12 @@ stdenv.mkDerivation rec { name = "accelio-${version}${stdenv.lib.optionalString (kernel != null) "-kernel"}"; - version = "2015-08-30"; + version = "1.5"; src = fetchFromGitHub { owner = "accelio"; repo = "accelio"; - rev = "3d1f2b2d311aa70de9856832fd02647266624e82"; + rev = "v1.5"; sha256 = "172frqk2n43g0arhazgcwfvj0syf861vdzdpxl7idr142bb0ykf7"; }; diff --git a/pkgs/development/libraries/audiofile/CVE-2015-7747.patch b/pkgs/development/libraries/audiofile/CVE-2015-7747.patch new file mode 100644 index 00000000000..a01aaa14dce --- /dev/null +++ b/pkgs/development/libraries/audiofile/CVE-2015-7747.patch @@ -0,0 +1,161 @@ +Description: fix buffer overflow when changing both sample format and + number of channels +Origin: backport, https://github.com/mpruett/audiofile/pull/25 +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/audiofile/+bug/1502721 +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=801102 + +Index: audiofile-0.3.6/libaudiofile/modules/ModuleState.cpp +=================================================================== +--- audiofile-0.3.6.orig/libaudiofile/modules/ModuleState.cpp 2015-10-20 08:00:58.036128202 -0400 ++++ audiofile-0.3.6/libaudiofile/modules/ModuleState.cpp 2015-10-20 08:00:58.036128202 -0400 +@@ -402,7 +402,7 @@ + addModule(new Transform(outfc, in.pcm, out.pcm)); + + if (in.channelCount != out.channelCount) +- addModule(new ApplyChannelMatrix(infc, isReading, ++ addModule(new ApplyChannelMatrix(outfc, isReading, + in.channelCount, out.channelCount, + in.pcm.minClip, in.pcm.maxClip, + track->channelMatrix)); +Index: audiofile-0.3.6/test/Makefile.am +=================================================================== +--- audiofile-0.3.6.orig/test/Makefile.am 2015-10-20 08:00:58.036128202 -0400 ++++ audiofile-0.3.6/test/Makefile.am 2015-10-20 08:00:58.036128202 -0400 +@@ -26,6 +26,7 @@ + VirtualFile \ + floatto24 \ + query2 \ ++ sixteen-stereo-to-eight-mono \ + sixteen-to-eight \ + testchannelmatrix \ + testdouble \ +@@ -139,6 +140,7 @@ + printmarkers_LDADD = $(LIBAUDIOFILE) -lm + + sixteen_to_eight_SOURCES = sixteen-to-eight.c TestUtilities.cpp TestUtilities.h ++sixteen_stereo_to_eight_mono_SOURCES = sixteen-stereo-to-eight-mono.c TestUtilities.cpp TestUtilities.h + + testchannelmatrix_SOURCES = testchannelmatrix.c TestUtilities.cpp TestUtilities.h + +Index: audiofile-0.3.6/test/sixteen-stereo-to-eight-mono.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ audiofile-0.3.6/test/sixteen-stereo-to-eight-mono.c 2015-10-20 08:33:57.512286416 -0400 +@@ -0,0 +1,117 @@ ++/* ++ Audio File Library ++ ++ Copyright 2000, Silicon Graphics, Inc. ++ ++ This program is free software; you can redistribute it and/or modify ++ it under the terms of the GNU General Public License as published by ++ the Free Software Foundation; either version 2 of the License, or ++ (at your option) any later version. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License along ++ with this program; if not, write to the Free Software Foundation, Inc., ++ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ++*/ ++ ++/* ++ sixteen-stereo-to-eight-mono.c ++ ++ This program tests the conversion from 2-channel 16-bit integers to ++ 1-channel 8-bit integers. ++*/ ++ ++#ifdef HAVE_CONFIG_H ++#include <config.h> ++#endif ++ ++#include <stdint.h> ++#include <stdio.h> ++#include <stdlib.h> ++#include <string.h> ++#include <unistd.h> ++#include <limits.h> ++ ++#include <audiofile.h> ++ ++#include "TestUtilities.h" ++ ++int main (int argc, char **argv) ++{ ++ AFfilehandle file; ++ AFfilesetup setup; ++ int16_t frames16[] = {14298, 392, 3923, -683, 958, -1921}; ++ int8_t frames8[] = {28, 6, -2}; ++ int i, frameCount = 3; ++ int8_t byte; ++ AFframecount result; ++ ++ setup = afNewFileSetup(); ++ ++ afInitFileFormat(setup, AF_FILE_WAVE); ++ ++ afInitSampleFormat(setup, AF_DEFAULT_TRACK, AF_SAMPFMT_TWOSCOMP, 16); ++ afInitChannels(setup, AF_DEFAULT_TRACK, 2); ++ ++ char testFileName[PATH_MAX]; ++ if (!createTemporaryFile("sixteen-to-eight", testFileName)) ++ { ++ fprintf(stderr, "Could not create temporary file.\n"); ++ exit(EXIT_FAILURE); ++ } ++ ++ file = afOpenFile(testFileName, "w", setup); ++ if (file == AF_NULL_FILEHANDLE) ++ { ++ fprintf(stderr, "could not open file for writing\n"); ++ exit(EXIT_FAILURE); ++ } ++ ++ afFreeFileSetup(setup); ++ ++ afWriteFrames(file, AF_DEFAULT_TRACK, frames16, frameCount); ++ ++ afCloseFile(file); ++ ++ file = afOpenFile(testFileName, "r", AF_NULL_FILESETUP); ++ if (file == AF_NULL_FILEHANDLE) ++ { ++ fprintf(stderr, "could not open file for reading\n"); ++ exit(EXIT_FAILURE); ++ } ++ ++ afSetVirtualSampleFormat(file, AF_DEFAULT_TRACK, AF_SAMPFMT_TWOSCOMP, 8); ++ afSetVirtualChannels(file, AF_DEFAULT_TRACK, 1); ++ ++ for (i=0; i<frameCount; i++) ++ { ++ /* Read one frame. */ ++ result = afReadFrames(file, AF_DEFAULT_TRACK, &byte, 1); ++ ++ if (result != 1) ++ break; ++ ++ /* Compare the byte read with its precalculated value. */ ++ if (memcmp(&byte, &frames8[i], 1) != 0) ++ { ++ printf("error\n"); ++ printf("expected %d, got %d\n", frames8[i], byte); ++ exit(EXIT_FAILURE); ++ } ++ else ++ { ++#ifdef DEBUG ++ printf("got what was expected: %d\n", byte); ++#endif ++ } ++ } ++ ++ afCloseFile(file); ++ unlink(testFileName); ++ ++ exit(EXIT_SUCCESS); ++} diff --git a/pkgs/development/libraries/audiofile/default.nix b/pkgs/development/libraries/audiofile/default.nix index c8fb8c53dc0..1fe6d7b15a8 100644 --- a/pkgs/development/libraries/audiofile/default.nix +++ b/pkgs/development/libraries/audiofile/default.nix @@ -10,6 +10,8 @@ stdenv.mkDerivation rec { sha256 = "0rb927zknk9kmhprd8rdr4azql4gn2dp75a36iazx2xhkbqhvind"; }; + patches = [ ./CVE-2015-7747.patch ]; + meta = with stdenv.lib; { description = "Library for reading and writing audio files in various formats"; homepage = http://www.68k.org/~michael/audiofile/; diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index ebdd5e8ade9..f933fa6bc3e 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -130,7 +130,7 @@ stdenv.mkDerivation { NIX_LDFLAGS="$(echo $NIX_LDFLAGS | sed "s,$out,$lib,g")" if test -f tools/build/src/tools/clang-darwin.jam ; then substituteInPlace tools/build/src/tools/clang-darwin.jam \ - --replace '$(<[1]:D=)' "$lib/lib/\$(<[1]:D=)"; + --replace '@rpath/$(<[1]:D=)' "$lib/lib/\$(<[1]:D=)"; fi; '' + optionalString (mpi != null) '' cat << EOF > user-config.jam diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index 5550708800e..5f705ea50a3 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -11,11 +11,11 @@ assert glSupport -> mesa_noglu != null; with { inherit (stdenv.lib) optional optionals; }; stdenv.mkDerivation rec { - name = "cairo-1.14.2"; + name = "cairo-1.14.4"; src = fetchurl { url = "http://cairographics.org/releases/${name}.tar.xz"; - sha1 = "c8da68aa66ca0855b5d0ff552766d3e8679e1d24"; + sha256 = "05p75r914d809711yg9rapgmmi4hymzbarhd3w0yrfadhiy9rv7n"; }; outputs = [ "dev" "out" "docdev" ]; diff --git a/pkgs/development/libraries/check/default.nix b/pkgs/development/libraries/check/default.nix index 3841878341c..3bfcde57422 100644 --- a/pkgs/development/libraries/check/default.nix +++ b/pkgs/development/libraries/check/default.nix @@ -1,4 +1,6 @@ -{ fetchurl, stdenv }: +{ fetchurl, stdenv +, CoreServices +}: stdenv.mkDerivation rec { name = "check-${version}"; @@ -12,6 +14,8 @@ stdenv.mkDerivation rec { # Test can randomly fail: http://hydra.nixos.org/build/7243912 doCheck = false; + buildInputs = stdenv.lib.optional stdenv.isDarwin CoreServices; + meta = with stdenv.lib; { description = "Unit testing framework for C"; 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 = '' diff --git a/pkgs/development/libraries/ctpl/default.nix b/pkgs/development/libraries/ctpl/default.nix new file mode 100644 index 00000000000..6ee04ae5795 --- /dev/null +++ b/pkgs/development/libraries/ctpl/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, pkgconfig, glib }: + +stdenv.mkDerivation rec { + name = "ctpl-${version}"; + version = "0.3.4"; + + src = fetchurl { + url = "http://download.tuxfamily.org/ctpl/releases/ctpl-${version}.tar.gz"; + sha256 = "1yr92xv9n6kgyixwg9ps4zb404ic5pgb171k4bi3mv9p6k8gv59s"; + }; + + buildInputs = [ pkgconfig glib ]; + + meta = with stdenv.lib; { + homepage = http://ctpl.tuxfamily.org/; + description = "Template engine library written in C"; + platforms = platforms.linux; + maintainers = [ maintainers.lethalman ]; + }; +} diff --git a/pkgs/development/libraries/epoxy/default.nix b/pkgs/development/libraries/epoxy/default.nix index ccbf4579684..00962409660 100644 --- a/pkgs/development/libraries/epoxy/default.nix +++ b/pkgs/development/libraries/epoxy/default.nix @@ -18,6 +18,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig utilmacros python ]; buildInputs = [ mesa libX11 ]; + preConfigure = stdenv.lib.optional stdenv.isDarwin '' + substituteInPlace configure --replace build_glx=no build_glx=yes + substituteInPlace src/dispatch_common.h --replace "PLATFORM_HAS_GLX 0" "PLATFORM_HAS_GLX 1" + ''; + meta = with stdenv.lib; { description = "A library for handling OpenGL function pointer management"; homepage = https://github.com/anholt/libepoxy; diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index 654741283f9..fadb3feb4cc 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -138,6 +138,10 @@ , optimizationsDeveloper ? true , extraWarningsDeveloper ? false , strippingDeveloper ? false +/* + * Darwin frameworks + */ +, Cocoa, CoreServices }: /* Maintainer notes: @@ -231,11 +235,11 @@ assert x11grabExtlib -> libX11 != null && libXv != null; stdenv.mkDerivation rec { name = "ffmpeg-full-${version}"; - version = "2.7.2"; + version = "2.8.1"; src = fetchurl { url = "https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.bz2"; - sha256 = "1wlygd0jp34dk4qagi4h9psn4yk8zgyj7zy9lrpm5332mm87bsvw"; + sha256 = "1qk6g2h993i0wgs9d2p3ahdc5bqr03mp74bk6r1zj6pfinr5mvg2"; }; patchPhase = ''patchShebangs .''; @@ -405,7 +409,8 @@ stdenv.mkDerivation rec { ++ optionals x11grabExtlib [ libXext libXfixes ] ++ optionals nonfreeLicensing [ faac fdk_aac openssl ] ++ optional ((isLinux || isFreeBSD) && libva != null) libva - ++ optionals isLinux [ alsaLib libraw1394 libv4l ]; + ++ optionals isLinux [ alsaLib libraw1394 libv4l ] + ++ optionals stdenv.isDarwin [ Cocoa CoreServices ]; # Build qt-faststart executable buildPhase = optional qtFaststartProgram ''make tools/qt-faststart''; diff --git a/pkgs/development/libraries/ffmpeg/2.6.nix b/pkgs/development/libraries/ffmpeg/2.6.nix deleted file mode 100644 index 60fc32e030e..00000000000 --- a/pkgs/development/libraries/ffmpeg/2.6.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ callPackage, ... } @ args: - -callPackage ./generic.nix (args // rec { - version = "${branch}.3"; - branch = "2.6"; - sha256 = "1yqc3vm1xrwf866q262qd4nr9d6ifp4gg183pjdc4sl9np0rissr"; -}) diff --git a/pkgs/development/libraries/ffmpeg/2.7.nix b/pkgs/development/libraries/ffmpeg/2.7.nix deleted file mode 100644 index 105239c48c9..00000000000 --- a/pkgs/development/libraries/ffmpeg/2.7.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ callPackage, ... } @ args: - -callPackage ./generic.nix (args // rec { - version = "${branch}.2"; - branch = "2.7"; - sha256 = "1wlygd0jp34dk4qagi4h9psn4yk8zgyj7zy9lrpm5332mm87bsvw"; -}) diff --git a/pkgs/development/libraries/ffmpeg/2.8.nix b/pkgs/development/libraries/ffmpeg/2.8.nix new file mode 100644 index 00000000000..e585ea14997 --- /dev/null +++ b/pkgs/development/libraries/ffmpeg/2.8.nix @@ -0,0 +1,7 @@ +{ callPackage, ... } @ args: + +callPackage ./generic.nix (args // rec { + version = "${branch}.1"; + branch = "2.8"; + sha256 = "1qk6g2h993i0wgs9d2p3ahdc5bqr03mp74bk6r1zj6pfinr5mvg2"; +}) diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index a09df5f57ad..0b45851cc93 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -10,6 +10,8 @@ , debugDeveloper ? false , optimizationsDeveloper ? true , extraWarningsDeveloper ? false +# Darwin frameworks +, Cocoa # Inherit generics , branch, sha256, version, ... }: @@ -145,7 +147,8 @@ stdenv.mkDerivation rec { ] ++ optional openglSupport mesa ++ optionals (!isDarwin) [ libvpx libpulseaudio ] # Need to be fixed on Darwin ++ optional (isLinux || isFreeBSD) libva - ++ optional isLinux alsaLib; + ++ optional isLinux alsaLib + ++ optional isDarwin Cocoa; enableParallelBuilding = true; 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 ''; diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index 6e1ada69039..8cf84eb08c3 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -3,12 +3,12 @@ , libpng }: composableDerivation.composableDerivation {} (fixed: rec { - version = "2.0.0"; + version = "2.0.1"; name = "gdal-${version}"; src = fetchurl { url = "http://download.osgeo.org/gdal/${version}/${name}.tar.gz"; - sha256 = "53761563ff53c5bf27bff7c4d6cab8bb1634baccefda05348e0f3b7acaf4c9e6"; + sha256 = "b55f794768e104a2fd0304eaa61bb8bda3dc7c4e14f2c9d0913baca3e55b83ab"; }; buildInputs = [ unzip libjpeg libtiff libpng proj openssl ] diff --git a/pkgs/development/libraries/gdal/gdal-1_11_2.nix b/pkgs/development/libraries/gdal/gdal-1_11.nix index fe7d0869fbd..0e4b4d03541 100644 --- a/pkgs/development/libraries/gdal/gdal-1_11_2.nix +++ b/pkgs/development/libraries/gdal/gdal-1_11.nix @@ -3,12 +3,12 @@ , libpng }: composableDerivation.composableDerivation {} (fixed: rec { - version = "1.11.2"; + version = "1.11.3"; name = "gdal-${version}"; src = fetchurl { url = "http://download.osgeo.org/gdal/${version}/${name}.tar.gz"; - sha256 = "66bc8192d24e314a66ed69285186d46e6999beb44fc97eeb9c76d82a117c0845"; + sha256 = "561588bdfd9ca91919d4679a77a2b44214b158934ee8b425295ca5be33a1014d"; }; buildInputs = [ unzip libjpeg libtiff libpng python pythonPackages.numpy proj openssl ]; diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index 7ff8eae6460..b0f2a5e877e 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -3,14 +3,14 @@ let ver_maj = "2.32"; - ver_min = "0"; + ver_min = "1"; in stdenv.mkDerivation rec { name = "gdk-pixbuf-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://gnome/sources/gdk-pixbuf/${ver_maj}/${name}.tar.xz"; - sha256 = "0rqvj5gcs2zfyyg9llm289b0xkj4mrhzxfjpjja0wx1m6vn5axjk"; + sha256 = "1g7kjxv67jcdasi14n7jan4icrnnppd1m99wrdmpv32k4m7vfcj4"; }; outputs = [ "dev" "out" "docdev" ]; @@ -27,6 +27,11 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ glib libtiff libjpeg libpng jasper ]; + # on darwin, tests don't link + preBuild = stdenv.lib.optionalString (stdenv.isDarwin && !doCheck) '' + substituteInPlace Makefile --replace "docs tests" "docs" + ''; + configureFlags = "--with-libjasper --with-x11" + stdenv.lib.optionalString (gobjectIntrospection != null) " --enable-introspection=yes" ; diff --git a/pkgs/development/libraries/glew/1.10.nix b/pkgs/development/libraries/glew/1.10.nix new file mode 100644 index 00000000000..8f153baf6cd --- /dev/null +++ b/pkgs/development/libraries/glew/1.10.nix @@ -0,0 +1,52 @@ +{ stdenv, fetchurl, mesa_glu, x11, libXmu, libXi }: + +with stdenv.lib; + +stdenv.mkDerivation rec { + name = "glew-1.10.0"; + + src = fetchurl { + url = "mirror://sourceforge/glew/${name}.tgz"; + sha256 = "01zki46dr5khzlyywr3cg615bcal32dazfazkf360s1znqh17i4r"; + }; + + nativeBuildInputs = [ x11 libXmu libXi ]; + propagatedNativeBuildInputs = [ mesa_glu ]; # GL/glew.h includes GL/glu.h + + patchPhase = '' + sed -i 's|lib64|lib|' config/Makefile.linux + ${optionalString (stdenv ? cross) '' + sed -i -e 's/\(INSTALL.*\)-s/\1/' Makefile + ''} + ''; + + buildFlags = [ "all" ]; + installFlags = [ "install.all" ]; + + preInstall = '' + export GLEW_DEST="$out" + ''; + + postInstall = '' + mkdir -pv $out/share/doc/glew + mkdir -p $out/lib/pkgconfig + cp glew*.pc $out/lib/pkgconfig + cp -r README.txt LICENSE.txt doc $out/share/doc/glew + ''; + + crossAttrs.makeFlags = [ + "CC=${stdenv.cross.config}-gcc" + "LD=${stdenv.cross.config}-gcc" + "AR=${stdenv.cross.config}-ar" + "STRIP=" + ] ++ optional (stdenv.cross.libc == "msvcrt") "SYSTEM=mingw" + ++ optional (stdenv.cross.libc == "libSystem") "SYSTEM=darwin"; + + meta = with stdenv.lib; { + description = "An OpenGL extension loading library for C(++)"; + homepage = http://glew.sourceforge.net/; + license = licenses.free; # different files under different licenses + #["BSD" "GLX" "SGI-B" "GPL2"] + platforms = platforms.mesaPlatforms; + }; +} 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; diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 6b6b39848e2..aabf351890e 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -40,7 +40,7 @@ let ''; ver_maj = "2.46"; - ver_min = "0"; + ver_min = "2"; in stdenv.mkDerivation rec { @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/glib/${ver_maj}/${name}.tar.xz"; - sha256 = "b1cee83469ae7d80f17c267c37f090414e93960bd62d2b254a5a96fbc5baacb4"; + sha256 = "5031722e37036719c1a09163cc6cf7c326e4c4f1f1e074b433c156862bd733db"; }; patches = optional stdenv.isDarwin ./darwin-compilation.patch ++ optional doCheck ./skip-timer-test.patch; 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 diff --git a/pkgs/development/libraries/gmp/6.x.nix b/pkgs/development/libraries/gmp/6.x.nix index bcb5ebbc141..a7443c02c5b 100644 --- a/pkgs/development/libraries/gmp/6.x.nix +++ b/pkgs/development/libraries/gmp/6.x.nix @@ -3,11 +3,11 @@ with { inherit (stdenv.lib) optional optionalString; }; let self = stdenv.mkDerivation rec { - name = "gmp-6.0.0a"; + name = "gmp-6.1.0"; src = fetchurl { # we need to use bz2, others aren't in bootstrapping stdenv urls = [ "mirror://gnu/gmp/${name}.tar.bz2" "ftp://ftp.gmplib.org/pub/${name}/${name}.tar.bz2" ]; - sha256 = "1bwsfmf0vrx3rwl4xmi5jhhy3v1qx1xj0m7p9hb0fvcw9f09m3kz"; + sha256 = "1s3kddydvngqrpc6i1vbz39raya2jdcl042wi0ksbszgjjllk129"; }; #outputs TODO: split $cxx due to libstdc++ dependency; maybe port to gmp5; diff --git a/pkgs/development/libraries/gnutls/3.4.nix b/pkgs/development/libraries/gnutls/3.4.nix index acd164de024..6d196978cdf 100644 --- a/pkgs/development/libraries/gnutls/3.4.nix +++ b/pkgs/development/libraries/gnutls/3.4.nix @@ -1,11 +1,11 @@ { callPackage, fetchurl, autoreconfHook, ... } @ args: callPackage ./generic.nix (args // rec { - version = "3.4.5"; + version = "3.4.6"; src = fetchurl { url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.4/gnutls-${version}.tar.xz"; - sha256 = "1bks1zpmhmnkz2v32dd9b44pz6x0a5w4yi9zzwsd0a078vhbi25g"; + sha256 = "1v109px1sy1s731fnawzdsvggdswmr7ha9q5lid4v8pzgznmkdgy"; }; # This fixes some broken parallel dependencies diff --git a/pkgs/development/libraries/gnutls/generic.nix b/pkgs/development/libraries/gnutls/generic.nix index cf1e0f9d578..3bcc521504e 100644 --- a/pkgs/development/libraries/gnutls/generic.nix +++ b/pkgs/development/libraries/gnutls/generic.nix @@ -1,5 +1,5 @@ { lib, fetchurl, stdenv, zlib, lzo, libtasn1, nettle, pkgconfig, lzip -, guileBindings, guile, perl, gmp, autogen, libidn, p11_kit, unbound +, guileBindings, guile, perl, gmp, autogen, libidn, p11_kit, unbound, libiconv , tpmSupport ? false, trousers # Version dependent args @@ -31,6 +31,7 @@ stdenv.mkDerivation { enableParallelBuilding = !guileBindings; buildInputs = [ lzo lzip nettle libtasn1 libidn p11_kit zlib gmp autogen ] + ++ lib.optional (stdenv.isDarwin) libiconv ++ lib.optional (tpmSupport && stdenv.isLinux) trousers ++ [ unbound ] ++ lib.optional guileBindings guile; diff --git a/pkgs/development/libraries/goffice/default.nix b/pkgs/development/libraries/goffice/default.nix index 517836f4d63..3aa9c678060 100644 --- a/pkgs/development/libraries/goffice/default.nix +++ b/pkgs/development/libraries/goffice/default.nix @@ -2,11 +2,11 @@ , libgsf, libxml2, libxslt, cairo, pango, librsvg, libspectre }: stdenv.mkDerivation rec { - name = "goffice-0.10.22"; + name = "goffice-0.10.24"; src = fetchurl { url = "mirror://gnome/sources/goffice/0.10/${name}.tar.xz"; - sha256 = "0206a87a323b52a874dc54491374245f9e1c5f62e93a2ce4a02fb444a26b0e28"; + sha256 = "cda70eab0b0b0e29c3bea09849bcfca0c2ccc20038ee69e7e14cde664484af5a"; }; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index a28fc84a7fe..6c00a5df09f 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -9,7 +9,7 @@ assert cupsSupport -> cups != null; let ver_maj = "3.18"; - ver_min = "0"; + ver_min = "5"; version = "${ver_maj}.${ver_min}"; in stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gtk+/${ver_maj}/gtk+-${version}.tar.xz"; - sha256 = "7fb8ae257403317d3852bad28d064d35f67e978b1fed8b71d5997e87204271b9"; + sha256 = "107aeb9a4244ce3c044becdd6dffc32d83202595181597180d4c736302a71852"; }; outputs = [ "dev" "out" ]; diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index 789a584d1ef..865a4f1cfad 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -5,16 +5,16 @@ }: let - version = "1.0.3"; + version = "1.0.6"; inherit (stdenv.lib) optional optionals optionalString; in stdenv.mkDerivation { - name = "harfbuzz${optionalString withIcu "-icu"}-1.0.3"; + name = "harfbuzz${optionalString withIcu "-icu"}-${version}"; src = fetchurl { url = "http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${version}.tar.bz2"; - sha256 = "1xrxlrvgyr6mm9qjxmkif2kvcah082y94gf1vqi0f0bdl1g8gp7b"; + sha256 = "09ivk5m4y09ar4zi9r6db7gp234cy05h0ach7w22g9kqvkxsf5pn"; }; outputs = [ "dev" "out" ]; diff --git a/pkgs/development/libraries/icu/default.nix b/pkgs/development/libraries/icu/default.nix index 2158314438a..bc8c62230ac 100644 --- a/pkgs/development/libraries/icu/default.nix +++ b/pkgs/development/libraries/icu/default.nix @@ -2,7 +2,7 @@ let pname = "icu4c"; - version = "55.1"; + version = "56.1"; in stdenv.mkDerivation { name = pname + "-" + version; @@ -10,7 +10,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://download.icu-project.org/files/${pname}/${version}/${pname}-" + (stdenv.lib.replaceChars ["."] ["_"] version) + "-src.tgz"; - sha256 = "0ys5f5spizg45qlaa31j2lhgry0jka2gfha527n4ndfxxz5j4sz1"; + sha256 = "05j86714qaj0lvhvyr2s1xncw6sk0h2dcghb3iiwykbkbh8fjr1s"; }; outputs = [ "dev" "out" ]; diff --git a/pkgs/development/libraries/indicator-application/gtk2.nix b/pkgs/development/libraries/indicator-application/gtk2.nix new file mode 100644 index 00000000000..7db9b1a0e42 --- /dev/null +++ b/pkgs/development/libraries/indicator-application/gtk2.nix @@ -0,0 +1,53 @@ +{ stdenv, fetchurl, lib, file +, pkgconfig, autoconf +, glib, dbus_glib, json_glib +, gtk2, libindicator-gtk2, libdbusmenu-gtk2, libappindicator-gtk2 }: + +with lib; + +stdenv.mkDerivation rec { + name = "indicator-application-gtk2-${version}"; + version = "12.10.0.1"; + + src = fetchurl { + url = "${meta.homepage}/indicator-application-gtk2/i-a-${version}/+download/indicator-application-${version}.tar.gz"; + sha256 = "1xqsb6c1pwawabw854f7aybjrgyhc2r1316i9lyjspci51zk5m7v"; + }; + + nativeBuildInputs = [ pkgconfig autoconf ]; + + buildInputs = [ + glib dbus_glib json_glib + gtk2 libindicator-gtk2 libdbusmenu-gtk2 libappindicator-gtk2 + ]; + + postPatch = '' + substituteInPlace configure.ac \ + --replace 'DBUSSERVICEDIR=`$PKG_CONFIG --variable=session_bus_services_dir dbus-1`' \ + "DBUSSERVICEDIR=$out/share/dbus-1/services" + autoconf + substituteInPlace {configure,ltmain.sh,m4/libtool.m4} \ + --replace /usr/bin/file ${file}/bin/file + substituteInPlace src/Makefile.in \ + --replace 'applicationlibdir = $(INDICATORDIR)' "applicationlibdir = $out/lib" + ''; + + configureFlags = [ + "CFLAGS=-Wno-error" + "--sysconfdir=/etc" + "--localstatedir=/var" + ]; + + installFlags = [ + "sysconfdir=\${out}/etc" + "localstatedir=\${TMPDIR}" + ]; + + meta = { + description = "Indicator to take menus from applications and place them in the panel (GTK+ 2 library for Xfce/LXDE)"; + homepage = "https://launchpad.net/indicators-gtk2"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = [ maintainers.msteen ]; + }; +} diff --git a/pkgs/development/libraries/indicator-application/gtk3.nix b/pkgs/development/libraries/indicator-application/gtk3.nix new file mode 100644 index 00000000000..4847eba22ed --- /dev/null +++ b/pkgs/development/libraries/indicator-application/gtk3.nix @@ -0,0 +1,55 @@ +{ stdenv, fetchurl, lib, file +, pkgconfig, autoconf +, glib, dbus_glib, json_glib +, gtk3, libindicator-gtk3, libdbusmenu-gtk3, libappindicator-gtk3 }: + +with lib; + +stdenv.mkDerivation rec { + name = "indicator-application-gtk3-${version}"; + version = "${versionMajor}.${versionMinor}"; + versionMajor = "12.10"; + versionMinor = "0"; + + src = fetchurl { + url = "${meta.homepage}/${versionMajor}/${version}/+download/indicator-application-${version}.tar.gz"; + sha256 = "1z8ar0k47l4his7zvffbc2kn658nid51svqnfv0dms601w53gbpr"; + }; + + nativeBuildInputs = [ pkgconfig autoconf ]; + + buildInputs = [ + glib dbus_glib json_glib + gtk3 libindicator-gtk3 libdbusmenu-gtk3 libappindicator-gtk3 + ]; + + postPatch = '' + substituteInPlace configure.ac \ + --replace 'DBUSSERVICEDIR=`$PKG_CONFIG --variable=session_bus_services_dir dbus-1`' \ + "DBUSSERVICEDIR=$out/share/dbus-1/services" + autoconf + substituteInPlace {configure,ltmain.sh,m4/libtool.m4} \ + --replace /usr/bin/file ${file}/bin/file + substituteInPlace src/Makefile.in \ + --replace 'applicationlibdir = $(INDICATORDIR)' "applicationlibdir = $out/lib" + ''; + + configureFlags = [ + "CFLAGS=-Wno-error" + "--sysconfdir=/etc" + "--localstatedir=/var" + ]; + + installFlags = [ + "sysconfdir=\${out}/etc" + "localstatedir=\${TMPDIR}" + ]; + + meta = { + description = "Indicator to take menus from applications and place them in the panel"; + homepage = "https://launchpad.net/indicator-application"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = [ maintainers.msteen ]; + }; +} 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 ]; 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"; diff --git a/pkgs/development/libraries/jemalloc/default.nix b/pkgs/development/libraries/jemalloc/default.nix index 4e13c9b1d93..746ebd2bfcd 100644 --- a/pkgs/development/libraries/jemalloc/default.nix +++ b/pkgs/development/libraries/jemalloc/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "jemalloc-4.0.2"; + name = "jemalloc-4.0.3"; src = fetchurl { url = "http://www.canonware.com/download/jemalloc/${name}.tar.bz2"; - sha256 = "04a6iw9wiwiknd7v3l3i7vpmc5nvv52islnb1hz9idmdk259r2hd"; + sha256 = "1mpnfaniaybv8kh7yjqq2g595l2i08m7adg238k5igzf61n6ixzi"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/kde-frameworks-5.10/default.nix b/pkgs/development/libraries/kde-frameworks-5.10/default.nix deleted file mode 100644 index e6961f16d27..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.10/default.nix +++ /dev/null @@ -1,217 +0,0 @@ -# Maintainer's Notes: -# -# Minor updates: -# 1. Edit ./manifest.sh to point to the updated URL. Upstream sometimes -# releases updates that include only the changed packages; in this case, -# multiple URLs can be provided and the results will be merged. -# 2. Run ./manifest.sh and ./dependencies.sh. -# 3. Build and enjoy. -# -# Major updates: -# We prefer not to immediately overwrite older versions with major updates, so -# make a copy of this directory first. After copying, be sure to delete ./tmp -# if it exists. Then follow the minor update instructions. - -{ pkgs, newScope, qt5 ? null, debug ? false }: - -let inherit (pkgs) autonix stdenv symlinkJoin; in - -with autonix; let inherit (stdenv) lib; in - -let - qt5_ = if qt5 != null then qt5 else pkgs.qt54; -in - -let - - qt5 = qt5_; - - super = - let json = builtins.fromJSON (builtins.readFile ./packages.json); - mirrorUrl = n: pkg: pkg // { - src = pkg.src // { url = "mirror://kde/${pkg.src.url}"; }; - }; - renames = builtins.fromJSON (builtins.readFile ./renames.json); - propagated = [ "extra-cmake-modules" ]; - native = [ - "bison" - "extra-cmake-modules" - "flex" - "kdoctools" - "ki18n" - "libxslt" - "perl" - "pythoninterp" - ]; - user = [ - "qt5" - "qt5core" - "qt5dbus" - "qt5gui" - "qt5qml" - "qt5quick" - "qt5svg" - "qt5webkitwidgets" - "qt5widgets" - "qt5x11extras" - "shareddesktopontologies" - "sharedmimeinfo" - ]; - in lib.fold (f: attrs: f attrs) json [ - (lib.mapAttrs kdePackage) - (userEnvDeps user) - (nativeDeps native) - (propagateDeps propagated) - (renameDeps renames) - (lib.mapAttrs mirrorUrl) - ]; - - kdePackage = name: pkg: - let defaultOverride = drv: drv // { - setupHook = ./setup-hook.sh; - cmakeFlags = - (drv.cmakeFlags or []) - ++ [ "-DBUILD_TESTING=OFF" ] - ++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug"; - meta = { - license = with stdenv.lib.licenses; [ - lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12 - ]; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ ttuegel ]; - homepage = "http://www.kde.org"; - }; - }; - callPackage = newScope { - inherit (stdenv) mkDerivation; - inherit (pkgs) fetchurl; - inherit scope; - }; - in mkPackage callPackage defaultOverride name pkg; - - scope = - # packages in this collection - self // - # packages pinned to this version of Qt 5 - { - dbusmenu-qt5 = pkgs.libdbusmenu_qt5.override { inherit qt5; }; - phonon4qt5 = pkgs.phonon_qt5.override { inherit qt5; }; - polkit_qt5 = pkgs.polkit_qt5.override { inherit qt5; }; - qt5 = qt5.base; - qt5core = qt5.base; - qt5dbus = qt5.base; - qt5gui = qt5.base; - qt5linguisttools = qt5.tools; - qt5qml = [qt5.declarative qt5.graphicaleffects]; - qt5quick = [qt5.quickcontrols qt5.graphicaleffects]; - qt5script = qt5.script; - qt5svg = qt5.svg; - qt5webkitwidgets = qt5.webkit; - qt5widgets = qt5.base; - qt5x11extras = qt5.x11extras; - qt5xmlpatterns = qt5.xmlpatterns; - } // - # packages from the nixpkgs collection - (with pkgs; - { - inherit acl cmake docbook_xml_dtd_45 docbook5_xsl epoxy fam gpgme - libgcrypt libgit2 modemmanager networkmanager perl - perlPackages qimageblitz xorg zlib; - boost = boost155; - gif = giflib; - glib2 = glib; - jpeg = libjpeg; - libintl = gettext; - liblzma = lzma; - pythoninterp = python; - pythonlibrary = python; - sharedmimeinfo = shared_mime_info; - } - ); - - self = super // { - extra-cmake-modules = overrideDerivation super.extra-cmake-modules (drv: { - buildInputs = []; - nativeBuildInputs = []; - propagatedBuildInputs = []; - propagatedNativeBuildInputs = [ scope.cmake pkgs.pkgconfig qt5.tools ]; - propagatedUserEnvPkgs = []; - cmakeFlags = ["-DBUILD_TESTING=OFF"]; - patches = [./extra-cmake-modules/0001-extra-cmake-modules-paths.patch]; - meta = { - license = stdenv.lib.licenses.bsd2; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ ttuegel ]; - homepage = "http://www.kde.org"; - }; - }); - - frameworkintegration = extendDerivation super.frameworkintegration { - buildInputs = [ scope.xorg.libXcursor ]; - }; - - kauth = extendDerivation super.kauth { - buildInputs = [ scope.polkit_qt5 ]; - patches = [ ./kauth/kauth-policy-install.patch ]; - }; - - kcmutils = extendDerivation super.kcmutils { - patches = [ ./kcmutils/kcmutils-pluginselector-follow-symlinks.patch ]; - }; - - kconfigwidgets = extendDerivation super.kconfigwidgets { - patches = [ ./kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch ]; - }; - - kdelibs4support = extendDerivation super.kdelibs4support { - buildInputs = [ scope.networkmanager scope.xorg.libSM ]; - cmakeFlags = [ - "-DDocBookXML4_DTD_DIR=${pkgs.docbook_xml_dtd_45}/xml/dtd/docbook" - "-DDocBookXML4_DTD_VERSION=4.5" - ]; - }; - - kdoctools = extendDerivation super.kdoctools { - propagatedNativeBuildInputs = [ scope.perl scope.perlPackages.URI ]; - cmakeFlags = [ - "-DDocBookXML4_DTD_DIR=${scope.docbook_xml_dtd_45}/xml/dtd/docbook" - "-DDocBookXML4_DTD_VERSION=4.5" - "-DDocBookXSL_DIR=${scope.docbook5_xsl}/xml/xsl/docbook" - ]; - patches = [ ./kdoctools/kdoctools-no-find-docbook-xml.patch ]; - }; - - ki18n = extendDerivation super.ki18n { - propagatedNativeBuildInputs = with scope; [ libintl pythoninterp ]; - }; - - kimageformats = extendDerivation super.kimageformats { - NIX_CFLAGS_COMPILE = "-I${pkgs.ilmbase}/include/OpenEXR"; - }; - - kinit = extendDerivation super.kinit { - patches = [./kinit/0001-kinit-libpath.patch]; - }; - - kpackage = extendDerivation super.kpackage { - patches = [ ./kpackage/0001-allow-external-paths.patch ]; - }; - - kservice = extendDerivation super.kservice { - buildInputs = [ scope.kwindowsystem ]; - patches = [ - ./kservice/kservice-kbuildsycoca-follow-symlinks.patch - ./kservice/kservice-kbuildsycoca-no-canonicalize-path.patch - ]; - }; - - ktexteditor = extendDerivation super.ktexteditor { - patches = [ ./ktexteditor/0001-no-qcoreapplication.patch ]; - }; - - networkmanager-qt = extendDerivation super.networkmanager-qt { - propagatedBuildInputs = [ scope.networkmanager ]; - }; - }; - -in self diff --git a/pkgs/development/libraries/kde-frameworks-5.10/dependencies.sh b/pkgs/development/libraries/kde-frameworks-5.10/dependencies.sh deleted file mode 100755 index 6122ddf4b3a..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.10/dependencies.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh - -# This script rebuilds dependencies.nix. -# You must run manifest.sh first to download the packages. - -# Without arguments, this will use the version of autonix-deps-kf5 in nixpkgs. -# If you are working on the packages, this is probably what you want. - -# You can also pass the path to a source tree where you have built -# autonix-deps-kf5 yourself. If you are working on autonix-deps-kf5, this is -# probably what you want. - -manifestXML=$(nix-build -E 'with (import ../../../.. {}); autonix.writeManifestXML ./manifest.nix') - -autonixDepsKf5="" -if [[ -z $1 ]]; then - autonixDepsKF5=$(nix-build ../../../.. -A haskellPackages.autonix-deps-kf5)/bin -else - autonixDepsKF5="$1/dist/build/kf5-deps" -fi - -exec ${autonixDepsKF5}/kf5-deps "${manifestXML}" diff --git a/pkgs/development/libraries/kde-frameworks-5.10/kcmutils/kcmutils-pluginselector-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.10/kcmutils/kcmutils-pluginselector-follow-symlinks.patch deleted file mode 100644 index 47b8dfad180..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.10/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.10/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.10/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch deleted file mode 100644 index 3bd946cbd84..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.10/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.10/kpackage/0001-allow-external-paths.patch b/pkgs/development/libraries/kde-frameworks-5.10/kpackage/0001-allow-external-paths.patch deleted file mode 100644 index 440e979c008..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.10/kpackage/0001-allow-external-paths.patch +++ /dev/null @@ -1,25 +0,0 @@ -From fbf10d2059fa1f19a0f0cfa2fda0abb6c435fa78 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel <ttuegel@gmail.com> -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.10/kservice/kservice-kbuildsycoca-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.10/kservice/kservice-kbuildsycoca-follow-symlinks.patch deleted file mode 100644 index e9bc418544a..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.10/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.10/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch b/pkgs/development/libraries/kde-frameworks-5.10/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch deleted file mode 100644 index 7e21ebfe86f..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.10/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.10/ktexteditor/0001-no-qcoreapplication.patch b/pkgs/development/libraries/kde-frameworks-5.10/ktexteditor/0001-no-qcoreapplication.patch deleted file mode 100644 index c2e77a537c5..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.10/ktexteditor/0001-no-qcoreapplication.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 71e28c7c6fdd1142f04c662f45cc8f779e457cda Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel <ttuegel@gmail.com> -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.10/packages.json b/pkgs/development/libraries/kde-frameworks-5.10/packages.json deleted file mode 100644 index c5e704e62b1..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.10/packages.json +++ /dev/null @@ -1,2090 +0,0 @@ -{ - "kwallet": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5gui" - ], - "name": "kwallet-5.10.0", - "src": { - "url": "stable/frameworks/5.10/kwallet-5.10.0.tar.xz", - "name": "kwallet-5.10.0.tar.xz", - "sha256": "0nrb67shmdfaw2naa87gp29f2y3nnscj6ipw854j7shxz4fl2nr4" - }, - "buildInputs": [ - "ecm", - "gpgme", - "kf5config", - "kf5coreaddons", - "kf5dbusaddons", - "kf5gpgmepp", - "kf5i18n", - "kf5iconthemes", - "kf5notifications", - "kf5service", - "kf5widgetsaddons", - "kf5windowsystem", - "libgcrypt", - "qt5", - "qt5dbus", - "qt5gui", - "qt5test", - "qt5widgets" - ] - }, - "kdewebkit": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5webkitwidgets" - ], - "name": "kdewebkit-5.10.0", - "src": { - "url": "stable/frameworks/5.10/kdewebkit-5.10.0.tar.xz", - "name": "kdewebkit-5.10.0.tar.xz", - "sha256": "08bw2ximj3z6rs06przf6kah1mczlv2nri99cgiihin99jx8f98h" - }, - "buildInputs": [ - "ecm", - "kf5config", - "kf5coreaddons", - "kf5jobwidgets", - "kf5kio", - "kf5parts", - "kf5service", - "kf5wallet", - "qt5", - "qt5core", - "qt5network", - "qt5webkitwidgets", - "qt5widgets" - ] - }, - "kbookmarks": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5widgetsaddons", - "qt5widgets", - "qt5xml" - ], - "name": "kbookmarks-5.10.0", - "src": { - "url": "stable/frameworks/5.10/kbookmarks-5.10.0.tar.xz", - "name": "kbookmarks-5.10.0.tar.xz", - "sha256": "040n5xv8n357smmhsq24hgv43dcsbpc0wfyjhfznz41azcibbydw" - }, - "buildInputs": [ - "ecm", - "kf5codecs", - "kf5config", - "kf5configwidgets", - "kf5coreaddons", - "kf5iconthemes", - "kf5widgetsaddons", - "kf5xmlgui", - "qt5", - "qt5dbus", - "qt5test", - "qt5widgets", - "qt5xml" - ] - }, - "threadweaver": { - "nativeBuildInputs": [ - "cmake", - "snippetextractor" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5core" - ], - "name": "threadweaver-5.10.0", - "src": { - "url": "stable/frameworks/5.10/threadweaver-5.10.0.tar.xz", - "name": "threadweaver-5.10.0.tar.xz", - "sha256": "1lfdxin8rjvjpqky3g416magsg9ivf5kjmh9r37rz4v0mxsv5knd" - }, - "buildInputs": [ - "ecm", - "kf5threadweaver", - "qt5", - "qt5core", - "qt5network", - "qt5test", - "qt5widgets", - "qt5xml" - ] - }, - "kcompletion": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5widgets" - ], - "name": "kcompletion-5.10.0", - "src": { - "url": "stable/frameworks/5.10/kcompletion-5.10.0.tar.xz", - "name": "kcompletion-5.10.0.tar.xz", - "sha256": "1cb8b7qij67bghg35xcbs2lpkh5jzl7illln7h6h9jyygzv6vq7m" - }, - "buildInputs": [ - "ecm", - "kf5config", - "kf5widgetsaddons", - "qt5", - "qt5test", - "qt5widgets" - ] - }, - "kwidgetsaddons": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5widgets" - ], - "name": "kwidgetsaddons-5.10.0", - "src": { - "url": "stable/frameworks/5.10/kwidgetsaddons-5.10.0.tar.xz", - "name": "kwidgetsaddons-5.10.0.tar.xz", - "sha256": "0c9gzwsacm4zjjqc25akzf88fgrp9nraqid3c4na6asyn1pxzkmh" - }, - "buildInputs": [ - "ecm", - "qt5", - "qt5test", - "qt5uitools", - "qt5widgets" - ] - }, - "kxmlrpcclient": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5kio" - ], - "name": "kxmlrpcclient-5.10.0", - "src": { - "url": "stable/frameworks/5.10/kxmlrpcclient-5.10.0.tar.xz", - "name": "kxmlrpcclient-5.10.0.tar.xz", - "sha256": "1cjwqxpwwx9gxxb43dncyfcn3rjfx28af6dbh4zx7l0yqw4z4cxi" - }, - "buildInputs": [ - "ecm", - "kf5i18n", - "kf5kio", - "qt5test" - ] - }, - "extra-cmake-modules": { - "nativeBuildInputs": [ - "cmake", - "qcollectiongenerator_executable", - "sphinx_executable" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "extra-cmake-modules-5.10.0", - "src": { - "url": "stable/frameworks/5.10/extra-cmake-modules-5.10.0.tar.xz", - "name": "extra-cmake-modules-5.10.0.tar.xz", - "sha256": "00h62mmxl8jwslssczv14dmydgmg3rr12dd8b5471xbmx8kvqb86" - }, - "buildInputs": [ - "agg", - "blitz", - "bluez", - "eigen2", - "enchant", - "ffmpeg", - "flac", - "flex", - "gobject", - "gstreamer", - "lcms", - "libart", - "libxslt", - "openexr", - "pcre", - "qca2", - "qimageblitz", - "qt5core", - "qt5linguisttools", - "sqlite", - "strigi", - "usb", - "xine", - "xmms" - ] - }, - "kidletime": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5core" - ], - "name": "kidletime-5.10.0", - "src": { - "url": "stable/frameworks/5.10/kidletime-5.10.0.tar.xz", - "name": "kidletime-5.10.0.tar.xz", - "sha256": "0rvw4b22x9jgkqx64wisc0qnl6kx2b97sz2hxcpqh2lkj1cql4r0" - }, - "buildInputs": [ - "ecm", - "qt5", - "qt5dbus", - "qt5widgets", - "qt5x11extras", - "x11", - "x11_xcb", - "xcb" - ] - }, - "kitemmodels": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5core" - ], - "name": "kitemmodels-5.10.0", - "src": { - "url": "stable/frameworks/5.10/kitemmodels-5.10.0.tar.xz", - "name": "kitemmodels-5.10.0.tar.xz", - "sha256": "1c63wsy9iy842ljv2vmnjcn6p3ahnv6pm73p1kayjdqq6wy0lmq6" - }, - "buildInputs": [ - "ecm", - "grantlee", - "qt5", - "qt5core", - "qt5quickwidgets", - "qt5script", - "qt5test", - "qt5widgets" - ] - }, - "attica": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5core" - ], - "name": "attica-5.10.0", - "src": { - "url": "stable/frameworks/5.10/attica-5.10.0.tar.xz", - "name": "attica-5.10.0.tar.xz", - "sha256": "1immb10bvpkscdawyv1n0y52jjnfy0y3hnjxxzfwci9fj24da625" - }, - "buildInputs": [ - "ecm", - "qt5", - "qt5core", - "qt5network", - "qt5test", - "qt5widgets" - ] - }, - "kwindowsystem": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5widgets" - ], - "name": "kwindowsystem-5.10.0", - "src": { - "url": "stable/frameworks/5.10/kwindowsystem-5.10.0.tar.xz", - "name": "kwindowsystem-5.10.0.tar.xz", - "sha256": "0grxbydcc9k88nnlav7vcn3lajzswcsim5cpjcsysx9irx8rbiqf" - }, - "buildInputs": [ - "ecm", - "qt5", - "qt5test", - "qt5widgets", - "qt5winextras", - "qt5x11extras", - "x11", - "xcb" - ] - }, - "ki18n": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "ki18n-5.10.0", - "src": { - "url": "stable/frameworks/5.10/ki18n-5.10.0.tar.xz", - "name": "ki18n-5.10.0.tar.xz", - "sha256": "0xa27c42bnvhks6mdz593hxwl3idagyz6mbmp8p5dj6xsfdabrcs" - }, - "buildInputs": [ - "ecm", - "libintl", - "qt5", - "qt5concurrent", - "qt5core", - "qt5script", - "qt5test" - ] - }, - "knewstuff": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5attica", - "kf5service", - "kf5xmlgui", - "qt5widgets" - ], - "name": "knewstuff-5.10.0", - "src": { - "url": "stable/frameworks/5.10/knewstuff-5.10.0.tar.xz", - "name": "knewstuff-5.10.0.tar.xz", - "sha256": "1z24h7rk7vyavw3949gj06y924x1sbyy8jh3krr1ngpddlrsk5l7" - }, - "buildInputs": [ - "ecm", - "kf5archive", - "kf5attica", - "kf5completion", - "kf5config", - "kf5coreaddons", - "kf5i18n", - "kf5iconthemes", - "kf5itemviews", - "kf5kio", - "kf5service", - "kf5textwidgets", - "kf5widgetsaddons", - "kf5xmlgui", - "qt5", - "qt5test", - "qt5widgets", - "qt5xml" - ] - }, - "kdelibs4support": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kdewin", - "kf5archive", - "kf5auth", - "kf5configwidgets", - "kf5coreaddons", - "kf5crash", - "kf5dbusaddons", - "kf5designerplugin", - "kf5doctools", - "kf5emoticons", - "kf5guiaddons", - "kf5iconthemes", - "kf5init", - "kf5itemmodels", - "kf5kdelibs4support", - "kf5notifications", - "kf5parts", - "kf5textwidgets", - "kf5unitconversion", - "kf5windowsystem", - "qt5dbus", - "qt5printsupport", - "qt5xml" - ], - "name": "kdelibs4support-5.10.0", - "src": { - "url": "stable/frameworks/5.10/portingAids/kdelibs4support-5.10.0.tar.xz", - "name": "kdelibs4support-5.10.0.tar.xz", - "sha256": "0j7ah078ckz8zcdb417j7dmzpcbs9vvbr42r6c49fk7rp7vy4ly2" - }, - "buildInputs": [ - "agg", - "blitz", - "bluez", - "docbookxml4", - "ecm", - "eigen2", - "enchant", - "ffmpeg", - "flac", - "gobject", - "gstreamer", - "kdewin", - "kf5completion", - "kf5config", - "kf5configwidgets", - "kf5crash", - "kf5dbusaddons", - "kf5designerplugin", - "kf5doctools", - "kf5globalaccel", - "kf5guiaddons", - "kf5i18n", - "kf5iconthemes", - "kf5kio", - "kf5notifications", - "kf5parts", - "kf5service", - "kf5textwidgets", - "kf5unitconversion", - "kf5widgetsaddons", - "kf5windowsystem", - "kf5xmlgui", - "lcms", - "libart", - "networkmanager", - "openexr", - "openssl", - "pcre", - "qca2", - "qimageblitz", - "qntrack", - "qt5", - "qt5concurrent", - "qt5dbus", - "qt5designer", - "qt5network", - "qt5printsupport", - "qt5svg", - "qt5test", - "qt5widgets", - "qt5x11extras", - "sqlite", - "usb", - "x11", - "xine", - "xmms" - ] - }, - "sonnet": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5core" - ], - "name": "sonnet-5.10.0", - "src": { - "url": "stable/frameworks/5.10/sonnet-5.10.0.tar.xz", - "name": "sonnet-5.10.0.tar.xz", - "sha256": "1ad205mldwk234vwjkbalx6pnib02mz68drajg07ii5ycsczgk93" - }, - "buildInputs": [ - "aspell", - "ecm", - "enchant", - "hspell", - "hunspell", - "qt5", - "qt5test", - "qt5widgets", - "zlib" - ] - }, - "networkmanager-qt": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5core" - ], - "name": "networkmanager-qt-5.10.0", - "src": { - "url": "stable/frameworks/5.10/networkmanager-qt-5.10.0.tar.xz", - "name": "networkmanager-qt-5.10.0.tar.xz", - "sha256": "0a9yg40rmvl7mxscyx6ndq4fwqxfy6rfy6a6cb8b6wm2im29njc4" - }, - "buildInputs": [ - "ecm", - "networkmanager", - "qt4", - "qt5", - "qt5core", - "qt5dbus", - "qt5network", - "qt5test" - ] - }, - "solid": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5core" - ], - "name": "solid-5.10.0", - "src": { - "url": "stable/frameworks/5.10/solid-5.10.0.tar.xz", - "name": "solid-5.10.0.tar.xz", - "sha256": "1qy3bic39jffc2pl1wh36qm8sizjld6gd2qx6y4j9xzkv723r864" - }, - "buildInputs": [ - "bison", - "ecm", - "flex", - "iokit", - "mediaplayerinfo", - "qt5", - "qt5concurrent", - "qt5dbus", - "qt5network", - "qt5qml", - "qt5test", - "qt5widgets", - "qt5xml", - "udev" - ] - }, - "modemmanager-qt": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5core" - ], - "name": "modemmanager-qt-5.10.0", - "src": { - "url": "stable/frameworks/5.10/modemmanager-qt-5.10.0.tar.xz", - "name": "modemmanager-qt-5.10.0.tar.xz", - "sha256": "1whhc8clibiwzda4zbk8asry65c7nlnlgq10sbmh7gq008l0z9l1" - }, - "buildInputs": [ - "ecm", - "kf5modemmanagerqt", - "modemmanager", - "qt4", - "qt5", - "qt5core", - "qt5dbus", - "qt5test", - "qt5xml" - ] - }, - "kactivities": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5core" - ], - "name": "kactivities-5.10.0", - "src": { - "url": "stable/frameworks/5.10/kactivities-5.10.0.tar.xz", - "name": "kactivities-5.10.0.tar.xz", - "sha256": "0d2cyjv9hb4zd99sp598miwq4k1nzv4ssbgak7jmifqcimjpjjsk" - }, - "buildInputs": [ - "boost", - "ecm", - "kf5", - "kf5config", - "kf5coreaddons", - "kf5dbusaddons", - "kf5declarative", - "kf5globalaccel", - "kf5i18n", - "kf5kcmutils", - "kf5kio", - "kf5service", - "kf5windowsystem", - "kf5xmlgui", - "qt5", - "qt5core", - "qt5dbus", - "qt5gui", - "qt5qml", - "qt5quick", - "qt5sql", - "qt5test", - "qt5widgets" - ] - }, - "kpeople": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5core" - ], - "name": "kpeople-5.10.0", - "src": { - "url": "stable/frameworks/5.10/kpeople-5.10.0.tar.xz", - "name": "kpeople-5.10.0.tar.xz", - "sha256": "0b56c3pha1rgz9h8ia0vd4k5nvmxh64wgk5vgfnxa0znij47wcka" - }, - "buildInputs": [ - "ecm", - "kf5coreaddons", - "kf5i18n", - "kf5itemviews", - "kf5service", - "kf5widgetsaddons", - "qt5", - "qt5dbus", - "qt5gui", - "qt5qml", - "qt5quick", - "qt5sql", - "qt5test", - "qt5widgets" - ] - }, - "kcrash": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5core" - ], - "name": "kcrash-5.10.0", - "src": { - "url": "stable/frameworks/5.10/kcrash-5.10.0.tar.xz", - "name": "kcrash-5.10.0.tar.xz", - "sha256": "1imgn8a8ns15f2alp5xljy6llmqy0dv7yiqqjb1n8klvyp5mynlx" - }, - "buildInputs": [ - "ecm", - "kf5coreaddons", - "kf5windowsystem", - "qt5", - "qt5core", - "qt5test", - "qt5widgets", - "qt5x11extras", - "x11" - ] - }, - "kglobalaccel": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5dbus", - "qt5widgets" - ], - "name": "kglobalaccel-5.10.0", - "src": { - "url": "stable/frameworks/5.10/kglobalaccel-5.10.0.tar.xz", - "name": "kglobalaccel-5.10.0.tar.xz", - "sha256": "02nr4f991zi03spq4m9rlj11m5kvhmqghkfl2ijqnwv8m4dq2afy" - }, - "buildInputs": [ - "ecm", - "kf5config", - "kf5coreaddons", - "kf5crash", - "kf5dbusaddons", - "kf5i18n", - "kf5windowsystem", - "qt5", - "qt5dbus", - "qt5test", - "qt5widgets", - "qt5x11extras", - "x11", - "xcb" - ] - }, - "kitemviews": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5widgets" - ], - "name": "kitemviews-5.10.0", - "src": { - "url": "stable/frameworks/5.10/kitemviews-5.10.0.tar.xz", - "name": "kitemviews-5.10.0.tar.xz", - "sha256": "0dihi79j7iqy2x3qivjalsj9qa2b17g7jl7j705fjjfnw64xj8bi" - }, - "buildInputs": [ - "ecm", - "qt5", - "qt5test", - "qt5widgets" - ] - }, - "kplotting": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5widgets" - ], - "name": "kplotting-5.10.0", - "src": { - "url": "stable/frameworks/5.10/kplotting-5.10.0.tar.xz", - "name": "kplotting-5.10.0.tar.xz", - "sha256": "0g7riml9nbs762s1pld9d3y743z52kxdaiaklg3ai5cljp5v5skh" - }, - "buildInputs": [ - "ecm", - "qt5", - "qt5test", - "qt5widgets" - ] - }, - "kauth": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5coreaddons" - ], - "name": "kauth-5.10.0", - "src": { - "url": "stable/frameworks/5.10/kauth-5.10.0.tar.xz", - "name": "kauth-5.10.0.tar.xz", - "sha256": "074xr0qzknh9d0f6lisbyf612p4drlqscs7lqkasmd8f0r14ixlq" - }, - "buildInputs": [ - "ecm", - "kf5coreaddons", - "qt5", - "qt5dbus", - "qt5test", - "qt5widgets" - ] - }, - "plasma-framework": { - "nativeBuildInputs": [ - "cmake", - "sh" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5package", - "kf5service" - ], - "name": "plasma-framework-5.10.0", - "src": { - "url": "stable/frameworks/5.10/plasma-framework-5.10.0.tar.xz", - "name": "plasma-framework-5.10.0.tar.xz", - "sha256": "0a2lkxbpry8p8sar7ai2fcnjciiik4ir9y9snkmxci26vgql8j8a" - }, - "buildInputs": [ - "ecm", - "egl", - "gpgme", - "kactivities", - "kcoreaddons", - "kde4support", - "kdeclarative", - "kdepimlibs", - "kdesu", - "kf5", - "kf5activities", - "kf5archive", - "kf5auth", - "kf5bookmarks", - "kf5codecs", - "kf5completion", - "kf5config", - "kf5configwidgets", - "kf5coreaddons", - "kf5crash", - "kf5dbusaddons", - "kf5declarative", - "kf5doctools", - "kf5globalaccel", - "kf5guiaddons", - "kf5i18n", - "kf5iconthemes", - "kf5idletime", - "kf5init", - "kf5itemmodels", - "kf5itemviews", - "kf5jobwidgets", - "kf5js", - "kf5karchive", - "kf5kauth", - "kf5kbookmarks", - "kf5kcodecs", - "kf5kcompletion", - "kf5kconfig", - "kf5kconfigwidgets", - "kf5kcoreaddons", - "kf5kcrash", - "kf5kdbusaddons", - "kf5kde4support", - "kf5kdeclarative", - "kf5kdesu", - "kf5kdoctools", - "kf5kf5globalaccel", - "kf5kguiaddons", - "kf5ki18n", - "kf5kiconthemes", - "kf5kidletime", - "kf5kinit", - "kf5kio", - "kf5kjobwidgets", - "kf5kjs", - "kf5knotifications", - "kf5kparts", - "kf5kross", - "kf5kservice", - "kf5ktextwidgets", - "kf5kunitconversion", - "kf5kwallet", - "kf5kwidgetsaddons", - "kf5kwindowsystem", - "kf5notifications", - "kf5package", - "kf5parts", - "kf5service", - "kf5solid", - "kf5sonnet", - "kf5su", - "kf5textwidgets", - "kf5threadweaver", - "kf5unitconversion", - "kf5wallet", - "kf5widgetsaddons", - "kf5windowsystem", - "kf5xmlgui", - "opengl", - "qca2", - "qt5", - "qt5gui", - "qt5qml", - "qt5quick", - "qt5script", - "qt5sql", - "qt5svg", - "qt5test", - "qt5widgets", - "qt5x11extras", - "solid", - "x11", - "xcb" - ] - }, - "kguiaddons": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5gui" - ], - "name": "kguiaddons-5.10.0", - "src": { - "url": "stable/frameworks/5.10/kguiaddons-5.10.0.tar.xz", - "name": "kguiaddons-5.10.0.tar.xz", - "sha256": "033z4difclwbmy4bi0c819i08x8pb5znr0kd27c3l9xaf2z3kaxr" - }, - "buildInputs": [ - "ecm", - "qt5", - "qt5gui", - "qt5test", - "qt5widgets", - "qt5x11extras", - "x11", - "xcb" - ] - }, - "kservice": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5config", - "kf5coreaddons" - ], - "name": "kservice-5.10.0", - "src": { - "url": "stable/frameworks/5.10/kservice-5.10.0.tar.xz", - "name": "kservice-5.10.0.tar.xz", - "sha256": "15dmfd8ddjaac5mdb041ddhpkr3bh6gcgy0wfg404xiy1sx12dr6" - }, - "buildInputs": [ - "ecm", - "kf5config", - "kf5coreaddons", - "kf5crash", - "kf5dbusaddons", - "kf5doctools", - "kf5i18n", - "qt5", - "qt5concurrent", - "qt5dbus", - "qt5test", - "qt5xml" - ] - }, - "khtml": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5archive", - "kf5bookmarks", - "kf5globalaccel", - "kf5i18n", - "kf5iconthemes", - "kf5js", - "kf5kio", - "kf5notifications", - "kf5parts", - "kf5sonnet", - "kf5wallet", - "kf5widgetsaddons", - "kf5windowsystem", - "qt5core" - ], - "name": "khtml-5.10.0", - "src": { - "url": "stable/frameworks/5.10/portingAids/khtml-5.10.0.tar.xz", - "name": "khtml-5.10.0.tar.xz", - "sha256": "0wzzcysgvjkibs8j277z75b0s5dvjwby7c6lnyyzmnm5vmsw2dj2" - }, - "buildInputs": [ - "ecm", - "gif", - "jpeg", - "kdewin", - "kf5archive", - "kf5codecs", - "kf5globalaccel", - "kf5i18n", - "kf5iconthemes", - "kf5js", - "kf5kio", - "kf5notifications", - "kf5parts", - "kf5sonnet", - "kf5textwidgets", - "kf5wallet", - "kf5widgetsaddons", - "kf5windowsystem", - "kf5xmlgui", - "openssl", - "perl", - "phonon4qt5", - "png", - "qt5", - "qt5test", - "qt5x11extras", - "x11" - ] - }, - "kded": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kded-5.10.0", - "src": { - "url": "stable/frameworks/5.10/kded-5.10.0.tar.xz", - "name": "kded-5.10.0.tar.xz", - "sha256": "0n2nd96j09igbxwq4697gyl45sfij22hs5mkys1gnaw5j8byaj4a" - }, - "buildInputs": [ - "ecm", - "kf5config", - "kf5coreaddons", - "kf5crash", - "kf5dbusaddons", - "kf5doctools", - "kf5init", - "kf5service", - "qt5" - ] - }, - "kpty": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5coreaddons" - ], - "name": "kpty-5.10.0", - "src": { - "url": "stable/frameworks/5.10/kpty-5.10.0.tar.xz", - "name": "kpty-5.10.0.tar.xz", - "sha256": "1ys8wv1hirv6jk6jdzjnvkhw2lx3rxj8xp4sgvxfbfs833vdnqx6" - }, - "buildInputs": [ - "ecm", - "kf5coreaddons", - "kf5i18n", - "qt5", - "utempter" - ] - }, - "kross": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5i18n", - "kf5iconthemes", - "kf5kio", - "kf5parts", - "kf5widgetsaddons", - "qt5script", - "qt5widgets", - "qt5xml" - ], - "name": "kross-5.10.0", - "src": { - "url": "stable/frameworks/5.10/portingAids/kross-5.10.0.tar.xz", - "name": "kross-5.10.0.tar.xz", - "sha256": "02mz7w920vka5wwgbnf0m774s56r4qkwplakdyal92ip3zc3m6jq" - }, - "buildInputs": [ - "ecm", - "kf5completion", - "kf5coreaddons", - "kf5doctools", - "kf5i18n", - "kf5iconthemes", - "kf5kio", - "kf5parts", - "kf5service", - "kf5widgetsaddons", - "kf5xmlgui", - "qt5", - "qt5core", - "qt5script", - "qt5test", - "qt5uitools", - "qt5widgets", - "qt5xml" - ] - }, - "kxmlgui": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5config", - "kf5configwidgets", - "qt5dbus", - "qt5widgets", - "qt5xml" - ], - "name": "kxmlgui-5.10.0", - "src": { - "url": "stable/frameworks/5.10/kxmlgui-5.10.0.tar.xz", - "name": "kxmlgui-5.10.0.tar.xz", - "sha256": "1m22ld9pd2z287j8nj9alk1pychq04r0w1g1vqhgr0shlxzx91pf" - }, - "buildInputs": [ - "ecm", - "kf5attica", - "kf5config", - "kf5configwidgets", - "kf5globalaccel", - "kf5i18n", - "kf5iconthemes", - "kf5itemviews", - "kf5textwidgets", - "kf5widgetsaddons", - "kf5windowsystem", - "qt5", - "qt5dbus", - "qt5network", - "qt5printsupport", - "qt5test", - "qt5widgets", - "qt5xml" - ] - }, - "kconfig": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5xml" - ], - "name": "kconfig-5.10.0", - "src": { - "url": "stable/frameworks/5.10/kconfig-5.10.0.tar.xz", - "name": "kconfig-5.10.0.tar.xz", - "sha256": "1r7r4yihlnld09l9qmq2q8h9xk7clmgbry8vnggzih1bamid79dq" - }, - "buildInputs": [ - "ecm", - "qt5", - "qt5concurrent", - "qt5core", - "qt5gui", - "qt5test", - "qt5xml" - ] - }, - "kinit": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kinit-5.10.0", - "src": { - "url": "stable/frameworks/5.10/kinit-5.10.0.tar.xz", - "name": "kinit-5.10.0.tar.xz", - "sha256": "02da17n19xx9cqiyzh7qlbqyy0mpy4gr3pdja1xlqaapc52k99sz" - }, - "buildInputs": [ - "ecm", - "kf5config", - "kf5crash", - "kf5doctools", - "kf5i18n", - "kf5kio", - "kf5service", - "kf5windowsystem", - "libcap", - "qt5", - "x11" - ] - }, - "kpackage": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5coreaddons" - ], - "name": "kpackage-5.10.0", - "src": { - "url": "stable/frameworks/5.10/kpackage-5.10.0.tar.xz", - "name": "kpackage-5.10.0.tar.xz", - "sha256": "0c5xnks7k85lj6pkbylnlcmlhxns95zs6km9hfvdi7zh0i26y8qb" - }, - "buildInputs": [ - "ecm", - "kf5archive", - "kf5config", - "kf5coreaddons", - "kf5doctools", - "kf5i18n", - "qt5", - "qt5core", - "qt5test" - ] - }, - "karchive": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5core" - ], - "name": "karchive-5.10.0", - "src": { - "url": "stable/frameworks/5.10/karchive-5.10.0.tar.xz", - "name": "karchive-5.10.0.tar.xz", - "sha256": "19lzv1fi7vw95l9mx0qx10nfn5q7wzkqahsg2jswp31vgf977wfw" - }, - "buildInputs": [ - "bzip2", - "ecm", - "kf5archive", - "liblzma", - "qt5core", - "qt5test", - "zlib" - ] - }, - "kdesu": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5pty" - ], - "name": "kdesu-5.10.0", - "src": { - "url": "stable/frameworks/5.10/kdesu-5.10.0.tar.xz", - "name": "kdesu-5.10.0.tar.xz", - "sha256": "002ryv2svl1hmapflg0cvl7xd7qa4sh2msxnma9ijsad1ypv9nrw" - }, - "buildInputs": [ - "ecm", - "kf5coreaddons", - "kf5i18n", - "kf5pty", - "kf5service", - "qt5core", - "x11" - ] - }, - "kimageformats": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kimageformats-5.10.0", - "src": { - "url": "stable/frameworks/5.10/kimageformats-5.10.0.tar.xz", - "name": "kimageformats-5.10.0.tar.xz", - "sha256": "140s1lydikb87rpaxqmv6ccp139ch9vsi62r6fmyvwx6l0ffh2ay" - }, - "buildInputs": [ - "ecm", - "jasper", - "openexr", - "qt5gui", - "qt5printsupport", - "qt5test" - ] - }, - "kmediaplayer": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5parts" - ], - "name": "kmediaplayer-5.10.0", - "src": { - "url": "stable/frameworks/5.10/portingAids/kmediaplayer-5.10.0.tar.xz", - "name": "kmediaplayer-5.10.0.tar.xz", - "sha256": "0q17lgajv3844d2nccnfyzg6g55wx79fxij2iw42m25wyxg7b4df" - }, - "buildInputs": [ - "ecm", - "kf5parts", - "kf5xmlgui", - "qt5dbus", - "qt5test", - "qt5widgets" - ] - }, - "ktexteditor": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "ktexteditor-5.10.0", - "src": { - "url": "stable/frameworks/5.10/ktexteditor-5.10.0.tar.xz", - "name": "ktexteditor-5.10.0.tar.xz", - "sha256": "1axs21vklg392hxcm8j6y01qk3wphsfldh0caqnv6ifhamvcvkhh" - }, - "buildInputs": [ - "ecm", - "kf5archive", - "kf5config", - "kf5guiaddons", - "kf5i18n", - "kf5iconthemes", - "kf5kio", - "kf5parts", - "kf5sonnet", - "libgit2", - "perl", - "qt5", - "qt5core", - "qt5printsupport", - "qt5script", - "qt5test", - "qt5widgets", - "qt5xml", - "qt5xmlpatterns" - ] - }, - "kdesignerplugin": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kdesignerplugin-5.10.0", - "src": { - "url": "stable/frameworks/5.10/kdesignerplugin-5.10.0.tar.xz", - "name": "kdesignerplugin-5.10.0.tar.xz", - "sha256": "1z82kxn5hpbmhsrh4ic7mcmsz115p39gph7ysjz9fh6ylfdgcrpm" - }, - "buildInputs": [ - "ecm", - "kf5completion", - "kf5config", - "kf5configwidgets", - "kf5coreaddons", - "kf5doctools", - "kf5iconthemes", - "kf5itemviews", - "kf5kio", - "kf5plotting", - "kf5sonnet", - "kf5textwidgets", - "kf5webkit", - "kf5widgetsaddons", - "kf5xmlgui", - "qt5core", - "qt5designer", - "qt5test", - "qt5widgets" - ] - }, - "kparts": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5kio", - "kf5textwidgets", - "kf5xmlgui" - ], - "name": "kparts-5.10.0", - "src": { - "url": "stable/frameworks/5.10/kparts-5.10.0.tar.xz", - "name": "kparts-5.10.0.tar.xz", - "sha256": "0k1zkr2qvl65cgk0j3ybvmxs8wwjl0641yrgl36ngbk23lyi35rv" - }, - "buildInputs": [ - "ecm", - "kf5config", - "kf5coreaddons", - "kf5i18n", - "kf5iconthemes", - "kf5jobwidgets", - "kf5kio", - "kf5notifications", - "kf5service", - "kf5textwidgets", - "kf5widgetsaddons", - "kf5xmlgui", - "qt5", - "qt5core", - "qt5test", - "qt5widgets", - "qt5xml" - ] - }, - "kcmutils": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5configwidgets", - "kf5service" - ], - "name": "kcmutils-5.10.0", - "src": { - "url": "stable/frameworks/5.10/kcmutils-5.10.0.tar.xz", - "name": "kcmutils-5.10.0.tar.xz", - "sha256": "1995jbnnkwmkyiq8jav4r3x3mi3w5kv0am10c0d6g1pxjsig1xrx" - }, - "buildInputs": [ - "ecm", - "kf5configwidgets", - "kf5coreaddons", - "kf5declarative", - "kf5i18n", - "kf5iconthemes", - "kf5itemviews", - "kf5package", - "kf5service", - "kf5xmlgui", - "qt5", - "qt5dbus", - "qt5qml", - "qt5quick", - "qt5widgets" - ] - }, - "frameworkintegration": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5configwidgets", - "kf5iconthemes" - ], - "name": "frameworkintegration-5.10.0", - "src": { - "url": "stable/frameworks/5.10/frameworkintegration-5.10.0.tar.xz", - "name": "frameworkintegration-5.10.0.tar.xz", - "sha256": "00plajvkp19njdyq37qmf0q5xvwvl3vgx0vmls4hf2mk179yqm63" - }, - "buildInputs": [ - "ecm", - "kf5config", - "kf5configwidgets", - "kf5i18n", - "kf5iconthemes", - "kf5kio", - "kf5notifications", - "kf5widgetsaddons", - "oxygenfont", - "qt5", - "qt5dbus", - "qt5qml", - "qt5test", - "qt5widgets", - "qt5x11extras", - "x11", - "xcb" - ] - }, - "kiconthemes": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5widgets" - ], - "name": "kiconthemes-5.10.0", - "src": { - "url": "stable/frameworks/5.10/kiconthemes-5.10.0.tar.xz", - "name": "kiconthemes-5.10.0.tar.xz", - "sha256": "19vvg63ld4388jd47245zqzbj5bs8qj69524bvwqbv77201qg7j1" - }, - "buildInputs": [ - "ecm", - "kf5configwidgets", - "kf5i18n", - "kf5itemviews", - "kf5widgetsaddons", - "qt5", - "qt5dbus", - "qt5svg", - "qt5test", - "qt5widgets" - ] - }, - "kjs": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5core" - ], - "name": "kjs-5.10.0", - "src": { - "url": "stable/frameworks/5.10/portingAids/kjs-5.10.0.tar.xz", - "name": "kjs-5.10.0.tar.xz", - "sha256": "0l3pn9g7mv5wklihgd7v3c83563ly9swwayivqlyz4rj35m7lvq1" - }, - "buildInputs": [ - "ecm", - "kf5doctools", - "pcre", - "perl", - "qt5core", - "qt5test" - ] - }, - "knotifyconfig": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5widgets" - ], - "name": "knotifyconfig-5.10.0", - "src": { - "url": "stable/frameworks/5.10/knotifyconfig-5.10.0.tar.xz", - "name": "knotifyconfig-5.10.0.tar.xz", - "sha256": "1zhddbynsk4b27sldmbd8q8mk8kbjyfv5k27vrqahlbq7ysrhflm" - }, - "buildInputs": [ - "ecm", - "kf5completion", - "kf5config", - "kf5configwidgets", - "kf5i18n", - "kf5kio", - "kf5notifications", - "kf5widgetsaddons", - "kf5xmlgui", - "phonon4qt5", - "qt5", - "qt5dbus", - "qt5optional_components", - "qt5test", - "qt5texttospeech", - "qt5widgets" - ] - }, - "kio": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5bookmarks", - "kf5completion", - "kf5config", - "kf5coreaddons", - "kf5itemviews", - "kf5jobwidgets", - "kf5service", - "kf5solid", - "kf5xmlgui", - "qt5network" - ], - "name": "kio-5.10.0", - "src": { - "url": "stable/frameworks/5.10/kio-5.10.0.tar.xz", - "name": "kio-5.10.0.tar.xz", - "sha256": "1lbbxn5s6p8fsgyr4nwwyawgcw4ywldwy7mbvn8pk5xrzai3c04r" - }, - "buildInputs": [ - "acl", - "ecm", - "gssapi", - "kf5archive", - "kf5bookmarks", - "kf5completion", - "kf5config", - "kf5configwidgets", - "kf5coreaddons", - "kf5dbusaddons", - "kf5doctools", - "kf5i18n", - "kf5iconthemes", - "kf5itemviews", - "kf5jobwidgets", - "kf5notifications", - "kf5service", - "kf5solid", - "kf5textwidgets", - "kf5wallet", - "kf5widgetsaddons", - "kf5windowsystem", - "kf5xmlgui", - "libxml2", - "libxslt", - "openssl", - "qt5", - "qt5concurrent", - "qt5core", - "qt5dbus", - "qt5network", - "qt5script", - "qt5test", - "qt5widgets", - "qt5x11extras", - "qt5xml", - "strigi", - "x11", - "zlib" - ] - }, - "kunitconversion": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5core" - ], - "name": "kunitconversion-5.10.0", - "src": { - "url": "stable/frameworks/5.10/kunitconversion-5.10.0.tar.xz", - "name": "kunitconversion-5.10.0.tar.xz", - "sha256": "0dxawvihm2bnc9l9vx90bq50sbcgrnkfvlsixkwhirw2cvvz0v5p" - }, - "buildInputs": [ - "ecm", - "kf5i18n", - "qt5", - "qt5core", - "qt5network", - "qt5test", - "qt5xml" - ] - }, - "kdnssd": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5network" - ], - "name": "kdnssd-5.10.0", - "src": { - "url": "stable/frameworks/5.10/kdnssd-5.10.0.tar.xz", - "name": "kdnssd-5.10.0.tar.xz", - "sha256": "0frar6j0n6m43l7hdc14n0vbvs63fjg2gv5q59zwsx856rrqfszi" - }, - "buildInputs": [ - "avahi", - "dnssd", - "ecm", - "qt5", - "qt5dbus", - "qt5network" - ] - }, - "knotifications": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5widgets" - ], - "name": "knotifications-5.10.0", - "src": { - "url": "stable/frameworks/5.10/knotifications-5.10.0.tar.xz", - "name": "knotifications-5.10.0.tar.xz", - "sha256": "16qh492wwcyxanwmaqp1979wh3mrzmjkhvgnig5fxfvqzh9hxp0p" - }, - "buildInputs": [ - "dbusmenu-qt5", - "ecm", - "kf5codecs", - "kf5config", - "kf5coreaddons", - "kf5iconthemes", - "kf5service", - "kf5windowsystem", - "phonon4qt5", - "qt5", - "qt5dbus", - "qt5optional_components", - "qt5test", - "qt5texttospeech", - "qt5widgets", - "qt5x11extras", - "x11" - ] - }, - "kdbusaddons": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5dbus" - ], - "name": "kdbusaddons-5.10.0", - "src": { - "url": "stable/frameworks/5.10/kdbusaddons-5.10.0.tar.xz", - "name": "kdbusaddons-5.10.0.tar.xz", - "sha256": "0lk7h424lc015asqpnldck18zcjki4672fkswy3qdvmkkpzdgx3m" - }, - "buildInputs": [ - "ecm", - "qt5dbus", - "qt5test", - "qt5x11extras" - ] - }, - "kemoticons": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5service", - "qt5gui" - ], - "name": "kemoticons-5.10.0", - "src": { - "url": "stable/frameworks/5.10/kemoticons-5.10.0.tar.xz", - "name": "kemoticons-5.10.0.tar.xz", - "sha256": "0i3hj04k0dh2rx77sig9qdpjh2rik0n2snpr61ckiw9ixh8fggkr" - }, - "buildInputs": [ - "ecm", - "kf5archive", - "kf5config", - "kf5coreaddons", - "kf5service", - "qt5", - "qt5gui", - "qt5test", - "qt5widgets", - "qt5xml" - ] - }, - "kdoctools": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5core" - ], - "name": "kdoctools-5.10.0", - "src": { - "url": "stable/frameworks/5.10/kdoctools-5.10.0.tar.xz", - "name": "kdoctools-5.10.0.tar.xz", - "sha256": "0v00pjm0jsqkxq52ndpds7qn5vbsxkgzvvy379id1ag692s55jkp" - }, - "buildInputs": [ - "docbookxml4", - "docbookxsl", - "ecm", - "kf5archive", - "kf5doctools", - "kf5i18n", - "libxml2", - "libxslt", - "qt5core" - ] - }, - "kapidox": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kapidox-5.10.0", - "src": { - "url": "stable/frameworks/5.10/kapidox-5.10.0.tar.xz", - "name": "kapidox-5.10.0.tar.xz", - "sha256": "1zjjj951vfnwc8833lh6schdcva0dhiws56kmhclg7m9mpnvbav4" - }, - "buildInputs": [ - "pythoninterp" - ] - }, - "kcoreaddons": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5core" - ], - "name": "kcoreaddons-5.10.0", - "src": { - "url": "stable/frameworks/5.10/kcoreaddons-5.10.0.tar.xz", - "name": "kcoreaddons-5.10.0.tar.xz", - "sha256": "0y1j50axd6i0givknp9xfk81jdcdzz5p7m761qvbbjflqrnznvc1" - }, - "buildInputs": [ - "ecm", - "fam", - "qt5", - "qt5core", - "qt5test", - "qt5widgets", - "sharedmimeinfo" - ] - }, - "krunner": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5plasma", - "qt5core" - ], - "name": "krunner-5.10.0", - "src": { - "url": "stable/frameworks/5.10/portingAids/krunner-5.10.0.tar.xz", - "name": "krunner-5.10.0.tar.xz", - "sha256": "15adxzsh27s6h37mfa8pwwdf47gp8whfsshj5chl7h3zdj5aa04i" - }, - "buildInputs": [ - "ecm", - "kf5config", - "kf5coreaddons", - "kf5i18n", - "kf5kio", - "kf5plasma", - "kf5service", - "kf5solid", - "kf5threadweaver", - "qt5", - "qt5gui", - "qt5quick", - "qt5test", - "qt5widgets" - ] - }, - "kjobwidgets": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5coreaddons", - "qt5widgets" - ], - "name": "kjobwidgets-5.10.0", - "src": { - "url": "stable/frameworks/5.10/kjobwidgets-5.10.0.tar.xz", - "name": "kjobwidgets-5.10.0.tar.xz", - "sha256": "0b2n0wn2l4k8xsjgycv7123xvlbq06g0pmbn5q6akywr0lrnyd16" - }, - "buildInputs": [ - "ecm", - "kf5coreaddons", - "kf5widgetsaddons", - "qt5", - "qt5dbus", - "qt5test", - "qt5widgets", - "qt5x11extras", - "x11" - ] - }, - "kcodecs": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5core" - ], - "name": "kcodecs-5.10.0", - "src": { - "url": "stable/frameworks/5.10/kcodecs-5.10.0.tar.xz", - "name": "kcodecs-5.10.0.tar.xz", - "sha256": "1izw6rpvpxhwnl6aqrfqh2m3v3ia5gynpsxd8syi1cxnzmajgwic" - }, - "buildInputs": [ - "ecm", - "qt5core", - "qt5test" - ] - }, - "kconfigwidgets": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5auth", - "kf5codecs", - "kf5config", - "kf5widgetsaddons" - ], - "name": "kconfigwidgets-5.10.0", - "src": { - "url": "stable/frameworks/5.10/kconfigwidgets-5.10.0.tar.xz", - "name": "kconfigwidgets-5.10.0.tar.xz", - "sha256": "19p073fzpvm6hn85qk959s6dlnizywwcipw4rfm92b3y3jqg77i0" - }, - "buildInputs": [ - "ecm", - "kf5auth", - "kf5codecs", - "kf5config", - "kf5coreaddons", - "kf5doctools", - "kf5guiaddons", - "kf5i18n", - "kf5widgetsaddons", - "qt5", - "qt5test" - ] - }, - "kdeclarative": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5config", - "kf5package", - "qt5qml" - ], - "name": "kdeclarative-5.10.0", - "src": { - "url": "stable/frameworks/5.10/kdeclarative-5.10.0.tar.xz", - "name": "kdeclarative-5.10.0.tar.xz", - "sha256": "1kfsqg43inn2is991nzcgcicd7aa7yg6bzsxac3c3136p32ii9yg" - }, - "buildInputs": [ - "activeapp", - "ecm", - "epoxy", - "kf5config", - "kf5globalaccel", - "kf5guiaddons", - "kf5i18n", - "kf5iconthemes", - "kf5kio", - "kf5package", - "kf5widgetsaddons", - "kf5windowsystem", - "qt5", - "qt5gui", - "qt5qml", - "qt5quick", - "qt5test" - ] - }, - "ktextwidgets": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5i18n", - "kf5sonnet", - "qt5widgets" - ], - "name": "ktextwidgets-5.10.0", - "src": { - "url": "stable/frameworks/5.10/ktextwidgets-5.10.0.tar.xz", - "name": "ktextwidgets-5.10.0.tar.xz", - "sha256": "0mpsikpy1i3j1dx352a5c77xx5m6iv4lfnff58yi5z0m31002mv6" - }, - "buildInputs": [ - "ecm", - "kf5completion", - "kf5config", - "kf5configwidgets", - "kf5i18n", - "kf5iconthemes", - "kf5service", - "kf5sonnet", - "kf5widgetsaddons", - "kf5windowsystem", - "qt5", - "qt5dbus", - "qt5test", - "qt5widgets" - ] - }, - "kjsembed": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5i18n", - "kf5js" - ], - "name": "kjsembed-5.10.0", - "src": { - "url": "stable/frameworks/5.10/portingAids/kjsembed-5.10.0.tar.xz", - "name": "kjsembed-5.10.0.tar.xz", - "sha256": "1922bvs3p2ffax5h8kmg4llw65h00m22qfs8n3qhcc952zgv1wxl" - }, - "buildInputs": [ - "ecm", - "kf5doctools", - "kf5i18n", - "kf5js", - "qt5" - ] - } -} \ No newline at end of file diff --git a/pkgs/development/libraries/kde-frameworks-5.10/packages.sh b/pkgs/development/libraries/kde-frameworks-5.10/packages.sh deleted file mode 100755 index 9d226db2c04..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.10/packages.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh - -set -x - -origin="$(pwd)" - -# if setting KDE_MIRROR, be sure to set --cut-dirs=N in MANIFEST_EXTRA_ARGS -KDE_MIRROR="${KDE_MIRROR:-http://download.kde.org}" - -alias nix-build="nix-build --no-out-link \"$origin/../../../..\"" - -# The extra slash at the end of the URL is necessary to stop wget -# from recursing over the whole server! (No, it's not a bug.) -$(nix-build -A autonix.manifest) \ - "${KDE_MIRROR}/stable/frameworks/5.10/" \ - "$@" -A '*.tar.xz' - -AUTONIX_DEPS_KF5=${AUTONIX_DEPS_KF5:-"$(nix-build -A haskellPackages.autonix-deps-kf5)/bin/kf5-deps"} - -$AUTONIX_DEPS_KF5 manifest.json - -rm manifest.json diff --git a/pkgs/development/libraries/kde-frameworks-5.10/plasma-framework/plasma-framework-external-paths.patch b/pkgs/development/libraries/kde-frameworks-5.10/plasma-framework/plasma-framework-external-paths.patch deleted file mode 100644 index 9a22c0bdbcd..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.10/plasma-framework/plasma-framework-external-paths.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/plasma/package.cpp b/src/plasma/package.cpp -index 07b3c90..84417e3 100644 ---- a/src/plasma/package.cpp -+++ b/src/plasma/package.cpp -@@ -791,7 +791,7 @@ PackagePrivate::PackagePrivate() - servicePrefix("plasma-applet-"), - fallbackPackage(0), - metadata(0), -- externalPaths(false), -+ externalPaths(true), - valid(false), - checkedValid(false) - { diff --git a/pkgs/development/libraries/kde-frameworks-5.10/renames.json b/pkgs/development/libraries/kde-frameworks-5.10/renames.json deleted file mode 100644 index 4da5f8272ee..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.10/renames.json +++ /dev/null @@ -1,70 +0,0 @@ -{ - "kf5widgetsaddons": "kwidgetsaddons", - "kf5texteditor": "ktexteditor", - "kf5designerplugin": "kdesignerplugin", - "kf5bookmarks": "kbookmarks", - "kf5frameworkintegration": "frameworkintegration", - "kf5package": "kpackage", - "kf5archive": "karchive", - "kf5plasma": "plasma-framework", - "kf5kcmutils": "kcmutils", - "kf5configwidgets": "kconfigwidgets", - "ctest": "attica", - "kf5kio": "kio", - "kf5networkmanagerqt": "networkmanager-qt", - "kf5coreaddons": "kcoreaddons", - "kf5guiaddons": "kguiaddons", - "kf5jobwidgets": "kjobwidgets", - "kf5modemmanagerqt": "modemmanager-qt", - "kf5runner": "krunner", - "kf5globalaccel": "kglobalaccel", - "kf5dbusaddons": "kdbusaddons", - "kf5crash": "kcrash", - "kf5itemviews": "kitemviews", - "kf5doctools": "kdoctools", - "kf5i18n": "ki18n", - "kf5webkit": "kdewebkit", - "kf5newstuff": "knewstuff", - "kded": "kded", - "kf5notifications": "knotifications", - "kf5activitiesexperimentalstats": "kactivities", - "kf5dnssd": "kdnssd", - "kf5notifyconfig": "knotifyconfig", - "kf5iconthemes": "kiconthemes", - "kf5js": "kjs", - "kf5kde4support": "kdelibs4support", - "kf5parts": "kparts", - "backend": "plasma-framework", - "kf5completion": "kcompletion", - "kf5threadweaver": "threadweaver", - "kf5mediaplayer": "kmediaplayer", - "kf5plasmaquick": "plasma-framework", - "kf5wallet": "kwallet", - "kf5xmlgui": "kxmlgui", - "kf5attica": "attica", - "kf5declarative": "kdeclarative", - "kf5config": "kconfig", - "kf5init": "kinit", - "kf5textwidgets": "ktextwidgets", - "kf5jsembed": "kjsembed", - "kf5codecs": "kcodecs", - "kf5service": "kservice", - "kf5sonnet": "sonnet", - "kf5kdelibs4support": "kdelibs4support", - "kf5pty": "kpty", - "kf5solid": "solid", - "kf5auth": "kauth", - "ecm": "extra-cmake-modules", - "kf5activities": "kactivities", - "kf5plotting": "kplotting", - "kf5people": "kpeople", - "kf5emoticons": "kemoticons", - "kf5kross": "kross", - "kf5su": "kdesu", - "kf5khtml": "khtml", - "kf5unitconversion": "kunitconversion", - "kf5idletime": "kidletime", - "kf5windowsystem": "kwindowsystem", - "kf5xmlrpcclient": "kxmlrpcclient", - "kf5itemmodels": "kitemmodels" -} \ No newline at end of file diff --git a/pkgs/development/libraries/kde-frameworks-5.10/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.10/setup-hook.sh deleted file mode 100644 index a8d9b7e0e36..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.10/setup-hook.sh +++ /dev/null @@ -1 +0,0 @@ -addToSearchPath XDG_DATA_DIRS @out@/share diff --git a/pkgs/development/libraries/kde-frameworks-5.12/default.nix b/pkgs/development/libraries/kde-frameworks-5.12/default.nix deleted file mode 100644 index 229f28f9095..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.12/default.nix +++ /dev/null @@ -1,228 +0,0 @@ -# Maintainer's Notes: -# -# Minor updates: -# 1. Edit ./manifest.sh to point to the updated URL. Upstream sometimes -# releases updates that include only the changed packages; in this case, -# multiple URLs can be provided and the results will be merged. -# 2. Run ./manifest.sh and ./dependencies.sh. -# 3. Build and enjoy. -# -# Major updates: -# We prefer not to immediately overwrite older versions with major updates, so -# make a copy of this directory first. After copying, be sure to delete ./tmp -# if it exists. Then follow the minor update instructions. - -{ pkgs, newScope, qt5 ? null, debug ? false }: - -let inherit (pkgs) autonix stdenv symlinkJoin; in - -with autonix; let inherit (stdenv) lib; in - -let - qt5_ = if qt5 != null then qt5 else pkgs.qt54; -in - -let - - qt5 = qt5_; - - super = - let json = builtins.fromJSON (builtins.readFile ./packages.json); - mirrorUrl = n: pkg: pkg // { - src = pkg.src // { url = "mirror://kde/${pkg.src.url}"; }; - }; - renames = builtins.fromJSON (builtins.readFile ./renames.json); - propagated = [ "extra-cmake-modules" ]; - native = [ - "bison" - "extra-cmake-modules" - "flex" - "kdoctools" - "ki18n" - "libxslt" - "perl" - "pythoninterp" - ]; - user = [ - "qt5" - "qt5core" - "qt5dbus" - "qt5gui" - "qt5qml" - "qt5quick" - "qt5svg" - "qt5webkitwidgets" - "qt5widgets" - "qt5x11extras" - "shareddesktopontologies" - "sharedmimeinfo" - ]; - in lib.fold (f: attrs: f attrs) json [ - (lib.mapAttrs kdePackage) - (userEnvDeps user) - (nativeDeps native) - (propagateDeps propagated) - (renameDeps renames) - (lib.mapAttrs mirrorUrl) - ]; - - kdePackage = name: pkg: - let defaultOverride = drv: drv // { - setupHook = ./setup-hook.sh; - cmakeFlags = - (drv.cmakeFlags or []) - ++ [ "-DBUILD_TESTING=OFF" ] - ++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug"; - meta = { - license = with stdenv.lib.licenses; [ - lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12 - ]; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ ttuegel ]; - homepage = "http://www.kde.org"; - }; - }; - callPackage = newScope { - inherit (stdenv) mkDerivation; - inherit (pkgs) fetchurl; - inherit scope; - }; - in mkPackage callPackage defaultOverride name pkg; - - scope = - # packages in this collection - self // - # packages pinned to this version of Qt 5 - { - dbusmenu-qt5 = pkgs.libdbusmenu_qt5.override { inherit qt5; }; - phonon4qt5 = pkgs.phonon_qt5.override { inherit qt5; }; - polkit_qt5 = pkgs.polkit_qt5.override { inherit qt5; }; - qt5 = qt5.base; - qt5core = qt5.base; - qt5dbus = qt5.base; - qt5gui = qt5.base; - qt5linguisttools = qt5.tools; - qt5qml = [qt5.declarative qt5.graphicaleffects]; - qt5quick = [qt5.quickcontrols qt5.graphicaleffects]; - qt5script = qt5.script; - qt5svg = qt5.svg; - qt5webkitwidgets = qt5.webkit; - qt5widgets = qt5.base; - qt5x11extras = qt5.x11extras; - qt5xmlpatterns = qt5.xmlpatterns; - } // - # packages from the nixpkgs collection - (with pkgs; - { - inherit acl cmake docbook_xml_dtd_45 docbook5_xsl epoxy fam gpgme - libgcrypt libgit2 modemmanager networkmanager perl - perlPackages qimageblitz xorg zlib; - boost = boost155; - gif = giflib; - glib2 = glib; - jpeg = libjpeg; - libintl = gettext; - liblzma = lzma; - pythoninterp = python; - pythonlibrary = python; - sharedmimeinfo = shared_mime_info; - } - ); - - self = super // { - bluez-qt = overrideDerivation super.bluez-qt (drv: { - preConfigure = '' - substituteInPlace CMakeLists.txt \ - --replace /lib/udev/rules.d "$out/lib/udev/rules.d" - ''; - }); - - extra-cmake-modules = overrideDerivation super.extra-cmake-modules (drv: { - buildInputs = []; - nativeBuildInputs = []; - propagatedBuildInputs = []; - propagatedNativeBuildInputs = [ scope.cmake pkgs.pkgconfig qt5.tools ]; - propagatedUserEnvPkgs = []; - cmakeFlags = ["-DBUILD_TESTING=OFF"]; - patches = [./extra-cmake-modules/0001-extra-cmake-modules-paths.patch]; - meta = { - license = stdenv.lib.licenses.bsd2; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ ttuegel ]; - homepage = "http://www.kde.org"; - }; - }); - - frameworkintegration = extendDerivation super.frameworkintegration { - buildInputs = [ scope.xorg.libXcursor ]; - }; - - kauth = extendDerivation super.kauth { - buildInputs = [ scope.polkit_qt5 ]; - patches = [ ./kauth/kauth-policy-install.patch ]; - }; - - kcmutils = extendDerivation super.kcmutils { - patches = [ ./kcmutils/kcmutils-pluginselector-follow-symlinks.patch ]; - }; - - kconfigwidgets = extendDerivation super.kconfigwidgets { - patches = [ ./kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch ]; - }; - - kdelibs4support = extendDerivation super.kdelibs4support { - buildInputs = [ scope.networkmanager scope.xorg.libSM ]; - cmakeFlags = [ - "-DDocBookXML4_DTD_DIR=${pkgs.docbook_xml_dtd_45}/xml/dtd/docbook" - "-DDocBookXML4_DTD_VERSION=4.5" - ]; - }; - - kdoctools = extendDerivation super.kdoctools { - propagatedNativeBuildInputs = [ scope.perl scope.perlPackages.URI ]; - cmakeFlags = [ - "-DDocBookXML4_DTD_DIR=${scope.docbook_xml_dtd_45}/xml/dtd/docbook" - "-DDocBookXML4_DTD_VERSION=4.5" - "-DDocBookXSL_DIR=${scope.docbook5_xsl}/xml/xsl/docbook" - ]; - patches = [ ./kdoctools/kdoctools-no-find-docbook-xml.patch ]; - }; - - ki18n = extendDerivation super.ki18n { - propagatedNativeBuildInputs = with scope; [ libintl pythoninterp ]; - }; - - kimageformats = extendDerivation super.kimageformats { - NIX_CFLAGS_COMPILE = "-I${pkgs.ilmbase}/include/OpenEXR"; - }; - - kinit = extendDerivation super.kinit { - patches = [./kinit/0001-kinit-libpath.patch]; - }; - - kpackage = extendDerivation super.kpackage { - patches = [ ./kpackage/0001-allow-external-paths.patch ]; - }; - - kservice = extendDerivation super.kservice { - buildInputs = [ scope.kwindowsystem ]; - patches = [ - ./kservice/kservice-kbuildsycoca-follow-symlinks.patch - ./kservice/kservice-kbuildsycoca-no-canonicalize-path.patch - ]; - }; - - ktexteditor = extendDerivation super.ktexteditor { - patches = [ ./ktexteditor/0001-no-qcoreapplication.patch ]; - }; - - kwallet = extendDerivation super.kwallet { - buildInputs = [ scope.kdoctools ]; - }; - - networkmanager-qt = extendDerivation super.networkmanager-qt { - propagatedBuildInputs = [ scope.networkmanager ]; - }; - }; - -in self diff --git a/pkgs/development/libraries/kde-frameworks-5.12/dependencies.sh b/pkgs/development/libraries/kde-frameworks-5.12/dependencies.sh deleted file mode 100755 index 6122ddf4b3a..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.12/dependencies.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh - -# This script rebuilds dependencies.nix. -# You must run manifest.sh first to download the packages. - -# Without arguments, this will use the version of autonix-deps-kf5 in nixpkgs. -# If you are working on the packages, this is probably what you want. - -# You can also pass the path to a source tree where you have built -# autonix-deps-kf5 yourself. If you are working on autonix-deps-kf5, this is -# probably what you want. - -manifestXML=$(nix-build -E 'with (import ../../../.. {}); autonix.writeManifestXML ./manifest.nix') - -autonixDepsKf5="" -if [[ -z $1 ]]; then - autonixDepsKF5=$(nix-build ../../../.. -A haskellPackages.autonix-deps-kf5)/bin -else - autonixDepsKF5="$1/dist/build/kf5-deps" -fi - -exec ${autonixDepsKF5}/kf5-deps "${manifestXML}" diff --git a/pkgs/development/libraries/kde-frameworks-5.12/extra-cmake-modules/0001-extra-cmake-modules-paths.patch b/pkgs/development/libraries/kde-frameworks-5.12/extra-cmake-modules/0001-extra-cmake-modules-paths.patch deleted file mode 100644 index 9717716faf5..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.12/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 <ttuegel@gmail.com> -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.12/kauth/kauth-policy-install.patch b/pkgs/development/libraries/kde-frameworks-5.12/kauth/kauth-policy-install.patch deleted file mode 100644 index 340155256f2..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.12/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.12/kcmutils/kcmutils-pluginselector-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.12/kcmutils/kcmutils-pluginselector-follow-symlinks.patch deleted file mode 100644 index 47b8dfad180..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.12/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.12/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.12/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch deleted file mode 100644 index 3bd946cbd84..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.12/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.12/kdoctools/kdoctools-no-find-docbook-xml.patch b/pkgs/development/libraries/kde-frameworks-5.12/kdoctools/kdoctools-no-find-docbook-xml.patch deleted file mode 100644 index 4e3a33efab3..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.12/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.12/kinit/0001-kinit-libpath.patch b/pkgs/development/libraries/kde-frameworks-5.12/kinit/0001-kinit-libpath.patch deleted file mode 100644 index 9c76079a382..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.12/kinit/0001-kinit-libpath.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 723c9b1268a04127647a1c20eebe9804150566dd Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel <ttuegel@gmail.com> -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.12/kservice/kservice-kbuildsycoca-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.12/kservice/kservice-kbuildsycoca-follow-symlinks.patch deleted file mode 100644 index e9bc418544a..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.12/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.12/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch b/pkgs/development/libraries/kde-frameworks-5.12/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch deleted file mode 100644 index 7e21ebfe86f..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.12/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.12/ktexteditor/0001-no-qcoreapplication.patch b/pkgs/development/libraries/kde-frameworks-5.12/ktexteditor/0001-no-qcoreapplication.patch deleted file mode 100644 index c2e77a537c5..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.12/ktexteditor/0001-no-qcoreapplication.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 71e28c7c6fdd1142f04c662f45cc8f779e457cda Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel <ttuegel@gmail.com> -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.12/packages.json b/pkgs/development/libraries/kde-frameworks-5.12/packages.json deleted file mode 100644 index f5951517266..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.12/packages.json +++ /dev/null @@ -1,2116 +0,0 @@ -{ - "kwallet": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5gui" - ], - "name": "kwallet-5.12.0", - "src": { - "url": "stable/frameworks/5.12/kwallet-5.12.0.tar.xz", - "name": "kwallet-5.12.0.tar.xz", - "sha256": "0i45qf4j42172jr4mz3xzw589frp4xw86b2j3rhgzipfi26cx3zd" - }, - "buildInputs": [ - "ecm", - "gpgme", - "kf5config", - "kf5coreaddons", - "kf5dbusaddons", - "kf5gpgmepp", - "kf5i18n", - "kf5iconthemes", - "kf5notifications", - "kf5service", - "kf5widgetsaddons", - "kf5windowsystem", - "libgcrypt", - "qt5", - "qt5dbus", - "qt5gui", - "qt5test", - "qt5widgets" - ] - }, - "kdewebkit": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5webkitwidgets" - ], - "name": "kdewebkit-5.12.0", - "src": { - "url": "stable/frameworks/5.12/kdewebkit-5.12.0.tar.xz", - "name": "kdewebkit-5.12.0.tar.xz", - "sha256": "09r0bvjgvb9ar13whr4ar21r4kzjwa4zipn6iqzx9n0xxwn2mxjv" - }, - "buildInputs": [ - "ecm", - "kf5config", - "kf5coreaddons", - "kf5jobwidgets", - "kf5kio", - "kf5parts", - "kf5service", - "kf5wallet", - "qt5", - "qt5core", - "qt5network", - "qt5webkitwidgets", - "qt5widgets" - ] - }, - "kbookmarks": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5widgetsaddons", - "qt5widgets", - "qt5xml" - ], - "name": "kbookmarks-5.12.0", - "src": { - "url": "stable/frameworks/5.12/kbookmarks-5.12.0.tar.xz", - "name": "kbookmarks-5.12.0.tar.xz", - "sha256": "07xayi77h9wg2f4pnwgjbicbfqk42lphqvcha9sn97p0hnzl1g5h" - }, - "buildInputs": [ - "ecm", - "kf5codecs", - "kf5config", - "kf5configwidgets", - "kf5coreaddons", - "kf5iconthemes", - "kf5widgetsaddons", - "kf5xmlgui", - "qt5", - "qt5dbus", - "qt5test", - "qt5widgets", - "qt5xml" - ] - }, - "bluez-qt": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5core" - ], - "name": "bluez-qt-5.12.0", - "src": { - "url": "stable/frameworks/5.12/bluez-qt-5.12.0.tar.xz", - "name": "bluez-qt-5.12.0.tar.xz", - "sha256": "1asgcvspwra52ywfk6v4mv1fdxkshyh5zyqnwljbbs1a1n8g8gl0" - }, - "buildInputs": [ - "ecm", - "qt5", - "qt5core", - "qt5dbus", - "qt5network", - "qt5qml", - "qt5quicktest", - "qt5test" - ] - }, - "threadweaver": { - "nativeBuildInputs": [ - "cmake", - "snippetextractor" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5core" - ], - "name": "threadweaver-5.12.0", - "src": { - "url": "stable/frameworks/5.12/threadweaver-5.12.0.tar.xz", - "name": "threadweaver-5.12.0.tar.xz", - "sha256": "1xswh5k48n3nq5v8zgc3qyldky8pq3xgsbsgjg1is5pgayw4j08b" - }, - "buildInputs": [ - "ecm", - "kf5threadweaver", - "qt5", - "qt5core", - "qt5network", - "qt5test", - "qt5widgets", - "qt5xml" - ] - }, - "kcompletion": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5widgets" - ], - "name": "kcompletion-5.12.0", - "src": { - "url": "stable/frameworks/5.12/kcompletion-5.12.0.tar.xz", - "name": "kcompletion-5.12.0.tar.xz", - "sha256": "0g4gvc9r0l7ng7jv0hkp8khhlckgwzpix5hsjjcmzggfkhsl4sj0" - }, - "buildInputs": [ - "ecm", - "kf5config", - "kf5widgetsaddons", - "qt5", - "qt5test", - "qt5widgets" - ] - }, - "kwidgetsaddons": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5widgets" - ], - "name": "kwidgetsaddons-5.12.0", - "src": { - "url": "stable/frameworks/5.12/kwidgetsaddons-5.12.0.tar.xz", - "name": "kwidgetsaddons-5.12.0.tar.xz", - "sha256": "12n3c3j6nawrhgc9mqk627q1brjvbdxkm52g0mnm5c5ql953gqs6" - }, - "buildInputs": [ - "ecm", - "qt5", - "qt5test", - "qt5uitools", - "qt5widgets" - ] - }, - "kxmlrpcclient": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5kio" - ], - "name": "kxmlrpcclient-5.12.0", - "src": { - "url": "stable/frameworks/5.12/kxmlrpcclient-5.12.0.tar.xz", - "name": "kxmlrpcclient-5.12.0.tar.xz", - "sha256": "1ysw61kcx0i6il6r782jdyr2a9n8hy0j5mgpd7slr57mrcfgsivd" - }, - "buildInputs": [ - "ecm", - "kf5i18n", - "kf5kio", - "qt5test" - ] - }, - "extra-cmake-modules": { - "nativeBuildInputs": [ - "cmake", - "qcollectiongenerator_executable", - "sphinx_executable" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "extra-cmake-modules-5.12.0", - "src": { - "url": "stable/frameworks/5.12/extra-cmake-modules-5.12.0.tar.xz", - "name": "extra-cmake-modules-5.12.0.tar.xz", - "sha256": "14n77sn493m8kzr42wv13mdgxpnbx7x64bvw37ircrx8wmf4002i" - }, - "buildInputs": [ - "agg", - "blitz", - "bluez", - "eigen2", - "enchant", - "ffmpeg", - "flac", - "flex", - "gobject", - "gstreamer", - "lcms", - "libart", - "libxslt", - "openexr", - "pcre", - "qca2", - "qimageblitz", - "qt5core", - "qt5linguisttools", - "sqlite", - "strigi", - "usb", - "xine", - "xmms" - ] - }, - "kidletime": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5core" - ], - "name": "kidletime-5.12.0", - "src": { - "url": "stable/frameworks/5.12/kidletime-5.12.0.tar.xz", - "name": "kidletime-5.12.0.tar.xz", - "sha256": "1rpvj4q07sc17an4274pcszdsqjdl8x33ln3lmw5x2q27v5d22qc" - }, - "buildInputs": [ - "ecm", - "qt5", - "qt5dbus", - "qt5widgets", - "qt5x11extras", - "x11", - "x11_xcb", - "xcb" - ] - }, - "kitemmodels": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5core" - ], - "name": "kitemmodels-5.12.0", - "src": { - "url": "stable/frameworks/5.12/kitemmodels-5.12.0.tar.xz", - "name": "kitemmodels-5.12.0.tar.xz", - "sha256": "0wmsb59svzk0iay9ynbjbdgqxph1cpvifvvnlxc67a5nzhgk5cms" - }, - "buildInputs": [ - "ecm", - "grantlee", - "qt5", - "qt5core", - "qt5quickwidgets", - "qt5script", - "qt5test", - "qt5widgets" - ] - }, - "attica": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5core" - ], - "name": "attica-5.12.0", - "src": { - "url": "stable/frameworks/5.12/attica-5.12.0.tar.xz", - "name": "attica-5.12.0.tar.xz", - "sha256": "05311rr7zsfwzq3569gg2gkq6rksvhdji1x0jv8zxax5a1n40gc7" - }, - "buildInputs": [ - "ecm", - "qt5", - "qt5core", - "qt5network", - "qt5test", - "qt5widgets" - ] - }, - "kwindowsystem": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5widgets" - ], - "name": "kwindowsystem-5.12.0", - "src": { - "url": "stable/frameworks/5.12/kwindowsystem-5.12.0.tar.xz", - "name": "kwindowsystem-5.12.0.tar.xz", - "sha256": "0fjxhf07r186cmp0mjvinrwxg4z90zlyvycqhy0n18fdp67szckl" - }, - "buildInputs": [ - "ecm", - "qt5", - "qt5test", - "qt5widgets", - "qt5winextras", - "qt5x11extras", - "x11", - "xcb" - ] - }, - "ki18n": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "ki18n-5.12.0", - "src": { - "url": "stable/frameworks/5.12/ki18n-5.12.0.tar.xz", - "name": "ki18n-5.12.0.tar.xz", - "sha256": "11bivhaiqk8rlnz288ghnbjp3i2kdivmrzscjjnyqw25rpjj4drz" - }, - "buildInputs": [ - "ecm", - "libintl", - "qt5", - "qt5concurrent", - "qt5core", - "qt5script", - "qt5test" - ] - }, - "knewstuff": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5attica", - "kf5service", - "kf5xmlgui", - "qt5widgets" - ], - "name": "knewstuff-5.12.0", - "src": { - "url": "stable/frameworks/5.12/knewstuff-5.12.0.tar.xz", - "name": "knewstuff-5.12.0.tar.xz", - "sha256": "03zxj81a4hy46azh047xxfmr4mjp8ri7hzcxspi31hmr8gf1hxv9" - }, - "buildInputs": [ - "ecm", - "kf5archive", - "kf5attica", - "kf5completion", - "kf5config", - "kf5coreaddons", - "kf5i18n", - "kf5iconthemes", - "kf5itemviews", - "kf5kio", - "kf5service", - "kf5textwidgets", - "kf5widgetsaddons", - "kf5xmlgui", - "qt5", - "qt5test", - "qt5widgets", - "qt5xml" - ] - }, - "kdelibs4support": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kdewin", - "kf5archive", - "kf5auth", - "kf5configwidgets", - "kf5coreaddons", - "kf5crash", - "kf5dbusaddons", - "kf5designerplugin", - "kf5doctools", - "kf5emoticons", - "kf5guiaddons", - "kf5iconthemes", - "kf5init", - "kf5itemmodels", - "kf5kdelibs4support", - "kf5notifications", - "kf5parts", - "kf5textwidgets", - "kf5unitconversion", - "kf5windowsystem", - "qt5dbus", - "qt5printsupport", - "qt5xml" - ], - "name": "kdelibs4support-5.12.0", - "src": { - "url": "stable/frameworks/5.12/portingAids/kdelibs4support-5.12.0.tar.xz", - "name": "kdelibs4support-5.12.0.tar.xz", - "sha256": "0hbs1gwqgx4sc8cma1q5pyanf2kj5brfz9dph5xcf32bijz2ds4f" - }, - "buildInputs": [ - "agg", - "blitz", - "bluez", - "docbookxml4", - "ecm", - "eigen2", - "enchant", - "ffmpeg", - "flac", - "gobject", - "gstreamer", - "kdewin", - "kf5completion", - "kf5config", - "kf5configwidgets", - "kf5crash", - "kf5dbusaddons", - "kf5designerplugin", - "kf5doctools", - "kf5globalaccel", - "kf5guiaddons", - "kf5i18n", - "kf5iconthemes", - "kf5kio", - "kf5notifications", - "kf5parts", - "kf5service", - "kf5textwidgets", - "kf5unitconversion", - "kf5widgetsaddons", - "kf5windowsystem", - "kf5xmlgui", - "lcms", - "libart", - "networkmanager", - "openexr", - "openssl", - "pcre", - "qca2", - "qimageblitz", - "qntrack", - "qt5", - "qt5concurrent", - "qt5dbus", - "qt5designer", - "qt5network", - "qt5printsupport", - "qt5svg", - "qt5test", - "qt5widgets", - "qt5x11extras", - "sqlite", - "usb", - "x11", - "xine", - "xmms" - ] - }, - "sonnet": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5core" - ], - "name": "sonnet-5.12.0", - "src": { - "url": "stable/frameworks/5.12/sonnet-5.12.0.tar.xz", - "name": "sonnet-5.12.0.tar.xz", - "sha256": "1rr5dbs9477mf8lacmk5dcvw0h3s597l4miwm4j3rmn9jpvlcm1l" - }, - "buildInputs": [ - "aspell", - "ecm", - "enchant", - "hspell", - "hunspell", - "qt5", - "qt5test", - "qt5widgets", - "zlib" - ] - }, - "networkmanager-qt": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5core" - ], - "name": "networkmanager-qt-5.12.0", - "src": { - "url": "stable/frameworks/5.12/networkmanager-qt-5.12.0.tar.xz", - "name": "networkmanager-qt-5.12.0.tar.xz", - "sha256": "0znwp1nyw47dpq48m1c1y250msm2lh9hipzjmgvh2mqr60vvy094" - }, - "buildInputs": [ - "ecm", - "networkmanager", - "qt4", - "qt5", - "qt5core", - "qt5dbus", - "qt5network", - "qt5test" - ] - }, - "solid": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5core" - ], - "name": "solid-5.12.0", - "src": { - "url": "stable/frameworks/5.12/solid-5.12.0.tar.xz", - "name": "solid-5.12.0.tar.xz", - "sha256": "0s3xjrc5v350s0w26jpzb427h0nx6bhqldv7qswknrqir5x6zymj" - }, - "buildInputs": [ - "bison", - "ecm", - "flex", - "iokit", - "mediaplayerinfo", - "qt5", - "qt5concurrent", - "qt5dbus", - "qt5network", - "qt5qml", - "qt5test", - "qt5widgets", - "qt5xml", - "udev" - ] - }, - "modemmanager-qt": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5core" - ], - "name": "modemmanager-qt-5.12.0", - "src": { - "url": "stable/frameworks/5.12/modemmanager-qt-5.12.0.tar.xz", - "name": "modemmanager-qt-5.12.0.tar.xz", - "sha256": "1s9ayfpkpkkrqss3x2swb2fzg5zxja8qkawwy59crf9xjfk3gwxi" - }, - "buildInputs": [ - "ecm", - "kf5modemmanagerqt", - "modemmanager", - "qt4", - "qt5", - "qt5core", - "qt5dbus", - "qt5test", - "qt5xml" - ] - }, - "kactivities": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5core" - ], - "name": "kactivities-5.12.0", - "src": { - "url": "stable/frameworks/5.12/kactivities-5.12.0.tar.xz", - "name": "kactivities-5.12.0.tar.xz", - "sha256": "1rv5fb5gx7nkksy857aqbsvgkkw0fc0zs8yab3b4hyv4ybqx4j2q" - }, - "buildInputs": [ - "boost", - "ecm", - "kf5", - "kf5config", - "kf5coreaddons", - "kf5dbusaddons", - "kf5declarative", - "kf5globalaccel", - "kf5i18n", - "kf5kcmutils", - "kf5kio", - "kf5service", - "kf5windowsystem", - "kf5xmlgui", - "qt5", - "qt5core", - "qt5dbus", - "qt5gui", - "qt5qml", - "qt5quick", - "qt5quickwidgets", - "qt5sql", - "qt5test", - "qt5widgets" - ] - }, - "kpeople": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5core" - ], - "name": "kpeople-5.12.0", - "src": { - "url": "stable/frameworks/5.12/kpeople-5.12.0.tar.xz", - "name": "kpeople-5.12.0.tar.xz", - "sha256": "0p8qamrxcfxb0f7fsrjn1k5vhi8hmd2iph6b5bjblfpwgw2f44r8" - }, - "buildInputs": [ - "ecm", - "kf5coreaddons", - "kf5i18n", - "kf5itemviews", - "kf5service", - "kf5widgetsaddons", - "qt5", - "qt5dbus", - "qt5gui", - "qt5qml", - "qt5quick", - "qt5sql", - "qt5test", - "qt5widgets" - ] - }, - "kcrash": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5core" - ], - "name": "kcrash-5.12.0", - "src": { - "url": "stable/frameworks/5.12/kcrash-5.12.0.tar.xz", - "name": "kcrash-5.12.0.tar.xz", - "sha256": "00m69f0wrykrdhiyasfpwykrkh4r05hldr8yjvw2sn62gb1s45pg" - }, - "buildInputs": [ - "ecm", - "kf5coreaddons", - "kf5windowsystem", - "qt5", - "qt5core", - "qt5test", - "qt5widgets", - "qt5x11extras", - "x11" - ] - }, - "kglobalaccel": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5dbus", - "qt5widgets" - ], - "name": "kglobalaccel-5.12.0", - "src": { - "url": "stable/frameworks/5.12/kglobalaccel-5.12.0.tar.xz", - "name": "kglobalaccel-5.12.0.tar.xz", - "sha256": "1p8kj31m4lyy6dr85383v6j8bg622xmw3x8kyiijlckd1zf2bmr8" - }, - "buildInputs": [ - "ecm", - "kf5config", - "kf5coreaddons", - "kf5crash", - "kf5dbusaddons", - "kf5windowsystem", - "qt5", - "qt5dbus", - "qt5test", - "qt5widgets", - "qt5x11extras", - "x11", - "xcb" - ] - }, - "kitemviews": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5widgets" - ], - "name": "kitemviews-5.12.0", - "src": { - "url": "stable/frameworks/5.12/kitemviews-5.12.0.tar.xz", - "name": "kitemviews-5.12.0.tar.xz", - "sha256": "0swlp9kynsw708mm9b4bh2r9rcwqxqmkwaga4gg33cjchf0y8862" - }, - "buildInputs": [ - "ecm", - "qt5", - "qt5test", - "qt5widgets" - ] - }, - "kplotting": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5widgets" - ], - "name": "kplotting-5.12.0", - "src": { - "url": "stable/frameworks/5.12/kplotting-5.12.0.tar.xz", - "name": "kplotting-5.12.0.tar.xz", - "sha256": "1xh0lbi7fxsz3gj2y762r9md85l8fp0l6kj5577444k4vswgaial" - }, - "buildInputs": [ - "ecm", - "qt5", - "qt5test", - "qt5widgets" - ] - }, - "kauth": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5coreaddons" - ], - "name": "kauth-5.12.0", - "src": { - "url": "stable/frameworks/5.12/kauth-5.12.0.tar.xz", - "name": "kauth-5.12.0.tar.xz", - "sha256": "1ky3f16z4w0p97yzdfn3v4qs50wcir5p18cq6sakjhp95fxj1m2y" - }, - "buildInputs": [ - "ecm", - "kf5coreaddons", - "qt5", - "qt5dbus", - "qt5test", - "qt5widgets" - ] - }, - "plasma-framework": { - "nativeBuildInputs": [ - "cmake", - "sh" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5package", - "kf5service" - ], - "name": "plasma-framework-5.12.0", - "src": { - "url": "stable/frameworks/5.12/plasma-framework-5.12.0.tar.xz", - "name": "plasma-framework-5.12.0.tar.xz", - "sha256": "07ma5nr3v3r9x9gc5sb3rhghci8cl0mm11f8dfawl3bvyzzhq3hm" - }, - "buildInputs": [ - "ecm", - "egl", - "gpgme", - "kactivities", - "kcoreaddons", - "kde4support", - "kdeclarative", - "kdepimlibs", - "kdesu", - "kf5", - "kf5activities", - "kf5archive", - "kf5auth", - "kf5bookmarks", - "kf5codecs", - "kf5completion", - "kf5config", - "kf5configwidgets", - "kf5coreaddons", - "kf5crash", - "kf5dbusaddons", - "kf5declarative", - "kf5doctools", - "kf5globalaccel", - "kf5guiaddons", - "kf5i18n", - "kf5iconthemes", - "kf5idletime", - "kf5init", - "kf5itemmodels", - "kf5itemviews", - "kf5jobwidgets", - "kf5js", - "kf5karchive", - "kf5kauth", - "kf5kbookmarks", - "kf5kcodecs", - "kf5kcompletion", - "kf5kconfig", - "kf5kconfigwidgets", - "kf5kcoreaddons", - "kf5kcrash", - "kf5kdbusaddons", - "kf5kde4support", - "kf5kdeclarative", - "kf5kdesu", - "kf5kdoctools", - "kf5kf5globalaccel", - "kf5kguiaddons", - "kf5ki18n", - "kf5kiconthemes", - "kf5kidletime", - "kf5kinit", - "kf5kio", - "kf5kjobwidgets", - "kf5kjs", - "kf5knotifications", - "kf5kparts", - "kf5kross", - "kf5kservice", - "kf5ktextwidgets", - "kf5kunitconversion", - "kf5kwallet", - "kf5kwidgetsaddons", - "kf5kwindowsystem", - "kf5notifications", - "kf5package", - "kf5parts", - "kf5service", - "kf5solid", - "kf5sonnet", - "kf5su", - "kf5textwidgets", - "kf5threadweaver", - "kf5unitconversion", - "kf5wallet", - "kf5widgetsaddons", - "kf5windowsystem", - "kf5xmlgui", - "opengl", - "qca2", - "qt5", - "qt5gui", - "qt5qml", - "qt5quick", - "qt5script", - "qt5sql", - "qt5svg", - "qt5test", - "qt5widgets", - "qt5x11extras", - "solid", - "x11", - "xcb" - ] - }, - "kguiaddons": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5gui" - ], - "name": "kguiaddons-5.12.0", - "src": { - "url": "stable/frameworks/5.12/kguiaddons-5.12.0.tar.xz", - "name": "kguiaddons-5.12.0.tar.xz", - "sha256": "0s49vn617vaddnrpryivrpwmcdb95xincx2x86bsybdsss8nawp3" - }, - "buildInputs": [ - "ecm", - "qt5", - "qt5gui", - "qt5test", - "qt5widgets", - "qt5x11extras", - "x11", - "xcb" - ] - }, - "kservice": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5config", - "kf5coreaddons" - ], - "name": "kservice-5.12.0", - "src": { - "url": "stable/frameworks/5.12/kservice-5.12.0.tar.xz", - "name": "kservice-5.12.0.tar.xz", - "sha256": "12zfxvzv34hbcwi325izlahr65cgd465hsj29ib3lgr0aadi8r0b" - }, - "buildInputs": [ - "ecm", - "kf5config", - "kf5coreaddons", - "kf5crash", - "kf5dbusaddons", - "kf5doctools", - "kf5i18n", - "qt5", - "qt5concurrent", - "qt5dbus", - "qt5test", - "qt5xml" - ] - }, - "khtml": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5archive", - "kf5bookmarks", - "kf5globalaccel", - "kf5i18n", - "kf5iconthemes", - "kf5js", - "kf5kio", - "kf5notifications", - "kf5parts", - "kf5sonnet", - "kf5wallet", - "kf5widgetsaddons", - "kf5windowsystem", - "qt5core" - ], - "name": "khtml-5.12.0", - "src": { - "url": "stable/frameworks/5.12/portingAids/khtml-5.12.0.tar.xz", - "name": "khtml-5.12.0.tar.xz", - "sha256": "0f76x8zy81dd7y0qwkf7drwa3k2f4yzbr13w2i89yaa078l7p9sw" - }, - "buildInputs": [ - "ecm", - "gif", - "jpeg", - "kdewin", - "kf5archive", - "kf5codecs", - "kf5globalaccel", - "kf5i18n", - "kf5iconthemes", - "kf5js", - "kf5kio", - "kf5notifications", - "kf5parts", - "kf5sonnet", - "kf5textwidgets", - "kf5wallet", - "kf5widgetsaddons", - "kf5windowsystem", - "kf5xmlgui", - "openssl", - "perl", - "phonon4qt5", - "png", - "qt5", - "qt5test", - "qt5x11extras", - "x11" - ] - }, - "kded": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kded-5.12.0", - "src": { - "url": "stable/frameworks/5.12/kded-5.12.0.tar.xz", - "name": "kded-5.12.0.tar.xz", - "sha256": "1876gc1kkz41kcmy78lnl212paygfhj0syvswbdpx3nq4gyyrkyx" - }, - "buildInputs": [ - "ecm", - "kf5config", - "kf5coreaddons", - "kf5crash", - "kf5dbusaddons", - "kf5doctools", - "kf5init", - "kf5service", - "qt5" - ] - }, - "kpty": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5coreaddons" - ], - "name": "kpty-5.12.0", - "src": { - "url": "stable/frameworks/5.12/kpty-5.12.0.tar.xz", - "name": "kpty-5.12.0.tar.xz", - "sha256": "0gpvjdsag5fmdz5fmjna7wb6j64cpwzfk6rljg938xg0pidms6wc" - }, - "buildInputs": [ - "ecm", - "kf5coreaddons", - "kf5i18n", - "qt5", - "utempter" - ] - }, - "kross": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5i18n", - "kf5iconthemes", - "kf5kio", - "kf5parts", - "kf5widgetsaddons", - "qt5script", - "qt5widgets", - "qt5xml" - ], - "name": "kross-5.12.0", - "src": { - "url": "stable/frameworks/5.12/portingAids/kross-5.12.0.tar.xz", - "name": "kross-5.12.0.tar.xz", - "sha256": "1s7vxsp992y8r39m1val4mylfcl084wsj391y5z333cdryr4wqwq" - }, - "buildInputs": [ - "ecm", - "kf5completion", - "kf5coreaddons", - "kf5doctools", - "kf5i18n", - "kf5iconthemes", - "kf5kio", - "kf5parts", - "kf5widgetsaddons", - "kf5xmlgui", - "qt5", - "qt5core", - "qt5script", - "qt5test", - "qt5uitools", - "qt5widgets", - "qt5xml" - ] - }, - "kxmlgui": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5config", - "kf5configwidgets", - "qt5dbus", - "qt5widgets", - "qt5xml" - ], - "name": "kxmlgui-5.12.0", - "src": { - "url": "stable/frameworks/5.12/kxmlgui-5.12.0.tar.xz", - "name": "kxmlgui-5.12.0.tar.xz", - "sha256": "1v9nf3hrymikgy3d7lh9xcyw8dx1ndl8gsgmzfbxjli60fjniiyl" - }, - "buildInputs": [ - "ecm", - "kf5attica", - "kf5config", - "kf5configwidgets", - "kf5globalaccel", - "kf5i18n", - "kf5iconthemes", - "kf5itemviews", - "kf5textwidgets", - "kf5widgetsaddons", - "kf5windowsystem", - "qt5", - "qt5dbus", - "qt5network", - "qt5printsupport", - "qt5test", - "qt5widgets", - "qt5xml" - ] - }, - "kconfig": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5xml" - ], - "name": "kconfig-5.12.0", - "src": { - "url": "stable/frameworks/5.12/kconfig-5.12.0.tar.xz", - "name": "kconfig-5.12.0.tar.xz", - "sha256": "1dxdf01kswigv7cdad9zjxg5iri479hi8gib3b72pwm24m0wc5ac" - }, - "buildInputs": [ - "ecm", - "qt5", - "qt5concurrent", - "qt5core", - "qt5gui", - "qt5test", - "qt5xml" - ] - }, - "kinit": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kinit-5.12.0", - "src": { - "url": "stable/frameworks/5.12/kinit-5.12.0.tar.xz", - "name": "kinit-5.12.0.tar.xz", - "sha256": "19w1wgv9javrfmfq52bdvaazd3hqlf6hwdw09hc5935b043zx6cz" - }, - "buildInputs": [ - "ecm", - "kf5config", - "kf5crash", - "kf5doctools", - "kf5i18n", - "kf5kio", - "kf5service", - "kf5windowsystem", - "libcap", - "qt5", - "x11" - ] - }, - "kpackage": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5coreaddons" - ], - "name": "kpackage-5.12.0", - "src": { - "url": "stable/frameworks/5.12/kpackage-5.12.0.tar.xz", - "name": "kpackage-5.12.0.tar.xz", - "sha256": "1a8cn1zqv930nmda8n45fnwc5al1iw7xdgqvydbgds7q0mqwg7l5" - }, - "buildInputs": [ - "ecm", - "kf5archive", - "kf5config", - "kf5coreaddons", - "kf5doctools", - "kf5i18n", - "qt5", - "qt5core", - "qt5test" - ] - }, - "karchive": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5core" - ], - "name": "karchive-5.12.0", - "src": { - "url": "stable/frameworks/5.12/karchive-5.12.0.tar.xz", - "name": "karchive-5.12.0.tar.xz", - "sha256": "0dh6pskw1picj3f6a4bbhd9j9ki8l738x7f9dxfwcx05mzsliyl8" - }, - "buildInputs": [ - "bzip2", - "ecm", - "kf5archive", - "liblzma", - "qt5core", - "qt5test", - "zlib" - ] - }, - "kdesu": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5pty" - ], - "name": "kdesu-5.12.0", - "src": { - "url": "stable/frameworks/5.12/kdesu-5.12.0.tar.xz", - "name": "kdesu-5.12.0.tar.xz", - "sha256": "1ks695j7wnb7j6vca7a3cb0ii0li4g7sdyksvqsmkxbb1rrpg11f" - }, - "buildInputs": [ - "ecm", - "kf5coreaddons", - "kf5i18n", - "kf5pty", - "kf5service", - "qt5core", - "x11" - ] - }, - "kimageformats": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kimageformats-5.12.0", - "src": { - "url": "stable/frameworks/5.12/kimageformats-5.12.0.tar.xz", - "name": "kimageformats-5.12.0.tar.xz", - "sha256": "1h91xwj4xjv8z5a9hnid7zqcs35cwxv6hf3kwaag35vllm2cs0s7" - }, - "buildInputs": [ - "ecm", - "jasper", - "openexr", - "qt5gui", - "qt5printsupport", - "qt5test" - ] - }, - "kmediaplayer": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5parts" - ], - "name": "kmediaplayer-5.12.0", - "src": { - "url": "stable/frameworks/5.12/portingAids/kmediaplayer-5.12.0.tar.xz", - "name": "kmediaplayer-5.12.0.tar.xz", - "sha256": "0yr5jjpfnjgfrzqpksl85k6jsgihdb5spf0k9478ryyzpzw3as15" - }, - "buildInputs": [ - "ecm", - "kf5parts", - "kf5xmlgui", - "qt5dbus", - "qt5test", - "qt5widgets" - ] - }, - "ktexteditor": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "ktexteditor-5.12.0", - "src": { - "url": "stable/frameworks/5.12/ktexteditor-5.12.0.tar.xz", - "name": "ktexteditor-5.12.0.tar.xz", - "sha256": "09fcyxanl744mrbpxw5sa1bvf18d9hcs305jaim8bgfw58gz7prl" - }, - "buildInputs": [ - "ecm", - "kf5archive", - "kf5config", - "kf5guiaddons", - "kf5i18n", - "kf5iconthemes", - "kf5kio", - "kf5parts", - "kf5sonnet", - "libgit2", - "perl", - "qt5", - "qt5core", - "qt5printsupport", - "qt5script", - "qt5test", - "qt5widgets", - "qt5xml", - "qt5xmlpatterns" - ] - }, - "kdesignerplugin": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kdesignerplugin-5.12.0", - "src": { - "url": "stable/frameworks/5.12/kdesignerplugin-5.12.0.tar.xz", - "name": "kdesignerplugin-5.12.0.tar.xz", - "sha256": "05n5pfqabmmy5y8dvk7xz51nyky4k44vxhv7k9fq231cza07w3dg" - }, - "buildInputs": [ - "ecm", - "kf5completion", - "kf5config", - "kf5configwidgets", - "kf5coreaddons", - "kf5doctools", - "kf5iconthemes", - "kf5itemviews", - "kf5kio", - "kf5plotting", - "kf5sonnet", - "kf5textwidgets", - "kf5webkit", - "kf5widgetsaddons", - "kf5xmlgui", - "qt5core", - "qt5designer", - "qt5test", - "qt5widgets" - ] - }, - "kparts": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5kio", - "kf5textwidgets", - "kf5xmlgui" - ], - "name": "kparts-5.12.0", - "src": { - "url": "stable/frameworks/5.12/kparts-5.12.0.tar.xz", - "name": "kparts-5.12.0.tar.xz", - "sha256": "075iqmjdmg8jlbmnpp4jjfr4way4i4c5zwg4c1d4cgd14rr9vm1r" - }, - "buildInputs": [ - "ecm", - "kf5config", - "kf5coreaddons", - "kf5i18n", - "kf5iconthemes", - "kf5jobwidgets", - "kf5kio", - "kf5notifications", - "kf5service", - "kf5textwidgets", - "kf5widgetsaddons", - "kf5xmlgui", - "qt5", - "qt5core", - "qt5test", - "qt5widgets", - "qt5xml" - ] - }, - "kcmutils": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5configwidgets", - "kf5service" - ], - "name": "kcmutils-5.12.0", - "src": { - "url": "stable/frameworks/5.12/kcmutils-5.12.0.tar.xz", - "name": "kcmutils-5.12.0.tar.xz", - "sha256": "1bnrybzfzhb98ihxcvxjgd6agbr16grhdp8zrbq0lhqbaivyfrzd" - }, - "buildInputs": [ - "ecm", - "kf5configwidgets", - "kf5coreaddons", - "kf5declarative", - "kf5i18n", - "kf5iconthemes", - "kf5itemviews", - "kf5package", - "kf5service", - "kf5xmlgui", - "qt5", - "qt5dbus", - "qt5qml", - "qt5quick", - "qt5widgets" - ] - }, - "frameworkintegration": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5configwidgets", - "kf5iconthemes" - ], - "name": "frameworkintegration-5.12.0", - "src": { - "url": "stable/frameworks/5.12/frameworkintegration-5.12.0.tar.xz", - "name": "frameworkintegration-5.12.0.tar.xz", - "sha256": "0pi1gsc2k681f7913ald5d4i53riv2nwj09plalkabydh8kcd55j" - }, - "buildInputs": [ - "ecm", - "kf5config", - "kf5configwidgets", - "kf5i18n", - "kf5iconthemes", - "kf5kio", - "kf5notifications", - "kf5widgetsaddons", - "oxygenfont", - "qt5", - "qt5dbus", - "qt5qml", - "qt5test", - "qt5widgets", - "qt5x11extras", - "x11", - "xcb" - ] - }, - "kiconthemes": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5widgets" - ], - "name": "kiconthemes-5.12.0", - "src": { - "url": "stable/frameworks/5.12/kiconthemes-5.12.0.tar.xz", - "name": "kiconthemes-5.12.0.tar.xz", - "sha256": "0myaqpi1pavjyf2pyvkb2v87vwpyzwd2bvm5bh88va1p1kw747a5" - }, - "buildInputs": [ - "ecm", - "kf5configwidgets", - "kf5i18n", - "kf5itemviews", - "kf5widgetsaddons", - "qt5", - "qt5dbus", - "qt5svg", - "qt5test", - "qt5widgets" - ] - }, - "kjs": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5core" - ], - "name": "kjs-5.12.0", - "src": { - "url": "stable/frameworks/5.12/portingAids/kjs-5.12.0.tar.xz", - "name": "kjs-5.12.0.tar.xz", - "sha256": "1ajcnpphn3vdkx4xwb762bvj0ws7l2h5sxq53cz3lzvznn9q99ps" - }, - "buildInputs": [ - "ecm", - "kf5doctools", - "pcre", - "perl", - "qt5core", - "qt5test" - ] - }, - "knotifyconfig": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5widgets" - ], - "name": "knotifyconfig-5.12.0", - "src": { - "url": "stable/frameworks/5.12/knotifyconfig-5.12.0.tar.xz", - "name": "knotifyconfig-5.12.0.tar.xz", - "sha256": "0gznp2m7hlrbl6y7d3p8g6nwdgpk1h2iyy810cs6cjhs5n7b7bfk" - }, - "buildInputs": [ - "ecm", - "kf5completion", - "kf5config", - "kf5configwidgets", - "kf5i18n", - "kf5kio", - "kf5notifications", - "kf5widgetsaddons", - "kf5xmlgui", - "phonon4qt5", - "qt5", - "qt5dbus", - "qt5optional_components", - "qt5test", - "qt5texttospeech", - "qt5widgets" - ] - }, - "kio": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5bookmarks", - "kf5completion", - "kf5config", - "kf5coreaddons", - "kf5itemviews", - "kf5jobwidgets", - "kf5service", - "kf5solid", - "kf5xmlgui", - "qt5network" - ], - "name": "kio-5.12.0", - "src": { - "url": "stable/frameworks/5.12/kio-5.12.0.tar.xz", - "name": "kio-5.12.0.tar.xz", - "sha256": "139jngyaa1rm159qj0ivjk9bd18rb6sp9n8290xsqwpfvs6ixn7w" - }, - "buildInputs": [ - "acl", - "ecm", - "gssapi", - "kf5archive", - "kf5bookmarks", - "kf5completion", - "kf5config", - "kf5configwidgets", - "kf5coreaddons", - "kf5dbusaddons", - "kf5doctools", - "kf5i18n", - "kf5iconthemes", - "kf5itemviews", - "kf5jobwidgets", - "kf5notifications", - "kf5service", - "kf5solid", - "kf5textwidgets", - "kf5wallet", - "kf5widgetsaddons", - "kf5windowsystem", - "kf5xmlgui", - "libxml2", - "libxslt", - "openssl", - "qt5", - "qt5concurrent", - "qt5core", - "qt5dbus", - "qt5network", - "qt5script", - "qt5test", - "qt5widgets", - "qt5x11extras", - "qt5xml", - "strigi", - "x11", - "zlib" - ] - }, - "kunitconversion": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5core" - ], - "name": "kunitconversion-5.12.0", - "src": { - "url": "stable/frameworks/5.12/kunitconversion-5.12.0.tar.xz", - "name": "kunitconversion-5.12.0.tar.xz", - "sha256": "0gmxqjryjzhhr75clbs7swd765asfaf0b7ivnqk99j0dzdg1yh8m" - }, - "buildInputs": [ - "ecm", - "kf5i18n", - "qt5", - "qt5core", - "qt5network", - "qt5test", - "qt5xml" - ] - }, - "kdnssd": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5network" - ], - "name": "kdnssd-5.12.0", - "src": { - "url": "stable/frameworks/5.12/kdnssd-5.12.0.tar.xz", - "name": "kdnssd-5.12.0.tar.xz", - "sha256": "1v8nml6fmabail6d9wybfqmg02kymg15x5ng4vc08z9wrn1jvxrd" - }, - "buildInputs": [ - "avahi", - "dnssd", - "ecm", - "qt5", - "qt5dbus", - "qt5network" - ] - }, - "knotifications": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5widgets" - ], - "name": "knotifications-5.12.0", - "src": { - "url": "stable/frameworks/5.12/knotifications-5.12.0.tar.xz", - "name": "knotifications-5.12.0.tar.xz", - "sha256": "08clp98lpplk2k6c4r1l01yh16ssn4ipfc6w8wiahqipp6gzw1bv" - }, - "buildInputs": [ - "dbusmenu-qt5", - "ecm", - "kf5codecs", - "kf5config", - "kf5coreaddons", - "kf5iconthemes", - "kf5service", - "kf5windowsystem", - "phonon4qt5", - "qt5", - "qt5dbus", - "qt5optional_components", - "qt5test", - "qt5texttospeech", - "qt5widgets", - "qt5x11extras", - "x11" - ] - }, - "kdbusaddons": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5dbus" - ], - "name": "kdbusaddons-5.12.0", - "src": { - "url": "stable/frameworks/5.12/kdbusaddons-5.12.0.tar.xz", - "name": "kdbusaddons-5.12.0.tar.xz", - "sha256": "1nfanafpsi67lmszf8lf3zyjghb3j0jfbc5s7vsa19zbxz9dsh3d" - }, - "buildInputs": [ - "ecm", - "qt5dbus", - "qt5test", - "qt5x11extras" - ] - }, - "kemoticons": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5service", - "qt5gui" - ], - "name": "kemoticons-5.12.0", - "src": { - "url": "stable/frameworks/5.12/kemoticons-5.12.0.tar.xz", - "name": "kemoticons-5.12.0.tar.xz", - "sha256": "11wm832xv59vlwnlq314vr7j151mfv7s5xsgab1h0w1ypf8nbggv" - }, - "buildInputs": [ - "ecm", - "kf5archive", - "kf5config", - "kf5coreaddons", - "kf5service", - "qt5", - "qt5gui", - "qt5test", - "qt5widgets", - "qt5xml" - ] - }, - "kdoctools": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5core" - ], - "name": "kdoctools-5.12.0", - "src": { - "url": "stable/frameworks/5.12/kdoctools-5.12.0.tar.xz", - "name": "kdoctools-5.12.0.tar.xz", - "sha256": "0if3lss9ywwkpcgb8k6vi6b35vl5xxy77gdsbmvd2w2r83p2s6n4" - }, - "buildInputs": [ - "docbookxml4", - "docbookxsl", - "ecm", - "kf5archive", - "kf5doctools", - "kf5i18n", - "libxml2", - "libxslt", - "qt5core" - ] - }, - "kapidox": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [], - "name": "kapidox-5.12.0", - "src": { - "url": "stable/frameworks/5.12/kapidox-5.12.0.tar.xz", - "name": "kapidox-5.12.0.tar.xz", - "sha256": "0pcmyp92l63klxjz3valpk9kr9rh3ny663hqlfj1qcbl5qx10fic" - }, - "buildInputs": [ - "pythoninterp" - ] - }, - "kcoreaddons": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5core" - ], - "name": "kcoreaddons-5.12.0", - "src": { - "url": "stable/frameworks/5.12/kcoreaddons-5.12.0.tar.xz", - "name": "kcoreaddons-5.12.0.tar.xz", - "sha256": "1w113966p2wsr6ddwifzpc6lvx2hpr2qziq7kn4ycjpq3fc6whl7" - }, - "buildInputs": [ - "ecm", - "fam", - "qt5", - "qt5core", - "qt5test", - "qt5widgets", - "sharedmimeinfo" - ] - }, - "krunner": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5plasma", - "qt5core" - ], - "name": "krunner-5.12.0", - "src": { - "url": "stable/frameworks/5.12/portingAids/krunner-5.12.0.tar.xz", - "name": "krunner-5.12.0.tar.xz", - "sha256": "167zz32q5ghxc672yp372livdr37wx24769726izhfhqh22gqbpz" - }, - "buildInputs": [ - "ecm", - "kf5config", - "kf5coreaddons", - "kf5i18n", - "kf5kio", - "kf5plasma", - "kf5service", - "kf5solid", - "kf5threadweaver", - "qt5", - "qt5gui", - "qt5quick", - "qt5test", - "qt5widgets" - ] - }, - "kjobwidgets": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5coreaddons", - "qt5widgets" - ], - "name": "kjobwidgets-5.12.0", - "src": { - "url": "stable/frameworks/5.12/kjobwidgets-5.12.0.tar.xz", - "name": "kjobwidgets-5.12.0.tar.xz", - "sha256": "1vrxcsy4jad2dzjhwlb44l18fckb1h5p3f4w6q8493clribc27kj" - }, - "buildInputs": [ - "ecm", - "kf5coreaddons", - "kf5widgetsaddons", - "qt5", - "qt5dbus", - "qt5test", - "qt5widgets", - "qt5x11extras", - "x11" - ] - }, - "kcodecs": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "qt5core" - ], - "name": "kcodecs-5.12.0", - "src": { - "url": "stable/frameworks/5.12/kcodecs-5.12.0.tar.xz", - "name": "kcodecs-5.12.0.tar.xz", - "sha256": "1xwz1ipf53azhcpm91c8q1q1i5v4avbnfapgz45hr223ilfkdmpy" - }, - "buildInputs": [ - "ecm", - "qt5core", - "qt5test" - ] - }, - "kconfigwidgets": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5auth", - "kf5codecs", - "kf5config", - "kf5widgetsaddons" - ], - "name": "kconfigwidgets-5.12.0", - "src": { - "url": "stable/frameworks/5.12/kconfigwidgets-5.12.0.tar.xz", - "name": "kconfigwidgets-5.12.0.tar.xz", - "sha256": "1xwk6alrfpgm3pblhdglzglazvjp9i5kzcg212ngad8q9z05c4jg" - }, - "buildInputs": [ - "ecm", - "kf5auth", - "kf5codecs", - "kf5config", - "kf5coreaddons", - "kf5doctools", - "kf5guiaddons", - "kf5i18n", - "kf5widgetsaddons", - "qt5", - "qt5test" - ] - }, - "kdeclarative": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5config", - "kf5package", - "qt5qml" - ], - "name": "kdeclarative-5.12.0", - "src": { - "url": "stable/frameworks/5.12/kdeclarative-5.12.0.tar.xz", - "name": "kdeclarative-5.12.0.tar.xz", - "sha256": "0k6c6ar5xi0m2p4s81p0057i13zpihakniscx5v9yz1ncv7sl8gm" - }, - "buildInputs": [ - "activeapp", - "ecm", - "epoxy", - "kf5config", - "kf5globalaccel", - "kf5guiaddons", - "kf5i18n", - "kf5iconthemes", - "kf5kio", - "kf5package", - "kf5widgetsaddons", - "kf5windowsystem", - "qt5", - "qt5gui", - "qt5qml", - "qt5quick", - "qt5test" - ] - }, - "ktextwidgets": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5i18n", - "kf5sonnet", - "qt5widgets" - ], - "name": "ktextwidgets-5.12.0", - "src": { - "url": "stable/frameworks/5.12/ktextwidgets-5.12.0.tar.xz", - "name": "ktextwidgets-5.12.0.tar.xz", - "sha256": "0m2813dm3xs9q2rwvbkynckgbbh0q51swhibhdyirggl1xc8vvf0" - }, - "buildInputs": [ - "ecm", - "kf5completion", - "kf5config", - "kf5configwidgets", - "kf5i18n", - "kf5iconthemes", - "kf5service", - "kf5sonnet", - "kf5widgetsaddons", - "kf5windowsystem", - "qt5", - "qt5optional_components", - "qt5test", - "qt5texttospeech", - "qt5widgets" - ] - }, - "kjsembed": { - "nativeBuildInputs": [ - "cmake" - ], - "propagatedNativeBuildInputs": [], - "propagatedUserEnvPkgs": [], - "propagatedBuildInputs": [ - "kf5i18n", - "kf5js" - ], - "name": "kjsembed-5.12.0", - "src": { - "url": "stable/frameworks/5.12/portingAids/kjsembed-5.12.0.tar.xz", - "name": "kjsembed-5.12.0.tar.xz", - "sha256": "0fmgpi0c62y2658xaf0d825azywmpy77vg97k788liqy0d1ykhvh" - }, - "buildInputs": [ - "ecm", - "kf5doctools", - "kf5i18n", - "kf5js", - "qt5" - ] - } -} \ No newline at end of file diff --git a/pkgs/development/libraries/kde-frameworks-5.12/packages.sh b/pkgs/development/libraries/kde-frameworks-5.12/packages.sh deleted file mode 100755 index b859a87f32f..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.12/packages.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh - -set -x - -origin="$(pwd)" - -# if setting KDE_MIRROR, be sure to set --cut-dirs=N in MANIFEST_EXTRA_ARGS -KDE_MIRROR="${KDE_MIRROR:-http://download.kde.org}" - -alias nix-build="nix-build --no-out-link \"$origin/../../../..\"" - -# The extra slash at the end of the URL is necessary to stop wget -# from recursing over the whole server! (No, it's not a bug.) -$(nix-build -A autonix.manifest) \ - "${KDE_MIRROR}/stable/frameworks/5.12/" \ - "$@" -A '*.tar.xz' - -AUTONIX_DEPS_KF5=${AUTONIX_DEPS_KF5:-"$(nix-build -A haskellPackages.autonix-deps-kf5)/bin/kf5-deps"} - -$AUTONIX_DEPS_KF5 manifest.json - -rm manifest.json diff --git a/pkgs/development/libraries/kde-frameworks-5.12/plasma-framework/plasma-framework-external-paths.patch b/pkgs/development/libraries/kde-frameworks-5.12/plasma-framework/plasma-framework-external-paths.patch deleted file mode 100644 index 9a22c0bdbcd..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.12/plasma-framework/plasma-framework-external-paths.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/plasma/package.cpp b/src/plasma/package.cpp -index 07b3c90..84417e3 100644 ---- a/src/plasma/package.cpp -+++ b/src/plasma/package.cpp -@@ -791,7 +791,7 @@ PackagePrivate::PackagePrivate() - servicePrefix("plasma-applet-"), - fallbackPackage(0), - metadata(0), -- externalPaths(false), -+ externalPaths(true), - valid(false), - checkedValid(false) - { diff --git a/pkgs/development/libraries/kde-frameworks-5.12/renames.json b/pkgs/development/libraries/kde-frameworks-5.12/renames.json deleted file mode 100644 index e469d582b1c..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.12/renames.json +++ /dev/null @@ -1,71 +0,0 @@ -{ - "kf5widgetsaddons": "kwidgetsaddons", - "kf5texteditor": "ktexteditor", - "kf5designerplugin": "kdesignerplugin", - "kf5bookmarks": "kbookmarks", - "kf5frameworkintegration": "frameworkintegration", - "kf5package": "kpackage", - "kf5archive": "karchive", - "kf5plasma": "plasma-framework", - "kf5kcmutils": "kcmutils", - "kf5configwidgets": "kconfigwidgets", - "ctest": "attica", - "kf5kio": "kio", - "kf5networkmanagerqt": "networkmanager-qt", - "kf5coreaddons": "kcoreaddons", - "kf5guiaddons": "kguiaddons", - "kf5jobwidgets": "kjobwidgets", - "kf5modemmanagerqt": "modemmanager-qt", - "kf5runner": "krunner", - "kf5globalaccel": "kglobalaccel", - "kf5dbusaddons": "kdbusaddons", - "kf5crash": "kcrash", - "kf5itemviews": "kitemviews", - "kf5doctools": "kdoctools", - "kf5i18n": "ki18n", - "kf5webkit": "kdewebkit", - "kf5newstuff": "knewstuff", - "kded": "kded", - "kf5notifications": "knotifications", - "kf5activitiesexperimentalstats": "kactivities", - "kf5dnssd": "kdnssd", - "kf5notifyconfig": "knotifyconfig", - "kf5iconthemes": "kiconthemes", - "kf5js": "kjs", - "kf5kde4support": "kdelibs4support", - "kf5parts": "kparts", - "backend": "plasma-framework", - "kf5completion": "kcompletion", - "kf5threadweaver": "threadweaver", - "kf5mediaplayer": "kmediaplayer", - "kf5plasmaquick": "plasma-framework", - "kf5wallet": "kwallet", - "kf5xmlgui": "kxmlgui", - "kf5attica": "attica", - "kf5declarative": "kdeclarative", - "kf5config": "kconfig", - "kf5init": "kinit", - "kf5textwidgets": "ktextwidgets", - "kf5jsembed": "kjsembed", - "kf5codecs": "kcodecs", - "kf5service": "kservice", - "kf5sonnet": "sonnet", - "kf5kdelibs4support": "kdelibs4support", - "kf5pty": "kpty", - "kf5solid": "solid", - "kf5auth": "kauth", - "ecm": "extra-cmake-modules", - "kf5activities": "kactivities", - "kf5plotting": "kplotting", - "kf5people": "kpeople", - "kf5emoticons": "kemoticons", - "kf5kross": "kross", - "kf5su": "kdesu", - "kf5khtml": "khtml", - "kf5unitconversion": "kunitconversion", - "kf5idletime": "kidletime", - "kf5bluezqt": "bluez-qt", - "kf5windowsystem": "kwindowsystem", - "kf5xmlrpcclient": "kxmlrpcclient", - "kf5itemmodels": "kitemmodels" -} \ No newline at end of file diff --git a/pkgs/development/libraries/kde-frameworks-5.12/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.12/setup-hook.sh deleted file mode 100644 index a8d9b7e0e36..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.12/setup-hook.sh +++ /dev/null @@ -1 +0,0 @@ -addToSearchPath XDG_DATA_DIRS @out@/share 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/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 <ttuegel@gmail.com> -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/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 <<EOF -# DO NOT EDIT! This file is generated automatically by manifest.sh -{ fetchurl, mirror }: - -{ -EOF - -workdir=$(pwd) - -find . | while read src; do - if [[ -f "${src}" ]]; then - url="${src:2}" - # 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:]]*-\)\+,,') - sha256=$(nix-hash --type sha256 --base32 --flat "$src") - cat >>../srcs.nix <<EOF - $name = { - version = "$version"; - src = fetchurl { - url = "\${mirror}/$url"; - sha256 = "$sha256"; - name = "$filename"; - }; - }; -EOF - fi -done - -echo "}" >>../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/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/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/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/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/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/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/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/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/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/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/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 <ttuegel@gmail.com> -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/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/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/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/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 <ttuegel@gmail.com> -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/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/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/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/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/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/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/attica.nix b/pkgs/development/libraries/kde-frameworks-5.15/attica.nix index 98721876c12..98721876c12 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/attica.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/attica.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.15/baloo.nix b/pkgs/development/libraries/kde-frameworks-5.15/baloo.nix new file mode 100644 index 00000000000..38c41d9271d --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.15/baloo.nix @@ -0,0 +1,25 @@ +{ kdeFramework, lib, extra-cmake-modules, kauth, kconfig +, kcoreaddons, kcrash, kdbusaddons, kfilemetadata, ki18n, kidletime +, kio, lmdb, makeQtWrapper, qtbase, qtquick1, solid +}: + +kdeFramework { + name = "baloo"; + nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ]; + buildInputs = [ + kconfig kcrash kdbusaddons lmdb qtquick1 solid + ]; + propagatedBuildInputs = [ + kauth kcoreaddons kfilemetadata ki18n kio kidletime qtbase + ]; + postInstall = '' + wrapQtProgram "$out/bin/baloo_file" + wrapQtProgram "$out/bin/baloo_file_extractor" + wrapQtProgram "$out/bin/balooctl" + wrapQtProgram "$out/bin/baloosearch" + wrapQtProgram "$out/bin/balooshow" + ''; + 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.15/bluez-qt.nix index f981b0516f7..f981b0516f7 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/bluez-qt.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/bluez-qt.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.13/default.nix b/pkgs/development/libraries/kde-frameworks-5.15/default.nix index 1ff433c13c8..6b6b95ab3c7 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/default.nix @@ -9,7 +9,7 @@ let - inherit (pkgs) lib stdenv; + inherit (pkgs) lib makeSetupHook stdenv; mirror = "mirror://kde"; srcs = import ./srcs.nix { inherit (pkgs) fetchurl; inherit mirror; }; diff --git a/pkgs/development/libraries/kde-frameworks-5.10/extra-cmake-modules/0001-extra-cmake-modules-paths.patch b/pkgs/development/libraries/kde-frameworks-5.15/extra-cmake-modules/0001-extra-cmake-modules-paths.patch index 9717716faf5..9717716faf5 100644 --- a/pkgs/development/libraries/kde-frameworks-5.10/extra-cmake-modules/0001-extra-cmake-modules-paths.patch +++ b/pkgs/development/libraries/kde-frameworks-5.15/extra-cmake-modules/0001-extra-cmake-modules-paths.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.13/extra-cmake-modules/default.nix b/pkgs/development/libraries/kde-frameworks-5.15/extra-cmake-modules/default.nix index 4d669b72a89..4e1b1aff3bd 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/extra-cmake-modules/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/extra-cmake-modules/default.nix @@ -2,9 +2,10 @@ kdeFramework { name = "extra-cmake-modules"; - setupHook = ./setup-hook.sh; patches = [ ./0001-extra-cmake-modules-paths.patch ]; + setupHook = ./setup-hook.sh; + # It is OK to propagate these inputs as long as # extra-cmake-modules is never a propagated input # of some other derivation. diff --git a/pkgs/development/libraries/kde-frameworks-5.15/extra-cmake-modules/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.15/extra-cmake-modules/setup-hook.sh new file mode 100644 index 00000000000..a6fa6189240 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.15/extra-cmake-modules/setup-hook.sh @@ -0,0 +1,27 @@ +addMimePkg() { + local propagated + + if [[ -d "$1/share/mime" ]]; then + propagated= + for pkg in $propagatedBuildInputs; do + if [[ "z$pkg" == "z$1" ]]; then + propagated=1 + fi + done + if [[ -z $propagated ]]; then + propagatedBuildInputs="$propagatedBuildInputs $1" + fi + + propagated= + for pkg in $propagatedUserEnvPkgs; do + if [[ "z$pkg" == "z$1" ]]; then + propagated=1 + fi + done + if [[ -z $propagated ]]; then + propagatedUserEnvPkgs="$propagatedUserEnvPkgs $1" + fi + fi +} + +envHooks+=(addMimePkg) diff --git a/pkgs/development/libraries/kde-frameworks-5.15/fetchsrcs.sh b/pkgs/development/libraries/kde-frameworks-5.15/fetchsrcs.sh new file mode 100755 index 00000000000..e7f6d9e00e5 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.15/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.15/" +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 <<EOF +# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh +{ fetchurl, mirror }: + +{ +EOF + +gawk -F , "{ print \$1 }" ../srcs.csv | sort | uniq | while read name; do + versions=$(gawk -F , "/^$name,/ { print \$2 }" ../srcs.csv) + latestVersion=$(echo "$versions" | sort -rV | head -n 1) + src=$(gawk -F , "/^$name,$latestVersion,/ { print \$3 }" ../srcs.csv) + filename=$(gawk -F , "/^$name,$latestVersion,/ { print \$4 }" ../srcs.csv) + url="${src:2}" + sha256=$(nix-hash --type sha256 --base32 --flat "$src") + cat >>../srcs.nix <<EOF + $name = { + version = "$latestVersion"; + src = fetchurl { + url = "\${mirror}/$url"; + sha256 = "$sha256"; + name = "$filename"; + }; + }; +EOF +done + +echo "}" >>../srcs.nix + +rm -f ../srcs.csv + +cd .. diff --git a/pkgs/development/libraries/kde-frameworks-5.15/frameworkintegration.nix b/pkgs/development/libraries/kde-frameworks-5.15/frameworkintegration.nix new file mode 100644 index 00000000000..26987c385ad --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.15/frameworkintegration.nix @@ -0,0 +1,17 @@ +{ 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 knotifications kwidgetsaddons + libXcursor + ]; + propagatedBuildInputs = [ kconfigwidgets ki18n kio kiconthemes qtx11extras ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kactivities.nix b/pkgs/development/libraries/kde-frameworks-5.15/kactivities.nix new file mode 100644 index 00000000000..3225098f439 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.15/kactivities.nix @@ -0,0 +1,22 @@ +{ kdeFramework, lib, extra-cmake-modules, boost, kcmutils, kconfig +, kcoreaddons, kdbusaddons, kdeclarative, kglobalaccel, ki18n +, kio, kservice, kwindowsystem, kxmlgui, makeQtWrapper, qtdeclarative +}: + +kdeFramework { + name = "kactivities"; + nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ]; + buildInputs = [ + boost kcmutils kconfig kcoreaddons kdbusaddons kservice + kxmlgui + ]; + propagatedBuildInputs = [ + kdeclarative kglobalaccel ki18n kio kwindowsystem qtdeclarative + ]; + postInstall = '' + wrapQtProgram "$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.15/kapidox.nix index 647be8f052c..647be8f052c 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/kapidox.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/kapidox.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.13/karchive.nix b/pkgs/development/libraries/kde-frameworks-5.15/karchive.nix index a8d9a0003c3..a8d9a0003c3 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/karchive.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/karchive.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kauth/default.nix b/pkgs/development/libraries/kde-frameworks-5.15/kauth/default.nix index 42a10019334..42a10019334 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/kauth/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/kauth/default.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.10/kauth/kauth-policy-install.patch b/pkgs/development/libraries/kde-frameworks-5.15/kauth/kauth-policy-install.patch index 340155256f2..340155256f2 100644 --- a/pkgs/development/libraries/kde-frameworks-5.10/kauth/kauth-policy-install.patch +++ b/pkgs/development/libraries/kde-frameworks-5.15/kauth/kauth-policy-install.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kbookmarks.nix b/pkgs/development/libraries/kde-frameworks-5.15/kbookmarks.nix index 1a469ab4db6..1a469ab4db6 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/kbookmarks.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/kbookmarks.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kcmutils/kcmutils-pluginselector-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.15/kcmutils/0001-qdiriterator-follow-symlinks.patch index 47b8dfad180..0d861fa9501 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/kcmutils/kcmutils-pluginselector-follow-symlinks.patch +++ b/pkgs/development/libraries/kde-frameworks-5.15/kcmutils/0001-qdiriterator-follow-symlinks.patch @@ -1,13 +1,25 @@ +From f14d2a275323a47104b33eb61c5b6910ae1a9f59 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel <ttuegel@gmail.com> +Date: Wed, 14 Oct 2015 06:43:53 -0500 +Subject: [PATCH] qdiriterator follow symlinks + +--- + src/kpluginselector.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + diff --git a/src/kpluginselector.cpp b/src/kpluginselector.cpp -index c63241b..2243f94 100644 +index 9c3431d..d6b1ee2 100644 --- a/src/kpluginselector.cpp +++ b/src/kpluginselector.cpp -@@ -304,7 +304,7 @@ void KPluginSelector::addPlugins(const QString &componentName, +@@ -305,7 +305,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); ++ QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); while (it.hasNext()) { desktopFileNames.append(it.next()); } +-- +2.5.2 + diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kcmutils/default.nix b/pkgs/development/libraries/kde-frameworks-5.15/kcmutils/default.nix new file mode 100644 index 00000000000..dbbb783ac61 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.15/kcmutils/default.nix @@ -0,0 +1,17 @@ +{ kdeFramework, lib, extra-cmake-modules, kconfigwidgets +, kcoreaddons, kdeclarative, ki18n, kiconthemes, kitemviews +, kpackage, kservice, kxmlgui +}: + +kdeFramework { + name = "kcmutils"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ + kcoreaddons kiconthemes kitemviews kpackage kxmlgui + ]; + propagatedBuildInputs = [ kconfigwidgets kdeclarative ki18n kservice ]; + patches = [ ./0001-qdiriterator-follow-symlinks.patch ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kcodecs.nix b/pkgs/development/libraries/kde-frameworks-5.15/kcodecs.nix index 53a69a69b69..53a69a69b69 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/kcodecs.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/kcodecs.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kcompletion.nix b/pkgs/development/libraries/kde-frameworks-5.15/kcompletion.nix index e393774f16a..e393774f16a 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/kcompletion.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/kcompletion.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kconfig.nix b/pkgs/development/libraries/kde-frameworks-5.15/kconfig.nix index ce890745767..e132afe5988 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/kconfig.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/kconfig.nix @@ -1,13 +1,14 @@ { kdeFramework, lib , extra-cmake-modules +, makeQtWrapper }: kdeFramework { name = "kconfig"; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ]; postInstall = '' - wrapKDEProgram "$out/bin/kreadconfig5" - wrapKDEProgram "$out/bin/kwriteconfig5" + wrapQtProgram "$out/bin/kreadconfig5" + wrapQtProgram "$out/bin/kwriteconfig5" ''; 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.15/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch index 3bd946cbd84..7a6c0ee9053 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch +++ b/pkgs/development/libraries/kde-frameworks-5.15/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch @@ -1,3 +1,12 @@ +From 4f84780893d505b2d62a14633dd983baa8ec6e28 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel <ttuegel@gmail.com> +Date: Wed, 14 Oct 2015 06:47:01 -0500 +Subject: [PATCH] qdiriterator follow symlinks + +--- + src/khelpclient.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + diff --git a/src/khelpclient.cpp b/src/khelpclient.cpp index 53a331e..80fbb01 100644 --- a/src/khelpclient.cpp @@ -11,3 +20,6 @@ index 53a331e..80fbb01 100644 while (it.hasNext()) { const QString desktopPath(it.next()); KDesktopFile desktopFile(desktopPath); +-- +2.5.2 + diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kconfigwidgets/default.nix b/pkgs/development/libraries/kde-frameworks-5.15/kconfigwidgets/default.nix new file mode 100644 index 00000000000..0e14d06edd3 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.15/kconfigwidgets/default.nix @@ -0,0 +1,17 @@ +{ kdeFramework, lib, extra-cmake-modules, kauth, kcodecs, kconfig +, kdoctools, kguiaddons, ki18n, kwidgetsaddons, makeQtWrapper +}: + +kdeFramework { + name = "kconfigwidgets"; + nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; + buildInputs = [ kguiaddons ]; + propagatedBuildInputs = [ kauth kconfig kcodecs ki18n kwidgetsaddons ]; + patches = [ ./0001-qdiriterator-follow-symlinks.patch ]; + postInstall = '' + wrapQtProgram "$out/bin/preparetips5" + ''; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kcoreaddons.nix b/pkgs/development/libraries/kde-frameworks-5.15/kcoreaddons.nix index 43c21bb51ef..43c21bb51ef 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/kcoreaddons.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/kcoreaddons.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kcrash.nix b/pkgs/development/libraries/kde-frameworks-5.15/kcrash.nix index b919c7ad222..bbab78ccb40 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/kcrash.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/kcrash.nix @@ -8,7 +8,8 @@ kdeFramework { name = "kcrash"; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ kcoreaddons kwindowsystem qtx11extras ]; + buildInputs = [ kcoreaddons ]; + propagatedBuildInputs = [ 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.15/kdbusaddons.nix index eb76e14705e..d2ceab31d14 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/kdbusaddons.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/kdbusaddons.nix @@ -1,14 +1,15 @@ { kdeFramework, lib , extra-cmake-modules +, makeQtWrapper , qtx11extras }: kdeFramework { name = "kdbusaddons"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ qtx11extras ]; + nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ]; + propagatedBuildInputs = [ qtx11extras ]; postInstall = '' - wrapKDEProgram "$out/bin/kquitapp5" + wrapQtProgram "$out/bin/kquitapp5" ''; meta = { maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kdeclarative.nix b/pkgs/development/libraries/kde-frameworks-5.15/kdeclarative.nix new file mode 100644 index 00000000000..74d107466cf --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.15/kdeclarative.nix @@ -0,0 +1,22 @@ +{ kdeFramework, lib, extra-cmake-modules, epoxy, kconfig +, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kpackage +, kwidgetsaddons, kwindowsystem, makeQtWrapper, pkgconfig +, qtdeclarative +}: + +kdeFramework { + name = "kdeclarative"; + nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ]; + buildInputs = [ + epoxy kguiaddons kiconthemes kwidgetsaddons + ]; + propagatedBuildInputs = [ + kconfig kglobalaccel ki18n kio kpackage kwindowsystem qtdeclarative + ]; + postInstall = '' + wrapQtProgram "$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.15/kded.nix index 47ae2d68c68..47ae2d68c68 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/kded.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/kded.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kdelibs4support.nix b/pkgs/development/libraries/kde-frameworks-5.15/kdelibs4support.nix new file mode 100644 index 00000000000..0dd5c415761 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.15/kdelibs4support.nix @@ -0,0 +1,32 @@ +{ 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 kservice kwidgetsaddons + kxmlgui networkmanager qtsvg qtx11extras xlibs.libSM + ]; + propagatedBuildInputs = [ + kauth karchive kconfigwidgets kcoreaddons kcrash kdbusaddons + kdesignerplugin kemoticons kglobalaccel kguiaddons ki18n kio + 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.15/kdesignerplugin.nix index 100d16d64bc..28df2415320 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/kdesignerplugin.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/kdesignerplugin.nix @@ -21,9 +21,10 @@ kdeFramework { nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kcompletion kconfig kconfigwidgets kcoreaddons kdewebkit - kiconthemes kio kitemviews kplotting ktextwidgets kwidgetsaddons - kxmlgui sonnet + kiconthemes kitemviews kplotting ktextwidgets kwidgetsaddons + kxmlgui ]; + propagatedBuildInputs = [ kio 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.15/kdesu.nix index 4503d8bcd10..364fbd6a720 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/kdesu.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/kdesu.nix @@ -1,16 +1,12 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kcoreaddons -, ki18n -, kpty +{ kdeFramework, lib, extra-cmake-modules, kcoreaddons, ki18n, kpty , kservice }: kdeFramework { name = "kdesu"; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ kcoreaddons ki18n kservice ]; - propagatedBuildInputs = [ kpty ]; + buildInputs = [ kcoreaddons kservice ]; + propagatedBuildInputs = [ ki18n kpty ]; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kdewebkit.nix b/pkgs/development/libraries/kde-frameworks-5.15/kdewebkit.nix new file mode 100644 index 00000000000..d361313d1d4 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.15/kdewebkit.nix @@ -0,0 +1,13 @@ +{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons +, ki18n, kio, kjobwidgets, kparts, kservice, kwallet, qtwebkit +}: + +kdeFramework { + name = "kdewebkit"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ kconfig kcoreaddons kjobwidgets kparts kservice kwallet ]; + propagatedBuildInputs = [ ki18n kio 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.15/kdnssd.nix index f00432b0c9c..f00432b0c9c 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/kdnssd.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/kdnssd.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kdoctools/default.nix b/pkgs/development/libraries/kde-frameworks-5.15/kdoctools/default.nix index 0ec13d1a15c..138c3fc33b9 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/kdoctools/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/kdoctools/default.nix @@ -1,18 +1,14 @@ -{ kdeFramework, lib -, extra-cmake-modules -, docbook_xml_dtd_45 -, docbook5_xsl -, karchive -, ki18n -, perl -, perlPackages +{ kdeFramework, lib, extra-cmake-modules, docbook_xml_dtd_45 +, docbook5_xsl, karchive, ki18n, makeQtWrapper, perl, perlPackages }: kdeFramework { name = "kdoctools"; + setupHook = ./setup-hook.sh; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ karchive ki18n ]; - propagatedNativeBuildInputs = [ perl perlPackages.URI ]; + buildInputs = [ karchive ]; + propagatedBuildInputs = [ ki18n ]; + propagatedNativeBuildInputs = [ makeQtWrapper perl perlPackages.URI ]; cmakeFlags = [ "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook" "-DDocBookXSL_DIR=${docbook5_xsl}/xml/xsl/docbook" diff --git a/pkgs/development/libraries/kde-frameworks-5.10/kdoctools/kdoctools-no-find-docbook-xml.patch b/pkgs/development/libraries/kde-frameworks-5.15/kdoctools/kdoctools-no-find-docbook-xml.patch index 4e3a33efab3..4e3a33efab3 100644 --- a/pkgs/development/libraries/kde-frameworks-5.10/kdoctools/kdoctools-no-find-docbook-xml.patch +++ b/pkgs/development/libraries/kde-frameworks-5.15/kdoctools/kdoctools-no-find-docbook-xml.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kdoctools/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.15/kdoctools/setup-hook.sh new file mode 100644 index 00000000000..5cfffbd622d --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.15/kdoctools/setup-hook.sh @@ -0,0 +1,5 @@ +addXdgData() { + addToSearchPath XDG_DATA_DIRS "$1/share" +} + +envHooks+=(addXdgData) diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kemoticons.nix b/pkgs/development/libraries/kde-frameworks-5.15/kemoticons.nix index d165f84e3a2..d165f84e3a2 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/kemoticons.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/kemoticons.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kfilemetadata.nix b/pkgs/development/libraries/kde-frameworks-5.15/kfilemetadata.nix new file mode 100644 index 00000000000..92ca1f26b93 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.15/kfilemetadata.nix @@ -0,0 +1,13 @@ +{ 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 popplerQt taglib ]; + propagatedBuildInputs = [ qtbase ki18n ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kglobalaccel.nix b/pkgs/development/libraries/kde-frameworks-5.15/kglobalaccel.nix index f7c5ea56266..c535b3590a3 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/kglobalaccel.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/kglobalaccel.nix @@ -5,15 +5,17 @@ , kcrash , kdbusaddons , kwindowsystem +, makeQtWrapper , qtx11extras }: kdeFramework { name = "kglobalaccel"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ kconfig kcoreaddons kcrash kdbusaddons kwindowsystem qtx11extras ]; + nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ]; + buildInputs = [ kconfig kcoreaddons kcrash kdbusaddons ]; + propagatedBuildInputs = [ kwindowsystem qtx11extras ]; postInstall = '' - wrapKDEProgram "$out/bin/kglobalaccel5" + wrapQtProgram "$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.15/kguiaddons.nix index bc4e9ab1184..bc4e9ab1184 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/kguiaddons.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/kguiaddons.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.15/khtml.nix b/pkgs/development/libraries/kde-frameworks-5.15/khtml.nix new file mode 100644 index 00000000000..d40df466ebb --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.15/khtml.nix @@ -0,0 +1,21 @@ +{ 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 kiconthemes knotifications kwallet kwidgetsaddons + kxmlgui phonon + ]; + propagatedBuildInputs = [ + kcodecs kglobalaccel ki18n kio kjs kparts ktextwidgets + kwindowsystem qtx11extras sonnet + ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/ki18n.nix b/pkgs/development/libraries/kde-frameworks-5.15/ki18n.nix index 915e3294b46..915e3294b46 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/ki18n.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/ki18n.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kiconthemes.nix b/pkgs/development/libraries/kde-frameworks-5.15/kiconthemes.nix new file mode 100644 index 00000000000..02b516afedc --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.15/kiconthemes.nix @@ -0,0 +1,13 @@ +{ kdeFramework, lib, extra-cmake-modules, kconfigwidgets, ki18n +, kitemviews, qtsvg +}: + +kdeFramework { + name = "kiconthemes"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ kconfigwidgets kitemviews qtsvg ]; + propagatedBuildInputs = [ ki18n ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kidletime.nix b/pkgs/development/libraries/kde-frameworks-5.15/kidletime.nix index fc086560023..fc086560023 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/kidletime.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/kidletime.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kimageformats.nix b/pkgs/development/libraries/kde-frameworks-5.15/kimageformats.nix index 49d66bbcc2c..49d66bbcc2c 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/kimageformats.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/kimageformats.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.10/kinit/0001-kinit-libpath.patch b/pkgs/development/libraries/kde-frameworks-5.15/kinit/0001-kinit-libpath.patch index 9c76079a382..9c76079a382 100644 --- a/pkgs/development/libraries/kde-frameworks-5.10/kinit/0001-kinit-libpath.patch +++ b/pkgs/development/libraries/kde-frameworks-5.15/kinit/0001-kinit-libpath.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kinit/default.nix b/pkgs/development/libraries/kde-frameworks-5.15/kinit/default.nix index 47f1aec72de..5f644d7c424 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/kinit/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/kinit/default.nix @@ -1,13 +1,5 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kconfig -, kcrash -, kdoctools -, ki18n -, kio -, kservice -, kwindowsystem -, libcap +{ kdeFramework, lib, extra-cmake-modules, kconfig, kcrash +, kdoctools, ki18n, kio, kservice, kwindowsystem, libcap , libcap_progs }: @@ -16,7 +8,8 @@ kdeFramework { name = "kinit"; nativeBuildInputs = [ extra-cmake-modules kdoctools libcap_progs ]; - buildInputs = [ kconfig kcrash ki18n kio kservice kwindowsystem libcap ]; + buildInputs = [ kconfig kcrash kservice libcap ]; + propagatedBuildInputs = [ ki18n kio kwindowsystem ]; patches = [ ./0001-kinit-libpath.patch ]; meta = { maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kio.nix b/pkgs/development/libraries/kde-frameworks-5.15/kio.nix new file mode 100644 index 00000000000..0789828d812 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.15/kio.nix @@ -0,0 +1,30 @@ +{ 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, makeQtWrapper +, qtscript, qtx11extras, solid +}: + +kdeFramework { + name = "kio"; + nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; + buildInputs = [ + acl karchive kconfig kcoreaddons kdbusaddons kiconthemes + knotifications ktextwidgets kwallet kwidgetsaddons + qtscript + ]; + propagatedBuildInputs = [ + kbookmarks kcompletion kconfigwidgets ki18n kitemviews kjobwidgets + kservice kwindowsystem kxmlgui solid qtx11extras + ]; + postInstall = '' + wrapQtProgram "$out/bin/kcookiejar5" + wrapQtProgram "$out/bin/ktelnetservice5" + wrapQtProgram "$out/bin/ktrash5" + wrapQtProgram "$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.15/kitemmodels.nix index a9024d771cc..a9024d771cc 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/kitemmodels.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/kitemmodels.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kitemviews.nix b/pkgs/development/libraries/kde-frameworks-5.15/kitemviews.nix index 931019ce495..931019ce495 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/kitemviews.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/kitemviews.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kjobwidgets.nix b/pkgs/development/libraries/kde-frameworks-5.15/kjobwidgets.nix index c3f1d37f858..746edf12eea 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/kjobwidgets.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/kjobwidgets.nix @@ -8,7 +8,8 @@ kdeFramework { name = "kjobwidgets"; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ kcoreaddons kwidgetsaddons qtx11extras ]; + buildInputs = [ kcoreaddons kwidgetsaddons ]; + propagatedBuildInputs = [ 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.15/kjs.nix index 902674d49b7..768720f178c 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/kjs.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/kjs.nix @@ -1,13 +1,14 @@ { kdeFramework, lib , extra-cmake-modules , kdoctools +, makeQtWrapper }: kdeFramework { name = "kjs"; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; postInstall = '' - wrapKDEProgram "$out/bin/kjs5" + wrapQtProgram "$out/bin/kjs5" ''; meta = { maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kjsembed.nix b/pkgs/development/libraries/kde-frameworks-5.15/kjsembed.nix new file mode 100644 index 00000000000..22eef2d47bd --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.15/kjsembed.nix @@ -0,0 +1,17 @@ +{ kdeFramework, lib, extra-cmake-modules, kdoctools, ki18n, kjs +, makeQtWrapper, qtsvg +}: + +kdeFramework { + name = "kjsembed"; + nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; + buildInputs = [ qtsvg ]; + propagatedBuildInputs = [ ki18n kjs ]; + postInstall = '' + wrapQtProgram "$out/bin/kjscmd5" + wrapQtProgram "$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.15/kmediaplayer.nix index 460458b2232..460458b2232 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/kmediaplayer.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/kmediaplayer.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.15/knewstuff.nix b/pkgs/development/libraries/kde-frameworks-5.15/knewstuff.nix new file mode 100644 index 00000000000..5bcd6f30146 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.15/knewstuff.nix @@ -0,0 +1,17 @@ +{ 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 kiconthemes + kitemviews ktextwidgets kwidgetsaddons + ]; + propagatedBuildInputs = [ attica ki18n kio 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.15/knotifications.nix index f3aa29f018c..7e301dd0f26 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/knotifications.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/knotifications.nix @@ -12,9 +12,9 @@ kdeFramework { name = "knotifications"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ - kcodecs kconfig kcoreaddons kwindowsystem - phonon qtx11extras + kcodecs kconfig kcoreaddons phonon ]; + propagatedBuildInputs = [ kwindowsystem qtx11extras ]; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; diff --git a/pkgs/development/libraries/kde-frameworks-5.15/knotifyconfig.nix b/pkgs/development/libraries/kde-frameworks-5.15/knotifyconfig.nix new file mode 100644 index 00000000000..dd99d2d4f1e --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.15/knotifyconfig.nix @@ -0,0 +1,13 @@ +{ kdeFramework, lib, extra-cmake-modules, kcompletion, kconfig +, ki18n, kio, phonon +}: + +kdeFramework { + name = "knotifyconfig"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ kcompletion kconfig phonon ]; + propagatedBuildInputs = [ ki18n kio ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.12/kpackage/0001-allow-external-paths.patch b/pkgs/development/libraries/kde-frameworks-5.15/kpackage/0001-allow-external-paths.patch index 440e979c008..beede4d7ccb 100644 --- a/pkgs/development/libraries/kde-frameworks-5.12/kpackage/0001-allow-external-paths.patch +++ b/pkgs/development/libraries/kde-frameworks-5.15/kpackage/0001-allow-external-paths.patch @@ -1,17 +1,17 @@ -From fbf10d2059fa1f19a0f0cfa2fda0abb6c435fa78 Mon Sep 17 00:00:00 2001 +From a92ac391b4e6ca335bd7fa78f1addd23c9467931 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel <ttuegel@gmail.com> Date: Wed, 28 Jan 2015 07:15:30 -0600 -Subject: [PATCH] allow external paths +Subject: [PATCH 1/2] allow external paths --- src/kpackage/package.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/kpackage/package.cpp b/src/kpackage/package.cpp -index eb4a09b..f70f1a1 100644 +index 539b21a..977a026 100644 --- a/src/kpackage/package.cpp +++ b/src/kpackage/package.cpp -@@ -758,7 +758,7 @@ PackagePrivate::PackagePrivate() +@@ -789,7 +789,7 @@ PackagePrivate::PackagePrivate() : QSharedData(), fallbackPackage(0), metadata(0), @@ -21,5 +21,5 @@ index eb4a09b..f70f1a1 100644 checkedValid(false) { -- -2.1.4 +2.5.2 diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kpackage/0002-qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.15/kpackage/0002-qdiriterator-follow-symlinks.patch new file mode 100644 index 00000000000..6e93fca9b21 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.15/kpackage/0002-qdiriterator-follow-symlinks.patch @@ -0,0 +1,39 @@ +From 9fc26c3c0478eb7cb0a531836ba2e3a85d820c88 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel <ttuegel@gmail.com> +Date: Wed, 14 Oct 2015 06:50:28 -0500 +Subject: [PATCH 2/2] qdiriterator follow symlinks + +--- + src/kpackage/packageloader.cpp | 2 +- + src/kpackage/private/packagejobthread.cpp | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/kpackage/packageloader.cpp b/src/kpackage/packageloader.cpp +index eb5ed47..94217f6 100644 +--- a/src/kpackage/packageloader.cpp ++++ b/src/kpackage/packageloader.cpp +@@ -241,7 +241,7 @@ QList<KPluginMetaData> PackageLoader::listPackages(const QString &packageFormat, + } else { + //qDebug() << "Not cached"; + // If there's no cache file, fall back to listing the directory +- const QDirIterator::IteratorFlags flags = QDirIterator::Subdirectories; ++ const QDirIterator::IteratorFlags flags = QDirIterator::Subdirectories | QDirIterator::FollowSymlinks; + const QStringList nameFilters = QStringList(QStringLiteral("metadata.desktop")); + + QDirIterator it(plugindir, nameFilters, QDir::Files, flags); +diff --git a/src/kpackage/private/packagejobthread.cpp b/src/kpackage/private/packagejobthread.cpp +index ca523b3..1cfa792 100644 +--- a/src/kpackage/private/packagejobthread.cpp ++++ b/src/kpackage/private/packagejobthread.cpp +@@ -145,7 +145,7 @@ bool indexDirectory(const QString& dir, const QString& dest) + QJsonArray plugins; + + int i = 0; +- QDirIterator it(dir, QStringList()<<QStringLiteral("*.desktop"), QDir::Files, QDirIterator::Subdirectories); ++ QDirIterator it(dir, QStringList()<<QStringLiteral("*.desktop"), QDir::Files, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); + while (it.hasNext()) { + it.next(); + const QString path = it.fileInfo().absoluteFilePath(); +-- +2.5.2 + diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kpackage/default.nix b/pkgs/development/libraries/kde-frameworks-5.15/kpackage/default.nix new file mode 100644 index 00000000000..d2dc262bf1a --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.15/kpackage/default.nix @@ -0,0 +1,26 @@ +{ kdeFramework, lib +, extra-cmake-modules +, karchive +, kconfig +, kcoreaddons +, kdoctools +, ki18n +, makeQtWrapper +}: + +kdeFramework { + name = "kpackage"; + nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; + buildInputs = [ karchive kconfig ]; + propagatedBuildInputs = [ kcoreaddons ki18n ]; + patches = [ + ./0001-allow-external-paths.patch + ./0002-qdiriterator-follow-symlinks.patch + ]; + postInstall = '' + wrapQtProgram "$out/bin/kpackagetool5" + ''; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kparts.nix b/pkgs/development/libraries/kde-frameworks-5.15/kparts.nix new file mode 100644 index 00000000000..1c3e0b2cbc5 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.15/kparts.nix @@ -0,0 +1,17 @@ +{ 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 kiconthemes kjobwidgets knotifications + kservice kwidgetsaddons + ]; + propagatedBuildInputs = [ ki18n kio ktextwidgets kxmlgui ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kpeople.nix b/pkgs/development/libraries/kde-frameworks-5.15/kpeople.nix new file mode 100644 index 00000000000..4c3877e7efd --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.15/kpeople.nix @@ -0,0 +1,15 @@ +{ kdeFramework, lib, extra-cmake-modules, kcoreaddons, ki18n +, kitemviews, kservice, kwidgetsaddons, qtdeclarative +}: + +kdeFramework { + name = "kpeople"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ + kcoreaddons kitemviews kservice kwidgetsaddons + ]; + propagatedBuildInputs = [ ki18n 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.15/kplotting.nix index c16f51b5ac3..c16f51b5ac3 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/kplotting.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/kplotting.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kpty.nix b/pkgs/development/libraries/kde-frameworks-5.15/kpty.nix index 72ac842a00a..2e34e6f674c 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/kpty.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/kpty.nix @@ -1,14 +1,9 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kcoreaddons -, ki18n -}: +{ kdeFramework, lib, extra-cmake-modules, kcoreaddons, ki18n }: kdeFramework { name = "kpty"; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ ki18n ]; - propagatedBuildInputs = [ kcoreaddons ]; + propagatedBuildInputs = [ kcoreaddons ki18n ]; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kross.nix b/pkgs/development/libraries/kde-frameworks-5.15/kross.nix index ca14e9827e2..7c6f079feaa 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/kross.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/kross.nix @@ -1,15 +1,6 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kcompletion -, kcoreaddons -, kdoctools -, ki18n -, kiconthemes -, kio -, kparts -, kwidgetsaddons -, kxmlgui -, qtscript +{ kdeFramework, lib, extra-cmake-modules, kcompletion, kcoreaddons +, kdoctools, ki18n, kiconthemes, kio, kparts, kwidgetsaddons +, kxmlgui, qtscript }: kdeFramework { diff --git a/pkgs/development/libraries/kde-frameworks-5.15/krunner.nix b/pkgs/development/libraries/kde-frameworks-5.15/krunner.nix new file mode 100644 index 00000000000..12d2b54d0eb --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.15/krunner.nix @@ -0,0 +1,16 @@ +{ 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 kservice qtquick1 solid threadweaver + ]; + propagatedBuildInputs = [ ki18n kio plasma-framework ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kservice/0001-qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.15/kservice/0001-qdiriterator-follow-symlinks.patch new file mode 100644 index 00000000000..3d8397d8ee2 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.15/kservice/0001-qdiriterator-follow-symlinks.patch @@ -0,0 +1,25 @@ +From ae8919eb81abad369e4a26ffcd845b140983398d Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel <ttuegel@gmail.com> +Date: Wed, 14 Oct 2015 06:28:57 -0500 +Subject: [PATCH 1/2] qdiriterator follow symlinks + +--- + src/sycoca/kbuildsycoca.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/sycoca/kbuildsycoca.cpp b/src/sycoca/kbuildsycoca.cpp +index 1deae14..250baa8 100644 +--- a/src/sycoca/kbuildsycoca.cpp ++++ b/src/sycoca/kbuildsycoca.cpp +@@ -208,7 +208,7 @@ bool KBuildSycoca::build() + QStringList relFiles; + const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, m_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... +-- +2.5.2 + diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kservice/0002-no-canonicalize-path.patch b/pkgs/development/libraries/kde-frameworks-5.15/kservice/0002-no-canonicalize-path.patch new file mode 100644 index 00000000000..685c6852611 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.15/kservice/0002-no-canonicalize-path.patch @@ -0,0 +1,25 @@ +From 46d124da602d84b7611a7ff0ac0862168d451cdb Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel <ttuegel@gmail.com> +Date: Wed, 14 Oct 2015 06:31:29 -0500 +Subject: [PATCH 2/2] no canonicalize path + +--- + src/sycoca/vfolder_menu.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/sycoca/vfolder_menu.cpp b/src/sycoca/vfolder_menu.cpp +index d3e31c3..d15d743 100644 +--- a/src/sycoca/vfolder_menu.cpp ++++ b/src/sycoca/vfolder_menu.cpp +@@ -415,7 +415,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; + } +-- +2.5.2 + diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kservice/default.nix b/pkgs/development/libraries/kde-frameworks-5.15/kservice/default.nix new file mode 100644 index 00000000000..03b7c7c2f51 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.15/kservice/default.nix @@ -0,0 +1,19 @@ +{ 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 = [ kcrash kdbusaddons ]; + propagatedBuildInputs = [ kconfig kcoreaddons ki18n kwindowsystem ]; + propagatedUserEnvPkgs = [ kcoreaddons ]; + patches = [ + ./0001-qdiriterator-follow-symlinks.patch + ./0002-no-canonicalize-path.patch + ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kservice/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.15/kservice/setup-hook.sh new file mode 100644 index 00000000000..c28e862ff8a --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.15/kservice/setup-hook.sh @@ -0,0 +1,43 @@ +addServicePkg() { + local propagated + for dir in "share/kservices5" "share/kservicetypes5"; do + if [[ -d "$1/$dir" ]]; then + propagated= + for pkg in $propagatedBuildInputs; do + if [[ "z$pkg" == "z$1" ]]; then + propagated=1 + break + fi + done + if [[ -z $propagated ]]; then + propagatedBuildInputs="$propagatedBuildInputs $1" + fi + + propagated= + for pkg in $propagatedUserEnvPkgs; do + if [[ "z$pkg" == "z$1" ]]; then + propagated=1 + break + fi + done + if [[ -z $propagated ]]; then + propagatedUserEnvPkgs="$propagatedUserEnvPkgs $1" + fi + + break + fi + done +} + +envHooks+=(addServicePkg) + +local propagated +for pkg in $propagatedBuildInputs; do + if [[ "z$pkg" == "z@out@" ]]; then + propagated=1 + break + fi +done +if [[ -z $propagated ]]; then + propagatedBuildInputs="$propagatedBuildInputs @out@" +fi diff --git a/pkgs/development/libraries/kde-frameworks-5.13/ktexteditor/0001-no-qcoreapplication.patch b/pkgs/development/libraries/kde-frameworks-5.15/ktexteditor/0001-no-qcoreapplication.patch index c2e77a537c5..def55bff9b2 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/ktexteditor/0001-no-qcoreapplication.patch +++ b/pkgs/development/libraries/kde-frameworks-5.15/ktexteditor/0001-no-qcoreapplication.patch @@ -1,6 +1,6 @@ -From 71e28c7c6fdd1142f04c662f45cc8f779e457cda Mon Sep 17 00:00:00 2001 +From dc50fffdc72b76498384ce2f9065c3757b786d71 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel <ttuegel@gmail.com> -Date: Sun, 15 Feb 2015 19:09:17 -0600 +Date: Wed, 14 Oct 2015 09:08:59 -0500 Subject: [PATCH] no qcoreapplication --- @@ -8,16 +8,16 @@ Subject: [PATCH] no qcoreapplication 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 +index 3c63140..e3d5efe 100644 --- a/src/syntax/data/katehighlightingindexer.cpp +++ b/src/syntax/data/katehighlightingindexer.cpp -@@ -49,19 +49,16 @@ QStringList readListing(const QString &fileName) +@@ -51,19 +51,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) @@ -34,9 +34,9 @@ index 3f02e8c..d1a865b 100644 if (hlFilenamesListing.isEmpty()) { return 1; } -@@ -127,7 +124,7 @@ int main(int argc, char *argv[]) +@@ -147,7 +144,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])); @@ -44,5 +44,5 @@ index 3f02e8c..d1a865b 100644 return 7; -- -2.1.4 +2.5.2 diff --git a/pkgs/development/libraries/kde-frameworks-5.15/ktexteditor/default.nix b/pkgs/development/libraries/kde-frameworks-5.15/ktexteditor/default.nix new file mode 100644 index 00000000000..39092fbb278 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.15/ktexteditor/default.nix @@ -0,0 +1,18 @@ +{ kdeFramework, lib, extra-cmake-modules, karchive, kconfig +, kguiaddons, ki18n, kio, kiconthemes, kparts, perl, qtscript +, qtxmlpatterns, sonnet +}: + +kdeFramework { + name = "ktexteditor"; + nativeBuildInputs = [ extra-cmake-modules perl ]; + buildInputs = [ + karchive kconfig kguiaddons kiconthemes kparts qtscript + qtxmlpatterns + ]; + propagatedBuildInputs = [ ki18n kio sonnet ]; + patches = [ ./0001-no-qcoreapplication.patch ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.15/ktextwidgets.nix b/pkgs/development/libraries/kde-frameworks-5.15/ktextwidgets.nix new file mode 100644 index 00000000000..e332d4ff9a8 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.15/ktextwidgets.nix @@ -0,0 +1,16 @@ +{ 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 + ]; + propagatedBuildInputs = [ ki18n kwindowsystem 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.15/kunitconversion.nix index 6c6a4caeb98..3cf0f847d83 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/kunitconversion.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/kunitconversion.nix @@ -1,12 +1,9 @@ -{ kdeFramework, lib -, extra-cmake-modules -, ki18n -}: +{ kdeFramework, lib, extra-cmake-modules, ki18n }: kdeFramework { name = "kunitconversion"; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ ki18n ]; + propagatedBuildInputs = [ ki18n ]; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kwallet.nix b/pkgs/development/libraries/kde-frameworks-5.15/kwallet.nix new file mode 100644 index 00000000000..7c4177e009d --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.15/kwallet.nix @@ -0,0 +1,21 @@ +{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons +, kdbusaddons, kdoctools, ki18n, kiconthemes, knotifications +, kservice, kwidgetsaddons, kwindowsystem, libgcrypt, makeQtWrapper +}: + +kdeFramework { + name = "kwallet"; + nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; + buildInputs = [ + kconfig kcoreaddons kdbusaddons kiconthemes knotifications + kservice kwidgetsaddons libgcrypt + ]; + propagatedBuildInputs = [ ki18n kwindowsystem ]; + postInstall = '' + wrapQtProgram "$out/bin/kwalletd5" + wrapQtProgram "$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.15/kwidgetsaddons.nix index d95f44d3fec..d95f44d3fec 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/kwidgetsaddons.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/kwidgetsaddons.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kwindowsystem.nix b/pkgs/development/libraries/kde-frameworks-5.15/kwindowsystem.nix index 09ab1f2200d..09ab1f2200d 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/kwindowsystem.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/kwindowsystem.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kxmlgui.nix b/pkgs/development/libraries/kde-frameworks-5.15/kxmlgui.nix new file mode 100644 index 00000000000..b3b8b39932d --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.15/kxmlgui.nix @@ -0,0 +1,17 @@ +{ 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 kiconthemes kitemviews + ktextwidgets + ]; + propagatedBuildInputs = [ kglobalaccel ki18n 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.15/kxmlrpcclient.nix index b28c00a33be..20a300b68bc 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/kxmlrpcclient.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/kxmlrpcclient.nix @@ -1,14 +1,9 @@ -{ kdeFramework, lib -, extra-cmake-modules -, ki18n -, kio -}: +{ kdeFramework, lib, extra-cmake-modules, ki18n, kio }: kdeFramework { name = "kxmlrpcclient"; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ ki18n ]; - propagatedBuildInputs = [ kio ]; + propagatedBuildInputs = [ ki18n 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.15/modemmanager-qt.nix index 7d7f769d6a9..7d7f769d6a9 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/modemmanager-qt.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/modemmanager-qt.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.13/networkmanager-qt.nix b/pkgs/development/libraries/kde-frameworks-5.15/networkmanager-qt.nix index 333378bd143..333378bd143 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/networkmanager-qt.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/networkmanager-qt.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.15/plasma-framework/default.nix b/pkgs/development/libraries/kde-frameworks-5.15/plasma-framework/default.nix new file mode 100644 index 00000000000..d8846f77723 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.15/plasma-framework/default.nix @@ -0,0 +1,25 @@ +{ kdeFramework, lib, extra-cmake-modules, kactivities, karchive +, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative +, kdoctools, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio +, knotifications, kpackage, kservice, kwindowsystem, kxmlgui +, makeQtWrapper, qtscript, qtx11extras +}: + +kdeFramework { + name = "plasma-framework"; + nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; + buildInputs = [ + karchive kconfig kconfigwidgets kcoreaddons kdbusaddons kguiaddons + kiconthemes knotifications kxmlgui qtscript + ]; + propagatedBuildInputs = [ + kactivities kdeclarative kglobalaccel ki18n kio kpackage kservice kwindowsystem + qtx11extras + ]; + postInstall = '' + wrapQtProgram "$out/bin/plasmapkg2" + ''; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.15/solid.nix b/pkgs/development/libraries/kde-frameworks-5.15/solid.nix new file mode 100644 index 00000000000..afd125e3c59 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.15/solid.nix @@ -0,0 +1,17 @@ +{ kdeFramework, lib +, extra-cmake-modules +, makeQtWrapper +, qtdeclarative +}: + +kdeFramework { + name = "solid"; + nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ]; + buildInputs = [ qtdeclarative ]; + postInstall = '' + wrapQtProgram "$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.15/sonnet.nix index 943fe04a1c9..943fe04a1c9 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/sonnet.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/sonnet.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.15/srcs.nix b/pkgs/development/libraries/kde-frameworks-5.15/srcs.nix new file mode 100644 index 00000000000..fd4998c49ba --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.15/srcs.nix @@ -0,0 +1,549 @@ +# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh +{ fetchurl, mirror }: + +{ + attica = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/attica-5.15.0.tar.xz"; + sha256 = "0gddapcl2m5gds8f341z0954qlllx22xbd51649lri429aw2ijcl"; + name = "attica-5.15.0.tar.xz"; + }; + }; + baloo = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/baloo-5.15.0.tar.xz"; + sha256 = "10qwxljzhl8wagfmvdbrmqlzk68jkrp703d232fr7gvz3qrmdpbz"; + name = "baloo-5.15.0.tar.xz"; + }; + }; + bluez-qt = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/bluez-qt-5.15.0.tar.xz"; + sha256 = "15k242ifj3mfy0g0v7h504zn07cvahc70whc6n9yr0091j1azf5f"; + name = "bluez-qt-5.15.0.tar.xz"; + }; + }; + extra-cmake-modules = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/extra-cmake-modules-5.15.0.tar.xz"; + sha256 = "1g02dcbx1r0n2skrhmc6d3pckqvbii7ai91chlkwcdd8vzd4lgcg"; + name = "extra-cmake-modules-5.15.0.tar.xz"; + }; + }; + frameworkintegration = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/frameworkintegration-5.15.0.tar.xz"; + sha256 = "06sacinx3g3hrs11v67k7j8ddp5swasjrw6x36ng3mr81i2ksyia"; + name = "frameworkintegration-5.15.0.tar.xz"; + }; + }; + kactivities = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/kactivities-5.15.0.tar.xz"; + sha256 = "0h9f78f8r5z5jarxph168h1m0zvz2zhd8iq6gc9sg09044xn1lnq"; + name = "kactivities-5.15.0.tar.xz"; + }; + }; + kapidox = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/kapidox-5.15.0.tar.xz"; + sha256 = "1342j7459rafz1ns0nnlh1i65c05cd6l3c4sh1j75qgl0pjnrvcq"; + name = "kapidox-5.15.0.tar.xz"; + }; + }; + karchive = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/karchive-5.15.0.tar.xz"; + sha256 = "1s5mggi0vydg9w589qk4fp4qbhj7h9wcczn6k7j41bcqdapxzdfh"; + name = "karchive-5.15.0.tar.xz"; + }; + }; + kauth = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/kauth-5.15.0.tar.xz"; + sha256 = "1nhrfbfasmg8a9gj94ri5qcvrdhhb204miv3i5y59ma09hd1xag2"; + name = "kauth-5.15.0.tar.xz"; + }; + }; + kbookmarks = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/kbookmarks-5.15.0.tar.xz"; + sha256 = "1y21679a37lspwf02vy687k5najap18x7hxd8k8hssdivjvg43z8"; + name = "kbookmarks-5.15.0.tar.xz"; + }; + }; + kcmutils = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/kcmutils-5.15.0.tar.xz"; + sha256 = "0syk030b89z90aa85d1mlag613yaajipgfxxfxnp3f488s54qn6z"; + name = "kcmutils-5.15.0.tar.xz"; + }; + }; + kcodecs = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/kcodecs-5.15.0.tar.xz"; + sha256 = "1kz8vbxblzf0lxcn6c2433lhgi2iyvqsm65qxsvf5zgxckq5277p"; + name = "kcodecs-5.15.0.tar.xz"; + }; + }; + kcompletion = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/kcompletion-5.15.0.tar.xz"; + sha256 = "1mq110fg30y3xdmjicckysz3k5ylz92hz609ffjnm2svk56w5cny"; + name = "kcompletion-5.15.0.tar.xz"; + }; + }; + kconfig = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/kconfig-5.15.0.tar.xz"; + sha256 = "083g4pr5sbqvpdn3ic3afbjzvczxl095rj0pi34g2b28anpwhjvn"; + name = "kconfig-5.15.0.tar.xz"; + }; + }; + kconfigwidgets = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/kconfigwidgets-5.15.0.tar.xz"; + sha256 = "0gkq7ifgyf7865ypxf4cwqkndn4qrp07k8wxp8fl0xa15d74nrj3"; + name = "kconfigwidgets-5.15.0.tar.xz"; + }; + }; + kcoreaddons = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/kcoreaddons-5.15.0.tar.xz"; + sha256 = "1v06bblxrxcwj9sbsz7xvqq6yg231m939pms8w0bbmyidsq4vpdm"; + name = "kcoreaddons-5.15.0.tar.xz"; + }; + }; + kcrash = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/kcrash-5.15.0.tar.xz"; + sha256 = "1631wmg895bb4ls2mfxnlnffmzl1mjm82ad8fk361gv0s9g0xb3y"; + name = "kcrash-5.15.0.tar.xz"; + }; + }; + kdbusaddons = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/kdbusaddons-5.15.0.tar.xz"; + sha256 = "1w32ra4ifhb2k2k2j3dfqrrc65w0rsmj9yr34k0flqiqs0mq1pfx"; + name = "kdbusaddons-5.15.0.tar.xz"; + }; + }; + kdeclarative = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/kdeclarative-5.15.0.tar.xz"; + sha256 = "06xv552v52zp9qb5v6w3cps9nm3wpacpjvm8s08zmij1y7by0z32"; + name = "kdeclarative-5.15.0.tar.xz"; + }; + }; + kded = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/kded-5.15.0.tar.xz"; + sha256 = "144lfjx6gmbhqqwdv4ll1ab4rj3pcyn8bp9yp4snzh6v2a2hncwq"; + name = "kded-5.15.0.tar.xz"; + }; + }; + kdelibs4support = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/portingAids/kdelibs4support-5.15.0.tar.xz"; + sha256 = "1091nc3rrcq360sillynvmxwvmd209cnlql6g9x249zdxjpv62qy"; + name = "kdelibs4support-5.15.0.tar.xz"; + }; + }; + kdesignerplugin = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/kdesignerplugin-5.15.0.tar.xz"; + sha256 = "0my6x0fx72dk65z6lajn1faxifc622msvll6jab0rk50x8ws9dwq"; + name = "kdesignerplugin-5.15.0.tar.xz"; + }; + }; + kdesu = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/kdesu-5.15.0.tar.xz"; + sha256 = "0cnqd0gm5xyqsqngl0x6rs0f01bilcfv8xx1ry9hfnqffv9amr9y"; + name = "kdesu-5.15.0.tar.xz"; + }; + }; + kdewebkit = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/kdewebkit-5.15.0.tar.xz"; + sha256 = "1cgwhb5nr6g6y3azp2ii0hdjlvwacdr94ldlsirqmzl7rymkgkqa"; + name = "kdewebkit-5.15.0.tar.xz"; + }; + }; + kdnssd = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/kdnssd-5.15.0.tar.xz"; + sha256 = "1z5d26pmc9vmf30zz35kcl585fpjfrp8xf5r13lfwnnbfr6pnh0k"; + name = "kdnssd-5.15.0.tar.xz"; + }; + }; + kdoctools = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/kdoctools-5.15.0.tar.xz"; + sha256 = "0vci37val64ixcz7zr99gzdqlb0ff04gdj2kad5dj32295iixhva"; + name = "kdoctools-5.15.0.tar.xz"; + }; + }; + kemoticons = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/kemoticons-5.15.0.tar.xz"; + sha256 = "0a3izq6w3w37qd6b6w2g179w9nrh5pwh8hnc4iggyr2wwf2hfw9c"; + name = "kemoticons-5.15.0.tar.xz"; + }; + }; + kfilemetadata = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/kfilemetadata-5.15.0.tar.xz"; + sha256 = "1y90azm27mnw2wfilwmg1gls21fpnd2nzvdl26vrhpsvnclf8rqn"; + name = "kfilemetadata-5.15.0.tar.xz"; + }; + }; + kglobalaccel = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/kglobalaccel-5.15.0.tar.xz"; + sha256 = "1ii7bd1rf038zjimz7nd2snfi76drqdnyrkivwd6np4fdvcsyhjr"; + name = "kglobalaccel-5.15.0.tar.xz"; + }; + }; + kguiaddons = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/kguiaddons-5.15.0.tar.xz"; + sha256 = "0pfcns136i0ghk32gyr7nnq7wnk2j8rmcr3jr18f1y9pkk3ih6q8"; + name = "kguiaddons-5.15.0.tar.xz"; + }; + }; + khtml = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/portingAids/khtml-5.15.0.tar.xz"; + sha256 = "01gx1qd7hhvyhzndin8kw9yg3jlz8rz7i8kxbl6wpab9sc270a70"; + name = "khtml-5.15.0.tar.xz"; + }; + }; + ki18n = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/ki18n-5.15.0.tar.xz"; + sha256 = "0qy7nv4ssjbyskjhnx8sr6vg9jwg183f6zd759rzp56pz5j79qdd"; + name = "ki18n-5.15.0.tar.xz"; + }; + }; + kiconthemes = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/kiconthemes-5.15.0.tar.xz"; + sha256 = "0ab9iki3jl4izzjph9bps04w7grimyyaaxsna6j0dzg90izg1zg2"; + name = "kiconthemes-5.15.0.tar.xz"; + }; + }; + kidletime = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/kidletime-5.15.0.tar.xz"; + sha256 = "0gp6grv6a9zb14yfrznwn5ih1946v500zlj5g9s8f1xw5p0792i2"; + name = "kidletime-5.15.0.tar.xz"; + }; + }; + kimageformats = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/kimageformats-5.15.0.tar.xz"; + sha256 = "0q66w91khj4xax4nzak5r9wmr0qny5cq7dapv11zdzn7rf90bpvv"; + name = "kimageformats-5.15.0.tar.xz"; + }; + }; + kinit = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/kinit-5.15.0.tar.xz"; + sha256 = "0ccf2rg6m74xj7mq4i0fsl09l2wkwyhmlfp3lvrn4714w19bj5yf"; + name = "kinit-5.15.0.tar.xz"; + }; + }; + kio = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/kio-5.15.0.tar.xz"; + sha256 = "0ld56arcjms5kiz9zj3g7hgd6xq05zg2bx0qpr4aaihl3hgp6888"; + name = "kio-5.15.0.tar.xz"; + }; + }; + kitemmodels = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/kitemmodels-5.15.0.tar.xz"; + sha256 = "112a8mdxabzv7lhpxfnnz2jrib972lz6ww7gd92lqziprz78fyga"; + name = "kitemmodels-5.15.0.tar.xz"; + }; + }; + kitemviews = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/kitemviews-5.15.0.tar.xz"; + sha256 = "1112x7lf0wvwsizcr2ij0w463cssg0ahcav872g39gzirf67lqyi"; + name = "kitemviews-5.15.0.tar.xz"; + }; + }; + kjobwidgets = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/kjobwidgets-5.15.0.tar.xz"; + sha256 = "12r3j1bwvmacj70dng4g5yrgjgj4v8nizk4yf22dfy858k8v8zda"; + name = "kjobwidgets-5.15.0.tar.xz"; + }; + }; + kjs = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/portingAids/kjs-5.15.0.tar.xz"; + sha256 = "1aj9w8009q8bdq17ckjr1z219qy4wkjwc5xggl1879haqxn1pfg3"; + name = "kjs-5.15.0.tar.xz"; + }; + }; + kjsembed = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/portingAids/kjsembed-5.15.0.tar.xz"; + sha256 = "099m6k6m6imy7jdia822i1g6c61gp955w21m4bb5nndwdy580mj4"; + name = "kjsembed-5.15.0.tar.xz"; + }; + }; + kmediaplayer = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/portingAids/kmediaplayer-5.15.0.tar.xz"; + sha256 = "1rli98klmizwmmwwn6lcna7vxihd7b5yrvshisw6ivb21ygjgrxm"; + name = "kmediaplayer-5.15.0.tar.xz"; + }; + }; + knewstuff = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/knewstuff-5.15.0.tar.xz"; + sha256 = "0s8ha0qqy007kq1k55mii5msbqxnczb57xici3in1idxjd83fjnw"; + name = "knewstuff-5.15.0.tar.xz"; + }; + }; + knotifications = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/knotifications-5.15.0.tar.xz"; + sha256 = "1189xx9a5i932lfyniqnz43gl3hhjlg962j996zy0g9yasc2r3cm"; + name = "knotifications-5.15.0.tar.xz"; + }; + }; + knotifyconfig = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/knotifyconfig-5.15.0.tar.xz"; + sha256 = "0b279z1qwfhj2mnpil0jd3xs8yn4i8mvib8dws6q4nygl941b8sa"; + name = "knotifyconfig-5.15.0.tar.xz"; + }; + }; + kpackage = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/kpackage-5.15.0.tar.xz"; + sha256 = "03zcnqly2pb67pza9xm9n0asjixqicxwj5vnv25yvki02cgwmvn3"; + name = "kpackage-5.15.0.tar.xz"; + }; + }; + kparts = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/kparts-5.15.0.tar.xz"; + sha256 = "0pjfmb97387kvvn7c4xzmxdja2jghx946ima5g8jnfw0zacsd2mw"; + name = "kparts-5.15.0.tar.xz"; + }; + }; + kpeople = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/kpeople-5.15.0.tar.xz"; + sha256 = "11frmba6rqn2bmqp28wrwrqw8lpkdg27v5fa5lg47vrdp4ih0rgs"; + name = "kpeople-5.15.0.tar.xz"; + }; + }; + kplotting = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/kplotting-5.15.0.tar.xz"; + sha256 = "0wwqlza0qfd25p9d5gfrs0ymwzg5b0lnb4b8slfw2znazvi03krj"; + name = "kplotting-5.15.0.tar.xz"; + }; + }; + kpty = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/kpty-5.15.0.tar.xz"; + sha256 = "03yl4kwhwma0nwbgww95z4853waxrq4xipy41k7224n3gvd62c30"; + name = "kpty-5.15.0.tar.xz"; + }; + }; + kross = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/portingAids/kross-5.15.0.tar.xz"; + sha256 = "1mlvs0ra3ngrmrmqb4qjg3nkw5hqscdd1p3cdh94mpcwk330svq0"; + name = "kross-5.15.0.tar.xz"; + }; + }; + krunner = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/portingAids/krunner-5.15.0.tar.xz"; + sha256 = "0kyb135a45b9si4xh7pml7aiigs3j5077dgjfrghhz0ci3ibmn0v"; + name = "krunner-5.15.0.tar.xz"; + }; + }; + kservice = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/kservice-5.15.0.tar.xz"; + sha256 = "13yfg99s7k7y2npj8jn12iikan95dsf8hdmqfjb59n5qg4a6h253"; + name = "kservice-5.15.0.tar.xz"; + }; + }; + ktexteditor = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/ktexteditor-5.15.0.tar.xz"; + sha256 = "161kkssai0lwssy6l4mxgclx7229bgfkfgsf973i94p6hanaymb8"; + name = "ktexteditor-5.15.0.tar.xz"; + }; + }; + ktextwidgets = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/ktextwidgets-5.15.0.tar.xz"; + sha256 = "1r9drjjlag5v7y8inswbrj2fmkzkranrnzyrwl4bl7v0l1dir2l8"; + name = "ktextwidgets-5.15.0.tar.xz"; + }; + }; + kunitconversion = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/kunitconversion-5.15.0.tar.xz"; + sha256 = "1qbps67w3ii2797q967wvy56zclsm9l6vcrwnylx9rfqygcs5ixf"; + name = "kunitconversion-5.15.0.tar.xz"; + }; + }; + kwallet = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/kwallet-5.15.0.tar.xz"; + sha256 = "1b97v4vad7lzrjmf04zikm4q9czyzbzkk3vdhcd2mi47vizrj392"; + name = "kwallet-5.15.0.tar.xz"; + }; + }; + kwidgetsaddons = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/kwidgetsaddons-5.15.0.tar.xz"; + sha256 = "1nbgsf5dfz0f12azw19ir7791y6ykkkj7y96ln0k81d3cbcgxq63"; + name = "kwidgetsaddons-5.15.0.tar.xz"; + }; + }; + kwindowsystem = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/kwindowsystem-5.15.0.tar.xz"; + sha256 = "1x8pagby6j7k2ns3davbmyysggril0kp9ccn3326qm89l70zrf8x"; + name = "kwindowsystem-5.15.0.tar.xz"; + }; + }; + kxmlgui = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/kxmlgui-5.15.0.tar.xz"; + sha256 = "1d5mm2fkzk92q9gfh76a83mbzqw2pcagkg6s51i5ax3zqb7jnzdm"; + name = "kxmlgui-5.15.0.tar.xz"; + }; + }; + kxmlrpcclient = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/kxmlrpcclient-5.15.0.tar.xz"; + sha256 = "03ckqn33djzyg0ik9g1jk4dj33incsxwvvdc7g5k8wjgjcdkp433"; + name = "kxmlrpcclient-5.15.0.tar.xz"; + }; + }; + modemmanager-qt = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/modemmanager-qt-5.15.0.tar.xz"; + sha256 = "1sxi32jxsz3d51nkcx7wxjyjvr2fg3qay3s3nzrpdzm0pa79drr9"; + name = "modemmanager-qt-5.15.0.tar.xz"; + }; + }; + networkmanager-qt = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/networkmanager-qt-5.15.0.tar.xz"; + sha256 = "0l0396c9fgwxdv1h33p7y8w0ylvm4pa3a53yv7jckkc49nygk38p"; + name = "networkmanager-qt-5.15.0.tar.xz"; + }; + }; + plasma-framework = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/plasma-framework-5.15.0.tar.xz"; + sha256 = "0v36i64jb3n6lq964417lzbdm6m57nvg83kjli4wqlc17dywjp8s"; + name = "plasma-framework-5.15.0.tar.xz"; + }; + }; + solid = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/solid-5.15.0.tar.xz"; + sha256 = "0118bynfqcgvg333ljbb80k7bkam6skc7vygwvy7fr7y4dzmlwfa"; + name = "solid-5.15.0.tar.xz"; + }; + }; + sonnet = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/sonnet-5.15.0.tar.xz"; + sha256 = "18qs5szdyvjzwlbid62g3qs7cs4fdb46n25aw49saq7drf567gm0"; + name = "sonnet-5.15.0.tar.xz"; + }; + }; + threadweaver = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.15/threadweaver-5.15.0.tar.xz"; + sha256 = "19ha9r6wjm93w4kh5rjaal0r91vxhsr9q82dw5b9j927zrqwb7pq"; + name = "threadweaver-5.15.0.tar.xz"; + }; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/threadweaver.nix b/pkgs/development/libraries/kde-frameworks-5.15/threadweaver.nix index 52817921cc7..52817921cc7 100644 --- a/pkgs/development/libraries/kde-frameworks-5.13/threadweaver.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/threadweaver.nix diff --git a/pkgs/development/libraries/ldb/default.nix b/pkgs/development/libraries/ldb/default.nix index 07d4b034474..a26d8094e39 100644 --- a/pkgs/development/libraries/ldb/default.nix +++ b/pkgs/development/libraries/ldb/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "ldb-1.1.21"; + name = "ldb-1.1.23"; src = fetchurl { url = "mirror://samba/ldb/${name}.tar.gz"; - sha256 = "1wfvqys8g3l2gki5xhf5jc50f6k95vdgzb97vvqfls404xzvnyr6"; + sha256 = "0ncmwgga6q9v7maiywgw21w6rb3149m1w2ca11yq8k5j0izjz2wg"; }; buildInputs = [ diff --git a/pkgs/development/libraries/leptonica/default.nix b/pkgs/development/libraries/leptonica/default.nix index ae5d49f2850..270403cbb74 100644 --- a/pkgs/development/libraries/leptonica/default.nix +++ b/pkgs/development/libraries/leptonica/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, libpng, libtiff, libjpeg, zlib}: stdenv.mkDerivation { - name = "leptonica-1.69"; + name = "leptonica-1.72"; src = fetchurl { - url = http://www.leptonica.org/source/leptonica-1.69.tar.gz; - sha256 = "0bd7w0zpmwwfn1cnrlyzjw3jf8x59r0rhdmvk7rigr57rnfnddry"; + url = http://www.leptonica.org/source/leptonica-1.72.tar.gz; + sha256 = "0mhzvqs0im04y1cpcc1yma70hgdac1frf33h73m9z3356bfymmbr"; }; buildInputs = [ libpng libtiff libjpeg zlib ]; diff --git a/pkgs/development/libraries/libappindicator/default.nix b/pkgs/development/libraries/libappindicator/default.nix new file mode 100644 index 00000000000..0dac5e4766f --- /dev/null +++ b/pkgs/development/libraries/libappindicator/default.nix @@ -0,0 +1,67 @@ +# TODO: Resolve the issues with the Mono bindings. + +{ stdenv, fetchurl, lib, file +, pkgconfig, autoconf +, glib, dbus_glib, gtkVersion +, gtk2 ? null, libindicator-gtk2 ? null, libdbusmenu-gtk2 ? null +, gtk3 ? null, libindicator-gtk3 ? null, libdbusmenu-gtk3 ? null +, python, pygobject, pygtk, gobjectIntrospection, vala +, monoSupport ? false, mono ? null, gtk-sharp ? null + }: + +with lib; + +stdenv.mkDerivation rec { + name = let postfix = if gtkVersion == "2" && monoSupport then "sharp" else "gtk${gtkVersion}"; + in "libappindicator-${postfix}-${version}"; + version = "${versionMajor}.${versionMinor}"; + versionMajor = "12.10"; + versionMinor = "0"; + + src = fetchurl { + url = "${meta.homepage}/${versionMajor}/${version}/+download/libappindicator-${version}.tar.gz"; + sha256 = "17xlqd60v0zllrxp8bgq3k5a1jkj0svkqn8rzllcyjh8k0gpr46m"; + }; + + nativeBuildInputs = [ pkgconfig autoconf ]; + + buildInputs = [ + glib dbus_glib + python pygobject pygtk gobjectIntrospection vala + ] ++ (if gtkVersion == "2" + then [ gtk2 libindicator-gtk2 libdbusmenu-gtk2 ] ++ optionals monoSupport [ mono gtk-sharp ] + else [ gtk3 libindicator-gtk3 libdbusmenu-gtk3 ]); + + postPatch = '' + substituteInPlace configure.ac \ + --replace '=codegendir pygtk-2.0' '=codegendir pygobject-2.0' + autoconf + substituteInPlace {configure,ltmain.sh,m4/libtool.m4} \ + --replace /usr/bin/file ${file}/bin/file + ''; + + configureFlags = [ + "CFLAGS=-Wno-error" + "--sysconfdir=/etc" + "--localstatedir=/var" + "--with-gtk=${gtkVersion}" + ]; + + postConfigure = '' + substituteInPlace configure \ + --replace /usr/bin/file ${file}/bin/file + ''; + + installFlags = [ + "sysconfdir=\${out}/etc" + "localstatedir=\${TMPDIR}" + ]; + + meta = { + description = "A library to allow applications to export a menu into the Unity Menu bar"; + homepage = "https://launchpad.net/libappindicator"; + license = with licenses; [ lgpl21 lgpl3 ]; + platforms = platforms.linux; + maintainers = [ maintainers.msteen ]; + }; +} 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 ] diff --git a/pkgs/development/libraries/libdbusmenu/default.nix b/pkgs/development/libraries/libdbusmenu/default.nix new file mode 100644 index 00000000000..3e633f9a365 --- /dev/null +++ b/pkgs/development/libraries/libdbusmenu/default.nix @@ -0,0 +1,59 @@ +{ stdenv, fetchurl, lib, file +, pkgconfig, intltool +, glib, dbus_glib, json_glib +, gobjectIntrospection, vala, gnome_doc_utils +, gtkVersion ? null, gtk2 ? null, gtk3 ? null }: + +with lib; + +stdenv.mkDerivation rec { + name = let postfix = if gtkVersion == null then "glib" else "gtk${gtkVersion}"; + in "libdbusmenu-${postfix}-${version}"; + version = "${versionMajor}.${versionMinor}"; + versionMajor = "12.10"; + versionMinor = "2"; + + src = fetchurl { + url = "${meta.homepage}/${versionMajor}/${version}/+download/libdbusmenu-${version}.tar.gz"; + sha256 = "9d6ad4a0b918b342ad2ee9230cce8a095eb601cb0cee6ddc1122d0481f9d04c9"; + }; + + nativeBuildInputs = [ pkgconfig intltool ]; + + buildInputs = [ + glib dbus_glib json_glib + gobjectIntrospection vala gnome_doc_utils + ] ++ optional (gtkVersion != null) (if gtkVersion == "2" then gtk2 else gtk3); + + postPatch = '' + substituteInPlace {configure,ltmain.sh,m4/libtool.m4} \ + --replace /usr/bin/file ${file}/bin/file + ''; + + # https://projects.archlinux.org/svntogit/community.git/tree/trunk/PKGBUILD?h=packages/libdbusmenu + preConfigure = '' + export HAVE_VALGRIND_TRUE="#" + export HAVE_VALGRIND_FALSE="" + ''; + + configureFlags = [ + "CFLAGS=-Wno-error" + "--sysconfdir=/etc" + "--localstatedir=/var" + (if gtkVersion == null then "--disable-gtk" else "--with-gtk=${gtkVersion}") + "--disable-scrollkeeper" + ] ++ optional (gtkVersion != "2") "--disable-dumper"; + + installFlags = [ + "sysconfdir=\${out}/etc" + "localstatedir=\${TMPDIR}" + ]; + + meta = { + description = "A library for passing menu structures across DBus"; + homepage = "https://launchpad.net/dbusmenu"; + license = with licenses; [ gpl3 lgpl21 lgpl3 ]; + platforms = platforms.linux; + maintainers = [ maintainers.msteen ]; + }; +} diff --git a/pkgs/development/libraries/libdc1394/default.nix b/pkgs/development/libraries/libdc1394/default.nix index 1d6b00abe53..c96a2b7f051 100644 --- a/pkgs/development/libraries/libdc1394/default.nix +++ b/pkgs/development/libraries/libdc1394/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, libraw1394, libusb1 }: +{ stdenv, fetchurl, libraw1394, libusb1 +, CoreServices +}: stdenv.mkDerivation rec { name = "libdc1394-2.2.3"; @@ -9,7 +11,8 @@ stdenv.mkDerivation rec { }; buildInputs = [ libusb1 ] - ++ stdenv.lib.optional stdenv.isLinux [ libraw1394 ]; + ++ stdenv.lib.optional stdenv.isLinux libraw1394 + ++ stdenv.lib.optional stdenv.isDarwin CoreServices; meta = { homepage = http://sourceforge.net/projects/libdc1394/; diff --git a/pkgs/development/libraries/libdevil/default.nix b/pkgs/development/libraries/libdevil/default.nix index abc7dd3af40..99630198885 100644 --- a/pkgs/development/libraries/libdevil/default.nix +++ b/pkgs/development/libraries/libdevil/default.nix @@ -1,5 +1,8 @@ { stdenv, fetchurl, libjpeg, libpng, libmng, lcms1, libtiff, openexr, mesa -, libX11, pkgconfig }: +, libX11, pkgconfig + +, OpenGL +}: stdenv.mkDerivation rec { @@ -11,7 +14,8 @@ stdenv.mkDerivation rec { sha256 = "1zd850nn7nvkkhasrv7kn17kzgslr5ry933v6db62s4lr0zzlbv8"; }; - buildInputs = [ libjpeg libpng libmng lcms1 libtiff openexr mesa libX11 ]; + buildInputs = [ libjpeg libpng libmng lcms1 libtiff openexr mesa libX11 ] + ++ stdenv.lib.optionals stdenv.isDarwin [ OpenGL ]; nativeBuildInputs = [ pkgconfig ]; configureFlags = [ "--enable-ILU" "--enable-ILUT" ]; 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 ]; }; } 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 - diff --git a/pkgs/development/libraries/libevdev/default.nix b/pkgs/development/libraries/libevdev/default.nix index cfc2c2f931b..c1587cedd16 100644 --- a/pkgs/development/libraries/libevdev/default.nix +++ b/pkgs/development/libraries/libevdev/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, python }: stdenv.mkDerivation rec { - name = "libevdev-1.4.4"; + name = "libevdev-1.4.5"; src = fetchurl { url = "http://www.freedesktop.org/software/libevdev/${name}.tar.xz"; - sha256 = "1aa5pj2ivhvpxcbvgh80ghmzpkwyahw9a2bxi7sjhvkakcv7k6gd"; + sha256 = "07faqb47c7sjl25rc788cbslyiv5ijky0jc4g6312qz0hv55h779"; }; buildInputs = [ python ]; diff --git a/pkgs/development/libraries/libgksu/default.nix b/pkgs/development/libraries/libgksu/default.nix index e3d64994fe2..7bf1d7cdc71 100644 --- a/pkgs/development/libraries/libgksu/default.nix +++ b/pkgs/development/libraries/libgksu/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { # Fix some binary paths sed -i -e 's|/usr/bin/xauth|${xauth}/bin/xauth|g' libgksu/gksu-run-helper.c libgksu/libgksu.c - sed -i -e 's|/usr/bin/sudo|${sudo}/bin/sudo|g' libgksu/libgksu.c + sed -i -e 's|/usr/bin/sudo|/var/setuid-wrappers/sudo|g' libgksu/libgksu.c sed -i -e 's|/bin/su\([^d]\)|/var/setuid-wrappers/su\1|g' libgksu/libgksu.c touch NEWS README diff --git a/pkgs/development/libraries/libidn/default.nix b/pkgs/development/libraries/libidn/default.nix index 19e8f38b373..b16dc835741 100644 --- a/pkgs/development/libraries/libidn/default.nix +++ b/pkgs/development/libraries/libidn/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv }: +{ fetchurl, stdenv, libiconv }: stdenv.mkDerivation rec { name = "libidn-1.32"; @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { doCheck = ! stdenv.isDarwin; + buildInputs = stdenv.lib.optional stdenv.isDarwin libiconv; + meta = { homepage = http://www.gnu.org/software/libidn/; description = "Library for internationalized domain names"; diff --git a/pkgs/development/libraries/libindicate/default.nix b/pkgs/development/libraries/libindicate/default.nix new file mode 100644 index 00000000000..0cff4aa1913 --- /dev/null +++ b/pkgs/development/libraries/libindicate/default.nix @@ -0,0 +1,62 @@ +# TODO: Resolve the issues with the Mono bindings. + +{ stdenv, fetchurl, lib, file +, pkgconfig, autoconf +, glib, dbus_glib, libdbusmenu-glib +, gtkVersion, gtk2 ? null, gtk3 ? null +, python, pygobject, pygtk, gobjectIntrospection, vala, gnome_doc_utils +, monoSupport ? false, mono ? null, gtk-sharp ? null + }: + +with lib; + +stdenv.mkDerivation rec { + name = let postfix = if gtkVersion == "2" && monoSupport then "sharp" else "gtk${gtkVersion}"; + in "libindicate-${postfix}-${version}"; + version = "${versionMajor}.${versionMinor}"; + versionMajor = "12.10"; + versionMinor = "1"; + + src = fetchurl { + url = "${meta.homepage}/${versionMajor}/${version}/+download/libindicate-${version}.tar.gz"; + sha256 = "10am0ymajx633b33anf6b79j37k61z30v9vaf5f9fwk1x5cw1q21"; + }; + + nativeBuildInputs = [ pkgconfig autoconf ]; + + buildInputs = [ + glib dbus_glib libdbusmenu-glib + python pygobject pygtk gobjectIntrospection vala gnome_doc_utils + ] ++ (if gtkVersion == "2" + then [ gtk2 ] ++ optionals monoSupport [ mono gtk-sharp ] + else [ gtk3 ]); + + postPatch = '' + substituteInPlace configure.ac \ + --replace '=codegendir pygtk-2.0' '=codegendir pygobject-2.0' \ + --replace 'pyglib-2.0-python$PYTHON_VERSION' 'pyglib-2.0-python' + autoconf + substituteInPlace {configure,ltmain.sh,m4/libtool.m4} \ + --replace /usr/bin/file ${file}/bin/file + ''; + + configureFlags = [ + "CFLAGS=-Wno-error" + "--sysconfdir=/etc" + "--localstatedir=/var" + "--with-gtk=${gtkVersion}" + ]; + + installFlags = [ + "sysconfdir=\${out}/etc" + "localstatedir=\${TMPDIR}" + ]; + + meta = { + description = "Library for raising indicators via DBus"; + homepage = "https://launchpad.net/libindicate"; + license = with licenses; [ lgpl21 lgpl3 ]; + platforms = platforms.linux; + maintainers = [ maintainers.msteen ]; + }; +} diff --git a/pkgs/development/libraries/libindicator/default.nix b/pkgs/development/libraries/libindicator/default.nix new file mode 100644 index 00000000000..e696e778dae --- /dev/null +++ b/pkgs/development/libraries/libindicator/default.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchurl, lib, file +, pkgconfig +, gtkVersion, gtk2 ? null, gtk3 ? null }: + +with lib; + +stdenv.mkDerivation rec { + name = "libindicator-gtk${gtkVersion}-${version}"; + version = "${versionMajor}.${versionMinor}"; + versionMajor = "12.10"; + versionMinor = "1"; + + src = fetchurl { + url = "${meta.homepage}/${versionMajor}/${version}/+download/libindicator-${version}.tar.gz"; + sha256 = "b2d2e44c10313d5c9cd60db455d520f80b36dc39562df079a3f29495e8f9447f"; + }; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ (if gtkVersion == "2" then gtk2 else gtk3) ]; + + postPatch = '' + substituteInPlace configure \ + --replace 'LIBINDICATOR_LIBS+="$LIBM"' 'LIBINDICATOR_LIBS+=" $LIBM"' + substituteInPlace {build-aux/ltmain.sh,configure,m4/libtool.m4} \ + --replace /usr/bin/file ${file}/bin/file + ''; + + configureFlags = [ + "CFLAGS=-Wno-error" + "--sysconfdir=/etc" + "--localstatedir=/var" + "--with-gtk=${gtkVersion}" + ]; + + installFlags = [ + "sysconfdir=\${out}/etc" + "localstatedir=\${TMPDIR}" + ]; + + meta = { + description = "A set of symbols and convenience functions for Ayatana indicators"; + homepage = "https://launchpad.net/libindicator"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = [ maintainers.msteen ]; + }; +} diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index 399640f6c4a..430743af96a 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -15,11 +15,11 @@ in with stdenv.lib; stdenv.mkDerivation rec { - name = "libinput-1.0.1"; + name = "libinput-1.1.1"; src = fetchurl { url = "http://www.freedesktop.org/software/libinput/${name}.tar.xz"; - sha256 = "17prgxxq95i2l8a00clwwmvvskbb9xza9fmym1jvlmxl358v6bs8"; + sha256 = "05yxz3cds65zmzj98yhsrwvnkv8c7n3zs2fksjzs2fy7vlrv9qid"; }; configureFlags = [ diff --git a/pkgs/development/libraries/libmediainfo/default.nix b/pkgs/development/libraries/libmediainfo/default.nix index dd17f7a4c00..d9619fd2712 100644 --- a/pkgs/development/libraries/libmediainfo/default.nix +++ b/pkgs/development/libraries/libmediainfo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, automake, autoconf, libtool, pkgconfig, libzen, zlib }: stdenv.mkDerivation rec { - version = "0.7.77"; + version = "0.7.79"; name = "libmediainfo-${version}"; src = fetchurl { url = "http://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz"; - sha256 = "1znxdn1jpqkiwshq9s514ak1z9wkrh9flky4s3q8z2xl68jpralq"; + sha256 = "0lanhx1zg7s36wgi9ndv4zz7dbhkqz4dc99mva6x9rcj2p5p8c6d"; }; buildInputs = [ automake autoconf libtool pkgconfig libzen zlib ]; diff --git a/pkgs/development/libraries/libmicrohttpd/default.nix b/pkgs/development/libraries/libmicrohttpd/default.nix index f6cd283d424..c6818794533 100644 --- a/pkgs/development/libraries/libmicrohttpd/default.nix +++ b/pkgs/development/libraries/libmicrohttpd/default.nix @@ -1,11 +1,11 @@ { 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 = [ "dev" "out" "docdev" ]; diff --git a/pkgs/development/libraries/libmm-qt/default.nix b/pkgs/development/libraries/libmm-qt/default.nix index f78604f86c5..3515d8388a2 100644 --- a/pkgs/development/libraries/libmm-qt/default.nix +++ b/pkgs/development/libraries/libmm-qt/default.nix @@ -27,6 +27,5 @@ stdenv.mkDerivation { description = "Qt wrapper for ModemManager DBus API"; license = licenses.lgpl21; platforms = platforms.linux; - maintainers = [ maintainers.jgeerds ]; }; } 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"; 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 ]; diff --git a/pkgs/development/libraries/libnm-qt/default.nix b/pkgs/development/libraries/libnm-qt/default.nix index 39e784fe89f..b9d033235cb 100644 --- a/pkgs/development/libraries/libnm-qt/default.nix +++ b/pkgs/development/libraries/libnm-qt/default.nix @@ -29,6 +29,5 @@ stdenv.mkDerivation { description = "Qt wrapper for NetworkManager DBus API"; license = licenses.lgpl21; platforms = platforms.linux; - maintainers = [ maintainers.jgeerds ]; }; } diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix index 67be2ec8611..00abbbbdca4 100644 --- a/pkgs/development/libraries/libpng/default.nix +++ b/pkgs/development/libraries/libpng/default.nix @@ -3,11 +3,11 @@ assert zlib != null; let - version = "1.6.18"; - sha256 = "0qq96rf31483kxz32h6l6921hy6p2v2pfqfvc74km229g4xw241f"; + version = "1.6.19"; + sha256 = "1s1mmkl79ghiczi2x2rbnp6y70v4c5pr8g3icxn9h5imymbmc71i"; patch_src = fetchurl { url = "mirror://sourceforge/libpng-apng/libpng-${version}-apng.patch.gz"; - sha256 = "0g2ljh2vhclas1hacys1c4gk6l6hyy6sngb2yvdsnjz50nyq16kv"; + sha256 = "0bgqkac16yhl0zwjzq2zwkixg2l2x3a6blbk3k0wqz0lza2a6jrh"; }; whenPatched = stdenv.lib.optionalString apngSupport; diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix index 913341c49b9..903dcd9305e 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-11-12"; listSources = fetchFromGitHub { - sha256 = "045snl0pz8ma5rk51xxbjcamm28hi4z2v7gd8zkkv8yrjyg9yp82"; - rev = "509db00ef21795e58bfc2c576cebf72c8ee7a6f9"; + sha256 = "1cwzazhvgzcp6xapk3d11ssfkq9cxmwljfd7bys7w15jfsn6r8d1"; + rev = "2adac6ff0f612543c4e8bf9a7219d52b0386870e"; repo = "list"; owner = "publicsuffix"; }; diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix index 8d9743a880f..fd18c7f5652 100644 --- a/pkgs/development/libraries/libressl/default.nix +++ b/pkgs/development/libraries/libressl/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libressl-${version}"; - version = "2.2.3"; + version = "2.2.4"; src = fetchurl { url = "mirror://openbsd/LibreSSL/${name}.tar.gz"; - sha256 = "10nq2rpyzgl7xhdip9mmn7hzb6hcjffbjcb04jchxmlivwdc5k51"; + sha256 = "0zlsxw366n438dc14zqnim6fc5vh1574jj95hv1sym46prcrhh3b"; }; enableParallelBuilding = true; @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { description = "Free TLS/SSL implementation"; homepage = "http://www.libressl.org"; platforms = platforms.all; - maintainers = with maintainers; [ thoughtpolice wkennington ]; + maintainers = with maintainers; [ thoughtpolice wkennington fpletz ]; }; } diff --git a/pkgs/development/libraries/libsexy/default.nix b/pkgs/development/libraries/libsexy/default.nix index 179c899d754..c0f12c54564 100644 --- a/pkgs/development/libraries/libsexy/default.nix +++ b/pkgs/development/libraries/libsexy/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A collection of GTK+ widgets"; - homepahe = http://blog.chipx86.com/tag/libsexy/; + homepage = http://blog.chipx86.com/tag/libsexy/; license = licenses.lgpl21; maintainers = with maintainers; [ ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libsndfile/default.nix b/pkgs/development/libraries/libsndfile/default.nix index b9aa9522564..5be8730ba01 100644 --- a/pkgs/development/libraries/libsndfile/default.nix +++ b/pkgs/development/libraries/libsndfile/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, flac, libogg, libvorbis, pkgconfig }: +{ stdenv, fetchurl, flac, libogg, libvorbis, pkgconfig +, Carbon +}: stdenv.mkDerivation rec { name = "libsndfile-1.0.25"; @@ -8,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "10j8mbb65xkyl0kfy0hpzpmrp0jkr12c7mfycqipxgka6ayns0ar"; }; - buildInputs = [ pkgconfig flac libogg libvorbis ]; + buildInputs = [ pkgconfig flac libogg libvorbis ] + ++ stdenv.lib.optional stdenv.isDarwin Carbon; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/libsodium/default.nix b/pkgs/development/libraries/libsodium/default.nix index f127776fa6a..42450275ad5 100644 --- a/pkgs/development/libraries/libsodium/default.nix +++ b/pkgs/development/libraries/libsodium/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libsodium-1.0.3"; + name = "libsodium-1.0.6"; src = fetchurl { url = "https://download.libsodium.org/libsodium/releases/${name}.tar.gz"; - sha256 = "120jkda2q58p0n68banh64vsfm3hgqnacagj425d218cr4ycdkyb"; + sha256 = "0ngvcjwg6m9nivzi208yvz8yvmk6kxnvyr25w907kaicgpm063cl"; }; outputs = [ "dev" "out" ]; diff --git a/pkgs/development/libraries/libsoundio/default.nix b/pkgs/development/libraries/libsoundio/default.nix index 48400ae6e1b..9f9f89ec812 100644 --- a/pkgs/development/libraries/libsoundio/default.nix +++ b/pkgs/development/libraries/libsoundio/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, cmake, alsaLib, libjack2-git, libpulseaudio }: stdenv.mkDerivation rec { - version = "1.0.2"; + version = "1.0.3"; name = "libsoundio-${version}"; src = fetchFromGitHub { owner = "andrewrk"; repo = "libsoundio"; rev = "${version}"; - sha256 = "0zq8sy8m9zp2ji7qiwn932ivl5mw30kn97nip84ki8vc0lm7f8hx"; + sha256 = "0xnv0rsan57i07ky823jczylbcpbzjk6j06fw9x0md65arcgcqfy"; }; buildInputs = [ cmake alsaLib libjack2-git libpulseaudio ]; diff --git a/pkgs/development/libraries/libssh/default.nix b/pkgs/development/libraries/libssh/default.nix index 645354d2445..e33d0c89b7d 100644 --- a/pkgs/development/libraries/libssh/default.nix +++ b/pkgs/development/libraries/libssh/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, cmake, zlib, openssl, libsodium }: stdenv.mkDerivation rec { - name = "libssh-0.7.1"; + name = "libssh-0.7.2"; src = fetchurl { - url = "https://red.libssh.org/attachments/download/154/libssh-0.7.1.tar.xz"; - sha256 = "0v84zm957z31yyrj47n62hby38nrjk5ih0ajmgccnqrjdpwwrirg"; + url = "https://red.libssh.org/attachments/download/177/${name}.tar.xz"; + sha256 = "0qmfxgx88dbzcbyvh40gddn0fcg9adyyskg8pnsclha1cywlab53"; }; postPatch = '' diff --git a/pkgs/development/libraries/libstrophe/default.nix b/pkgs/development/libraries/libstrophe/default.nix index b4757831899..b5eb2ae7dd7 100644 --- a/pkgs/development/libraries/libstrophe/default.nix +++ b/pkgs/development/libraries/libstrophe/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "libstrophe-${version}"; - version = "0.8.7"; + version = "0.8.8"; src = fetchFromGitHub { owner = "strophe"; repo = "libstrophe"; rev = version; - sha256 = "1iic8xbcxh21dzns8m9kkz0cj5f3ppn414gnhyh4y2wcjsz6hp8l"; + sha256 = "1xzyqqf99r0jfd0g3v0zwc68sac6y25v1d4m365zpc14l02midis"; }; buildInputs = [ automake autoconf openssl expat libtool pkgconfig check ]; 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)" ] 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"; } // diff --git a/pkgs/development/libraries/libwacom/default.nix b/pkgs/development/libraries/libwacom/default.nix index 7a843013835..12bb7c785ac 100644 --- a/pkgs/development/libraries/libwacom/default.nix +++ b/pkgs/development/libraries/libwacom/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, glib, pkgconfig, udev, libgudev }: stdenv.mkDerivation rec { - name = "libwacom-0.7.1"; + name = "libwacom-0.15"; src = fetchurl { url = "mirror://sourceforge/linuxwacom/libwacom/${name}.tar.bz2"; - sha256 = "1agdaa1bv5mp4l32qgsw63swnnv0p279jiy9madgw4y3d8d12dwm"; + sha256 = "04vppdj99cc0ya44n8p7zjk9yyw03v6fksw0a9n1gpnnsn4wardb"; }; buildInputs = [ glib pkgconfig udev libgudev ]; 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; diff --git a/pkgs/development/libraries/libzen/default.nix b/pkgs/development/libraries/libzen/default.nix index 11b77ae0815..127eeaeaca9 100644 --- a/pkgs/development/libraries/libzen/default.nix +++ b/pkgs/development/libraries/libzen/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, automake, autoconf, libtool, pkgconfig }: -let version = "0.4.31"; in +let version = "0.4.32"; in stdenv.mkDerivation { name = "libzen-${version}"; src = fetchurl { url = "http://mediaarea.net/download/source/libzen/${version}/libzen_${version}.tar.bz2"; - sha256 = "1d54bn561dipf16ki1bfq5r72j5bmz1yyx4n1v85jv4qc4cfvl4z"; + sha256 = "0rhbiaywij6jj8d7vkc4v7y21ic1kv9fbn9lk82mm12yjwzlhhyd"; }; buildInputs = [ automake autoconf libtool pkgconfig ]; @@ -14,7 +14,7 @@ stdenv.mkDerivation { sourceRoot = "./ZenLib/Project/GNU/Library/"; - preConfigure = "sh autogen"; + preConfigure = "sh autogen.sh"; meta = { description = "Shared library for libmediainfo and mediainfo"; diff --git a/pkgs/development/libraries/live555/default.nix b/pkgs/development/libraries/live555/default.nix new file mode 100644 index 00000000000..f61f2723752 --- /dev/null +++ b/pkgs/development/libraries/live555/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchurl }: + +# Based on https://projects.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD +let + version = "2015.10.12"; +in +stdenv.mkDerivation { + name = "live555-${version}"; + + src = fetchurl { # the upstream doesn't provide a stable URL + url = "mirror://sourceforge/slackbuildsdirectlinks/live.${version}.tar.gz"; + sha256 = "05qwws4hda4x3l4ym22k55cc9j07w7g5vj3r18dancgf0fla40j4"; + }; + + postPatch = "sed 's,/bin/rm,rm,g' -i genMakefiles"; + + configurePhase = '' + sed \ + -e 's/$(INCLUDES) -I. -O2 -DSOCKLEN_T/$(INCLUDES) -I. -O2 -I. -fPIC -DRTSPCLIENT_SYNCHRONOUS_INTERFACE=1 -DSOCKLEN_T/g' \ + -i config.linux + + ./genMakefiles linux + ''; + + installPhase = '' + for dir in BasicUsageEnvironment groupsock liveMedia UsageEnvironment; do + install -dm755 $out/{bin,lib,include/$dir} + install -m644 $dir/*.a "$out/lib" + install -m644 $dir/include/*.h* "$out/include/$dir" + done + ''; + + meta = with stdenv.lib; { + description = "Set of C++ libraries for multimedia streaming, using open standard protocols (RTP/RTCP, RTSP, SIP)"; + homepage = http://www.live555.com/liveMedia/; + license = licenses.lgpl21Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/lmdb/default.nix b/pkgs/development/libraries/lmdb/default.nix index 02c07a78acb..8621a573190 100644 --- a/pkgs/development/libraries/lmdb/default.nix +++ b/pkgs/development/libraries/lmdb/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchzip }: -stdenv.mkDerivation rec { +let optional = stdenv.lib.optional; +in stdenv.mkDerivation rec { name = "lmdb-${version}"; version = "0.9.16"; @@ -11,7 +12,8 @@ stdenv.mkDerivation rec { postUnpack = "sourceRoot=\${sourceRoot}/libraries/liblmdb"; - makeFlags = "prefix=$(out)"; + makeFlags = ["prefix=$(out)"] + ++ optional stdenv.cc.isClang "CC=clang"; doCheck = true; checkPhase = "make test"; diff --git a/pkgs/development/libraries/mbedtls/default.nix b/pkgs/development/libraries/mbedtls/default.nix index c37aea46eed..7c7b82d9eef 100644 --- a/pkgs/development/libraries/mbedtls/default.nix +++ b/pkgs/development/libraries/mbedtls/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl }: stdenv.mkDerivation rec { - name = "mbedtls-1.3.11"; + name = "mbedtls-1.3.14"; src = fetchurl { url = "https://polarssl.org/download/${name}-gpl.tgz"; - sha256 = "1js1lk6hvw9l3nhjhnhzfazfbnlcmk229hmnlm7jli3agc1979b7"; + sha256 = "1y3gr3kfai3d13j08r4pv42sh47nbfm4nqi9jq8c9d06qidr2xmy"; }; nativeBuildInputs = [ perl ]; diff --git a/pkgs/development/libraries/mesa-darwin/default.nix b/pkgs/development/libraries/mesa-darwin/default.nix index 1ada9298f3c..af8b4e1179c 100644 --- a/pkgs/development/libraries/mesa-darwin/default.nix +++ b/pkgs/development/libraries/mesa-darwin/default.nix @@ -2,7 +2,7 @@ , python, libxml2Python, file, expat, makedepend, xorg, llvm, libffi, libvdpau , enableTextureFloats ? false # Texture floats are patented, see docs/patents.txt , enableExtraFeatures ? false # not maintained -, darwin +, OpenGL, apple_sdk, Xplugin }: let @@ -23,11 +23,7 @@ let presentproto libX11 libXext libxcb libXt libxshmfence libffi libvdpau - ] ++ stdenv.lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.OpenGL - darwin.apple_sdk.sdk - darwin.apple_sdk.libs.Xplugin - ]; + ] ++ stdenv.lib.optionals stdenv.isDarwin [ OpenGL apple_sdk.sdk Xplugin ]; postUnpack = '' ln -s darwin $sourceRoot/configs/current diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 1d34b87ce64..3386de316b9 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -23,7 +23,7 @@ else with { inherit (stdenv.lib) optional optionalString; }; let - version = "11.0.2"; + version = "11.0.5"; # this is the default search path for DRI drivers driverLink = "/run/opengl-driver" + optionalString stdenv.isi686 "-32"; in @@ -36,7 +36,7 @@ stdenv.mkDerivation { "https://launchpad.net/mesa/trunk/${version}/+download/mesa-${version}.tar.xz" "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz" ]; - sha256 = "fce11fb27eb87adf1e620a76455d635c6136dfa49ae58c53b34ef8d0c7b7eae4"; + sha256 = "9c255a2a6695fcc6ef4a279e1df0aeaf417dc142f39ee59dfb533d80494bb67a"; }; prePatch = "patchShebangs ."; diff --git a/pkgs/development/libraries/mlt/qt-5.4.nix b/pkgs/development/libraries/mlt/qt-5.4.nix index d3d8f6c6b86..6f308a20fdc 100644 --- a/pkgs/development/libraries/mlt/qt-5.4.nix +++ b/pkgs/development/libraries/mlt/qt-5.4.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "mlt-${version}"; - version = "0.9.6"; + version = "0.9.8"; src = fetchurl { url = "https://github.com/mltframework/mlt/archive/v${version}.tar.gz"; - sha256 = "0s8ypg0q50zfcmq527y8cbdvzxhiqidm1923k28ar8jqmjp45ssh"; + sha256 = "0x0hsb05i7g70dh3jll41qlvcylailfgsr0y1dpx7hyigynxc50j"; }; buildInputs = [ diff --git a/pkgs/development/libraries/movit/default.nix b/pkgs/development/libraries/movit/default.nix index df084f0cc20..fdb31293f37 100644 --- a/pkgs/development/libraries/movit/default.nix +++ b/pkgs/development/libraries/movit/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "movit-${version}"; - version = "1.1.3"; + version = "1.2.0"; src = fetchurl { url = "http://movit.sesse.net/${name}.tar.gz"; - sha256 = "0q33h3gfw16gd9k6s3isd7ili2mifw7j1723xpdlc516gggsazw9"; + sha256 = "0wyl5xl4pkw17pkxsdg8idqvsgm4fxapd0r4dw9wlxw250915nmf"; }; GTEST_DIR = "${gtest}"; diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index 74b2156efd6..efaf0fec215 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -1,35 +1,35 @@ -{ lib, stdenv, fetchurl, pkgconfig, libtool +{ lib, stdenv, fetchurl , mouseSupport ? false , unicode ? true , gpm + +# Extra Options +, abiVersion ? "5" }: stdenv.mkDerivation rec { - name = "ncurses-6.0"; + name = "ncurses-5.9"; src = fetchurl { url = "mirror://gnu/ncurses/${name}.tar.gz"; - sha256 = "0q3jck7lna77z5r42f13c4xglc7azd19pxfrjrpgp2yf615w4lgm"; + sha256 = "0fsn7xis81za62afan0vvm38bvgzg5wfmv1m86flqcj0nj7jjilh"; }; - patches = [ ./clang.patch ]; + # gcc-5.patch should be removed after 5.9 + patches = [ ./clang.patch ./gcc-5.patch ]; outputs = [ "dev" "lib" "out" "man" ]; setOutputFlags = false; # some aren't supported configureFlags = [ "--with-shared" - "--with-cxx-shared" - "--with-libtool" "--without-debug" - "--enable-overwrite" # Needed for proper header installation "--enable-pc-files" "--enable-symlinks" ] ++ lib.optional unicode "--enable-widec"; - nativeBuildInputs = [ pkgconfig libtool ]; buildInputs = lib.optional (mouseSupport && stdenv.isLinux) gpm; preConfigure = '' @@ -78,6 +78,7 @@ stdenv.mkDerivation rec { for dylibtype in so dll dylib; do if [ -e "$lib/lib/lib''${library}$suffix.$dylibtype" ]; then ln -svf lib''${library}$suffix.$dylibtype $lib/lib/lib$library$newsuffix.$dylibtype + ln -svf lib''${library}$suffix.$dylibtype.${abiVersion} $lib/lib/lib$library$newsuffix.$dylibtype.${abiVersion} fi done for statictype in a dll.a la; do @@ -90,6 +91,10 @@ stdenv.mkDerivation rec { done ''; + preFixup = '' + rm "$lib"/lib/*.a + ''; + meta = { description = "Free software emulation of curses in SVR4 and more"; @@ -116,6 +121,6 @@ stdenv.mkDerivation rec { passthru = { ldflags = "-lncurses"; - inherit unicode; + inherit unicode abiVersion; }; } diff --git a/pkgs/development/libraries/ncurses/gcc-5.patch b/pkgs/development/libraries/ncurses/gcc-5.patch new file mode 100644 index 00000000000..2448229b88e --- /dev/null +++ b/pkgs/development/libraries/ncurses/gcc-5.patch @@ -0,0 +1,46 @@ +https://bugs.gentoo.org/545114 + +extracted from the upstream change (which had many unrelated commits in one) + +From 97bb4678dc03e753290b39bbff30ba2825df9517 Mon Sep 17 00:00:00 2001 +From: "Thomas E. Dickey" <dickey@invisible-island.net> +Date: Sun, 7 Dec 2014 03:10:09 +0000 +Subject: [PATCH] ncurses 5.9 - patch 20141206 + ++ modify MKlib_gen.sh to work around change in development version of + gcc introduced here: + https://gcc.gnu.org/ml/gcc-patches/2014-06/msg02185.html + https://gcc.gnu.org/ml/gcc-patches/2014-07/msg00236.html + (reports by Marcus Shawcroft, Maohui Lei). + +diff --git a/ncurses/base/MKlib_gen.sh b/ncurses/base/MKlib_gen.sh +index d8cc3c9..b91398c 100755 +--- a/ncurses/base/MKlib_gen.sh ++++ b/ncurses/base/MKlib_gen.sh +@@ -474,11 +474,22 @@ sed -n -f $ED1 \ + -e 's/gen_$//' \ + -e 's/ / /g' >>$TMP + ++cat >$ED1 <<EOF ++s/ / /g ++s/^ // ++s/ $// ++s/P_NCURSES_BOOL/NCURSES_BOOL/g ++EOF ++ ++# A patch discussed here: ++# https://gcc.gnu.org/ml/gcc-patches/2014-06/msg02185.html ++# introduces spurious #line markers. Work around that by ignoring the system's ++# attempt to define "bool" and using our own symbol here. ++sed -e 's/bool/P_NCURSES_BOOL/g' $TMP > $ED2 ++cat $ED2 >$TMP ++ + $preprocessor $TMP 2>/dev/null \ +-| sed \ +- -e 's/ / /g' \ +- -e 's/^ //' \ +- -e 's/_Bool/NCURSES_BOOL/g' \ ++| sed -f $ED1 \ + | $AWK -f $AW2 \ + | sed -f $ED3 \ + | sed \ 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/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix index c4257fe97d2..5cd5f0cb629 100644 --- a/pkgs/development/libraries/nghttp2/default.nix +++ b/pkgs/development/libraries/nghttp2/default.nix @@ -34,12 +34,12 @@ let in stdenv.mkDerivation rec { name = "${prefix}nghttp2-${version}"; - version = "1.2.1"; + version = "1.3.4"; # Don't use fetchFromGitHub since this needs a bootstrap curl src = fetchurl { url = "http://pub.wak.io/nixos/tarballs/nghttp2-${version}.tar.bz2"; - sha256 = "8027461a231d205394890b2fee34d1c3751e28e7d3f7c1ebc1b557993ea4045e"; + sha256 = "63c1d70e50f0c8514e261be88b66720df095269791aa008d76c09e0c3a4c085f"; }; # Configure script searches for a symbol which does not exist in jemalloc on Darwin @@ -66,6 +66,7 @@ stdenv.mkDerivation rec { (mkWith (optJemalloc != null) "jemalloc" null) (mkWith false "spdylay" null) (mkWith false "cython" null) + (mkWith false "mruby" null) ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix index 5050741dcbc..ef4dde42597 100644 --- a/pkgs/development/libraries/nspr/default.nix +++ b/pkgs/development/libraries/nspr/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl }: -let version = "4.10.9"; in +let version = "4.10.10"; in stdenv.mkDerivation { name = "nspr-${version}"; src = fetchurl { url = "http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${version}/src/nspr-${version}.tar.gz"; - sha256 = "4112ff6ad91d32696ca0c6c3d4abef6367b5dc0127fa172fcb3c3ab81bb2d881"; + sha256 = "343614971c30520d0fa55f4af0a72578e2d8674bb71caf7187490c3379523107"; }; outputs = [ "dev" "out" ]; diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index fd5834b206e..20290b4c87a 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation rec { name = "nss-${version}"; - version = "3.20"; + version = "3.20.1"; src = fetchurl { - url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_20_RTM/src/${name}.tar.gz"; - sha256 = "5e38d4b9837ca338af966b97fc91c07f67ad647fb38dc4af3cfd0d84e477d15c"; + url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_20_1_RTM/src/${name}.tar.gz"; + sha256 = "ad3c8f11dfd9570c2d04a6140d5ef7c2bdd0fe30d6c9e5548721a4251a5e8c97"; }; buildInputs = [ nspr perl zlib sqlite ]; diff --git a/pkgs/development/libraries/openscenegraph/default.nix b/pkgs/development/libraries/openscenegraph/default.nix index 476f7e14c60..ecb4d82c965 100644 --- a/pkgs/development/libraries/openscenegraph/default.nix +++ b/pkgs/development/libraries/openscenegraph/default.nix @@ -1,6 +1,6 @@ x@{builderDefsPackage , cmake, giflib, libjpeg, libtiff, lib3ds, freetype, libpng - , coin3d, jasper, gdal_1_11_2, xproto, libX11, libXmu, freeglut, mesa + , coin3d, jasper, gdal_1_11, xproto, libX11, libXmu, freeglut, mesa , doxygen, ffmpeg, xineLib, unzip, zlib, openal, libxml2 , curl, a52dec, faad2, gdk_pixbuf, pkgconfig, kbproto, SDL , qt4, poppler, librsvg, gtk diff --git a/pkgs/development/libraries/openssl/1.0.2.x.nix b/pkgs/development/libraries/openssl/1.0.2.x.nix new file mode 100644 index 00000000000..9175da0bca4 --- /dev/null +++ b/pkgs/development/libraries/openssl/1.0.2.x.nix @@ -0,0 +1,91 @@ +{ stdenv, fetchurl, perl +, withCryptodev ? false, cryptodevHeaders }: + +with stdenv.lib; +let + opensslCrossSystem = attrByPath [ "openssl" "system" ] + (throw "openssl needs its platform name cross building" null) + stdenv.cross; +in +stdenv.mkDerivation rec { + name = "openssl-1.0.2d"; + + src = fetchurl { + urls = [ + "http://www.openssl.org/source/${name}.tar.gz" + "http://openssl.linux-mirror.org/source/${name}.tar.gz" + ]; + sha1 = "d01d17b44663e8ffa6a33a5a30053779d9593c3d"; + }; + + patches = optional stdenv.isCygwin ./1.0.1-cygwin64.patch; + + nativeBuildInputs = [ perl ]; + buildInputs = stdenv.lib.optional withCryptodev cryptodevHeaders; + + # On x86_64-darwin, "./config" misdetects the system as + # "darwin-i386-cc". So specify the system type explicitly. + configureScript = + if stdenv.system == "x86_64-darwin" then "./Configure darwin64-x86_64-cc" + else if stdenv.system == "x86_64-solaris" then "./Configure solaris64-x86_64-gcc" + else "./config"; + + configureFlags = [ + "shared" + "--libdir=lib" + "--openssldir=etc/ssl" + ] ++ stdenv.lib.optionals withCryptodev [ + "-DHAVE_CRYPTODEV" + "-DUSE_CRYPTODEV_DIGESTS" + ]; + + makeFlags = [ + "MANDIR=$(out)/share/man" + ]; + + # Parallel building is broken in OpenSSL. + enableParallelBuilding = false; + + postInstall = '' + # If we're building dynamic libraries, then don't install static + # libraries. + if [ -n "$(echo $out/lib/*.so $out/lib/*.dylib $out/lib/*.dll)" ]; then + rm "$out/lib/"*.a + fi + + # remove dependency on Perl at runtime + rm -r $out/etc/ssl/misc $out/bin/c_rehash + ''; + + postFixup = '' + # Check to make sure we don't depend on perl + if grep -r '${perl}' $out; then + echo "Found an erroneous dependency on perl ^^^" >&2 + exit 1 + fi + ''; + + crossAttrs = { + # upstream patch: https://rt.openssl.org/Ticket/Display.html?id=2558 + postPatch = '' + sed -i -e 's/[$][(]CROSS_COMPILE[)]windres/$(WINDRES)/' Makefile.shared + ''; + preConfigure='' + # It's configure does not like --build or --host + export configureFlags="${concatStringsSep " " (configureFlags ++ [ opensslCrossSystem ])}" + # WINDRES and RANLIB need to be prefixed when cross compiling; + # the openssl configure script doesn't do that for us + export WINDRES=${stdenv.cross.config}-windres + export RANLIB=${stdenv.cross.config}-ranlib + ''; + configureScript = "./Configure"; + }; + + meta = { + homepage = http://www.openssl.org/; + description = "A cryptographic library that implements the SSL and TLS protocols"; + platforms = stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.simons ]; + priority = 10; # resolves collision with ‘man-pages’ + }; +} diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index d5d6a3caa79..2df2847e898 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -8,14 +8,14 @@ let stdenv.cross; in stdenv.mkDerivation rec { - name = "openssl-1.0.2d"; + name = "openssl-1.0.1p"; src = fetchurl { urls = [ "http://www.openssl.org/source/${name}.tar.gz" "http://openssl.linux-mirror.org/source/${name}.tar.gz" ]; - sha256 = "671c36487785628a703374c652ad2cebea45fa920ae5681515df25d9f2c9a8c8"; + sha1 = "9d1977cc89242cd11471269ece2ed4650947c046"; }; patches = optional stdenv.isCygwin ./1.0.1-cygwin64.patch @@ -74,11 +74,18 @@ stdenv.mkDerivation rec { ''; crossAttrs = { + # upstream patch: https://rt.openssl.org/Ticket/Display.html?id=2558 + postPatch = '' + sed -i -e 's/[$][(]CROSS_COMPILE[)]windres/$(WINDRES)/' Makefile.shared + ''; preConfigure='' # It's configure does not like --build or --host export configureFlags="${concatStringsSep " " (configureFlags ++ [ opensslCrossSystem ])}" + # WINDRES and RANLIB need to be prefixed when cross compiling; + # the openssl configure script doesn't do that for us + export WINDRES=${stdenv.cross.config}-windres + export RANLIB=${stdenv.cross.config}-ranlib ''; - configureScript = "./Configure"; }; 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/development/libraries/pcre2/default.nix b/pkgs/development/libraries/pcre2/default.nix new file mode 100644 index 00000000000..4f8d5cf1aaa --- /dev/null +++ b/pkgs/development/libraries/pcre2/default.nix @@ -0,0 +1,23 @@ +{ 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"; + }; + + configureFlags = [ + "--enable-pcre2-16" + "--enable-pcre2-32" + "--enable-jit" + ]; + + 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/development/libraries/protobuf/generic.nix b/pkgs/development/libraries/protobuf/generic.nix index 692891bd5bf..fc41187a931 100644 --- a/pkgs/development/libraries/protobuf/generic.nix +++ b/pkgs/development/libraries/protobuf/generic.nix @@ -12,6 +12,9 @@ stdenv.mkDerivation rec { rm -rf gtest cp -r ${gtest.source} gtest chmod -R a+w gtest + '' + stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace src/google/protobuf/testing/googletest.cc \ + --replace 'tmpnam(b)' '"'$TMPDIR'/foo"' ''; buildInputs = [ autoreconfHook zlib ]; diff --git a/pkgs/development/libraries/pugixml/default.nix b/pkgs/development/libraries/pugixml/default.nix index 153d3ce8e80..b866a347d95 100644 --- a/pkgs/development/libraries/pugixml/default.nix +++ b/pkgs/development/libraries/pugixml/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "pugixml-${version}"; - version = "1.6"; + version = "1.7"; src = fetchurl { url = "https://github.com/zeux/pugixml/releases/download/v${version}/${name}.tar.gz"; - sha256 = "1pnrdi8n9fdclmhxri3jwc6xwpgvblbjnqkk9ykycpnljv20ads7"; + sha256 = "1jpml475kbhs1aqwa48g2cbfxlrb9qp115m2j9yryxhxyr30vqgv"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/qt-5/5.5/default.nix b/pkgs/development/libraries/qt-5/5.5/default.nix index 418ab88cd9f..10d7f6eb914 100644 --- a/pkgs/development/libraries/qt-5/5.5/default.nix +++ b/pkgs/development/libraries/qt-5/5.5/default.nix @@ -18,7 +18,7 @@ , decryptSslTraffic ? false }: -let inherit (pkgs) stdenv; in +let inherit (pkgs) makeSetupHook makeWrapper stdenv; in with stdenv.lib; @@ -73,15 +73,17 @@ let /* qtandroidextras = not packaged */ /* qtcanvas3d = not packaged */ qtconnectivity = callPackage ./qtconnectivity.nix {}; - qtdeclarative = callPackage ./qtdeclarative.nix {}; + qtdeclarative = callPackage ./qtdeclarative {}; qtdoc = callPackage ./qtdoc.nix {}; qtenginio = callPackage ./qtenginio.nix {}; qtgraphicaleffects = callPackage ./qtgraphicaleffects.nix {}; qtimageformats = callPackage ./qtimageformats.nix {}; qtlocation = callPackage ./qtlocation.nix {}; /* qtmacextras = not packaged */ - qtmultimedia = callPackage ./qtmultimedia.nix {}; - qtquick1 = callPackage ./qtquick1.nix {}; + qtmultimedia = callPackage ./qtmultimedia.nix { + inherit (pkgs.gst_all_1) gstreamer gst-plugins-base; + }; + qtquick1 = callPackage ./qtquick1 {}; qtquickcontrols = callPackage ./qtquickcontrols.nix {}; qtscript = callPackage ./qtscript {}; qtsensors = callPackage ./qtsensors.nix {}; @@ -99,6 +101,8 @@ let qtx11extras = callPackage ./qtx11extras.nix {}; qtxmlpatterns = callPackage ./qtxmlpatterns.nix {}; + makeQtWrapper = makeSetupHook { deps = [ makeWrapper ]; } ./make-qt-wrapper.sh; + }; in makeScope pkgs.newScope addPackages diff --git a/pkgs/development/libraries/qt-5/5.5/make-qt-wrapper.sh b/pkgs/development/libraries/qt-5/5.5/make-qt-wrapper.sh new file mode 100644 index 00000000000..d61665455bf --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.5/make-qt-wrapper.sh @@ -0,0 +1,42 @@ +addQtDependency() { + addToSearchPath QT_PLUGIN_PATH "$1/lib/qt5/plugins" + addToSearchPath QML_IMPORT_PATH "$1/lib/qt5/imports" + addToSearchPath QML2_IMPORT_PATH "$1/lib/qt5/qml" + addToSearchPath XDG_CONFIG_DIRS "$1/etc/xdg" + addToSearchPath XDG_DATA_DIRS "$1/share" +} + +wrapQtProgram() { + local prog="$1" + shift + wrapProgram "$prog" \ + --prefix QT_PLUGIN_PATH : "$QT_PLUGIN_PATH" \ + --prefix QML_IMPORT_PATH : "$QML_IMPORT_PATH" \ + --prefix QML2_IMPORT_PATH : "$QML2_IMPORT_PATH" \ + --prefix XDG_CONFIG_DIRS : "$XDG_CONFIG_DIRS" \ + --prefix XDG_DATA_DIRS : "$XDG_DATA_DIRS" \ + "$@" +} + +makeQtWrapper() { + local old="$1" + local new="$2" + shift + shift + makeWrapper "$old" "$new" \ + --prefix QT_PLUGIN_PATH : "$QT_PLUGIN_PATH" \ + --prefix QML_IMPORT_PATH : "$QML_IMPORT_PATH" \ + --prefix QML2_IMPORT_PATH : "$QML2_IMPORT_PATH" \ + --prefix XDG_CONFIG_DIRS : "$XDG_CONFIG_DIRS" \ + --prefix XDG_DATA_DIRS : "$XDG_DATA_DIRS" \ + "$@" +} + +# cannot use addToSearchPath because these directories may not exist yet +export QT_PLUGIN_PATH="$QT_PLUGIN_PATH${QT_PLUGIN_PATH:+:}$out/lib/qt5/plugins" +export QML_IMPORT_PATH="$QML_IMPORT_PATH${QML_IMPORT_PATH:+:}$out/lib/qt5/imports" +export QML2_IMPORT_PATH="$QML2_IMPORT_PATH${QML2_IMPORT_PATH:+:}$out/lib/qt5/qml" +export XDG_CONFIG_DIRS="$XDG_CONFIG_DIRS${XDG_CONFIG_DIRS:+:}$out/etc/xdg" +export XDG_DATA_DIRS="$XDG_DATA_DIRS${XDG_DATA_DIRS:+:}$out/share" + +envHooks+=(addQtDependency) diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/0001-dlopen-gtkstyle.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/0001-dlopen-gtkstyle.patch index b86dfaf628b..a4211378b90 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/0001-dlopen-gtkstyle.patch +++ b/pkgs/development/libraries/qt-5/5.5/qtbase/0001-dlopen-gtkstyle.patch @@ -1,7 +1,7 @@ -From d3224286c647f1d1e7dac485bbeee5bc8286e6c6 Mon Sep 17 00:00:00 2001 +From 5334f7d5d3e7be31ea25c3553dfb60f283a14669 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel <ttuegel@gmail.com> Date: Mon, 1 Dec 2014 17:21:58 -0600 -Subject: [PATCH 1/9] dlopen-gtkstyle +Subject: [PATCH 01/11] dlopen-gtkstyle --- qtbase/src/widgets/styles/qgtk2painter.cpp | 2 +- @@ -59,5 +59,5 @@ index 0e119a1..ad6caa1 100644 return (QGtkStylePrivate::gconf_client_get_default !=0); } -- -2.5.0 +2.5.2 diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/0002-dlopen-resolv.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/0002-dlopen-resolv.patch index 90afce32dc1..ce768fec80c 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/0002-dlopen-resolv.patch +++ b/pkgs/development/libraries/qt-5/5.5/qtbase/0002-dlopen-resolv.patch @@ -1,7 +1,7 @@ -From af315c076c8626292075592fab1726fcd62c3169 Mon Sep 17 00:00:00 2001 +From 51ae02d8c9de1cb93bf22b2519efb119dd2e39d9 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel <ttuegel@gmail.com> Date: Mon, 1 Dec 2014 17:22:55 -0600 -Subject: [PATCH 2/9] dlopen-resolv +Subject: [PATCH 02/11] dlopen-resolv --- qtbase/src/network/kernel/qdnslookup_unix.cpp | 2 +- @@ -35,5 +35,5 @@ index 90a6f76..758407a 100644 return; } -- -2.5.0 +2.5.2 diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/0003-dlopen-gl.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/0003-dlopen-gl.patch index a8a0bdf4410..0f8bd78aa32 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/0003-dlopen-gl.patch +++ b/pkgs/development/libraries/qt-5/5.5/qtbase/0003-dlopen-gl.patch @@ -1,7 +1,7 @@ -From fc9f34b6e8a290615868e27bfcd31c355d11487c Mon Sep 17 00:00:00 2001 +From d1f7bf62e4bab26df5deea37f08cfdd278cca47c Mon Sep 17 00:00:00 2001 From: Thomas Tuegel <ttuegel@gmail.com> Date: Mon, 1 Dec 2014 17:23:08 -0600 -Subject: [PATCH 3/9] dlopen-gl +Subject: [PATCH 03/11] dlopen-gl --- .../plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp | 2 +- @@ -21,5 +21,5 @@ index 5166372..bdeb69a 100644 } } -- -2.5.0 +2.5.2 diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/0004-tzdir.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/0004-tzdir.patch index a4e9cd986a2..c2564df4e1a 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/0004-tzdir.patch +++ b/pkgs/development/libraries/qt-5/5.5/qtbase/0004-tzdir.patch @@ -1,7 +1,7 @@ -From b1a0771652ddf91058f67fa92260a89c43f5c530 Mon Sep 17 00:00:00 2001 +From 26c73d6da84f1b4797421b9ddecef18d6ce588f0 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel <ttuegel@gmail.com> Date: Mon, 1 Dec 2014 17:23:22 -0600 -Subject: [PATCH 4/9] tzdir +Subject: [PATCH 04/11] tzdir --- qtbase/src/corelib/tools/qtimezoneprivate_tz.cpp | 21 +++++++++++++++------ @@ -48,5 +48,5 @@ index 29f0e17..3878974 100644 } -- -2.5.0 +2.5.2 diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/0005-dlopen-libXcursor.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/0005-dlopen-libXcursor.patch index fe53e0e7c48..61c9b9846f5 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/0005-dlopen-libXcursor.patch +++ b/pkgs/development/libraries/qt-5/5.5/qtbase/0005-dlopen-libXcursor.patch @@ -1,7 +1,7 @@ -From 5fbe717120864d490fa4d60bc7f7676ac19bd69d Mon Sep 17 00:00:00 2001 +From 9fbdfd6c1231ee4778acc9a2edf297cf4b9314ac Mon Sep 17 00:00:00 2001 From: Thomas Tuegel <ttuegel@gmail.com> Date: Mon, 1 Dec 2014 17:33:51 -0600 -Subject: [PATCH 5/9] dlopen-libXcursor +Subject: [PATCH 05/11] dlopen-libXcursor --- qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp | 4 ++-- @@ -25,5 +25,5 @@ index e51ab85..7ec4b0b 100644 } if (xcursorFound) { -- -2.5.0 +2.5.2 diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/0006-dlopen-openssl.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/0006-dlopen-openssl.patch index 718ff08ca43..ad48133d93f 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/0006-dlopen-openssl.patch +++ b/pkgs/development/libraries/qt-5/5.5/qtbase/0006-dlopen-openssl.patch @@ -1,7 +1,7 @@ -From 4c4b1f2a35644014da79d089d3860e518fa9a27d Mon Sep 17 00:00:00 2001 +From 2d7e4e21291238e2b41d0e173f918cd3530c8ade Mon Sep 17 00:00:00 2001 From: Thomas Tuegel <ttuegel@gmail.com> Date: Sun, 23 Aug 2015 08:52:04 -0500 -Subject: [PATCH 6/9] dlopen openssl +Subject: [PATCH 06/11] dlopen openssl --- qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp | 8 ++++---- @@ -34,5 +34,5 @@ index e2700df..a7ccf88 100644 // libssl.so.0 and libcrypto.so.0 found return pair; -- -2.5.0 +2.5.2 diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/0007-dlopen-dbus.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/0007-dlopen-dbus.patch index 96d268c358b..dcd5855e824 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/0007-dlopen-dbus.patch +++ b/pkgs/development/libraries/qt-5/5.5/qtbase/0007-dlopen-dbus.patch @@ -1,7 +1,7 @@ -From a23141d76cdde068ba1cefdad4a6352c921ce7c9 Mon Sep 17 00:00:00 2001 +From d060d32d8df3e320a12567ebdfc2c1d01c648168 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel <ttuegel@gmail.com> Date: Sun, 23 Aug 2015 08:52:27 -0500 -Subject: [PATCH 7/9] dlopen dbus +Subject: [PATCH 07/11] dlopen dbus --- qtbase/src/dbus/qdbus_symbols.cpp | 2 +- @@ -21,5 +21,5 @@ index b82d92b..f72c9cb 100644 lib->unload(); -- -2.5.0 +2.5.2 diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/0008-xdg-config-dirs.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/0008-xdg-config-dirs.patch index 4d23d640df0..ebb572081bf 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/0008-xdg-config-dirs.patch +++ b/pkgs/development/libraries/qt-5/5.5/qtbase/0008-xdg-config-dirs.patch @@ -1,7 +1,7 @@ -From a7dc6209542ef8aa54191c0e17fbb9b41cbad67f Mon Sep 17 00:00:00 2001 +From 253c0829d4bc30da0152a22114a949449796ec7d Mon Sep 17 00:00:00 2001 From: Thomas Tuegel <ttuegel@gmail.com> Date: Sun, 23 Aug 2015 08:52:57 -0500 -Subject: [PATCH 8/9] xdg config dirs +Subject: [PATCH 08/11] xdg config dirs --- qtbase/src/corelib/io/qsettings.cpp | 18 ++++++++++++++++++ @@ -51,5 +51,5 @@ index 93d63fd..160b197 100644 SandboxConfFile = 0, NumConfFiles = 1 -- -2.5.0 +2.5.2 diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/0009-decrypt-ssl-traffic.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/0009-decrypt-ssl-traffic.patch index 8c8ec697458..1d7202924cd 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/0009-decrypt-ssl-traffic.patch +++ b/pkgs/development/libraries/qt-5/5.5/qtbase/0009-decrypt-ssl-traffic.patch @@ -1,7 +1,7 @@ -From 64bc88615a4cb58d461fe600b46611415d74b7b2 Mon Sep 17 00:00:00 2001 +From 44378743aa6ca21eb61de93476daa8356081c0fc Mon Sep 17 00:00:00 2001 From: Thomas Tuegel <ttuegel@gmail.com> Date: Sun, 23 Aug 2015 08:53:42 -0500 -Subject: [PATCH 9/9] decrypt ssl traffic +Subject: [PATCH 09/11] decrypt ssl traffic --- qtbase/src/network/ssl/qsslsocket_openssl.cpp | 2 +- @@ -21,5 +21,5 @@ index 049666b..e8342ab 100644 #include "qssl_p.h" #include "qsslsocket_openssl_p.h" -- -2.5.0 +2.5.2 diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/0010-mkspecs-libgl.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/0010-mkspecs-libgl.patch new file mode 100644 index 00000000000..3a60abb5f4a --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.5/qtbase/0010-mkspecs-libgl.patch @@ -0,0 +1,27 @@ +From 5113406661f06afa01da48ebc0567a4d0f69051c Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel <ttuegel@gmail.com> +Date: Sat, 17 Oct 2015 09:12:46 -0500 +Subject: [PATCH 10/11] mkspecs libgl + +--- + qtbase/mkspecs/common/linux.conf | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/qtbase/mkspecs/common/linux.conf b/qtbase/mkspecs/common/linux.conf +index 8d6fb6f..0ff9181 100644 +--- a/qtbase/mkspecs/common/linux.conf ++++ b/qtbase/mkspecs/common/linux.conf +@@ -12,8 +12,8 @@ QMAKE_INCDIR = + QMAKE_LIBDIR = + QMAKE_INCDIR_X11 = + QMAKE_LIBDIR_X11 = +-QMAKE_INCDIR_OPENGL = +-QMAKE_LIBDIR_OPENGL = ++QMAKE_INCDIR_OPENGL = @mesa_inc@/include ++QMAKE_LIBDIR_OPENGL = @mesa_lib@/lib + QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL + QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL + QMAKE_INCDIR_EGL = +-- +2.5.2 + diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/0011-nix-profiles-library-paths.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/0011-nix-profiles-library-paths.patch new file mode 100644 index 00000000000..8eaf2f4ffac --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.5/qtbase/0011-nix-profiles-library-paths.patch @@ -0,0 +1,38 @@ +From 2da5e660c4b470444e756f2ec88cb520a124bc99 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel <ttuegel@gmail.com> +Date: Sat, 17 Oct 2015 09:20:35 -0500 +Subject: [PATCH] nix profiles library paths + +--- + qtbase/src/corelib/kernel/qcoreapplication.cpp | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +diff --git a/qtbase/src/corelib/kernel/qcoreapplication.cpp b/qtbase/src/corelib/kernel/qcoreapplication.cpp +index ecafe91..96e3eb5 100644 +--- a/qtbase/src/corelib/kernel/qcoreapplication.cpp ++++ b/qtbase/src/corelib/kernel/qcoreapplication.cpp +@@ -2496,6 +2496,21 @@ QStringList QCoreApplication::libraryPaths() + } + } + } ++ ++ // Add library paths derived from NIX_PROFILES. ++ const QByteArray nixProfilesEnv = qgetenv("NIX_PROFILES"); ++ if (!nixProfilesEnv.isEmpty()) { ++ QLatin1Char pathSep(' '); ++ QStringList paths = QFile::decodeName(nixProfilesEnv).split(pathSep, QString::SkipEmptyParts); ++ for (QStringList::iterator it = paths.begin(); it != paths.end(); ++it) { ++ it->append("/lib/qt5/plugins"); ++ QString canonicalPath = QDir(*it).canonicalPath(); ++ if (!canonicalPath.isEmpty() ++ && !app_libpaths->contains(canonicalPath)) { ++ app_libpaths->append(canonicalPath); ++ } ++ } ++ } + } + return *(coreappdata()->app_libpaths); + } +-- +2.5.2 + diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/0014-mkspecs-libgl.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/0014-mkspecs-libgl.patch deleted file mode 100644 index 4ec1947f6f9..00000000000 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/0014-mkspecs-libgl.patch +++ /dev/null @@ -1,17 +0,0 @@ -Ensure Qt knows where libGL is. - -Author: Bjørn Forsman <bjorn.forsman@gmail.com> -diff -uNr qt-everywhere-opensource-src-5.3.2.orig/qtbase/mkspecs/common/linux.conf qt-everywhere-opensource-src-5.3.2/qtbase/mkspecs/common/linux.conf ---- qt-everywhere-opensource-src-5.3.2.orig/qtbase/mkspecs/common/linux.conf 2014-09-11 12:48:07.000000000 +0200 -+++ qt-everywhere-opensource-src-5.3.2/qtbase/mkspecs/common/linux.conf 2015-08-23 13:03:30.617473019 +0200 -@@ -12,8 +12,8 @@ - QMAKE_LIBDIR = - QMAKE_INCDIR_X11 = - QMAKE_LIBDIR_X11 = --QMAKE_INCDIR_OPENGL = --QMAKE_LIBDIR_OPENGL = -+QMAKE_INCDIR_OPENGL = @mesa_inc@/include -+QMAKE_LIBDIR_OPENGL = @mesa_lib@/lib - QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL - QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL - QMAKE_INCDIR_EGL = diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix index 2bafa8deba4..1ec89acfcd2 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix +++ b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix @@ -86,13 +86,14 @@ stdenv.mkDerivation { xdg-config-dirs = ./0008-xdg-config-dirs.patch; decrypt-ssl-traffic = ./0009-decrypt-ssl-traffic.patch; mkspecs-libgl = substituteAll { - src = ./0014-mkspecs-libgl.patch; + src = ./0010-mkspecs-libgl.patch; mesa_inc = mesa.dev; mesa_lib = mesa.out; }; + nix-profiles-library-paths = ./0011-nix-profiles-library-paths.patch; in [ dlopen-resolv dlopen-gl tzdir dlopen-libXcursor dlopen-openssl - dlopen-dbus xdg-config-dirs + dlopen-dbus xdg-config-dirs nix-profiles-library-paths ] ++ optional gtkStyle dlopen-gtkstyle ++ optional decryptSslTraffic decrypt-ssl-traffic 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..b86b6df28ac 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 @@ -18,22 +18,25 @@ addQtModule() { fi done fi +} - if [[ -d "$1/lib/qt5/plugins" ]]; then - addToSearchPath QT_PLUGIN_PATH "$1/lib/qt5/plugins" - fi - - if [[ -d "$1/lib/qt5/imports" ]]; then - addToSearchPath QML_IMPORT_PATH "$1/lib/qt5/imports" - fi - - if [[ -d "$1/lib/qt5/qml" ]]; then - addToSearchPath QML2_IMPORT_PATH "$1/lib/qt5/qml" - fi - - if [[ -d "$1/share" ]]; then - addToSearchPath XDG_DATA_DIRS "$1/share" - fi +propagateRuntimeDeps() { + local propagated + for dir in "etc/xdg" "lib/qt5/plugins" "lib/qt5/qml" "lib/qt5/imports" "share"; do + if [[ -d "$1/$dir" ]]; then + propagated= + for pkg in $propagatedBuildInputs; do + if [[ "z$pkg" == "z$1" ]]; then + propagated=1 + break + fi + done + if [[ -z $propagated ]]; then + propagatedBuildInputs="$propagatedBuildInputs $1" + fi + break + fi + done } rmQtModules() { @@ -60,17 +63,9 @@ setQMakePath() { export PATH="$qtOut/bin${PATH:+:}$PATH" } -wrapQtProgram() { - wrapProgram "$1" \ - --set QT_PLUGIN_PATH : "$QT_PLUGIN_PATH" \ - --set QML_IMPORT_PATH : "$QML_IMPORT_PATH" \ - --set QML2_IMPORT_PATH : "$QML2_IMPORT_PATH" \ - "$@" -} - qtOut="" if [[ -z "$NIX_QT_SUBMODULE" ]]; then - qtOut="$PWD/qmake-$name" + qtOut=`mktemp -d` else qtOut=$out fi @@ -88,12 +83,8 @@ Documentation = share/doc/qt5 EOF export QMAKE="$qtOut/bin/qmake" -addToSearchPath QT_PLUGIN_PATH "$out/lib/qt5/plugins" -addToSearchPath QML_IMPORT_PATH "$out/lib/qt5/imports" -addToSearchPath QML2_IMPORT_PATH "$out/lib/qt5/qml" -addToSearchPath XDG_DATA_DIRS "$out/share" -envHooks+=(addQtModule) +envHooks+=(addQtModule propagateRuntimeDeps) preConfigurePhases+=(setQMakePath) if [[ -n "$NIX_QT_SUBMODULE" ]]; then diff --git a/pkgs/development/libraries/qt-5/5.5/qtdeclarative/0001-nix-profiles-import-paths.patch b/pkgs/development/libraries/qt-5/5.5/qtdeclarative/0001-nix-profiles-import-paths.patch new file mode 100644 index 00000000000..8e86f97a947 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.5/qtdeclarative/0001-nix-profiles-import-paths.patch @@ -0,0 +1,37 @@ +From 3f6fa74067aacd0e595e45b4ef7ce754514cb205 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel <ttuegel@gmail.com> +Date: Sat, 17 Oct 2015 09:28:18 -0500 +Subject: [PATCH] nix profiles import paths + +--- + src/qml/qml/qqmlimport.cpp | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +diff --git a/src/qml/qml/qqmlimport.cpp b/src/qml/qml/qqmlimport.cpp +index 5a54609..f33c2f9 100644 +--- a/src/qml/qml/qqmlimport.cpp ++++ b/src/qml/qml/qqmlimport.cpp +@@ -1549,6 +1549,20 @@ QQmlImportDatabase::QQmlImportDatabase(QQmlEngine *e) + QString installImportsPath = QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath); + addImportPath(installImportsPath); + ++ // Add import paths derived from NIX_PROFILES. ++ const QByteArray nixProfilesEnv = qgetenv("NIX_PROFILES"); ++ if (!nixProfilesEnv.isEmpty()) { ++ QLatin1Char pathSep(' '); ++ QStringList paths = QFile::decodeName(nixProfilesEnv).split(pathSep, QString::SkipEmptyParts); ++ for (QStringList::iterator it = paths.begin(); it != paths.end(); ++it) { ++ it->append("/lib/qt5/qml"); ++ QString canonicalPath = QDir(*it).canonicalPath(); ++ if (!canonicalPath.isEmpty()) { ++ addImportPath(canonicalPath); ++ } ++ } ++ } ++ + // env import paths + QByteArray envImportPath = qgetenv("QML2_IMPORT_PATH"); + if (!envImportPath.isEmpty()) { +-- +2.5.2 + diff --git a/pkgs/development/libraries/qt-5/5.5/qtdeclarative.nix b/pkgs/development/libraries/qt-5/5.5/qtdeclarative/default.nix index a71f11b7d40..9181c37b225 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtdeclarative.nix +++ b/pkgs/development/libraries/qt-5/5.5/qtdeclarative/default.nix @@ -2,6 +2,7 @@ qtSubmodule { name = "qtdeclarative"; + patches = [ ./0001-nix-profiles-import-paths.patch ]; qtInputs = [ qtbase qtsvg qtxmlpatterns ]; nativeBuildInputs = [ python ]; } diff --git a/pkgs/development/libraries/qt-5/5.5/qtmultimedia.nix b/pkgs/development/libraries/qt-5/5.5/qtmultimedia.nix index 7d70cf0e371..b6b4d8ea0cf 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtmultimedia.nix +++ b/pkgs/development/libraries/qt-5/5.5/qtmultimedia.nix @@ -1,11 +1,12 @@ -{ qtSubmodule, qtbase, qtdeclarative -, alsaLib, gstreamer, gst_plugins_base, libpulseaudio +{ qtSubmodule, qtbase, qtdeclarative, pkgconfig +, alsaLib, gstreamer, gst-plugins-base, libpulseaudio }: qtSubmodule { name = "qtmultimedia"; qtInputs = [ qtbase qtdeclarative ]; buildInputs = [ - alsaLib gstreamer gst_plugins_base libpulseaudio + pkgconfig alsaLib gstreamer gst-plugins-base libpulseaudio ]; + configureFlags = "GST_VERSION=1.0"; } diff --git a/pkgs/development/libraries/qt-5/5.5/qtquick1/0001-nix-profiles-import-paths.patch b/pkgs/development/libraries/qt-5/5.5/qtquick1/0001-nix-profiles-import-paths.patch new file mode 100644 index 00000000000..63b141f6ce5 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.5/qtquick1/0001-nix-profiles-import-paths.patch @@ -0,0 +1,37 @@ +From bbc706b3fcb90ca3b2b51d5e3434145572152711 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel <ttuegel@gmail.com> +Date: Sat, 17 Oct 2015 09:29:51 -0500 +Subject: [PATCH] nix profiles import paths + +--- + src/declarative/qml/qdeclarativeimport.cpp | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +diff --git a/src/declarative/qml/qdeclarativeimport.cpp b/src/declarative/qml/qdeclarativeimport.cpp +index 9404834..d185ed5 100644 +--- a/src/declarative/qml/qdeclarativeimport.cpp ++++ b/src/declarative/qml/qdeclarativeimport.cpp +@@ -725,6 +725,20 @@ QDeclarativeImportDatabase::QDeclarativeImportDatabase(QDeclarativeEngine *e) + + addImportPath(installImportsPath); + ++ // Add import paths derived from NIX_PROFILES. ++ const QByteArray nixProfilesEnv = qgetenv("NIX_PROFILES"); ++ if (!nixProfilesEnv.isEmpty()) { ++ QLatin1Char pathSep(' '); ++ QStringList paths = QFile::decodeName(nixProfilesEnv).split(pathSep, QString::SkipEmptyParts); ++ for (QStringList::iterator it = paths.begin(); it != paths.end(); ++it) { ++ it->append("/lib/qt5/imports"); ++ QString canonicalPath = QDir(*it).canonicalPath(); ++ if (!canonicalPath.isEmpty()) { ++ addImportPath(canonicalPath); ++ } ++ } ++ } ++ + // env import paths + QByteArray envImportPath = qgetenv("QML_IMPORT_PATH"); + if (!envImportPath.isEmpty()) { +-- +2.5.2 + diff --git a/pkgs/development/libraries/qt-5/5.5/qtquick1.nix b/pkgs/development/libraries/qt-5/5.5/qtquick1/default.nix index 23282e02906..d1c7bb389a4 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtquick1.nix +++ b/pkgs/development/libraries/qt-5/5.5/qtquick1/default.nix @@ -2,5 +2,6 @@ qtSubmodule { name = "qtquick1"; + patches = [ ./0001-nix-profiles-import-paths.patch ]; qtInputs = [ qtscript qtsvg qtwebkit qtxmlpatterns ]; } diff --git a/pkgs/development/libraries/rabbitmq-c/default.nix b/pkgs/development/libraries/rabbitmq-c/default.nix index 639c8fb1ead..0ab9cd1df04 100644 --- a/pkgs/development/libraries/rabbitmq-c/default.nix +++ b/pkgs/development/libraries/rabbitmq-c/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "rabbitmq-c-${version}"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "alanxz"; repo = "rabbitmq-c"; rev = "v${version}"; - sha256 = "1nfb82lbccr46wr4a2fsrkvpvdvmnyx8kn275hvdfz7mxpkd5qy6"; + sha256 = "084zlir59zc505nxd4m2g9d355m9a8y94gbjaqmjz9kym8lpayd1"; }; buildInputs = [ cmake openssl popt xmlto ]; diff --git a/pkgs/development/libraries/rdkafka/default.nix b/pkgs/development/libraries/rdkafka/default.nix index d8ef878db2c..32fff70ebfb 100644 --- a/pkgs/development/libraries/rdkafka/default.nix +++ b/pkgs/development/libraries/rdkafka/default.nix @@ -1,14 +1,13 @@ { stdenv, fetchFromGitHub, zlib, perl }: stdenv.mkDerivation rec { - name = "rdkafka-${version}"; - version = "0.8.6"; + name = "rdkafka-2015-11-03"; src = fetchFromGitHub { owner = "edenhill"; repo = "librdkafka"; - rev = version; - sha256 = "0iklvslz35dd0lz26ffrbfb20qirl9v5kcdmlcnnzc034hr2zmnv"; + rev = "3e1babf4f26a7d12bbd272c1cdf4aa6a44000d4a"; + sha256 = "1vmbbkgdwxr25wz60hi6rhqb843ipz34r9baygv87fwh3lwwkqwl"; }; buildInputs = [ zlib perl ]; diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix index 1ea90340021..54e711de256 100644 --- a/pkgs/development/libraries/rocksdb/default.nix +++ b/pkgs/development/libraries/rocksdb/default.nix @@ -13,13 +13,13 @@ let in stdenv.mkDerivation rec { name = "rocksdb-${version}"; - version = "3.13.1"; + version = "4.0"; src = fetchFromGitHub { owner = "facebook"; repo = "rocksdb"; - rev = "rocksdb-${version}"; - sha256 = "1jw2sjvpixz565wvmgls4rly3wylcmyypka4pvd9mhxkq8d699h9"; + rev = "v${version}"; + sha256 = "0zm4165h5fklcf4n8dar6mdj36g2kzp2pwf7fqnify1r48xwm8hx"; }; buildInputs = [ snappy google-gflags zlib bzip2 lz4 numactl malloc ]; diff --git a/pkgs/development/libraries/science/math/atlas/default.nix b/pkgs/development/libraries/science/math/atlas/default.nix index f4bda4f4735..1fa48ffea91 100644 --- a/pkgs/development/libraries/science/math/atlas/default.nix +++ b/pkgs/development/libraries/science/math/atlas/default.nix @@ -63,7 +63,8 @@ stdenv.mkDerivation { # performance timings. We ignore that check, however, because with binaries # being pre-built on Hydra those timings aren't accurate for the local # machine in the first place. - patches = optional tolerateCpuTimingInaccuracy ./disable-timing-accuracy-check.patch; + patches = optional tolerateCpuTimingInaccuracy ./disable-timing-accuracy-check.patch + ++ optional stdenv.isDarwin ./tmpdir.patch; # Configure outside of the source directory. preConfigure = '' @@ -106,6 +107,7 @@ stdenv.mkDerivation { homepage = "http://math-atlas.sourceforge.net/"; description = "Automatically Tuned Linear Algebra Software (ATLAS)"; license = stdenv.lib.licenses.bsd3; + platforms = stdenv.lib.platforms.linux; longDescription = '' The ATLAS (Automatically Tuned Linear Algebra Software) project is an diff --git a/pkgs/development/libraries/science/math/atlas/tmpdir.patch b/pkgs/development/libraries/science/math/atlas/tmpdir.patch new file mode 100644 index 00000000000..be571b94300 --- /dev/null +++ b/pkgs/development/libraries/science/math/atlas/tmpdir.patch @@ -0,0 +1,276 @@ +diff --git a/CONFIG/ARCHS/negflt.c b/CONFIG/ARCHS/negflt.c +index e5b7871..d45e387 100644 +--- a/CONFIG/ARCHS/negflt.c ++++ b/CONFIG/ARCHS/negflt.c +@@ -239,7 +239,7 @@ void NegFile(char *fnam, int N, int *cols) + FILE *fpin, *fpout; + WORDS *wp0, *wp; + +- tnam = tmpnam(NULL); ++ tnam = tempnam(NULL, NULL); + fpin = fopen(fnam, "r"); + assert(fpin); + fpout = fopen(tnam, "w"); +diff --git a/CONFIG/include/atlas_sys.h b/CONFIG/include/atlas_sys.h +index b83a749..8902d38 100644 +--- a/CONFIG/include/atlas_sys.h ++++ b/CONFIG/include/atlas_sys.h +@@ -216,12 +216,13 @@ static char *ATL_fgets_CWS(char *sout, int *plen, FILE *fpin) + + static char *ATL_tmpnam(void) + { +- static char tnam[L_tmpnam]; ++ static char *tnam; + static char FirstTime=1; + if (FirstTime) + { + FirstTime = 0; +- assert(tmpnam(tnam)); ++ tnam = tempnam(NULL, NULL); ++ assert(tnam); + } + return(tnam); + } +diff --git a/bin/atlas_install.c b/bin/atlas_install.c +index 2753cbf..e49cc3e 100644 +--- a/bin/atlas_install.c ++++ b/bin/atlas_install.c +@@ -662,7 +662,8 @@ void GoToTown(int ARCHDEF, int L1DEF, int TuneLA) + { + const char TR[2] = {'N','T'}; + char prec[4] = {'d', 's', 'z', 'c'}, pre, upre, *typ; +- char ln[1024], tnam[256], ln2[512], ln3[512], fnam[128]; ++ char ln[1024], ln2[512], ln3[512], fnam[128]; ++ char *tnam; + char *mulinst, *peakstr, *peakstr2; + int nprec=4; + int iL1, lat, muladd, maused, latuse, lbnreg; +@@ -681,7 +682,7 @@ void GoToTown(int ARCHDEF, int L1DEF, int TuneLA) + fpsum = fopen("INSTALL_LOG/SUMMARY.LOG", "a"); + ATL_Cassert(fpsum, "OPENING INSTALL_LOG/SUMMARY.LOG", NULL); + +- ATL_Cassert(tmpnam(tnam), "GETTING TEMPFILE", NULL); ++ ATL_Cassert((tnam = tempnam(NULL, NULL)), "GETTING TEMPFILE", NULL); + + if (L1DEF) + { +diff --git a/bin/extract.c b/bin/extract.c +index 7a5a926..53fb8bf 100644 +--- a/bin/extract.c ++++ b/bin/extract.c +@@ -3378,7 +3378,7 @@ void PushProc0(EXTENV *EE, EXTPROC **basep, EXTPROC **myfuncs, char *ln) + pp->argnams = KillWord(wp, wp); + pp->nargs = CountWords(pp->argnams); + +- cp = tmpnam(NULL); ++ cp = tempnam(NULL, NULL); + if (cp == NULL) ExtErr(EE, "Out of tmpnams!!!"); + i = Wstrlen(cp) + 1; + pp->FileNam = malloc(i*sizeof(char)); +diff --git a/include/atlas_mvtesttime.h b/include/atlas_mvtesttime.h +index 9147fcb..ab6a99f 100644 +--- a/include/atlas_mvtesttime.h ++++ b/include/atlas_mvtesttime.h +@@ -105,14 +105,15 @@ static int MVKernelFailsTest + char ln[4096]; + char *sp; + int i, lda0; +- static char outnam[L_tmpnam]; ++ static char* outnam; + static int FirstTime=1; + + if (FirstTime) + { + + FirstTime = 0; +- assert(tmpnam(outnam)); ++ outnam = tempnam(NULL, NULL); ++ assert(outnam); + } + /* + * If the file is generated, call generator to create it +@@ -221,14 +222,15 @@ static double TimeMVKernel + char ln[2048], resf[256], *sp; + double *dp, mf; + int i, align = pre2size(pre); +- static char outnam[L_tmpnam]; ++ static char* outnam; + static int FirstTime=1; + + if (FirstTime) + { + + FirstTime = 0; +- assert(tmpnam(outnam)); ++ outnam = tempnam(NULL, NULL); ++ assert(outnam); + } + /* + * If the file is generated, call generator to create it +diff --git a/include/atlas_r1testtime.h b/include/atlas_r1testtime.h +index b33213a..f27ee25 100644 +--- a/include/atlas_r1testtime.h ++++ b/include/atlas_r1testtime.h +@@ -76,14 +76,15 @@ static int R1KernelFailsTest + char ln[4096]; + char *sp; + int i, lda0; +- static char outnam[L_tmpnam]; ++ static char* outnam; + static int FirstTime=1; + + if (FirstTime) + { + + FirstTime = 0; +- assert(tmpnam(outnam)); ++ outnam = tempnam(NULL, NULL); ++ assert(outnam); + } + /* + * If the file is generated, call generator to create it +@@ -187,14 +188,15 @@ static double TimeR1Kernel + char ln[2048], resf[256], *sp; + double *dp, mf; + int i, align = pre2size(pre); +- static char outnam[L_tmpnam]; ++ static char* outnam; + static int FirstTime=1; + + if (FirstTime) + { + + FirstTime = 0; +- assert(tmpnam(outnam)); ++ outnam = tempnam(NULL, NULL); ++ assert(outnam); + } + /* + * If the file is generated, call generator to create it +diff --git a/include/atlas_r2testtime.h b/include/atlas_r2testtime.h +index facc66d..c638dce 100644 +--- a/include/atlas_r2testtime.h ++++ b/include/atlas_r2testtime.h +@@ -76,14 +76,15 @@ static int R2KernelFailsTest + char ln[4096]; + char *sp; + int i, lda0; +- static char outnam[L_tmpnam]; ++ static char* outnam; + static int FirstTime=1; + + if (FirstTime) + { + + FirstTime = 0; +- assert(tmpnam(outnam)); ++ outnam = tempnam(NULL, NULL); ++ assert(outnam); + } + /* + * If the file is generated, call generator to create it +@@ -187,14 +188,15 @@ static double TimeR2Kernel + char ln[2048], resf[256], *sp; + double *dp, mf; + int i, align = pre2size(pre); +- static char outnam[L_tmpnam]; ++ static char* outnam; + static int FirstTime=1; + + if (FirstTime) + { + + FirstTime = 0; +- assert(tmpnam(outnam)); ++ outnam = tempnam(NULL, NULL); ++ assert(outnam); + } + /* + * If the file is generated, call generator to create it +diff --git a/include/atlas_sys.h b/include/atlas_sys.h +index b83a749..b3f88d2 100644 +--- a/include/atlas_sys.h ++++ b/include/atlas_sys.h +@@ -216,12 +216,13 @@ static char *ATL_fgets_CWS(char *sout, int *plen, FILE *fpin) + + static char *ATL_tmpnam(void) + { +- static char tnam[L_tmpnam]; ++ static char* tnam; + static char FirstTime=1; + if (FirstTime) + { + FirstTime = 0; +- assert(tmpnam(tnam)); ++ tnam = tempnam(NULL, NULL); ++ assert(tnam); + } + return(tnam); + } +diff --git a/tune/blas/gemm/usercomb.c b/tune/blas/gemm/usercomb.c +index 59a7cd4..eb3eb05 100644 +--- a/tune/blas/gemm/usercomb.c ++++ b/tune/blas/gemm/usercomb.c +@@ -138,11 +138,13 @@ int GetUserCase(char pre, int icase, int *iflag, int *mb, int *nb, int *kb, + + void CombineFiles(char *fout, int nfiles, char **fnams) + { +- char tnam[256], ln[512]; ++ char ln[512]; ++ char *tnam; + int i, j, n, nn; + FILE *fpout, *fpin; + +- assert(tmpnam(tnam)); ++ tnam = tempnam(NULL, NULL); ++ assert(tnam); + for (n=i=0; i < nfiles; i++) n += NumUserCases0(fnams[i]); + + fpout = fopen(tnam, "w"); +diff --git a/tune/blas/gemm/userflag.c b/tune/blas/gemm/userflag.c +index c3983e4..b7dd70b 100644 +--- a/tune/blas/gemm/userflag.c ++++ b/tune/blas/gemm/userflag.c +@@ -139,8 +139,8 @@ int GetUserCase(char pre, int icase, int *iflag, int *mb, int *nb, int *kb, + + void GoGetThem(char *infile, char *outfile) + { +- char ln[512], ln2[512], tnam[256], MCC[256], MMFLAGS[256]; +- char *chkfile = "FlagCheck.c", *sp, *sp2; ++ char ln[512], ln2[512], MCC[256], MMFLAGS[256]; ++ char *chkfile = "FlagCheck.c", *sp, *sp2, *tnam; + FILE *fpin, *fpout; + int i, j, n, nmin=0, good; + int wass; +@@ -152,7 +152,8 @@ void GoGetThem(char *infile, char *outfile) + n = NumUserCases0(infile); + fpin = fopen(infile, "r"); + assert(fpin); +- assert(tmpnam(tnam)); ++ tnam = tempnam(NULL, NULL); ++ assert(tnam); + fpout = fopen(tnam, "w"); + assert(fpout); + assert(fgets(ln, 512, fpin)); +diff --git a/tune/sysinfo/emit_buildinfo.c b/tune/sysinfo/emit_buildinfo.c +index 309c06a..3feaea7 100644 +--- a/tune/sysinfo/emit_buildinfo.c ++++ b/tune/sysinfo/emit_buildinfo.c +@@ -41,14 +41,15 @@ static char SMCVERS[LNLEN], DMCVERS[LNLEN], SKCVERS[LNLEN], DKCVERS[LNLEN]; + static char UNAM[64], DATE[128]; + char *CmndResults(char *cmnd) + { +- static char tnam[128]; ++ static char* tnam; + static int FirstTime=1; + char ln[512]; + + if (FirstTime) + { + FirstTime = 0; +- assert(tmpnam(tnam)); ++ tnam = tempnam(NULL, NULL); ++ assert(tnam); + } + sprintf(ln, "%s > %s\n", cmnd, tnam); + fprintf(stderr, "system: %s", ln); diff --git a/pkgs/development/libraries/science/math/blas/default.nix b/pkgs/development/libraries/science/math/blas/default.nix index fa8412ccb6d..07b1e8877fb 100644 --- a/pkgs/development/libraries/science/math/blas/default.nix +++ b/pkgs/development/libraries/science/math/blas/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, gfortran }: -stdenv.mkDerivation { - name = "blas-20110419"; +stdenv.mkDerivation rec { + name = "blas-3.5.0"; src = fetchurl { - url = "http://www.netlib.org/blas/blas.tgz"; - sha256 = "1d931d91byv2svydpj2ipjh1f2sm1h9ns8ik2w5fwaa8qinxz1za"; + url = "http://www.netlib.org/blas/${name}.tgz"; + sha256 = "096a3apnh899abjymjjg8m34hncagkzp9qxw08cms98g71fpfzgg"; }; buildInputs = [gfortran]; 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 = '' diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index a4bf1efbb73..781c0d38ee6 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gfortran, perl, liblapack, config, coreutils +{ stdenv, fetchurl, gfortran, perl, which, config, coreutils # Most packages depending on openblas expect integer width to match pointer width, # but some expect to use 32-bit integers always (for compatibility with reference BLAS). , blas64 ? null @@ -6,6 +6,8 @@ with stdenv.lib; +let blas64_ = blas64; in + let local = config.openblas.preferLocalBuild or false; binary = { i686-linux = "32"; @@ -18,21 +20,21 @@ 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.15"; +in +stdenv.mkDerivation { name = "openblas-${version}"; src = fetchurl { - url = "https://github.com/xianyi/OpenBLAS/tarball/v${version}"; - sha256 = "0av3pd96j8rx5i65f652xv9wqfkaqn0w4ma1gvbyz73i6j2hi9db"; + url = "https://github.com/xianyi/OpenBLAS/archive/v${version}.tar.gz"; + sha256 = "0i4hrjx622vw5ff35wm6cnga3ic8hcfa88p1wlj24a3qb770mi3k"; name = "openblas-${version}.tar.gz"; }; - preBuild = "cp ${liblapack.src} lapack-${liblapack.meta.version}.tgz"; + inherit blas64; - nativeBuildInputs = optionals stdenv.isDarwin [coreutils] ++ [gfortran perl]; + nativeBuildInputs = optionals stdenv.isDarwin [coreutils] ++ [gfortran perl which]; makeFlags = (if local then localFlags else genericFlags) @@ -50,7 +52,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"; 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..e38e6c9e31f --- /dev/null +++ b/pkgs/development/libraries/science/math/openlibm/default.nix @@ -0,0 +1,19 @@ +{ 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"; + }; + + makeFlags = [ "prefix=$(out)" ]; + + 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/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/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; diff --git a/pkgs/development/libraries/signon/default.nix b/pkgs/development/libraries/signon/default.nix index d33edf9726f..fe7a73fa0fe 100644 --- a/pkgs/development/libraries/signon/default.nix +++ b/pkgs/development/libraries/signon/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchzip, doxygen, qtbase }: +{ stdenv, fetchurl, doxygen, qtbase }: stdenv.mkDerivation rec { name = "signon-${version}"; version = "8.57"; - src = fetchzip { - url = "http://signond.accounts-sso.googlecode.com/archive/${version}.zip"; - sha256 = "0q1ncmp27jrwbjkqisf0l63zzpw6bcsx5i4y86xixh8wd5arj87a"; + src = fetchurl { + url = "https://gitlab.com/accounts-sso/signond/repository/archive.tar.gz?ref=${version}"; + sha256 = "1vqkxhmdjk3217k38l2s3wld8x7f4jrbbh6xbr036cn1r23ncni5"; }; buildInputs = [ qtbase ]; diff --git a/pkgs/development/libraries/signon/old.nix b/pkgs/development/libraries/signon/old.nix index 7b3defb8a58..bf211c3b8a3 100644 --- a/pkgs/development/libraries/signon/old.nix +++ b/pkgs/development/libraries/signon/old.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchzip, doxygen, qt5 }: +{ stdenv, fetchurl, doxygen, qt5 }: stdenv.mkDerivation rec { name = "signon-${version}"; version = "8.57"; - src = fetchzip { - url = "http://signond.accounts-sso.googlecode.com/archive/${version}.zip"; - sha256 = "0q1ncmp27jrwbjkqisf0l63zzpw6bcsx5i4y86xixh8wd5arj87a"; + src = fetchurl { + url = "https://gitlab.com/accounts-sso/signond/repository/archive.tar.gz?ref=${version}"; + sha256 = "1vqkxhmdjk3217k38l2s3wld8x7f4jrbbh6xbr036cn1r23ncni5"; }; buildInputs = [ qt5.base ]; diff --git a/pkgs/development/libraries/socket_wrapper/default.nix b/pkgs/development/libraries/socket_wrapper/default.nix index df0cc1db34b..bff4f393d1d 100644 --- a/pkgs/development/libraries/socket_wrapper/default.nix +++ b/pkgs/development/libraries/socket_wrapper/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, pkgconfig }: stdenv.mkDerivation rec { - name = "socket_wrapper-1.1.4"; + name = "socket_wrapper-1.1.5"; src = fetchurl { url = "mirror://samba/cwrap/${name}.tar.gz"; - sha256 = "0ypp7sx5rhn4jpmn5yxgr7mm5kkdcsa76xfnhgsvhagh1naqap2k"; + sha256 = "01gn21kbicwfn3vlnnir8c11z2g54b532bj3qrpdrhgrcm3ifi45"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/development/libraries/spice-protocol/default.nix b/pkgs/development/libraries/spice-protocol/default.nix index 3bcd7fd67ef..0f9b1288cc4 100644 --- a/pkgs/development/libraries/spice-protocol/default.nix +++ b/pkgs/development/libraries/spice-protocol/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "spice-protocol-0.12.9"; + name = "spice-protocol-0.12.10"; src = fetchurl { url = "http://www.spice-space.org/download/releases/${name}.tar.bz2"; - sha256 = "0xkqycpqpkxjlcg4fk1vyv2vjni60s0fjx5l57918q0mvlsgh319"; + sha256 = "1yrfacqgnabmx2q768mim892ga2wnlp5cavkf51v3idyjmqhv3vq"; }; postInstall = '' diff --git a/pkgs/development/libraries/spice/default.nix b/pkgs/development/libraries/spice/default.nix index 2353eec7348..8e1227e46ff 100644 --- a/pkgs/development/libraries/spice/default.nix +++ b/pkgs/development/libraries/spice/default.nix @@ -1,29 +1,30 @@ { stdenv, fetchurl, pkgconfig, pixman, celt, alsaLib, openssl , libXrandr, libXfixes, libXext, libXrender, libXinerama, libjpeg, zlib -, spice_protocol, python, pyparsing, glib }: +, spice_protocol, python, pyparsing, glib, cyrus_sasl, lz4 }: with stdenv.lib; stdenv.mkDerivation rec { - name = "spice-0.12.5"; + name = "spice-0.12.6"; src = fetchurl { url = "http://www.spice-space.org/download/releases/${name}.tar.bz2"; - sha256 = "10gmqaanfg929aamf11n4si4r3d1g7z9qjdclsl9kjv7iw6s42a2"; + sha256 = "1dk9hp78ldqb0a52kdlqq0scnk3drnhj7rsw8r7hmy2v2cqflj7i"; }; buildInputs = [ pixman celt alsaLib openssl libjpeg zlib libXrandr libXfixes libXrender libXext libXinerama - python pyparsing glib ]; + python pyparsing glib cyrus_sasl lz4 ]; nativeBuildInputs = [ pkgconfig spice_protocol ]; NIX_CFLAGS_COMPILE = "-fno-stack-protector"; configureFlags = [ - "--with-sasl=no" + "--with-sasl" "--disable-smartcard" "--enable-client" + "--enable-lz4" ]; postInstall = '' diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index d1a6a341d87..1a623819273 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -3,11 +3,11 @@ assert interactive -> readline != null && ncurses != null; stdenv.mkDerivation { - name = "sqlite-3.8.11.1"; + name = "sqlite-3.9.2"; src = fetchurl { - url = "http://sqlite.org/2015/sqlite-autoconf-3081101.tar.gz"; - sha1 = "d0e22d7e361b6f50830a3cdeafe35311443f8f9a"; + url = "http://sqlite.org/2015/sqlite-autoconf-3090200.tar.gz"; + sha1 = "dae1ae5297fece9671ae0c434a7ecd0cda09c76a"; }; outputs = [ "dev" "out" "bin" ]; @@ -19,6 +19,7 @@ stdenv.mkDerivation { NIX_CFLAGS_COMPILE = [ "-DSQLITE_ENABLE_COLUMN_METADATA" "-DSQLITE_ENABLE_DBSTAT_VTAB" + "-DSQLITE_ENABLE_JSON1" "-DSQLITE_ENABLE_FTS3" "-DSQLITE_ENABLE_FTS3_PARENTHESIS" "-DSQLITE_ENABLE_FTS4" diff --git a/pkgs/development/libraries/subunit/default.nix b/pkgs/development/libraries/subunit/default.nix index fa007da7d9c..e4a767579ab 100644 --- a/pkgs/development/libraries/subunit/default.nix +++ b/pkgs/development/libraries/subunit/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "subunit-${version}"; - version = "1.0.0"; + version = "1.1.0"; src = fetchurl { url = "https://launchpad.net/subunit/trunk/${version}/+download/${name}.tar.gz"; - sha256 = "1fnhrrwww90746an2nz2kn9qdf9pklmaf5lm22gssl6648f2rp2m"; + sha256 = "0lcah7p66c05p7xpw6ns1is0i02lh0nq8gq51mv4wyvbr6zaasa8"; }; buildInputs = [ pkgconfig check cppunit perl pythonPackages.wrapPython ]; @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { description = "A streaming protocol for test results"; homepage = https://launchpad.net/subunit; license = licenses.asl20; - platforms = platforms.linux; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/swiften/default.nix b/pkgs/development/libraries/swiften/default.nix new file mode 100644 index 00000000000..64ea6fa0e74 --- /dev/null +++ b/pkgs/development/libraries/swiften/default.nix @@ -0,0 +1,31 @@ +{ 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 = '' + patchShebangs ./scons + ./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/development/libraries/talloc/default.nix b/pkgs/development/libraries/talloc/default.nix index 467ccf9db86..2c7cbe04019 100644 --- a/pkgs/development/libraries/talloc/default.nix +++ b/pkgs/development/libraries/talloc/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "talloc-2.1.3"; + name = "talloc-2.1.5"; src = fetchurl { url = "mirror://samba/talloc/${name}.tar.gz"; - sha256 = "1c1c3zs13qyripjwcjpz2hqc3p9p50m5yl95gdrrrvyl49dzg9bs"; + sha256 = "1pfx3kmj973hpacfw46fzfnjd7ms1j03ifkc30wk930brx8ffcrq"; }; buildInputs = [ @@ -24,10 +24,6 @@ stdenv.mkDerivation rec { "--builtin-libraries=replace" ]; - postInstall = '' - ar qf $out/lib/libtalloc.a bin/default/talloc_5.o - ''; - meta = with stdenv.lib; { description = "Hierarchical pool based memory allocator with destructors"; homepage = http://tdb.samba.org/; diff --git a/pkgs/development/libraries/tdb/default.nix b/pkgs/development/libraries/tdb/default.nix index 2bb47df20cf..0843d05e028 100644 --- a/pkgs/development/libraries/tdb/default.nix +++ b/pkgs/development/libraries/tdb/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "tdb-1.3.7"; + name = "tdb-1.3.8"; src = fetchurl { url = "mirror://samba/tdb/${name}.tar.gz"; - sha256 = "04k42cjvjc5wsqsqf44397hclq3nxlm9avjcsbz2hsn01k59akd6"; + sha256 = "1cg6gmpgn36dd4bsp3j9k3hyrm87d8hdigqyyqxw5jga4w2aq186"; }; buildInputs = [ diff --git a/pkgs/development/libraries/tevent/default.nix b/pkgs/development/libraries/tevent/default.nix index 2e9c83755a6..4b77ced250b 100644 --- a/pkgs/development/libraries/tevent/default.nix +++ b/pkgs/development/libraries/tevent/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "tevent-0.9.25"; + name = "tevent-0.9.26"; src = fetchurl { url = "mirror://samba/tevent/${name}.tar.gz"; - sha256 = "0sf694bdp2l6s48gmr8hxlcpdmjbwhr9ph1faqxmkcqibbav1ppy"; + sha256 = "1gbh6d2m49j1v2hkaiyrh8bj02i5wxd4hqayzk2g44yyivbi8b16"; }; buildInputs = [ diff --git a/pkgs/development/libraries/uid_wrapper/default.nix b/pkgs/development/libraries/uid_wrapper/default.nix index 49bc088d8c5..0675ec68b4e 100644 --- a/pkgs/development/libraries/uid_wrapper/default.nix +++ b/pkgs/development/libraries/uid_wrapper/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, pkgconfig }: stdenv.mkDerivation rec { - name = "uid_wrapper-1.1.1"; + name = "uid_wrapper-1.2.0"; src = fetchurl { url = "mirror://samba/cwrap/${name}.tar.gz"; - sha256 = "0y033cjs0kwmpx70xc4wh789vk9rw6bziizs28h50ad7lyyvx5b9"; + sha256 = "0sfznk53kmz9m3rxwbv4pwwqs4bw3kr917y4n53h5jaxjym0m4c0"; }; nativeBuildInputs = [ cmake pkgconfig ]; 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)" ]; diff --git a/pkgs/development/libraries/v8/4.5.nix b/pkgs/development/libraries/v8/4.5.nix new file mode 100644 index 00000000000..95ff225c059 --- /dev/null +++ b/pkgs/development/libraries/v8/4.5.nix @@ -0,0 +1,142 @@ +{ stdenv, lib, fetchgit, fetchFromGitHub, gyp, readline, python, which, icu +, patchelf, coreutils +, doCheck ? false +}: + +assert readline != null; + +let + arch = if stdenv.isArm + then if stdenv.is64bit + then"arm64" + else "arm" + else if stdenv.is64bit + then"x64" + else "ia32"; + git_url = "https://chromium.googlesource.com"; + clangFlag = if stdenv.isDarwin then "1" else "0"; + + deps = { + "build/gyp" = fetchgit { + url = "${git_url}/external/gyp.git"; + rev = "5122240c5e5c4d8da12c543d82b03d6089eb77c5"; + sha256 = "0mdrrhmfl4jrdmfrxmg7ywhdf9c7gv2x08fiq955fs9z8kvxqgdx"; + }; + "third_party/icu" = fetchgit { + url = "${git_url}/chromium/deps/icu.git"; + rev = "c81a1a3989c3b66fa323e9a6ee7418d7c08297af"; + sha256 = "0xrhig85vpw9hqjrhkxsr69m2xnig2bwmjhylzffrwz0783l7yhw"; + }; + "buildtools" = fetchgit { + url = "${git_url}/chromium/buildtools.git"; + rev = "ecc8e253abac3b6186a97573871a084f4c0ca3ae"; + sha256 = "1ccfnj3dp4i0z2bj09zy8aa4x749id6h058qa330li368417jwci"; + }; + "testing/gtest" = fetchgit { + url = "${git_url}/external/googletest.git"; + rev = "23574bf2333f834ff665f894c97bef8a5b33a0a9"; + sha256 = "1scyrk8d6xrsqma27q0wdrxqfa2n12k8mi9lfbsm5ivim9sr1d75"; + }; + "testing/gmock" = fetchgit { + url = "${git_url}/external/googlemock.git"; + rev = "29763965ab52f24565299976b936d1265cb6a271"; + sha256 = "0n2ajjac7myr5bgqk0x7j8281b4whkzgr1irv5nji9n3xz5i6gz4"; + }; + "tools/clang" = fetchgit { + url = "${git_url}/chromium/src/tools/clang.git"; + rev = "73ec8804ed395b0886d6edf82a9f33583f4a7902"; + sha256 = "0p2w4cgj3d4lqa8arss3j86lk0g8zhbbn5pzlcrhy5pl4xphjbk3"; + }; + }; + +in + +stdenv.mkDerivation rec { + name = "v8-${version}"; + version = "4.5.107"; + + inherit doCheck; + + src = fetchFromGitHub { + owner = "v8"; + repo = "v8"; + rev = version; + sha256 = "0wbzi4rhm4ygsm1k4x0vwfm42z3j8ww6wz7bcvd0m7mqzayn0bw4"; + }; + + postUnpack = '' + ${lib.concatStringsSep "\n" ( + lib.mapAttrsToList (n: v: '' + mkdir -p $sourceRoot/${n} + cp -r ${v}/* $sourceRoot/${n} + '') deps)} + ''; + + # Patches pulled from: + # https://github.com/cowboyd/libv8/tree/4.5/patches + patches = lib.optional (!doCheck) ./disable-building-tests.patch ++ [ + ./fPIC-for-static.patch + ./build-standalone-static-library.patch + ]; + + postPatch = '' + sed -i 's,#!/usr/bin/env python,#!${python}/bin/python,' build/gyp_v8 + sed -i 's,/bin/echo,${coreutils}/bin/echo,' build/standalone.gypi + sed -i '/CR_CLANG_REVISION/ d' build/standalone.gypi + ''; + + configurePhase = '' + PYTHONPATH="tools/generate_shim_headers:$PYTHONPATH" \ + PYTHONPATH="$(toPythonPath ${gyp}):$PYTHONPATH" \ + build/gyp_v8 \ + -f make \ + --generator-output="out" \ + -Dflock_index=0 \ + -Dclang=${clangFlag} \ + -Dv8_enable_i18n_support=1 \ + -Duse_system_icu=1 \ + -Dcomponent=shared_library \ + -Dconsole=readline \ + -Dv8_target_arch=${arch} \ + -Dv8_use_external_startup_data=0 + ''; + + nativeBuildInputs = [ which ]; + buildInputs = [ readline python icu patchelf ]; + + buildFlags = [ + "LINK=g++" + "-C out" + "builddir=$(CURDIR)/Release" + "BUILDTYPE=Release" + ]; + + enableParallelBuilding = true; + + # the `libv8_libplatform` target is _only_ built as a static library, + # and is expected to be statically linked in when needed. + # see the following link for further commentary: + # https://github.com/cowboyd/therubyracer/issues/391 + installPhase = '' + install -vD out/Release/d8 "$out/bin/d8" + install -vD out/Release/mksnapshot "$out/bin/mksnapshot" + ${if stdenv.isDarwin then '' + install -vD out/Release/lib.target/libv8.dylib "$out/lib/libv8.dylib" + install_name_tool -change /usr/local/lib/libv8.dylib $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.cc.cc}/lib/libgcc_s.1.dylib $out/bin/d8 + install_name_tool -id $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.cc.cc}/lib/libgcc_s.1.dylib $out/lib/libv8.dylib + '' else '' + install -vD out/Release/lib.target/libv8.so "$out/lib/libv8.so" + ''} + mkdir -p "$out/include" + cp -vr include/*.h "$out/include" + cp -vr include/libplatform "$out/include" + cp -v out/Release/*.a "$out/lib" + ''; + + meta = with lib; { + description = "Google's open source JavaScript engine"; + maintainers = with maintainers; [ cstrahan ]; + platforms = with platforms; linux; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/libraries/v8/build-standalone-static-library.patch b/pkgs/development/libraries/v8/build-standalone-static-library.patch new file mode 100644 index 00000000000..994c322429d --- /dev/null +++ b/pkgs/development/libraries/v8/build-standalone-static-library.patch @@ -0,0 +1,14 @@ +diff --git a/build/standalone.gypi b/build/standalone.gypi +index b6519c4..ef9e7c5 100644 +--- a/build/standalone.gypi ++++ b/build/standalone.gypi +@@ -373,6 +373,9 @@ + }], + ], + 'target_conditions': [ ++ ['_type=="static_library"', { ++ 'standalone_static_library': 1, ++ }], + ['v8_code == 0', { + 'defines!': [ + 'DEBUG', diff --git a/pkgs/development/libraries/v8/disable-building-tests.patch b/pkgs/development/libraries/v8/disable-building-tests.patch new file mode 100644 index 00000000000..1854a9b7e56 --- /dev/null +++ b/pkgs/development/libraries/v8/disable-building-tests.patch @@ -0,0 +1,27 @@ +diff --git a/Makefile b/Makefile +index 9761265..80169b2 100644 +--- a/Makefile ++++ b/Makefile +@@ -248,8 +248,6 @@ NACL_ARCHES = nacl_ia32 nacl_x64 + GYPFILES = third_party/icu/icu.gypi third_party/icu/icu.gyp \ + build/shim_headers.gypi build/features.gypi build/standalone.gypi \ + build/toolchain.gypi build/all.gyp build/mac/asan.gyp \ +- test/cctest/cctest.gyp \ +- test/unittests/unittests.gyp tools/gyp/v8.gyp \ + tools/parser-shell.gyp testing/gmock.gyp testing/gtest.gyp \ + buildtools/third_party/libc++abi/libc++abi.gyp \ + buildtools/third_party/libc++/libc++.gyp samples/samples.gyp \ +diff --git a/build/all.gyp b/build/all.gyp +index 4aeb507..1ff2c7a 100644 +--- a/build/all.gyp ++++ b/build/all.gyp +@@ -10,8 +10,6 @@ + 'dependencies': [ + '../samples/samples.gyp:*', + '../src/d8.gyp:d8', +- '../test/cctest/cctest.gyp:*', +- '../test/unittests/unittests.gyp:*', + ], + 'conditions': [ + ['component!="shared_library"', { + diff --git a/pkgs/development/libraries/v8/fPIC-for-static.patch b/pkgs/development/libraries/v8/fPIC-for-static.patch new file mode 100644 index 00000000000..39564772af8 --- /dev/null +++ b/pkgs/development/libraries/v8/fPIC-for-static.patch @@ -0,0 +1,13 @@ +diff --git a/build/standalone.gypi b/build/standalone.gypi +index 7670e5b..230518c 100644 +--- a/build/standalone.gypi ++++ b/build/standalone.gypi +@@ -205,7 +205,7 @@ + [ 'visibility=="hidden" and v8_enable_backtrace==0', { + 'cflags': [ '-fvisibility=hidden' ], + }], +- [ 'component=="shared_library"', { ++ [ 'component=="shared_library" or component=="static_library" and (v8_target_arch=="x64" or v8_target_arch=="arm64")', { + 'cflags': [ '-fPIC', ], + }], + ], diff --git a/pkgs/development/libraries/vc/0.7.nix b/pkgs/development/libraries/vc/0.7.nix new file mode 100644 index 00000000000..7f774e2eb92 --- /dev/null +++ b/pkgs/development/libraries/vc/0.7.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + version = "0.7.5"; + name = "Vc-${version}"; + + src = fetchFromGitHub { + owner = "VcDevel"; + repo = "Vc"; + rev = version; + sha256 = "190s4r2n3jsivl4j2m288j3rqmgjj6gl308hi9mzwyhcfn17q8br"; + }; + + nativeBuildInputs = [ cmake ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Library for multiprecision complex arithmetic with exact rounding"; + homepage = https://github.com/VcDevel/Vc; + license = licenses.bsd3; + platforms = platforms.all; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/development/libraries/vc/default.nix b/pkgs/development/libraries/vc/default.nix new file mode 100644 index 00000000000..9d5a24c4371 --- /dev/null +++ b/pkgs/development/libraries/vc/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + version = "1.0.0"; + name = "Vc-${version}"; + + src = fetchFromGitHub { + owner = "VcDevel"; + repo = "Vc"; + rev = version; + sha256 = "014li9kcbbxinh9r1nngdzspjzs2nxwslcknd950msjkqgnjhz4r"; + }; + + nativeBuildInputs = [ cmake ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Library for multiprecision complex arithmetic with exact rounding"; + homepage = https://github.com/VcDevel/Vc; + license = licenses.bsd3; + platforms = platforms.all; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/development/libraries/wavpack/default.nix b/pkgs/development/libraries/wavpack/default.nix index 074b26e3f3a..3bdb1392bd9 100644 --- a/pkgs/development/libraries/wavpack/default.nix +++ b/pkgs/development/libraries/wavpack/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchurl, libiconv }: stdenv.mkDerivation rec { name = "wavpack-${version}"; @@ -6,6 +6,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + buildInputs = stdenv.lib.optional stdenv.isDarwin libiconv; + patches = [ # backported from # https://github.com/dbry/WavPack/commit/12867b33e2de3e95b88d7cb6f449ce0c5c87cdd5 diff --git a/pkgs/development/libraries/wxmac/default.nix b/pkgs/development/libraries/wxmac/default.nix index 9734fd358ea..e5d680501f0 100644 --- a/pkgs/development/libraries/wxmac/default.nix +++ b/pkgs/development/libraries/wxmac/default.nix @@ -1,5 +1,7 @@ -{ stdenv, fetchurl, setfile, rez, derez, - expat, libiconv, libjpeg, libpng, libtiff, zlib +{ stdenv, fetchurl +, expat, libiconv, libjpeg, libpng, libtiff, zlib +, setfile, rez, derez +, AGL, Cocoa, Kernel, QuickTime }: with stdenv.lib; @@ -15,9 +17,20 @@ stdenv.mkDerivation rec { patches = [ ./wx.patch ]; - buildInputs = [ setfile rez derez expat libiconv libjpeg libpng libtiff zlib ]; + buildInputs = [ + expat libiconv libjpeg libpng libtiff zlib + Cocoa Kernel QuickTime setfile rez derez + ]; + + propagatedBuildInputs = [ AGL ]; + + postPatch = '' + substituteInPlace configure --replace "-framework System" -lSystem + ''; configureFlags = [ + "wx_cv_std_libfullpath=/var/empty" + "--with-macosx-version-min=10.7" "--enable-unicode" "--with-osx_cocoa" "--enable-std_string" @@ -44,6 +57,8 @@ stdenv.mkDerivation rec { ./wx-config --libs ''; + NIX_CFLAGS_COMPILE = "-Wno-undef"; + doCheck = true; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/xmlsec/default.nix b/pkgs/development/libraries/xmlsec/default.nix index 85e2f08b31d..3d92dcf3e12 100644 --- a/pkgs/development/libraries/xmlsec/default.nix +++ b/pkgs/development/libraries/xmlsec/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, libxml2, gnutls, libxslt, pkgconfig, libgcrypt, libtool }: +{ stdenv, fetchurl, libxml2, gnutls, libxslt, pkgconfig, libgcrypt, libtool +, openssl, makeWrapper }: let version = "1.2.20"; @@ -11,9 +12,13 @@ stdenv.mkDerivation rec { sha256 = "01bkbv2y3x8d1sf4dcln1x3y2jyj391s3208d9a2ndhglly5j89j"; }; - buildInputs = [ libxml2 gnutls libxslt pkgconfig libgcrypt libtool ]; - + buildInputs = [ makeWrapper libxml2 gnutls libxslt pkgconfig libgcrypt libtool openssl ]; enableParallelBuilding = true; + doCheck = true; + + postFixup = '' + wrapProgram "$out/bin/xmlsec1" --prefix LD_LIBRARY_PATH ":" "$out/lib" + ''; meta = { homepage = http://www.aleksey.com/xmlsec; 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 ]; diff --git a/pkgs/development/libraries/zeromq/4.x.nix b/pkgs/development/libraries/zeromq/4.x.nix index de91ac50428..22e2e8716a6 100644 --- a/pkgs/development/libraries/zeromq/4.x.nix +++ b/pkgs/development/libraries/zeromq/4.x.nix @@ -8,9 +8,17 @@ stdenv.mkDerivation rec { sha256 = "04gligbgr0phipjkwc0dyk1vr9306r6s4dbj85z7fxxk1n1ircv1"; }; + # Fix zeromq-4.1.3 with libsodium-1.0.6 + postPatch = '' + sed -i 's/libzmq_werror="yes"/libzmq_werror="no"/' configure + ''; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libuuid libsodium ]; + # https://github.com/zeromq/libzmq/commit/479db2113643e459c11db392e0fefd6400657c9e + patches = [ ./sodium_warning.patch ]; + meta = with stdenv.lib; { branch = "4"; homepage = "http://www.zeromq.org"; diff --git a/pkgs/development/libraries/zeromq/sodium_warning.patch b/pkgs/development/libraries/zeromq/sodium_warning.patch new file mode 100644 index 00000000000..4b84fd7edf4 --- /dev/null +++ b/pkgs/development/libraries/zeromq/sodium_warning.patch @@ -0,0 +1,70 @@ +From 479db2113643e459c11db392e0fefd6400657c9e Mon Sep 17 00:00:00 2001 +From: Constantin Rack <constantin@rack.li> +Date: Sat, 8 Nov 2014 10:50:17 +0100 +Subject: [PATCH] Problem: return code of sodium_init() is not checked. + +There are two todo comments in curve_client.cpp and curve_server.cpp that suggest +checking the return code of sodium_init() call. sodium_init() returns -1 on error, +0 on success and 1 if it has been called before and is already initalized: +https://github.com/jedisct1/libsodium/blob/master/src/libsodium/sodium/core.c +--- + src/curve_client.cpp | 7 ++++--- + src/curve_server.cpp | 7 ++++--- + 2 files changed, 8 insertions(+), 6 deletions(-) + +diff --git a/src/curve_client.cpp b/src/curve_client.cpp +index 6019c54..77fc420 100644 +--- a/src/curve_client.cpp ++++ b/src/curve_client.cpp +@@ -38,6 +38,7 @@ zmq::curve_client_t::curve_client_t (const options_t &options_) : + cn_peer_nonce(1), + sync() + { ++ int rc; + memcpy (public_key, options_.curve_public_key, crypto_box_PUBLICKEYBYTES); + memcpy (secret_key, options_.curve_secret_key, crypto_box_SECRETKEYBYTES); + memcpy (server_key, options_.curve_server_key, crypto_box_PUBLICKEYBYTES); +@@ -47,12 +48,12 @@ zmq::curve_client_t::curve_client_t (const options_t &options_) : + unsigned char tmpbytes[4]; + randombytes(tmpbytes, 4); + #else +- // todo check return code +- sodium_init(); ++ rc = sodium_init (); ++ zmq_assert (rc != -1); + #endif + + // Generate short-term key pair +- const int rc = crypto_box_keypair (cn_public, cn_secret); ++ rc = crypto_box_keypair (cn_public, cn_secret); + zmq_assert (rc == 0); + } + +diff --git a/src/curve_server.cpp b/src/curve_server.cpp +index a3c4243..22c32d6 100644 +--- a/src/curve_server.cpp ++++ b/src/curve_server.cpp +@@ -42,6 +42,7 @@ zmq::curve_server_t::curve_server_t (session_base_t *session_, + cn_peer_nonce(1), + sync() + { ++ int rc; + // Fetch our secret key from socket options + memcpy (secret_key, options_.curve_secret_key, crypto_box_SECRETKEYBYTES); + scoped_lock_t lock (sync); +@@ -50,12 +51,12 @@ zmq::curve_server_t::curve_server_t (session_base_t *session_, + unsigned char tmpbytes[4]; + randombytes(tmpbytes, 4); + #else +- // todo check return code +- sodium_init(); ++ rc = sodium_init (); ++ zmq_assert (rc != -1); + #endif + + // Generate short-term key pair +- const int rc = crypto_box_keypair (cn_public, cn_secret); ++ rc = crypto_box_keypair (cn_public, cn_secret); + zmq_assert (rc == 0); + } + |