diff options
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/development/tools/continuous-integration')
6 files changed, 62 insertions, 43 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix index ceaa704b565c..223b814708d3 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix @@ -1,8 +1,8 @@ -{ fetchFromGitHub, stdenv, buildGoPackage, +{ fetchFromGitHub, stdenv, buildGoModule, makeWrapper, coreutils, git, openssh, bash, gnused, gnugrep }: -buildGoPackage rec { +buildGoModule rec { name = "buildkite-agent-${version}"; - version = "3.17.0"; + version = "3.26.0"; goPackagePath = "github.com/buildkite/agent"; @@ -10,17 +10,18 @@ buildGoPackage rec { owner = "buildkite"; repo = "agent"; rev = "v${version}"; - sha256 = "0a7x919kxnpdn0pnhc5ilx1z6ninx8zgjvsd0jcg4qwh0qqp5ppr"; + sha256 = "1z8hiamg3h1fnsmr8j5l9q6c8cd81lqmd00gcmz4spw73pqfxg3r"; }; + + vendorSha256 = "1kxnpn4py8a2rz1gwg0y3yiwcwphj38pkp2k9z1p85ccm2wblljz"; + postPatch = '' substituteInPlace bootstrap/shell/shell.go --replace /bin/bash ${bash}/bin/bash ''; nativeBuildInputs = [ makeWrapper ]; - # on Linux, the TMPDIR is /build which is the same prefix as this package - # remove once #35068 is merged - noAuditTmpdir = stdenv.isLinux; + doCheck = false; postInstall = '' # Fix binary name @@ -43,6 +44,6 @@ buildGoPackage rec { homepage = "https://buildkite.com/docs/agent"; license = licenses.mit; maintainers = with maintainers; [ pawelpacana zimbatm rvl ]; - platforms = platforms.unix; + platforms = with platforms; unix ++ darwin; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/continuous-integration/drone-cli/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/continuous-integration/drone-cli/default.nix index 66fb878aa26e..2a8e10008c2b 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/continuous-integration/drone-cli/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/continuous-integration/drone-cli/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchFromGitHub, buildGoModule }: -let version = "1.2.2"; +let version = "1.2.4"; in buildGoModule rec { inherit version; pname = "drone-cli"; revision = "v${version}"; - vendorSha256 = "1ryh94cj37j8x6qwxr5ydyw6cnjppakg1w84sipm11d0vvv98bhi"; + vendorSha256 = "0v94rwxkbj85l3brbm792xf1rfs3vgnwpgjczwqip1gm159dpnd7"; doCheck = false; @@ -18,7 +18,7 @@ in buildGoModule rec { owner = "drone"; repo = "drone-cli"; rev = revision; - sha256 = "082yqm72y8s3v06gkcg947p62sd63y3r2bmdsrfgdrzb5w5a75bl"; + sha256 = "14sm5k2ifvr4g9369zqgb92vrr4rc0bxf5m52l3g8bd2s8fq8nx8"; }; meta = with stdenv.lib; { diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/continuous-integration/fly/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/continuous-integration/fly/default.nix index c85f5473de88..f993faf544d7 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/continuous-integration/fly/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/continuous-integration/fly/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "fly"; - version = "6.5.1"; + version = "6.7.2"; src = fetchFromGitHub { owner = "concourse"; repo = "concourse"; rev = "v${version}"; - sha256 = "0ldw40xn9nb5picly32nq558x0klvkyrr9af0jfngbvm4l5209bc"; + sha256 = "0c5alf2a0088i25mglla9dl4m3wr5y8pnl5cczgn06sz8qp9a0s0"; }; vendorSha256 = "1fxbxkg7disndlmb065abnfn7sn79qclkcbizmrq49f064w1ijr4"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index b59a45617288..db2d228ce454 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,16 +1,16 @@ { lib, buildGoPackage, fetchFromGitLab, fetchurl }: let - version = "13.4.1"; + version = "13.6.0"; # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64 docker_x86_64 = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-x86_64.tar.xz"; - sha256 = "0yc4yfqhh51p0nz0sl2qfp48n431qgp23wn3aqq3jg4fh9578prb"; + sha256 = "0q1f4dmdkqrdzs3mb5wk6k6x50li4c7js0blzfcz3f3n8gm925jw"; }; docker_arm = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz"; - sha256 = "1n50izz21dmd14qm6y9fsgwf5f0r9829dv79mvlqxmh1q87acm93"; + sha256 = "1hxjqk4in1a2abcyxj7556fcscxq4cfy24cgcmh1qhvirnm5j6mc"; }; in buildGoPackage rec { @@ -30,7 +30,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "10k3xn3fapwx52s3r3pk972k1s7793cgja7g1fvm06pic8l7q05g"; + sha256 = "0vwky4hdkh1qvd61zdf2avbbnn3ya6pdicqggh2fx7k04pnp05mh"; }; patches = [ ./fix-shell-path.patch ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix index d9eb540c3f2e..13a6d596599a 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -1,12 +1,13 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, common-updater-scripts, coreutils, git, gnused, nix, nixfmt +, writeScript, nixosTests, jq, cacert, curl }: stdenv.mkDerivation rec { pname = "jenkins"; - version = "2.249.2"; + version = "2.263.1"; src = fetchurl { url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war"; - sha256 = "08m5z4ik96gnhw92hjzch7rpvrs0dipi9fps4rihwwzg5k26rc0v"; + sha256 = "1wfn5r356fqy8ypqnw44ir0cy8qr5ck6xckxnnn2c9x324mypv8f"; }; buildCommand = '' @@ -14,11 +15,50 @@ stdenv.mkDerivation rec { cp "$src" "$out/webapps/jenkins.war" ''; + passthru = { + tests = { inherit (nixosTests) jenkins; }; + + updateScript = writeScript "update.sh" '' + #!${stdenv.shell} + set -o errexit + PATH=${ + stdenv.lib.makeBinPath [ + cacert + common-updater-scripts + coreutils + curl + git + gnused + jq + nix + nixfmt + ] + } + + core_json="$(curl -s --fail --location https://updates.jenkins.io/stable/update-center.actual.json | jq .core)" + oldVersion=$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion jenkins" | tr -d '"') + + version="$(jq -r .version <<<$core_json)" + sha256="$(jq -r .sha256 <<<$core_json)" + hash="$(nix-hash --type sha256 --to-base32 "$sha256")" + url="$(jq -r .url <<<$core_json)" + + if [ ! "$oldVersion" = "$version" ]; then + update-source-version jenkins "$version" "$hash" "$url" + nixpkgs="$(git rev-parse --show-toplevel)" + default_nix="$nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix" + nixfmt "$default_nix" + else + echo "jenkins is already up-to-date" + fi + ''; + }; + meta = with stdenv.lib; { description = "An extendable open source continuous integration server"; homepage = "https://jenkins-ci.org"; license = licenses.mit; platforms = platforms.all; - maintainers = with maintainers; [ coconnor fpletz earldouglas ]; + maintainers = with maintainers; [ coconnor fpletz earldouglas nequissimus ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/update.sh b/infra/libkookie/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/update.sh deleted file mode 100755 index 4f2f6527eccc..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/update.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl common-updater-scripts jq - -set -eu -o pipefail - -core_json="$(curl -s --fail --location https://updates.jenkins.io/stable/update-center.actual.json | jq .core)" -oldVersion=$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion jenkins" | tr -d '"') - -version="$(jq -r .version <<<$core_json)" -sha256="$(jq -r .sha256 <<<$core_json)" -hash="$(nix-hash --type sha256 --to-base32 "$sha256")" -url="$(jq -r .url <<<$core_json)" - -if [ ! "${oldVersion}" = "${version}" ]; then - update-source-version jenkins "$version" "$hash" "$url" - nixpkgs="$(git rev-parse --show-toplevel)" - default_nix="$nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix" - git add "${default_nix}" - git commit -m "jenkins: ${oldVersion} -> ${version}" -else - echo "jenkins is already up-to-date" -fi |