diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-03-08 00:02:02 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-03-08 00:02:02 +0000 |
commit | 555fb8b14653c1f2714973cfee7b0c73417b0547 (patch) | |
tree | 1bd5e309f01f461f96812198cbea496c5e4222e5 /pkgs/development/libraries | |
parent | 2fa8dd529ab62044054c3a8fd7fa1b3d693d4fdc (diff) | |
parent | b7deb4cf7598330a450b8ad2174424daa1611e8b (diff) | |
download | nixpkgs-555fb8b14653c1f2714973cfee7b0c73417b0547.tar nixpkgs-555fb8b14653c1f2714973cfee7b0c73417b0547.tar.gz nixpkgs-555fb8b14653c1f2714973cfee7b0c73417b0547.tar.bz2 nixpkgs-555fb8b14653c1f2714973cfee7b0c73417b0547.tar.lz nixpkgs-555fb8b14653c1f2714973cfee7b0c73417b0547.tar.xz nixpkgs-555fb8b14653c1f2714973cfee7b0c73417b0547.tar.zst nixpkgs-555fb8b14653c1f2714973cfee7b0c73417b0547.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/libraries')
4 files changed, 11 insertions, 3 deletions
diff --git a/pkgs/development/libraries/intel-gmmlib/default.nix b/pkgs/development/libraries/intel-gmmlib/default.nix index 16f758a08ab..d9ac5e4da3f 100644 --- a/pkgs/development/libraries/intel-gmmlib/default.nix +++ b/pkgs/development/libraries/intel-gmmlib/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { OpenCL(TM) and the Intel(R) Media Driver for VAAPI. ''; platforms = [ "x86_64-linux" "i686-linux" ]; - maintainers = with maintainers; [ primeos SuperSandro2000 ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/pkgs/development/libraries/intel-media-driver/default.nix b/pkgs/development/libraries/intel-media-driver/default.nix index 08ce4235498..6a9d523f903 100644 --- a/pkgs/development/libraries/intel-media-driver/default.nix +++ b/pkgs/development/libraries/intel-media-driver/default.nix @@ -63,6 +63,6 @@ stdenv.mkDerivation rec { changelog = "https://github.com/intel/media-driver/releases/tag/intel-media-${version}"; license = with licenses; [ bsd3 mit ]; platforms = platforms.linux; - maintainers = with maintainers; [ primeos jfrankenau SuperSandro2000 ]; + maintainers = with maintainers; [ jfrankenau SuperSandro2000 ]; }; } diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix index 86edacc6166..bd639ec3041 100644 --- a/pkgs/development/libraries/nghttp2/default.nix +++ b/pkgs/development/libraries/nghttp2/default.nix @@ -10,6 +10,10 @@ , enableJemalloc ? false, jemalloc ? null , enableApp ? with stdenv.hostPlatform; !isWindows && !isStatic , enablePython ? false, python ? null, cython ? null, ncurses ? null, setuptools ? null + +# downstream dependencies, for testing +, curl +, libsoup }: # Note: this package is used for bootstrapping fetchurl, and thus @@ -73,6 +77,10 @@ stdenv.mkDerivation rec { #doCheck = true; # requires CUnit ; currently failing at test_util_localtime_date in util_test.cc + passthru.tests = { + inherit curl libsoup; + }; + meta = with lib; { homepage = "https://nghttp2.org/"; description = "A C implementation of HTTP/2"; diff --git a/pkgs/development/libraries/vaapi-intel/default.nix b/pkgs/development/libraries/vaapi-intel/default.nix index f21a947a533..2a9f0cf7403 100644 --- a/pkgs/development/libraries/vaapi-intel/default.nix +++ b/pkgs/development/libraries/vaapi-intel/default.nix @@ -48,6 +48,6 @@ stdenv.mkDerivation rec { backends for each supported hardware vendor. ''; platforms = [ "x86_64-linux" "i686-linux" ]; - maintainers = with maintainers; [ primeos ]; + maintainers = with maintainers; [ ]; }; } |