diff options
| author | Artturi <Artturin@artturin.com> | 2022-03-01 05:33:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-01 05:33:49 +0200 |
| commit | 1f0db68c4ace494339913db33d8f210cf5157279 (patch) | |
| tree | bb02eee62062cf21501aacd1b341cbecbfa6e011 | |
| parent | Merge pull request #162122 from psydvl/bottles (diff) | |
| parent | gg-scm: 1.1.0 -> 1.2.1 (diff) | |
| download | nixpkgs-1f0db68c4ace494339913db33d8f210cf5157279.tar.gz | |
Merge pull request #162029 from zombiezen/gg-scm-121
gg-scm: 1.1.0 -> 1.2.1
| -rw-r--r-- | pkgs/applications/version-management/git-and-tools/gg/default.nix | 25 | ||||
| -rw-r--r-- | pkgs/applications/version-management/git-and-tools/gg/skip-broken-revert-tests.patch | 12 |
2 files changed, 17 insertions, 20 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/gg/default.nix b/pkgs/applications/version-management/git-and-tools/gg/default.nix index a5ea070ec0f2..7bb0dec9eb26 100644 --- a/pkgs/applications/version-management/git-and-tools/gg/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gg/default.nix @@ -3,32 +3,41 @@ , fetchFromGitHub , installShellFiles , makeWrapper +, bash +, coreutils , git , pandoc }: -buildGoModule rec { +let + version = "1.2.1"; + commit = "eed9dc7c82c5a7fbc13fd9b496e1faaec3f20d57"; +in buildGoModule { pname = "gg-scm"; - version = "1.1.0"; + inherit version; src = fetchFromGitHub { owner = "gg-scm"; repo = "gg"; rev = "v${version}"; - sha256 = "sha256-kLmu4h/EBbSFHrffvusKq38X3/ID9bOlLMvEUtnFGhk="; + sha256 = "770c807403f5d99cea6450f889d268800e1c2563f0cd6142936741c40b29cc95"; }; - patches = [ ./skip-broken-revert-tests.patch ]; + postPatch = '' + substituteInPlace cmd/gg/editor_unix.go \ + --replace /bin/sh ${bash}/bin/sh + ''; subPackages = [ "cmd/gg" ]; ldflags = [ "-s" "-w" "-X" "main.versionInfo=${version}" - "-X" "main.buildCommit=a0b348c9cef33fa46899f5e55e3316f382a09f6a+" + "-X" "main.buildCommit=${commit}" ]; - vendorSha256 = "sha256-+ZmNXB+I6vPRbACwEkfl/vVmqoZy67Zn9SBrham5zRk="; + vendorSha256 = "214dc073dad7b323ea449acf24c5b578d573432eeaa1506cf5761a2d7f5ce405"; - nativeBuildInputs = [ git pandoc installShellFiles makeWrapper ]; - buildInputs = [ git ]; + nativeBuildInputs = [ pandoc installShellFiles makeWrapper ]; + checkInputs = [ bash coreutils git ]; + buildInputs = [ bash git ]; postInstall = '' wrapProgram $out/bin/gg --suffix PATH : ${git}/bin diff --git a/pkgs/applications/version-management/git-and-tools/gg/skip-broken-revert-tests.patch b/pkgs/applications/version-management/git-and-tools/gg/skip-broken-revert-tests.patch deleted file mode 100644 index f8540952ae7c..000000000000 --- a/pkgs/applications/version-management/git-and-tools/gg/skip-broken-revert-tests.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/cmd/gg/revert_test.go b/cmd/gg/revert_test.go -index 9420e9b..ff6ca93 100644 ---- a/cmd/gg/revert_test.go -+++ b/cmd/gg/revert_test.go -@@ -592,6 +592,7 @@ func TestRevert_LocalRename(t *testing.T) { - } - - func TestRevert_UnknownFile(t *testing.T) { -+ t.Skip("Broken in 1.1.0") - t.Parallel() - t.Run("EmptyRepo", func(t *testing.T) { - t.Parallel() |