about summary refs log tree commit diff
path: root/pkgs/development/libraries
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/development/libraries')
-rw-r--r--pkgs/development/libraries/ayatana-ido/default.nix10
-rw-r--r--pkgs/development/libraries/eclib/default.nix4
-rw-r--r--pkgs/development/libraries/folks/default.nix36
-rw-r--r--pkgs/development/libraries/gjs/default.nix6
-rw-r--r--pkgs/development/libraries/glibc/default.nix3
-rw-r--r--pkgs/development/libraries/libayatana-appindicator/default.nix33
-rw-r--r--pkgs/development/libraries/libayatana-indicator/default.nix18
-rw-r--r--pkgs/development/libraries/libfreefare/default.nix6
-rw-r--r--pkgs/development/libraries/libowfat/default.nix13
-rw-r--r--pkgs/development/libraries/libshumate/default.nix4
-rw-r--r--pkgs/development/libraries/qcoro/default.nix16
-rw-r--r--pkgs/development/libraries/science/math/faiss/default.nix3
-rw-r--r--pkgs/development/libraries/tomlplusplus/default.nix28
13 files changed, 107 insertions, 73 deletions
diff --git a/pkgs/development/libraries/ayatana-ido/default.nix b/pkgs/development/libraries/ayatana-ido/default.nix
index 03b89411168ac..4a1bed05a3fbc 100644
--- a/pkgs/development/libraries/ayatana-ido/default.nix
+++ b/pkgs/development/libraries/ayatana-ido/default.nix
@@ -1,20 +1,20 @@
 { lib, stdenv, fetchFromGitHub
-, pkg-config, autoreconfHook
-, gtk3, gobject-introspection, gtk-doc, vala
+, pkg-config, cmake
+, gtk3
 }:
 
 stdenv.mkDerivation rec {
   pname = "ayatana-ido";
-  version = "0.8.2";
+  version = "0.9.2";
 
   src = fetchFromGitHub {
     owner = "AyatanaIndicators";
     repo = pname;
     rev = version;
-    sha256 = "sha256-nJ4F2faK0XZPj9GzUk3Ueap5h6rALFXISHqFQ30RuoU=";
+    sha256 = "sha256-0LswdcV4VSg5o5uJ6vfw713eDnMbodZPQ9d2djxHc6k=";
   };
 
-  nativeBuildInputs = [ pkg-config autoreconfHook gtk-doc vala gobject-introspection ];
+  nativeBuildInputs = [ pkg-config cmake ];
 
   buildInputs = [ gtk3 ];
 
diff --git a/pkgs/development/libraries/eclib/default.nix b/pkgs/development/libraries/eclib/default.nix
index af358be312183..30b4c5976f258 100644
--- a/pkgs/development/libraries/eclib/default.nix
+++ b/pkgs/development/libraries/eclib/default.nix
@@ -14,7 +14,7 @@ assert withFlint -> flint != null;
 
 stdenv.mkDerivation rec {
   pname = "eclib";
-  version = "20220621"; # upgrade might break the sage interface
+  version = "20221012"; # upgrade might break the sage interface
   # sage tests to run:
   # src/sage/interfaces/mwrank.py
   # src/sage/libs/eclib
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     # see https://github.com/JohnCremona/eclib/issues/64#issuecomment-789788561
     # for upstream's explanation of the above
     url = "https://github.com/JohnCremona/eclib/releases/download/${version}/eclib-${version}.tar.bz2";
-    sha256 = "sha256-EfoCNhnXGuN5SxgPFES4BaevhSRzU1JvT3ARq9NMJhM=";
+    sha256 = "sha256-TPavWyn6BMt7fAo19rrlPICPbK/XKstBruB/ka1adBc=";
   };
   buildInputs = [
     pari
diff --git a/pkgs/development/libraries/folks/default.nix b/pkgs/development/libraries/folks/default.nix
index 41ede8b85a848..0471283ef00cf 100644
--- a/pkgs/development/libraries/folks/default.nix
+++ b/pkgs/development/libraries/folks/default.nix
@@ -1,28 +1,22 @@
 { stdenv
 , lib
 , fetchurl
+, fetchpatch
 , pkg-config
 , meson
 , ninja
 , glib
 , gnome
-, nspr
 , gettext
 , gobject-introspection
 , vala
 , sqlite
-, libxml2
 , dbus-glib
-, libsoup
-, nss
 , dbus
 , libgee
 , evolution-data-server-gtk4
-, libsecret
-, db
 , python3
 , readline
-, gtk3
 , gtk-doc
 , docbook-xsl-nons
 , docbook_xml_dtd_43
@@ -43,31 +37,35 @@ stdenv.mkDerivation rec {
     sha256 = "D/+KiWMwzYKu5FmDJPflQciE0DN1NiEnI7S+s4x1kIY=";
   };
 
+  patches = [
+    # Do not check for unneeded GTK dependency.
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/folks/-/commit/686d58fb2454e5038bb951423245ed8c2d4b5cf6.patch";
+      sha256 = "0ydafVKhSrkHZK8bitPF5mNDTG5GrixGzBgBLNzLuXQ=";
+    })
+  ];
+
   nativeBuildInputs = [
     gettext
     gobject-introspection
-    gtk3
     gtk-doc
     docbook-xsl-nons
     docbook_xml_dtd_43
     meson
     ninja
     pkg-config
-    python3
     vala
+  ] ++ lib.optionals telepathySupport [
+    python3
   ];
 
   buildInputs = [
-    db
     dbus-glib
-    evolution-data-server-gtk4
-    libsecret
-    libsoup
-    libxml2
-    nspr
-    nss
+    evolution-data-server-gtk4 # UI part not needed, using gtk4 version to reduce system closure.
     readline
-  ] ++ lib.optional telepathySupport telepathy-glib;
+  ] ++ lib.optionals telepathySupport [
+    telepathy-glib
+  ];
 
   propagatedBuildInputs = [
     glib
@@ -105,9 +103,7 @@ stdenv.mkDerivation rec {
     runHook postCheck
   '';
 
-  postPatch = ''
-    chmod +x meson_post_install.py
-    patchShebangs meson_post_install.py
+  postPatch = lib.optionalString telepathySupport ''
     patchShebangs tests/tools/manager-file.py
   '';
 
diff --git a/pkgs/development/libraries/gjs/default.nix b/pkgs/development/libraries/gjs/default.nix
index 6a24be2adbbba..4716bb061b39a 100644
--- a/pkgs/development/libraries/gjs/default.nix
+++ b/pkgs/development/libraries/gjs/default.nix
@@ -79,9 +79,11 @@ in stdenv.mkDerivation rec {
 
   mesonFlags = [
     "-Dinstalled_test_prefix=${placeholder "installedTests"}"
+  ] ++ lib.optionals (!stdenv.isLinux) [
+    "-Dprofiler=disabled"
   ];
 
-  doCheck = true;
+  doCheck = !stdenv.isDarwin;
 
   postPatch = ''
     patchShebangs build/choose-tests-locale.sh
@@ -139,6 +141,6 @@ in stdenv.mkDerivation rec {
     homepage = "https://gitlab.gnome.org/GNOME/gjs/blob/master/doc/Home.md";
     license = licenses.lgpl2Plus;
     maintainers = teams.gnome.members;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix
index 8602498f01b94..791ac47536f94 100644
--- a/pkgs/development/libraries/glibc/default.nix
+++ b/pkgs/development/libraries/glibc/default.nix
@@ -39,6 +39,9 @@ callPackage ./common.nix { inherit stdenv; } {
 
       # Apparently --bindir is not respected.
       makeFlagsArray+=("bindir=$bin/bin" "sbindir=$bin/sbin" "rootsbindir=$bin/sbin")
+    '' + lib.optionalString stdenv.buildPlatform.isDarwin ''
+      # ld-wrapper will otherwise attempt to inject CoreFoundation into ld-linux's RUNPATH
+      export NIX_COREFOUNDATION_RPATH=
     '';
 
     # The pie, stackprotector and fortify hardening flags are autodetected by
diff --git a/pkgs/development/libraries/libayatana-appindicator/default.nix b/pkgs/development/libraries/libayatana-appindicator/default.nix
index df1c6683fbcf5..a0d6d8db3a7cf 100644
--- a/pkgs/development/libraries/libayatana-appindicator/default.nix
+++ b/pkgs/development/libraries/libayatana-appindicator/default.nix
@@ -1,15 +1,14 @@
 { stdenv, fetchFromGitHub, lib
-, pkg-config, autoreconfHook , gtk-doc
+, pkg-config, cmake
+, gtk-doc
+, gtk3, libayatana-indicator, libdbusmenu-gtk3
+, vala
 , gobject-introspection
-, gtkVersion ? "3"
-, gtk2, libayatana-indicator-gtk2, libdbusmenu-gtk2
-, gtk3, libayatana-indicator-gtk3, libdbusmenu-gtk3
-, dbus-glib,
 }:
 
 stdenv.mkDerivation rec {
-  pname = "libayatana-appindicator-gtk${gtkVersion}";
-  version = "0.5.5";
+  pname = "libayatana-appindicator";
+  version = "0.5.91";
 
   outputs = [ "out" "dev" ];
 
@@ -17,24 +16,18 @@ stdenv.mkDerivation rec {
     owner = "AyatanaIndicators";
     repo = "libayatana-appindicator";
     rev = version;
-    sha256 = "1sba0w455rdkadkhxrx4fr63m0d9blsbb1q1hcshxw1k1z2nh1gk";
+    sha256 = "sha256-hOMnpBF0VaFLYvbiKp8n88F14wIeLqSCsT6GFR3ATys=";
   };
 
-  nativeBuildInputs = [ pkg-config autoreconfHook gtk-doc gobject-introspection dbus-glib ];
+  nativeBuildInputs = [ pkg-config cmake gtk-doc vala gobject-introspection ];
 
-  buildInputs =
-    lib.optional (gtkVersion == "2") libayatana-indicator-gtk2
-    ++ lib.optional (gtkVersion == "3") libayatana-indicator-gtk3;
+  buildInputs = [ gtk3 ];
 
-  propagatedBuildInputs =
-    lib.optionals (gtkVersion == "2") [ gtk2 libdbusmenu-gtk2 ]
-    ++ lib.optionals (gtkVersion == "3") [ gtk3 libdbusmenu-gtk3 ];
+  propagatedBuildInputs = [ libayatana-indicator libdbusmenu-gtk3 ];
 
-  preAutoreconf = ''
-    gtkdocize
-  '';
-
-  configureFlags = [ "--with-gtk=${gtkVersion}" ];
+  cmakeFlags = [
+    "-DENABLE_BINDINGS_MONO=False"
+  ];
 
   meta = with lib; {
     description = "Ayatana Application Indicators Shared Library";
diff --git a/pkgs/development/libraries/libayatana-indicator/default.nix b/pkgs/development/libraries/libayatana-indicator/default.nix
index f4871538effe4..f58b0b273fb93 100644
--- a/pkgs/development/libraries/libayatana-indicator/default.nix
+++ b/pkgs/development/libraries/libayatana-indicator/default.nix
@@ -1,29 +1,25 @@
 { stdenv, fetchFromGitHub, lib
-, pkg-config, autoreconfHook
-, gtkVersion ? "3"
-, gtk2
+, pkg-config, cmake
 , gtk3
 , ayatana-ido
 }:
 
 stdenv.mkDerivation rec {
-  pname = "libayatana-indicator-gtk${gtkVersion}";
-  version = "0.8.2";
+  pname = "libayatana-indicator";
+  version = "0.9.2";
 
   src = fetchFromGitHub {
     owner = "AyatanaIndicators";
     repo = "libayatana-indicator";
     rev = version;
-    sha256 = "1wlqm3pj12vgz587a72widbg0vcmm1klsd2lh3mpzfy20m3vjxhj";
+    sha256 = "sha256-Bi+whbODdJMSQ6iiIrHAwht1Efi83icerT7ubQvE5n0=";
   };
 
-  nativeBuildInputs = [ pkg-config autoreconfHook ];
+  nativeBuildInputs = [ pkg-config cmake ];
 
-  buildInputs = [ ayatana-ido ]
-    ++ lib.optionals (gtkVersion == "2") [ gtk2 ]
-    ++ lib.optionals (gtkVersion == "3") [ gtk3 ];
+  buildInputs = [ gtk3 ];
 
-  configureFlags = [ "--with-gtk=${gtkVersion}" ];
+  propagatedBuildInputs = [ ayatana-ido ];
 
   meta = with lib; {
     description = "Ayatana Indicators Shared Library";
diff --git a/pkgs/development/libraries/libfreefare/default.nix b/pkgs/development/libraries/libfreefare/default.nix
index 9fd8c1e6b6131..5dd007f597548 100644
--- a/pkgs/development/libraries/libfreefare/default.nix
+++ b/pkgs/development/libraries/libfreefare/default.nix
@@ -1,5 +1,7 @@
 { lib, stdenv, fetchurl, pkg-config, libnfc, openssl
-, libobjc ? null }:
+, libobjc ? null
+, IOKit, Security
+}:
 
 stdenv.mkDerivation {
   pname = "libfreefare";
@@ -11,7 +13,7 @@ stdenv.mkDerivation {
   };
 
   nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ libnfc openssl ] ++ lib.optional stdenv.isDarwin libobjc;
+  buildInputs = [ libnfc openssl ] ++ lib.optionals stdenv.isDarwin [ libobjc IOKit Security ];
 
   meta = with lib; {
     description = "The libfreefare project aims to provide a convenient API for MIFARE card manipulations";
diff --git a/pkgs/development/libraries/libowfat/default.nix b/pkgs/development/libraries/libowfat/default.nix
index 665121b58b5ce..edfdb73e20376 100644
--- a/pkgs/development/libraries/libowfat/default.nix
+++ b/pkgs/development/libraries/libowfat/default.nix
@@ -9,6 +9,16 @@ stdenv.mkDerivation rec {
     sha256 = "1hcqg7pvy093bxx8wk7i4gvbmgnxz2grxpyy7b4mphidjbcv7fgl";
   };
 
+  # Fix for glibc 2.34 from Gentoo
+  # https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=914a4aa87415dabfe77181a2365766417a5919a4
+  postPatch = ''
+    # do not define "__pure__", this the gcc builtin (bug #806505)
+    sed 's#__pure__;#__attribute__((__pure__));#' -i fmt.h scan.h byte.h stralloc.h str.h critbit.h || die
+    sed 's#__pure__$#__attrib__pure__#' -i  fmt.h scan.h byte.h stralloc.h str.h critbit.h || die
+    # remove unneeded definition of __deprecated__
+    sed '/^#define __deprecated__$/d' -i scan/scan_iso8601.c scan/scan_httpdate.c || die
+  '';
+
   makeFlags = [ "prefix=$(out)" ];
   enableParallelBuilding = true;
 
@@ -17,8 +27,5 @@ stdenv.mkDerivation rec {
     homepage = "https://www.fefe.de/libowfat/";
     license = licenses.gpl2;
     platforms = platforms.linux;
-    # Doesn't build with glibc 2.34: https://hydra.nixos.org/build/156248131
-    # Should be fixed with the next release: https://bugs.gentoo.org/806505
-    broken = true;
   };
 }
diff --git a/pkgs/development/libraries/libshumate/default.nix b/pkgs/development/libraries/libshumate/default.nix
index 5911e199bcb2f..2c1f4365b5a66 100644
--- a/pkgs/development/libraries/libshumate/default.nix
+++ b/pkgs/development/libraries/libshumate/default.nix
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
     "-Ddemos=true"
   ];
 
-  doCheck = true;
+  doCheck = !stdenv.isDarwin;
 
   checkPhase = ''
     runHook preCheck
@@ -83,6 +83,6 @@ stdenv.mkDerivation rec {
     homepage = "https://gitlab.gnome.org/GNOME/libshumate";
     license = licenses.lgpl21Plus;
     maintainers = teams.gnome.members;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/qcoro/default.nix b/pkgs/development/libraries/qcoro/default.nix
index d5d3fd8ba1bbc..7fcbd489b4c92 100644
--- a/pkgs/development/libraries/qcoro/default.nix
+++ b/pkgs/development/libraries/qcoro/default.nix
@@ -1,30 +1,35 @@
-{ lib
-, mkDerivation
+{ stdenv
+, gcc11Stdenv
+, lib
 , fetchFromGitHub
 , cmake
 , libpthreadstubs
 , qtbase
+, qtwebsockets
+, wrapQtAppsHook
 }:
 
-mkDerivation rec {
+gcc11Stdenv.mkDerivation rec {
   pname = "qcoro";
-  version = "0.4.0";
+  version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "danvratil";
     repo = "qcoro";
     rev = "v${version}";
-    sha256 = "sha256-RVpyL+BklX8Wyk9Xj9UyuvNK5Vev8ZsrOSMxX1HtcHU=";
+    sha256 = "sha256-6kRWBzspwsO0Q6/8gQUr69DJjmkPa3lWrKTmSgVn6V4=";
   };
 
   outputs = [ "out" "dev" ];
 
   nativeBuildInputs = [
+    wrapQtAppsHook
     cmake
   ];
 
   buildInputs = [
     qtbase
+    qtwebsockets
     libpthreadstubs
   ];
 
@@ -34,6 +39,5 @@ mkDerivation rec {
     license = licenses.mit;
     maintainers = with maintainers; [ smitop ];
     platforms = platforms.linux;
-    badPlatforms = platforms.aarch64;
   };
 }
diff --git a/pkgs/development/libraries/science/math/faiss/default.nix b/pkgs/development/libraries/science/math/faiss/default.nix
index 9c83a1220e461..3e4e227f83e2d 100644
--- a/pkgs/development/libraries/science/math/faiss/default.nix
+++ b/pkgs/development/libraries/science/math/faiss/default.nix
@@ -8,6 +8,7 @@
 , cudaCapabilities ? [ "60" "70" "80" "86" ]
 , pythonSupport ? true
 , pythonPackages
+, llvmPackages
 , blas
 , swig
 , addOpenGLRunpath
@@ -47,6 +48,8 @@ stdenv.mkDerivation {
     pythonPackages.setuptools
     pythonPackages.pip
     pythonPackages.wheel
+  ] ++ lib.optionals stdenv.cc.isClang [
+    llvmPackages.openmp
   ];
 
   propagatedBuildInputs = lib.optionals pythonSupport [
diff --git a/pkgs/development/libraries/tomlplusplus/default.nix b/pkgs/development/libraries/tomlplusplus/default.nix
new file mode 100644
index 0000000000000..be1c4b7d9c81e
--- /dev/null
+++ b/pkgs/development/libraries/tomlplusplus/default.nix
@@ -0,0 +1,28 @@
+{ lib
+, stdenv
+, meson
+, ninja
+, fetchFromGitHub
+}:
+
+stdenv.mkDerivation rec {
+  pname = "tomlplusplus";
+  version = "3.2.0";
+
+  src = fetchFromGitHub {
+    owner = "marzer";
+    repo = pname;
+    rev = "v${version}";
+    hash = "sha256-nohO4eySs73BSgjvq+uzybiE5lw2rFY5YqGbl/oqGek=";
+  };
+
+  nativeBuildInputs = [ meson ninja ];
+
+  meta = with lib;{
+    homepage = "https://github.com/marzer/tomlplusplus";
+    description = "Header-only TOML config file parser and serializer for C++17";
+    license = licenses.mit;
+    maintainers = with maintainers; [ Scrumplex ];
+    platforms = with platforms; unix;
+  };
+}