diff options
author | Ali Caglayan <alizter@gmail.com> | 2023-08-04 17:13:01 +0200 |
---|---|---|
committer | Vincent Laporte <vbgl@users.noreply.github.com> | 2023-08-10 21:59:16 +0200 |
commit | 59d7a52fcb1eb6f2ceb6e16958499dfc0a040933 (patch) | |
tree | f0b07b50766c50795af6c413e28d013f2253fa10 /pkgs | |
parent | 47224fd0c51817102f7bcb9433c631df8ab9fb60 (diff) |
merge-fmt: init at 0.3
Signed-off-by: Ali Caglayan <alizter@gmail.com>
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/version-management/merge-fmt/default.nix | 28 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 32 insertions, 0 deletions
diff --git a/pkgs/applications/version-management/merge-fmt/default.nix b/pkgs/applications/version-management/merge-fmt/default.nix new file mode 100644 index 0000000000000..2f1ec571b162f --- /dev/null +++ b/pkgs/applications/version-management/merge-fmt/default.nix @@ -0,0 +1,28 @@ +{ lib, fetchurl, buildDunePackage, cmdliner, base, stdio }: + +buildDunePackage rec { + pname = "merge-fmt"; + version = "0.3"; + + src = fetchurl { + url = + "https://github.com/hhugo/merge-fmt/releases/download/${version}/merge-fmt-${version}.tbz"; + hash = "sha256-F+ds0ToWcKD4NJU3yYSVW4B3m2LBnhR+4QVTDO79q14="; + }; + + minimalOCamlVersion = "4.06"; + duneVersion = "3"; + + buildInputs = [ cmdliner base stdio ]; + + meta = with lib; { + description = "Git mergetool leveraging code formatters"; + homepage = "https://github.com/hhugo/merge-fmt"; + license = licenses.mit; + longDescription = '' + `merge-fmt` is a small wrapper on top git commands to help resolve + conflicts by leveraging code formatters. + ''; + maintainers = [ maintainers.alizter ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 880ce5c92d463..9c36c0e4d78b9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2399,6 +2399,10 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) OpenCL; }; + merge-fmt = callPackage ../applications/version-management/merge-fmt { + inherit (ocamlPackages) buildDunePackage cmdliner base stdio; + }; + pass-git-helper = python3Packages.callPackage ../applications/version-management/pass-git-helper { }; qgit = qt5.callPackage ../applications/version-management/qgit { }; |