diff --git a/pkgs/applications/misc/udiskie/default.nix b/pkgs/applications/misc/udiskie/default.nix index 7563fa0ca3d..fb9c7021b15 100644 --- a/pkgs/applications/misc/udiskie/default.nix +++ b/pkgs/applications/misc/udiskie/default.nix @@ -1,7 +1,7 @@ { lib , fetchFromGitHub -, asciidoc-full , buildPythonApplication +, asciidoc-full , docopt , gettext , gobject-introspection @@ -19,15 +19,17 @@ buildPythonApplication rec { pname = "udiskie"; - version = "2.3.3"; + version = "2.4.0"; src = fetchFromGitHub { owner = "coldfix"; repo = "udiskie"; rev = "v${version}"; - hash = "sha256-OeNAcL7jd8GiPVUGxWwX4N/G/jzxfyifaoSD/hXXwyM="; + hash = "sha256-T4kMPMXfehZT7P+TOd1llR2TbHPA/quNL545xxlmJfE="; }; + outputs = [ "out" "man" ]; + nativeBuildInputs = [ asciidoc-full # Man page gettext @@ -40,7 +42,7 @@ buildPythonApplication rec { gtk3 libappindicator-gtk3 libnotify - librsvg # Because it uses SVG icons + librsvg # SVG icons udisks2 ]; @@ -50,11 +52,13 @@ buildPythonApplication rec { pyyaml ]; - postBuild = "make -C doc"; + postBuild = '' + make -C doc + ''; postInstall = '' - mkdir -p $out/share/man/man8 - cp -v doc/udiskie.8 $out/share/man/man8/ + mkdir -p $man/share/man/man8 + cp -v doc/udiskie.8 $man/share/man/man8/ ''; checkInputs = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8125d0ad73d..1f949fd8ef1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28370,7 +28370,7 @@ with pkgs; udevil = callPackage ../applications/misc/udevil {}; - udiskie = python3Packages.callPackage ../applications/misc/udiskie { }; + udiskie = python3.pkgs.callPackage ../applications/misc/udiskie { }; sacc = callPackage ../applications/networking/gopher/sacc { };