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

Merge release-22.11 into staging-next-22.11

Browse Source
This commit is contained in:
github-actions[bot]
2023-02-19 00:15:24 +00:00
committed by GitHub
parent 89be7458b9 a0995268af
commit b11d73f4e2
10 changed files with 133 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/networking/instant-messengers/webex/default.nix
View File

@@ -55,11 +55,11 @@
stdenv.mkDerivation rec {
pname = "webex";
version = "42.10.0.24000";
version = "42.12.0.24485";
src = fetchurl {
url = "https://binaries.webex.com/WebexDesktop-Ubuntu-Gold/20221019145240/Webex_ubuntu.7z";
sha256 = "03b77a3fcce76f04cf684bcdecb3bcce97c5a8b6cc36b40967cc14fa9a46c102";
url = "https://binaries.webex.com/WebexDesktop-Ubuntu-Gold/20221206141837/Webex_ubuntu.7z";
sha256 = "4c09c13b760abbdcc8bc1a74d137f8bc23386da4425cbefd8ea75bd0a877fdbf";
};
buildInputs = [

23
pkgs/applications/office/gnucash/0004-exec-fq-helpers.patch Normal file
View File

@@ -0,0 +1,23 @@
diff --git a/gnucash/price-quotes.scm b/gnucash/price-quotes.scm
index 8e3ff255f..a6b805fa5 100644
--- a/gnucash/price-quotes.scm
+++ b/gnucash/price-quotes.scm
@@ -44,7 +44,7 @@
(define (start-program)
(set! program
(gnc-spawn-process-async
- (list "perl" "-w" gnc:*finance-quote-check*) #t)))
+ (list gnc:*finance-quote-check*) #t)))
(define (get-sources)
(when program
@@ -119,7 +119,7 @@
(define (start-quoter)
(set! quoter
- (gnc-spawn-process-async (list "perl" "-w" gnc:*finance-quote-helper*) #t)))
+ (gnc-spawn-process-async (list gnc:*finance-quote-helper*) #t)))
(define (get-quotes)
(when quoter

2
pkgs/applications/office/gnucash/default.nix
View File

@@ -72,6 +72,8 @@ stdenv.mkDerivation rec {
./0002-disable-gnc-fq-update.patch
# this patch prevents the building of gnucash-valgrind
./0003-remove-valgrind.patch
# this patch makes gnucash exec the Finance::Quote helpers directly
./0004-exec-fq-helpers.patch
];
# this needs to be an environment variable and not a cmake flag to suppress

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

@@ -1,14 +1,14 @@
{
"version": "15.8.1",
"repo_hash": "sha256-AdgebB7IY18u/J1F67oNnwVYmmeYJPNCI/yll2eZEiQ=",
"version": "15.8.3",
"repo_hash": "sha256-kODF5qalf8PClbsTgcqm5X2uTXpFA8N9FW+2HCPKxD0=",
"yarn_hash": "1famdjvsbhvnkg5sp2vnc3jzaixww41833pb0427s3qpig0fc7az",
"owner": "gitlab-org",
"repo": "gitlab",
"rev": "v15.8.1-ee",
"rev": "v15.8.3-ee",
"passthru": {
"GITALY_SERVER_VERSION": "15.8.1",
"GITLAB_PAGES_VERSION": "15.8.1",
"GITALY_SERVER_VERSION": "15.8.3",
"GITLAB_PAGES_VERSION": "15.8.3",
"GITLAB_SHELL_VERSION": "14.15.0",
"GITLAB_WORKHORSE_VERSION": "15.8.1"
"GITLAB_WORKHORSE_VERSION": "15.8.3"
}
}

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

@@ -11,7 +11,7 @@ let
gemdir = ./.;
};
version = "15.8.1";
version = "15.8.3";
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-TolduUm8OhpubHXMCyy0vQhj65lauh5eST5UDvdWNVE=";
sha256 = "sha256-jH5cbhoRgFsWJhXhKvdee4n77W2l+GSHGM2NElJTEy8=";
};
vendorSha256 = "sha256-8P5X/bqeI1hY45IGsvEWOg3GuetEQF/XtZzUMdX22pA=";

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

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

4
pkgs/development/libraries/webkitgtk/default.nix
View File

@@ -68,7 +68,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "webkitgtk";
version = "2.38.4";
version = "2.38.5";
name = "${finalAttrs.pname}-${finalAttrs.version}+abi=${if lib.versionAtLeast gtk3.version "4.0" then "5.0" else "4.${if lib.versions.major libsoup.version == "2" then "0" else "1"}"}";
outputs = [ "out" "dev" "devdoc" ];
@@ -79,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchurl {
url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz";
hash = "sha256-T0fqKaLU1fFe7z3J4tbG8Gfo3oY6P2RFXhzPlpPMHTY=";
hash = "sha256-QMIMQwIidN9Yk/IrEFT6iUw+6gVzibsIruCMWwuwwac=";
};
patches = lib.optionals stdenv.isLinux [

87
pkgs/os-specific/linux/kernel/fix-em-ice-bonding.patch Normal file
View File

@@ -0,0 +1,87 @@
From 1640688018f329559c61352646f283f98938af31 Mon Sep 17 00:00:00 2001
From: Cole Helbling <cole.helbling@determinate.systems>
Date: Thu, 16 Feb 2023 09:30:21 -0800
Subject: [PATCH] Revert "RDMA/irdma: Report the correct link speed"
This reverts commit 425c9bd06b7a70796d880828d15c11321bdfb76d.
Some Equinix Metal instances, such as a3.large.x86, m3.large.x86
(specific hardware revisions), and n3.large.x86, use the `ice` kernel
driver for their network cards, in conjunction with bonded devices.
However, this commit caused a regression where these bonded devices
would deadlock. This was initially reported by Jaroslav Pulchart on
the netdev mailing list[1], and there were follow-up patches from Dave
Ertman[2][3] that attempted to fix this but were not up to snuff for
various reasons[4].
Specifically, v2 of the patch ([3]) appears to fix the issue on some
devices (tested with 8086:159B network cards), while it is still broken
on others (such as an 8086:1593 network card).
We revert the patch exposing the issue until upstream has a working
solution in order to make Equinix Metal instances work reliably again.
[1]: https://lore.kernel.org/netdev/CAK8fFZ6A_Gphw_3-QMGKEFQk=sfCw1Qmq0TVZK3rtAi7vb621A@mail.gmail.com/
[2]: https://patchwork.ozlabs.org/project/intel-wired-lan/patch/20230111183145.1497367-1-david.m.ertman@intel.com/
[3]: https://patchwork.ozlabs.org/project/intel-wired-lan/patch/20230215191757.1826508-1-david.m.ertman@intel.com/
[4]: https://lore.kernel.org/netdev/cb31a911-ba80-e2dc-231f-851757cfd0b8@intel.com/T/#m6e53f8c43093693c10268140126abe99e082dc1c
---
drivers/infiniband/hw/irdma/verbs.c | 35 ++++++++++++++++++++++++++---
1 file changed, 32 insertions(+), 3 deletions(-)
diff --git a/drivers/infiniband/hw/irdma/verbs.c b/drivers/infiniband/hw/irdma/verbs.c
index c5971a840b87..911902d2b93e 100644
--- a/drivers/infiniband/hw/irdma/verbs.c
+++ b/drivers/infiniband/hw/irdma/verbs.c
@@ -60,6 +60,36 @@ static int irdma_query_device(struct ib_device *ibdev,
return 0;
}
+/**
+ * irdma_get_eth_speed_and_width - Get IB port speed and width from netdev speed
+ * @link_speed: netdev phy link speed
+ * @active_speed: IB port speed
+ * @active_width: IB port width
+ */
+static void irdma_get_eth_speed_and_width(u32 link_speed, u16 *active_speed,
+ u8 *active_width)
+{
+ if (link_speed <= SPEED_1000) {
+ *active_width = IB_WIDTH_1X;
+ *active_speed = IB_SPEED_SDR;
+ } else if (link_speed <= SPEED_10000) {
+ *active_width = IB_WIDTH_1X;
+ *active_speed = IB_SPEED_FDR10;
+ } else if (link_speed <= SPEED_20000) {
+ *active_width = IB_WIDTH_4X;
+ *active_speed = IB_SPEED_DDR;
+ } else if (link_speed <= SPEED_25000) {
+ *active_width = IB_WIDTH_1X;
+ *active_speed = IB_SPEED_EDR;
+ } else if (link_speed <= SPEED_40000) {
+ *active_width = IB_WIDTH_4X;
+ *active_speed = IB_SPEED_FDR10;
+ } else {
+ *active_width = IB_WIDTH_4X;
+ *active_speed = IB_SPEED_EDR;
+ }
+}
+
/**
* irdma_query_port - get port attributes
* @ibdev: device pointer from stack
@@ -87,9 +117,8 @@ static int irdma_query_port(struct ib_device *ibdev, u32 port,
props->state = IB_PORT_DOWN;
props->phys_state = IB_PORT_PHYS_STATE_DISABLED;
}
-
- ib_get_eth_speed(ibdev, port, &props->active_speed,
- &props->active_width);
+ irdma_get_eth_speed_and_width(SPEED_100000, &props->active_speed,
+ &props->active_width);
if (rdma_protocol_roce(ibdev, 1)) {
props->gid_tbl_len = 32;
--
2.39.0

5
pkgs/os-specific/linux/kernel/patches.nix
View File

@@ -57,4 +57,9 @@
name = "export-rt-sched-migrate";
patch = ./export-rt-sched-migrate.patch;
};
fix-em-ice-bonding = {
name = "fix-em-ice-bonding";
patch = ./fix-em-ice-bonding.patch;
};
}

2
pkgs/top-level/linux-kernels.nix
View File

@@ -148,6 +148,7 @@ in {
kernelPatches = [
kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper
kernelPatches.fix-em-ice-bonding
];
};
@@ -161,6 +162,7 @@ in {
kernelPatches = [
kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper
kernelPatches.fix-em-ice-bonding
];
};