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

umockdev: 0.13.1 -> 0.15.2

commit5afb1fed39a8fd035295475344a2145e49a81553 authorFlorian Klink <flokli@flokli.de> dateSat 26 Dec 2020, 17:36 (6 years ago) parent6fa7bdb5be624a
1 file changed+37−21
pkgs/development/libraries/umockdev/default.nix+37−21
pkgs/development/libraries/umockdev/default.nix+37−21
@@ -1,53 +1,69 @@
1−{ stdenv, fetchurl, fetchpatch, pkgconfig
2−, gobject-introspection, glib, systemd, libgudev, vala
3−, usbutils, which, python3 }:
1+{ stdenv
2+, docbook_xsl
3+, fetchurl
4+, glib
5+, gobject-introspection
6+, gtk-doc
7+, libgudev
8+, meson
9+, ninja
10+, pkg-config
11+, python3
12+, systemd
13+, usbutils
14+, vala
15+, which
16+}:
417
518stdenv.mkDerivation rec {
619 pname = "umockdev";
7− version = "0.13.1";
20+ version = "0.15.2";
821
922 outputs = [ "bin" "out" "dev" "doc" ];
1023
1124 src = fetchurl {
1225 url = "https://github.com/martinpitt/umockdev/releases/download/${version}/${pname}-${version}.tar.xz";
13− sha256 = "197a169imiirgm73d9fn9234cx56agyw9d2f47h7f1d8s2d51lla";
26+ sha256 = "19f21qb9ckwvlm7yzpnc0vcp092qbkms2yrafc26b9a63v4imj52";
1427 };
1528
16− patches = [
17− ./fix-test-paths.patch
18− # https://github.com/NixOS/nixpkgs/commit/9960a2be9b32a6d868046c5bfa188b9a0dd66682#commitcomment-34734461
19− ./disable-failed-test.patch
20− # https://github.com/martinpitt/umockdev/pull/93
21− (fetchpatch {
22− url = "https://github.com/abbradar/umockdev/commit/ce22f893bf50de0b32760238a3e2cfb194db89e9.patch";
23− sha256 = "01q3qhs30x8hl23iigimsa2ikbiw8y8y0bpmh02mh1my87shpwnx";
24− })
29+ mesonFlags = [
30+ "-Dgtk_doc=true"
2531 ];
2632
27− # autoreconfHook complains if we try to build the documentation
28− postPatch = ''
29− echo 'EXTRA_DIST =' > docs/gtk-doc.make
30− '';
31−
3233 preCheck = ''
3334 patchShebangs tests/test-static-code
3435 '';
3536
3637 buildInputs = [ glib systemd libgudev ];
3738
38− nativeBuildInputs = [ pkgconfig vala gobject-introspection ];
39+ nativeBuildInputs = [
40+ docbook_xsl
41+ gobject-introspection
42+ gtk-doc
43+ meson
44+ ninja
45+ pkg-config
46+ vala
47+ ];
3948
4049 checkInputs = [ python3 which usbutils ];
4150
4251 enableParallelBuilding = true;
4352
4453 # Test fail with libusb 1.0.24
54+ # https://github.com/NixOS/nixpkgs/issues/107420
55+ # https://github.com/martinpitt/umockdev/issues/115
4556 doCheck = false;
4657
58+ postInstall = ''
59+ mkdir -p $doc/share/doc/umockdev/
60+ mv docs/reference $doc/share/doc/umockdev/
61+ '';
62+
4763 meta = with stdenv.lib; {
4864 description = "Mock hardware devices for creating unit tests";
4965 license = licenses.lgpl2;
50− maintainers = with maintainers; [];
66+ maintainers = with maintainers; [ flokli ];
5167 platforms = with platforms; linux;
5268 };
5369}