diff options
| author | Artturi <Artturin@artturin.com> | 2022-03-01 05:33:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-01 05:33:51 +0200 |
| commit | 9d8763b7916f05c34525b6fc4ad31a6c63a1298a (patch) | |
| tree | 1cc05bd3c431401522940b19a304e34596fca5ac | |
| parent | Merge pull request #162029 from zombiezen/gg-scm-121 (diff) | |
| download | nixpkgs-origin/revert-162029-gg-scm-121.tar.gz | |
Revert "gg-scm: 1.1.0 -> 1.2.1"origin/revert-162029-gg-scm-121
| -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, 20 insertions, 17 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 7bb0dec9eb26..a5ea070ec0f2 100644 --- a/pkgs/applications/version-management/git-and-tools/gg/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gg/default.nix @@ -3,41 +3,32 @@ , fetchFromGitHub , installShellFiles , makeWrapper -, bash -, coreutils , git , pandoc }: -let - version = "1.2.1"; - commit = "eed9dc7c82c5a7fbc13fd9b496e1faaec3f20d57"; -in buildGoModule { +buildGoModule rec { pname = "gg-scm"; - inherit version; + version = "1.1.0"; src = fetchFromGitHub { owner = "gg-scm"; repo = "gg"; rev = "v${version}"; - sha256 = "770c807403f5d99cea6450f889d268800e1c2563f0cd6142936741c40b29cc95"; + sha256 = "sha256-kLmu4h/EBbSFHrffvusKq38X3/ID9bOlLMvEUtnFGhk="; }; - postPatch = '' - substituteInPlace cmd/gg/editor_unix.go \ - --replace /bin/sh ${bash}/bin/sh - ''; + patches = [ ./skip-broken-revert-tests.patch ]; subPackages = [ "cmd/gg" ]; ldflags = [ "-s" "-w" "-X" "main.versionInfo=${version}" - "-X" "main.buildCommit=${commit}" + "-X" "main.buildCommit=a0b348c9cef33fa46899f5e55e3316f382a09f6a+" ]; - vendorSha256 = "214dc073dad7b323ea449acf24c5b578d573432eeaa1506cf5761a2d7f5ce405"; + vendorSha256 = "sha256-+ZmNXB+I6vPRbACwEkfl/vVmqoZy67Zn9SBrham5zRk="; - nativeBuildInputs = [ pandoc installShellFiles makeWrapper ]; - checkInputs = [ bash coreutils git ]; - buildInputs = [ bash git ]; + nativeBuildInputs = [ git pandoc installShellFiles makeWrapper ]; + buildInputs = [ 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 new file mode 100644 index 000000000000..f8540952ae7c --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/gg/skip-broken-revert-tests.patch @@ -0,0 +1,12 @@ +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() |