git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #131762 from grahamc/lib-fprint

{lib,}fprint: version bumps

commitab93cc0adde7edd7e3c71435d9d4c935ca4b621f authorGraham Christensen <graham@grahamc.com> dateWed 28 Jul 2021, 07:01 (5 years ago) parentbc3039d0a002b6
2 files changed+12−5
pkgs/development/libraries/libfprint/default.nix+10−3 pkgs/tools/security/fprintd/default.nix+2−2
pkgs/development/libraries/libfprint/default.nix+10−3
@@ -10,6 +10,8 @@
1010, nss
1111, gobject-introspection
1212, coreutils
13+, cairo
14+, libgudev
1315, gtk-doc
1416, docbook-xsl-nons
1517, docbook_xml_dtd_43
@@ -17,7 +19,7 @@
1719
1820stdenv.mkDerivation rec {
1921 pname = "libfprint";
20− version = "1.90.7";
22+ version = "1.92.1";
2123 outputs = [ "out" "devdoc" ];
2224
2325 src = fetchFromGitLab {
@@ -25,7 +27,7 @@ stdenv.mkDerivation rec {
2527 owner = "libfprint";
2628 repo = pname;
2729 rev = "v${version}";
28− sha256 = "sha256-g/yczzCZEzUKV2uFl1MAPL1H/R2QJSwxgppI2ftt9QI=";
30+ sha256 = "0dpwzmwl9jjpaz44znvy3v8s9sln0c71b756rs1knk0zx8sa1qbc";
2931 };
3032
3133 nativeBuildInputs = [
@@ -43,6 +45,8 @@ stdenv.mkDerivation rec {
4345 pixman
4446 glib
4547 nss
48+ cairo
49+ libgudev
4650 ];
4751
4852 checkInputs = [
@@ -53,6 +57,7 @@ stdenv.mkDerivation rec {
5357 "-Dudev_rules_dir=${placeholder "out"}/lib/udev/rules.d"
5458 # Include virtual drivers for fprintd tests
5559 "-Ddrivers=all"
60+ "-Dudev_hwdb_dir=${placeholder "out"}/lib/udev/hwdb.d"
5661 ];
5762
5863 doCheck = true;
@@ -61,7 +66,9 @@ stdenv.mkDerivation rec {
6166 patchShebangs \
6267 tests/test-runner.sh \
6368 tests/unittest_inspector.py \
64− tests/virtual-image.py
69+ tests/virtual-image.py \
70+ tests/umockdev-test.py \
71+ tests/test-generated-hwdb.sh
6572 '';
6673
6774 meta = with lib; {
pkgs/tools/security/fprintd/default.nix+2−2
@@ -25,7 +25,7 @@
2525
2626stdenv.mkDerivation rec {
2727 pname = "fprintd";
28− version = "1.90.9";
28+ version = "1.92.0";
2929 outputs = [ "out" "devdoc" ];
3030
3131 src = fetchFromGitLab {
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
3333 owner = "libfprint";
3434 repo = pname;
3535 rev = "v${version}";
36− sha256 = "rOTVThHOY/Q2IIu2RGiv26UE2V/JFfWWnfKZQfKl5Mg=";
36+ sha256 = "0bqzxxb5iq3pdwdv1k8wsx3alirbjla6zgcki55b5p6mzrvk781x";
3737 };
3838
3939 nativeBuildInputs = [