diff options
author | John Soo <john@consumable.com> | 2021-09-07 16:19:17 -0700 |
---|---|---|
committer | John Soo <john@consumable.com> | 2021-09-11 15:32:14 -0700 |
commit | 818cabf53bc327d43fefe5552261cce6c70b931d (patch) | |
tree | 298c684ba83f0fb6c764b54594ebd6607f230921 /pkgs/tools/networking/dd-agent | |
parent | f98ae8d59e27205b198631bbce7dc6fda619e9eb (diff) | |
download | nixlib-818cabf53bc327d43fefe5552261cce6c70b931d.tar nixlib-818cabf53bc327d43fefe5552261cce6c70b931d.tar.gz nixlib-818cabf53bc327d43fefe5552261cce6c70b931d.tar.bz2 nixlib-818cabf53bc327d43fefe5552261cce6c70b931d.tar.lz nixlib-818cabf53bc327d43fefe5552261cce6c70b931d.tar.xz nixlib-818cabf53bc327d43fefe5552261cce6c70b931d.tar.zst nixlib-818cabf53bc327d43fefe5552261cce6c70b931d.zip |
datadog-agent: Don't use invoke during build.
Diffstat (limited to 'pkgs/tools/networking/dd-agent')
-rw-r--r-- | pkgs/tools/networking/dd-agent/datadog-agent.nix | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/tools/networking/dd-agent/datadog-agent.nix b/pkgs/tools/networking/dd-agent/datadog-agent.nix index 55580cdd34f4..7f500b2c09fc 100644 --- a/pkgs/tools/networking/dd-agent/datadog-agent.nix +++ b/pkgs/tools/networking/dd-agent/datadog-agent.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, makeWrapper, fetchgit, git, invoke, pyaml, pythonPackages, pkg-config, systemd, hostname, extraTags ? [] }: +{ lib, buildGoModule, makeWrapper, fetchFromGitHub, pythonPackages, pkg-config, systemd, hostname, extraTags ? [] }: let # keep this in sync with github.com/DataDog/agent-payload dependency @@ -12,11 +12,10 @@ in buildGoModule rec { pname = "datadog-agent"; version = "7.30.2"; - src = fetchgit { - url = "https://${goPackagePath}.git"; + src = fetchFromGitHub { + inherit owner repo; rev = version; - leaveDotGit = true; - sha256 = "1cpybjwnby265w307p3hdg06448xrmapjbvd6zp46d7rsi4lj6vn"; + sha256 = "17ahrxhb87sj7f04wg44xv4k9wrlvf04j92ac5936a6maygp01rd"; }; vendorSha256 = "06ryy501vibc6n14qwg94394c76l060525y6qg261qb748mbi8qi"; @@ -30,7 +29,7 @@ in buildGoModule rec { ]; - nativeBuildInputs = [ git pyaml invoke pkg-config makeWrapper ]; + nativeBuildInputs = [ pkg-config makeWrapper ]; buildInputs = [ systemd ]; PKG_CONFIG_PATH = "${python}/lib/pkgconfig"; @@ -44,7 +43,8 @@ in buildGoModule rec { ]; in '' buildFlagsArray=( "-tags" "ec2 systemd cpython process log secrets ${lib.concatStringsSep " " extraTags}" "-ldflags" "${ldFlags}") - invoke generate --mod=vendor + # Keep directories to generate in sync with tasks/go.py + go generate ./pkg/status ./cmd/agent/gui ''; # DataDog use paths relative to the agent binary, so fix these. |