git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #108317 from flokli/umockdev-0.15.4

umockdev: 0.15.2 -> 0.15.4

commitd14652cee3c51670379d22e1b428ec6cd13feeac authorBernardo Meurer <bernardo@meurer.org> dateSun 3 Jan 2021, 23:39 (6 years ago) parent9c9c646bdd15d2
3 files changed+3−35
pkgs/development/libraries/umockdev/default.nix+3−10 pkgs/development/libraries/umockdev/disable-failed-test.patch−13 pkgs/development/libraries/umockdev/fix-test-paths.patch−12
pkgs/development/libraries/umockdev/default.nix+3−10
@@ -17,23 +17,19 @@
1717
1818stdenv.mkDerivation rec {
1919 pname = "umockdev";
20− version = "0.15.2";
20+ version = "0.15.4";
2121
2222 outputs = [ "bin" "out" "dev" "doc" ];
2323
2424 src = fetchurl {
2525 url = "https://github.com/martinpitt/umockdev/releases/download/${version}/${pname}-${version}.tar.xz";
26− sha256 = "19f21qb9ckwvlm7yzpnc0vcp092qbkms2yrafc26b9a63v4imj52";
26+ sha256 = "09k8jwvsphd97hcagf0zaf0hwzlzq2r8jfgbmvj55k7ylrg8hjxg";
2727 };
2828
2929 mesonFlags = [
3030 "-Dgtk_doc=true"
3131 ];
3232
33− preCheck = ''
34− patchShebangs tests/test-static-code
35− '';
36−
3733 buildInputs = [ glib systemd libgudev ];
3834
3935 nativeBuildInputs = [
@@ -50,10 +46,7 @@ stdenv.mkDerivation rec {
5046
5147 enableParallelBuilding = true;
5248
53− # Test fail with libusb 1.0.24
54− # https://github.com/NixOS/nixpkgs/issues/107420
55− # https://github.com/martinpitt/umockdev/issues/115
56− doCheck = false;
49+ doCheck = true;
5750
5851 postInstall = ''
5952 mkdir -p $doc/share/doc/umockdev/
pkgs/development/libraries/umockdev/disable-failed-test.patchdeleted−13
@@ -1,13 +0,0 @@
1−diff --git a/tests/test-umockdev-vala.vala b/tests/test-umockdev-vala.vala
2−index 8b104b2..d9889b8 100644
3−--- a/tests/test-umockdev-vala.vala
4−+++ b/tests/test-umockdev-vala.vala
5−@@ -668,7 +668,7 @@ main (string[] args)
6−
7− /* tests for mocking ioctls */
8− Test.add_func ("/umockdev-testbed-vala/usbfs_ioctl_static", t_usbfs_ioctl_static);
9−- Test.add_func ("/umockdev-testbed-vala/usbfs_ioctl_tree", t_usbfs_ioctl_tree);
10−+ /* Test.add_func ("/umockdev-testbed-vala/usbfs_ioctl_tree", t_usbfs_ioctl_tree); */
11− Test.add_func ("/umockdev-testbed-vala/usbfs_ioctl_tree_with_default_device", t_usbfs_ioctl_tree_with_default_device);
12− Test.add_func ("/umockdev-testbed-vala/usbfs_ioctl_tree_override_default_device", t_usbfs_ioctl_tree_override_default_device);
13− Test.add_func ("/umockdev-testbed-vala/usbfs_ioctl_tree_xz", t_usbfs_ioctl_tree_xz);
pkgs/development/libraries/umockdev/fix-test-paths.patchdeleted−12
@@ -1,12 +0,0 @@
1−diff -ru3 umockdev-0.13.1/tests/test-umockdev.c umockdev-0.13.1-new/tests/test-umockdev.c
2−--- umockdev-0.13.1/tests/test-umockdev.c 2019-08-18 20:39:39.708262517 +0300
3−+++ umockdev-0.13.1-new/tests/test-umockdev.c 2019-08-18 21:04:27.688761503 +0300
4−@@ -1084,7 +1084,7 @@
5−
6− /* sys/ in other dir should not be trapped */
7− errno = 0;
8−- dirfd = open("/run", O_RDONLY | O_DIRECTORY);
9−+ dirfd = open("/tmp", O_RDONLY | O_DIRECTORY);
10− g_assert_cmpint(openat(dirfd, "sys", O_RDONLY), <, 0);
11− g_assert_cmpint(errno, ==, ENOENT);
12− g_assert_cmpint(openat64(dirfd, "sys", O_RDONLY), <, 0);