diff options
Diffstat (limited to 'pkgs/development/libraries')
25 files changed, 200 insertions, 151 deletions
diff --git a/pkgs/development/libraries/doctest/default.nix b/pkgs/development/libraries/doctest/default.nix index e55313bc9fe4..ae7eca92712c 100644 --- a/pkgs/development/libraries/doctest/default.nix +++ b/pkgs/development/libraries/doctest/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "doctest"; - version = "2.3.5"; + version = "2.3.7"; src = fetchFromGitHub { owner = "onqtam"; repo = "doctest"; rev = version; - sha256 = "0rddlzhnv0f5036q0m0p019pismka7sx6x8cnzk65sk77b1dsbhg"; + sha256 = "134lx7pjnglrl4wdmyr9dz3rjb6d4ir6rvapg00gp52n44dbhnrq"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/enchant/2.x.nix b/pkgs/development/libraries/enchant/2.x.nix index c92afee6dc94..65d85eddbe40 100644 --- a/pkgs/development/libraries/enchant/2.x.nix +++ b/pkgs/development/libraries/enchant/2.x.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "enchant"; - version = "2.2.7"; + version = "2.2.8"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://github.com/AbiWord/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "029smcna98hllgkm2gy94qa7qphxs4xaa8cdbg5kaaw16mhrf8hv"; + sha256 = "0m9m564qqwbssvvf7y3dlz1yxzqsjiqy1yd2zsmb3l0d7y2y5df7"; }; nativeBuildInputs = [ @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Generic spell checking library"; - homepage = https://abiword.github.io/enchant/; + homepage = "https://abiword.github.io/enchant/"; license = licenses.lgpl21Plus; # with extra provision for non-free checkers maintainers = with maintainers; [ jtojnar ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/folks/default.nix b/pkgs/development/libraries/folks/default.nix index 6179ea983e33..89b7938de1e4 100644 --- a/pkgs/development/libraries/folks/default.nix +++ b/pkgs/development/libraries/folks/default.nix @@ -23,6 +23,9 @@ , python3 , readline , gtk3 +, gtk-doc +, docbook-xsl-nons +, docbook_xml_dtd_43 }: # TODO: enable more folks backends @@ -31,7 +34,7 @@ stdenv.mkDerivation rec { pname = "folks"; version = "0.13.2"; - outputs = [ "out" "dev" ]; + outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; @@ -39,14 +42,16 @@ stdenv.mkDerivation rec { }; mesonFlags = [ - # TODO: https://gitlab.gnome.org/GNOME/folks/issues/108 - "-Ddocs=false" + "-Ddocs=true" ]; nativeBuildInputs = [ gettext gobject-introspection gtk3 + gtk-doc + docbook-xsl-nons + docbook_xml_dtd_43 meson ninja pkgconfig @@ -75,10 +80,16 @@ stdenv.mkDerivation rec { checkInputs = [ dbus + (python3.withPackages (pp: with pp; [ + python-dbusmock + # The following possibly need to be propagated by dbusmock + # if they are not optional + dbus-python + pygobject3 + ])) ]; - # TODO: enable tests - # doCheck = true; + doCheck = true; postPatch = '' chmod +x meson_post_install.py diff --git a/pkgs/development/libraries/getdns/default.nix b/pkgs/development/libraries/getdns/default.nix index 721245ceb6d7..c0268c161aeb 100644 --- a/pkgs/development/libraries/getdns/default.nix +++ b/pkgs/development/libraries/getdns/default.nix @@ -1,24 +1,20 @@ -{ stdenv, fetchurl, libtool, unbound, libidn, m4, file -, openssl, doxygen, autoreconfHook, automake }: +{ stdenv, fetchurl, unbound, libidn2, openssl, doxygen, cmake }: stdenv.mkDerivation rec { pname = "getdns"; - version = "1.5.2"; + version = "1.6.0"; versionRewrite = builtins.splitVersion version; src = fetchurl { - url = "https://getdnsapi.net/releases/${pname}-${builtins.concatStringsSep "-" versionRewrite}/${pname}-${version}.tar.gz"; - sha256 = "1h4l0sbkpiahpx2pd5lby10yi22mdxgx5xf1y80r77pa46iac9hq"; + url = "https://getdnsapi.net/releases/${pname}-${ + builtins.concatStringsSep "-" versionRewrite + }/${pname}-${version}.tar.gz"; + sha256 = "0jhg7258wz287kjymimvdvv04n69lwxdc3sb62l2p453f5s77ra0"; }; - nativeBuildInputs = [ libtool m4 autoreconfHook automake file ]; + nativeBuildInputs = [ cmake ]; - buildInputs = [ unbound libidn openssl doxygen ]; - - patchPhase = '' - substituteInPlace m4/acx_openssl.m4 \ - --replace /usr/local/ssl ${openssl.dev} - ''; + buildInputs = [ unbound libidn2 openssl doxygen ]; meta = with stdenv.lib; { description = "A modern asynchronous DNS API"; @@ -32,9 +28,9 @@ stdenv.mkDerivation rec { interface that enables end-to-end trust in the DNS architecture, and which will inspire application developers to implement innovative security solutions in their applications. -''; - homepage = https://getdnsapi.net; - maintainers = with maintainers; [ leenaars ]; + ''; + homepage = "https://getdnsapi.net"; + maintainers = with maintainers; [ leenaars ehmry ]; license = licenses.bsd3; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/gom/default.nix b/pkgs/development/libraries/gom/default.nix index e006f8cd6f8e..2d5133afab4d 100644 --- a/pkgs/development/libraries/gom/default.nix +++ b/pkgs/development/libraries/gom/default.nix @@ -1,6 +1,5 @@ { stdenv , fetchurl -, fetchpatch , meson , ninja , pkgconfig @@ -14,26 +13,16 @@ stdenv.mkDerivation rec { pname = "gom"; - version = "0.3.3"; + version = "0.4"; outputs = [ "out" "py" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1n1n226dyb3q98216aah87in9hhjcwsbpspsdqqfswz2bx5y6mxc"; + sha256 = "aNCABqqjtYFpznzxg5SY9FaG+6gRXwms7Lidd+EBip0="; }; patches = [ - # Needed to apply the next patch - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gom/commit/e8b7c314ce61d459132cf03c9e455d2a01fdc6ea.patch"; - sha256 = "0d7g3nm5lrfhfx9ly8qgf5bfp12kvr7m1xmlgin2q8vqpn0r2ggp"; - }) - # https://gitlab.gnome.org/GNOME/gom/merge_requests/3 - (fetchpatch { - url = "https://gitlab.gnome.org/worldofpeace/gom/commit/b621c15600b1c32826c9878565eb2398a50907f2.patch"; - sha256 = "1hqck9bb7sxn4akisnn26sbddlphjsavgksick5k4h3rsc0xwx1v"; - }) ./longer-stress-timeout.patch ]; diff --git a/pkgs/development/libraries/gsasl/default.nix b/pkgs/development/libraries/gsasl/default.nix index 899aa116b2ca..c5e1deea6e12 100644 --- a/pkgs/development/libraries/gsasl/default.nix +++ b/pkgs/development/libraries/gsasl/default.nix @@ -12,16 +12,19 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-gssapi-impl=mit" ]; + preCheck = '' + export LOCALDOMAIN="dummydomain" + ''; doCheck = !stdenv.hostPlatform.isDarwin; meta = { description = "GNU SASL, Simple Authentication and Security Layer library"; longDescription = - '' GNU SASL is a library that implements the IETF Simple - Authentication and Security Layer (SASL) framework and - some SASL mechanisms. SASL is used in network servers - (e.g. IMAP, SMTP, etc.) to authenticate peers. + '' GNU SASL is a library that implements the IETF Simple + Authentication and Security Layer (SASL) framework and + some SASL mechanisms. SASL is used in network servers + (e.g. IMAP, SMTP, etc.) to authenticate peers. ''; homepage = https://www.gnu.org/software/gsasl/; diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix index 7caf32921de3..9f381c5ac708 100644 --- a/pkgs/development/libraries/gtk/3.x.nix +++ b/pkgs/development/libraries/gtk/3.x.nix @@ -77,9 +77,6 @@ stdenv.mkDerivation rec { # let’s drop that dependency in similar way to how other parts of the library do it # e.g. https://gitlab.gnome.org/GNOME/gtk/blob/3.24.4/gtk/gtk-launch.c#L31-33 ./patches/3.0-darwin-x11.patch - # 3.24.13 failed to ship a header file - # https://gitlab.gnome.org/GNOME/gtk/issues/2279 - ./patches/missing-header.patch ]; separateDebugInfo = stdenv.isLinux; diff --git a/pkgs/development/libraries/gtk/patches/missing-header.patch b/pkgs/development/libraries/gtk/patches/missing-header.patch deleted file mode 100644 index 49eb51dae9af..000000000000 --- a/pkgs/development/libraries/gtk/patches/missing-header.patch +++ /dev/null @@ -1,56 +0,0 @@ -diff --git a/gdk/quartz/gdkquartz-gtk-only.h b/gdk/quartz/gdkquartz-gtk-only.h -new file mode 100644 -index 0000000000000000000000000000000000000000..193686c041971e4d8b3a1bc6bb2a79d8ba6e9a70 ---- /dev/null -+++ b/gdk/quartz/gdkquartz-gtk-only.h -@@ -0,0 +1,50 @@ -+/* gdkquartz-gtk-only.h -+ * -+ * Copyright (C) 2005-2007 Imendio AB -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library. If not, see <http://www.gnu.org/licenses/>. -+ */ -+ -+#ifndef __GDK_QUARTZ_GTK_ONLY_H__ -+#define __GDK_QUARTZ_GTK_ONLY_H__ -+ -+#if !(defined (GTK_COMPILATION) || defined (GDK_COMPILATION)) -+#error "This API is for use only in Gtk internal code." -+#endif -+ -+#include <Appkit/Appkit.h> -+#include <gdk/gdk.h> -+#include <gdk/quartz/gdkquartz.h> -+ -+/* Drag and Drop/Clipboard */ -+GDK_AVAILABLE_IN_ALL -+GdkAtom gdk_quartz_pasteboard_type_to_atom_libgtk_only (NSString *type); -+GDK_AVAILABLE_IN_ALL -+NSString *gdk_quartz_target_to_pasteboard_type_libgtk_only (const gchar *target); -+GDK_AVAILABLE_IN_ALL -+NSString *gdk_quartz_atom_to_pasteboard_type_libgtk_only (GdkAtom atom); -+ -+/* Utilities */ -+GDK_AVAILABLE_IN_ALL -+NSImage *gdk_quartz_pixbuf_to_ns_image_libgtk_only (GdkPixbuf *pixbuf); -+GDK_AVAILABLE_IN_ALL -+NSEvent *gdk_quartz_event_get_nsevent (GdkEvent *event); -+ -+/* Window */ -+GDK_AVAILABLE_IN_ALL -+NSWindow *gdk_quartz_window_get_nswindow (GdkWindow *window); -+GDK_AVAILABLE_IN_ALL -+NSView *gdk_quartz_window_get_nsview (GdkWindow *window); -+ -+#endif diff --git a/pkgs/development/libraries/howard-hinnant-date/default.nix b/pkgs/development/libraries/howard-hinnant-date/default.nix index 30e5c92b8f09..185af3dff319 100644 --- a/pkgs/development/libraries/howard-hinnant-date/default.nix +++ b/pkgs/development/libraries/howard-hinnant-date/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, curl, fetchpatch }: +{ stdenv, fetchFromGitHub, cmake, curl, tzdata, fetchpatch, substituteAll }: stdenv.mkDerivation rec { pname = "howard-hinnant-date-unstable"; @@ -16,6 +16,13 @@ stdenv.mkDerivation rec { url = "https://github.com/HowardHinnant/date/commit/e56b2dce7e89a92e1b9b35caa13b3e938c4cedea.patch"; sha256 = "0m3qbhq7kmm9qa3jm6d2px7c1dxdj5k9lffgdvqnrwmhxwj1p9n2"; }) + # Without this patch, this library will drop a `tzdata` directory into + # `~/Downloads` if it cannot find `/usr/share/zoneinfo`. Make the path it + # searches for `zoneinfo` be the one from the `tzdata` package. + (substituteAll { + src = ./make-zoneinfo-available.diff; + inherit tzdata; + }) ]; nativeBuildInputs = [ cmake ]; @@ -24,6 +31,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_TZ_LIB=true" "-DBUILD_SHARED_LIBS=true" + "-DUSE_SYSTEM_TZ_DB=true" ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/howard-hinnant-date/make-zoneinfo-available.diff b/pkgs/development/libraries/howard-hinnant-date/make-zoneinfo-available.diff new file mode 100644 index 000000000000..f9e69ff38cbb --- /dev/null +++ b/pkgs/development/libraries/howard-hinnant-date/make-zoneinfo-available.diff @@ -0,0 +1,13 @@ +diff --git a/src/tz.cpp b/src/tz.cpp +index 68436c3..2bfe19e 100644 +--- a/src/tz.cpp ++++ b/src/tz.cpp +@@ -349,7 +349,7 @@ discover_tz_dir() + struct stat sb; + using namespace std; + # ifndef __APPLE__ +- CONSTDATA auto tz_dir_default = "/usr/share/zoneinfo"; ++ CONSTDATA auto tz_dir_default = "@tzdata@/share/zoneinfo"; + CONSTDATA auto tz_dir_buildroot = "/usr/share/zoneinfo/uclibc"; + + // Check special path which is valid for buildroot with uclibc builds diff --git a/pkgs/development/libraries/libabigail/default.nix b/pkgs/development/libraries/libabigail/default.nix index dc19adfb6a66..168ce0c9e571 100644 --- a/pkgs/development/libraries/libabigail/default.nix +++ b/pkgs/development/libraries/libabigail/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "libabigail"; - version = "1.6"; + version = "1.7"; outputs = [ "bin" "out" "dev" ]; src = fetchurl { url = "https://mirrors.kernel.org/sourceware/${pname}/${pname}-${version}.tar.gz"; - sha256 = "04j07lhvwbp6qp8pdwbf7iqnr7kgpabmqylsw4invpmzwnyp6g6g"; + sha256 = "0bf8w01l6wm7mm4clfg5rqi30m1ws11qqa4bp2vxghfwgi9ai8i7"; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libamqpcpp/default.nix b/pkgs/development/libraries/libamqpcpp/default.nix index 315d3f499560..bdf081222b6d 100644 --- a/pkgs/development/libraries/libamqpcpp/default.nix +++ b/pkgs/development/libraries/libamqpcpp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libamqpcpp"; - version = "4.1.5"; + version = "4.1.6"; src = fetchFromGitHub { owner = "CopernicaMarketingSoftware"; repo = "AMQP-CPP"; rev = "v${version}"; - sha256 = "1jyvpa68wymnn8wnh8i59pa9kdbixv86mh8q338agnwkmzvlgm58"; + sha256 = "0cw1apj4qxfxpp0gz4my4656d5ijjj6s2y4rjahhj67h10qj4bd2"; }; buildInputs = [ openssl ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Library for communicating with a RabbitMQ server"; - homepage = https://github.com/CopernicaMarketingSoftware/AMQP-CPP; + homepage = "https://github.com/CopernicaMarketingSoftware/AMQP-CPP"; license = licenses.asl20; maintainers = [ maintainers.mjp ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/libgdata/default.nix b/pkgs/development/libraries/libgdata/default.nix index 6830d47df74b..91bb9869f3c6 100644 --- a/pkgs/development/libraries/libgdata/default.nix +++ b/pkgs/development/libraries/libgdata/default.nix @@ -12,7 +12,6 @@ , gcr , gnome-online-accounts , gobject-introspection -, liboauth , gnome3 , p11-kit , openssl @@ -22,13 +21,13 @@ stdenv.mkDerivation rec { pname = "libgdata"; - version = "0.17.11"; + version = "0.17.12"; outputs = [ "out" "dev" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "11m99sh2k679rnsvqsi95s1l0r8lkvj61dmwg1pnxvsd5q91g6bb"; + sha256 = "0613nihsvwvdnmlbjnwi8zqxgmpwyxdapzznq4cy1fp84246zzd0"; }; patches = [ @@ -47,7 +46,6 @@ stdenv.mkDerivation rec { buildInputs = [ gcr glib - liboauth libsoup libxml2 openssl @@ -80,7 +78,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "GData API library"; - homepage = https://wiki.gnome.org/Projects/libgdata; + homepage = "https://wiki.gnome.org/Projects/libgdata"; maintainers = with maintainers; [ raskin lethalman ] ++ gnome3.maintainers; platforms = platforms.linux; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/libgpod/default.nix b/pkgs/development/libraries/libgpod/default.nix index 063588e9f1e5..5c25a4d5abf6 100644 --- a/pkgs/development/libraries/libgpod/default.nix +++ b/pkgs/development/libraries/libgpod/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, gettext, perlPackages, intltool, pkgconfig, glib, libxml2, sqlite, zlib, sg3_utils, gdk-pixbuf, taglib, - libimobiledevice, mutagen, + libimobiledevice, monoSupport ? false, mono, gtk-sharp-2_0 }: @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { dontStrip = true; propagatedBuildInputs = [ glib libxml2 sqlite zlib sg3_utils - gdk-pixbuf taglib libimobiledevice mutagen ]; + gdk-pixbuf taglib libimobiledevice ]; nativeBuildInputs = [ gettext intltool pkgconfig ] ++ (with perlPackages; [ perl XMLParser ]) diff --git a/pkgs/development/libraries/libite/default.nix b/pkgs/development/libraries/libite/default.nix index 34ca7406d697..26d7e1e961d4 100644 --- a/pkgs/development/libraries/libite/default.nix +++ b/pkgs/development/libraries/libite/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libite"; - version = "2.1.0"; + version = "2.1.2"; src = fetchFromGitHub { owner = "troglobit"; repo = "libite"; rev = "v${version}"; - sha256 = "0fi3j3y37id24cgy3868pyvxkd6mvbbraalvpm99f5dhrxdlv961"; + sha256 = "0pvki6cm3ia27nsd6dljddjgz1bd6avf6c0ppj63fa3sz52lfmga"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/development/libraries/liblouis/default.nix b/pkgs/development/libraries/liblouis/default.nix index 932edd20e9a6..83d08dc019bf 100644 --- a/pkgs/development/libraries/liblouis/default.nix +++ b/pkgs/development/libraries/liblouis/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "liblouis"; - version = "3.12.0"; + version = "3.13.0"; src = fetchFromGitHub { owner = "liblouis"; repo = "liblouis"; rev = "v${version}"; - sha256 = "0sw7iwb9158z7jslxj9jwh2vqbg0q8wq6fbmk9iz7sfkjqhi80hv"; + sha256 = "1srpafxdw4627lyv92cn8wd9zda3507qpp5s2z66bsln8jnb1mza"; }; outputs = [ "out" "dev" "man" "info" "doc" ]; @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Open-source braille translator and back-translator"; - homepage = http://liblouis.org/; + homepage = "http://liblouis.org/"; license = licenses.lgpl21; maintainers = with maintainers; [ jtojnar ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libmypaint/default.nix b/pkgs/development/libraries/libmypaint/default.nix index 32251afffde5..409867695fc0 100644 --- a/pkgs/development/libraries/libmypaint/default.nix +++ b/pkgs/development/libraries/libmypaint/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pname = "libmypaint"; - version = "1.5.0"; + version = "1.5.1"; outputs = [ "out" "dev" ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { owner = "mypaint"; repo = "libmypaint"; rev = "v${version}"; - sha256 = "06szsadj589vlvn33gzybygdknsaahr4cpigh2xyg8mr3h9ngqrl"; + sha256 = "1pxx8fjdabcindxhzgbhg4p7yanl4ihbd8kq71y2nyi9dqsjr2fw"; }; nativeBuildInputs = [ @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { preConfigure = "./autogen.sh"; meta = with stdenv.lib; { - homepage = http://mypaint.org/; + homepage = "http://mypaint.org/"; description = "Library for making brushstrokes which is used by MyPaint and other projects"; license = licenses.isc; maintainers = with maintainers; [ goibhniu jtojnar ]; diff --git a/pkgs/development/libraries/libvmaf/default.nix b/pkgs/development/libraries/libvmaf/default.nix index 82c76f7ea372..fb494909c838 100644 --- a/pkgs/development/libraries/libvmaf/default.nix +++ b/pkgs/development/libraries/libvmaf/default.nix @@ -1,33 +1,28 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, intltool, libtool, pkgconfig }: +{ stdenv, fetchFromGitHub, meson, ninja }: stdenv.mkDerivation rec { pname = "libvmaf"; - version = "1.3.15"; + version = "1.5.1"; src = fetchFromGitHub { owner = "netflix"; repo = "vmaf"; rev = "v${version}"; - sha256="10kgcdf06hzhbl5r7zsllq88bxbyn282hfqx5i3hkp66fpq896d2"; + sha256 = "10fw53k9k4aq4p2qi5qkfjfnhldw4p5bbmxggf8220gfa95nvyl3"; }; - nativeBuildInputs = [ autoconf automake intltool libtool pkgconfig ]; + sourceRoot = "source/libvmaf"; + + nativeBuildInputs = [ meson ninja ]; outputs = [ "out" "dev" ]; doCheck = true; - postFixup = '' - substituteInPlace "$dev/lib/pkgconfig/libvmaf.pc" \ - --replace "includedir=/usr/local/include" "includedir=$dev" - ''; - - makeFlags = [ "INSTALL_PREFIX=${placeholder "out"}" ]; - meta = with stdenv.lib; { homepage = "https://github.com/Netflix/vmaf"; description = "Perceptual video quality assessment based on multi-method fusion (VMAF)"; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.asl20; - maintainers = [ maintainers.cfsmp3 ]; + maintainers = [ maintainers.cfsmp3 maintainers.marsam ]; }; } diff --git a/pkgs/development/libraries/libyaml-cpp/default.nix b/pkgs/development/libraries/libyaml-cpp/default.nix index 3d0a94a35d0b..cf880ef1e16c 100644 --- a/pkgs/development/libraries/libyaml-cpp/default.nix +++ b/pkgs/development/libraries/libyaml-cpp/default.nix @@ -11,6 +11,13 @@ stdenv.mkDerivation rec { sha256 = "0ykkxzxcwwiv8l8r697gyqh1nl582krpvi7m7l6b40ijnk4pw30s"; }; + # implement https://github.com/jbeder/yaml-cpp/commit/52a1378e48e15d42a0b755af7146394c6eff998c + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace 'option(YAML_BUILD_SHARED_LIBS "Build Shared Libraries" OFF)' \ + 'option(YAML_BUILD_SHARED_LIBS "Build yaml-cpp shared library" ''${BUILD_SHARED_LIBS})' + ''; + nativeBuildInputs = [ cmake ]; cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DYAML_CPP_BUILD_TESTS=OFF" ]; diff --git a/pkgs/development/libraries/lyra/default.nix b/pkgs/development/libraries/lyra/default.nix index 3e73c9266a03..e7227ac63885 100644 --- a/pkgs/development/libraries/lyra/default.nix +++ b/pkgs/development/libraries/lyra/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lyra"; - version = "1.1"; + version = "1.3"; src = fetchFromGitHub { owner = "bfgroup"; repo = "lyra"; rev = version; - sha256 = "1wcwsmg41bmjir6pjrjxrwccqj25d9068ifi9m6xz6q3fhaq6s81"; + sha256 = "0rpk1hadfcvjps5k307sddv23q73m2918wclfxfi6mj8l7gwkcn9"; }; nativeBuildInputs = [ meson ninja ]; diff --git a/pkgs/development/libraries/neatvnc/default.nix b/pkgs/development/libraries/neatvnc/default.nix new file mode 100644 index 000000000000..127f25a50bea --- /dev/null +++ b/pkgs/development/libraries/neatvnc/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchFromGitHub, meson, pkg-config, ninja +, pixman, libuv, gnutls, libdrm +# libjpeg_turbo: Optional, for tight encoding (disabled because experimental) +, enableCpuAcceleration ? false # Whether to use CPU extensions (e.g. AVX) +}: + +stdenv.mkDerivation rec { + pname = "neatvnc"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "any1"; + repo = pname; + rev = "v${version}"; + sha256 = "04wcpwxlcf0bczcs97j21346mn6finfj7xgc2dsrwrw9xq8qa7wc"; + }; + + nativeBuildInputs = [ meson pkg-config ninja ]; + buildInputs = [ pixman libuv gnutls libdrm ]; + + patches = stdenv.lib.optional (!enableCpuAcceleration) ./disable-cpu-acceleration.patch; + + meta = with stdenv.lib; { + description = "A VNC server library"; + longDescription = '' + This is a liberally licensed VNC server library that's intended to be + fast and neat. Goals: + - Speed + - Clean interface + - Interoperability with the Freedesktop.org ecosystem + ''; + inherit (src.meta) homepage; + license = licenses.isc; + platforms = platforms.linux; + maintainers = with maintainers; [ primeos ]; + }; +} diff --git a/pkgs/development/libraries/neatvnc/disable-cpu-acceleration.patch b/pkgs/development/libraries/neatvnc/disable-cpu-acceleration.patch new file mode 100644 index 000000000000..97b77c02df48 --- /dev/null +++ b/pkgs/development/libraries/neatvnc/disable-cpu-acceleration.patch @@ -0,0 +1,17 @@ +diff --git a/meson.build b/meson.build +index 31dd8b8..8761087 100644 +--- a/meson.build ++++ b/meson.build +@@ -21,12 +21,6 @@ endif + + cpu = host_machine.cpu_family() + +-if cpu == 'x86_64' +- c_args += '-mavx' +-elif cpu == 'arm' +- c_args += '-mfpu=neon' +-endif +- + add_project_arguments(c_args, language: 'c') + + cc = meson.get_compiler('c') diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index 3efbea97c5e9..094e90fd500d 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -1,16 +1,36 @@ -{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, doxygen, graphviz, valgrind -, glib, dbus, gst_all_1, alsaLib, ffmpeg, libjack2, udev, libva, xorg -, sbc, SDL2, makeFontsConf +{ stdenv +, fetchFromGitHub +, meson +, ninja +, pkgconfig +, doxygen +, graphviz +, valgrind +, glib +, dbus +, gst_all_1 +, alsaLib +, ffmpeg +, libjack2 +, udev +, libva +, xorg +, sbc +, SDL2 +, makeFontsConf }: let fontsConf = makeFontsConf { - fontDirectories = [ ]; + fontDirectories = []; }; -in stdenv.mkDerivation rec { +in +stdenv.mkDerivation rec { pname = "pipewire"; version = "0.2.7"; + outputs = [ "out" "lib" "dev" "doc" ]; + src = fetchFromGitHub { owner = "PipeWire"; repo = "pipewire"; @@ -18,14 +38,28 @@ in stdenv.mkDerivation rec { sha256 = "1q5wrqnhhs6r49p8yvkw1pl0cnsd4rndxy4h5lvdydwgf1civcwc"; }; - outputs = [ "out" "lib" "dev" "doc" ]; - nativeBuildInputs = [ - meson ninja pkgconfig doxygen graphviz valgrind + doxygen + graphviz + meson + ninja + pkgconfig + valgrind ]; + buildInputs = [ - glib dbus gst_all_1.gst-plugins-base gst_all_1.gstreamer - alsaLib ffmpeg libjack2 udev libva xorg.libX11 sbc SDL2 + SDL2 + alsaLib + dbus + ffmpeg + glib + gst_all_1.gst-plugins-base + gst_all_1.gstreamer + libjack2 + libva + sbc + udev + xorg.libX11 ]; mesonFlags = [ diff --git a/pkgs/development/libraries/tdlib/default.nix b/pkgs/development/libraries/tdlib/default.nix index 5224744c6a2c..4bf49e297e33 100644 --- a/pkgs/development/libraries/tdlib/default.nix +++ b/pkgs/development/libraries/tdlib/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { description = "Cross-platform library for building Telegram clients"; homepage = "https://core.telegram.org/tdlib/"; license = [ licenses.boost ]; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.vyorkin ]; }; } diff --git a/pkgs/development/libraries/zimg/default.nix b/pkgs/development/libraries/zimg/default.nix index 75f10f94fb38..f5913137e1c2 100644 --- a/pkgs/development/libraries/zimg/default.nix +++ b/pkgs/development/libraries/zimg/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zimg"; - version = "2.9.2"; + version = "2.9.3"; src = fetchFromGitHub { owner = "sekrit-twc"; repo = "zimg"; rev = "release-${version}"; - sha256 = "0jlgrlfs9maixd8mx7gk2kfawz8ixnihkxi7vhyzfy1gq49vmxm2"; + sha256 = "1dqyrq3p8bkgvj4ci50ac342hjnhyz6xxvhiwp7wpi3v3nbj7s02"; }; nativeBuildInputs = [ autoreconfHook ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Scaling, colorspace conversion and dithering library"; - homepage = https://github.com/sekrit-twc/zimg; + homepage = "https://github.com/sekrit-twc/zimg"; license = licenses.wtfpl; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ rnhmjoj ]; |