diff options
Diffstat (limited to 'pkgs/development/libraries')
73 files changed, 786 insertions, 589 deletions
diff --git a/pkgs/development/libraries/audio/libspecbleach/default.nix b/pkgs/development/libraries/audio/libspecbleach/default.nix new file mode 100644 index 0000000000000..f9f147ab11a2c --- /dev/null +++ b/pkgs/development/libraries/audio/libspecbleach/default.nix @@ -0,0 +1,26 @@ +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, fftwFloat}: + +stdenv.mkDerivation rec { + pname = "libspecbleach"; + version = "0.1.2"; + + src = fetchFromGitHub { + owner = "lucianodato"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-WmUl8rA/+V+hv7FPG/5Or6aAQVqt1rIJtdb53KhSmuo="; + }; + + nativeBuildInputs = [ meson ninja pkg-config ]; + buildInputs = [ + fftwFloat + ]; + + meta = with lib; { + description = "C library for audio noise reduction"; + homepage = "https://github.com/lucianodato/libspecbleach"; + license = licenses.lgpl2; + maintainers = [ maintainers.magnetophon ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/bc-decaf/default.nix b/pkgs/development/libraries/bc-decaf/default.nix new file mode 100644 index 0000000000000..acfd0e85d4f41 --- /dev/null +++ b/pkgs/development/libraries/bc-decaf/default.nix @@ -0,0 +1,36 @@ +{ cmake +, fetchFromGitLab +, lib +, python3 +, stdenv +}: + +stdenv.mkDerivation rec { + pname = "bc-decaf"; + version = "linphone-4.4.1"; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ + python3 + ]; + + src = fetchFromGitLab { + domain = "gitlab.linphone.org"; + group = "BC"; + owner = "public/external"; + repo = "decaf"; + rev = "6e78a9beb24d1e3d7050dd52a65e4f88b101a1fc"; + sha256 = "sha256-D2SzkinloL0Ya9p25YUsc+7lKvoTMUsdkKrkv/5AEeY="; + }; + + # Do not build static libraries and do not enable -Werror + cmakeFlags = [ "-DENABLE_STATIC=NO" "-DENABLE_STRICT=NO" ]; + + meta = with lib; { + description = "Elliptic curve library supporting Ed448-Goldilocks and Curve25519. Belledonne Communications' fork for Linphone."; + homepage = "https://gitlab.linphone.org/BC/public/bctoolbox"; + license = licenses.mit; + maintainers = with maintainers; [ thibaultlemaire ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/bctoolbox/default.nix b/pkgs/development/libraries/bctoolbox/default.nix index d189752664628..6c1c2cdefb9c2 100644 --- a/pkgs/development/libraries/bctoolbox/default.nix +++ b/pkgs/development/libraries/bctoolbox/default.nix @@ -1,16 +1,28 @@ { bcunit , cmake +, bc-decaf , fetchFromGitLab , mbedtls -, lib, stdenv +, lib +, stdenv }: stdenv.mkDerivation rec { pname = "bctoolbox"; version = "5.1.17"; - nativeBuildInputs = [ cmake bcunit ]; - buildInputs = [ mbedtls ]; + nativeBuildInputs = [ + cmake + ]; + buildInputs = [ + # Made by BC + bcunit + + # Vendored by BC + bc-decaf + + mbedtls + ]; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -22,9 +34,9 @@ stdenv.mkDerivation rec { }; # Do not build static libraries - cmakeFlags = [ "-DENABLE_STATIC=NO" ]; + cmakeFlags = [ "-DENABLE_STATIC=NO" "-DENABLE_STRICT=NO" ]; - NIX_CFLAGS_COMPILE = [ "-Wno-error=stringop-truncation" ]; + strictDeps = true; meta = with lib; { description = "Utilities library for Linphone"; diff --git a/pkgs/development/libraries/belcard/default.nix b/pkgs/development/libraries/belcard/default.nix index 740dbeee64872..aace36c619c00 100644 --- a/pkgs/development/libraries/belcard/default.nix +++ b/pkgs/development/libraries/belcard/default.nix @@ -2,12 +2,13 @@ , belr , cmake , fetchFromGitLab -, lib, stdenv +, lib +, stdenv }: stdenv.mkDerivation rec { pname = "belcard"; - version = "5.1.10"; + version = "5.1.12"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -25,7 +26,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DENABLE_STATIC=NO" ]; meta = with lib; { - description = "C++ library to manipulate VCard standard format"; + description = "C++ library to manipulate VCard standard format. Part of the Linphone project."; homepage = "https://gitlab.linphone.org/BC/public/belcard"; license = licenses.gpl3Plus; platforms = platforms.all; diff --git a/pkgs/development/libraries/belle-sip/default.nix b/pkgs/development/libraries/belle-sip/default.nix index e1b517f66bf5f..22817feadedaf 100644 --- a/pkgs/development/libraries/belle-sip/default.nix +++ b/pkgs/development/libraries/belle-sip/default.nix @@ -1,5 +1,5 @@ -{ antlr3_4 -, bctoolbox +{ bctoolbox +, belr , cmake , fetchFromGitLab , lib @@ -11,18 +11,18 @@ stdenv.mkDerivation rec { pname = "belle-sip"; - version = "4.5.14"; + version = "linphone-4.4.1"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; owner = "public"; group = "BC"; repo = pname; - rev = version; - sha256 = "sha256-L6dhgBJrzYgBuMNd2eMZJCqB/GIZjKipfn1SffxBFWw="; + rev = "44d5977570280763ee1fecdb920736715bad58a3"; + sha256 = "sha256-w++v3YlDZfpCHAbUQA/RftjRNGkz9J/zYoxZqRgtvnA="; }; - nativeBuildInputs = [ antlr3_4 cmake ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ zlib ]; @@ -36,11 +36,11 @@ stdenv.mkDerivation rec { "-Wno-error=stringop-overflow" ]; - propagatedBuildInputs = [ libantlr3c mbedtls bctoolbox ]; + propagatedBuildInputs = [ libantlr3c mbedtls bctoolbox belr ]; meta = with lib; { homepage = "https://linphone.org/technical-corner/belle-sip"; - description = "Modern library implementing SIP (RFC 3261) transport, transaction and dialog layers"; + description = "Modern library implementing SIP (RFC 3261) transport, transaction and dialog layers. Part of the Linphone project."; license = licenses.gpl3Plus; platforms = platforms.all; maintainers = with maintainers; [ jluttine ]; diff --git a/pkgs/development/libraries/belr/default.nix b/pkgs/development/libraries/belr/default.nix index 05d6573beb8ad..91f1c91e220cc 100644 --- a/pkgs/development/libraries/belr/default.nix +++ b/pkgs/development/libraries/belr/default.nix @@ -1,12 +1,13 @@ { bctoolbox , cmake , fetchFromGitLab -, lib, stdenv +, lib +, stdenv }: stdenv.mkDerivation rec { pname = "belr"; - version = "5.1.3"; + version = "5.1.12"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -24,7 +25,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DENABLE_STATIC=NO" ]; meta = with lib; { - description = "Belledonne Communications' language recognition library"; + description = "Belledonne Communications' language recognition library. Part of the Linphone project."; homepage = "https://gitlab.linphone.org/BC/public/belr"; license = licenses.gpl3Plus; platforms = platforms.all; diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index 1881f06aa4afd..34ab5554e74b2 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -32,7 +32,7 @@ assert enablePython -> stdenv.hostPlatform == stdenv.buildPlatform; assert enableNumpy -> enablePython; # Boost <1.69 can't be built on linux with clang >8, because pth was removed -assert with lib; ((stdenv.isLinux && toolset == "clang" && !(versionOlder stdenv.cc.version "8.0.0")) -> !(versionOlder version "1.69")); +assert with lib; (stdenv.isLinux && toolset == "clang" && versionAtLeast stdenv.cc.version "8.0.0") -> versionAtLeast version "1.69"; with lib; let @@ -143,7 +143,7 @@ stdenv.mkDerivation { stripLen = 1; extraPrefix = "libs/context/"; }) - ++ optional (and (versionAtLeast version "1.70") (!versionAtLeast version "1.73")) ./cmake-paths.patch + ++ optional (versionAtLeast version "1.70" && versionOlder version "1.73") ./cmake-paths.patch ++ optional (versionAtLeast version "1.73") ./cmake-paths-173.patch ++ optional (version == "1.77.0") (fetchpatch { url = "https://github.com/boostorg/math/commit/7d482f6ebc356e6ec455ccb5f51a23971bf6ce5b.patch"; diff --git a/pkgs/development/libraries/bzrtp/default.nix b/pkgs/development/libraries/bzrtp/default.nix index 29b665fec6287..3a6ef0e3562d9 100644 --- a/pkgs/development/libraries/bzrtp/default.nix +++ b/pkgs/development/libraries/bzrtp/default.nix @@ -2,12 +2,13 @@ , cmake , fetchFromGitLab , sqlite -, lib, stdenv +, lib +, stdenv }: stdenv.mkDerivation rec { pname = "bzrtp"; - version = "5.1.0"; + version = "5.1.12"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -22,12 +23,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; # Do not build static libraries - cmakeFlags = [ "-DENABLE_STATIC=NO" ]; - - NIX_CFLAGS_COMPILE = "-Wno-error=cast-function-type"; + cmakeFlags = [ "-DENABLE_STATIC=NO" "-DCMAKE_C_FLAGS=-Wno-error=cast-function-type" ]; meta = with lib; { - description = "An opensource implementation of ZRTP keys exchange protocol"; + description = "An opensource implementation of ZRTP keys exchange protocol. Part of the Linphone project."; homepage = "https://gitlab.linphone.org/BC/public/bzrtp"; license = licenses.gpl3Plus; platforms = platforms.all; diff --git a/pkgs/development/libraries/clucene-core/2.x.nix b/pkgs/development/libraries/clucene-core/2.x.nix index 52caa26c9c58b..861e9179e0948 100644 --- a/pkgs/development/libraries/clucene-core/2.x.nix +++ b/pkgs/development/libraries/clucene-core/2.x.nix @@ -20,11 +20,14 @@ stdenv.mkDerivation rec { ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "-D_CL_HAVE_GCC_ATOMIC_FUNCTIONS=0" "-D_CL_HAVE_NAMESPACES_EXITCODE=0" + "-D_CL_HAVE_NAMESPACES_EXITCODE__TRYRUN_OUTPUT=" "-D_CL_HAVE_NO_SNPRINTF_BUG_EXITCODE=0" - "-D_CL_HAVE_NO_SNWPRINTF_BUG_EXITCODE=0" + "-D_CL_HAVE_NO_SNPRINTF_BUG_EXITCODE__TRYRUN_OUTPUT=" "-D_CL_HAVE_TRY_BLOCKS_EXITCODE=0" + "-D_CL_HAVE_TRY_BLOCKS_EXITCODE__TRYRUN_OUTPUT=" "-D_CL_HAVE_PTHREAD_MUTEX_RECURSIVE=0" "-DLUCENE_STATIC_CONSTANT_SYNTAX_EXITCODE=0" + "-DLUCENE_STATIC_CONSTANT_SYNTAX_EXITCODE__TRYRUN_OUTPUT=" ]; patches = # From debian diff --git a/pkgs/development/libraries/entt/default.nix b/pkgs/development/libraries/entt/default.nix index c514e3d78003a..67886920cd37f 100644 --- a/pkgs/development/libraries/entt/default.nix +++ b/pkgs/development/libraries/entt/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "entt"; - version = "3.9.0"; + version = "3.10.0"; src = fetchFromGitHub { owner = "skypjack"; repo = "entt"; rev = "v${version}"; - sha256 = "sha256-7UeL8D+A0pH3TKNO5B8A1nhD7uDWeirHnHaI/YKVwyo="; + sha256 = "sha256-/4lc+/YiLPxrn+7Z67sEapYY0ocLWHPC8yeYD2VI+64="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/gdal/2.4.nix b/pkgs/development/libraries/gdal/2.4.nix index 0e57160f1947a..800c7797d1c06 100644 --- a/pkgs/development/libraries/gdal/2.4.nix +++ b/pkgs/development/libraries/gdal/2.4.nix @@ -78,5 +78,6 @@ stdenv.mkDerivation rec { license = lib.licenses.mit; maintainers = [ lib.maintainers.marcweber ]; platforms = with lib.platforms; linux ++ darwin; + broken = stdenv.isLinux; #r2000.cpp:824:13: error: expected primary-expression before '}' token }; } diff --git a/pkgs/development/libraries/goffice/default.nix b/pkgs/development/libraries/goffice/default.nix index 7dbc4157f6ee2..4428b077a47d3 100644 --- a/pkgs/development/libraries/goffice/default.nix +++ b/pkgs/development/libraries/goffice/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ libxslt librsvg ]; enableParallelBuilding = true; - doCheck = true; + doCheck = !stdenv.hostPlatform.isPower64; passthru = { updateScript = gnome.updateScript { diff --git a/pkgs/development/libraries/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/default.nix index d1c7233f0d488..9b67dd49c82bf 100644 --- a/pkgs/development/libraries/gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/default.nix @@ -13,6 +13,8 @@ gst-plugins-ugly = callPackage ./ugly { inherit CoreFoundation DiskArbitration IOKit; }; + gst-plugins-viperfx = callPackage ./viperfx { }; + gst-rtsp-server = callPackage ./rtsp-server { }; gst-libav = callPackage ./libav { }; diff --git a/pkgs/development/libraries/gstreamer/viperfx/default.nix b/pkgs/development/libraries/gstreamer/viperfx/default.nix new file mode 100644 index 0000000000000..83c7d75e98c1a --- /dev/null +++ b/pkgs/development/libraries/gstreamer/viperfx/default.nix @@ -0,0 +1,41 @@ +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, wrapGAppsHook +, gst_all_1 +, cmake +}: +stdenv.mkDerivation rec { + pname = "gst-plugins-viperfx"; + version = "unstable-2020-9-20"; + + src = fetchFromGitHub { + owner = "Audio4Linux"; + repo = "gst-plugin-viperfx"; + rev = "a5c1b03dfe1ab0822b717a5f9392e9f1237fdba0"; + sha256 = "sha256-0so4jV56nl3tZHuZpvtyMrpOZ4tNJ59Pyj6zbV5bJ5Y="; + }; + + nativeBuildInputs = [ cmake pkg-config wrapGAppsHook ]; + + propagatedBuildInputs = [ + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + ]; + + installPhase = '' + runHook preInstall + install -D libgstviperfx.so $out/lib/gstreamer-1.0/libgstviperfx.so + install -D $src/COPYING $out/share/licenses/gst-plugins-viperfx/LICENSE + runHook postInstall + ''; + + meta = with lib; { + description = "ViPER FX core wrapper plug-in for GStreamer1"; + homepage = "https://github.com/Audio4Linux/gst-plugin-viperfx"; + license = licenses.unfreeRedistributable; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ rewine ]; + }; +} diff --git a/pkgs/development/libraries/gtk/4.x.nix b/pkgs/development/libraries/gtk/4.x.nix index eaf6d5bf1b262..e59e471a51eb7 100644 --- a/pkgs/development/libraries/gtk/4.x.nix +++ b/pkgs/development/libraries/gtk/4.x.nix @@ -62,7 +62,7 @@ in stdenv.mkDerivation rec { pname = "gtk4"; - version = "4.6.2"; + version = "4.6.3"; outputs = [ "out" "dev" ] ++ lib.optionals x11Support [ "devdoc" ]; outputBin = "dev"; @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gtk/${lib.versions.majorMinor version}/gtk-${version}.tar.xz"; - sha256 = "/yY69gmlDrdgVmU1ktkpRZrvSBmkRMQ29tUsb2PB+uw="; + sha256 = "pXrNDkSCmBcA/fhllsdBPLYe9H915HR/2oCegjG42Ww="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/gusb/default.nix b/pkgs/development/libraries/gusb/default.nix index 449a7a17623b0..e3dac6c4ec70d 100644 --- a/pkgs/development/libraries/gusb/default.nix +++ b/pkgs/development/libraries/gusb/default.nix @@ -10,13 +10,13 @@ let in stdenv.mkDerivation rec { pname = "gusb"; - version = "0.3.7"; + version = "0.3.10"; outputs = [ "bin" "out" "dev" "devdoc" ]; src = fetchurl { url = "https://people.freedesktop.org/~hughsient/releases/libgusb-${version}.tar.xz"; - sha256 = "sha256-2l8l1oc2ImibM1FIbL4CjvwlRAP2Rt2BIl3+hULYxn0="; + sha256 = "sha256-DrC5qw+LugxZYxyAnDe2Fu806zyOAAsLm3HPEeSTG9w="; }; patches = [ diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix index e02a0be4d28d5..685a77bbd5985 100644 --- a/pkgs/development/libraries/gvfs/default.nix +++ b/pkgs/development/libraries/gvfs/default.nix @@ -43,11 +43,11 @@ stdenv.mkDerivation rec { pname = "gvfs"; - version = "1.50.0"; + version = "1.50.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "y8L1ZNLp8Ax2BnP0LWgDvOPggat/+0RW3v//upM5tN0="; + sha256 = "dPb0EU9kJJOEroNKv6tjkjGLdCLOUyFV1rSbrh/cQFY="; }; postPatch = '' diff --git a/pkgs/development/libraries/jarowinkler-cpp/default.nix b/pkgs/development/libraries/jarowinkler-cpp/default.nix new file mode 100644 index 0000000000000..f89c54121ca1d --- /dev/null +++ b/pkgs/development/libraries/jarowinkler-cpp/default.nix @@ -0,0 +1,41 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, catch2 +}: + +stdenv.mkDerivation rec { + pname = "jarowinkler-cpp"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "maxbachmann"; + repo = "jarowinkler-cpp"; + rev = "v${version}"; + hash = "sha256-6dIyCyoPs/2wHyGqlE+NC0pwz5ggS5edhN4Jbltx0jg="; + }; + + nativeBuildInputs = [ + cmake + ]; + + cmakeFlags = lib.optionals doCheck [ + "-DRAPIDFUZZ_BUILD_TESTING=ON" + ]; + + checkInputs = [ + catch2 + ]; + + # uses unreleased Catch2 version 3 + doCheck = false; + + meta = { + description = "Fast Jaro and Jaro-Winkler distance"; + homepage = "https://github.com/maxbachmann/jarowinkler-cpp"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/development/libraries/libadwaita/default.nix b/pkgs/development/libraries/libadwaita/default.nix index 447ad06e9b87d..f7bef8af2e4a3 100644 --- a/pkgs/development/libraries/libadwaita/default.nix +++ b/pkgs/development/libraries/libadwaita/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { pname = "libadwaita"; - version = "1.1.0"; + version = "1.1.1"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "devdoc"; # demo app @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { owner = "GNOME"; repo = "libadwaita"; rev = version; - hash = "sha256-+bgCD2jy3M0gEAtbB+nOptQGEXXkvk1idoggJz4UMy0="; + hash = "sha256-iCMCQyhCUhp1f20+Qost9nnmfIUFE0iLKMKT/PfwOd4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libechonest/default.nix b/pkgs/development/libraries/libechonest/default.nix index 29a0a63a03e7f..6f160bdb6dcc3 100644 --- a/pkgs/development/libraries/libechonest/default.nix +++ b/pkgs/development/libraries/libechonest/default.nix @@ -11,6 +11,9 @@ stdenv.mkDerivation rec { sha256 = "0xbavf9f355dl1d3qv59x4ryypqrdanh9xdvw2d0q66l008crdkq"; }; + # Fix build with GCC 11. + NIX_CFLAGS_COMPILE = [ "-std=c++14" ]; + patches = [ (fetchpatch { url = "https://github.com/lfranchi/libechonest/commit/009514f65044823ef29045397d4b58dd04d09977.patch"; diff --git a/pkgs/development/libraries/libhandy/default.nix b/pkgs/development/libraries/libhandy/default.nix index c1d81f8043c80..38e540efd4e94 100644 --- a/pkgs/development/libraries/libhandy/default.nix +++ b/pkgs/development/libraries/libhandy/default.nix @@ -15,6 +15,7 @@ , xvfb-run , gdk-pixbuf , librsvg +, libxml2 , hicolor-icon-theme , at-spi2-atk , at-spi2-core @@ -25,7 +26,7 @@ stdenv.mkDerivation rec { pname = "libhandy"; - version = "1.6.1"; + version = "1.6.2"; outputs = [ "out" @@ -38,7 +39,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-bqsDhEBNVr0bH6BZ2aCBF3d49q4ID/whIPKGVsp0YqQ="; + sha256 = "sha256-f6iaqoeWa20PX0700+/a9lTisB6ix84r1wMB0fn0LKM="; }; nativeBuildInputs = [ @@ -48,6 +49,8 @@ stdenv.mkDerivation rec { ninja pkg-config vala + ] ++ lib.optionals enableGlade [ + libxml2 # for xmllint ]; buildInputs = [ diff --git a/pkgs/development/libraries/libixp-hg/default.nix b/pkgs/development/libraries/libixp-hg/default.nix deleted file mode 100644 index 0aeef61dae9eb..0000000000000 --- a/pkgs/development/libraries/libixp-hg/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, stdenv, fetchurl, unzip, txt2tags }: - -stdenv.mkDerivation rec { - rev = "148"; - version = "hg-2012-12-02"; - pname = "libixp"; - - src = fetchurl { - url = "https://storage.googleapis.com/google-code-archive-source/v2/code.google.com/libixp/source-archive.zip"; - sha256 = "0kcdvdcrkw6q39v563ncis6d7ini64xbgn5fd3b4aa95fp9sj3is"; - }; - - configurePhase = '' - sed -i -e "s|^PREFIX.*=.*$|PREFIX = $out|" config.mk - ''; - - nativeBuildInputs = [ unzip ]; - buildInputs = [ txt2tags ]; - - meta = { - homepage = "http://repo.cat-v.org/libixp/"; # see also https://libs.suckless.org/deprecated/libixp - description = "Portable, simple C-language 9P client and server libary"; - maintainers = with lib.maintainers; [ kovirobi ]; - license = lib.licenses.mit; - platforms = with lib.platforms; unix; - }; -} diff --git a/pkgs/development/libraries/libixp/default.nix b/pkgs/development/libraries/libixp/default.nix new file mode 100644 index 0000000000000..255f4ef30569a --- /dev/null +++ b/pkgs/development/libraries/libixp/default.nix @@ -0,0 +1,28 @@ +{ lib, stdenv, fetchFromGitHub, unzip, txt2tags }: + +stdenv.mkDerivation rec { + pname = "libixp"; + version = "unstable-2022-04-04"; + + src = fetchFromGitHub { + owner = "0intro"; + repo = "libixp"; + rev = "ca2acb2988e4f040022f0e2094c69ab65fa6ec53"; + hash = "sha256-S25DmXJ7fN0gXLV0IzUdz8hXPTYEHmaSG7Mnli6GQVc="; + }; + + postConfigure = '' + sed -i -e "s|^PREFIX.*=.*$|PREFIX = $out|" config.mk + ''; + + nativeBuildInputs = [ unzip ]; + buildInputs = [ txt2tags ]; + + meta = { + homepage = "https://github.com/0intro/libixp"; + description = "Portable, simple C-language 9P client and server libary"; + maintainers = with lib.maintainers; [ kovirobi ]; + license = lib.licenses.mit; + platforms = with lib.platforms; unix; + }; +} diff --git a/pkgs/development/libraries/libjcat/default.nix b/pkgs/development/libraries/libjcat/default.nix index f40898d11815f..ca4509ff3cc26 100644 --- a/pkgs/development/libraries/libjcat/default.nix +++ b/pkgs/development/libraries/libjcat/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ stdenv +, lib , fetchFromGitHub , docbook_xml_dtd_43 , docbook-xsl-nons @@ -18,7 +19,7 @@ stdenv.mkDerivation rec { pname = "libjcat"; - version = "0.1.10"; + version = "0.1.11"; outputs = [ "bin" "out" "dev" "devdoc" "man" "installedTests" ]; @@ -26,7 +27,7 @@ stdenv.mkDerivation rec { owner = "hughsie"; repo = "libjcat"; rev = version; - sha256 = "sha256-6fqcP8LWvRoDf5gJz+kW0w5+3PP/luuoPMak1QLKzzM="; + sha256 = "2kdoOwgaLpo/Cp3wkCMgdyQ++BC3Cn7CRhXhVCHn/iM="; }; patches = [ diff --git a/pkgs/development/libraries/liblinphone/default.nix b/pkgs/development/libraries/liblinphone/default.nix index 2d4a1004d87fd..89a23dccc7e8e 100644 --- a/pkgs/development/libraries/liblinphone/default.nix +++ b/pkgs/development/libraries/liblinphone/default.nix @@ -16,6 +16,7 @@ , graphviz , gtk2 , intltool +, jsoncpp , libexosip , libmatroska , libnotify @@ -34,11 +35,12 @@ , pkg-config , python3 , readline -, soci +, bc-soci , boost , speex , sqlite -, lib, stdenv +, lib +, stdenv , udev , xercesc , xsd @@ -47,7 +49,7 @@ stdenv.mkDerivation rec { pname = "liblinphone"; - version = "4.5.17"; + version = "5.1.22"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -55,9 +57,11 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-ryyT4bG3lnE72ydvCAoiT3IeHY4mZwX9nCqaTRC1wyc="; + sha256 = "sha256-hTyp/fUA1+7J1MtqX33kH8Vn1XNjx51Wy5REvrpdJTY="; }; + patches = [ ./use-normal-jsoncpp.patch ]; + # Do not build static libraries cmakeFlags = [ "-DENABLE_STATIC=NO" ]; @@ -66,12 +70,24 @@ stdenv.mkDerivation rec { # of them might not be needed for liblinphone alone. buildInputs = [ (python3.withPackages (ps: [ ps.pystache ps.six ])) + + # Made by BC bcg729 bctoolbox belcard belle-sip belr bzrtp + lime + mediastreamer + ortp + + # Vendored by BC + bc-soci + + # Vendored by BC but we use upstream, might cause problems + libmatroska + cairo cyrus_sasl ffmpeg @@ -80,20 +96,15 @@ stdenv.mkDerivation rec { gtk2 libX11 libexosip - libmatroska libnotify libosip libsoup libupnp libxml2 - lime mbedtls - mediastreamer openldap - ortp pango readline - soci boost speex sqlite @@ -101,10 +112,13 @@ stdenv.mkDerivation rec { xercesc xsd zlib + jsoncpp ]; nativeBuildInputs = [ + # Made by BC bcunit + cmake doxygen graphviz diff --git a/pkgs/development/libraries/liblinphone/use-normal-jsoncpp.patch b/pkgs/development/libraries/liblinphone/use-normal-jsoncpp.patch new file mode 100644 index 0000000000000..4685b327ecd34 --- /dev/null +++ b/pkgs/development/libraries/liblinphone/use-normal-jsoncpp.patch @@ -0,0 +1,57 @@ +From ea6901c9ed0f804bd2d6d09e514610518c2f4f09 Mon Sep 17 00:00:00 2001 +From: Lorenz Brun <lorenz@brun.one> +Date: Fri, 18 Mar 2022 17:36:22 +0100 +Subject: [PATCH] Use normal jsoncpp + +--- + src/CMakeLists.txt | 6 +++--- + tester/CMakeLists.txt | 2 +- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 5cd87fe9a..822b2151e 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -34,7 +34,7 @@ if (ENABLE_FLEXIAPI) + if (XCODE) + list(APPEND LINK_LIBS jsoncpp_static) + else() +- list(APPEND LINK_LIBS jsoncpp_object) ++ list(APPEND LINK_LIBS jsoncpp) + endif() + endif() + +@@ -592,7 +592,7 @@ if(ENABLE_STATIC) + if (XCODE) + target_link_libraries(linphone PRIVATE jsoncpp_static) + else() +- target_link_libraries(linphone PRIVATE jsoncpp_object) ++ target_link_libraries(linphone PRIVATE jsoncpp) + endif() + endif() + +@@ -646,7 +646,7 @@ if(ENABLE_SHARED) + if (XCODE) + target_link_libraries(linphone PRIVATE jsoncpp_static) + else() +- target_link_libraries(linphone PRIVATE jsoncpp_object) ++ target_link_libraries(linphone PRIVATE jsoncpp) + endif() + endif() + +diff --git a/tester/CMakeLists.txt b/tester/CMakeLists.txt +index b97042678..b4c5a5794 100644 +--- a/tester/CMakeLists.txt ++++ b/tester/CMakeLists.txt +@@ -34,7 +34,7 @@ if (ENABLE_FLEXIAPI) + if (XCODE) + list(APPEND OTHER_LIBS_FOR_TESTER jsoncpp_static) + else() +- list(APPEND OTHER_LIBS_FOR_TESTER jsoncpp_object) ++ list(APPEND OTHER_LIBS_FOR_TESTER jsoncpp) + endif() + endif() + +-- +2.25.1 + diff --git a/pkgs/development/libraries/libnftnl/default.nix b/pkgs/development/libraries/libnftnl/default.nix index 2c351181ee22b..66134eaffe094 100644 --- a/pkgs/development/libraries/libnftnl/default.nix +++ b/pkgs/development/libraries/libnftnl/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A userspace library providing a low-level netlink API to the in-kernel nf_tables subsystem"; - homepage = "http://netfilter.org/projects/libnftnl"; + homepage = "https://netfilter.org/projects/libnftnl/"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ fpletz ajs124 ]; diff --git a/pkgs/development/libraries/libosmscout/default.nix b/pkgs/development/libraries/libosmscout/default.nix index b11ec3eb94c1d..76a1ba534b71c 100644 --- a/pkgs/development/libraries/libosmscout/default.nix +++ b/pkgs/development/libraries/libosmscout/default.nix @@ -1,20 +1,21 @@ -{ lib, mkDerivation, fetchgit, cmake, pkg-config -, marisa, qtlocation }: +{ lib, mkDerivation, fetchFromGitHub, cmake, pkg-config +, marisa, qttools, qtlocation }: mkDerivation rec { pname = "libosmscout"; - version = "2017.06.30"; + version = "2022.04.25"; - src = fetchgit { - url = "git://git.code.sf.net/p/libosmscout/code"; - rev = "0c0fde4d9803539c99911389bc918377a93f350c"; - sha256 = "1pa459h52kw88mvsdvkz83f4p35vvgsfy2qfjwcj61gj4y9d2rq4"; + src = fetchFromGitHub { + owner = "Framstag"; + repo = "libosmscout"; + rev = "4c3b28472864b8e9cdda80a05ec73ef22cb39323"; + sha256 = "sha256-Qe5TkF4BwlsEI7emC0gdc7SmS4QrSGLiO0QdjuJA09g="; }; cmakeFlags = [ "-DOSMSCOUT_BUILD_TESTS=OFF" ]; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ marisa qtlocation ]; + buildInputs = [ marisa qttools qtlocation ]; meta = with lib; { description = "Simple, high-level interfaces for offline location and POI lokup, rendering and routing functionalities based on OpenStreetMap (OSM) data"; diff --git a/pkgs/development/libraries/libslirp/default.nix b/pkgs/development/libraries/libslirp/default.nix index f4eaa9c31993c..06fb0d41b8bc1 100644 --- a/pkgs/development/libraries/libslirp/default.nix +++ b/pkgs/development/libraries/libslirp/default.nix @@ -9,14 +9,14 @@ stdenv.mkDerivation rec { pname = "libslirp"; - version = "4.6.1"; + version = "4.7.0"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "slirp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-AM6NxO4hjFiUAzRYbXV3fe18xwCBmzdM63n93UOxjKw="; + sha256 = "sha256-avUbgXPPV3IhUwZyARxCvctbVlLqDKWmMhAjdVBA3jY="; }; nativeBuildInputs = [ meson ninja pkg-config ]; diff --git a/pkgs/development/libraries/libviperfx/default.nix b/pkgs/development/libraries/libviperfx/default.nix new file mode 100644 index 0000000000000..3c980823f410c --- /dev/null +++ b/pkgs/development/libraries/libviperfx/default.nix @@ -0,0 +1,30 @@ +{ lib, stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "libviperfx"; + version = "unstable-2018-01-15"; + + src = fetchFromGitHub { + owner = "vipersaudio"; + repo = "viperfx_core_binary"; + rev = "6f7d0da725affe854f083baf5d90c70e172e4488"; + sha256 = "sha256-hfX46Kk91eQgiO3uhew91I6eEHxazhdGwSkhfNZ+HvQ="; + }; + + dontBuild = true; + + installPhase = '' + runHook preInstall + install -D libviperfx_x64_linux.so $out/lib/libviperfx.so + install -D README.md $out/share/licenses/libviperfx/LICENSE + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/vipersaudio/viperfx_core_binary"; + description = "The ViPER FX core"; + license = licenses.unfreeRedistributable; + maintainers = with maintainers; [ rewine ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/development/libraries/libxmlb/default.nix b/pkgs/development/libraries/libxmlb/default.nix index 80d6129f18a83..c7dbfc8889c99 100644 --- a/pkgs/development/libraries/libxmlb/default.nix +++ b/pkgs/development/libraries/libxmlb/default.nix @@ -1,9 +1,8 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch , docbook_xml_dtd_43 -, docbook_xsl +, docbook-xsl-nons , glib , gobject-introspection , gtk-doc @@ -18,7 +17,7 @@ stdenv.mkDerivation rec { pname = "libxmlb"; - version = "0.3.7"; + version = "0.3.8"; outputs = [ "out" "lib" "dev" "devdoc" "installedTests" ]; @@ -26,23 +25,16 @@ stdenv.mkDerivation rec { owner = "hughsie"; repo = "libxmlb"; rev = version; - sha256 = "sha256-ZzA1YJYxTR91X79NU9dWd11Ze+PX2wuZeumuEuNdC48="; + sha256 = "vT/NGFDzP0ut+TKD8pYVQrjTkepzKEJUo3uKF4MX334="; }; patches = [ ./installed-tests-path.patch - # Fix darwin build, can be removed on next release - # `--version-script` isn't supported by the macOS linker - # https://github.com/hughsie/libxmlb/pull/119 - (fetchpatch { - url = "https://github.com/hughsie/libxmlb/commit/d83aac5bd78cfbbfa2ecd428ff54b811071dfe4d.patch"; - sha256 = "sha256-UNRMbyNzdxfTZ8xV6J8a622hPnr3mowooP1q8Dg19yw="; - }) ]; nativeBuildInputs = [ docbook_xml_dtd_43 - docbook_xsl + docbook-xsl-nons gobject-introspection gtk-doc meson diff --git a/pkgs/development/libraries/libyang/default.nix b/pkgs/development/libraries/libyang/default.nix index d6efe0543db76..cedc24909bcae 100644 --- a/pkgs/development/libraries/libyang/default.nix +++ b/pkgs/development/libraries/libyang/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "libyang"; - version = "2.0.112"; + version = "2.0.164"; src = fetchFromGitHub { owner = "CESNET"; repo = "libyang"; rev = "v${version}"; - sha256 = "sha256-f8x0tC3XcQ9fnUE987GYw8qEo/B+J759vpCImqG3QWs="; + sha256 = "sha256-0Ou0j9KaNkX/SFmid+wphvtu3wDTXkw+8xdck6lEE3w="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/lime/default.nix b/pkgs/development/libraries/lime/default.nix index 7e7edff6bffb7..1d6a94a828a08 100644 --- a/pkgs/development/libraries/lime/default.nix +++ b/pkgs/development/libraries/lime/default.nix @@ -3,7 +3,7 @@ , cmake , fetchFromGitLab , lib -, soci +, bc-soci , sqlite , boost , stdenv @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { pname = "lime"; - version = "5.0.53"; + version = "5.1.12"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -19,17 +19,27 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-M+KdauIVsN3c+cEPw4CaMzXnQZwAPNXeJCriuk9NCWM="; + sha256 = "sha256-vgaxb8sfgtAhqG8kg3C4+UrTOHyTVR9QVO9iuKFgSBk="; }; - buildInputs = [ bctoolbox soci belle-sip sqlite boost ]; + buildInputs = [ + # Made by BC + bctoolbox + belle-sip + + # Vendored by BC + bc-soci + + sqlite + boost + ]; nativeBuildInputs = [ cmake ]; # Do not build static libraries cmakeFlags = [ "-DENABLE_STATIC=NO" ]; meta = with lib; { - description = "End-to-end encryption library for instant messaging"; + description = "End-to-end encryption library for instant messaging. Part of the Linphone project."; homepage = "http://www.linphone.org/technical-corner/lime"; license = licenses.gpl3Only; platforms = platforms.all; diff --git a/pkgs/development/libraries/mapbox-gl-qml/default.nix b/pkgs/development/libraries/mapbox-gl-qml/default.nix index 49a7f26220dd8..a9a2ad64d7adc 100644 --- a/pkgs/development/libraries/mapbox-gl-qml/default.nix +++ b/pkgs/development/libraries/mapbox-gl-qml/default.nix @@ -6,31 +6,28 @@ , curl , qtbase , qtlocation -, mapbox-gl-native +, maplibre-gl-native }: mkDerivation rec { pname = "mapbox-gl-qml"; - version = "1.7.7.1"; + version = "2.0.1"; src = fetchFromGitHub { owner = "rinigus"; repo = "mapbox-gl-qml"; rev = version; - hash = "sha256-lmL9nawMY8rNNBV4zNF4N1gn9XZzIZ9Cw2ZRs9bjBaI="; + hash = "sha256-EVZbQXV8pI0QTqFDTTynVglsqX1O5oK0Pl5Y/wp+/q0="; }; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ curl qtlocation mapbox-gl-native ]; + buildInputs = [ curl qtlocation maplibre-gl-native ]; postPatch = '' substituteInPlace src/CMakeLists.txt \ --replace ' ''${QT_INSTALL_QML}' " $out/${qtbase.qtQmlPrefix}" ''; - # Package expects qt5 subdirectory of mapbox-gl-native to be in the include path - NIX_CFLAGS_COMPILE = "-I${mapbox-gl-native}/include/qt5"; - meta = with lib; { description = "Unofficial Mapbox GL Native bindings for Qt QML"; homepage = "https://github.com/rinigus/mapbox-gl-qml"; diff --git a/pkgs/development/libraries/maplibre-gl-native/default.nix b/pkgs/development/libraries/maplibre-gl-native/default.nix new file mode 100644 index 0000000000000..c680f6822b5dc --- /dev/null +++ b/pkgs/development/libraries/maplibre-gl-native/default.nix @@ -0,0 +1,66 @@ +{ lib +, mkDerivation +, fetchFromGitHub +, fetchpatch +, cmake +, pkg-config +, qtbase +, curl +, libuv +, glfw3 +, rapidjson +}: + +mkDerivation rec { + pname = "maplibre-gl-native"; + version = "unstable-2022-04-07"; + + src = fetchFromGitHub { + owner = "maplibre"; + repo = "maplibre-gl-native"; + rev = "225f8a4bfe7ad30fd59d693c1fb3ca0ba70d2806"; + fetchSubmodules = true; + hash = "sha256-NLtpi+bDLTHlnzMZ4YFQyF5B1xt9lzHyZPvEQLlBAnY="; + }; + + patches = [ + (fetchpatch { + name = "skip-license-check.patch"; + url = "https://git.alpinelinux.org/aports/plain/testing/mapbox-gl-native/0002-skip-license-check.patch?id=6751a93dca26b0b3ceec9eb151272253a2fe497e"; + sha256 = "1yybwzxbvn0lqb1br1fyg7763p2h117s6mkmywkl4l7qg9daa7ba"; + }) + ]; + + postPatch = '' + # don't use vendored rapidjson + rm -r vendor/mapbox-base/extras/rapidjson + ''; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + curl + libuv + glfw3 + qtbase + rapidjson + ]; + + cmakeFlags = [ + "-DMBGL_WITH_QT=ON" + "-DMBGL_WITH_QT_LIB_ONLY=ON" + "-DMBGL_WITH_QT_HEADLESS=OFF" + ]; + + meta = with lib; { + description = "Open-source alternative to Mapbox GL Native"; + homepage = "https://maplibre.org/"; + license = licenses.bsd2; + maintainers = with maintainers; [ dotlambda ]; + platforms = platforms.linux; + broken = lib.versionOlder qtbase.version "5.15"; + }; +} diff --git a/pkgs/development/libraries/mediastreamer/default.nix b/pkgs/development/libraries/mediastreamer/default.nix index aa584deddb812..2d9c559bcba83 100644 --- a/pkgs/development/libraries/mediastreamer/default.nix +++ b/pkgs/development/libraries/mediastreamer/default.nix @@ -25,6 +25,8 @@ , ortp , pkg-config , python3 +, qtbase +, qtdeclarative , SDL , speex , srtp @@ -33,7 +35,9 @@ stdenv.mkDerivation rec { pname = "mediastreamer2"; - version = "4.5.15"; + version = "5.1.20"; + + dontWrapQtApps = true; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -41,7 +45,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-n/EuXEQ9nJKC32PMvWkfP1G+E6uQQuu1/A168n8/cIY="; + sha256 = "sha256-u8YqF5BzyYIF9+XB90Eu6DlwXuu1FDOJUzxebj0errU="; }; patches = [ @@ -59,12 +63,20 @@ stdenv.mkDerivation rec { intltool pkg-config python3 + qtbase + qtdeclarative ]; propagatedBuildInputs = [ - alsa-lib + # Made by BC bctoolbox bzrtp + ortp + + # Vendored by BC but we use upstream, might cause problems + libmatroska + + alsa-lib ffmpeg glew gsm @@ -73,7 +85,6 @@ stdenv.mkDerivation rec { libX11 libXext libXv - libmatroska libopus libpcap libpulseaudio @@ -81,7 +92,6 @@ stdenv.mkDerivation rec { libupnp libv4l libvpx - ortp SDL speex srtp @@ -89,22 +99,17 @@ stdenv.mkDerivation rec { strictDeps = true; - # Do not build static libraries - cmakeFlags = [ "-DENABLE_STATIC=NO" ]; - - NIX_CFLAGS_COMPILE = [ - "-DGIT_VERSION=\"v${version}\"" - "-Wno-error=deprecated-declarations" - "-Wno-error=cast-function-type" - "-Wno-error=stringop-truncation" - "-Wno-error=stringop-overflow" - ] ++ lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "11") [ - "-Wno-error=stringop-overread" + cmakeFlags = [ + "-DENABLE_STATIC=NO" # Do not build static libraries + "-DENABLE_QT_GL=ON" # Build necessary MSQOGL plugin for Linphone desktop + "-DCMAKE_C_FLAGS=-DGIT_VERSION=\"v${version}\"" + "-DENABLE_STRICT=NO" # Disable -Werror ]; + NIX_LDFLAGS = "-lXext"; meta = with lib; { - description = "A powerful and lightweight streaming engine specialized for voice/video telephony applications"; + description = "A powerful and lightweight streaming engine specialized for voice/video telephony applications. Part of the Linphone project"; homepage = "http://www.linphone.org/technical-corner/mediastreamer2"; license = licenses.gpl3Only; platforms = platforms.linux; diff --git a/pkgs/development/libraries/mediastreamer/msopenh264.nix b/pkgs/development/libraries/mediastreamer/msopenh264.nix index 08842889f8651..17f537b4d8734 100644 --- a/pkgs/development/libraries/mediastreamer/msopenh264.nix +++ b/pkgs/development/libraries/mediastreamer/msopenh264.nix @@ -5,22 +5,21 @@ , mediastreamer , openh264 , pkg-config -, lib, stdenv +, lib +, stdenv }: stdenv.mkDerivation rec { pname = "msopenh264"; - # Using master branch for linphone-desktop caused a chain reaction that many - # of its dependencies needed to use master branch too. - version = "unstable-2020-03-03"; + version = "linphone-4.4.1"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; owner = "public"; group = "BC"; repo = pname; - rev = "2c3abf52824ad23a4caae7565ef158ef91767704"; - sha256 = "140hs5lzpshzswvl39klcypankq3v2qck41696j22my7s4wsa0hr"; + rev = "5603a432be2ed10f5d5a5ce068ef83ab2a996d6b"; + sha256 = "sha256-AqZ7tsNZw2Djgyo1JBJbT/c3eQVyEn6r3CT6DQLD/B8="; }; nativeBuildInputs = [ autoreconfHook cmake pkg-config ]; @@ -40,7 +39,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "H.264 encoder/decoder plugin for mediastreamer2"; + description = "H.264 encoder/decoder plugin for mediastreamer2. Part of the Linphone project."; homepage = "https://www.linphone.org/technical-corner/mediastreamer2"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/development/libraries/mimetic/default.nix b/pkgs/development/libraries/mimetic/default.nix index 1638caa0d1f8b..5a965c3d7d92b 100644 --- a/pkgs/development/libraries/mimetic/default.nix +++ b/pkgs/development/libraries/mimetic/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, cutee }: +{ lib, stdenv, fetchurl, fetchpatch, cutee }: stdenv.mkDerivation rec { pname = "mimetic"; @@ -11,7 +11,13 @@ stdenv.mkDerivation rec { buildInputs = [ cutee ]; - patches = lib.optional stdenv.isAarch64 ./narrowing.patch; + patches = [ + # Fix build with gcc11 + (fetchpatch { + url = "https://github.com/tat/mimetic/commit/bf84940f9021950c80846e6b1a5f8b0b55991b00.patch"; + sha256 = "sha256-1JW9zPg67BgNsdIjK/jp9j7QMg50eRMz5FsDsbbzBlI="; + }) + ] ++ lib.optional stdenv.isAarch64 ./narrowing.patch; meta = with lib; { description = "MIME handling library"; diff --git a/pkgs/development/libraries/mlt/qt-5.nix b/pkgs/development/libraries/mlt/qt-5.nix index 5c58aa4f8aec6..11a63a3cd5ce4 100644 --- a/pkgs/development/libraries/mlt/qt-5.nix +++ b/pkgs/development/libraries/mlt/qt-5.nix @@ -71,6 +71,7 @@ mkDerivation rec { passthru.updateScript = gitUpdater { inherit pname version; + attrPath = "libsForQt5.mlt"; rev-prefix = "v"; }; diff --git a/pkgs/development/libraries/nghttp3/default.nix b/pkgs/development/libraries/nghttp3/default.nix index d9608b8e14047..6a2ae909a0c06 100644 --- a/pkgs/development/libraries/nghttp3/default.nix +++ b/pkgs/development/libraries/nghttp3/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "nghttp3"; - version = "unstable-2022-04-10"; + version = "0.4.0"; src = fetchFromGitHub { owner = "ngtcp2"; repo = pname; - rev = "1e4bef2cc45b1fd3971ca3606d08a1e1d1567b1a"; - sha256 = "sha256-DHNxtu4X0S8l1ADwRJC3yQ+Z1ja3FT0Zb/boRh6PvYw="; + rev = "v${version}"; + sha256 = "sha256-toGTkgJLdSLNWCPJFpT63IxF3xANbvtkhJo5NUg/ZBg="; }; nativeBuildInputs = [ autoreconfHook pkg-config file ]; diff --git a/pkgs/development/libraries/ngtcp2/default.nix b/pkgs/development/libraries/ngtcp2/default.nix index cb11df7f032cf..4b08a91864729 100644 --- a/pkgs/development/libraries/ngtcp2/default.nix +++ b/pkgs/development/libraries/ngtcp2/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "ngtcp2"; - version = "unstable-2022-04-11"; + version = "0.4.0"; src = fetchFromGitHub { owner = "ngtcp2"; repo = pname; - rev = "825899c051ea2a1f06a0c4617f41782f37009a18"; - sha256 = "sha256-VoSy0tyIXWNTmcVdsaiM9ijXLq41AOaPBajvsEIrfjo="; + rev = "v${version}"; + sha256 = "sha256-nmVVK2lpz01hgSxPAMmBfF+nNVZu9PWRGzCWh/5yhj8="; }; nativeBuildInputs = [ autoreconfHook pkg-config file ]; diff --git a/pkgs/development/libraries/opendht/default.nix b/pkgs/development/libraries/opendht/default.nix index 2cd76a7ca78bb..c588685eb9960 100644 --- a/pkgs/development/libraries/opendht/default.nix +++ b/pkgs/development/libraries/opendht/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "opendht"; - version = "2.3.5"; + version = "2.4.0"; src = fetchFromGitHub { owner = "savoirfairelinux"; repo = "opendht"; rev = version; - sha256 = "sha256-GGaq8ziOCUDMxILq2QYUkSP4usBjbufbHwQF4Pr6hHw="; + sha256 = "sha256-vfMzUzTfz8G+E4W/1pX5v2P0RntgSTR61urmxtsrOWM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/openfst/default.nix b/pkgs/development/libraries/openfst/default.nix index 599d1cad0cc50..cf49842291296 100644 --- a/pkgs/development/libraries/openfst/default.nix +++ b/pkgs/development/libraries/openfst/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "openfst"; - version = "1.8.1"; + version = "1.8.2"; src = fetchurl { url = "http://www.openfst.org/twiki/pub/FST/FstDownload/${pname}-${version}.tar.gz"; - sha256 = "sha256-JPtTtyu2h+P6julscqMf8pINmbmAoKj2HdpCb8pnE/A="; + sha256 = "sha256-3ph782JHIcXVujIa+VdRiY5PS7Qcijbi1k8GJ2Vti0I="; }; configureFlags = [ diff --git a/pkgs/development/libraries/openjpeg/default.nix b/pkgs/development/libraries/openjpeg/default.nix index 32bfa6f245841..b26738c9ea154 100644 --- a/pkgs/development/libraries/openjpeg/default.nix +++ b/pkgs/development/libraries/openjpeg/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libpng libtiff lcms2 ]; - doCheck = (testsSupport && !stdenv.isAarch64); # tests fail on aarch64-linux + doCheck = (testsSupport && !stdenv.isAarch64 && !stdenv.hostPlatform.isPower64); # tests fail on aarch64-linux and powerpc64 checkPhase = '' substituteInPlace ../tools/ctest_scripts/travis-ci.cmake \ --replace "JPYLYZER_EXECUTABLE=" "JPYLYZER_EXECUTABLE=\"${jpylyzer}/bin/jpylyzer\" # " diff --git a/pkgs/development/libraries/ortp/default.nix b/pkgs/development/libraries/ortp/default.nix index af924ad80d261..ada36487135fb 100644 --- a/pkgs/development/libraries/ortp/default.nix +++ b/pkgs/development/libraries/ortp/default.nix @@ -1,12 +1,13 @@ { bctoolbox , cmake , fetchFromGitLab -, lib, stdenv +, lib +, stdenv }: stdenv.mkDerivation rec { pname = "ortp"; - version = "4.5.1"; + version = "5.1.12"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -14,7 +15,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "1lc1j7wvkyp5lhcflq3h5y7n8aiwgwj84ffm81ggbsmavamgwkk7"; + sha256 = "sha256-CD9xn1m6zpUEC+shmNeWfGAJxNto87UbznD+TLdeuEg="; }; # Do not build static libraries @@ -26,7 +27,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; meta = with lib; { - description = "A Real-Time Transport Protocol (RFC3550) stack"; + description = "A Real-Time Transport Protocol (RFC3550) stack. Part of the Linphone project."; homepage = "https://linphone.org/technical-corner/ortp"; license = licenses.gpl3Plus; platforms = platforms.all; diff --git a/pkgs/development/libraries/poppler/0.61-CVE-2019-9959.patch b/pkgs/development/libraries/poppler/0.61-CVE-2019-9959.patch deleted file mode 100644 index 5c2af7a2adc20..0000000000000 --- a/pkgs/development/libraries/poppler/0.61-CVE-2019-9959.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/poppler/JPEG2000Stream.cc b/poppler/JPEG2000Stream.cc ---- a/poppler/JPEG2000Stream.cc -+++ b/poppler/JPEG2000Stream.cc -@@ -201,7 +201,7 @@ void JPXStream::init() - if (getDict()) smaskInData = getDict()->lookup("SMaskInData"); - - int bufSize = BUFFER_INITIAL_SIZE; -- if (oLen.isInt()) bufSize = oLen.getInt(); -+ if (oLen.isInt() && oLen.getInt() > 0) bufSize = oLen.getInt(); - - if (cspace.isArray() && cspace.arrayGetLength() > 0) { - -@@ -365,7 +365,7 @@ void JPXStream::init() - } - - int bufSize = BUFFER_INITIAL_SIZE; -- if (oLen.isInt()) bufSize = oLen.getInt(); -+ if (oLen.isInt() && oLen.getInt() > 0) bufSize = oLen.getInt(); - - if (cspace.isArray() && cspace.arrayGetLength() > 0) { diff --git a/pkgs/development/libraries/poppler/0.61.nix b/pkgs/development/libraries/poppler/0.61.nix deleted file mode 100644 index e46da53f68dc4..0000000000000 --- a/pkgs/development/libraries/poppler/0.61.nix +++ /dev/null @@ -1,94 +0,0 @@ -{ stdenv -, lib -, fetchurl -, fetchpatch -, cairo -, cmake -, curl -, fontconfig -, freetype -, lcms -, libiconv -, libintl -, libjpeg -, ninja -, openjpeg -, pkg-config -, zlib -, withData ? true, poppler_data -, qt5Support ? false, qtbase ? null -, introspectionSupport ? false, gobject-introspection ? null -, utils ? false -, minimal ? false, suffix ? "glib" -}: - -let - version = "0.61.1"; - mkFlag = optset: flag: "-DENABLE_${flag}=${if optset then "on" else "off"}"; -in -stdenv.mkDerivation rec { - pname = "poppler-${suffix}"; - inherit version; - - src = fetchurl { - url = "https://poppler.freedesktop.org/poppler-${version}.tar.xz"; - sha256 = "1afdrxxkaivvviazxkg5blsf2x24sjkfj92ib0d3q5pm8dihjrhj"; - }; - - outputs = [ "out" "dev" ]; - - patches = [ - # Fix internal crash: a negative number that should not be - (fetchpatch { - name = "CVE-2018-13988"; - url = "https://cgit.freedesktop.org/poppler/poppler/patch/?id=004e3c10df0abda214f0c293f9e269fdd979c5ee"; - sha256 = "1l8713s57xc6g81bldw934rsfm140fqc7ggd50ha5mxdl1b3app2"; - }) - # Fix internal crash: a negative number that should not be (not the above!) - ./0.61-CVE-2019-9959.patch - ]; - - nativeBuildInputs = [ - cmake - ninja - pkg-config - ]; - - buildInputs = [ - libiconv - libintl - ] - ++ lib.optional withData poppler_data; - - # TODO: reduce propagation to necessary libs - propagatedBuildInputs = with lib; - [ zlib freetype fontconfig libjpeg openjpeg ] - ++ optionals (!minimal) [ cairo lcms curl ] - ++ optional qt5Support qtbase - ++ optional introspectionSupport gobject-introspection; - - # Not sure when and how to pass it. It seems an upstream bug anyway. - CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11"; - - cmakeFlags = [ - (mkFlag true "XPDF_HEADERS") - (mkFlag (!minimal) "GLIB") - (mkFlag (!minimal) "CPP") - (mkFlag (!minimal) "LIBCURL") - (mkFlag utils "UTILS") - (mkFlag qt5Support "QT5") - ]; - - dontWrapQtApps = true; - - meta = with lib; { - homepage = "https://poppler.freedesktop.org/"; - description = "A PDF rendering library"; - longDescription = '' - Poppler is a PDF rendering library based on the xpdf-3.0 code base. - ''; - license = licenses.gpl2Plus; - platforms = platforms.all; - maintainers = with maintainers; [ ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/proj/default.nix b/pkgs/development/libraries/proj/default.nix index 376cb36edd618..a8e42fb6fb178 100644 --- a/pkgs/development/libraries/proj/default.nix +++ b/pkgs/development/libraries/proj/default.nix @@ -7,36 +7,43 @@ , libtiff , curl , gtest +, nlohmann_json }: stdenv.mkDerivation rec { pname = "proj"; - version = "8.2.1"; + version = "9.0.0"; src = fetchFromGitHub { owner = "OSGeo"; repo = "PROJ"; rev = version; - hash = "sha256-tnaIqYKgYHY1Tg33jsKYn9QL8YUobgXKbQsodoCXNys="; + sha256 = "sha256-zMP+WzC65BFz8g8mF5t7toqxmxCJePysd6WJuqpe8yg="; }; - outputs = [ "out" "dev"]; + outputs = [ "out" "dev" ]; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ sqlite libtiff curl ]; + buildInputs = [ sqlite libtiff curl nlohmann_json ]; checkInputs = [ gtest ]; cmakeFlags = [ "-DUSE_EXTERNAL_GTEST=ON" "-DRUN_NETWORK_DEPENDENT_TESTS=OFF" + "-DNLOHMANN_JSON_ORIGIN=external" ]; - preCheck = '' - export HOME=$TMPDIR - export TMP=$TMPDIR - ''; + preCheck = + let + libPathEnvVar = if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; + in + '' + export HOME=$TMPDIR + export TMP=$TMPDIR + export ${libPathEnvVar}=$PWD/lib + ''; doCheck = true; diff --git a/pkgs/development/libraries/protolock/default.nix b/pkgs/development/libraries/protolock/default.nix index ef6338207e3f3..a9b45ddf61329 100644 --- a/pkgs/development/libraries/protolock/default.nix +++ b/pkgs/development/libraries/protolock/default.nix @@ -13,8 +13,6 @@ buildGoModule rec { vendorSha256 = "sha256-kgSJUSjY8kgrGCNDPgw1WA8KwAqI5koJQ0IcE+tC5nk="; - doCheck = false; - postInstall = '' rm $out/bin/plugin* ''; diff --git a/pkgs/development/libraries/qwt/default.nix b/pkgs/development/libraries/qwt/default.nix index 46cfc426efa47..e74f8300bf728 100644 --- a/pkgs/development/libraries/qwt/default.nix +++ b/pkgs/development/libraries/qwt/default.nix @@ -4,6 +4,8 @@ stdenv.mkDerivation rec { pname = "qwt"; version = "6.2.0"; + outputs = [ "out" "dev" ]; + src = fetchurl { url = "mirror://sourceforge/qwt/qwt-${version}.tar.bz2"; sha256 = "sha256-kZT2UTlV0P1zAPZxWBdQZEYBl6urGpL6EnpnpLC3FTA="; diff --git a/pkgs/development/libraries/rapidfuzz-cpp/default.nix b/pkgs/development/libraries/rapidfuzz-cpp/default.nix new file mode 100644 index 0000000000000..2e1ad8080fa44 --- /dev/null +++ b/pkgs/development/libraries/rapidfuzz-cpp/default.nix @@ -0,0 +1,41 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, catch2 +}: + +stdenv.mkDerivation rec { + pname = "rapidfuzz-cpp"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "maxbachmann"; + repo = "rapidfuzz-cpp"; + rev = "v${version}"; + hash = "sha256-331iW0nu5MlxuKNTgMkRSASnglxn+hEWBhRMnw0lY2Y="; + }; + + nativeBuildInputs = [ + cmake + ]; + + cmakeFlags = lib.optionals doCheck [ + "-DRAPIDFUZZ_BUILD_TESTING=ON" + ]; + + checkInputs = [ + catch2 + ]; + + # uses unreleased Catch2 version 3 + doCheck = false; + + meta = { + description = "Rapid fuzzy string matching in C++ using the Levenshtein Distance"; + homepage = "https://github.com/maxbachmann/rapidfuzz-cpp"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/development/libraries/redis-plus-plus/default.nix b/pkgs/development/libraries/redis-plus-plus/default.nix new file mode 100644 index 0000000000000..a39a9b185dca4 --- /dev/null +++ b/pkgs/development/libraries/redis-plus-plus/default.nix @@ -0,0 +1,38 @@ +{ lib, stdenv, fetchFromGitHub, cmake, hiredis +, enableShared ? !stdenv.hostPlatform.isStatic +, enableStatic ? stdenv.hostPlatform.isStatic +}: + +# You must build at one type of library +assert enableShared || enableStatic; + +stdenv.mkDerivation rec { + pname = "redis-plus-plus"; + version = "1.3.3"; + + src = fetchFromGitHub { + owner = "sewenew"; + repo = "redis-plus-plus"; + rev = version; + sha256 = "sha256-k4q5YbbbKKHXcL0nndzJPshzXS20ARz4Tdy5cBg7kMc="; + }; + + nativeBuildInputs = [ cmake ]; + propagatedBuildInputs = [ hiredis ]; + + cmakeFlags = [ + "-DREDIS_PLUS_PLUS_BUILD_TEST=OFF" + ] ++ lib.optional (!enableShared) [ + "-DREDIS_PLUS_PLUS_BUILD_SHARED=OFF" + ] ++ lib.optional (!enableStatic) [ + "-DREDIS_PLUS_PLUS_BUILD_STATIC=OFF" + ]; + + meta = with lib; { + homepage = "https://github.com/sewenew/redis-plus-plus"; + description = "Redis client written in C++"; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ wheelsandmetal ]; + }; +} diff --git a/pkgs/development/libraries/rocclr/default.nix b/pkgs/development/libraries/rocclr/default.nix index b55c2ef81527f..fb847b83fe958 100644 --- a/pkgs/development/libraries/rocclr/default.nix +++ b/pkgs/development/libraries/rocclr/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "rocclr"; - version = "5.0.2"; + version = "5.1.0"; src = fetchFromGitHub { owner = "ROCm-Developer-Tools"; repo = "ROCclr"; rev = "rocm-${version}"; - hash = "sha256-x6XwYxgiCoy6Q7gIevSTEWgUQ0aEjPFhKSqMqQahHig="; + hash = "sha256-SFWEGKffhuiTE7ICbkElVV5cldXu4Xbwvjb6LiNmijA="; }; prePatch = '' diff --git a/pkgs/development/libraries/rocm-comgr/default.nix b/pkgs/development/libraries/rocm-comgr/default.nix index 141c1b01d6f6d..6994b7cda3d1c 100644 --- a/pkgs/development/libraries/rocm-comgr/default.nix +++ b/pkgs/development/libraries/rocm-comgr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rocm-comgr"; - version = "5.0.2"; + version = "5.1.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCm-CompilerSupport"; rev = "rocm-${version}"; - hash = "sha256-EIBH7TXelo6mr+/vJ+iT+VLUVoQqWmNsgeN3Nwwr+tM="; + hash = "sha256-zlCM3Zue7MEhL1c0gUPwRNgdjzyyF9BEP3UxE8RYkKk="; }; sourceRoot = "source/lib/comgr"; diff --git a/pkgs/development/libraries/rocm-device-libs/default.nix b/pkgs/development/libraries/rocm-device-libs/default.nix index 773f98ee54a93..a8519d3d692b9 100644 --- a/pkgs/development/libraries/rocm-device-libs/default.nix +++ b/pkgs/development/libraries/rocm-device-libs/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "rocm-device-libs"; - version = "5.0.2"; + version = "5.1.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCm-Device-Libs"; rev = "rocm-${version}"; - hash = "sha256-eZdy9+BfuUVzPO6huvqcwCog96qMVTYoY3l6J0YMUZQ="; + hash = "sha256-kmCk+BpM1QCJzEAkru2LK3CGwVXNUEZBFicmwnrPcx8="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/rocm-runtime/default.nix b/pkgs/development/libraries/rocm-runtime/default.nix index aff0475c4a53a..d16966d213089 100644 --- a/pkgs/development/libraries/rocm-runtime/default.nix +++ b/pkgs/development/libraries/rocm-runtime/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "rocm-runtime"; - version = "5.0.1"; + version = "5.1.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCR-Runtime"; rev = "rocm-${version}"; - hash = "sha256-KOzVZNHtpwEOn7lZ36c4BGrImrq8dkUWRiHqGm+UTDk="; + hash = "sha256-MGm7YmnoFNk7VsxsbsUgSD9Y5r1OBm6Ycg3wXNme8EI="; }; sourceRoot = "source/src"; diff --git a/pkgs/development/libraries/rocm-thunk/default.nix b/pkgs/development/libraries/rocm-thunk/default.nix index 9ceb1360cda0e..c7280108159c8 100644 --- a/pkgs/development/libraries/rocm-thunk/default.nix +++ b/pkgs/development/libraries/rocm-thunk/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "rocm-thunk"; - version = "5.0.2"; + version = "5.1.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCT-Thunk-Interface"; rev = "rocm-${version}"; - hash = "sha256-hhDLy92jS/akp1Ozun45OEjVbVcjufkRIfC8bqqFjp4="; + hash = "sha256-Qvbvfe1fhoLTkDnzG0WzfAxbyDoEJwkzVvlBGTBkq0w="; }; preConfigure = '' diff --git a/pkgs/development/libraries/science/astronomy/indilib/default.nix b/pkgs/development/libraries/science/astronomy/indilib/default.nix index 60f5e51ae9578..d0cf27bef5bda 100644 --- a/pkgs/development/libraries/science/astronomy/indilib/default.nix +++ b/pkgs/development/libraries/science/astronomy/indilib/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "indilib"; - version = "1.9.4"; + version = "1.9.5"; src = fetchFromGitHub { owner = "indilib"; repo = "indi"; rev = "v${version}"; - sha256 = "sha256-U3Q0WUEDRn0zfBIdHXFp5Zcaf+M6HrSFnpeu5aAkjks="; + sha256 = "sha256-mj9rnPn85Fbc7Y8qRndqPVANzBrk3al+vDJagLTDJ04="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/science/math/fenics/default.nix b/pkgs/development/libraries/science/math/fenics/default.nix deleted file mode 100644 index 9ca4d6314c1ea..0000000000000 --- a/pkgs/development/libraries/science/math/fenics/default.nix +++ /dev/null @@ -1,272 +0,0 @@ -{ lib, stdenv -, fetchurl -, fetchpatch -, boost -, cmake -, doxygen -, eigen -, mpi4py -, numpy -, pkg-config -, pybind11 -, pytest -, pythonPackages -, six -, sympy -, gtest -, hdf5 -, mpi -, ply -, python -, scotch -, setuptools -, sphinx -, suitesparse -, swig -, zlib -, blas -, lapack -, nixosTests -}: -let - version = "2019.1.0"; - - # TODO: test with newer pytest - pytest = pythonPackages.callPackage - ../../../../python2-modules/pytest { - # hypothesis tests require pytest that causes dependency cycle - hypothesis = pythonPackages.hypothesis.override { - doCheck = false; - }; - }; - - dijitso = pythonPackages.buildPythonPackage { - pname = "dijitso"; - inherit version; - src = fetchurl { - url = "https://bitbucket.org/fenics-project/dijitso/downloads/dijitso-${version}.tar.gz"; - sha256 = "1ncgbr0bn5cvv16f13g722a0ipw6p9y6p4iasxjziwsp8kn5x97a"; - }; - propagatedBuildInputs = [ numpy six ]; - checkInputs = [ pytest ]; - preCheck = '' - export HOME=$PWD - ''; - checkPhase = '' - runHook preCheck - py.test test/ - runHook postCheck - ''; - meta = { - description = "Distributed just-in-time shared library building"; - homepage = "https://fenicsproject.org/"; - platforms = lib.platforms.all; - license = lib.licenses.lgpl3; - }; - }; - - fiat = pythonPackages.buildPythonPackage { - pname = "fiat"; - inherit version; - src = fetchurl { - url = "https://bitbucket.org/fenics-project/fiat/downloads/fiat-${version}.tar.gz"; - sha256 = "1sbi0fbr7w9g9ajr565g3njxrc3qydqjy3334vmz5xg0rd3106il"; - }; - propagatedBuildInputs = [ numpy six sympy ]; - checkInputs = [ pytest ]; - - preCheck = '' - # Workaround pytest 4.6.3 issue. - # See: https://bitbucket.org/fenics-project/fiat/pull-requests/59 - rm test/unit/test_quadrature.py - rm test/unit/test_reference_element.py - rm test/unit/test_fiat.py - ''; - checkPhase = '' - runHook preCheck - py.test test/unit/ - runHook postCheck - ''; - meta = { - description = "Automatic generation of finite element basis functions"; - homepage = "https://fenicsproject.org/"; - platforms = lib.platforms.all; - license = lib.licenses.lgpl3; - }; - }; - - ufl = pythonPackages.buildPythonPackage { - pname = "ufl"; - inherit version; - src = fetchurl { - url = "https://bitbucket.org/fenics-project/ufl/downloads/ufl-${version}.tar.gz"; - sha256 = "04daxwg4y9c51sdgvwgmlc82nn0fjw7i2vzs15ckdc7dlazmcfi1"; - }; - propagatedBuildInputs = [ numpy six ]; - checkInputs = [ pytest ]; - checkPhase = '' - runHook preCheck - py.test test/ - runHook postCheck - ''; - meta = { - description = "A domain-specific language for finite element variational forms"; - homepage = "https://fenicsproject.org/"; - platforms = lib.platforms.all; - license = lib.licenses.lgpl3; - }; - }; - - ffc = pythonPackages.buildPythonPackage { - pname = "ffc"; - inherit version; - src = fetchurl { - url = "https://bitbucket.org/fenics-project/ffc/downloads/ffc-${version}.tar.gz"; - sha256 = "1zdg6pziss4va74pd7jjl8sc3ya2gmhpypccmyd8p7c66ji23y2g"; - }; - nativeBuildInputs = [ - pybind11 - ]; - propagatedBuildInputs = [ - dijitso - fiat - numpy - six - sympy - ufl - setuptools - ]; - checkInputs = [ pytest ]; - preCheck = '' - export HOME=$PWD - rm test/unit/ufc/finite_element/test_evaluate.py - ''; - checkPhase = '' - runHook preCheck - py.test test/unit/ - runHook postCheck - ''; - meta = { - description = "A compiler for finite element variational forms"; - homepage = "https://fenicsproject.org/"; - platforms = lib.platforms.all; - license = lib.licenses.lgpl3; - }; - }; - dolfin = stdenv.mkDerivation { - pname = "dolfin"; - inherit version; - src = fetchurl { - url = "https://bitbucket.org/fenics-project/dolfin/downloads/dolfin-${version}.tar.gz"; - sha256 = "0kbyi4x5f6j4zpasch0swh0ch81w2h92rqm1nfp3ydi4a93vky33"; - }; - patches = [ - (fetchpatch { - name = "fix-double-prefix.patch"; - url = "https://bitbucket.org/josef_kemetmueller/dolfin/commits/328e94acd426ebaf2243c072b806be3379fd4340/raw"; - sha256 = "1zj7k3y7vsx0hz3gwwlxhq6gdqamqpcw90d4ishwx5ps5ckcsb9r"; - }) - ]; - propagatedBuildInputs = [ - dijitso - fiat - numpy - six - ufl - ]; - nativeBuildInputs = [ - cmake - doxygen - pkg-config - ]; - buildInputs = [ - boost - dijitso - eigen - ffc - fiat - hdf5 - mpi - numpy - blas - lapack - ply - python - scotch - six - sphinx - suitesparse - swig - sympy - ufl - zlib - ]; - cmakeFlags = [ - "-DDOLFIN_CXX_FLAGS=-std=c++11" - "-DDOLFIN_AUTO_DETECT_MPI=ON" - "-DDOLFIN_ENABLE_CHOLMOD=ON" - "-DDOLFIN_ENABLE_DOCS=ON" - "-DDOLFIN_ENABLE_HDF5=ON" - "-DDOLFIN_ENABLE_MPI=ON" - "-DDOLFIN_ENABLE_SCOTCH=ON" - "-DDOLFIN_ENABLE_UMFPACK=ON" - "-DDOLFIN_ENABLE_ZLIB=ON" - "-DDOLFIN_SKIP_BUILD_TESTS=ON" # Otherwise SCOTCH is not found - # TODO: Enable the following features - "-DDOLFIN_ENABLE_PARMETIS=OFF" - "-DDOLFIN_ENABLE_PETSC=OFF" - "-DDOLFIN_ENABLE_SLEPC=OFF" - "-DDOLFIN_ENABLE_TRILINOS=OFF" - ]; - installCheckPhase = '' - source $out/share/dolfin/dolfin.conf - make runtests - ''; - meta = { - description = "The FEniCS Problem Solving Environment in Python and C++"; - homepage = "https://fenicsproject.org/"; - license = lib.licenses.lgpl3; - }; - }; - python-dolfin = pythonPackages.buildPythonPackage rec { - pname = "dolfin"; - inherit version; - disabled = pythonPackages.isPy27; - src = dolfin.src; - sourceRoot = "${pname}-${version}/python"; - nativeBuildInputs = [ - pybind11 - cmake - ]; - dontUseCmakeConfigure = true; - preConfigure = '' - export CMAKE_PREFIX_PATH=${pybind11}/share/cmake/pybind11:$CMAKE_PREFIX_PATH - substituteInPlace setup.py --replace "pybind11==2.2.4" "pybind11" - substituteInPlace dolfin/jit/jit.py \ - --replace 'pkgconfig.exists("dolfin")' 'pkgconfig.exists("${dolfin}/lib/pkgconfig/dolfin.pc")' \ - --replace 'pkgconfig.parse("dolfin")' 'pkgconfig.parse("${dolfin}/lib/pkgconfig/dolfin.pc")' - ''; - buildInputs = [ - dolfin - boost - ]; - - propagatedBuildInputs = [ - dijitso - ffc - mpi4py - numpy - ufl - pythonPackages.pkgconfig - pythonPackages.pybind11 - ]; - doCheck = false; # Tries to orte_ess_init and call ssh to localhost - passthru.tests = { inherit (nixosTests) fenics; }; - meta = { - description = "Python bindings for the DOLFIN FEM compiler"; - homepage = "https://fenicsproject.org/"; - platforms = lib.platforms.all; - license = lib.licenses.lgpl3; - }; - }; -in python-dolfin diff --git a/pkgs/development/libraries/science/math/scalapack/default.nix b/pkgs/development/libraries/science/math/scalapack/default.nix index bafb52be7ffbe..7620844f8d1cd 100644 --- a/pkgs/development/libraries/science/math/scalapack/default.nix +++ b/pkgs/development/libraries/science/math/scalapack/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, openssh +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, openssh , mpi, blas, lapack } : @@ -17,6 +17,13 @@ stdenv.mkDerivation rec { passthru = { inherit (blas) isILP64; }; + # upstream patch, remove with next release + patches = [ (fetchpatch { + name = "gcc-10"; + url = "https://github.com/Reference-ScaLAPACK/scalapack/commit/a0f76fc0c1c16646875b454b7d6f8d9d17726b5a.patch"; + sha256 = "0civn149ikghakic30bynqg1bal097hr7i12cm4kq3ssrhq073bp"; + })]; + # Required to activate ILP64. # See https://github.com/Reference-ScaLAPACK/scalapack/pull/19 postPatch = lib.optionalString passthru.isILP64 '' diff --git a/pkgs/development/libraries/simpleitk/default.nix b/pkgs/development/libraries/simpleitk/default.nix index c38257dadb048..9573afda0b30b 100644 --- a/pkgs/development/libraries/simpleitk/default.nix +++ b/pkgs/development/libraries/simpleitk/default.nix @@ -4,6 +4,8 @@ stdenv.mkDerivation rec { pname = "simpleitk"; version = "2.1.1"; + outputs = [ "out" "dev" ]; + src = fetchFromGitHub { owner = "SimpleITK"; repo = "SimpleITK"; diff --git a/pkgs/development/libraries/skalibs/default.nix b/pkgs/development/libraries/skalibs/default.nix index ddf2ee5b467d1..70033523627e0 100644 --- a/pkgs/development/libraries/skalibs/default.nix +++ b/pkgs/development/libraries/skalibs/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "skalibs"; - version = "2.11.1.0"; - sha256 = "1fga2kmzcp2llqv5nzrmgm33p1jz7y9pnaghzbxf8ldnsns800a0"; + version = "2.11.2.0"; + sha256 = "sha256-ZJzzI2/jED9FNmthlrG80EV8nBfKhvK4AAdpaiuqe3c="; description = "A set of general-purpose C programming libraries"; diff --git a/pkgs/development/libraries/soci/bc-soci.nix b/pkgs/development/libraries/soci/bc-soci.nix new file mode 100644 index 0000000000000..d728d61a8f57e --- /dev/null +++ b/pkgs/development/libraries/soci/bc-soci.nix @@ -0,0 +1,53 @@ +{ cmake +, fetchFromGitLab +, fetchpatch +, sqlite +, boost +, lib +, stdenv +}: + +stdenv.mkDerivation rec { + pname = "bc-soci"; + version = "linphone-4.4.1"; + + src = fetchFromGitLab { + domain = "gitlab.linphone.org"; + group = "BC"; + owner = "public/external"; + repo = "soci"; + rev = "bc8ce0c5628dd48eca6ef5ce0a0a2f52547d88b6"; + sha256 = "sha256-qo26aYp/G2C6UkGA1qkHQwTKD5go7TQ9JWxb9xtbe6M="; + }; + + patches = [ + (fetchpatch { + name = "fix-backend-search-path.patch"; + url = "https://github.com/SOCI/soci/commit/56c93afc467bdba8ffbe68739eea76059ea62f7a.patch"; + sha256 = "sha256-nC/39pn3Cv5e65GgIfF3l64/AbCsfZHPUPIWETZFZAY="; + }) + ]; + + cmakeFlags = [ + # Do not build static libraries + "-DSOCI_SHARED=YES" + "-DSOCI_STATIC=OFF" + + "-DSOCI_TESTS=NO" + "-DWITH_SQLITE3=YES" + ]; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ + sqlite + boost + ]; + + meta = with lib; { + description = "Database access library for C++. Belledonne Communications' fork for Linphone."; + homepage = "https://gitlab.linphone.org/BC/public/external/soci"; + license = licenses.boost; + platforms = platforms.all; + maintainers = with maintainers; [ thibaultlemaire ]; + }; +} diff --git a/pkgs/development/libraries/spirv-headers/default.nix b/pkgs/development/libraries/spirv-headers/default.nix index d9516538163bb..379b6b7c1bb27 100644 --- a/pkgs/development/libraries/spirv-headers/default.nix +++ b/pkgs/development/libraries/spirv-headers/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "spirv-headers"; - version = "1.2.198.0"; + version = "1.3.211.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Headers"; rev = "sdk-${version}"; - sha256 = "sha256-cdEiRSCoX0New8ecUh7UTDz/is2v29zhf6Il2N1j3mw="; + sha256 = "sha256-LkIrTFWYvZffLVJJW3152um5LTEsMJEDEsIhBAdhBlk="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/taskflow/default.nix b/pkgs/development/libraries/taskflow/default.nix new file mode 100644 index 0000000000000..29760cdb94bd2 --- /dev/null +++ b/pkgs/development/libraries/taskflow/default.nix @@ -0,0 +1,50 @@ +{ lib +, stdenv +, fetchFromGitHub +, substituteAll +, doctest +, cmake +}: + +stdenv.mkDerivation rec { + pname = "taskflow"; + version = "3.3.0"; + + src = fetchFromGitHub { + owner = "taskflow"; + repo = "taskflow"; + rev = "v${version}"; + hash = "sha256-UfXGupxgtowIt3BnIVWwim3rTE57TT1C9TCx9LVyN34="; + }; + + patches = [ + (substituteAll { + src = ./unvendor-doctest.patch; + inherit doctest; + }) + ]; + + postPatch = '' + rm -r 3rd-party + + # tries to use x86 intrinsics on aarch64-darwin + sed -i '/^#if __has_include (<immintrin\.h>)/,/^#endif/d' taskflow/utility/os.hpp + ''; + + nativeBuildInputs = [ + cmake + ]; + + doCheck = true; + + meta = { + description = "General-purpose Parallel and Heterogeneous Task Programming System"; + homepage = "https://taskflow.github.io/"; + changelog = let + release = lib.replaceStrings ["."] ["-"] version; + in "https://taskflow.github.io/taskflow/release-${release}.html"; + license = lib.licenses.mit; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/libraries/taskflow/unvendor-doctest.patch b/pkgs/development/libraries/taskflow/unvendor-doctest.patch new file mode 100644 index 0000000000000..85f2e1fcff98e --- /dev/null +++ b/pkgs/development/libraries/taskflow/unvendor-doctest.patch @@ -0,0 +1,21 @@ +diff --git a/unittests/CMakeLists.txt b/unittests/CMakeLists.txt +index 3397d798..8277191e 100644 +--- a/unittests/CMakeLists.txt ++++ b/unittests/CMakeLists.txt +@@ -1,6 +1,6 @@ + enable_testing() + +-include(${TF_3RD_PARTY_DIR}/doctest/doctest.cmake) ++include(@doctest@/lib/cmake/doctest/doctest.cmake) + + list(APPEND TF_UNITTESTS + utility +@@ -24,7 +24,7 @@ list(APPEND TF_UNITTESTS + foreach(unittest IN LISTS TF_UNITTESTS) + add_executable(${unittest} ${unittest}.cpp) + target_link_libraries(${unittest} ${PROJECT_NAME} tf::default_settings) +- target_include_directories(${unittest} PRIVATE ${TF_3RD_PARTY_DIR}/doctest) ++ target_include_directories(${unittest} PRIVATE @doctest@/include/doctest) + doctest_discover_tests(${unittest}) + endforeach() + diff --git a/pkgs/development/libraries/utmps/default.nix b/pkgs/development/libraries/utmps/default.nix index 84f5b26c300c6..a7063f198c508 100644 --- a/pkgs/development/libraries/utmps/default.nix +++ b/pkgs/development/libraries/utmps/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "utmps"; - version = "0.1.1.0"; - sha256 = "0vsx5b99fwmp05l4wsw744gg79hbfb4wlzyfip3k0g76fcs49nil"; + version = "0.1.2.0"; + sha256 = "sha256-kCXZYbgnGg7MjutXhhJra3mTdq+m8r0lwPhy/STxEjw="; description = "A secure utmpx and wtmp implementation"; diff --git a/pkgs/development/libraries/vapoursynth/default.nix b/pkgs/development/libraries/vapoursynth/default.nix index f97723bc65431..0d990b9836359 100644 --- a/pkgs/development/libraries/vapoursynth/default.nix +++ b/pkgs/development/libraries/vapoursynth/default.nix @@ -4,17 +4,15 @@ , ApplicationServices }: -with lib; - stdenv.mkDerivation rec { pname = "vapoursynth"; - version = "R57"; + version = "58"; src = fetchFromGitHub { owner = "vapoursynth"; repo = "vapoursynth"; - rev = version; - sha256 = "sha256-tPQ1SOIpFevOYzL9a8Lc5+dv2egVX1CY3km8yWVv+Sk="; + rev = "R${version}"; + sha256 = "sha256-LIjNfyfpyvE+Ec6f4aGzRA4ZGoWPFhjtUw4yrenDsUQ="; }; patches = [ @@ -25,7 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ zimg libass (python3.withPackages (ps: with ps; [ sphinx cython ])) - ] ++ optionals stdenv.isDarwin [ libiconv ApplicationServices ]; + ] ++ lib.optionals stdenv.isDarwin [ libiconv ApplicationServices ]; enableParallelBuilding = true; @@ -58,5 +56,4 @@ stdenv.mkDerivation rec { platforms = platforms.x86_64; maintainers = with maintainers; [ rnhmjoj sbruder tadeokondrak ]; }; - } diff --git a/pkgs/development/libraries/vulkan-headers/default.nix b/pkgs/development/libraries/vulkan-headers/default.nix index 4010ee684590b..4fead1a1180f9 100644 --- a/pkgs/development/libraries/vulkan-headers/default.nix +++ b/pkgs/development/libraries/vulkan-headers/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "vulkan-headers"; - version = "1.2.198.0"; + version = "1.3.211.0"; nativeBuildInputs = [ cmake ]; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { owner = "KhronosGroup"; repo = "Vulkan-Headers"; rev = "sdk-${version}"; - sha256 = "sha256-SvC0AX1wIZWLzws3ZS8Wi8fbNUw1+An/PRlFIfNj24Y="; + sha256 = "sha256-FqrcFHsUS8e4ZgZpxVc8nNZWdNltniFmMjyyWVoNc7w="; }; meta = with lib; { diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index 077f881e722d6..196081aa58c1d 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -3,16 +3,18 @@ stdenv.mkDerivation rec { pname = "vulkan-loader"; - version = "1.2.198.0"; + version = "1.3.211.0"; src = (assert version == vulkan-headers.version; fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Loader"; rev = "sdk-${version}"; - sha256 = "sha256-k3eCdZqCjFxpKa0pZ0K4XcORxdSOlr1dFa7C3Qzi04Y="; + sha256 = "sha256-NQu98wA7UK231rpoKDs1yQ6pEyB4wZg7MjFC3JwS2BY="; }); + patches = [ ./fix-pkgconfig.patch ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ vulkan-headers ] ++ lib.optionals (!stdenv.isDarwin) [ libX11 libxcb libXrandr wayland ]; diff --git a/pkgs/development/libraries/vulkan-loader/fix-pkgconfig.patch b/pkgs/development/libraries/vulkan-loader/fix-pkgconfig.patch new file mode 100644 index 0000000000000..b5c3bf4428ab4 --- /dev/null +++ b/pkgs/development/libraries/vulkan-loader/fix-pkgconfig.patch @@ -0,0 +1,14 @@ +diff --git a/loader/vulkan.pc.in b/loader/vulkan.pc.in +index 153815577..584b15273 100644 +--- a/loader/vulkan.pc.in ++++ b/loader/vulkan.pc.in +@@ -1,7 +1,5 @@ +-prefix=@CMAKE_INSTALL_PREFIX@ +-exec_prefix=${prefix} +-libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ +-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ ++libdir=@CMAKE_INSTALL_LIBDIR@ ++includedir=@CMAKE_INSTALL_INCLUDEDIR@ + + Name: @CMAKE_PROJECT_NAME@ + Description: Vulkan Loader diff --git a/pkgs/development/libraries/waylandpp/default.nix b/pkgs/development/libraries/waylandpp/default.nix index 49e0e01872f53..30976e46bf1fd 100644 --- a/pkgs/development/libraries/waylandpp/default.nix +++ b/pkgs/development/libraries/waylandpp/default.nix @@ -9,6 +9,7 @@ , buildPackages , docSupport ? true , doxygen ? null +, graphviz ? null }: assert docSupport -> doxygen != null; @@ -16,13 +17,13 @@ assert docSupport -> doxygen != null; with lib; stdenv.mkDerivation rec { pname = "waylandpp"; - version = "0.2.9"; + version = "0.2.10"; src = fetchFromGitHub { owner = "NilsBrause"; repo = pname; rev = version; - sha256 = "sha256-c7sayJjQaqJWso2enESBx6OUW9vxxsfuHFolYDIYlXw="; + sha256 = "sha256-5/u6tp7/E4tjSfX+QJFmcUYdnyOgl9rB79PDE/SJH1o="; }; cmakeFlags = [ @@ -31,7 +32,7 @@ stdenv.mkDerivation rec { "-DWAYLAND_SCANNERPP=${buildPackages.waylandpp}/bin/wayland-scanner++" ]; - nativeBuildInputs = [ cmake pkg-config ] ++ optional docSupport doxygen; + nativeBuildInputs = [ cmake pkg-config ] ++ optionals docSupport [ doxygen graphviz ]; buildInputs = [ pugixml wayland libGL libffi ]; outputs = [ "bin" "dev" "lib" "out" ] ++ optionals docSupport [ "doc" "devman" ]; diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index d8f4b72a2feef..2359625a4f7c5 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { pname = "webkitgtk"; - version = "2.36.0"; + version = "2.36.1"; outputs = [ "out" "dev" ]; @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz"; - sha256 = "sha256-uHfMofEFI19d1Xx6wrLCvjxraR/0RPk5JcclTPFWxk0="; + sha256 = "sha256-AUnqX7HSDyqZgWd9RclSoEczAAHqJKjcKQNSOfEsDI8="; }; patches = lib.optionals stdenv.isLinux [ |