diff options
| author | Florian Klink <flokli@flokli.de> | 2021-01-03 14:04:53 +0100 |
|---|---|---|
| committer | Florian Klink <flokli@flokli.de> | 2021-01-03 21:51:47 +0100 |
| commit | bdd15d2a5567af057e6575d3656e9cf2485d8e5f (patch) | |
| tree | 15385225387498516e88fc7ff8be038446fde0d5 /pkgs/development/libraries | |
| parent | bfa497bc2b858148d344126ec68a2e217f338123 (diff) | |
| download | nixpkgs-bdd15d2a5567af057e6575d3656e9cf2485d8e5f.tar nixpkgs-bdd15d2a5567af057e6575d3656e9cf2485d8e5f.tar.gz nixpkgs-bdd15d2a5567af057e6575d3656e9cf2485d8e5f.tar.bz2 nixpkgs-bdd15d2a5567af057e6575d3656e9cf2485d8e5f.tar.lz nixpkgs-bdd15d2a5567af057e6575d3656e9cf2485d8e5f.tar.xz nixpkgs-bdd15d2a5567af057e6575d3656e9cf2485d8e5f.tar.zst nixpkgs-bdd15d2a5567af057e6575d3656e9cf2485d8e5f.zip | |
umockdev: 0.15.2 -> 0.15.4
Diffstat (limited to 'pkgs/development/libraries')
3 files changed, 3 insertions, 35 deletions
diff --git a/pkgs/development/libraries/umockdev/default.nix b/pkgs/development/libraries/umockdev/default.nix index cd8c90f319d..5050650635f 100644 --- a/pkgs/development/libraries/umockdev/default.nix +++ b/pkgs/development/libraries/umockdev/default.nix @@ -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/ diff --git a/pkgs/development/libraries/umockdev/disable-failed-test.patch b/pkgs/development/libraries/umockdev/disable-failed-test.patch deleted file mode 100644 index 69e74dd38b8..00000000000 --- a/pkgs/development/libraries/umockdev/disable-failed-test.patch +++ /dev/null @@ -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); diff --git a/pkgs/development/libraries/umockdev/fix-test-paths.patch b/pkgs/development/libraries/umockdev/fix-test-paths.patch deleted file mode 100644 index 53015d66268..00000000000 --- a/pkgs/development/libraries/umockdev/fix-test-paths.patch +++ /dev/null @@ -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); |