diff options
author | Mario Rodas <marsam@users.noreply.github.com> | 2021-01-06 17:30:53 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-06 17:30:53 -0500 |
commit | b3f079e40c6472114995866af25111f349705f75 (patch) | |
tree | 19f31095226c67354477d136bcdee127290acf5c /pkgs | |
parent | 1358d9b5db4a06730c61a2c106c9f760f0f603c2 (diff) | |
parent | ffcc723c731df1e7e511fcab5221db82d98e7617 (diff) | |
download | nixpkgs-b3f079e40c6472114995866af25111f349705f75.tar nixpkgs-b3f079e40c6472114995866af25111f349705f75.tar.gz nixpkgs-b3f079e40c6472114995866af25111f349705f75.tar.bz2 nixpkgs-b3f079e40c6472114995866af25111f349705f75.tar.lz nixpkgs-b3f079e40c6472114995866af25111f349705f75.tar.xz nixpkgs-b3f079e40c6472114995866af25111f349705f75.tar.zst nixpkgs-b3f079e40c6472114995866af25111f349705f75.zip |
Merge pull request #107012 from DamienCassou/DamienCassou/git-when-merged
gitAndTools.git-when-merged: init at 1.2.0
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/version-management/git-and-tools/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/version-management/git-and-tools/git-when-merged/default.nix | 40 |
2 files changed, 42 insertions, 0 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 46b27e95c79..2b0efdf6904 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -172,6 +172,8 @@ let inherit (darwin.apple_sdk.frameworks) Security; }; + git-when-merged = callPackage ./git-when-merged { }; + git-workspace = callPackage ./git-workspace { inherit (darwin.apple_sdk.frameworks) Security; }; diff --git a/pkgs/applications/version-management/git-and-tools/git-when-merged/default.nix b/pkgs/applications/version-management/git-and-tools/git-when-merged/default.nix new file mode 100644 index 00000000000..8eee1469819 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-when-merged/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchFromGitHub, python3 }: + +stdenv.mkDerivation rec { + pname = "git-when-merged"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "mhagger"; + repo = pname; + rev = "v${version}"; + sha256 = "0sw98gmsnd4iki9fx455jga9m80bxvvfgys8i1r2fc7d5whc2qa6"; + }; + + buildInputs = [ python3 ]; + + installPhase = '' + install -D --target-directory $out/bin/ bin/git-when-merged + ''; + + meta = with stdenv.lib; { + description = + "Helps you figure out when and why a commit was merged into a branch"; + longDescription = '' + If you use standard Git workflows, then you create a feature + branch for each feature that you are working on. When the feature + is complete, you merge it into your master branch. You might even + have sub-feature branches that are merged into a feature branch + before the latter is merged. + + In such a workflow, the first-parent history of master consists + mainly of merges of feature branches into the mainline. git + when-merged can be used to ask, "When (and why) was commit C + merged into the current branch?" + ''; + homepage = "https://github.com/mhagger/git-when-merged"; + license = licenses.gpl2Only; + platforms = python3.meta.platforms; + maintainers = with maintainers; [ DamienCassou ]; + }; +} |