diff --git a/pkgs/by-name/ri/riffdiff/package.nix b/pkgs/by-name/ri/riffdiff/package.nix new file mode 100644 index 000000000000..eecc8e3e57b0 --- /dev/null +++ b/pkgs/by-name/ri/riffdiff/package.nix @@ -0,0 +1,39 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + nix-update-script, + riffdiff, + testers, +}: + +rustPlatform.buildRustPackage rec { + pname = "riffdiff"; + version = "3.3.6"; + + src = fetchFromGitHub { + owner = "walles"; + repo = "riff"; + rev = "refs/tags/${version}"; + hash = "sha256-qXFSO2VIPaGnB+5Wp/u0FTcKnpcMLxW6uNykKL681lU="; + }; + + cargoHash = "sha256-i6/wa2/ogyLwLBdIXqTYdJX9+SFf+p7Zm2j2Q3mje6w="; + + passthru = { + tests.version = testers.testVersion { package = riffdiff; }; + updateScript = nix-update-script { }; + }; + + meta = { + description = "Diff filter highlighting which line parts have changed"; + homepage = "https://github.com/walles/riff"; + changelog = "https://github.com/walles/riff/releases/tag/${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + johnpyp + getchoo + ]; + mainProgram = "riff"; + }; +} diff --git a/pkgs/tools/text/riffdiff/default.nix b/pkgs/tools/text/riffdiff/default.nix deleted file mode 100644 index 481a75e1bd12..000000000000 --- a/pkgs/tools/text/riffdiff/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, rustPlatform, fetchFromGitHub }: - -rustPlatform.buildRustPackage rec { - pname = "riffdiff"; - version = "3.3.3"; - - src = fetchFromGitHub { - owner = "walles"; - repo = "riff"; - rev = version; - hash = "sha256-IdYQ8vD3ZIzqdNY4JtR8f2huV/DWOhV8FUn7tuRe7IQ="; - }; - - cargoHash = "sha256-1on4CTstEvjNLtk1RG6dcNl0XhaPYAy+U0DYn/aVzEg="; - - meta = with lib; { - description = "Diff filter highlighting which line parts have changed"; - homepage = "https://github.com/walles/riff"; - license = licenses.mit; - maintainers = with maintainers; [ johnpyp ]; - mainProgram = "riff"; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 169919e3fc3a..3ab217810eb5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18138,8 +18138,6 @@ with pkgs; riff = callPackage ../development/tools/misc/riff { }; - riffdiff = callPackage ../tools/text/riffdiff {}; - rman = callPackage ../development/tools/misc/rman { }; rnginline = with python3Packages; toPythonApplication rnginline;