@@ -1,42 +1,47 @@
11{ lib
2+, asciidoc
23, fetchFromGitHub
3−, buildPythonApplication
4−, asciidoc-full
5−, docopt
6−, gettext
74, gobject-introspection
85, gtk3
9−, keyutils
6+, installShellFiles
107, libappindicator-gtk3
118, libnotify
129, librsvg
13−, nose
14−, pygobject3
15−, pyyaml
10+, python3
1611, udisks2
1712, wrapGAppsHook
1813}:
1914
20−buildPythonApplication rec {
15+python3.pkgs.buildPythonApplication rec {
2116 pname = "udiskie";
22− version = "2.4.0";
17+ version = "2.4.2";
18+
19+ format = "setuptools";
2320
2421 src = fetchFromGitHub {
2522 owner = "coldfix";
2623 repo = "udiskie";
2724 rev = "v${version}";
28− hash = "sha256-T4kMPMXfehZT7P+TOd1llR2TbHPA/quNL545xxlmJfE=";
25+ hash = "sha256-lQMJVSY3JeZYYOFDyV29Ye2j8r+ngE/ta2wQYipy4hU=";
2926 };
3027
31− outputs = [ "out" "man" ];
28+ patches = [
29+ ./locale-path.patch
30+ ];
31+
32+ postPatch = ''
33+ substituteInPlace udiskie/locale.py --subst-var out
34+ '';
3235
3336 nativeBuildInputs = [
34− asciidoc-full # Man page
35− gettext
37+ asciidoc # Man page
3638 gobject-introspection
39+ installShellFiles
3740 wrapGAppsHook
3841 ];
3942
43+ dontWrapGApps = true;
44+
4045 buildInputs = [
4146 gobject-introspection
4247 gtk3
@@ -46,8 +51,9 @@ buildPythonApplication rec {
4651 udisks2
4752 ];
4853
49− propagatedBuildInputs = [
54+ propagatedBuildInputs = with python3.pkgs; [
5055 docopt
56+ keyutils
5157 pygobject3
5258 pyyaml
5359 ];
@@ -57,21 +63,20 @@ buildPythonApplication rec {
5763 '';
5864
5965 postInstall = ''
60− mkdir -p $man/share/man/man8
61− cp -v doc/udiskie.8 $man/share/man/man8/
66+ installManPage doc/udiskie.8
6267 '';
6368
64− checkInputs = [
65− keyutils
66− nose
67− ];
68−
69− checkPhase = ''
70− nosetests
69+ preFixup = ''
70+ makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
7171 '';
7272
73+ checkInputs = with python3.pkgs; [
74+ pytestCheckHook
75+ ];
76+
7377 meta = with lib; {
7478 homepage = "https://github.com/coldfix/udiskie";
79+ changelog = "https://github.com/coldfix/udiskie/blob/${src.rev}/CHANGES.rst";
7580 description = "Removable disk automounter for udisks";
7681 longDescription = ''
7782 udiskie is a udisks2 front-end that allows to manage removeable media such
@@ -88,6 +93,6 @@ buildPythonApplication rec {
8893 - password caching (requires python keyutils 0.3)
8994 '';
9095 license = licenses.mit;
91− maintainers = with maintainers; [ AndersonTorres ];
96+ maintainers = with maintainers; [ AndersonTorres dotlambda ];
9297 };
9398}