dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #298611 from anthonyroussel/update/goss

Browse Source 
goss: 0.4.4 -> 0.4.6
This commit is contained in:
Mario Rodas 2024-03-26 08:37:47 -05:00 committed by GitHub
commit 6adcdc8526
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 11 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nixos/tests/goss.nix
View File

@ -28,10 +28,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
}; };
group.root.exists = true; group.root.exists = true;
kernel-param."kernel.ostype".value = "Linux"; kernel-param."kernel.ostype".value = "Linux";
service.goss = {
enabled = true;
running = true;
};
user.root.exists = true; user.root.exists = true;
}; };
}; };
@ -46,8 +42,8 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
with subtest("returns health status"): with subtest("returns health status"):
result = json.loads(machine.succeed("curl -sS http://localhost:8080/healthz")) result = json.loads(machine.succeed("curl -sS http://localhost:8080/healthz"))
assert len(result["results"]) == 10, f".results should be an array of 10 items, was {result['results']!r}" assert len(result["results"]) == 8, f".results should be an array of 10 items, was {result['results']!r}"
assert result["summary"]["failed-count"] == 0, f".summary.failed-count should be zero, was {result['summary']['failed-count']}" assert result["summary"]["failed-count"] == 0, f".summary.failed-count should be zero, was {result['summary']['failed-count']}"
assert result["summary"]["test-count"] == 10, f".summary.test-count should be 10, was {result['summary']['test-count']}" assert result["summary"]["test-count"] == 8, f".summary.test-count should be 10, was {result['summary']['test-count']}"
''; '';
}) })

4
pkgs/tools/misc/dgoss/default.nix → pkgs/by-name/dg/dgoss/package.nix
View File

@ -9,13 +9,13 @@
resholve.mkDerivation rec { resholve.mkDerivation rec {
pname = "dgoss"; pname = "dgoss";
version = "0.4.2"; version = "0.4.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "goss-org"; owner = "goss-org";
repo = "goss"; repo = "goss";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-FDn1OETkYIpMenk8QAAHvfNZcSzqGl5xrD0fAZPVmRM="; hash = "sha256-4LJD70Y6nxRWdcaPe074iP2MVUMDgoTOwWbC1JecVcI=";
}; };
dontConfigure = true; dontConfigure = true;

17
pkgs/tools/misc/goss/default.nix → pkgs/by-name/go/goss/package.nix
View File

@ -16,30 +16,27 @@ buildGoModule rec {
pname = "goss"; pname = "goss";
# Don't forget to update dgoss to the same version. # Don't forget to update dgoss to the same version.
version = "0.4.4"; version = "0.4.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "goss-org"; owner = "goss-org";
repo = pname; repo = pname;
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-dH052t30unWmrFTZK5niXNvbg1nngzWY7mwuZr4ULbM="; hash = "sha256-4LJD70Y6nxRWdcaPe074iP2MVUMDgoTOwWbC1JecVcI=";
}; };
vendorHash = "sha256-4fEEz/c/xIeWxIzyyjwgSn2/2FWLA2tIedK65jGgYhY="; vendorHash = "sha256-5/vpoJZu/swNwQQXtW6wuEVCtOq6HsbFywuipaiwHfs=";
CGO_ENABLED = 0; CGO_ENABLED = 0;
ldflags = [ ldflags = [
"-s" "-w" "-X main.version=v${version}" "-s"
"-w"
"-X main.version=v${version}"
]; ];
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
checkFlags = [
# Prometheus tests are skipped upstream
# See https://github.com/goss-org/goss/blob/master/ci/go-test.sh
"-skip" "^TestPrometheus"
];
postInstall = let postInstall = let
runtimeDependencies = [ bash getent ] runtimeDependencies = [ bash getent ]
++ lib.optionals stdenv.isLinux [ systemd ]; ++ lib.optionals stdenv.isLinux [ systemd ];

4
pkgs/top-level/all-packages.nix
View File

@ -5000,8 +5000,6 @@ with pkgs;
ioport = callPackage ../os-specific/linux/ioport { }; ioport = callPackage ../os-specific/linux/ioport { };
dgoss = callPackage ../tools/misc/dgoss { };
diagrams-builder = callPackage ../tools/graphics/diagrams-builder { diagrams-builder = callPackage ../tools/graphics/diagrams-builder {
inherit (haskellPackages) ghcWithPackages diagrams-builder; inherit (haskellPackages) ghcWithPackages diagrams-builder;
}; };
@ -5533,8 +5531,6 @@ with pkgs;
godu = callPackage ../tools/misc/godu { }; godu = callPackage ../tools/misc/godu { };
goss = callPackage ../tools/misc/goss { };
gosu = callPackage ../tools/misc/gosu { }; gosu = callPackage ../tools/misc/gosu { };
gotify-cli = callPackage ../tools/misc/gotify-cli { }; gotify-cli = callPackage ../tools/misc/gotify-cli { };