diff options
author | Matthew Bauer <mjbauer95@gmail.com> | 2018-08-21 15:41:53 -0500 |
---|---|---|
committer | Matthew Bauer <mjbauer95@gmail.com> | 2018-08-21 15:41:53 -0500 |
commit | 379fc894de3b3ec69cde73454853b4ac4eee4065 (patch) | |
tree | 79b5e82daccf2de704d0230d191f3313f16a1694 /pkgs/development/libraries | |
parent | 9c35796ee31939f6c12fc05e6d1a4a0f544ecc5d (diff) | |
parent | 28e51c7ceac1c3df219dbf8388bf122f817459b7 (diff) | |
download | nixlib-379fc894de3b3ec69cde73454853b4ac4eee4065.tar nixlib-379fc894de3b3ec69cde73454853b4ac4eee4065.tar.gz nixlib-379fc894de3b3ec69cde73454853b4ac4eee4065.tar.bz2 nixlib-379fc894de3b3ec69cde73454853b4ac4eee4065.tar.lz nixlib-379fc894de3b3ec69cde73454853b4ac4eee4065.tar.xz nixlib-379fc894de3b3ec69cde73454853b4ac4eee4065.tar.zst nixlib-379fc894de3b3ec69cde73454853b4ac4eee4065.zip |
Merge remote-tracking branch 'origin/master' into staging
Diffstat (limited to 'pkgs/development/libraries')
63 files changed, 620 insertions, 462 deletions
diff --git a/pkgs/development/libraries/ace/default.nix b/pkgs/development/libraries/ace/default.nix index d1ddb17ba2fc..a1741513642f 100644 --- a/pkgs/development/libraries/ace/default.nix +++ b/pkgs/development/libraries/ace/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ace-${version}"; - version = "6.5.0"; + version = "6.5.1"; src = fetchurl { url = "http://download.dre.vanderbilt.edu/previous_versions/ACE-${version}.tar.bz2"; - sha256 = "0mzkyn7bjw3h8q22ajg765dflwxnsz6b20ql23gcbqkxfjvvdyyv"; + sha256 = "1vwhyk0lrpnn78xx212d16lf7vl2q6651wc8vxqbd296x6wbnh2y"; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix index 952f7435c069..8e89aeb21a24 100644 --- a/pkgs/development/libraries/arrow-cpp/default.nix +++ b/pkgs/development/libraries/arrow-cpp/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "arrow-cpp-${version}"; - version = "0.9.0"; + version = "0.10.0"; src = fetchurl { url = "mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz"; - sha256 = "16l91fixb5dgx3v6xc73ipn1w1hjgbmijyvs81j7ywzpna2cdcdy"; + sha256 = "0bc4krapz1kzdm16npzmgdz7zvg9lip6rnqbwph8vfn7zji0fcll"; }; sourceRoot = "apache-arrow-${version}/cpp"; diff --git a/pkgs/development/libraries/at-spi2-atk/default.nix b/pkgs/development/libraries/at-spi2-atk/default.nix index a9652f4da3ee..f1db64cc9ea5 100644 --- a/pkgs/development/libraries/at-spi2-atk/default.nix +++ b/pkgs/development/libraries/at-spi2-atk/default.nix @@ -10,6 +10,7 @@ , dbus , glib , libxml2 +, fixDarwinDylibNames , gnome3 # To pass updateScript }: @@ -24,7 +25,9 @@ stdenv.mkDerivation rec { sha256 = "0vkan52ab9vrkknnv8y4f1cspk8x7xd10qx92xk9ys71p851z2b1"; }; - nativeBuildInputs = [ meson ninja pkgconfig ]; + nativeBuildInputs = [ meson ninja pkgconfig ] + # Fixup rpaths because of meson, remove with meson-0.47 + ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; buildInputs = [ at-spi2-core atk dbus glib libxml2 ]; doCheck = false; # fails with "No test data file provided" diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix index 9bbde08023ba..d9251c2bdc5d 100644 --- a/pkgs/development/libraries/at-spi2-core/default.nix +++ b/pkgs/development/libraries/at-spi2-core/default.nix @@ -11,6 +11,7 @@ , libX11 , libXtst # at-spi2-core can be build without X support, but due it is a client-side library, GUI-less usage is a very rare case , libXi +, fixDarwinDylibNames , gnome3 # To pass updateScript }: @@ -27,7 +28,9 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ meson ninja pkgconfig gobjectIntrospection ]; + nativeBuildInputs = [ meson ninja pkgconfig gobjectIntrospection ] + # Fixup rpaths because of meson, remove with meson-0.47 + ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; buildInputs = [ dbus glib libX11 libXtst libXi ]; doCheck = false; # fails with "AT-SPI: Couldn't connect to accessibility bus. Is at-spi-bus-launcher running?" diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix index 2874d22a1f9d..1e341d3124b4 100644 --- a/pkgs/development/libraries/babl/default.nix +++ b/pkgs/development/libraries/babl/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "babl-0.1.54"; + name = "babl-0.1.56"; src = fetchurl { url = "https://ftp.gtk.org/pub/babl/0.1/${name}.tar.bz2"; - sha256 = "01rad0sf9bkg7124qz5zdn08nl1q00yy5lg6ca3v053jblsg2asd"; + sha256 = "0a2dvihah1j7qi5dp1qzzlwklcqnndmxsm7lc7i78g7c2yknrlla"; }; doCheck = true; diff --git a/pkgs/development/libraries/c-ares/default.nix b/pkgs/development/libraries/c-ares/default.nix index a22437d3993e..176245491179 100644 --- a/pkgs/development/libraries/c-ares/default.nix +++ b/pkgs/development/libraries/c-ares/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, writeTextDir }: +{ targetPlatform, stdenv, fetchurl, writeTextDir }: let self = stdenv.mkDerivation rec { @@ -36,12 +36,12 @@ stdenv.mkDerivation rec { set_target_properties(c-ares::cares PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${self}/include" - INTERFACE_LINK_LIBRARIES "nsl;rt" + ${stdenv.lib.optionalString stdenv.isLinux ''INTERFACE_LINK_LIBRARIES "nsl;rt"''} ) set_property(TARGET c-ares::cares APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) set_target_properties(c-ares::cares PROPERTIES - IMPORTED_LOCATION_RELEASE "${self}/lib/libcares.so.2.2.0" - IMPORTED_SONAME_RELEASE "libcares.so.2" + IMPORTED_LOCATION_RELEASE "${self}/lib/libcares${targetPlatform.extensions.sharedLibrary}" + IMPORTED_SONAME_RELEASE "libcares${targetPlatform.extensions.sharedLibrary}" ) add_library(c-ares::cares_shared INTERFACE IMPORTED) set_target_properties(c-ares::cares_shared PROPERTIES INTERFACE_LINK_LIBRARIES "c-ares::cares") diff --git a/pkgs/development/libraries/eccodes/default.nix b/pkgs/development/libraries/eccodes/default.nix index 5f70a7571bae..5cd004c8d136 100644 --- a/pkgs/development/libraries/eccodes/default.nix +++ b/pkgs/development/libraries/eccodes/default.nix @@ -6,11 +6,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "eccodes-${version}"; - version = "2.8.0"; + version = "2.8.2"; src = fetchurl { url = "https://software.ecmwf.int/wiki/download/attachments/45757960/eccodes-${version}-Source.tar.gz"; - sha256 = "06rf6yzrszfqm74sq3485c7h6m0xjnz35sm31xkk70fxgk129fp0"; + sha256 = "0aki7llrdfj6273yjy8yv0d027sdbv8xs3iv68fb69s0clyygrin"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/fflas-ffpack/default.nix b/pkgs/development/libraries/fflas-ffpack/default.nix index 5f99f35a1599..bf7630608f7d 100644 --- a/pkgs/development/libraries/fflas-ffpack/default.nix +++ b/pkgs/development/libraries/fflas-ffpack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, givaro, pkgconfig, openblas +{ stdenv, fetchFromGitHub, autoreconfHook, givaro, pkgconfig, blas , gmpxx , optimize ? false # impure }: @@ -6,23 +6,30 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "fflas-ffpack"; version = "2.3.2"; + src = fetchFromGitHub { owner = "linbox-team"; repo = "${pname}"; rev = "v${version}"; sha256 = "1cqhassj2dny3gx0iywvmnpq8ca0d6m82xl5rz4mb8gaxr2kwddl"; }; + checkInputs = [ gmpxx ]; + + enableParallelBuilding = true; + nativeBuildInputs = [ autoreconfHook pkgconfig ] ++ stdenv.lib.optionals doCheck checkInputs; - buildInputs = [ givaro openblas]; + + buildInputs = [ givaro blas ]; + configureFlags = [ - "--with-blas-libs=-lopenblas" - "--with-lapack-libs=-lopenblas" + "--with-blas-libs=-l${blas.linkName}" + "--with-lapack-libs=-l${blas.linkName}" ] ++ stdenv.lib.optionals (!optimize) [ # disable SIMD instructions (which are enabled *when available* by default) "--disable-sse" @@ -36,13 +43,15 @@ stdenv.mkDerivation rec { "--disable-fma" "--disable-fma4" ]; + doCheck = true; + meta = { inherit version; description = ''Finite Field Linear Algebra Subroutines''; license = stdenv.lib.licenses.lgpl21Plus; maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; homepage = https://linbox-team.github.io/fflas-ffpack/; }; } diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index 2b6a949c2326..d188cb9810a7 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "folly-${version}"; - version = "2018.07.09.00"; + version = "2018.08.13.00"; src = fetchFromGitHub { owner = "facebook"; repo = "folly"; rev = "v${version}"; - sha256 = "08irwa2pb3f2gnk31rq31jjrqk2xxx0a0m72gf0bsv2w9fgn5sfm"; + sha256 = "1lhq3l7rirhi4vwgiym0r3rff1i69c7bdpi1hm8r4axs2dfjvxdr"; }; nativeBuildInputs = [ autoreconfHook python pkgconfig ]; diff --git a/pkgs/development/libraries/fontconfig-ultimate/default.nix b/pkgs/development/libraries/fontconfig-ultimate/default.nix index a2e5f69202c4..9aeb12344ece 100644 --- a/pkgs/development/libraries/fontconfig-ultimate/default.nix +++ b/pkgs/development/libraries/fontconfig-ultimate/default.nix @@ -38,4 +38,11 @@ stdenv.mkDerivation { cp fontconfig_patches/free/*.conf $out/etc/fonts/presets/free cp fontconfig_patches/ms/*.conf $out/etc/fonts/presets/ms ''; + + meta = with stdenv.lib; { + description = "Font configuration files, patches, scripts and source packages (Infinality & friends)"; + homepage = https://github.com/bohoomil/fontconfig-ultimate; + license = licenses.mit; + platforms = platforms.all; + }; } diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix index 52d439918aa3..4f07316bd3f1 100644 --- a/pkgs/development/libraries/freetds/default.nix +++ b/pkgs/development/libraries/freetds/default.nix @@ -8,11 +8,11 @@ assert odbcSupport -> unixODBC != null; stdenv.mkDerivation rec { name = "freetds-${version}"; - version = "1.00.91"; + version = "1.00.94"; src = fetchurl { url = "http://www.freetds.org/files/stable/${name}.tar.bz2"; - sha256 = "04c344xdvh2j36r01ph7yhy5rb1668il0z9vyphwdy6qqwywh622"; + sha256 = "1r03ns0jp2sbbivys5bks376vbdqbnx8v764kjh74gpbajjmkksz"; }; buildInputs = [ diff --git a/pkgs/development/libraries/funambol/default.nix b/pkgs/development/libraries/funambol/default.nix index d0850128ebcc..100c00eea497 100644 --- a/pkgs/development/libraries/funambol/default.nix +++ b/pkgs/development/libraries/funambol/default.nix @@ -14,10 +14,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook unzip ]; - meta = { + meta = with stdenv.lib; { description = "SyncML client sdk by Funambol project"; homepage = http://www.funambol.com; - maintainers = [ ]; - platforms = stdenv.lib.platforms.unix; + license = licenses.agpl3; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/gamin/default.nix b/pkgs/development/libraries/gamin/default.nix index a4e0bcfb52b0..4cff22457403 100644 --- a/pkgs/development/libraries/gamin/default.nix +++ b/pkgs/development/libraries/gamin/default.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation (rec { homepage = https://people.gnome.org/~veillard/gamin/; description = "A file and directory monitoring system"; maintainers = with maintainers; [ lovek323 ]; + license = licenses.gpl2; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/gcab/default.nix b/pkgs/development/libraries/gcab/default.nix index 0758d1252274..dc0ca5fffa3a 100644 --- a/pkgs/development/libraries/gcab/default.nix +++ b/pkgs/development/libraries/gcab/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, gettext, gobjectIntrospection, pkgconfig, meson, ninja, glibcLocales, git, vala, glib, zlib }: +{ stdenv, fetchurl, gettext, gobjectIntrospection, pkgconfig +, meson, ninja, glibcLocales, git, vala, glib, zlib +}: stdenv.mkDerivation rec { name = "gcab-${version}"; @@ -22,6 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { platforms = platforms.linux; + license = licenses.lgpl21; maintainers = [ maintainers.lethalman ]; }; diff --git a/pkgs/development/libraries/gdata-sharp/default.nix b/pkgs/development/libraries/gdata-sharp/default.nix index 40e9b0ed90d5..a9b79dac7b88 100644 --- a/pkgs/development/libraries/gdata-sharp/default.nix +++ b/pkgs/development/libraries/gdata-sharp/default.nix @@ -34,6 +34,8 @@ in stdenv.mkDerivation rec { The Google Data APIs provide a simple protocol for reading and writing data on the web. ''; + + license = licenses.asl20; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/gdcm/default.nix b/pkgs/development/libraries/gdcm/default.nix index a4eab462046c..cba31f45d557 100644 --- a/pkgs/development/libraries/gdcm/default.nix +++ b/pkgs/development/libraries/gdcm/default.nix @@ -26,14 +26,15 @@ stdenv.mkDerivation rec { buildInputs = [ cmake vtk ]; propagatedBuildInputs = [ ]; - meta = { + meta = with stdenv.lib; { description = "The grassroots cross-platform DICOM implementation"; longDescription = '' Grassroots DICOM (GDCM) is an implementation of the DICOM standard designed to be open source so that researchers may access clinical data directly. GDCM includes a file format definition and a network communications protocol, both of which should be extended to provide a full set of tools for a researcher or small medical imaging vendor to interface with an existing medical database. ''; homepage = http://gdcm.sourceforge.net/; - platforms = stdenv.lib.platforms.all; + license = with licenses; [ bsd3 asl20 ]; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index 94536f8f5b69..3fb50e98c1c8 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -116,6 +116,7 @@ stdenv.mkDerivation rec { description = "A library for image loading and manipulation"; homepage = http://library.gnome.org/devel/gdk-pixbuf/; maintainers = [ maintainers.eelco ]; + license = licenses.lgpl21; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/gegl/4.0.nix b/pkgs/development/libraries/gegl/4.0.nix index f32bc120170c..c8b7b3b8eca5 100644 --- a/pkgs/development/libraries/gegl/4.0.nix +++ b/pkgs/development/libraries/gegl/4.0.nix @@ -3,18 +3,18 @@ , libwebp, gnome3, libintl }: let - version = "0.4.4"; + version = "0.4.8"; in stdenv.mkDerivation rec { name = "gegl-${version}"; + outputs = [ "out" "dev" "devdoc" ]; + outputBin = "dev"; + src = fetchurl { url = "https://download.gimp.org/pub/gegl/${stdenv.lib.versions.majorMinor version}/${name}.tar.bz2"; - sha256 = "143qwn92xc5wm09p9iwrpw9y0ahha5lcyx1bb0lzwcb1fgd4bjzq"; + sha256 = "0jdfhf8wikba4h68k505x0br3gisiwivc33aca8v3ibaqpp6i53i"; }; - # needs fonts otherwise, don't know how to pass them - configureFlags = [ "--disable-docs" ]; - enableParallelBuilding = true; doCheck = true; diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix index 07db27dcc791..469dcbf75bbe 100644 --- a/pkgs/development/libraries/gettext/default.nix +++ b/pkgs/development/libraries/gettext/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = { + meta = with lib; { description = "Well integrated set of translation tools and documentation"; longDescription = '' @@ -76,8 +76,9 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/gettext/; - maintainers = with lib.maintainers; [ zimbatm vrthra ]; - platforms = lib.platforms.all; + maintainers = with maintainers; [ zimbatm vrthra ]; + license = licenses.gpl2Plus; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/gf2x/default.nix b/pkgs/development/libraries/gf2x/default.nix index 8c2e29231dca..a00e07376c7b 100644 --- a/pkgs/development/libraries/gf2x/default.nix +++ b/pkgs/development/libraries/gf2x/default.nix @@ -1,19 +1,33 @@ -{stdenv, fetchurl}: +{ stdenv +, lib +, fetchurl +, optimize ? false # impure hardware optimizations +}: stdenv.mkDerivation rec { name = "gf2x-${version}"; - version = "1.2"; + version = "1.2"; # remember to also update the url src = fetchurl { # find link to latest version (with file id) here: https://gforge.inria.fr/projects/gf2x/ - url = "https://gforge.inria.fr/frs/download.php/file/36934/gf2x-1.2.tar.gz"; + # Requested a predictable link: + # https://gforge.inria.fr/tracker/index.php?func=detail&aid=21704&group_id=1874&atid=6982 + url = "https://gforge.inria.fr/frs/download.php/file/36934/gf2x-${version}.tar.gz"; sha256 = "0d6vh1mxskvv3bxl6byp7gxxw3zzpkldrxnyajhnl05m0gx7yhk1"; }; - meta = with stdenv.lib; { + # no actual checks present yet (as of 1.2), but can't hurt trying + # for an indirect test, run ntl's test suite + doCheck = true; + + configureFlags = lib.optionals (!optimize) [ + "--disable-hardware-specific-code" + ]; + + meta = with lib; { description = ''Routines for fast arithmetic in GF(2)[x]''; homepage = http://gf2x.gforge.inria.fr; license = licenses.gpl2Plus; - maintainers = with maintainers; [ raskin ]; + maintainers = with maintainers; [ raskin timokau ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/giflib/4.1.nix b/pkgs/development/libraries/giflib/4.1.nix index c70bda034871..941a7c27feaf 100644 --- a/pkgs/development/libraries/giflib/4.1.nix +++ b/pkgs/development/libraries/giflib/4.1.nix @@ -10,9 +10,11 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; - meta = { + meta = with stdenv.lib; { + description = "A library for reading and writing gif images"; branch = "4.1"; - platforms = stdenv.lib.platforms.unix; + license = licenses.mit; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/gio-sharp/default.nix b/pkgs/development/libraries/gio-sharp/default.nix index 804da49fda93..b0a115eb4a51 100644 --- a/pkgs/development/libraries/gio-sharp/default.nix +++ b/pkgs/development/libraries/gio-sharp/default.nix @@ -23,6 +23,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "GIO API bindings"; + homepage = https://github.com/mono/gio-sharp; + license = licenses.mit; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/gnet/default.nix b/pkgs/development/libraries/gnet/default.nix index c9431420194a..0b2fb9fef6c3 100644 --- a/pkgs/development/libraries/gnet/default.nix +++ b/pkgs/development/libraries/gnet/default.nix @@ -17,6 +17,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A network library, written in C, object-oriented, and built upon GLib"; homepage = https://developer.gnome.org/gnet/; + license = licenses.lgpl2; platforms = platforms.linux; maintainers = with maintainers; [ pSub ]; }; diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix index fc1f186a219e..7f680b6b59bf 100644 --- a/pkgs/development/libraries/grpc/default.nix +++ b/pkgs/development/libraries/grpc/default.nix @@ -9,6 +9,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags ]; + cmakeFlags = [ "-DgRPC_ZLIB_PROVIDER=package" "-DgRPC_CARES_PROVIDER=package" @@ -16,11 +17,19 @@ stdenv.mkDerivation rec { "-DgRPC_PROTOBUF_PROVIDER=package" "-DgRPC_GFLAGS_PROVIDER=package" ]; + + # CMake creates a build directory by default, this conflicts with the + # basel BUILD file on case-insensitive filesystems. + preConfigure = '' + rm -vf BUILD + ''; + enableParallelBuilds = true; meta = with stdenv.lib; { description = "The C based gRPC (C++, Python, Ruby, Objective-C, PHP, C#)"; license = licenses.asl20; + maintainers = [ maintainers.lnl7 ]; homepage = https://grpc.io/; }; } diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix index a384e46fb147..4bf42e1b5b65 100644 --- a/pkgs/development/libraries/gtk+/2.x.nix +++ b/pkgs/development/libraries/gtk+/2.x.nix @@ -2,7 +2,7 @@ , gdk_pixbuf, xlibsWrapper, gobjectIntrospection , xineramaSupport ? stdenv.isLinux , cupsSupport ? true, cups ? null -, gdktarget ? "x11" +, gdktarget ? if stdenv.isDarwin then "quartz" else "x11" , AppKit, Cocoa , fetchpatch }: diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index 21f9adfdc8e3..27052d1922f6 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -1,10 +1,11 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, gettext, perl, makeWrapper, shared-mime-info , expat, glib, cairo, pango, gdk_pixbuf, atk, at-spi2-atk, gobjectIntrospection -, xorg, epoxy, json-glib, libxkbcommon, gmp +, xorg, epoxy, json-glib, libxkbcommon, gmp, gnome3 +, x11Support ? stdenv.isLinux , waylandSupport ? stdenv.isLinux, mesa_noglu, wayland, wayland-protocols , xineramaSupport ? stdenv.isLinux , cupsSupport ? stdenv.isLinux, cups ? null -, darwin, gnome3 +, AppKit, Cocoa }: assert cupsSupport -> cups != null; @@ -36,12 +37,13 @@ stdenv.mkDerivation rec { }) ]; - buildInputs = [ libxkbcommon epoxy json-glib ]; + buildInputs = [ libxkbcommon epoxy json-glib ] + ++ optional stdenv.isDarwin AppKit; propagatedBuildInputs = with xorg; with stdenv.lib; [ expat glib cairo pango gdk_pixbuf atk at-spi2-atk gnome3.gsettings-desktop-schemas libXrandr libXrender libXcomposite libXi libXcursor libSM libICE ] + ++ optional stdenv.isDarwin Cocoa # explicitly propagated, always needed ++ optionals waylandSupport [ mesa_noglu wayland wayland-protocols ] - ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ AppKit Cocoa ]) ++ optional xineramaSupport libXinerama ++ optional cupsSupport cups; #TODO: colord? @@ -55,9 +57,9 @@ stdenv.mkDerivation rec { "--disable-debug" "--disable-dependency-tracking" "--disable-glibtest" - "--with-gdktarget=quartz" + ] ++ optional (stdenv.isDarwin && !x11Support) "--enable-quartz-backend" - ] ++ optional stdenv.isLinux [ + ++ optional x11Support [ "--enable-x11-backend" ] ++ optional waylandSupport [ "--enable-wayland-backend" diff --git a/pkgs/development/libraries/indicator-application/gtk3.nix b/pkgs/development/libraries/indicator-application/gtk3.nix index 3d7c20691ab5..023572976351 100644 --- a/pkgs/development/libraries/indicator-application/gtk3.nix +++ b/pkgs/development/libraries/indicator-application/gtk3.nix @@ -1,39 +1,30 @@ -{ stdenv, fetchurl, lib, file -, pkgconfig, autoconf +{ stdenv, fetchbzr +, pkgconfig, systemd, autoreconfHook , glib, dbus-glib, json-glib , gtk3, libindicator-gtk3, libdbusmenu-gtk3, libappindicator-gtk3 }: -with lib; - stdenv.mkDerivation rec { - name = "indicator-application-gtk3-${version}"; - version = "${versionMajor}.${versionMinor}"; - versionMajor = "12.10"; - versionMinor = "0"; - - src = fetchurl { - url = "${meta.homepage}/${versionMajor}/${version}/+download/indicator-application-${version}.tar.gz"; - sha256 = "1z8ar0k47l4his7zvffbc2kn658nid51svqnfv0dms601w53gbpr"; + pname = "indicator-application"; + version = "12.10.1"; + + name = "${pname}-gtk3-${version}"; + + src = fetchbzr { + url = "https://code.launchpad.net/~indicator-applet-developers/${pname}/trunk.17.04"; + rev = "260"; + sha256 = "1f0jdyqqb5g86zdpbcyn16x94yjigsfiv2kf73dvni5rp1vafbq1"; }; - nativeBuildInputs = [ pkgconfig autoconf ]; + nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ - glib dbus-glib json-glib + glib dbus-glib json-glib systemd gtk3 libindicator-gtk3 libdbusmenu-gtk3 libappindicator-gtk3 ]; postPatch = '' - substituteInPlace configure.ac \ - --replace 'DBUSSERVICEDIR=`$PKG_CONFIG --variable=session_bus_services_dir dbus-1`' \ - "DBUSSERVICEDIR=$out/share/dbus-1/services" - autoconf - for f in {configure,ltmain.sh,m4/libtool.m4}; do - substituteInPlace $f \ - --replace /usr/bin/file ${file}/bin/file - done - substituteInPlace src/Makefile.in \ - --replace 'applicationlibdir = $(INDICATORDIR)' "applicationlibdir = $out/lib" + substituteInPlace data/Makefile.am \ + --replace "/etc/xdg/autostart" "$out/etc/xdg/autostart" ''; configureFlags = [ @@ -47,7 +38,16 @@ stdenv.mkDerivation rec { "localstatedir=\${TMPDIR}" ]; - meta = { + PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "$(out)/lib/systemd/user"; + PKG_CONFIG_INDICATOR3_0_4_INDICATORDIR = "$(out)/lib/indicators3/7/"; + + # Upstart is not used in NixOS + postFixup = '' + rm -rf $out/share/indicator-application/upstart + rm -rf $out/share/upstart + ''; + + meta = with stdenv.lib; { description = "Indicator to take menus from applications and place them in the panel"; homepage = https://launchpad.net/indicator-application; license = licenses.gpl3; diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh index 1d389f914ddf..48f009f8d3e0 100644 --- a/pkgs/development/libraries/kde-frameworks/fetch.sh +++ b/pkgs/development/libraries/kde-frameworks/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/frameworks/5.48/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/frameworks/5.49/ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix index 1ad2254ccf89..4f866974b61b 100644 --- a/pkgs/development/libraries/kde-frameworks/srcs.nix +++ b/pkgs/development/libraries/kde-frameworks/srcs.nix @@ -3,627 +3,627 @@ { attica = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/attica-5.48.0.tar.xz"; - sha256 = "1q2133gmhfi3wd9978556syzzqc1s6zgjc0p1353w6dmfwxfyzq8"; - name = "attica-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/attica-5.49.0.tar.xz"; + sha256 = "1iqclahs9yzyjnkzbzr8hl9j6q8m2djdm6mix92xwrakgirnl3gn"; + name = "attica-5.49.0.tar.xz"; }; }; baloo = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/baloo-5.48.0.tar.xz"; - sha256 = "0rgz2gx99c1k8vgfskx7w6q1sjf98wcvybv88djdlj2s6h2qn8lj"; - name = "baloo-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/baloo-5.49.0.tar.xz"; + sha256 = "0xj12v0k58sr3snxyj4vx7dqhinrvk6qm0ikymscqgbmw9ijwxph"; + name = "baloo-5.49.0.tar.xz"; }; }; bluez-qt = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/bluez-qt-5.48.0.tar.xz"; - sha256 = "149px5gnplk0y7cl3cz258qks3rq5p0kkk9rc48y59zvlxiyy949"; - name = "bluez-qt-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/bluez-qt-5.49.0.tar.xz"; + sha256 = "0mgnq7w52ksr8b7ys2f1m3irnviy011bsaggh489fjy0xlzk5ard"; + name = "bluez-qt-5.49.0.tar.xz"; }; }; breeze-icons = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/breeze-icons-5.48.0.tar.xz"; - sha256 = "1p0krrxfz6p0qhy79lnjyi0xsrprw1q4z65xah89kj0wmfriiyqh"; - name = "breeze-icons-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/breeze-icons-5.49.0.tar.xz"; + sha256 = "178620hhqlv6dl8qal2bmiw55s8b3p4h16q8cgkmq5q5i59nzcph"; + name = "breeze-icons-5.49.0.tar.xz"; }; }; extra-cmake-modules = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/extra-cmake-modules-5.48.0.tar.xz"; - sha256 = "1675xnc9hv8z8gp95ici2zqmbv7i6f65g0kln4fskxmlxnfplnzw"; - name = "extra-cmake-modules-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/extra-cmake-modules-5.49.0.tar.xz"; + sha256 = "07pdgjyrxniacqcfvrzw8ij3kasx5pkbq38k6491qbhzfm8vi7y0"; + name = "extra-cmake-modules-5.49.0.tar.xz"; }; }; frameworkintegration = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/frameworkintegration-5.48.0.tar.xz"; - sha256 = "1na913ndc55nlmfc61122b1p29h4prxnpc5pqvh6drsgfyacnm8y"; - name = "frameworkintegration-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/frameworkintegration-5.49.0.tar.xz"; + sha256 = "1ni4jrny630zf3zwmqbm8z7dqgiar58992lylfv7kspdg5crcgfx"; + name = "frameworkintegration-5.49.0.tar.xz"; }; }; kactivities = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kactivities-5.48.0.tar.xz"; - sha256 = "1zxdzwz8j43hh8d7v1qfihf95kwxvsbqki0zgdhlnj7s0xds0yz8"; - name = "kactivities-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kactivities-5.49.0.tar.xz"; + sha256 = "117f3zrdbs0pa10wn7vy691n02m01h6x4pm8m1q3f4pjm0k4kqim"; + name = "kactivities-5.49.0.tar.xz"; }; }; kactivities-stats = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kactivities-stats-5.48.0.tar.xz"; - sha256 = "11r61qnrjpc4ls18apb4a13j1lizjq48bxfw3f8p8hjxxxh8z0j6"; - name = "kactivities-stats-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kactivities-stats-5.49.0.tar.xz"; + sha256 = "129z2m5330j0l1nw8g3qjib60xmx54c6d2g9vnp4w8z0agnihs5f"; + name = "kactivities-stats-5.49.0.tar.xz"; }; }; kapidox = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kapidox-5.48.0.tar.xz"; - sha256 = "1b22np0lygnm2r2q1anh0f4b7dh2h0lccx767g4r2w0fw5r1bbb4"; - name = "kapidox-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kapidox-5.49.0.tar.xz"; + sha256 = "09jph3hvasqx1ia0l7is9brc08nxvh9qmg8564nh5cmqaxdwj559"; + name = "kapidox-5.49.0.tar.xz"; }; }; karchive = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/karchive-5.48.0.tar.xz"; - sha256 = "10qbx8k1yqqfp1pq5yj8ln3gpj2wnfnlln99gczf99f51fqd65p6"; - name = "karchive-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/karchive-5.49.0.tar.xz"; + sha256 = "1p1gwqda2bsjdysp4ggwdsldbasyfl075xn3wchqyakdv2bdzmn0"; + name = "karchive-5.49.0.tar.xz"; }; }; kauth = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kauth-5.48.0.tar.xz"; - sha256 = "00mpbs24dm9ycabpcm2wwlv1vdq4dq5qr2zw6bbqpgj3jplakbs7"; - name = "kauth-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kauth-5.49.0.tar.xz"; + sha256 = "0qg3zwg3kfx2snmvsw4ixr0qds7bd7992dxggvi9dcny7dm9q0n8"; + name = "kauth-5.49.0.tar.xz"; }; }; kbookmarks = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kbookmarks-5.48.0.tar.xz"; - sha256 = "11ics7gbdkx1f0pxryf2xwjq4fyqh6a3gzcizymm1m7gmygggqar"; - name = "kbookmarks-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kbookmarks-5.49.0.tar.xz"; + sha256 = "0clmfdcc1fc98q3vbfjf8x140a6df88ixhz0mny3dpv1wcr5cz53"; + name = "kbookmarks-5.49.0.tar.xz"; }; }; kcmutils = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kcmutils-5.48.0.tar.xz"; - sha256 = "0nvlzvv2gmc2hz11w6bixz4mccnj09g69byrnvsrwh0psf1kqlmw"; - name = "kcmutils-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kcmutils-5.49.0.tar.xz"; + sha256 = "0xv899p9f0hj6hd089mhn910qn66bihzpaa11ikrhbimckw8g19q"; + name = "kcmutils-5.49.0.tar.xz"; }; }; kcodecs = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kcodecs-5.48.0.tar.xz"; - sha256 = "1pz0s3krb4vv01hvpjdr5ngnw1ndxgsfln944fm9pfj0pmk7p92n"; - name = "kcodecs-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kcodecs-5.49.0.tar.xz"; + sha256 = "07va63gsfjrc5ha9rdli923cwyzxpb3v8xgf1zfhw75cfkgda3nz"; + name = "kcodecs-5.49.0.tar.xz"; }; }; kcompletion = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kcompletion-5.48.0.tar.xz"; - sha256 = "129mmh46y0r6dcnbxf5yswsr48qj5l25n930nlx7wzaav28y55lp"; - name = "kcompletion-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kcompletion-5.49.0.tar.xz"; + sha256 = "16br6wnqzndk8v41im23h2ww4hypi2i1qfg6m9c49mpxflgmspbi"; + name = "kcompletion-5.49.0.tar.xz"; }; }; kconfig = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kconfig-5.48.0.tar.xz"; - sha256 = "1g640cnd9j2jp35bb5zgjfxskbg3fj9p03r0yf3dkm1d1681x9a3"; - name = "kconfig-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kconfig-5.49.0.tar.xz"; + sha256 = "0cb3crnlr8hr5npq3ykfxqd4yckmkykzrrizfs89ryhmznc2ngsf"; + name = "kconfig-5.49.0.tar.xz"; }; }; kconfigwidgets = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kconfigwidgets-5.48.0.tar.xz"; - sha256 = "0xlnbw34zbmy7fwsi9iks4iv7shki4fqs7wd3yblmyxa2l18ldh9"; - name = "kconfigwidgets-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kconfigwidgets-5.49.0.tar.xz"; + sha256 = "1nqcrqr67m3kvq2r83x45zcdghk12bas9fp0s43s68imrhy5xikz"; + name = "kconfigwidgets-5.49.0.tar.xz"; }; }; kcoreaddons = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kcoreaddons-5.48.0.tar.xz"; - sha256 = "157k4l67iswny5krinfigfc6pabqfyfzya6hc5gcjrdplmnccy1f"; - name = "kcoreaddons-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kcoreaddons-5.49.0.tar.xz"; + sha256 = "00s22jvbwav20cidnp8v9fgc6pqbp4wnqkb2spv18mjhg4pv3bqj"; + name = "kcoreaddons-5.49.0.tar.xz"; }; }; kcrash = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kcrash-5.48.0.tar.xz"; - sha256 = "0qqwdx7piz4wfm4lh41kknfcyw5saw17qh07ghhi7j80whpkazk8"; - name = "kcrash-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kcrash-5.49.0.tar.xz"; + sha256 = "0xmr9rrl0xahpnq1rw4bbar1nbr21x2bk4hhv79la6dsg9ha25b3"; + name = "kcrash-5.49.0.tar.xz"; }; }; kdbusaddons = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kdbusaddons-5.48.0.tar.xz"; - sha256 = "0vpd4cij52v43fsifbk3nnmi5csik8h4avima6jw0b09s8xdz8rr"; - name = "kdbusaddons-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kdbusaddons-5.49.0.tar.xz"; + sha256 = "1fnmrrffp3kfwyjfzqkzlizflpyqgzbjljb51ppmdypcq8wy9ibh"; + name = "kdbusaddons-5.49.0.tar.xz"; }; }; kdeclarative = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kdeclarative-5.48.0.tar.xz"; - sha256 = "09nfp6vrj6dc3kfknicr8629ifz976wi4wxdh5bfx15z9296l8pd"; - name = "kdeclarative-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kdeclarative-5.49.0.tar.xz"; + sha256 = "0kgawb8wfx4snk2ckwxj0hmpgcvq3k1zpsxqdawi4cmsy4bxzfs9"; + name = "kdeclarative-5.49.0.tar.xz"; }; }; kded = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kded-5.48.0.tar.xz"; - sha256 = "13527iv6cf44wgxpqfhmkhryihjfi02fi78lf2bnvgwmhd2nl954"; - name = "kded-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kded-5.49.0.tar.xz"; + sha256 = "1l6hs3spbs3618jwg3n7r3hrrkqxmmd43f0km8849x4641p72zyc"; + name = "kded-5.49.0.tar.xz"; }; }; kdelibs4support = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/portingAids/kdelibs4support-5.48.0.tar.xz"; - sha256 = "058s5h6sfhi1i3pa59hwpyxzd01jgpb8r68nnbphmryimi5nazqf"; - name = "kdelibs4support-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/portingAids/kdelibs4support-5.49.0.tar.xz"; + sha256 = "1cz70c77l66lbw4fbgmfbq1fldybqxsiay2pg9risgqp3ra8wahi"; + name = "kdelibs4support-5.49.0.tar.xz"; }; }; kdesignerplugin = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kdesignerplugin-5.48.0.tar.xz"; - sha256 = "1kswvxgjpyi1p1kg4z5x5df8yqhrwhcpavzx4a83dg6hp5xk0l2l"; - name = "kdesignerplugin-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kdesignerplugin-5.49.0.tar.xz"; + sha256 = "0hj4ng0i22rvw4kl0irhqhww3kvn4c0pncn38w1j5vim4gxv0xcd"; + name = "kdesignerplugin-5.49.0.tar.xz"; }; }; kdesu = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kdesu-5.48.0.tar.xz"; - sha256 = "14ka3h06xbfv357z29zgbwnjcfwspi42f0fm3m7lszqhz9skj4v5"; - name = "kdesu-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kdesu-5.49.0.tar.xz"; + sha256 = "1gwvby51qqbkrs2vjpnplxr6m6xa5ddfdjs1iygh8kpqsh8a765k"; + name = "kdesu-5.49.0.tar.xz"; }; }; kdewebkit = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kdewebkit-5.48.0.tar.xz"; - sha256 = "0wf2prv85sayz1mqq0ymrqw3p0f3ikakhgzy01pixrp7qgwqkkrv"; - name = "kdewebkit-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kdewebkit-5.49.0.tar.xz"; + sha256 = "05idyw94ayjh7qdia9pnjmx29r5lsch421kv8h5ivr7ixcbrgk6n"; + name = "kdewebkit-5.49.0.tar.xz"; }; }; kdnssd = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kdnssd-5.48.0.tar.xz"; - sha256 = "01hra59b0sm82j7ry78f3clrypc80q59vx9h0ahacbab4pzq41p5"; - name = "kdnssd-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kdnssd-5.49.0.tar.xz"; + sha256 = "1n61id2x1iianshg8g6fw389mqihz4h8sj9hnng7cdg4csh72ffr"; + name = "kdnssd-5.49.0.tar.xz"; }; }; kdoctools = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kdoctools-5.48.0.tar.xz"; - sha256 = "0v8x198kfgz2p56nyy9cb6lks5yazdbdg55c4ps5bw36dbmpd3v8"; - name = "kdoctools-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kdoctools-5.49.0.tar.xz"; + sha256 = "1dmpk453s71ls0q8hgpqqd5dcr7zlimf5wykizcy2wn7p77gzsgl"; + name = "kdoctools-5.49.0.tar.xz"; }; }; kemoticons = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kemoticons-5.48.0.tar.xz"; - sha256 = "166sjwrn9dm4km8sypdwcfsylcamhl1gfl28h8hrv498zhnyrfb9"; - name = "kemoticons-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kemoticons-5.49.0.tar.xz"; + sha256 = "0mz9hkhnprjbrfq54mqcvj8w87h025785m1bas80brsqzvni5krn"; + name = "kemoticons-5.49.0.tar.xz"; }; }; kfilemetadata = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kfilemetadata-5.48.0.tar.xz"; - sha256 = "0krn53a2s950fb980gdap5hwf994kxfd4h8zk7a4s9cick957z5f"; - name = "kfilemetadata-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kfilemetadata-5.49.0.tar.xz"; + sha256 = "045k1mgn8kg0qfsr5sl1499nzhzmbcvrqc205pmq6sh4r14nvk80"; + name = "kfilemetadata-5.49.0.tar.xz"; }; }; kglobalaccel = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kglobalaccel-5.48.0.tar.xz"; - sha256 = "15dlpm69d38bsgl6hc7f1mjjq8qyxac010whx4rcsk4vsrwdfnm7"; - name = "kglobalaccel-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kglobalaccel-5.49.0.tar.xz"; + sha256 = "1fk7wazfwr7smqiym3phm5yvw6cmiczag52y1vad8fgb3izd6zhl"; + name = "kglobalaccel-5.49.0.tar.xz"; }; }; kguiaddons = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kguiaddons-5.48.0.tar.xz"; - sha256 = "0viqq9qg448fh12isc1kkmzcnnsjqw5fx4wlshyza19gfr4ym0dz"; - name = "kguiaddons-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kguiaddons-5.49.0.tar.xz"; + sha256 = "1zkjd3l5pyvvilcc9lbdgqaxnpvh586yf0cndl90h3x89hy1d4xk"; + name = "kguiaddons-5.49.0.tar.xz"; }; }; kholidays = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kholidays-5.48.0.tar.xz"; - sha256 = "04vjp2jm2c6qgj50jbqkkgqh8b759pd4dpsczfkyq30p03vybxr4"; - name = "kholidays-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kholidays-5.49.0.tar.xz"; + sha256 = "0yc4i4qsk3w1v0andw737ps1ad70696q140k0ycfhk6qmv1wvsdp"; + name = "kholidays-5.49.0.tar.xz"; }; }; khtml = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/portingAids/khtml-5.48.0.tar.xz"; - sha256 = "1zrilnvvvvjq82hm6gbh5pvzfygy8w7a0140d3l74jjgy01394m1"; - name = "khtml-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/portingAids/khtml-5.49.0.tar.xz"; + sha256 = "0k9m2pgq64grmgc6ywpzfnn65h8wfkkiwjbmz2mwbf2yi9c1ky64"; + name = "khtml-5.49.0.tar.xz"; }; }; ki18n = { - version = "5.48.1"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/ki18n-5.48.1.tar.xz"; - sha256 = "0m9x6bagviqrnm0hx7ykggqiykxv3qi11bmi0xz2f02y78q89f3h"; - name = "ki18n-5.48.1.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/ki18n-5.49.0.tar.xz"; + sha256 = "1i4rdrxann45zl6fkmfd1b96q52g0mpc5x19fx9h80crapkm8jjz"; + name = "ki18n-5.49.0.tar.xz"; }; }; kiconthemes = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kiconthemes-5.48.0.tar.xz"; - sha256 = "1xqbg10qlk1zdha4kfyya1471r35gnz63iyj0ks3gzyfjvbivpy4"; - name = "kiconthemes-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kiconthemes-5.49.0.tar.xz"; + sha256 = "1f7pk6smi2f0mm7jkrw5ymmkhd9gi8vnmppyblp1v3pvmy571c2m"; + name = "kiconthemes-5.49.0.tar.xz"; }; }; kidletime = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kidletime-5.48.0.tar.xz"; - sha256 = "184b1qdh4bwsdg9lyl4d8rcs833fqcmfvbb5qmdd3mqvvg8xv9mm"; - name = "kidletime-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kidletime-5.49.0.tar.xz"; + sha256 = "1fd02anlmaa0hnnp5q1s9973m3asy56qppwq1va1g6ga3csv3wrv"; + name = "kidletime-5.49.0.tar.xz"; }; }; kimageformats = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kimageformats-5.48.0.tar.xz"; - sha256 = "1myxp583gw5d50ddkkv6ipbdzf6k3sdk9gambklay1dzmy4b91sc"; - name = "kimageformats-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kimageformats-5.49.0.tar.xz"; + sha256 = "1q7019gbk59fwampna1ayjvw016c0q79hmldpaqh3xa9sh082wy4"; + name = "kimageformats-5.49.0.tar.xz"; }; }; kinit = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kinit-5.48.0.tar.xz"; - sha256 = "08sf3j1bpxzqjim777d6znn8f7rzs5vpm4wz21s1ng3f32z2km9a"; - name = "kinit-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kinit-5.49.0.tar.xz"; + sha256 = "1rq9b59gdgcpvwd694l8h55sqahpdaky0n7ag5psjlfn5myf1d95"; + name = "kinit-5.49.0.tar.xz"; }; }; kio = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kio-5.48.0.tar.xz"; - sha256 = "0am03nwbfidb5dxs8j8qaan4mcs7xv75sk135rslwfp5q56v1fa0"; - name = "kio-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kio-5.49.0.tar.xz"; + sha256 = "0rrsg3g1b204cdp58vxd5dig1ggwyvk1382p1c86vn6w8qbrq27k"; + name = "kio-5.49.0.tar.xz"; }; }; kirigami2 = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kirigami2-5.48.0.tar.xz"; - sha256 = "0f01rnzzv2w7mmb0war8kph46c3wbdbz7s9i6rwh6g7kg6zvzn52"; - name = "kirigami2-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kirigami2-5.49.0.tar.xz"; + sha256 = "1wan9h7kvjzvyzfjfjd512lxiac5prhs493xjqwxgags6kxwglaz"; + name = "kirigami2-5.49.0.tar.xz"; }; }; kitemmodels = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kitemmodels-5.48.0.tar.xz"; - sha256 = "13b0fqy4yg4zahqq8376gnna36mfg94yb5d1fz0cgw7fk9d920gf"; - name = "kitemmodels-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kitemmodels-5.49.0.tar.xz"; + sha256 = "1frha301540js45mrxiw034m9b2rwsa56xphkqn6cm4jmn48qdjg"; + name = "kitemmodels-5.49.0.tar.xz"; }; }; kitemviews = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kitemviews-5.48.0.tar.xz"; - sha256 = "0cdyw0gy67yhhxv44j1bhhd4qnj7rwi0fjzf275532bf3js1j12w"; - name = "kitemviews-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kitemviews-5.49.0.tar.xz"; + sha256 = "1aj605q2p72w4rb9i0f2xb93bn5xfjq9sl5i4h6rqflcvvy7qpdp"; + name = "kitemviews-5.49.0.tar.xz"; }; }; kjobwidgets = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kjobwidgets-5.48.0.tar.xz"; - sha256 = "0a5awpbka6mk4r4m5if7s9i5ybysykpcmlj69liabzcv0k1x5y6w"; - name = "kjobwidgets-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kjobwidgets-5.49.0.tar.xz"; + sha256 = "04i5cvbxii7n0jr3ai1dh44miqbdkxb6an5w8s7qvkv0xmkml35g"; + name = "kjobwidgets-5.49.0.tar.xz"; }; }; kjs = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/portingAids/kjs-5.48.0.tar.xz"; - sha256 = "0ysbf6m63cw2iywwr7p5ngsh7s7ml9sc1sqkhnbh7racn0pzc1l4"; - name = "kjs-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/portingAids/kjs-5.49.0.tar.xz"; + sha256 = "057ikyi4wffjvxdyk08hmj7h8vmbwbcxv98apmjzgsd611zvx5p0"; + name = "kjs-5.49.0.tar.xz"; }; }; kjsembed = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/portingAids/kjsembed-5.48.0.tar.xz"; - sha256 = "0j74g3xb23k55pixk76z2ib6yyc7f2iwvwqvvw1f907rn43g6qqx"; - name = "kjsembed-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/portingAids/kjsembed-5.49.0.tar.xz"; + sha256 = "0qddjkfm6f0f5dynqvi3l23mgyfdbk4xzg967sj3a2qlq423ah0m"; + name = "kjsembed-5.49.0.tar.xz"; }; }; kmediaplayer = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/portingAids/kmediaplayer-5.48.0.tar.xz"; - sha256 = "1kw35c5dmwsrkinfgmylzgvw3zcg0yimlfcl52bhdg0x7sgdbjkq"; - name = "kmediaplayer-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/portingAids/kmediaplayer-5.49.0.tar.xz"; + sha256 = "0hbx48ivj4i96yagd9n9vd22ycsljrvijm6nfms4x7z7jr49flrx"; + name = "kmediaplayer-5.49.0.tar.xz"; }; }; knewstuff = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/knewstuff-5.48.0.tar.xz"; - sha256 = "0g2sxk6wqqgynmqgz6jxknlrsmpj4y94cn7vpw84isd9brsr5hfv"; - name = "knewstuff-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/knewstuff-5.49.0.tar.xz"; + sha256 = "1vhcl2z9rcqg8390l1cwn3yyi1n17pn6mn8fsplp25qhzimb8bmk"; + name = "knewstuff-5.49.0.tar.xz"; }; }; knotifications = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/knotifications-5.48.0.tar.xz"; - sha256 = "11p03jgkw8zvfsal6q3yxz5shkpxiknnryw2a120sjmsab87imzb"; - name = "knotifications-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/knotifications-5.49.0.tar.xz"; + sha256 = "10481j2irlqhqd16xi412xbglnyjl0ndanlv9s0d3fxirs95zdd9"; + name = "knotifications-5.49.0.tar.xz"; }; }; knotifyconfig = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/knotifyconfig-5.48.0.tar.xz"; - sha256 = "1rlzmp1lzrniav2d5sjzh43mdm47i5dpa2rlsqppqq5887wjphcm"; - name = "knotifyconfig-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/knotifyconfig-5.49.0.tar.xz"; + sha256 = "09v4aq5x98sqg2awhw0n0y0rnjkr77kbf51xij0fiykd4llp9lfa"; + name = "knotifyconfig-5.49.0.tar.xz"; }; }; kpackage = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kpackage-5.48.0.tar.xz"; - sha256 = "18q6gp1gmzjyid803j7mcm9dbqg4bcd059qlp6sb6rkllygv4pcr"; - name = "kpackage-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kpackage-5.49.0.tar.xz"; + sha256 = "1xbfjwxb4gff8gg0hs5m9s0jcnzqk27rs2jr71g5ckhvs5psnkcd"; + name = "kpackage-5.49.0.tar.xz"; }; }; kparts = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kparts-5.48.0.tar.xz"; - sha256 = "1p4xdrxfvq5xj17zf8gfxc0c9lryp8n9ahinardlb3rnb1wcw4hv"; - name = "kparts-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kparts-5.49.0.tar.xz"; + sha256 = "0zdz0byj0gsbgb007y8x37w8yf1gkw6dsp2s9bbdc4w6h9ipdj2k"; + name = "kparts-5.49.0.tar.xz"; }; }; kpeople = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kpeople-5.48.0.tar.xz"; - sha256 = "1gddld3phsqknm3x0k0wnhgqid5dqsqbw06v91vbl8746np04zf7"; - name = "kpeople-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kpeople-5.49.0.tar.xz"; + sha256 = "0i5pd1d2jphsvpc3dpdw28dsdal1qrnnrx3k6qx4wax3f8ph5khv"; + name = "kpeople-5.49.0.tar.xz"; }; }; kplotting = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kplotting-5.48.0.tar.xz"; - sha256 = "17f78wppaj433x6fm108z5zw849qvnjsxisa92rxmkm9c64wzijg"; - name = "kplotting-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kplotting-5.49.0.tar.xz"; + sha256 = "13fzqqkyxs4ja6n5yb9lc5jx4qpsmrbsiihnwrgj3lhpzhlr91n0"; + name = "kplotting-5.49.0.tar.xz"; }; }; kpty = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kpty-5.48.0.tar.xz"; - sha256 = "0ywkiw7gpqx7zrj6wrvfsn2sjkyxzsmqn8p91z0kz1s3id2s04fk"; - name = "kpty-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kpty-5.49.0.tar.xz"; + sha256 = "1pnj07079l6gkz6171fcvljh0dcdy9s77p1q0l9nnkknjbr102pg"; + name = "kpty-5.49.0.tar.xz"; }; }; kross = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/portingAids/kross-5.48.0.tar.xz"; - sha256 = "0zxhn8wai71ll1113k47xmcspbp16iz1rybm6m2qs6f4j5ghif8q"; - name = "kross-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/portingAids/kross-5.49.0.tar.xz"; + sha256 = "194zcf499fkwk3wcs3kc3l0fi9h8gn5yqh6gxrgiyn6iyy9a4qdz"; + name = "kross-5.49.0.tar.xz"; }; }; krunner = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/krunner-5.48.0.tar.xz"; - sha256 = "0mdwyvx656ba8pwvg4qw8jr268iffqrp9ipr28m71hkx0sh7k6hn"; - name = "krunner-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/krunner-5.49.0.tar.xz"; + sha256 = "02l5gch9hpag1q5ixnb541g7m9lx25pbggldpa8zykp63apyca19"; + name = "krunner-5.49.0.tar.xz"; }; }; kservice = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kservice-5.48.0.tar.xz"; - sha256 = "1r5d3cdvmbyqn8hm2hjalgg1ncnpdh1w7fd5rr0k97j5qj29ypis"; - name = "kservice-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kservice-5.49.0.tar.xz"; + sha256 = "1wwb6c6m8f3b16p47adkc05rrlszvvym7ckks5xp08s58pk1dm8z"; + name = "kservice-5.49.0.tar.xz"; }; }; ktexteditor = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/ktexteditor-5.48.0.tar.xz"; - sha256 = "1fnq6d3ky277rbg3ngq55gdswrgfxsn19c43s23xcbfaymmhapj7"; - name = "ktexteditor-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/ktexteditor-5.49.0.tar.xz"; + sha256 = "14iss8svx49vav0h2kg8vhv8g5hg4ky30s7049csfwz7xhp7jmcj"; + name = "ktexteditor-5.49.0.tar.xz"; }; }; ktextwidgets = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/ktextwidgets-5.48.0.tar.xz"; - sha256 = "0hf4rpnkc9qfpnpfm6bsrrjrvvkr6785pnakqyfbjcgbyavp58hg"; - name = "ktextwidgets-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/ktextwidgets-5.49.0.tar.xz"; + sha256 = "14gclshmpwmfwkp2hzlnf823pjjmknd9q0gdclsh3yy268c2rsw1"; + name = "ktextwidgets-5.49.0.tar.xz"; }; }; kunitconversion = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kunitconversion-5.48.0.tar.xz"; - sha256 = "0hipqjj82zkq8ysvg304m5jblxxrvjh8vfc3wgl93zvj0mwx06db"; - name = "kunitconversion-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kunitconversion-5.49.0.tar.xz"; + sha256 = "11jnqz218rga3f4ppf1d927c7qhh2qpghwjpsrnrxdkz5nrvnf79"; + name = "kunitconversion-5.49.0.tar.xz"; }; }; kwallet = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kwallet-5.48.0.tar.xz"; - sha256 = "047jp26igla05isq6hg5bq9l3xd3dfa3v8dq3rz4im7dwa10hshr"; - name = "kwallet-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kwallet-5.49.0.tar.xz"; + sha256 = "13bmks9jb3yhp6clv25qkqkrvbhfyk9z16laxsv79jdd82lxgn1z"; + name = "kwallet-5.49.0.tar.xz"; }; }; kwayland = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kwayland-5.48.0.tar.xz"; - sha256 = "1qcb2kg1a23fvl6i0xky6mzmn3f6pqkvpv0dy245bd01x7q4csg4"; - name = "kwayland-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kwayland-5.49.0.tar.xz"; + sha256 = "0d95l2i3j1xxkc15n57w4rhf3di02zna4zzn4gap9qdhfxlfbqi6"; + name = "kwayland-5.49.0.tar.xz"; }; }; kwidgetsaddons = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kwidgetsaddons-5.48.0.tar.xz"; - sha256 = "079f28ifadxhvk4miwlnhw3dvg7bmb6gjiqcg2w65bmp21rsywb7"; - name = "kwidgetsaddons-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kwidgetsaddons-5.49.0.tar.xz"; + sha256 = "1frgqz9njbc81pfy6gl6p0hyh1977lg31ynrx5wy7lg7fwaxwl92"; + name = "kwidgetsaddons-5.49.0.tar.xz"; }; }; kwindowsystem = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kwindowsystem-5.48.0.tar.xz"; - sha256 = "1b6cvx3yqkqmvji2y7ys421hmj98xhww1rlgphfdvrdaqzl4579n"; - name = "kwindowsystem-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kwindowsystem-5.49.0.tar.xz"; + sha256 = "175rzwrjndhawyy4x11lbihdr1r9gwxmxjpbz4x06hlz4g50wffp"; + name = "kwindowsystem-5.49.0.tar.xz"; }; }; kxmlgui = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kxmlgui-5.48.0.tar.xz"; - sha256 = "0n38bxxip1c4fgj00jvph98qhb11ifx40z4m0pjafm52bg0kaa2h"; - name = "kxmlgui-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kxmlgui-5.49.0.tar.xz"; + sha256 = "0wsgs5ya3wnc5cryi1r9i30sq8dnnhh15p02skdjlhwjfvdhxmfa"; + name = "kxmlgui-5.49.0.tar.xz"; }; }; kxmlrpcclient = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/kxmlrpcclient-5.48.0.tar.xz"; - sha256 = "0s0xrx2p0jngk83zb8zjn4vkwnj46wzbxzj904g71ca428nmfx40"; - name = "kxmlrpcclient-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/kxmlrpcclient-5.49.0.tar.xz"; + sha256 = "0l4jnvn7s77jkvd2z44mz24mfzcw499plms79j21pjryc88drh06"; + name = "kxmlrpcclient-5.49.0.tar.xz"; }; }; modemmanager-qt = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/modemmanager-qt-5.48.0.tar.xz"; - sha256 = "17pnzpv3g3g25vnh9jjjk3fk6i3lhk6icl56ifcsmpj09nlw41im"; - name = "modemmanager-qt-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/modemmanager-qt-5.49.0.tar.xz"; + sha256 = "1wf3v552vbr4kh2d770zn3yn0q3bqjqbfrvnf813mnld7961m7p2"; + name = "modemmanager-qt-5.49.0.tar.xz"; }; }; networkmanager-qt = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/networkmanager-qt-5.48.0.tar.xz"; - sha256 = "15qikndykampl63bnp6rik1vkmwpivqf1krbsb0r29fmwyzhy38v"; - name = "networkmanager-qt-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/networkmanager-qt-5.49.0.tar.xz"; + sha256 = "16pnd52m9srcb2ml3vc3kd9k1yak5rq09yci39qp7z5jbdy7jk2z"; + name = "networkmanager-qt-5.49.0.tar.xz"; }; }; oxygen-icons5 = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/oxygen-icons5-5.48.0.tar.xz"; - sha256 = "08y1gy2xgzby9wxbh90cfzly1aym9nym5r8m7z848a4v7chp0wpw"; - name = "oxygen-icons5-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/oxygen-icons5-5.49.0.tar.xz"; + sha256 = "0llx06sr36cd6vgkgm3jw6k4cv1cfx3r6x6lmb477wpahis0n75g"; + name = "oxygen-icons5-5.49.0.tar.xz"; }; }; plasma-framework = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/plasma-framework-5.48.0.tar.xz"; - sha256 = "1hl1q1v8kmq20bzm2bfrpjx1f1rljg2akib0sc65nw6vclrcgh82"; - name = "plasma-framework-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/plasma-framework-5.49.0.tar.xz"; + sha256 = "1yrccbkdpnfbgn7fzpmzzxm5c7fhkv1vqygq1f96r30fia0cj5jv"; + name = "plasma-framework-5.49.0.tar.xz"; }; }; prison = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/prison-5.48.0.tar.xz"; - sha256 = "04asjh9k6qhz6mzqvcw5famjh8fdfrjj5gwhar9lpzvl53k9236q"; - name = "prison-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/prison-5.49.0.tar.xz"; + sha256 = "0dppz9x6k84sl0aiyjlh3xigqgda64r8mij3bzxcdkv2wbc4ld9d"; + name = "prison-5.49.0.tar.xz"; }; }; purpose = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/purpose-5.48.0.tar.xz"; - sha256 = "015dcsz2pybfl13dq0fhja7j05bvchjd6bcwmniq8cwc2dg2qxyp"; - name = "purpose-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/purpose-5.49.0.tar.xz"; + sha256 = "014izz6vvk3vqw7s2qy33dqfflyylk8vqr9srkf391f6yfld9ygz"; + name = "purpose-5.49.0.tar.xz"; }; }; qqc2-desktop-style = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/qqc2-desktop-style-5.48.0.tar.xz"; - sha256 = "1wc4vxjipdw3zq1lqwz3s7f0gzrcvs8svy9ip5r40qcz2w55s4an"; - name = "qqc2-desktop-style-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/qqc2-desktop-style-5.49.0.tar.xz"; + sha256 = "1vbms7b8x1y7yh8im8dv1q3wwl3j2x4r47yqg86f28grw2r2n2zj"; + name = "qqc2-desktop-style-5.49.0.tar.xz"; }; }; solid = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/solid-5.48.0.tar.xz"; - sha256 = "0fy070kbqs9hvi1ngmqzfz8a9vnry0mrin51z1yfdc44806bk2ns"; - name = "solid-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/solid-5.49.0.tar.xz"; + sha256 = "1p7rdmf2f8520xc7zp7wxlcizyyjfxwq5mf95qsfpwc4dl0c43gp"; + name = "solid-5.49.0.tar.xz"; }; }; sonnet = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/sonnet-5.48.0.tar.xz"; - sha256 = "1mzl2a61jrqflnlkkrp079z428sf2bc811qwfx0rdh0jp7bc7sq4"; - name = "sonnet-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/sonnet-5.49.0.tar.xz"; + sha256 = "0m5pmka1hwjsg3c3qvx087z3fjrfw0ayk7ylgjls5iwd39kkl1b3"; + name = "sonnet-5.49.0.tar.xz"; }; }; syntax-highlighting = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/syntax-highlighting-5.48.0.tar.xz"; - sha256 = "03cfljg90iszpxmx6f0dv1w1r451yqzi9bk27x56s5xzsghj8bv5"; - name = "syntax-highlighting-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/syntax-highlighting-5.49.0.tar.xz"; + sha256 = "17rkgzkfiz5dv0xr67na7ikqszgwjnf2gc11b2h47qdsr7pgx95v"; + name = "syntax-highlighting-5.49.0.tar.xz"; }; }; threadweaver = { - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.48/threadweaver-5.48.0.tar.xz"; - sha256 = "0pks8sddqdhlcrqgb106b6jy0gh3gfcss2rdavqfck6d9780v125"; - name = "threadweaver-5.48.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.49/threadweaver-5.49.0.tar.xz"; + sha256 = "099bs429p71dzrqy25z61rvn48w3b73p7yag4q69jnxcpj0qcyz7"; + name = "threadweaver-5.49.0.tar.xz"; }; }; } diff --git a/pkgs/development/libraries/libdwarf/default.nix b/pkgs/development/libraries/libdwarf/default.nix index d043820aa083..649541e22627 100644 --- a/pkgs/development/libraries/libdwarf/default.nix +++ b/pkgs/development/libraries/libdwarf/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, libelf }: let - version = "20180527"; + version = "20180809"; src = fetchurl { url = "https://www.prevanders.net/libdwarf-${version}.tar.gz"; # Upstream displays this hash broken into three parts: diff --git a/pkgs/development/libraries/libguestfs/default.nix b/pkgs/development/libraries/libguestfs/default.nix index e9010852eb33..6001946cb970 100644 --- a/pkgs/development/libraries/libguestfs/default.nix +++ b/pkgs/development/libraries/libguestfs/default.nix @@ -11,11 +11,11 @@ assert javaSupport -> jdk != null; stdenv.mkDerivation rec { name = "libguestfs-${version}"; - version = "1.38.3"; + version = "1.38.4"; src = fetchurl { url = "http://libguestfs.org/download/1.38-stable/libguestfs-${version}.tar.gz"; - sha256 = "130nc9v9f8k5kwz9hzqd43fjxg01hl7jh0jw1fhs4ah5hmg71v34"; + sha256 = "1xsazw6yrbgmc647j8l896fzv534157sqmdzac09rxkxwiy0wm16"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libmbim/default.nix b/pkgs/development/libraries/libmbim/default.nix index 431770ef12d1..d07840977795 100644 --- a/pkgs/development/libraries/libmbim/default.nix +++ b/pkgs/development/libraries/libmbim/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, glib, python, udev, libgudev }: stdenv.mkDerivation rec { - name = "libmbim-1.16.0"; + name = "libmbim-1.16.2"; src = fetchurl { url = "https://www.freedesktop.org/software/libmbim/${name}.tar.xz"; - sha256 = "1hpsjc7bzmakzvj8z9fffvqknc38fa8ridpmklq46jyxxnz51jn8"; + sha256 = "0qmjvjbgs9m8qsaiq5arikzglgaas9hh1968bi7sy3905kp4yjgb"; }; outputs = [ "out" "dev" "man" ]; diff --git a/pkgs/development/libraries/libqmatrixclient/default.nix b/pkgs/development/libraries/libqmatrixclient/default.nix index d1dae0cfee6e..8cca5333d084 100644 --- a/pkgs/development/libraries/libqmatrixclient/default.nix +++ b/pkgs/development/libraries/libqmatrixclient/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { description= "A Qt5 library to write cross-platfrom clients for Matrix"; homepage = https://matrix.org/docs/projects/sdk/libqmatrixclient.html; license = licenses.lgpl21; - platforms = platforms.linux; + platforms = with platforms; linux ++ darwin; maintainers = with maintainers; [ peterhoeg ]; }; } diff --git a/pkgs/development/libraries/libqmi/default.nix b/pkgs/development/libraries/libqmi/default.nix index a0f5ac737679..5bfa1427ab65 100644 --- a/pkgs/development/libraries/libqmi/default.nix +++ b/pkgs/development/libraries/libqmi/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, glib, python, libgudev, libmbim }: stdenv.mkDerivation rec { - name = "libqmi-1.20.0"; + name = "libqmi-1.20.2"; src = fetchurl { url = "https://www.freedesktop.org/software/libqmi/${name}.tar.xz"; - sha256 = "1d3fca477sdwbv4bsq1cl98qc8sixrzp0gqjcmjj8mlwfk9qqhi1"; + sha256 = "0i6aw8jyxv84d5x8lj2g9lb8xxf1dyad8n3q0kw164pyig55jd67"; }; outputs = [ "out" "dev" "devdoc" ]; diff --git a/pkgs/development/libraries/librealsense/default.nix b/pkgs/development/libraries/librealsense/default.nix index 84fb600d88e3..ea24c9da88b9 100644 --- a/pkgs/development/libraries/librealsense/default.nix +++ b/pkgs/development/libraries/librealsense/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "librealsense-${version}"; - version = "2.14.1"; + version = "2.15.0"; src = fetchFromGitHub { owner = "IntelRealSense"; repo = "librealsense"; rev = "v${version}"; - sha256 = "1gxfnc1c87a3xfp0dpcp32jjjmxz7f9aw6jcda87lr2xvhpvq0n5"; + sha256 = "12918gcn0w5h6bqgx6s44w44bs1x2pcndn2833xzya69rddkdv6x"; }; buildInputs = [ diff --git a/pkgs/development/libraries/librelp/default.nix b/pkgs/development/libraries/librelp/default.nix index 083ea88301a6..521f963e277c 100644 --- a/pkgs/development/libraries/librelp/default.nix +++ b/pkgs/development/libraries/librelp/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, gnutls, zlib }: stdenv.mkDerivation rec { - name = "librelp-1.2.16"; + name = "librelp-1.2.17"; src = fetchurl { url = "http://download.rsyslog.com/librelp/${name}.tar.gz"; - sha256 = "0lzxc2ydjbbs50dalqp2s107ckp63arpk223cigasq0hl395s8qc"; + sha256 = "1w6blhfr3rlmvjj0fbr8rsycrkm5b92n44zaaijg1jnvxjfqpy0v"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix index 91d2851df2bb..e30f2b0af5d5 100644 --- a/pkgs/development/libraries/libressl/default.nix +++ b/pkgs/development/libraries/libressl/default.nix @@ -27,6 +27,7 @@ let meta = with lib; { description = "Free TLS/SSL implementation"; homepage = "https://www.libressl.org"; + license = with licenses; [ publicDomain bsdOriginal bsd0 bsd3 gpl3 isc ]; platforms = platforms.all; maintainers = with maintainers; [ thoughtpolice wkennington fpletz globin ]; }; diff --git a/pkgs/development/libraries/libsolv/default.nix b/pkgs/development/libraries/libsolv/default.nix index 9db56aa3a9ec..ad8120d3591a 100644 --- a/pkgs/development/libraries/libsolv/default.nix +++ b/pkgs/development/libraries/libsolv/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, cmake, ninja, zlib, expat, rpm, db }: stdenv.mkDerivation rec { - rev = "0.6.34"; + rev = "0.6.35"; name = "libsolv-${rev}"; src = fetchFromGitHub { inherit rev; owner = "openSUSE"; repo = "libsolv"; - sha256 = "1knr48dilg8kscbmpjvd7m2krvgcdq0f9vpbqcgmxxa969mzrcy7"; + sha256 = "0jx1bmwwhjwfidwa0hrarwpcrf4ic068kapd4vb9m5y7xd4l55nq"; }; cmakeFlags = [ diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix index 994d22846773..b3636eef2621 100644 --- a/pkgs/development/libraries/libtoxcore/default.nix +++ b/pkgs/development/libraries/libtoxcore/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, libsodium, ncurses, libopus, libmsgpack +{ stdenv, fetchFromGitHub, cmake, libsodium, ncurses, libopus, msgpack , libvpx, check, libconfig, pkgconfig }: let @@ -20,7 +20,7 @@ let ]; buildInputs = [ - libsodium libmsgpack ncurses libconfig + libsodium msgpack ncurses libconfig ] ++ stdenv.lib.optionals (!stdenv.isAarch32) [ libopus libvpx ]; diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 63f11daad288..4b104a04c15d 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -60,7 +60,9 @@ in stdenv.mkDerivation rec { --replace 'lxc_path,' '"/run/libvirt/nix-emulators/libvirt_lxc",' patchShebangs . # fixes /usr/bin/python references - ''; + substituteInPlace src/util/virjsoncompat.c --replace \ + '"libjansson.so.4"' '"${jansson}/lib/libjansson${stdenv.targetPlatform.extensions.sharedLibrary}"' + ''; configureFlags = [ "--localstatedir=/var" diff --git a/pkgs/development/libraries/libwps/default.nix b/pkgs/development/libraries/libwps/default.nix index 2f89c0abdfc6..b0449d8205d1 100644 --- a/pkgs/development/libraries/libwps/default.nix +++ b/pkgs/development/libraries/libwps/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libwps-${version}"; - version = "0.4.9"; + version = "0.4.10"; src = fetchurl { url = "mirror://sourceforge/libwps/${name}.tar.bz2"; - sha256 = "1wn5lvx7c9dp98d9akqjhkv5fk94725hbvqzbjpy1v8y4mm9knb6"; + sha256 = "1adx2wawl0i16p8df80m6k6a137h709ip4zc0zlzr6wal8gpn0i4"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/linbox/default.nix b/pkgs/development/libraries/linbox/default.nix index c4ff0e892a82..a9a649e2de76 100644 --- a/pkgs/development/libraries/linbox/default.nix +++ b/pkgs/development/libraries/linbox/default.nix @@ -4,7 +4,7 @@ , autoreconfHook , givaro , pkgconfig -, openblas +, blas , fflas-ffpack , gmpxx , optimize ? false # impure @@ -29,13 +29,13 @@ stdenv.mkDerivation rec { buildInputs = [ givaro - openblas + blas gmpxx fflas-ffpack ]; configureFlags = [ - "--with-blas-libs=-lopenblas" + "--with-blas-libs=-l${blas.linkName}" "--disable-optimization" ] ++ stdenv.lib.optionals (!optimize) [ # disable SIMD instructions (which are enabled *when available* by default) @@ -65,12 +65,14 @@ stdenv.mkDerivation rec { doCheck = true; + enableParallelBuilding = true; + meta = { inherit version; description = "C++ library for exact, high-performance linear algebra"; license = stdenv.lib.licenses.lgpl21Plus; maintainers = [stdenv.lib.maintainers.timokau]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; homepage = http://linalg.org/; }; } diff --git a/pkgs/development/libraries/lmdbxx/default.nix b/pkgs/development/libraries/lmdbxx/default.nix new file mode 100644 index 000000000000..34dfe26ad70b --- /dev/null +++ b/pkgs/development/libraries/lmdbxx/default.nix @@ -0,0 +1,26 @@ +{ stdenv +, fetchFromGitHub +, lmdb }: + +stdenv.mkDerivation rec { + name = "lmdbxx-${version}"; + version = "0.9.14.0"; + + src = fetchFromGitHub { + owner = "bendiken"; + repo = "lmdbxx"; + rev = "${version}"; + sha256 = "1jmb9wg2iqag6ps3z71bh72ymbcjrb6clwlkgrqf1sy80qwvlsn6"; + }; + + buildInputs = [ lmdb ]; + makeFlags = [ "PREFIX=$(out)" ]; + + meta = { + homepage = "https://github.com/bendiken/lmdbxx#readme"; + description = "C++11 wrapper for the LMDB embedded B+ tree database library"; + license = stdenv.lib.licenses.unlicense; + maintainers = with stdenv.lib.maintainers; [ fgaz ]; + }; +} + diff --git a/pkgs/development/libraries/libmsgpack/default.nix b/pkgs/development/libraries/msgpack/default.nix index 8feacd4e3653..bf51f8954025 100644 --- a/pkgs/development/libraries/libmsgpack/default.nix +++ b/pkgs/development/libraries/msgpack/default.nix @@ -1,12 +1,12 @@ { callPackage, fetchFromGitHub, ... } @ args: callPackage ./generic.nix (args // rec { - version = "2.1.5"; + version = "3.0.1"; src = fetchFromGitHub { owner = "msgpack"; repo = "msgpack-c"; rev = "cpp-${version}"; - sha256 = "0n4kvma3dldfsvv7b0zw23qln6av5im2aqqd6m890i75zwwkw0zv"; + sha256 = "0nr6y9v4xbvzv717j9w9lhmags1y2s5mq103v044qlyd2jkbg2p4"; }; }) diff --git a/pkgs/development/libraries/libmsgpack/generic.nix b/pkgs/development/libraries/msgpack/generic.nix index 947960d23592..67418b6666d4 100644 --- a/pkgs/development/libraries/libmsgpack/generic.nix +++ b/pkgs/development/libraries/msgpack/generic.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "libmsgpack-${version}"; + name = "msgpack-${version}"; inherit src patches; diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index 4e9dab79e4e9..3089e6da23ae 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -113,9 +113,10 @@ in stdenv.mkDerivation rec { rm -f "$out"/lib/*.a ''; - meta = { + meta = with stdenv.lib; { homepage = https://developer.mozilla.org/en-US/docs/NSS; description = "A set of libraries for development of security-enabled client and server applications"; - platforms = stdenv.lib.platforms.all; + license = licenses.mpl20; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/ntl/default.nix b/pkgs/development/libraries/ntl/default.nix index 96d3be41235a..63a51a90ccd2 100644 --- a/pkgs/development/libraries/ntl/default.nix +++ b/pkgs/development/libraries/ntl/default.nix @@ -14,16 +14,13 @@ assert withGf2x -> gf2x != null; stdenv.mkDerivation rec { name = "ntl-${version}"; - version = "11.2.1"; + version = "11.3.0"; + src = fetchurl { url = "http://www.shoup.net/ntl/ntl-${version}.tar.gz"; - sha256 = "04avzmqflx2a33n7v9jj32g83p7m6z712fg1mw308jk5ca2qp489"; + sha256 = "1pcib3vz1sdqlk0n561wbf7fwq44jm5cpx710w4vqljxgrjd7q1s"; }; - patchPhase = stdenv.lib.optionalString stdenv.isDarwin '' - substituteInPlace DoConfig --replace g++ c++ - ''; - buildInputs = [ gmp ]; @@ -51,6 +48,7 @@ stdenv.mkDerivation rec { else "generic" # "chooses options that should be OK for most platforms" }" + "CXX=c++" ] ++ lib.optionals withGf2x [ "NTL_GF2X_LIB=on" "GF2X_PREFIX=${gf2x}" @@ -66,6 +64,8 @@ stdenv.mkDerivation rec { length integers, and for vectors, matrices, and polynomials over the integers and over finite fields. ''; + # Upstream contact: maintainer is victorshoup on GitHub. Alternatively the + # email listed on the homepage. homepage = http://www.shoup.net/ntl/; maintainers = with maintainers; [ timokau ]; license = licenses.gpl2Plus; diff --git a/pkgs/development/libraries/opendht/default.nix b/pkgs/development/libraries/opendht/default.nix index 2bb82efb24ce..bd7d252e1a08 100644 --- a/pkgs/development/libraries/opendht/default.nix +++ b/pkgs/development/libraries/opendht/default.nix @@ -6,7 +6,7 @@ , pkgconfig , nettle , gnutls -, libmsgpack +, msgpack , readline , libargon2 }: @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { pkgconfig nettle gnutls - libmsgpack + msgpack readline libargon2 ]; diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix index 9ed555053e25..16e00e9f2b95 100644 --- a/pkgs/development/libraries/openldap/default.nix +++ b/pkgs/development/libraries/openldap/default.nix @@ -51,6 +51,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://www.openldap.org/; description = "An open source implementation of the Lightweight Directory Access Protocol"; + license = licenses.openldap; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 9f0c2b2a5b88..380c0c4af638 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -109,11 +109,12 @@ let fi ''; - meta = { + meta = with stdenv.lib; { homepage = https://www.openssl.org/; description = "A cryptographic library that implements the SSL and TLS protocols"; - platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.peti ]; + license = licenses.openssl; + platforms = platforms.all; + maintainers = [ maintainers.peti ]; priority = 10; # resolves collision with ‘man-pages’ }; }; diff --git a/pkgs/development/libraries/oracle-instantclient/default.nix b/pkgs/development/libraries/oracle-instantclient/default.nix index a4196e0dc9f0..0c05e2ec5f61 100644 --- a/pkgs/development/libraries/oracle-instantclient/default.nix +++ b/pkgs/development/libraries/oracle-instantclient/default.nix @@ -1,13 +1,15 @@ -{ stdenv, requireFile, autoPatchelfHook, unzip, libaio, makeWrapper, odbcSupport ? false, unixODBC }: +{ stdenv, requireFile, autoPatchelfHook, fixDarwinDylibNames, unzip, libaio, makeWrapper, odbcSupport ? false, unixODBC }: assert odbcSupport -> unixODBC != null; let + inherit (stdenv.lib) optional optionals optionalString; + baseVersion = "12.2"; version = "${baseVersion}.0.1.0"; requireSource = component: arch: version: rel: hash: (requireFile rec { - name = "instantclient-${component}-${arch}-${version}" + (stdenv.lib.optionalString (rel != "") "-${rel}") + ".zip"; + name = "instantclient-${component}-${arch}-${version}" + (optionalString (rel != "") "-${rel}") + ".zip"; url = "http://www.oracle.com/technetwork/database/database-technologies/instant-client/downloads/index.html"; sha256 = hash; }); @@ -24,37 +26,46 @@ let (requireSource "basic" arch version "" "5015e3c9fba84e009f7519893f798a1622c37d1ae2c55104ff502c52a0fe5194") (requireSource "sdk" arch version "" "7f404c3573c062ce487a51ac4cfe650c878d7edf8e73b364ec852645ed1098cb") (requireSource "sqlplus" arch version "" "d49b2bd97376591ca07e7a836278933c3f251875c215044feac73ba9f451dfc2") ] - ++ stdenv.lib.optional odbcSupport (requireSource "odbc" arch version "2" "365a4ae32c7062d9fbc3fb41add748e7881f774484a175a4b41a2c294ce9095d"); + ++ optional odbcSupport (requireSource "odbc" arch version "2" "365a4ae32c7062d9fbc3fb41add748e7881f774484a175a4b41a2c294ce9095d"); "x86_64-darwin" = [ (requireSource "basic" arch version "2" "3ed3102e5a24f0da638694191edb34933309fb472eb1df21ad5c86eedac3ebb9") (requireSource "sdk" arch version "2" "e0befca9c4e71ebc9f444957ffa70f01aeeec5976ea27c40406471b04c34848b") (requireSource "sqlplus" arch version "2" "d147cbb5b2a954fdcb4b642df4f0bd1153fd56e0f56e7fa301601b4f7e2abe0e") ] - ++ stdenv.lib.optional odbcSupport (requireSource "odbc" arch version "2" "1805c1ab6c8c5e8df7bdcc35d7f2b94c329ecf4dff9bde55d5f9b159ecd8b64e"); + ++ optional odbcSupport (requireSource "odbc" arch version "2" "1805c1ab6c8c5e8df7bdcc35d7f2b94c329ecf4dff9bde55d5f9b159ecd8b64e"); }."${stdenv.system}" or throwSystem; + extLib = stdenv.hostPlatform.extensions.sharedLibrary; in stdenv.mkDerivation rec { inherit version srcs; name = "oracle-instantclient-${version}"; buildInputs = [ stdenv.cc.cc.lib ] - ++ stdenv.lib.optionals (stdenv.isLinux) [ libaio ] - ++ stdenv.lib.optional odbcSupport unixODBC; - nativeBuildInputs = [ autoPatchelfHook makeWrapper unzip ]; + ++ optionals (stdenv.isLinux) [ libaio ] + ++ optional odbcSupport unixODBC; + + nativeBuildInputs = [ makeWrapper unzip ] + ++ optional stdenv.isLinux autoPatchelfHook + ++ optional stdenv.isDarwin fixDarwinDylibNames; unpackCmd = "unzip $curSrc"; installPhase = '' mkdir -p "$out/"{bin,include,lib,"share/java","share/${name}/demo/"} - install -Dm755 {sqlplus,adrci,genezi} $out/bin - ln -s $out/bin/sqlplus $out/bin/sqlplus64 - install -Dm644 *${stdenv.hostPlatform.extensions.sharedLibrary}* $out/lib + ${optionalString stdenv.isDarwin '' + for exe in "$out/bin/"* ; do + install_name_tool -add_rpath "$out/lib" "$exe" + done + ''} + ln -sfn $out/bin/sqlplus $out/bin/sqlplus64 + install -Dm644 *${extLib}* $out/lib install -Dm644 *.jar $out/share/java install -Dm644 sdk/include/* $out/include install -Dm644 sdk/demo/* $out/share/${name}/demo # PECL::oci8 will not build without this - ln -s $out/lib/libclntsh.so.12.1 $out/lib/libclntsh.so + # this symlink only exists in dist zipfiles for some platforms + ln -sfn $out/lib/libclntsh${extLib}.12.1 $out/lib/libclntsh${extLib} ''; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/podofo/default.nix b/pkgs/development/libraries/podofo/default.nix index 9a43470de3b7..51e2b5059749 100644 --- a/pkgs/development/libraries/podofo/default.nix +++ b/pkgs/development/libraries/podofo/default.nix @@ -19,6 +19,11 @@ stdenv.mkDerivation rec { # TODO(@Dridus) remove the ++ libc at next hash break buildInputs = [ lua5 ] ++ stdenv.lib.optional stdenv.isLinux stdenv.cc.libc; + preConfigure = '' + CC=${stdenv.cc.targetPrefix}cc + CXX=${stdenv.cc.targetPrefix}c++ + ''; + cmakeFlags = "-DPODOFO_BUILD_SHARED=ON -DPODOFO_BUILD_STATIC=OFF"; meta = { diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix index 82927664b4c1..6675bbf91836 100644 --- a/pkgs/development/libraries/polkit/default.nix +++ b/pkgs/development/libraries/polkit/default.nix @@ -83,6 +83,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://www.freedesktop.org/wiki/Software/polkit; description = "A toolkit for defining and handling the policy that allows unprivileged processes to speak to privileged processes"; + license = licenses.gpl2; platforms = platforms.unix; maintainers = [ ]; }; diff --git a/pkgs/development/libraries/pth/default.nix b/pkgs/development/libraries/pth/default.nix index 6118d9c41d6f..90dc647233d8 100644 --- a/pkgs/development/libraries/pth/default.nix +++ b/pkgs/development/libraries/pth/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "pth-2.0.7"; - + src = fetchurl { url = "mirror://gnu/pth/${name}.tar.gz"; sha256 = "0ckjqw5kz5m30srqi87idj7xhpw6bpki43mj07bazjm2qmh3cdbj"; @@ -12,9 +12,10 @@ stdenv.mkDerivation rec { configureFlagsArray=("CFLAGS=-DJB_SP=8 -DJB_PC=9") ''; - meta = { + meta = with stdenv.lib; { description = "The GNU Portable Threads library"; homepage = http://www.gnu.org/software/pth; - platforms = stdenv.lib.platforms.all; + license = licenses.lgpl21Plus; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index dc5f2ae96b3e..7d342330491c 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -103,8 +103,6 @@ EOF # Apple has some secret stuff they don't share with OpenBSM substituteInPlace src/3rdparty/chromium/base/mac/mach_port_broker.mm \ --replace "audit_token_to_pid(msg.trailer.msgh_audit)" "msg.trailer.msgh_audit.val[5]" - substituteInPlace src/3rdparty/chromium/sandbox/mac/bootstrap_sandbox.cc \ - --replace "audit_token_to_pid(msg.trailer.msgh_audit)" "msg.trailer.msgh_audit.val[5]" ''; NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-DMAC_OS_X_VERSION_MAX_ALLOWED=MAC_OS_X_VERSION_10_10 -DMAC_OS_X_VERSION_MIN_REQUIRED=MAC_OS_X_VERSION_10_10"; diff --git a/pkgs/development/libraries/science/math/blas/default.nix b/pkgs/development/libraries/science/math/blas/default.nix index 9955af046597..286be260052b 100644 --- a/pkgs/development/libraries/science/math/blas/default.nix +++ b/pkgs/development/libraries/science/math/blas/default.nix @@ -59,4 +59,10 @@ stdenv.mkDerivation rec { homepage = http://www.netlib.org/blas/; platforms = stdenv.lib.platforms.unix; }; + + # We use linkName to pass a different name to --with-blas-libs for + # fflas-ffpack and linbox, because we use blas on darwin but openblas + # elsewhere. + # See see https://github.com/NixOS/nixpkgs/pull/45013. + passthru.linkName = "blas"; } diff --git a/pkgs/development/libraries/science/math/ecos/default.nix b/pkgs/development/libraries/science/math/ecos/default.nix new file mode 100644 index 000000000000..645a865eb955 --- /dev/null +++ b/pkgs/development/libraries/science/math/ecos/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "ecos-${version}"; + version = "2.0.6"; + + src = fetchFromGitHub { + owner = "embotech"; + repo = "ecos"; + rev = "v${version}"; + sha256 = "11v958j66wq30gxpjpkgl7n3rvla845lygz8fl39pgf1vk9sdyc7"; + }; + + buildPhase = '' + make all shared + ''; + + doCheck = true; + checkPhase = '' + make test + ./runecos + ''; + + installPhase = '' + mkdir -p $out/lib + cp lib*.a lib*.so $out/lib + cp -r include $out/ + ''; + + meta = with stdenv.lib; { + description = "A lightweight conic solver for second-order cone programming"; + homepage = https://www.embotech.com/ECOS; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = [ maintainers.bhipple ]; + }; +} diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index e00a5ca9f8d9..18483f9e327c 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -143,4 +143,10 @@ stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = with maintainers; [ ttuegel ]; }; + + # We use linkName to pass a different name to --with-blas-libs for + # fflas-ffpack and linbox, because we use blas on darwin but openblas + # elsewhere. + # See see https://github.com/NixOS/nixpkgs/pull/45013. + passthru.linkName = "openblas"; } diff --git a/pkgs/development/libraries/unixODBC/default.nix b/pkgs/development/libraries/unixODBC/default.nix index ccd243e1f735..1275df69f596 100644 --- a/pkgs/development/libraries/unixODBC/default.nix +++ b/pkgs/development/libraries/unixODBC/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "unixODBC-${version}"; - version = "2.3.6"; + version = "2.3.7"; src = fetchurl { url = "ftp://ftp.unixodbc.org/pub/unixODBC/${name}.tar.gz"; - sha256 = "0sads5b8cmmj526gyjba7ccknl1vbhkslfqshv1yqln08zv3gdl8"; + sha256 = "0xry3sg497wly8f7715a7gwkn2k36bcap0mvzjw74jj53yx6kwa5"; }; configureFlags = [ "--disable-gui" "--sysconfdir=/etc" ]; diff --git a/pkgs/development/libraries/uriparser/default.nix b/pkgs/development/libraries/uriparser/default.nix index 9b4e3a74afe1..c716ae7f8dbb 100644 --- a/pkgs/development/libraries/uriparser/default.nix +++ b/pkgs/development/libraries/uriparser/default.nix @@ -2,27 +2,20 @@ stdenv.mkDerivation rec { name = "uriparser-${version}"; - version = "0.8.5"; + version = "0.8.6"; + # Release tarball differs from source tarball src = fetchurl { - url = "mirror://sourceforge/project/uriparser/Sources/${version}/${name}.tar.bz2"; - sha256 = "1p9c6lr39rjl4bbzi7wl2nsg72gcz8qhicxh9v043qyr0dfcvsjq"; + url = "https://github.com/uriparser/uriparser/releases/download/${name}/${name}.tar.bz2"; + sha256 = "0m2a5bf5b00ybagxmsa8mdj9mhc62vcm0qimy1ivfza1fbjsf287"; }; + nativeBuildInputs = [ pkgconfig cpptest doxygen graphviz ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cpptest doxygen graphviz ]; - - # There is actually no .map files to install in doc for v0.8.4 - # (dot outputs only SVG and PNG in this release) - preBuild = '' - substituteInPlace doc/Makefile.am --replace " html/*.map" "" - substituteInPlace doc/Makefile.in --replace " html/*.map" "" - ''; - + doCheck = true; meta = with stdenv.lib; { - homepage = http://uriparser.sourceforge.net/; + homepage = https://uriparser.github.io/; description = "Strictly RFC 3986 compliant URI parsing library"; longDescription = '' uriparser is a strictly RFC 3986 compliant URI parsing and handling library written in C. diff --git a/pkgs/development/libraries/v8/3.16.14.nix b/pkgs/development/libraries/v8/3.16.14.nix index e1a9336e3a56..a7dddd141246 100644 --- a/pkgs/development/libraries/v8/3.16.14.nix +++ b/pkgs/development/libraries/v8/3.16.14.nix @@ -6,7 +6,7 @@ let arch = if stdenv.isAarch32 then (if stdenv.is64bit then "arm64" else "arm") else (if stdenv.is64bit then "x64" else "ia32"); - armHardFloat = stdenv.isAarch32 && (stdenv.platform.gcc.float or null) == "hard"; + armHardFloat = stdenv.isAarch32 && (stdenv.hostPlatform.platform.gcc.float or null) == "hard"; in stdenv.mkDerivation rec { diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix index 8c0d065247b4..f93f7ed87460 100644 --- a/pkgs/development/libraries/xapian/default.nix +++ b/pkgs/development/libraries/xapian/default.nix @@ -11,7 +11,7 @@ let inherit sha256; }; - patches = [ + patches = stdenv.lib.optional (version == "1.4.7") [ # fix notmuch build, see https://notmuchmail.org/faq/#index12h2 # cannot fetchpatch this because base directory differs # TODO: remove on next xapian update diff --git a/pkgs/development/libraries/zeroc-ice/default.nix b/pkgs/development/libraries/zeroc-ice/default.nix index 063d64c69058..4369a9765e58 100644 --- a/pkgs/development/libraries/zeroc-ice/default.nix +++ b/pkgs/development/libraries/zeroc-ice/default.nix @@ -27,6 +27,11 @@ stdenv.mkDerivation rec { --replace xcrun "" ''; + preConfigure = '' + CC=${stdenv.cc.targetPrefix}cc + CXX=${stdenv.cc.targetPrefix}c++ + ''; + makeFlags = [ "prefix=$(out)" "OPTIMIZE=yes" ]; enableParallelBuilding = true; |