From 196812302f775b1c5d4f0747571d7447741f66a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 22 Aug 2022 00:20:49 +0200 Subject: [PATCH 1/2] intel-media-driver: 22.5.0 -> 22.5.2 --- .../libraries/intel-media-driver/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/intel-media-driver/default.nix b/pkgs/development/libraries/intel-media-driver/default.nix index 5296b5ffa3d9..1b461ee9e1cd 100644 --- a/pkgs/development/libraries/intel-media-driver/default.nix +++ b/pkgs/development/libraries/intel-media-driver/default.nix @@ -10,11 +10,13 @@ , libdrm , enableX11 ? stdenv.isLinux , libX11 + # for passhtru.tests +, pkgsi686Linux }: stdenv.mkDerivation rec { pname = "intel-media-driver"; - version = "22.5.0"; + version = "22.5.2"; outputs = [ "out" "dev" ]; @@ -22,7 +24,7 @@ stdenv.mkDerivation rec { owner = "intel"; repo = "media-driver"; rev = "intel-media-${version}"; - sha256 = "sha256-8E3MN4a+k8YA+uuUPApYFvT82bgJHE1cnPyuAO6R1tA="; + sha256 = "sha256-3WqmTM68XdQfGibkVAT1S9N7Cn8eviNM6qUeF8qogtc="; }; patches = [ @@ -58,6 +60,10 @@ stdenv.mkDerivation rec { $out/lib/dri/iHD_drv_video.so ''; + passthru.tests = { + inherit (pkgsi686Linux) intel-media-driver; + }; + meta = with lib; { description = "Intel Media Driver for VAAPI — Broadwell+ iGPUs"; longDescription = '' From d3a584eb74449da9197c1fa0aeabf26b8226b646 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 22 Aug 2022 15:23:00 +0200 Subject: [PATCH 2/2] python310Packages.setuptools-scm: fix typo in comment --- pkgs/development/python-modules/setuptools-scm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/setuptools-scm/default.nix b/pkgs/development/python-modules/setuptools-scm/default.nix index 229460e55723..b4e8cc5afa62 100644 --- a/pkgs/development/python-modules/setuptools-scm/default.nix +++ b/pkgs/development/python-modules/setuptools-scm/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { "setuptools_scm" ]; - # check in passhtru.tests.pytest to escape infinite recursion on pytest + # check in passthru.tests.pytest to escape infinite recursion on pytest doCheck = false; passthru.tests = {