diff options
Diffstat (limited to 'pkgs/development/libraries')
-rw-r--r-- | pkgs/development/libraries/ffmpeg/3.4.nix | 3 | ||||
-rw-r--r-- | pkgs/development/libraries/freetds/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/ghc_filesystem/default.nix | 22 | ||||
-rw-r--r-- | pkgs/development/libraries/libAfterImage/default.nix | 55 | ||||
-rw-r--r-- | pkgs/development/libraries/liblinphone/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/opencl-clang/default.nix | 7 | ||||
-rw-r--r-- | pkgs/development/libraries/ucx/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/wayland/default.nix | 2 |
8 files changed, 93 insertions, 8 deletions
diff --git a/pkgs/development/libraries/ffmpeg/3.4.nix b/pkgs/development/libraries/ffmpeg/3.4.nix index a5140fa01ca0d..25c0a12f731a0 100644 --- a/pkgs/development/libraries/ffmpeg/3.4.nix +++ b/pkgs/development/libraries/ffmpeg/3.4.nix @@ -9,4 +9,7 @@ callPackage ./generic.nix (rec { branch = "3.4.8"; sha256 = "1d0r4yja2dkkyhdwx1migq46gsrcbajiv66263a5sq5bfr9dqkch"; darwinFrameworks = [ Cocoa CoreMedia ]; + knownVulnerabilities = [ + "CVE-2021-30123" + ]; } // args) diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix index 0a9a4684e1257..56f0e03921bed 100644 --- a/pkgs/development/libraries/freetds/default.nix +++ b/pkgs/development/libraries/freetds/default.nix @@ -8,11 +8,11 @@ assert odbcSupport -> unixODBC != null; stdenv.mkDerivation rec { pname = "freetds"; - version = "1.2.18"; + version = "1.2.21"; src = fetchurl { url = "https://www.freetds.org/files/stable/${pname}-${version}.tar.bz2"; - sha256 = "sha256-ENR+YJhs/FH4Fw+p6rpDEU7r3eC6bmscSBPYbwIaqt0="; + sha256 = "sha256-pea79tbz3AgWsZy9CDCNJ6CEsEkmqqBaxn+AjqB9PY0="; }; buildInputs = [ diff --git a/pkgs/development/libraries/ghc_filesystem/default.nix b/pkgs/development/libraries/ghc_filesystem/default.nix new file mode 100644 index 0000000000000..76cfc4fbce6b4 --- /dev/null +++ b/pkgs/development/libraries/ghc_filesystem/default.nix @@ -0,0 +1,22 @@ +{ stdenv, lib, cmake, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "filesystem"; + version = "1.5.4"; + + src = fetchFromGitHub { + owner = "gulrak"; + repo = "filesystem"; + rev = "v${version}"; + hash = "sha256-SvNUzKoNiSIM0no+A0NUT6hmeUH9SzgLQLrC5XOC0Ho="; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + description = "header-only single-file C++ std::filesystem compatible helper library"; + homepage = "https://github.com/gulrak/filesystem"; + license = licenses.mit; + maintainers = with maintainers; [ lourkeur ]; + }; +} diff --git a/pkgs/development/libraries/libAfterImage/default.nix b/pkgs/development/libraries/libAfterImage/default.nix index 1c88459ba9b62..de463cdf42cb4 100644 --- a/pkgs/development/libraries/libAfterImage/default.nix +++ b/pkgs/development/libraries/libAfterImage/default.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, fetchurl, zlib }: +{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, giflib, libjpeg, libpng, libX11, zlib +, static ? stdenv.hostPlatform.isStatic +, withX ? !stdenv.isDarwin }: stdenv.mkDerivation { pname = "libAfterImage"; @@ -13,7 +15,56 @@ stdenv.mkDerivation { sha256 = "0n74rxidwig3yhr6fzxsk7y19n1nq1f296lzrvgj5pfiyi9k48vf"; }; - buildInputs = [ zlib ]; + patches = [ + # add back --with-gif option + (fetchpatch { + name = "libafterimage-gif.patch"; + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/libafterimage/files/libafterimage-gif.patch?id=4aa4fca00611b0b3a4007870da43cc5fd63f76c4"; + sha256 = "16pa94wlqpd7h6mzs4f0qm794yk1xczrwsgf93kdd3g0zbjq3rnr"; + }) + + # fix build with newer giflib + (fetchpatch { + name = "libafterimage-giflib5-v2.patch"; + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/libafterimage/files/libafterimage-giflib5-v2.patch?id=4aa4fca00611b0b3a4007870da43cc5fd63f76c4"; + sha256 = "0qwydqy9bm73cg5n3vm97aj4jfi70p7fxqmfbi54vi78z593brln"; + stripLen = 1; + }) + + # fix build with newer libpng + (fetchpatch { + name = "libafterimage-libpng15.patch"; + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/libafterimage/files/libafterimage-libpng15.patch?id=4aa4fca00611b0b3a4007870da43cc5fd63f76c4"; + sha256 = "1qyvf7786hayasfnnilfbri3p99cfz5wjpbli3gdqj2cvk6mpydv"; + }) + + # fix an ldconfig problem + (fetchpatch { + name = "libafterimage-makefile.patch"; + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/libafterimage/files/libafterimage-makefile.in.patch?id=4aa4fca00611b0b3a4007870da43cc5fd63f76c4"; + sha256 = "1n6fniz6dldms615046yhc4mlg9gb53y4yfia8wfz6szgq5zicj4"; + }) + ]; + patchFlags = [ "-p0" ]; + + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ giflib libjpeg libpng zlib ] ++ lib.optional withX libX11; + + preConfigure = '' + rm -rf {libjpeg,libpng,libungif,zlib}/ + substituteInPlace Makefile.in \ + --replace "include .depend" "" + '' + lib.optionalString stdenv.isDarwin '' + substituteInPlace Makefile.in \ + --replace "-soname," "-install_name,$out/lib/" + ''; + + configureFlags = [ + "--with-gif" + "--disable-mmx-optimization" + "--${if static then "enable" else "disable"}-staticlibs" + "--${if !static then "enable" else "disable"}-sharedlibs" + ] ++ lib.optional withX "--with-x"; meta = with lib; { homepage = "http://www.afterstep.org/afterimage/"; diff --git a/pkgs/development/libraries/liblinphone/default.nix b/pkgs/development/libraries/liblinphone/default.nix index 3ef64823a024a..bc1fcc9f6a9c5 100644 --- a/pkgs/development/libraries/liblinphone/default.nix +++ b/pkgs/development/libraries/liblinphone/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { pname = "liblinphone"; - version = "4.5.1"; + version = "4.5.15"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "05ybbxq2yqzy3f3vzq8c3szs3qr0zl64la53icpqnmfakwnps5gs"; + sha256 = "sha256-lDj2OkWuodPHpvoJ5W2GivzVIeMnprb42kAnJKfKtdg="; }; # Do not build static libraries diff --git a/pkgs/development/libraries/opencl-clang/default.nix b/pkgs/development/libraries/opencl-clang/default.nix index c40fb9c1203a0..48c681973d16a 100644 --- a/pkgs/development/libraries/opencl-clang/default.nix +++ b/pkgs/development/libraries/opencl-clang/default.nix @@ -76,6 +76,13 @@ let ./opencl-headers-dir.patch ]; + # Uses linker flags that are not supported on Darwin. + postPatch = lib.optionalString stdenv.isDarwin '' + sed -i -e '/SET_LINUX_EXPORTS_FILE/d' CMakeLists.txt + substituteInPlace CMakeLists.txt \ + --replace '-Wl,--no-undefined' "" + ''; + nativeBuildInputs = [ cmake git llvm.dev ]; buildInputs = [ libclang llvm spirv-llvm-translator ]; diff --git a/pkgs/development/libraries/ucx/default.nix b/pkgs/development/libraries/ucx/default.nix index 6f46486e5498d..872e7fbc4f213 100644 --- a/pkgs/development/libraries/ucx/default.nix +++ b/pkgs/development/libraries/ucx/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "ucx"; - version = "1.10.0"; + version = "1.10.1"; src = fetchFromGitHub { owner = "openucx"; repo = "ucx"; rev = "v${version}"; - sha256 = "1j2gfw4anixb5ajgiyn7bcca8pgjvsaf0y0b2xz88s9hdx0h6gs9"; + sha256 = "1jl7wrmcpf6lakpi1gvjcs18cy0mmwgsv5wdd80zyl41cpd8gm8d"; }; nativeBuildInputs = [ autoreconfHook doxygen ]; diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix index c62431769b5e4..08741c29dd6d1 100644 --- a/pkgs/development/libraries/wayland/default.nix +++ b/pkgs/development/libraries/wayland/default.nix @@ -117,6 +117,8 @@ stdenv.mkDerivation rec { license = licenses.mit; # Expat version platforms = if withLibraries then platforms.linux else platforms.unix; maintainers = with maintainers; [ primeos codyopel qyliss ]; + # big sur doesn't support gcc stdenv and wayland doesn't build with clang + broken = stdenv.isDarwin; }; passthru.version = version; |