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

Merge release-23.05 into staging-next-23.05

Browse Source
This commit is contained in:
github-actions[bot]
2023-12-06 00:13:15 +00:00
committed by GitHub
parent 05e3e6cd10 0561103ced
commit e4402cb992
10 changed files with 39 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/networking/instant-messengers/element/update.sh
View File

@@ -1,5 +1,5 @@
#!/usr/bin/env nix-shell
#!nix-shell -I nixpkgs=../../../../../ -i bash -p nix wget prefetch-yarn-deps nix-prefetch-github
#!nix-shell -I nixpkgs=../../../../../ -i bash -p nix wget prefetch-yarn-deps nix-prefetch-github jq
if [ "$#" -gt 1 ] || [[ "$1" == -* ]]; then
echo "Regenerates packaging data for the element packages."

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

@@ -1,15 +1,15 @@
{
"version": "16.5.1",
"repo_hash": "sha256-7vKdCFDgtXSTlYV9nfLuQ+LZCaGDLU9zp97rob4dj2A=",
"yarn_hash": "1df7lf2grxpfjy1vgwsxw9n310jgjb64vqcxn2a7wzgh0svr1yyf",
"version": "16.5.3",
"repo_hash": "sha256-0Tewet9A0+0wDcMWVhXMGx1zr/R2WN46h+pEP3pEkac=",
"yarn_hash": "03ryyk7dw7s8yjdx9wdrvllaydb0w5an06agkwf5npgr6x1bz3yv",
"owner": "gitlab-org",
"repo": "gitlab",
"rev": "v16.5.1-ee",
"rev": "v16.5.3-ee",
"passthru": {
"GITALY_SERVER_VERSION": "16.5.1",
"GITLAB_PAGES_VERSION": "16.5.1",
"GITALY_SERVER_VERSION": "16.5.3",
"GITLAB_PAGES_VERSION": "16.5.3",
"GITLAB_SHELL_VERSION": "14.29.0",
"GITLAB_ELASTICSEARCH_INDEXER_VERSION": "4.4.0",
"GITLAB_WORKHORSE_VERSION": "16.5.1"
"GITLAB_WORKHORSE_VERSION": "16.5.3"
}
}

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

@@ -6,7 +6,7 @@
}:
let
version = "16.5.1";
version = "16.5.3";
package_version = "v${lib.versions.major version}";
gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";
@@ -18,7 +18,7 @@ let
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
hash = "sha256-LrkFSsWIPqiEXUV5OyYkB2XUbCMXjbpcCmTacR33vOQ=";
hash = "sha256-lGwRGU24pyBypQRTvGRYaAmkVbPLaw+fSeAXJ1pyQaA=";
};
vendorHash = "sha256-QLt/12P6OLpLqCINROLmzhoRpLGrB9WzME7FzhIcb0Q=";

6
pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix
View File

@@ -2,7 +2,7 @@
buildGoModule rec {
pname = "gitlab-container-registry";
version = "3.85.0";
version = "3.86.2";
rev = "v${version}-gitlab";
# nixpkgs-update: no auto update
@@ -10,10 +10,10 @@ buildGoModule rec {
owner = "gitlab-org";
repo = "container-registry";
inherit rev;
sha256 = "sha256-F20f1qDsI+moBAL+Tpx5AALgOi0vTH7hZ5RIvRMwY1s=";
sha256 = "sha256-hZhlSZ/crwzc8KEkbMGY9zAYVbMT9p4y7Wm3B+F+iPU=";
};
vendorHash = "sha256-JWuSJD2Mi0om9vA6+mYbArfr2lmGlRua6IM0DhDzSBk=";
vendorHash = "sha256-3iBMn1kA/GZC/7FEFLd1/e7+mSsCOAo+zQo3dVpTHw4=";
patches = [
./Disable-inmemory-storage-driver-test.patch

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

@@ -2,14 +2,14 @@
buildGoModule rec {
pname = "gitlab-pages";
version = "16.5.1";
version = "16.5.3";
# nixpkgs-update: no auto update
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-pages";
rev = "v${version}";
hash = "sha256-1fcsliorkl118MyUnZ3yrQjwLBQGsNBBA4dIEFHBJAI=";
hash = "sha256-eE+QuzqNm3zA0le8MWR3Kbc+/kQtKIrSd9sTmVYaNbQ=";
};
vendorHash = "sha256-YG+ERETxp0BPh/V4820pMXTXu9YcodRhzme6qZJBC9Q=";

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

@@ -5,7 +5,7 @@ in
buildGoModule rec {
pname = "gitlab-workhorse";
version = "16.5.1";
version = "16.5.3";
# nixpkgs-update: no auto update
src = fetchFromGitLab {

23
pkgs/development/libraries/open62541/default.nix
View File

@@ -33,13 +33,13 @@ in
stdenv.mkDerivation (finalAttrs: {
pname = "open62541";
version = "1.3.8";
version = "1.3.9";
src = fetchFromGitHub {
owner = "open62541";
repo = "open62541";
rev = "v${finalAttrs.version}";
hash = "sha256-koifSynnJX9IuwX8HUT1TzHoKgJfweNGAVlqUx7nEc4=";
hash = "sha256-FnLMR54xjIyYRqwCnvMJsNgsVwH7hVAixCNGhfIZPiw=";
fetchSubmodules = true;
};
@@ -92,16 +92,15 @@ stdenv.mkDerivation (finalAttrs: {
enableParallelChecking = false;
preCheck = let
disabledTests =
lib.optionals withPubSub [
# "Cannot set socket option IP_ADD_MEMBERSHIP"
"pubsub_publish"
"check_pubsub_get_state"
"check_pubsub_publish_rt_levels"
"check_pubsub_subscribe_config_freeze"
"check_pubsub_subscribe_rt_levels"
"check_pubsub_multiple_subscribe_rt_levels"
];
disabledTests = lib.optionals withPubSub [
# "Cannot set socket option IP_ADD_MEMBERSHIP"
"pubsub_publish"
"check_pubsub_get_state"
"check_pubsub_publish_rt_levels"
"check_pubsub_subscribe_config_freeze"
"check_pubsub_subscribe_rt_levels"
"check_pubsub_multiple_subscribe_rt_levels"
];
regex = "^(${builtins.concatStringsSep "|" disabledTests})\$";
in lib.optionalString (disabledTests != []) ''
checkFlagsArray+=(ARGS="-E ${lib.escapeRegex regex}")

16
pkgs/os-specific/linux/kernel/kernels-org.json
View File

@@ -1,7 +1,7 @@
{
"testing": {
"version": "6.7-rc3",
"hash": "sha256:1bi80271g76pcajzmzr0dxcmzzlzicqddm38mr7pkz8zi0070arf"
"version": "6.7-rc4",
"hash": "sha256:1igynlm5pv62brfkyjh6w8lzvmmy8c3g8phrn5wgdyy8svc48r8h"
},
"6.5": {
"version": "6.5.13",
@@ -12,12 +12,12 @@
"hash": "sha256:0zgj1z97jyx7wf12zrnlcp0mj4cl43ais9qsy6dh1jwylf2fq9ln"
},
"6.1": {
"version": "6.1.64",
"hash": "sha256:1ry7dp39010hfja1wial6r6q6ilgygwm7gdz22bg4rzaycwam7b2"
"version": "6.1.65",
"hash": "sha256:02mj394ina3npp6qqinc4pc6afp5pg1rlbjc90g4p902d29jjwj0"
},
"5.15": {
"version": "5.15.140",
"hash": "sha256:0isa9si9wjn10lw41431wdqsbp9y685ch5lzhwswng3g6j5ywaxy"
"version": "5.15.141",
"hash": "sha256:1yicgvq413801qrfzr0rdzwgg45dszrvfd6y9dmrhak9bk36lvck"
},
"5.10": {
"version": "5.10.202",
@@ -36,7 +36,7 @@
"hash": "sha256:03sk82dgvccv70i3hy8gf2hw0n4m305f7rxjw93p7jnjrbpdrp1r"
},
"6.6": {
"version": "6.6.3",
"hash": "sha256:19wmjkyyv5glv1w647qisrv829hhhpba5x905a7p7kch9wyzrv98"
"version": "6.6.4",
"hash": "sha256:0i9ym5nqf704iz5674k66kn9a5hkm0y0sdhqy5c6v39xr5h9dr29"
}
}

6
pkgs/os-specific/linux/kernel/linux-rt-6.1.nix
View File

@@ -6,7 +6,7 @@
, ... } @ args:
let
version = "6.1.59-rt16"; # updated by ./update-rt.sh
version = "6.1.64-rt17"; # updated by ./update-rt.sh
branch = lib.versions.majorMinor version;
kversion = builtins.elemAt (lib.splitString "-" version) 0;
in buildLinux (args // {
@@ -18,14 +18,14 @@ in buildLinux (args // {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v6.x/linux-${kversion}.tar.xz";
sha256 = "1860r1aan258yi2jq68bp1kdbcyy7ygc7d8g54wnc0vmqqj7fzv2";
sha256 = "1ry7dp39010hfja1wial6r6q6ilgygwm7gdz22bg4rzaycwam7b2";
};
kernelPatches = let rt-patch = {
name = "rt";
patch = fetchurl {
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
sha256 = "1cmgw6a8zlj89172mp85lxaksz1pvc155mj2fq59l1ry35gwb5q7";
sha256 = "1vvn21bprsqqzmqvcmj1jx3xn1dc6kih5fib9qpcyrh0j1c7s077";
};
}; in [ rt-patch ] ++ kernelPatches;

2
pkgs/top-level/all-packages.nix
View File

@@ -4765,7 +4765,7 @@ with pkgs;
element-desktop = callPackage ../applications/networking/instant-messengers/element/element-desktop.nix {
inherit (darwin.apple_sdk.frameworks) Security AppKit CoreServices;
electron = electron_26;
electron = electron_27;
};
element-desktop-wayland = writeScriptBin "element-desktop" ''
#!/bin/sh