MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 06:45:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

merge-fmt: init at 0.3

Browse source 
Signed-off-by: Ali Caglayan <alizter@gmail.com>
This commit is contained in:
Ali Caglayan 2023-08-04 17:13:01 +02:00 committed by Vincent Laporte
parent 47224fd0c5
commit 59d7a52fcb
2 changed files with 32 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
pkgs/applications/version-management/merge-fmt/default.nix Normal file
View file

@ -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 ];
};
}

4
pkgs/top-level/all-packages.nix
View file

@ -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 { };