feedbackd: unstable-2021-01-25 -> 0.0.0+git20210426

Align version scheme with upstream and other distros.
Also split outputs and build man pages as well as documentation.

+29 -11
+29 -11
pkgs/applications/misc/feedbackd/default.nix
··· 1 1 { lib 2 2 , stdenv 3 3 , fetchFromGitLab 4 + , docbook-xsl-nons 5 + , gobject-introspection 6 + , gtk-doc 7 + , libxslt 4 8 , meson 5 9 , ninja 6 10 , pkg-config 11 + , vala 7 12 , wrapGAppsHook 8 13 , glib 9 14 , gsound 15 + , json-glib 10 16 , libgudev 11 - , json-glib 12 - , vala 13 - , gobject-introspection 17 + , dbus 14 18 }: 15 19 16 20 stdenv.mkDerivation rec { 17 - pname = "feedbackd-unstable"; 18 - version = "2021-01-25"; 21 + pname = "feedbackd"; 22 + # Not an actual upstream project release, 23 + # only a Debian package release that is tagged in the upstream repo 24 + version = "0.0.0+git20210426"; 25 + 26 + outputs = [ "out" "dev" "devdoc" ]; 19 27 20 28 src = fetchFromGitLab { 21 29 domain = "source.puri.sm"; 22 30 owner = "Librem5"; 23 31 repo = "feedbackd"; 24 - rev = "v0.0.0+git${builtins.replaceStrings ["-"] [""] version}"; 25 - sha256 = "184ag10sfzrka533inv6f38x6z769kq5jj56vdkcm65j5h786w5v"; 32 + rev = "v${version}"; 33 + sha256 = "12kdchv11c5ynpv6fbagcx755x5p2kd7acpwjxi9khwdwjsqxlmn"; 26 34 }; 27 35 28 36 nativeBuildInputs = [ 37 + docbook-xsl-nons 38 + gobject-introspection 39 + gtk-doc 40 + libxslt 29 41 meson 30 42 ninja 31 43 pkg-config 32 - wrapGAppsHook 33 44 vala 34 - gobject-introspection 45 + wrapGAppsHook 35 46 ]; 36 47 37 48 buildInputs = [ 38 49 glib 39 50 gsound 40 - libgudev 41 51 json-glib 52 + libgudev 42 53 ]; 54 + 55 + mesonFlags = [ "-Dgtk_doc=true" "-Dman=true" ]; 56 + 57 + checkInputs = [ 58 + dbus 59 + ]; 60 + 61 + doCheck = true; 43 62 44 63 postInstall = '' 45 64 mkdir -p $out/lib/udev/rules.d ··· 54 73 platforms = platforms.linux; 55 74 }; 56 75 } 57 -