diff options
| author | Joachim F <joachifm@users.noreply.github.com> | 2018-01-04 19:31:12 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-04 19:31:12 +0000 |
| commit | 05204ddfe49c92c4785d3ff4f0582c44e969e6a9 (patch) | |
| tree | 272e225d8ea665170f4dd95c05ec32466e6b5793 | |
| parent | 7b781bce598ddfa672c9f249cc6e116f06239291 (diff) | |
| parent | b7ed446cd19f24a62917658bce95fdcf69f5ca63 (diff) | |
Merge pull request #33332 from dtzWill/feature/fac
fac: init at 1.0.1
| -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 000000000000..22b5ff4f0866 --- /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 45fde304663b..2074d9986eef 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1088,6 +1088,8 @@ with pkgs; f3 = callPackage ../tools/filesystems/f3 { }; + fac = callPackage ../development/tools/fac { }; + facedetect = callPackage ../tools/graphics/facedetect { }; facter = callPackage ../tools/system/facter { }; |