diff options
| author | Yorick <yorickvanpelt@gmail.com> | 2019-01-28 18:31:00 +0100 |
|---|---|---|
| committer | zimbatm <zimbatm@zimbatm.com> | 2019-01-28 17:31:00 +0000 |
| commit | 83520c308caf404574e9d748c30078e6449f4fae (patch) | |
| tree | a0df548dce7cee5d4cfa012070b9ac7b1c41180f /pkgs/development/tools/continuous-integration | |
| parent | 38527866cf1973281b78f2fcb21b88bbdc94de1e (diff) | |
buildkite-agent3: 3.0.1 -> 3.8.4 (#54430)
Diffstat (limited to 'pkgs/development/tools/continuous-integration')
| -rw-r--r-- | pkgs/development/tools/continuous-integration/buildkite-agent/3.x.nix | 9 | ||||
| -rw-r--r-- | pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix | 8 |
2 files changed, 8 insertions, 9 deletions
diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/3.x.nix b/pkgs/development/tools/continuous-integration/buildkite-agent/3.x.nix index 2ceaee5650b2..e8266c2efe2c 100644 --- a/pkgs/development/tools/continuous-integration/buildkite-agent/3.x.nix +++ b/pkgs/development/tools/continuous-integration/buildkite-agent/3.x.nix @@ -1,12 +1,15 @@ -{ callPackage, fetchFromGitHub, ... } @ args: +{ bash, callPackage, fetchFromGitHub, ... } @ args: callPackage ./generic.nix (args // rec { src = fetchFromGitHub { owner = "buildkite"; repo = "agent"; rev = "v${version}"; - sha256 = "09smyrzp1xkczlmh8vqb7bmjb2b5d6yf9birjgaw36c6m44bpfvs"; + sha256 = "0sr1rxl92d4wdipl66f1yymx5bmyj1y85v6k22v57rzr6yhyfmsf"; }; - version = "3.0.1"; + version = "3.8.4"; hasBootstrapScript = false; + postPatch = '' + substituteInPlace bootstrap/shell/shell.go --replace /bin/bash ${bash}/bin/bash + ''; }) diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix b/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix index 8aa02ac307dd..ba0be89abf3d 100644 --- a/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix +++ b/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix @@ -1,5 +1,5 @@ { stdenv, buildGoPackage, makeWrapper, coreutils, git, openssh, bash, gnused, gnugrep -, src, version, hasBootstrapScript +, src, version, hasBootstrapScript, postPatch ? "" , ... }: let goPackagePath = "github.com/buildkite/agent"; @@ -7,14 +7,10 @@ in buildGoPackage { name = "buildkite-agent-${version}"; - inherit goPackagePath src; + inherit goPackagePath src postPatch; nativeBuildInputs = [ makeWrapper ]; - # on Linux, the TMPDIR is /build which is the same prefix as this package - # remove once #35068 is merged - noAuditTmpdir = stdenv.isLinux; - postInstall = '' ${stdenv.lib.optionalString hasBootstrapScript '' # Install bootstrap.sh |