diff options
| author | techknowlogick <techknowlogick@gitea.io> | 2022-12-29 13:12:21 -0500 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2023-01-03 03:49:33 +0000 |
| commit | 573f2af8c5ab75c9d3ade44fe038ab8c245a06ab (patch) | |
| tree | b14a3a45351ab24a831d7627bb3dbfbabdb944a6 | |
| parent | Merge pull request #208355 from NixOS/backport-208308-to-release-22.11 (diff) | |
| download | nixpkgs-origin/backport-208260-to-release-22.11.tar.gz | |
woodpecker: 0.15.5 -> 0.15.6origin/backport-208260-to-release-22.11
(cherry picked from commit 493f17de944c9e38886b36a24006a8658d0d3db1)
3 files changed, 5 insertions, 16 deletions
diff --git a/pkgs/development/tools/continuous-integration/woodpecker/cli.nix b/pkgs/development/tools/continuous-integration/woodpecker/cli.nix index aa83dfb16166..b5eda9efb917 100644 --- a/pkgs/development/tools/continuous-integration/woodpecker/cli.nix +++ b/pkgs/development/tools/continuous-integration/woodpecker/cli.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, callPackage, fetchFromGitHub, fetchpatch }: +{ lib, buildGoModule, callPackage, fetchFromGitHub }: let common = callPackage ./common.nix { }; in @@ -7,16 +7,6 @@ buildGoModule { inherit (common) version src ldflags postBuild; vendorSha256 = null; - patches = [ - # Fixes https://github.com/NixOS/nixpkgs/issues/184875, until a new version - # is released. - (fetchpatch { - name = "display-system-ca-error-only-if-there-is-an-error.patch"; - url = "https://github.com/woodpecker-ci/woodpecker/commit/1fb800329488de74c9db7cfc5dc43fb5a4efbad8.patch"; - sha256 = "sha256-wKI/7PhbxsAD/qrl4nnkHyyQhQcvGlySysnxytGJzfU="; - }) - ]; - subPackages = "cmd/cli"; CGO_ENABLED = 0; diff --git a/pkgs/development/tools/continuous-integration/woodpecker/common.nix b/pkgs/development/tools/continuous-integration/woodpecker/common.nix index d6b337f4892a..e94e83b7e6b9 100644 --- a/pkgs/development/tools/continuous-integration/woodpecker/common.nix +++ b/pkgs/development/tools/continuous-integration/woodpecker/common.nix @@ -1,8 +1,8 @@ { lib, fetchFromGitHub }: let - version = "0.15.5"; - srcSha256 = "yaA2PKw4xuqd8vGXh/GhcJJHw4mJ1z97tWJTREE14ow="; - yarnSha256 = "1jpb4gblmknl81f6iclqg8ba82ca931q38xpm0kzki8y5ayk9n67"; + version = "0.15.6"; + srcSha256 = "sha256-8XXeGEw7+NGULsD5/g1j9+P2h82oRpEuMJT6sMp+z38="; + yarnSha256 = "sha256-PY0BIBbjyi2DG+n5x/IPc0AwrFSwII4huMDU+FeZ/Sc="; in { inherit version yarnSha256; diff --git a/pkgs/development/tools/continuous-integration/woodpecker/woodpecker-package.json b/pkgs/development/tools/continuous-integration/woodpecker/woodpecker-package.json index eb29431a0566..3caa2f3cbf7f 100644 --- a/pkgs/development/tools/continuous-integration/woodpecker/woodpecker-package.json +++ b/pkgs/development/tools/continuous-integration/woodpecker/woodpecker-package.json @@ -18,7 +18,6 @@ }, "dependencies": { "@kyvg/vue3-notification": "2.3.4", - "@meforma/vue-toaster": "1.2.2", "ansi-to-html": "0.7.2", "dayjs": "1.10.7", "floating-vue": "2.0.0-beta.5", @@ -54,7 +53,7 @@ "typescript": "4.4.4", "unplugin-icons": "0.12.17", "unplugin-vue-components": "0.17.0", - "vite": "2.6.13", + "vite": "2.9.13", "vite-plugin-windicss": "1.4.12", "vite-svg-loader": "3.0.0", "vue-tsc": "0.28.10", |