diff options
Diffstat (limited to 'pkgs/development/libraries')
224 files changed, 1509 insertions, 3141 deletions
diff --git a/pkgs/development/libraries/accelio/default.nix b/pkgs/development/libraries/accelio/default.nix index 80b0eba60bd..637976977b1 100644 --- a/pkgs/development/libraries/accelio/default.nix +++ b/pkgs/development/libraries/accelio/default.nix @@ -47,7 +47,11 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://www.accelio.org/; - description = "a high-performance asynchronous reliable messaging and RPC library optimized for hardware acceleration"; + description = "High-performance messaging and RPC library"; + longDescription = '' + A high-performance asynchronous reliable messaging and RPC library + optimized for hardware acceleration. + ''; license = licenses.bsd3; platforms = with platforms; linux ++ freebsd; maintainers = with maintainers; [ wkennington ]; diff --git a/pkgs/development/libraries/allegro/5-unstable.nix b/pkgs/development/libraries/allegro/5-unstable.nix index dd0df768a68..e5a2c38ddab 100644 --- a/pkgs/development/libraries/allegro/5-unstable.nix +++ b/pkgs/development/libraries/allegro/5-unstable.nix @@ -1,61 +1,36 @@ - -x@{builderDefsPackage - , texinfo, libXext, xextproto, libX11, xproto, libXpm, libXt, libXcursor - , alsaLib, cmake, zlib, libpng, libvorbis, libXxf86dga, libXxf86misc - , xf86dgaproto, xf86miscproto, xf86vidmodeproto, libXxf86vm, openal, mesa - , kbproto, libjpeg, flac, inputproto, libXi, fixesproto, libXfixes - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - []; - - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); - sourceInfo = rec { - baseName="allegro"; - folderSuffix = "-unstable"; - version = "5.1.11"; - name="${baseName}-${version}"; - project="alleg"; - url="mirror://sourceforge/project/${project}/${baseName}${folderSuffix}/${version}/${name}.tar.gz"; - hash="18fdppaqaf3g3rcqwhyvsmkzk3y14clz4l8cvmg4hvjgyf011f3i"; - }; -in -rec { - src = a.fetchurl { - url = sourceInfo.url; +{ stdenv, fetchurl, texinfo, libXext, xextproto, libX11, xproto +, libXpm, libXt, libXcursor, alsaLib, cmake, zlib, libpng, libvorbis +, libXxf86dga, libXxf86misc, xf86dgaproto, xf86miscproto +, xf86vidmodeproto, libXxf86vm, openal, mesa, kbproto, libjpeg, flac +, inputproto, libXi, fixesproto, libXfixes }: + +stdenv.mkDerivation rec { + name = "allegro-${version}"; + version = "5.1.11"; + + src = fetchurl { + url = "http://download.gna.org/allegro/allegro-unstable/${version}/${name}.tar.gz"; sha256 = "0zz07gdyc6xflpvkknwgzsyyyh9qiwd69j42rm9cw1ciwcsic1vs"; }; - inherit (sourceInfo) name version; - inherit buildInputs; - - /* doConfigure should be removed if not needed */ - phaseNames = ["patchIncludes" "doCmake" "doMakeInstall"]; - - patchIncludes = a.fullDepEntry '' - sed -e 's@/XInput2.h@/XI2.h@g' -i CMakeLists.txt src/*.c - '' ["minInit" "doUnpack"]; + buildInputs = [ + texinfo libXext xextproto libX11 xproto libXpm libXt libXcursor + alsaLib cmake zlib libpng libvorbis libXxf86dga libXxf86misc + xf86dgaproto xf86miscproto xf86vidmodeproto libXxf86vm openal mesa + kbproto libjpeg flac inputproto libXi fixesproto libXfixes + ]; - doCmake = a.fullDepEntry ('' - export NIX_LDFLAGS="$NIX_LDFLAGS -lXext -lX11 -lXpm -lXcursor -lXxf86vm -lXi -lXfixes" - cmake -D CMAKE_INSTALL_PREFIX=$out -D CMAKE_SKIP_RPATH=ON . - '') ["minInit" "doUnpack" "addInputs"]; + patchPhase = '' + sed -e 's@/XInput2.h@/XI2.h@g' -i CMakeLists.txt "src/"*.c + ''; - makeFlags = [ - ]; + cmakeFlags = [ "-DCMAKE_SKIP_RPATH=ON" ]; - meta = { + meta = with stdenv.lib; { description = "A game programming library"; - license = a.lib.licenses.free; # giftware - maintainers = with a.lib.maintainers; - [ - raskin - ]; - platforms = with a.lib.platforms; - linux; - inherit version; + homepage = http://liballeg.org/; + license = licenses.zlib; + maintainers = [ maintainers.raskin ]; + platforms = platforms.linux; }; -}) x +} diff --git a/pkgs/development/libraries/allegro/5-unstable.upstream b/pkgs/development/libraries/allegro/5-unstable.upstream deleted file mode 100644 index e07829c08cc..00000000000 --- a/pkgs/development/libraries/allegro/5-unstable.upstream +++ /dev/null @@ -1,7 +0,0 @@ -attribute_name allegro5 -url http://alleg.sourceforge.net/download.html -version_link '/allegro-unstable/.*[.]tar[.].*/download$' -SF_redirect -do_overwrite () { - do_overwrite_just_version -} diff --git a/pkgs/development/libraries/allegro/5.nix b/pkgs/development/libraries/allegro/5.nix index 793b57c676b..6f05afa4f48 100644 --- a/pkgs/development/libraries/allegro/5.nix +++ b/pkgs/development/libraries/allegro/5.nix @@ -1,56 +1,31 @@ +{ stdenv, fetchurl, texinfo, libXext, xextproto, libX11, xproto +, libXpm, libXt, libXcursor, alsaLib, cmake, zlib, libpng, libvorbis +, libXxf86dga, libXxf86misc, xf86dgaproto, xf86miscproto +, xf86vidmodeproto, libXxf86vm, openal, mesa, kbproto, libjpeg, flac }: -x@{builderDefsPackage - , texinfo, libXext, xextproto, libX11, xproto, libXpm, libXt, libXcursor - , alsaLib, cmake, zlib, libpng, libvorbis, libXxf86dga, libXxf86misc - , xf86dgaproto, xf86miscproto, xf86vidmodeproto, libXxf86vm, openal, mesa - , kbproto, libjpeg, flac - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - []; +stdenv.mkDerivation rec { + name = "allegro-${version}"; + version = "5.0.11"; - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); - sourceInfo = rec { - baseName="allegro"; - version = "5.0.11"; - name="${baseName}-${version}"; - project="alleg"; - url="mirror://sourceforge/project/${project}/${baseName}/${version}/${name}.tar.gz"; - hash="18fdppaqaf3g3rcqwhyvsmkzk3y14clz4l8cvmg4hvjgyf011f3i"; - }; -in -rec { - src = a.fetchurl { - url = sourceInfo.url; + src = fetchurl { + url = "http://download.gna.org/allegro/allegro/${version}/${name}.tar.gz"; sha256 = "0cd51qrh97jrr0xdmnivqgwljpmizg8pixsgvc4blqqlaz4i9zj9"; }; - inherit (sourceInfo) name version; - inherit buildInputs; - - /* doConfigure should be removed if not needed */ - phaseNames = ["doCmake" "doMakeInstall"]; - - doCmake = a.fullDepEntry ('' - export NIX_LDFLAGS="$NIX_LDFLAGS -lXext -lX11 -lXpm -lXcursor -lXxf86vm" - cmake -D CMAKE_INSTALL_PREFIX=$out -D CMAKE_SKIP_RPATH=ON . - '') ["minInit" "doUnpack" "addInputs"]; - - makeFlags = [ + buildInputs = [ + texinfo libXext xextproto libX11 xproto libXpm libXt libXcursor + alsaLib cmake zlib libpng libvorbis libXxf86dga libXxf86misc + xf86dgaproto xf86miscproto xf86vidmodeproto libXxf86vm openal mesa + kbproto libjpeg flac ]; - meta = { + cmakeFlags = [ "-DCMAKE_SKIP_RPATH=ON" ]; + + meta = with stdenv.lib; { description = "A game programming library"; - license = a.lib.licenses.free; # giftware - maintainers = with a.lib.maintainers; - [ - raskin - ]; - platforms = with a.lib.platforms; - linux; - inherit version; + homepage = http://liballeg.org/; + license = licenses.zlib; + maintainers = [ maintainers.raskin ]; + platforms = platforms.linux; }; -}) x +} diff --git a/pkgs/development/libraries/allegro/5.upstream b/pkgs/development/libraries/allegro/5.upstream deleted file mode 100644 index 9d139383fe3..00000000000 --- a/pkgs/development/libraries/allegro/5.upstream +++ /dev/null @@ -1,7 +0,0 @@ -attribute_name allegro5 -url http://alleg.sourceforge.net/download.html -version_link '[.]tar[.].*/download$' -SF_redirect -do_overwrite () { - do_overwrite_just_version -} diff --git a/pkgs/development/libraries/allegro/default.nix b/pkgs/development/libraries/allegro/default.nix index 6d31087968c..deb3a6877e8 100644 --- a/pkgs/development/libraries/allegro/default.nix +++ b/pkgs/development/libraries/allegro/default.nix @@ -1,59 +1,30 @@ -x@{builderDefsPackage - , texinfo, libXext, xextproto, libX11, xproto, libXpm, libXt, libXcursor - , alsaLib, cmake, zlib, libpng, libvorbis, libXxf86dga, libXxf86misc - , xf86dgaproto, xf86miscproto, xf86vidmodeproto, libXxf86vm, openal, mesa - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - []; +{ stdenv, fetchurl, texinfo, libXext, xextproto, libX11, xproto +, libXpm, libXt, libXcursor, alsaLib, cmake, zlib, libpng, libvorbis +, libXxf86dga, libXxf86misc, xf86dgaproto, xf86miscproto +, xf86vidmodeproto, libXxf86vm, openal, mesa }: - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); - sourceInfo = rec { - baseName="allegro"; - version="4.4.2"; - name="${baseName}-${version}"; - project="alleg"; - url="mirror://sourceforge/project/${project}/${baseName}/${version}/${name}.tar.gz"; - hash="1p0ghkmpc4kwij1z9rzxfv7adnpy4ayi0ifahlns1bdzgmbyf88v"; - }; -in -rec { - src = a.fetchurl { - url = sourceInfo.url; - sha256 = sourceInfo.hash; - }; - - inherit (sourceInfo) name version; - inherit buildInputs; - - /* doConfigure should be removed if not needed */ - phaseNames = ["doCmake" "doMakeInstall"]; +stdenv.mkDerivation rec { + name = "allegro-${version}"; + version="4.4.2"; - doCmake = a.fullDepEntry ('' - export NIX_LDFLAGS="$NIX_LDFLAGS -lXext -lX11 -lXpm -lXcursor -lXxf86vm" - cmake -D CMAKE_INSTALL_PREFIX=$out -D CMAKE_SKIP_RPATH=ON . - '') ["minInit" "doUnpack" "addInputs"]; + src = fetchurl { + url = "http://download.gna.org/allegro/allegro/${version}/${name}.tar.gz"; + sha256 = "1p0ghkmpc4kwij1z9rzxfv7adnpy4ayi0ifahlns1bdzgmbyf88v"; + }; - makeFlags = [ + buildInputs = [ + texinfo libXext xextproto libX11 xproto libXpm libXt libXcursor + alsaLib cmake zlib libpng libvorbis libXxf86dga libXxf86misc + xf86dgaproto xf86miscproto xf86vidmodeproto libXxf86vm openal mesa ]; - meta = { - branch = "4"; + cmakeFlags = [ "-DCMAKE_SKIP_RPATH=ON" ]; + + meta = with stdenv.lib; { description = "A game programming library"; - license = a.lib.licenses.free; # giftware - maintainers = with a.lib.maintainers; - [ - raskin - ]; - platforms = with a.lib.platforms; - linux; - }; - passthru = { - updateInfo = { - downloadPage = "http://sourceforge.net/projects/alleg/files/"; - }; + homepage = http://liballeg.org/; + license = licenses.free; # giftware + maintainers = [ maintainers.raskin ]; + platforms = platforms.linux; }; -}) x +} diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix index f1c0807144b..6f0956f1d1d 100644 --- a/pkgs/development/libraries/apr-util/default.nix +++ b/pkgs/development/libraries/apr-util/default.nix @@ -3,6 +3,7 @@ , bdbSupport ? false, db , ldapSupport ? !stdenv.isCygwin, openldap , libiconv +, cyrus_sasl, autoreconfHook }: assert sslSupport -> openssl != null; @@ -19,24 +20,28 @@ stdenv.mkDerivation rec { sha256 = "0bn81pfscy9yjvbmyx442svf43s6dhrdfcsnkpxz43fai5qk5kx6"; }; + patches = optional stdenv.isFreeBSD ./include-static-dependencies.patch; + outputs = [ "dev" "out" ]; outputBin = "dev"; - configureFlags = '' - --with-apr=${apr} --with-expat=${expat} - ${optionalString (!stdenv.isCygwin) "--with-crypto"} - ${stdenv.lib.optionalString sslSupport "--with-openssl"} - ${stdenv.lib.optionalString bdbSupport "--with-berkeley-db=${db}"} - ${stdenv.lib.optionalString ldapSupport "--with-ldap"}${ - optionalString stdenv.isCygwin "--without-pgsql --without-sqlite2 --without-sqlite3 --without-freetds --without-berkeley-db --without-crypto"} - ''; + buildInputs = optional stdenv.isFreeBSD autoreconfHook; - buildInputs = stdenv.lib.optional sslSupport openssl; + configureFlags = [ "--with-apr=${apr}" "--with-expat=${expat}" ] + ++ optional (!stdenv.isCygwin) "--with-crypto" + ++ optional sslSupport "--with-openssl=${openssl}" + ++ optional bdbSupport "--with-berkeley-db=${db}" + ++ optional ldapSupport "--with-ldap=ldap" + ++ optionals stdenv.isCygwin + [ "--without-pgsql" "--without-sqlite2" "--without-sqlite3" + "--without-freetds" "--without-berkeley-db" "--without-crypto" ] + ; propagatedBuildInputs = [ makeWrapper apr expat libiconv ] ++ optional sslSupport openssl ++ optional bdbSupport db - ++ optional ldapSupport openldap; + ++ optional ldapSupport openldap + ++ optional stdenv.isFreeBSD cyrus_sasl; # Give apr1 access to sed for runtime invocations postInstall = '' diff --git a/pkgs/development/libraries/apr-util/include-static-dependencies.patch b/pkgs/development/libraries/apr-util/include-static-dependencies.patch new file mode 100644 index 00000000000..1813c721781 --- /dev/null +++ b/pkgs/development/libraries/apr-util/include-static-dependencies.patch @@ -0,0 +1,12 @@ +diff --git a/build/apu-conf.m4 b/build/apu-conf.m4 +index 8943f10..aa44305 100644 +--- a/build/apu-conf.m4 ++++ b/build/apu-conf.m4 +@@ -279,6 +279,7 @@ AC_ARG_WITH(ldap,[ --with-ldap=library ldap library to use], + APU_FIND_LDAPLIB("ldap", "-llber -lresolv -lsocket -lnsl") + APU_FIND_LDAPLIB("ldap", "-ldl -lpthread") + else ++ APU_FIND_LDAPLIB($LIBLDAP, "-llber -lcrypto -lssl -lsasl2") + APU_FIND_LDAPLIB($LIBLDAP) + APU_FIND_LDAPLIB($LIBLDAP, "-lresolv") + APU_FIND_LDAPLIB($LIBLDAP, "-lresolv -lsocket -lnsl") diff --git a/pkgs/development/libraries/asc-support/default.nix b/pkgs/development/libraries/asc-support/default.nix deleted file mode 100644 index a2b2588d9cc..00000000000 --- a/pkgs/development/libraries/asc-support/default.nix +++ /dev/null @@ -1,34 +0,0 @@ - -{ stdenv -, fetchurl -, aterm -, toolbuslib -, asfSupport -, errorSupport -, ptSupport -, sglr -, tideSupport -, cLibrary -, configSupport -, ptableSupport -, rstoreSupport -, pkgconfig -}: -let - isMingw = stdenv ? cross && stdenv.cross.config == "i686-pc-mingw32" ; -in -stdenv.mkDerivation rec { - name = "asc-support-2.6"; - - src = fetchurl { - url = "http://www.meta-environment.org/releases/${name}.tar.gz"; - sha256 = "1svq368kdxnmjdfv8sqs0cn9s69c75qcp44mpapfjj6kfhrzkxdc"; - }; - - patches = if isMingw then [./mingw.patch] else []; - - buildInputs = [aterm toolbuslib asfSupport errorSupport ptSupport sglr tideSupport cLibrary configSupport ptableSupport rstoreSupport ]; - nativeBuildInputs = [pkgconfig]; - - dontStrip = isMingw; -} diff --git a/pkgs/development/libraries/asc-support/mingw.patch b/pkgs/development/libraries/asc-support/mingw.patch deleted file mode 100644 index 8a421a99dae..00000000000 --- a/pkgs/development/libraries/asc-support/mingw.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -rc asc-support-2.6/lib/asc-main.c asc-support-2.6-new/lib/asc-main.c -*** asc-support-2.6/lib/asc-main.c 2008-11-10 14:12:47.000000000 +0100 ---- asc-support-2.6-new/lib/asc-main.c 2010-08-24 11:02:04.000000000 +0200 -*************** -*** 7,13 **** - #include <ctype.h> - #include <string.h> - #include <sys/time.h> -- #include <sys/resource.h> - #include <unistd.h> - #include <aterm2.h> - #include <sglrInterface.h> ---- 7,12 ---- -*************** -*** 46,52 **** - } - - static void printStats() { -- struct rusage usage; - FILE *file; - char buf[BUFSIZ]; - int size, resident, shared, trs, lrs, drs, dt; ---- 45,50 ---- -*************** -*** 61,74 **** - fprintf(stderr, "could not open %s\n", buf); - perror(""); - } -! if (getrusage(RUSAGE_SELF, &usage) == -1) { -! perror("rusage"); -! } else { -! fprintf(stderr, "utime : %ld.%06d sec.\n", -! (long)usage.ru_utime.tv_sec, (int)usage.ru_utime.tv_usec); -! fprintf(stderr, "stime : %ld.%06d sec.\n", -! (long)usage.ru_stime.tv_sec, (int)usage.ru_stime.tv_usec); -! } - } - - static ATbool toolbusMode(int argc, char* argv[]) { ---- 59,66 ---- - fprintf(stderr, "could not open %s\n", buf); - perror(""); - } -! fprintf(stderr, "utime : %ld.%06d sec.\n", 0, 0); -! fprintf(stderr, "stime : %ld.%06d sec.\n", 0, 0); - } - - static ATbool toolbusMode(int argc, char* argv[]) { diff --git a/pkgs/development/libraries/asf-support/default.nix b/pkgs/development/libraries/asf-support/default.nix deleted file mode 100644 index 9a712a869af..00000000000 --- a/pkgs/development/libraries/asf-support/default.nix +++ /dev/null @@ -1,24 +0,0 @@ - -{ stdenv -, fetchurl -, aterm -, errorSupport -, ptSupport -, pkgconfig -}: -let - isMingw = stdenv ? cross && stdenv.cross.config == "i686-pc-mingw32" ; -in -stdenv.mkDerivation rec { - name = "asf-support-1.8"; - - src = fetchurl { - url = "http://www.meta-environment.org/releases/${name}.tar.gz"; - sha256 = "04f7grfadq0si24rs9vlcknlahfa7nb3d6n6pjl1qbxi8m1gwhnc"; - }; - - buildInputs = [aterm errorSupport ptSupport]; - nativeBuildInputs = [pkgconfig]; - - dontStrip = isMingw; -} diff --git a/pkgs/development/libraries/at-spi2-atk/default.nix b/pkgs/development/libraries/at-spi2-atk/default.nix index f5d806ff67a..f3538a12221 100644 --- a/pkgs/development/libraries/at-spi2-atk/default.nix +++ b/pkgs/development/libraries/at-spi2-atk/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { versionMajor = "2.18"; - versionMinor = "0"; + versionMinor = "1"; moduleName = "at-spi2-atk"; name = "${moduleName}-${versionMajor}.${versionMinor}"; src = fetchurl { url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz"; - sha256 = "0xgkrnx04vaklbkzc7bzym9s0qhj8aiz4knqlxgx3vxnacsb6vaa"; + sha256 = "0bf1g5cj84rmx7p1q547vwbc0hlpcs2wrxnmv96lckfkhs9mzcf4"; }; buildInputs = [ python pkgconfig popt atk libX11 libICE xorg.libXtst libXi diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix index a4707ef4334..e49569bc226 100644 --- a/pkgs/development/libraries/at-spi2-core/default.nix +++ b/pkgs/development/libraries/at-spi2-core/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { versionMajor = "2.18"; - versionMinor = "0"; + versionMinor = "3"; moduleName = "at-spi2-core"; name = "${moduleName}-${versionMajor}.${versionMinor}"; src = fetchurl { url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz"; - sha256 = "0xna0gnlqvzy6209klirywcm7ianazshg6pkk828g07bnrywgvhs"; + sha256 = "0afn4x04j5l352vj0dccb2hkpzg3l2vhr8h1yv89fpqmjkfnm8md"; }; outputs = [ "dev" "out" ]; diff --git a/pkgs/development/libraries/aterm/2.8.nix b/pkgs/development/libraries/aterm/2.8.nix deleted file mode 100644 index 3aa0e95305a..00000000000 --- a/pkgs/development/libraries/aterm/2.8.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv, fetchurl }: - -let - isMingw = stdenv ? cross && stdenv.cross.config == "i686-pc-mingw32" ; -in -stdenv.mkDerivation { - name = "aterm-2.8"; - - src = fetchurl { - url = http://www.meta-environment.org/releases/aterm-2.8.tar.gz; - sha256 = "1vq4qpmcww3n9v7bklgp7z1yqi9gmk6hcahqjqdzc5ksa089rdms"; - }; - - patches = [ - # Fix for http://bugzilla.sen.cwi.nl:8080/show_bug.cgi?id=841 - ./max-long.patch - ] ++ ( if isMingw then [./aterm-mingw-asm.patch] else [] ); - - # The test programs stress, randgen, fib, and testsafio all fail with - # segmentation faults when compiled with GCC 4.8.x, and the code itself many - # warnings, complaining "cast from pointer to integer of different size". - # This looks really bad. I leave the test suite enabled, because those issue - # feel too serious to just ignore. - doCheck = true; - - dontStrip = isMingw; - - meta = { - homepage = http://www.cwi.nl/htbin/sen1/twiki/bin/view/SEN1/ATerm; - license = "LGPL"; - description = "Library for manipulation of term data structures in C"; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; - maintainers = [ stdenv.lib.maintainers.eelco ]; - broken = true; - }; -} diff --git a/pkgs/development/libraries/avahi/default.nix b/pkgs/development/libraries/avahi/default.nix index 6c8fe6e112b..199379ad401 100644 --- a/pkgs/development/libraries/avahi/default.nix +++ b/pkgs/development/libraries/avahi/default.nix @@ -36,12 +36,15 @@ stdenv.mkDerivation rec { avahi-core/socket.c ''; - postInstall = '' + postInstall = # Maintain compat for mdnsresponder and howl - ${if withLibdnssdCompat then "ln -s avahi-compat-libdns_sd/dns_sd.h $out/include/dns_sd.h" else ""} + stdenv.lib.optionalString withLibdnssdCompat '' + ln -s avahi-compat-libdns_sd/dns_sd.h "$out/include/dns_sd.h" + ''; + /* # these don't exist (anymore?) ln -s avahi-compat-howl $out/include/howl ln -s avahi-compat-howl.pc $out/lib/pkgconfig/howl.pc - ''; + */ meta = with stdenv.lib; { description = "mDNS/DNS-SD implementation"; diff --git a/pkgs/development/libraries/boolstuff/default.nix b/pkgs/development/libraries/boolstuff/default.nix index c1bd8a4b3a2..62d61e6cb5d 100644 --- a/pkgs/development/libraries/boolstuff/default.nix +++ b/pkgs/development/libraries/boolstuff/default.nix @@ -3,16 +3,16 @@ let baseurl = "http://perso.b2b2c.ca/sarrazip/dev"; in stdenv.mkDerivation rec { - name = "boolstuff-0.1.14"; + name = "boolstuff-0.1.15"; src = fetchurl { url = "${baseurl}/${name}.tar.gz"; - sha256 = "1ccn9v3kxz44pv3mr8q0l2i9769jiigw1gfv47ia50mbspwb87r6"; + sha256 = "1mzw4368hqw0b6xr01yqcbs9jk9ma3qq9hk3iqxmkiwqqxgirgln"; }; nativeBuildInputs = [ pkgconfig ]; - meta = { + meta = { description = "Library for operations on boolean expression binary trees"; homepage = "${baseurl}/boolstuff.html"; license = "GPL"; diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index f933fa6bc3e..30f24d0c357 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -1,5 +1,5 @@ { stdenv, icu, expat, zlib, bzip2, python, fixDarwinDylibNames -, toolset ? if stdenv.isDarwin then "clang" else null +, toolset ? if stdenv.cc.isClang then "clang" else null , enableRelease ? true , enableDebug ? false , enableSingleThreaded ? false diff --git a/pkgs/development/libraries/botan/unstable.nix b/pkgs/development/libraries/botan/unstable.nix index 5685d261829..172c18480ad 100644 --- a/pkgs/development/libraries/botan/unstable.nix +++ b/pkgs/development/libraries/botan/unstable.nix @@ -2,7 +2,7 @@ callPackage ./generic.nix (args // { baseVersion = "1.11"; - revision = "19"; - sha256 = "0a1hgd3w2pyn6yx89bal61bkxxazv0p8x8x4kri73p1b4vj3n3sb"; + revision = "25"; + sha256 = "1spjryza9yznbsa26i1kg3hz4ifjdi6cjhfd2h2lqg07xyf2a66c"; openssl = null; }) diff --git a/pkgs/development/libraries/box2d/default.nix b/pkgs/development/libraries/box2d/default.nix index 10a7ca54952..25d291da332 100644 --- a/pkgs/development/libraries/box2d/default.nix +++ b/pkgs/development/libraries/box2d/default.nix @@ -1,51 +1,33 @@ -x@{builderDefsPackage - , unzip, cmake, mesa, freeglut, libX11, xproto - , inputproto, libXi, fetchsvn, pkgconfig - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchsvn" "builderDefsPackage"] ++ - []; +{ stdenv, fetchurl, unzip, cmake, mesa, freeglut, libX11, xproto, inputproto +, libXi, pkgconfig }: - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); -in -rec { - version = "2.3.0"; +stdenv.mkDerivation rec { name = "box2d-${version}"; - srcDrv = a.fetchsvn { - url = "http://box2d.googlecode.com/svn/trunk"; - rev = "277"; - sha256 = "1xp93yw2zcqhmh999v7cwqaqxq1glgyg5r8kfm4yabc1ypba3in4"; + version = "2.3.0"; + + src = fetchurl { + url = "https://github.com/erincatto/Box2D/archive/v${version}.tar.gz"; + sha256 = "1dmbswh4x2n5l3c9h0k72m0z4rdpzfy1xl8m8p3rf5rwkvk3bkg2"; }; - src = srcDrv + "/"; - inherit buildInputs; + sourceRoot = "Box2D-${version}/Box2D"; - phaseNames = ["changeSettings" "doCmake" "doMakeInstall"]; + buildInputs = [ + unzip cmake mesa freeglut libX11 xproto inputproto libXi pkgconfig + ]; - changeSettings = a.fullDepEntry '' - sed -i Box2D/Common/b2Settings.h -e 's@b2_maxPolygonVertices .*@b2_maxPolygonVertices 15@' - '' ["minInit" "addInputs" "doUnpack"]; - - goSrcDir = ''cd Box2D''; + cmakeFlags = [ "-DBOX2D_INSTALL=ON" "-DBOX2D_BUILD_SHARED=ON" ]; - doCmake = a.fullDepEntry '' - cd Build; - cmake -DBOX2D_INSTALL=ON -DBOX2D_BUILD_SHARED=ON -DCMAKE_INSTALL_PREFIX=$out .. - '' ["minInit" "addInputs" "doUnpack"]; - - meta = { + prePatch = '' + substituteInPlace Box2D/Common/b2Settings.h \ + --replace 'b2_maxPolygonVertices 8' 'b2_maxPolygonVertices 15' + ''; + + meta = with stdenv.lib; { description = "2D physics engine"; - maintainers = with a.lib.maintainers; - [ - raskin - ]; - platforms = with a.lib.platforms; - linux; - license = "bsd"; - inherit version; + homepage = http://box2d.org/; + maintainers = [ maintainers.raskin ]; + platforms = platforms.linux; + license = licenses.zlib; }; -}) x - +} diff --git a/pkgs/development/libraries/c-library/default.nix b/pkgs/development/libraries/c-library/default.nix deleted file mode 100644 index 714e8b66089..00000000000 --- a/pkgs/development/libraries/c-library/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv -, fetchurl -, aterm -, pkgconfig -}: -let - isMingw = stdenv ? cross && stdenv.cross.config == "i686-pc-mingw32" ; -in -stdenv.mkDerivation rec { - name = "c-library-1.2"; - - src = fetchurl { - url = "http://www.meta-environment.org/releases/${name}.tar.gz"; - sha256 = "0rmhag2653nq76n1n49blii9zx0ph58szv1xzw1i551wmw7yrz88"; - }; - - patches = if isMingw then [./mingw.patch] else []; - - buildInputs = [aterm]; - nativeBuildInputs = [pkgconfig]; - dontStrip = isMingw; -} diff --git a/pkgs/development/libraries/c-library/mingw.patch b/pkgs/development/libraries/c-library/mingw.patch deleted file mode 100644 index 8b5ca31e20d..00000000000 --- a/pkgs/development/libraries/c-library/mingw.patch +++ /dev/null @@ -1,114 +0,0 @@ -diff -rc c-library-1.2/statistics/rsrc-usage.c c-library-1.2-new/statistics/rsrc-usage.c -*** c-library-1.2/statistics/rsrc-usage.c 2008-11-10 14:09:47.000000000 +0100 ---- c-library-1.2-new/statistics/rsrc-usage.c 2010-08-24 09:09:13.000000000 +0200 -*************** -*** 2,81 **** - - #include <unistd.h> - #include <stdio.h> -- #include <sys/time.h> -- #include <sys/resource.h> - #include "rsrc-usage.h" - - /*static int AT_calcAllocatedSize();*/ -- static struct rusage rsrc_usage; -- static struct rusage flt_rsrc_usage; - - void printrusage(struct rusage *rusage) { -- fprintf(stderr, "maxrss %ld\n", rusage->ru_maxrss); -- fprintf(stderr, "ixrss %ld\n", rusage->ru_ixrss); -- fprintf(stderr, "idrss %ld\n", rusage->ru_idrss); -- fprintf(stderr, "isrss %ld\n", rusage->ru_isrss); -- fprintf(stderr, "minflt %ld\n", rusage->ru_minflt); -- fprintf(stderr, "majflt %ld\n", rusage->ru_majflt); -- fprintf(stderr, "nswap %ld\n", rusage->ru_nswap); -- fprintf(stderr, "inblock %ld\n", rusage->ru_inblock); -- fprintf(stderr, "oublock %ld\n", rusage->ru_oublock); -- fprintf(stderr, "msgsnd %ld\n", rusage->ru_msgsnd); -- fprintf(stderr, "msgrcv %ld\n", rusage->ru_msgrcv); -- fprintf(stderr, "nsignals %ld\n", rusage->ru_nsignals); -- fprintf(stderr, "nvcsw %ld\n", rusage->ru_nvcsw); -- fprintf(stderr, "nivcsw %ld\n", rusage->ru_nivcsw); - } - - double STATS_Timer(void) { -! static double cur = 0; -! double prev; -! -! prev = cur; -! if (getrusage(RUSAGE_SELF, &rsrc_usage) == -1) { -! perror("getrusage"); -! return (double)0; -! } -! -! cur = (double) (rsrc_usage.ru_utime.tv_sec) + -! (double) ((rsrc_usage.ru_utime.tv_usec) * 1.0e-06); -! -! prev = cur - prev; -! return prev > 0 ? prev: 0; - } - - void STATS_PageFlt(long *maj, long *min) { -! static long ma, mi, ma_prev, mi_prev; -! -! -! ma_prev = ma; -! mi_prev = mi; -! getrusage(RUSAGE_SELF, &flt_rsrc_usage); -! -! /* printrusage(&flt_rsrc_usage); */ -! -! mi = flt_rsrc_usage.ru_minflt - mi_prev; -! ma = flt_rsrc_usage.ru_majflt - ma_prev; -! -! *maj = ma; -! *min = mi; - } - - long STATS_Allocated(void) { -! static long allocated = 0L; -! long tmp; -! -! tmp = allocated; -! /** \todo: AT_calcAllocatedSize() is unreachable. Fix. */ -! /*allocated = AT_calcAllocatedSize();*/ -! -! return allocated - tmp; - } - - long STATS_ResidentSetSize(void) { -! getrusage(RUSAGE_SELF, &rsrc_usage); -! -! return rsrc_usage.ru_maxrss; - } - - ---- 2,29 ---- - - #include <unistd.h> - #include <stdio.h> - #include "rsrc-usage.h" - - /*static int AT_calcAllocatedSize();*/ - - void printrusage(struct rusage *rusage) { - } - - double STATS_Timer(void) { -! return 0; - } - - void STATS_PageFlt(long *maj, long *min) { -! *maj = 0; -! *min = 0; - } - - long STATS_Allocated(void) { -! return 0; - } - - long STATS_ResidentSetSize(void) { -! return 0; - } - - diff --git a/pkgs/development/libraries/caelum/default.nix b/pkgs/development/libraries/caelum/default.nix deleted file mode 100644 index 823eac14548..00000000000 --- a/pkgs/development/libraries/caelum/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchurl, cmake, pkgconfig, ois, ogre, boost }: - -stdenv.mkDerivation rec { - name = "caelum-0.6.1"; - - src = fetchurl { - url = "http://caelum.googlecode.com/files/${name}.tar.gz"; - sha256 = "1j995q1a88cikqrxdqsrwzm2asid51xbmkl7vn1grfrdadb15303"; - }; - - buildInputs = [ ois ogre boost ]; - nativeBuildInputs = [ cmake pkgconfig ]; - - enableParallelBuilding = true; - - meta = { - description = "Add-on for the OGRE, aimed to render atmospheric effects"; - homepage = http://code.google.com/p/caelum/; - license = stdenv.lib.licenses.lgpl21Plus; - broken = true; - }; -} diff --git a/pkgs/development/libraries/cdk/default.nix b/pkgs/development/libraries/cdk/default.nix index f998f464457..94edc46fc4c 100644 --- a/pkgs/development/libraries/cdk/default.nix +++ b/pkgs/development/libraries/cdk/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { inherit buildInputs; src = fetchurl { url = "http://invisible-island.net/datafiles/release/cdk.tar.gz"; - sha256 = "00s87kq5x10x22azr6q17b663syk169y3dk3kaj8z6dlk2b8vknp"; + sha256 = "0j74l874y33i26y5kjg3pf1vswyjif8k93pqhi0iqykpbxfsg382"; }; meta = { description = ''Curses development kit''; diff --git a/pkgs/development/libraries/cgui/default.nix b/pkgs/development/libraries/cgui/default.nix index 6bd3dd41de7..0f117862236 100644 --- a/pkgs/development/libraries/cgui/default.nix +++ b/pkgs/development/libraries/cgui/default.nix @@ -1,57 +1,26 @@ -x@{builderDefsPackage - , texinfo, allegro, perl - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - []; +{ stdenv, fetchurl, texinfo, allegro, perl }: - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); - sourceInfo = rec { - baseName="cgui"; - version="2.0.3"; - name="${baseName}-${version}"; - project="${baseName}"; - url="mirror://sourceforge/project/${project}/${version}/${name}.tar.gz"; - hash="00kk4xaw68m44awy8zq4g5plx372swwccvzshn68a0a8f3f2wi4x"; - }; -in -rec { - src = a.fetchurl { - url = sourceInfo.url; - sha256 = sourceInfo.hash; - }; +stdenv.mkDerivation rec { + name = "cgui-${version}"; + version="2.0.3"; - inherit (sourceInfo) name version; - inherit buildInputs; + src = fetchurl { + url = "mirror://sourceforge/project/cgui/${version}/${name}.tar.gz"; + sha256 = "00kk4xaw68m44awy8zq4g5plx372swwccvzshn68a0a8f3f2wi4x"; + }; - /* doConfigure should be removed if not needed */ - phaseNames = ["genMakefile" "doMakeInstall"]; + buildInputs = [ texinfo allegro perl ]; - genMakefile = a.fullDepEntry ('' + configurePhase = '' export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -fPIC" sh fix.sh unix - '') ["minInit" "doUnpack" "addInputs"]; - - makeFlags = [ - "SYSTEM_DIR=$out" - ]; + ''; - meta = { + makeFlags = [ "SYSTEM_DIR=$(out)" ]; + + meta = with stdenv.lib; { description = "A multiplatform basic GUI library"; - maintainers = with a.lib.maintainers; - [ - raskin - ]; - platforms = with a.lib.platforms; - linux; - }; - passthru = { - updateInfo = { - downloadPage = "http://sourceforge.net/projects/cgui/files/"; - }; + maintainers = [ maintainers.raskin ]; + platforms = platforms.linux; }; -}) x - +} diff --git a/pkgs/development/libraries/cloog-ppl/default.nix b/pkgs/development/libraries/cloog-ppl/default.nix index 6f730d4821e..2c49e036358 100644 --- a/pkgs/development/libraries/cloog-ppl/default.nix +++ b/pkgs/development/libraries/cloog-ppl/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, ppl, autoconf, automake, libtool }: +{ fetchurl, stdenv, ppl, autoreconfHook }: stdenv.mkDerivation rec { name = "cloog-ppl-0.15.11"; @@ -10,19 +10,14 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ ppl ]; - nativeBuildInputs = [ automake autoconf libtool ]; + nativeBuildInputs = [ autoreconfHook ]; patches = [ ./fix-ppl-version.patch ]; configureFlags = "--with-ppl=${ppl}"; - preConfigure = '' + preAutoreconf = '' touch NEWS ChangeLog AUTHORS - ${libtool}/bin/libtoolize -c --force - ${automake}/bin/aclocal - ${automake}/bin/automake --add-missing - ${automake}/bin/automake -a -c --foreign - ${autoconf}/bin/autoreconf ''; crossAttrs = { diff --git a/pkgs/development/libraries/cmark/default.nix b/pkgs/development/libraries/cmark/default.nix new file mode 100644 index 00000000000..be60c18353e --- /dev/null +++ b/pkgs/development/libraries/cmark/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, cmake }: + +stdenv.mkDerivation rec { + version = "0.23.0"; + name = "cmark-${version}"; + + src = fetchurl { + url = "https://github.com/jgm/cmark/archive/${version}.tar.gz"; + sha256 = "87d289965066fce7be247d44c0304af1b20817dcc1b563702302ae33f2be0596"; + }; + + buildInputs = [ cmake ]; + + meta = { + description = "CommonMark parsing and rendering library and program in C"; + homepage = https://github.com/jgm/cmark; + maintainers = [ stdenv.lib.maintainers.michelk ]; + }; +} diff --git a/pkgs/development/libraries/config-support/default.nix b/pkgs/development/libraries/config-support/default.nix deleted file mode 100644 index d25accd4664..00000000000 --- a/pkgs/development/libraries/config-support/default.nix +++ /dev/null @@ -1,22 +0,0 @@ - -{ stdenv -, fetchurl -, aterm -, pkgconfig -}: -let - isMingw = stdenv ? cross && stdenv.cross.config == "i686-pc-mingw32" ; -in -stdenv.mkDerivation rec { - name = "config-support-1.4"; - - src = fetchurl { - url = "http://www.meta-environment.org/releases/${name}.tar.gz"; - sha256 = "0klhc7v760aklsy73pwn87snhgalkfxisac8srn8qcd3ljbfdrmi"; - }; - - buildInputs = [aterm]; - nativeBuildInputs = [pkgconfig]; - - dontStrip = isMingw; -} diff --git a/pkgs/development/libraries/cppzmq/default.nix b/pkgs/development/libraries/cppzmq/default.nix index f74ee51cab2..c8ab48288a1 100644 --- a/pkgs/development/libraries/cppzmq/default.nix +++ b/pkgs/development/libraries/cppzmq/default.nix @@ -1,12 +1,13 @@ -{ stdenv, fetchgit }: +{ stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "cppzmq-20150926"; + name = "cppzmq-20151203"; - src = fetchgit { - url = "https://github.com/zeromq/cppzmq"; - rev = "fa2f2c67a79c31d73bfef6862cc8ce12a98dd022"; - sha256 = "7b46712b5fa7e59cd0ffae190674046c71d5762c064003c125d6cd7a3da19b71"; + src = fetchFromGitHub { + owner = "zeromq"; + repo = "cppzmq"; + rev = "7f7c83411d83eafe57ae6ffc2972ad9455ac258e"; + sha256 = "1h6fl7mgkv98gz0csbp525a4bp1w9nwm059gwmmv1wqc1l741pv7"; }; installPhase = '' diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix index b7155f286c5..21ad12869f9 100644 --- a/pkgs/development/libraries/cyrus-sasl/default.nix +++ b/pkgs/development/libraries/cyrus-sasl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, openssl, kerberos, db, gettext, pam, fixDarwinDylibNames }: +{ lib, stdenv, fetchurl, openssl, kerberos, db, gettext, pam, fixDarwinDylibNames, autoreconfHook }: with stdenv.lib; stdenv.mkDerivation rec { @@ -13,11 +13,18 @@ stdenv.mkDerivation rec { buildInputs = [ openssl db gettext kerberos ] + ++ lib.optional stdenv.isFreeBSD autoreconfHook ++ lib.optional stdenv.isLinux pam ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; - patches = [ ./missing-size_t.patch ]; # https://bugzilla.redhat.com/show_bug.cgi?id=906519 - patchFlags = "-p0"; + patches = [ + ./missing-size_t.patch # https://bugzilla.redhat.com/show_bug.cgi?id=906519 + ] ++ lib.optional stdenv.isFreeBSD ( + fetchurl { + url = "http://www.linuxfromscratch.org/patches/blfs/svn/cyrus-sasl-2.1.26-fixes-3.patch"; + sha256 = "1vh4pc2rxxm6yvykx0b7kg09jbcwcxwv5rs6yq2ag3y8p6a9x86w"; + } + ); configureFlags = [ "--with-openssl=${openssl}" diff --git a/pkgs/development/libraries/cyrus-sasl/missing-size_t.patch b/pkgs/development/libraries/cyrus-sasl/missing-size_t.patch index 42f20fb8096..da96818ca26 100644 --- a/pkgs/development/libraries/cyrus-sasl/missing-size_t.patch +++ b/pkgs/development/libraries/cyrus-sasl/missing-size_t.patch @@ -1,6 +1,6 @@ Gentoo bug #458790 ---- include/sasl.h 2012-10-12 17:05:48.000000000 +0300 -+++ include/sasl.h 2013-02-23 16:56:44.648786268 +0200 +--- a/include/sasl.h 2012-10-12 17:05:48.000000000 +0300 ++++ b/include/sasl.h 2013-02-23 16:56:44.648786268 +0200 @@ -121,6 +121,9 @@ #ifndef SASL_H #define SASL_H 1 diff --git a/pkgs/development/libraries/db/clang-4.8.patch b/pkgs/development/libraries/db/clang-4.8.patch new file mode 100644 index 00000000000..c53160a8297 --- /dev/null +++ b/pkgs/development/libraries/db/clang-4.8.patch @@ -0,0 +1,22 @@ +diff --git a/dbinc/atomic.h b/dbinc/atomic.h +index 0034dcc..fa7ba93 100644 +--- a/dbinc/atomic.h ++++ b/dbinc/atomic.h +@@ -144,7 +144,7 @@ typedef LONG volatile *interlocked_val; + #define atomic_inc(env, p) __atomic_inc(p) + #define atomic_dec(env, p) __atomic_dec(p) + #define atomic_compare_exchange(env, p, o, n) \ +- __atomic_compare_exchange((p), (o), (n)) ++ __db_atomic_compare_exchange((p), (o), (n)) + static inline int __atomic_inc(db_atomic_t *p) + { + int temp; +@@ -176,7 +176,7 @@ static inline int __atomic_dec(db_atomic_t *p) + * http://gcc.gnu.org/onlinedocs/gcc-4.1.0/gcc/Atomic-Builtins.html + * which configure could be changed to use. + */ +-static inline int __atomic_compare_exchange( ++static inline int __db_atomic_compare_exchange( + db_atomic_t *p, atomic_value_t oldval, atomic_value_t newval) + { + atomic_value_t was; diff --git a/pkgs/development/libraries/db/osx.patch b/pkgs/development/libraries/db/clang-5.3.patch index 438fa7eedd7..438fa7eedd7 100644 --- a/pkgs/development/libraries/db/osx.patch +++ b/pkgs/development/libraries/db/clang-5.3.patch diff --git a/pkgs/development/libraries/db/db-4.8.nix b/pkgs/development/libraries/db/db-4.8.nix index 9b5e8cb39bd..6a161b0b72d 100644 --- a/pkgs/development/libraries/db/db-4.8.nix +++ b/pkgs/development/libraries/db/db-4.8.nix @@ -2,6 +2,7 @@ import ./generic.nix (args // rec { version = "4.8.30"; + extraPatches = [ ./clang-4.8.patch ]; sha256 = "0ampbl2f0hb1nix195kz1syrqqxpmvnvnfvphambj7xjrl3iljg0"; branch = "4.8"; }) diff --git a/pkgs/development/libraries/db/db-5.3.nix b/pkgs/development/libraries/db/db-5.3.nix index b5e62ee686f..98002c24461 100644 --- a/pkgs/development/libraries/db/db-5.3.nix +++ b/pkgs/development/libraries/db/db-5.3.nix @@ -3,6 +3,6 @@ import ./generic.nix (args // rec { version = "5.3.28"; sha256 = "0a1n5hbl7027fbz5lm0vp0zzfp1hmxnz14wx3zl9563h83br5ag0"; - extraPatches = [ ./osx.patch ]; + extraPatches = [ ./clang-5.3.patch ]; branch = "5.3"; }) diff --git a/pkgs/development/libraries/db/generic.nix b/pkgs/development/libraries/db/generic.nix index 077bd4e03a3..f5ee4e440ff 100644 --- a/pkgs/development/libraries/db/generic.nix +++ b/pkgs/development/libraries/db/generic.nix @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { (if cxxSupport then "--enable-cxx" else "--disable-cxx") (if compat185 then "--enable-compat185" else "--disable-compat185") "--enable-dbm" + (stdenv.lib.optionalString stdenv.isFreeBSD "--with-pic") ]; preConfigure = '' diff --git a/pkgs/development/libraries/dotconf/default.nix b/pkgs/development/libraries/dotconf/default.nix index 74e4b6c5666..f44a4a37fa7 100644 --- a/pkgs/development/libraries/dotconf/default.nix +++ b/pkgs/development/libraries/dotconf/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, stdenv, autoconf, automake, libtool }: +{ fetchFromGitHub, stdenv, autoreconfHook }: stdenv.mkDerivation rec { name = "dotconf-" + version; @@ -11,9 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1sc95hw5k2xagpafny0v35filmcn05k1ds5ghkldfpf6xw4hakp7"; }; - buildInputs = [ autoconf automake libtool ]; - - preConfigure = "autoreconf --install"; + buildInputs = [ autoreconfHook ]; meta = with stdenv.lib; { description = "A configuration parser library"; diff --git a/pkgs/development/libraries/enet/default.nix b/pkgs/development/libraries/enet/default.nix index 5c029adbf84..0d5bd834787 100644 --- a/pkgs/development/libraries/enet/default.nix +++ b/pkgs/development/libraries/enet/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "enet-1.3.12"; + name = "enet-1.3.13"; src = fetchurl { url = "http://enet.bespin.org/download/${name}.tar.gz"; - sha256 = "02qxgsn20m306hg3pklfa35mjlc2fqcsd1x4pi3xnbfy1nyir1d5"; + sha256 = "0p53mnmjbm56wizwraznynx13fcibcxiqny110dp6a5a3w174q73"; }; meta = { diff --git a/pkgs/development/libraries/error-support/default.nix b/pkgs/development/libraries/error-support/default.nix deleted file mode 100644 index 766a0dbef1d..00000000000 --- a/pkgs/development/libraries/error-support/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv -, fetchurl -, aterm -, toolbuslib -, pkgconfig -}: -let - isMingw = stdenv ? cross && stdenv.cross.config == "i686-pc-mingw32" ; -in -stdenv.mkDerivation rec { - name = "error-support-1.6"; - - src = fetchurl { - url = "http://www.meta-environment.org/releases/${name}.tar.gz"; - sha256 = "0sdw3mrh90k76w2pvpdfg7d2cxfxb3s5spbqglkkpvx8bldhlk33"; - }; - - buildInputs = [aterm toolbuslib]; - nativeBuildInputs = [pkgconfig]; - - dontStrip = isMingw; -} diff --git a/pkgs/development/libraries/exiv2/default.nix b/pkgs/development/libraries/exiv2/default.nix index 0702d24a80b..e1af46cc3ed 100644 --- a/pkgs/development/libraries/exiv2/default.nix +++ b/pkgs/development/libraries/exiv2/default.nix @@ -1,28 +1,20 @@ -{stdenv, fetchurl, fetchpatch, zlib, expat}: +{ stdenv, fetchurl, fetchpatch, zlib, expat, gettext }: stdenv.mkDerivation rec { - name = "exiv2-0.24"; + name = "exiv2-0.25"; src = fetchurl { url = "http://www.exiv2.org/${name}.tar.gz"; - sha256 = "13pgvz14kyapxl89pxjaq3274k56d5lzfckpg1g9z7gvqzk4797l"; + sha256 = "197g6vgcpyf9p2cwn5p5hb1r714xsk1v4p96f5pv1z8mi9vzq2y8"; }; + postPatch = "patchShebangs ./src/svn_version.sh"; - patches = [(fetchpatch { - name = "CVE-2014-9449.diff"; - url = "http://dev.exiv2.org/projects/exiv2/repository/revisions/3264/diff?format=diff&rev_to=3263"; - sha256 = "02w0fksl966d4v6bkg6rq3wmvv8xjpvfp47qr0nv1xq0bphxqzag"; - })]; - - propagatedBuildInputs = [zlib expat]; - -# configure script finds zlib&expat but it thinks that they're in /usr - configureFlags = "--with-zlib=${zlib} --with-expat=${expat}"; + nativeBuildInputs = [ gettext ]; + propagatedBuildInputs = [ zlib expat ]; meta = { homepage = http://www.exiv2.org/; description = "A library and command-line utility to manage image metadata"; - maintainers = [stdenv.lib.maintainers.urkud]; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix index 082f651a3fc..774190278cb 100644 --- a/pkgs/development/libraries/expat/default.nix +++ b/pkgs/development/libraries/expat/default.nix @@ -12,6 +12,9 @@ stdenv.mkDerivation rec { outputs = [ "dev" "out" ]; # TODO: fix referrers outputBin = "dev"; + + configureFlags = stdenv.lib.optional stdenv.isFreeBSD "--with-pic"; + outputMan = "dev"; # tiny page for a dev tool meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/farbfeld/default.nix b/pkgs/development/libraries/farbfeld/default.nix new file mode 100644 index 00000000000..2301dbac368 --- /dev/null +++ b/pkgs/development/libraries/farbfeld/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchgit, libpng, libjpeg }: + +stdenv.mkDerivation rec { + name = "farbfeld-${version}"; + version = "1"; + + src = fetchgit { + url = "http://git.suckless.org/farbfeld"; + rev = "refs/tags/${version}"; + sha256 = "1mgk46lpqqvn4qx37r0jxz2jjsd4nvl6zjl04y4bfyzf4wkkmmln"; + }; + + buildInputs = [ libpng libjpeg ]; + + installFlags = "PREFIX=/ DESTDIR=$(out)"; + + meta = with stdenv.lib; { + description = "Suckless image format with conversion tools"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ pSub ]; + }; +} diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index fadb3feb4cc..eed6a3bc763 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -235,11 +235,11 @@ assert x11grabExtlib -> libX11 != null && libXv != null; stdenv.mkDerivation rec { name = "ffmpeg-full-${version}"; - version = "2.8.1"; + version = "2.8.5"; src = fetchurl { url = "https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.bz2"; - sha256 = "1qk6g2h993i0wgs9d2p3ahdc5bqr03mp74bk6r1zj6pfinr5mvg2"; + sha256 = "0nk1j3i7qc1k3dygpq74pxq382vqg9kaf2hxl9jfw8rkad8rjv9v"; }; patchPhase = ''patchShebangs .''; diff --git a/pkgs/development/libraries/ffmpeg/2.2.nix b/pkgs/development/libraries/ffmpeg/2.2.nix deleted file mode 100644 index fbbb75cb832..00000000000 --- a/pkgs/development/libraries/ffmpeg/2.2.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ callPackage, ... } @ args: - -callPackage ./generic.nix (args // rec { - version = "${branch}.15"; - branch = "2.2"; - sha256 = "1s2mf1lvvwj6vkbp0wdr21xki864xsfi1rsjaa67q5m9dx4rrnr4"; -}) diff --git a/pkgs/development/libraries/ffmpeg/2.8.nix b/pkgs/development/libraries/ffmpeg/2.8.nix index e585ea14997..2f911b26ca1 100644 --- a/pkgs/development/libraries/ffmpeg/2.8.nix +++ b/pkgs/development/libraries/ffmpeg/2.8.nix @@ -1,7 +1,7 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // rec { - version = "${branch}.1"; + version = "${branch}.5"; branch = "2.8"; - sha256 = "1qk6g2h993i0wgs9d2p3ahdc5bqr03mp74bk6r1zj6pfinr5mvg2"; + sha256 = "0nk1j3i7qc1k3dygpq74pxq382vqg9kaf2hxl9jfw8rkad8rjv9v"; }) diff --git a/pkgs/development/libraries/ffms/default.nix b/pkgs/development/libraries/ffms/default.nix index 6f78c198f40..faf38ff4295 100644 --- a/pkgs/development/libraries/ffms/default.nix +++ b/pkgs/development/libraries/ffms/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, zlib, ffmpeg, pkgconfig }: stdenv.mkDerivation rec { - name = "ffms-2.20"; + name = "ffms-2.21"; src = fetchurl { - url = https://codeload.github.com/FFMS/ffms2/tar.gz/2.20; + url = https://codeload.github.com/FFMS/ffms2/tar.gz/2.21; name = "${name}.tar.gz"; - sha256 = "183klnhl57zf0i8xlr7yvj89ih83pzd48c37qpr57hjn4wbq1n67"; + sha256 = "00h2a5yhvr1qzbrzwbjv1ybxrx25lchgral6yxv36aaf4pi3rhn2"; }; NIX_CFLAGS_COMPILE = "-fPIC"; diff --git a/pkgs/development/libraries/funambol/default.nix b/pkgs/development/libraries/funambol/default.nix index 98049e0ca35..1fc2b21b5e5 100644 --- a/pkgs/development/libraries/funambol/default.nix +++ b/pkgs/development/libraries/funambol/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib, curl, automake, libtool, autoconf, unzip }: +{ stdenv, fetchurl, zlib, curl, autoreconfHook, unzip }: stdenv.mkDerivation rec { name = "funambol-client-cpp-9.0.0"; @@ -10,17 +10,9 @@ stdenv.mkDerivation rec { postUnpack = ''sourceRoot+="/sdk/cpp/build/autotools"''; - # Upstream guys forgotten to run autoreconf... - preConfigure='' - libtoolize -c -f - aclocal - autoheader - automake -a -c -f --add-missing - autoconf -f''; - propagatedBuildInputs = [ zlib curl ]; - nativeBuildInputs = [ automake libtool autoconf unzip ]; + nativeBuildInputs = [ autoreconfHook unzip ]; meta = { description = "SyncML client sdk by Funambol project"; diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index b0f2a5e877e..756ebf81619 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -3,14 +3,14 @@ let ver_maj = "2.32"; - ver_min = "1"; + ver_min = "3"; in stdenv.mkDerivation rec { name = "gdk-pixbuf-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://gnome/sources/gdk-pixbuf/${ver_maj}/${name}.tar.xz"; - sha256 = "1g7kjxv67jcdasi14n7jan4icrnnppd1m99wrdmpv32k4m7vfcj4"; + sha256 = "0cfh87aqyqbfcwpbv1ihgmgfcn66il5q2n8yjyl8gxkjmkqp2rrb"; }; outputs = [ "dev" "out" "docdev" ]; diff --git a/pkgs/development/libraries/gecode/3.nix b/pkgs/development/libraries/gecode/3.nix new file mode 100644 index 00000000000..a0f3dc636f9 --- /dev/null +++ b/pkgs/development/libraries/gecode/3.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, perl }: + +stdenv.mkDerivation rec { + name = "gecode-${version}"; + version = "3.7.3"; + + src = fetchurl { + url = "http://www.gecode.org/download/${name}.tar.gz"; + sha256 = "0k45jas6p3cyldgyir1314ja3174sayn2h2ly3z9b4dl3368pk77"; + }; + + buildInputs = [ perl ]; + + meta = with stdenv.lib; { + license = licenses.mit; + homepage = http://www.gecode.org; + description = "Toolkit for developing constraint-based systems"; + platforms = platforms.all; + maintainers = [ maintainers.manveru ]; + }; +} diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 6ce234c3a64..7feccdef9aa 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -7,7 +7,7 @@ with stdenv.lib; -assert !stdenv.isDarwin -> stdenv.cc.isGNU; +assert stdenv.isFreeBSD || stdenv.isDarwin || stdenv.cc.isGNU; # TODO: # * Add gio-module-fam @@ -69,11 +69,15 @@ stdenv.mkDerivation rec { # internal pcre would only add <200kB, but it's relatively common configureFlags = [ "--with-pcre=system" ] ++ optional stdenv.isDarwin "--disable-compile-warnings" + ++ optional stdenv.isFreeBSD "--with-libiconv=gnu" ++ optional stdenv.isSunOS ["--disable-modular-tests" "--with-libiconv"]; NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin " -lintl" + optionalString stdenv.isSunOS " -DBSD_COMP"; + LIBELF_CFLAGS = optional stdenv.isFreeBSD "-I${libelf}"; + LIBELF_LIBS = optional stdenv.isFreeBSD "-L${libelf} -lelf"; + preBuild = optionalString stdenv.isDarwin '' export MACOSX_DEPLOYMENT_TARGET= diff --git a/pkgs/development/libraries/gloox/default.nix b/pkgs/development/libraries/gloox/default.nix index 9723bf90eb0..6d43ea9a309 100644 --- a/pkgs/development/libraries/gloox/default.nix +++ b/pkgs/development/libraries/gloox/default.nix @@ -9,14 +9,14 @@ assert sslSupport -> openssl != null; assert idnSupport -> libidn != null; let - version = "1.0.13"; + version = "1.0.14"; in stdenv.mkDerivation rec { name = "gloox-${version}"; src = fetchurl { url = "http://camaya.net/download/gloox-${version}.tar.bz2"; - sha256 = "12payqyx1ly8nm3qn24bj0kyy9d08sixnjqxw7fn6rbwr7m1x7sd"; + sha256 = "0h9r4382qv0vqc91x1qz1nivxw1r2l874s1kl0bskzm9dyk742sj"; }; buildInputs = [ ] diff --git a/pkgs/development/libraries/gnutls/generic.nix b/pkgs/development/libraries/gnutls/generic.nix index 3bcc521504e..3e9980e2fcf 100644 --- a/pkgs/development/libraries/gnutls/generic.nix +++ b/pkgs/development/libraries/gnutls/generic.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { enableParallelBuilding = !guileBindings; buildInputs = [ lzo lzip nettle libtasn1 libidn p11_kit zlib gmp autogen ] - ++ lib.optional (stdenv.isDarwin) libiconv + ++ lib.optional (stdenv.isFreeBSD || stdenv.isDarwin) libiconv ++ lib.optional (tpmSupport && stdenv.isLinux) trousers ++ [ unbound ] ++ lib.optional guileBindings guile; diff --git a/pkgs/development/libraries/goffice/default.nix b/pkgs/development/libraries/goffice/default.nix index 3aa9c678060..4b58f3ab2ef 100644 --- a/pkgs/development/libraries/goffice/default.nix +++ b/pkgs/development/libraries/goffice/default.nix @@ -2,11 +2,11 @@ , libgsf, libxml2, libxslt, cairo, pango, librsvg, libspectre }: stdenv.mkDerivation rec { - name = "goffice-0.10.24"; + name = "goffice-0.10.26"; src = fetchurl { url = "mirror://gnome/sources/goffice/0.10/${name}.tar.xz"; - sha256 = "cda70eab0b0b0e29c3bea09849bcfca0c2ccc20038ee69e7e14cde664484af5a"; + sha256 = "2b8dd0a0f84ef4f6bd32bfdae2b68caa0e41631026a74d04c4d2266512a744bb"; }; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/development/libraries/gsasl/default.nix b/pkgs/development/libraries/gsasl/default.nix index 383c1a7e223..1ca5d019b22 100644 --- a/pkgs/development/libraries/gsasl/default.nix +++ b/pkgs/development/libraries/gsasl/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, gss, libidn }: +{ fetchurl, stdenv, gss, libidn, krb5Full }: stdenv.mkDerivation rec { name = "gsasl-1.8.0"; @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { }; buildInputs = [ libidn ] - ++ stdenv.lib.optional (!stdenv.isDarwin) gss; + ++ stdenv.lib.optional (!stdenv.isDarwin) gss + ++ stdenv.lib.optional stdenv.isDarwin krb5Full; configureFlags = stdenv.lib.optionalString stdenv.isDarwin "--with-gssapi-impl=mit"; diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix index bc129d9f1fb..d4d4cddb402 100644 --- a/pkgs/development/libraries/gtk+/2.x.nix +++ b/pkgs/development/libraries/gtk+/2.x.nix @@ -8,11 +8,11 @@ assert xineramaSupport -> xorg.libXinerama != null; assert cupsSupport -> cups != null; stdenv.mkDerivation rec { - name = "gtk+-2.24.28"; + name = "gtk+-2.24.29"; src = fetchurl { url = "mirror://gnome/sources/gtk+/2.24/${name}.tar.xz"; - sha256 = "0mj6xn40py9r9lvzg633fal81xfwfm89d9mvz7jk4lmwk0g49imj"; + sha256 = "1f1ifv1ijrda4jx831l24d3ww65v5gf56r464fi11n6k02bcah87"; }; outputs = [ "dev" "out" "docdev" ]; diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index 865a4f1cfad..2d84b1e73a8 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -5,7 +5,7 @@ }: let - version = "1.0.6"; + version = "1.1.2"; inherit (stdenv.lib) optional optionals optionalString; in @@ -14,7 +14,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${version}.tar.bz2"; - sha256 = "09ivk5m4y09ar4zi9r6db7gp234cy05h0ach7w22g9kqvkxsf5pn"; + sha256 = "07s6z3hbrb4rdfgzmln169wxz4nm5y7qbr02ik5c7drxpn85fb2a"; }; outputs = [ "dev" "out" ]; diff --git a/pkgs/development/libraries/hawknl/default.nix b/pkgs/development/libraries/hawknl/default.nix index 290f411cbf4..372a8b8c112 100644 --- a/pkgs/development/libraries/hawknl/default.nix +++ b/pkgs/development/libraries/hawknl/default.nix @@ -1,11 +1,12 @@ {stdenv, fetchurl, unzip}: stdenv.mkDerivation { - name = "hawknl-1.34"; - src = fetchurl { - url = http://hawksoft.com/download/files/HawkNL168src.zip; - sha256 = "11shn2fbxj3w0j77w0234pqyj1368x686kkgv09q5yqhi1cdp028"; - }; + name = "hawknl-1.68"; + + src = fetchurl { + url = http://urchlay.naptime.net/~urchlay/src/HawkNL168src.zip; + sha256 = "11shn2fbxj3w0j77w0234pqyj1368x686kkgv09q5yqhi1cdp028"; + }; buildInputs = [ unzip ]; diff --git a/pkgs/development/libraries/hivex/default.nix b/pkgs/development/libraries/hivex/default.nix index e048b07a1da..76836b69d2a 100644 --- a/pkgs/development/libraries/hivex/default.nix +++ b/pkgs/development/libraries/hivex/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, automake, autoconf, libtool, makeWrapper +{ stdenv, fetchurl, pkgconfig, autoreconfHook, makeWrapper , perl, libxml2, IOStringy }: stdenv.mkDerivation rec { @@ -13,14 +13,10 @@ stdenv.mkDerivation rec { patches = [ ./hivex-syms.patch ]; buildInputs = [ - pkgconfig automake autoconf libtool makeWrapper + pkgconfig autoreconfHook makeWrapper perl libxml2 IOStringy ]; - preConfigure = '' - AUTOPOINT=true autoreconf --verbose --install - ''; - postInstall = '' for bin in $out/bin/*; do wrapProgram "$bin" --prefix "PATH" : "$out/bin" diff --git a/pkgs/development/libraries/icu/default.nix b/pkgs/development/libraries/icu/default.nix index 58eb2e22781..199e2b8f962 100644 --- a/pkgs/development/libraries/icu/default.nix +++ b/pkgs/development/libraries/icu/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { ''; configureFlags = "--disable-debug" + - stdenv.lib.optionalString stdenv.isDarwin " --enable-rpath"; + stdenv.lib.optionalString (stdenv.isFreeBSD || stdenv.isDarwin) " --enable-rpath"; # remove dependency on bootstrap-tools in early stdenv build postInstall = stdenv.lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/libraries/jemalloc/default.nix b/pkgs/development/libraries/jemalloc/default.nix index 746ebd2bfcd..4a4bc039229 100644 --- a/pkgs/development/libraries/jemalloc/default.nix +++ b/pkgs/development/libraries/jemalloc/default.nix @@ -10,7 +10,11 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://www.canonware.com/jemalloc/index.html; - description = "a general purpose malloc(3) implementation that emphasizes fragmentation avoidance and scalable concurrency support"; + description = "General purpose malloc(3) implementation"; + longDescription = '' + malloc(3)-compatible memory allocator that emphasizes fragmentation + avoidance and scalable concurrency support. + ''; license = licenses.bsd2; platforms = platforms.all; maintainers = with maintainers; [ wkennington ]; diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kpackage/0001-allow-external-paths.patch b/pkgs/development/libraries/kde-frameworks-5.17/kpackage/0001-allow-external-paths.patch deleted file mode 100644 index beede4d7ccb..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.17/kpackage/0001-allow-external-paths.patch +++ /dev/null @@ -1,25 +0,0 @@ -From a92ac391b4e6ca335bd7fa78f1addd23c9467931 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel <ttuegel@gmail.com> -Date: Wed, 28 Jan 2015 07:15:30 -0600 -Subject: [PATCH 1/2] allow external paths - ---- - src/kpackage/package.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/kpackage/package.cpp b/src/kpackage/package.cpp -index 539b21a..977a026 100644 ---- a/src/kpackage/package.cpp -+++ b/src/kpackage/package.cpp -@@ -789,7 +789,7 @@ PackagePrivate::PackagePrivate() - : QSharedData(), - fallbackPackage(0), - metadata(0), -- externalPaths(false), -+ externalPaths(true), - valid(false), - checkedValid(false) - { --- -2.5.2 - diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kpackage/0002-qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.17/kpackage/0002-qdiriterator-follow-symlinks.patch deleted file mode 100644 index 6e93fca9b21..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.17/kpackage/0002-qdiriterator-follow-symlinks.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 9fc26c3c0478eb7cb0a531836ba2e3a85d820c88 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel <ttuegel@gmail.com> -Date: Wed, 14 Oct 2015 06:50:28 -0500 -Subject: [PATCH 2/2] qdiriterator follow symlinks - ---- - src/kpackage/packageloader.cpp | 2 +- - src/kpackage/private/packagejobthread.cpp | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/kpackage/packageloader.cpp b/src/kpackage/packageloader.cpp -index eb5ed47..94217f6 100644 ---- a/src/kpackage/packageloader.cpp -+++ b/src/kpackage/packageloader.cpp -@@ -241,7 +241,7 @@ QList<KPluginMetaData> PackageLoader::listPackages(const QString &packageFormat, - } else { - //qDebug() << "Not cached"; - // If there's no cache file, fall back to listing the directory -- const QDirIterator::IteratorFlags flags = QDirIterator::Subdirectories; -+ const QDirIterator::IteratorFlags flags = QDirIterator::Subdirectories | QDirIterator::FollowSymlinks; - const QStringList nameFilters = QStringList(QStringLiteral("metadata.desktop")); - - QDirIterator it(plugindir, nameFilters, QDir::Files, flags); -diff --git a/src/kpackage/private/packagejobthread.cpp b/src/kpackage/private/packagejobthread.cpp -index ca523b3..1cfa792 100644 ---- a/src/kpackage/private/packagejobthread.cpp -+++ b/src/kpackage/private/packagejobthread.cpp -@@ -145,7 +145,7 @@ bool indexDirectory(const QString& dir, const QString& dest) - QJsonArray plugins; - - int i = 0; -- QDirIterator it(dir, QStringList()<<QStringLiteral("*.desktop"), QDir::Files, QDirIterator::Subdirectories); -+ QDirIterator it(dir, QStringList()<<QStringLiteral("*.desktop"), QDir::Files, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); - while (it.hasNext()) { - it.next(); - const QString path = it.fileInfo().absoluteFilePath(); --- -2.5.2 - diff --git a/pkgs/development/libraries/kde-frameworks-5.17/ktexteditor/default.nix b/pkgs/development/libraries/kde-frameworks-5.17/ktexteditor/default.nix deleted file mode 100644 index 39092fbb278..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.17/ktexteditor/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ kdeFramework, lib, extra-cmake-modules, karchive, kconfig -, kguiaddons, ki18n, kio, kiconthemes, kparts, perl, qtscript -, qtxmlpatterns, sonnet -}: - -kdeFramework { - name = "ktexteditor"; - nativeBuildInputs = [ extra-cmake-modules perl ]; - buildInputs = [ - karchive kconfig kguiaddons kiconthemes kparts qtscript - qtxmlpatterns - ]; - propagatedBuildInputs = [ ki18n kio sonnet ]; - patches = [ ./0001-no-qcoreapplication.patch ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.17/srcs.nix b/pkgs/development/libraries/kde-frameworks-5.17/srcs.nix deleted file mode 100644 index 8cf8d1bbad4..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.17/srcs.nix +++ /dev/null @@ -1,565 +0,0 @@ -# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh -{ fetchurl, mirror }: - -{ - attica = { - version = "5.17.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.17/attica-5.17.0.tar.xz"; - sha256 = "0n5f8754705ga3s158nn56haakajcpx7hms3pjn32jc1n95h06nf"; - name = "attica-5.17.0.tar.xz"; - }; - }; - baloo = { - version = "5.17.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.17/baloo-5.17.0.tar.xz"; - sha256 = "01gkn69i63ppjrswpqw1vdfc590vn4xlld1zmjzprbfs2ryni2k0"; - name = "baloo-5.17.0.tar.xz"; - }; - }; - bluez-qt = { - version = "5.17.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.17/bluez-qt-5.17.0.tar.xz"; - sha256 = "1jh60gs2lqwg1x609lh3lrgqjfg179r40j59wgmzrm5bfvc5zsk5"; - name = "bluez-qt-5.17.0.tar.xz"; - }; - }; - breeze-icons = { - version = "5.17.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.17/breeze-icons-5.17.0.tar.xz"; - sha256 = "120x15mps8gy4c4vzrcwvfcmjv7qka7q92lyqk76g70v6yh29q84"; - name = "breeze-icons-5.17.0.tar.xz"; - }; - }; - extra-cmake-modules = { - version = "5.17.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.17/extra-cmake-modules-5.17.0.tar.xz"; - sha256 = "01blad3rwffsgd21xkkk653kbqv2gvh0ckmvpil9x9fc0w7gwmqs"; - name = "extra-cmake-modules-5.17.0.tar.xz"; - }; - }; - frameworkintegration = { - version = "5.17.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.17/frameworkintegration-5.17.0.tar.xz"; - sha256 = "1f8clq6wszb74qal6402r66izansn9cz1x5j13v8ajwqb7rr8gvl"; - name = "frameworkintegration-5.17.0.tar.xz"; - }; - }; - kactivities = { - version = "5.17.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.17/kactivities-5.17.0.tar.xz"; - sha256 = "0lnx3kbgna9pq1bdzzygng0l7rkwyvr2gkxm5abhbw290dvq0xas"; - name = "kactivities-5.17.0.tar.xz"; - }; - }; - kapidox = { - version = "5.17.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.17/kapidox-5.17.0.tar.xz"; - sha256 = "1cd32n36w8hfggng61m50jflb9lpv4ba74aq1g64c1grbfjad3k1"; - name = "kapidox-5.17.0.tar.xz"; - }; - }; - karchive = { - version = "5.17.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.17/karchive-5.17.0.tar.xz"; - sha256 = "1ry7vwgc1np9pw1b8791lji09n1y6afyifqlv112riifq7ljmld1"; - name = "karchive-5.17.0.tar.xz"; - }; - }; - kauth = { - version = "5.17.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.17/kauth-5.17.0.tar.xz"; - sha256 = "0v7vgh4hmfk3h3083jwx3n11xz22j6vn50naffzwwixqlrqa7qy3"; - name = "kauth-5.17.0.tar.xz"; - }; - }; - kbookmarks = { - version = "5.17.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.17/kbookmarks-5.17.0.tar.xz"; - sha256 = "0rk70ag21lpym9lw4dd9rlq77lfi2v2y076g6000hhrqjnvdbcya"; - name = "kbookmarks-5.17.0.tar.xz"; - }; - }; - kcmutils = { - version = "5.17.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.17/kcmutils-5.17.0.tar.xz"; - sha256 = "176b8ai490ipc1p8zqzi3ymsqzazb7awgnrd81b4fr3fzcm3q8zh"; - name = "kcmutils-5.17.0.tar.xz"; - }; - }; - kcodecs = { - version = "5.17.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.17/kcodecs-5.17.0.tar.xz"; - sha256 = "12nic57sx69zvj9ihw3ifiwnf9giqq57kgp892kcz5q42wjqzvj3"; - name = "kcodecs-5.17.0.tar.xz"; - }; - }; - kcompletion = { - version = "5.17.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.17/kcompletion-5.17.0.tar.xz"; - sha256 = "0d8mx3kr29lp1fk0n8pmmzlzrw9fa3czayn46xdwf1dr2pjj4a2g"; - name = "kcompletion-5.17.0.tar.xz"; - }; - }; - kconfig = { - version = "5.17.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.17/kconfig-5.17.0.tar.xz"; - sha256 = "1kdagw6wisqnfj6iq77r0nkc04cvhj4n454s3w3az0bhk23b4nrj"; - name = "kconfig-5.17.0.tar.xz"; - }; - }; - kconfigwidgets = { - version = "5.17.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.17/kconfigwidgets-5.17.0.tar.xz"; - sha256 = "0fvrk5ap4lr8i2nlphsy3z7kv39h28v33yja2r54pa4207kq4cy2"; - name = "kconfigwidgets-5.17.0.tar.xz"; - }; - }; - kcoreaddons = { - version = "5.17.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.17/kcoreaddons-5.17.0.tar.xz"; - sha256 = "0pd6siicagcjd4vbn30rhrlwy6r3iiyjpl2pim1njr6fvsb0687n"; - name = "kcoreaddons-5.17.0.tar.xz"; - }; - }; - kcrash = { - version = "5.17.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.17/kcrash-5.17.0.tar.xz"; - sha256 = "0v1v4ksfswc3fg7piqiw0fln30vilk5pbqq2wphbwbgn5im91m7d"; - name = "kcrash-5.17.0.tar.xz"; - }; - }; - kdbusaddons = { - version = "5.17.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.17/kdbusaddons-5.17.0.tar.xz"; - sha256 = "1n4k97206v7hdkrd2p8vhy1bnr194zvamw3vpvhfxgq4pr4a96dm"; - name = "kdbusaddons-5.17.0.tar.xz"; - }; - }; - kdeclarative = { - version = "5.17.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.17/kdeclarative-5.17.0.tar.xz"; - sha256 = "12p5dkdww32d5gk71aw7x5xpa3gj1ag60vj17b9v3zmax0a2g84k"; - name = "kdeclarative-5.17.0.tar.xz"; - }; - }; - kded = { - version = "5.17.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.17/kded-5.17.0.tar.xz"; - sha256 = "1sly9dviv0q99045p13xswjr78x2x5fzwj4qad66w6cyv67i0khk"; - name = "kded-5.17.0.tar.xz"; - }; - }; - kdelibs4support = { - version = "5.17.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.17/portingAids/kdelibs4support-5.17.0.tar.xz"; - sha256 = "03i7r60zjd10cam0q0kld0x43a8fn281bgn25fysw7604f92x7rx"; - name = "kdelibs4support-5.17.0.tar.xz"; - }; - }; - kdesignerplugin = { - version = "5.17.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.17/kdesignerplugin-5.17.0.tar.xz"; - sha256 = "0v47sia41gsf9gaf5jgvfgf2wzszfa76abzplqrmlgvrymi1fk1z"; - name = "kdesignerplugin-5.17.0.tar.xz"; - }; - }; - kdesu = { - version = "5.17.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.17/kdesu-5.17.0.tar.xz"; - sha256 = "188k34x4z1s948f3qdy4c5pascdzshrqnbsx0ppnjlgxhv8sx108"; - name = "kdesu-5.17.0.tar.xz"; - }; - }; - kdewebkit = { - version = "5.17.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.17/kdewebkit-5.17.0.tar.xz"; - sha256 = "1p3nanp1i09hpxp9gfvjyqcrfjf7ypxpfhpd381az96pjs35dixc"; - name = "kdewebkit-5.17.0.tar.xz"; - }; - }; - kdnssd = { - version = "5.17.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.17/kdnssd-5.17.0.tar.xz"; - sha256 = "05njhdpmp28c46271laxjy87v6miwzf7xm1886b9q0v47cpin2p1"; - name = "kdnssd-5.17.0.tar.xz"; - }; - }; - kdoctools = { - version = "5.17.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.17/kdoctools-5.17.0.tar.xz"; - sha256 = "0qbzj68rfg9xc3nabhrnaqm9ysgbrdhdgm8ag64ixk6b4x6hjmr8"; - name = "kdoctools-5.17.0.tar.xz"; - }; - }; - kemoticons = { - version = "5.17.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.17/kemoticons-5.17.0.tar.xz"; - sha256 = "0cxzjfsl1ph3nl6ycsgyaz22rb4nc15n2glcgnmrqchh67xxzv13"; - name = "kemoticons-5.17.0.tar.xz"; - }; - }; - kfilemetadata = { - version = "5.17.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.17/kfilemetadata-5.17.0.tar.xz"; - sha256 = "1a6865v1cz31i8a63hhjzp1lw5b78p0r7ypml6syxlblpg2y9mzh"; - name = "kfilemetadata-5.17.0.tar.xz"; - }; - }; - kglobalaccel = { - version = "5.17.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.17/kglobalaccel-5.17.0.tar.xz"; - sha256 = "0dm8xljqgxay98dcqdgvmhcf0fanv3iiw23nk4vyzis6n8nv04hz"; - name = "kglobalaccel-5.17.0.tar.xz"; - }; - }; - kguiaddons = { - version = "5.17.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.17/kguiaddons-5.17.0.tar.xz"; - sha256 = "1r15ll4c27zp78p9i18izxrpmf41hynz16z0fmz8jgcdnxgx0d74"; - name = "kguiaddons-5.17.0.tar.xz"; - }; - }; - khtml = { - version = "5.17.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.17/portingAids/khtml-5.17.0.tar.xz"; - sha256 = "0mz5mb7mh2nxih2avy2ncmchlyzg8pignnl4lbr5cnfc7y79g7i4"; - name = "khtml-5.17.0.tar.xz"; - }; - }; - ki18n = { - version = "5.17.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.17/ki18n-5.17.0.tar.xz"; - sha256 = "07chysr2x579ll6qwxmirmcy5b06wf0578l8xmvgc9q4wk0m0m73"; - name = "ki18n-5.17.0.tar.xz"; - }; - }; - kiconthemes = { - version = "5.17.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.17/kiconthemes-5.17.0.tar.xz"; - sha256 = "1fgwgwmrb0pav30s7wc30src92cvfw6cxqz2q14n5flz7kg1d0k3"; - name = "kiconthemes-5.17.0.tar.xz"; - }; - }; - kidletime = { - version = "5.17.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.17/kidletime-5.17.0.tar.xz"; - sha256 = "06ig3wca3k1kdq0w1pl5syvcgrrshyws6xal7qswr6vsf6jd7n95"; - name = "kidletime-5.17.0.tar.xz"; - }; - }; - kimageformats = { - version = "5.17.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.17/kimageformats-5.17.0.tar.xz"; - sha256 = "0dw007wc50fhgpm1sv8qxs3y8xwwgcz33nd8p7yg8bxqfgjmhzbs"; - name = "kimageformats-5.17.0.tar.xz"; - }; - }; - kinit = { - version = "5.17.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.17/kinit-5.17.0.tar.xz"; - sha256 = "18agcc5z8g0vsk97wh4p09185m5vz52wdsia7rg8f5fb4wkzrn5i"; - name = "kinit-5.17.0.tar.xz"; - }; - }; - kio = { - version = "5.17.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.17/kio-5.17.0.tar.xz"; - sha256 = "1dfh2kbp00kv5b94p4xjimh4fhlwmcgac7wsi1g2pvrbw7gsi48l"; - name = "kio-5.17.0.tar.xz"; - }; - }; - kitemmodels = { - version = "5.17.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.17/kitemmodels-5.17.0.tar.xz"; - sha256 = "19zq1d7ymfzlz3nx4a9hvlfssa7x0rdh8pg8i9rchalals6239ny"; - name = "kitemmodels-5.17.0.tar.xz"; - }; - }; - kitemviews = { - version = "5.17.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.17/kitemviews-5.17.0.tar.xz"; - sha256 = "1k3f1j3sw86jl5y3ak767ldb2fraspldjh6i98926wingqq3y8p3"; - name = "kitemviews-5.17.0.tar.xz"; - }; - }; - kjobwidgets = { - version = "5.17.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.17/kjobwidgets-5.17.0.tar.xz"; - sha256 = "02j7fm0g0dc6grvgjhx269b5p4xil7k8z1m8amkjpc7v3j3vkyrw"; - name = "kjobwidgets-5.17.0.tar.xz"; - }; - }; - kjs = { - version = "5.17.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.17/portingAids/kjs-5.17.0.tar.xz"; - sha256 = "0988qcgiqc4mla3x12mb8xaw0mhy2kmdi94xw634az03mwghljh4"; - name = "kjs-5.17.0.tar.xz"; - }; - }; - kjsembed = { - version = "5.17.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.17/portingAids/kjsembed-5.17.0.tar.xz"; - sha256 = "0am27pdc2pdjisc82iinq68lw8r12a0zb9n6ywa1mlqbrvr5sqgs"; - name = "kjsembed-5.17.0.tar.xz"; - }; - }; - kmediaplayer = { - version = "5.17.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.17/portingAids/kmediaplayer-5.17.0.tar.xz"; - sha256 = "1idzbddyfrf05kbqqm1hcyy53qrnvg9sb0f29rqp33mq36y63rxg"; - name = "kmediaplayer-5.17.0.tar.xz"; - }; - }; - knewstuff = { - version = "5.17.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.17/knewstuff-5.17.0.tar.xz"; - sha256 = "1ljr1syg7810ww0wlqq2p7xdqn9sfz7kkxr8vdw4627gjqr50l5s"; - name = "knewstuff-5.17.0.tar.xz"; - }; - }; - knotifications = { - version = "5.17.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.17/knotifications-5.17.0.tar.xz"; - sha256 = "0k2g0vmlhandp9zihj5sbs06yanmpy06h2pq5d2hn569anvpxr0r"; - name = "knotifications-5.17.0.tar.xz"; - }; - }; - knotifyconfig = { - version = "5.17.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.17/knotifyconfig-5.17.0.tar.xz"; - sha256 = "1lfa23vag5j294ry5c0n59rs04k1mb5yr7vi69al2pw6xmnkbw6n"; - name = "knotifyconfig-5.17.0.tar.xz"; - }; - }; - kpackage = { - version = "5.17.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.17/kpackage-5.17.0.tar.xz"; - sha256 = "03z3hcibzkzymva935gx39bbrl61jw8wnxqxh2f56z7qmm7sj9x7"; - name = "kpackage-5.17.0.tar.xz"; - }; - }; - kparts = { - version = "5.17.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.17/kparts-5.17.0.tar.xz"; - sha256 = "08dh17z5345gmvaacrllpx9zdfayndfxl8ykhzpp3gvx0ssrswwx"; - name = "kparts-5.17.0.tar.xz"; - }; - }; - kpeople = { - version = "5.17.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.17/kpeople-5.17.0.tar.xz"; - sha256 = "0d7j2j92r2iwkabnqm6f6wm5d4j69r4z1859pc9l4rhh4f0qy9g3"; - name = "kpeople-5.17.0.tar.xz"; - }; - }; - kplotting = { - version = "5.17.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.17/kplotting-5.17.0.tar.xz"; - sha256 = "0i8gcvf2fiaxxqjan1lil9is8v5bfd4yi9zyl7bzijcishckrkmx"; - name = "kplotting-5.17.0.tar.xz"; - }; - }; - kpty = { - version = "5.17.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.17/kpty-5.17.0.tar.xz"; - sha256 = "1csgwp9y33sfgzn4mwinqznfmsd2cm1iia6qm0xpmf8n39rassxc"; - name = "kpty-5.17.0.tar.xz"; - }; - }; - kross = { - version = "5.17.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.17/portingAids/kross-5.17.0.tar.xz"; - sha256 = "0bjkp8ibaw1zr71dbfz09qbaragmzh3slyp8mm6ypaixgfvprklx"; - name = "kross-5.17.0.tar.xz"; - }; - }; - krunner = { - version = "5.17.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.17/portingAids/krunner-5.17.0.tar.xz"; - sha256 = "0ghxbmkpi20kbrsn6kib3na3gdnsn5akfzazfwh8q00dhabhin4k"; - name = "krunner-5.17.0.tar.xz"; - }; - }; - kservice = { - version = "5.17.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.17/kservice-5.17.0.tar.xz"; - sha256 = "0nz46n6yj3h6ml0gvn2j7malvxn4p96q9xh9f2i7j1jwl3c5j4b8"; - name = "kservice-5.17.0.tar.xz"; - }; - }; - ktexteditor = { - version = "5.17.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.17/ktexteditor-5.17.0.tar.xz"; - sha256 = "16shf6zq019pmg8avnlvn4l5w71h4y6v3511rckn8kqdrz3wb4pr"; - name = "ktexteditor-5.17.0.tar.xz"; - }; - }; - ktextwidgets = { - version = "5.17.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.17/ktextwidgets-5.17.0.tar.xz"; - sha256 = "1940a2s084hwf359rr3vrlzdz09iyn3nlpch24wgff728i28mc73"; - name = "ktextwidgets-5.17.0.tar.xz"; - }; - }; - kunitconversion = { - version = "5.17.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.17/kunitconversion-5.17.0.tar.xz"; - sha256 = "0yc3k0d91m5ql75azabqqsihy3hai3x0hzwby8wwm5by20mq1bjf"; - name = "kunitconversion-5.17.0.tar.xz"; - }; - }; - kwallet = { - version = "5.17.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.17/kwallet-5.17.0.tar.xz"; - sha256 = "0552cd4m6nf439vrbwljxmb030h1ndmldvnl4p5r0g8h8jd12siv"; - name = "kwallet-5.17.0.tar.xz"; - }; - }; - kwidgetsaddons = { - version = "5.17.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.17/kwidgetsaddons-5.17.0.tar.xz"; - sha256 = "151jywz4z375kgx362i39gf5xb7fdayz9kly738vzwx4vx253xvn"; - name = "kwidgetsaddons-5.17.0.tar.xz"; - }; - }; - kwindowsystem = { - version = "5.17.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.17/kwindowsystem-5.17.0.tar.xz"; - sha256 = "180b567ixiv487fdw2hp0jgs7cckm8f82y0mny5zvi25l39gjq54"; - name = "kwindowsystem-5.17.0.tar.xz"; - }; - }; - kxmlgui = { - version = "5.17.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.17/kxmlgui-5.17.0.tar.xz"; - sha256 = "0rbxk9f918wmq1ijxcpjf6rl31p1f0f85f8rjk5aln3gh65b1zdn"; - name = "kxmlgui-5.17.0.tar.xz"; - }; - }; - kxmlrpcclient = { - version = "5.17.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.17/kxmlrpcclient-5.17.0.tar.xz"; - sha256 = "1zj7c6b72cnnkds73938xyy87padbv0ah3jfqxdfb1yd5zxba7cs"; - name = "kxmlrpcclient-5.17.0.tar.xz"; - }; - }; - modemmanager-qt = { - version = "5.17.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.17/modemmanager-qt-5.17.0.tar.xz"; - sha256 = "1q3abgr527lcrzy40anm3sjy9j8ycga4g1gkqz201lwa1wp22zr3"; - name = "modemmanager-qt-5.17.0.tar.xz"; - }; - }; - networkmanager-qt = { - version = "5.17.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.17/networkmanager-qt-5.17.0.tar.xz"; - sha256 = "08aafz3y2lnnl5dmzj4s1nfjwhy3mda20pkxjyw1vk8l3s8nhs1l"; - name = "networkmanager-qt-5.17.0.tar.xz"; - }; - }; - oxygen-icons5 = { - version = "5.17.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.17/oxygen-icons5-5.17.0.tar.xz"; - sha256 = "18m5hfz4zappnz45f230sgjbl52fsjxli6d5dvm6998bhcyvv1y9"; - name = "oxygen-icons5-5.17.0.tar.xz"; - }; - }; - plasma-framework = { - version = "5.17.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.17/plasma-framework-5.17.0.tar.xz"; - sha256 = "0pi91pg9h0s4xziw9m8mc65b8ryhgjnv14zalmbwyr63qn7bkfjh"; - name = "plasma-framework-5.17.0.tar.xz"; - }; - }; - solid = { - version = "5.17.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.17/solid-5.17.0.tar.xz"; - sha256 = "1igdqk5cgrxq4is55zdskkc0kbcyp9vjfdrvr9xxhs0lxgizccx3"; - name = "solid-5.17.0.tar.xz"; - }; - }; - sonnet = { - version = "5.17.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.17/sonnet-5.17.0.tar.xz"; - sha256 = "0f7bzdcknc7kc4133q0c3zc1j78yf29kh8i7c0qg01zv1iafbbsv"; - name = "sonnet-5.17.0.tar.xz"; - }; - }; - threadweaver = { - version = "5.17.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.17/threadweaver-5.17.0.tar.xz"; - sha256 = "1cf7qrzw4saai0z6l7bzhfc8clhngcgxla5zbpj28l6130lha8sw"; - name = "threadweaver-5.17.0.tar.xz"; - }; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.17/attica.nix b/pkgs/development/libraries/kde-frameworks-5.18/attica.nix index 98721876c12..98721876c12 100644 --- a/pkgs/development/libraries/kde-frameworks-5.17/attica.nix +++ b/pkgs/development/libraries/kde-frameworks-5.18/attica.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.17/baloo.nix b/pkgs/development/libraries/kde-frameworks-5.18/baloo.nix index 38c41d9271d..38c41d9271d 100644 --- a/pkgs/development/libraries/kde-frameworks-5.17/baloo.nix +++ b/pkgs/development/libraries/kde-frameworks-5.18/baloo.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.17/bluez-qt.nix b/pkgs/development/libraries/kde-frameworks-5.18/bluez-qt.nix index f981b0516f7..f981b0516f7 100644 --- a/pkgs/development/libraries/kde-frameworks-5.17/bluez-qt.nix +++ b/pkgs/development/libraries/kde-frameworks-5.18/bluez-qt.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.17/breeze-icons.nix b/pkgs/development/libraries/kde-frameworks-5.18/breeze-icons.nix index 879262c56a4..879262c56a4 100644 --- a/pkgs/development/libraries/kde-frameworks-5.17/breeze-icons.nix +++ b/pkgs/development/libraries/kde-frameworks-5.18/breeze-icons.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.17/default.nix b/pkgs/development/libraries/kde-frameworks-5.18/default.nix index 828faaa631f..f41aebcb59d 100644 --- a/pkgs/development/libraries/kde-frameworks-5.17/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.18/default.nix @@ -74,7 +74,7 @@ let kidletime = callPackage ./kidletime.nix {}; kimageformats = callPackage ./kimageformats.nix {}; kinit = callPackage ./kinit {}; - kio = callPackage ./kio.nix {}; + kio = callPackage ./kio {}; kitemmodels = callPackage ./kitemmodels.nix {}; kitemviews = callPackage ./kitemviews.nix {}; kjobwidgets = callPackage ./kjobwidgets.nix {}; diff --git a/pkgs/development/libraries/kde-frameworks-5.17/extra-cmake-modules/0001-extra-cmake-modules-paths.patch b/pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/0001-extra-cmake-modules-paths.patch index 9717716faf5..9717716faf5 100644 --- a/pkgs/development/libraries/kde-frameworks-5.17/extra-cmake-modules/0001-extra-cmake-modules-paths.patch +++ b/pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/0001-extra-cmake-modules-paths.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.17/extra-cmake-modules/default.nix b/pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/default.nix index 4e1b1aff3bd..4e1b1aff3bd 100644 --- a/pkgs/development/libraries/kde-frameworks-5.17/extra-cmake-modules/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/default.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.17/extra-cmake-modules/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/setup-hook.sh index a6fa6189240..a6fa6189240 100644 --- a/pkgs/development/libraries/kde-frameworks-5.17/extra-cmake-modules/setup-hook.sh +++ b/pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/setup-hook.sh diff --git a/pkgs/development/libraries/kde-frameworks-5.17/fetchsrcs.sh b/pkgs/development/libraries/kde-frameworks-5.18/fetchsrcs.sh index 16a8de82c59..84b882a0a07 100755 --- a/pkgs/development/libraries/kde-frameworks-5.17/fetchsrcs.sh +++ b/pkgs/development/libraries/kde-frameworks-5.18/fetchsrcs.sh @@ -4,7 +4,7 @@ set -x # The trailing slash at the end is necessary! -RELEASE_URL="http://download.kde.org/stable/frameworks/5.17/" +RELEASE_URL="http://download.kde.org/stable/frameworks/5.18/" EXTRA_WGET_ARGS='-A *.tar.xz' mkdir tmp; cd tmp diff --git a/pkgs/development/libraries/kde-frameworks-5.17/frameworkintegration.nix b/pkgs/development/libraries/kde-frameworks-5.18/frameworkintegration.nix index 26987c385ad..26987c385ad 100644 --- a/pkgs/development/libraries/kde-frameworks-5.17/frameworkintegration.nix +++ b/pkgs/development/libraries/kde-frameworks-5.18/frameworkintegration.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kactivities.nix b/pkgs/development/libraries/kde-frameworks-5.18/kactivities.nix index 3225098f439..3225098f439 100644 --- a/pkgs/development/libraries/kde-frameworks-5.17/kactivities.nix +++ b/pkgs/development/libraries/kde-frameworks-5.18/kactivities.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kapidox.nix b/pkgs/development/libraries/kde-frameworks-5.18/kapidox.nix index 647be8f052c..647be8f052c 100644 --- a/pkgs/development/libraries/kde-frameworks-5.17/kapidox.nix +++ b/pkgs/development/libraries/kde-frameworks-5.18/kapidox.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.17/karchive.nix b/pkgs/development/libraries/kde-frameworks-5.18/karchive.nix index a8d9a0003c3..a8d9a0003c3 100644 --- a/pkgs/development/libraries/kde-frameworks-5.17/karchive.nix +++ b/pkgs/development/libraries/kde-frameworks-5.18/karchive.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kauth/default.nix b/pkgs/development/libraries/kde-frameworks-5.18/kauth/default.nix index 2b000ff3c04..2b000ff3c04 100644 --- a/pkgs/development/libraries/kde-frameworks-5.17/kauth/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.18/kauth/default.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kauth/kauth-policy-install.patch b/pkgs/development/libraries/kde-frameworks-5.18/kauth/kauth-policy-install.patch index 340155256f2..340155256f2 100644 --- a/pkgs/development/libraries/kde-frameworks-5.17/kauth/kauth-policy-install.patch +++ b/pkgs/development/libraries/kde-frameworks-5.18/kauth/kauth-policy-install.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kbookmarks.nix b/pkgs/development/libraries/kde-frameworks-5.18/kbookmarks.nix index 1a469ab4db6..1a469ab4db6 100644 --- a/pkgs/development/libraries/kde-frameworks-5.17/kbookmarks.nix +++ b/pkgs/development/libraries/kde-frameworks-5.18/kbookmarks.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kcmutils/0001-qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.18/kcmutils/0001-qdiriterator-follow-symlinks.patch index 0d861fa9501..0d861fa9501 100644 --- a/pkgs/development/libraries/kde-frameworks-5.17/kcmutils/0001-qdiriterator-follow-symlinks.patch +++ b/pkgs/development/libraries/kde-frameworks-5.18/kcmutils/0001-qdiriterator-follow-symlinks.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kcmutils/default.nix b/pkgs/development/libraries/kde-frameworks-5.18/kcmutils/default.nix index dbbb783ac61..dbbb783ac61 100644 --- a/pkgs/development/libraries/kde-frameworks-5.17/kcmutils/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.18/kcmutils/default.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kcodecs.nix b/pkgs/development/libraries/kde-frameworks-5.18/kcodecs.nix index 53a69a69b69..53a69a69b69 100644 --- a/pkgs/development/libraries/kde-frameworks-5.17/kcodecs.nix +++ b/pkgs/development/libraries/kde-frameworks-5.18/kcodecs.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kcompletion.nix b/pkgs/development/libraries/kde-frameworks-5.18/kcompletion.nix index e393774f16a..e393774f16a 100644 --- a/pkgs/development/libraries/kde-frameworks-5.17/kcompletion.nix +++ b/pkgs/development/libraries/kde-frameworks-5.18/kcompletion.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kconfig.nix b/pkgs/development/libraries/kde-frameworks-5.18/kconfig.nix index e132afe5988..e132afe5988 100644 --- a/pkgs/development/libraries/kde-frameworks-5.17/kconfig.nix +++ b/pkgs/development/libraries/kde-frameworks-5.18/kconfig.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.18/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch index 7a6c0ee9053..7a6c0ee9053 100644 --- a/pkgs/development/libraries/kde-frameworks-5.17/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch +++ b/pkgs/development/libraries/kde-frameworks-5.18/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kconfigwidgets/default.nix b/pkgs/development/libraries/kde-frameworks-5.18/kconfigwidgets/default.nix index 0e14d06edd3..0e14d06edd3 100644 --- a/pkgs/development/libraries/kde-frameworks-5.17/kconfigwidgets/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.18/kconfigwidgets/default.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kcoreaddons.nix b/pkgs/development/libraries/kde-frameworks-5.18/kcoreaddons.nix index f3a1db7bd48..f3a1db7bd48 100644 --- a/pkgs/development/libraries/kde-frameworks-5.17/kcoreaddons.nix +++ b/pkgs/development/libraries/kde-frameworks-5.18/kcoreaddons.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kcrash.nix b/pkgs/development/libraries/kde-frameworks-5.18/kcrash.nix index bbab78ccb40..bbab78ccb40 100644 --- a/pkgs/development/libraries/kde-frameworks-5.17/kcrash.nix +++ b/pkgs/development/libraries/kde-frameworks-5.18/kcrash.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kdbusaddons.nix b/pkgs/development/libraries/kde-frameworks-5.18/kdbusaddons.nix index d2ceab31d14..d2ceab31d14 100644 --- a/pkgs/development/libraries/kde-frameworks-5.17/kdbusaddons.nix +++ b/pkgs/development/libraries/kde-frameworks-5.18/kdbusaddons.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kdeclarative.nix b/pkgs/development/libraries/kde-frameworks-5.18/kdeclarative.nix index 74d107466cf..74d107466cf 100644 --- a/pkgs/development/libraries/kde-frameworks-5.17/kdeclarative.nix +++ b/pkgs/development/libraries/kde-frameworks-5.18/kdeclarative.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kded.nix b/pkgs/development/libraries/kde-frameworks-5.18/kded.nix index 47ae2d68c68..47ae2d68c68 100644 --- a/pkgs/development/libraries/kde-frameworks-5.17/kded.nix +++ b/pkgs/development/libraries/kde-frameworks-5.18/kded.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kdelibs4support.nix b/pkgs/development/libraries/kde-frameworks-5.18/kdelibs4support.nix index 0dd5c415761..e61c4bb86e7 100644 --- a/pkgs/development/libraries/kde-frameworks-5.17/kdelibs4support.nix +++ b/pkgs/development/libraries/kde-frameworks-5.18/kdelibs4support.nix @@ -1,6 +1,6 @@ { kdeFramework, lib, extra-cmake-modules, docbook_xml_dtd_45, kauth , karchive, kcompletion, kconfig, kconfigwidgets, kcoreaddons -, kcrash, kdbusaddons, kdesignerplugin, kdoctools, kemoticons +, kcrash, kdbusaddons, kded, kdesignerplugin, kdoctools, kemoticons , kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kitemmodels , kinit, knotifications, kparts, kservice, ktextwidgets , kunitconversion, kwidgetsaddons, kwindowsystem, kxmlgui @@ -13,7 +13,7 @@ kdeFramework { name = "kdelibs4support"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - kcompletion kconfig kservice kwidgetsaddons + kcompletion kconfig kded kservice kwidgetsaddons kxmlgui networkmanager qtsvg qtx11extras xlibs.libSM ]; propagatedBuildInputs = [ diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kdesignerplugin.nix b/pkgs/development/libraries/kde-frameworks-5.18/kdesignerplugin.nix index cbc114ccca0..cbc114ccca0 100644 --- a/pkgs/development/libraries/kde-frameworks-5.17/kdesignerplugin.nix +++ b/pkgs/development/libraries/kde-frameworks-5.18/kdesignerplugin.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kdesu.nix b/pkgs/development/libraries/kde-frameworks-5.18/kdesu.nix index 364fbd6a720..364fbd6a720 100644 --- a/pkgs/development/libraries/kde-frameworks-5.17/kdesu.nix +++ b/pkgs/development/libraries/kde-frameworks-5.18/kdesu.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kdewebkit.nix b/pkgs/development/libraries/kde-frameworks-5.18/kdewebkit.nix index d361313d1d4..d361313d1d4 100644 --- a/pkgs/development/libraries/kde-frameworks-5.17/kdewebkit.nix +++ b/pkgs/development/libraries/kde-frameworks-5.18/kdewebkit.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kdnssd.nix b/pkgs/development/libraries/kde-frameworks-5.18/kdnssd.nix index f00432b0c9c..f00432b0c9c 100644 --- a/pkgs/development/libraries/kde-frameworks-5.17/kdnssd.nix +++ b/pkgs/development/libraries/kde-frameworks-5.18/kdnssd.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kdoctools/default.nix b/pkgs/development/libraries/kde-frameworks-5.18/kdoctools/default.nix index 138c3fc33b9..138c3fc33b9 100644 --- a/pkgs/development/libraries/kde-frameworks-5.17/kdoctools/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.18/kdoctools/default.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kdoctools/kdoctools-no-find-docbook-xml.patch b/pkgs/development/libraries/kde-frameworks-5.18/kdoctools/kdoctools-no-find-docbook-xml.patch index 4e3a33efab3..4e3a33efab3 100644 --- a/pkgs/development/libraries/kde-frameworks-5.17/kdoctools/kdoctools-no-find-docbook-xml.patch +++ b/pkgs/development/libraries/kde-frameworks-5.18/kdoctools/kdoctools-no-find-docbook-xml.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kdoctools/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.18/kdoctools/setup-hook.sh index 5cfffbd622d..5cfffbd622d 100644 --- a/pkgs/development/libraries/kde-frameworks-5.17/kdoctools/setup-hook.sh +++ b/pkgs/development/libraries/kde-frameworks-5.18/kdoctools/setup-hook.sh diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kemoticons.nix b/pkgs/development/libraries/kde-frameworks-5.18/kemoticons.nix index d165f84e3a2..d165f84e3a2 100644 --- a/pkgs/development/libraries/kde-frameworks-5.17/kemoticons.nix +++ b/pkgs/development/libraries/kde-frameworks-5.18/kemoticons.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kfilemetadata.nix b/pkgs/development/libraries/kde-frameworks-5.18/kfilemetadata.nix index be99c58d550..be99c58d550 100644 --- a/pkgs/development/libraries/kde-frameworks-5.17/kfilemetadata.nix +++ b/pkgs/development/libraries/kde-frameworks-5.18/kfilemetadata.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kglobalaccel.nix b/pkgs/development/libraries/kde-frameworks-5.18/kglobalaccel.nix index c535b3590a3..c535b3590a3 100644 --- a/pkgs/development/libraries/kde-frameworks-5.17/kglobalaccel.nix +++ b/pkgs/development/libraries/kde-frameworks-5.18/kglobalaccel.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kguiaddons.nix b/pkgs/development/libraries/kde-frameworks-5.18/kguiaddons.nix index bc4e9ab1184..bc4e9ab1184 100644 --- a/pkgs/development/libraries/kde-frameworks-5.17/kguiaddons.nix +++ b/pkgs/development/libraries/kde-frameworks-5.18/kguiaddons.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.17/khtml.nix b/pkgs/development/libraries/kde-frameworks-5.18/khtml.nix index d40df466ebb..d40df466ebb 100644 --- a/pkgs/development/libraries/kde-frameworks-5.17/khtml.nix +++ b/pkgs/development/libraries/kde-frameworks-5.18/khtml.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.17/ki18n.nix b/pkgs/development/libraries/kde-frameworks-5.18/ki18n.nix index 268006512e7..268006512e7 100644 --- a/pkgs/development/libraries/kde-frameworks-5.17/ki18n.nix +++ b/pkgs/development/libraries/kde-frameworks-5.18/ki18n.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kiconthemes/default-theme-breeze.patch b/pkgs/development/libraries/kde-frameworks-5.18/kiconthemes/default-theme-breeze.patch index 5b3b15d5d5b..5b3b15d5d5b 100644 --- a/pkgs/development/libraries/kde-frameworks-5.17/kiconthemes/default-theme-breeze.patch +++ b/pkgs/development/libraries/kde-frameworks-5.18/kiconthemes/default-theme-breeze.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kiconthemes/default.nix b/pkgs/development/libraries/kde-frameworks-5.18/kiconthemes/default.nix index b78b25582be..b78b25582be 100644 --- a/pkgs/development/libraries/kde-frameworks-5.17/kiconthemes/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.18/kiconthemes/default.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kiconthemes/series b/pkgs/development/libraries/kde-frameworks-5.18/kiconthemes/series index ab5cc8a3edb..ab5cc8a3edb 100644 --- a/pkgs/development/libraries/kde-frameworks-5.17/kiconthemes/series +++ b/pkgs/development/libraries/kde-frameworks-5.18/kiconthemes/series diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kidletime.nix b/pkgs/development/libraries/kde-frameworks-5.18/kidletime.nix index fc086560023..fc086560023 100644 --- a/pkgs/development/libraries/kde-frameworks-5.17/kidletime.nix +++ b/pkgs/development/libraries/kde-frameworks-5.18/kidletime.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kimageformats.nix b/pkgs/development/libraries/kde-frameworks-5.18/kimageformats.nix index 49d66bbcc2c..49d66bbcc2c 100644 --- a/pkgs/development/libraries/kde-frameworks-5.17/kimageformats.nix +++ b/pkgs/development/libraries/kde-frameworks-5.18/kimageformats.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kinit/0001-kinit-libpath.patch b/pkgs/development/libraries/kde-frameworks-5.18/kinit/0001-kinit-libpath.patch index 9c76079a382..9c76079a382 100644 --- a/pkgs/development/libraries/kde-frameworks-5.17/kinit/0001-kinit-libpath.patch +++ b/pkgs/development/libraries/kde-frameworks-5.18/kinit/0001-kinit-libpath.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kinit/default.nix b/pkgs/development/libraries/kde-frameworks-5.18/kinit/default.nix index 5f644d7c424..5f644d7c424 100644 --- a/pkgs/development/libraries/kde-frameworks-5.17/kinit/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.18/kinit/default.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kio.nix b/pkgs/development/libraries/kde-frameworks-5.18/kio/default.nix index 199565e2418..a2131ff3385 100644 --- a/pkgs/development/libraries/kde-frameworks-5.17/kio.nix +++ b/pkgs/development/libraries/kde-frameworks-5.18/kio/default.nix @@ -1,4 +1,5 @@ -{ kdeFramework, lib, extra-cmake-modules, acl, karchive +{ kdeFramework, lib, copyPathsToStore +, extra-cmake-modules, acl, karchive , kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons , kdbusaddons, kdoctools, ki18n, kiconthemes, kitemviews , kjobwidgets, knotifications, kservice, ktextwidgets, kwallet @@ -8,6 +9,7 @@ kdeFramework { name = "kio"; + patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; buildInputs = [ acl karchive kconfig kcoreaddons kdbusaddons kiconthemes diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kio/samba-search-path.patch b/pkgs/development/libraries/kde-frameworks-5.18/kio/samba-search-path.patch new file mode 100644 index 00000000000..c9ad46b41bb --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.18/kio/samba-search-path.patch @@ -0,0 +1,28 @@ +Index: kio-5.17.0/src/core/ksambashare.cpp +=================================================================== +--- kio-5.17.0.orig/src/core/ksambashare.cpp ++++ kio-5.17.0/src/core/ksambashare.cpp +@@ -67,13 +67,18 @@ KSambaSharePrivate::~KSambaSharePrivate( + + bool KSambaSharePrivate::isSambaInstalled() + { +- if (QFile::exists(QStringLiteral("/usr/sbin/smbd")) +- || QFile::exists(QStringLiteral("/usr/local/sbin/smbd"))) { +- return true; ++ const QByteArray pathEnv = qgetenv("PATH"); ++ if (!pathEnv.isEmpty()) { ++ QLatin1Char pathSep(':'); ++ QStringList paths = QFile::decodeName(pathEnv).split(pathSep, QString::SkipEmptyParts); ++ for (QStringList::iterator it = paths.begin(); it != paths.end(); ++it) { ++ it->append("/smbd"); ++ if (QFile::exists(*it)) { ++ return true; ++ } ++ } + } + +- //qDebug() << "Samba is not installed!"; +- + return false; + } + diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kio/series b/pkgs/development/libraries/kde-frameworks-5.18/kio/series new file mode 100644 index 00000000000..77ca1545004 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.18/kio/series @@ -0,0 +1 @@ +samba-search-path.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kitemmodels.nix b/pkgs/development/libraries/kde-frameworks-5.18/kitemmodels.nix index a9024d771cc..a9024d771cc 100644 --- a/pkgs/development/libraries/kde-frameworks-5.17/kitemmodels.nix +++ b/pkgs/development/libraries/kde-frameworks-5.18/kitemmodels.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kitemviews.nix b/pkgs/development/libraries/kde-frameworks-5.18/kitemviews.nix index 931019ce495..931019ce495 100644 --- a/pkgs/development/libraries/kde-frameworks-5.17/kitemviews.nix +++ b/pkgs/development/libraries/kde-frameworks-5.18/kitemviews.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kjobwidgets.nix b/pkgs/development/libraries/kde-frameworks-5.18/kjobwidgets.nix index 746edf12eea..746edf12eea 100644 --- a/pkgs/development/libraries/kde-frameworks-5.17/kjobwidgets.nix +++ b/pkgs/development/libraries/kde-frameworks-5.18/kjobwidgets.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kjs.nix b/pkgs/development/libraries/kde-frameworks-5.18/kjs.nix index 768720f178c..768720f178c 100644 --- a/pkgs/development/libraries/kde-frameworks-5.17/kjs.nix +++ b/pkgs/development/libraries/kde-frameworks-5.18/kjs.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kjsembed.nix b/pkgs/development/libraries/kde-frameworks-5.18/kjsembed.nix index 22eef2d47bd..22eef2d47bd 100644 --- a/pkgs/development/libraries/kde-frameworks-5.17/kjsembed.nix +++ b/pkgs/development/libraries/kde-frameworks-5.18/kjsembed.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kmediaplayer.nix b/pkgs/development/libraries/kde-frameworks-5.18/kmediaplayer.nix index 460458b2232..460458b2232 100644 --- a/pkgs/development/libraries/kde-frameworks-5.17/kmediaplayer.nix +++ b/pkgs/development/libraries/kde-frameworks-5.18/kmediaplayer.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.17/knewstuff.nix b/pkgs/development/libraries/kde-frameworks-5.18/knewstuff.nix index 5bcd6f30146..5bcd6f30146 100644 --- a/pkgs/development/libraries/kde-frameworks-5.17/knewstuff.nix +++ b/pkgs/development/libraries/kde-frameworks-5.18/knewstuff.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.17/knotifications.nix b/pkgs/development/libraries/kde-frameworks-5.18/knotifications.nix index 7e301dd0f26..7e301dd0f26 100644 --- a/pkgs/development/libraries/kde-frameworks-5.17/knotifications.nix +++ b/pkgs/development/libraries/kde-frameworks-5.18/knotifications.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.17/knotifyconfig.nix b/pkgs/development/libraries/kde-frameworks-5.18/knotifyconfig.nix index dd99d2d4f1e..dd99d2d4f1e 100644 --- a/pkgs/development/libraries/kde-frameworks-5.17/knotifyconfig.nix +++ b/pkgs/development/libraries/kde-frameworks-5.18/knotifyconfig.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kpackage/allow-external-paths.patch b/pkgs/development/libraries/kde-frameworks-5.18/kpackage/allow-external-paths.patch new file mode 100644 index 00000000000..e9d74444814 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.18/kpackage/allow-external-paths.patch @@ -0,0 +1,13 @@ +Index: kpackage-5.18.0/src/kpackage/package.cpp +=================================================================== +--- kpackage-5.18.0.orig/src/kpackage/package.cpp ++++ kpackage-5.18.0/src/kpackage/package.cpp +@@ -808,7 +808,7 @@ PackagePrivate::PackagePrivate() + : QSharedData(), + fallbackPackage(0), + metadata(0), +- externalPaths(false), ++ externalPaths(true), + valid(false), + checkedValid(false) + { diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kpackage/default.nix b/pkgs/development/libraries/kde-frameworks-5.18/kpackage/default.nix index d2dc262bf1a..aea1b0d31a0 100644 --- a/pkgs/development/libraries/kde-frameworks-5.17/kpackage/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.18/kpackage/default.nix @@ -1,4 +1,4 @@ -{ kdeFramework, lib +{ kdeFramework, lib, copyPathsToStore , extra-cmake-modules , karchive , kconfig @@ -13,10 +13,7 @@ kdeFramework { nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; buildInputs = [ karchive kconfig ]; propagatedBuildInputs = [ kcoreaddons ki18n ]; - patches = [ - ./0001-allow-external-paths.patch - ./0002-qdiriterator-follow-symlinks.patch - ]; + patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); postInstall = '' wrapQtProgram "$out/bin/kpackagetool5" ''; diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kpackage/qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.18/kpackage/qdiriterator-follow-symlinks.patch new file mode 100644 index 00000000000..ddbf17d0006 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.18/kpackage/qdiriterator-follow-symlinks.patch @@ -0,0 +1,26 @@ +Index: kpackage-5.18.0/src/kpackage/packageloader.cpp +=================================================================== +--- kpackage-5.18.0.orig/src/kpackage/packageloader.cpp ++++ kpackage-5.18.0/src/kpackage/packageloader.cpp +@@ -241,7 +241,7 @@ QList<KPluginMetaData> PackageLoader::li + } else { + //qDebug() << "Not cached"; + // If there's no cache file, fall back to listing the directory +- const QDirIterator::IteratorFlags flags = QDirIterator::Subdirectories; ++ const QDirIterator::IteratorFlags flags = QDirIterator::Subdirectories | QDirIterator::FollowSymlinks; + const QStringList nameFilters = QStringList(QStringLiteral("metadata.desktop")) << QStringLiteral("metadata.json"); + + QDirIterator it(plugindir, nameFilters, QDir::Files, flags); +Index: kpackage-5.18.0/src/kpackage/private/packagejobthread.cpp +=================================================================== +--- kpackage-5.18.0.orig/src/kpackage/private/packagejobthread.cpp ++++ kpackage-5.18.0/src/kpackage/private/packagejobthread.cpp +@@ -146,7 +146,7 @@ bool indexDirectory(const QString& dir, + + QJsonArray plugins; + +- QDirIterator it(dir, *metaDataFiles, QDir::Files, QDirIterator::Subdirectories); ++ QDirIterator it(dir, *metaDataFiles, QDir::Files, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); + while (it.hasNext()) { + it.next(); + const QString path = it.fileInfo().absoluteFilePath(); diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kpackage/series b/pkgs/development/libraries/kde-frameworks-5.18/kpackage/series new file mode 100644 index 00000000000..9b7f076efc7 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.18/kpackage/series @@ -0,0 +1,2 @@ +allow-external-paths.patch +qdiriterator-follow-symlinks.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kparts.nix b/pkgs/development/libraries/kde-frameworks-5.18/kparts.nix index 1c3e0b2cbc5..1c3e0b2cbc5 100644 --- a/pkgs/development/libraries/kde-frameworks-5.17/kparts.nix +++ b/pkgs/development/libraries/kde-frameworks-5.18/kparts.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kpeople.nix b/pkgs/development/libraries/kde-frameworks-5.18/kpeople.nix index 4c3877e7efd..4c3877e7efd 100644 --- a/pkgs/development/libraries/kde-frameworks-5.17/kpeople.nix +++ b/pkgs/development/libraries/kde-frameworks-5.18/kpeople.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kplotting.nix b/pkgs/development/libraries/kde-frameworks-5.18/kplotting.nix index c16f51b5ac3..c16f51b5ac3 100644 --- a/pkgs/development/libraries/kde-frameworks-5.17/kplotting.nix +++ b/pkgs/development/libraries/kde-frameworks-5.18/kplotting.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kpty.nix b/pkgs/development/libraries/kde-frameworks-5.18/kpty.nix index 2e34e6f674c..2e34e6f674c 100644 --- a/pkgs/development/libraries/kde-frameworks-5.17/kpty.nix +++ b/pkgs/development/libraries/kde-frameworks-5.18/kpty.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kross.nix b/pkgs/development/libraries/kde-frameworks-5.18/kross.nix index 7c6f079feaa..7c6f079feaa 100644 --- a/pkgs/development/libraries/kde-frameworks-5.17/kross.nix +++ b/pkgs/development/libraries/kde-frameworks-5.18/kross.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.17/krunner.nix b/pkgs/development/libraries/kde-frameworks-5.18/krunner.nix index 12d2b54d0eb..12d2b54d0eb 100644 --- a/pkgs/development/libraries/kde-frameworks-5.17/krunner.nix +++ b/pkgs/development/libraries/kde-frameworks-5.18/krunner.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kservice/0001-qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.18/kservice/0001-qdiriterator-follow-symlinks.patch index 3d8397d8ee2..3d8397d8ee2 100644 --- a/pkgs/development/libraries/kde-frameworks-5.17/kservice/0001-qdiriterator-follow-symlinks.patch +++ b/pkgs/development/libraries/kde-frameworks-5.18/kservice/0001-qdiriterator-follow-symlinks.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kservice/0002-no-canonicalize-path.patch b/pkgs/development/libraries/kde-frameworks-5.18/kservice/0002-no-canonicalize-path.patch index 685c6852611..685c6852611 100644 --- a/pkgs/development/libraries/kde-frameworks-5.17/kservice/0002-no-canonicalize-path.patch +++ b/pkgs/development/libraries/kde-frameworks-5.18/kservice/0002-no-canonicalize-path.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kservice/default.nix b/pkgs/development/libraries/kde-frameworks-5.18/kservice/default.nix index 03b7c7c2f51..03b7c7c2f51 100644 --- a/pkgs/development/libraries/kde-frameworks-5.17/kservice/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.18/kservice/default.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kservice/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.18/kservice/setup-hook.sh index c28e862ff8a..c28e862ff8a 100644 --- a/pkgs/development/libraries/kde-frameworks-5.17/kservice/setup-hook.sh +++ b/pkgs/development/libraries/kde-frameworks-5.18/kservice/setup-hook.sh diff --git a/pkgs/development/libraries/kde-frameworks-5.18/ktexteditor/default.nix b/pkgs/development/libraries/kde-frameworks-5.18/ktexteditor/default.nix new file mode 100644 index 00000000000..b8df6a5f4c0 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.18/ktexteditor/default.nix @@ -0,0 +1,22 @@ +{ kdeFramework, lib, copyPathsToStore +, extra-cmake-modules, makeQtWrapper, perl +, karchive, kconfig, kguiaddons, kiconthemes, kparts +, libgit2 +, qtscript, qtxmlpatterns +, ki18n, kio, sonnet +}: + +kdeFramework { + name = "ktexteditor"; + nativeBuildInputs = [ extra-cmake-modules makeQtWrapper perl ]; + buildInputs = [ + karchive kconfig kguiaddons kiconthemes kparts + libgit2 + qtscript qtxmlpatterns + ]; + propagatedBuildInputs = [ ki18n kio sonnet ]; + patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.17/ktexteditor/0001-no-qcoreapplication.patch b/pkgs/development/libraries/kde-frameworks-5.18/ktexteditor/no-qcoreapplication.patch index def55bff9b2..19ab1e1e551 100644 --- a/pkgs/development/libraries/kde-frameworks-5.17/ktexteditor/0001-no-qcoreapplication.patch +++ b/pkgs/development/libraries/kde-frameworks-5.18/ktexteditor/no-qcoreapplication.patch @@ -1,17 +1,8 @@ -From dc50fffdc72b76498384ce2f9065c3757b786d71 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel <ttuegel@gmail.com> -Date: Wed, 14 Oct 2015 09:08:59 -0500 -Subject: [PATCH] no qcoreapplication - ---- - src/syntax/data/katehighlightingindexer.cpp | 11 ++++------- - 1 file changed, 4 insertions(+), 7 deletions(-) - -diff --git a/src/syntax/data/katehighlightingindexer.cpp b/src/syntax/data/katehighlightingindexer.cpp -index 3c63140..e3d5efe 100644 ---- a/src/syntax/data/katehighlightingindexer.cpp -+++ b/src/syntax/data/katehighlightingindexer.cpp -@@ -51,19 +51,16 @@ QStringList readListing(const QString &fileName) +Index: ktexteditor-5.18.0/src/syntax/data/katehighlightingindexer.cpp +=================================================================== +--- ktexteditor-5.18.0.orig/src/syntax/data/katehighlightingindexer.cpp ++++ ktexteditor-5.18.0/src/syntax/data/katehighlightingindexer.cpp +@@ -55,19 +55,16 @@ QStringList readListing(const QString &f int main(int argc, char *argv[]) { @@ -34,7 +25,7 @@ index 3c63140..e3d5efe 100644 if (hlFilenamesListing.isEmpty()) { return 1; } -@@ -147,7 +144,7 @@ int main(int argc, char *argv[]) +@@ -152,7 +149,7 @@ int main(int argc, char *argv[]) return anyError; // create outfile, after all has worked! @@ -43,6 +34,3 @@ index 3c63140..e3d5efe 100644 if (!outFile.open(QIODevice::WriteOnly | QIODevice::Truncate)) return 7; --- -2.5.2 - diff --git a/pkgs/development/libraries/kde-frameworks-5.18/ktexteditor/series b/pkgs/development/libraries/kde-frameworks-5.18/ktexteditor/series new file mode 100644 index 00000000000..46cd23829a2 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.18/ktexteditor/series @@ -0,0 +1 @@ +no-qcoreapplication.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.17/ktextwidgets.nix b/pkgs/development/libraries/kde-frameworks-5.18/ktextwidgets.nix index e332d4ff9a8..e332d4ff9a8 100644 --- a/pkgs/development/libraries/kde-frameworks-5.17/ktextwidgets.nix +++ b/pkgs/development/libraries/kde-frameworks-5.18/ktextwidgets.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kunitconversion.nix b/pkgs/development/libraries/kde-frameworks-5.18/kunitconversion.nix index 3cf0f847d83..3cf0f847d83 100644 --- a/pkgs/development/libraries/kde-frameworks-5.17/kunitconversion.nix +++ b/pkgs/development/libraries/kde-frameworks-5.18/kunitconversion.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kwallet.nix b/pkgs/development/libraries/kde-frameworks-5.18/kwallet.nix index 7c4177e009d..7c4177e009d 100644 --- a/pkgs/development/libraries/kde-frameworks-5.17/kwallet.nix +++ b/pkgs/development/libraries/kde-frameworks-5.18/kwallet.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kwidgetsaddons.nix b/pkgs/development/libraries/kde-frameworks-5.18/kwidgetsaddons.nix index d95f44d3fec..d95f44d3fec 100644 --- a/pkgs/development/libraries/kde-frameworks-5.17/kwidgetsaddons.nix +++ b/pkgs/development/libraries/kde-frameworks-5.18/kwidgetsaddons.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kwindowsystem.nix b/pkgs/development/libraries/kde-frameworks-5.18/kwindowsystem.nix index 09ab1f2200d..09ab1f2200d 100644 --- a/pkgs/development/libraries/kde-frameworks-5.17/kwindowsystem.nix +++ b/pkgs/development/libraries/kde-frameworks-5.18/kwindowsystem.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kxmlgui.nix b/pkgs/development/libraries/kde-frameworks-5.18/kxmlgui.nix index f081d5f9170..f081d5f9170 100644 --- a/pkgs/development/libraries/kde-frameworks-5.17/kxmlgui.nix +++ b/pkgs/development/libraries/kde-frameworks-5.18/kxmlgui.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kxmlrpcclient.nix b/pkgs/development/libraries/kde-frameworks-5.18/kxmlrpcclient.nix index 20a300b68bc..20a300b68bc 100644 --- a/pkgs/development/libraries/kde-frameworks-5.17/kxmlrpcclient.nix +++ b/pkgs/development/libraries/kde-frameworks-5.18/kxmlrpcclient.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.17/modemmanager-qt.nix b/pkgs/development/libraries/kde-frameworks-5.18/modemmanager-qt.nix index 7d7f769d6a9..7d7f769d6a9 100644 --- a/pkgs/development/libraries/kde-frameworks-5.17/modemmanager-qt.nix +++ b/pkgs/development/libraries/kde-frameworks-5.18/modemmanager-qt.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.17/networkmanager-qt.nix b/pkgs/development/libraries/kde-frameworks-5.18/networkmanager-qt.nix index 333378bd143..333378bd143 100644 --- a/pkgs/development/libraries/kde-frameworks-5.17/networkmanager-qt.nix +++ b/pkgs/development/libraries/kde-frameworks-5.18/networkmanager-qt.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.17/oxygen-icons5.nix b/pkgs/development/libraries/kde-frameworks-5.18/oxygen-icons5.nix index ee350f8e153..ee350f8e153 100644 --- a/pkgs/development/libraries/kde-frameworks-5.17/oxygen-icons5.nix +++ b/pkgs/development/libraries/kde-frameworks-5.18/oxygen-icons5.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.17/plasma-framework/default.nix b/pkgs/development/libraries/kde-frameworks-5.18/plasma-framework/default.nix index d8846f77723..d8846f77723 100644 --- a/pkgs/development/libraries/kde-frameworks-5.17/plasma-framework/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.18/plasma-framework/default.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.17/solid.nix b/pkgs/development/libraries/kde-frameworks-5.18/solid.nix index afd125e3c59..afd125e3c59 100644 --- a/pkgs/development/libraries/kde-frameworks-5.17/solid.nix +++ b/pkgs/development/libraries/kde-frameworks-5.18/solid.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.17/sonnet.nix b/pkgs/development/libraries/kde-frameworks-5.18/sonnet.nix index 943fe04a1c9..943fe04a1c9 100644 --- a/pkgs/development/libraries/kde-frameworks-5.17/sonnet.nix +++ b/pkgs/development/libraries/kde-frameworks-5.18/sonnet.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.18/srcs.nix b/pkgs/development/libraries/kde-frameworks-5.18/srcs.nix new file mode 100644 index 00000000000..12c5c30a247 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.18/srcs.nix @@ -0,0 +1,565 @@ +# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh +{ fetchurl, mirror }: + +{ + attica = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/attica-5.18.0.tar.xz"; + sha256 = "1n6pkaak9xf7nyi0b1wr8fm5qkv7mgpsws9igd7g2xqvvqzyp5xw"; + name = "attica-5.18.0.tar.xz"; + }; + }; + baloo = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/baloo-5.18.0.tar.xz"; + sha256 = "0sdnd6v01rcgq7v2jny0655jrghfamwyj0win7xfhx1622dfi8l8"; + name = "baloo-5.18.0.tar.xz"; + }; + }; + bluez-qt = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/bluez-qt-5.18.0.tar.xz"; + sha256 = "17vx77w4fwdi7y394s2pqph2vmfs8n0107rmz4q7aa62q9iwdrbr"; + name = "bluez-qt-5.18.0.tar.xz"; + }; + }; + breeze-icons = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/breeze-icons-5.18.0.tar.xz"; + sha256 = "0a4iqr5zrb56aln5hdsk5zrl23w8w8y5nmrxb093h205r36hfw4z"; + name = "breeze-icons-5.18.0.tar.xz"; + }; + }; + extra-cmake-modules = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/extra-cmake-modules-5.18.0.tar.xz"; + sha256 = "1kp0pysa154cbp1ysgyqk03w8s335v3wmfrx4pshyfpg1s24k83y"; + name = "extra-cmake-modules-5.18.0.tar.xz"; + }; + }; + frameworkintegration = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/frameworkintegration-5.18.0.tar.xz"; + sha256 = "06hw885mk0i2173lfdqz3hyp1fx2bndpj00hk32s3i2ggnn2y1rv"; + name = "frameworkintegration-5.18.0.tar.xz"; + }; + }; + kactivities = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/kactivities-5.18.0.tar.xz"; + sha256 = "0nqa63ds7vj87zg2gz1mx42c30l3ypfk4ghhgxwziab315bpcpmr"; + name = "kactivities-5.18.0.tar.xz"; + }; + }; + kapidox = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/kapidox-5.18.0.tar.xz"; + sha256 = "1hackjnpxijqqpn9cvnwcn9yc0jni21qgjccj74025ihdgigp70s"; + name = "kapidox-5.18.0.tar.xz"; + }; + }; + karchive = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/karchive-5.18.0.tar.xz"; + sha256 = "0ph59w8y49b3znaj9c1qk0zwkg0pmjjcyr4jlv5w56mh0zkq37h5"; + name = "karchive-5.18.0.tar.xz"; + }; + }; + kauth = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/kauth-5.18.0.tar.xz"; + sha256 = "14kvy7cbw31sc48f0aldpi52wxhwd69prwadvjhqwy912s8kr04n"; + name = "kauth-5.18.0.tar.xz"; + }; + }; + kbookmarks = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/kbookmarks-5.18.0.tar.xz"; + sha256 = "0qi2f612s756qh5ldibscfhcq8q802vgr2497fm9xl95kfqmcg1n"; + name = "kbookmarks-5.18.0.tar.xz"; + }; + }; + kcmutils = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/kcmutils-5.18.0.tar.xz"; + sha256 = "1m53308icq1x1877afcxlhygl56dsl50fiwmfjf0g5pfmnql3qfp"; + name = "kcmutils-5.18.0.tar.xz"; + }; + }; + kcodecs = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/kcodecs-5.18.0.tar.xz"; + sha256 = "1injdpz7kdf2j6is2w3v3xgd9ahgls0j632q03q7qa48xp4wx64h"; + name = "kcodecs-5.18.0.tar.xz"; + }; + }; + kcompletion = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/kcompletion-5.18.0.tar.xz"; + sha256 = "0gkj4gplm7qwx4nqhhph5h3jp4h8b22ssmw0vvv6bpsnq7idk76b"; + name = "kcompletion-5.18.0.tar.xz"; + }; + }; + kconfig = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/kconfig-5.18.0.tar.xz"; + sha256 = "1s7fvhflsvv8zwb9cr50m3hxh0d4z5grh0nkri5ngzqb123wi91n"; + name = "kconfig-5.18.0.tar.xz"; + }; + }; + kconfigwidgets = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/kconfigwidgets-5.18.0.tar.xz"; + sha256 = "08i12040prs2nxybxbbf3w0n91c9p0c64j8fz18axi4yszrmv8im"; + name = "kconfigwidgets-5.18.0.tar.xz"; + }; + }; + kcoreaddons = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/kcoreaddons-5.18.0.tar.xz"; + sha256 = "05y8pan8hdn6qj2si9v9igjrx00l7bqzhdm2qq9vbjrv5xj8axzf"; + name = "kcoreaddons-5.18.0.tar.xz"; + }; + }; + kcrash = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/kcrash-5.18.0.tar.xz"; + sha256 = "0rk27zr0mb4jlicm1s175x139avzi0q4jk3mlczfg4rkrxzgbx5w"; + name = "kcrash-5.18.0.tar.xz"; + }; + }; + kdbusaddons = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/kdbusaddons-5.18.0.tar.xz"; + sha256 = "0l9ww3zaz1x6bk9axmm6zlj1dcn0gr0z61v9lw5y31rypxclhza8"; + name = "kdbusaddons-5.18.0.tar.xz"; + }; + }; + kdeclarative = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/kdeclarative-5.18.0.tar.xz"; + sha256 = "0mpvwn26msg3sc9z1r1vnw32rkl842jxpvpx2vg8kwcd9snwx9a6"; + name = "kdeclarative-5.18.0.tar.xz"; + }; + }; + kded = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/kded-5.18.0.tar.xz"; + sha256 = "0y5sn7yxalylcwcz2j4h349lll2vkf44bw3n6w2cbqqf5wnr2za5"; + name = "kded-5.18.0.tar.xz"; + }; + }; + kdelibs4support = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/portingAids/kdelibs4support-5.18.0.tar.xz"; + sha256 = "0flhhjnnm2wh6869q8gxk45wlpq0679xlklzqlxvqx7a4kxdl8d8"; + name = "kdelibs4support-5.18.0.tar.xz"; + }; + }; + kdesignerplugin = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/kdesignerplugin-5.18.0.tar.xz"; + sha256 = "163lfx8vxxdhxbn090k5r4m9vy940kfwvsyjsi8v0pp9ww49g13n"; + name = "kdesignerplugin-5.18.0.tar.xz"; + }; + }; + kdesu = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/kdesu-5.18.0.tar.xz"; + sha256 = "0dqjmvi440p4n62w9y3qw4n7fcivyg3d54fv9nrf1sx87vdw7r83"; + name = "kdesu-5.18.0.tar.xz"; + }; + }; + kdewebkit = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/kdewebkit-5.18.0.tar.xz"; + sha256 = "1ahr62xfk085kb9p2axx04gf7bpnr0vv2d4kpc4s0xrj3xi0alnl"; + name = "kdewebkit-5.18.0.tar.xz"; + }; + }; + kdnssd = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/kdnssd-5.18.0.tar.xz"; + sha256 = "12vplqfsc3zks1grmb5i4hdww0g51lv54nb1drpj42mzyi1q1v1l"; + name = "kdnssd-5.18.0.tar.xz"; + }; + }; + kdoctools = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/kdoctools-5.18.0.tar.xz"; + sha256 = "10h74lb4597fs1h88x60ykpkz47pgfa4k04h4i5l0qb5vb1jlw7d"; + name = "kdoctools-5.18.0.tar.xz"; + }; + }; + kemoticons = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/kemoticons-5.18.0.tar.xz"; + sha256 = "0lba6rzmij20ndkq0vw9zkxbjq6g98may3ypyj0kc82d3sw9hkhs"; + name = "kemoticons-5.18.0.tar.xz"; + }; + }; + kfilemetadata = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/kfilemetadata-5.18.0.tar.xz"; + sha256 = "19b8nh5x8c0w516afh8ln72vi5dk91wl8bcsqd84h3s6gw55rsm4"; + name = "kfilemetadata-5.18.0.tar.xz"; + }; + }; + kglobalaccel = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/kglobalaccel-5.18.0.tar.xz"; + sha256 = "1v22rh8c103zl63cgg4gx430qw29f9yn9k5219pcw5n57jx0n5c1"; + name = "kglobalaccel-5.18.0.tar.xz"; + }; + }; + kguiaddons = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/kguiaddons-5.18.0.tar.xz"; + sha256 = "153mjbiwg4p65c2msj8j3pycn5gys39ahg9ik7jqg7w4cjcl2jxz"; + name = "kguiaddons-5.18.0.tar.xz"; + }; + }; + khtml = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/portingAids/khtml-5.18.0.tar.xz"; + sha256 = "0kgin1bhbx95kypsg1k318qjxz3258x3a6kkdbky3cvfmq8r5ka5"; + name = "khtml-5.18.0.tar.xz"; + }; + }; + ki18n = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/ki18n-5.18.0.tar.xz"; + sha256 = "14vlq49a0bp1vpjb2zxkgqsd5yjmb0azri2iq9sgxxx1v6gyy9h9"; + name = "ki18n-5.18.0.tar.xz"; + }; + }; + kiconthemes = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/kiconthemes-5.18.0.tar.xz"; + sha256 = "10pj2q28y57ng26xg2211v9vy91hqqmcyxh90q1qj89clykimwid"; + name = "kiconthemes-5.18.0.tar.xz"; + }; + }; + kidletime = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/kidletime-5.18.0.tar.xz"; + sha256 = "0726nq508rpzjxvfp354jd8n14m49grv6nfv09q2zyw02cf6n9bi"; + name = "kidletime-5.18.0.tar.xz"; + }; + }; + kimageformats = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/kimageformats-5.18.0.tar.xz"; + sha256 = "1y6zc04sx4sqyfavr8nf05a1p4kyb8ic335iy5s869r6zrvljpnc"; + name = "kimageformats-5.18.0.tar.xz"; + }; + }; + kinit = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/kinit-5.18.0.tar.xz"; + sha256 = "142xm7yglssw771340bs0lk1xgsr53218zh87v6n9hchrd34zg08"; + name = "kinit-5.18.0.tar.xz"; + }; + }; + kio = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/kio-5.18.0.tar.xz"; + sha256 = "020gvxs5xp9v4pra814200nv79c9b9j59skbrxq9cazhnywnnlns"; + name = "kio-5.18.0.tar.xz"; + }; + }; + kitemmodels = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/kitemmodels-5.18.0.tar.xz"; + sha256 = "0r5r7ia1lwqll6bz92k4qgj737hsg6pfhxmycr6g88b9fiab1qw4"; + name = "kitemmodels-5.18.0.tar.xz"; + }; + }; + kitemviews = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/kitemviews-5.18.0.tar.xz"; + sha256 = "10pbh0fpzrh0ijbadjx81690p9iw34rs2waks99fc0jy3hamny3b"; + name = "kitemviews-5.18.0.tar.xz"; + }; + }; + kjobwidgets = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/kjobwidgets-5.18.0.tar.xz"; + sha256 = "0gxvh9wxnfkrxm9zc7yx579vlxs3xmihfyqs92fpkjhy2shfd2sg"; + name = "kjobwidgets-5.18.0.tar.xz"; + }; + }; + kjs = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/portingAids/kjs-5.18.0.tar.xz"; + sha256 = "0z89l2yhs3vld1qbd6v506lksmxvwrzgdq77aghy3mbkfgz3jd62"; + name = "kjs-5.18.0.tar.xz"; + }; + }; + kjsembed = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/portingAids/kjsembed-5.18.0.tar.xz"; + sha256 = "0mpq7aywspm6l13afrr2dis8ygyld5il21g90ij0fc1jwp95zk3d"; + name = "kjsembed-5.18.0.tar.xz"; + }; + }; + kmediaplayer = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/portingAids/kmediaplayer-5.18.0.tar.xz"; + sha256 = "07m3agz73yzmfn8ykg0f6a2c39rkzchzqc1iam2zfydqxyvh4bxb"; + name = "kmediaplayer-5.18.0.tar.xz"; + }; + }; + knewstuff = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/knewstuff-5.18.0.tar.xz"; + sha256 = "0mda1n0py6nm9wp89z5hkhhk9ah5sjrkzl1dshd4lq77f7p7i1g4"; + name = "knewstuff-5.18.0.tar.xz"; + }; + }; + knotifications = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/knotifications-5.18.0.tar.xz"; + sha256 = "1npir2v4irhm6xmzf60aj5388slq6fw7jbcwjjscldrwk2ca06hz"; + name = "knotifications-5.18.0.tar.xz"; + }; + }; + knotifyconfig = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/knotifyconfig-5.18.0.tar.xz"; + sha256 = "0q2735m2m1wrnp7g4ycnbjy7qgpjxc5fvx9zrwnd0jl5rmdw4sbb"; + name = "knotifyconfig-5.18.0.tar.xz"; + }; + }; + kpackage = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/kpackage-5.18.0.tar.xz"; + sha256 = "14q2ssf3g7ljakzpq7q9q2zbm8jqk01ybjx4s16qpw9gakcrbli9"; + name = "kpackage-5.18.0.tar.xz"; + }; + }; + kparts = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/kparts-5.18.0.tar.xz"; + sha256 = "1q4xd4dy40mh4a8vgpvdamy1242isjy9ma94cf95qqc6qgjnqxhy"; + name = "kparts-5.18.0.tar.xz"; + }; + }; + kpeople = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/kpeople-5.18.0.tar.xz"; + sha256 = "0d0mp2qz3f1bki6rfw8x6zc0rmv4n43mi06k3vh30qpiaj7crl5k"; + name = "kpeople-5.18.0.tar.xz"; + }; + }; + kplotting = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/kplotting-5.18.0.tar.xz"; + sha256 = "1jiqx9gdv69frfh8vanphp6lzc3vxn2q1lhibi7v03qkc2qaw5cc"; + name = "kplotting-5.18.0.tar.xz"; + }; + }; + kpty = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/kpty-5.18.0.tar.xz"; + sha256 = "1baz1xs22r4qli74sqwpcjmxnfrd0iqyyzg1fmljr8fvs4pdy1x1"; + name = "kpty-5.18.0.tar.xz"; + }; + }; + kross = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/portingAids/kross-5.18.0.tar.xz"; + sha256 = "1ky13yqxhkghxqd21jrnrpjfnrkgspv0p3dfij994rkaqq8rm1r6"; + name = "kross-5.18.0.tar.xz"; + }; + }; + krunner = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/portingAids/krunner-5.18.0.tar.xz"; + sha256 = "14c51kiwr49dbdxg8y6ivmmfr9h6p8jjd32k35pi4gpi2vlh29pf"; + name = "krunner-5.18.0.tar.xz"; + }; + }; + kservice = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/kservice-5.18.0.tar.xz"; + sha256 = "0pbs1n2i7vjgjh7j87ps8gkzmj5igw1aib1aq089m4hfrl8pbrq8"; + name = "kservice-5.18.0.tar.xz"; + }; + }; + ktexteditor = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/ktexteditor-5.18.0.tar.xz"; + sha256 = "0fx82s5y1wya3v36qq3agmfrnff9a7v94fhifvfiwmhk2ddwwg3v"; + name = "ktexteditor-5.18.0.tar.xz"; + }; + }; + ktextwidgets = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/ktextwidgets-5.18.0.tar.xz"; + sha256 = "1wflqfmgqa3lh3apf22sami6caclvyv7li6qiskwfkzkb0a6x373"; + name = "ktextwidgets-5.18.0.tar.xz"; + }; + }; + kunitconversion = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/kunitconversion-5.18.0.tar.xz"; + sha256 = "0gpmndyly977dzfyfhrd0q434c0qr1sinh75dwf9clmqw576jl6i"; + name = "kunitconversion-5.18.0.tar.xz"; + }; + }; + kwallet = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/kwallet-5.18.0.tar.xz"; + sha256 = "0w69y0xdvvrvcydv160z7s03y1n5vxjj3sfk530zc6bjszplvxis"; + name = "kwallet-5.18.0.tar.xz"; + }; + }; + kwidgetsaddons = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/kwidgetsaddons-5.18.0.tar.xz"; + sha256 = "06fqz7cwczp5sahg54zi46rf9jf2si88w5yizp61z8yv57kvpvk1"; + name = "kwidgetsaddons-5.18.0.tar.xz"; + }; + }; + kwindowsystem = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/kwindowsystem-5.18.0.tar.xz"; + sha256 = "01hzd4r8y4hdpynnh32qf418hxzbd67fkdq6a4vabl384aipnmk7"; + name = "kwindowsystem-5.18.0.tar.xz"; + }; + }; + kxmlgui = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/kxmlgui-5.18.0.tar.xz"; + sha256 = "0yimy0r73sv8z4wq0mkdx24icjrzmy5bciblwlnzagd61f8j8qri"; + name = "kxmlgui-5.18.0.tar.xz"; + }; + }; + kxmlrpcclient = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/kxmlrpcclient-5.18.0.tar.xz"; + sha256 = "0h88pc3h5z3q58b7qxdn69klwr0p9ffbirzncyvxjrhr7dq36nv9"; + name = "kxmlrpcclient-5.18.0.tar.xz"; + }; + }; + modemmanager-qt = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/modemmanager-qt-5.18.0.tar.xz"; + sha256 = "09k07wxkn511sa4hwmrs6jfx4lnnw3zcac5dzz43hhsmw74yj9az"; + name = "modemmanager-qt-5.18.0.tar.xz"; + }; + }; + networkmanager-qt = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/networkmanager-qt-5.18.0.tar.xz"; + sha256 = "11j818ws5jz23hyilfpf3npk893hs388v1xpwhh0lkjwm60wkzln"; + name = "networkmanager-qt-5.18.0.tar.xz"; + }; + }; + oxygen-icons5 = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/oxygen-icons5-5.18.0.tar.xz"; + sha256 = "11zmxc9n7x6iwdckwxwjji0497yjcsjli7pzr8d049lbc7xsjvi8"; + name = "oxygen-icons5-5.18.0.tar.xz"; + }; + }; + plasma-framework = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/plasma-framework-5.18.0.tar.xz"; + sha256 = "1lxhlzx3jcqzx90kjl8w8p53nrgrkjiz1xf92ah3mygjyvi5rlh8"; + name = "plasma-framework-5.18.0.tar.xz"; + }; + }; + solid = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/solid-5.18.0.tar.xz"; + sha256 = "0ilki4s3f3gjsdj6z41a8k4h2b52w8xrh2api0sqj0ifk2yhx6wh"; + name = "solid-5.18.0.tar.xz"; + }; + }; + sonnet = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/sonnet-5.18.0.tar.xz"; + sha256 = "1780jvsfkasabdbk9xjhjcihcc6mxxipi2rsq2001flxnnx4kykg"; + name = "sonnet-5.18.0.tar.xz"; + }; + }; + threadweaver = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/threadweaver-5.18.0.tar.xz"; + sha256 = "00c9vvyhyysg0cdlmvpls0h3pdbbhhwfxlm9l9i9r3j8x6rigm54"; + name = "threadweaver-5.18.0.tar.xz"; + }; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.17/threadweaver.nix b/pkgs/development/libraries/kde-frameworks-5.18/threadweaver.nix index 52817921cc7..52817921cc7 100644 --- a/pkgs/development/libraries/kde-frameworks-5.17/threadweaver.nix +++ b/pkgs/development/libraries/kde-frameworks-5.18/threadweaver.nix diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix index 0569c0bf5b3..175d0c7bc3b 100644 --- a/pkgs/development/libraries/kerberos/heimdal.nix +++ b/pkgs/development/libraries/kerberos/heimdal.nix @@ -23,7 +23,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig python perl yacc flex ] ++ (with perlPackages; [ JSON ]) ++ optional (!libOnly) texinfo; - buildInputs = [ libcap_ng sqlite openssl db libedit ] + buildInputs = optionals (!stdenv.isFreeBSD) [ libcap_ng db ] + ++ [ sqlite openssl libedit ] ++ optionals (!libOnly) [ openldap pam ]; ## ugly, X should be made an option @@ -31,14 +32,15 @@ stdenv.mkDerivation rec { "--sysconfdir=/etc" "--localstatedir=/var" "--enable-hdb-openldap-module" - "--with-capng" "--with-sqlite3=${sqlite}" - "--with-berkeley-db=${db}" "--with-libedit=${libedit}" "--with-openssl=${openssl}" "--without-x" + "--with-berkeley-db=${db}" ] ++ optionals (!libOnly) [ "--with-openldap=${openldap}" + ] ++ optionals (!stdenv.isFreeBSD) [ + "--with-capng" ]; buildPhase = optionalString libOnly '' @@ -83,7 +85,7 @@ stdenv.mkDerivation rec { meta = { description = "An implementation of Kerberos 5 (and some more stuff)"; license = licenses.bsd3; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.freebsd; maintainers = with maintainers; [ wkennington ]; }; diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix index 2e5e48891b8..5b2b0954203 100644 --- a/pkgs/development/libraries/kerberos/krb5.nix +++ b/pkgs/development/libraries/kerberos/krb5.nix @@ -11,24 +11,22 @@ in with stdenv.lib; stdenv.mkDerivation rec { name = "${type}krb5-${version}"; - version = "1.13.2"; + version = "1.14"; src = fetchurl { - url = "${meta.homepage}dist/krb5/1.13/krb5-${version}-signed.tar"; - sha256 = "1qbdzyrws7d0q4filsibh28z54pd5l987jr0ygv43iq9085w6a75"; + url = "${meta.homepage}dist/krb5/1.14/krb5-${version}.tar.gz"; + sha256 = "1sgr61cnkgc5xazijaww6wpn5fnxl9vyj9ixk3r3y7ikv3x0gnyf"; }; + configureFlags = optional stdenv.isFreeBSD ''WARN_CFLAGS=""''; + nativeBuildInputs = [ pkgconfig perl yacc ] # Provides the mig command used by the build scripts - ++ stdenv.lib.optional stdenv.isDarwin bootstrap_cmds; + ++ optional stdenv.isDarwin bootstrap_cmds; buildInputs = [ openssl ] ++ optionals (!libOnly) [ openldap libedit ]; - unpackPhase = '' - tar -xf $src - tar -xzf krb5-${version}.tar.gz - cd krb5-${version}/src - ''; + preConfigure = "cd ./src"; buildPhase = optionalString libOnly '' (cd util; make -j $NIX_BUILD_CORES) diff --git a/pkgs/development/libraries/libbluray/default.nix b/pkgs/development/libraries/libbluray/default.nix index 77fa6dec43e..7d7689bf23e 100644 --- a/pkgs/development/libraries/libbluray/default.nix +++ b/pkgs/development/libraries/libbluray/default.nix @@ -19,12 +19,12 @@ assert withFonts -> freetype != null; stdenv.mkDerivation rec { baseName = "libbluray"; - version = "0.9.0"; + version = "0.9.2"; name = "${baseName}-${version}"; src = fetchurl { url = "ftp://ftp.videolan.org/pub/videolan/${baseName}/${version}/${name}.tar.bz2"; - sha256 = "0kb9znxk6610vi0fjhqxn4z5i98nvxlsz1f8dakj99rg42livdl4"; + sha256 = "1sp71j4agcsg17g6b85cqz78pn5vknl5pl39rvr6mkib5ps99jgg"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ] diff --git a/pkgs/development/libraries/libcommuni/default.nix b/pkgs/development/libraries/libcommuni/default.nix new file mode 100644 index 00000000000..e8debfda1de --- /dev/null +++ b/pkgs/development/libraries/libcommuni/default.nix @@ -0,0 +1,30 @@ +{ fetchgit, qt5, stdenv +}: + +stdenv.mkDerivation rec { + name = "libcommuni-${version}"; + version = "2016-01-02"; + + src = fetchgit { + url = "https://github.com/communi/libcommuni.git"; + rev = "779b0c774428669235d44d2db8e762558e2f4b79"; + sha256 = "15sb7vinaaz1v5nclxpnp5p9a0kmfmlgiqibkipnyydizclidpfx"; + }; + + buildInputs = [ qt5.qtbase ]; + + enableParallelBuild = true; + + configurePhase = '' + sed -i -e 's|/bin/pwd|pwd|g' configure + ./configure -config release -prefix $out -qmake ${qt5.qtbase}/bin/qmake + ''; + + meta = with stdenv.lib; { + description = "A cross-platform IRC framework written with Qt"; + homepage = https://communi.github.io; + license = licenses.bsd3; + platforms = platforms.all; + maintainers = with maintainers; [ hrdinka ]; + }; +} diff --git a/pkgs/development/libraries/libdc1394avt/default.nix b/pkgs/development/libraries/libdc1394avt/default.nix deleted file mode 100644 index 7565502cc1c..00000000000 --- a/pkgs/development/libraries/libdc1394avt/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchurl, libraw1394, libusb1, pkgconfig }: - -stdenv.mkDerivation rec { - name = "libdc1394avt-2.1.2"; - - src = fetchurl { - url = http://www.alliedvisiontec.com/fileadmin/content/PDF/Software/AVT_software/zip_files/AVTFire4Linux3v0.src.tar; - sha256 = "13fz3apxcv2rkb34hxd48lbhss6vagp9h96f55148l4mlf5iyyfv"; - }; - - unpackPhase = '' - tar xf $src - BIGTAR=`echo *` - tar xf */libdc1394*.tar.gz - rm -R $BIGTAR - cd libd* - ''; - - buildInputs = [ libraw1394 libusb1 pkgconfig ]; - - meta = { - homepage = http://www.alliedvisiontec.com/us/products/software/linux/avt-fire4linux.html; - description = "Capture and control API for IIDC cameras with AVT extensions"; - license = stdenv.lib.licenses.lgpl21Plus; - maintainers = [ stdenv.lib.maintainers.viric ]; - platforms = stdenv.lib.platforms.linux; - broken = true; - }; -} diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index 4db67e73b8b..ad524ffeb02 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, udev, valgrind }: stdenv.mkDerivation rec { - name = "libdrm-2.4.65"; + name = "libdrm-2.4.66"; src = fetchurl { url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2"; - sha256 = "71960ac8bde7d710992b1bc8879935e8300a870c36bd06f22412d0447e3d96c4"; + sha256 = "79cb8e988749794edfb2d777b298d5292eff353bbbb71ed813589e61d2bc2d76"; }; outputs = [ "dev" "out" ]; diff --git a/pkgs/development/libraries/libedit/default.nix b/pkgs/development/libraries/libedit/default.nix index 23b26e343db..abd04849beb 100644 --- a/pkgs/development/libraries/libedit/default.nix +++ b/pkgs/development/libraries/libedit/default.nix @@ -11,23 +11,21 @@ stdenv.mkDerivation rec { # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds. NROFF = "${groff}/bin/nroff"; - patches = if stdenv.isCygwin then [ - ./01-cygwin.patch - ] else null; + patches = [ ./01-cygwin.patch ./freebsd-wchar.patch ]; + + propagatedBuildInputs = [ ncurses ]; + + configureFlags = [ "--enable-widec" ]; postInstall = '' find $out/lib -type f | grep '\.\(la\|pc\)''$' | xargs sed -i \ -e 's,-lncurses[a-z]*,-L${ncurses.lib}/lib -lncursesw,g' ''; - configureFlags = [ "--enable-widec" ]; - - propagatedBuildInputs = [ ncurses ]; - meta = with stdenv.lib; { homepage = "http://www.thrysoee.dk/editline/"; description = "A port of the NetBSD Editline library (libedit)"; - license = licenses.bsd3; + license = licenses.bsd3; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/libedit/freebsd-wchar.patch b/pkgs/development/libraries/libedit/freebsd-wchar.patch new file mode 100644 index 00000000000..6bf7fb0ef69 --- /dev/null +++ b/pkgs/development/libraries/libedit/freebsd-wchar.patch @@ -0,0 +1,13 @@ +diff --git a/src/chartype.h b/src/chartype.h +index 0beee17..4ac86f3 100644 +--- a/src/chartype.h ++++ b/src/chartype.h +@@ -44,7 +44,7 @@ + * supports non-BMP code points without requiring UTF-16, but nothing + * seems to actually advertise this properly, despite Unicode 3.1 having + * been around since 2001... */ +-#if !defined(__NetBSD__) && !defined(__sun) && !(defined(__APPLE__) && defined(__MACH__)) && !defined(__OpenBSD__) ++#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__sun) && !(defined(__APPLE__) && defined(__MACH__)) && !defined(__OpenBSD__) + #ifndef __STDC_ISO_10646__ + /* In many places it is assumed that the first 127 code points are ASCII + * compatible, so ensure wchar_t indeed does ISO 10646 and not some other diff --git a/pkgs/development/libraries/libelf-freebsd/default.nix b/pkgs/development/libraries/libelf-freebsd/default.nix new file mode 100644 index 00000000000..26fe2d90963 --- /dev/null +++ b/pkgs/development/libraries/libelf-freebsd/default.nix @@ -0,0 +1,37 @@ +{ fetchsvn, stdenv, gnum4, tet }: + +stdenv.mkDerivation (rec { + version = "3258"; + name = "libelf-freebsd-${version}"; + + src = fetchsvn { + url = svn://svn.code.sf.net/p/elftoolchain/code/trunk; + rev = (stdenv.lib.strings.toInt version); + name = "elftoolchain-${version}"; + }; + + buildInputs = [ gnum4 tet ]; + + buildPhase = '' + PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin:$PATH # use BSD install(1) instead of coreutils and make(1) instead of GNU Make + cp -vr ${tet} test/tet/tet3.8 + chmod -R a+w test/tet/tet3.8 + make libelf + ''; + + installPhase = '' + cp -vr libelf $out + cp -vr common/. $out/ + ''; + + meta = { + description = "Essential compilation tools and libraries for building and analyzing ELF based program images"; + + homepage = https://sourceforge.net/p/elftoolchain/wiki/Home/; + + license = stdenv.lib.licenses.bsd2; + + platforms = stdenv.lib.platforms.freebsd; + maintainers = [ ]; + }; +}) diff --git a/pkgs/development/libraries/libgksu/default.nix b/pkgs/development/libraries/libgksu/default.nix index 7bf1d7cdc71..521e780a920 100644 --- a/pkgs/development/libraries/libgksu/default.nix +++ b/pkgs/development/libraries/libgksu/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, makeWrapper, gtk, gnome, gnome3, - libstartup_notification, libgtop, perl, perlXMLParser, autoconf, - automake, libtool, intltool, gtk_doc, docbook_xsl, xauth, sudo + libstartup_notification, libgtop, perl, perlXMLParser, + autoreconfHook, intltool, gtk_doc, docbook_xsl, xauth, sudo }: stdenv.mkDerivation rec { @@ -52,13 +52,12 @@ stdenv.mkDerivation rec { preConfigure = '' intltoolize --force --copy --automake - autoreconf -vfi ''; buildInputs = [ pkgconfig makeWrapper gtk gnome.GConf libstartup_notification gnome3.libgnome_keyring libgtop gnome.libglade perl perlXMLParser - autoconf automake libtool intltool gtk_doc docbook_xsl + autoreconfHook intltool gtk_doc docbook_xsl ]; preFixup = '' diff --git a/pkgs/development/libraries/libgphoto2/default.nix b/pkgs/development/libraries/libgphoto2/default.nix index 2fdf3d5e69b..e25cdb61d86 100644 --- a/pkgs/development/libraries/libgphoto2/default.nix +++ b/pkgs/development/libraries/libgphoto2/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/gphoto/${name}.tar.bz2"; - sha256 = "1di7iv2r5ghzrylfbpvp694gpqbwjj3ngrmg4kvl7big6hp2c6h3"; + sha256 = "0chz57rhzdz1cbdjw1q5rs439s879kk06jrci4jyn5rlm7iyic6d"; }; nativeBuildInputs = [ pkgconfig gettext ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { MTP, and other vendor specific protocols for controlling and transferring data from digital cameras. ''; - version = "2.5.8"; + version = "2.5.9"; # XXX: the homepage claims LGPL, but several src files are lgpl21Plus license = stdenv.lib.licenses.lgpl21Plus; platforms = with stdenv.lib.platforms; unix; diff --git a/pkgs/development/libraries/libguestfs/default.nix b/pkgs/development/libraries/libguestfs/default.nix index 6853c9a2ef0..8901fef21fd 100644 --- a/pkgs/development/libraries/libguestfs/default.nix +++ b/pkgs/development/libraries/libguestfs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, autoconf, automake, libtool, makeWrapper +{ stdenv, fetchurl, pkgconfig, autoreconfHook, makeWrapper , ncurses, cpio, gperf, perl, cdrkit, flex, bison, qemu, pcre, augeas, libxml2 , acl, libcap, libcap_ng, libconfig, systemd, fuse, yajl, libvirt, hivex , gmp, readline, file, libintlperl, GetoptLong, SysVirt, numactl, xen }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - makeWrapper pkgconfig autoconf automake libtool ncurses cpio gperf perl + makeWrapper pkgconfig autoreconfHook ncurses cpio gperf perl cdrkit flex bison qemu pcre augeas libxml2 acl libcap libcap_ng libconfig systemd fuse yajl libvirt gmp readline file hivex libintlperl GetoptLong SysVirt numactl xen @@ -28,10 +28,6 @@ stdenv.mkDerivation rec { patches = [ ./libguestfs-syms.patch ]; NIX_CFLAGS_COMPILE="-I${libxml2.dev}/include/libxml2/"; - preConfigure = '' - AUTOPOINT=true LIBTOOLIZE=true autoreconf --verbose --install - ''; - postInstall = '' for bin in $out/bin/*; do wrapProgram "$bin" \ diff --git a/pkgs/development/libraries/libiconv/default.nix b/pkgs/development/libraries/libiconv/default.nix index 70b0574a7b4..f5818c3bf4c 100644 --- a/pkgs/development/libraries/libiconv/default.nix +++ b/pkgs/development/libraries/libiconv/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv }: +{ fetchurl, stdenv, lib }: assert (!stdenv.isLinux); @@ -10,16 +10,18 @@ stdenv.mkDerivation rec { sha256 = "04q6lgl3kglmmhw59igq1n7v3rp1rpkypl366cy1k1yn2znlvckj"; }; - patches = if stdenv.isCygwin then [ + patches = lib.optionals stdenv.isCygwin [ ./libiconv-1.14-reloc.patch ./libiconv-1.14-wchar.patch - ] else null; + ]; + 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 # DLL.) Thus, build the static library too, and this is what Gettext # will actually use. - configureFlags = if stdenv.isCygwin then [ "--enable-static" ] else null; + lib.optional stdenv.isCygwin "--enable-static" + ++ lib.optional stdenv.isFreeBSD "--with-pic"; crossAttrs = { # Disable stripping to avoid "libiconv.a: Archive has no index" (MinGW). @@ -41,11 +43,11 @@ stdenv.mkDerivation rec { ''; homepage = http://www.gnu.org/software/libiconv/; - license = stdenv.lib.licenses.lgpl2Plus; + license = lib.licenses.lgpl2Plus; maintainers = [ ]; # This library is not needed on GNU platforms. - hydraPlatforms = stdenv.lib.platforms.cygwin ++ stdenv.lib.platforms.darwin ++ stdenv.lib.platforms.freebsd; + hydraPlatforms = with lib.platforms; cygwin ++ darwin ++ freebsd; }; } diff --git a/pkgs/development/libraries/libivykis/default.nix b/pkgs/development/libraries/libivykis/default.nix index 3ebfb5d8cfc..8e2a659b3f0 100644 --- a/pkgs/development/libraries/libivykis/default.nix +++ b/pkgs/development/libraries/libivykis/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, file, protobufc }: +{ stdenv, fetchurl, autoreconfHook, pkgconfig, file, protobufc }: stdenv.mkDerivation rec { name = "libivykis-${version}"; @@ -10,9 +10,7 @@ stdenv.mkDerivation rec { sha256 = "11d7sjbhcll932rlvx9sf3vk60b5bazmjf4vlr4qd9cz0cashizz"; }; - buildInputs = [ autoconf automake libtool pkgconfig file protobufc ]; - - preConfigure = "autoreconf -i"; + buildInputs = [ autoreconfHook pkgconfig file protobufc ]; meta = with stdenv.lib; { description = '' diff --git a/pkgs/development/libraries/libmediainfo/default.nix b/pkgs/development/libraries/libmediainfo/default.nix index 5fbc6bb1dbf..19d0b84f69e 100644 --- a/pkgs/development/libraries/libmediainfo/default.nix +++ b/pkgs/development/libraries/libmediainfo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, automake, autoconf, libtool, pkgconfig, libzen, zlib }: stdenv.mkDerivation rec { - version = "0.7.80"; + version = "0.7.81"; name = "libmediainfo-${version}"; src = fetchurl { url = "http://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz"; - sha256 = "0v9px37qx0dkx67gqwi1rd9x4m7zm1ml8sdj5fx0isj6qymbd1z5"; + sha256 = "0hzfrg7n7wlnwq28hmpxczis1k8x73wbwlsmfkshvqcwi7lva0cs"; }; buildInputs = [ automake autoconf libtool pkgconfig libzen zlib ]; diff --git a/pkgs/development/libraries/libmusclecard/default.nix b/pkgs/development/libraries/libmusclecard/default.nix deleted file mode 100644 index fa8b41a1772..00000000000 --- a/pkgs/development/libraries/libmusclecard/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{stdenv, fetchurl, pkgconfig, pcsclite}: -stdenv.mkDerivation { - name = "libmusclecard-1.3.6"; - - src = fetchurl { - url = https://alioth.debian.org/frs/download.php/3024/libmusclecard-1.3.6.tar.bz2; - sha256 = "1sswy7vcy0w9p6818al7prv9d3whj7w3w98k55zw9nhspbj6lppb"; - }; - - # The OS should care on preparing the services into this location - configureFlags = [ "--enable-muscledropdir=/var/lib/pcsc/services" ]; - - buildInputs = [ pkgconfig pcsclite ]; - - meta = { - description = "Library for MUSCLE smartcard applications"; - homepage = http://pcsclite.alioth.debian.org/; - license = stdenv.lib.licenses.lgpl21; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; - broken = true; - }; -} diff --git a/pkgs/development/libraries/libmwaw/default.nix b/pkgs/development/libraries/libmwaw/default.nix index 2ef10f41d9a..7354111e131 100644 --- a/pkgs/development/libraries/libmwaw/default.nix +++ b/pkgs/development/libraries/libmwaw/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="libmwaw"; - version="0.3.5"; + version="0.3.7"; name="${baseName}-${version}"; - hash="1vx9h419fcfcs0yj071hsg9d2qvkacgca6052m8hv3h743cdmzil"; - url="mirror://sourceforge/project/libmwaw/libmwaw/libmwaw-0.3.5/libmwaw-0.3.5.tar.xz"; - sha256="1vx9h419fcfcs0yj071hsg9d2qvkacgca6052m8hv3h743cdmzil"; + hash="1yg8zvv71r6wsrj71as1ngavj07527d8vrzdrf7s4yf2f7l12xh5"; + url="mirror://sourceforge/project/libmwaw/libmwaw/libmwaw-0.3.7/libmwaw-0.3.7.tar.xz"; + sha256="1yg8zvv71r6wsrj71as1ngavj07527d8vrzdrf7s4yf2f7l12xh5"; }; buildInputs = [ boost pkgconfig cppunit zlib libwpg libwpd librevenge diff --git a/pkgs/development/libraries/libodfgen/default.nix b/pkgs/development/libraries/libodfgen/default.nix index e8778ff413a..341ef372351 100644 --- a/pkgs/development/libraries/libodfgen/default.nix +++ b/pkgs/development/libraries/libodfgen/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="libodfgen"; - version="0.1.4"; + version="0.1.6"; name="${baseName}-${version}"; - hash="1qgilnsd57ayv9mqh4sg9mkknifr98dv70a35gizxh5cw7c5x6r4"; - url="mirror://sourceforge/project/libwpd/libodfgen/libodfgen-0.1.4/libodfgen-0.1.4.tar.xz"; - sha256="1qgilnsd57ayv9mqh4sg9mkknifr98dv70a35gizxh5cw7c5x6r4"; + hash="1sdr42f0bigip14zhs51m0zdwwzzl1mwmk882l4khpph8jmi1ch3"; + url="mirror://sourceforge/project/libwpd/libodfgen/libodfgen-0.1.6/libodfgen-0.1.6.tar.xz"; + sha256="1sdr42f0bigip14zhs51m0zdwwzzl1mwmk882l4khpph8jmi1ch3"; }; buildInputs = [ boost pkgconfig cppunit zlib libwpg libwpd librevenge diff --git a/pkgs/development/libraries/libopensc-dnie/default.nix b/pkgs/development/libraries/libopensc-dnie/default.nix deleted file mode 100644 index b610fe23ede..00000000000 --- a/pkgs/development/libraries/libopensc-dnie/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ stdenv, fetchurl, writeScript, patchelf, glib, opensc, openssl, openct -, libtool, pcsclite, zlib -}: - -stdenv.mkDerivation rec { - name = "libopensc-dnie-1.4.6-2"; - - src = if stdenv.system == "i686-linux" then (fetchurl { - url = http://www.dnielectronico.es/descargas/PKCS11_para_Sistemas_Unix/1.4.6.Ubuntu_Jaunty_32/Ubuntu_Jaunty_opensc-dnie_1.4.6-2_i386.deb.tar; - sha256 = "1i6r9ahjr0rkcxjfzkg2rrib1rjsjd5raxswvvfiya98q8rlv39i"; - }) - else if stdenv.system == "x86_64-linux" then (fetchurl { url = http://www.dnielectronico.es/descargas/PKCS11_para_Sistemas_Unix/1.4.6.Ubuntu_Jaunty_64/Ubuntu_Jaunty_opensc-dnie_1.4.6-2_amd64.deb.tar; - sha256 = "1py2bxavdcj0crhk1lwqzjgya5lvyhdfdbr4g04iysj56amxb7f9"; - }) - else throw "Architecture not supported"; - - buildInputs = [ patchelf glib ]; - - builder = writeScript (name + "-builder.sh") '' - source $stdenv/setup - tar xf $src - ar x opensc-dnie* - tar xf data.tar.gz - - RPATH=${stdenv.lib.makeLibraryPath [ glib opensc openssl openct libtool pcsclite stdenv.cc.libc zlib ]} - - for a in "usr/lib/"*.so*; do - if ! test -L $a; then - patchelf --set-rpath $RPATH $a - fi - done - - sed -i s,/usr,$out, "usr/lib/pkgconfig/"* - - mkdir -p $out - cp -R usr/lib $out - cp -R usr/share $out - ''; - - passthru = { - # This will help keeping the proper opensc version when using this libopensc-dnie library - inherit opensc; - }; - - meta = { - homepage = http://www.dnielectronico.es/descargas/; - description = "Opensc plugin to access the Spanish national ID smartcard"; - license = stdenv.lib.licenses.unfree; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; - broken = true; - }; -} diff --git a/pkgs/development/libraries/libossp-uuid/default.nix b/pkgs/development/libraries/libossp-uuid/default.nix index 119f4111666..ddfc2a5132c 100644 --- a/pkgs/development/libraries/libossp-uuid/default.nix +++ b/pkgs/development/libraries/libossp-uuid/default.nix @@ -10,6 +10,8 @@ stdenv.mkDerivation { sha256= "11a615225baa5f8bb686824423f50e4427acd3f70d394765bdff32801f0fd5b0"; }; + configureFlags = stdenv.lib.optional stdenv.isFreeBSD "--with-pic"; + meta = with stdenv.lib; { homepage = http://www.ossp.org/pkg/lib/uuid/; description = "OSSP uuid ISO-C and C++ shared library"; diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix index 1412e1d59fa..7368729a881 100644 --- a/pkgs/development/libraries/libpsl/default.nix +++ b/pkgs/development/libraries/libpsl/default.nix @@ -1,35 +1,36 @@ { stdenv, fetchFromGitHub, autoreconfHook, docbook_xsl, gtk_doc, icu -, libxslt, pkgconfig }: +, libxslt, pkgconfig, python }: let version = "${libVersion}-list-${listVersion}"; - listVersion = "2015-12-17"; + listVersion = "2016-01-09"; listSources = fetchFromGitHub { - sha256 = "09scxqlw7cp7vkjn7bp7dr9nqb3wg84kvw3iyapyxddfri4k0rvl"; - rev = "9636089f5f22b0af98b1a48fb9179dc875f0872d"; + sha256 = "1xsal9vyan954ahyn9pxvqpipmpcf6drp30xz7ag5xp3f2clcx8s"; + rev = "0f7cc8b00498812ddaa983c56d67ef3713e48350"; repo = "list"; owner = "publicsuffix"; }; - libVersion = "0.11.0"; + libVersion = "0.12.0"; in stdenv.mkDerivation { name = "libpsl-${version}"; src = fetchFromGitHub { - sha256 = "08k7prrr83lg6jmm5r5k4alpm2in4qlnx49ypb4bxv16lq8dcnmm"; + sha256 = "13w3lc752az2swymg408f3w2lbqs0f2h5ri6d5jw1vv9z0ij9xlw"; rev = "libpsl-${libVersion}"; repo = "libpsl"; owner = "rockdaboot"; }; buildInputs = [ icu libxslt ]; - nativeBuildInputs = [ autoreconfHook docbook_xsl gtk_doc pkgconfig ]; + nativeBuildInputs = [ autoreconfHook docbook_xsl gtk_doc pkgconfig python ]; postPatch = '' substituteInPlace src/psl.c --replace bits/stat.h sys/stat.h + patchShebangs src/make_dafsa.py ''; preAutoreconf = '' @@ -41,7 +42,12 @@ in stdenv.mkDerivation { # The libpsl check phase requires the list's test scripts (tests/) as well cp -Rv "${listSources}"/* list ''; - configureFlags = [ "--disable-static" "--enable-gtk-doc" "--enable-man" ]; + configureFlags = [ + "--disable-builtin" + "--disable-static" + "--enable-gtk-doc" + "--enable-man" + ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/libpst/default.nix b/pkgs/development/libraries/libpst/default.nix index 8fa781c4fda..78c65d03bfd 100644 --- a/pkgs/development/libraries/libpst/default.nix +++ b/pkgs/development/libraries/libpst/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoconf, automake, libtool, boost, python, libgsf, +{ stdenv, fetchurl, autoreconfHook, boost, python, libgsf, pkgconfig, bzip2, xmlto, gettext, imagemagick, doxygen }: stdenv.mkDerivation rec { @@ -9,13 +9,9 @@ stdenv.mkDerivation rec { sha256 = "0qih919zk40japs4mpiaw5vyr2bvwz60sjf23gixd5vvzc32cljz"; }; - buildInputs = [ autoconf automake libtool boost python libgsf pkgconfig bzip2 + buildInputs = [ autoreconfHook boost python libgsf pkgconfig bzip2 xmlto gettext imagemagick doxygen ]; - preConfigure = '' - autoreconf -v -f -i - ''; - doCheck = true; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/librdf/default.nix b/pkgs/development/libraries/librdf/default.nix index 58ff77480b6..88666310158 100644 --- a/pkgs/development/libraries/librdf/default.nix +++ b/pkgs/development/libraries/librdf/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, libtool, automake, autoconf -, librdf_raptor, librdf_raptor2, ladspaH, openssl, zlib #, swh_lv2 +{ stdenv, fetchurl, pkgconfig, autoreconfHook +, librdf_raptor2, ladspaH, openssl, zlib }: stdenv.mkDerivation rec { @@ -11,19 +11,13 @@ stdenv.mkDerivation rec { sha256 = "18p2flb2sv2hq6w2qkd29z9c7knnwqr3f12i2srshlzx6vwkm05s"; }; + preAutoreconf = "rm m4/*"; postPatch = "sed -i -e 's:usr/local:usr:' examples/{instances,remove}_test.c"; - preConfigure = "rm m4/* && autoreconf -if"; - - buildInputs = [ - pkgconfig libtool automake autoconf ladspaH openssl zlib /*swh_lv2*/ - #librdf_raptor - ]; + buildInputs = [ pkgconfig autoreconfHook ladspaH openssl zlib ]; propagatedBuildInputs = [ librdf_raptor2 ]; - #doCheck = true; # would need swh_lv2 and some path patching - meta = { description = "Lightweight RDF library with special support for LADSPA plugins"; homepage = http://sourceforge.net/projects/lrdf/; diff --git a/pkgs/development/libraries/libre/default.nix b/pkgs/development/libraries/libre/default.nix index f73ddfe340e..17226ef17c4 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.13"; + version = "0.4.14"; name = "libre-${version}"; src=fetchurl { url = "http://www.creytiv.com/pub/re-${version}.tar.gz"; - sha256 = "0496nfi7vi6ivnyici5bqs147pwkdqn48w2rajhr5k8jd07pq5qp"; + sha256 = "0ylv7v77jsny0a5wfc8i6dxsp8bjlmlz2gcyyv7x49c76pk0gdcy"; }; buildInputs = [zlib openssl]; makeFlags = [ diff --git a/pkgs/development/libraries/librem/default.nix b/pkgs/development/libraries/librem/default.nix index 817e1c79bc7..730916bf9d3 100644 --- a/pkgs/development/libraries/librem/default.nix +++ b/pkgs/development/libraries/librem/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, zlib, openssl, libre}: stdenv.mkDerivation rec { - version = "0.4.6"; + version = "0.4.7"; name = "librem-${version}"; src=fetchurl { url = "http://www.creytiv.com/pub/rem-${version}.tar.gz"; - sha256 = "0rgqy9pqn730ijxvz1gk0virsf6jwjmq02s99jqqrfm3p0g6zs3w"; + sha256 = "0klm6ls9w0cj66h1zxmx0ifsihlmq1bq75vbmf09d0vvw5g4y22x"; }; buildInputs = [zlib openssl libre]; makeFlags = [ diff --git a/pkgs/development/libraries/librevenge/default.nix b/pkgs/development/libraries/librevenge/default.nix index fa90c76b24a..dc7634c958c 100644 --- a/pkgs/development/libraries/librevenge/default.nix +++ b/pkgs/development/libraries/librevenge/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="librevenge"; - version="0.0.2"; + version="0.0.3"; name="${baseName}-${version}"; - hash="03ygxyb0vfjv8raif5q62sl33b54wkr5rzgadb8slijm6k281wpn"; - url="mirror://sourceforge/project/libwpd/librevenge/librevenge-0.0.2/librevenge-0.0.2.tar.xz"; - sha256="03ygxyb0vfjv8raif5q62sl33b54wkr5rzgadb8slijm6k281wpn"; + hash="1r0n5q7rw32h5fhnxfl7f4pwvprn9agpf117nhn71jrjqx57irvw"; + url="mirror://sourceforge/project/libwpd/librevenge/librevenge-0.0.3/librevenge-0.0.3.tar.xz"; + sha256="1r0n5q7rw32h5fhnxfl7f4pwvprn9agpf117nhn71jrjqx57irvw"; }; buildInputs = [ boost pkgconfig cppunit zlib diff --git a/pkgs/development/libraries/libtoxcore/new-api/default.nix b/pkgs/development/libraries/libtoxcore/new-api/default.nix index 0433d146680..70363b83025 100644 --- a/pkgs/development/libraries/libtoxcore/new-api/default.nix +++ b/pkgs/development/libraries/libtoxcore/new-api/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchFromGitHub, autoconf, libtool, automake, libsodium, ncurses, libopus +{ stdenv, fetchFromGitHub, autoreconfHook, libsodium, ncurses, libopus , libvpx, check, libconfig, pkgconfig }: stdenv.mkDerivation rec { - name = "tox-core-dev-20150629"; + name = "tox-core-dev-20160105"; src = fetchFromGitHub { owner = "irungentoo"; repo = "toxcore"; - rev = "219fabc0f5dbaac7968cb7728d25dface3ebb2ea"; - sha256 = "1rsnxa5b7i2zclx0kzbf4a5mds0jfkvfjz1s4whzk7rf8w3vpqkh"; + rev = "b9ef24875ce1d9bf5f04f0164ae95f729330a295"; + sha256 = "0hxwp4nk5an3a2pmha6x2729mxm57j52vnrsq47gir31c0hk6x2x"; }; NIX_LDFLAGS = "-lgcc_s"; @@ -22,10 +22,6 @@ stdenv.mkDerivation rec { auto_tests/tox_test.c ''; - preConfigure = '' - autoreconf -i - ''; - configureFlags = [ "--with-libsodium-headers=${libsodium.dev}/include" "--with-libsodium-libs=${libsodium.out}/lib" @@ -34,8 +30,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - autoconf libtool automake libsodium ncurses - check libconfig pkgconfig + autoreconfHook libsodium ncurses check libconfig pkgconfig ] ++ stdenv.lib.optionals (!stdenv.isArm) [ libopus ]; diff --git a/pkgs/development/libraries/libtoxcore/old-api/default.nix b/pkgs/development/libraries/libtoxcore/old-api/default.nix index 6bc69792b53..2fb5e93eab9 100644 --- a/pkgs/development/libraries/libtoxcore/old-api/default.nix +++ b/pkgs/development/libraries/libtoxcore/old-api/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, libtool, automake, libsodium, ncurses, libopus +{ stdenv, fetchFromGitHub, autoreconfHook, libsodium, ncurses, libopus , libvpx, check, libconfig, pkgconfig }: let @@ -26,10 +26,6 @@ stdenv.mkDerivation rec { auto_tests/tox_test.c ''; - preConfigure = '' - autoreconf -i - ''; - configureFlags = [ "--with-libsodium-headers=${libsodium.dev}/include" "--with-libsodium-libs=${libsodium.out}/lib" @@ -38,7 +34,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - autoconf libtool automake libsodium ncurses + autoreconfHook libsodium ncurses check libconfig pkgconfig ] ++ stdenv.lib.optionals (!stdenv.isArm) [ libopus diff --git a/pkgs/development/libraries/libvirt/build-on-bsd.patch b/pkgs/development/libraries/libvirt/build-on-bsd.patch new file mode 100644 index 00000000000..830f0f30ff9 --- /dev/null +++ b/pkgs/development/libraries/libvirt/build-on-bsd.patch @@ -0,0 +1,58 @@ +diff -Naur libvirt-1.3.0.orig/src/admin/admin_protocol.c libvirt-1.3.0/src/admin/admin_protocol.c +--- libvirt-1.3.0.orig/src/admin/admin_protocol.c 2015-12-02 16:17:07.000000000 +0100 ++++ libvirt-1.3.0/src/admin/admin_protocol.c 2016-01-04 17:57:10.043412857 +0100 +@@ -6,6 +6,25 @@ + + #include "admin_protocol.h" + ++/* cygwin's xdr implementation defines xdr_u_int64_t instead of xdr_uint64_t ++ * and lacks IXDR_PUT_INT32 and IXDR_GET_INT32 ++ */ ++#ifdef HAVE_XDR_U_INT64_T ++# define xdr_uint64_t xdr_u_int64_t ++#endif ++#ifndef IXDR_PUT_INT32 ++# define IXDR_PUT_INT32 IXDR_PUT_LONG ++#endif ++#ifndef IXDR_GET_INT32 ++# define IXDR_GET_INT32 IXDR_GET_LONG ++#endif ++#ifndef IXDR_PUT_U_INT32 ++# define IXDR_PUT_U_INT32 IXDR_PUT_U_LONG ++#endif ++#ifndef IXDR_GET_U_INT32 ++# define IXDR_GET_U_INT32 IXDR_GET_U_LONG ++#endif ++ + bool_t + xdr_admin_nonnull_string (XDR *xdrs, admin_nonnull_string *objp) + { +diff -Naur libvirt-1.3.0.orig/src/logging/log_protocol.c libvirt-1.3.0/src/logging/log_protocol.c +--- libvirt-1.3.0.orig/src/logging/log_protocol.c 2015-12-08 13:07:35.000000000 +0100 ++++ libvirt-1.3.0/src/logging/log_protocol.c 2016-01-04 17:56:50.673463563 +0100 +@@ -7,6 +7,25 @@ + #include "log_protocol.h" + #include "internal.h" + ++/* cygwin's xdr implementation defines xdr_u_int64_t instead of xdr_uint64_t ++ * and lacks IXDR_PUT_INT32 and IXDR_GET_INT32 ++ */ ++#ifdef HAVE_XDR_U_INT64_T ++# define xdr_uint64_t xdr_u_int64_t ++#endif ++#ifndef IXDR_PUT_INT32 ++# define IXDR_PUT_INT32 IXDR_PUT_LONG ++#endif ++#ifndef IXDR_GET_INT32 ++# define IXDR_GET_INT32 IXDR_GET_LONG ++#endif ++#ifndef IXDR_PUT_U_INT32 ++# define IXDR_PUT_U_INT32 IXDR_PUT_U_LONG ++#endif ++#ifndef IXDR_GET_U_INT32 ++# define IXDR_GET_U_INT32 IXDR_GET_U_LONG ++#endif ++ + bool_t + xdr_virLogManagerProtocolUUID (XDR *xdrs, virLogManagerProtocolUUID objp) + { diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index c947758b979..feb460f2e8b 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -1,22 +1,27 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, gnutls, devicemapper, perl, python +{ stdenv, fetchurl, fetchpatch +, pkgconfig, makeWrapper +, libxml2, gnutls, devicemapper, perl, python , iproute, iptables, readline, lvm2, utillinux, systemd, libpciaccess, gettext -, libtasn1, ebtables, libgcrypt, yajl, makeWrapper, pmutils, libcap_ng +, libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng , dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages , curl, libiconv, gmp, xen }: stdenv.mkDerivation rec { name = "libvirt-${version}"; - version = "1.2.19"; + version = "1.3.0"; src = fetchurl { url = "http://libvirt.org/sources/${name}.tar.gz"; - sha256 = "0vnxmqf04frrj18lrvq7wc70wh179d382py14006879k0cgi8b18"; + sha256 = "ebcf5645fa565e3fe2fe94a86e841db9b768cf0e0a7e6cf395c6327f9a23bd64"; }; + patches = [ ./build-on-bsd.patch ]; + + nativeBuildInputs = [ makeWrapper pkgconfig ]; buildInputs = [ - pkgconfig libxml2 gnutls perl python readline - gettext libtasn1 libgcrypt yajl makeWrapper + libxml2 gnutls perl python readline + gettext libtasn1 libgcrypt yajl libxslt xhtml1 perlPackages.XMLXPath curl libpcap ] ++ stdenv.lib.optionals stdenv.isLinux [ libpciaccess devicemapper lvm2 utillinux systemd.udev.lib libcap_ng @@ -35,7 +40,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--localstatedir=/var" - "--sysconfdir=/etc" + "--sysconfdir=/var/lib" "--with-libpcap" "--with-vmware" "--with-vbox" @@ -53,7 +58,7 @@ stdenv.mkDerivation rec { installFlags = [ "localstatedir=$(TMPDIR)/var" - "sysconfdir=$(out)/etc" + "sysconfdir=$(out)/var/lib" ]; postInstall = '' diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index 2b2b1d81a16..f7e175373e1 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -1,16 +1,12 @@ { stdenv, fetchurl, zlib, xz, python, findXMLCatalogs }: -let - version = "2.9.2"; - inherit (stdenv.lib) optional; -in - stdenv.mkDerivation rec { name = "libxml2-${version}"; + version = "2.9.3"; src = fetchurl { url = "http://xmlsoft.org/sources/${name}.tar.gz"; - sha256 = "1g6mf03xcabmk5ing1lwqmasr803616gb2xhn7pll10x2l5w6y2i"; + sha256 = "0bd17g6znn2r98gzpjppsqjg33iraky4px923j3k8kdl8qgy7sad"; }; outputs = [ "dev" "out" "bin" "doc" "py" ]; @@ -20,7 +16,7 @@ stdenv.mkDerivation rec { # 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. - ++ optional stdenv.isFreeBSD xz; + ++ stdenv.lib.optional stdenv.isFreeBSD xz; propagatedBuildInputs = [ zlib findXMLCatalogs ]; @@ -47,4 +43,3 @@ stdenv.mkDerivation rec { maintainers = [ stdenv.lib.maintainers.eelco ]; }; } - diff --git a/pkgs/development/libraries/minizip/default.nix b/pkgs/development/libraries/minizip/default.nix index b71920446e4..22657cf3899 100644 --- a/pkgs/development/libraries/minizip/default.nix +++ b/pkgs/development/libraries/minizip/default.nix @@ -1,14 +1,11 @@ -{ stdenv, zlib, autoconf, automake, libtool }: +{ stdenv, zlib, autoreconfHook }: stdenv.mkDerivation { name = "minizip-${zlib.version}"; inherit (zlib) src; - nativeBuildInputs = [ autoconf automake libtool ]; + nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ zlib ]; - preConfigure = '' - cd contrib/minizip - autoreconf -vfi - ''; + sourceRoot = "zlib-${zlib.version}/contrib/minizip"; } diff --git a/pkgs/development/libraries/mygui/svn.nix b/pkgs/development/libraries/mygui/svn.nix deleted file mode 100644 index 15da5054291..00000000000 --- a/pkgs/development/libraries/mygui/svn.nix +++ /dev/null @@ -1,27 +0,0 @@ -{stdenv, fetchsvn, unzip, ogre, cmake, ois, freetype, libuuid, boost}: - -stdenv.mkDerivation rec { - name = "mygui-svn-4141"; - - src = fetchsvn { - url = https://my-gui.svn.sourceforge.net/svnroot/my-gui/trunk; - rev = 4141; - sha256 = "0xfm4b16ksqd1cwq45kl01wi4pmj244dpn11xln8ns7wz0sffjwn"; - }; - - enableParallelBuilding = true; - - cmakeFlags = [ - "-DOGRE_LIB_DIR=${ogre}/lib" - "-DOGRE_INCLUDE_DIR=${ogre}/include/OGRE" - "-DOGRE_LIBRARIES=OgreMain" - ]; - - buildInputs = [ unzip ogre cmake ois freetype libuuid boost ]; - - meta = { - homepage = http://mygui.info/; - description = "Library for creating GUIs for games and 3D applications"; - license = stdenv.lib.licenses.lgpl3Plus; - }; -} diff --git a/pkgs/development/libraries/ois/default.nix b/pkgs/development/libraries/ois/default.nix index 67df3645eb9..25bb7a365f2 100644 --- a/pkgs/development/libraries/ois/default.nix +++ b/pkgs/development/libraries/ois/default.nix @@ -1,60 +1,41 @@ -x@{builderDefsPackage, fetchurl - , autoconf, automake, libtool, m4 - , libX11, xproto, libXi, inputproto - , libXaw, libXmu, libXt - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - []; - - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); - sourceInfo = rec { - baseName="ois"; - majorVersion="1"; - minorVersion="3"; - version="${majorVersion}.${minorVersion}"; - name="${baseName}-${version}"; - url="mirror://sourceforge/project/wgois/Source%20Release/${version}/ois_v${majorVersion}-${minorVersion}.tar.gz"; - hash="18gs6xxhbqb91x2gm95hh1pmakimqim1k9c65h7ah6g14zc7dyjh"; - }; +{ stdenv, fetchurl, autoconf, automake, libtool, libX11, xproto +, libXi, inputproto, libXaw, libXmu, libXt }: + +let + majorVersion = "1"; + minorVersion = "3"; in -rec { - src = a.fetchurl { - url = sourceInfo.url; - sha256 = sourceInfo.hash; - }; - inherit (sourceInfo) name version; - inherit buildInputs; +stdenv.mkDerivation rec { + name = "ois-${version}"; + version = "${majorVersion}.${minorVersion}"; + + src = fetchurl { + url = "mirror://sourceforge/project/wgois/Source%20Release/${version}/ois_v${majorVersion}-${minorVersion}.tar.gz"; + sha256 = "18gs6xxhbqb91x2gm95hh1pmakimqim1k9c65h7ah6g14zc7dyjh"; + }; - phaseNames = ["doPatch" "doConfigure" "doMakeInstall"]; + patches = [ + (fetchurl { + url = http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-games/ois/files/ois-1.3-gcc47.patch; + sha256 = "026jw06n42bcrmg0sbdhzc4cqxsnf7fw30a2z9cigd9x282zhii8"; + name = "gcc47.patch"; + }) + ]; - patches = [(fetchurl { - url = http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-games/ois/files/ois-1.3-gcc47.patch; - sha256 = "026jw06n42bcrmg0sbdhzc4cqxsnf7fw30a2z9cigd9x282zhii8"; - name = "gcc47.patch"; - })]; patchFlags = "-p0"; - configureCommand = ''sh bootstrap; sh configure''; + buildInputs = [ + autoconf automake libtool libX11 xproto libXi inputproto libXaw + libXmu libXt + ]; + + preConfigure = "sh bootstrap"; - meta = { + meta = with stdenv.lib; { description = "Object-oriented C++ input system"; - maintainers = with a.lib.maintainers; - [ - raskin - ]; - platforms = with a.lib.platforms; - linux; - license = a.lib.licenses.zlib; + maintainers = [ maintainers.raskin ]; + platforms = platforms.linux; + license = licenses.zlib; }; - passthru = { - updateInfo = { - downloadPage = "http://sourceforge.net/projects/wgois/files/Source Release/"; - }; - }; -}) x - +} diff --git a/pkgs/development/libraries/opencv/2.1.nix b/pkgs/development/libraries/opencv/2.1.nix deleted file mode 100644 index 302ac10d4ab..00000000000 --- a/pkgs/development/libraries/opencv/2.1.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ stdenv, fetchurl, cmake, gtk, glib, libjpeg, libpng, libtiff, jasper, ffmpeg, pkgconfig, - xineLib, gstreamer }: - -stdenv.mkDerivation rec { - name = "opencv-2.1.0"; - - src = fetchurl { - url = "mirror://sourceforge/opencvlibrary/OpenCV-2.1.0.tar.bz2"; - sha256 = "26061fd52ab0ab593c093ff94b5f5c09b956d7deda96b47019ff11932111397f"; - }; - - # The order is important; libpng should go before X libs, because they - # propagate the libpng 1.5 (and opencv wants libpng 1.2) - buildInputs = [ cmake libpng gtk glib libjpeg libtiff jasper ffmpeg pkgconfig - xineLib gstreamer ]; - - enableParallelBuilding = true; - - patchPhase = '' - sed -i 's/ptrdiff_t/std::ptrdiff_t/' include/opencv/* - ''; - - preConfigure = '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -D__STDC_CONSTANT_MACROS " - ''; - - meta = { - description = "Open Computer Vision Library with more than 500 algorithms"; - homepage = http://opencv.willowgarage.com/; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; - broken = true; - }; -} diff --git a/pkgs/development/libraries/opendkim/default.nix b/pkgs/development/libraries/opendkim/default.nix index d84f9e75510..e89cd880df1 100644 --- a/pkgs/development/libraries/opendkim/default.nix +++ b/pkgs/development/libraries/opendkim/default.nix @@ -1,4 +1,5 @@ -{stdenv, fetchurl, openssl, libmilter, libbsd}: +{ stdenv, fetchurl, pkgconfig, libbsd, openssl, libmilter +, perl, makeWrapper }: stdenv.mkDerivation rec { name = "opendkim-2.10.3"; @@ -7,15 +8,22 @@ stdenv.mkDerivation rec { sha256 = "06v8bqhh604sz9rh5bvw278issrwjgc4h1wx2pz9a84lpxbvm823"; }; - configureFlags="--with-openssl=${openssl} --with-milter=${libmilter}"; + configureFlags= [ "--with-milter=${libmilter}" ]; - buildInputs = [openssl libmilter libbsd]; - - meta = { + nativeBuildInputs = [ pkgconfig makeWrapper ]; + + buildInputs = [ libbsd openssl libmilter perl ]; + + postInstall = '' + wrapProgram $out/sbin/opendkim-genkey \ + --prefix PATH : ${openssl}/bin + ''; + + meta = with stdenv.lib; { description = "C library for producing DKIM-aware applications and an open source milter for providing DKIM service"; - homepage = http://opendkim.org/; - maintainers = [ ]; - platforms = with stdenv.lib.platforms; all; + homepage = http://www.opendkim.org/; + maintainers = with maintainers; [ abbradar ]; + license = licenses.bsd3; + platforms = platforms.unix; }; - } diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix index e9895ff56a0..f0569332391 100644 --- a/pkgs/development/libraries/openldap/default.nix +++ b/pkgs/development/libraries/openldap/default.nix @@ -9,7 +9,16 @@ stdenv.mkDerivation rec { }; # Should be removed with >=2.4.43 - patches = [ ./CVE-2015-6908.patch ]; + patches = [ + ./CVE-2015-6908.patch + ( + fetchurl { + sha256 = "5bcb3f9fb7186b380efa0a1c2d31ad755e190134b5c4dac07c65bbf7c0b6b3b3"; + url = "https://github.com/LMDB/lmdb/commit/3360cbad668f678fb23c064ca4efcc5c9ae95d10.patch"; + name = "openldap-clang-compilation.patch"; + } + ) + ]; # TODO: separate "out" and "bin" outputs = [ "dev" "out" "man" "docdev" ]; @@ -20,7 +29,8 @@ stdenv.mkDerivation rec { [ "--enable-overlays" "--disable-dependency-tracking" # speeds up one-time build ] ++ stdenv.lib.optional (openssl == null) "--without-tls" - ++ stdenv.lib.optional (cyrus_sasl == null) "--without-cyrus-sasl"; + ++ stdenv.lib.optional (cyrus_sasl == null) "--without-cyrus-sasl" + ++ stdenv.lib.optional stdenv.isFreeBSD "--with-pic"; # Fixup broken libtool preFixup = '' diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix index 7fe57af5710..1862e633ad5 100644 --- a/pkgs/development/libraries/openmpi/default.nix +++ b/pkgs/development/libraries/openmpi/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, gfortran +{stdenv, fetchurl, gfortran, perl # Enable the Sun Grid Engine bindings , enableSGE ? false @@ -9,17 +9,32 @@ with stdenv.lib; -stdenv.mkDerivation { - name = "openmpi-1.6.5"; +let + majorVersion = "1.10"; + +in stdenv.mkDerivation rec { + name = "openmpi-${majorVersion}.1"; + src = fetchurl { - url = http://www.open-mpi.org/software/ompi/v1.6/downloads/openmpi-1.6.5.tar.bz2 ; - sha256 = "11gws4d3z7934zna2r7m1f80iay2ha17kp42mkh39wjykfwbldzy"; + url = "http://www.open-mpi.org/software/ompi/v${majorVersion}/downloads/${name}.tar.bz2"; + sha256 = "14p4px9a3qzjc22lnl6braxrcrmd9rgmy7fh4qpanawn2pgfq6br"; }; + buildInputs = [ gfortran ]; + + nativeBuildInputs = [ perl ]; + configureFlags = [] ++ optional enableSGE "--with-sge" ++ optional enablePrefix "--enable-mpirun-prefix-by-default" ; + + enableParallelBuilding = true; + + preBuild = '' + patchShebangs ompi/mpi/fortran/base/gen-mpi-sizeof.pl + ''; + meta = { homepage = http://www.open-mpi.org/; description = "Open source MPI-2 implementation"; diff --git a/pkgs/development/libraries/openscenegraph/default.nix b/pkgs/development/libraries/openscenegraph/default.nix index ecb4d82c965..578d0219c02 100644 --- a/pkgs/development/libraries/openscenegraph/default.nix +++ b/pkgs/development/libraries/openscenegraph/default.nix @@ -1,60 +1,36 @@ -x@{builderDefsPackage - , cmake, giflib, libjpeg, libtiff, lib3ds, freetype, libpng - , coin3d, jasper, gdal_1_11, xproto, libX11, libXmu, freeglut, mesa - , doxygen, ffmpeg, xineLib, unzip, zlib, openal, libxml2 - , curl, a52dec, faad2, gdk_pixbuf, pkgconfig, kbproto, SDL - , qt4, poppler, librsvg, gtk - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - []; +{ stdenv, fetchurl, cmake, giflib, libjpeg, libtiff, lib3ds, freetype +, libpng, coin3d, jasper, gdal_1_11, xproto, libX11, libXmu +, freeglut, mesa, doxygen, ffmpeg, xineLib, unzip, zlib, openal +, libxml2, curl, a52dec, faad2, gdk_pixbuf, pkgconfig, kbproto, SDL +, qt4, poppler, librsvg, gtk }: - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); - sourceInfo = rec { - baseName="OpenSceneGraph"; - version="3.2.1"; - name="${baseName}-${version}"; - url="http://trac.openscenegraph.org/downloads/developer_releases/${name}.zip"; - hash="0v9y1gxb16y0mj994jd0mhcz32flhv2r6kc01xdqb4817lk75bnr"; - }; -in -rec { - src = a.fetchurl { - url = sourceInfo.url; - sha256 = sourceInfo.hash; - }; +stdenv.mkDerivation rec { + name = "openscenegraph-${version}"; + version = "3.2.1"; - inherit (sourceInfo) name version; - inherit buildInputs; + src = fetchurl { + url = "http://trac.openscenegraph.org/downloads/developer_releases/${name}.zip"; + sha256 = "0v9y1gxb16y0mj994jd0mhcz32flhv2r6kc01xdqb4817lk75bnr"; + }; - /* doConfigure should be removed if not needed */ - phaseNames = ["setVars" "addInputs" "doUnpack" "doPatch" "doCmake" "doMakeInstall"]; + buildInputs = [ + cmake giflib libjpeg libtiff lib3ds freetype libpng coin3d jasper + gdal_1_11 xproto libX11 libXmu freeglut mesa doxygen ffmpeg + xineLib unzip zlib openal libxml2 curl a52dec faad2 gdk_pixbuf + pkgconfig kbproto SDL qt4 poppler librsvg gtk + ]; cmakeFlags = [ - "-D MATH_LIBRARY=" + "-DMATH_LIBRARY=" + "-DCMAKE_C_FLAGS=-D__STDC_CONSTANT_MACROS=1" + "-DCMAKE_CXX_FLAGS=-D__STDC_CONSTANT_MACROS=1" ]; - setVars = a.noDepEntry '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -D__STDC_CONSTANT_MACROS=1" - ''; - - meta = { + meta = with stdenv.lib; { description = "A 3D graphics toolkit"; - maintainers = with a.lib.maintainers; - [ - raskin - ]; - platforms = with a.lib.platforms; - linux; + homepage = http://www.openscenegraph.org/; + maintainers = [ maintainers.raskin ]; + platforms = platforms.linux; license = "OpenSceneGraph Public License - free LGPL-based license"; }; - passthru = { - updateInfo = { - downloadPage = "http://www.openscenegraph.org/projects/osg/wiki/Downloads"; - }; - }; -}) x - +} diff --git a/pkgs/development/libraries/openslp/default.nix b/pkgs/development/libraries/openslp/default.nix new file mode 100644 index 00000000000..a77296b4895 --- /dev/null +++ b/pkgs/development/libraries/openslp/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation { + name = "openslp-2.0.0"; + + src = fetchurl { + url = "mirror://sourceforge/openslp/2.0.0/2.0.0/openslp-2.0.0.tar.gz"; + sha256 = "16splwmqp0400w56297fkipaq9vlbhv7hapap8z09gp5m2i3fhwj"; + }; + + meta = with stdenv.lib; { + homepage = "http://openslp.org/"; + description = "An open-source implementation of the IETF Service Location Protocol"; + maintainers = with maintainers; [ ttuegel ]; + license = licenses.bsd3; + platforms = platforms.all; + }; + +} diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index e213fa56a7c..3905d69e8d7 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -4,14 +4,14 @@ let ver_maj = "1.38"; - ver_min = "0"; + ver_min = "1"; in stdenv.mkDerivation rec { name = "pango-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://gnome/sources/pango/${ver_maj}/${name}.tar.xz"; - sha256 = "0v12gi7f01iq3z852pclpnmkbcksbvpcmiazmklkx1dd9fbpakhx"; + sha256 = "1dsf45m51i4rcyvh5wlxxrjfhvn5b67d5ckjc6vdcxbddjgmc80k"; }; outputs = [ "dev" "out" "bin" "docdev" ]; diff --git a/pkgs/development/libraries/pgen/default.nix b/pkgs/development/libraries/pgen/default.nix deleted file mode 100644 index 53dc7a768ee..00000000000 --- a/pkgs/development/libraries/pgen/default.nix +++ /dev/null @@ -1,33 +0,0 @@ - -{ stdenv -, fetchurl -, aterm -, toolbuslib -, cLibrary -, configSupport -, ptSupport -, ptableSupport -, errorSupport -, tideSupport -, ascSupport -, asfSupport -, sdfSupport -, sglr -, pkgconfig -}: -let - isMingw = stdenv ? cross && stdenv.cross.config == "i686-pc-mingw32" ; -in -stdenv.mkDerivation ( rec { - name = "pgen-2.8.1"; - - src = fetchurl { - url = "http://www.meta-environment.org/releases/${name}.tar.gz"; - sha256 = "0z5x6rnsp732jdszcgm22bfw3v6ai9zl49b3s5iyk9qjfmyx0h41"; - }; - - buildInputs = [aterm toolbuslib cLibrary configSupport ptSupport ptableSupport errorSupport tideSupport sdfSupport sglr ascSupport asfSupport]; - nativeBuildInputs = [pkgconfig]; - - dontStrip = isMingw; -} // ( if isMingw then { NIX_CFLAGS_COMPILE = "-O2 -Wl,--stack=0x2300000"; } else {} ) ) diff --git a/pkgs/development/libraries/pkcs11helper/default.nix b/pkgs/development/libraries/pkcs11helper/default.nix index c4f0ad16fb7..4092783b0c9 100644 --- a/pkgs/development/libraries/pkcs11helper/default.nix +++ b/pkgs/development/libraries/pkcs11helper/default.nix @@ -1,20 +1,18 @@ -{ stdenv, fetchurl, pkgconfig, openssl, autoconf, automake, libtool }: +{ stdenv, fetchurl, pkgconfig, openssl, autoreconfHook }: let rev = "5d412bad60"; in stdenv.mkDerivation rec { name = "pkcs11-helper-20121123-${rev}"; - + src = fetchurl { url = "https://github.com/alonbl/pkcs11-helper/tarball/${rev}"; name = "${name}.tar.gz"; sha256 = "1mih6mha39yr5s5m18lg4854qc105asgnwmjw7f95kgmzni62kxp"; }; - preConfigure = "autoreconf -vfi"; - - buildInputs = [ pkgconfig openssl autoconf automake libtool ]; + buildInputs = [ pkgconfig openssl autoreconfHook ]; meta = with stdenv.lib; { homepage = https://www.opensc-project.org/opensc/wiki/pkcs11-helper; diff --git a/pkgs/development/libraries/plib/CVE-2012-4552.patch b/pkgs/development/libraries/plib/CVE-2012-4552.patch new file mode 100644 index 00000000000..d3853283076 --- /dev/null +++ b/pkgs/development/libraries/plib/CVE-2012-4552.patch @@ -0,0 +1,55 @@ +diff -up plib-1.8.5/src/ssg/ssgParser.cxx~ plib-1.8.5/src/ssg/ssgParser.cxx +--- plib-1.8.5/src/ssg/ssgParser.cxx~ 2008-03-11 03:06:23.000000000 +0100 ++++ plib-1.8.5/src/ssg/ssgParser.cxx 2012-11-01 15:33:12.424483374 +0100 +@@ -57,18 +57,16 @@ void _ssgParser::error( const char *form + char msgbuff[ 255 ]; + va_list argp; + +- char* msgptr = msgbuff; +- if (linenum) +- { +- msgptr += sprintf ( msgptr,"%s, line %d: ", +- path, linenum ); +- } +- + va_start( argp, format ); +- vsprintf( msgptr, format, argp ); ++ vsnprintf( msgbuff, sizeof(msgbuff), format, argp ); + va_end( argp ); + +- ulSetError ( UL_WARNING, "%s", msgbuff ) ; ++ if (linenum) ++ { ++ ulSetError ( UL_WARNING, "%s, line %d: %s", path, linenum, msgbuff ) ; ++ } else { ++ ulSetError ( UL_WARNING, "%s", msgbuff ) ; ++ } + } + + +@@ -78,18 +76,16 @@ void _ssgParser::message( const char *fo + char msgbuff[ 255 ]; + va_list argp; + +- char* msgptr = msgbuff; +- if (linenum) +- { +- msgptr += sprintf ( msgptr,"%s, line %d: ", +- path, linenum ); +- } +- + va_start( argp, format ); +- vsprintf( msgptr, format, argp ); ++ vsnprintf( msgbuff, sizeof(msgbuff), format, argp ); + va_end( argp ); + +- ulSetError ( UL_DEBUG, "%s", msgbuff ) ; ++ if (linenum) ++ { ++ ulSetError ( UL_DEBUG, "%s, line %d: %s", path, linenum, msgbuff ) ; ++ } else { ++ ulSetError ( UL_DEBUG, "%s", msgbuff ) ; ++ } + } + + // Opens the file and does a few internal calculations based on the spec. diff --git a/pkgs/development/libraries/plib/default.nix b/pkgs/development/libraries/plib/default.nix index 4ab6fb3ad8b..ff60e62cad3 100644 --- a/pkgs/development/libraries/plib/default.nix +++ b/pkgs/development/libraries/plib/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0cha71mflpa10vh2l7ipyqk67dq2y0k5xbafwdks03fwdyzj4ns8"; }; + patches = [ ./CVE-2012-4552.patch ]; + NIX_CFLAGS_COMPILE = if enablePIC then "-fPIC" else ""; propagatedBuildInputs = [ diff --git a/pkgs/development/libraries/policykit/default.nix b/pkgs/development/libraries/policykit/default.nix deleted file mode 100644 index 9f8b702f897..00000000000 --- a/pkgs/development/libraries/policykit/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, glib, dbus, dbus_glib, expat, pam -, intltool, gettext, libxslt, docbook_xsl }: - -stdenv.mkDerivation rec { - name = "policykit-0.9"; - - src = fetchurl { - url = http://hal.freedesktop.org/releases/PolicyKit-0.9.tar.gz; - sha256 = "1dw05s4xqj67i3c13knzl04l8jap0kywzpav6fidpmqrximpq37l"; - }; - - buildInputs = - [ pkgconfig glib dbus_glib pam intltool gettext libxslt ]; - - propagatedBuildInputs = [ expat dbus ]; - - configureFlags = "--localstatedir=/var --sysconfdir=/etc"; - - installFlags = "localstatedir=$(TMPDIR)/var sysconfdir=$(out)/etc"; # keep `make install' happy - - # Read policy files from /etc/PolicyKit/policy instead of - # /usr/share/PolicyKit/policy. Using PACKAGE_DATA_DIR is hacky, but - # it works because it's only used in the C code for finding the - # policy directory. - NIX_CFLAGS_COMPILE = "-DPACKAGE_DATA_DIR=\"/etc\""; - - # Needed to build the manpages. - XML_CATALOG_FILES = "${docbook_xsl}/xml/xsl/docbook/catalog.xml"; - - meta = { - homepage = http://www.freedesktop.org/wiki/Software/PolicyKit; - description = "A toolkit for defining and handling the policy that allows unprivileged processes to speak to privileged processes (obsolete)"; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/development/libraries/pt-support/default.nix b/pkgs/development/libraries/pt-support/default.nix deleted file mode 100644 index 063fdd7cc04..00000000000 --- a/pkgs/development/libraries/pt-support/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv -, fetchurl -, aterm -, toolbuslib -, errorSupport -, pkgconfig -}: -let - isMingw = stdenv ? cross && stdenv.cross.config == "i686-pc-mingw32" ; -in -stdenv.mkDerivation ( rec { - name = "pt-support-2.4"; - - src = fetchurl { - url = "http://www.meta-environment.org/releases/${name}.tar.gz"; - sha256 = "14krhhhmrg7605ppglzd1k08n7x61g7vdkh11qcz8hb9r4n71j45"; - }; - - buildInputs = [aterm toolbuslib errorSupport]; - nativeBuildInputs = [pkgconfig]; - - dontStrip = isMingw; -} // ( if isMingw then { NIX_CFLAGS_COMPILE = "-O2 -Wl,--stack=0x2300000"; } else {} ) ) - diff --git a/pkgs/development/libraries/ptable-support/default.nix b/pkgs/development/libraries/ptable-support/default.nix deleted file mode 100644 index 357d288c732..00000000000 --- a/pkgs/development/libraries/ptable-support/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv -, fetchurl -, aterm -, ptSupport -, pkgconfig -}: -let - isMingw = stdenv ? cross && stdenv.cross.config == "i686-pc-mingw32" ; -in -stdenv.mkDerivation rec { - name = "ptable-support-1.2"; - - src = fetchurl { - url = "http://www.meta-environment.org/releases/${name}.tar.gz"; - sha256 = "0bqx1xsimf9vq6q2qnsy3565rzlha4cm2blcn3kqwbirfyj1kln9"; - }; - - buildInputs = [aterm ptSupport]; - nativeBuildInputs = [pkgconfig]; - - dontStrip = isMingw; -} diff --git a/pkgs/development/libraries/qmltermwidget/default.nix b/pkgs/development/libraries/qmltermwidget/default.nix index 4d12f020d1e..64d8570460c 100644 --- a/pkgs/development/libraries/qmltermwidget/default.nix +++ b/pkgs/development/libraries/qmltermwidget/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { patchPhase = '' substituteInPlace qmltermwidget.pro \ - --replace '$$[QT_INSTALL_QML]' "/lib/qml/" + --replace '$$[QT_INSTALL_QML]' "/lib/qt5/qml/" ''; configurePhase = "qmake PREFIX=$out"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "A QML port of qtermwidget"; - homepage = "https://github.com/Swordifish90/qmltermwidget"; + homepage = "https://github.com/Swordfish90/qmltermwidget"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ skeidel ]; diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index 39cfd745be5..07a7993a67f 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -90,7 +90,7 @@ stdenv.mkDerivation rec { -datadir $out/share/${name} -translationdir $out/share/${name}/translations " - '' + optionalString stdenv.isDarwin '' + '' + optionalString stdenv.cc.isClang '' sed -i 's/QMAKE_CC = gcc/QMAKE_CC = clang/' mkspecs/common/g++-base.conf sed -i 's/QMAKE_CXX = g++/QMAKE_CXX = clang++/' mkspecs/common/g++-base.conf ''; @@ -100,7 +100,7 @@ stdenv.mkDerivation rec { '' -v -no-separate-debug-info -release -no-fast -confirm-license -opensource - -opengl -xrender -xrandr -xinerama -xcursor -xinput -xfixes -fontconfig + -${if stdenv.isFreeBSD then "no-" else ""}opengl -xrender -xrandr -xinerama -xcursor -xinput -xfixes -fontconfig -qdbus -${if cups == null then "no-" else ""}cups -glib -dbus-linked -openssl-linked ${if mysql != null then "-plugin" else "-no"}-sql-mysql -system-sqlite @@ -127,17 +127,18 @@ stdenv.mkDerivation rec { # The following libraries are only used in plugins buildInputs = [ cups # Qt dlopen's libcups instead of linking to it - mysql.lib postgresql sqlite libjpeg libmng libtiff icu ] + postgresql sqlite libjpeg libmng libtiff icu ] + ++ optionals (mysql != null) [ mysql.lib ] ++ optionals gtkStyle [ gtk gdk_pixbuf ]; nativeBuildInputs = [ perl pkgconfig which ]; enableParallelBuilding = false; - NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin + NIX_CFLAGS_COMPILE = optionalString (stdenv.isFreeBSD || stdenv.isDarwin) "-I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include"; - NIX_LDFLAGS = optionalString stdenv.isDarwin + NIX_LDFLAGS = optionalString (stdenv.isFreeBSD || stdenv.isDarwin) "-lglib-2.0"; preBuild = optionalString stdenv.isDarwin '' diff --git a/pkgs/development/libraries/rstore-support/default.nix b/pkgs/development/libraries/rstore-support/default.nix deleted file mode 100644 index c18f52e84d7..00000000000 --- a/pkgs/development/libraries/rstore-support/default.nix +++ /dev/null @@ -1,23 +0,0 @@ - -{ stdenv -, fetchurl -, aterm -, toolbuslib -, pkgconfig -}: -let - isMingw = stdenv ? cross && stdenv.cross.config == "i686-pc-mingw32" ; -in -stdenv.mkDerivation rec { - name = "rstore-support-1.0"; - - src = fetchurl { - url = "http://www.meta-environment.org/releases/${name}.tar.gz"; - sha256 = "0fahq947bdaiymfz08fb2kvbnggpc8ybhh3sbxgja61pp2jizg46"; - }; - - buildInputs = [aterm toolbuslib]; - nativeBuildInputs = [pkgconfig]; - - dontStrip = isMingw; -} diff --git a/pkgs/development/libraries/sdf-library/default.nix b/pkgs/development/libraries/sdf-library/default.nix deleted file mode 100644 index 76c1782fbc5..00000000000 --- a/pkgs/development/libraries/sdf-library/default.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ stdenv -, fetchurl -, aterm -}: -stdenv.mkDerivation { - name = "sdf-library-1.1"; - - src = fetchurl { - url = http://www.meta-environment.org/releases/sdf-library-1.1.tar.gz; - sha256 = "0dnv2f690s4q60bssavivganyalh7n966grcsb5hlb6z57gbaqp1"; - }; - - buildInputs = [aterm]; -} diff --git a/pkgs/development/libraries/sdf-support/default.nix b/pkgs/development/libraries/sdf-support/default.nix deleted file mode 100644 index 8095650b12f..00000000000 --- a/pkgs/development/libraries/sdf-support/default.nix +++ /dev/null @@ -1,27 +0,0 @@ - -{ stdenv -, fetchurl -, aterm -, toolbuslib -, errorSupport -, ptSupport -, pkgconfig -}: -let - isMingw = stdenv ? cross && stdenv.cross.config == "i686-pc-mingw32" ; -in -stdenv.mkDerivation rec { - name = "sdf-support-2.5"; - - src = fetchurl { - url = "http://www.meta-environment.org/releases/${name}.tar.gz"; - sha256 = "0zazks2yvm8gqdx0389b1b8hf8ss284q1ywk4d7cqc8glba29cs0"; - }; - - patches = if isMingw then [./mingw.patch] else []; - - buildInputs = [aterm toolbuslib errorSupport ptSupport]; - nativeBuildInputs = [pkgconfig]; - - dontStrip = isMingw; -} diff --git a/pkgs/development/libraries/sdf-support/mingw.patch b/pkgs/development/libraries/sdf-support/mingw.patch deleted file mode 100644 index 59e57065b7d..00000000000 --- a/pkgs/development/libraries/sdf-support/mingw.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -rc sdf-support-2.5/utils/sdf-modules/src/main.c sdf-support-2.5-new/utils/sdf-modules/src/main.c -*** sdf-support-2.5/utils/sdf-modules/src/main.c 2008-11-10 14:20:07.000000000 +0100 ---- sdf-support-2.5-new/utils/sdf-modules/src/main.c 2010-08-24 10:53:04.000000000 +0200 -*************** -*** 19,25 **** - /*{{{ defines */ - - #define SEP '/' -! #define PATH_LEN (_POSIX_PATH_MAX) - - /*}}} */ - /*{{{ variables */ ---- 19,25 ---- - /*{{{ defines */ - - #define SEP '/' -! #define PATH_LEN (256) - - /*}}} */ - /*{{{ variables */ diff --git a/pkgs/development/libraries/serf/default.nix b/pkgs/development/libraries/serf/default.nix index 580460d5fc0..20ce1dabf9a 100644 --- a/pkgs/development/libraries/serf/default.nix +++ b/pkgs/development/libraries/serf/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildPhase = '' scons PREFIX="$out" OPENSSL="${openssl}" ZLIB="${zlib}" APR="$(echo "${apr}"/bin/*-config)" \ APU="$(echo "${aprutil}"/bin/*-config)" CC="${ - if stdenv.isDarwin then "clang" else "${stdenv.cc}/bin/gcc" + if stdenv.cc.isClang then "clang" else "${stdenv.cc}/bin/gcc" }" ${ if (stdenv.isDarwin || stdenv.isCygwin) then "" else "GSSAPI=\"${kerberos}\"" } diff --git a/pkgs/development/libraries/sglr/default.nix b/pkgs/development/libraries/sglr/default.nix deleted file mode 100644 index f6c14eae464..00000000000 --- a/pkgs/development/libraries/sglr/default.nix +++ /dev/null @@ -1,28 +0,0 @@ - -{ stdenv -, fetchurl -, aterm -, toolbuslib -, cLibrary -, configSupport -, ptSupport -, ptableSupport -, errorSupport -, pkgconfig -}: -let - isMingw = stdenv ? cross && stdenv.cross.config == "i686-pc-mingw32" ; -in -stdenv.mkDerivation rec { - name = "sglr-4.5.3"; - - src = fetchurl { - url = "http://www.meta-environment.org/releases/${name}.tar.gz"; - sha256 = "1k3q9k32r6i2wh3k6b000fs11n0vhy6yr8kr0bd58ybwp5dnjj77"; - }; - - buildInputs = [aterm toolbuslib cLibrary configSupport ptSupport ptableSupport errorSupport]; - nativeBuildInputs = [pkgconfig]; - - dontStrip = isMingw; -} diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix index 99f699e301c..0ef024424b2 100644 --- a/pkgs/development/libraries/spice-gtk/default.nix +++ b/pkgs/development/libraries/spice-gtk/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, gtk, spice_protocol, intltool, celt_0_5_1 , openssl, libpulseaudio, pixman, gobjectIntrospection, libjpeg_turbo, zlib -, cyrus_sasl, python, pygtk, autoconf, automake, libtool, usbredir, libsoup +, cyrus_sasl, python, pygtk, autoreconfHook, usbredir, libsoup , gtk3, enableGTK3 ? false }: with stdenv.lib; @@ -18,14 +18,16 @@ stdenv.mkDerivation rec { libjpeg_turbo zlib cyrus_sasl python pygtk usbredir ] ++ (if enableGTK3 then [ gtk3 ] else [ gtk ]); - nativeBuildInputs = [ pkgconfig intltool libtool libsoup autoconf automake ]; + nativeBuildInputs = [ pkgconfig intltool libsoup autoreconfHook ]; NIX_CFLAGS_COMPILE = "-fno-stack-protector"; - preConfigure = '' + preAutoreconf = '' substituteInPlace src/Makefile.am \ - --replace '=codegendir pygtk-2.0' '=codegendir pygobject-2.0' - autoreconf -v --force --install + --replace '=codegendir pygtk-2.0' '=codegendir pygobject-2.0' + ''; + + preConfigure = '' intltoolize -f ''; diff --git a/pkgs/development/libraries/telepathy/qt/default.nix b/pkgs/development/libraries/telepathy/qt/default.nix index 1052e92d380..49745e23fca 100644 --- a/pkgs/development/libraries/telepathy/qt/default.nix +++ b/pkgs/development/libraries/telepathy/qt/default.nix @@ -2,18 +2,31 @@ , telepathy_farstream, telepathy_glib, pythonDBus, fetchpatch }: stdenv.mkDerivation rec { - name = "telepathy-qt-0.9.6"; + name = "telepathy-qt-0.9.6.1"; src = fetchurl { url = "http://telepathy.freedesktop.org/releases/telepathy-qt/${name}.tar.gz"; - sha256 = "0j7hs055cx5g9chn3b2p0arig70m5g9547qgqvk29kxdyxxxsmqc"; + sha256 = "1y51c6rxk5qvmab98c8rnmrlyk27hnl248casvbq3cd93sav8vj9"; }; - patches = [(fetchpatch { - name = "gst-1.6.patch"; - url = "http://cgit.freedesktop.org/telepathy/telepathy-qt/patch" - + "/?id=ec4a3d62b68a57254515f01fc5ea3325ffb1dbfb"; - sha256 = "1rh7n3xyrwpvpa3haqi35qn4mfz4396ha43w4zsqpmcyda9y65v2"; - })]; + patches = let + mkUrl = hash: "http://cgit.freedesktop.org/telepathy/telepathy-qt/patch/?id=" + hash; + in [ + (fetchpatch { + name = "gst-1.6.patch"; + url = mkUrl "ec4a3d62b68a57254515f01fc5ea3325ffb1dbfb"; + sha256 = "1rh7n3xyrwpvpa3haqi35qn4mfz4396ha43w4zsqpmcyda9y65v2"; + }) + (fetchpatch { + name = "parallel-make-1.patch"; + url = mkUrl "1e1f53e9d91684918c34ec50392f86287e001a1e"; + sha256 = "1f9nk0bi90armb9zay53c7cz70zcwqqwli7sb9wgw76rmwqhl8qw"; + }) + (fetchpatch { + name = "parallel-make-2.patch"; + url = mkUrl "7389dc990c67d4269f3a79c924c054e87f2e4ac5"; + sha256 = "0mvdvyy76kpaxacljidf06wd43fr2qripr4mwsakjs3hxb1pkk57"; + }) + ]; nativeBuildInputs = [ cmake pkgconfig python ]; propagatedBuildInputs = [ qtbase dbus_glib telepathy_farstream telepathy_glib pythonDBus ]; @@ -22,6 +35,8 @@ stdenv.mkDerivation rec { cmakeFlags = "-DDESIRED_QT_VERSION=${builtins.substring 0 1 qtbase.version}"; + NIX_CFLAGS_COMPILE = [ "-Wno-error=cpp" ]; # remove after the next update + preBuild = '' NIX_CFLAGS_COMPILE+=" `pkg-config --cflags dbus-glib-1`" ''; diff --git a/pkgs/development/libraries/thrift/default.nix b/pkgs/development/libraries/thrift/default.nix index a09a8a530a5..e48ce231590 100644 --- a/pkgs/development/libraries/thrift/default.nix +++ b/pkgs/development/libraries/thrift/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, boost, zlib, libevent, openssl, python, pkgconfig, bison -, flex +, flex, twisted }: stdenv.mkDerivation rec { name = "thrift-${version}"; - version = "0.9.2"; + version = "0.9.3"; src = fetchurl { url = "http://archive.apache.org/dist/thrift/${version}/${name}.tar.gz"; - sha256 = "0w4m6hjmgr1wqac9p5zyfxx2wwqay730qi14fzxba7f46hwhvxff"; + sha256 = "17lnchan9q3qdg222rgjjai6819j9k755s239phdv6n0183hlx5h"; }; #enableParallelBuilding = true; problems on hydra @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { pythonPath = []; buildInputs = [ - boost zlib libevent openssl python pkgconfig bison flex + boost zlib libevent openssl python pkgconfig bison flex twisted ]; preConfigure = "export PY_PREFIX=$out"; diff --git a/pkgs/development/libraries/ti-rpc/default.nix b/pkgs/development/libraries/ti-rpc/default.nix index a4d210547fd..7a58f4c8cff 100644 --- a/pkgs/development/libraries/ti-rpc/default.nix +++ b/pkgs/development/libraries/ti-rpc/default.nix @@ -1,19 +1,16 @@ { fetchurl, stdenv, autoreconfHook, libkrb5 }: stdenv.mkDerivation rec { - name = "libtirpc-0.3.2"; + name = "libtirpc-1.0.1"; src = fetchurl { url = "mirror://sourceforge/libtirpc/${name}.tar.bz2"; - sha256 = "1z1z8xnlqgqznxzmyc6sypjc6b220xkv0s55hxd5sb3zydws6210"; + sha256 = "17mqrdgsgp9m92pmq7bvr119svdg753prqqxmg4cnz5y657rfmji"; }; nativeBuildInputs = [ autoreconfHook ]; propagatedBuildInputs = [ libkrb5 ]; - # http://sourceforge.net/p/libtirpc/mailman/libtirpc-devel/thread/5581CB06.5020604%40email.com/#msg34216933 - patches = [ ./fix_missing_rpc_get_default_domain.patch ]; - preConfigure = '' sed -es"|/etc/netconfig|$out/etc/netconfig|g" -i doc/Makefile.in tirpc/netconfig.h ''; diff --git a/pkgs/development/libraries/ti-rpc/fix_missing_rpc_get_default_domain.patch b/pkgs/development/libraries/ti-rpc/fix_missing_rpc_get_default_domain.patch deleted file mode 100644 index c905d3c0de8..00000000000 --- a/pkgs/development/libraries/ti-rpc/fix_missing_rpc_get_default_domain.patch +++ /dev/null @@ -1,88 +0,0 @@ -diff -rNu3 libtirpc-0.3.2-old/src/Makefile.am libtirpc-0.3.2/src/Makefile.am ---- libtirpc-0.3.2-old/src/Makefile.am 2015-07-28 15:17:49.248168000 +0300 -+++ libtirpc-0.3.2/src/Makefile.am 2015-07-28 15:18:04.870144456 +0300 -@@ -69,7 +69,7 @@ - endif - - libtirpc_la_SOURCES += key_call.c key_prot_xdr.c getpublickey.c --libtirpc_la_SOURCES += netname.c netnamer.c rtime.c -+libtirpc_la_SOURCES += netname.c netnamer.c rpcdname.c rtime.c - - CLEANFILES = cscope.* *~ - DISTCLEANFILES = Makefile.in -diff -rNu3 libtirpc-0.3.2-old/src/rpcdname.c libtirpc-0.3.2/src/rpcdname.c ---- libtirpc-0.3.2-old/src/rpcdname.c 1970-01-01 03:00:00.000000000 +0300 -+++ libtirpc-0.3.2/src/rpcdname.c 2015-07-28 15:18:04.870144456 +0300 -@@ -0,0 +1,72 @@ -+/* -+ * Copyright (c) 2009, Sun Microsystems, Inc. -+ * All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions are met: -+ * - Redistributions of source code must retain the above copyright notice, -+ * this list of conditions and the following disclaimer. -+ * - Redistributions in binary form must reproduce the above copyright notice, -+ * this list of conditions and the following disclaimer in the documentation -+ * and/or other materials provided with the distribution. -+ * - Neither the name of Sun Microsystems, Inc. nor the names of its -+ * contributors may be used to endorse or promote products derived -+ * from this software without specific prior written permission. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE -+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -+ * POSSIBILITY OF SUCH DAMAGE. -+ */ -+ -+/* -+ * rpcdname.c -+ * Gets the default domain name -+ */ -+ -+#include <stdlib.h> -+#include <unistd.h> -+#include <string.h> -+ -+static char *default_domain = 0; -+ -+static char * -+get_default_domain() -+{ -+ char temp[256]; -+ -+ if (default_domain) -+ return (default_domain); -+ if (getdomainname(temp, sizeof(temp)) < 0) -+ return (0); -+ if ((int) strlen(temp) > 0) { -+ default_domain = (char *)malloc((strlen(temp)+(unsigned)1)); -+ if (default_domain == 0) -+ return (0); -+ (void) strcpy(default_domain, temp); -+ return (default_domain); -+ } -+ return (0); -+} -+ -+/* -+ * This is a wrapper for the system call getdomainname which returns a -+ * ypclnt.h error code in the failure case. It also checks to see that -+ * the domain name is non-null, knowing that the null string is going to -+ * get rejected elsewhere in the NIS client package. -+ */ -+int -+__rpc_get_default_domain(domain) -+ char **domain; -+{ -+ if ((*domain = get_default_domain()) != 0) -+ return (0); -+ return (-1); -+} diff --git a/pkgs/development/libraries/tide-support/default.nix b/pkgs/development/libraries/tide-support/default.nix deleted file mode 100644 index d30d316c0dc..00000000000 --- a/pkgs/development/libraries/tide-support/default.nix +++ /dev/null @@ -1,23 +0,0 @@ - -{ stdenv -, fetchurl -, aterm -, toolbuslib -, pkgconfig -}: -let - isMingw = stdenv ? cross && stdenv.cross.config == "i686-pc-mingw32" ; -in -stdenv.mkDerivation rec { - name = "tide-support-1.3.1"; - - src = fetchurl { - url = "http://www.meta-environment.org/releases/${name}.tar.gz"; - sha256 = "06n80rihcj2dhrvx8969jbgxqvg2vb3jqpkdmcr47y08xs7j5n2b"; - }; - - buildInputs = [aterm toolbuslib]; - nativeBuildInputs = [pkgconfig]; - - dontStrip = isMingw; -} diff --git a/pkgs/development/libraries/toolbuslib/default.nix b/pkgs/development/libraries/toolbuslib/default.nix deleted file mode 100644 index 16680f0134c..00000000000 --- a/pkgs/development/libraries/toolbuslib/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv -, fetchurl -, aterm -, pkgconfig -, w32api -}: -let - isMingw = stdenv ? cross && stdenv.cross.config == "i686-pc-mingw32" ; -in -stdenv.mkDerivation rec { - name = "toolbuslib-1.1"; - - src = fetchurl { - url = "http://www.meta-environment.org/releases/${name}.tar.gz"; - sha256 = "0f4q0r177lih23ypypc8ckkyv5vhvnkhbrv25gswrqdif5dxbwr0"; - }; - - patches = if isMingw then [./mingw.patch] else []; - - buildInputs = [aterm] ++ (if isMingw then [w32api] else []); - nativeBuildInputs = [pkgconfig]; - - dontStrip = isMingw; -} diff --git a/pkgs/development/libraries/toolbuslib/mingw.patch b/pkgs/development/libraries/toolbuslib/mingw.patch deleted file mode 100644 index 04484aaee92..00000000000 --- a/pkgs/development/libraries/toolbuslib/mingw.patch +++ /dev/null @@ -1,888 +0,0 @@ -diff -rc toolbuslib-1.1/configure toolbuslib-1.1-new/configure -*** toolbuslib-1.1/configure 2008-11-10 13:59:46.000000000 +0100 ---- toolbuslib-1.1-new/configure 2010-08-23 16:53:39.000000000 +0200 -*************** -*** 20719,21162 **** - fi - - -- if test "${ac_cv_header_netdb_h+set}" = set; then -- echo "$as_me:$LINENO: checking for netdb.h" >&5 -- echo $ECHO_N "checking for netdb.h... $ECHO_C" >&6 -- if test "${ac_cv_header_netdb_h+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -- fi -- echo "$as_me:$LINENO: result: $ac_cv_header_netdb_h" >&5 -- echo "${ECHO_T}$ac_cv_header_netdb_h" >&6 -- else -- # Is the header compilable? -- echo "$as_me:$LINENO: checking netdb.h usability" >&5 -- echo $ECHO_N "checking netdb.h usability... $ECHO_C" >&6 -- cat >conftest.$ac_ext <<_ACEOF -- /* confdefs.h. */ -- _ACEOF -- cat confdefs.h >>conftest.$ac_ext -- cat >>conftest.$ac_ext <<_ACEOF -- /* end confdefs.h. */ -- $ac_includes_default -- #include <netdb.h> -- _ACEOF -- rm -f conftest.$ac_objext -- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_header_compiler=yes -- else -- echo "$as_me: failed program was:" >&5 -- sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_header_compiler=no -- fi -- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -- echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -- echo "${ECHO_T}$ac_header_compiler" >&6 -- -- # Is the header present? -- echo "$as_me:$LINENO: checking netdb.h presence" >&5 -- echo $ECHO_N "checking netdb.h presence... $ECHO_C" >&6 -- cat >conftest.$ac_ext <<_ACEOF -- /* confdefs.h. */ -- _ACEOF -- cat confdefs.h >>conftest.$ac_ext -- cat >>conftest.$ac_ext <<_ACEOF -- /* end confdefs.h. */ -- #include <netdb.h> -- _ACEOF -- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi -- else -- ac_cpp_err=yes -- fi -- if test -z "$ac_cpp_err"; then -- ac_header_preproc=yes -- else -- echo "$as_me: failed program was:" >&5 -- sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_header_preproc=no -- fi -- rm -f conftest.err conftest.$ac_ext -- echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -- echo "${ECHO_T}$ac_header_preproc" >&6 -- -- # So? What about this header? -- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -- yes:no: ) -- { echo "$as_me:$LINENO: WARNING: netdb.h: accepted by the compiler, rejected by the preprocessor!" >&5 -- echo "$as_me: WARNING: netdb.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: netdb.h: proceeding with the compiler's result" >&5 -- echo "$as_me: WARNING: netdb.h: proceeding with the compiler's result" >&2;} -- ac_header_preproc=yes -- ;; -- no:yes:* ) -- { echo "$as_me:$LINENO: WARNING: netdb.h: present but cannot be compiled" >&5 -- echo "$as_me: WARNING: netdb.h: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: netdb.h: check for missing prerequisite headers?" >&5 -- echo "$as_me: WARNING: netdb.h: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: netdb.h: see the Autoconf documentation" >&5 -- echo "$as_me: WARNING: netdb.h: see the Autoconf documentation" >&2;} -- { echo "$as_me:$LINENO: WARNING: netdb.h: section \"Present But Cannot Be Compiled\"" >&5 -- echo "$as_me: WARNING: netdb.h: section \"Present But Cannot Be Compiled\"" >&2;} -- { echo "$as_me:$LINENO: WARNING: netdb.h: proceeding with the preprocessor's result" >&5 -- echo "$as_me: WARNING: netdb.h: proceeding with the preprocessor's result" >&2;} -- { echo "$as_me:$LINENO: WARNING: netdb.h: in the future, the compiler will take precedence" >&5 -- echo "$as_me: WARNING: netdb.h: in the future, the compiler will take precedence" >&2;} -- ( -- cat <<\_ASBOX -- ## ------------------------------------------ ## -- ## Report this to the AC_PACKAGE_NAME lists. ## -- ## ------------------------------------------ ## -- _ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -- ;; -- esac -- echo "$as_me:$LINENO: checking for netdb.h" >&5 -- echo $ECHO_N "checking for netdb.h... $ECHO_C" >&6 -- if test "${ac_cv_header_netdb_h+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -- else -- ac_cv_header_netdb_h=$ac_header_preproc -- fi -- echo "$as_me:$LINENO: result: $ac_cv_header_netdb_h" >&5 -- echo "${ECHO_T}$ac_cv_header_netdb_h" >&6 -- -- fi -- if test $ac_cv_header_netdb_h = yes; then -- : -- else -- { { echo "$as_me:$LINENO: error: \"*** no netdb.h\"" >&5 -- echo "$as_me: error: \"*** no netdb.h\"" >&2;} -- { (exit 1); exit 1; }; } -- fi -- -- -- if test "${ac_cv_header_netinet_in_h+set}" = set; then -- echo "$as_me:$LINENO: checking for netinet/in.h" >&5 -- echo $ECHO_N "checking for netinet/in.h... $ECHO_C" >&6 -- if test "${ac_cv_header_netinet_in_h+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -- fi -- echo "$as_me:$LINENO: result: $ac_cv_header_netinet_in_h" >&5 -- echo "${ECHO_T}$ac_cv_header_netinet_in_h" >&6 -- else -- # Is the header compilable? -- echo "$as_me:$LINENO: checking netinet/in.h usability" >&5 -- echo $ECHO_N "checking netinet/in.h usability... $ECHO_C" >&6 -- cat >conftest.$ac_ext <<_ACEOF -- /* confdefs.h. */ -- _ACEOF -- cat confdefs.h >>conftest.$ac_ext -- cat >>conftest.$ac_ext <<_ACEOF -- /* end confdefs.h. */ -- $ac_includes_default -- #include <netinet/in.h> -- _ACEOF -- rm -f conftest.$ac_objext -- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_header_compiler=yes -- else -- echo "$as_me: failed program was:" >&5 -- sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_header_compiler=no -- fi -- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -- echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -- echo "${ECHO_T}$ac_header_compiler" >&6 -- -- # Is the header present? -- echo "$as_me:$LINENO: checking netinet/in.h presence" >&5 -- echo $ECHO_N "checking netinet/in.h presence... $ECHO_C" >&6 -- cat >conftest.$ac_ext <<_ACEOF -- /* confdefs.h. */ -- _ACEOF -- cat confdefs.h >>conftest.$ac_ext -- cat >>conftest.$ac_ext <<_ACEOF -- /* end confdefs.h. */ -- #include <netinet/in.h> -- _ACEOF -- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi -- else -- ac_cpp_err=yes -- fi -- if test -z "$ac_cpp_err"; then -- ac_header_preproc=yes -- else -- echo "$as_me: failed program was:" >&5 -- sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_header_preproc=no -- fi -- rm -f conftest.err conftest.$ac_ext -- echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -- echo "${ECHO_T}$ac_header_preproc" >&6 -- -- # So? What about this header? -- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -- yes:no: ) -- { echo "$as_me:$LINENO: WARNING: netinet/in.h: accepted by the compiler, rejected by the preprocessor!" >&5 -- echo "$as_me: WARNING: netinet/in.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: netinet/in.h: proceeding with the compiler's result" >&5 -- echo "$as_me: WARNING: netinet/in.h: proceeding with the compiler's result" >&2;} -- ac_header_preproc=yes -- ;; -- no:yes:* ) -- { echo "$as_me:$LINENO: WARNING: netinet/in.h: present but cannot be compiled" >&5 -- echo "$as_me: WARNING: netinet/in.h: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: netinet/in.h: check for missing prerequisite headers?" >&5 -- echo "$as_me: WARNING: netinet/in.h: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: netinet/in.h: see the Autoconf documentation" >&5 -- echo "$as_me: WARNING: netinet/in.h: see the Autoconf documentation" >&2;} -- { echo "$as_me:$LINENO: WARNING: netinet/in.h: section \"Present But Cannot Be Compiled\"" >&5 -- echo "$as_me: WARNING: netinet/in.h: section \"Present But Cannot Be Compiled\"" >&2;} -- { echo "$as_me:$LINENO: WARNING: netinet/in.h: proceeding with the preprocessor's result" >&5 -- echo "$as_me: WARNING: netinet/in.h: proceeding with the preprocessor's result" >&2;} -- { echo "$as_me:$LINENO: WARNING: netinet/in.h: in the future, the compiler will take precedence" >&5 -- echo "$as_me: WARNING: netinet/in.h: in the future, the compiler will take precedence" >&2;} -- ( -- cat <<\_ASBOX -- ## ------------------------------------------ ## -- ## Report this to the AC_PACKAGE_NAME lists. ## -- ## ------------------------------------------ ## -- _ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -- ;; -- esac -- echo "$as_me:$LINENO: checking for netinet/in.h" >&5 -- echo $ECHO_N "checking for netinet/in.h... $ECHO_C" >&6 -- if test "${ac_cv_header_netinet_in_h+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -- else -- ac_cv_header_netinet_in_h=$ac_header_preproc -- fi -- echo "$as_me:$LINENO: result: $ac_cv_header_netinet_in_h" >&5 -- echo "${ECHO_T}$ac_cv_header_netinet_in_h" >&6 -- -- fi -- if test $ac_cv_header_netinet_in_h = yes; then -- : -- else -- { { echo "$as_me:$LINENO: error: \"*** no netinet/in.h\"" >&5 -- echo "$as_me: error: \"*** no netinet/in.h\"" >&2;} -- { (exit 1); exit 1; }; } -- fi -- -- -- if test "${ac_cv_header_netinet_tcp_h+set}" = set; then -- echo "$as_me:$LINENO: checking for netinet/tcp.h" >&5 -- echo $ECHO_N "checking for netinet/tcp.h... $ECHO_C" >&6 -- if test "${ac_cv_header_netinet_tcp_h+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -- fi -- echo "$as_me:$LINENO: result: $ac_cv_header_netinet_tcp_h" >&5 -- echo "${ECHO_T}$ac_cv_header_netinet_tcp_h" >&6 -- else -- # Is the header compilable? -- echo "$as_me:$LINENO: checking netinet/tcp.h usability" >&5 -- echo $ECHO_N "checking netinet/tcp.h usability... $ECHO_C" >&6 -- cat >conftest.$ac_ext <<_ACEOF -- /* confdefs.h. */ -- _ACEOF -- cat confdefs.h >>conftest.$ac_ext -- cat >>conftest.$ac_ext <<_ACEOF -- /* end confdefs.h. */ -- $ac_includes_default -- #include <netinet/tcp.h> -- _ACEOF -- rm -f conftest.$ac_objext -- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_header_compiler=yes -- else -- echo "$as_me: failed program was:" >&5 -- sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_header_compiler=no -- fi -- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -- echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -- echo "${ECHO_T}$ac_header_compiler" >&6 -- -- # Is the header present? -- echo "$as_me:$LINENO: checking netinet/tcp.h presence" >&5 -- echo $ECHO_N "checking netinet/tcp.h presence... $ECHO_C" >&6 -- cat >conftest.$ac_ext <<_ACEOF -- /* confdefs.h. */ -- _ACEOF -- cat confdefs.h >>conftest.$ac_ext -- cat >>conftest.$ac_ext <<_ACEOF -- /* end confdefs.h. */ -- #include <netinet/tcp.h> -- _ACEOF -- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi -- else -- ac_cpp_err=yes -- fi -- if test -z "$ac_cpp_err"; then -- ac_header_preproc=yes -- else -- echo "$as_me: failed program was:" >&5 -- sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_header_preproc=no -- fi -- rm -f conftest.err conftest.$ac_ext -- echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -- echo "${ECHO_T}$ac_header_preproc" >&6 -- -- # So? What about this header? -- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -- yes:no: ) -- { echo "$as_me:$LINENO: WARNING: netinet/tcp.h: accepted by the compiler, rejected by the preprocessor!" >&5 -- echo "$as_me: WARNING: netinet/tcp.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: netinet/tcp.h: proceeding with the compiler's result" >&5 -- echo "$as_me: WARNING: netinet/tcp.h: proceeding with the compiler's result" >&2;} -- ac_header_preproc=yes -- ;; -- no:yes:* ) -- { echo "$as_me:$LINENO: WARNING: netinet/tcp.h: present but cannot be compiled" >&5 -- echo "$as_me: WARNING: netinet/tcp.h: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: netinet/tcp.h: check for missing prerequisite headers?" >&5 -- echo "$as_me: WARNING: netinet/tcp.h: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: netinet/tcp.h: see the Autoconf documentation" >&5 -- echo "$as_me: WARNING: netinet/tcp.h: see the Autoconf documentation" >&2;} -- { echo "$as_me:$LINENO: WARNING: netinet/tcp.h: section \"Present But Cannot Be Compiled\"" >&5 -- echo "$as_me: WARNING: netinet/tcp.h: section \"Present But Cannot Be Compiled\"" >&2;} -- { echo "$as_me:$LINENO: WARNING: netinet/tcp.h: proceeding with the preprocessor's result" >&5 -- echo "$as_me: WARNING: netinet/tcp.h: proceeding with the preprocessor's result" >&2;} -- { echo "$as_me:$LINENO: WARNING: netinet/tcp.h: in the future, the compiler will take precedence" >&5 -- echo "$as_me: WARNING: netinet/tcp.h: in the future, the compiler will take precedence" >&2;} -- ( -- cat <<\_ASBOX -- ## ------------------------------------------ ## -- ## Report this to the AC_PACKAGE_NAME lists. ## -- ## ------------------------------------------ ## -- _ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -- ;; -- esac -- echo "$as_me:$LINENO: checking for netinet/tcp.h" >&5 -- echo $ECHO_N "checking for netinet/tcp.h... $ECHO_C" >&6 -- if test "${ac_cv_header_netinet_tcp_h+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -- else -- ac_cv_header_netinet_tcp_h=$ac_header_preproc -- fi -- echo "$as_me:$LINENO: result: $ac_cv_header_netinet_tcp_h" >&5 -- echo "${ECHO_T}$ac_cv_header_netinet_tcp_h" >&6 -- -- fi -- if test $ac_cv_header_netinet_tcp_h = yes; then -- : -- else -- { { echo "$as_me:$LINENO: error: \"*** no netinet/tcp.h\"" >&5 -- echo "$as_me: error: \"*** no netinet/tcp.h\"" >&2;} -- { (exit 1); exit 1; }; } -- fi -- -- - if test "${ac_cv_header_sys_param_h+set}" = set; then - echo "$as_me:$LINENO: checking for sys/param.h" >&5 - echo $ECHO_N "checking for sys/param.h... $ECHO_C" >&6 ---- 20719,20724 ---- -*************** -*** 21303,21454 **** - fi - - -- if test "${ac_cv_header_sys_socket_h+set}" = set; then -- echo "$as_me:$LINENO: checking for sys/socket.h" >&5 -- echo $ECHO_N "checking for sys/socket.h... $ECHO_C" >&6 -- if test "${ac_cv_header_sys_socket_h+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -- fi -- echo "$as_me:$LINENO: result: $ac_cv_header_sys_socket_h" >&5 -- echo "${ECHO_T}$ac_cv_header_sys_socket_h" >&6 -- else -- # Is the header compilable? -- echo "$as_me:$LINENO: checking sys/socket.h usability" >&5 -- echo $ECHO_N "checking sys/socket.h usability... $ECHO_C" >&6 -- cat >conftest.$ac_ext <<_ACEOF -- /* confdefs.h. */ -- _ACEOF -- cat confdefs.h >>conftest.$ac_ext -- cat >>conftest.$ac_ext <<_ACEOF -- /* end confdefs.h. */ -- $ac_includes_default -- #include <sys/socket.h> -- _ACEOF -- rm -f conftest.$ac_objext -- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_header_compiler=yes -- else -- echo "$as_me: failed program was:" >&5 -- sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_header_compiler=no -- fi -- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -- echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -- echo "${ECHO_T}$ac_header_compiler" >&6 -- -- # Is the header present? -- echo "$as_me:$LINENO: checking sys/socket.h presence" >&5 -- echo $ECHO_N "checking sys/socket.h presence... $ECHO_C" >&6 -- cat >conftest.$ac_ext <<_ACEOF -- /* confdefs.h. */ -- _ACEOF -- cat confdefs.h >>conftest.$ac_ext -- cat >>conftest.$ac_ext <<_ACEOF -- /* end confdefs.h. */ -- #include <sys/socket.h> -- _ACEOF -- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi -- else -- ac_cpp_err=yes -- fi -- if test -z "$ac_cpp_err"; then -- ac_header_preproc=yes -- else -- echo "$as_me: failed program was:" >&5 -- sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_header_preproc=no -- fi -- rm -f conftest.err conftest.$ac_ext -- echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -- echo "${ECHO_T}$ac_header_preproc" >&6 -- -- # So? What about this header? -- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -- yes:no: ) -- { echo "$as_me:$LINENO: WARNING: sys/socket.h: accepted by the compiler, rejected by the preprocessor!" >&5 -- echo "$as_me: WARNING: sys/socket.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: sys/socket.h: proceeding with the compiler's result" >&5 -- echo "$as_me: WARNING: sys/socket.h: proceeding with the compiler's result" >&2;} -- ac_header_preproc=yes -- ;; -- no:yes:* ) -- { echo "$as_me:$LINENO: WARNING: sys/socket.h: present but cannot be compiled" >&5 -- echo "$as_me: WARNING: sys/socket.h: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: sys/socket.h: check for missing prerequisite headers?" >&5 -- echo "$as_me: WARNING: sys/socket.h: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: sys/socket.h: see the Autoconf documentation" >&5 -- echo "$as_me: WARNING: sys/socket.h: see the Autoconf documentation" >&2;} -- { echo "$as_me:$LINENO: WARNING: sys/socket.h: section \"Present But Cannot Be Compiled\"" >&5 -- echo "$as_me: WARNING: sys/socket.h: section \"Present But Cannot Be Compiled\"" >&2;} -- { echo "$as_me:$LINENO: WARNING: sys/socket.h: proceeding with the preprocessor's result" >&5 -- echo "$as_me: WARNING: sys/socket.h: proceeding with the preprocessor's result" >&2;} -- { echo "$as_me:$LINENO: WARNING: sys/socket.h: in the future, the compiler will take precedence" >&5 -- echo "$as_me: WARNING: sys/socket.h: in the future, the compiler will take precedence" >&2;} -- ( -- cat <<\_ASBOX -- ## ------------------------------------------ ## -- ## Report this to the AC_PACKAGE_NAME lists. ## -- ## ------------------------------------------ ## -- _ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -- ;; -- esac -- echo "$as_me:$LINENO: checking for sys/socket.h" >&5 -- echo $ECHO_N "checking for sys/socket.h... $ECHO_C" >&6 -- if test "${ac_cv_header_sys_socket_h+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -- else -- ac_cv_header_sys_socket_h=$ac_header_preproc -- fi -- echo "$as_me:$LINENO: result: $ac_cv_header_sys_socket_h" >&5 -- echo "${ECHO_T}$ac_cv_header_sys_socket_h" >&6 -- -- fi -- if test $ac_cv_header_sys_socket_h = yes; then -- : -- else -- { { echo "$as_me:$LINENO: error: \"*** no sys/socket.h\"" >&5 -- echo "$as_me: error: \"*** no sys/socket.h\"" >&2;} -- { (exit 1); exit 1; }; } -- fi -- -- - if test "${ac_cv_header_sys_time_h+set}" = set; then - echo "$as_me:$LINENO: checking for sys/time.h" >&5 - echo $ECHO_N "checking for sys/time.h... $ECHO_C" >&6 ---- 20865,20870 ---- -*************** -*** 21595,21746 **** - fi - - -- if test "${ac_cv_header_sys_un_h+set}" = set; then -- echo "$as_me:$LINENO: checking for sys/un.h" >&5 -- echo $ECHO_N "checking for sys/un.h... $ECHO_C" >&6 -- if test "${ac_cv_header_sys_un_h+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -- fi -- echo "$as_me:$LINENO: result: $ac_cv_header_sys_un_h" >&5 -- echo "${ECHO_T}$ac_cv_header_sys_un_h" >&6 -- else -- # Is the header compilable? -- echo "$as_me:$LINENO: checking sys/un.h usability" >&5 -- echo $ECHO_N "checking sys/un.h usability... $ECHO_C" >&6 -- cat >conftest.$ac_ext <<_ACEOF -- /* confdefs.h. */ -- _ACEOF -- cat confdefs.h >>conftest.$ac_ext -- cat >>conftest.$ac_ext <<_ACEOF -- /* end confdefs.h. */ -- $ac_includes_default -- #include <sys/un.h> -- _ACEOF -- rm -f conftest.$ac_objext -- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_header_compiler=yes -- else -- echo "$as_me: failed program was:" >&5 -- sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_header_compiler=no -- fi -- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -- echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -- echo "${ECHO_T}$ac_header_compiler" >&6 -- -- # Is the header present? -- echo "$as_me:$LINENO: checking sys/un.h presence" >&5 -- echo $ECHO_N "checking sys/un.h presence... $ECHO_C" >&6 -- cat >conftest.$ac_ext <<_ACEOF -- /* confdefs.h. */ -- _ACEOF -- cat confdefs.h >>conftest.$ac_ext -- cat >>conftest.$ac_ext <<_ACEOF -- /* end confdefs.h. */ -- #include <sys/un.h> -- _ACEOF -- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi -- else -- ac_cpp_err=yes -- fi -- if test -z "$ac_cpp_err"; then -- ac_header_preproc=yes -- else -- echo "$as_me: failed program was:" >&5 -- sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_header_preproc=no -- fi -- rm -f conftest.err conftest.$ac_ext -- echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -- echo "${ECHO_T}$ac_header_preproc" >&6 -- -- # So? What about this header? -- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -- yes:no: ) -- { echo "$as_me:$LINENO: WARNING: sys/un.h: accepted by the compiler, rejected by the preprocessor!" >&5 -- echo "$as_me: WARNING: sys/un.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: sys/un.h: proceeding with the compiler's result" >&5 -- echo "$as_me: WARNING: sys/un.h: proceeding with the compiler's result" >&2;} -- ac_header_preproc=yes -- ;; -- no:yes:* ) -- { echo "$as_me:$LINENO: WARNING: sys/un.h: present but cannot be compiled" >&5 -- echo "$as_me: WARNING: sys/un.h: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: sys/un.h: check for missing prerequisite headers?" >&5 -- echo "$as_me: WARNING: sys/un.h: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: sys/un.h: see the Autoconf documentation" >&5 -- echo "$as_me: WARNING: sys/un.h: see the Autoconf documentation" >&2;} -- { echo "$as_me:$LINENO: WARNING: sys/un.h: section \"Present But Cannot Be Compiled\"" >&5 -- echo "$as_me: WARNING: sys/un.h: section \"Present But Cannot Be Compiled\"" >&2;} -- { echo "$as_me:$LINENO: WARNING: sys/un.h: proceeding with the preprocessor's result" >&5 -- echo "$as_me: WARNING: sys/un.h: proceeding with the preprocessor's result" >&2;} -- { echo "$as_me:$LINENO: WARNING: sys/un.h: in the future, the compiler will take precedence" >&5 -- echo "$as_me: WARNING: sys/un.h: in the future, the compiler will take precedence" >&2;} -- ( -- cat <<\_ASBOX -- ## ------------------------------------------ ## -- ## Report this to the AC_PACKAGE_NAME lists. ## -- ## ------------------------------------------ ## -- _ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -- ;; -- esac -- echo "$as_me:$LINENO: checking for sys/un.h" >&5 -- echo $ECHO_N "checking for sys/un.h... $ECHO_C" >&6 -- if test "${ac_cv_header_sys_un_h+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -- else -- ac_cv_header_sys_un_h=$ac_header_preproc -- fi -- echo "$as_me:$LINENO: result: $ac_cv_header_sys_un_h" >&5 -- echo "${ECHO_T}$ac_cv_header_sys_un_h" >&6 -- -- fi -- if test $ac_cv_header_sys_un_h = yes; then -- : -- else -- { { echo "$as_me:$LINENO: error: \"*** no sys/un.h\"" >&5 -- echo "$as_me: error: \"*** no sys/un.h\"" >&2;} -- { (exit 1); exit 1; }; } -- fi -- -- - if test "${ac_cv_header_unistd_h+set}" = set; then - echo "$as_me:$LINENO: checking for unistd.h" >&5 - echo $ECHO_N "checking for unistd.h... $ECHO_C" >&6 ---- 21011,21016 ---- -diff -rc toolbuslib-1.1/src/atb-tool.c toolbuslib-1.1-new/src/atb-tool.c -*** toolbuslib-1.1/src/atb-tool.c 2008-11-10 13:59:41.000000000 +0100 ---- toolbuslib-1.1-new/src/atb-tool.c 2010-08-23 16:58:11.000000000 +0200 -*************** -*** 6,22 **** - #include <stdlib.h> - #include <unistd.h> - #include <errno.h> -- #include <netdb.h> -- #include <sys/socket.h> - #include <sys/time.h> -- #include <sys/un.h> - #include <sys/param.h> -- #include <netinet/in.h> -- #include <netinet/tcp.h> - #include <signal.h> - #include <string.h> -! -! #include <sys/resource.h> - - #include <aterm2.h> - #include "safio.h" ---- 6,16 ---- - #include <stdlib.h> - #include <unistd.h> - #include <errno.h> - #include <sys/time.h> - #include <sys/param.h> - #include <signal.h> - #include <string.h> -! #include <winsock2.h> - - #include <aterm2.h> - #include "safio.h" -*************** -*** 39,44 **** ---- 33,40 ---- - #define MAX_NR_QUEUES 64 - #define MAX_QUEUE_LEN 128 - -+ #define MAXHOSTNAMELEN 256 -+ - /* Operation codes. */ - /* From Tool to ToolBus. */ - #define CONNECT 1 -*************** -*** 144,151 **** - * Gathers performance stats. - */ - static ATerm getPerformanceStats(){ -- struct rusage resourceUsage; -- - // Type stuff - ATerm remote = (ATerm) ATmakeAppl0(ATmakeAFun("remote", 0, ATtrue)); - ATerm toolType = (ATerm) ATmakeAppl1(ATmakeAFun("type", 1, ATfalse), remote); ---- 140,145 ---- -*************** -*** 161,171 **** - // Thread stuff - ATerm threads; - -- getrusage(RUSAGE_SELF, &resourceUsage); -- - { -! int userTime = (int) (resourceUsage.ru_utime.tv_sec * 1000) + (resourceUsage.ru_utime.tv_usec / 1000); -! int systemTime = (int) (resourceUsage.ru_stime.tv_sec * 1000) + (resourceUsage.ru_stime.tv_usec / 1000); - - ATerm userTimeTerm = (ATerm) ATmakeAppl1(ATmakeAFun("user-time", 1, ATfalse), (ATerm) ATmakeInt(userTime)); - ATerm systemTimeTerm = (ATerm) ATmakeAppl1(ATmakeAFun("system-time", 1, ATfalse), (ATerm) ATmakeInt(systemTime)); ---- 155,163 ---- - // Thread stuff - ATerm threads; - - { -! int userTime = 0; -! int systemTime = 0; - - ATerm userTimeTerm = (ATerm) ATmakeAppl1(ATmakeAFun("user-time", 1, ATfalse), (ATerm) ATmakeInt(userTime)); - ATerm systemTimeTerm = (ATerm) ATmakeAppl1(ATmakeAFun("system-time", 1, ATfalse), (ATerm) ATmakeInt(systemTime)); -*************** -*** 349,364 **** - - otp = (OperationTermPair) malloc(sizeof(struct _OperationTermPair)); - -- /* Initialize handlers for OS signals */ -- { -- struct sigaction disconnect; -- disconnect.sa_handler = disconnectHandler; -- sigemptyset(&disconnect.sa_mask); -- -- sigaction(SIGTERM, &disconnect, NULL); -- sigaction(SIGQUIT, &disconnect, NULL); -- } -- - /* Get hostname of machine that runs this particular tool */ - return gethostname(this_host, MAXHOSTNAMELEN); - } ---- 341,346 ---- -diff -rc toolbuslib-1.1/src/Makefile.in toolbuslib-1.1-new/src/Makefile.in -*** toolbuslib-1.1/src/Makefile.in 2008-11-10 13:59:47.000000000 +0100 ---- toolbuslib-1.1-new/src/Makefile.in 2010-08-24 10:28:10.000000000 +0200 -*************** -*** 223,234 **** - libATB_la_SOURCES = atb-tool.c - libATB_la_CPPFLAGS = $(ATERM_CFLAGS) - libATB_la_LDFLAGS = -avoid-version -no-undefined $(AM_LDFLAGS) -! libATB_la_LIBADD = $(ATERM_LIBS) $(SOCKETLIBS) - - bin_PROGRAMS = tbunpack - - tbunpack_SOURCES = tbunpack.c atb-tool.c -! tbunpack_LDADD = $(ATERM_LIBS) - subdir = ./src - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ---- 223,234 ---- - libATB_la_SOURCES = atb-tool.c - libATB_la_CPPFLAGS = $(ATERM_CFLAGS) - libATB_la_LDFLAGS = -avoid-version -no-undefined $(AM_LDFLAGS) -! libATB_la_LIBADD = $(ATERM_LIBS) $(SOCKETLIBS) -lwsock32 - - bin_PROGRAMS = tbunpack - - tbunpack_SOURCES = tbunpack.c atb-tool.c -! tbunpack_LDADD = $(ATERM_LIBS) -lwsock32 - subdir = ./src - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/pkgs/development/libraries/tremor/default.nix b/pkgs/development/libraries/tremor/default.nix index c8eb6e3bdab..aa4a5578691 100644 --- a/pkgs/development/libraries/tremor/default.nix +++ b/pkgs/development/libraries/tremor/default.nix @@ -1,19 +1,18 @@ -{ stdenv, fetchsvn, autoconf, automake, libtool, pkgconfig, libogg }: +{ stdenv, fetchsvn, autoreconfHook, pkgconfig, libogg }: stdenv.mkDerivation rec { name = "tremor-svn-${src.rev}"; - + src = fetchsvn { url = http://svn.xiph.org/trunk/Tremor; rev = "17866"; sha256 = "161411cbefa1527da7a8fc087e78d8e21d19143d3a6eb42fb281e5026aad7568"; }; - nativeBuildInputs = [ autoconf automake libtool pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; propagatedBuildInputs = [ libogg ]; preConfigure = '' - autoreconf -vfi sed -i /XIPH_PATH_OGG/d configure ''; diff --git a/pkgs/development/libraries/unicap/default.nix b/pkgs/development/libraries/unicap/default.nix index daec5a78566..604a1b7012a 100644 --- a/pkgs/development/libraries/unicap/default.nix +++ b/pkgs/development/libraries/unicap/default.nix @@ -1,56 +1,34 @@ -x@{builderDefsPackage - , libusb, libraw1394, dcraw, intltool, perl - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - []; +{ stdenv, fetchurl, libusb, libraw1394, dcraw, intltool, perl, v4l_utils }: - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); - sourceInfo = rec { - baseName="libunicap"; - version="0.9.12"; - name="${baseName}-${version}"; - url="http://www.unicap-imaging.org/downloads/${name}.tar.gz"; - hash="05zcnnm4dfc6idihfi0fq5xka6x86zi89wip2ca19yz768sd33s9"; - }; -in -rec { - src = a.fetchurl { - url = sourceInfo.url; - sha256 = sourceInfo.hash; +stdenv.mkDerivation rec { + name = "libunicap-${version}"; + version="0.9.12"; + + src = fetchurl { + url = "http://www.unicap-imaging.org/downloads/${name}.tar.gz"; + sha256 = "05zcnnm4dfc6idihfi0fq5xka6x86zi89wip2ca19yz768sd33s9"; }; - inherit (sourceInfo) name version; - inherit buildInputs; + buildInputs = [ libusb libraw1394 dcraw intltool perl v4l_utils ]; - /* doConfigure should be removed if not needed */ - phaseNames = ["fixIncludes" "fixMakefiles" "doConfigure" "doMakeInstall"]; + patches = [ + # Debian has a patch that fixes the build. + (fetchurl { + url = "https://sources.debian.net/data/main/u/unicap/0.9.12-2/debian/patches/1009_v4l1.patch"; + sha256 = "1lgypmhdj681m7d1nmzgvh19cz8agj2f31wlnfib0ha8i3g5hg5w"; + }) + ]; - fixIncludes = a.fullDepEntry ('' + postPatch = '' find . -type f -exec sed -e '/linux\/types\.h/d' -i '{}' ';' - '') ["minInit" "doUnpack"]; - - fixMakefiles = a.fullDepEntry ('' sed -e 's@/etc/udev@'"$out"'/&@' -i data/Makefile.* - '') ["minInit" "doUnpack"]; + ''; - meta = { + meta = with stdenv.lib; { description = "Universal video capture API"; - maintainers = with a.lib.maintainers; - [ - raskin - ]; - platforms = with a.lib.platforms; - linux; - broken = true; + homepage = http://www.unicap-imaging.org/; + maintainers = [ maintainers.raskin ]; + license = licenses.gpl2Plus; + platforms = platforms.linux; }; - passthru = { - updateInfo = { - downloadPage = "http://unicap-imaging.org/download.htm"; - }; - }; -}) x - +} diff --git a/pkgs/development/libraries/vc/default.nix b/pkgs/development/libraries/vc/default.nix index 9d5a24c4371..c96c2c47cb9 100644 --- a/pkgs/development/libraries/vc/default.nix +++ b/pkgs/development/libraries/vc/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - version = "1.0.0"; + version = "1.1.0"; name = "Vc-${version}"; src = fetchFromGitHub { owner = "VcDevel"; repo = "Vc"; rev = version; - sha256 = "014li9kcbbxinh9r1nngdzspjzs2nxwslcknd950msjkqgnjhz4r"; + sha256 = "1i27zpwcpsfabvf1vpyx5rlzkkgqfd55c3c0jq5fghywyj6743j8"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix index 9fe45996b10..59713bb8d20 100644 --- a/pkgs/development/libraries/zlib/default.nix +++ b/pkgs/development/libraries/zlib/default.nix @@ -47,7 +47,8 @@ stdenv.mkDerivation rec { # As zlib takes part in the stdenv building, we don't want references # to the bootstrap-tools libgcc (as uses to happen on arm/mips) - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (!stdenv.isDarwin) "-static-libgcc"; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (!stdenv.isDarwin) "-static-libgcc " + + stdenv.lib.optionalString (stdenv.isFreeBSD) "-fPIC"; crossAttrs = { dontStrip = static; |