diff options
Diffstat (limited to 'nixpkgs/pkgs/development/tools/continuous-integration')
23 files changed, 93 insertions, 151 deletions
diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/agola/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/agola/default.nix index 02cd0f25acd5..f13f6ec2164c 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/agola/default.nix +++ b/nixpkgs/pkgs/development/tools/continuous-integration/agola/default.nix @@ -4,7 +4,7 @@ }: let - version = "0.8.0"; + version = "0.9.2"; in buildGoModule { @@ -15,10 +15,10 @@ buildGoModule { owner = "agola-io"; repo = "agola"; rev = "v${version}"; - hash = "sha256-nU04MVkUC+m6Ga4qDUH9KrA0zbYmttAicpvdxbaBG0Y="; + hash = "sha256-ggi0Eb4vO5zBoIrIIa3MFwOIW0IBS8yGF6eveBb+lgY="; }; - vendorHash = "sha256-k3Sip9CqTGRTWxr3RzZf0jCrm4AfUrpY/wSTmHy+yik="; + vendorHash = "sha256-Igtccundx/2PHFp8+L44CvOLG+/Ndinhonh/EDcQeoY="; ldflags = [ "-s" diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/buildbot/master.nix b/nixpkgs/pkgs/development/tools/continuous-integration/buildbot/master.nix index 8de60461f730..a0e11089497c 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/buildbot/master.nix +++ b/nixpkgs/pkgs/development/tools/continuous-integration/buildbot/master.nix @@ -1,7 +1,8 @@ { lib , stdenv , buildPythonApplication -, fetchPypi +, fetchFromGitHub +, fetchpatch , makeWrapper # Tie withPlugins through the fixed point here, so it will receive an # overridden version properly @@ -72,14 +73,16 @@ let in buildPythonApplication rec { pname = "buildbot"; - version = "3.11.1"; + version = "3.11.3"; format = "pyproject"; disabled = pythonOlder "3.8"; - src = fetchPypi { - inherit pname version; - hash = "sha256-ruYW1sVoGvFMi+NS+xiNsn0Iq2RmKlax4bxHgYrj6ZY="; + src = fetchFromGitHub { + owner = "buildbot"; + repo = "buildbot"; + rev = "v${version}"; + hash = "sha256-rDbAWLoEEjygW72YDBsVwiaHdRTVYA9IFxY3XMDleho="; }; build-system = [ @@ -134,10 +137,20 @@ buildPythonApplication rec { # This patch disables the test that tries to read /etc/os-release which # is not accessible in sandboxed builds. ./skip_test_linux_distro.patch + # Fix gitpoller, source: https://github.com/buildbot/buildbot/pull/7664 + # Included in next release. + (fetchpatch { + url = "https://github.com/buildbot/buildbot/commit/dd5d61e63e3b0740cc538a225ccf104ccecfc734.patch"; + sha256 = "sha256-CL6uRaKxh8uCBfWQ0tNiLh2Ym0HVatWni8hcuTyAAw0="; + excludes = ["master/buildbot/test/unit/changes/test_gitpoller.py"]; + }) ]; postPatch = '' - substituteInPlace buildbot/scripts/logwatcher.py --replace '/usr/bin/tail' "$(type -P tail)" + substituteInPlace master/buildbot/scripts/logwatcher.py --replace '/usr/bin/tail' "$(type -P tail)" + ''; + preBuild = '' + cd master ''; # Silence the depreciation warning from SqlAlchemy @@ -163,7 +176,7 @@ buildPythonApplication rec { }; meta = with lib; { - description = "An open-source continuous integration framework for automating software build, test, and release processes"; + description = "Open-source continuous integration framework for automating software build, test, and release processes"; homepage = "https://buildbot.net/"; changelog = "https://github.com/buildbot/buildbot/releases/tag/v${version}"; maintainers = teams.buildbot.members; diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/buildbot/pkg.nix b/nixpkgs/pkgs/development/tools/continuous-integration/buildbot/pkg.nix index 4ccdb66d7b11..a93cbf28e3b8 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/buildbot/pkg.nix +++ b/nixpkgs/pkgs/development/tools/continuous-integration/buildbot/pkg.nix @@ -1,12 +1,12 @@ { lib, buildPythonPackage, fetchPypi, isPy3k, buildbot }: buildPythonPackage rec { - pname = "buildbot-pkg"; + pname = "buildbot_pkg"; inherit (buildbot) version; src = fetchPypi { inherit pname version; - hash = "sha256-cfPsNnR0gEgz1y/GNR6faixk2HyuHaRh1E9nGHjCb58="; + hash = "sha256-pO2TmTwbY0cnR+882pl7wDiR6JEK+sHHpAltKmTxiIM="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/buildbot/plugins.nix b/nixpkgs/pkgs/development/tools/continuous-integration/buildbot/plugins.nix index b84e42c1bee7..7403498a8c61 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/buildbot/plugins.nix +++ b/nixpkgs/pkgs/development/tools/continuous-integration/buildbot/plugins.nix @@ -3,12 +3,12 @@ # this is exposed for potential plugins to use and for nix-update inherit buildbot-pkg; www = buildPythonPackage rec { - pname = "buildbot-www"; + pname = "buildbot_www"; inherit (buildbot-pkg) version; src = fetchPypi { inherit pname version; - hash = "sha256-5q4N76XHUhvc2lIqup0dYwrEdI5bR/96N7m2rhvPJh4="; + hash = "sha256-EL5iZ257VXnL+29Jr6r3PVeURX1AcugfZ4RLTjClsXo="; }; # Remove unnecessary circular dependency on buildbot @@ -30,12 +30,12 @@ }; www-react = buildPythonPackage rec { - pname = "buildbot-www-react"; + pname = "buildbot_www_react"; inherit (buildbot-pkg) version; src = fetchPypi { inherit pname version; - hash = "sha256-kjow5WksdBzeo8nwXk5Djm/4tym8XvMo+VgiqSSAyKk="; + hash = "sha256-5QLw5nXnU+z11E5Tgvu9bbbpCTRpV2zXndukcZPRjtE="; }; # Remove unnecessary circular dependency on buildbot @@ -57,12 +57,12 @@ }; console-view = buildPythonPackage rec { - pname = "buildbot-console-view"; + pname = "buildbot_console_view"; inherit (buildbot-pkg) version; src = fetchPypi { inherit pname version; - hash = "sha256-IrXDwO0YSpiZfw6B/lorEQdbAIZ5qCja75L/PFRmJms="; + hash = "sha256-tzqifo9A/KJF9dLpO7jblVaDjx7++v0wLz1Olc79JxI="; }; buildInputs = [ buildbot-pkg ]; @@ -79,12 +79,12 @@ }; react-console-view = buildPythonPackage rec { - pname = "buildbot-react-console-view"; + pname = "buildbot_react_console_view"; inherit (buildbot-pkg) version; src = fetchPypi { inherit pname version; - hash = "sha256-ZkUsAN56OEI/SphQydv4HkVV6Eobd0pd+UbXa23mBfQ="; + hash = "sha256-fzaqYmaO+vWnQpUvOsPCny3W27atcIHsgeGV6dKEJeg="; }; buildInputs = [ buildbot-pkg ]; @@ -101,12 +101,12 @@ }; waterfall-view = buildPythonPackage rec { - pname = "buildbot-waterfall-view"; + pname = "buildbot_waterfall_view"; inherit (buildbot-pkg) version; src = fetchPypi { inherit pname version; - hash = "sha256-qL1+bpgxflcRTFPOvDHKdHilio28bbHClqy1Um4Se+o="; + hash = "sha256-BLIs91k8/A4LYMTDgct7TOWFoLU4qK47Javr8qRzkZQ="; }; buildInputs = [ buildbot-pkg ]; @@ -123,12 +123,12 @@ }; react-waterfall-view = buildPythonPackage rec { - pname = "buildbot-react-waterfall-view"; + pname = "buildbot_react_waterfall_view"; inherit (buildbot-pkg) version; src = fetchPypi { inherit pname version; - hash = "sha256-5D0N/5Sf8YNQBKt8GzAk1htdEY/xOmE5Abt5y7P9h34="; + hash = "sha256-dX+tp+WidfLy612+41jz+do/iXQTaIQPcetG8td3jp4="; }; buildInputs = [ buildbot-pkg ]; @@ -145,12 +145,12 @@ }; grid-view = buildPythonPackage rec { - pname = "buildbot-grid-view"; + pname = "buildbot_grid_view"; inherit (buildbot-pkg) version; src = fetchPypi { inherit pname version; - hash = "sha256-snyJbQZqSIqOk6dTJidSv1VmE/Gn+pblcZs8BpZ+fdA="; + hash = "sha256-2kLGdvmf2mnF21gkDCf6h+bhnsxveaNNh95qczRY824="; }; buildInputs = [ buildbot-pkg ]; @@ -167,12 +167,12 @@ }; react-grid-view = buildPythonPackage rec { - pname = "buildbot-react-grid-view"; + pname = "buildbot_react_grid_view"; inherit (buildbot-pkg) version; src = fetchPypi { inherit pname version; - hash = "sha256-0Ggm3NQn1ZZfMsMqf1qdCD1+HkJZmM1p+TqOPF0Q9CE="; + hash = "sha256-rIAbk9+6Wi1PCjizHp9p6jpCwaBgBT5Ch1Sa4VKDoww="; }; buildInputs = [ buildbot-pkg ]; @@ -189,12 +189,12 @@ }; wsgi-dashboards = buildPythonPackage rec { - pname = "buildbot-wsgi-dashboards"; + pname = "buildbot_wsgi_dashboards"; inherit (buildbot-pkg) version; src = fetchPypi { inherit pname version; - hash = "sha256-rBUrYSeAWrxn5mlXaAAtE58jIZVLs/q69ARY2u6rTsI="; + hash = "sha256-D9mjEKFrh+ytNbpuN/06XbiBnKjFLopXfjDg28j7niw="; }; buildInputs = [ buildbot-pkg ]; @@ -211,12 +211,12 @@ }; react-wsgi-dashboards = buildPythonPackage rec { - pname = "buildbot-react-wsgi-dashboards"; + pname = "buildbot_react_wsgi_dashboards"; inherit (buildbot-pkg) version; src = fetchPypi { inherit pname version; - hash = "sha256-U0DHWFMmvTKFBW1C5bnoemjMOKpw1H3GXnBn/AU52vY="; + hash = "sha256-q3In0IMAIBUjxSzv4LlH9EJukLYJ3WzoEYkFBZB96W8="; }; buildInputs = [ buildbot-pkg ]; @@ -233,12 +233,12 @@ }; badges = buildPythonPackage rec { - pname = "buildbot-badges"; + pname = "buildbot_badges"; inherit (buildbot-pkg) version; src = fetchPypi { inherit pname version; - hash = "sha256-7t4E7twn4TeJJCE5Vn83UzIRE2Okvcox2us1d8j50Os="; + hash = "sha256-TK4KYn3CWxymTsKWeqHr2i5rdO9ZDHvJrb9RqfKNJV4="; }; buildInputs = [ buildbot-pkg ]; diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/buildbot/skip_test_linux_distro.patch b/nixpkgs/pkgs/development/tools/continuous-integration/buildbot/skip_test_linux_distro.patch index 8fe5c7b56b4f..e7190680ad2e 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/buildbot/skip_test_linux_distro.patch +++ b/nixpkgs/pkgs/development/tools/continuous-integration/buildbot/skip_test_linux_distro.patch @@ -1,6 +1,6 @@ -diff -Nur buildbot-0.9.6/buildbot/test/unit/test_buildbot_net_usage_data.py buildbot-0.9.6.patched/buildbot/test/unit/test_buildbot_net_usage_data.py ---- buildbot-0.9.6/buildbot/test/unit/test_buildbot_net_usage_data.py 2017-04-19 16:57:02.000000000 +0200 -+++ buildbot-0.9.6.patched/buildbot/test/unit/test_buildbot_net_usage_data.py 2017-05-04 12:22:54.575762551 +0200 +diff -Nur buildbot-0.9.6/master/buildbot/test/unit/test_buildbot_net_usage_data.py buildbot-0.9.6.patched/buildbot/test/unit/test_buildbot_net_usage_data.py +--- buildbot-0.9.6/master/buildbot/test/unit/test_buildbot_net_usage_data.py 2017-04-19 16:57:02.000000000 +0200 ++++ buildbot-0.9.6.patched/master/buildbot/test/unit/test_buildbot_net_usage_data.py 2017-05-04 12:22:54.575762551 +0200 @@ -147,6 +147,7 @@ _sendBuildbotNetUsageData({'foo': 'bar'}) diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/buildbot/worker.nix b/nixpkgs/pkgs/development/tools/continuous-integration/buildbot/worker.nix index 1b73737e42cb..071559eccf6c 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/buildbot/worker.nix +++ b/nixpkgs/pkgs/development/tools/continuous-integration/buildbot/worker.nix @@ -23,12 +23,12 @@ }: buildPythonPackage (rec { - pname = "buildbot-worker"; + pname = "buildbot_worker"; inherit (buildbot) version; src = fetchPypi { inherit pname version; - hash = "sha256-hRsmgP8IiWg5+YCqMVYgZc4ljWwz7YWfAFrmMHx8wBY="; + hash = "sha256-TFymBnUufOEWZ/IUKd7nebZ+yl58ZChFkGrUxOXn28g="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-cli/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-cli/default.nix index 5e191cb83b32..dd81126d68fd 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-cli/default.nix @@ -24,7 +24,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" "-X main.VERSION=${version}" ]; meta = with lib; { - description = "A command line interface for Buildkite"; + description = "Command line interface for Buildkite"; homepage = "https://github.com/buildkite/cli"; license = licenses.mit; maintainers = with maintainers; [ groodt ]; diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix index a86db85067f6..e50259bed236 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "cirrus-cli"; - version = "0.117.0"; + version = "0.119.1"; src = fetchFromGitHub { owner = "cirruslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dJq2/XxhSvqlRQwMHX2RHct6KQu9uik3SPeWD2/rwto="; + sha256 = "sha256-nEGeh0ZTYE4Ff0x+1G38KUFcUsr39kvM8QUfmHCFyK4="; }; - vendorHash = "sha256-d3cHXO4SFeNybiVDc3dUmd1XzUJ1SlMqSw7KPC3ZrXQ="; + vendorHash = "sha256-rL4bXt6VBG2b9nZ1M2FF6E8ODPT3UF4aRHSJqpVWyTw="; ldflags = [ "-X github.com/cirruslabs/cirrus-cli/internal/version.Version=v${version}" diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/codeberg-pages/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/codeberg-pages/default.nix index c9ec0cc84ad4..63324531f8e2 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/codeberg-pages/default.nix +++ b/nixpkgs/pkgs/development/tools/continuous-integration/codeberg-pages/default.nix @@ -14,7 +14,10 @@ buildGoModule rec { vendorHash = "sha256-vTYB3ka34VooN2Wh/Rcj+2S1qAsA2a/VtXlILn1W7oU="; - patches = [ ./disable_httptest.patch ]; + postPatch = '' + # disable httptest + rm server/handler/handler_test.go + ''; ldflags = [ "-s" "-w" ]; diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/codeberg-pages/disable_httptest.patch b/nixpkgs/pkgs/development/tools/continuous-integration/codeberg-pages/disable_httptest.patch deleted file mode 100644 index 90c815712d38..000000000000 --- a/nixpkgs/pkgs/development/tools/continuous-integration/codeberg-pages/disable_httptest.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff --git a/server/handler/handler_test.go b/server/handler/handler_test.go -deleted file mode 100644 -index 6521633..0000000 ---- a/server/handler/handler_test.go -+++ /dev/null -@@ -1,52 +0,0 @@ --package handler -- --import ( -- "net/http" -- "net/http/httptest" -- "testing" -- "time" -- -- "codeberg.org/codeberg/pages/server/cache" -- "codeberg.org/codeberg/pages/server/gitea" -- "github.com/rs/zerolog/log" --) -- --func TestHandlerPerformance(t *testing.T) { -- giteaClient, _ := gitea.NewClient("https://codeberg.org", "", cache.NewKeyValueCache(), false, false) -- testHandler := Handler( -- "codeberg.page", "raw.codeberg.org", -- giteaClient, -- "https://docs.codeberg.org/pages/raw-content/", -- []string{"/.well-known/acme-challenge/"}, -- []string{"raw.codeberg.org", "fonts.codeberg.org", "design.codeberg.org"}, -- []string{"pages"}, -- cache.NewKeyValueCache(), -- cache.NewKeyValueCache(), -- cache.NewKeyValueCache(), -- ) -- -- testCase := func(uri string, status int) { -- t.Run(uri, func(t *testing.T) { -- req := httptest.NewRequest("GET", uri, http.NoBody) -- w := httptest.NewRecorder() -- -- log.Printf("Start: %v\n", time.Now()) -- start := time.Now() -- testHandler(w, req) -- end := time.Now() -- log.Printf("Done: %v\n", time.Now()) -- -- resp := w.Result() -- -- if resp.StatusCode != status { -- t.Errorf("request failed with status code %d", resp.StatusCode) -- } else { -- t.Logf("request took %d milliseconds", end.Sub(start).Milliseconds()) -- } -- }) -- } -- -- testCase("https://mondstern.codeberg.page/", 404) // TODO: expect 200 -- testCase("https://codeberg.page/", 404) // TODO: expect 200 -- testCase("https://example.momar.xyz/", 424) --} diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/drone/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/drone/default.nix index e6f6b8bf4c45..e481df1d538b 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/drone/default.nix +++ b/nixpkgs/pkgs/development/tools/continuous-integration/drone/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "drone.io${lib.optionalString (!enableUnfree) "-oss"}"; - version = "2.23.0"; + version = "2.24.0"; src = fetchFromGitHub { owner = "harness"; repo = "drone"; rev = "v${version}"; - sha256 = "sha256-HkyR2h7dgbEhqexJXyGebP3zkoTLlzuY+1O2pidAveQ="; + sha256 = "sha256-IiSsw0bZDAVuOrm7JBTT14Cf7I/koeS2Yw6vWYBG7kA="; }; vendorHash = "sha256-n4KbKkqAnHDIsXs8A/FE+rCkSKQKr5fv7npJ/X6t0mk="; @@ -25,7 +25,7 @@ buildGoModule rec { description = "Continuous Integration platform built on container technology"; mainProgram = "drone-server"; homepage = "https://github.com/harness/drone"; - maintainers = with maintainers; [ elohmeier vdemeester techknowlogick ]; + maintainers = with maintainers; [ vdemeester techknowlogick ]; license = with licenses; if enableUnfree then unfreeRedistributable else asl20; }; } diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/gitea-actions-runner/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/gitea-actions-runner/default.nix index 68093f39e4f8..10e07234aafa 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/gitea-actions-runner/default.nix +++ b/nixpkgs/pkgs/development/tools/continuous-integration/gitea-actions-runner/default.nix @@ -7,17 +7,17 @@ buildGoModule rec { pname = "gitea-actions-runner"; - version = "0.2.6"; + version = "0.2.10"; src = fetchFromGitea { domain = "gitea.com"; owner = "gitea"; repo = "act_runner"; rev = "v${version}"; - hash = "sha256-GE9yqp5zWJ4lL0L/w3oSvU72AiHBNb+yh2qBPKPe9X0="; + hash = "sha256-YRWFBMHw9Fcmzkmglh2I1kXJkAAivqvCBcenLTjE/bI="; }; - vendorHash = "sha256-NoaLq5pCwTuPd9ne5LYcvJsgUXAqcfkcW3Ck2K350JE="; + vendorHash = "sha256-8sdSQhg9DnRLgghDZzWrUMM4vjinhCgu3dTKU7MBVQU="; ldflags = [ "-s" @@ -36,6 +36,6 @@ buildGoModule rec { license = licenses.mit; changelog = "https://gitea.com/gitea/act_runner/releases/tag/v${version}"; homepage = "https://gitea.com/gitea/act_runner"; - description = "A runner for Gitea based on act"; + description = "Runner for Gitea based on act"; }; } diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/github-runner/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/github-runner/default.nix index f219438d134d..227f03bf8770 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/github-runner/default.nix +++ b/nixpkgs/pkgs/development/tools/continuous-integration/github-runner/default.nix @@ -22,13 +22,13 @@ assert builtins.all (x: builtins.elem x [ "node20" ]) nodeRuntimes; buildDotnetModule rec { pname = "github-runner"; - version = "2.316.0"; + version = "2.317.0"; src = fetchFromGitHub { owner = "actions"; repo = "runner"; rev = "v${version}"; - hash = "sha256-LoXVe4ZuVIFoqz+N8WK950Wm8zssCoKVj6HSkPvDFYU="; + hash = "sha256-+VwEH4hmEjeYFWm7TOndD5SOJwsyPZEhKkCSyl7x8cE="; leaveDotGit = true; postFetch = '' git -C $out rev-parse --short HEAD > $out/.git-revision diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/github-runner/deps.nix b/nixpkgs/pkgs/development/tools/continuous-integration/github-runner/deps.nix index d2db24600350..4c05dc60a162 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/github-runner/deps.nix +++ b/nixpkgs/pkgs/development/tools/continuous-integration/github-runner/deps.nix @@ -258,13 +258,13 @@ (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; }) (fetchNuGet { pname = "System.Xml.XmlDocument"; version = "4.3.0"; sha256 = "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi"; }) (fetchNuGet { pname = "System.Xml.XmlSerializer"; version = "4.3.0"; sha256 = "07pa4sx196vxkgl3csvdmw94nydlsm9ir38xxcs84qjn8cycd912"; }) - (fetchNuGet { pname = "xunit"; version = "2.4.1"; sha256 = "0xf3kaywpg15flqaqfgywqyychzk15kz0kz34j21rcv78q9ywq20"; }) + (fetchNuGet { pname = "xunit"; version = "2.7.1"; sha256 = "18bvbmqzkyia862x0jaj3ax5zlnlgsdpl52ai53g0fn8hcnnzzvi"; }) (fetchNuGet { pname = "xunit.abstractions"; version = "2.0.3"; sha256 = "00wl8qksgkxld76fgir3ycc5rjqv1sqds6x8yx40927q5py74gfh"; }) - (fetchNuGet { pname = "xunit.analyzers"; version = "0.10.0"; sha256 = "15n02q3akyqbvkp8nq75a8rd66d4ax0rx8fhdcn8j78pi235jm7j"; }) - (fetchNuGet { pname = "xunit.assert"; version = "2.4.1"; sha256 = "1imynzh80wxq2rp9sc4gxs4x1nriil88f72ilhj5q0m44qqmqpc6"; }) - (fetchNuGet { pname = "xunit.core"; version = "2.4.1"; sha256 = "1nnb3j4kzmycaw1g76ii4rfqkvg6l8gqh18falwp8g28h802019a"; }) - (fetchNuGet { pname = "xunit.extensibility.core"; version = "2.4.1"; sha256 = "103qsijmnip2pnbhciqyk2jyhdm6snindg5z2s57kqf5pcx9a050"; }) - (fetchNuGet { pname = "xunit.extensibility.execution"; version = "2.4.1"; sha256 = "1pbilxh1gp2ywm5idfl0klhl4gb16j86ib4x83p8raql1dv88qia"; }) + (fetchNuGet { pname = "xunit.analyzers"; version = "1.12.0"; sha256 = "1shs5afb00r3ipnq7wnyvxyp4hnfcmbbf89qcpn4awhd355cv9k6"; }) + (fetchNuGet { pname = "xunit.assert"; version = "2.7.1"; sha256 = "1nz05bh78d6ilz2g2vqp3jgxag5p3h1cnidwr9qxzgr89nj2fas6"; }) + (fetchNuGet { pname = "xunit.core"; version = "2.7.1"; sha256 = "1lr7dm4f9i6xcjq1d8sj3a11y1kj50z43wmr84m8aj6lkwqkbv6z"; }) + (fetchNuGet { pname = "xunit.extensibility.core"; version = "2.7.1"; sha256 = "00pjk2i95kzjqm6j86i589vf265cmczk748xl4qcqalwrzhhc1g8"; }) + (fetchNuGet { pname = "xunit.extensibility.execution"; version = "2.7.1"; sha256 = "1s90pc6fm3i5r3wjip9jkk2m5giyimik9f05b77yylknl9yipcfw"; }) (fetchNuGet { pname = "xunit.runner.visualstudio"; version = "2.4.1"; sha256 = "0fln5pk18z98gp0zfshy1p9h6r9wc55nyqhap34k89yran646vhn"; }) (fetchNuGet { pname = "YamlDotNet.Signed"; version = "5.3.0"; sha256 = "1gnp5aa2zzg7v61bbn2ra1npy0p07szp5w8vqk44fdj3fcvrdxib"; }) ] diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index 999a2ce7719b..fbce84a67912 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,7 +1,7 @@ -{ lib, buildGoModule, fetchFromGitLab, fetchurl, bash }: +{ lib, buildGoModule, fetchFromGitLab, bash }: let - version = "16.11.0"; + version = "17.0.0"; in buildGoModule rec { inherit version; @@ -17,13 +17,13 @@ buildGoModule rec { # For patchShebangs buildInputs = [ bash ]; - vendorHash = "sha256-98ixme01PHbuyCJatWErbzTeuKYSbXsLbZxNGSd+zjY="; + vendorHash = "sha256-ms93Ea2Un/F9TDmNttSxi/CtZGsOnmptCf/hjtgCMB0="; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "sha256-cPY+JAvyRb4+ytx5nwx1BaH/tZ5BW4kgWIEvD6a3aec="; + sha256 = "sha256-u9yA9v2UojBTDElfZhi8k9D1of0vIj3c14ZFmwa+yj4="; }; patches = [ diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/gocd-agent/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/gocd-agent/default.nix index 6a6c5674bb67..314dd38c0795 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/gocd-agent/default.nix +++ b/nixpkgs/pkgs/development/tools/continuous-integration/gocd-agent/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-L2MOkbVHoQu99lKrbnsNkhuU0SZ8VANSK72GZrGLbiQ="; }; meta = with lib; { - description = "A continuous delivery server specializing in advanced workflow modeling and visualization"; + description = "Continuous delivery server specializing in advanced workflow modeling and visualization"; homepage = "http://www.go.cd"; license = licenses.asl20; platforms = platforms.all; diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/gocd-server/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/gocd-server/default.nix index 6fc577225f42..ce01ff95cc5a 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/gocd-server/default.nix +++ b/nixpkgs/pkgs/development/tools/continuous-integration/gocd-server/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - description = "A continuous delivery server specializing in advanced workflow modeling and visualization"; + description = "Continuous delivery server specializing in advanced workflow modeling and visualization"; homepage = "http://www.go.cd"; license = licenses.asl20; platforms = platforms.all; diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/hci/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/hci/default.nix index 0fac1dfc04c6..4f04e0494f0f 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/hci/default.nix +++ b/nixpkgs/pkgs/development/tools/continuous-integration/hci/default.nix @@ -31,7 +31,10 @@ let makeWrapper $out/libexec/hci $out/bin/hci --prefix PATH : ${lib.escapeShellArg (makeBinPath bundledBins)} ''; }) - (addBuildTools [ makeWrapper ] (justStaticExecutables (haskellPackages.hercules-ci-cli.override overrides))); + (addBuildTools [ makeWrapper ] + # TODO: Erroneous references to GHC on aarch64-darwin: https://github.com/NixOS/nixpkgs/issues/318013 + ((if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 then lib.id else haskell.lib.compose.justStaticExecutables) + (haskellPackages.hercules-ci-cli.override overrides))); in pkg // { meta = pkg.meta // { position = toString ./default.nix + ":1"; diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix index 8d4805341d55..0da85bae969a 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix +++ b/nixpkgs/pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix @@ -23,6 +23,10 @@ let (o: { postInstall = '' ${o.postInstall or ""} + ${lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) '' + remove-references-to -t ${haskellPackages.hercules-ci-cnix-expr} $out/bin/hercules-ci-agent + remove-references-to -t ${haskellPackages.hercules-ci-cnix-expr} $out/bin/hercules-ci-agent-worker + ''} mkdir -p $out/libexec mv $out/bin/hercules-ci-agent $out/libexec makeWrapper $out/libexec/hercules-ci-agent $out/bin/hercules-ci-agent --prefix PATH : ${lib.escapeShellArg (makeBinPath bundledBins)} diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix index 10f2d9faba12..c657c7bcf8aa 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - description = "An extendable open source continuous integration server"; + description = "Extendable open source continuous integration server"; homepage = "https://jenkins.io/"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/woodpecker-pipeline-transform/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/woodpecker-pipeline-transform/default.nix deleted file mode 100644 index af05fafea40b..000000000000 --- a/nixpkgs/pkgs/development/tools/continuous-integration/woodpecker-pipeline-transform/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, buildGoModule, fetchFromGitea }: -buildGoModule rec { - pname = "woodpecker-pipeline-transform"; - version = "0.1.1"; - - src = fetchFromGitea { - domain = "codeberg.org"; - owner = "lafriks"; - repo = "woodpecker-pipeline-transform"; - rev = "v${version}"; - sha256 = "sha256-tWDMbOkajZ3BB32Vl630EZrY+Owm72MD2Z2JjMucVkI="; - }; - - vendorHash = "sha256-qKzGALMagf6QHeLdABfNGG4f/3K/F6CjVYjOJtyTNoM="; - - meta = with lib; { - description = "Utility to convert different pipelines to Woodpecker CI pipelines"; - homepage = "https://codeberg.org/lafriks/woodpecker-pipeline-transform"; - license = licenses.mit; - mainProgram = "pipeline-convert"; - maintainers = with maintainers; [ ambroisie ]; - }; -} diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/woodpecker-plugin-git/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/woodpecker-plugin-git/default.nix index c05800237637..37596774bbde 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/woodpecker-plugin-git/default.nix +++ b/nixpkgs/pkgs/development/tools/continuous-integration/woodpecker-plugin-git/default.nix @@ -32,7 +32,7 @@ buildGoModule rec { passthru.tests.version = testers.testVersion { package = woodpecker-plugin-git; }; meta = with lib; { - description = "Woodpecker plugin for cloning Git repositories."; + description = "Woodpecker plugin for cloning Git repositories"; homepage = "https://woodpecker-ci.org/"; changelog = "https://github.com/woodpecker-ci/plugin-git/releases/tag/${version}"; license = licenses.asl20; diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/woodpecker/common.nix b/nixpkgs/pkgs/development/tools/continuous-integration/woodpecker/common.nix index 214e1c35b276..53aac9d5d4df 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/woodpecker/common.nix +++ b/nixpkgs/pkgs/development/tools/continuous-integration/woodpecker/common.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "2.4.1"; - srcHash = "sha256-03y0xLXgdvw1NAtH2FDW91wp13ohimqjz3kl2mWc11E="; + version = "2.6.0"; + srcHash = "sha256-SuTizOHsj1t4WovbOX5MuMZixbPo7TyCnD6nnf62/H4="; # The tarball contains vendored dependencies vendorHash = null; in |