From 8694bf0696e40c673d7095b866e70dccfda7fdb3 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sun, 24 Mar 2024 12:26:16 +0100 Subject: [PATCH 1/5] dgoss: 0.4.2 -> 0.4.6 --- pkgs/tools/misc/dgoss/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/dgoss/default.nix b/pkgs/tools/misc/dgoss/default.nix index 8201a8805be1..cf396e70829e 100644 --- a/pkgs/tools/misc/dgoss/default.nix +++ b/pkgs/tools/misc/dgoss/default.nix @@ -9,13 +9,13 @@ resholve.mkDerivation rec { pname = "dgoss"; - version = "0.4.2"; + version = "0.4.6"; src = fetchFromGitHub { owner = "goss-org"; repo = "goss"; rev = "refs/tags/v${version}"; - hash = "sha256-FDn1OETkYIpMenk8QAAHvfNZcSzqGl5xrD0fAZPVmRM="; + hash = "sha256-4LJD70Y6nxRWdcaPe074iP2MVUMDgoTOwWbC1JecVcI="; }; dontConfigure = true; From b110971a7a2f170cf7beca33a727a827836533b4 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sun, 24 Mar 2024 12:26:32 +0100 Subject: [PATCH 2/5] goss: 0.4.4 -> 0.4.6 https://github.com/goss-org/goss/compare/v0.4.4...v0.4.6 --- pkgs/tools/misc/goss/default.nix | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/misc/goss/default.nix b/pkgs/tools/misc/goss/default.nix index 83b6b2466fbf..5501d07e134f 100644 --- a/pkgs/tools/misc/goss/default.nix +++ b/pkgs/tools/misc/goss/default.nix @@ -16,30 +16,27 @@ buildGoModule rec { pname = "goss"; # Don't forget to update dgoss to the same version. - version = "0.4.4"; + version = "0.4.6"; src = fetchFromGitHub { owner = "goss-org"; repo = pname; 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; + ldflags = [ - "-s" "-w" "-X main.version=v${version}" + "-s" + "-w" + "-X main.version=v${version}" ]; 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 runtimeDependencies = [ bash getent ] ++ lib.optionals stdenv.isLinux [ systemd ]; From e994c804b6d0c3d2e94548426378da6bfaa804e8 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sun, 24 Mar 2024 12:43:02 +0100 Subject: [PATCH 3/5] nixosTests.goss: fix unstable test --- nixos/tests/goss.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/nixos/tests/goss.nix b/nixos/tests/goss.nix index 6b772d19215e..2e77b2734464 100644 --- a/nixos/tests/goss.nix +++ b/nixos/tests/goss.nix @@ -28,10 +28,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { }; group.root.exists = true; kernel-param."kernel.ostype".value = "Linux"; - service.goss = { - enabled = true; - running = true; - }; user.root.exists = true; }; }; @@ -46,8 +42,8 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { with subtest("returns health status"): 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"]["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']}" ''; }) From 381cfad636f9fcfe6fac41cbe702638df923abae Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sun, 24 Mar 2024 14:55:11 +0100 Subject: [PATCH 4/5] dgoss: move to pkgs/by-name --- .../misc/dgoss/default.nix => by-name/dg/dgoss/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/misc/dgoss/default.nix => by-name/dg/dgoss/package.nix} (100%) diff --git a/pkgs/tools/misc/dgoss/default.nix b/pkgs/by-name/dg/dgoss/package.nix similarity index 100% rename from pkgs/tools/misc/dgoss/default.nix rename to pkgs/by-name/dg/dgoss/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b682c3501ecd..17593ac426f7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5004,8 +5004,6 @@ with pkgs; ioport = callPackage ../os-specific/linux/ioport { }; - dgoss = callPackage ../tools/misc/dgoss { }; - diagrams-builder = callPackage ../tools/graphics/diagrams-builder { inherit (haskellPackages) ghcWithPackages diagrams-builder; }; From 0df8e366dc1ca41a6586102d9c01820f7adfff4f Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sun, 24 Mar 2024 14:55:31 +0100 Subject: [PATCH 5/5] goss: move to pkgs/by-name --- .../misc/goss/default.nix => by-name/go/goss/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/misc/goss/default.nix => by-name/go/goss/package.nix} (100%) diff --git a/pkgs/tools/misc/goss/default.nix b/pkgs/by-name/go/goss/package.nix similarity index 100% rename from pkgs/tools/misc/goss/default.nix rename to pkgs/by-name/go/goss/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 17593ac426f7..e876cf88f47c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5535,8 +5535,6 @@ with pkgs; godu = callPackage ../tools/misc/godu { }; - goss = callPackage ../tools/misc/goss { }; - gosu = callPackage ../tools/misc/gosu { }; gotify-cli = callPackage ../tools/misc/gotify-cli { };