libfprintd: 1.94.6 -> 1.94.8 (#344384) (42d0e103) · Commits · nix / nixpkgs

pkgs/tools/security/fprintd/tod.nix→pkgs/by-name/fp/fprintd-tod/package.nix

+37 −14

Original line number	Diff line number	Diff line
		{ lib
		, fetchFromGitLab
		, fetchpatch
		, fprintd
		, libfprint-tod
		{
		lib,
		fetchFromGitLab,
		fetchpatch,
		libxml2,
		fprintd,
		libfprint-tod,
		python3Packages,
		libpam-wrapper,
		gusb,
		gobject-introspection,
		}:

		(fprintd.override { libfprint = libfprint-tod; }).overrideAttrs (oldAttrs: rec {
		(fprintd.override { libfprint = libfprint-tod; }).overrideAttrs (
		finalAttrs: previousAttrs: {
		pname = "fprintd-tod";
		version = "1.90.9";

		@@ -13,11 +20,24 @@
		domain = "gitlab.freedesktop.org";
		owner = "libfprint";
		repo = "fprintd";
		rev = "v${version}";
		rev = "v${finalAttrs.version}";
		sha256 = "sha256-rOTVThHOY/Q2IIu2RGiv26UE2V/JFfWWnfKZQfKl5Mg=";
		};

		patches = oldAttrs.patches or [] ++ [
		nativeBuildInputs = previousAttrs.nativeBuildInputs or [ ] ++ [
		libpam-wrapper
		python3Packages.python
		python3Packages.pycairo
		python3Packages.dbus-python
		python3Packages.python-dbusmock
		python3Packages.pygobject3
		gusb
		python3Packages.pypamtest
		gobject-introspection
		libxml2 # for xmllint
		];

		patches = previousAttrs.patches or [ ] ++ [
		(fetchpatch {
		name = "use-more-idiomatic-correct-embedded-shell-scripting";
		url = "https://gitlab.freedesktop.org/libfprint/fprintd/-/commit/f4256533d1ffdc203c3f8c6ee42e8dcde470a93f.patch";
		@@ -40,7 +60,9 @@
		})
		];

		postPatch = oldAttrs.postPatch or "" + ''
		postPatch =
		previousAttrs.postPatch or ""
		+ ''
		# part of "remove-pointless-copying-of-files-into-build-directory" but git-apply doesn't handle renaming
		mv src/device.xml src/net.reactivated.Fprint.Device.xml
		mv src/manager.xml src/net.reactivated.Fprint.Manager.xml
		@@ -53,4 +75,5 @@
		platforms = lib.platforms.linux;
		maintainers = with lib.maintainers; [ hmenke ];
		};
		})
		}
		)

pkgs/tools/security/fprintd/default.nix→pkgs/by-name/fp/fprintd/package.nix

+39 −34

Original line number	Diff line number	Diff line
		{ lib, stdenv
		, fetchFromGitLab
		, pkg-config
		, gobject-introspection
		, meson
		, ninja
		, perl
		, gettext
		, gtk-doc
		, libxslt
		, docbook-xsl-nons
		, docbook_xml_dtd_412
		, glib
		, gusb
		, dbus
		, polkit
		, nss
		, pam
		, systemd
		, libfprint
		, python3
		{
		lib,
		stdenv,
		fetchFromGitLab,
		pkg-config,
		gobject-introspection,
		meson,
		ninja,
		perl,
		gettext,
		gtk-doc,
		libxslt,
		docbook-xsl-nons,
		docbook_xml_dtd_412,
		glib,
		gusb,
		dbus,
		polkit,
		nss,
		pam,
		systemd,
		libfprint,
		python3,
		}:

		stdenv.mkDerivation rec {
		stdenv.mkDerivation (finalAttrs: {
		pname = "fprintd";
		version = "1.94.4";
		outputs = [ "out" "devdoc" ];
		outputs = [
		"out"
		"devdoc"
		];

		src = fetchFromGitLab {
		domain = "gitlab.freedesktop.org";
		owner = "libfprint";
		repo = pname;
		rev = "v${version}";
		sha256 = "sha256-B2g2d29jSER30OUqCkdk3+Hv5T3DA4SUKoyiqHb8FeU=";
		repo = "fprintd";
		rev = "refs/tags/v${finalAttrs.version}";
		hash = "sha256-B2g2d29jSER30OUqCkdk3+Hv5T3DA4SUKoyiqHb8FeU=";
		};

		nativeBuildInputs = [
		@@ -41,6 +46,7 @@ stdenv.mkDerivation rec {
		perl # for pod2man
		gettext
		gtk-doc
		python3
		libxslt
		dbus
		docbook-xsl-nons
		@@ -81,11 +87,10 @@ stdenv.mkDerivation rec {
		# FIXME: Ugly hack for tests to find libpam_wrapper.so
		LIBRARY_PATH = lib.makeLibraryPath [ python3.pkgs.pypamtest ];

		doCheck = true;

		mesonCheckFlags = [
		# PAM related checks are timing out
		"--no-suite" "fprintd:TestPamFprintd"
		"--no-suite"
		"fprintd:TestPamFprintd"
		];

		patches = [
		@@ -107,11 +112,11 @@ stdenv.mkDerivation rec {
		--replace "'G_DEBUG=fatal-criticals'," ""
		'';

		meta = with lib; {
		meta = {
		homepage = "https://fprint.freedesktop.org/";
		description = "D-Bus daemon that offers libfprint functionality over the D-Bus interprocess communication bus";
		license = licenses.gpl2Plus;
		platforms = platforms.linux;
		maintainers = with maintainers; [ abbradar ];
		license = lib.licenses.gpl2Plus;
		platforms = lib.platforms.linux;
		maintainers = with lib.maintainers; [ abbradar ];
		};
		}
		})

pkgs/tools/security/fprintd/skip-test-test_removal_during_enroll.patch→pkgs/by-name/fp/fprintd/skip-test-test_removal_during_enroll.patch

+0 −0

File moved.

View file

pkgs/development/libraries/libfprint/default.nix→pkgs/by-name/li/libfprint/package.nix

+32 −27

Original line number	Diff line number	Diff line
		{ lib, stdenv
		, fetchFromGitLab
		, pkg-config
		, meson
		, python3
		, ninja
		, gusb
		, pixman
		, glib
		, nss
		, gobject-introspection
		, cairo
		, libgudev
		, gtk-doc
		, docbook-xsl-nons
		, docbook_xml_dtd_43
		{
		lib,
		stdenv,
		fetchFromGitLab,
		pkg-config,
		meson,
		python3,
		ninja,
		gusb,
		pixman,
		glib,
		nss,
		gobject-introspection,
		cairo,
		libgudev,
		gtk-doc,
		docbook-xsl-nons,
		docbook_xml_dtd_43,
		}:

		stdenv.mkDerivation rec {
		stdenv.mkDerivation (finalAttrs: {
		pname = "libfprint";
		version = "1.94.6";
		outputs = [ "out" "devdoc" ];
		version = "1.94.8";
		outputs = [
		"out"
		"devdoc"
		];

		src = fetchFromGitLab {
		domain = "gitlab.freedesktop.org";
		owner = "libfprint";
		repo = pname;
		rev = "v${version}";
		hash = "sha256-lDnAXWukBZSo8X6UEVR2nOMeVUi/ahnJgx2cP+vykZ8=";
		repo = "libfprint";
		rev = "v${finalAttrs.version}";
		hash = "sha256-PZr4ZeVnuCKYfI8CKvRqBwalxsz9Ka17kSuLflwl7mE=";
		};

		postPatch = ''
		@@ -82,11 +87,11 @@ stdenv.mkDerivation rec {
		runHook postInstallCheck
		'';

		meta = with lib; {
		meta = {
		homepage = "https://fprint.freedesktop.org/";
		description = "Library designed to make it easy to add support for consumer fingerprint readers";
		license = licenses.lgpl21Only;
		platforms = platforms.linux;
		maintainers = with maintainers; [ abbradar ];
		license = lib.licenses.lgpl21Only;
		platforms = lib.platforms.linux;
		maintainers = with lib.maintainers; [ abbradar ];
		};
		}
		})

pkgs/top-level/all-packages.nix

+0 −6

Original line number	Diff line number	Diff line
		@@ -7582,10 +7582,6 @@ with pkgs;

		fpm = callPackage ../tools/package-management/fpm { };

		fprintd = callPackage ../tools/security/fprintd { };

		fprintd-tod = callPackage ../tools/security/fprintd/tod.nix { };

		ferdium = callPackage ../applications/networking/instant-messengers/ferdium {
		mkFranzDerivation = callPackage ../applications/networking/instant-messengers/franz/generic.nix { };
		};
		@@ -20669,8 +20665,6 @@ with pkgs;
		extraOnly = true;
		};

		libfprint = callPackage ../development/libraries/libfprint { };

		libfprint-tod = callPackage ../development/libraries/libfprint-tod { };

		libfprint-2-tod1-goodix = callPackage ../development/libraries/libfprint-2-tod1-goodix { };