diff --git a/pkgs/by-name/dg/dgoss/package.nix b/pkgs/by-name/dg/dgoss/package.nix index cf396e70829e..55014119c826 100644 --- a/pkgs/by-name/dg/dgoss/package.nix +++ b/pkgs/by-name/dg/dgoss/package.nix @@ -1,22 +1,17 @@ -{ lib -, fetchFromGitHub -, resholve -, bash -, coreutils -, goss -, which +{ + bash, + coreutils, + gnused, + goss, + lib, + resholve, + which, }: resholve.mkDerivation rec { pname = "dgoss"; - version = "0.4.6"; - - src = fetchFromGitHub { - owner = "goss-org"; - repo = "goss"; - rev = "refs/tags/v${version}"; - hash = "sha256-4LJD70Y6nxRWdcaPe074iP2MVUMDgoTOwWbC1JecVcI="; - }; + version = goss.version; + src = goss.src; dontConfigure = true; dontBuild = true; @@ -30,7 +25,11 @@ resholve.mkDerivation rec { default = { scripts = [ "bin/dgoss" ]; interpreter = "${bash}/bin/bash"; - inputs = [ coreutils which ]; + inputs = [ + coreutils + gnused + which + ]; keep = { "$CONTAINER_RUNTIME" = true; }; diff --git a/pkgs/by-name/go/goss/package.nix b/pkgs/by-name/go/goss/package.nix index 5501d07e134f..672800e410d4 100644 --- a/pkgs/by-name/go/goss/package.nix +++ b/pkgs/by-name/go/goss/package.nix @@ -14,25 +14,23 @@ buildGoModule rec { pname = "goss"; - - # Don't forget to update dgoss to the same version. - version = "0.4.6"; + version = "0.4.7"; src = fetchFromGitHub { owner = "goss-org"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-4LJD70Y6nxRWdcaPe074iP2MVUMDgoTOwWbC1JecVcI="; + hash = "sha256-KP0i+ePmkx43MdokVQO3CvTsdIFO7rCWLd8vJVC9Qf0="; }; - vendorHash = "sha256-5/vpoJZu/swNwQQXtW6wuEVCtOq6HsbFywuipaiwHfs="; + vendorHash = "sha256-VLIDAlLO6COGDKDN12bYIBluFVgqPEmm8QRfSNPfLJY="; CGO_ENABLED = 0; ldflags = [ "-s" "-w" - "-X main.version=v${version}" + "-X github.com/goss-org/goss/util.Version=v${version}" ]; nativeBuildInputs = [ makeWrapper ];