alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #108317 from flokli/umockdev-0.15.4

Browse source 
umockdev: 0.15.2 -> 0.15.4
This commit is contained in:
Bernardo Meurer 2021-01-03 23:39:10 +00:00 committed by GitHub
parent 9c9c6461ba bdd15d2a55
commit d14652cee3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkgs/development/libraries/umockdev/default.nix
View file

@ -17,23 +17,19 @@
stdenv.mkDerivation rec {
pname = "umockdev";
version = "0.15.2";
version = "0.15.4";
outputs = [ "bin" "out" "dev" "doc" ];
src = fetchurl {
url = "https://github.com/martinpitt/umockdev/releases/download/${version}/${pname}-${version}.tar.xz";
sha256 = "19f21qb9ckwvlm7yzpnc0vcp092qbkms2yrafc26b9a63v4imj52";
sha256 = "09k8jwvsphd97hcagf0zaf0hwzlzq2r8jfgbmvj55k7ylrg8hjxg";
};
mesonFlags = [
"-Dgtk_doc=true"
];
preCheck = ''
patchShebangs tests/test-static-code
'';
buildInputs = [ glib systemd libgudev ];
nativeBuildInputs = [
@ -50,10 +46,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
# Test fail with libusb 1.0.24
# https://github.com/NixOS/nixpkgs/issues/107420
# https://github.com/martinpitt/umockdev/issues/115
doCheck = false;
doCheck = true;
postInstall = ''
mkdir -p $doc/share/doc/umockdev/

13
pkgs/development/libraries/umockdev/disable-failed-test.patch
View file

@ -1,13 +0,0 @@
diff --git a/tests/test-umockdev-vala.vala b/tests/test-umockdev-vala.vala
index 8b104b2..d9889b8 100644
--- a/tests/test-umockdev-vala.vala
+++ b/tests/test-umockdev-vala.vala
@@ -668,7 +668,7 @@ main (string[] args)
/* tests for mocking ioctls */
Test.add_func ("/umockdev-testbed-vala/usbfs_ioctl_static", t_usbfs_ioctl_static);
- Test.add_func ("/umockdev-testbed-vala/usbfs_ioctl_tree", t_usbfs_ioctl_tree);
+ /* Test.add_func ("/umockdev-testbed-vala/usbfs_ioctl_tree", t_usbfs_ioctl_tree); */
Test.add_func ("/umockdev-testbed-vala/usbfs_ioctl_tree_with_default_device", t_usbfs_ioctl_tree_with_default_device);
Test.add_func ("/umockdev-testbed-vala/usbfs_ioctl_tree_override_default_device", t_usbfs_ioctl_tree_override_default_device);
Test.add_func ("/umockdev-testbed-vala/usbfs_ioctl_tree_xz", t_usbfs_ioctl_tree_xz);

12
pkgs/development/libraries/umockdev/fix-test-paths.patch
View file

@ -1,12 +0,0 @@
diff -ru3 umockdev-0.13.1/tests/test-umockdev.c umockdev-0.13.1-new/tests/test-umockdev.c
--- umockdev-0.13.1/tests/test-umockdev.c 2019-08-18 20:39:39.708262517 +0300
+++ umockdev-0.13.1-new/tests/test-umockdev.c 2019-08-18 21:04:27.688761503 +0300
@@ -1084,7 +1084,7 @@
/* sys/ in other dir should not be trapped */
errno = 0;
- dirfd = open("/run", O_RDONLY | O_DIRECTORY);
+ dirfd = open("/tmp", O_RDONLY | O_DIRECTORY);
g_assert_cmpint(openat(dirfd, "sys", O_RDONLY), <, 0);
g_assert_cmpint(errno, ==, ENOENT);
g_assert_cmpint(openat64(dirfd, "sys", O_RDONLY), <, 0);