BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #162029 from zombiezen/gg-scm-121

Browse source 
gg-scm: 1.1.0 -> 1.2.1
This commit is contained in:
Artturi 2022-03-01 05:33:49 +02:00 committed by GitHub
commit 1f0db68c4a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
pkgs/applications/version-management/git-and-tools/gg/default.nix
View file

@ -3,32 +3,41 @@
, fetchFromGitHub , fetchFromGitHub
, installShellFiles , installShellFiles
, makeWrapper , makeWrapper
, bash
, coreutils
, git , git
, pandoc , pandoc
}: }:
buildGoModule rec { let
version = "1.2.1";
commit = "eed9dc7c82c5a7fbc13fd9b496e1faaec3f20d57";
in buildGoModule {
pname = "gg-scm"; pname = "gg-scm";
version = "1.1.0"; inherit version;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "gg-scm"; owner = "gg-scm";
repo = "gg"; repo = "gg";
rev = "v${version}"; 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" ]; subPackages = [ "cmd/gg" ];
ldflags = [ ldflags = [
"-s" "-w" "-s" "-w"
"-X" "main.versionInfo=${version}" "-X" "main.versionInfo=${version}"
"-X" "main.buildCommit=a0b348c9cef33fa46899f5e55e3316f382a09f6a+" "-X" "main.buildCommit=${commit}"
]; ];
vendorSha256 = "sha256-+ZmNXB+I6vPRbACwEkfl/vVmqoZy67Zn9SBrham5zRk="; vendorSha256 = "214dc073dad7b323ea449acf24c5b578d573432eeaa1506cf5761a2d7f5ce405";
nativeBuildInputs = [ git pandoc installShellFiles makeWrapper ]; nativeBuildInputs = [ pandoc installShellFiles makeWrapper ];
buildInputs = [ git ]; checkInputs = [ bash coreutils git ];
buildInputs = [ bash git ];
postInstall = '' postInstall = ''
wrapProgram $out/bin/gg --suffix PATH : ${git}/bin wrapProgram $out/bin/gg --suffix PATH : ${git}/bin

12
pkgs/applications/version-management/git-and-tools/gg/skip-broken-revert-tests.patch
View file

@ -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()