github-actions[bot]
2 years ago
committed by
GitHub
commit
dae6d3bb73
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,27 @@ |
|||||||
|
# HG changeset patch
|
||||||
|
# User John Donoghue <john.donoghue@ieee.org>
|
||||||
|
# Date 1652358904 14400
|
||||||
|
# Thu May 12 08:35:04 2022 -0400
|
||||||
|
# Branch stable
|
||||||
|
# Node ID 8c940cfcce257369677c09154da2aab2c56eaa79
|
||||||
|
# Parent 63710f3bd9811c2d206ac9e7b4f47cf06c47e153
|
||||||
|
* scripts/pkg/private/build.m: check configure and Makefile exist before trying to unlink them (Bug #62436)
|
||||||
|
|
||||||
|
diff -r 63710f3bd981 -r 8c940cfcce25 scripts/pkg/private/build.m
|
||||||
|
--- a/scripts/pkg/private/build.m Wed May 11 09:44:55 2022 -0700
|
||||||
|
+++ b/scripts/pkg/private/build.m Thu May 12 08:35:04 2022 -0400
|
||||||
|
@@ -77,8 +77,12 @@
|
||||||
|
else
|
||||||
|
arch_abi = getarch ();
|
||||||
|
configure_make (desc, build_root, verbose);
|
||||||
|
- unlink (fullfile (build_root, "src", "configure"));
|
||||||
|
- unlink (fullfile (build_root, "src", "Makefile"));
|
||||||
|
+ if exist (fullfile (build_root, "src", "configure"), "file")
|
||||||
|
+ unlink (fullfile (build_root, "src", "configure"));
|
||||||
|
+ endif
|
||||||
|
+ if exist (fullfile (build_root, "src", "Makefile"), "file")
|
||||||
|
+ unlink (fullfile (build_root, "src", "Makefile"));
|
||||||
|
+ endif
|
||||||
|
endif
|
||||||
|
tar_name = [desc.name "-" desc.version "-" arch_abi ".tar"];
|
||||||
|
tar_path = fullfile (builddir, tar_name);
|
||||||
@ -1,46 +0,0 @@ |
|||||||
{ lib, buildGoPackage, makeWrapper, coreutils, git, openssh, bash, gnused, gnugrep |
|
||||||
, src, version, hasBootstrapScript, postPatch ? "" |
|
||||||
, ... }: |
|
||||||
let |
|
||||||
goPackagePath = "github.com/buildkite/agent"; |
|
||||||
in |
|
||||||
buildGoPackage { |
|
||||||
pname = "buildkite-agent"; |
|
||||||
inherit version; |
|
||||||
|
|
||||||
inherit goPackagePath src postPatch; |
|
||||||
|
|
||||||
nativeBuildInputs = [ makeWrapper ]; |
|
||||||
|
|
||||||
postInstall = '' |
|
||||||
${lib.optionalString hasBootstrapScript '' |
|
||||||
# Install bootstrap.sh |
|
||||||
mkdir -p $out/libexec/buildkite-agent |
|
||||||
cp $NIX_BUILD_TOP/go/src/${goPackagePath}/templates/bootstrap.sh $out/libexec/buildkite-agent |
|
||||||
sed -e "s|#!/bin/bash|#!${bash}/bin/bash|g" -i $out/libexec/buildkite-agent/bootstrap.sh |
|
||||||
''} |
|
||||||
|
|
||||||
# Fix binary name |
|
||||||
mv $out/bin/{agent,buildkite-agent} |
|
||||||
|
|
||||||
# These are runtime dependencies |
|
||||||
wrapProgram $out/bin/buildkite-agent \ |
|
||||||
${lib.optionalString hasBootstrapScript "--set BUILDKITE_BOOTSTRAP_SCRIPT_PATH $out/libexec/buildkite-agent/bootstrap.sh"} \ |
|
||||||
--prefix PATH : '${lib.makeBinPath [ openssh git coreutils gnused gnugrep ]}' |
|
||||||
''; |
|
||||||
|
|
||||||
meta = with lib; { |
|
||||||
description = "Build runner for buildkite.com"; |
|
||||||
longDescription = '' |
|
||||||
The buildkite-agent is a small, reliable, and cross-platform build runner |
|
||||||
that makes it easy to run automated builds on your own infrastructure. |
|
||||||
It’s main responsibilities are polling buildkite.com for work, running |
|
||||||
build jobs, reporting back the status code and output log of the job, |
|
||||||
and uploading the job's artifacts. |
|
||||||
''; |
|
||||||
homepage = "https://buildkite.com/docs/agent"; |
|
||||||
license = licenses.mit; |
|
||||||
maintainers = with maintainers; [ pawelpacana zimbatm rvl ]; |
|
||||||
platforms = platforms.unix; |
|
||||||
}; |
|
||||||
} |
|
||||||
@ -1,30 +0,0 @@ |
|||||||
# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 |
|
||||||
[ |
|
||||||
{ |
|
||||||
goPackagePath = "github.com/cihub/seelog"; |
|
||||||
fetch = { |
|
||||||
type = "git"; |
|
||||||
url = "https://github.com/cihub/seelog"; |
|
||||||
rev = "f561c5e57575bb1e0a2167028b7339b3a8d16fb4"; |
|
||||||
sha256 = "0r3228hvgljgpaggj6b9mvxfsizfw25q2c1761wsvcif8gz49cvl"; |
|
||||||
}; |
|
||||||
} |
|
||||||
{ |
|
||||||
goPackagePath = "github.com/shirou/gopsutil"; |
|
||||||
fetch = { |
|
||||||
type = "git"; |
|
||||||
url = "https://github.com/shirou/gopsutil"; |
|
||||||
rev = "eeb1d38d69593f121e060d24d17f7b1f0936b203"; |
|
||||||
sha256 = "01qsznk599225gf4pld7p2m30p61y77mvzhrs6raxpk6wf7icp4w"; |
|
||||||
}; |
|
||||||
} |
|
||||||
{ |
|
||||||
goPackagePath = "golang.org/x/sys"; |
|
||||||
fetch = { |
|
||||||
type = "git"; |
|
||||||
url = "https://go.googlesource.com/sys"; |
|
||||||
rev = "77b0e4315053a57ed2962443614bdb28db152054"; |
|
||||||
sha256 = "1024gcv1b40i2rgvpgyw2hgy1k5g7473pn29yavwysj37m1rrplp"; |
|
||||||
}; |
|
||||||
} |
|
||||||
] |
|
||||||
Loading…
Reference in new issue