From 95052508cdad36f817af14da2f9753c7cb7e9f2b Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 28 Nov 2023 20:47:48 -0500 Subject: [PATCH] runme: 1.7.8 -> 2.0.0 Diff: https://github.com/stateful/runme/compare/v1.7.8...v2.0.0 Changelog: https://github.com/stateful/runme/releases/tag/v2.0.0 --- pkgs/development/tools/misc/runme/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/misc/runme/default.nix b/pkgs/development/tools/misc/runme/default.nix index 3795476c3e16..bf93c17e4da7 100644 --- a/pkgs/development/tools/misc/runme/default.nix +++ b/pkgs/development/tools/misc/runme/default.nix @@ -1,5 +1,5 @@ { lib -, buildGo121Module +, buildGoModule , fetchFromGitHub , installShellFiles , nodejs @@ -10,18 +10,18 @@ , runme }: -buildGo121Module rec { +buildGoModule rec { pname = "runme"; - version = "1.7.8"; + version = "2.0.0"; src = fetchFromGitHub { owner = "stateful"; repo = "runme"; rev = "v${version}"; - hash = "sha256-ZM8gdZ26XAlC+j6U0+oQJIb+5gOGFUAYHPP82kA1ogU="; + hash = "sha256-EUAYwm7nd7VRGbTth+ZXcgqqPSGKthv8sciO+iCpdds="; }; - vendorHash = "sha256-nKH4hT0J9QfrDdvovu/XNxU4PtZYKkfqEBiCTNLWyRA="; + vendorHash = "sha256-xQuxoizcxut4qjXqgMEWMROiG53goxEXQas5n/2NiaY="; nativeBuildInputs = [ installShellFiles @@ -44,8 +44,11 @@ buildGo121Module rec { "-X=github.com/stateful/runme/internal/version.Commit=${src.rev}" ]; + # tests fail to access /etc/bashrc on darwin + doCheck = !stdenv.isDarwin; + postPatch = '' - substituteInPlace testdata/script/basic.txtar \ + substituteInPlace testdata/{categories/basic,runall/basic,script/basic}.txtar \ --replace /bin/bash "${runtimeShell}" '';