@@ -1,42 +1,47 @@
2, fetchFromGitHub
3, fetchFromGitHub
3−, buildPythonApplication
7, gobject-introspection
4, gobject-introspection
9−, keyutils
6+, installShellFiles
10, libappindicator-gtk3
7, libappindicator-gtk3
11, libnotify
8, libnotify
17, wrapGAppsHook
12, wrapGAppsHook
20−buildPythonApplication rec {
15+python3.pkgs.buildPythonApplication rec {
21 pname = "udiskie";
16 pname = "udiskie";
22− version = "2.4.0";
17+ version = "2.4.2";
19+ format = "setuptools";
24 src = fetchFromGitHub {
21 src = fetchFromGitHub {
25 owner = "coldfix";
22 owner = "coldfix";
26 repo = "udiskie";
23 repo = "udiskie";
27 rev = "v${version}";
24 rev = "v${version}";
28− hash = "sha256-T4kMPMXfehZT7P+TOd1llR2TbHPA/quNL545xxlmJfE=";
25+ hash = "sha256-lQMJVSY3JeZYYOFDyV29Ye2j8r+ngE/ta2wQYipy4hU=";
31− outputs = [ "out" "man" ];
28+ patches = [
33+ substituteInPlace udiskie/locale.py --subst-var out
33 nativeBuildInputs = [
36 nativeBuildInputs = [
34− asciidoc-full # Man page
37+ asciidoc # Man page
36 gobject-introspection
38 gobject-introspection
37 wrapGAppsHook
40 wrapGAppsHook
43+ dontWrapGApps = true;
40 buildInputs = [
45 buildInputs = [
41 gobject-introspection
46 gobject-introspection
@@ -46,8 +51,9 @@ buildPythonApplication rec {
49− propagatedBuildInputs = [
54+ propagatedBuildInputs = with python3.pkgs; [
51 pygobject3
57 pygobject3
@@ -57,21 +63,20 @@ buildPythonApplication rec {
59 postInstall = ''
65 postInstall = ''
60− mkdir -p $man/share/man/man8
61− cp -v doc/udiskie.8 $man/share/man/man8/
66+ installManPage doc/udiskie.8
64− checkInputs = [
69+ preFixup = ''
65− keyutils
70+ makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
73+ checkInputs = with python3.pkgs; [
73 meta = with lib; {
77 meta = with lib; {
74 homepage = "https://github.com/coldfix/udiskie";
78 homepage = "https://github.com/coldfix/udiskie";
79+ changelog = "https://github.com/coldfix/udiskie/blob/${src.rev}/CHANGES.rst";
75 description = "Removable disk automounter for udisks";
80 description = "Removable disk automounter for udisks";
76 longDescription = ''
81 longDescription = ''
77 udiskie is a udisks2 front-end that allows to manage removeable media such
82 udiskie is a udisks2 front-end that allows to manage removeable media such
@@ -88,6 +93,6 @@ buildPythonApplication rec {
88 - password caching (requires python keyutils 0.3)
93 - password caching (requires python keyutils 0.3)
90 license = licenses.mit;
95 license = licenses.mit;
91− maintainers = with maintainers; [ AndersonTorres ];
96+ maintainers = with maintainers; [ AndersonTorres dotlambda ];