diff options
author | Anthony Roussel <anthony@roussel.dev> | 2024-05-29 10:22:01 +0200 |
---|---|---|
committer | Anthony Roussel <anthony@roussel.dev> | 2024-05-29 10:26:55 +0200 |
commit | 636742652d6942a4c4982d99b32937ad17cfccf0 (patch) | |
tree | b1baf1955c43100c1c6936bca83090952ba31f37 | |
parent | 42b2a1173e9604877326991fecc5a3bf2cdf5c0e (diff) |
dgoss: sync with goss
-rw-r--r-- | pkgs/by-name/dg/dgoss/package.nix | 31 | ||||
-rw-r--r-- | pkgs/by-name/go/goss/package.nix | 2 |
2 files changed, 15 insertions, 18 deletions
diff --git a/pkgs/by-name/dg/dgoss/package.nix b/pkgs/by-name/dg/dgoss/package.nix index cf396e70829e9..55014119c8265 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 0715ee1901e66..672800e410d4d 100644 --- a/pkgs/by-name/go/goss/package.nix +++ b/pkgs/by-name/go/goss/package.nix @@ -14,8 +14,6 @@ buildGoModule rec { pname = "goss"; - - # Don't forget to update dgoss to the same version. version = "0.4.7"; src = fetchFromGitHub { |