nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-07-22 00:20:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge staging-next-22.05 into staging-22.05

Browse Source
This commit is contained in:
github-actions[bot]
2022-10-20 00:22:44 +00:00
committed by GitHub
parent aa27d711db 2868077cdc
commit 555fc2ce67
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/networking/nextcloud-client/default.nix
View File

@@ -26,7 +26,7 @@
mkDerivation rec {
pname = "nextcloud-client";
version = "3.6.0";
version = "3.6.1";
outputs = [ "out" "dev" ];
@@ -34,7 +34,7 @@ mkDerivation rec {
owner = "nextcloud";
repo = "desktop";
rev = "v${version}";
sha256 = "sha256-wAxq5xFlofn2xEguvewMvGcel9O+CN/1AycR3tv/xMA=";
sha256 = "sha256-RCYiUxTZSuZbDocueW0d8PdsRTR9bTjDgx0H53UGDP4=";
};
patches = [

10
pkgs/applications/version-management/gitlab/data.json
View File

@@ -1,15 +1,15 @@
{
"version": "15.4.1",
"repo_hash": "sha256-z4J0ia9WxL+tJnoYNBtb6ZMuqGHiyhQ0tc0L8kzj26w=",
"version": "15.4.2",
"repo_hash": "sha256-KGVZrfrzfIn2ZQJ42FisLvjIGg0+QOnzfjCR6mQHjlM=",
"yarn_hash": "1r33qrvwf2wmq5c1d2awk9qhk9nzvafqn3drdvnczfv43sda4lg8",
"owner": "gitlab-org",
"repo": "gitlab",
"rev": "v15.4.1-ee",
"rev": "v15.4.2-ee",
"passthru": {
"GITALY_SERVER_VERSION": "15.4.1",
"GITALY_SERVER_VERSION": "15.4.2",
"GITLAB_PAGES_VERSION": "1.62.0",
"GITLAB_SHELL_VERSION": "14.10.0",
"GITLAB_WORKHORSE_VERSION": "15.4.1"
"GITLAB_WORKHORSE_VERSION": "15.4.2"
},
"vendored_gems": [
"bundler-checksum",

4
pkgs/applications/version-management/gitlab/gitaly/default.nix
View File

@@ -11,7 +11,7 @@ let
gemdir = ./.;
};
version = "15.4.1";
version = "15.4.2";
package_version = "v${lib.versions.major version}";
gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";
@@ -22,7 +22,7 @@ let
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
sha256 = "sha256-7f4TxCI/k2yirQxYI8i/6PXGVDs4x4ncIou1qH0TKAc=";
sha256 = "sha256-DBAQ1dJLQ+Xno4e/n1jvgKiHAol/uTMjx6RtZIBwM3w=";
};
vendorSha256 = "sha256-CUFYHjmOfosM3mfw0qEY+AQcR8U3J/1lU2Ml6wSZ/QM=";

2
pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
View File

@@ -5,7 +5,7 @@ in
buildGoModule rec {
pname = "gitlab-workhorse";
version = "15.4.1";
version = "15.4.2";
src = fetchFromGitLab {
owner = data.owner;