diff --git a/pkgs/tools/misc/grc/default.nix b/pkgs/tools/misc/grc/default.nix index 8fe35012090..e47ea74bbe9 100644 --- a/pkgs/tools/misc/grc/default.nix +++ b/pkgs/tools/misc/grc/default.nix @@ -1,15 +1,15 @@ -{ lib, fetchFromGitHub, python3Packages }: +{ lib, fetchFromGitHub, buildPythonApplication }: -python3Packages.buildPythonApplication rec { +buildPythonApplication rec { pname = "grc"; - version = "1.11.3"; + version = "1.12"; format = "other"; src = fetchFromGitHub { - owner = "garabik"; - repo = "grc"; - rev = "v${version}"; - sha256 = "0b3wx9zr7l642hizk93ysbdss7rfymn22b2ykj4kpkf1agjkbv35"; + owner = "garabik"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-XJj1j6sDt0iL3U6uMbB1j0OfpXRdP+x66gc6sKxrQIA="; }; postPatch = '' @@ -21,23 +21,20 @@ python3Packages.buildPythonApplication rec { installPhase = '' runHook preInstall - ./install.sh "$out" "$out" install -Dm444 -t $out/share/zsh/vendor-completions _grc - runHook postInstall ''; meta = with lib; { - description = "Yet another colouriser for beautifying your logfiles or output of commands"; - homepage = "http://korpus.juls.savba.sk/~garabik/software/grc.html"; - license = licenses.gpl2; - maintainers = with maintainers; [ lovek323 AndersonTorres peterhoeg ]; - platforms = platforms.unix; - + homepage = "http://korpus.juls.savba.sk/~garabik/software/grc.html"; + description = "A generic text colouriser"; longDescription = '' Generic Colouriser is yet another colouriser (written in Python) for beautifying your logfiles or output of commands. ''; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ lovek323 AndersonTorres peterhoeg ]; + platforms = platforms.unix; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f745c2e7adb..4314e21805e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1344,7 +1344,7 @@ in gucci = callPackage ../tools/text/gucci { }; - grc = callPackage ../tools/misc/grc { }; + grc = python3Packages.callPackage ../tools/misc/grc { }; green-pdfviewer = callPackage ../applications/misc/green-pdfviewer { SDL = SDL_sixel;