diff options
| author | Will Dietz <w@wdtz.org> | 2018-01-02 10:25:45 -0600 |
|---|---|---|
| committer | Will Dietz <w@wdtz.org> | 2018-01-02 18:05:20 -0600 |
| commit | b7ed446cd19f24a62917658bce95fdcf69f5ca63 (patch) | |
| tree | 732aaed1e3b7800b8e32f859fc07a78650ecc560 | |
| parent | 0bc1642fb87041a7f4288ce2219ac6ebdb517a7c (diff) | |
fac: 1.0.1
Fixes #33321.
| -rw-r--r-- | pkgs/development/tools/fac/default.nix | 30 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 32 insertions, 0 deletions
diff --git a/pkgs/development/tools/fac/default.nix b/pkgs/development/tools/fac/default.nix new file mode 100644 index 0000000000000..22b5ff4f08663 --- /dev/null +++ b/pkgs/development/tools/fac/default.nix @@ -0,0 +1,30 @@ +{ stdenv, buildGoPackage, fetchFromGitHub, makeWrapper, git }: + +buildGoPackage rec { + name = "fac-${version}"; + version = "1.0.1"; + + goPackagePath = "github.com/mkchoi212/fac"; + + src = fetchFromGitHub { + owner = "mkchoi212"; + repo = "fac"; + rev = "v${version}"; + sha256 = "1j5kip3l3p9qlly03pih905sdz3ncvpj7135jpnfhckbk1s5x9dc"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + postInstall = '' + wrapProgram $bin/bin/fac \ + --prefix PATH : ${git}/bin + ''; + + meta = with stdenv.lib; { + description = "CUI for fixing git conflicts"; + inherit (src.meta) homepage; + license = licenses.mit; + maintainers = with maintainers; [ dtzWill ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bbaef3658d692..683af8c93b027 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1087,6 +1087,8 @@ with pkgs; f3 = callPackage ../tools/filesystems/f3 { }; + fac = callPackage ../development/tools/fac { }; + facedetect = callPackage ../tools/graphics/facedetect { }; facter = callPackage ../tools/system/facter { }; |