diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index d4c9d3e0fd2..4e39fb49a73 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4356,6 +4356,15 @@ github = "solson"; name = "Scott Olson"; }; + sondr3 = { + email = "nilsen.sondre@gmail.com"; + github = "sondr3"; + name = "Sondre Nilsen"; + keys = [{ + longkeyid = "ed25519/0x25676BCBFFAD76B1"; + fingerprint = "0EC3 FA89 EFBA B421 F82E 40B0 2567 6BCB FFAD 76B1"; + }]; + }; sorki = { email = "srk@48.io"; github = "sorki"; diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index e7199543ad7..0797d75a837 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -82,6 +82,8 @@ let git-hub = callPackage ./git-hub { }; + git-ignore = callPackage ./git-ignore { }; + git-imerge = callPackage ./git-imerge { }; git-octopus = callPackage ./git-octopus { }; diff --git a/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix b/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix new file mode 100644 index 00000000000..9edcf4c3ac4 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl, darwin }: + +with rustPlatform; + +buildRustPackage rec { + name = "git-ignore-${version}"; + version = "0.2.0"; + + cargoSha256 = "1fqfy8lnvpn5sd3l73x2p359zq4303vsrdgw3aphvy6580yjb84d"; + + src = fetchFromGitHub { + owner = "sondr3"; + repo = "git-ignore"; + rev = "v${version}"; + sha256 = "1nihh5inh46r8jg9z7d6g9gqfyhrznmkn15nmzpbnzf0653dl629"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ openssl ] + ++ stdenv.lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; + + meta = with stdenv.lib; { + description = "Quickly and easily fetch .gitignore templates from gitignore.io"; + homepage = https://github.com/sondr3/git-ignore; + license = licenses.gpl3Plus; + platforms = platforms.all; + maintainers = [ maintainers.sondr3 ]; + }; +}