diff options
Diffstat (limited to 'pkgs/development/libraries')
318 files changed, 2604 insertions, 3732 deletions
diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix index 5d97a7fa59e..6c3920ff8aa 100644 --- a/pkgs/development/libraries/SDL/default.nix +++ b/pkgs/development/libraries/SDL/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, audiofile, libcap -, openglSupport ? false, mesa_noglu ? null +, openglSupport ? false, mesa ? null , alsaSupport ? true, alsaLib ? null , x11Support ? true, xlibsWrapper ? null, libXrandr ? null , pulseaudioSupport ? true, libpulseaudio ? null @@ -10,7 +10,7 @@ # PulseAudio. assert (stdenv.isLinux && !(stdenv ? cross)) -> alsaSupport || pulseaudioSupport; -assert openglSupport -> (mesa_noglu != null && x11Support); +assert openglSupport -> (mesa != null && x11Support); assert x11Support -> (xlibsWrapper != null && libXrandr != null); assert alsaSupport -> alsaLib != null; assert pulseaudioSupport -> libpulseaudio != null; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { optionals x11Support [ xlibsWrapper libXrandr ] ++ optional alsaSupport alsaLib ++ optional stdenv.isLinux libcap ++ - optional openglSupport mesa_noglu ++ + optional openglSupport mesa ++ optional pulseaudioSupport libpulseaudio ++ optional stdenv.isDarwin Cocoa; diff --git a/pkgs/development/libraries/SDL2_image/default.nix b/pkgs/development/libraries/SDL2_image/default.nix index 55b465226d8..eab9b1fb55d 100644 --- a/pkgs/development/libraries/SDL2_image/default.nix +++ b/pkgs/development/libraries/SDL2_image/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, SDL2, libpng, libjpeg, libtiff, libungif, libXpm, zlib }: stdenv.mkDerivation rec { - name = "SDL2_image-2.0.0"; + name = "SDL2_image-2.0.1"; src = fetchurl { url = "http://www.libsdl.org/projects/SDL_image/release/${name}.tar.gz"; - sha256 = "0d3jlhkmr0j5a2dd5h6y29jfcsj7mkl16wghm6n3nqqp7g3ib65j"; + sha256 = "0r3z1l7fdn76qkpy7snpkcjqz8dkv2zp6lsqpq25q4m5xsyaygis"; }; buildInputs = [SDL2 libpng libjpeg libtiff libungif libXpm zlib]; diff --git a/pkgs/development/libraries/SDL2_mixer/default.nix b/pkgs/development/libraries/SDL2_mixer/default.nix index 06e174371c7..dcfa130de3a 100644 --- a/pkgs/development/libraries/SDL2_mixer/default.nix +++ b/pkgs/development/libraries/SDL2_mixer/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, SDL2, libogg, libvorbis, enableNativeMidi ? false }: stdenv.mkDerivation rec { - name = "SDL2_mixer-2.0.0"; + name = "SDL2_mixer-2.0.1"; src = fetchurl { url = "http://www.libsdl.org/projects/SDL_mixer/release/${name}.tar.gz"; - sha256 = "0nvjdxjchrajrn0jag877hdx9zb788hsd315zzg1lyck2wb0xkm8"; + sha256 = "0pv9jzjpcjlbiaybvwrb4avmv46qk7iqxlnqrd2dfj82c4mgc92s"; }; propagatedBuildInputs = [SDL2 libogg libvorbis]; diff --git a/pkgs/development/libraries/SDL2_ttf/default.nix b/pkgs/development/libraries/SDL2_ttf/default.nix index d1600ee8a8f..8d11689aba5 100644 --- a/pkgs/development/libraries/SDL2_ttf/default.nix +++ b/pkgs/development/libraries/SDL2_ttf/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, SDL2, freetype }: stdenv.mkDerivation rec { - name = "SDL2_ttf-2.0.12"; + name = "SDL2_ttf-2.0.14"; src = fetchurl { url = "https://www.libsdl.org/projects/SDL_ttf/release/${name}.tar.gz"; - sha256 = "0vkg6lyj278mdpd52map3rfi65fbq16w67ahmmfcl77a8da60a47"; + sha256 = "0xljwcpvd2knrjdfag5b257xqayplz55mqlszrqp0kpnphh5xnrl"; }; buildInputs = [SDL2 freetype]; diff --git a/pkgs/development/libraries/adns/default.nix b/pkgs/development/libraries/adns/default.nix index cecb8ee0a49..745cdf746ec 100644 --- a/pkgs/development/libraries/adns/default.nix +++ b/pkgs/development/libraries/adns/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.lgpl2; platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.simons ]; + maintainers = [ stdenv.lib.maintainers.peti ]; }; } diff --git a/pkgs/development/libraries/alure/default.nix b/pkgs/development/libraries/alure/default.nix new file mode 100644 index 00000000000..200ff1ca2e7 --- /dev/null +++ b/pkgs/development/libraries/alure/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, cmake, openal }: + +stdenv.mkDerivation rec { + name = "alure-${version}"; + version = "1.2"; + + src = fetchurl { + url = "http://kcat.strangesoft.net/alure-releases/alure-${version}.tar.bz2"; + sha256 = "0w8gsyqki21s1qb2s5ac1kj08i6nc937c0rr08xbw9w9wvd6lpj6"; + }; + + buildInputs = [ cmake openal ]; + + meta = with stdenv.lib; { + description = "A utility library to help manage common tasks with OpenAL applications"; + homepage = http://kcat.strangesoft.net/alure.html; + license = licenses.mit; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/appstream/default.nix b/pkgs/development/libraries/appstream/default.nix index 5df6ac2cace..302d63aa759 100644 --- a/pkgs/development/libraries/appstream/default.nix +++ b/pkgs/development/libraries/appstream/default.nix @@ -4,7 +4,20 @@ }: stdenv.mkDerivation { - name = "appstream-0.8.0"; + name = "appstream-0.9.5"; + + src = fetchurl { + url = "https://github.com/ximion/appstream/archive/APPSTREAM_0_8_0.tar.gz"; + sha256 = "16a3b38avrwyl1pp8jdgfjv6cd5mccbmk4asni92l40y5r0xfycr"; + }; + + nativeBuildInputs = [ + cmake pkgconfig gettext intltool + xmlto docbook_xsl docbook_xml_dtd_45 + gobjectIntrospection + ]; + + buildInputs = [ glib xapian libxml2 libyaml ]; meta = with stdenv.lib; { description = "Software metadata handling library"; @@ -19,17 +32,4 @@ stdenv.mkDerivation { license = licenses.lgpl21Plus; platforms = platforms.linux; }; - - src = fetchurl { - url = "https://github.com/ximion/appstream/archive/APPSTREAM_0_8_0.tar.gz"; - sha256 = "16a3b38avrwyl1pp8jdgfjv6cd5mccbmk4asni92l40y5r0xfycr"; - }; - - nativeBuildInputs = [ - cmake pkgconfig gettext intltool - xmlto docbook_xsl docbook_xml_dtd_45 - gobjectIntrospection - ]; - - buildInputs = [ glib xapian libxml2 libyaml ]; } diff --git a/pkgs/development/libraries/assimp/default.nix b/pkgs/development/libraries/assimp/default.nix index 38d7e50bdf8..ef75ad3fe87 100644 --- a/pkgs/development/libraries/assimp/default.nix +++ b/pkgs/development/libraries/assimp/default.nix @@ -1,17 +1,16 @@ -{ stdenv, fetchurl, unzip, cmake, boost, zlib }: +{ stdenv, fetchFromGitHub, unzip, cmake, boost, zlib }: let - major = "3"; - minor = "1"; - revision = "1"; - version = "${major}.${minor}.${revision}"; + version = "3.2"; in stdenv.mkDerivation { name = "assimp-${version}"; - src = fetchurl { - url = "mirror://sourceforge/project/assimp/assimp-${major}.${minor}/assimp-${version}_no_test_models.zip"; - sha256 = "17nyzsqzqpafamhi779f1bkh5mfgj8rpas034x3v9a0hdy3jg66s"; + src = fetchFromGitHub{ + owner = "assimp"; + repo = "assimp"; + rev = "v${version}"; + sha256 = "09fsksbq9a8gykwmw6gaicwh2ladrln1jc1xc5yk7w6x180cbb1x"; }; buildInputs = [ unzip cmake boost zlib ]; diff --git a/pkgs/development/libraries/audio/jamomacore/default.nix b/pkgs/development/libraries/audio/jamomacore/default.nix new file mode 100644 index 00000000000..a3d04fee7f6 --- /dev/null +++ b/pkgs/development/libraries/audio/jamomacore/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub, pkgconfig, alsaLib, portaudio, portmidi, libsndfile, cmake, libxml2, ninja }: + +stdenv.mkDerivation rec { + version = "1.0-beta.1"; + name = "JamomaCore-${version}"; + + src = fetchFromGitHub { + owner = "jamoma"; + repo = "JamomaCore"; + rev = "v${version}"; + sha256 = "1hb9b6qc18rsvzvixgllknn756m6zwcn22c79rdibbyz1bhrcnln"; + }; + + buildInputs = [ pkgconfig alsaLib portaudio portmidi libsndfile cmake libxml2 ninja ]; + + meta = { + description = "A C++ platform for building dynamic and reflexive systems with an emphasis on audio and media"; + homepage = https://jamoma.org; + license = stdenv.lib.licenses.bsd3; + maintainers = [ stdenv.lib.maintainers.magnetophon ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/development/libraries/audio/lvtk/default.nix b/pkgs/development/libraries/audio/lvtk/default.nix index 401743ac517..a56425b8425 100644 --- a/pkgs/development/libraries/audio/lvtk/default.nix +++ b/pkgs/development/libraries/audio/lvtk/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { configurePhase = '' python waf configure --prefix=$out \ --boost-includes="${boost.dev}/include" \ - --boost-libs="${boost.lib}/lib" + --boost-libs="${boost.out}/lib" ''; buildPhase = "python waf"; diff --git a/pkgs/development/libraries/audio/rtaudio/default.nix b/pkgs/development/libraries/audio/rtaudio/default.nix new file mode 100644 index 00000000000..326572996b4 --- /dev/null +++ b/pkgs/development/libraries/audio/rtaudio/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, autoconf, automake, libtool, libjack2, alsaLib, rtmidi }: + +stdenv.mkDerivation rec { + version = "4.1.2"; + name = "rtaudio-${version}"; + + src = fetchFromGitHub { + owner = "thestk"; + repo = "rtaudio"; + rev = "${version}"; + sha256 = "09j84l9l3q0g238z5k89rm8hgk0i1ir8917an7amq474nwjp80pq"; + }; + + buildInputs = [ autoconf automake libtool libjack2 alsaLib rtmidi ]; + + preConfigure = '' + ./autogen.sh --no-configure + ./configure + ''; + + meta = { + description = "A set of C++ classes that provide a cross platform API for realtime audio input/output"; + homepage = http://www.music.mcgill.ca/~gary/rtaudio/; + license = stdenv.lib.licenses.mit; + maintainers = [ stdenv.lib.maintainers.magnetophon ]; + platforms = with stdenv.lib.platforms; linux ++ darwin; + }; +} diff --git a/pkgs/development/libraries/audio/rtmidi/default.nix b/pkgs/development/libraries/audio/rtmidi/default.nix new file mode 100644 index 00000000000..b41db495dba --- /dev/null +++ b/pkgs/development/libraries/audio/rtmidi/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, autoconf, automake, libtool, libjack2, alsaLib, pkgconfig }: + +stdenv.mkDerivation rec { + version = "2.1.1"; + name = "rtmidi-${version}"; + + src = fetchFromGitHub { + owner = "thestk"; + repo = "rtmidi"; + rev = "${version}"; + sha256 = "11pl45lp8sq5xkpipwk622w508nw0qcxr03ibicqn1lsws0hva96"; + }; + + buildInputs = [ autoconf automake libtool libjack2 alsaLib pkgconfig ]; + + preConfigure = '' + ./autogen.sh --no-configure + ./configure + ''; + + meta = { + description = "A set of C++ classes that provide a cross platform API for realtime MIDI input/output"; + homepage = http://www.music.mcgill.ca/~gary/rtmidi/; + license = stdenv.lib.licenses.mit; + maintainers = [ stdenv.lib.maintainers.magnetophon ]; + platforms = with stdenv.lib.platforms; linux ++ darwin; + }; +} diff --git a/pkgs/development/libraries/blitz/default.nix b/pkgs/development/libraries/blitz/default.nix index e6f59ca8efe..ab34f64dfbf 100644 --- a/pkgs/development/libraries/blitz/default.nix +++ b/pkgs/development/libraries/blitz/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { patches = [ ./blitz-gcc47.patch ./blitz-testsuite-stencil-et.patch ]; buildInputs = [ pkgconfig gfortran texinfo ] - ++ optional (boost != null) [ boost.lib ]; + ++ optional (boost != null) [ boost.out ]; configureFlags = [ "--enable-shared" @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { ++ optional enablePadding "--enable-array-length-padding" ++ optional enableSerialization "--enable-serialization" ++ optionals (boost != null) [ "--with-boost=${boost.dev}" - "--with-boost-libdir=${boost.lib}/lib" ] + "--with-boost-libdir=${boost.out}/lib" ] ++ optional stdenv.is64bit "--enable-64bit" ; diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index 5b0c06bd6bb..8ba8dc19009 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -1,11 +1,11 @@ -{ stdenv, icu, expat, zlib, bzip2, python, fixDarwinDylibNames +{ stdenv, fetchurl, icu, expat, zlib, bzip2, python, fixDarwinDylibNames, libiconv , toolset ? if stdenv.cc.isClang then "clang" else null , enableRelease ? true , enableDebug ? false , enableSingleThreaded ? false , enableMultiThreaded ? true -, enableShared ? true -, enableStatic ? false +, enableShared ? !(stdenv.cross.libc or null == "msvcrt") # problems for now +, enableStatic ? !enableShared , enablePIC ? false , enableExceptions ? false , taggedLayout ? ((enableRelease && enableDebug) || (enableSingleThreaded && enableMultiThreaded) || (enableShared && enableStatic)) @@ -53,7 +53,7 @@ let genericB2Flags = [ "--includedir=$dev/include" - "--libdir=$lib/lib" + "--libdir=$out/lib" "-j$NIX_BUILD_CORES" "--layout=${layout}" "variant=${variant}" @@ -76,8 +76,14 @@ let "--user-config=user-config.jam" "toolset=gcc-cross" "--without-python" + ] ++ optionals (stdenv.cross.libc == "msvcrt") [ + "target-os=windows" + "threadapi=win32" + "binary-format=pe" + "address-model=${if hasPrefix "x86_64-" stdenv.cross.config then "64" else "32"}" + "architecture=x86" ]; - crossB2Args = concatMapStringsSep " " (genericB2Flags ++ crossB2Flags); + crossB2Args = concatStringsSep " " (genericB2Flags ++ crossB2Flags); builder = b2Args: '' ./b2 ${b2Args} @@ -90,10 +96,6 @@ let # Let boost install everything else ./b2 ${b2Args} install - - # Create a derivation which encompasses everything, making buildInputs nicer - mkdir -p $out/nix-support - echo "$dev $lib" > $out/nix-support/propagated-native-build-inputs ''; commonConfigureFlags = [ @@ -108,6 +110,8 @@ let find include \( -name '*.hpp' -or -name '*.h' -or -name '*.ipp' \) \ -exec sed '1i#line 1 "{}"' -i '{}' \; ) + '' + optionalString (stdenv.cross.libc or null == "msvcrt") '' + ${stdenv.cross.config}-ranlib "$lib/lib/"*.a ''; in @@ -123,14 +127,13 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.boost; platforms = platforms.unix; - maintainers = with maintainers; [ simons wkennington ]; + maintainers = with maintainers; [ peti wkennington ]; }; preConfigure = '' - 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 '@rpath/$(<[1]:D=)' "$lib/lib/\$(<[1]:D=)"; + --replace '@rpath/$(<[1]:D=)' "$out/lib/\$(<[1]:D=)"; fi; '' + optionalString (mpi != null) '' cat << EOF > user-config.jam @@ -143,14 +146,15 @@ stdenv.mkDerivation { enableParallelBuilding = true; - buildInputs = [ icu expat zlib bzip2 python ] + buildInputs = [ expat zlib bzip2 libiconv ] + ++ stdenv.lib.optionals (! stdenv ? cross) [ python icu ] ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; configureScript = "./bootstrap.sh"; - configureFlags = commonConfigureFlags ++ [ - "--with-icu=${icu.dev}" - "--with-python=${python.interpreter}" - ] ++ optional (toolset != null) "--with-toolset=${toolset}"; + configureFlags = commonConfigureFlags + ++ [ "--with-python=${python.interpreter}" ] + ++ optional (! stdenv ? cross) "--with-icu=${icu.dev}" + ++ optional (toolset != null) "--with-toolset=${toolset}"; buildPhase = builder nativeB2Args; @@ -158,19 +162,14 @@ stdenv.mkDerivation { postFixup = fixup; - outputs = [ "out" "dev" "lib" ]; + outputs = [ "dev" "out" ]; setOutputFlags = false; crossAttrs = rec { - buildInputs = [ expat.crossDrv zlib.crossDrv bzip2.crossDrv ]; - # all buildInputs set previously fell into propagatedBuildInputs, as usual, so we have to - # override them. - propagatedBuildInputs = buildInputs; # We want to substitute the contents of configureFlags, removing thus the # usual --build and --host added on cross building. preConfigure = '' export configureFlags="--without-icu ${concatStringsSep " " commonConfigureFlags}" - set -x cat << EOF > user-config.jam using gcc : cross : $crossConfig-g++ ; EOF @@ -178,5 +177,13 @@ stdenv.mkDerivation { buildPhase = builder crossB2Args; installPhase = installer crossB2Args; postFixup = fixup; + } // optionalAttrs (stdenv.cross.libc == "msvcrt") { + patches = fetchurl { + url = "https://svn.boost.org/trac/boost/raw-attachment/ticket/7262/" + + "boost-mingw.patch"; + sha256 = "0s32kwll66k50w6r5np1y5g907b7lcpsjhfgr7rsw7q5syhzddyj"; + }; + + patchFlags = "-p0"; }; } diff --git a/pkgs/development/libraries/buddy/default.nix b/pkgs/development/libraries/buddy/default.nix index d23b2f27c07..8b40260ddf3 100644 --- a/pkgs/development/libraries/buddy/default.nix +++ b/pkgs/development/libraries/buddy/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { license = "as-is"; platforms = with stdenv.lib.platforms; allBut cygwin; - maintainers = [ stdenv.lib.maintainers.simons ]; + maintainers = [ stdenv.lib.maintainers.peti ]; }; } diff --git a/pkgs/development/libraries/bullet/bullet283.nix b/pkgs/development/libraries/bullet/bullet283.nix new file mode 100644 index 00000000000..ea792b98a32 --- /dev/null +++ b/pkgs/development/libraries/bullet/bullet283.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, cmake, mesa, freeglut }: + +stdenv.mkDerivation rec { + name = "bullet-2.83.7"; # vdrift 2012-07-22 doesn't build with 2.81 + src = fetchurl { + url = "https://github.com/bulletphysics/bullet3/archive/2.83.7.tar.gz"; + sha256 = "0hqjnmlb2p29yiasrm7kvgv0nklz5zkwhfk4f78zz1gf0vrdil80"; + }; + + buildInputs = [ cmake mesa freeglut ]; + configurePhase = '' + cmake -DBUILD_SHARED_LIBS=ON -DINSTALL_EXTRA_LIBS=TRUE \ + -DCMAKE_INSTALL_PREFIX=$out . + ''; + + enableParallelBuilding = true; + + meta = { + description = "A professional free 3D Game Multiphysics Library"; + longDescription = '' + Bullet 3D Game Multiphysics Library provides state of the art collision + detection, soft body and rigid body dynamics. + ''; + homepage = https://github.com/bulletphysics/bullet3; + license = stdenv.lib.licenses.zlib; + maintainers = with stdenv.lib.maintainers; [ aforemny ]; + }; +} diff --git a/pkgs/development/libraries/bwidget/default.nix b/pkgs/development/libraries/bwidget/default.nix index ed670e61243..72b60391f4f 100644 --- a/pkgs/development/libraries/bwidget/default.nix +++ b/pkgs/development/libraries/bwidget/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "bwidget-${version}"; - version = "1.9.8"; + version = "1.9.10"; src = fetchurl { url = "mirror://sourceforge/tcllib/bwidget-${version}.tar.gz"; - sha256 = "055kpl3ghznk028jnhzsa3p48qgipckfzn2liwq932crxviicl2l"; + sha256 = "025lmriaq4qqy99lh826wx2cnqqgxn7srz4m3q06bl6r9ch15hr6"; }; dontBuild = true; diff --git a/pkgs/development/libraries/cegui/default.nix b/pkgs/development/libraries/cegui/default.nix index c7d7aa4d67a..7e5c768036f 100644 --- a/pkgs/development/libraries/cegui/default.nix +++ b/pkgs/development/libraries/cegui/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "cegui-${version}"; - version = "0.8.4"; + version = "0.8.7"; src = fetchurl { url = "mirror://sourceforge/crayzedsgui/${name}.tar.bz2"; - sha256 = "1253aywv610rbs96hwqiw2z7xrrv24l3jhfsqj95w143idabvz5m"; + sha256 = "067562s71kfsnbp2zb2bmq8zj3jk96g5a4rcc5qc3n8nfyayhldk"; }; diff --git a/pkgs/development/libraries/cimg/builder.sh b/pkgs/development/libraries/cimg/builder.sh index bbd5f712551..6473395493c 100644 --- a/pkgs/development/libraries/cimg/builder.sh +++ b/pkgs/development/libraries/cimg/builder.sh @@ -4,9 +4,8 @@ source $stdenv/setup unpackPhase cd $sourceRoot -install -dm 755 $out/include/cimg $out/share/doc/cimg/html $out/share/cimg/examples $out/share/cimg/plugins +install -dm 755 $out/include/cimg $doc/share/doc/cimg/html $doc/share/cimg/examples $doc/share/cimg/plugins install -m 644 CImg.h $out/include/cimg -cp -dr --no-preserve=ownership html/* $out/share/doc/cimg/html/ -cp -dr --no-preserve=ownership examples/* $out/share/cimg/examples/ -cp -dr --no-preserve=ownership plugins/* $out/share/cimg/plugins/ +cp -dr --no-preserve=ownership examples/* $doc/share/cimg/examples/ +cp -dr --no-preserve=ownership plugins/* $doc/share/cimg/plugins/ diff --git a/pkgs/development/libraries/cimg/default.nix b/pkgs/development/libraries/cimg/default.nix index dc397adf491..722852f1270 100644 --- a/pkgs/development/libraries/cimg/default.nix +++ b/pkgs/development/libraries/cimg/default.nix @@ -4,21 +4,22 @@ stdenv.mkDerivation rec { name = "cimg-${version}"; - version = "1.5.9"; + version = "1.7.0"; src = fetchurl { - url = "mirror://sourceforge/project/cimg/CImg-${version}.zip"; - sha256 = "1xn20643gcbl76kvy9ajhwbyjjb73mg65q32ma8mdkwn1qhn7f7c"; + url = "http://cimg.eu/files/CImg_${version}.zip"; + sha256 = "06j3n7gvgxzvprqwf56nnca195y38dcbdlszrxyn5p9w9al437zj"; }; - buildInputs = with stdenv.lib; - [ unzip ]; + buildInputs = [ unzip ]; builder = ./builder.sh; - + + outputs = [ "out" "doc" ]; + meta = with stdenv.lib; { description = "A small, open source, C++ toolkit for image processing"; - homepage = http://cimg.sourceforge.net/; + homepage = http://cimg.eu/; license = licenses.cecill-c; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/cloog/default.nix b/pkgs/development/libraries/cloog/default.nix index 55f70597170..5da29273a8b 100644 --- a/pkgs/development/libraries/cloog/default.nix +++ b/pkgs/development/libraries/cloog/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, gmp, isl }: stdenv.mkDerivation rec { - name = "cloog-0.18.3"; + name = "cloog-0.18.4"; src = fetchurl { url = "http://www.bastoul.net/cloog/pages/download/count.php3?url=./${name}.tar.gz"; - sha256 = "0d4pqs4rs1qx0302wpv06ww1nwyg4yv5cw9qpfzxz36b19s6q326"; + sha256 = "03km1aqaiy3sbqc2f046ms9x0mlmacxlvs5rxsvjj8nf20vxynij"; }; buildInputs = [ gmp ]; diff --git a/pkgs/development/libraries/cppunit/default.nix b/pkgs/development/libraries/cppunit/default.nix index 0b9b09a4bd1..4c64cb715e4 100644 --- a/pkgs/development/libraries/cppunit/default.nix +++ b/pkgs/development/libraries/cppunit/default.nix @@ -12,6 +12,5 @@ stdenv.mkDerivation { homepage = "http://sourceforge.net/apps/mediawiki/cppunit/"; description = "C++ unit testing framework"; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; - maintainers = [ stdenv.lib.maintainers.simons ]; }; } diff --git a/pkgs/development/libraries/cpputest/default.nix b/pkgs/development/libraries/cpputest/default.nix new file mode 100644 index 00000000000..6494a0428e0 --- /dev/null +++ b/pkgs/development/libraries/cpputest/default.nix @@ -0,0 +1,19 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation rec { + version = "3.7.2"; + name = "cpputest-${version}"; + + src = fetchurl { + url = "https://github.com/cpputest/cpputest/releases/download/${version}/${name}.tar.gz"; + sha256 = "0lwn226d8mrppdyzcvr08vsnnp6h0mpy5kz5a475ish87az00pcc"; + }; + + meta = { + homepage = "http://cpputest.github.io/"; + description = "Unit testing and mocking framework for C/C++"; + platforms = stdenv.lib.platforms.linux ; + license = stdenv.lib.licenses.bsd3; + maintainers = [ stdenv.lib.maintainers.juliendehos ]; + }; +} diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix index 21ad12869f9..f1cd9d526e4 100644 --- a/pkgs/development/libraries/cyrus-sasl/default.nix +++ b/pkgs/development/libraries/cyrus-sasl/default.nix @@ -51,6 +51,5 @@ stdenv.mkDerivation rec { homepage = "http://cyrusimap.web.cmu.edu/"; description = "library for adding authentication support to connection-based protocols"; platforms = platforms.unix; - maintainers = with maintainers; [ simons ]; }; } diff --git a/pkgs/development/libraries/dbus-glib/default.nix b/pkgs/development/libraries/dbus-glib/default.nix index 59d227f0e86..d06a919cada 100644 --- a/pkgs/development/libraries/dbus-glib/default.nix +++ b/pkgs/development/libraries/dbus-glib/default.nix @@ -17,6 +17,10 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ dbus glib ]; + preConfigure = '' + configureFlagsArray+=("--exec-prefix=$dev") + ''; + doCheck = true; passthru = { inherit dbus glib; }; diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index 83635d9739f..dd86ca54081 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -6,8 +6,8 @@ assert x11Support -> libX11 != null && libSM != null; let - version = "1.8.20"; - sha256 = "0fkh3d5r57a659hw9lqnw4v0bc5556vx54fsf7l9c732ci6byksw"; + version = "1.10.8"; + sha256 = "0560y3hxpgh346w6avcrcz79c8ansmn771y5xpcvvlr6m8mx5wxs"; self = stdenv.mkDerivation { name = "dbus-${version}"; @@ -17,8 +17,7 @@ self = stdenv.mkDerivation { inherit sha256; }; - patches = [ ./ignore-missing-includedirs.patch ] - ++ lib.optional stdenv.isSunOS ./implement-getgrouplist.patch; + patches = lib.optional stdenv.isSunOS ./implement-getgrouplist.patch; postPatch = '' substituteInPlace tools/Makefile.in \ --replace 'install-localstatelibDATA:' 'disabled:' \ diff --git a/pkgs/development/libraries/dbus/ignore-missing-includedirs.patch b/pkgs/development/libraries/dbus/ignore-missing-includedirs.patch deleted file mode 100644 index 2781f4ae3de..00000000000 --- a/pkgs/development/libraries/dbus/ignore-missing-includedirs.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -ru -x '*~' dbus-1.2.24-orig/bus/config-parser.c dbus-1.2.24/bus/config-parser.c ---- dbus-1.2.24-orig/bus/config-parser.c 2010-03-23 20:01:27.000000000 +0100 -+++ dbus-1.2.24/bus/config-parser.c 2010-07-20 14:17:20.000000000 +0200 -@@ -2159,12 +2159,16 @@ - - retval = FALSE; - -- dir = _dbus_directory_open (dirname, error); -+ dbus_error_init (&tmp_error); -+ -+ dir = _dbus_directory_open (dirname, &tmp_error); - - if (dir == NULL) -- goto failed; -+ { -+ retval = TRUE; -+ goto failed; -+ } - -- dbus_error_init (&tmp_error); - while (_dbus_directory_get_next_file (dir, &filename, &tmp_error)) - { - DBusString full_path; diff --git a/pkgs/development/libraries/exiv2/default.nix b/pkgs/development/libraries/exiv2/default.nix index e1af46cc3ed..af17c9ae0f0 100644 --- a/pkgs/development/libraries/exiv2/default.nix +++ b/pkgs/development/libraries/exiv2/default.nix @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { }; postPatch = "patchShebangs ./src/svn_version.sh"; + outputs = [ "dev" "out" ]; + nativeBuildInputs = [ gettext ]; propagatedBuildInputs = [ zlib expat ]; diff --git a/pkgs/development/libraries/ffmpeg/0.10.nix b/pkgs/development/libraries/ffmpeg/0.10.nix index b008151d6cb..4eebad6b307 100644 --- a/pkgs/development/libraries/ffmpeg/0.10.nix +++ b/pkgs/development/libraries/ffmpeg/0.10.nix @@ -4,4 +4,5 @@ callPackage ./generic.nix (args // rec { version = "${branch}.16"; branch = "0.10"; sha256 = "1l9z5yfp1vq4z2y4mh91707dhcn41c3pd505i0gvdzcdsp5j6y77"; + patches = [ ./vpxenc-0.10-libvpx-1.5.patch ]; }) diff --git a/pkgs/development/libraries/ffmpeg/1.2.nix b/pkgs/development/libraries/ffmpeg/1.2.nix index c87cf581c76..312eb70fdf2 100644 --- a/pkgs/development/libraries/ffmpeg/1.2.nix +++ b/pkgs/development/libraries/ffmpeg/1.2.nix @@ -4,4 +4,5 @@ callPackage ./generic.nix (args // rec { version = "${branch}.12"; branch = "1.2"; sha256 = "0za9w87rk4x6wkjc6iaxqx2ihlsgj181ilfgxfjc54mdgxfcjfli"; + patches = [ ./vpxenc-1.2-libvpx-1.5.patch ]; }) diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index d50c20331e4..0c4e9df3df1 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -15,7 +15,7 @@ # Darwin frameworks , Cocoa # Inherit generics -, branch, sha256, version, ... +, branch, sha256, version, patches ? [], ... }: /* Maintainer notes: @@ -69,7 +69,8 @@ stdenv.mkDerivation rec { inherit sha256; }; - patchPhase = ''patchShebangs .''; + postPatch = ''patchShebangs .''; + inherit patches; outputs = [ "dev" "out" "bin" ] ++ optional (reqMin "1.0") "doc" ; # just dev-doc diff --git a/pkgs/development/libraries/ffmpeg/vpxenc-0.10-libvpx-1.5.patch b/pkgs/development/libraries/ffmpeg/vpxenc-0.10-libvpx-1.5.patch new file mode 100644 index 00000000000..740bb746aad --- /dev/null +++ b/pkgs/development/libraries/ffmpeg/vpxenc-0.10-libvpx-1.5.patch @@ -0,0 +1,24 @@ +diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c +index 1d33ce9..dface51 100644 +--- a/libavcodec/libvpxenc.c ++++ b/libavcodec/libvpxenc.c +@@ -78,19 +78,11 @@ typedef struct VP8EncoderContext { + + /** String mappings for enum vp8e_enc_control_id */ + static const char *ctlidstr[] = { +- [VP8E_UPD_ENTROPY] = "VP8E_UPD_ENTROPY", +- [VP8E_UPD_REFERENCE] = "VP8E_UPD_REFERENCE", +- [VP8E_USE_REFERENCE] = "VP8E_USE_REFERENCE", +- [VP8E_SET_ROI_MAP] = "VP8E_SET_ROI_MAP", +- [VP8E_SET_ACTIVEMAP] = "VP8E_SET_ACTIVEMAP", +- [VP8E_SET_SCALEMODE] = "VP8E_SET_SCALEMODE", + [VP8E_SET_CPUUSED] = "VP8E_SET_CPUUSED", + [VP8E_SET_ENABLEAUTOALTREF] = "VP8E_SET_ENABLEAUTOALTREF", + [VP8E_SET_NOISE_SENSITIVITY] = "VP8E_SET_NOISE_SENSITIVITY", +- [VP8E_SET_SHARPNESS] = "VP8E_SET_SHARPNESS", + [VP8E_SET_STATIC_THRESHOLD] = "VP8E_SET_STATIC_THRESHOLD", + [VP8E_SET_TOKEN_PARTITIONS] = "VP8E_SET_TOKEN_PARTITIONS", +- [VP8E_GET_LAST_QUANTIZER] = "VP8E_GET_LAST_QUANTIZER", + [VP8E_SET_ARNR_MAXFRAMES] = "VP8E_SET_ARNR_MAXFRAMES", + [VP8E_SET_ARNR_STRENGTH] = "VP8E_SET_ARNR_STRENGTH", + [VP8E_SET_ARNR_TYPE] = "VP8E_SET_ARNR_TYPE", diff --git a/pkgs/development/libraries/ffmpeg/vpxenc-1.2-libvpx-1.5.patch b/pkgs/development/libraries/ffmpeg/vpxenc-1.2-libvpx-1.5.patch new file mode 100644 index 00000000000..7f1ec1df6c7 --- /dev/null +++ b/pkgs/development/libraries/ffmpeg/vpxenc-1.2-libvpx-1.5.patch @@ -0,0 +1,24 @@ +diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c +index 4f1adb8..1791952 100644 +--- a/libavcodec/libvpxenc.c ++++ b/libavcodec/libvpxenc.c +@@ -87,19 +87,11 @@ typedef struct VP8EncoderContext { + + /** String mappings for enum vp8e_enc_control_id */ + static const char *const ctlidstr[] = { +- [VP8E_UPD_ENTROPY] = "VP8E_UPD_ENTROPY", +- [VP8E_UPD_REFERENCE] = "VP8E_UPD_REFERENCE", +- [VP8E_USE_REFERENCE] = "VP8E_USE_REFERENCE", +- [VP8E_SET_ROI_MAP] = "VP8E_SET_ROI_MAP", +- [VP8E_SET_ACTIVEMAP] = "VP8E_SET_ACTIVEMAP", +- [VP8E_SET_SCALEMODE] = "VP8E_SET_SCALEMODE", + [VP8E_SET_CPUUSED] = "VP8E_SET_CPUUSED", + [VP8E_SET_ENABLEAUTOALTREF] = "VP8E_SET_ENABLEAUTOALTREF", + [VP8E_SET_NOISE_SENSITIVITY] = "VP8E_SET_NOISE_SENSITIVITY", +- [VP8E_SET_SHARPNESS] = "VP8E_SET_SHARPNESS", + [VP8E_SET_STATIC_THRESHOLD] = "VP8E_SET_STATIC_THRESHOLD", + [VP8E_SET_TOKEN_PARTITIONS] = "VP8E_SET_TOKEN_PARTITIONS", +- [VP8E_GET_LAST_QUANTIZER] = "VP8E_GET_LAST_QUANTIZER", + [VP8E_SET_ARNR_MAXFRAMES] = "VP8E_SET_ARNR_MAXFRAMES", + [VP8E_SET_ARNR_STRENGTH] = "VP8E_SET_ARNR_STRENGTH", + [VP8E_SET_ARNR_TYPE] = "VP8E_SET_ARNR_TYPE", diff --git a/pkgs/development/libraries/fmod/4.24.16.nix b/pkgs/development/libraries/fmod/4.24.16.nix index 191db2f6f6d..b45ec24ca6b 100644 --- a/pkgs/development/libraries/fmod/4.24.16.nix +++ b/pkgs/development/libraries/fmod/4.24.16.nix @@ -29,11 +29,10 @@ stdenv.mkDerivation rec { dontStrip = true; dontPatchELF = true; + dontBuild = true; makeFlags = [ "DESTLIBDIR=$(out)/lib" "DESTHDRDIR=$(out)/include" ]; - buildPhase = "true"; - preInstall = '' mkdir -p $out/lib ''; diff --git a/pkgs/development/libraries/fmod/default.nix b/pkgs/development/libraries/fmod/default.nix index 621d6dc405f..af946019540 100644 --- a/pkgs/development/libraries/fmod/default.nix +++ b/pkgs/development/libraries/fmod/default.nix @@ -18,7 +18,8 @@ stdenv.mkDerivation rec { }; dontStrip = true; - buildPhase = "true"; + dontBuild = true; + installPhase = '' mkdir -p $out/lib $out/include/fmodex diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index 72867e012a9..dc07c481b10 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { patchShebangs build ''; - configureFlags = [ "--with-boost-libdir=${boost.lib}/lib" ]; + configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix index 81e98056e90..0548d1433b7 100644 --- a/pkgs/development/libraries/freetype/default.nix +++ b/pkgs/development/libraries/freetype/default.nix @@ -26,7 +26,8 @@ stdenv.mkDerivation rec { }; patches = [] - ++ optionals useEncumberedCode [ + # mingw: these patches use `strcasestr` which isn't available on windows + ++ optionals (useEncumberedCode && stdenv.cross.libc or null != "msvcrt" ) [ (fetchbohoomil "01-freetype-2.6.2-enable-valid.patch" "1szq0zha7n41f4pq179wgfkam034mp2xn0xc36sdl5sjp9s9hv08") (fetchbohoomil "02-upstream-2015.12.05.patch" @@ -39,7 +40,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ zlib bzip2 libpng ]; # needed when linking against freetype # dependence on harfbuzz is looser than the reverse dependence - buildInputs = [ pkgconfig which ] + nativeBuildInputs = [ pkgconfig which ] # FreeType requires GNU Make, which is not part of stdenv on FreeBSD. ++ optional (!stdenv.isLinux) gnumake; @@ -56,7 +57,7 @@ stdenv.mkDerivation rec { postInstall = glib.flattenInclude; - crossAttrs = { + crossAttrs = stdenv.lib.optionalAttrs (stdenv.cross.libc or null != "msvcrt") { # Somehow it calls the unwrapped gcc, "i686-pc-linux-gnu-gcc", instead # of gcc. I think it's due to the unwrapped gcc being in the PATH. I don't # know why it's on the PATH. diff --git a/pkgs/development/libraries/gd/CVE-2016-3074.patch b/pkgs/development/libraries/gd/CVE-2016-3074.patch new file mode 100644 index 00000000000..76994697729 --- /dev/null +++ b/pkgs/development/libraries/gd/CVE-2016-3074.patch @@ -0,0 +1,13 @@ +diff --git a/src/gd_gd2.c b/src/gd_gd2.c +index 6f28461..a50b33d 100644 +--- a/src/gd_gd2.c ++++ b/src/gd_gd2.c +@@ -165,6 +165,8 @@ _gd2GetHeader (gdIOCtxPtr in, int *sx, int *sy, + if (gdGetInt (&cidx[i].size, in) != 1) { + goto fail2; + }; ++ if (cidx[i].offset < 0 || cidx[i].size < 0) ++ goto fail2; + }; + *chunkIdx = cidx; + }; diff --git a/pkgs/development/libraries/gd/default.nix b/pkgs/development/libraries/gd/default.nix index b581bce24b1..47218a803c0 100644 --- a/pkgs/development/libraries/gd/default.nix +++ b/pkgs/development/libraries/gd/default.nix @@ -1,23 +1,36 @@ -{stdenv, fetchurl, zlib, libpng, freetype, libjpeg, fontconfig}: +{ stdenv, fetchurl +, pkgconfig +, zlib +, libjpeg +, libpng +, libtiff ? null +, libXpm ? null +, fontconfig +, freetype +}: -stdenv.mkDerivation { - name = "gd-2.0.35"; +stdenv.mkDerivation rec { + name = "gd-${version}"; + version = "2.1.1"; src = fetchurl { - url = http://www.libgd.org/releases/gd-2.0.35.tar.bz2; - sha256 = "1y80lcmb8qbzf0a28841zxhq9ndfapmh2fsrqfd9lalxfj8288mz"; + url = "https://github.com/libgd/libgd/releases/download/${name}/libgd-${version}.tar.xz"; + sha256 = "11djy9flzxczphigqgp7fbbblbq35gqwwhn9xfcckawlapa1xnls"; }; - buildInputs = [zlib libpng freetype]; - - propagatedBuildInputs = [libjpeg fontconfig]; # urgh + patches = [ + ./CVE-2016-3074.patch + ]; hardeningDisable = [ "format" ]; - configureFlags = "--without-x"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ zlib fontconfig freetype libjpeg libpng libtiff libXpm ]; - meta = { - homepage = http://www.libgd.org/; - description = "An open source code library for the dynamic creation of images by programmers"; + meta = with stdenv.lib; { + homepage = https://libgd.github.io/; + description = "A dynamic image creation library"; + license = licenses.free; # some custom license + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/gdcm/default.nix b/pkgs/development/libraries/gdcm/default.nix index 4663f7aac22..0ca281b0722 100644 --- a/pkgs/development/libraries/gdcm/default.nix +++ b/pkgs/development/libraries/gdcm/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, cmake }: stdenv.mkDerivation rec { - version = "2.4.4"; + version = "2.4.6"; name = "gdcm-${version}"; src = fetchurl { url = "mirror://sourceforge/gdcm/${name}.tar.bz2"; - sha256 = "07svgp7c928sw712gq6rx4h0c6wp2kr1n8fmxjlzb031l51jzkf5"; + sha256 = "0rgqgkjyqgld0hpa311z8cddp42v9ihzidyanwyxqpv3jmcrlsfk"; }; dontUseCmakeBuildDir = true; diff --git a/pkgs/development/libraries/gegl/default.nix b/pkgs/development/libraries/gegl/default.nix index 38432f68273..70b731f56dd 100644 --- a/pkgs/development/libraries/gegl/default.nix +++ b/pkgs/development/libraries/gegl/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { description = "Graph-based image processing framework"; homepage = http://www.gegl.org; license = stdenv.lib.licenses.gpl3; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix index b75e85cbea5..1d3644be6a7 100644 --- a/pkgs/development/libraries/gettext/default.nix +++ b/pkgs/development/libraries/gettext/default.nix @@ -57,13 +57,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - crossAttrs = { - buildInputs = lib.optional (stdenv ? ccCross && stdenv.ccCross.libc ? libiconv) - stdenv.ccCross.libc.libiconv.crossDrv; - # Gettext fails to guess the cross compiler - configureFlags = "CXX=${stdenv.cross.config}-g++"; - }; - meta = { description = "Well integrated set of translation tools and documentation"; diff --git a/pkgs/development/libraries/git2/default.nix b/pkgs/development/libraries/git2/default.nix index 3cf429ab1d7..3e9e0bea8e3 100644 --- a/pkgs/development/libraries/git2/default.nix +++ b/pkgs/development/libraries/git2/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, pkgconfig, cmake, zlib, python, libssh2, openssl, http-parser, libiconv }: stdenv.mkDerivation (rec { - version = "0.23.2"; + version = "0.24.1"; name = "libgit2-${version}"; src = fetchurl { name = "${name}.tar.gz"; url = "https://github.com/libgit2/libgit2/tarball/v${version}"; - sha256 = "1d3901bmgvdnmzrx21afi1d0llsqmca3ckj942p0i2wpdpr1kbcp"; + sha256 = "0rw80480dx2f6a2wbb1bwixygg1iwq3r7vwhxdmkkf4lpxd35jhd"; }; cmakeFlags = "-DTHREADSAFE=ON"; diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 893f65c3e20..a189edb9832 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -49,6 +49,11 @@ stdenv.mkDerivation ({ "/bin:/usr/bin", which is inappropriate on NixOS machines. This patch extends the search path by "/run/current-system/sw/bin". */ ./fix_path_attribute_in_getconf.patch + + ./cve-2016-3075.patch + ./glob-simplify-interface.patch + ./cve-2016-1234.patch + ./cve-2016-3706.patch ]; postPatch = diff --git a/pkgs/development/libraries/glibc/cve-2016-1234.patch b/pkgs/development/libraries/glibc/cve-2016-1234.patch new file mode 100644 index 00000000000..d98577868a9 --- /dev/null +++ b/pkgs/development/libraries/glibc/cve-2016-1234.patch @@ -0,0 +1,372 @@ +commit c87db3fcbdf890990b44d956621763538c878cd3 +Author: Florian Weimer <fweimer@redhat.com> +Date: Wed May 4 12:09:35 2016 +0200 + + CVE-2016-1234: glob: Do not copy d_name field of struct dirent [BZ #19779] + + Instead, we store the data we need from the return value of + readdir in an object of the new type struct readdir_result. + This type is independent of the layout of struct dirent. + + (cherry picked from commit 5171f3079f2cc53e0548fc4967361f4d1ce9d7ea) + +diff --git a/posix/bug-glob2.c b/posix/bug-glob2.c +index 0fdc5d0..5873e08 100644 +--- a/posix/bug-glob2.c ++++ b/posix/bug-glob2.c +@@ -40,6 +40,17 @@ + # define PRINTF(fmt, args...) + #endif + ++#define LONG_NAME \ ++ "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" \ ++ "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" \ ++ "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" \ ++ "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" \ ++ "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" \ ++ "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" \ ++ "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" \ ++ "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" \ ++ "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" \ ++ "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + + static struct + { +@@ -58,6 +69,7 @@ static struct + { ".", 3, DT_DIR, 0755 }, + { "..", 3, DT_DIR, 0755 }, + { "a", 3, DT_REG, 0644 }, ++ { LONG_NAME, 3, DT_REG, 0644 }, + { "unreadable", 2, DT_DIR, 0111 }, + { ".", 3, DT_DIR, 0111 }, + { "..", 3, DT_DIR, 0755 }, +@@ -75,7 +87,7 @@ typedef struct + int level; + int idx; + struct dirent d; +- char room_for_dirent[NAME_MAX]; ++ char room_for_dirent[sizeof (LONG_NAME)]; + } my_DIR; + + +diff --git a/posix/glob.c b/posix/glob.c +index 9ae76ac..ea4b0b6 100644 +--- a/posix/glob.c ++++ b/posix/glob.c +@@ -24,7 +24,9 @@ + #include <errno.h> + #include <sys/types.h> + #include <sys/stat.h> ++#include <stdbool.h> + #include <stddef.h> ++#include <stdint.h> + + /* Outcomment the following line for production quality code. */ + /* #define NDEBUG 1 */ +@@ -73,69 +75,8 @@ + # endif /* HAVE_VMSDIR_H */ + #endif + +- +-/* When used in the GNU libc the symbol _DIRENT_HAVE_D_TYPE is available +- if the `d_type' member for `struct dirent' is available. +- HAVE_STRUCT_DIRENT_D_TYPE plays the same role in GNULIB. */ +-#if defined _DIRENT_HAVE_D_TYPE || defined HAVE_STRUCT_DIRENT_D_TYPE +-/* True if the directory entry D must be of type T. */ +-# define DIRENT_MUST_BE(d, t) ((d)->d_type == (t)) +- +-/* True if the directory entry D might be a symbolic link. */ +-# define DIRENT_MIGHT_BE_SYMLINK(d) \ +- ((d)->d_type == DT_UNKNOWN || (d)->d_type == DT_LNK) +- +-/* True if the directory entry D might be a directory. */ +-# define DIRENT_MIGHT_BE_DIR(d) \ +- ((d)->d_type == DT_DIR || DIRENT_MIGHT_BE_SYMLINK (d)) +- +-#else /* !HAVE_D_TYPE */ +-# define DIRENT_MUST_BE(d, t) false +-# define DIRENT_MIGHT_BE_SYMLINK(d) true +-# define DIRENT_MIGHT_BE_DIR(d) true +-#endif /* HAVE_D_TYPE */ +- +-/* If the system has the `struct dirent64' type we use it internally. */ +-#if defined _LIBC && !defined COMPILE_GLOB64 +- +-# if (defined POSIX || defined WINDOWS32) && !defined __GNU_LIBRARY__ +-# define CONVERT_D_INO(d64, d32) +-# else +-# define CONVERT_D_INO(d64, d32) \ +- (d64)->d_ino = (d32)->d_ino; +-# endif +- +-# ifdef _DIRENT_HAVE_D_TYPE +-# define CONVERT_D_TYPE(d64, d32) \ +- (d64)->d_type = (d32)->d_type; +-# else +-# define CONVERT_D_TYPE(d64, d32) +-# endif +- +-# define CONVERT_DIRENT_DIRENT64(d64, d32) \ +- strcpy ((d64)->d_name, (d32)->d_name); \ +- CONVERT_D_INO (d64, d32) \ +- CONVERT_D_TYPE (d64, d32) +-#endif +- +- +-#if (defined POSIX || defined WINDOWS32) && !defined __GNU_LIBRARY__ +-/* Posix does not require that the d_ino field be present, and some +- systems do not provide it. */ +-# define REAL_DIR_ENTRY(dp) 1 +-#else +-# define REAL_DIR_ENTRY(dp) (dp->d_ino != 0) +-#endif /* POSIX */ +- + #include <stdlib.h> + #include <string.h> +- +-/* NAME_MAX is usually defined in <dirent.h> or <limits.h>. */ +-#include <limits.h> +-#ifndef NAME_MAX +-# define NAME_MAX (sizeof (((struct dirent *) 0)->d_name)) +-#endif +- + #include <alloca.h> + + #ifdef _LIBC +@@ -180,8 +121,111 @@ + + static const char *next_brace_sub (const char *begin, int flags) __THROWNL; + ++/* A representation of a directory entry which does not depend on the ++ layout of struct dirent, or the size of ino_t. */ ++struct readdir_result ++{ ++ const char *name; ++# if defined _DIRENT_HAVE_D_TYPE || defined HAVE_STRUCT_DIRENT_D_TYPE ++ uint8_t type; ++# endif ++ bool skip_entry; ++}; ++ ++# if defined _DIRENT_HAVE_D_TYPE || defined HAVE_STRUCT_DIRENT_D_TYPE ++/* Initializer based on the d_type member of struct dirent. */ ++# define D_TYPE_TO_RESULT(source) (source)->d_type, ++ ++/* True if the directory entry D might be a symbolic link. */ ++static bool ++readdir_result_might_be_symlink (struct readdir_result d) ++{ ++ return d.type == DT_UNKNOWN || d.type == DT_LNK; ++} ++ ++/* True if the directory entry D might be a directory. */ ++static bool ++readdir_result_might_be_dir (struct readdir_result d) ++{ ++ return d.type == DT_DIR || readdir_result_might_be_symlink (d); ++} ++# else /* defined _DIRENT_HAVE_D_TYPE || defined HAVE_STRUCT_DIRENT_D_TYPE */ ++# define D_TYPE_TO_RESULT(source) ++ ++/* If we do not have type information, symbolic links and directories ++ are always a possibility. */ ++ ++static bool ++readdir_result_might_be_symlink (struct readdir_result d) ++{ ++ return true; ++} ++ ++static bool ++readdir_result_might_be_dir (struct readdir_result d) ++{ ++ return true; ++} ++ ++# endif /* defined _DIRENT_HAVE_D_TYPE || defined HAVE_STRUCT_DIRENT_D_TYPE */ ++ ++# if (defined POSIX || defined WINDOWS32) && !defined __GNU_LIBRARY__ ++/* Initializer for skip_entry. POSIX does not require that the d_ino ++ field be present, and some systems do not provide it. */ ++# define D_INO_TO_RESULT(source) false, ++# else ++# define D_INO_TO_RESULT(source) (source)->d_ino == 0, ++# endif ++ ++/* Construct an initializer for a struct readdir_result object from a ++ struct dirent *. No copy of the name is made. */ ++#define READDIR_RESULT_INITIALIZER(source) \ ++ { \ ++ source->d_name, \ ++ D_TYPE_TO_RESULT (source) \ ++ D_INO_TO_RESULT (source) \ ++ } ++ + #endif /* !defined _LIBC || !defined GLOB_ONLY_P */ + ++/* Call gl_readdir on STREAM. This macro can be overridden to reduce ++ type safety if an old interface version needs to be supported. */ ++#ifndef GL_READDIR ++# define GL_READDIR(pglob, stream) ((pglob)->gl_readdir (stream)) ++#endif ++ ++/* Extract name and type from directory entry. No copy of the name is ++ made. If SOURCE is NULL, result name is NULL. Keep in sync with ++ convert_dirent64 below. */ ++static struct readdir_result ++convert_dirent (const struct dirent *source) ++{ ++ if (source == NULL) ++ { ++ struct readdir_result result = { NULL, }; ++ return result; ++ } ++ struct readdir_result result = READDIR_RESULT_INITIALIZER (source); ++ return result; ++} ++ ++#ifndef COMPILE_GLOB64 ++/* Like convert_dirent, but works on struct dirent64 instead. Keep in ++ sync with convert_dirent above. */ ++static struct readdir_result ++convert_dirent64 (const struct dirent64 *source) ++{ ++ if (source == NULL) ++ { ++ struct readdir_result result = { NULL, }; ++ return result; ++ } ++ struct readdir_result result = READDIR_RESULT_INITIALIZER (source); ++ return result; ++} ++#endif ++ ++ + #ifndef attribute_hidden + # define attribute_hidden + #endif +@@ -1538,55 +1582,36 @@ glob_in_dir (const char *pattern, const char *directory, int flags, + + while (1) + { +- const char *name; +-#if defined _LIBC && !defined COMPILE_GLOB64 +- struct dirent64 *d; +- union +- { +- struct dirent64 d64; +- char room [offsetof (struct dirent64, d_name[0]) +- + NAME_MAX + 1]; +- } +- d64buf; +- +- if (__glibc_unlikely (flags & GLOB_ALTDIRFUNC)) +- { +- struct dirent *d32 = (*pglob->gl_readdir) (stream); +- if (d32 != NULL) +- { +- CONVERT_DIRENT_DIRENT64 (&d64buf.d64, d32); +- d = &d64buf.d64; +- } +- else +- d = NULL; +- } +- else +- d = __readdir64 (stream); ++ struct readdir_result d; ++ { ++ if (__builtin_expect (flags & GLOB_ALTDIRFUNC, 0)) ++ d = convert_dirent (GL_READDIR (pglob, stream)); ++ else ++ { ++#ifdef COMPILE_GLOB64 ++ d = convert_dirent (__readdir (stream)); + #else +- struct dirent *d = (__builtin_expect (flags & GLOB_ALTDIRFUNC, 0) +- ? ((struct dirent *) +- (*pglob->gl_readdir) (stream)) +- : __readdir (stream)); ++ d = convert_dirent64 (__readdir64 (stream)); + #endif +- if (d == NULL) ++ } ++ } ++ if (d.name == NULL) + break; +- if (! REAL_DIR_ENTRY (d)) ++ if (d.skip_entry) + continue; + + /* If we shall match only directories use the information + provided by the dirent call if possible. */ +- if ((flags & GLOB_ONLYDIR) && !DIRENT_MIGHT_BE_DIR (d)) ++ if ((flags & GLOB_ONLYDIR) && !readdir_result_might_be_dir (d)) + continue; + +- name = d->d_name; +- +- if (fnmatch (pattern, name, fnm_flags) == 0) ++ if (fnmatch (pattern, d.name, fnm_flags) == 0) + { + /* If the file we found is a symlink we have to + make sure the target file exists. */ +- if (!DIRENT_MIGHT_BE_SYMLINK (d) +- || link_exists_p (dfd, directory, dirlen, name, pglob, +- flags)) ++ if (!readdir_result_might_be_symlink (d) ++ || link_exists_p (dfd, directory, dirlen, d.name, ++ pglob, flags)) + { + if (cur == names->count) + { +@@ -1606,7 +1631,7 @@ glob_in_dir (const char *pattern, const char *directory, int flags, + names = newnames; + cur = 0; + } +- names->name[cur] = strdup (d->d_name); ++ names->name[cur] = strdup (d.name); + if (names->name[cur] == NULL) + goto memory_error; + ++cur; +diff --git a/sysdeps/unix/sysv/linux/i386/glob64.c b/sysdeps/unix/sysv/linux/i386/glob64.c +index b4fcd1a..802c957 100644 +--- a/sysdeps/unix/sysv/linux/i386/glob64.c ++++ b/sysdeps/unix/sysv/linux/i386/glob64.c +@@ -1,3 +1,21 @@ ++/* Two glob variants with 64-bit support, for dirent64 and __olddirent64. ++ Copyright (C) 1998-2016 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library 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 ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ <http://www.gnu.org/licenses/>. */ ++ + #include <dirent.h> + #include <glob.h> + #include <sys/stat.h> +@@ -38,11 +56,15 @@ int __old_glob64 (const char *__pattern, int __flags, + + #undef dirent + #define dirent __old_dirent64 ++#undef GL_READDIR ++# define GL_READDIR(pglob, stream) \ ++ ((struct __old_dirent64 *) (pglob)->gl_readdir (stream)) + #undef __readdir + #define __readdir(dirp) __old_readdir64 (dirp) + #undef glob + #define glob(pattern, flags, errfunc, pglob) \ + __old_glob64 (pattern, flags, errfunc, pglob) ++#define convert_dirent __old_convert_dirent + #define glob_in_dir __old_glob_in_dir + #define GLOB_ATTRIBUTE attribute_compat_text_section + diff --git a/pkgs/development/libraries/glibc/cve-2016-3075.patch b/pkgs/development/libraries/glibc/cve-2016-3075.patch new file mode 100644 index 00000000000..0da10167bef --- /dev/null +++ b/pkgs/development/libraries/glibc/cve-2016-3075.patch @@ -0,0 +1,35 @@ +commit 146b58d11fddbef15b888906e3be4f33900c416f +Author: Florian Weimer <fweimer@redhat.com> +Date: Tue Mar 29 12:57:56 2016 +0200 + + CVE-2016-3075: Stack overflow in _nss_dns_getnetbyname_r [BZ #19879] + + The defensive copy is not needed because the name may not alias the + output buffer. + + (cherry picked from commit 317b199b4aff8cfa27f2302ab404d2bb5032b9a4) + (cherry picked from commit 883dceebc8f11921a9890211a4e202e5be17562f) + +diff --git a/resolv/nss_dns/dns-network.c b/resolv/nss_dns/dns-network.c +index 2eb2f67..8f301a7 100644 +--- a/resolv/nss_dns/dns-network.c ++++ b/resolv/nss_dns/dns-network.c +@@ -118,17 +118,14 @@ _nss_dns_getnetbyname_r (const char *name, struct netent *result, + } net_buffer; + querybuf *orig_net_buffer; + int anslen; +- char *qbuf; + enum nss_status status; + + if (__res_maybe_init (&_res, 0) == -1) + return NSS_STATUS_UNAVAIL; + +- qbuf = strdupa (name); +- + net_buffer.buf = orig_net_buffer = (querybuf *) alloca (1024); + +- anslen = __libc_res_nsearch (&_res, qbuf, C_IN, T_PTR, net_buffer.buf->buf, ++ anslen = __libc_res_nsearch (&_res, name, C_IN, T_PTR, net_buffer.buf->buf, + 1024, &net_buffer.ptr, NULL, NULL, NULL, NULL); + if (anslen < 0) + { diff --git a/pkgs/development/libraries/glibc/cve-2016-3706.patch b/pkgs/development/libraries/glibc/cve-2016-3706.patch new file mode 100644 index 00000000000..cf9fb060355 --- /dev/null +++ b/pkgs/development/libraries/glibc/cve-2016-3706.patch @@ -0,0 +1,181 @@ +commit 1a8a7c12950a0026a3c406a7cb1608f96aa1460e +Author: Florian Weimer <fweimer@redhat.com> +Date: Fri Apr 29 10:35:34 2016 +0200 + + CVE-2016-3706: getaddrinfo: stack overflow in hostent conversion [BZ #20010] + + When converting a struct hostent response to struct gaih_addrtuple, the + gethosts macro (which is called from gaih_inet) used alloca, without + malloc fallback for large responses. This commit changes this code to + use calloc unconditionally. + + This commit also consolidated a second hostent-to-gaih_addrtuple + conversion loop (in gaih_inet) to use the new conversion function. + + (cherry picked from commit 4ab2ab03d4351914ee53248dc5aef4a8c88ff8b9) + +diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c +index 1ef3f20..fed2d3b 100644 +--- a/sysdeps/posix/getaddrinfo.c ++++ b/sysdeps/posix/getaddrinfo.c +@@ -168,9 +168,58 @@ gaih_inet_serv (const char *servicename, const struct gaih_typeproto *tp, + return 0; + } + ++/* Convert struct hostent to a list of struct gaih_addrtuple objects. ++ h_name is not copied, and the struct hostent object must not be ++ deallocated prematurely. *RESULT must be NULL or a pointer to an ++ object allocated using malloc, which is freed. */ ++static bool ++convert_hostent_to_gaih_addrtuple (const struct addrinfo *req, ++ int family, ++ struct hostent *h, ++ struct gaih_addrtuple **result) ++{ ++ free (*result); ++ *result = NULL; ++ ++ /* Count the number of addresses in h->h_addr_list. */ ++ size_t count = 0; ++ for (char **p = h->h_addr_list; *p != NULL; ++p) ++ ++count; ++ ++ /* Report no data if no addresses are available, or if the incoming ++ address size is larger than what we can store. */ ++ if (count == 0 || h->h_length > sizeof (((struct gaih_addrtuple) {}).addr)) ++ return true; ++ ++ struct gaih_addrtuple *array = calloc (count, sizeof (*array)); ++ if (array == NULL) ++ return false; ++ ++ for (size_t i = 0; i < count; ++i) ++ { ++ if (family == AF_INET && req->ai_family == AF_INET6) ++ { ++ /* Perform address mapping. */ ++ array[i].family = AF_INET6; ++ memcpy(array[i].addr + 3, h->h_addr_list[i], sizeof (uint32_t)); ++ array[i].addr[2] = htonl (0xffff); ++ } ++ else ++ { ++ array[i].family = family; ++ memcpy (array[i].addr, h->h_addr_list[i], h->h_length); ++ } ++ array[i].next = array + i + 1; ++ } ++ array[0].name = h->h_name; ++ array[count - 1].next = NULL; ++ ++ *result = array; ++ return true; ++} ++ + #define gethosts(_family, _type) \ + { \ +- int i; \ + int herrno; \ + struct hostent th; \ + struct hostent *h; \ +@@ -219,36 +268,23 @@ gaih_inet_serv (const char *servicename, const struct gaih_typeproto *tp, + } \ + else if (h != NULL) \ + { \ +- for (i = 0; h->h_addr_list[i]; i++) \ ++ /* Make sure that addrmem can be freed. */ \ ++ if (!malloc_addrmem) \ ++ addrmem = NULL; \ ++ if (!convert_hostent_to_gaih_addrtuple (req, _family,h, &addrmem)) \ + { \ +- if (*pat == NULL) \ +- { \ +- *pat = __alloca (sizeof (struct gaih_addrtuple)); \ +- (*pat)->scopeid = 0; \ +- } \ +- uint32_t *addr = (*pat)->addr; \ +- (*pat)->next = NULL; \ +- (*pat)->name = i == 0 ? strdupa (h->h_name) : NULL; \ +- if (_family == AF_INET && req->ai_family == AF_INET6) \ +- { \ +- (*pat)->family = AF_INET6; \ +- addr[3] = *(uint32_t *) h->h_addr_list[i]; \ +- addr[2] = htonl (0xffff); \ +- addr[1] = 0; \ +- addr[0] = 0; \ +- } \ +- else \ +- { \ +- (*pat)->family = _family; \ +- memcpy (addr, h->h_addr_list[i], sizeof(_type)); \ +- } \ +- pat = &((*pat)->next); \ ++ _res.options |= old_res_options & RES_USE_INET6; \ ++ result = -EAI_SYSTEM; \ ++ goto free_and_return; \ + } \ ++ *pat = addrmem; \ ++ /* The conversion uses malloc unconditionally. */ \ ++ malloc_addrmem = true; \ + \ + if (localcanon != NULL && canon == NULL) \ + canon = strdupa (localcanon); \ + \ +- if (_family == AF_INET6 && i > 0) \ ++ if (_family == AF_INET6 && *pat != NULL) \ + got_ipv6 = true; \ + } \ + } +@@ -612,44 +648,16 @@ gaih_inet (const char *name, const struct gaih_service *service, + { + if (h != NULL) + { +- int i; +- /* We found data, count the number of addresses. */ +- for (i = 0; h->h_addr_list[i]; ++i) +- ; +- if (i > 0 && *pat != NULL) +- --i; +- +- if (__libc_use_alloca (alloca_used +- + i * sizeof (struct gaih_addrtuple))) +- addrmem = alloca_account (i * sizeof (struct gaih_addrtuple), +- alloca_used); +- else +- { +- addrmem = malloc (i +- * sizeof (struct gaih_addrtuple)); +- if (addrmem == NULL) +- { +- result = -EAI_MEMORY; +- goto free_and_return; +- } +- malloc_addrmem = true; +- } +- +- /* Now convert it into the list. */ +- struct gaih_addrtuple *addrfree = addrmem; +- for (i = 0; h->h_addr_list[i]; ++i) ++ /* We found data, convert it. */ ++ if (!convert_hostent_to_gaih_addrtuple ++ (req, AF_INET, h, &addrmem)) + { +- if (*pat == NULL) +- { +- *pat = addrfree++; +- (*pat)->scopeid = 0; +- } +- (*pat)->next = NULL; +- (*pat)->family = AF_INET; +- memcpy ((*pat)->addr, h->h_addr_list[i], +- h->h_length); +- pat = &((*pat)->next); ++ result = -EAI_MEMORY; ++ goto free_and_return; + } ++ *pat = addrmem; ++ /* The conversion uses malloc unconditionally. */ ++ malloc_addrmem = true; + } + } + else diff --git a/pkgs/development/libraries/glibc/glob-simplify-interface.patch b/pkgs/development/libraries/glibc/glob-simplify-interface.patch new file mode 100644 index 00000000000..647cca8b3a6 --- /dev/null +++ b/pkgs/development/libraries/glibc/glob-simplify-interface.patch @@ -0,0 +1,216 @@ +commit 68302147ee061c69eb447e243ad9a18ef4cfbc4c +Author: Florian Weimer <fweimer@redhat.com> +Date: Fri Apr 29 09:33:07 2016 +0200 + + glob: Simplify the interface for the GLOB_ALTDIRFUNC callback gl_readdir + + Previously, application code had to set up the d_namlen member if + the target supported it, involving conditional compilation. After + this change, glob will use the length of the string in d_name instead + of d_namlen to determine the file name length. All glibc targets + provide the d_type and d_ino members, and setting them as needed for + gl_readdir is straightforward. + + Changing the behavior with regards to d_ino is left to a future + cleanup. + + (cherry picked from commit 137fe72eca6923a00381a3ca9f0e7672c1f85e3f) + +diff --git a/manual/examples/mkdirent.c b/manual/examples/mkdirent.c +new file mode 100644 +index 0000000..f8400f4 +--- /dev/null ++++ b/manual/examples/mkdirent.c +@@ -0,0 +1,42 @@ ++/* Example for creating a struct dirent object for use with glob. ++ Copyright (C) 2016 Free Software Foundation, 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, if not, see <http://www.gnu.org/licenses/>. ++*/ ++ ++#include <dirent.h> ++#include <errno.h> ++#include <stddef.h> ++#include <stdlib.h> ++#include <string.h> ++ ++struct dirent * ++mkdirent (const char *name) ++{ ++ size_t dirent_size = offsetof (struct dirent, d_name) + 1; ++ size_t name_length = strlen (name); ++ size_t total_size = dirent_size + name_length; ++ if (total_size < dirent_size) ++ { ++ errno = ENOMEM; ++ return NULL; ++ } ++ struct dirent *result = malloc (total_size); ++ if (result == NULL) ++ return NULL; ++ result->d_type = DT_UNKNOWN; ++ result->d_ino = 1; /* Do not skip this entry. */ ++ memcpy (result->d_name, name, name_length + 1); ++ return result; ++} +diff --git a/manual/pattern.texi b/manual/pattern.texi +index d1b9275..565e7eb 100644 +--- a/manual/pattern.texi ++++ b/manual/pattern.texi +@@ -237,7 +237,44 @@ function used to read the contents of a directory. It is used if the + @code{GLOB_ALTDIRFUNC} bit is set in the flag parameter. The type of + this field is @w{@code{struct dirent *(*) (void *)}}. + +-This is a GNU extension. ++An implementation of @code{gl_readdir} needs to initialize the following ++members of the @code{struct dirent} object: ++ ++@table @code ++@item d_type ++This member should be set to the file type of the entry if it is known. ++Otherwise, the value @code{DT_UNKNOWN} can be used. The @code{glob} ++function may use the specified file type to avoid callbacks in cases ++where the file type indicates that the data is not required. ++ ++@item d_ino ++This member needs to be non-zero, otherwise @code{glob} may skip the ++current entry and call the @code{gl_readdir} callback function again to ++retrieve another entry. ++ ++@item d_name ++This member must be set to the name of the entry. It must be ++null-terminated. ++@end table ++ ++The example below shows how to allocate a @code{struct dirent} object ++containing a given name. ++ ++@smallexample ++@include mkdirent.c.texi ++@end smallexample ++ ++The @code{glob} function reads the @code{struct dirent} members listed ++above and makes a copy of the file name in the @code{d_name} member ++immediately after the @code{gl_readdir} callback function returns. ++Future invocations of any of the callback functions may dealloacte or ++reuse the buffer. It is the responsibility of the caller of the ++@code{glob} function to allocate and deallocate the buffer, around the ++call to @code{glob} or using the callback functions. For example, an ++application could allocate the buffer in the @code{gl_readdir} callback ++function, and deallocate it in the @code{gl_closedir} callback function. ++ ++The @code{gl_readdir} member is a GNU extension. + + @item gl_opendir + The address of an alternative implementation of the @code{opendir} +diff --git a/posix/bug-glob2.c b/posix/bug-glob2.c +index ddf5ec9..0fdc5d0 100644 +--- a/posix/bug-glob2.c ++++ b/posix/bug-glob2.c +@@ -193,7 +193,7 @@ my_readdir (void *gdir) + return NULL; + } + +- dir->d.d_ino = dir->idx; ++ dir->d.d_ino = 1; /* glob should not skip this entry. */ + + #ifdef _DIRENT_HAVE_D_TYPE + dir->d.d_type = filesystem[dir->idx].type; +diff --git a/posix/glob.c b/posix/glob.c +index 0c04c3c..9ae76ac 100644 +--- a/posix/glob.c ++++ b/posix/glob.c +@@ -57,10 +57,8 @@ + + #if defined HAVE_DIRENT_H || defined __GNU_LIBRARY__ + # include <dirent.h> +-# define NAMLEN(dirent) strlen((dirent)->d_name) + #else + # define dirent direct +-# define NAMLEN(dirent) (dirent)->d_namlen + # ifdef HAVE_SYS_NDIR_H + # include <sys/ndir.h> + # endif +@@ -76,12 +74,6 @@ + #endif + + +-/* In GNU systems, <dirent.h> defines this macro for us. */ +-#ifdef _D_NAMLEN +-# undef NAMLEN +-# define NAMLEN(d) _D_NAMLEN(d) +-#endif +- + /* When used in the GNU libc the symbol _DIRENT_HAVE_D_TYPE is available + if the `d_type' member for `struct dirent' is available. + HAVE_STRUCT_DIRENT_D_TYPE plays the same role in GNULIB. */ +@@ -105,12 +97,6 @@ + + /* If the system has the `struct dirent64' type we use it internally. */ + #if defined _LIBC && !defined COMPILE_GLOB64 +-# if defined HAVE_DIRENT_H || defined __GNU_LIBRARY__ +-# define CONVERT_D_NAMLEN(d64, d32) +-# else +-# define CONVERT_D_NAMLEN(d64, d32) \ +- (d64)->d_namlen = (d32)->d_namlen; +-# endif + + # if (defined POSIX || defined WINDOWS32) && !defined __GNU_LIBRARY__ + # define CONVERT_D_INO(d64, d32) +@@ -127,8 +113,7 @@ + # endif + + # define CONVERT_DIRENT_DIRENT64(d64, d32) \ +- memcpy ((d64)->d_name, (d32)->d_name, NAMLEN (d32) + 1); \ +- CONVERT_D_NAMLEN (d64, d32) \ ++ strcpy ((d64)->d_name, (d32)->d_name); \ + CONVERT_D_INO (d64, d32) \ + CONVERT_D_TYPE (d64, d32) + #endif +@@ -1554,7 +1539,6 @@ glob_in_dir (const char *pattern, const char *directory, int flags, + while (1) + { + const char *name; +- size_t len; + #if defined _LIBC && !defined COMPILE_GLOB64 + struct dirent64 *d; + union +@@ -1622,12 +1606,10 @@ glob_in_dir (const char *pattern, const char *directory, int flags, + names = newnames; + cur = 0; + } +- len = NAMLEN (d); +- names->name[cur] = (char *) malloc (len + 1); ++ names->name[cur] = strdup (d->d_name); + if (names->name[cur] == NULL) + goto memory_error; +- *((char *) mempcpy (names->name[cur++], name, len)) +- = '\0'; ++ ++cur; + ++nfound; + } + } +diff --git a/posix/tst-gnuglob.c b/posix/tst-gnuglob.c +index 992b997..b7b859b 100644 +--- a/posix/tst-gnuglob.c ++++ b/posix/tst-gnuglob.c +@@ -211,7 +211,7 @@ my_readdir (void *gdir) + return NULL; + } + +- dir->d.d_ino = dir->idx; ++ dir->d.d_ino = 1; /* glob should not skip this entry. */ + + #ifdef _DIRENT_HAVE_D_TYPE + dir->d.d_type = filesystem[dir->idx].type; diff --git a/pkgs/development/libraries/glibmm/default.nix b/pkgs/development/libraries/glibmm/default.nix index 8417179dde1..6d15faf9549 100644 --- a/pkgs/development/libraries/glibmm/default.nix +++ b/pkgs/development/libraries/glibmm/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { sha256 = "c78654addeb27a1213bedd7cd21904a45bbb98a5ba2f2f0de2b2f1a5682d86cf"; }; + outputs = [ "dev" "out" ]; + nativeBuildInputs = [ pkgconfig gnum4 ]; propagatedBuildInputs = [ glib libsigcxx ]; diff --git a/pkgs/development/libraries/gmp/5.1.x.nix b/pkgs/development/libraries/gmp/5.1.x.nix index ad3f0da981f..c6cbfdd89b4 100644 --- a/pkgs/development/libraries/gmp/5.1.x.nix +++ b/pkgs/development/libraries/gmp/5.1.x.nix @@ -74,6 +74,6 @@ stdenv.mkDerivation rec { ''; platforms = platforms.all; - maintainers = [ maintainers.simons ]; + maintainers = [ maintainers.peti ]; }; } diff --git a/pkgs/development/libraries/gmp/6.x.nix b/pkgs/development/libraries/gmp/6.x.nix index a7443c02c5b..d17ac5b8760 100644 --- a/pkgs/development/libraries/gmp/6.x.nix +++ b/pkgs/development/libraries/gmp/6.x.nix @@ -73,7 +73,7 @@ let self = stdenv.mkDerivation rec { ''; platforms = platforms.all; - maintainers = [ maintainers.simons ]; + maintainers = [ maintainers.peti ]; }; }; in self diff --git a/pkgs/development/libraries/gsasl/default.nix b/pkgs/development/libraries/gsasl/default.nix index 1ca5d019b22..720ff06ceaa 100644 --- a/pkgs/development/libraries/gsasl/default.nix +++ b/pkgs/development/libraries/gsasl/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, gss, libidn, krb5Full }: +{ fetchurl, stdenv, gss, libidn, kerberos }: stdenv.mkDerivation rec { name = "gsasl-1.8.0"; @@ -8,11 +8,9 @@ stdenv.mkDerivation rec { sha256 = "1rci64cxvcfr8xcjpqc4inpfq7aw4snnsbf5xz7d30nhvv8n40ii"; }; - buildInputs = [ libidn ] - ++ stdenv.lib.optional (!stdenv.isDarwin) gss - ++ stdenv.lib.optional stdenv.isDarwin krb5Full; + buildInputs = [ libidn kerberos ]; - configureFlags = stdenv.lib.optionalString stdenv.isDarwin "--with-gssapi-impl=mit"; + configureFlags = "--with-gssapi-impl=mit"; doCheck = true; @@ -29,7 +27,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/gsasl/; license = stdenv.lib.licenses.gpl3Plus; - maintainers = with stdenv.lib.maintainers; [ ]; + maintainers = with stdenv.lib.maintainers; [ shlevy ]; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index add3026275f..c47de95c2ad 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -34,6 +34,8 @@ stdenv.mkDerivation rec { sha256 = "03m99igngm37653353n5d724bcqw7p6hw6xjw0i2824523fpcqqi"; }; + outputs = [ "dev" "out" ]; + nativeBuildInputs = [ pkgconfig python ]; buildInputs = [ diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix index b2fff30197c..176eb404f00 100644 --- a/pkgs/development/libraries/gstreamer/base/default.nix +++ b/pkgs/development/libraries/gstreamer/base/default.nix @@ -18,6 +18,8 @@ stdenv.mkDerivation rec { sha256 = "08hmg7fp519wim1fm04r7f2q2020ssdninawqsbrqjsvs70srh5b"; }; + outputs = [ "dev" "out" ]; + nativeBuildInputs = [ pkgconfig python gobjectIntrospection ]; @@ -31,7 +33,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ gstreamer ]; - configureFlags = if stdenv.isDarwin then [ + configureFlags = if stdenv.isDarwin then [ # Does not currently build on Darwin "--disable-libvisual" # Undefined symbols _cdda_identify and _cdda_identify_scsi in cdparanoia diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix index 40caf4093f0..531e22d755d 100644 --- a/pkgs/development/libraries/gstreamer/core/default.nix +++ b/pkgs/development/libraries/gstreamer/core/default.nix @@ -10,6 +10,7 @@ stdenv.mkDerivation rec { homepage = "http://gstreamer.freedesktop.org"; license = stdenv.lib.licenses.lgpl2Plus; platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.ttuegel ]; }; src = fetchurl { @@ -17,17 +18,30 @@ stdenv.mkDerivation rec { sha256 = "1p5y9bbrhywng0prmpxv29p6jsz6vd039d49bnc98p9b45532yll"; }; + outputs = [ "dev" "out" ]; + outputBin = "dev"; + nativeBuildInputs = [ pkgconfig perl bison flex python gobjectIntrospection makeWrapper ]; propagatedBuildInputs = [ glib ]; + enableParallelBuilding = true; + + preConfigure = '' + configureFlagsArray+=("--exec-prefix=$dev") + ''; + postInstall = '' for prog in "$out/bin/"*; do wrapProgram "$prog" --prefix GST_PLUGIN_SYSTEM_PATH : "\$(unset _tmp; for profile in \$NIX_PROFILES; do _tmp="\$profile/lib/gstreamer-1.0''$\{_tmp:+:\}\$_tmp"; done; printf "\$_tmp")" done ''; + preFixup = '' + moveToOutput "share/bash-completion" "$dev" + ''; + setupHook = ./setup-hook.sh; } diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix index e47ecfa01aa..0b48d87b90a 100644 --- a/pkgs/development/libraries/gstreamer/ges/default.nix +++ b/pkgs/development/libraries/gstreamer/ges/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { sha256 = "1gisdfa91kq89bsmbvb47alaxh8lpqmr6f3dzlwmf389nkandw2h"; }; + outputs = [ "dev" "out" ]; + nativeBuildInputs = [ pkgconfig python gobjectIntrospection flex perl ]; propagatedBuildInputs = [ gnonlin libxml2 ]; diff --git a/pkgs/development/libraries/gstreamer/gnonlin/default.nix b/pkgs/development/libraries/gstreamer/gnonlin/default.nix index 9d43f3ac23c..db29413476f 100644 --- a/pkgs/development/libraries/gstreamer/gnonlin/default.nix +++ b/pkgs/development/libraries/gstreamer/gnonlin/default.nix @@ -22,6 +22,8 @@ stdenv.mkDerivation rec { sha256 = "0zv60rq2h736a6fivd3a3wp59dj1jar7b2vwzykahvl168b7wrid"; }; + outputs = [ "dev" "out" ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ gst-plugins-base ]; diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index 54175fb83fb..d14a99ce56b 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -29,6 +29,8 @@ stdenv.mkDerivation rec { sha256 = "0kczdvqxvl8kxiy2d7czv16jp73hv9k3nykh47ckihnv8x6i6362"; }; + outputs = [ "dev" "out" ]; + nativeBuildInputs = [ pkgconfig python ]; buildInputs = [ @@ -40,5 +42,10 @@ stdenv.mkDerivation rec { ++ libintlOrEmpty ++ optionals stdenv.isLinux [ libv4l libpulseaudio libavc1394 libiec61883 ]; + preFixup = '' + mkdir -p "$dev/lib/gstreamer-1.0" + mv "$out/lib/gstreamer-1.0/"*.la "$dev/lib/gstreamer-1.0" + ''; + LDFLAGS = optionalString stdenv.isDarwin "-lintl"; } diff --git a/pkgs/development/libraries/gstreamer/gstreamermm/default.nix b/pkgs/development/libraries/gstreamer/gstreamermm/default.nix index 692310be0ba..9b7db6d4732 100644 --- a/pkgs/development/libraries/gstreamer/gstreamermm/default.nix +++ b/pkgs/development/libraries/gstreamer/gstreamermm/default.nix @@ -11,13 +11,15 @@ stdenv.mkDerivation rec { url = "mirror://gnome/sources/gstreamermm/${ver_maj}/${name}.tar.xz"; sha256 = "0bj6and9b26d32bq90l8nx5wqh2ikkh8dm7qwxyxfdvmrzhixhgi"; }; - + + outputs = [ "dev" "out" ]; + nativeBuildInputs = [ pkgconfig file ]; propagatedBuildInputs = [ glibmm gst_all_1.gst-plugins-base ]; enableParallelBuilding = true; - + meta = with stdenv.lib; { description = "C++ interface for GStreamer"; homepage = http://gstreamer.freedesktop.org/bindings/cplusplus.html; diff --git a/pkgs/development/libraries/gstreamer/libav/default.nix b/pkgs/development/libraries/gstreamer/libav/default.nix index e4daa642ba0..ad3bdb81858 100644 --- a/pkgs/development/libraries/gstreamer/libav/default.nix +++ b/pkgs/development/libraries/gstreamer/libav/default.nix @@ -22,6 +22,8 @@ stdenv.mkDerivation rec { sha256 = "0719njp8aarhvn038pijq6dmsnli0zlg146hyfs3rsdffs4f472s"; }; + outputs = [ "dev" "out" ]; + configureFlags = stdenv.lib.optionalString withSystemLibav "--with-system-libav"; diff --git a/pkgs/development/libraries/gstreamer/python/default.nix b/pkgs/development/libraries/gstreamer/python/default.nix index 5320fdfaced..6d018c36f56 100644 --- a/pkgs/development/libraries/gstreamer/python/default.nix +++ b/pkgs/development/libraries/gstreamer/python/default.nix @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { patches = [ ./different-path-with-pygobject.patch ]; + outputs = [ "dev" "out" ]; + nativeBuildInputs = [ pkgconfig python ]; # XXX: in the Libs.private field of python3.pc diff --git a/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix b/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix index 3bd840dcd7e..675fdf322e8 100644 --- a/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { }) ]; + outputs = [ "dev" "out" ]; + buildInputs = [ gst_all_1.gstreamer gst_all_1.gst-plugins-base glib qt4 ]; propagatedBuildInputs = [ boost ]; nativeBuildInputs = [ cmake automoc4 flex bison pkgconfig ]; diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix index 8f8437ad4ac..3b17c548ba2 100644 --- a/pkgs/development/libraries/gstreamer/ugly/default.nix +++ b/pkgs/development/libraries/gstreamer/ugly/default.nix @@ -25,6 +25,8 @@ stdenv.mkDerivation rec { sha256 = "137b6kqykh5nwbmiv28nn1pc1d2x2rb2xxg382pc9pa9gpxpyrak"; }; + outputs = [ "dev" "out" ]; + nativeBuildInputs = [ pkgconfig python ]; buildInputs = [ diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix index a9aa3d73fa2..18394193706 100644 --- a/pkgs/development/libraries/gstreamer/vaapi/default.nix +++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { sha256 = "14jal2g5mf8r59w8420ixl3kg50vcmy56446ncwd0xrizd6yms5b"; }; + outputs = [ "dev" "out" ]; + nativeBuildInputs = with stdenv.lib; [ pkgconfig bzip2 ]; buildInputs = [ diff --git a/pkgs/development/libraries/gstreamer/validate/default.nix b/pkgs/development/libraries/gstreamer/validate/default.nix index 1c123621664..02ce69af907 100644 --- a/pkgs/development/libraries/gstreamer/validate/default.nix +++ b/pkgs/development/libraries/gstreamer/validate/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { sha256 = "1pcy9pfffyk6xiw6aq38kbv7k24x2rljdy8fabjfy1abpmvvfrkn"; }; + outputs = [ "dev" "out" ]; + nativeBuildInputs = [ pkgconfig gobjectIntrospection ]; diff --git a/pkgs/development/libraries/gtk+/2.0-immodules.cache.patch b/pkgs/development/libraries/gtk+/2.0-immodules.cache.patch new file mode 100644 index 00000000000..1b8231756e7 --- /dev/null +++ b/pkgs/development/libraries/gtk+/2.0-immodules.cache.patch @@ -0,0 +1,27 @@ +--- a/gtk/gtkrc.c 2014-09-30 05:02:17.000000000 +0900 ++++ b/gtk/gtkrc.c 2016-04-09 17:39:51.363288355 +0900 +@@ -445,5 +445,23 @@ + if (var) + result = g_strdup (var); + ++ // check NIX_PROFILES paths. ++ const gchar *nixProfilesEnv = g_getenv ("NIX_PROFILES"); ++ gchar *cachePath; ++ guint i; ++ ++ if(nixProfilesEnv && !result){ ++ gchar **paths = g_strsplit(nixProfilesEnv, " ", -1); ++ for (i = 0; paths[i] != NULL; i++){ ++ cachePath = g_build_filename(paths[i], "etc", "gtk-2.0", "immodules.cache", NULL); ++ if( g_file_test( cachePath, G_FILE_TEST_EXISTS) ){ ++ if(result) g_free(result); ++ result = g_strdup(cachePath); ++ } ++ g_free(cachePath); ++ } ++ g_strfreev(paths); ++ } ++ + if (!result) + { + diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix index d4d4cddb402..f3ebc189cd7 100644 --- a/pkgs/development/libraries/gtk+/2.x.nix +++ b/pkgs/development/libraries/gtk+/2.x.nix @@ -26,6 +26,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ setupHook perl pkgconfig gettext ]; + patches = [ ./2.0-immodules.cache.patch ]; + propagatedBuildInputs = with xorg; with stdenv.lib; [ glib cairo pango gdk_pixbuf atk ] ++ optionals (stdenv.isLinux || stdenv.isDarwin) [ diff --git a/pkgs/development/libraries/gtk+/3.0-immodules.cache.patch b/pkgs/development/libraries/gtk+/3.0-immodules.cache.patch new file mode 100644 index 00000000000..bbe5f28dbd3 --- /dev/null +++ b/pkgs/development/libraries/gtk+/3.0-immodules.cache.patch @@ -0,0 +1,27 @@ +--- a/gtk/deprecated/gtkrc.c 2016-04-02 18:43:08.401663112 +0900 ++++ b/gtk/deprecated/gtkrc.c 2016-04-02 18:29:19.927608592 +0900 +@@ -774,5 +774,23 @@ + if (var) + result = g_strdup (var); + ++ // check NIX_PROFILES paths. ++ const gchar *nixProfilesEnv = g_getenv ("NIX_PROFILES"); ++ gchar *cachePath; ++ guint i; ++ ++ if(nixProfilesEnv && !result){ ++ gchar **paths = g_strsplit(nixProfilesEnv, " ", -1); ++ for (i = 0; paths[i] != NULL; i++){ ++ cachePath = g_build_filename(paths[i], "etc", "gtk-3.0", "immodules.cache", NULL); ++ if( g_file_test( cachePath, G_FILE_TEST_EXISTS) ){ ++ if(result) g_free(result); ++ result = g_strdup(cachePath); ++ } ++ g_free(cachePath); ++ } ++ g_strfreev(paths); ++ } ++ + if (!result) + { + diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index dcbf0b4a47c..b1991ada402 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -28,6 +28,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig gettext gobjectIntrospection perl ]; + patches = [ ./3.0-immodules.cache.patch ]; + buildInputs = [ libxkbcommon epoxy json_glib ]; propagatedBuildInputs = with xorg; with stdenv.lib; [ expat glib cairo pango gdk_pixbuf atk at_spi2_atk @@ -58,13 +60,6 @@ stdenv.mkDerivation rec { --replace '-L${gmp.dev}/lib' '-L${gmp.out}/lib' ''; - passthru = { - gtkExeEnvPostBuild = '' - rm $out/lib/gtk-3.0/3.0.0/immodules.cache - $out/bin/gtk-query-immodules-3.0 $out/lib/gtk-3.0/3.0.0/immodules/*.so > $out/lib/gtk-3.0/3.0.0/immodules.cache - ''; # workaround for bug of nix-mode for Emacs */ ''; - }; - meta = with stdenv.lib; { description = "A multi-platform toolkit for creating graphical user interfaces"; diff --git a/pkgs/development/libraries/http-parser/default.nix b/pkgs/development/libraries/http-parser/default.nix index 6dd8efddaa6..ddbcc3a26c2 100644 --- a/pkgs/development/libraries/http-parser/default.nix +++ b/pkgs/development/libraries/http-parser/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, gyp, utillinux, python, fixDarwinDylibNames }: let - version = "2.6.1"; + version = "2.7.0"; in stdenv.mkDerivation { name = "http-parser-${version}"; src = fetchurl { url = "https://github.com/joyent/http-parser/archive/v${version}.tar.gz"; - sha256 = "1b9ahv77zryx1z6j7sax2asx0gj209wh2244q9crj7hj14h8bkj8"; + sha256 = "0rqij6v6wv1giwx4prfa082kw1nka5d9vlb06zkc8mwszq1vzidh"; }; patches = [ ./build-shared.patch ]; diff --git a/pkgs/development/libraries/imlib2/default.nix b/pkgs/development/libraries/imlib2/default.nix index 8d79fcc50a8..85e9979ebb0 100644 --- a/pkgs/development/libraries/imlib2/default.nix +++ b/pkgs/development/libraries/imlib2/default.nix @@ -1,17 +1,19 @@ { stdenv, fetchurl, xlibsWrapper, libjpeg, libtiff, giflib, libpng, bzip2, pkgconfig }: stdenv.mkDerivation rec { - name = "imlib2-1.4.8"; + name = "imlib2-1.4.9"; src = fetchurl { url = "mirror://sourceforge/enlightenment/${name}.tar.bz2"; - sha256 = "0xxhgkd1axlcmf3kp1d7naiygparpg8l3sg3d263rhl2z0gm7aw9"; + sha256 = "08809xxk2555yj6glixzw9a0x3x8cx55imd89kj3r0h152bn8a3x"; }; buildInputs = [ xlibsWrapper libjpeg libtiff giflib libpng bzip2 ]; nativeBuildInputs = [ pkgconfig ]; + enableParallelBuilding = true; + preConfigure = '' substituteInPlace imlib2-config.in \ --replace "@my_libs@" "" diff --git a/pkgs/development/libraries/incrtcl/default.nix b/pkgs/development/libraries/incrtcl/default.nix index e6474abf11c..a8f29b60c2b 100644 --- a/pkgs/development/libraries/incrtcl/default.nix +++ b/pkgs/development/libraries/incrtcl/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "incrtcl-${version}"; - version = "3.4.1"; + version = "4.0.4"; src = fetchurl { - url = mirror://sourceforge/incrtcl/%5BIncr%20Tcl_Tk%5D-source/3.4/itcl3.4.1.tar.gz; - sha256 = "0s457j9mn3c1wjj43iwy3zwhyz980jlyqn3s9487da9dwwn86c2k"; + url = mirror://sourceforge/incrtcl/%5BIncr%20Tcl_Tk%5D-source/3.4/itcl4.0.4.tar.gz; + sha256 = "1ppc9b13cvmc6rp77k7dl2zb26xk0z30vxygmr4h1xr2r8w091k3"; }; buildInputs = [ tcl ]; diff --git a/pkgs/development/libraries/java/rhino/default.nix b/pkgs/development/libraries/java/rhino/default.nix index 87958512925..960af32d359 100644 --- a/pkgs/development/libraries/java/rhino/default.nix +++ b/pkgs/development/libraries/java/rhino/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { name = "rhino-${version}"; src = fetchurl { - url = "https://ftp.mozilla.org/pub/js/rhino1_7R2.zip"; + url = "mirror://mozilla/js/rhino1_7R2.zip"; sha256 = "1p32hkghi6bkc3cf2dcqyaw5cjj7403mykcp0fy8f5bsnv0pszv7"; }; diff --git a/pkgs/development/libraries/jemalloc/default.nix b/pkgs/development/libraries/jemalloc/default.nix index 4a4bc039229..9b54ce48239 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.3"; + name = "jemalloc-4.1.1"; src = fetchurl { url = "http://www.canonware.com/download/jemalloc/${name}.tar.bz2"; - sha256 = "1mpnfaniaybv8kh7yjqq2g595l2i08m7adg238k5igzf61n6ixzi"; + sha256 = "1bmdr51wxiir595k2r6z9a7rcgm42kkgnr586xir7vdcndr3pwf8"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/kde-frameworks-5.19/attica.nix b/pkgs/development/libraries/kde-frameworks-5.19/attica.nix deleted file mode 100644 index 98721876c12..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/attica.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -}: - -kdeFramework { - name = "attica"; - nativeBuildInputs = [ extra-cmake-modules ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/baloo.nix b/pkgs/development/libraries/kde-frameworks-5.19/baloo.nix deleted file mode 100644 index 38c41d9271d..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/baloo.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ 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.19/bluez-qt.nix b/pkgs/development/libraries/kde-frameworks-5.19/bluez-qt.nix deleted file mode 100644 index f981b0516f7..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/bluez-qt.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, qtdeclarative -}: - -kdeFramework { - name = "bluez-qt"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ qtdeclarative ]; - preConfigure = '' - substituteInPlace CMakeLists.txt \ - --replace /lib/udev/rules.d "$out/lib/udev/rules.d" - ''; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/breeze-icons.nix b/pkgs/development/libraries/kde-frameworks-5.19/breeze-icons.nix deleted file mode 100644 index 44cc99daf26..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/breeze-icons.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ kdeFramework -, extra-cmake-modules -, qtsvg -}: - -kdeFramework { - name = "breeze-icons"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ qtsvg ]; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/default.nix deleted file mode 100644 index bb96048d6ff..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/default.nix +++ /dev/null @@ -1,114 +0,0 @@ -# Maintainer's Notes: -# -# How To Update -# 1. Edit the URL in ./manifest.sh -# 2. Run ./manifest.sh -# 3. Fix build errors. - -{ pkgs, debug ? false }: - -let - - inherit (pkgs) lib makeSetupHook stdenv; - - mirror = "mirror://kde"; - srcs = import ./srcs.nix { inherit (pkgs) fetchurl; inherit mirror; }; - - packages = self: with self; { - kdeFramework = args: - let - inherit (args) name; - inherit (srcs."${name}") src version; - in stdenv.mkDerivation (args // { - name = "${name}-${version}"; - inherit src; - - outputs = args.outputs or [ "dev" "out" ]; - - cmakeFlags = - (args.cmakeFlags or []) - ++ [ "-DBUILD_TESTING=OFF" ] - ++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug"; - - meta = { - license = with lib.licenses; [ - lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12 - ]; - platforms = lib.platforms.linux; - homepage = "http://www.kde.org"; - } // (args.meta or {}); - }); - - attica = callPackage ./attica.nix {}; - baloo = callPackage ./baloo.nix {}; - bluez-qt = callPackage ./bluez-qt.nix {}; - breeze-icons = callPackage ./breeze-icons.nix {}; - extra-cmake-modules = callPackage ./extra-cmake-modules {}; - frameworkintegration = callPackage ./frameworkintegration.nix {}; - kactivities = callPackage ./kactivities.nix {}; - kapidox = callPackage ./kapidox.nix {}; - karchive = callPackage ./karchive.nix {}; - kauth = callPackage ./kauth {}; - kbookmarks = callPackage ./kbookmarks.nix {}; - kcmutils = callPackage ./kcmutils {}; - kcodecs = callPackage ./kcodecs.nix {}; - kcompletion = callPackage ./kcompletion.nix {}; - kconfig = callPackage ./kconfig.nix {}; - kconfigwidgets = callPackage ./kconfigwidgets {}; - kcoreaddons = callPackage ./kcoreaddons.nix {}; - kcrash = callPackage ./kcrash.nix {}; - kdbusaddons = callPackage ./kdbusaddons.nix {}; - kdeclarative = callPackage ./kdeclarative.nix {}; - kded = callPackage ./kded.nix {}; - kdelibs4support = callPackage ./kdelibs4support {}; - kdesignerplugin = callPackage ./kdesignerplugin.nix {}; - kdewebkit = callPackage ./kdewebkit.nix {}; - kdesu = callPackage ./kdesu.nix {}; - kdnssd = callPackage ./kdnssd.nix {}; - kdoctools = callPackage ./kdoctools {}; - kemoticons = callPackage ./kemoticons.nix {}; - kfilemetadata = callPackage ./kfilemetadata {}; - kglobalaccel = callPackage ./kglobalaccel.nix {}; - kguiaddons = callPackage ./kguiaddons.nix {}; - khtml = callPackage ./khtml.nix {}; - ki18n = callPackage ./ki18n.nix {}; - kiconthemes = callPackage ./kiconthemes {}; - kidletime = callPackage ./kidletime.nix {}; - kimageformats = callPackage ./kimageformats.nix {}; - kinit = callPackage ./kinit {}; - kio = callPackage ./kio {}; - kitemmodels = callPackage ./kitemmodels.nix {}; - kitemviews = callPackage ./kitemviews.nix {}; - kjobwidgets = callPackage ./kjobwidgets.nix {}; - kjs = callPackage ./kjs.nix {}; - kjsembed = callPackage ./kjsembed.nix {}; - kmediaplayer = callPackage ./kmediaplayer.nix {}; - knewstuff = callPackage ./knewstuff.nix {}; - knotifications = callPackage ./knotifications.nix {}; - knotifyconfig = callPackage ./knotifyconfig.nix {}; - kpackage = callPackage ./kpackage {}; - kparts = callPackage ./kparts.nix {}; - kpeople = callPackage ./kpeople.nix {}; - kplotting = callPackage ./kplotting.nix {}; - kpty = callPackage ./kpty.nix {}; - kross = callPackage ./kross.nix {}; - krunner = callPackage ./krunner.nix {}; - kservice = callPackage ./kservice {}; - ktexteditor = callPackage ./ktexteditor {}; - ktextwidgets = callPackage ./ktextwidgets.nix {}; - kunitconversion = callPackage ./kunitconversion.nix {}; - kwallet = callPackage ./kwallet.nix {}; - kwidgetsaddons = callPackage ./kwidgetsaddons.nix {}; - kwindowsystem = callPackage ./kwindowsystem.nix {}; - kxmlgui = callPackage ./kxmlgui.nix {}; - kxmlrpcclient = callPackage ./kxmlrpcclient.nix {}; - modemmanager-qt = callPackage ./modemmanager-qt.nix {}; - networkmanager-qt = callPackage ./networkmanager-qt.nix {}; - oxygen-icons5 = callPackage ./oxygen-icons5.nix {}; - plasma-framework = callPackage ./plasma-framework {}; - solid = callPackage ./solid.nix {}; - sonnet = callPackage ./sonnet.nix {}; - threadweaver = callPackage ./threadweaver.nix {}; - }; - -in packages diff --git a/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/default.nix deleted file mode 100644 index 1c2ea70442d..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ kdeFramework, lib, copyPathsToStore, cmake, pkgconfig, qttools }: - -kdeFramework { - name = "extra-cmake-modules"; - - patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); - - outputs = [ "out" ]; # this package has no runtime components - 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. - propagatedNativeBuildInputs = [ cmake pkgconfig qttools ]; - - meta = with lib; { - license = licenses.bsd2; - maintainers = [ maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/nix-lib-path.patch b/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/nix-lib-path.patch deleted file mode 100644 index a74340a6dc9..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/nix-lib-path.patch +++ /dev/null @@ -1,37 +0,0 @@ -Index: extra-cmake-modules-5.18.0/kde-modules/KDEInstallDirs.cmake -=================================================================== ---- extra-cmake-modules-5.18.0.orig/kde-modules/KDEInstallDirs.cmake -+++ extra-cmake-modules-5.18.0/kde-modules/KDEInstallDirs.cmake -@@ -200,32 +200,6 @@ - # GNUInstallDirs code deals with re-configuring, but that is dealt with - # by the _define_* macros in this module). - 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 diff --git a/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/series b/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/series deleted file mode 100644 index b4569e50a5f..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/series +++ /dev/null @@ -1 +0,0 @@ -nix-lib-path.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/setup-hook.sh deleted file mode 100644 index 56ed09f4ea5..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/setup-hook.sh +++ /dev/null @@ -1,81 +0,0 @@ -_ecmSetXdgDirs() { - addToSearchPathOnce XDG_DATA_DIRS "$1/share" - addToSearchPathOnce XDG_CONFIG_DIRS "$1/etc/xdg" - addToSearchPathOnce NIX_WRAP_XDG_CONFIG_DIRS "$1/etc/xdg" -} - -_ecmPropagateSharedData() { - local sharedPaths=( \ - "config.cfg" \ - "doc" \ - "kconf_update" \ - "kservices5" \ - "kservicetypes5" \ - "kxmlgui5" \ - "knotifications5" \ - "icons" \ - "sounds" \ - "templates" \ - "wallpapers" \ - "applications" \ - "desktop-directories" \ - "mime" \ - "info" \ - "dbus-1" \ - "interfaces" \ - "services" \ - "system-services" ) - for dir in ${sharedPaths[@]}; do - if [ -d "$1/share/$dir" ]; then - addToSearchPathOnce NIX_WRAP_XDG_DATA_DIRS "$1/share" - propagateOnce propagatedUserEnvPkgs "$1" - break - fi - done -} - -_ecmConfig() { - # Because we need to use absolute paths here, we must set *all* the paths. - cmakeFlags+=" -DKDE_INSTALL_EXECROOTDIR=${!outputBin}" - cmakeFlags+=" -DKDE_INSTALL_BINDIR=${!outputBin}/bin" - cmakeFlags+=" -DKDE_INSTALL_SBINDIR=${!outputBin}/sbin" - cmakeFlags+=" -DKDE_INSTALL_LIBDIR=${!outputLib}/lib" - cmakeFlags+=" -DKDE_INSTALL_LIBEXECDIR=${!outputLib}/lib/libexec" - cmakeFlags+=" -DKDE_INSTALL_CMAKEPACKAGEDIR=${!outputDev}/lib/cmake" - cmakeFlags+=" -DKDE_INSTALL_QTPLUGINDIR=${!outputLib}/lib/qt5/plugins" - cmakeFlags+=" -DKDE_INSTALL_PLUGINDIR=${!outputLib}/lib/qt5/plugins" - cmakeFlags+=" -DKDE_INSTALL_QTQUICKIMPORTSDIR=${!outputLib}/lib/qt5/imports" - cmakeFlags+=" -DKDE_INSTALL_QMLDIR=${!outputLib}/lib/qt5/qml" - cmakeFlags+=" -DKDE_INSTALL_INCLUDEDIR=${!outputInclude}/include" - cmakeFlags+=" -DKDE_INSTALL_LOCALSTATEDIR=/var" - cmakeFlags+=" -DKDE_INSTALL_DATAROOTDIR=${!outputLib}/share" - cmakeFlags+=" -DKDE_INSTALL_DATADIR=${!outputLib}/share" - cmakeFlags+=" -DKDE_INSTALL_DOCBUNDLEDIR=${!outputLib}/share/doc/HTML" - cmakeFlags+=" -DKDE_INSTALL_KCFGDIR=${!outputLib}/share/config.kcfg" - cmakeFlags+=" -DKDE_INSTALL_KCONFUPDATEDIR=${!outputLib}/share/kconf_update" - cmakeFlags+=" -DKDE_INSTALL_KSERVICES5DIR=${!outputLib}/share/kservices5" - cmakeFlags+=" -DKDE_INSTALL_KSERVICETYPES5DIR=${!outputLib}/share/kservicetypes5" - cmakeFlags+=" -DKDE_INSTALL_KXMLGUI5DIR=${!outputLib}/share/kxmlgui5" - cmakeFlags+=" -DKDE_INSTALL_KNOTIFY5RCDIR=${!outputLib}/share/knotifications5" - cmakeFlags+=" -DKDE_INSTALL_ICONDIR=${!outputLib}/share/icons" - cmakeFlags+=" -DKDE_INSTALL_LOCALEDIR=${!outputLib}/share/locale" - cmakeFlags+=" -DKDE_INSTALL_SOUNDDIR=${!outputLib}/share/sounds" - cmakeFlags+=" -DKDE_INSTALL_TEMPLATEDIR=${!outputLib}/share/templates" - cmakeFlags+=" -DKDE_INSTALL_WALLPAPERDIR=${!outputLib}/share/wallpapers" - cmakeFlags+=" -DKDE_INSTALL_APPDIR=${!outputLib}/share/applications" - cmakeFlags+=" -DKDE_INSTALL_DESKTOPDIR=${!outputLib}/share/desktop-directories" - cmakeFlags+=" -DKDE_INSTALL_MIMEDIR=${!outputLib}/share/mime/packages" - cmakeFlags+=" -DKDE_INSTALL_METAINFODIR=${!outputLib}/share/appdata" - cmakeFlags+=" -DKDE_INSTALL_MANDIR=${!outputLib}/share/man" - cmakeFlags+=" -DKDE_INSTALL_INFODIR=${!outputLib}/share/info" - cmakeFlags+=" -DKDE_INSTALL_DBUSDIR=${!outputLib}/share/dbus-1" - cmakeFlags+=" -DKDE_INSTALL_DBUSINTERFACEDIR=${!outputLib}/share/dbus-1/interfaces" - cmakeFlags+=" -DKDE_INSTALL_DBUSSERVICEDIR=${!outputLib}/share/dbus-1/services" - cmakeFlags+=" -DKDE_INSTALL_DBUSSYSTEMSERVICEDIR=${!outputLib}/share/dbus-1/system-services" - cmakeFlags+=" -DKDE_INSTALL_SYSCONFDIR=${!outputLib}/etc" - cmakeFlags+=" -DKDE_INSTALL_CONFDIR=${!outputLib}/etc/xdg" - cmakeFlags+=" -DKDE_INSTALL_AUTOSTARTDIR=${!outputLib}/etc/xdg/autostart" -} - -envHooks+=(_ecmSetXdgDirs _ecmPropagateSharedData) -preConfigureHooks+=(_ecmConfig) diff --git a/pkgs/development/libraries/kde-frameworks-5.19/fetchsrcs.sh b/pkgs/development/libraries/kde-frameworks-5.19/fetchsrcs.sh deleted file mode 100755 index 7937e6f8bed..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/fetchsrcs.sh +++ /dev/null @@ -1,57 +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.19/" -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.19/frameworkintegration.nix b/pkgs/development/libraries/kde-frameworks-5.19/frameworkintegration.nix deleted file mode 100644 index 26987c385ad..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/frameworkintegration.nix +++ /dev/null @@ -1,17 +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 knotifications kwidgetsaddons - libXcursor - ]; - propagatedBuildInputs = [ kconfigwidgets ki18n kio kiconthemes qtx11extras ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kactivities.nix b/pkgs/development/libraries/kde-frameworks-5.19/kactivities.nix deleted file mode 100644 index 3225098f439..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/kactivities.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ 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.19/kapidox.nix b/pkgs/development/libraries/kde-frameworks-5.19/kapidox.nix deleted file mode 100644 index 647be8f052c..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/kapidox.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, python -}: - -kdeFramework { - name = "kapidox"; - nativeBuildInputs = [ extra-cmake-modules python ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/karchive.nix b/pkgs/development/libraries/kde-frameworks-5.19/karchive.nix deleted file mode 100644 index a8d9a0003c3..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/karchive.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -}: - -kdeFramework { - name = "karchive"; - nativeBuildInputs = [ extra-cmake-modules ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kauth/cmake-install-paths.patch b/pkgs/development/libraries/kde-frameworks-5.19/kauth/cmake-install-paths.patch deleted file mode 100644 index c66f5ecd008..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/kauth/cmake-install-paths.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: kauth-5.18.0/KF5AuthConfig.cmake.in -=================================================================== ---- kauth-5.18.0.orig/KF5AuthConfig.cmake.in -+++ kauth-5.18.0/KF5AuthConfig.cmake.in -@@ -4,9 +4,9 @@ set(KAUTH_STUB_FILES_DIR "@PACKAGE_KDE_I - - 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_HELPER_INSTALL_DIR "@KAUTH_HELPER_INSTALL_DIR@") --set(KAUTH_HELPER_INSTALL_ABSOLUTE_DIR "@KAUTH_HELPER_INSTALL_ABSOLUTE_DIR@") -+set(KAUTH_POLICY_FILES_INSTALL_DIR "${KDE_INSTALL_DATADIR}/polkit-1/actions") -+set(KAUTH_HELPER_INSTALL_DIR "${KDE_INSTALL_LIBEXECDIR}") -+set(KAUTH_HELPER_INSTALL_ABSOLUTE_DIR "${KDE_INSTALL_LIBEXECDIR}") - - find_dependency(KF5CoreAddons "@KF5_DEP_VERSION@") - diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kauth/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/kauth/default.nix deleted file mode 100644 index 1352d8c5821..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/kauth/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ kdeFramework, lib, copyPathsToStore -, extra-cmake-modules -, kcoreaddons -, polkit-qt -}: - -kdeFramework { - name = "kauth"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ polkit-qt ]; - propagatedBuildInputs = [ kcoreaddons ]; - patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kauth/series b/pkgs/development/libraries/kde-frameworks-5.19/kauth/series deleted file mode 100644 index d2689425c38..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/kauth/series +++ /dev/null @@ -1 +0,0 @@ -cmake-install-paths.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kbookmarks.nix b/pkgs/development/libraries/kde-frameworks-5.19/kbookmarks.nix deleted file mode 100644 index 1a469ab4db6..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/kbookmarks.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kcodecs -, kconfig -, kconfigwidgets -, kcoreaddons -, kiconthemes -, kxmlgui -}: - -kdeFramework { - name = "kbookmarks"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - kcodecs - kconfig - kconfigwidgets - kcoreaddons - kiconthemes - kxmlgui - ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kcmutils/0001-qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.19/kcmutils/0001-qdiriterator-follow-symlinks.patch deleted file mode 100644 index 0d861fa9501..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/kcmutils/0001-qdiriterator-follow-symlinks.patch +++ /dev/null @@ -1,25 +0,0 @@ -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 9c3431d..d6b1ee2 100644 ---- a/src/kpluginselector.cpp -+++ b/src/kpluginselector.cpp -@@ -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); - while (it.hasNext()) { - desktopFileNames.append(it.next()); - } --- -2.5.2 - diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kcmutils/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/kcmutils/default.nix deleted file mode 100644 index dbbb783ac61..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/kcmutils/default.nix +++ /dev/null @@ -1,17 +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 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.19/kcodecs.nix b/pkgs/development/libraries/kde-frameworks-5.19/kcodecs.nix deleted file mode 100644 index 53a69a69b69..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/kcodecs.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -}: - -kdeFramework { - name = "kcodecs"; - nativeBuildInputs = [ extra-cmake-modules ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kcompletion.nix b/pkgs/development/libraries/kde-frameworks-5.19/kcompletion.nix deleted file mode 100644 index e393774f16a..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/kcompletion.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kconfig -, kwidgetsaddons -}: - -kdeFramework { - name = "kcompletion"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ kconfig kwidgetsaddons ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kconfig.nix b/pkgs/development/libraries/kde-frameworks-5.19/kconfig.nix deleted file mode 100644 index e132afe5988..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/kconfig.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, makeQtWrapper -}: - -kdeFramework { - name = "kconfig"; - nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ]; - postInstall = '' - wrapQtProgram "$out/bin/kreadconfig5" - wrapQtProgram "$out/bin/kwriteconfig5" - ''; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.19/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch deleted file mode 100644 index 7a6c0ee9053..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch +++ /dev/null @@ -1,25 +0,0 @@ -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 -+++ 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); --- -2.5.2 - diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kconfigwidgets/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/kconfigwidgets/default.nix deleted file mode 100644 index 0e14d06edd3..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/kconfigwidgets/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ 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.19/kcoreaddons.nix b/pkgs/development/libraries/kde-frameworks-5.19/kcoreaddons.nix deleted file mode 100644 index f3a1db7bd48..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/kcoreaddons.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ kdeFramework, lib, makeQtWrapper -, extra-cmake-modules -, shared_mime_info -}: - -kdeFramework { - name = "kcoreaddons"; - nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ]; - buildInputs = [ shared_mime_info ]; - postInstall = '' - wrapQtProgram "$out/bin/desktoptojson" - ''; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kcrash.nix b/pkgs/development/libraries/kde-frameworks-5.19/kcrash.nix deleted file mode 100644 index bbab78ccb40..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/kcrash.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kcoreaddons -, kwindowsystem -, qtx11extras -}: - -kdeFramework { - name = "kcrash"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ kcoreaddons ]; - propagatedBuildInputs = [ kwindowsystem qtx11extras ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdbusaddons.nix b/pkgs/development/libraries/kde-frameworks-5.19/kdbusaddons.nix deleted file mode 100644 index d2ceab31d14..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/kdbusaddons.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, makeQtWrapper -, qtx11extras -}: - -kdeFramework { - name = "kdbusaddons"; - nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ]; - propagatedBuildInputs = [ qtx11extras ]; - postInstall = '' - wrapQtProgram "$out/bin/kquitapp5" - ''; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdeclarative.nix b/pkgs/development/libraries/kde-frameworks-5.19/kdeclarative.nix deleted file mode 100644 index 74d107466cf..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/kdeclarative.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ 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.19/kded.nix b/pkgs/development/libraries/kde-frameworks-5.19/kded.nix deleted file mode 100644 index 47ae2d68c68..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/kded.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kconfig -, kcoreaddons -, kcrash -, kdbusaddons -, kdoctools -, kinit -, kservice -}: - -kdeFramework { - name = "kded"; - buildInputs = [ kconfig kcoreaddons kcrash kdbusaddons kinit kservice ]; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/default.nix deleted file mode 100644 index 843db83a99b..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ kdeFramework, lib, copyPathsToStore -, extra-cmake-modules, docbook_xml_dtd_45, kauth -, karchive, kcompletion, kconfig, kconfigwidgets, kcoreaddons -, kcrash, kdbusaddons, kded, 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"; - outputs = [ "dev" "out" ]; - patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); - setupHook = ./setup-hook.sh; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - buildInputs = [ - kcompletion kconfig kded 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.19/kdelibs4support/nix-kde-include-dir.patch b/pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/nix-kde-include-dir.patch deleted file mode 100644 index eabb7025448..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/nix-kde-include-dir.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: kdelibs4support-5.18.0/src/kdecore/kstandarddirs.cpp -=================================================================== ---- kdelibs4support-5.18.0.orig/src/kdecore/kstandarddirs.cpp -+++ kdelibs4support-5.18.0/src/kdecore/kstandarddirs.cpp -@@ -292,7 +292,7 @@ static QString relativeInstallPath(const - return QFile::decodeName(ICON_INSTALL_DIR "/"); - } - if (strcmp("include", type) == 0) { -- return QFile::decodeName(INCLUDE_INSTALL_DIR "/"); -+ return QFile::decodeName(qgetenv("NIX_KDE_INCLUDE_DIR")); - } - break; - case 'l': diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/series b/pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/series deleted file mode 100644 index 9b08ab20877..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/series +++ /dev/null @@ -1 +0,0 @@ -nix-kde-include-dir.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/setup-hook.sh deleted file mode 100644 index 21ac2e83b5d..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/setup-hook.sh +++ /dev/null @@ -1 +0,0 @@ -export NIX_KDE_INCLUDE_DIR="@dev@/include/" # trailing slash is required! diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdesignerplugin.nix b/pkgs/development/libraries/kde-frameworks-5.19/kdesignerplugin.nix deleted file mode 100644 index cbc114ccca0..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/kdesignerplugin.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ kdeFramework, lib, makeQtWrapper -, extra-cmake-modules -, kcompletion -, kconfig -, kconfigwidgets -, kcoreaddons -, kdewebkit -, kdoctools -, kiconthemes -, kio -, kitemviews -, kplotting -, ktextwidgets -, kwidgetsaddons -, kxmlgui -, sonnet -}: - -kdeFramework { - name = "kdesignerplugin"; - nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; - buildInputs = [ - kcompletion kconfig kconfigwidgets kcoreaddons kdewebkit - kiconthemes kitemviews kplotting ktextwidgets kwidgetsaddons - kxmlgui - ]; - propagatedBuildInputs = [ kio sonnet ]; - postInstall = '' - wrapQtProgram "$out/bin/kgendesignerplugin" - ''; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdesu.nix b/pkgs/development/libraries/kde-frameworks-5.19/kdesu.nix deleted file mode 100644 index 364fbd6a720..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/kdesu.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ kdeFramework, lib, extra-cmake-modules, kcoreaddons, ki18n, kpty -, kservice -}: - -kdeFramework { - name = "kdesu"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ kcoreaddons kservice ]; - propagatedBuildInputs = [ ki18n kpty ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdewebkit.nix b/pkgs/development/libraries/kde-frameworks-5.19/kdewebkit.nix deleted file mode 100644 index d361313d1d4..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/kdewebkit.nix +++ /dev/null @@ -1,13 +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 kjobwidgets kparts kservice kwallet ]; - propagatedBuildInputs = [ ki18n kio qtwebkit ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdnssd.nix b/pkgs/development/libraries/kde-frameworks-5.19/kdnssd.nix deleted file mode 100644 index f00432b0c9c..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/kdnssd.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, avahi -}: - -kdeFramework { - name = "kdnssd"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ avahi ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdoctools/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/kdoctools/default.nix deleted file mode 100644 index f67c19f4239..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/kdoctools/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ kdeFramework, lib, extra-cmake-modules, docbook_xml_dtd_45 -, docbook5_xsl, karchive, ki18n, makeQtWrapper, perl, perlPackages -}: - -kdeFramework { - name = "kdoctools"; - nativeBuildInputs = [ extra-cmake-modules ]; - 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" - ]; - patches = [ ./kdoctools-no-find-docbook-xml.patch ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdoctools/kdoctools-no-find-docbook-xml.patch b/pkgs/development/libraries/kde-frameworks-5.19/kdoctools/kdoctools-no-find-docbook-xml.patch deleted file mode 100644 index 4e3a33efab3..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/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.19/kemoticons.nix b/pkgs/development/libraries/kde-frameworks-5.19/kemoticons.nix deleted file mode 100644 index d165f84e3a2..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/kemoticons.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, karchive -, kconfig -, kcoreaddons -, kservice -}: - -kdeFramework { - name = "kemoticons"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ karchive kconfig kcoreaddons ]; - propagatedBuildInputs = [ kservice ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kfilemetadata/cmake-install-paths.patch b/pkgs/development/libraries/kde-frameworks-5.19/kfilemetadata/cmake-install-paths.patch deleted file mode 100644 index 732f7b69c82..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/kfilemetadata/cmake-install-paths.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: kfilemetadata-5.18.0/src/CMakeLists.txt -=================================================================== ---- kfilemetadata-5.18.0.orig/src/CMakeLists.txt -+++ kfilemetadata-5.18.0/src/CMakeLists.txt -@@ -49,7 +49,7 @@ install(TARGETS KF5FileMetaData EXPORT K - - install(EXPORT KF5FileMetaDataTargets - NAMESPACE KF5:: -- DESTINATION ${LIB_INSTALL_DIR}/cmake/KF5FileMetaData -+ DESTINATION ${KDE_INSTALL_FULL_CMAKEPACKAGEDIR}/KF5FileMetaData - FILE KF5FileMetaDataTargets.cmake) - - install(FILES diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kfilemetadata/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/kfilemetadata/default.nix deleted file mode 100644 index 9bb4831cf8d..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/kfilemetadata/default.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ kdeFramework, lib, copyPathsToStore, extra-cmake-modules -, attr, ebook_tools, exiv2, ffmpeg, karchive, ki18n, poppler, qtbase, taglib -}: - -kdeFramework { - name = "kfilemetadata"; - patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ attr ebook_tools exiv2 ffmpeg karchive poppler taglib ]; - propagatedBuildInputs = [ qtbase ki18n ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kfilemetadata/series b/pkgs/development/libraries/kde-frameworks-5.19/kfilemetadata/series deleted file mode 100644 index d2689425c38..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/kfilemetadata/series +++ /dev/null @@ -1 +0,0 @@ -cmake-install-paths.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kglobalaccel.nix b/pkgs/development/libraries/kde-frameworks-5.19/kglobalaccel.nix deleted file mode 100644 index c535b3590a3..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/kglobalaccel.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kconfig -, kcoreaddons -, kcrash -, kdbusaddons -, kwindowsystem -, makeQtWrapper -, qtx11extras -}: - -kdeFramework { - name = "kglobalaccel"; - nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ]; - buildInputs = [ kconfig kcoreaddons kcrash kdbusaddons ]; - propagatedBuildInputs = [ kwindowsystem qtx11extras ]; - postInstall = '' - wrapQtProgram "$out/bin/kglobalaccel5" - ''; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kguiaddons.nix b/pkgs/development/libraries/kde-frameworks-5.19/kguiaddons.nix deleted file mode 100644 index bc4e9ab1184..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/kguiaddons.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, qtx11extras -}: - -kdeFramework { - name = "kguiaddons"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ qtx11extras ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/khtml.nix b/pkgs/development/libraries/kde-frameworks-5.19/khtml.nix deleted file mode 100644 index d40df466ebb..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/khtml.nix +++ /dev/null @@ -1,21 +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 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.19/ki18n.nix b/pkgs/development/libraries/kde-frameworks-5.19/ki18n.nix deleted file mode 100644 index 268006512e7..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/ki18n.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, gettext -, python -, qtdeclarative -, qtscript -}: - -kdeFramework { - name = "ki18n"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ qtdeclarative qtscript ]; - propagatedNativeBuildInputs = [ gettext python ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/default-theme-breeze.patch b/pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/default-theme-breeze.patch deleted file mode 100644 index 5b3b15d5d5b..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/default-theme-breeze.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: kiconthemes-5.17.0/src/kicontheme.cpp -=================================================================== ---- kiconthemes-5.17.0.orig/src/kicontheme.cpp -+++ kiconthemes-5.17.0/src/kicontheme.cpp -@@ -557,7 +557,7 @@ void KIconTheme::reconfigure() - // static - QString KIconTheme::defaultThemeName() - { -- return QStringLiteral("oxygen"); -+ return QStringLiteral("breeze"); - } - - void KIconTheme::assignIconsToContextMenu(ContextMenus type, diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/default.nix deleted file mode 100644 index b78b25582be..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ kdeFramework, lib, copyPathsToStore -, extra-cmake-modules, makeQtWrapper -, kconfigwidgets, ki18n, breeze-icons, kitemviews, qtsvg -}: - -kdeFramework { - name = "kiconthemes"; - patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); - nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ]; - buildInputs = [ kconfigwidgets kitemviews qtsvg ]; - propagatedBuildInputs = [ breeze-icons ki18n ]; - postInstall = '' - wrapQtProgram "$out/bin/kiconfinder5" - ''; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/series b/pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/series deleted file mode 100644 index ab5cc8a3edb..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/series +++ /dev/null @@ -1 +0,0 @@ -default-theme-breeze.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kidletime.nix b/pkgs/development/libraries/kde-frameworks-5.19/kidletime.nix deleted file mode 100644 index fc086560023..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/kidletime.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, qtbase -, qtx11extras -}: - -kdeFramework { - name = "kidletime"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ qtx11extras ]; - propagatedBuildInputs = [ qtbase ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kimageformats.nix b/pkgs/development/libraries/kde-frameworks-5.19/kimageformats.nix deleted file mode 100644 index 49d66bbcc2c..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/kimageformats.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, ilmbase -}: - -kdeFramework { - name = "kimageformats"; - nativeBuildInputs = [ extra-cmake-modules ]; - NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR"; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kinit/0001-kinit-libpath.patch b/pkgs/development/libraries/kde-frameworks-5.19/kinit/0001-kinit-libpath.patch deleted file mode 100644 index 9c76079a382..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/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.19/kinit/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/kinit/default.nix deleted file mode 100644 index 5f644d7c424..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/kinit/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ kdeFramework, lib, extra-cmake-modules, kconfig, kcrash -, kdoctools, ki18n, kio, kservice, kwindowsystem, libcap -, libcap_progs -}: - -# TODO: setuid wrapper - -kdeFramework { - name = "kinit"; - nativeBuildInputs = [ extra-cmake-modules kdoctools libcap_progs ]; - buildInputs = [ kconfig kcrash 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.19/kio/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/kio/default.nix deleted file mode 100644 index a2131ff3385..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/kio/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ kdeFramework, lib, copyPathsToStore -, 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"; - patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); - 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" - wrapQtProgram "$out/bin/protocoltojson" - ''; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kio/samba-search-path.patch b/pkgs/development/libraries/kde-frameworks-5.19/kio/samba-search-path.patch deleted file mode 100644 index c9ad46b41bb..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/kio/samba-search-path.patch +++ /dev/null @@ -1,28 +0,0 @@ -Index: kio-5.17.0/src/core/ksambashare.cpp -=================================================================== ---- kio-5.17.0.orig/src/core/ksambashare.cpp -+++ kio-5.17.0/src/core/ksambashare.cpp -@@ -67,13 +67,18 @@ KSambaSharePrivate::~KSambaSharePrivate( - - bool KSambaSharePrivate::isSambaInstalled() - { -- if (QFile::exists(QStringLiteral("/usr/sbin/smbd")) -- || QFile::exists(QStringLiteral("/usr/local/sbin/smbd"))) { -- return true; -+ const QByteArray pathEnv = qgetenv("PATH"); -+ if (!pathEnv.isEmpty()) { -+ QLatin1Char pathSep(':'); -+ QStringList paths = QFile::decodeName(pathEnv).split(pathSep, QString::SkipEmptyParts); -+ for (QStringList::iterator it = paths.begin(); it != paths.end(); ++it) { -+ it->append("/smbd"); -+ if (QFile::exists(*it)) { -+ return true; -+ } -+ } - } - -- //qDebug() << "Samba is not installed!"; -- - return false; - } - diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kio/series b/pkgs/development/libraries/kde-frameworks-5.19/kio/series deleted file mode 100644 index 77ca1545004..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/kio/series +++ /dev/null @@ -1 +0,0 @@ -samba-search-path.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kitemmodels.nix b/pkgs/development/libraries/kde-frameworks-5.19/kitemmodels.nix deleted file mode 100644 index a9024d771cc..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/kitemmodels.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -}: - -kdeFramework { - name = "kitemmodels"; - nativeBuildInputs = [ extra-cmake-modules ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kitemviews.nix b/pkgs/development/libraries/kde-frameworks-5.19/kitemviews.nix deleted file mode 100644 index 931019ce495..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/kitemviews.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -}: - -kdeFramework { - name = "kitemviews"; - nativeBuildInputs = [ extra-cmake-modules ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kjobwidgets.nix b/pkgs/development/libraries/kde-frameworks-5.19/kjobwidgets.nix deleted file mode 100644 index 746edf12eea..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/kjobwidgets.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kcoreaddons -, kwidgetsaddons -, qtx11extras -}: - -kdeFramework { - name = "kjobwidgets"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ kcoreaddons kwidgetsaddons ]; - propagatedBuildInputs = [ qtx11extras ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kjs.nix b/pkgs/development/libraries/kde-frameworks-5.19/kjs.nix deleted file mode 100644 index 768720f178c..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/kjs.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kdoctools -, makeQtWrapper -}: - -kdeFramework { - name = "kjs"; - nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; - postInstall = '' - wrapQtProgram "$out/bin/kjs5" - ''; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kjsembed.nix b/pkgs/development/libraries/kde-frameworks-5.19/kjsembed.nix deleted file mode 100644 index 22eef2d47bd..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/kjsembed.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ 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.19/kmediaplayer.nix b/pkgs/development/libraries/kde-frameworks-5.19/kmediaplayer.nix deleted file mode 100644 index 460458b2232..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/kmediaplayer.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kparts -, kxmlgui -}: - -kdeFramework { - name = "kmediaplayer"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ kxmlgui ]; - propagatedBuildInputs = [ kparts ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/knewstuff.nix b/pkgs/development/libraries/kde-frameworks-5.19/knewstuff.nix deleted file mode 100644 index 5bcd6f30146..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/knewstuff.nix +++ /dev/null @@ -1,17 +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 kiconthemes - kitemviews ktextwidgets kwidgetsaddons - ]; - propagatedBuildInputs = [ attica ki18n kio kservice kxmlgui ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/knotifications.nix b/pkgs/development/libraries/kde-frameworks-5.19/knotifications.nix deleted file mode 100644 index 7e301dd0f26..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/knotifications.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kcodecs -, kconfig -, kcoreaddons -, kwindowsystem -, phonon -, qtx11extras -}: - -kdeFramework { - name = "knotifications"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - kcodecs kconfig kcoreaddons phonon - ]; - propagatedBuildInputs = [ kwindowsystem qtx11extras ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/knotifyconfig.nix b/pkgs/development/libraries/kde-frameworks-5.19/knotifyconfig.nix deleted file mode 100644 index dd99d2d4f1e..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/knotifyconfig.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ 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.19/kpackage/allow-external-paths.patch b/pkgs/development/libraries/kde-frameworks-5.19/kpackage/allow-external-paths.patch deleted file mode 100644 index e9d74444814..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/kpackage/allow-external-paths.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: kpackage-5.18.0/src/kpackage/package.cpp -=================================================================== ---- kpackage-5.18.0.orig/src/kpackage/package.cpp -+++ kpackage-5.18.0/src/kpackage/package.cpp -@@ -808,7 +808,7 @@ PackagePrivate::PackagePrivate() - : QSharedData(), - fallbackPackage(0), - metadata(0), -- externalPaths(false), -+ externalPaths(true), - valid(false), - checkedValid(false) - { diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kpackage/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/kpackage/default.nix deleted file mode 100644 index aea1b0d31a0..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/kpackage/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ kdeFramework, lib, copyPathsToStore -, 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 = copyPathsToStore (lib.readPathsFromFile ./. ./series); - postInstall = '' - wrapQtProgram "$out/bin/kpackagetool5" - ''; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kpackage/qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.19/kpackage/qdiriterator-follow-symlinks.patch deleted file mode 100644 index ddbf17d0006..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/kpackage/qdiriterator-follow-symlinks.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: kpackage-5.18.0/src/kpackage/packageloader.cpp -=================================================================== ---- kpackage-5.18.0.orig/src/kpackage/packageloader.cpp -+++ kpackage-5.18.0/src/kpackage/packageloader.cpp -@@ -241,7 +241,7 @@ QList<KPluginMetaData> PackageLoader::li - } else { - //qDebug() << "Not cached"; - // If there's no cache file, fall back to listing the directory -- const QDirIterator::IteratorFlags flags = QDirIterator::Subdirectories; -+ const QDirIterator::IteratorFlags flags = QDirIterator::Subdirectories | QDirIterator::FollowSymlinks; - const QStringList nameFilters = QStringList(QStringLiteral("metadata.desktop")) << QStringLiteral("metadata.json"); - - QDirIterator it(plugindir, nameFilters, QDir::Files, flags); -Index: kpackage-5.18.0/src/kpackage/private/packagejobthread.cpp -=================================================================== ---- kpackage-5.18.0.orig/src/kpackage/private/packagejobthread.cpp -+++ kpackage-5.18.0/src/kpackage/private/packagejobthread.cpp -@@ -146,7 +146,7 @@ bool indexDirectory(const QString& dir, - - QJsonArray plugins; - -- QDirIterator it(dir, *metaDataFiles, QDir::Files, QDirIterator::Subdirectories); -+ QDirIterator it(dir, *metaDataFiles, QDir::Files, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); - while (it.hasNext()) { - it.next(); - const QString path = it.fileInfo().absoluteFilePath(); diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kpackage/series b/pkgs/development/libraries/kde-frameworks-5.19/kpackage/series deleted file mode 100644 index 9b7f076efc7..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/kpackage/series +++ /dev/null @@ -1,2 +0,0 @@ -allow-external-paths.patch -qdiriterator-follow-symlinks.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kparts.nix b/pkgs/development/libraries/kde-frameworks-5.19/kparts.nix deleted file mode 100644 index 1c3e0b2cbc5..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/kparts.nix +++ /dev/null @@ -1,17 +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 kiconthemes kjobwidgets knotifications - kservice kwidgetsaddons - ]; - propagatedBuildInputs = [ ki18n kio ktextwidgets kxmlgui ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kpeople.nix b/pkgs/development/libraries/kde-frameworks-5.19/kpeople.nix deleted file mode 100644 index 4c3877e7efd..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/kpeople.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ 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.19/kplotting.nix b/pkgs/development/libraries/kde-frameworks-5.19/kplotting.nix deleted file mode 100644 index c16f51b5ac3..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/kplotting.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -}: - -kdeFramework { - name = "kplotting"; - nativeBuildInputs = [ extra-cmake-modules ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kpty.nix b/pkgs/development/libraries/kde-frameworks-5.19/kpty.nix deleted file mode 100644 index 2e34e6f674c..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/kpty.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ kdeFramework, lib, extra-cmake-modules, kcoreaddons, ki18n }: - -kdeFramework { - name = "kpty"; - nativeBuildInputs = [ extra-cmake-modules ]; - propagatedBuildInputs = [ kcoreaddons ki18n ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kross.nix b/pkgs/development/libraries/kde-frameworks-5.19/kross.nix deleted file mode 100644 index 7c6f079feaa..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/kross.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ kdeFramework, lib, extra-cmake-modules, kcompletion, kcoreaddons -, kdoctools, ki18n, kiconthemes, kio, kparts, kwidgetsaddons -, kxmlgui, qtscript -}: - -kdeFramework { - name = "kross"; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - buildInputs = [ kcompletion kcoreaddons kxmlgui ]; - propagatedBuildInputs = [ ki18n kiconthemes kio kparts kwidgetsaddons qtscript ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/krunner.nix b/pkgs/development/libraries/kde-frameworks-5.19/krunner.nix deleted file mode 100644 index 12d2b54d0eb..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/krunner.nix +++ /dev/null @@ -1,16 +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 kservice qtquick1 solid threadweaver - ]; - propagatedBuildInputs = [ ki18n kio plasma-framework ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kservice/0001-qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.19/kservice/0001-qdiriterator-follow-symlinks.patch deleted file mode 100644 index 3d8397d8ee2..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/kservice/0001-qdiriterator-follow-symlinks.patch +++ /dev/null @@ -1,25 +0,0 @@ -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.19/kservice/0002-no-canonicalize-path.patch b/pkgs/development/libraries/kde-frameworks-5.19/kservice/0002-no-canonicalize-path.patch deleted file mode 100644 index 685c6852611..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/kservice/0002-no-canonicalize-path.patch +++ /dev/null @@ -1,25 +0,0 @@ -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.19/kservice/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/kservice/default.nix deleted file mode 100644 index 3a27d85b916..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/kservice/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons -, kcrash, kdbusaddons, kdoctools, ki18n, kwindowsystem -}: - -kdeFramework { - name = "kservice"; - propagatedNativeBuildInputs = [ extra-cmake-modules ]; - nativeBuildInputs = [ kdoctools ]; - buildInputs = [ kcrash kdbusaddons ]; - propagatedBuildInputs = [ kconfig kcoreaddons ki18n kwindowsystem ]; - 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.19/ktexteditor/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/default.nix deleted file mode 100644 index b8df6a5f4c0..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ kdeFramework, lib, copyPathsToStore -, extra-cmake-modules, makeQtWrapper, perl -, karchive, kconfig, kguiaddons, kiconthemes, kparts -, libgit2 -, qtscript, qtxmlpatterns -, ki18n, kio, sonnet -}: - -kdeFramework { - name = "ktexteditor"; - nativeBuildInputs = [ extra-cmake-modules makeQtWrapper perl ]; - buildInputs = [ - karchive kconfig kguiaddons kiconthemes kparts - libgit2 - qtscript qtxmlpatterns - ]; - propagatedBuildInputs = [ ki18n kio sonnet ]; - patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/no-qcoreapplication.patch b/pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/no-qcoreapplication.patch deleted file mode 100644 index 19ab1e1e551..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/no-qcoreapplication.patch +++ /dev/null @@ -1,36 +0,0 @@ -Index: ktexteditor-5.18.0/src/syntax/data/katehighlightingindexer.cpp -=================================================================== ---- ktexteditor-5.18.0.orig/src/syntax/data/katehighlightingindexer.cpp -+++ ktexteditor-5.18.0/src/syntax/data/katehighlightingindexer.cpp -@@ -55,19 +55,16 @@ QStringList readListing(const QString &f - - int main(int argc, char *argv[]) - { -- // 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; - } -@@ -152,7 +149,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; - diff --git a/pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/series b/pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/series deleted file mode 100644 index 46cd23829a2..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/series +++ /dev/null @@ -1 +0,0 @@ -no-qcoreapplication.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.19/ktextwidgets.nix b/pkgs/development/libraries/kde-frameworks-5.19/ktextwidgets.nix deleted file mode 100644 index e332d4ff9a8..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/ktextwidgets.nix +++ /dev/null @@ -1,16 +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 - ]; - propagatedBuildInputs = [ ki18n kwindowsystem sonnet ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kunitconversion.nix b/pkgs/development/libraries/kde-frameworks-5.19/kunitconversion.nix deleted file mode 100644 index 3cf0f847d83..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/kunitconversion.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ kdeFramework, lib, extra-cmake-modules, ki18n }: - -kdeFramework { - name = "kunitconversion"; - nativeBuildInputs = [ extra-cmake-modules ]; - propagatedBuildInputs = [ ki18n ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kwallet.nix b/pkgs/development/libraries/kde-frameworks-5.19/kwallet.nix deleted file mode 100644 index 5ade5f63a8d..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/kwallet.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ kdeFramework, lib, extra-cmake-modules, kconfig, kconfigwidgets -, kcoreaddons , kdbusaddons, kdoctools, ki18n, kiconthemes -, knotifications , kservice, kwidgetsaddons, kwindowsystem, libgcrypt -, makeQtWrapper }: - -kdeFramework { - name = "kwallet"; - nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; - buildInputs = [ - kconfig kconfigwidgets 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.19/kwidgetsaddons.nix b/pkgs/development/libraries/kde-frameworks-5.19/kwidgetsaddons.nix deleted file mode 100644 index d95f44d3fec..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/kwidgetsaddons.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -}: - -kdeFramework { - name = "kwidgetsaddons"; - nativeBuildInputs = [ extra-cmake-modules ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kwindowsystem.nix b/pkgs/development/libraries/kde-frameworks-5.19/kwindowsystem.nix deleted file mode 100644 index 09ab1f2200d..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/kwindowsystem.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, qtx11extras -}: - -kdeFramework { - name = "kwindowsystem"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ qtx11extras ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kxmlgui.nix b/pkgs/development/libraries/kde-frameworks-5.19/kxmlgui.nix deleted file mode 100644 index f081d5f9170..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/kxmlgui.nix +++ /dev/null @@ -1,18 +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 kiconthemes kitemviews ktextwidgets - ]; - propagatedBuildInputs = [ - kconfigwidgets kglobalaccel ki18n kwindowsystem sonnet - ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kxmlrpcclient.nix b/pkgs/development/libraries/kde-frameworks-5.19/kxmlrpcclient.nix deleted file mode 100644 index 20a300b68bc..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/kxmlrpcclient.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ kdeFramework, lib, extra-cmake-modules, ki18n, kio }: - -kdeFramework { - name = "kxmlrpcclient"; - nativeBuildInputs = [ extra-cmake-modules ]; - propagatedBuildInputs = [ ki18n kio ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/modemmanager-qt.nix b/pkgs/development/libraries/kde-frameworks-5.19/modemmanager-qt.nix deleted file mode 100644 index 7d7f769d6a9..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/modemmanager-qt.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, modemmanager -}: - -kdeFramework { - name = "modemmanager-qt"; - nativeBuildInputs = [ extra-cmake-modules ]; - propagatedBuildInputs = [ modemmanager ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/networkmanager-qt.nix b/pkgs/development/libraries/kde-frameworks-5.19/networkmanager-qt.nix deleted file mode 100644 index 333378bd143..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/networkmanager-qt.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, networkmanager -}: - -kdeFramework { - name = "networkmanager-qt"; - nativeBuildInputs = [ extra-cmake-modules ]; - propagatedBuildInputs = [ networkmanager ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/oxygen-icons5.nix b/pkgs/development/libraries/kde-frameworks-5.19/oxygen-icons5.nix deleted file mode 100644 index ee350f8e153..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/oxygen-icons5.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ kdeFramework -, lib -, extra-cmake-modules -}: - -kdeFramework { - name = "oxygen-icons5"; - nativeBuildInputs = [ extra-cmake-modules ]; - meta = { - license = lib.licenses.lgpl3Plus; - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/plasma-framework/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/plasma-framework/default.nix deleted file mode 100644 index d8846f77723..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/plasma-framework/default.nix +++ /dev/null @@ -1,25 +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 -, 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.19/solid.nix b/pkgs/development/libraries/kde-frameworks-5.19/solid.nix deleted file mode 100644 index afd125e3c59..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/solid.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ 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.19/sonnet.nix b/pkgs/development/libraries/kde-frameworks-5.19/sonnet.nix deleted file mode 100644 index 943fe04a1c9..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/sonnet.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, hunspell -}: - -kdeFramework { - name = "sonnet"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ hunspell ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/srcs.nix b/pkgs/development/libraries/kde-frameworks-5.19/srcs.nix deleted file mode 100644 index b86c0b71224..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/srcs.nix +++ /dev/null @@ -1,565 +0,0 @@ -# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh -{ fetchurl, mirror }: - -{ - attica = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/attica-5.19.0.tar.xz"; - sha256 = "0cbvjnv2fcqsxspiy5pzmnnzrpfamlsc9j927kd6gpzai1ckf1lv"; - name = "attica-5.19.0.tar.xz"; - }; - }; - baloo = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/baloo-5.19.0.tar.xz"; - sha256 = "02yy0w13h5wxm74a87zi439f6yd9miid6rb54nia0pgvcka98svg"; - name = "baloo-5.19.0.tar.xz"; - }; - }; - bluez-qt = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/bluez-qt-5.19.0.tar.xz"; - sha256 = "0609i7rzhnnnp4fqnwscwp6y646ji8kl2hw5sy7azc87yllisnyv"; - name = "bluez-qt-5.19.0.tar.xz"; - }; - }; - breeze-icons = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/breeze-icons-5.19.0.tar.xz"; - sha256 = "0bwix0jl1dscqfb7ygn9drpd9ivfx4g15vz6h01mswvxa9lz1vj0"; - name = "breeze-icons-5.19.0.tar.xz"; - }; - }; - extra-cmake-modules = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/extra-cmake-modules-5.19.0.tar.xz"; - sha256 = "1dl3hhbara7iswb5wsc5dp17ar3ljw5f0nrncl8vry9smaz2zl63"; - name = "extra-cmake-modules-5.19.0.tar.xz"; - }; - }; - frameworkintegration = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/frameworkintegration-5.19.0.tar.xz"; - sha256 = "00la7p7wcyqpxyi73h4fjrmm9d2gqzdaljn4468xya4bfns5ijy3"; - name = "frameworkintegration-5.19.0.tar.xz"; - }; - }; - kactivities = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/kactivities-5.19.0.tar.xz"; - sha256 = "0yml1sbn3z4jd4vsfs25kqrl03pmlcgamzbgpw3248sabhyg7ks3"; - name = "kactivities-5.19.0.tar.xz"; - }; - }; - kapidox = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/kapidox-5.19.0.tar.xz"; - sha256 = "0a9731xrkd6mnqh72592rx6gfnxxdfd7xl8pdpgdn7qs3394k1yz"; - name = "kapidox-5.19.0.tar.xz"; - }; - }; - karchive = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/karchive-5.19.0.tar.xz"; - sha256 = "043spmi7s2d1bj8d3wbgzbhisip6h92kqjhlvg8gyv0a7vy54ymv"; - name = "karchive-5.19.0.tar.xz"; - }; - }; - kauth = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/kauth-5.19.0.tar.xz"; - sha256 = "0fm9ih2hkh2rpmlf98yw8z1r5bn2qmpva2k7mrv6ijd5h767fxss"; - name = "kauth-5.19.0.tar.xz"; - }; - }; - kbookmarks = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/kbookmarks-5.19.0.tar.xz"; - sha256 = "0q418jpdc348nqgdavsmxxka4g8sldpdi9n89i1pllfmq10kw9sd"; - name = "kbookmarks-5.19.0.tar.xz"; - }; - }; - kcmutils = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/kcmutils-5.19.0.tar.xz"; - sha256 = "0qhdjb3zvqq9ycfgb52lz4flgipyplj5ksz8h8y71bbs4w6lazd8"; - name = "kcmutils-5.19.0.tar.xz"; - }; - }; - kcodecs = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/kcodecs-5.19.0.tar.xz"; - sha256 = "1rzp314fv9n5168j7nhv1c8fjaszpmgdx6javrx4w0hyrjdfkg66"; - name = "kcodecs-5.19.0.tar.xz"; - }; - }; - kcompletion = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/kcompletion-5.19.0.tar.xz"; - sha256 = "05n0y5kf3bcc4wgn6k0js5cravv1k93xxzrgapm21323qgvfagwd"; - name = "kcompletion-5.19.0.tar.xz"; - }; - }; - kconfig = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/kconfig-5.19.0.tar.xz"; - sha256 = "0nk5hfl8yh0kgaa7xi0cc05dl6nf7prvbvxv0i99207xh9dafdmm"; - name = "kconfig-5.19.0.tar.xz"; - }; - }; - kconfigwidgets = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/kconfigwidgets-5.19.0.tar.xz"; - sha256 = "1nld27chcjwjgwv76s2j77ifmca235yp10bm08rjmvnfn6778ypv"; - name = "kconfigwidgets-5.19.0.tar.xz"; - }; - }; - kcoreaddons = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/kcoreaddons-5.19.0.tar.xz"; - sha256 = "07sm0givfdx28p302fkynzsd3xkpn1hbs43d4rscyx18yxfsldcw"; - name = "kcoreaddons-5.19.0.tar.xz"; - }; - }; - kcrash = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/kcrash-5.19.0.tar.xz"; - sha256 = "1dy03gp1sj96wn0zfa0dpbvz8pz0ia1j7p1wcif3iqk55pjxdgyl"; - name = "kcrash-5.19.0.tar.xz"; - }; - }; - kdbusaddons = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/kdbusaddons-5.19.0.tar.xz"; - sha256 = "1bb5aik0kl3kab5399drfjxrm8iysgkf813xgr0y4k64c9kwfp28"; - name = "kdbusaddons-5.19.0.tar.xz"; - }; - }; - kdeclarative = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/kdeclarative-5.19.0.tar.xz"; - sha256 = "03g02zy7wjzmpvqzxx32z8ap7jyj9sf432g1d3csb0dcbx2ny52g"; - name = "kdeclarative-5.19.0.tar.xz"; - }; - }; - kded = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/kded-5.19.0.tar.xz"; - sha256 = "0nyvg0h2aqy7qr57bad6wyc2rmcv9nhdq0py4fxc3irb6516p9hz"; - name = "kded-5.19.0.tar.xz"; - }; - }; - kdelibs4support = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/portingAids/kdelibs4support-5.19.0.tar.xz"; - sha256 = "0iqnb2j6gfy8006arwv65vljfhxdnk6aia0zppngb481jnd9n2pn"; - name = "kdelibs4support-5.19.0.tar.xz"; - }; - }; - kdesignerplugin = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/kdesignerplugin-5.19.0.tar.xz"; - sha256 = "11inmvyair796rx4842naf1dnxqvc6bqqzrv700ycvisad646ws5"; - name = "kdesignerplugin-5.19.0.tar.xz"; - }; - }; - kdesu = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/kdesu-5.19.0.tar.xz"; - sha256 = "19w8m7ji61bpd368lzkwlizcwa1l968l568lksgm2mm9pnyjjhgz"; - name = "kdesu-5.19.0.tar.xz"; - }; - }; - kdewebkit = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/kdewebkit-5.19.0.tar.xz"; - sha256 = "04b5qanhxggffnvmi28lspyi8kj4kq7mxhxndar9fmkzzgvy70hj"; - name = "kdewebkit-5.19.0.tar.xz"; - }; - }; - kdnssd = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/kdnssd-5.19.0.tar.xz"; - sha256 = "15a8w2i29mrbhadw6y123mr0cc45ijabnwdfp3lbkd40lk8nq314"; - name = "kdnssd-5.19.0.tar.xz"; - }; - }; - kdoctools = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/kdoctools-5.19.0.tar.xz"; - sha256 = "06g77n9wxpiv4skc1kz794ppfb2mkmd3fgn6an5kr301xc76cnpn"; - name = "kdoctools-5.19.0.tar.xz"; - }; - }; - kemoticons = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/kemoticons-5.19.0.tar.xz"; - sha256 = "0fiix2sf2wrvmrpx8whdr1bzm7gbv7pvg02y47w5bl6s9gh176g5"; - name = "kemoticons-5.19.0.tar.xz"; - }; - }; - kfilemetadata = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/kfilemetadata-5.19.0.tar.xz"; - sha256 = "11j8if3xhp3xxwibwm6nxb4lh8wx40ni3zf5hki327pxv4vpq3qr"; - name = "kfilemetadata-5.19.0.tar.xz"; - }; - }; - kglobalaccel = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/kglobalaccel-5.19.0.tar.xz"; - sha256 = "021j98f7217m83aqxpamg0lzlaiskdaqsd9iabc8wrp1g0nkm05d"; - name = "kglobalaccel-5.19.0.tar.xz"; - }; - }; - kguiaddons = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/kguiaddons-5.19.0.tar.xz"; - sha256 = "019xaf7vpgifcw8wibli9d2b50brhgdaypsqknh6mqq8q9g06jhy"; - name = "kguiaddons-5.19.0.tar.xz"; - }; - }; - khtml = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/portingAids/khtml-5.19.0.tar.xz"; - sha256 = "0hqa54a9nxy954vy8gf52y89xd3ibz9b4jgh6w347b1alp1zn145"; - name = "khtml-5.19.0.tar.xz"; - }; - }; - ki18n = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/ki18n-5.19.0.tar.xz"; - sha256 = "0v3arc20y5d8afm9zfrz1skd2xg3ng62cq1xvxiq645w6mxf7y05"; - name = "ki18n-5.19.0.tar.xz"; - }; - }; - kiconthemes = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/kiconthemes-5.19.0.tar.xz"; - sha256 = "0riicirgda3w2b30dzsa2lq9xrr4y04qwhxyzq1p8gn2x4pp3g3n"; - name = "kiconthemes-5.19.0.tar.xz"; - }; - }; - kidletime = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/kidletime-5.19.0.tar.xz"; - sha256 = "0jlbzqv36ddhfhk8xkkgw0xhq8s371z9ama1cyv2xq8kk4vjywc6"; - name = "kidletime-5.19.0.tar.xz"; - }; - }; - kimageformats = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/kimageformats-5.19.0.tar.xz"; - sha256 = "1ydizc6b0ncndazk62h8y249yfcx381pwzyivfpka1f69zfgyvv5"; - name = "kimageformats-5.19.0.tar.xz"; - }; - }; - kinit = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/kinit-5.19.0.tar.xz"; - sha256 = "03l7pijqdnnsfg6yz9p73p7xa86sldayggl6rc5hpkzmgyczcfzm"; - name = "kinit-5.19.0.tar.xz"; - }; - }; - kio = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/kio-5.19.0.tar.xz"; - sha256 = "0c7smp7cajivx53shy65mp9zcc51pha9iyvh37dggfflxy3xf9nv"; - name = "kio-5.19.0.tar.xz"; - }; - }; - kitemmodels = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/kitemmodels-5.19.0.tar.xz"; - sha256 = "0skmim986qnncbzd84vm1wp1fr41jn04af2dgckirsk23d35bln7"; - name = "kitemmodels-5.19.0.tar.xz"; - }; - }; - kitemviews = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/kitemviews-5.19.0.tar.xz"; - sha256 = "118zv46mvrfwbvl06bb1m8axv92wnp4pfs36hsxvnjl7gfjk5xjn"; - name = "kitemviews-5.19.0.tar.xz"; - }; - }; - kjobwidgets = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/kjobwidgets-5.19.0.tar.xz"; - sha256 = "1qzf8nzy8rxkdai9aj2lyrww90245v0p2q115xiz73bsg9rahmji"; - name = "kjobwidgets-5.19.0.tar.xz"; - }; - }; - kjs = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/portingAids/kjs-5.19.0.tar.xz"; - sha256 = "08m01762hb25vm020g3v37bh40cgvcfrj45ql135klx96x9imfaf"; - name = "kjs-5.19.0.tar.xz"; - }; - }; - kjsembed = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/portingAids/kjsembed-5.19.0.tar.xz"; - sha256 = "1wmkgy8jgm21y2cvcbv1fdv29dxxla8n6ws78kzzbbw4cgqwwl48"; - name = "kjsembed-5.19.0.tar.xz"; - }; - }; - kmediaplayer = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/portingAids/kmediaplayer-5.19.0.tar.xz"; - sha256 = "1vhqr2c7q8vwzdj29vpmfjfhyal8wp9ffirrnqc98vb6sffs85ay"; - name = "kmediaplayer-5.19.0.tar.xz"; - }; - }; - knewstuff = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/knewstuff-5.19.0.tar.xz"; - sha256 = "12acd12vxk9z83zg3yz8lvmmb8737z9lzd4hs9a3jcs1z5k2nhb4"; - name = "knewstuff-5.19.0.tar.xz"; - }; - }; - knotifications = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/knotifications-5.19.0.tar.xz"; - sha256 = "0grgm0ws16gp2j77nslqpl1jpxbi0m6g59zr7v1xnmzdk2j6n4av"; - name = "knotifications-5.19.0.tar.xz"; - }; - }; - knotifyconfig = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/knotifyconfig-5.19.0.tar.xz"; - sha256 = "161brvryxzdkny7sf6icn1jpyi6rnw6jc808gdf5g41v50xpnxfj"; - name = "knotifyconfig-5.19.0.tar.xz"; - }; - }; - kpackage = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/kpackage-5.19.0.tar.xz"; - sha256 = "1km4sjgxfljp2pnjnzj48q3c574zvj7341a57n4ifhjwj37yzxdv"; - name = "kpackage-5.19.0.tar.xz"; - }; - }; - kparts = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/kparts-5.19.0.tar.xz"; - sha256 = "05g59x2mrqygawzcwgw3igl5n96l649h0kpzh37sfq4i8kg15g7l"; - name = "kparts-5.19.0.tar.xz"; - }; - }; - kpeople = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/kpeople-5.19.0.tar.xz"; - sha256 = "1ksf6g71li1xk4q98cvwkam8m8g32x2815kj1gfwbg4g6iw74w98"; - name = "kpeople-5.19.0.tar.xz"; - }; - }; - kplotting = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/kplotting-5.19.0.tar.xz"; - sha256 = "169x4m9ms8yhfha8zclnl8wrnfhfqshpwwg4b5bd046pcrkqmnqq"; - name = "kplotting-5.19.0.tar.xz"; - }; - }; - kpty = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/kpty-5.19.0.tar.xz"; - sha256 = "0289vzfjwppwqj9h03flzhwm18dnxz11hqhdhr9990x7rw6a4n03"; - name = "kpty-5.19.0.tar.xz"; - }; - }; - kross = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/portingAids/kross-5.19.0.tar.xz"; - sha256 = "1nv7mrhn7wa4bs2a164x42d3b37akyvhkxqs8cg5fqp4vr2wkw0p"; - name = "kross-5.19.0.tar.xz"; - }; - }; - krunner = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/portingAids/krunner-5.19.0.tar.xz"; - sha256 = "054s8309lxi27gpbg7iygbcxsp0pwrzbzww3h8zp2a9yiic4s5mx"; - name = "krunner-5.19.0.tar.xz"; - }; - }; - kservice = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/kservice-5.19.0.tar.xz"; - sha256 = "02lbia26r2462nwksizaxjfkhxfqqs732dp495yx8bjc7wcv3srm"; - name = "kservice-5.19.0.tar.xz"; - }; - }; - ktexteditor = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/ktexteditor-5.19.0.tar.xz"; - sha256 = "0v3l44w4k43ajs81i8386hszk3x7rajjlb6z3jb7q98vhp91b5dp"; - name = "ktexteditor-5.19.0.tar.xz"; - }; - }; - ktextwidgets = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/ktextwidgets-5.19.0.tar.xz"; - sha256 = "1xydb76r6x1p10bkr2nlqg3md78jw8zvqad0h42dgvl4f5xvjknp"; - name = "ktextwidgets-5.19.0.tar.xz"; - }; - }; - kunitconversion = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/kunitconversion-5.19.0.tar.xz"; - sha256 = "11g1vhqkrb1k748drj7klkbb7jca3dybakcmcgqf53g8vxfih8kb"; - name = "kunitconversion-5.19.0.tar.xz"; - }; - }; - kwallet = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/kwallet-5.19.0.tar.xz"; - sha256 = "0z0c62fdfx9syrq6z7bk0ihac4yqyxpycll7h3mijj29km4jnpjm"; - name = "kwallet-5.19.0.tar.xz"; - }; - }; - kwidgetsaddons = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/kwidgetsaddons-5.19.0.tar.xz"; - sha256 = "0b85ng0dj5gpzifqmhyzgx61nb37vq7d0gvfpfazlcp5n27ywivm"; - name = "kwidgetsaddons-5.19.0.tar.xz"; - }; - }; - kwindowsystem = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/kwindowsystem-5.19.0.tar.xz"; - sha256 = "115xs34r74j9zcsw69glnh8w59iyh764n3gniawwrk23c6yb8fch"; - name = "kwindowsystem-5.19.0.tar.xz"; - }; - }; - kxmlgui = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/kxmlgui-5.19.0.tar.xz"; - sha256 = "1al2xifiyvl3zpva9nqap8gb6vqfgmf2fnhkmymm02rwg4yn4gah"; - name = "kxmlgui-5.19.0.tar.xz"; - }; - }; - kxmlrpcclient = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/kxmlrpcclient-5.19.0.tar.xz"; - sha256 = "0lji7cxvh2lmjz42lx6ymz962gr4cyqfzksz0n5vgzfk5z0vq98g"; - name = "kxmlrpcclient-5.19.0.tar.xz"; - }; - }; - modemmanager-qt = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/modemmanager-qt-5.19.0.tar.xz"; - sha256 = "05x9jicryjw9fj02arpya8xsh79rsnljnqjfpwbb7pi38f9i8v4w"; - name = "modemmanager-qt-5.19.0.tar.xz"; - }; - }; - networkmanager-qt = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/networkmanager-qt-5.19.0.tar.xz"; - sha256 = "0wi0mkygzbvvyil1nyzc3ihgilvpx6j7caqaa9k38p85g93vsq13"; - name = "networkmanager-qt-5.19.0.tar.xz"; - }; - }; - oxygen-icons5 = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/oxygen-icons5-5.19.0.tar.xz"; - sha256 = "09vfwcyidj3bl0qr4sq78bkc69zp9x8dwp8bsay5y05q8591dkg0"; - name = "oxygen-icons5-5.19.0.tar.xz"; - }; - }; - plasma-framework = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/plasma-framework-5.19.0.tar.xz"; - sha256 = "1588r1jag0s9hhw4qq7mr2mcdd3d9az5ngb3z1l58xdhvfcc4497"; - name = "plasma-framework-5.19.0.tar.xz"; - }; - }; - solid = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/solid-5.19.0.tar.xz"; - sha256 = "02bnvhscb55r6q5hkyh7rqi6zsc3r974y3x9shi8l0xbs78snkgz"; - name = "solid-5.19.0.tar.xz"; - }; - }; - sonnet = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/sonnet-5.19.0.tar.xz"; - sha256 = "02ringh0wyiq1n19c200bcyf5x2w5jhw0pcxvfjzjai1sjig03x7"; - name = "sonnet-5.19.0.tar.xz"; - }; - }; - threadweaver = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/threadweaver-5.19.0.tar.xz"; - sha256 = "1jm1sw7xq76s2ggghm6qqdn7452myy9n7p5zzdb01qbaw2y1x4pw"; - name = "threadweaver-5.19.0.tar.xz"; - }; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.19/threadweaver.nix b/pkgs/development/libraries/kde-frameworks-5.19/threadweaver.nix deleted file mode 100644 index 52817921cc7..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.19/threadweaver.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -}: - -kdeFramework { - name = "threadweaver"; - nativeBuildInputs = [ extra-cmake-modules ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix index 467dd87f43e..55ff770f4bd 100644 --- a/pkgs/development/libraries/libarchive/default.nix +++ b/pkgs/development/libraries/libarchive/default.nix @@ -21,6 +21,9 @@ stdenv.mkDerivation rec { buildInputs = [ sharutils libxml2 zlib bzip2 openssl xz lzo ] ++ stdenv.lib.optionals stdenv.isLinux [ e2fsprogs attr acl ]; + # Without this, pkgconfig-based dependencies are unhappy + propagatedBuildInputs = stdenv.lib.optionals stdenv.isLinux [ attr acl ]; + preBuild = if stdenv.isCygwin then '' echo "#include <windows.h>" >> config.h '' else null; diff --git a/pkgs/development/libraries/libass/default.nix b/pkgs/development/libraries/libass/default.nix index ab300729acc..4b579524a52 100644 --- a/pkgs/development/libraries/libass/default.nix +++ b/pkgs/development/libraries/libass/default.nix @@ -5,6 +5,7 @@ , harfbuzzSupport ? true, harfbuzz ? null # harfbuzz support , rasterizerSupport ? false # Internal rasterizer , largeTilesSupport ? false # Use larger tiles in the rasterizer +, libiconv }: assert encaSupport -> enca != null; @@ -18,11 +19,11 @@ in with stdenv.lib; stdenv.mkDerivation rec { name = "libass-${version}"; - version = "0.12.2"; + version = "0.13.2"; src = fetchurl { url = "https://github.com/libass/libass/releases/download/${version}/${name}.tar.xz"; - sha256 = "1qzibgqmnnqk2r116lpk1br764g0v74f2zp12y5id0p1plaing37"; + sha256 = "1kpsw4zw95v4cjvild9wpk73dzavn1khsm3bm32kcz6amnkd166n"; }; configureFlags = [ @@ -38,7 +39,8 @@ stdenv.mkDerivation rec { buildInputs = [ freetype fribidi ] ++ optional encaSupport enca ++ optional fontconfigSupport fontconfig - ++ optional harfbuzzSupport harfbuzz; + ++ optional harfbuzzSupport harfbuzz + ++ optional stdenv.isDarwin libiconv; meta = { description = "Portable ASS/SSA subtitle renderer"; diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix index b84b852691f..ef09b9e4b40 100644 --- a/pkgs/development/libraries/libav/default.nix +++ b/pkgs/development/libraries/libav/default.nix @@ -38,6 +38,10 @@ let inherit sha1; # upstream directly provides sha1 of releases over https }; + patches = [] + ++ optionals (vpxSupport && version == "0.8.17" ) [ ./vpxenc-0.8.17-libvpx-1.5.patch ] + ++ optionals (vpxSupport && version == "11.6") [ ./vpxenc-11.6-libvpx-1.5.patch ]; + preConfigure = "patchShebangs doc/texi2pod.pl"; configureFlags = diff --git a/pkgs/development/libraries/libav/vpxenc-0.8.17-libvpx-1.5.patch b/pkgs/development/libraries/libav/vpxenc-0.8.17-libvpx-1.5.patch new file mode 100644 index 00000000000..456828c025e --- /dev/null +++ b/pkgs/development/libraries/libav/vpxenc-0.8.17-libvpx-1.5.patch @@ -0,0 +1,22 @@ +--- a/libavcodec/libvpxenc.c 2016-05-01 17:57:16.753852614 +0200 ++++ b/libavcodec/libvpxenc.c 2016-05-01 18:01:08.252147138 +0200 +@@ -67,19 +67,11 @@ + + /** String mappings for enum vp8e_enc_control_id */ + static const char *ctlidstr[] = { +- [VP8E_UPD_ENTROPY] = "VP8E_UPD_ENTROPY", +- [VP8E_UPD_REFERENCE] = "VP8E_UPD_REFERENCE", +- [VP8E_USE_REFERENCE] = "VP8E_USE_REFERENCE", +- [VP8E_SET_ROI_MAP] = "VP8E_SET_ROI_MAP", +- [VP8E_SET_ACTIVEMAP] = "VP8E_SET_ACTIVEMAP", +- [VP8E_SET_SCALEMODE] = "VP8E_SET_SCALEMODE", + [VP8E_SET_CPUUSED] = "VP8E_SET_CPUUSED", + [VP8E_SET_ENABLEAUTOALTREF] = "VP8E_SET_ENABLEAUTOALTREF", + [VP8E_SET_NOISE_SENSITIVITY] = "VP8E_SET_NOISE_SENSITIVITY", +- [VP8E_SET_SHARPNESS] = "VP8E_SET_SHARPNESS", + [VP8E_SET_STATIC_THRESHOLD] = "VP8E_SET_STATIC_THRESHOLD", + [VP8E_SET_TOKEN_PARTITIONS] = "VP8E_SET_TOKEN_PARTITIONS", +- [VP8E_GET_LAST_QUANTIZER] = "VP8E_GET_LAST_QUANTIZER", + [VP8E_SET_ARNR_MAXFRAMES] = "VP8E_SET_ARNR_MAXFRAMES", + [VP8E_SET_ARNR_STRENGTH] = "VP8E_SET_ARNR_STRENGTH", + [VP8E_SET_ARNR_TYPE] = "VP8E_SET_ARNR_TYPE", diff --git a/pkgs/development/libraries/libav/vpxenc-11.6-libvpx-1.5.patch b/pkgs/development/libraries/libav/vpxenc-11.6-libvpx-1.5.patch new file mode 100644 index 00000000000..f3c52582b44 --- /dev/null +++ b/pkgs/development/libraries/libav/vpxenc-11.6-libvpx-1.5.patch @@ -0,0 +1,22 @@ +--- a/libavcodec/libvpxenc.c 2016-05-01 17:53:17.974517377 +0200 ++++ b/libavcodec/libvpxenc.c 2016-05-01 17:54:30.564923297 +0200 +@@ -70,19 +70,11 @@ + + /** String mappings for enum vp8e_enc_control_id */ + static const char *const ctlidstr[] = { +- [VP8E_UPD_ENTROPY] = "VP8E_UPD_ENTROPY", +- [VP8E_UPD_REFERENCE] = "VP8E_UPD_REFERENCE", +- [VP8E_USE_REFERENCE] = "VP8E_USE_REFERENCE", +- [VP8E_SET_ROI_MAP] = "VP8E_SET_ROI_MAP", +- [VP8E_SET_ACTIVEMAP] = "VP8E_SET_ACTIVEMAP", +- [VP8E_SET_SCALEMODE] = "VP8E_SET_SCALEMODE", + [VP8E_SET_CPUUSED] = "VP8E_SET_CPUUSED", + [VP8E_SET_ENABLEAUTOALTREF] = "VP8E_SET_ENABLEAUTOALTREF", + [VP8E_SET_NOISE_SENSITIVITY] = "VP8E_SET_NOISE_SENSITIVITY", +- [VP8E_SET_SHARPNESS] = "VP8E_SET_SHARPNESS", + [VP8E_SET_STATIC_THRESHOLD] = "VP8E_SET_STATIC_THRESHOLD", + [VP8E_SET_TOKEN_PARTITIONS] = "VP8E_SET_TOKEN_PARTITIONS", +- [VP8E_GET_LAST_QUANTIZER] = "VP8E_GET_LAST_QUANTIZER", + [VP8E_SET_ARNR_MAXFRAMES] = "VP8E_SET_ARNR_MAXFRAMES", + [VP8E_SET_ARNR_STRENGTH] = "VP8E_SET_ARNR_STRENGTH", + [VP8E_SET_ARNR_TYPE] = "VP8E_SET_ARNR_TYPE", diff --git a/pkgs/development/libraries/libdvdread/default.nix b/pkgs/development/libraries/libdvdread/default.nix index 493be4c8f86..ef717fedb22 100644 --- a/pkgs/development/libraries/libdvdread/default.nix +++ b/pkgs/development/libraries/libdvdread/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libdvdread-${version}"; - version = "5.0.2"; + version = "5.0.3"; src = fetchurl { url = "http://get.videolan.org/libdvdread/${version}/${name}.tar.bz2"; - sha256 = "82cbe693f2a3971671e7428790b5498392db32185b8dc8622f7b9cd307d3cfbf"; + sha256 = "0ayqiq0psq18rcp6f5pz82sxsq66v0kwv0y55dbrcg68plnxy71j"; }; buildInputs = [libdvdcss]; diff --git a/pkgs/development/libraries/libdwg/default.nix b/pkgs/development/libraries/libdwg/default.nix index a80c0677a3b..8ffa1ff8192 100644 --- a/pkgs/development/libraries/libdwg/default.nix +++ b/pkgs/development/libraries/libdwg/default.nix @@ -1,13 +1,15 @@ -{stdenv, fetchurl}: +{stdenv, fetchurl, indent}: stdenv.mkDerivation { - name = "libdwg-0.3"; + name = "libdwg-0.6"; src = fetchurl { - url = mirror://sourceforge/libdwg/libdwg-0.3.tar.bz2; - sha256 = "0lx7ih00m11qw9wsc5ksmwvi3d80l0yfwnbrn5qfz182w4d3fpc9"; + url = mirror://sourceforge/libdwg/libdwg-0.6.tar.bz2; + sha256 = "0l8ks1x70mkna1q7mzy1fxplinz141bd24qhrm1zkdil74mcsryc"; }; + nativeBuildInputs = [ indent ]; + meta = { description = "library reading dwg files"; homepage = http://libdwg.sourceforge.net/en/; diff --git a/pkgs/development/libraries/libev/default.nix b/pkgs/development/libraries/libev/default.nix index 0472aeef694..37e0c9b3431 100644 --- a/pkgs/development/libraries/libev/default.nix +++ b/pkgs/development/libraries/libev/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libev-${version}"; - version="4.20"; + version="4.22"; src = fetchurl { url = "http://dist.schmorp.de/libev/Attic/${name}.tar.gz"; - sha256 = "17j47pbkr65a18mfvy2861p5k7w4pxmdgiw723ryfqd9gx636w7q"; + sha256 = "1mhvy38g9947bbr0n0hzc34zwfvvfd99qgzpkbap8g2lmkl7jq3k"; }; meta = { diff --git a/pkgs/development/libraries/libevdev/default.nix b/pkgs/development/libraries/libevdev/default.nix index c1587cedd16..3ff40141b16 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.5"; + name = "libevdev-1.4.6"; src = fetchurl { url = "http://www.freedesktop.org/software/libevdev/${name}.tar.xz"; - sha256 = "07faqb47c7sjl25rc788cbslyiv5ijky0jc4g6312qz0hv55h779"; + sha256 = "1lrja526iyg48yw6i0dxdhyj63q9gwbgvj6xk1hskxzrqyhf2akv"; }; buildInputs = [ python ]; diff --git a/pkgs/development/libraries/libfilezilla/default.nix b/pkgs/development/libraries/libfilezilla/default.nix index 4381f9e6c73..3e0310736dd 100644 --- a/pkgs/development/libraries/libfilezilla/default.nix +++ b/pkgs/development/libraries/libfilezilla/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libfilezilla-${version}"; - version = "0.5.0"; + version = "0.5.1"; src = fetchurl { url = "mirror://sourceforge/project/filezilla/libfilezilla/${version}/${name}.tar.bz2"; - sha256 = "07f5hk5izqgqjadrwy608gi0w3scm3zvpsv63j7bgfqk67qilslc"; + sha256 = "1ydpk6i5vjd78i0531cxlkjvlmvvrsfyc7hv7wx81ws3rkp5hnsq"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libgcrypt/1.5.nix b/pkgs/development/libraries/libgcrypt/1.5.nix index d77946e5ec3..4287c86dbd5 100644 --- a/pkgs/development/libraries/libgcrypt/1.5.nix +++ b/pkgs/development/libraries/libgcrypt/1.5.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { postInstall = '' sed -i 's,#include <gpg-error.h>,#include "${libgpgerror.dev}/include/gpg-error.h",g' $out/include/gcrypt.h '' + stdenv.lib.optionalString enableCapabilities '' - sed -i 's,\(-lcap\),-L${libcap.out}/lib \1,' $out/lib/libgcrypt.la + sed -i 's,\(-lcap\),-L${libcap.lib}/lib \1,' $out/lib/libgcrypt.la ''; doCheck = true; diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index d566a0e8567..dd57e74e156 100644 --- a/pkgs/development/libraries/libgcrypt/default.nix +++ b/pkgs/development/libraries/libgcrypt/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { postFixup = '' sed -i 's,#include <gpg-error.h>,#include "${libgpgerror.dev}/include/gpg-error.h",g' "$dev/include/gcrypt.h" '' + stdenv.lib.optionalString enableCapabilities '' - sed -i 's,\(-lcap\),-L${libcap.out}/lib \1,' $out/lib/libgcrypt.la + sed -i 's,\(-lcap\),-L${libcap.lib}/lib \1,' $out/lib/libgcrypt.la ''; # TODO: figure out why this is even necessary and why the missing dylib only crashes diff --git a/pkgs/development/libraries/libgnome-keyring/default.nix b/pkgs/development/libraries/libgnome-keyring/default.nix index 4aadafff844..95de4918668 100644 --- a/pkgs/development/libraries/libgnome-keyring/default.nix +++ b/pkgs/development/libraries/libgnome-keyring/default.nix @@ -9,6 +9,8 @@ stdenv.mkDerivation { sha256 = "030gka96kzqg1r19b4xrmac89hf1xj1kr5p461yvbzfxh46qqf2n"; }; + outputs = [ "dev" "out" ]; + propagatedBuildInputs = [ glib dbus_libs libgcrypt ]; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/development/libraries/libiconv/default.nix b/pkgs/development/libraries/libiconv/default.nix index f5818c3bf4c..9b62436ae08 100644 --- a/pkgs/development/libraries/libiconv/default.nix +++ b/pkgs/development/libraries/libiconv/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, lib }: -assert (!stdenv.isLinux); +assert !stdenv.isLinux || stdenv ? cross; # TODO: improve on cross stdenv.mkDerivation rec { name = "libiconv-1.14"; @@ -15,6 +15,12 @@ stdenv.mkDerivation rec { ./libiconv-1.14-wchar.patch ]; + postPatch = + lib.optionalString (stdenv.cross.libc or null == "msvcrt") + '' + sed '/^_GL_WARN_ON_USE (gets/d' -i srclib/stdio.in.h + ''; + configureFlags = # On Cygwin, Libtool produces a `.dll.a', which is not a "real" DLL # (Windows' linker would need to be used somehow to produce an actual diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index 2c29482227a..fdb4f168bac 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -15,13 +15,15 @@ in with stdenv.lib; stdenv.mkDerivation rec { - name = "libinput-1.2.3"; + name = "libinput-1.3.0"; src = fetchurl { url = "http://www.freedesktop.org/software/libinput/${name}.tar.xz"; - sha256 = "1wp937sn2dzqhrbl2bhapqb0pvybc80z8ynw7yfkm5ycl39skch9"; + sha256 = "1sn1s1bz06fa49izqkqf519sjclsvhf42i6slzx1w5hx4vxpb2lr"; }; + outputs = [ "dev" "out" ]; + configureFlags = [ (mkFlag documentationSupport "documentation") (mkFlag eventGUISupport "event-gui") diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix index da4d3a9822f..c326e630bd0 100644 --- a/pkgs/development/libraries/libjpeg-turbo/default.nix +++ b/pkgs/development/libraries/libjpeg-turbo/default.nix @@ -8,6 +8,10 @@ stdenv.mkDerivation rec { sha256 = "0gi349hp1x7mb98s4mf66sb2xay2kjjxj9ihrriw0yiy0k9va6sj"; }; + patches = + stdenv.lib.optional (stdenv.cross.libc or null == "msvcrt") + ./mingw-boolean.patch; + outputs = [ "dev" "out" "doc" "bin" ]; nativeBuildInputs = [ nasm ]; diff --git a/pkgs/development/libraries/libjpeg-turbo/mingw-boolean.patch b/pkgs/development/libraries/libjpeg-turbo/mingw-boolean.patch new file mode 100644 index 00000000000..9b9483d6398 --- /dev/null +++ b/pkgs/development/libraries/libjpeg-turbo/mingw-boolean.patch @@ -0,0 +1,19 @@ +Ported to updated libjpeg-turbo from +https://github.com/msys2/MINGW-packages/blob/master/mingw-w64-libjpeg-turbo/jpeg-typedefs.patch +--- a/jmorecfg.h 2012-02-10 06:47:55 +0300 ++++ b/jmorecfg.h 2012-05-03 10:29:13 +0400 +@@ -224,7 +224,13 @@ + * Defining HAVE_BOOLEAN before including jpeglib.h should make it work. + */ + +-#ifndef HAVE_BOOLEAN ++#if defined(_WIN32) && !defined(HAVE_BOOLEAN) ++#ifndef __RPCNDR_H__ ++typedef unsigned char boolean; ++#endif ++#define HAVE_BOOLEAN ++#endif ++#if !defined(HAVE_BOOLEAN) && !defined(__RPCNDR_H__) + typedef int boolean; + #endif + #ifndef FALSE /* in case these macros already exist */ diff --git a/pkgs/development/libraries/libksba/default.nix b/pkgs/development/libraries/libksba/default.nix index 26aa974a7ee..9171471882c 100644 --- a/pkgs/development/libraries/libksba/default.nix +++ b/pkgs/development/libraries/libksba/default.nix @@ -1,18 +1,18 @@ { stdenv, fetchurl, libgpgerror }: stdenv.mkDerivation rec { - name = "libksba-1.3.3"; + name = "libksba-1.3.4"; src = fetchurl { url = "mirror://gnupg/libksba/${name}.tar.bz2"; - sha256 = "11kp3h9l3b8ikydkcdkwgx45r662zi30m26ra5llyhfh6kz5yzqc"; + sha256 = "0kxdb02z41cwm1xbwfwj9nbc0dzjhwyq8c475mlhhmpcxcy8ihpn"; }; propagatedBuildInputs = [ libgpgerror ]; meta = with stdenv.lib; { - homepage = http://www.gnupg.org; - description = "CMS and X.509 access library under development"; + homepage = https://www.gnupg.org; + description = "CMS and X.509 access library"; platforms = platforms.all; license = licenses.lgpl3; maintainers = with maintainers; [ wkennington ]; diff --git a/pkgs/development/libraries/libmpack/default.nix b/pkgs/development/libraries/libmpack/default.nix new file mode 100644 index 00000000000..d127531b1e0 --- /dev/null +++ b/pkgs/development/libraries/libmpack/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, libtool }: + +stdenv.mkDerivation rec { + name = "libmpack-${version}"; + version = "1.0.2"; + src = fetchFromGitHub { + owner = "tarruda"; + repo = "libmpack"; + rev = version; + sha256 = "0s391vyz1gv4j95zdyvxspw7c0xq7d7b4fh0yxrgqqqp5js1rlj0"; + }; + buildInputs = [ libtool ]; + installPhase = '' + mkdir -p $out/lib/libmpack + cp -R build/* $out/lib/libmpack + rm -rf $out/lib/libmpack/debug + ''; + meta = with stdenv.lib; { + description = "Simple implementation of msgpack in C"; + homepage = "https://github.com/tarruda/libmpack/"; + license = licenses.mit; + maintainers = with maintainers; [ lovek323 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/libnatspec/default.nix b/pkgs/development/libraries/libnatspec/default.nix index 7dafe3434f9..cdde02c361f 100644 --- a/pkgs/development/libraries/libnatspec/default.nix +++ b/pkgs/development/libraries/libnatspec/default.nix @@ -1,13 +1,15 @@ -{ stdenv, fetchurl, popt, libiconv }: +{ stdenv, fetchurl, autoreconfHook, popt, libiconv }: stdenv.mkDerivation (rec { - name = "libnatspec-0.2.6"; + name = "libnatspec-0.3.0"; src = fetchurl { url = "mirror://sourceforge/natspec/${name}.tar.bz2"; - sha256 = "0zvm9afh1skxgdv62ylrpwyykpjhhskxj0zv7yrdf7jhfdriz0y3"; + sha256 = "0wffxjlc8svilwmrcg3crddpfrpv35mzzjgchf8ygqsvwbrbb3b7"; }; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ popt ]; meta = { diff --git a/pkgs/development/libraries/libnftnl/default.nix b/pkgs/development/libraries/libnftnl/default.nix index df692f76a2a..53dfd21f23d 100644 --- a/pkgs/development/libraries/libnftnl/default.nix +++ b/pkgs/development/libraries/libnftnl/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { name = "libnftnl-1.0.5"; src = fetchurl { - url = "netfilter.org/projects/libnftnl/files/${name}.tar.bz2"; + url = "http://netfilter.org/projects/libnftnl/files/${name}.tar.bz2"; sha256 = "15z4kcsklbvy94d24p2r0avyhc2rsvygjqr3gyccg2z30akzbm7n"; }; buildInputs = [ pkgconfig libmnl ]; meta = with stdenv.lib; { - description = "a userspace library providing a low-level netlink API to the in-kernel nf_tables subsystem"; + description = "A userspace library providing a low-level netlink API to the in-kernel nf_tables subsystem"; homepage = http://netfilter.org/projects/libnftnl; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libopus/default.nix b/pkgs/development/libraries/libopus/default.nix index b8951e66c8b..20101fe6fe3 100644 --- a/pkgs/development/libraries/libopus/default.nix +++ b/pkgs/development/libraries/libopus/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, fixedPoint ? false, withCustomModes ? true }: let - version = "1.1"; + version = "1.1.2"; in stdenv.mkDerivation rec { name = "libopus-${version}"; src = fetchurl { url = "http://downloads.xiph.org/releases/opus/opus-${version}.tar.gz"; - sha256 = "158xprn2086arvdib3vbbygz7z6jqkw2nci7nlywzzwallap0wmr"; + sha256 = "1z87x5c5x951lhnm70iqr2gqn15wns5cqsw8nnkvl48jwdw00a8f"; }; outputs = [ "dev" "out" ]; diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix index 6faed97aaee..a5a0e1d42a3 100644 --- a/pkgs/development/libraries/libpng/default.nix +++ b/pkgs/development/libraries/libpng/default.nix @@ -26,7 +26,9 @@ in stdenv.mkDerivation rec { preConfigure = "export bin=$dev"; - doCheck = true; + # it's hard to cross-run tests and some check programs didn't compile anyway + makeFlags = stdenv.lib.optional (!doCheck) "check_PROGRAMS="; + doCheck = ! stdenv ? cross; postInstall = ''mv "$out/bin" "$dev/bin"''; diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix index 07258e40355..8540eccf2da 100644 --- a/pkgs/development/libraries/libpsl/default.nix +++ b/pkgs/development/libraries/libpsl/default.nix @@ -3,10 +3,10 @@ let - listVersion = "2016-04-16"; + listVersion = "2016-05-10"; listSources = fetchFromGitHub { - sha256 = "0lwf8cvqfr3nsx92i2fphij0whb2lcswk6z6grhisqmwrs873hyv"; - rev = "dfac82546fde5180e2d5a1b61b6ae2f668009870"; + sha256 = "1bpdli2q5ap677yg0w0v7q5qmaxnm2y17wakzmc0k6k7m7xfyzw0"; + rev = "2226f9cc92213d0d68a74ecb535b15b3af00388a"; repo = "list"; owner = "publicsuffix"; }; diff --git a/pkgs/development/libraries/libpwquality/default.nix b/pkgs/development/libraries/libpwquality/default.nix index aaa39783fa7..fa272f2ec6f 100644 --- a/pkgs/development/libraries/libpwquality/default.nix +++ b/pkgs/development/libraries/libpwquality/default.nix @@ -1,11 +1,12 @@ -{ stdenv, cracklib, fetchurl, python }: +{ stdenv, fetchurl, cracklib, python }: stdenv.mkDerivation rec { - name = "libpwquality-1.2.3"; + name = "libpwquality-${version}"; + version = "1.3.0"; src = fetchurl { url = "https://fedorahosted.org/releases/l/i/libpwquality/${name}.tar.bz2"; - sha256 = "0sjiabvl5277nfxyy96jdz65a0a3pmkkwrfbziwgik83gg77j75i"; + sha256 = "0aidriag6h0syfm33nzdfdsqgrnsgihwjv3a5lgkqch3w68fmlkl"; }; buildInputs = [ cracklib python ]; diff --git a/pkgs/development/libraries/libre/default.nix b/pkgs/development/libraries/libre/default.nix index 243b4b9420a..3038b9f83d3 100644 --- a/pkgs/development/libraries/libre/default.nix +++ b/pkgs/development/libraries/libre/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, zlib, openssl}: stdenv.mkDerivation rec { - version = "0.4.15"; + version = "0.4.16"; name = "libre-${version}"; src=fetchurl { url = "http://www.creytiv.com/pub/re-${version}.tar.gz"; - sha256 = "0yvjc3hvjk29irdii2h1hpq4cg9l1c71jfvglz67y1pc89z63yax"; + sha256 = "0aabz9hjw47xqis2xr3rvxw1slpig4hq9wkl8fbdpgq2fgrzqdmw"; }; buildInputs = [zlib openssl]; makeFlags = [ diff --git a/pkgs/development/libraries/libressl/2.2.nix b/pkgs/development/libraries/libressl/2.2.nix index 09505217ae2..280c2e6bc94 100644 --- a/pkgs/development/libraries/libressl/2.2.nix +++ b/pkgs/development/libraries/libressl/2.2.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libressl-${version}"; - version = "2.2.6"; + version = "2.2.7"; src = fetchurl { url = "mirror://openbsd/LibreSSL/${name}.tar.gz"; - sha256 = "0kynb15l5gq1qgp3p4ncn20sc65sbl8lk89vyr07s17xrya9kq8y"; + sha256 = "1kckv36dgvvjq1ap6ahxgma4hw57zp61xsp5vjvyza5vhfrnhb3y"; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/libressl/2.3.nix b/pkgs/development/libraries/libressl/2.3.nix index 129456e6657..a5052a9b499 100644 --- a/pkgs/development/libraries/libressl/2.3.nix +++ b/pkgs/development/libraries/libressl/2.3.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libressl-${version}"; - version = "2.3.3"; + version = "2.3.4"; src = fetchurl { url = "mirror://openbsd/LibreSSL/${name}.tar.gz"; - sha256 = "1a8anm8nsfyxds03csk738m2cmzjbsb867my1rz5ij3w31k32wvn"; + sha256 = "1ag65pbvdikqj5y1w780jicl3ngi9ld2332ki6794y0gcar3a4bs"; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index 0768a21bf54..6147e847b33 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null; + outputs = [ "dev" "out" ]; + buildInputs = [ libxml2 libgsf bzip2 libcroco pango libintlOrEmpty ] ++ stdenv.lib.optional enableIntrospection [ gobjectIntrospection ]; diff --git a/pkgs/development/libraries/libseccomp/default.nix b/pkgs/development/libraries/libseccomp/default.nix index 444b68a23ee..63a60820e3f 100644 --- a/pkgs/development/libraries/libseccomp/default.nix +++ b/pkgs/development/libraries/libseccomp/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, getopt }: -let version = "2.2.3"; in +let version = "2.3.0"; in stdenv.mkDerivation rec { name = "libseccomp-${version}"; src = fetchurl { url = "https://github.com/seccomp/libseccomp/releases/download/v${version}/libseccomp-${version}.tar.gz"; - sha256 = "d9b400b703cab7bb04b84b9b6e52076a630b673819d7541757bcc16467b6d49e"; + sha256 = "07chdgr87aayn6sjm94y6gisl4j6si1hr9cqhs09l9bqfnky6mnp"; }; buildInputs = [ getopt ]; diff --git a/pkgs/development/libraries/libsecret/default.nix b/pkgs/development/libraries/libsecret/default.nix index 3ceabc3f1ac..bb8d971d6d4 100644 --- a/pkgs/development/libraries/libsecret/default.nix +++ b/pkgs/development/libraries/libsecret/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, glib, pkgconfig, intltool, libxslt, docbook_xsl, gtk_doc , libgcrypt, gobjectIntrospection }: let - version = "0.18"; + version = "0.18.5"; in stdenv.mkDerivation rec { name = "libsecret-${version}"; src = fetchurl { - url = "mirror://gnome/sources/libsecret/${version}/${name}.tar.xz"; - sha256 = "1qq29c01xxjyx5sl6y5h22w8r0ff4c73bph3gfx3h7mx5mvalwqc"; + url = "mirror://gnome/sources/libsecret/0.18/${name}.tar.xz"; + sha256 = "1cychxc3ff8fp857iikw0n2s13s2mhw2dn1mr632f7w3sn6vvrww"; }; propagatedBuildInputs = [ glib ]; diff --git a/pkgs/development/libraries/libserialport/default.nix b/pkgs/development/libraries/libserialport/default.nix index c40812beeac..e7ee188c29f 100644 --- a/pkgs/development/libraries/libserialport/default.nix +++ b/pkgs/development/libraries/libserialport/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, udev }: stdenv.mkDerivation rec { - name = "libserialport-0.1.0"; + name = "libserialport-0.1.1"; src = fetchurl { url = "http://sigrok.org/download/source/libserialport/${name}.tar.gz"; - sha256 = "1bqrldwrcsv6jbq3pmqczq27gdkrzpaxwplanqs25f6q9gb5p47c"; + sha256 = "17ajlwgvyyrap8z7f16zcs59pksvncwbmd3mzf98wj7zqgczjaja"; }; buildInputs = [ pkgconfig udev ]; diff --git a/pkgs/development/libraries/libsndfile/default.nix b/pkgs/development/libraries/libsndfile/default.nix index 547c7647b7a..85d30fdd79b 100644 --- a/pkgs/development/libraries/libsndfile/default.nix +++ b/pkgs/development/libraries/libsndfile/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, flac, libogg, libvorbis, pkgconfig -, Carbon +, Carbon, AudioToolbox }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ pkgconfig flac libogg libvorbis ] - ++ stdenv.lib.optional stdenv.isDarwin Carbon; + ++ stdenv.lib.optionals stdenv.isDarwin [ Carbon AudioToolbox ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/libspotify/default.nix b/pkgs/development/libraries/libspotify/default.nix index 02bd1f966e6..951a939cbfb 100644 --- a/pkgs/development/libraries/libspotify/default.nix +++ b/pkgs/development/libraries/libspotify/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, libspotify, alsaLib, readline, pkgconfig, apiKey, unzip, gnused }: -let - version = "12.1.51"; +let + version = "12.1.51"; isLinux = (stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux"); in @@ -29,13 +29,8 @@ else stdenv.mkDerivation { else null; - # common - buildPhase = "true"; - # no patch or build phase for darwin - phases = - [ "unpackPhase" ] ++ - (stdenv.lib.optionals (isLinux) [ "patchPhase" "buildPhase" ]) ++ - [ "installPhase" ]; + dontBuild = true; + installPhase = if (isLinux) then "installPhase" else '' @@ -48,7 +43,7 @@ else stdenv.mkDerivation { mkdir -p "$out"/share/man mv -v man3 "$out"/share/man ''; - + # darwin-specific buildInputs = stdenv.lib.optional (stdenv.system == "x86_64-darwin") unzip; diff --git a/pkgs/development/libraries/libtcod/default.nix b/pkgs/development/libraries/libtcod/default.nix new file mode 100644 index 00000000000..959c544876f --- /dev/null +++ b/pkgs/development/libraries/libtcod/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromBitbucket, cmake, SDL, mesa, upx }: + +stdenv.mkDerivation rec { + + name = "libtcod-${version}"; + version = "1.5.1"; + + src = fetchFromBitbucket { + owner = "libtcod"; + repo = "libtcod"; + rev = "1.5.1"; + sha256 = "1ibsnmnim712npxkqklc5ibnd32hgsx2yzyfzzc5fis5mhinbl63"; + }; + + prePatch = '' + sed -i CMakeLists.txt \ + -e "s,SET(ROOT_DIR.*,SET(ROOT_DIR $out),g" \ + -e "s,SET(INSTALL_DIR.*,SET(INSTALL_DIR $out),g" + echo 'INSTALL(DIRECTORY include DESTINATION .)' >> CMakeLists.txt + ''; + + cmakeFlags="-DLIBTCOD_SAMPLES=OFF"; + + buildInputs = [ cmake SDL mesa upx ]; + + meta = { + description = "API for roguelike games"; + homepage = http://roguecentral.org/doryen/libtcod/; + license = stdenv.lib.licenses.bsd3; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.skeidel ]; + }; +} diff --git a/pkgs/development/libraries/libtorrent-rasterbar/generic.nix b/pkgs/development/libraries/libtorrent-rasterbar/generic.nix index a5bb258af1a..d840487b4a5 100644 --- a/pkgs/development/libraries/libtorrent-rasterbar/generic.nix +++ b/pkgs/development/libraries/libtorrent-rasterbar/generic.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { "--with-libgeoip=system" "--with-libiconv=yes" "--with-boost=${boost.dev}" - "--with-boost-libdir=${boost.lib}/lib" + "--with-boost-libdir=${boost.out}/lib" "--with-libiconv=yes" ]; diff --git a/pkgs/development/libraries/libu2f-host/default.nix b/pkgs/development/libraries/libu2f-host/default.nix index dc2481a2e85..48d55f17c57 100644 --- a/pkgs/development/libraries/libu2f-host/default.nix +++ b/pkgs/development/libraries/libu2f-host/default.nix @@ -1,19 +1,20 @@ { stdenv, fetchurl, pkgconfig, json_c, hidapi }: stdenv.mkDerivation rec { - name = "libu2f-host-1.0.0"; + name = "libu2f-host-1.1.1"; src = fetchurl { url = "https://developers.yubico.com/libu2f-host/Releases/${name}.tar.xz"; - sha256 = "0x232rp325k1l3rdh1b9d7w3w2z2lhjmp95v4mlmd8pybjdnpi8q"; + sha256 = "0g0f012w0c00cvj5g319x2b8prbh0d3fcac9960cy7xsd8chckg1"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ json_c hidapi ]; + doCheck = true; + postInstall = '' - mkdir -p $out/lib/udev/rules.d/ - cp -v *.rules $out/lib/udev/rules.d/ + install -D -t $out/lib/udev/rules.d 70-u2f.rules ''; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix index 5c593dd1f75..278679698c6 100644 --- a/pkgs/development/libraries/libvpx/default.nix +++ b/pkgs/development/libraries/libvpx/default.nix @@ -13,12 +13,10 @@ , runtimeCpuDetectSupport ? true # detect cpu capabilities at runtime , thumbSupport ? false # build arm assembly in thumb mode , examplesSupport ? true # build examples (vpxdec & vpxenc are part of examples) -, fastUnalignedSupport ? true # use unaligned accesses if supported by hardware , debugLibsSupport ? false # include debug version of each library , postprocSupport ? true # postprocessing , multithreadSupport ? true # multithreaded decoding & encoding , internalStatsSupport ? false # output of encoder internal stats for debug, if supported (encoders) -, memTrackerSupport ? false # track memory usage , spatialResamplingSupport ? true # spatial sampling (scaling) , realtimeOnlySupport ? false # build for real-time encoding , ontheflyBitpackingSupport ? false # on-the-fly bitpacking in real-time encoding @@ -61,13 +59,13 @@ assert isCygwin -> unitTestsSupport && webmIOSupport && libyuvSupport; stdenv.mkDerivation rec { name = "libvpx-${version}"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "webmproject"; repo = "libvpx"; rev = "v${version}"; - sha256 = "1y8cf2q5ij8z8ab5j36m18rbs62aah6sw6shzbs3jr70ja0z6n8s"; + sha256 = "19ill4c7dak5f8m4pdbas87zknw3a34sca8a4i952q0l0jnif0np"; }; patchPhase = ''patchShebangs .''; @@ -103,7 +101,6 @@ stdenv.mkDerivation rec { "--as=yasm" # Limit default decoder max to WHXGA (if sizeLimitSupport then "--size-limit=5120x3200" else null) - (enableFeature fastUnalignedSupport "fast-unaligned") "--disable-codec-srcs" (enableFeature debugLibsSupport "debug-libs") (enableFeature isMips "dequant-tokens") @@ -112,7 +109,6 @@ stdenv.mkDerivation rec { (enableFeature (postprocSupport && (vp9DecoderSupport || vp9EncoderSupport)) "vp9-postproc") (enableFeature multithreadSupport "multithread") (enableFeature internalStatsSupport "internal-stats") - (enableFeature memTrackerSupport "mem-tracker") (enableFeature spatialResamplingSupport "spatial-resampling") (enableFeature realtimeOnlySupport "realtime-only") (enableFeature ontheflyBitpackingSupport "onthefly-bitpacking") @@ -158,6 +154,7 @@ stdenv.mkDerivation rec { dontSetConfigureCross = true; configureFlags = configureFlags ++ [ #"--extra-cflags=" + #"--extra-cxxflags=" #"--prefix=" #"--libc=" #"--libdir=" diff --git a/pkgs/development/libraries/libxkbcommon/default.nix b/pkgs/development/libraries/libxkbcommon/default.nix index 2bf7bbaabb3..7cfccfe05f7 100644 --- a/pkgs/development/libraries/libxkbcommon/default.nix +++ b/pkgs/development/libraries/libxkbcommon/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, yacc, flex, xkeyboard_config, libxcb }: stdenv.mkDerivation rec { - name = "libxkbcommon-0.5.0"; + name = "libxkbcommon-0.6.1"; src = fetchurl { url = "http://xkbcommon.org/download/${name}.tar.xz"; - sha256 = "176ii5dn2wh74q48sd8ac37ljlvgvp5f506glr96z6ibfhj7igch"; + sha256 = "0q47xa1szlxwgvwmhv4b7xwawnykz1hnc431d84nj8dlh2q8f22v"; }; outputs = [ "dev" "out" ]; @@ -20,8 +20,10 @@ stdenv.mkDerivation rec { sed -i 's/,--version-script=.*$//' Makefile ''; - meta = { + meta = with stdenv.lib; { description = "A library to handle keyboard descriptions"; homepage = http://xkbcommon.org; + license = licenses.mit; + maintainers = with maintainers; [ garbas ]; }; } diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index 8eedf50c9ca..7229b10e01c 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, zlib, xz, python, findXMLCatalogs }: +{ stdenv, lib, fetchurl, zlib, xz, python, findXMLCatalogs, libiconv +, supportPython ? (! stdenv ? cross) }: stdenv.mkDerivation rec { name = "libxml2-${version}"; @@ -9,23 +10,36 @@ stdenv.mkDerivation rec { sha256 = "0bd17g6znn2r98gzpjppsqjg33iraky4px923j3k8kdl8qgy7sad"; }; - outputs = [ "dev" "out" "bin" "doc" "py" ]; - propagatedBuildOutputs = "out bin py"; + outputs = [ "dev" "out" "bin" "doc" ] + ++ lib.optional supportPython "py"; + propagatedBuildOutputs = "out bin" + lib.optionalString supportPython " py"; - buildInputs = [ python ] + buildInputs = lib.optional supportPython python # Libxml2 has an optional dependency on liblzma. However, on impure # platforms, it may end up using that from /usr/lib, and thus lack a # RUNPATH for that, leading to undefined references for its users. - ++ stdenv.lib.optional stdenv.isFreeBSD xz; + ++ lib.optional stdenv.isFreeBSD xz; propagatedBuildInputs = [ zlib findXMLCatalogs ]; - configureFlags = "--with-python=${python} --exec_prefix=$dev"; + configureFlags = lib.optional supportPython "--with-python=${python}" + ++ [ "--exec_prefix=$dev" ]; enableParallelBuilding = true; - preInstall = ''substituteInPlace python/libxml2mod.la --replace "${python}" "$py"''; - installFlags = ''pythondir="$(py)/lib/${python.libPrefix}/site-packages"''; + crossAttrs = lib.optionalAttrs (stdenv.cross.libc == "msvcrt") { + # creating the DLL is broken ATM + dontDisableStatic = true; + configureFlags = configureFlags ++ [ "--disable-shared" ]; + + # libiconv is a header dependency - propagating is enough + propagatedBuildInputs = [ findXMLCatalogs libiconv ]; + }; + + preInstall = lib.optionalString supportPython + ''substituteInPlace python/libxml2mod.la --replace "${python}" "$py"''; + installFlags = lib.optionalString supportPython + ''pythondir="$(py)/lib/${python.libPrefix}/site-packages"''; postFixup = '' moveToOutput bin/xml2-config "$dev" @@ -33,13 +47,13 @@ stdenv.mkDerivation rec { moveToOutput share/man/man1 "$bin" ''; - passthru = { inherit version; pythonSupport = true; }; + passthru = { inherit version; pythonSupport = supportPython; }; meta = { homepage = http://xmlsoft.org/; description = "An XML parsing library for C"; license = "bsd"; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.eelco ]; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.eelco ]; }; } diff --git a/pkgs/development/libraries/libxmp/default.nix b/pkgs/development/libraries/libxmp/default.nix index 106fcee257f..28584d14a87 100644 --- a/pkgs/development/libraries/libxmp/default.nix +++ b/pkgs/development/libraries/libxmp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libxmp-4.3.11"; + name = "libxmp-4.3.12"; meta = with stdenv.lib; { description = "Extended module player library"; @@ -17,6 +17,6 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/xmp/libxmp/${name}.tar.gz"; - sha256 = "0r9qhps2a8nc850bislkgjzlamwl671r1sag1mi8k1a9gxq4n9kx"; + sha256 = "1536dfxgxl6dyvkdby8lxzi9f7y2qlwl8ylrkybips3ampcqgkhm"; }; } diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix index 0eda42879ec..c76f2824604 100644 --- a/pkgs/development/libraries/libxslt/default.nix +++ b/pkgs/development/libraries/libxslt/default.nix @@ -9,6 +9,12 @@ stdenv.mkDerivation rec { }; patches = stdenv.lib.optional stdenv.isSunOS ./patch-ah.patch + ++ stdenv.lib.optional (stdenv.cross.libc or null == "msvcrt") + (fetchpatch { + name = "mingw.patch"; + url = "http://git.gnome.org/browse/libxslt/patch/?id=ab5810bf27cd63"; + sha256 = "0kkqq3fv2k3q86al38vp6zwxazpvp5kslcjnmrq4ax5cm2zvsjk3"; + }) ++ [ (fetchpatch { name = "CVE-2015-7995.patch"; diff --git a/pkgs/development/libraries/libzip/default.nix b/pkgs/development/libraries/libzip/default.nix index 4af9278c7b1..714745c432e 100644 --- a/pkgs/development/libraries/libzip/default.nix +++ b/pkgs/development/libraries/libzip/default.nix @@ -1,32 +1,34 @@ -{ stdenv, fetchurl, zlib }: +{ stdenv, fetchurl, perl, zlib }: stdenv.mkDerivation rec { - name = "libzip-0.11.2"; + name = "libzip-${version}"; + version = "1.1.2"; src = fetchurl { url = "http://www.nih.at/libzip/${name}.tar.gz"; - sha256 = "1mcqrz37vjrfr4gnss37z1m7xih9x9miq3mms78zf7wn7as1znw3"; + sha256 = "08b26qbfxq6z5xf36y1d8insm5valv83dhj933iag6man04prb2r"; }; - # fix CVE-2015-2331 taken from Debian patch: - # https://bugs.debian.org/cgi-bin/bugreport.cgi?msg=12;filename=libzip-0.11.2-1.2-nmu.diff;att=1;bug=780756 - postPatch = '' - substituteInPlace lib/zip_dirent.c --replace \ - 'else if ((cd->entry=(struct zip_entry *)' \ - 'else if (nentry > ((size_t)-1)/sizeof(*(cd->entry)) || (cd->entry=(struct zip_entry *)' - cat lib/zip_dirent.c - ''; + outputs = [ "dev" "out" ]; + nativeBuildInputs = [ perl ]; propagatedBuildInputs = [ zlib ]; + preInstall = '' + patchShebangs man/handle_links + ''; + # At least mysqlWorkbench cannot find zipconf.h; I think also openoffice # had this same problem. This links it somewhere that mysqlworkbench looks. postInstall = '' - ( cd $out/include ; ln -s ../lib/libzip/include/zipconf.h zipconf.h ) + mkdir -p $dev/lib + mv $out/lib/libzip $dev/lib/libzip + ( cd $dev/include ; ln -s ../lib/libzip/include/zipconf.h zipconf.h ) ''; meta = { homepage = http://www.nih.at/libzip; description = "A C library for reading, creating and modifying zip archives"; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/log4cplus/default.nix b/pkgs/development/libraries/log4cplus/default.nix index 9d07f033eda..6d63e8367f7 100644 --- a/pkgs/development/libraries/log4cplus/default.nix +++ b/pkgs/development/libraries/log4cplus/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl }: let - name = "log4cplus-1.1.2"; + name = "log4cplus-1.2.0"; in stdenv.mkDerivation { inherit name; src = fetchurl { url = "mirror://sourceforge/log4cplus/${name}.tar.bz2"; - sha256 = "14zdfaxnxjrnfdjipmcrvsqp8pj1s4wscphvg4jvbp3kd34mcvf4"; + sha256 = "1fb3g9l12sps3mv4xjiql2kcvj439mww3skz735y7113cnlcf338"; }; meta = { diff --git a/pkgs/development/libraries/mediastreamer/default.nix b/pkgs/development/libraries/mediastreamer/default.nix index de976002f03..5830786f644 100644 --- a/pkgs/development/libraries/mediastreamer/default.nix +++ b/pkgs/development/libraries/mediastreamer/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "mediastreamer-2.11.2"; + name = "mediastreamer-2.12.1"; src = fetchurl { url = "mirror://savannah/linphone/mediastreamer/${name}.tar.gz"; - sha256 = "1g6gawrlz1lixzs1kzckm3rxc401ww8pi00x7r5kb84bdijb02cc"; + sha256 = "1rzjh2ln8qd6jvfmxlnbrcx2vbajx2j9hblqq2gdn10sf97qvgqd"; }; patches = [ ./plugins_dir.patch ]; diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 2d05861605a..6ac8acebfe8 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -169,6 +169,6 @@ stdenv.mkDerivation { homepage = http://www.mesa3d.org/; license = licenses.mit; # X11 variant, in most files platforms = platforms.mesaPlatforms; - maintainers = with maintainers; [ eduarrrd simons vcunat ]; + maintainers = with maintainers; [ eduarrrd vcunat ]; }; } diff --git a/pkgs/development/libraries/ndn-cxx/default.nix b/pkgs/development/libraries/ndn-cxx/default.nix index d95443da359..87aaaece53f 100644 --- a/pkgs/development/libraries/ndn-cxx/default.nix +++ b/pkgs/development/libraries/ndn-cxx/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { ./waf configure \ --with-cryptopp=${cryptopp} \ --boost-includes=${boost.dev}/include \ - --boost-libs=${boost.lib}/lib \ + --boost-libs=${boost.out}/lib \ --with-examples \ --prefix=$out ''; diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix index 29175fbb7d4..b690a55bb92 100644 --- a/pkgs/development/libraries/nghttp2/default.nix +++ b/pkgs/development/libraries/nghttp2/default.nix @@ -7,12 +7,12 @@ stdenv.mkDerivation rec { name = "nghttp2-${version}"; - version = "1.9.2"; + version = "1.10.0"; # Don't use fetchFromGitHub since this needs a bootstrap curl src = fetchurl { url = "https://github.com/nghttp2/nghttp2/releases/download/v${version}/nghttp2-${version}.tar.bz2"; - sha256 = "1jnms0mmf73cwdqvbzpdyi974f8xq7p8bxgba2ippw70pz8y0ac0"; + sha256 = "1m95j3lhxp6k16aa2m03rsky13nmj8ky1kk96cwl88vbsrliz4mh"; }; # Configure script searches for a symbol which does not exist in jemalloc on Darwin diff --git a/pkgs/development/libraries/nlopt/default.nix b/pkgs/development/libraries/nlopt/default.nix index ddf47cf31d8..4e3db9b0d40 100644 --- a/pkgs/development/libraries/nlopt/default.nix +++ b/pkgs/development/libraries/nlopt/default.nix @@ -25,7 +25,6 @@ stdenv.mkDerivation rec { description = "Free open-source library for nonlinear optimization"; license = stdenv.lib.licenses.lgpl21Plus; hydraPlatforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.simons ]; broken = true; # cannot cope with Octave 4.x }; diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix index 726b5d7b29a..23f7ffb0ce8 100644 --- a/pkgs/development/libraries/nspr/default.nix +++ b/pkgs/development/libraries/nspr/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { name = "nspr-${version}"; src = fetchurl { - url = "http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${version}/src/nspr-${version}.tar.gz"; + url = "mirror://mozilla/nspr/releases/v${version}/src/nspr-${version}.tar.gz"; sha256 = "1pk98bmc5xzbl62q5wf2d6mryf0v95z6rsmxz27nclwiaqg0mcg0"; }; diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index fc5bffe6b74..c95e2304e40 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -12,7 +12,7 @@ in stdenv.mkDerivation rec { version = "3.23"; src = fetchurl { - url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_23_RTM/src/${name}.tar.gz"; + url = "mirror://mozilla/security/nss/releases/NSS_3_23_RTM/src/${name}.tar.gz"; sha256 = "1kqidv91icq96m9m8zx50n7px08km2l88458rkgyjwcn3kiq7cwl"; }; diff --git a/pkgs/development/libraries/openbr/default.nix b/pkgs/development/libraries/openbr/default.nix index dd40311b807..3f3218a550f 100644 --- a/pkgs/development/libraries/openbr/default.nix +++ b/pkgs/development/libraries/openbr/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.asl20; maintainers = with stdenv.lib.maintainers; [flosse]; platforms = with stdenv.lib.platforms; linux; + broken = true; }; } diff --git a/pkgs/development/libraries/openh264/default.nix b/pkgs/development/libraries/openh264/default.nix index 76188d484f9..71983b30a2c 100644 --- a/pkgs/development/libraries/openh264/default.nix +++ b/pkgs/development/libraries/openh264/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, nasm }: stdenv.mkDerivation rec { - name = "openh264-1.4.0"; + name = "openh264-1.5.0"; src = fetchurl { - url = "https://github.com/cisco/openh264/archive/v1.4.0.tar.gz"; - sha256 = "08haj0xkyjlwbpqdinxk0cmvqw89bx89ly0kqs9lf87fy6ksgfd1"; + url = "https://github.com/cisco/openh264/archive/v1.5.0.tar.gz"; + sha256 = "1d97dh5hzmy46jamfw03flvcz8md1hxp6y5n0b787h8ks7apn1wq"; }; buildInputs = [ nasm ]; diff --git a/pkgs/development/libraries/openjpeg/generic.nix b/pkgs/development/libraries/openjpeg/generic.nix index 1b4b4af7f41..b01ff527d8c 100644 --- a/pkgs/development/libraries/openjpeg/generic.nix +++ b/pkgs/development/libraries/openjpeg/generic.nix @@ -25,12 +25,14 @@ in stdenv.mkDerivation rec { name = "openjpeg-${version}"; - + src = fetchurl { url = "mirror://sourceforge/openjpeg.mirror/${version}/openjpeg-${version}.tar.gz"; inherit sha256; }; + outputs = [ "dev" "out" ]; + cmakeFlags = [ "-DCMAKE_INSTALL_NAME_DIR=\${CMAKE_INSTALL_PREFIX}/lib" "-DBUILD_SHARED_LIBS=ON" diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 1e0f419c5f7..8c0ad107d77 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -57,20 +57,20 @@ let rm "$out/lib/"*.a fi - mkdir -p $bin - mv $out/bin $bin/ + mkdir -p $bin + mv $out/bin $bin/ - mkdir $dev - mv $out/include $dev/ + mkdir $dev + mv $out/include $dev/ # remove dependency on Perl at runtime - rm -r $out/etc/ssl/misc + rm -r $out/etc/ssl/misc rmdir $out/etc/ssl/{certs,private} ''; postFixup = '' - # Check to make sure the main output doesn't depend on perl + # Check to make sure the main output doesn't depend on perl if grep -r '${perl}' $out; then echo "Found an erroneous dependency on perl ^^^" >&2 exit 1 @@ -97,7 +97,7 @@ let 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 ]; + maintainers = [ stdenv.lib.maintainers.peti ]; priority = 10; # resolves collision with ‘man-pages’ }; }; @@ -105,13 +105,13 @@ let in { openssl_1_0_1 = common { - version = "1.0.1s"; - sha256 = "e7e81d82f3cd538ab0cdba494006d44aab9dd96b7f6233ce9971fb7c7916d511"; + version = "1.0.1t"; + sha256 = "4a6ee491a2fdb22e519c76fdc2a628bb3cec12762cd456861d207996c8a07088"; }; openssl_1_0_2 = common { - version = "1.0.2g"; - sha256 = "b784b1b3907ce39abf4098702dade6365522a253ad1552e267a9a0e89594aa33"; + version = "1.0.2h"; + sha256 = "1d4007e53aad94a5b2002fe045ee7bb0b3d98f1a47f8b2bc851dcd1c74332919"; }; } diff --git a/pkgs/development/libraries/ortp/default.nix b/pkgs/development/libraries/ortp/default.nix index 746f10eebed..15bd39a031f 100644 --- a/pkgs/development/libraries/ortp/default.nix +++ b/pkgs/development/libraries/ortp/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "ortp-0.24.2"; + name = "ortp-${version}"; + version = "0.25.0"; src = fetchurl { url = "mirror://savannah/linphone/ortp/sources/${name}.tar.gz"; - sha256 = "05k6ianphr533qnjwxsv7jnh7fb2sq0dj1pdy1bk2w5khmlwfdyb"; + sha256 = "16ldzrn1268dr6kdl8mibg2knd6w75a1v0iqfsgk5zdig5mq5sqd"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/p11-kit/default.nix b/pkgs/development/libraries/p11-kit/default.nix index f2a9bdc1230..e08e7c06815 100644 --- a/pkgs/development/libraries/p11-kit/default.nix +++ b/pkgs/development/libraries/p11-kit/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libiconv, pkgconfig, libffi, libtasn1 }: stdenv.mkDerivation rec { - name = "p11-kit-0.23.1"; + name = "p11-kit-0.23.2"; src = fetchurl { url = "${meta.homepage}releases/${name}.tar.gz"; - sha256 = "1i3a1wdpagm0p3y1bwaz5x5rjhcpqbcrnhkcp10p259vkxk72wz5"; + sha256 = "1w7szm190phlkg7qx05ychlj2dbvkgkhx9gw6dx4d5rw62l6wwms"; }; outputs = [ "dev" "out" "docdev" ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { installFlags = [ "exampledir=\${out}/etc/pkcs11" ]; meta = with stdenv.lib; { - homepage = http://p11-glue.freedesktop.org/; + homepage = https://p11-glue.freedesktop.org/; platforms = platforms.all; maintainers = with maintainers; [ urkud wkennington ]; license = licenses.mit; diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix index 91af6f4dadf..c56eef31961 100644 --- a/pkgs/development/libraries/pcre/default.nix +++ b/pkgs/development/libraries/pcre/default.nix @@ -62,6 +62,5 @@ in stdenv.mkDerivation rec { ''; platforms = platforms.all; - maintainers = [ maintainers.simons ]; }; } diff --git a/pkgs/development/libraries/phonon-backend-gstreamer/qt4/default.nix b/pkgs/development/libraries/phonon-backend-gstreamer/qt4/default.nix deleted file mode 100644 index 2f588cbe708..00000000000 --- a/pkgs/development/libraries/phonon-backend-gstreamer/qt4/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ stdenv, fetchurl, cmake, automoc4, qt4, pkgconfig, phonon, gst_all_1 }: - -let - version = "4.8.2"; - pname = "phonon-backend-gstreamer"; -in - -stdenv.mkDerivation rec { - name = "${pname}-${version}"; - - src = fetchurl { - url = "mirror://kde/stable/phonon/${pname}/${version}/src/${name}.tar.xz"; - sha256 = "1q1ix6zsfnh6gfnpmwp67s376m7g7ahpjl1qp2fqakzb5cgzgq10"; - }; - - buildInputs = with gst_all_1; [ phonon qt4 gstreamer gst-plugins-base ]; - - nativeBuildInputs = [ cmake automoc4 pkgconfig ]; - - NIX_CFLAGS_COMPILE = [ - # This flag should be picked up through pkgconfig, but it isn't. - "-I${gst_all_1.gstreamer}/lib/gstreamer-1.0/include" - ]; - - cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" ]; - - meta = { - homepage = http://phonon.kde.org/; - description = "GStreamer backend for Phonon"; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/phonon-backend-gstreamer/qt5/default.nix b/pkgs/development/libraries/phonon-backend-gstreamer/qt5/default.nix deleted file mode 100644 index 98aa7d81b36..00000000000 --- a/pkgs/development/libraries/phonon-backend-gstreamer/qt5/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ stdenv, fetchurl, cmake, gst_all_1, phonon, pkgconfig, qtbase, debug ? false }: - -with stdenv.lib; - -let - version = "4.8.2"; - pname = "phonon-backend-gstreamer"; -in - -stdenv.mkDerivation rec { - name = "${pname}-${version}"; - - src = fetchurl { - url = "mirror://kde/stable/phonon/${pname}/${version}/src/${name}.tar.xz"; - sha256 = "1q1ix6zsfnh6gfnpmwp67s376m7g7ahpjl1qp2fqakzb5cgzgq10"; - }; - - buildInputs = with gst_all_1; [ gstreamer gst-plugins-base phonon qtbase ]; - - NIX_CFLAGS_COMPILE = [ - # This flag should be picked up through pkgconfig, but it isn't. - "-I${gst_all_1.gstreamer}/lib/gstreamer-1.0/include" - ]; - - nativeBuildInputs = [ cmake pkgconfig ]; - - cmakeFlags = [ - "-DCMAKE_INSTALL_LIBDIR=lib" - "-DPHONON_BUILD_PHONON4QT5=ON" - ] - ++ optional debug "-DCMAKE_BUILD_TYPE=Debug"; - - meta = with stdenv.lib; { - homepage = http://phonon.kde.org/; - description = "GStreamer backend for Phonon"; - platforms = platforms.linux; - maintainers = with maintainers; [ ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/phonon-backend-vlc/qt4/default.nix b/pkgs/development/libraries/phonon-backend-vlc/qt4/default.nix deleted file mode 100644 index 70b6174c635..00000000000 --- a/pkgs/development/libraries/phonon-backend-vlc/qt4/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, fetchurl, xz, vlc, automoc4, cmake, pkgconfig, phonon, qt4}: - -with stdenv.lib; - -let - pname = "phonon-backend-vlc"; - v = "0.8.1"; - # Force same Qt version in phonon and VLC - vlc_ = vlc.override { inherit qt4; }; - phonon_ = phonon.override { inherit qt4; }; -in - -stdenv.mkDerivation { - name = "${pname}-${v}"; - - src = fetchurl { - url = "mirror://kde/stable/phonon/${pname}/${v}/${pname}-${v}.tar.xz"; - sha256 = "1fyfh7qyb6rld350v2fgz452ld96d3z5ifchr323q0vc3hb9k222"; - }; - - nativeBuildInputs = [ cmake pkgconfig automoc4 xz ]; - - buildInputs = [ vlc_ phonon_ qt4 ]; - - meta = { - homepage = http://phonon.kde.org/; - description = "VideoLAN backend for Phonon multimedia framework"; - platforms = platforms.linux; - maintainers = with maintainers; [ ttuegel urkud ]; - license = licenses.lgpl21Plus; - }; -} diff --git a/pkgs/development/libraries/phonon-backend-vlc/qt5/default.nix b/pkgs/development/libraries/phonon-backend-vlc/qt5/default.nix deleted file mode 100644 index 744d681a694..00000000000 --- a/pkgs/development/libraries/phonon-backend-vlc/qt5/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, fetchurl, xz, vlc, cmake, pkgconfig, phonon, qtbase }: - -with stdenv.lib; - -let - pname = "phonon-backend-vlc"; - v = "0.8.2"; -in - -stdenv.mkDerivation { - name = "${pname}-${v}"; - - src = fetchurl { - url = "mirror://kde/stable/phonon/${pname}/${v}/src/${pname}-${v}.tar.xz"; - sha256 = "18ysdga681my75lxxv5h242pa4qappvg5z73wnc0ks9yypnzidys"; - }; - - nativeBuildInputs = [ cmake pkgconfig xz ]; - - buildInputs = [ vlc phonon qtbase ]; - - cmakeFlags = ["-DPHONON_BUILD_PHONON4QT5=ON"]; - - meta = { - homepage = http://phonon.kde.org/; - description = "VideoLAN backend for Phonon multimedia framework"; - platforms = platforms.linux; - maintainers = with maintainers; [ ttuegel urkud ]; - license = licenses.lgpl21Plus; - }; -} diff --git a/pkgs/development/libraries/phonon/backends/gstreamer.nix b/pkgs/development/libraries/phonon/backends/gstreamer.nix new file mode 100644 index 00000000000..3f2ab6696d1 --- /dev/null +++ b/pkgs/development/libraries/phonon/backends/gstreamer.nix @@ -0,0 +1,45 @@ +{ stdenv, lib, fetchurl, cmake, gst_all_1, phonon, pkgconfig +, extra-cmake-modules ? null, qtbase ? null, qtx11extras ? null, qt4 ? null +, debug ? false }: + +with lib; + +let + v = "4.9.0"; + pname = "phonon-backend-gstreamer"; + withQt5 = extra-cmake-modules != null; +in + +assert withQt5 -> qtbase != null; +assert withQt5 -> qtx11extras != null; + +stdenv.mkDerivation rec { + name = "${pname}-${if withQt5 then "qt5" else "qt4"}-${v}"; + + meta = with stdenv.lib; { + homepage = http://phonon.kde.org/; + description = "GStreamer backend for Phonon"; + platforms = platforms.linux; + maintainers = with maintainers; [ ttuegel ]; + }; + + src = fetchurl { + url = "mirror://kde/stable/phonon/${pname}/${v}/${pname}-${v}.tar.xz"; + sha256 = "1wc5p1rqglf0n1avp55s50k7fjdzdrhg0gind15k8796w7nfbhyf"; + }; + + buildInputs = with gst_all_1; + [ gstreamer gst-plugins-base phonon ] + ++ (if withQt5 then [ qtbase qtx11extras ] else [ qt4 ]); + + NIX_CFLAGS_COMPILE = [ + # This flag should be picked up through pkgconfig, but it isn't. + "-I${gst_all_1.gstreamer}/lib/gstreamer-1.0/include" + ]; + + nativeBuildInputs = [ cmake pkgconfig ] ++ optional withQt5 extra-cmake-modules; + + cmakeFlags = + [ "-DCMAKE_BUILD_TYPE=${if debug then "Debug" else "Release"}" ] + ++ optional withQt5 "-DPHONON_BUILD_PHONON4QT5=ON"; +} diff --git a/pkgs/development/libraries/phonon/backends/vlc.nix b/pkgs/development/libraries/phonon/backends/vlc.nix new file mode 100644 index 00000000000..aaff26eee28 --- /dev/null +++ b/pkgs/development/libraries/phonon/backends/vlc.nix @@ -0,0 +1,39 @@ +{ stdenv, lib, fetchurl, cmake, phonon, pkgconfig, vlc +, extra-cmake-modules ? null, qtbase ? null, qtx11extras ? null, qt4 ? null +, debug ? false }: + +with lib; + +let + v = "0.9.0"; + pname = "phonon-backend-vlc"; + withQt5 = extra-cmake-modules != null; +in + +assert withQt5 -> qtbase != null; +assert withQt5 -> qtx11extras != null; + +stdenv.mkDerivation rec { + name = "${pname}-${if withQt5 then "qt5" else "qt4"}-${v}"; + + meta = with stdenv.lib; { + homepage = http://phonon.kde.org/; + description = "GStreamer backend for Phonon"; + platforms = platforms.linux; + }; + + src = fetchurl { + url = "mirror://kde/stable/phonon/${pname}/${v}/${pname}-${v}.tar.xz"; + sha256 = "1gnd1j305mqajw5gxm42vg6ajkvi8611bxgc3qhj5k0saz5dgkn0"; + }; + + buildInputs = + [ phonon vlc ] + ++ (if withQt5 then [ qtbase qtx11extras ] else [ qt4 ]); + + nativeBuildInputs = [ cmake pkgconfig ] ++ optional withQt5 extra-cmake-modules; + + cmakeFlags = + [ "-DCMAKE_BUILD_TYPE=${if debug then "Debug" else "Release"}" ] + ++ optional withQt5 "-DPHONON_BUILD_PHONON4QT5=ON"; +} diff --git a/pkgs/development/libraries/phonon/default.nix b/pkgs/development/libraries/phonon/default.nix index db4c237c989..3fbbccc08e3 100644 --- a/pkgs/development/libraries/phonon/default.nix +++ b/pkgs/development/libraries/phonon/default.nix @@ -1,21 +1,19 @@ -{ stdenv, fetchurl, cmake, mesa, pkgconfig, libpulseaudio -, qt4 ? null, automoc4 ? null -, qtbase ? null, qtquick1 ? null, qttools ? null +{ stdenv, lib, fetchurl, cmake, mesa, pkgconfig, libpulseaudio +, qt4 ? null, extra-cmake-modules ? null, qtbase ? null, qttools ? null , debug ? false }: -with stdenv.lib; +with lib; let - v = "4.8.3"; - withQt5 = qtbase != null; + v = "4.9.0"; + withQt5 = extra-cmake-modules != null; in -assert withQt5 -> qtquick1 != null; +assert withQt5 -> qtbase != null; assert withQt5 -> qttools != null; -assert !withQt5 -> automoc4 != null; stdenv.mkDerivation rec { - name = "phonon-${v}"; + name = "phonon-${if withQt5 then "qt5" else "qt4"}-${v}"; meta = { homepage = http://phonon.kde.org/; @@ -26,17 +24,15 @@ stdenv.mkDerivation rec { }; src = fetchurl { - url = "mirror://kde/stable/phonon/${v}/src/phonon-${v}.tar.xz"; - sha256 = "05nshngk03ln90vsjz44dx8al576f4vd5fvhs1l0jmx13jb9q551"; + url = "mirror://kde/stable/phonon/${v}/phonon-${v}.tar.xz"; + sha256 = "1q5hvsk4sfcb91625wcmldy7kgjmfpmpmkgzi6mxkqdd307v8x5v"; }; buildInputs = [ mesa libpulseaudio ] - ++ (if withQt5 then [ qtbase qtquick1 qttools ] else [ qt4 ]); + ++ (if withQt5 then [ qtbase qttools ] else [ qt4 ]); - nativeBuildInputs = - [ cmake pkgconfig ] - ++ optional (!withQt5) automoc4; + nativeBuildInputs = [ cmake pkgconfig ] ++ optional withQt5 extra-cmake-modules; NIX_CFLAGS_COMPILE = "-fPIC"; diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index ebcdcc2b3ef..51b5ac5981e 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -5,8 +5,8 @@ }: let # beware: updates often break cups_filters build - version = "0.36.0"; # even major numbers are stable - sha256 = "13i440kv873wgmw50rs4d1v05cj0r7bqnghd70hp9vy44dxhdk4k"; + version = "0.43.0"; # even major numbers are stable + sha256 = "0mi4zf0pz3x3fx3ir7szz1n57nywgbpd4mp2r7mvf47f4rmf4867"; in stdenv.mkDerivation rec { name = "poppler-${suffix}-${version}"; @@ -22,24 +22,35 @@ stdenv.mkDerivation rec { # TODO: reduce propagation to necessary libs propagatedBuildInputs = with lib; - [ zlib freetype fontconfig libjpeg lcms curl openjpeg ] - ++ optional (!minimal) cairo + [ zlib freetype fontconfig libjpeg ] + ++ optionals (!minimal) [ cairo lcms curl openjpeg ] ++ optional qt4Support qt4 ++ optional qt5Support qtbase; nativeBuildInputs = [ pkgconfig libiconv ] ++ libintlOrEmpty; + NIX_CFLAGS_COMPILE = [ "-DQT_NO_DEBUG" ]; + configureFlags = with lib; [ "--enable-xpdf-headers" "--enable-libcurl" "--enable-zlib" + "--enable-build-type=release" + ] + ++ optionals minimal [ + "--disable-poppler-glib" "--disable-poppler-cpp" + "--disable-libopenjpeg" "--disable-libcurl" ] - ++ optionals minimal [ "--disable-poppler-glib" "--disable-poppler-cpp" ] - ++ optional (!utils) "--disable-utils"; + ++ optional (!utils) "--disable-utils" ; enableParallelBuilding = true; + crossAttrs.postPatch = + # there are tests using `strXXX_s` functions that are missing apparently + stdenv.lib.optionalString (stdenv.cross.libc or null == "msvcrt") + "sed '/^SUBDIRS =/s/ test / /' -i Makefile.in"; + meta = with lib; { homepage = http://poppler.freedesktop.org/; description = "A PDF rendering library"; diff --git a/pkgs/development/libraries/postgis/default.nix b/pkgs/development/libraries/postgis/default.nix index 5f41eb61c29..f3e2312f484 100644 --- a/pkgs/development/libraries/postgis/default.nix +++ b/pkgs/development/libraries/postgis/default.nix @@ -89,6 +89,10 @@ in rec { sha256 = "02gsi1cm63kf0r7881444lrkzdjqhhpz9a5zav3al0q24nq01r8g"; sql_srcs = ["postgis.sql" "spatial_ref_sys.sql"]; builtInputs = [gdal json_c pkgconfig]; + + # postgis config directory assumes /include /lib from the same root for json-c library + NIX_LDFLAGS = "-L${stdenv.lib.getLib json_c}/lib"; + dontDisableStatic = true; preConfigure = '' sed -i 's@/usr/bin/file@${file}/bin/file@' configure diff --git a/pkgs/development/libraries/qt-5/5.4/fix-qt-module-cmake-config.sh b/pkgs/development/libraries/qt-5/5.4/fix-qt-module-cmake-config.sh deleted file mode 100644 index 7ca3e33b613..00000000000 --- a/pkgs/development/libraries/qt-5/5.4/fix-qt-module-cmake-config.sh +++ /dev/null @@ -1,5 +0,0 @@ -fixQtModuleCMakeConfig() { - local module="$1" - sed -e "/set(imported_location/ s@\\\${_qt5${module}_install_prefix}@${!outputLib}@" \ - -i "${!outputDev}/lib/cmake/Qt5${module}/Qt5${module}Config.cmake" -} diff --git a/pkgs/development/libraries/qt-5/5.4/make-qt-wrapper.sh b/pkgs/development/libraries/qt-5/5.4/make-qt-wrapper.sh deleted file mode 100644 index d61665455bf..00000000000 --- a/pkgs/development/libraries/qt-5/5.4/make-qt-wrapper.sh +++ /dev/null @@ -1,42 +0,0 @@ -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.4/qtbase/nix-profiles-library-paths.patch b/pkgs/development/libraries/qt-5/5.4/qtbase/nix-profiles-library-paths.patch deleted file mode 100644 index 824d2ea0817..00000000000 --- a/pkgs/development/libraries/qt-5/5.4/qtbase/nix-profiles-library-paths.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: qt-everywhere-opensource-src-5.4.2/qtbase/src/corelib/kernel/qcoreapplication.cpp -=================================================================== ---- qt-everywhere-opensource-src-5.4.2.orig/qtbase/src/corelib/kernel/qcoreapplication.cpp -+++ qt-everywhere-opensource-src-5.4.2/qtbase/src/corelib/kernel/qcoreapplication.cpp -@@ -2442,6 +2442,21 @@ QStringList QCoreApplication::libraryPat - } - } - } -+ -+ // 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); - } diff --git a/pkgs/development/libraries/qt-5/5.4/qtdeclarative/0001-nix-profiles-import-paths.patch b/pkgs/development/libraries/qt-5/5.4/qtdeclarative/0001-nix-profiles-import-paths.patch deleted file mode 100644 index 8e86f97a947..00000000000 --- a/pkgs/development/libraries/qt-5/5.4/qtdeclarative/0001-nix-profiles-import-paths.patch +++ /dev/null @@ -1,37 +0,0 @@ -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.4/qtdeclarative/default.nix b/pkgs/development/libraries/qt-5/5.4/qtdeclarative/default.nix deleted file mode 100644 index e2219642a12..00000000000 --- a/pkgs/development/libraries/qt-5/5.4/qtdeclarative/default.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ qtSubmodule, python, qtbase, qtsvg, qtxmlpatterns }: - -qtSubmodule { - name = "qtdeclarative"; - patches = [ ./0001-nix-profiles-import-paths.patch ]; - qtInputs = [ qtbase qtsvg qtxmlpatterns ]; - nativeBuildInputs = [ python ]; - postFixup = '' - fixQtModuleCMakeConfig "Qml" - fixQtModuleCMakeConfig "Quick" - fixQtModuleCMakeConfig "QuickTest" - fixQtModuleCMakeConfig "QuickWidgets" - ''; -} diff --git a/pkgs/development/libraries/qt-5/5.4/qtquick1/0001-nix-profiles-import-paths.patch b/pkgs/development/libraries/qt-5/5.4/qtquick1/0001-nix-profiles-import-paths.patch deleted file mode 100644 index 63b141f6ce5..00000000000 --- a/pkgs/development/libraries/qt-5/5.4/qtquick1/0001-nix-profiles-import-paths.patch +++ /dev/null @@ -1,37 +0,0 @@ -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.4/qtquick1/default.nix b/pkgs/development/libraries/qt-5/5.4/qtquick1/default.nix deleted file mode 100644 index d81abbcd614..00000000000 --- a/pkgs/development/libraries/qt-5/5.4/qtquick1/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ qtSubmodule, qtscript, qtsvg, qtwebkit, qtxmlpatterns }: - -qtSubmodule { - name = "qtquick1"; - patches = [ ./0001-nix-profiles-import-paths.patch ]; - qtInputs = [ qtscript qtsvg qtwebkit qtxmlpatterns ]; - postFixup = '' - fixQtModuleCMakeConfig "Declarative" - ''; -} diff --git a/pkgs/development/libraries/qt-5/5.4/qttools.nix b/pkgs/development/libraries/qt-5/5.4/qttools.nix deleted file mode 100644 index 16887c4265a..00000000000 --- a/pkgs/development/libraries/qt-5/5.4/qttools.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ qtSubmodule, qtbase }: - -qtSubmodule { - name = "qttools"; - qtInputs = [ qtbase ]; - postFixup = '' - moveToOutput "bin/qdbus" "$out" - moveToOutput "bin/qtpaths" "$out" - - fixQtModuleCMakeConfig "Designer" - fixQtModuleCMakeConfig "Help" - fixQtModuleCMakeConfig "LinguistTools" - fixQtModuleCMakeConfig "UiTools" - ''; -} diff --git a/pkgs/development/libraries/qt-5/5.4/qtwebkit-examples.nix b/pkgs/development/libraries/qt-5/5.4/qtwebkit-examples.nix deleted file mode 100644 index 64f85c42d19..00000000000 --- a/pkgs/development/libraries/qt-5/5.4/qtwebkit-examples.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ qtSubmodule, qttools, qtwebkit }: - -qtSubmodule { - name = "qtwebkit-examples"; - qtInputs = [ qttools qtwebkit ]; -} diff --git a/pkgs/development/libraries/qt-5/5.4/qtwebkit/0001-dlopen-webkit-nsplugin.patch b/pkgs/development/libraries/qt-5/5.4/qtwebkit/0001-dlopen-webkit-nsplugin.patch deleted file mode 100644 index 0eeacce1bc0..00000000000 --- a/pkgs/development/libraries/qt-5/5.4/qtwebkit/0001-dlopen-webkit-nsplugin.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 862ce7d357a3ec32683ac6ec7c0ebdc9346b44ba Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel <ttuegel@gmail.com> -Date: Sun, 23 Aug 2015 09:18:54 -0500 -Subject: [PATCH 1/3] dlopen webkit nsplugin - ---- - Source/WebCore/plugins/qt/PluginPackageQt.cpp | 2 +- - Source/WebCore/plugins/qt/PluginViewQt.cpp | 2 +- - Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/Source/WebCore/plugins/qt/PluginPackageQt.cpp b/Source/WebCore/plugins/qt/PluginPackageQt.cpp -index a923d49..2731d05 100644 ---- a/Source/WebCore/plugins/qt/PluginPackageQt.cpp -+++ b/Source/WebCore/plugins/qt/PluginPackageQt.cpp -@@ -136,7 +136,7 @@ static void initializeGtk(QLibrary* module = 0) - } - } - -- QLibrary library(QLatin1String("libgtk-x11-2.0"), 0); -+ QLibrary library(QLatin1String("@gtk@/lib/libgtk-x11-2.0"), 0); - if (library.load()) { - typedef void *(*gtk_init_check_ptr)(int*, char***); - gtk_init_check_ptr gtkInitCheck = (gtk_init_check_ptr)library.resolve("gtk_init_check"); -diff --git a/Source/WebCore/plugins/qt/PluginViewQt.cpp b/Source/WebCore/plugins/qt/PluginViewQt.cpp -index de06a2f..363bde5 100644 ---- a/Source/WebCore/plugins/qt/PluginViewQt.cpp -+++ b/Source/WebCore/plugins/qt/PluginViewQt.cpp -@@ -697,7 +697,7 @@ static Display *getPluginDisplay() - // support gdk based plugins (like flash) that use a different X connection. - // The code below has the same effect as this one: - // Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default()); -- QLibrary library(QLatin1String("libgdk-x11-2.0"), 0); -+ QLibrary library(QLatin1String("@gdk_pixbuf@/lib/libgdk-x11-2.0"), 0); - if (!library.load()) - return 0; - -diff --git a/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp b/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp -index d734ff6..62a2197 100644 ---- a/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp -+++ b/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp -@@ -64,7 +64,7 @@ static Display* getPluginDisplay() - // The code below has the same effect as this one: - // Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default()); - -- QLibrary library(QLatin1String("libgdk-x11-2.0"), 0); -+ QLibrary library(QLatin1String("@gdk_pixbuf@/libgdk-x11-2.0"), 0); - if (!library.load()) - return 0; - --- -2.5.0 - diff --git a/pkgs/development/libraries/qt-5/5.4/qtwebkit/0002-dlopen-webkit-gtk.patch b/pkgs/development/libraries/qt-5/5.4/qtwebkit/0002-dlopen-webkit-gtk.patch deleted file mode 100644 index bb5d1f74364..00000000000 --- a/pkgs/development/libraries/qt-5/5.4/qtwebkit/0002-dlopen-webkit-gtk.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 6a407d30357c2551abceac75c82f4a1688e47437 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel <ttuegel@gmail.com> -Date: Sun, 23 Aug 2015 09:19:16 -0500 -Subject: [PATCH 2/3] dlopen webkit gtk - ---- - Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp b/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp -index 8de6521..0b25748 100644 ---- a/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp -+++ b/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp -@@ -53,7 +53,7 @@ static void messageHandler(QtMsgType type, const QMessageLogContext&, const QStr - - static bool initializeGtk() - { -- QLibrary gtkLibrary(QLatin1String("libgtk-x11-2.0"), 0); -+ QLibrary gtkLibrary(QLatin1String("@gtk@/lib/libgtk-x11-2.0"), 0); - if (!gtkLibrary.load()) - return false; - typedef void* (*gtk_init_ptr)(void*, void*); --- -2.5.0 - diff --git a/pkgs/development/libraries/qt-5/5.4/qtwebkit/0003-dlopen-webkit-udev.patch b/pkgs/development/libraries/qt-5/5.4/qtwebkit/0003-dlopen-webkit-udev.patch deleted file mode 100644 index 1c360cd81aa..00000000000 --- a/pkgs/development/libraries/qt-5/5.4/qtwebkit/0003-dlopen-webkit-udev.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 864020dd47c3b6d532d9f26b82185904cf9324f2 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel <ttuegel@gmail.com> -Date: Sun, 23 Aug 2015 09:19:29 -0500 -Subject: [PATCH 3/3] dlopen webkit udev - ---- - Source/WebCore/platform/qt/GamepadsQt.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Source/WebCore/platform/qt/GamepadsQt.cpp b/Source/WebCore/platform/qt/GamepadsQt.cpp -index 60ff317..da8ac69 100644 ---- a/Source/WebCore/platform/qt/GamepadsQt.cpp -+++ b/Source/WebCore/platform/qt/GamepadsQt.cpp -@@ -111,12 +111,12 @@ private: - bool load() - { - m_libUdev.setLoadHints(QLibrary::ResolveAllSymbolsHint); -- m_libUdev.setFileNameAndVersion(QStringLiteral("udev"), 1); -+ m_libUdev.setFileNameAndVersion(QStringLiteral("@libudev@/lib/libudev"), 1); - m_loaded = m_libUdev.load(); - if (resolveMethods()) - return true; - -- m_libUdev.setFileNameAndVersion(QStringLiteral("udev"), 0); -+ m_libUdev.setFileNameAndVersion(QStringLiteral("@libudev@/lib/libudev"), 0); - m_loaded = m_libUdev.load(); - return resolveMethods(); - } --- -2.5.0 - diff --git a/pkgs/development/libraries/qt-5/5.4/qtwebkit/default.nix b/pkgs/development/libraries/qt-5/5.4/qtwebkit/default.nix deleted file mode 100644 index 7ed3017b95a..00000000000 --- a/pkgs/development/libraries/qt-5/5.4/qtwebkit/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ qtSubmodule, stdenv, qtdeclarative, qtlocation, qtmultimedia, qtsensors -, fontconfig, gdk_pixbuf, gtk, libwebp, libxml2, libxslt -, sqlite, libudev -, bison2, flex, gdb, gperf, perl, pkgconfig, python, ruby -, substituteAll -, flashplayerFix ? false -}: - -with stdenv.lib; - -qtSubmodule { - name = "qtwebkit"; - qtInputs = [ qtdeclarative qtlocation qtmultimedia qtsensors ]; - buildInputs = [ fontconfig libwebp libxml2 libxslt sqlite ]; - nativeBuildInputs = [ - bison2 flex gdb gperf perl pkgconfig python ruby - ]; - patches = - let dlopen-webkit-nsplugin = substituteAll { - src = ./0001-dlopen-webkit-nsplugin.patch; - gtk = gtk.out; - gdk_pixbuf = gdk_pixbuf.out; - }; - dlopen-webkit-gtk = substituteAll { - src = ./0002-dlopen-webkit-gtk.patch; - gtk = gtk.out; - }; - dlopen-webkit-udev = substituteAll { - src = ./0003-dlopen-webkit-udev.patch; - udev = libudev.out; - }; - in optionals flashplayerFix [ dlopen-webkit-nsplugin dlopen-webkit-gtk ] - ++ [ dlopen-webkit-udev ]; - postFixup = '' - fixQtModuleCMakeConfig "WebKit" - fixQtModuleCMakeConfig "WebKitWidgets" - ''; -} diff --git a/pkgs/development/libraries/qt-5/5.4/srcs.nix b/pkgs/development/libraries/qt-5/5.4/srcs.nix deleted file mode 100644 index dd873f5961b..00000000000 --- a/pkgs/development/libraries/qt-5/5.4/srcs.nix +++ /dev/null @@ -1,245 +0,0 @@ -# DO NOT EDIT! This file is generated automatically by manifest.sh -{ fetchurl, mirror }: - -{ - qtbase = { - version = "5.4.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtbase-opensource-src-5.4.2.tar.xz"; - sha256 = "0x2szpjjvsrpcqw0dd3gsim7b1jv9p716pnllzjbia5mp0hggi4z"; - name = "qtbase-opensource-src-5.4.2.tar.xz"; - }; - }; - qtenginio = { - version = "5.4.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtenginio-opensource-src-5.4.2.tar.xz"; - sha256 = "082i3fapjw6xs0jkz7x529dn3pb6w1pfli3cjrgvggff86gwlgwn"; - name = "qtenginio-opensource-src-5.4.2.tar.xz"; - }; - }; - qtserialport = { - version = "5.4.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtserialport-opensource-src-5.4.2.tar.xz"; - sha256 = "1h6p5rb0ldxgzd4md3n79gy0j9blhj736670xqjd9vlvh1743kck"; - name = "qtserialport-opensource-src-5.4.2.tar.xz"; - }; - }; - qtscript = { - version = "5.4.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtscript-opensource-src-5.4.2.tar.xz"; - sha256 = "0izsmy0cr8iii78r10ndkidyljxqd2k9g03f5xb9nxacvr2f8hp0"; - name = "qtscript-opensource-src-5.4.2.tar.xz"; - }; - }; - qtwebchannel = { - version = "5.4.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtwebchannel-opensource-src-5.4.2.tar.xz"; - sha256 = "0vy1zjbghfa1wirxd8fd2n2n8yryykzr09913qm2nlfbcxdsgqsn"; - name = "qtwebchannel-opensource-src-5.4.2.tar.xz"; - }; - }; - qtwinextras = { - version = "5.4.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtwinextras-opensource-src-5.4.2.tar.xz"; - sha256 = "0sgybvr1y2xsddlqc95ninxj3rfmd4gv7a8f7rqcxdynjan5gij0"; - name = "qtwinextras-opensource-src-5.4.2.tar.xz"; - }; - }; - qtwebsockets = { - version = "5.4.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtwebsockets-opensource-src-5.4.2.tar.xz"; - sha256 = "0lv1la8333qnirxmscs42xnnra0xry1gjbhi3bxrf1hrfs2im9j4"; - name = "qtwebsockets-opensource-src-5.4.2.tar.xz"; - }; - }; - qtmultimedia = { - version = "5.4.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtmultimedia-opensource-src-5.4.2.tar.xz"; - sha256 = "0h29cs8ajnjarhjx1aczdnxqwvg6pqs9s8w28hw488s149wqqrnj"; - name = "qtmultimedia-opensource-src-5.4.2.tar.xz"; - }; - }; - qtgraphicaleffects = { - version = "5.4.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtgraphicaleffects-opensource-src-5.4.2.tar.xz"; - sha256 = "02p8xm5ajicjam30ry3g1lm2p4nja2q0sls8dzimqrxhw5xlg3xs"; - name = "qtgraphicaleffects-opensource-src-5.4.2.tar.xz"; - }; - }; - qtxmlpatterns = { - version = "5.4.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtxmlpatterns-opensource-src-5.4.2.tar.xz"; - sha256 = "0ar7znqp1i02ha5ngy2kzk3hlgkafjbn2xa8j2k78gzmwsmdhzxa"; - name = "qtxmlpatterns-opensource-src-5.4.2.tar.xz"; - }; - }; - qttranslations = { - version = "5.4.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qttranslations-opensource-src-5.4.2.tar.xz"; - sha256 = "0b4l69c16z8gjd4mq75zz3lj2gxarr9wyk0vk60jg1mi62vxvdls"; - name = "qttranslations-opensource-src-5.4.2.tar.xz"; - }; - }; - qtdeclarative = { - version = "5.4.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtdeclarative-opensource-src-5.4.2.tar.xz"; - sha256 = "1bj1wwms6lpj8s70y8by3j0hjsw6g9v8m6fybx68krzzizbj2c5p"; - name = "qtdeclarative-opensource-src-5.4.2.tar.xz"; - }; - }; - qtwebkit = { - version = "5.4.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtwebkit-opensource-src-5.4.2.tar.xz"; - sha256 = "0vffbpiczag2n2hp5gc0nii8n7vkidr8f8pp8a47px0183hl6hiy"; - name = "qtwebkit-opensource-src-5.4.2.tar.xz"; - }; - }; - qtquick1 = { - version = "5.4.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtquick1-opensource-src-5.4.2.tar.xz"; - sha256 = "0178z15a31fw3l6933fwxs7sk0csifpwckydp3rqnn3fg5f2fwvp"; - name = "qtquick1-opensource-src-5.4.2.tar.xz"; - }; - }; - qtquickcontrols = { - version = "5.4.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtquickcontrols-opensource-src-5.4.2.tar.xz"; - sha256 = "137z3c3drxlvkdfc7zgcl0xqmavw0ladzqy0i3bq51h756qdc877"; - name = "qtquickcontrols-opensource-src-5.4.2.tar.xz"; - }; - }; - qtimageformats = { - version = "5.4.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtimageformats-opensource-src-5.4.2.tar.xz"; - sha256 = "1nny6j9pm5ri3n1vwl5lrfrdz0fl81rx127wa49rkg2rjai2aawb"; - name = "qtimageformats-opensource-src-5.4.2.tar.xz"; - }; - }; - qtdoc = { - version = "5.4.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtdoc-opensource-src-5.4.2.tar.xz"; - sha256 = "15lamv6jvd7v33ldpcrazcdksv6qibdcgh4ncbyh774k8avgrlh8"; - name = "qtdoc-opensource-src-5.4.2.tar.xz"; - }; - }; - qtwayland = { - version = "5.4.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtwayland-opensource-src-5.4.2.tar.xz"; - sha256 = "14pmpkfq70plw07igxjaiji4vnjg5kg7izlb0wwym1lisg7bwkg0"; - name = "qtwayland-opensource-src-5.4.2.tar.xz"; - }; - }; - qtmacextras = { - version = "5.4.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtmacextras-opensource-src-5.4.2.tar.xz"; - sha256 = "0h0p3s0rvd3g9rgr4hwcggdbsav2g30vijqwmdxgxd8c00yply80"; - name = "qtmacextras-opensource-src-5.4.2.tar.xz"; - }; - }; - qtactiveqt = { - version = "5.4.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtactiveqt-opensource-src-5.4.2.tar.xz"; - sha256 = "014kwficqydciwdm1yw88yms81qm8pmi6xfhhfpbc9k85pc6jlla"; - name = "qtactiveqt-opensource-src-5.4.2.tar.xz"; - }; - }; - qtlocation = { - version = "5.4.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtlocation-opensource-src-5.4.2.tar.xz"; - sha256 = "1v43hl2zzi90vaw11y8dvsksrjn0r2v0br7pw6njl8lqadpg4jnw"; - name = "qtlocation-opensource-src-5.4.2.tar.xz"; - }; - }; - qtconnectivity = { - version = "5.4.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtconnectivity-opensource-src-5.4.2.tar.xz"; - sha256 = "1nj68bzgm3r1gg171kj0acnifzb3jx0m5pf4f81xb7zl4hfxasrs"; - name = "qtconnectivity-opensource-src-5.4.2.tar.xz"; - }; - }; - qtx11extras = { - version = "5.4.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtx11extras-opensource-src-5.4.2.tar.xz"; - sha256 = "0jgyywjxavfpiz8202g3s0g9izfl185mmak4fs9h80w1i3gn5zzn"; - name = "qtx11extras-opensource-src-5.4.2.tar.xz"; - }; - }; - qttools = { - version = "5.4.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qttools-opensource-src-5.4.2.tar.xz"; - sha256 = "1d5nx01r7wxhdg9f1i9xhsvsbwgaz3yv516s068riy970bhdgwzd"; - name = "qttools-opensource-src-5.4.2.tar.xz"; - }; - }; - qtsensors = { - version = "5.4.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtsensors-opensource-src-5.4.2.tar.xz"; - sha256 = "1yawvjbdymgw8af7ir9zcin89xxck9dm2l6hnc43lwrky0frcvcf"; - name = "qtsensors-opensource-src-5.4.2.tar.xz"; - }; - }; - qtwebengine = { - version = "5.4.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtwebengine-opensource-src-5.4.2.tar.xz"; - sha256 = "06cyl733prakniqrn8sd807lclk5im2vmysjdcijry2mcyah2ih8"; - name = "qtwebengine-opensource-src-5.4.2.tar.xz"; - }; - }; - qtsvg = { - version = "5.4.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtsvg-opensource-src-5.4.2.tar.xz"; - sha256 = "1dsyncp154xvb7d82nmnfjm0ngymnhqmliq58ljwxsjmpjlncakz"; - name = "qtsvg-opensource-src-5.4.2.tar.xz"; - }; - }; - qt5 = { - version = "5.4.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qt5-opensource-src-5.4.2.tar.xz"; - sha256 = "17a0pybr4bpyv9pj7cr5hl4g31biv89bjr8zql723h0b12ql1w44"; - name = "qt5-opensource-src-5.4.2.tar.xz"; - }; - }; - qtwebkit-examples = { - version = "5.4.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtwebkit-examples-opensource-src-5.4.2.tar.xz"; - sha256 = "0pm9ik1j09jfb5xflc16449nff2xsfyfms7vxlcdjg4dhcqfmll8"; - name = "qtwebkit-examples-opensource-src-5.4.2.tar.xz"; - }; - }; - qtandroidextras = { - version = "5.4.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtandroidextras-opensource-src-5.4.2.tar.xz"; - sha256 = "0krfm0wg26x7575p8isswdhrkb0jxyp169grwklil7mfw8yg3xhx"; - name = "qtandroidextras-opensource-src-5.4.2.tar.xz"; - }; - }; -} diff --git a/pkgs/development/libraries/qt-5/5.5/default.nix b/pkgs/development/libraries/qt-5/5.5/default.nix index 034e25662ea..9cfc052e730 100644 --- a/pkgs/development/libraries/qt-5/5.5/default.nix +++ b/pkgs/development/libraries/qt-5/5.5/default.nix @@ -45,7 +45,6 @@ let nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ self.fixQtModuleCMakeConfig self.qmakeHook ]; NIX_QT_SUBMODULE = args.NIX_QT_SUBMODULE or true; - dontFixLibtool = args.dontFixLibtool or true; outputs = args.outputs or [ "dev" "out" ]; setOutputFlags = args.setOutputFlags or false; diff --git a/pkgs/development/libraries/qt-5/5.5/qmake-hook.sh b/pkgs/development/libraries/qt-5/5.5/qmake-hook.sh index f059c19e03b..2669a396280 100644 --- a/pkgs/development/libraries/qt-5/5.5/qmake-hook.sh +++ b/pkgs/development/libraries/qt-5/5.5/qmake-hook.sh @@ -53,6 +53,19 @@ _qtMultioutModuleDevs() { # The destination directory must exist or moveToOutput will do nothing mkdir -p "${!outputDev}/share" moveToOutput "share/doc" "${!outputDev}" + + # Move libtool archives and qmake project files to $dev/lib + if [ "z${!outputLib}" != "z${!outputDev}" ]; then + pushd "${!outputLib}" + if [ -d "lib" ]; then + find lib \( -name '*.a' -o -name '*.la' -o -name '*.prl' -print0 \) | \ + while read -r -d $'\0' file; do + mkdir -p "${!outputDev}/$(dirname "$file")" + mv "${!outputLib}/$file" "${!outputDev}/$file" + done + fi + popd + fi } qmakeConfigurePhase() { 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 7d68116d716..2cd129acab1 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix +++ b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix @@ -8,7 +8,7 @@ , zlib, libjpeg, libpng, libtiff, sqlite, icu , coreutils, bison, flex, gdb, gperf, lndir, ruby -, python, perl, pkgconfig +, patchelf, perl, pkgconfig, python # optional dependencies , cups ? null @@ -19,7 +19,7 @@ , buildExamples ? false , buildTests ? false , developerBuild ? false -, gtkStyle ? false, libgnomeui, GConf, gnome_vfs, gtk +, gtkStyle ? true, libgnomeui, GConf, gnome_vfs, gtk , decryptSslTraffic ? false }: @@ -27,6 +27,9 @@ let inherit (srcs.qt5) version; system-x86_64 = lib.elem stdenv.system lib.platforms.x86_64; + # Search path for Gtk plugin + gtkLibPath = lib.makeLibraryPath [ gtk.out gnome_vfs.out libgnomeui.out GConf.out ]; + dontInvalidateBacking = fetchurl { url = "https://codereview.qt-project.org/gitweb?p=qt/qtbase.git;a=patch;h=0f68f8920573cdce1729a285a92ac8582df32841;hp=24c50f8dcf7fa61ac3c3d4d6295c259a104a2b8c"; name = "qtbug-48321-dont-invalidate-backing-store.patch"; @@ -43,7 +46,7 @@ stdenv.mkDerivation { sourceRoot = "qt-everywhere-opensource-src-${version}"; - outputs = [ "dev" "out" ]; + outputs = [ "dev" "out" "gtk" ]; postUnpack = '' mv qtbase-opensource-src-${version} ./qt-everywhere-opensource-src-${version}/qtbase @@ -51,7 +54,6 @@ stdenv.mkDerivation { patches = copyPathsToStore (lib.readPathsFromFile ./. ./series) - ++ lib.optional gtkStyle ./dlopen-gtkstyle.patch ++ lib.optional decryptSslTraffic ./decrypt-ssl-traffic.patch ++ lib.optional mesaSupported [ ./dlopen-gl.patch ./mkspecs-libgl.patch ]; @@ -89,14 +91,6 @@ stdenv.mkDerivation { qtbase/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp \ --replace "@libX11@" "${libX11.out}" '' - + lib.optionalString gtkStyle '' - substituteInPlace qtbase/src/widgets/styles/qgtk2painter.cpp --replace "@gtk@" "${gtk.out}" - substituteInPlace qtbase/src/widgets/styles/qgtkstyle_p.cpp \ - --replace "@gtk@" "${gtk.out}" \ - --replace "@gnome_vfs@" "${gnome_vfs.out}" \ - --replace "@libgnomeui@" "${libgnomeui.out}" \ - --replace "@gconf@" "${GConf.out}" - '' + lib.optionalString mesaSupported '' substituteInPlace \ qtbase/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp \ @@ -106,24 +100,12 @@ stdenv.mkDerivation { --replace "@mesa_inc@" "${mesa.dev}" ''; + setOutputFlags = false; preConfigure = '' export LD_LIBRARY_PATH="$PWD/qtbase/lib:$PWD/qtbase/plugins/platforms:$LD_LIBRARY_PATH" export MAKEFLAGS=-j$NIX_BUILD_CORES - _multioutQtDevs() { - # We cannot simply set these paths in configureFlags because libQtCore retains - # references to the paths it was built with. - moveToOutput "bin" "$dev" - moveToOutput "include" "$dev" - moveToOutput "mkspecs" "$dev" - - # The destination directory must exist or moveToOutput will do nothing - mkdir -p "$dev/share" - moveToOutput "share/doc" "$dev" - } - preFixupHooks+=(_multioutQtDevs) - configureFlags+="\ -plugindir $out/lib/qt5/plugins \ -importdir $out/lib/qt5/imports \ @@ -230,11 +212,50 @@ stdenv.mkDerivation { ++ lib.optional (postgresql != null) postgresql ++ lib.optionals gtkStyle [gnome_vfs.out libgnomeui.out gtk GConf]; - nativeBuildInputs = [ fixQtModuleCMakeConfig lndir python perl pkgconfig ]; + nativeBuildInputs = [ fixQtModuleCMakeConfig lndir patchelf perl pkgconfig python ]; # freetype-2.5.4 changed signedness of some struct fields NIX_CFLAGS_COMPILE = "-Wno-error=sign-compare"; + preFixup = '' + # We cannot simply set these paths in configureFlags because libQtCore retains + # references to the paths it was built with. + moveToOutput "bin" "$dev" + moveToOutput "include" "$dev" + moveToOutput "mkspecs" "$dev" + + # The destination directory must exist or moveToOutput will do nothing + mkdir -p "$dev/share" + moveToOutput "share/doc" "$dev" + + # Move libtool archives and qmake projects + if [ "z''${!outputLib}" != "z''${!outputDev}" ]; then + pushd "''${!outputLib}" + find lib -name '*.a' -o -name '*.la' -o -name '*.prl' | \ + while read -r file; do + mkdir -p "''${!outputDev}/$(dirname "$file")" + mv "''${!outputLib}/$file" "''${!outputDev}/$file" + done + popd + fi + + # Move the QGtkStyle plugin to the gtk output + mkdir -p "$gtk/lib/qt5/plugins/platformthemes" + mv "$out/lib/qt5/plugins/platformthemes/libqgtk2.so" "$gtk/lib/qt5/plugins/platformthemes" + rm "$out/lib/cmake/Qt5Gui/Qt5Gui_QGtk2ThemePlugin.cmake" + + # Set RPATH for QGtkStyle plugin + qgtk2="$gtk/lib/qt5/plugins/platformthemes/libqgtk2.so" + qgtk2_RPATH="$(patchelf --print-rpath "$qgtk2")" + qgtk2_RPATH="$qgtk2_RPATH''${qgtk2_RPATH:+:}${gtkLibPath}" + patchelf "$qgtk2" \ + --add-needed libgtk-x11-2.0.so \ + --add-needed libgnomeui-2.so \ + --add-needed libgnomevfs-2.so \ + --add-needed libgconf-2.so \ + --set-rpath "$qgtk2_RPATH" + ''; + postFixup = '' # Don't retain build-time dependencies like gdb and ruby. diff --git a/pkgs/development/libraries/qt-5/5.4/default.nix b/pkgs/development/libraries/qt-5/5.6/default.nix index 950129ba541..4aada4224da 100644 --- a/pkgs/development/libraries/qt-5/5.4/default.nix +++ b/pkgs/development/libraries/qt-5/5.6/default.nix @@ -1,15 +1,20 @@ -# Maintainer's Notes: -# -# Minor updates: -# 1. Edit ./fetchsrcs.sh to point to the updated URL. -# 2. Run ./fetchsrcs.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. Be sure to check if -# any new components have been added and package them as necessary. +/* + +# Minor Updates + +1. Edit ./fetchsrcs.sh to point to the updated URL. +2. Run ./fetchsrcs.sh. +3. Build and enjoy. + +# Major Updates + +1. Make a copy of this directory. (We like to keep the old version around + for a short time after major updates.) +2. Delete the tmp/ subdirectory of the copy. +3. Follow the minor update instructions above. +4. Package any new Qt modules, if necessary. + +*/ { pkgs @@ -30,20 +35,22 @@ let qtSubmodule = args: let inherit (args) name; - inherit (srcs."${args.name}") version src; + version = args.version or srcs."${name}".version; + src = args.src or srcs."${name}".src; inherit (pkgs.stdenv) mkDerivation; in mkDerivation (args // { name = "${name}-${version}"; inherit src; propagatedBuildInputs = args.qtInputs ++ (args.propagatedBuildInputs or []); - nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ self.fixQtModuleCMakeConfig self.qmakeHook ]; + nativeBuildInputs = + (args.nativeBuildInputs or []) + ++ [ pkgs.perl self.qmakeHook ]; NIX_QT_SUBMODULE = args.NIX_QT_SUBMODULE or true; - dontFixLibtool = args.dontFixLibtool or true; outputs = args.outputs or [ "dev" "out" ]; - setOutputFlags = false; + setOutputFlags = args.setOutputFlags or false; enableParallelBuilding = args.enableParallelBuilding or true; @@ -57,6 +64,7 @@ let qtbase = callPackage ./qtbase { mesa = pkgs.mesa_noglu; + harfbuzz = pkgs.harfbuzz-icu; cups = if stdenv.isLinux then pkgs.cups else null; # GNOME dependencies are not used unless gtkStyle == true inherit (pkgs.gnome) libgnomeui GConf gnome_vfs; @@ -79,7 +87,6 @@ let 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 {}; @@ -90,8 +97,6 @@ let /* qtwayland = not packaged */ /* qtwebchannel = not packaged */ /* qtwebengine = not packaged */ - qtwebkit = callPackage ./qtwebkit {}; - qtwebkit-examples = callPackage ./qtwebkit-examples.nix {}; qtwebsockets = callPackage ./qtwebsockets.nix {}; /* qtwinextras = not packaged */ qtx11extras = callPackage ./qtx11extras.nix {}; @@ -99,18 +104,17 @@ let env = callPackage ../qt-env.nix {}; full = env "qt-${qtbase.version}" [ - qtconnectivity qtdeclarative qtdoc qtenginio qtgraphicaleffects qtimageformats - qtlocation qtmultimedia qtquick1 qtquickcontrols qtscript qtsensors qtserialport - qtsvg qttools qttranslations qtwebkit qtwebkit-examples qtwebsockets qtx11extras - qtxmlpatterns + qtconnectivity qtdeclarative qtdoc qtenginio qtgraphicaleffects + qtimageformats qtlocation qtmultimedia qtquickcontrols qtscript + qtsensors qtserialport qtsvg qttools qttranslations qtwebsockets + qtx11extras qtxmlpatterns ]; makeQtWrapper = makeSetupHook { deps = [ makeWrapper ]; } ./make-qt-wrapper.sh; - fixQtModuleCMakeConfig = makeSetupHook { } ./fix-qt-module-cmake-config.sh; qmakeHook = makeSetupHook { substitutions = { qt_dev = qtbase.dev; lndir = pkgs.xorg.lndir; }; } ./qmake-hook.sh; }; - self = makeScope pkgs.newScope addPackages; + self = makeScope pkgs.newScope addPackages; in self diff --git a/pkgs/development/libraries/qt-5/5.4/fetchsrcs.sh b/pkgs/development/libraries/qt-5/5.6/fetchsrcs.sh index 0fd5bb8d5fe..c499c70ea2c 100755 --- a/pkgs/development/libraries/qt-5/5.4/fetchsrcs.sh +++ b/pkgs/development/libraries/qt-5/5.6/fetchsrcs.sh @@ -4,7 +4,7 @@ set -x # The trailing slash at the end is necessary! -RELEASE_URL="http://download.qt.io/official_releases/qt/5.4/5.4.2/submodules/" +RELEASE_URL="http://download.qt.io/official_releases/qt/5.6/5.6.0/submodules/" EXTRA_WGET_ARGS='-A *.tar.xz' mkdir tmp; cd tmp diff --git a/pkgs/development/libraries/qt-5/5.6/make-qt-wrapper.sh b/pkgs/development/libraries/qt-5/5.6/make-qt-wrapper.sh new file mode 100644 index 00000000000..3b537430371 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.6/make-qt-wrapper.sh @@ -0,0 +1,38 @@ +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 : "$NIX_WRAP_XDG_CONFIG_DIRS" \ + --prefix XDG_DATA_DIRS : "$NIX_WRAP_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 : "$NIX_WRAP_XDG_CONFIG_DIRS" \ + --prefix XDG_DATA_DIRS : "$NIX_WRAP_XDG_DATA_DIRS" \ + "$@" +} + +_makeQtWrapperSetup() { + # cannot use addToSearchPath because these directories may not exist yet + export QT_PLUGIN_PATH="$QT_PLUGIN_PATH${QT_PLUGIN_PATH:+:}${!outputLib}/lib/qt5/plugins" + export QML_IMPORT_PATH="$QML_IMPORT_PATH${QML_IMPORT_PATH:+:}${!outputLib}/lib/qt5/imports" + export QML2_IMPORT_PATH="$QML2_IMPORT_PATH${QML2_IMPORT_PATH:+:}${!outputLib}/lib/qt5/qml" + export XDG_CONFIG_DIRS="$XDG_CONFIG_DIRS${XDG_CONFIG_DIRS:+:}${!outputLib}/etc/xdg" + export XDG_DATA_DIRS="$XDG_DATA_DIRS${XDG_DATA_DIRS:+:}${!outputLib}/share" + export NIX_WRAP_XDG_CONFIG_DIRS="$NIX_WRAP_XDG_CONFIG_DIRS${NIX_WRAP_XDG_CONFIG_DIRS:+:}${!outputLib}/etc/xdg" + export NIX_WRAP_XDG_DATA_DIRS="$NIX_WRAP_XDG_DATA_DIRS${NIX_WRAP_XDG_DATA_DIRS:+:}${!outputLib}/share" +} + +prePhases+=(_makeQtWrapperSetup) diff --git a/pkgs/development/libraries/qt-5/5.4/qmake-hook.sh b/pkgs/development/libraries/qt-5/5.6/qmake-hook.sh index a38f9f578e3..cf3803a1b9c 100644 --- a/pkgs/development/libraries/qt-5/5.4/qmake-hook.sh +++ b/pkgs/development/libraries/qt-5/5.6/qmake-hook.sh @@ -44,7 +44,7 @@ _qtSetQmakePath() { export PATH="$qtOut/bin${PATH:+:}$PATH" } -_qtMultioutModuleDevs() { +_qtModuleMultioutDevsPre() { # We cannot simply set these paths in configureFlags because libQtCore retains # references to the paths it was built with. moveToOutput "bin" "${!outputDev}" @@ -55,6 +55,25 @@ _qtMultioutModuleDevs() { moveToOutput "share/doc" "${!outputDev}" } +_qtModuleMultioutDevsPost() { + # Move libtool archives and qmake project files to $dev/lib + if [ "z${!outputLib}" != "z${!outputDev}" ]; then + pushd "${!outputLib}" + if [ -d "lib" ]; then + find lib \( -name '*.a' -o -name '*.la' -o -name '*.prl' \) -print0 | \ + while read -r -d $'\0' file; do + mkdir -p "${!outputDev}/$(dirname "$file")" + mv "${!outputLib}/$file" "${!outputDev}/$file" + done + + # Ensure that CMake can find the shared libraries + mkdir -p "${!outputDev}/lib" + @lndir@/bin/lndir -silent "${!outputLib}/lib" "${!outputDev}/lib" + fi + popd + fi +} + qmakeConfigurePhase() { runHook preConfigure @@ -89,13 +108,14 @@ envHooks+=(_qtLinkModule) # It must run after all the envHooks! postHooks+=(_qtSetQmakePath) -if [ -z "$dontUseQmakeConfigure" -a -z "$configurePhase" ]; then +if [ -z "$dontUseQmakeConfigure" -a -z "$configurePhase" ]; then configurePhase=qmakeConfigurePhase fi if [ -n "$NIX_QT_SUBMODULE" ]; then postInstallHooks+=(_qtRmQmake _qtRmModules) - preFixupHooks+=(_qtMultioutModuleDevs) + preFixupHooks+=(_qtModuleMultioutDevsPre) + postFixupHooks+=(_qtModuleMultioutDevsPost) fi fi diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase/compose-search-path.patch b/pkgs/development/libraries/qt-5/5.6/qtbase/compose-search-path.patch index 08d12087f08..3d65dcc902c 100644 --- a/pkgs/development/libraries/qt-5/5.4/qtbase/compose-search-path.patch +++ b/pkgs/development/libraries/qt-5/5.6/qtbase/compose-search-path.patch @@ -1,8 +1,8 @@ -Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp +Index: qt-everywhere-opensource-src-5.6.0/qtbase/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp =================================================================== ---- qt-everywhere-opensource-src-5.5.1.orig/qtbase/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp -+++ qt-everywhere-opensource-src-5.5.1/qtbase/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp -@@ -68,10 +68,7 @@ void TableGenerator::initPossibleLocatio +--- qt-everywhere-opensource-src-5.6.0.orig/qtbase/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp ++++ qt-everywhere-opensource-src-5.6.0/qtbase/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp +@@ -251,10 +251,7 @@ void TableGenerator::initPossibleLocatio // the QTCOMPOSE environment variable if (qEnvironmentVariableIsSet("QTCOMPOSE")) m_possibleLocations.append(QString::fromLocal8Bit(qgetenv("QTCOMPOSE"))); diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase/decrypt-ssl-traffic.patch b/pkgs/development/libraries/qt-5/5.6/qtbase/decrypt-ssl-traffic.patch index 10e7e01a07f..2cb3f7dfa70 100644 --- a/pkgs/development/libraries/qt-5/5.4/qtbase/decrypt-ssl-traffic.patch +++ b/pkgs/development/libraries/qt-5/5.6/qtbase/decrypt-ssl-traffic.patch @@ -1,8 +1,8 @@ -Index: qt-everywhere-opensource-src-5.4.2/qtbase/src/network/ssl/qsslsocket_openssl.cpp +Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/network/ssl/qsslsocket_openssl.cpp =================================================================== ---- qt-everywhere-opensource-src-5.4.2.orig/qtbase/src/network/ssl/qsslsocket_openssl.cpp -+++ qt-everywhere-opensource-src-5.4.2/qtbase/src/network/ssl/qsslsocket_openssl.cpp -@@ -47,7 +47,7 @@ +--- qt-everywhere-opensource-src-5.5.1.orig/qtbase/src/network/ssl/qsslsocket_openssl.cpp ++++ qt-everywhere-opensource-src-5.5.1/qtbase/src/network/ssl/qsslsocket_openssl.cpp +@@ -48,7 +48,7 @@ ****************************************************************************/ //#define QSSLSOCKET_DEBUG diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix index 32e8bacd1e7..6ab5a48951f 100644 --- a/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix +++ b/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix @@ -1,13 +1,14 @@ -{ stdenv, lib, fetchurl, copyPathsToStore, fixQtModuleCMakeConfig +{ stdenv, lib, fetchgit, copyPathsToStore , srcs , xlibs, libX11, libxcb, libXcursor, libXext, libXrender, libXi , xcbutil, xcbutilimage, xcbutilkeysyms, xcbutilwm, libxkbcommon -, fontconfig, freetype, openssl, dbus, glib, udev, libxml2, libxslt, pcre +, fontconfig, freetype, harfbuzz +, openssl, dbus, glib, udev, libxml2, libxslt, pcre16 , zlib, libjpeg, libpng, libtiff, sqlite, icu , coreutils, bison, flex, gdb, gperf, lndir, ruby -, python, perl, pkgconfig +, patchelf, perl, pkgconfig, python # optional dependencies , cups ? null @@ -18,13 +19,16 @@ , buildExamples ? false , buildTests ? false , developerBuild ? false -, gtkStyle ? false, libgnomeui, GConf, gnome_vfs, gtk +, gtkStyle ? true, libgnomeui, GConf, gnome_vfs, gtk , decryptSslTraffic ? false }: let inherit (srcs.qt5) version; system-x86_64 = lib.elem stdenv.system lib.platforms.x86_64; + + # Search path for Gtk plugin + gtkLibPath = lib.makeLibraryPath [ gtk.out gnome_vfs.out libgnomeui.out GConf.out ]; in stdenv.mkDerivation { @@ -36,15 +40,14 @@ stdenv.mkDerivation { sourceRoot = "qt-everywhere-opensource-src-${version}"; - outputs = [ "dev" "out" ]; + outputs = [ "dev" "out" "gtk" ]; postUnpack = '' - mv qtbase-opensource-src-${version} ./qt-everywhere-opensource-src-${version}/qtbase + mv qtbase-opensource-src-${version} $sourceRoot/qtbase ''; patches = copyPathsToStore (lib.readPathsFromFile ./. ./series) - ++ lib.optional gtkStyle ./dlopen-gtkstyle.patch ++ lib.optional decryptSslTraffic ./decrypt-ssl-traffic.patch ++ lib.optional mesaSupported [ ./dlopen-gl.patch ./mkspecs-libgl.patch ]; @@ -78,51 +81,30 @@ stdenv.mkDerivation { qtbase/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp \ --replace "@libX11@" "${libX11.out}" '' - + lib.optionalString gtkStyle '' - substituteInPlace qtbase/src/widgets/styles/qgtk2painter.cpp --replace "@gtk@" "${gtk.out}" - substituteInPlace qtbase/src/widgets/styles/qgtkstyle_p.cpp \ - --replace "@gtk@" "${gtk.out}" \ - --replace "@gnome_vfs@" "${gnome_vfs}" \ - --replace "@libgnomeui@" "${libgnomeui}" \ - --replace "@gconf@" "${GConf}" - '' + lib.optionalString mesaSupported '' substituteInPlace \ - qtbase/src/plugins/platforms/xcb/qglxintegration.cpp \ + qtbase/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp \ --replace "@mesa_lib@" "${mesa.out}" substituteInPlace qtbase/mkspecs/common/linux.conf \ --replace "@mesa_lib@" "${mesa.out}" \ --replace "@mesa_inc@" "${mesa.dev}" ''; + setOutputFlags = false; preConfigure = '' export LD_LIBRARY_PATH="$PWD/qtbase/lib:$PWD/qtbase/plugins/platforms:$LD_LIBRARY_PATH" export MAKEFLAGS=-j$NIX_BUILD_CORES - _multioutQtDevs() { - # We cannot simply set these paths in configureFlags because libQtCore retains - # references to the paths it was built with. - moveToOutput "bin" "$dev" - moveToOutput "include" "$dev" - moveToOutput "mkspecs" "$dev" - - # The destination directory must exist or moveToOutput will do nothing - mkdir -p "$dev/share" - moveToOutput "share/doc" "$dev" - - mkdir -p "$dev/lib" - lndir -silent "$out/lib" "$dev/lib" - if [[ -h "$dev/lib/cmake" ]]; then rm "$dev/lib/cmake"; fi - if [[ -h "$dev/lib/pkgconfig" ]]; then rm "$dev/lib/pkgconfig"; fi - } - preFixupHooks+=(_multioutQtDevs) - configureFlags+="\ -plugindir $out/lib/qt5/plugins \ -importdir $out/lib/qt5/imports \ -qmldir $out/lib/qt5/qml \ -docdir $out/share/doc/qt5" + '' + # QMake expects to extract the list of available modules from .gitmodules + + '' + echo '[submodule "qtbase"]' >.gitmodules ''; prefixKey = "-prefix "; @@ -179,8 +161,10 @@ stdenv.mkDerivation { -system-zlib -system-libpng -system-libjpeg + -system-harfbuzz -system-xcb -system-xkbcommon + -system-pcre -openssl-linked -dbus-linked @@ -200,9 +184,16 @@ stdenv.mkDerivation { PSQL_LIBS = lib.optionalString (postgresql != null) "-L${postgresql.lib}/lib -lpq"; propagatedBuildInputs = [ + dbus glib libxml2 libxslt openssl pcre16 sqlite udev zlib + + # Image formats + libjpeg libpng libtiff + + # Text rendering + fontconfig freetype harfbuzz icu + + # X11 libs xlibs.libXcomposite libX11 libxcb libXext libXrender libXi - fontconfig freetype openssl dbus glib udev libxml2 libxslt pcre - zlib libjpeg libpng libtiff sqlite icu xcbutil xcbutilimage xcbutilkeysyms xcbutilwm libxkbcommon ] ++ lib.optional mesaSupported mesa; @@ -213,30 +204,59 @@ stdenv.mkDerivation { ++ lib.optional (cups != null) cups ++ lib.optional (mysql != null) mysql.lib ++ lib.optional (postgresql != null) postgresql - ++ lib.optionals gtkStyle [gnome_vfs libgnomeui gtk GConf]; + ++ lib.optionals gtkStyle [gnome_vfs.out libgnomeui.out gtk GConf]; - nativeBuildInputs = [ fixQtModuleCMakeConfig lndir python perl pkgconfig ]; + nativeBuildInputs = [ lndir patchelf perl pkgconfig python ]; # freetype-2.5.4 changed signedness of some struct fields NIX_CFLAGS_COMPILE = "-Wno-error=sign-compare"; + preFixup = '' + # We cannot simply set these paths in configureFlags because libQtCore retains + # references to the paths it was built with. + moveToOutput "bin" "$dev" + moveToOutput "include" "$dev" + moveToOutput "mkspecs" "$dev" + + # The destination directory must exist or moveToOutput will do nothing + mkdir -p "$dev/share" + moveToOutput "share/doc" "$dev" + + # Move the QGtkStyle plugin to the gtk output + mkdir -p "$gtk/lib/qt5/plugins/platformthemes" + mv "$out/lib/qt5/plugins/platformthemes/libqgtk2.so" "$gtk/lib/qt5/plugins/platformthemes" + rm "$out/lib/cmake/Qt5Gui/Qt5Gui_QGtk2ThemePlugin.cmake" + + # Set RPATH for QGtkStyle plugin + qgtk2="$gtk/lib/qt5/plugins/platformthemes/libqgtk2.so" + qgtk2_RPATH="$(patchelf --print-rpath "$qgtk2")" + qgtk2_RPATH="$qgtk2_RPATH''${qgtk2_RPATH:+:}${gtkLibPath}" + patchelf "$qgtk2" \ + --add-needed libgtk-x11-2.0.so \ + --add-needed libgnomeui-2.so \ + --add-needed libgnomevfs-2.so \ + --add-needed libgconf-2.so \ + --set-rpath "$qgtk2_RPATH" + ''; + postFixup = '' # Don't retain build-time dependencies like gdb and ruby. - sed '/QMAKE_DEFAULT_.*DIRS/ d' -i "$dev/mkspecs/qconfig.pri" - - fixQtModuleCMakeConfig "Concurrent" - fixQtModuleCMakeConfig "Core" - fixQtModuleCMakeConfig "DBus" - fixQtModuleCMakeConfig "Gui" - fixQtModuleCMakeConfig "Network" - fixQtModuleCMakeConfig "OpenGL" - fixQtModuleCMakeConfig "OpenGLExtensions" - fixQtModuleCMakeConfig "PrintSupport" - fixQtModuleCMakeConfig "Sql" - fixQtModuleCMakeConfig "Test" - fixQtModuleCMakeConfig "Widgets" - fixQtModuleCMakeConfig "Xml" + sed '/QMAKE_DEFAULT_.*DIRS/ d' -i $dev/mkspecs/qconfig.pri + + # Move libtool archives and qmake projects + if [ "z''${!outputLib}" != "z''${!outputDev}" ]; then + pushd "''${!outputLib}" + find lib -name '*.a' -o -name '*.la' -o -name '*.prl' | \ + while read -r file; do + mkdir -p "''${!outputDev}/$(dirname "$file")" + mv "''${!outputLib}/$file" "''${!outputDev}/$file" + done + popd + + # Ensure that CMake can find the shared libraries + lndir -silent "''${!outputLib}/lib" "''${!outputDev}/lib" + fi ''; setupHook = ./setup-hook.sh; diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase/dlopen-dbus.patch b/pkgs/development/libraries/qt-5/5.6/qtbase/dlopen-dbus.patch index 05e98d8be71..401cfd5c295 100644 --- a/pkgs/development/libraries/qt-5/5.4/qtbase/dlopen-dbus.patch +++ b/pkgs/development/libraries/qt-5/5.6/qtbase/dlopen-dbus.patch @@ -1,8 +1,8 @@ -Index: qt-everywhere-opensource-src-5.4.2/qtbase/src/dbus/qdbus_symbols.cpp +Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/dbus/qdbus_symbols.cpp =================================================================== ---- qt-everywhere-opensource-src-5.4.2.orig/qtbase/src/dbus/qdbus_symbols.cpp -+++ qt-everywhere-opensource-src-5.4.2/qtbase/src/dbus/qdbus_symbols.cpp -@@ -88,7 +88,7 @@ bool qdbus_loadLibDBus() +--- qt-everywhere-opensource-src-5.5.1.orig/qtbase/src/dbus/qdbus_symbols.cpp ++++ qt-everywhere-opensource-src-5.5.1/qtbase/src/dbus/qdbus_symbols.cpp +@@ -89,7 +89,7 @@ bool qdbus_loadLibDBus() #ifdef Q_OS_WIN QLatin1String("dbus-1"), #endif diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase/dlopen-gl.patch b/pkgs/development/libraries/qt-5/5.6/qtbase/dlopen-gl.patch index d5c4c2b97cb..59f510ac54d 100644 --- a/pkgs/development/libraries/qt-5/5.4/qtbase/dlopen-gl.patch +++ b/pkgs/development/libraries/qt-5/5.6/qtbase/dlopen-gl.patch @@ -1,8 +1,8 @@ -Index: qt-everywhere-opensource-src-5.4.2/qtbase/src/plugins/platforms/xcb/qglxintegration.cpp +Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp =================================================================== ---- qt-everywhere-opensource-src-5.4.2.orig/qtbase/src/plugins/platforms/xcb/qglxintegration.cpp -+++ qt-everywhere-opensource-src-5.4.2/qtbase/src/plugins/platforms/xcb/qglxintegration.cpp -@@ -560,7 +560,12 @@ void (*QGLXContext::getProcAddress(const +--- qt-everywhere-opensource-src-5.5.1.orig/qtbase/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp ++++ qt-everywhere-opensource-src-5.5.1/qtbase/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp +@@ -563,7 +563,12 @@ void (*QGLXContext::getProcAddress(const { extern const QString qt_gl_library_name(); // QLibrary lib(qt_gl_library_name()); diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase/dlopen-gtkstyle.patch b/pkgs/development/libraries/qt-5/5.6/qtbase/dlopen-gtkstyle.patch index c2be7377949..ad1719c46e2 100644 --- a/pkgs/development/libraries/qt-5/5.4/qtbase/dlopen-gtkstyle.patch +++ b/pkgs/development/libraries/qt-5/5.6/qtbase/dlopen-gtkstyle.patch @@ -1,7 +1,7 @@ -Index: qt-everywhere-opensource-src-5.4.2/qtbase/src/widgets/styles/qgtk2painter.cpp +Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/widgets/styles/qgtk2painter.cpp =================================================================== ---- qt-everywhere-opensource-src-5.4.2.orig/qtbase/src/widgets/styles/qgtk2painter.cpp -+++ qt-everywhere-opensource-src-5.4.2/qtbase/src/widgets/styles/qgtk2painter.cpp +--- qt-everywhere-opensource-src-5.5.1.orig/qtbase/src/widgets/styles/qgtk2painter.cpp ++++ qt-everywhere-opensource-src-5.5.1/qtbase/src/widgets/styles/qgtk2painter.cpp @@ -96,7 +96,7 @@ static void initGtk() static bool initialized = false; if (!initialized) { @@ -11,11 +11,11 @@ Index: qt-everywhere-opensource-src-5.4.2/qtbase/src/widgets/styles/qgtk2painter QGtk2PainterPrivate::gdk_pixmap_new = (Ptr_gdk_pixmap_new)libgtk.resolve("gdk_pixmap_new"); QGtk2PainterPrivate::gdk_pixbuf_get_from_drawable = (Ptr_gdk_pixbuf_get_from_drawable)libgtk.resolve("gdk_pixbuf_get_from_drawable"); -Index: qt-everywhere-opensource-src-5.4.2/qtbase/src/widgets/styles/qgtkstyle_p.cpp +Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/widgets/styles/qgtkstyle_p.cpp =================================================================== ---- qt-everywhere-opensource-src-5.4.2.orig/qtbase/src/widgets/styles/qgtkstyle_p.cpp -+++ qt-everywhere-opensource-src-5.4.2/qtbase/src/widgets/styles/qgtkstyle_p.cpp -@@ -326,7 +326,7 @@ void QGtkStylePrivate::gtkWidgetSetFocus +--- qt-everywhere-opensource-src-5.5.1.orig/qtbase/src/widgets/styles/qgtkstyle_p.cpp ++++ qt-everywhere-opensource-src-5.5.1/qtbase/src/widgets/styles/qgtkstyle_p.cpp +@@ -327,7 +327,7 @@ void QGtkStylePrivate::gtkWidgetSetFocus void QGtkStylePrivate::resolveGtk() const { // enforce the "0" suffix, so we'll open libgtk-x11-2.0.so.0 @@ -24,7 +24,7 @@ Index: qt-everywhere-opensource-src-5.4.2/qtbase/src/widgets/styles/qgtkstyle_p. gtk_init = (Ptr_gtk_init)libgtk.resolve("gtk_init"); gtk_window_new = (Ptr_gtk_window_new)libgtk.resolve("gtk_window_new"); -@@ -424,8 +424,8 @@ void QGtkStylePrivate::resolveGtk() cons +@@ -425,8 +425,8 @@ void QGtkStylePrivate::resolveGtk() cons pango_font_description_get_family = (Ptr_pango_font_description_get_family)libgtk.resolve("pango_font_description_get_family"); pango_font_description_get_style = (Ptr_pango_font_description_get_style)libgtk.resolve("pango_font_description_get_style"); @@ -35,7 +35,7 @@ Index: qt-everywhere-opensource-src-5.4.2/qtbase/src/widgets/styles/qgtkstyle_p. } /* \internal -@@ -593,9 +593,9 @@ void QGtkStylePrivate::cleanupGtkWidgets +@@ -594,9 +594,9 @@ void QGtkStylePrivate::cleanupGtkWidgets static bool resolveGConf() { if (!QGtkStylePrivate::gconf_client_get_default) { diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase/dlopen-libXcursor.patch b/pkgs/development/libraries/qt-5/5.6/qtbase/dlopen-libXcursor.patch index 608c68b6d5b..d3b5b631be7 100644 --- a/pkgs/development/libraries/qt-5/5.4/qtbase/dlopen-libXcursor.patch +++ b/pkgs/development/libraries/qt-5/5.6/qtbase/dlopen-libXcursor.patch @@ -1,9 +1,9 @@ -Index: qt-everywhere-opensource-src-5.4.2/qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp +Index: qt-everywhere-opensource-src-5.6.0/qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp =================================================================== ---- qt-everywhere-opensource-src-5.4.2.orig/qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp -+++ qt-everywhere-opensource-src-5.4.2/qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp -@@ -297,10 +297,10 @@ QXcbCursor::QXcbCursor(QXcbConnection *c - #ifdef XCB_USE_XLIB +--- qt-everywhere-opensource-src-5.6.0.orig/qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp ++++ qt-everywhere-opensource-src-5.6.0/qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp +@@ -303,10 +303,10 @@ QXcbCursor::QXcbCursor(QXcbConnection *c + #if defined(XCB_USE_XLIB) && !defined(QT_NO_LIBRARY) static bool function_ptrs_not_initialized = true; if (function_ptrs_not_initialized) { - QLibrary xcursorLib(QLatin1String("Xcursor"), 1); diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase/dlopen-openssl.patch b/pkgs/development/libraries/qt-5/5.6/qtbase/dlopen-openssl.patch index b648a58b570..f51fa44faaf 100644 --- a/pkgs/development/libraries/qt-5/5.4/qtbase/dlopen-openssl.patch +++ b/pkgs/development/libraries/qt-5/5.6/qtbase/dlopen-openssl.patch @@ -1,8 +1,8 @@ -Index: qt-everywhere-opensource-src-5.4.2/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp +Index: qt-everywhere-opensource-src-5.6.0/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp =================================================================== ---- qt-everywhere-opensource-src-5.4.2.orig/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp -+++ qt-everywhere-opensource-src-5.4.2/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp -@@ -611,8 +611,8 @@ static QPair<QLibrary*, QLibrary*> loadO +--- qt-everywhere-opensource-src-5.6.0.orig/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp ++++ qt-everywhere-opensource-src-5.6.0/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp +@@ -652,8 +652,8 @@ static QPair<QLibrary*, QLibrary*> loadO #endif #if defined(SHLIB_VERSION_NUMBER) && !defined(Q_OS_QNX) // on QNX, the libs are always libssl.so and libcrypto.so // first attempt: the canonical name is libssl.so.<SHLIB_VERSION_NUMBER> @@ -13,7 +13,7 @@ Index: qt-everywhere-opensource-src-5.4.2/qtbase/src/network/ssl/qsslsocket_open if (libcrypto->load() && libssl->load()) { // libssl.so.<SHLIB_VERSION_NUMBER> and libcrypto.so.<SHLIB_VERSION_NUMBER> found return pair; -@@ -629,8 +629,8 @@ static QPair<QLibrary*, QLibrary*> loadO +@@ -670,8 +670,8 @@ static QPair<QLibrary*, QLibrary*> loadO // OS X's /usr/lib/libssl.dylib, /usr/lib/libcrypto.dylib will be picked up in the third // attempt, _after_ <bundle>/Contents/Frameworks has been searched. // iOS does not ship a system libssl.dylib, libcrypto.dylib in the first place. diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase/dlopen-resolv.patch b/pkgs/development/libraries/qt-5/5.6/qtbase/dlopen-resolv.patch index 20e56bf3149..3e9b9ca2b08 100644 --- a/pkgs/development/libraries/qt-5/5.4/qtbase/dlopen-resolv.patch +++ b/pkgs/development/libraries/qt-5/5.6/qtbase/dlopen-resolv.patch @@ -1,7 +1,7 @@ -Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/network/kernel/qdnslookup_unix.cpp +Index: qt-everywhere-opensource-src-5.6.0/qtbase/src/network/kernel/qdnslookup_unix.cpp =================================================================== ---- qt-everywhere-opensource-src-5.5.1.orig/qtbase/src/network/kernel/qdnslookup_unix.cpp -+++ qt-everywhere-opensource-src-5.5.1/qtbase/src/network/kernel/qdnslookup_unix.cpp +--- qt-everywhere-opensource-src-5.6.0.orig/qtbase/src/network/kernel/qdnslookup_unix.cpp ++++ qt-everywhere-opensource-src-5.6.0/qtbase/src/network/kernel/qdnslookup_unix.cpp @@ -79,7 +79,7 @@ static void resolveLibrary() if (!lib.load()) #endif @@ -11,10 +11,10 @@ Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/network/kernel/qdnslookup_u if (!lib.load()) return; } -Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/network/kernel/qhostinfo_unix.cpp +Index: qt-everywhere-opensource-src-5.6.0/qtbase/src/network/kernel/qhostinfo_unix.cpp =================================================================== ---- qt-everywhere-opensource-src-5.5.1.orig/qtbase/src/network/kernel/qhostinfo_unix.cpp -+++ qt-everywhere-opensource-src-5.5.1/qtbase/src/network/kernel/qhostinfo_unix.cpp +--- qt-everywhere-opensource-src-5.6.0.orig/qtbase/src/network/kernel/qhostinfo_unix.cpp ++++ qt-everywhere-opensource-src-5.6.0/qtbase/src/network/kernel/qhostinfo_unix.cpp @@ -95,7 +95,7 @@ static void resolveLibrary() if (!lib.load()) #endif diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase/libressl.patch b/pkgs/development/libraries/qt-5/5.6/qtbase/libressl.patch new file mode 100644 index 00000000000..a05d55c8640 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.6/qtbase/libressl.patch @@ -0,0 +1,33 @@ +From 81494e67eccba04fc3fe554d76a9ca6fe7f2250e Mon Sep 17 00:00:00 2001 +From: hasufell <hasufell@gentoo.org> +Date: Sat, 10 Oct 2015 01:15:01 +0200 +Subject: [PATCH] Fix compilation with libressl + +By additionally checking for defined(SSL_CTRL_SET_CURVES), which +is defined in openssl, but not in libressl. +--- + src/network/ssl/qsslcontext_openssl.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +Index: qt-everywhere-opensource-src-5.6.0/qtbase/src/network/ssl/qsslcontext_openssl.cpp +=================================================================== +--- qt-everywhere-opensource-src-5.6.0.orig/qtbase/src/network/ssl/qsslcontext_openssl.cpp ++++ qt-everywhere-opensource-src-5.6.0/qtbase/src/network/ssl/qsslcontext_openssl.cpp +@@ -340,7 +340,7 @@ init_context: + + const QVector<QSslEllipticCurve> qcurves = sslContext->sslConfiguration.ellipticCurves(); + if (!qcurves.isEmpty()) { +-#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(OPENSSL_NO_EC) ++#if OPENSSL_VERSION_NUMBER >= 0x10002000L && defined(SSL_CTRL_SET_CURVES) && !defined(OPENSSL_NO_EC) + // Set the curves to be used + if (q_SSLeay() >= 0x10002000L) { + // SSL_CTX_ctrl wants a non-const pointer as last argument, +@@ -354,7 +354,7 @@ init_context: + return sslContext; + } + } else +-#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(OPENSSL_NO_EC) ++#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L && defined(SSL_CTRL_SET_CURVES) && !defined(OPENSSL_NO_EC) + { + // specific curves requested, but not possible to set -> error + sslContext->errorStr = msgErrorSettingEllipticCurves(QSslSocket::tr("OpenSSL version too old, need at least v1.0.2")); diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase/mkspecs-libgl.patch b/pkgs/development/libraries/qt-5/5.6/qtbase/mkspecs-libgl.patch index 56ee0a411d4..56ee0a411d4 100644 --- a/pkgs/development/libraries/qt-5/5.4/qtbase/mkspecs-libgl.patch +++ b/pkgs/development/libraries/qt-5/5.6/qtbase/mkspecs-libgl.patch diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase/nix-profiles-library-paths.patch b/pkgs/development/libraries/qt-5/5.6/qtbase/nix-profiles-library-paths.patch new file mode 100644 index 00000000000..b2aad140ad0 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.6/qtbase/nix-profiles-library-paths.patch @@ -0,0 +1,22 @@ +Index: qt-everywhere-opensource-src-5.6.0/qtbase/src/corelib/kernel/qcoreapplication.cpp +=================================================================== +--- qt-everywhere-opensource-src-5.6.0.orig/qtbase/src/corelib/kernel/qcoreapplication.cpp ++++ qt-everywhere-opensource-src-5.6.0/qtbase/src/corelib/kernel/qcoreapplication.cpp +@@ -2533,7 +2533,17 @@ QStringList QCoreApplication::libraryPat + QStringList *app_libpaths = new QStringList; + coreappdata()->app_libpaths.reset(app_libpaths); + ++ // Add library paths derived from NIX_PROFILES. ++ const QByteArrayList profiles = qgetenv("NIX_PROFILES").split(' '); ++ const QString plugindir = QString::fromLatin1("/lib/qt5/plugins"); ++ Q_FOREACH (const QByteArray &profile, profiles) { ++ if (!profile.isEmpty()) { ++ app_libpaths->append(QFile::decodeName(profile) + plugindir); ++ } ++ } ++ + const QByteArray libPathEnv = qgetenv("QT_PLUGIN_PATH"); ++ qunsetenv("QT_PLUGIN_PATH"); // do not propagate to child processes + if (!libPathEnv.isEmpty()) { + QStringList paths = QFile::decodeName(libPathEnv).split(QDir::listSeparator(), QString::SkipEmptyParts); + for (QStringList::const_iterator it = paths.constBegin(); it != paths.constEnd(); ++it) { diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase/series b/pkgs/development/libraries/qt-5/5.6/qtbase/series index 3cfa50e85b7..2196d838375 100644 --- a/pkgs/development/libraries/qt-5/5.4/qtbase/series +++ b/pkgs/development/libraries/qt-5/5.6/qtbase/series @@ -6,3 +6,4 @@ dlopen-dbus.patch xdg-config-dirs.patch nix-profiles-library-paths.patch compose-search-path.patch +libressl.patch diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase/setup-hook.sh b/pkgs/development/libraries/qt-5/5.6/qtbase/setup-hook.sh index a9c4fbc855f..a9c4fbc855f 100644 --- a/pkgs/development/libraries/qt-5/5.4/qtbase/setup-hook.sh +++ b/pkgs/development/libraries/qt-5/5.6/qtbase/setup-hook.sh diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase/tzdir.patch b/pkgs/development/libraries/qt-5/5.6/qtbase/tzdir.patch index f62b25ef445..1c0541bdc2a 100644 --- a/pkgs/development/libraries/qt-5/5.4/qtbase/tzdir.patch +++ b/pkgs/development/libraries/qt-5/5.6/qtbase/tzdir.patch @@ -1,8 +1,8 @@ -Index: qt-everywhere-opensource-src-5.4.2/qtbase/src/corelib/tools/qtimezoneprivate_tz.cpp +Index: qt-everywhere-opensource-src-5.6.0/qtbase/src/corelib/tools/qtimezoneprivate_tz.cpp =================================================================== ---- qt-everywhere-opensource-src-5.4.2.orig/qtbase/src/corelib/tools/qtimezoneprivate_tz.cpp -+++ qt-everywhere-opensource-src-5.4.2/qtbase/src/corelib/tools/qtimezoneprivate_tz.cpp -@@ -61,7 +61,10 @@ typedef QHash<QByteArray, QTzTimeZone> Q +--- qt-everywhere-opensource-src-5.6.0.orig/qtbase/src/corelib/tools/qtimezoneprivate_tz.cpp ++++ qt-everywhere-opensource-src-5.6.0/qtbase/src/corelib/tools/qtimezoneprivate_tz.cpp +@@ -62,7 +62,10 @@ typedef QHash<QByteArray, QTzTimeZone> Q // Parse zone.tab table, assume lists all installed zones, if not will need to read directories static QTzTimeZoneHash loadTzTimeZones() { @@ -14,7 +14,7 @@ Index: qt-everywhere-opensource-src-5.4.2/qtbase/src/corelib/tools/qtimezonepriv if (!QFile::exists(path)) path = QStringLiteral("/usr/lib/zoneinfo/zone.tab"); -@@ -552,12 +555,18 @@ void QTzTimeZonePrivate::init(const QByt +@@ -560,12 +563,18 @@ void QTzTimeZonePrivate::init(const QByt if (!tzif.open(QIODevice::ReadOnly)) return; } else { diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase/xdg-config-dirs.patch b/pkgs/development/libraries/qt-5/5.6/qtbase/xdg-config-dirs.patch index dbf5eac52e6..ff4ad82ea8f 100644 --- a/pkgs/development/libraries/qt-5/5.4/qtbase/xdg-config-dirs.patch +++ b/pkgs/development/libraries/qt-5/5.6/qtbase/xdg-config-dirs.patch @@ -1,8 +1,8 @@ -Index: qt-everywhere-opensource-src-5.4.2/qtbase/src/corelib/io/qsettings.cpp +Index: qt-everywhere-opensource-src-5.6.0/qtbase/src/corelib/io/qsettings.cpp =================================================================== ---- qt-everywhere-opensource-src-5.4.2.orig/qtbase/src/corelib/io/qsettings.cpp -+++ qt-everywhere-opensource-src-5.4.2/qtbase/src/corelib/io/qsettings.cpp -@@ -1128,6 +1128,24 @@ QConfFileSettingsPrivate::QConfFileSetti +--- qt-everywhere-opensource-src-5.6.0.orig/qtbase/src/corelib/io/qsettings.cpp ++++ qt-everywhere-opensource-src-5.6.0/qtbase/src/corelib/io/qsettings.cpp +@@ -1155,6 +1155,24 @@ QConfFileSettingsPrivate::QConfFileSetti if (!application.isEmpty()) confFiles[F_System | F_Application].reset(QConfFile::fromName(systemPath + appFile, false)); confFiles[F_System | F_Organization].reset(QConfFile::fromName(systemPath + orgFile, false)); @@ -27,11 +27,11 @@ Index: qt-everywhere-opensource-src-5.4.2/qtbase/src/corelib/io/qsettings.cpp #else QString confName = getPath(format, QSettings::UserScope) + org; if (!application.isEmpty()) -Index: qt-everywhere-opensource-src-5.4.2/qtbase/src/corelib/io/qsettings_p.h +Index: qt-everywhere-opensource-src-5.6.0/qtbase/src/corelib/io/qsettings_p.h =================================================================== ---- qt-everywhere-opensource-src-5.4.2.orig/qtbase/src/corelib/io/qsettings_p.h -+++ qt-everywhere-opensource-src-5.4.2/qtbase/src/corelib/io/qsettings_p.h -@@ -240,7 +240,7 @@ public: +--- qt-everywhere-opensource-src-5.6.0.orig/qtbase/src/corelib/io/qsettings_p.h ++++ qt-everywhere-opensource-src-5.6.0/qtbase/src/corelib/io/qsettings_p.h +@@ -241,7 +241,7 @@ public: F_Organization = 0x1, F_User = 0x0, F_System = 0x2, diff --git a/pkgs/development/libraries/qt-5/5.4/qtconnectivity.nix b/pkgs/development/libraries/qt-5/5.6/qtconnectivity.nix index 35538c7261f..95cd6fea79b 100644 --- a/pkgs/development/libraries/qt-5/5.4/qtconnectivity.nix +++ b/pkgs/development/libraries/qt-5/5.6/qtconnectivity.nix @@ -3,8 +3,4 @@ qtSubmodule { name = "qtconnectivity"; qtInputs = [ qtbase qtdeclarative ]; - postFixup = '' - fixQtModuleCMakeConfig "Bluetooth" - fixQtModuleCMakeConfig "Nfc" - ''; } diff --git a/pkgs/development/libraries/qt-5/5.6/qtdeclarative/default.nix b/pkgs/development/libraries/qt-5/5.6/qtdeclarative/default.nix new file mode 100644 index 00000000000..328d8aee72b --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.6/qtdeclarative/default.nix @@ -0,0 +1,8 @@ +{ qtSubmodule, lib, copyPathsToStore, python, qtbase, qtsvg, qtxmlpatterns }: + +qtSubmodule { + name = "qtdeclarative"; + patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); + qtInputs = [ qtbase qtsvg qtxmlpatterns ]; + nativeBuildInputs = [ python ]; +} diff --git a/pkgs/development/libraries/qt-5/5.6/qtdeclarative/nix-profiles-import-paths.patch b/pkgs/development/libraries/qt-5/5.6/qtdeclarative/nix-profiles-import-paths.patch new file mode 100644 index 00000000000..06b244b974f --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.6/qtdeclarative/nix-profiles-import-paths.patch @@ -0,0 +1,20 @@ +Index: qtdeclarative-opensource-src-5.5.1/src/qml/qml/qqmlimport.cpp +=================================================================== +--- qtdeclarative-opensource-src-5.5.1.orig/src/qml/qml/qqmlimport.cpp ++++ qtdeclarative-opensource-src-5.5.1/src/qml/qml/qqmlimport.cpp +@@ -1549,6 +1549,15 @@ QQmlImportDatabase::QQmlImportDatabase(Q + QString installImportsPath = QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath); + addImportPath(installImportsPath); + ++ // Add library paths derived from NIX_PROFILES. ++ const QByteArrayList profiles = qgetenv("NIX_PROFILES").split(' '); ++ const QString qmldir = QString::fromLatin1("/lib/qt5/qml"); ++ Q_FOREACH (const QByteArray &profile, profiles) { ++ if (!profile.isEmpty()) { ++ addImportPath(QFile::decodeName(profile) + qmldir); ++ } ++ } ++ + // env import paths + QByteArray envImportPath = qgetenv("QML2_IMPORT_PATH"); + if (!envImportPath.isEmpty()) { diff --git a/pkgs/development/libraries/qt-5/5.6/qtdeclarative/series b/pkgs/development/libraries/qt-5/5.6/qtdeclarative/series new file mode 100644 index 00000000000..7dbe197c56e --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.6/qtdeclarative/series @@ -0,0 +1 @@ +nix-profiles-import-paths.patch diff --git a/pkgs/development/libraries/qt-5/5.4/qtdoc.nix b/pkgs/development/libraries/qt-5/5.6/qtdoc.nix index 578ea6ba0b2..578ea6ba0b2 100644 --- a/pkgs/development/libraries/qt-5/5.4/qtdoc.nix +++ b/pkgs/development/libraries/qt-5/5.6/qtdoc.nix diff --git a/pkgs/development/libraries/qt-5/5.4/qtenginio.nix b/pkgs/development/libraries/qt-5/5.6/qtenginio.nix index 503a0f7ce4f..b860a73ef89 100644 --- a/pkgs/development/libraries/qt-5/5.4/qtenginio.nix +++ b/pkgs/development/libraries/qt-5/5.6/qtenginio.nix @@ -3,7 +3,4 @@ qtSubmodule { name = "qtenginio"; qtInputs = [ qtdeclarative ]; - postFixup = '' - fixQtModuleCMakeConfig "Enginio" - ''; } diff --git a/pkgs/development/libraries/qt-5/5.4/qtgraphicaleffects.nix b/pkgs/development/libraries/qt-5/5.6/qtgraphicaleffects.nix index 3273f12eb83..3273f12eb83 100644 --- a/pkgs/development/libraries/qt-5/5.4/qtgraphicaleffects.nix +++ b/pkgs/development/libraries/qt-5/5.6/qtgraphicaleffects.nix diff --git a/pkgs/development/libraries/qt-5/5.4/qtimageformats.nix b/pkgs/development/libraries/qt-5/5.6/qtimageformats.nix index 03d0fffbe80..03d0fffbe80 100644 --- a/pkgs/development/libraries/qt-5/5.4/qtimageformats.nix +++ b/pkgs/development/libraries/qt-5/5.6/qtimageformats.nix diff --git a/pkgs/development/libraries/qt-5/5.4/qtlocation.nix b/pkgs/development/libraries/qt-5/5.6/qtlocation.nix index 0e2ad8bafb3..1e134057c4b 100644 --- a/pkgs/development/libraries/qt-5/5.4/qtlocation.nix +++ b/pkgs/development/libraries/qt-5/5.6/qtlocation.nix @@ -3,8 +3,4 @@ qtSubmodule { name = "qtlocation"; qtInputs = [ qtbase qtmultimedia ]; - postFixup = '' - fixQtModuleCMakeConfig "Location" - fixQtModuleCMakeConfig "Positioning" - ''; } diff --git a/pkgs/development/libraries/qt-5/5.4/qtmultimedia.nix b/pkgs/development/libraries/qt-5/5.6/qtmultimedia.nix index 9eb68ba6b5b..7c1cc5da07e 100644 --- a/pkgs/development/libraries/qt-5/5.4/qtmultimedia.nix +++ b/pkgs/development/libraries/qt-5/5.6/qtmultimedia.nix @@ -9,8 +9,4 @@ qtSubmodule { pkgconfig alsaLib gstreamer gst-plugins-base libpulseaudio ]; qmakeFlags = [ "GST_VERSION=1.0" ]; - postFixup = '' - fixQtModuleCMakeConfig "Multimedia" - fixQtModuleCMakeConfig "MultimediaWidgets" - ''; } diff --git a/pkgs/development/libraries/qt-5/5.4/qtquickcontrols.nix b/pkgs/development/libraries/qt-5/5.6/qtquickcontrols.nix index 93a864621b8..93a864621b8 100644 --- a/pkgs/development/libraries/qt-5/5.4/qtquickcontrols.nix +++ b/pkgs/development/libraries/qt-5/5.6/qtquickcontrols.nix diff --git a/pkgs/development/libraries/qt-5/5.4/qtscript/0001-glib-2.32.patch b/pkgs/development/libraries/qt-5/5.6/qtscript/0001-glib-2.32.patch index 887e107b6c1..887e107b6c1 100644 --- a/pkgs/development/libraries/qt-5/5.4/qtscript/0001-glib-2.32.patch +++ b/pkgs/development/libraries/qt-5/5.6/qtscript/0001-glib-2.32.patch diff --git a/pkgs/development/libraries/qt-5/5.4/qtscript/default.nix b/pkgs/development/libraries/qt-5/5.6/qtscript/default.nix index b81a43aeadb..127766e2ebd 100644 --- a/pkgs/development/libraries/qt-5/5.4/qtscript/default.nix +++ b/pkgs/development/libraries/qt-5/5.6/qtscript/default.nix @@ -4,7 +4,4 @@ qtSubmodule { name = "qtscript"; qtInputs = [ qtbase qttools ]; patches = [ ./0001-glib-2.32.patch ]; - postFixup = '' - fixQtModuleCMakeConfig "Script" - ''; } diff --git a/pkgs/development/libraries/qt-5/5.4/qtsensors.nix b/pkgs/development/libraries/qt-5/5.6/qtsensors.nix index 5776f45a706..61e64dc47e4 100644 --- a/pkgs/development/libraries/qt-5/5.4/qtsensors.nix +++ b/pkgs/development/libraries/qt-5/5.6/qtsensors.nix @@ -3,7 +3,4 @@ qtSubmodule { name = "qtsensors"; qtInputs = [ qtbase qtdeclarative ]; - postFixup = '' - fixQtModuleCMakeConfig "Sensors" - ''; } diff --git a/pkgs/development/libraries/qt-5/5.4/qtserialport/0001-dlopen-serialport-udev.patch b/pkgs/development/libraries/qt-5/5.6/qtserialport/0001-dlopen-serialport-udev.patch index 3a813dc8007..3a813dc8007 100644 --- a/pkgs/development/libraries/qt-5/5.4/qtserialport/0001-dlopen-serialport-udev.patch +++ b/pkgs/development/libraries/qt-5/5.6/qtserialport/0001-dlopen-serialport-udev.patch diff --git a/pkgs/development/libraries/qt-5/5.4/qtserialport/default.nix b/pkgs/development/libraries/qt-5/5.6/qtserialport/default.nix index 2c9575f122e..32549c95344 100644 --- a/pkgs/development/libraries/qt-5/5.4/qtserialport/default.nix +++ b/pkgs/development/libraries/qt-5/5.6/qtserialport/default.nix @@ -3,14 +3,10 @@ qtSubmodule { name = "qtserialport"; qtInputs = [ qtbase ]; - patches = [ (substituteAll { src = ./0001-dlopen-serialport-udev.patch; libudev = libudev.out; }) ]; - postFixup = '' - fixQtModuleCMakeConfig "SerialPort" - ''; } diff --git a/pkgs/development/libraries/qt-5/5.4/qtsvg.nix b/pkgs/development/libraries/qt-5/5.6/qtsvg.nix index a460d6da4c2..b9ccac7cf93 100644 --- a/pkgs/development/libraries/qt-5/5.4/qtsvg.nix +++ b/pkgs/development/libraries/qt-5/5.6/qtsvg.nix @@ -3,7 +3,4 @@ qtSubmodule { name = "qtsvg"; qtInputs = [ qtbase ]; - postFixup = '' - fixQtModuleCMakeConfig "Svg" - ''; } diff --git a/pkgs/development/libraries/qt-5/5.6/qttools.nix b/pkgs/development/libraries/qt-5/5.6/qttools.nix new file mode 100644 index 00000000000..4aeaea729a2 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.6/qttools.nix @@ -0,0 +1,10 @@ +{ qtSubmodule, qtbase, qtdeclarative }: + +qtSubmodule { + name = "qttools"; + qtInputs = [ qtbase qtdeclarative ]; + postFixup = '' + moveToOutput "bin/qdbus" "$out" + moveToOutput "bin/qtpaths" "$out" + ''; +} diff --git a/pkgs/development/libraries/qt-5/5.4/qttranslations.nix b/pkgs/development/libraries/qt-5/5.6/qttranslations.nix index 50fc8cf6826..50fc8cf6826 100644 --- a/pkgs/development/libraries/qt-5/5.4/qttranslations.nix +++ b/pkgs/development/libraries/qt-5/5.6/qttranslations.nix diff --git a/pkgs/development/libraries/qt-5/5.4/qtwebsockets.nix b/pkgs/development/libraries/qt-5/5.6/qtwebsockets.nix index c0d0f9e7d71..fbdfbbcf0db 100644 --- a/pkgs/development/libraries/qt-5/5.4/qtwebsockets.nix +++ b/pkgs/development/libraries/qt-5/5.6/qtwebsockets.nix @@ -3,7 +3,4 @@ qtSubmodule { name = "qtwebsockets"; qtInputs = [ qtbase qtdeclarative ]; - postFixup = '' - fixQtModuleCMakeConfig "WebSockets" - ''; } diff --git a/pkgs/development/libraries/qt-5/5.4/qtx11extras.nix b/pkgs/development/libraries/qt-5/5.6/qtx11extras.nix index db92f135362..a765161e2d7 100644 --- a/pkgs/development/libraries/qt-5/5.4/qtx11extras.nix +++ b/pkgs/development/libraries/qt-5/5.6/qtx11extras.nix @@ -3,7 +3,4 @@ qtSubmodule { name = "qtx11extras"; qtInputs = [ qtbase ]; - postFixup = '' - fixQtModuleCMakeConfig "X11Extras" - ''; } diff --git a/pkgs/development/libraries/qt-5/5.4/qtxmlpatterns.nix b/pkgs/development/libraries/qt-5/5.6/qtxmlpatterns.nix index 3b22132e4c3..9a8ddbba2bd 100644 --- a/pkgs/development/libraries/qt-5/5.4/qtxmlpatterns.nix +++ b/pkgs/development/libraries/qt-5/5.6/qtxmlpatterns.nix @@ -3,7 +3,4 @@ qtSubmodule { name = "qtxmlpatterns"; qtInputs = [ qtbase ]; - postFixup = '' - fixQtModuleCMakeConfig "XmlPatterns" - ''; } diff --git a/pkgs/development/libraries/qt-5/5.6/srcs.nix b/pkgs/development/libraries/qt-5/5.6/srcs.nix new file mode 100644 index 00000000000..9ddbbbde078 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.6/srcs.nix @@ -0,0 +1,261 @@ +# DO NOT EDIT! This file is generated automatically by manifest.sh +{ fetchurl, mirror }: + +{ + qttools = { + version = "5.6.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qttools-opensource-src-5.6.0.tar.xz"; + sha256 = "1791c9a1vxv0q2ywr00ya5rxaggidsq81s8h8fwmql75pdhlq90d"; + name = "qttools-opensource-src-5.6.0.tar.xz"; + }; + }; + qtwebengine = { + version = "5.6.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtwebengine-opensource-src-5.6.0.tar.xz"; + sha256 = "00vaqx3mypqlnjkfwhx54r6ygfs07amkwc4rma0sg64zdjnvb8la"; + name = "qtwebengine-opensource-src-5.6.0.tar.xz"; + }; + }; + qtserialbus = { + version = "5.6.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtserialbus-opensource-src-5.6.0.tar.xz"; + sha256 = "13hbmj9pilh5gkbbngfbp225qvc650pnzvpzawpnf69zwl757jlc"; + name = "qtserialbus-opensource-src-5.6.0.tar.xz"; + }; + }; + qtwayland = { + version = "5.6.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtwayland-opensource-src-5.6.0.tar.xz"; + sha256 = "1k5zsgz54wlkxm3ici55lbbz286bk2791vri02bjgja5y9102pdm"; + name = "qtwayland-opensource-src-5.6.0.tar.xz"; + }; + }; + qt5 = { + version = "5.6.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qt5-opensource-src-5.6.0.tar.xz"; + sha256 = "195dl9pk9slbiy6mgwwpc70vaw62sdhxc3lxmlnyddk99widqa3k"; + name = "qt5-opensource-src-5.6.0.tar.xz"; + }; + }; + qtimageformats = { + version = "5.6.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtimageformats-opensource-src-5.6.0.tar.xz"; + sha256 = "1nmsh682idxl0642q7376r9qfxkx0736q9pl4jx179c9lrsl519c"; + name = "qtimageformats-opensource-src-5.6.0.tar.xz"; + }; + }; + qtactiveqt = { + version = "5.6.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtactiveqt-opensource-src-5.6.0.tar.xz"; + sha256 = "0xrjr9jwkxxcv46a8vj77px3v1p36nm6rpvyxma0wb4xhpippp3a"; + name = "qtactiveqt-opensource-src-5.6.0.tar.xz"; + }; + }; + qtdoc = { + version = "5.6.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtdoc-opensource-src-5.6.0.tar.xz"; + sha256 = "1z69yl8nkvp21arjhzl34gr8gvxm5b03d58lwnddl4mkaxbi4vap"; + name = "qtdoc-opensource-src-5.6.0.tar.xz"; + }; + }; + qtsensors = { + version = "5.6.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtsensors-opensource-src-5.6.0.tar.xz"; + sha256 = "0blwqmkh0hn1716d5fvy0vnh56y9iikl34ayz6ksl0ayxhpkk3si"; + name = "qtsensors-opensource-src-5.6.0.tar.xz"; + }; + }; + qtwebchannel = { + version = "5.6.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtwebchannel-opensource-src-5.6.0.tar.xz"; + sha256 = "0ky1njksczyfb7y7p5kfgzbx9vgajzy51g2y3vrpfvl6bs9j8m62"; + name = "qtwebchannel-opensource-src-5.6.0.tar.xz"; + }; + }; + qtmacextras = { + version = "5.6.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtmacextras-opensource-src-5.6.0.tar.xz"; + sha256 = "1jkmwppapvymdr1kwdrbjlxhcafcn4jb23ssnhrvvgcq3lnl5lhj"; + name = "qtmacextras-opensource-src-5.6.0.tar.xz"; + }; + }; + qtwebsockets = { + version = "5.6.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtwebsockets-opensource-src-5.6.0.tar.xz"; + sha256 = "17vi3n27gx3f3c2lii3b70pzz6mpblam3236v6mj439xzrlvi2i6"; + name = "qtwebsockets-opensource-src-5.6.0.tar.xz"; + }; + }; + qtconnectivity = { + version = "5.6.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtconnectivity-opensource-src-5.6.0.tar.xz"; + sha256 = "1ss0ibabiv7n5hakkxmkc4msrwgqcvfffdjajnv5jrq0030v0p0c"; + name = "qtconnectivity-opensource-src-5.6.0.tar.xz"; + }; + }; + qtscript = { + version = "5.6.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtscript-opensource-src-5.6.0.tar.xz"; + sha256 = "0hjhkh4lia1i0iir1i8dr57gizi74h73j0phhir3q3wsglcpax5c"; + name = "qtscript-opensource-src-5.6.0.tar.xz"; + }; + }; + qttranslations = { + version = "5.6.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qttranslations-opensource-src-5.6.0.tar.xz"; + sha256 = "0jfdfj2z0nvf1xblmdxaphn0psjycrb5g3jxxcddkci214gka2cq"; + name = "qttranslations-opensource-src-5.6.0.tar.xz"; + }; + }; + qtlocation = { + version = "5.6.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtlocation-opensource-src-5.6.0.tar.xz"; + sha256 = "1jakjrwic01b5vyij6hfzdfpipandpkj9li3d7wf9bzws0cia3in"; + name = "qtlocation-opensource-src-5.6.0.tar.xz"; + }; + }; + qtserialport = { + version = "5.6.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtserialport-opensource-src-5.6.0.tar.xz"; + sha256 = "07rwhmh9y7b3ycvx4d4d1j32nahf8nhsb9qj99kxz5xrdfv7zvhn"; + name = "qtserialport-opensource-src-5.6.0.tar.xz"; + }; + }; + qtsvg = { + version = "5.6.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtsvg-opensource-src-5.6.0.tar.xz"; + sha256 = "07v4bzxd31dhkhp52y4g2ii0sslmk48cqkkz32v41frqj4qrk1vr"; + name = "qtsvg-opensource-src-5.6.0.tar.xz"; + }; + }; + qtwebview = { + version = "5.6.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtwebview-opensource-src-5.6.0.tar.xz"; + sha256 = "0mqbh125bq37xybwslhri4pl861r26cnraiz9ivh4881kqzab3x4"; + name = "qtwebview-opensource-src-5.6.0.tar.xz"; + }; + }; + qtcanvas3d = { + version = "5.6.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtcanvas3d-opensource-src-5.6.0.tar.xz"; + sha256 = "1kwykm1ffgpjgb3ggd4h2d2x3yhp9jsc0gnwlks620bahagdbbb6"; + name = "qtcanvas3d-opensource-src-5.6.0.tar.xz"; + }; + }; + qtwinextras = { + version = "5.6.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtwinextras-opensource-src-5.6.0.tar.xz"; + sha256 = "14xvm081wjyild2wi7pcilqxdkhc8b0lf9yn7yf7zp576i9ir5aq"; + name = "qtwinextras-opensource-src-5.6.0.tar.xz"; + }; + }; + qtgraphicaleffects = { + version = "5.6.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtgraphicaleffects-opensource-src-5.6.0.tar.xz"; + sha256 = "1s0n8hrmrfs53cmm7i45p8zavvmsl0aisd5sgj93p8c5rzyi3s81"; + name = "qtgraphicaleffects-opensource-src-5.6.0.tar.xz"; + }; + }; + qtxmlpatterns = { + version = "5.6.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtxmlpatterns-opensource-src-5.6.0.tar.xz"; + sha256 = "1m0rr0m9zg2d6rdban2p5qyx8rdnjnjsfk3bm72bh47hscxipvds"; + name = "qtxmlpatterns-opensource-src-5.6.0.tar.xz"; + }; + }; + qtquickcontrols2 = { + version = "5.6.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtquickcontrols2-opensource-src-5.6.0.tar.xz"; + sha256 = "1q7yp7l32jd3p28587ldxzkj58z1aad9gcs80w6vqc9952i6xv2r"; + name = "qtquickcontrols2-opensource-src-5.6.0.tar.xz"; + }; + }; + qtbase = { + version = "5.6.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtbase-opensource-src-5.6.0.tar.xz"; + sha256 = "0ynnvcs5idivzldsq5ciqg9myg82b3l3906l4vjv54lyamf8mykf"; + name = "qtbase-opensource-src-5.6.0.tar.xz"; + }; + }; + qt3d = { + version = "5.6.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qt3d-opensource-src-5.6.0.tar.xz"; + sha256 = "17a37xhav5mxspx2c9wsgvcilv7ys40q6minmlqd1gnfmsfphqdr"; + name = "qt3d-opensource-src-5.6.0.tar.xz"; + }; + }; + qtenginio = { + version = "1.6.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtenginio-opensource-src-1.6.0.tar.xz"; + sha256 = "033z2jncci64s7s9ml5rsfsnrkdmhx1g5dfvr61imv63pzxxqzb2"; + name = "qtenginio-opensource-src-1.6.0.tar.xz"; + }; + }; + qtx11extras = { + version = "5.6.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtx11extras-opensource-src-5.6.0.tar.xz"; + sha256 = "099lc7kxcxgp5s01ddnd6n955fc8866caark43xfs2dw0a6pdva7"; + name = "qtx11extras-opensource-src-5.6.0.tar.xz"; + }; + }; + qtdeclarative = { + version = "5.6.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtdeclarative-opensource-src-5.6.0.tar.xz"; + sha256 = "0k70zlyx1nh35caiav4s3jvg5l029pvilm6sarxmfj73y19z0mcc"; + name = "qtdeclarative-opensource-src-5.6.0.tar.xz"; + }; + }; + qtmultimedia = { + version = "5.6.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtmultimedia-opensource-src-5.6.0.tar.xz"; + sha256 = "11h66xcr3y3w8hhvx801r66yirvf1kppasjlhm25qvr6rpb9jgqh"; + name = "qtmultimedia-opensource-src-5.6.0.tar.xz"; + }; + }; + qtquickcontrols = { + version = "5.6.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtquickcontrols-opensource-src-5.6.0.tar.xz"; + sha256 = "12vqkxpz5y2bbh083lpsxcianykl8x7am49pmc4x221a5xwrc27c"; + name = "qtquickcontrols-opensource-src-5.6.0.tar.xz"; + }; + }; + qtandroidextras = { + version = "5.6.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtandroidextras-opensource-src-5.6.0.tar.xz"; + sha256 = "1qhrn8vhfn0z73bc2ls1b4zfvr7r5gn7b5xdmjp26hi338j55vp0"; + name = "qtandroidextras-opensource-src-5.6.0.tar.xz"; + }; + }; +} diff --git a/pkgs/development/libraries/science/math/atlas/default.nix b/pkgs/development/libraries/science/math/atlas/default.nix index 9779af6addc..db8aff49c00 100644 --- a/pkgs/development/libraries/science/math/atlas/default.nix +++ b/pkgs/development/libraries/science/math/atlas/default.nix @@ -49,7 +49,7 @@ let in stdenv.mkDerivation { - name = "atlas-${version}" + optionalString withLapack "-with-lapack"; + name = "atlas${optionalString withLapack "-with-lapack"}-${version}"; src = fetchurl { url = "mirror://sourceforge/math-atlas/atlas${version}.tar.bz2"; diff --git a/pkgs/development/libraries/science/math/liblapack/3.5.0.nix b/pkgs/development/libraries/science/math/liblapack/3.5.0.nix index ef89c0bfee2..1d05e6bb2a3 100644 --- a/pkgs/development/libraries/science/math/liblapack/3.5.0.nix +++ b/pkgs/development/libraries/science/math/liblapack/3.5.0.nix @@ -59,8 +59,6 @@ stdenv.mkDerivation rec { description = "Linear Algebra PACKage"; homepage = "http://www.netlib.org/lapack/"; license = licenses.bsd3; - platforms = platforms.all; - maintainers = [ maintainers.simons ]; }; } diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix index f3832ba0a20..80b66c5ab16 100644 --- a/pkgs/development/libraries/science/math/liblapack/default.nix +++ b/pkgs/development/libraries/science/math/liblapack/default.nix @@ -59,8 +59,6 @@ stdenv.mkDerivation rec { description = "Linear Algebra PACKage"; homepage = "http://www.netlib.org/lapack/"; license = licenses.bsd3; - platforms = platforms.all; - maintainers = [ maintainers.simons ]; }; } diff --git a/pkgs/development/libraries/signon/default.nix b/pkgs/development/libraries/signon/default.nix deleted file mode 100644 index f2f7de5b712..00000000000 --- a/pkgs/development/libraries/signon/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, fetchurl, doxygen, qtbase, qmakeHook }: - -stdenv.mkDerivation rec { - name = "signon-${version}"; - version = "8.57"; - src = fetchurl { - url = "https://gitlab.com/accounts-sso/signond/repository/archive.tar.gz?ref=${version}"; - sha256 = "1vqkxhmdjk3217k38l2s3wld8x7f4jrbbh6xbr036cn1r23ncni5"; - }; - - buildInputs = [ qtbase ]; - nativeBuildInputs = [ doxygen qmakeHook ]; - - preConfigure = '' - qmakeFlags="$qmakeFlags LIBDIR=$out/lib CMAKE_CONFIG_PATH=$out/lib/cmake/SignOnQt5" - ''; - -} diff --git a/pkgs/development/libraries/soundtouch/default.nix b/pkgs/development/libraries/soundtouch/default.nix index dcb09af84f9..14eb5a24056 100644 --- a/pkgs/development/libraries/soundtouch/default.nix +++ b/pkgs/development/libraries/soundtouch/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pName = "soundtouch"; - name = "${pName}-1.8.0"; + name = "${pName}-1.9.2"; src = fetchurl { url = "http://www.surina.net/soundtouch/${name}.tar.gz"; - sha256 = "3d4161d74ca25c5a98c69dbb8ea10fd2be409ba1a3a0bf81db407c4c261f166b"; + sha256 = "04y5l56yn4jvwpv9mn1p3m2vi5kdym9xpdac8pmhwhl13r8qdsya"; }; buildInputs = [ autoconf automake libtool ]; diff --git a/pkgs/development/libraries/spdlog/default.nix b/pkgs/development/libraries/spdlog/default.nix new file mode 100644 index 00000000000..1c3952e7adf --- /dev/null +++ b/pkgs/development/libraries/spdlog/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + name = "spdlog-${version}"; + version = stdenv.lib.strings.substring 0 7 rev; + rev = "292bdc5eb4929f183c78d2c67082b715306f81c9"; + + src = fetchFromGitHub { + owner = "gabime"; + repo = "spdlog"; + inherit rev; + sha256 = "1b6b0c81a8hisaibqlzj5mrk3snrfl8p5sqa056q2f02i62zksbn"; + }; + + buildInputs = [ cmake ]; + + # cmakeFlags = [ "-DSPDLOG_BUILD_EXAMPLES=ON" ]; + + outputs = [ "out" "doc" ]; + + postInstall = '' + mkdir -p $out/share/doc/spdlog + cp -rv ../example $out/share/doc/spdlog + ''; + + meta = with stdenv.lib; { + description = "Very fast, header only, C++ logging library."; + homepage = https://github.com/gabime/spdlog; + license = licenses.mit; + maintainers = with maintainers; [ obadz ]; + platforms = platforms.all; + + # This is a header-only library, no point in hydra building it: + hydraPlatforms = []; + }; +} diff --git a/pkgs/development/libraries/svrcore/default.nix b/pkgs/development/libraries/svrcore/default.nix index a5559e87aad..ddb880e6bf2 100644 --- a/pkgs/development/libraries/svrcore/default.nix +++ b/pkgs/development/libraries/svrcore/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "4.0.4"; src = fetchurl { - url = "https://ftp.mozilla.org/pub/directory/svrcore/releases/${version}/src/${name}.tar.bz2"; + url = "mirror://mozilla/directory/svrcore/releases/${version}/src/${name}.tar.bz2"; sha256 = "0n3alg6bxml8952fb6h0bi0l29farvq21q6k20gy2ba90m3znwj7"; }; diff --git a/pkgs/development/libraries/swiften/default.nix b/pkgs/development/libraries/swiften/default.nix index 64ea6fa0e74..46ecada9668 100644 --- a/pkgs/development/libraries/swiften/default.nix +++ b/pkgs/development/libraries/swiften/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { patchShebangs ./scons ./scons openssl=${openssl} \ boost_includedir=${boost.dev}/include \ - boost_libdir=${boost.lib}/lib \ + boost_libdir=${boost.out}/lib \ boost_bundled_enable=false \ SWIFTEN_INSTALLDIR=$out $out ''; diff --git a/pkgs/development/libraries/tbb/default.nix b/pkgs/development/libraries/tbb/default.nix index 31fc5401e75..8a91086c5db 100644 --- a/pkgs/development/libraries/tbb/default.nix +++ b/pkgs/development/libraries/tbb/default.nix @@ -37,6 +37,6 @@ stdenv.mkDerivation { details and threading mechanisms for scalability and performance. ''; platforms = with stdenv.lib.platforms; linux ++ darwin; - maintainers = with stdenv.lib.maintainers; [ simons thoughtpolice ]; + maintainers = with stdenv.lib.maintainers; [ peti thoughtpolice ]; }; } diff --git a/pkgs/development/libraries/tecla/default.nix b/pkgs/development/libraries/tecla/default.nix index f83b34e40d1..6f30497d870 100644 --- a/pkgs/development/libraries/tecla/default.nix +++ b/pkgs/development/libraries/tecla/default.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation rec { license = "as-is"; hydraPlatforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.simons ]; + maintainers = [ stdenv.lib.maintainers.peti ]; }; } diff --git a/pkgs/development/libraries/udns/default.nix b/pkgs/development/libraries/udns/default.nix new file mode 100644 index 00000000000..9d781b301a0 --- /dev/null +++ b/pkgs/development/libraries/udns/default.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchurl }: + +# this expression is mostly based on debian's packaging +# https://tracker.debian.org/media/packages/u/udns/rules-0.4-1 + +stdenv.mkDerivation rec { + name = "udns-${version}"; + version = "0.4"; + + configurePhase = "./configure --enable-ipv6"; + + buildPhase = "make staticlib sharedlib rblcheck_s dnsget_s"; + + src = fetchurl { + url = "http://www.corpit.ru/mjt/udns/${name}.tar.gz"; + sha256 = "0447fv1hmb44nnchdn6p5pd9b44x8p5jn0ahw6crwbqsg7f0hl8i"; + }; + + installPhase = '' + mkdir -p $out/bin + mkdir -p $out/include + mkdir -p $out/lib + mkdir -p $out/share/man/man1 + mkdir -p $out/share/man/man3 + cp dnsget_s $out/bin/dnsget + cp rblcheck_s $out/bin/rblcheck + cp udns.h $out/include/ + cp libudns.a $out/lib/ + cp libudns.so.0 $out/lib/ + ln -rs $out/lib/libudns.so.0 $out/lib/libudns.so + cp dnsget.1 rblcheck.1 $out/share/man/man1 + cp udns.3 $out/share/man/man3 + ''; + + # keep man3 + outputDocdev = "out"; + + meta = with stdenv.lib; { + homepage = http://www.corpit.ru/mjt/udns.html; + description = "Async-capable DNS stub resolver library"; + license = licenses.lgpl21Plus; + maintainers = [ maintainers.womfoo ]; + platforms = platforms.linux; + }; + +} diff --git a/pkgs/development/libraries/unixODBC/default.nix b/pkgs/development/libraries/unixODBC/default.nix index ef8dcdc5329..e40f362a3b1 100644 --- a/pkgs/development/libraries/unixODBC/default.nix +++ b/pkgs/development/libraries/unixODBC/default.nix @@ -1,10 +1,20 @@ -{stdenv, fetchurl}: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "unixODBC-2.3.2"; + name = "unixODBC-${version}"; + version = "2.3.4"; + src = fetchurl { url = "ftp://ftp.unixodbc.org/pub/unixODBC/${name}.tar.gz"; - sha256 = "16jw5fq7wgfky6ak1h2j2pqx99jivsdl4q8aq6immpr55xs5jd4w"; + sha256 = "0f8y88rcc2akjvjv5y66yx7k0ms9h1s0vbcfy25j93didflhj59f"; + }; + + configureFlags = [ "--disable-gui" "--sysconfdir=/etc" ]; + + meta = with stdenv.lib; { + description = "ODBC driver manager for Unix"; + homepage = http://www.unixodbc.org/; + license = licenses.lgpl2; + platforms = platforms.linux; }; - configureFlags = "--disable-gui --sysconfdir=/etc"; } diff --git a/pkgs/development/libraries/unixODBCDrivers/default.nix b/pkgs/development/libraries/unixODBCDrivers/default.nix index d3a2debbd12..80b39bd4cab 100644 --- a/pkgs/development/libraries/unixODBCDrivers/default.nix +++ b/pkgs/development/libraries/unixODBCDrivers/default.nix @@ -1,115 +1,130 @@ -{fetchurl, stdenv, unixODBC, glibc, libtool, openssl, zlib, postgresql, mysql, sqlite}: -# each attr contains the name deriv referencing the derivation and ini which -# evaluates to a string which can be appended to the global unix odbc ini file -# to register the driver +{ fetchurl, stdenv, unixODBC, cmake, postgresql, mysql55, mariadb, sqlite, zlib, libxml2 }: + # I haven't done any parameter tweaking.. So the defaults provided here might be bad + { -# new postgres connector library (doesn't work yet) - psqlng = rec { - deriv = stdenv.mkDerivation { - name = "unix-odbc-pg-odbcng-0.90.101"; - buildInputs = [ unixODBC glibc libtool postgresql ]; - # added -ltdl to resolve missing references `dlsym' `dlerror' `dlopen' `dlclose' - preConfigure=" - export CPPFLAGS=-I${unixODBC}/include - export LDFLAGS='-L${unixODBC}/lib -lltdl' - "; - src = fetchurl { - # using my mirror because original url is https - # https://projects.commandprompt.com/public/odbcng/attachment/wiki/Downloads/odbcng-0.90.101.tar.gz"; - url = http://mawercer.de/~publicrepos/odbcng-0.90.101.tar.gz; - sha256 = "13z3sify4z2jcil379704w0knkpflg6di4jh6zx1x2gdgzydxa1y"; - }; - meta = { - description = "unix odbc driver for postgresql"; - homepage = https://projects.commandprompt.com/public/odbcng; - license = stdenv.lib.licenses.gpl2; - }; + psql = stdenv.mkDerivation rec { + name = "psqlodbc-${version}"; + version = "09.05.0210"; + + src = fetchurl { + url = "http://ftp.postgresql.org/pub/odbc/versions/src/${name}.tar.gz"; + sha256 = "0317zrxaiy209xzcc6b5sz6hsyiv4zm74iikp91rgz7z3ll4n4dc"; + }; + + buildInputs = [ unixODBC postgresql ]; + + passthru = { + fancyName = "PostgreSQL"; + driver = "lib/psqlodbcw.so"; + }; + + meta = with stdenv.lib; { + description = "Official PostgreSQL ODBC Driver"; + homepage = https://odbc.postgresql.org/; + license = licenses.lgpl2; + platforms = platforms.linux; }; - ini = ""; }; -# official postgres connector - psql = rec { - deriv = stdenv.mkDerivation rec { - name = "psqlodbc-09.03.0100"; - buildInputs = [ unixODBC libtool postgresql openssl ]; - preConfigure=" - export CPPFLAGS=-I${unixODBC}/include - export LDFLAGS='-L${unixODBC}/lib -lltdl' - "; - # added -ltdl to resolve missing references `dlsym' `dlerror' `dlopen' `dlclose' + + mariadb = stdenv.mkDerivation rec { + name = "mariadb-connector-odbc-${version}"; + version = "2.0.10"; + src = fetchurl { - url = "http://ftp.postgresql.org/pub/odbc/versions/src/${name}.tar.gz"; - sha256 = "0mh10chkmlppidnmvgbp47v5jnphsrls28zwbvyk2crcn8gdx9q1"; + url = "https://downloads.mariadb.org/interstitial/connector-odbc-${version}/src/${name}-ga-src.tar.gz"; + sha256 = "0b6ximy0dg0xhqbrm1l7pn8hjapgpmddi67kh54h6i9cq9hqfdvz"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ unixODBC mariadb ]; + + cmakeFlags = [ + "-DMARIADB_INCLUDE_DIR=${mariadb.lib}/include/mysql" + ]; + + preConfigure = '' + sed -i \ + -e 's,mariadb_config,mysql_config,g' \ + -e 's,libmariadbclient,libmysqlclient,g' \ + cmake/FindMariaDB.cmake + ''; + + passthru = { + fancyName = "MariaDB"; + driver = "lib/libmyodbc3-3.51.12.so"; }; - meta = { - description = "unix odbc driver for postgresql"; - homepage = http://pgfoundry.org/projects/psqlodbc/; - license = "LGPL"; + + meta = with stdenv.lib; { + description = "MariaDB ODBC database driver"; + homepage = https://downloads.mariadb.org/connector-odbc/; + license = licenses.gpl2; + platforms = platforms.linux; + broken = true; + }; + }; + + mysql = stdenv.mkDerivation rec { + name = "mysql-connector-odbc-${version}"; + majorVersion = "5.3"; + version = "${majorVersion}.6"; + + src = fetchurl { + url = "https://dev.mysql.com/get/Downloads/Connector-ODBC/${majorVersion}/${name}-src.tar.gz"; + sha256 = "1smi4z49i4zm7cmykjkwlxxzqvn7myngsw5bc35z6gqxmi8c55xr"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ unixODBC mysql55 ]; + + cmakeFlags = [ "-DWITH_UNIXODBC=1" ]; + + passthru = { + fancyName = "MySQL"; + driver = "lib/libmyodbc3-3.51.12.so"; + }; + + meta = with stdenv.lib; { + description = "MariaDB ODBC database driver"; + homepage = https://dev.mysql.com/downloads/connector/odbc/; + license = licenses.gpl2; + platforms = platforms.linux; + broken = true; }; }; - ini = - "[PostgreSQL]\n" + - "Description = official PostgreSQL driver for Linux & Win32\n" + - "Driver = ${deriv}/lib/psqlodbcw.so\n" + - "Threading = 2\n"; - }; -# mysql connector - mysql = rec { - libraries = ["lib/libmyodbc3-3.51.12.so"]; - deriv = stdenv.mkDerivation { - name = "mysql-connector-odbc-3.51.12"; - src = fetchurl { - url = http://ftp.snt.utwente.nl/pub/software/mysql/Downloads/MyODBC3/mysql-connector-odbc-3.51.12.tar.gz; - md5 = "a484f590464fb823a8f821b2f1fd7fef"; - }; - configureFlags = "--disable-gui" - + " --with-mysql-path=${mysql.lib} --with-unixODBC=${unixODBC}"; - buildInputs = [ libtool zlib ]; - inherit mysql unixODBC; + + sqlite = stdenv.mkDerivation rec { + name = "sqlite-connector-odbc-${version}"; + version = "0.9993"; + + src = fetchurl { + url = "http://www.ch-werner.de/sqliteodbc/sqliteodbc-${version}.tar.gz"; + sha256 = "0dgsj28sc7f7aprmdd0n5a1rmcx6pv7170c8dfjl0x1qsjxim6hs"; }; - ini = - "[MYSQL]\n" + - "Description = MySQL driver\n" + - "Driver = ${deriv}/lib/libmyodbc3-3.51.12.so\n" + - "CPTimeout = \n" + - "CPReuse = \n" + - "FileUsage = 3\n "; - }; - sqlite = rec { - deriv = let version = "0.995"; in - stdenv.mkDerivation { - name = "sqlite-connector-odbc-${version}"; - - src = fetchurl { - url = "http://www.ch-werner.de/sqliteodbc/sqliteodbc-${version}.tar.gz"; - sha256 = "1r97fw6xy5w2f8c0ii7blfqfi6salvd3k8wnxpx9wqc1gxk8jnyy"; - }; - - buildInputs = [ sqlite ]; - - configureFlags = "--with-sqlite3=${sqlite} --with-odbc=${unixODBC}"; - - # move libraries to $out/lib where they're expected to be - postInstall = '' - mkdir -p "$out/lib" - mv "$out"/*.so "$out/lib" - mv "$out"/*.la "$out/lib" - ''; - - meta = { - description = "ODBC driver for SQLite"; - homepage = http://www.ch-werner.de/sqliteodbc; - license = stdenv.lib.licenses.bsd2; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ vlstill ]; - }; + + buildInputs = [ unixODBC sqlite zlib libxml2 ]; + + configureFlags = [ "--with-odbc=${unixODBC}" ]; + + installTargets = [ "install-3" ]; + + # move libraries to $out/lib where they're expected to be + postInstall = '' + mkdir -p "$out/lib" + mv "$out"/*.* "$out/lib" + ''; + + passthru = { + fancyName = "SQLite"; + driver = "lib/libsqlite3odbc.so"; + }; + + meta = with stdenv.lib; { + description = "ODBC driver for SQLite"; + homepage = http://www.ch-werner.de/sqliteodbc; + license = licenses.bsd2; + platforms = platforms.linux; + maintainers = with maintainers; [ vlstill ]; }; - ini = - "[SQLite]\n" + - "Description = SQLite ODBC Driver\n" + - "Driver = ${deriv}/lib/libsqlite3odbc.so\n" + - "Setup = ${deriv}/lib/libsqlite3odbc.so\n" + - "Threading = 2\n"; - }; + }; } diff --git a/pkgs/development/libraries/uthash/default.nix b/pkgs/development/libraries/uthash/default.nix index 5f3b71131e0..511129de1e8 100644 --- a/pkgs/development/libraries/uthash/default.nix +++ b/pkgs/development/libraries/uthash/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "035z3cs5ignywgh4wqxx358a2nhn3lj0x1ifij6vj0yyyhah3wgj"; }; - buildPhase = ":"; + dontBuild = false; buildInputs = stdenv.lib.optional doCheck perl; diff --git a/pkgs/development/libraries/webkitgtk/2.12.nix b/pkgs/development/libraries/webkitgtk/2.12.nix index 70467a25360..313f67b1b6a 100644 --- a/pkgs/development/libraries/webkitgtk/2.12.nix +++ b/pkgs/development/libraries/webkitgtk/2.12.nix @@ -40,13 +40,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake perl python ruby bison gperf sqlite pkgconfig gettext gobjectIntrospection - ] ++ (with xlibs; [ libXdmcp ]); + ]; buildInputs = [ gtk2 wayland libwebp enchant libnotify libxml2 libsecret libxslt harfbuzz libpthreadstubs gst-plugins-base libxkbcommon epoxy at_spi2_core - ] ++ optional enableGeoLocation geoclue2; + ] ++ optional enableGeoLocation geoclue2 + ++ (with xlibs; [ libXdmcp libXt libXtst ]); propagatedBuildInputs = [ libsoup gtk3 diff --git a/pkgs/development/libraries/xcb-util-cursor/HEAD.nix b/pkgs/development/libraries/xcb-util-cursor/HEAD.nix index cf14490c514..8bd7a90ad5a 100644 --- a/pkgs/development/libraries/xcb-util-cursor/HEAD.nix +++ b/pkgs/development/libraries/xcb-util-cursor/HEAD.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, bashInteractive, autoconf, automake, libtool, pkgconfig +{ stdenv, fetchgit, autoconf, automake, libtool, pkgconfig , git, xorg, gnum4, libxcb, gperf }: stdenv.mkDerivation rec { @@ -18,6 +18,8 @@ stdenv.mkDerivation rec { platforms = platforms.linux ++ platforms.darwin; }; + outputs = [ "dev" "out" ]; + buildInputs = [ autoconf automake @@ -34,6 +36,6 @@ stdenv.mkDerivation rec { configurePhase = '' sed -i '15 i\ LT_INIT' configure.ac - ${bashInteractive}/bin/bash autogen.sh --prefix="$out" + ${stdenv.shell} autogen.sh --prefix="$out" ''; } diff --git a/pkgs/development/libraries/xgboost/default.nix b/pkgs/development/libraries/xgboost/default.nix new file mode 100644 index 00000000000..afe4ce4448b --- /dev/null +++ b/pkgs/development/libraries/xgboost/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchgit }: + +stdenv.mkDerivation rec { + name = "xgboost-${version}"; + version = "2016-05-14"; + + # needs submodules + src = fetchgit { + url = "https://github.com/dmlc/xgboost"; + rev = "9c26566eb09733423f821f139938ff4105c3775d"; + sha256 = "0nmhgl70mnc2igkfppdw2in66zdczzsqxrlsb4bknrglpp3axnm1"; + }; + + enableParallelBuilding = true; + + installPhase = '' + mkdir -p $out + cp -r include $out + install -Dm755 lib/libxgboost.so $out/lib/libxgboost.so + install -Dm755 xgboost $out/bin/xgboost + ''; + + meta = with stdenv.lib; { + description = "Scalable, Portable and Distributed Gradient Boosting (GBDT, GBRT or GBM) Library"; + homepage = "https://github.com/dmlc/xgboost"; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/development/libraries/xlibs-wrapper/default.nix b/pkgs/development/libraries/xlibs-wrapper/default.nix index fcdab133e2f..ffc58d9ad4b 100644 --- a/pkgs/development/libraries/xlibs-wrapper/default.nix +++ b/pkgs/development/libraries/xlibs-wrapper/default.nix @@ -2,9 +2,12 @@ stdenv.mkDerivation { name = "xlibs-wrapper"; - buildPhase = "true"; + + dontBuild = true; + installPhase = "mkdir -p $out"; unpackPhase = "sourceRoot=."; + propagatedBuildInputs = packages; preferLocalBuild = true; diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix index 6d0f8185921..77f576239a9 100644 --- a/pkgs/development/libraries/zlib/default.nix +++ b/pkgs/development/libraries/zlib/default.nix @@ -54,21 +54,25 @@ stdenv.mkDerivation rec { crossAttrs = { dontStrip = static; + dontSetConfigureCross = true; } // stdenv.lib.optionalAttrs (stdenv.cross.libc == "msvcrt") { - configurePhase='' - installFlags="BINARY_PATH=$out/bin INCLUDE_PATH=$out/include LIBRARY_PATH=$out/lib" - ''; + installFlags = [ + "BINARY_PATH=$(out)/bin" + "INCLUDE_PATH=$(dev)/include" + "LIBRARY_PATH=$(out)/lib" + ]; makeFlags = [ "-f" "win32/Makefile.gcc" "PREFIX=${stdenv.cross.config}-" - ] ++ (if static then [] else [ "SHARED_MODE=1" ]); + ] ++ stdenv.lib.optional (!static) "SHARED_MODE=1"; + + # Non-typical naming confuses libtool which then refuses to use zlib's DLL + # in some cases, e.g. when compiling libpng. + postInstall = postInstall + "ln -s zlib1.dll $out/bin/libz.dll"; } // stdenv.lib.optionalAttrs (stdenv.cross.libc == "libSystem") { makeFlags = [ "RANLIB=${stdenv.cross.config}-ranlib" ]; }; - # CYGXXX: This is not needed anymore and non-functional, but left not to trigger rebuilds - cygwinConfigureEnableShared = if (!stdenv.isCygwin) then true else null; - passthru.version = version; meta = with stdenv.lib; { |