summary refs log tree commit diff
path: root/pkgs/development/tools/continuous-integration/buildkite-agent
diff options
context:
space:
mode:
authorYorick <yorickvanpelt@gmail.com>2019-01-28 18:31:00 +0100
committerzimbatm <zimbatm@zimbatm.com>2019-01-28 17:31:00 +0000
commit83520c308caf404574e9d748c30078e6449f4fae (patch)
treea0df548dce7cee5d4cfa012070b9ac7b1c41180f /pkgs/development/tools/continuous-integration/buildkite-agent
parent38527866cf1973281b78f2fcb21b88bbdc94de1e (diff)
downloadnixpkgs-83520c308caf404574e9d748c30078e6449f4fae.tar
nixpkgs-83520c308caf404574e9d748c30078e6449f4fae.tar.gz
nixpkgs-83520c308caf404574e9d748c30078e6449f4fae.tar.bz2
nixpkgs-83520c308caf404574e9d748c30078e6449f4fae.tar.lz
nixpkgs-83520c308caf404574e9d748c30078e6449f4fae.tar.xz
nixpkgs-83520c308caf404574e9d748c30078e6449f4fae.tar.zst
nixpkgs-83520c308caf404574e9d748c30078e6449f4fae.zip
buildkite-agent3: 3.0.1 -> 3.8.4 (#54430)
Diffstat (limited to 'pkgs/development/tools/continuous-integration/buildkite-agent')
-rw-r--r--pkgs/development/tools/continuous-integration/buildkite-agent/3.x.nix9
-rw-r--r--pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix8
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 2ceaee5650b..e8266c2efe2 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 8aa02ac307d..ba0be89abf3 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