diff options
author | Florian Klink <flokli@flokli.de> | 2020-12-22 23:18:50 +0100 |
---|---|---|
committer | Florian Klink <flokli@flokli.de> | 2020-12-25 00:59:57 +0100 |
commit | 5be624ae2aae354990d72c3012f4aea96514fabf (patch) | |
tree | e8890c298b0e04df050a78850e2850f03603f000 /pkgs/development/libraries/umockdev | |
parent | 09067f8176ca425dcc00254db0235313d5bb4cee (diff) | |
download | nixpkgs-5be624ae2aae354990d72c3012f4aea96514fabf.tar nixpkgs-5be624ae2aae354990d72c3012f4aea96514fabf.tar.gz nixpkgs-5be624ae2aae354990d72c3012f4aea96514fabf.tar.bz2 nixpkgs-5be624ae2aae354990d72c3012f4aea96514fabf.tar.lz nixpkgs-5be624ae2aae354990d72c3012f4aea96514fabf.tar.xz nixpkgs-5be624ae2aae354990d72c3012f4aea96514fabf.tar.zst nixpkgs-5be624ae2aae354990d72c3012f4aea96514fabf.zip |
umockdev: 0.13.1 -> 0.15.2
This updates umockdev to the latest stable release. Upstream switched to meson and gtk-doc in the meantime.
Diffstat (limited to 'pkgs/development/libraries/umockdev')
-rw-r--r-- | pkgs/development/libraries/umockdev/default.nix | 58 |
1 files changed, 37 insertions, 21 deletions
diff --git a/pkgs/development/libraries/umockdev/default.nix b/pkgs/development/libraries/umockdev/default.nix index 9911c3e68cd..cd8c90f319d 100644 --- a/pkgs/development/libraries/umockdev/default.nix +++ b/pkgs/development/libraries/umockdev/default.nix @@ -1,53 +1,69 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig -, gobject-introspection, glib, systemd, libgudev, vala -, usbutils, which, python3 }: +{ stdenv +, docbook_xsl +, fetchurl +, glib +, gobject-introspection +, gtk-doc +, libgudev +, meson +, ninja +, pkg-config +, python3 +, systemd +, usbutils +, vala +, which +}: stdenv.mkDerivation rec { pname = "umockdev"; - version = "0.13.1"; + version = "0.15.2"; outputs = [ "bin" "out" "dev" "doc" ]; src = fetchurl { url = "https://github.com/martinpitt/umockdev/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "197a169imiirgm73d9fn9234cx56agyw9d2f47h7f1d8s2d51lla"; + sha256 = "19f21qb9ckwvlm7yzpnc0vcp092qbkms2yrafc26b9a63v4imj52"; }; - patches = [ - ./fix-test-paths.patch - # https://github.com/NixOS/nixpkgs/commit/9960a2be9b32a6d868046c5bfa188b9a0dd66682#commitcomment-34734461 - ./disable-failed-test.patch - # https://github.com/martinpitt/umockdev/pull/93 - (fetchpatch { - url = "https://github.com/abbradar/umockdev/commit/ce22f893bf50de0b32760238a3e2cfb194db89e9.patch"; - sha256 = "01q3qhs30x8hl23iigimsa2ikbiw8y8y0bpmh02mh1my87shpwnx"; - }) + mesonFlags = [ + "-Dgtk_doc=true" ]; - # autoreconfHook complains if we try to build the documentation - postPatch = '' - echo 'EXTRA_DIST =' > docs/gtk-doc.make - ''; - preCheck = '' patchShebangs tests/test-static-code ''; buildInputs = [ glib systemd libgudev ]; - nativeBuildInputs = [ pkgconfig vala gobject-introspection ]; + nativeBuildInputs = [ + docbook_xsl + gobject-introspection + gtk-doc + meson + ninja + pkg-config + vala + ]; checkInputs = [ python3 which usbutils ]; 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; + postInstall = '' + mkdir -p $doc/share/doc/umockdev/ + mv docs/reference $doc/share/doc/umockdev/ + ''; + meta = with stdenv.lib; { description = "Mock hardware devices for creating unit tests"; license = licenses.lgpl2; - maintainers = with maintainers; []; + maintainers = with maintainers; [ flokli ]; platforms = with platforms; linux; }; } |