hovercraft: refactor package definitions

+12 -19
+12 -19
pkgs/by-name/ho/hovercraft/package.nix
··· 1 1 { 2 2 lib, 3 - buildPythonApplication, 4 - isPy3k, 5 3 fetchFromGitHub, 6 - manuel, 7 - setuptools, 8 - docutils, 9 - lxml, 10 - svg-path, 11 - pygments, 12 - watchdog, 4 + python3Packages, 13 5 fetchpatch, 14 6 }: 15 7 16 - buildPythonApplication rec { 8 + python3Packages.buildPythonApplication rec { 17 9 pname = "hovercraft"; 18 10 version = "2.7"; 19 11 format = "setuptools"; 20 - disabled = !isPy3k; 12 + disabled = !python3Packages.isPy3k; 21 13 22 14 src = fetchFromGitHub { 23 15 owner = "regebro"; 24 16 repo = "hovercraft"; 25 - rev = version; 26 - sha256 = "0k0gjlqjz424rymcfdjpj6a71ppblfls5f8y2hd800d1as4im8az"; 17 + tag = version; 18 + hash = "sha256-X6EaiVahAYAaFB65oqmj695wlJFXNseqz0SQLzGVD0w="; 27 19 }; 28 20 29 - nativeCheckInputs = [ manuel ]; 30 - propagatedBuildInputs = [ 21 + nativeCheckInputs = with python3Packages; [ manuel ]; 22 + 23 + dependencies = with python3Packages; [ 31 24 setuptools 32 25 docutils 33 26 lxml ··· 39 32 (fetchpatch { 40 33 name = "fix tests with pygments 2.14"; 41 34 url = "https://sources.debian.org/data/main/h/hovercraft/2.7-5/debian/patches/0003-Fix-tests-with-pygments-2.14.patch"; 42 - sha256 = "sha256-qz4Kp4MxlS3KPKRB5/VESCI++66U9q6cjQ0cHy3QjTc="; 35 + hash = "sha256-qz4Kp4MxlS3KPKRB5/VESCI++66U9q6cjQ0cHy3QjTc="; 43 36 }) 44 37 ]; 45 38 46 - meta = with lib; { 39 + meta = { 47 40 description = "Makes impress.js presentations from reStructuredText"; 48 41 mainProgram = "hovercraft"; 49 42 homepage = "https://github.com/regebro/hovercraft"; 50 - license = licenses.mit; 51 - maintainers = with maintainers; [ makefu ]; 43 + license = lib.licenses.mit; 44 + maintainers = with lib.maintainers; [ makefu ]; 52 45 }; 53 46 }