From 41c914edb2d18f4892bbde263a66e65b2ffcfeb5 Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 21 Sep 2022 09:48:25 -0400 Subject: [PATCH 1/2] changie: fix version output, add figsoda to maintainers --- pkgs/development/tools/changie/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/changie/default.nix b/pkgs/development/tools/changie/default.nix index 53c4a22f59f36..e9de84c20ad7d 100644 --- a/pkgs/development/tools/changie/default.nix +++ b/pkgs/development/tools/changie/default.nix @@ -13,12 +13,14 @@ buildGoModule rec { vendorSha256 = "sha256-9Cpyemq/f62rVMvGwOtgDGd9XllvICXL2dqNwUoFQmg="; + ldflags = [ "-s" "-w" "-X=main.version=${version}" ]; + meta = with lib; { homepage = "https://changie.dev"; + changelog = "https://github.com/miniscruff/changie/blob/v${version}/CHANGELOG.md"; description = "Automated changelog tool for preparing releases with lots of customization options"; license = licenses.mit; platforms = platforms.unix; - maintainers = with maintainers; [ matthiasbeyer ]; + maintainers = with maintainers; [ figsoda matthiasbeyer ]; }; } - From 6fd770a1fead52798ebf87c454f53911bbcdb98b Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 21 Sep 2022 11:51:21 -0400 Subject: [PATCH 2/2] changie: skip flaky test --- pkgs/development/tools/changie/default.nix | 2 ++ pkgs/development/tools/changie/skip-flaky-test.patch | 10 ++++++++++ 2 files changed, 12 insertions(+) create mode 100644 pkgs/development/tools/changie/skip-flaky-test.patch diff --git a/pkgs/development/tools/changie/default.nix b/pkgs/development/tools/changie/default.nix index e9de84c20ad7d..e2a9bed25099e 100644 --- a/pkgs/development/tools/changie/default.nix +++ b/pkgs/development/tools/changie/default.nix @@ -13,6 +13,8 @@ buildGoModule rec { vendorSha256 = "sha256-9Cpyemq/f62rVMvGwOtgDGd9XllvICXL2dqNwUoFQmg="; + patches = [ ./skip-flaky-test.patch ]; + ldflags = [ "-s" "-w" "-X=main.version=${version}" ]; meta = with lib; { diff --git a/pkgs/development/tools/changie/skip-flaky-test.patch b/pkgs/development/tools/changie/skip-flaky-test.patch new file mode 100644 index 0000000000000..48c038ecf624d --- /dev/null +++ b/pkgs/development/tools/changie/skip-flaky-test.patch @@ -0,0 +1,10 @@ +--- a/core/change_test.go ++++ b/core/change_test.go +@@ -353,6 +353,7 @@ var _ = Describe("Change ask prompts", func() { + }) + + It("gets error for invalid body", func() { ++ Skip("") + var min int64 = 5 + submitFailed := false + config := Config{