Unverified Commit 5039770f authored by Thomas Gerbet's avatar Thomas Gerbet Committed by GitHub
Browse files

fleet: 4.67.1 -> 4.67.2, fleetctl: 4.67.1 -> 4.67.2 and keep in sync with fleet (#402876)

parents f149b2b0 e1b2c783

pkgs/by-name/fl/fleet/package.nix

+4 −10
Original line number Diff line number Diff line 
{

  lib,

  stdenv,

  fetchFromGitHub,

  buildGoModule,

  writableTmpDirAsHomeHook,

  versionCheckHook,

}:



buildGoModule (finalAttrs: {

  pname = "fleet";

  version = "4.67.1";

  version = "4.67.2";



  src = fetchFromGitHub {

    owner = "fleetdm";

    repo = "fleet";

    tag = "fleet-v${finalAttrs.version}";

    hash = "sha256-cZ0YTFcyPt7NMZUDZCdlVPTuhwRy7mTp7JCdINqiwOM=";

    hash = "sha256-iMLD9M4EzXHRxvc5px9UcXEdjRIO1jm+hYwhaYaFON8=";

  };

  vendorHash = "sha256-gFAotYho18Jn8MaFK6ShoMA1VLXVENcrASvHWZGFOFg=";

  vendorHash = "sha256-UkdHwjCcxNX7maI4QClLm5WWaLXwGlEu80eZXVoYy60=";



  subPackages = [

    "cmd/fleet"
@@ -28,11 +26,6 @@ buildGoModule (finalAttrs: { 
    "-X github.com/fleetdm/fleet/v4/server/version.version=${finalAttrs.version}"

  ];



  doCheck = true;

  nativeCheckInputs = [

    writableTmpDirAsHomeHook

  ];



  doInstallCheck = true;

  versionCheckProgramArg = "version";

  nativeInstallCheckInputs = [
@@ -46,6 +39,7 @@ buildGoModule (finalAttrs: { 
    license = lib.licenses.mit;

    maintainers = with lib.maintainers; [

      asauzeau

      lesuisse

    ];

    mainProgram = "fleet";

  };

pkgs/by-name/fl/fleetctl/package.nix

+13 −16
Original line number Diff line number Diff line 
{

  lib,

  buildGoModule,

  fetchFromGitHub,

  fleet,

  writableTmpDirAsHomeHook,

  versionCheckHook,

  stdenv,

}:



buildGoModule rec {

  pname = "fleectl";

  version = "4.67.1";

buildGoModule (finalAttrs: {

  pname = "fleetctl";



  src = fetchFromGitHub {

    owner = "fleetdm";

    repo = "fleet";

    tag = "fleet-v${version}";

    hash = "sha256-shaOPK7BbIDARopzGehlIA6aPdRiFRP9hrFRNO3kfGA=";

  };

  vendorHash = "sha256-UkdHwjCcxNX7maI4QClLm5WWaLXwGlEu80eZXVoYy60=";

  inherit (fleet) version src vendorHash;



  subPackages = [

    "cmd/fleetctl"

  ];



  ldflags = [

    "-X github.com/fleetdm/fleet/v4/server/version.appName=${pname}"

    "-X github.com/fleetdm/fleet/v4/server/version.version=${version}"

    "-X github.com/fleetdm/fleet/v4/server/version.appName=fleetctl"

    "-X github.com/fleetdm/fleet/v4/server/version.version=${finalAttrs.version}"

  ];



  nativeCheckInputs = [

    writableTmpDirAsHomeHook

    versionCheckHook

  ];



  # Try to access /var/empty/.goquery/history subfolders

  doCheck = !stdenv.hostPlatform.isDarwin;

  doInstallCheck = !stdenv.hostPlatform.isDarwin;



  nativeInstallCheckInputs = [

    versionCheckHook

  ];



  meta = {

    homepage = "https://github.com/fleetdm/fleet";

    changelog = "https://github.com/fleetdm/fleet/releases/tag/fleet-v${version}";

    changelog = "https://github.com/fleetdm/fleet/releases/tag/fleet-v${finalAttrs.version}";

    description = "CLI tool for managing Fleet";

    license = lib.licenses.mit;

    maintainers = with lib.maintainers; [
@@ -46,4 +43,4 @@ buildGoModule rec { 
    ];

    mainProgram = "fleetctl";

  };

}
 
})