From 930646f7835358f85aafb028939a1c2d0a56e55f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Tue, 11 Mar 2025 08:33:31 +0100 Subject: [PATCH 1/2] libfprint-tod: 1.90.7+git20210222+tod1 -> 1.94.9+tod1 This also fixes the build issue introduced by #388631. --- pkgs/by-name/li/libfprint-tod/package.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/li/libfprint-tod/package.nix b/pkgs/by-name/li/libfprint-tod/package.nix index 30f2b91864d7..6abda09a6eb3 100644 --- a/pkgs/by-name/li/libfprint-tod/package.nix +++ b/pkgs/by-name/li/libfprint-tod/package.nix @@ -13,7 +13,7 @@ libfprint.overrideAttrs ( ... }: let - version = "1.90.7+git20210222+tod1"; + version = "1.94.9+tod1"; in { pname = "libfprint-tod"; @@ -24,18 +24,22 @@ libfprint.overrideAttrs ( owner = "3v1n0"; repo = "libfprint"; rev = "v${version}"; - sha256 = "0cj7iy5799pchyzqqncpkhibkq012g3bdpn18pfb19nm43svhn4j"; + hash = "sha256-xkywuFbt8EFJOlIsSN2hhZfMUhywdgJ/uT17uiO3YV4="; }; mesonFlags = [ # Include virtual drivers for fprintd tests "-Ddrivers=all" "-Dudev_hwdb_dir=${placeholder "out"}/lib/udev/hwdb.d" + "-Dudev_rules_dir=${placeholder "out"}/lib/udev/rules.d" ]; postPatch = '' ${postPatch} - patchShebangs ./tests/*.py ./tests/*.sh + patchShebangs \ + ./libfprint/tod/tests/*.sh \ + ./tests/*.py \ + ./tests/*.sh \ ''; meta = with lib; { From 392773a15445c850f7299ebdacaef0bf2c7a7ad8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sat, 15 Mar 2025 21:08:46 +0100 Subject: [PATCH 2/2] libfprint-2-tod1-vfs0090: mark broken This package does not compile against recent libfprint-tod anymore and upstream hasn't seen updates since 2020. --- pkgs/by-name/li/libfprint-2-tod1-vfs0090/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/li/libfprint-2-tod1-vfs0090/package.nix b/pkgs/by-name/li/libfprint-2-tod1-vfs0090/package.nix index 7d0d006dbb4c..7cd609484408 100644 --- a/pkgs/by-name/li/libfprint-2-tod1-vfs0090/package.nix +++ b/pkgs/by-name/li/libfprint-2-tod1-vfs0090/package.nix @@ -66,5 +66,8 @@ stdenv.mkDerivation { license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = with maintainers; [ valodim ]; + # Does not compile against libfprint-tod, hasn't seen any maintenance + # since 2020. + broken = true; }; }