Skip to content

Commit 5249bbc

Browse files
nixpkgs-ci[bot]nixpkgs-ci[bot]
authored
Merge release-25.11 into staging-next-25.11
2 parents 82311da + afbbf77 commit 5249bbc

15 files changed

Lines changed: 51 additions & 66 deletions

File tree

‎pkgs/applications/networking/instant-messengers/discord/sources.json‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,42 @@
11
{
22
"linux-canary": {
3-
"hash": "sha256-ogiHH8HYrHGb4r6ADSJG3LHUs7VLjqWwQqKBfHamCyk=",
4-
"url": "https://canary.dl2.discordapp.net/apps/linux/0.0.871/discord-canary-0.0.871.tar.gz",
5-
"version": "0.0.871"
3+
"hash": "sha256-HL6QPiKDg8io8Uhb2u2wDi+5FvwkZzHh4cqBJ6t4qOg=",
4+
"url": "https://canary.dl2.discordapp.net/apps/linux/0.0.873/discord-canary-0.0.873.tar.gz",
5+
"version": "0.0.873"
66
},
77
"linux-development": {
88
"hash": "sha256-EVkjWoqWl9Z+iHCLPOLu4PIUb2wC3HVcPVjOVz++IVw=",
99
"url": "https://development.dl2.discordapp.net/apps/linux/0.0.94/discord-development-0.0.94.tar.gz",
1010
"version": "0.0.94"
1111
},
1212
"linux-ptb": {
13-
"hash": "sha256-OlNU/DUQxjwAf6Qjqi6vUHfH6IhYJ9zSKp19hTuzVjk=",
14-
"url": "https://ptb.dl2.discordapp.net/apps/linux/0.0.177/discord-ptb-0.0.177.tar.gz",
15-
"version": "0.0.177"
13+
"hash": "sha256-X8PZkMhFYmWjeKPAvxtyBgrQAofkEpD1ow9gzm7v0LQ=",
14+
"url": "https://ptb.dl2.discordapp.net/apps/linux/0.0.178/discord-ptb-0.0.178.tar.gz",
15+
"version": "0.0.178"
1616
},
1717
"linux-stable": {
18-
"hash": "sha256-21ddAZveT1EXYr5cUoiIzD7uAbtF94EXW04VKGS5izM=",
19-
"url": "https://stable.dl2.discordapp.net/apps/linux/0.0.124/discord-0.0.124.tar.gz",
20-
"version": "0.0.124"
18+
"hash": "sha256-AyKUq2GJjMam2r7oQjdQBhBsTYbhVtnUaTeLP4emRIE=",
19+
"url": "https://stable.dl2.discordapp.net/apps/linux/0.0.125/discord-0.0.125.tar.gz",
20+
"version": "0.0.125"
2121
},
2222
"osx-canary": {
23-
"hash": "sha256-unXMbJ53+TFDtExOP13UdC4qA7mnu4z900gfEvN7Uys=",
24-
"url": "https://canary.dl2.discordapp.net/apps/osx/0.0.975/DiscordCanary.dmg",
25-
"version": "0.0.975"
23+
"hash": "sha256-MPE+EQEvvodFJy0kLT2VQUpMJh3wuh15nhena1LeDuI=",
24+
"url": "https://canary.dl2.discordapp.net/apps/osx/0.0.977/DiscordCanary.dmg",
25+
"version": "0.0.977"
2626
},
2727
"osx-development": {
2828
"hash": "sha256-B1//zMlTv2+RWHfWZSaaU8ubVOwWob+EYjNdtFRwlgg=",
2929
"url": "https://development.dl2.discordapp.net/apps/osx/0.0.107/DiscordDevelopment.dmg",
3030
"version": "0.0.107"
3131
},
3232
"osx-ptb": {
33-
"hash": "sha256-Ty6WSK5n+Gp/pEmmeayy+BgRz5rZFXuFTxcqCjzEkwY=",
34-
"url": "https://ptb.dl2.discordapp.net/apps/osx/0.0.209/DiscordPTB.dmg",
35-
"version": "0.0.209"
33+
"hash": "sha256-CbdKYcJE1Yn8s27f9QXHMVmF6U1URnUdmz5M8ilzZWU=",
34+
"url": "https://ptb.dl2.discordapp.net/apps/osx/0.0.210/DiscordPTB.dmg",
35+
"version": "0.0.210"
3636
},
3737
"osx-stable": {
38-
"hash": "sha256-AbgvI8VJ1uRGFwglL1mqOLESliAlbFQdP4gcJf+t1PY=",
39-
"url": "https://stable.dl2.discordapp.net/apps/osx/0.0.376/Discord.dmg",
40-
"version": "0.0.376"
38+
"hash": "sha256-AGFwdporeTx5D8zb7Gf5ECIM3jv4T6Z1W0BxHZ0NA8o=",
39+
"url": "https://stable.dl2.discordapp.net/apps/osx/0.0.377/Discord.dmg",
40+
"version": "0.0.377"
4141
}
4242
}

‎pkgs/by-name/cl/cloud-hypervisor/package.nix‎

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
lib,
33
stdenv,
44
fetchFromGitHub,
5-
fetchpatch,
65
rustPlatform,
76
pkg-config,
87
dtc,
@@ -11,29 +10,16 @@
1110

1211
rustPlatform.buildRustPackage rec {
1312
pname = "cloud-hypervisor";
14-
version = "49.0";
13+
version = "50.1";
1514

1615
src = fetchFromGitHub {
1716
owner = "cloud-hypervisor";
1817
repo = "cloud-hypervisor";
1918
rev = "v${version}";
20-
hash = "sha256-bPPs/4XMcvOH4BGfQrjQdvgjGWae4UEZjzPKjalDN3w=";
19+
hash = "sha256-18A0Sl3/sclKtjkZLKFR3RfjqceKOddxFEnBQF76+xU=";
2120
};
2221

23-
patches = [
24-
(fetchpatch {
25-
name = "vsock-seccomp-Rust-1.90.patch";
26-
url = "https://github.com/cloud-hypervisor/cloud-hypervisor/commit/ec57aade1563075e37b8e9ccc0b85fe2c04a54b8.patch";
27-
hash = "sha256-M+I+ZbiNDV1a8Y46+/mPTyDlQgQS7G6ytvPgli0NhJ0=";
28-
})
29-
(fetchpatch {
30-
name = "vfio-user-seccomp-Rust-1.90.patch";
31-
url = "https://github.com/cloud-hypervisor/cloud-hypervisor/commit/95b8c6afdd6eec9810243f92ec1956dccfe305da.patch";
32-
hash = "sha256-kCP/Fu0Dg+GdnwyFQLqZWKlbqO9w4KRJcbV4sReSDYM=";
33-
})
34-
];
35-
36-
cargoHash = "sha256-5EK9V9yiF/UjmlYSKBIJgQOA1YU33ezicLikWYnKFAo=";
22+
cargoHash = "sha256-9QYSbnirQBG/WkfIBQ47wHE478RjWQ9rTJe/aJ436bU=";
3723

3824
separateDebugInfo = true;
3925

‎pkgs/by-name/dr/drawio-headless/package.nix‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ writeTextFile {
3838
directory.
3939
'';
4040
maintainers = with lib.maintainers; [
41-
qyliss
4241
tfc
4342
];
4443
mainProgram = "drawio";

‎pkgs/by-name/fl/flare-signal/package.nix‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,19 @@
2323

2424
stdenv.mkDerivation (finalAttrs: {
2525
pname = "flare";
26-
version = "0.18.3";
26+
version = "0.18.4";
2727

2828
src = fetchFromGitLab {
2929
domain = "gitlab.com";
3030
owner = "schmiddi-on-mobile";
3131
repo = "flare";
3232
tag = finalAttrs.version;
33-
hash = "sha256-+25nDG/xw82Iv6gGYWmGHUBf4CbTLBTzrOqKdrCFIMQ=";
33+
hash = "sha256-6a/up/UbaB9WQEiw8fmuh9Xjz73oBxO2k9jKhKwo0mc=";
3434
};
3535

3636
cargoDeps = rustPlatform.fetchCargoVendor {
3737
inherit (finalAttrs) pname version src;
38-
hash = "sha256-nY+rxWzZJoQRB+Pn4yjof+fCcI2GU2+QFCN73kgRLZ0=";
38+
hash = "sha256-wjm3R43iMbXZeMe4dPyreXNqc+3FrDvaEeJJM+IYtz4=";
3939
};
4040

4141
nativeBuildInputs = [

‎pkgs/by-name/in/inetutils/package.nix‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
libxcrypt,
1111
util-linux,
1212
}:
13-
stdenv.mkDerivation rec {
13+
stdenv.mkDerivation (finalAttrs: {
1414
pname = "inetutils";
1515
version = "2.7";
1616

1717
src = fetchurl {
18-
url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz";
18+
url = "mirror://gnu/inetutils/inetutils-${finalAttrs.version}.tar.gz";
1919
hash = "sha256-oVa+HN48XA/+/CYhgNk2mmBIQIeQeqVUxieH0vQOwIY=";
2020
};
2121

@@ -123,4 +123,4 @@ stdenv.mkDerivation rec {
123123
*/
124124
priority = (util-linux.meta.priority or lib.meta.defaultPriority) + 1;
125125
};
126-
}
126+
})

‎pkgs/by-name/li/libsignal-ffi/package.nix‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ rustPlatform.buildRustPackage rec {
2121
pname = "libsignal-ffi";
2222
# must match the version used in mautrix-signal
2323
# see https://github.com/mautrix/signal/issues/401
24-
version = "0.86.12";
24+
version = "0.87.1";
2525

2626
src = fetchFromGitHub {
2727
fetchSubmodules = true;
2828
owner = "signalapp";
2929
repo = "libsignal";
3030
tag = "v${version}";
31-
hash = "sha256-XVq1fvhUF0WqSs1lJRCBRuhOW4idY6Nm21UdX4/6TE8=";
31+
hash = "sha256-yr2+yM7RmUQ7mNDMCcaM5cCpudof14JuO5J6D944k0U=";
3232
};
3333

3434
nativeBuildInputs = [
@@ -40,7 +40,7 @@ rustPlatform.buildRustPackage rec {
4040
env.BORING_BSSL_PATH = "${boringssl-wrapper}";
4141
env.NIX_LDFLAGS = if stdenv.hostPlatform.isDarwin then "-lc++" else "-lstdc++";
4242

43-
cargoHash = "sha256-vat7vjL9HDY/m7CLUJNpU3NZ79nCVHxLO5tEtaEDBnE=";
43+
cargoHash = "sha256-rqxp+RZuuT+nFudNeCgA8g04C9KT1Qi59K4b2avL5u4=";
4444

4545
cargoBuildFlags = [
4646
"-p"

‎pkgs/by-name/li/linux-firmware/package.nix‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ let
2222
in
2323
stdenvNoCC.mkDerivation rec {
2424
pname = "linux-firmware";
25-
version = "20260110";
25+
version = "20260221";
2626

2727
src = fetchFromGitLab {
2828
owner = "kernel-firmware";
2929
repo = "linux-firmware";
3030
tag = version;
31-
hash = "sha256-zL2ck91IBjBw/10YirxfoScEjbvEXVBR7bpLzuF3kDc=";
31+
hash = "sha256-QHoS9+WS9IjRVhTJEFF/X8+4ZKjKwpJAvf7EqsV+qEY=";
3232
};
3333

3434
postUnpack = ''

‎pkgs/by-name/ma/mautrix-signal/package.nix‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ let
2020
in
2121
buildGoModule rec {
2222
pname = "mautrix-signal";
23-
version = "26.01";
24-
tag = "v0.2601.0";
23+
version = "26.02";
24+
tag = "v0.2602.0";
2525

2626
src = fetchFromGitHub {
2727
owner = "mautrix";
2828
repo = "signal";
2929
inherit tag;
30-
hash = "sha256-zvB0CbSzrLcUJiEIj3vtDq2C0XEYUNRbaUAn+636+uk=";
30+
hash = "sha256-FWFAH+jtPdLG9vJS4QXpFjsGWUzILW17WRFyfdnFlAE=";
3131
};
3232

3333
buildInputs =
@@ -44,7 +44,7 @@ buildGoModule rec {
4444

4545
CGO_LDFLAGS = lib.optional withGoolm [ cppStdLib ];
4646

47-
vendorHash = "sha256-Eo7T/63ywNnn/t0RzjwkSYRmrL0IMdIsv4wqrQFv+5U=";
47+
vendorHash = "sha256-TFz5P8czj8J9+QTFHjffCldw8Je2+DiM49W7jv5rY/I=";
4848

4949
ldflags = [
5050
"-X"

‎pkgs/by-name/mi/microsoft-edge/package.nix‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,11 +162,11 @@ let
162162
in
163163
stdenvNoCC.mkDerivation (finalAttrs: {
164164
pname = "microsoft-edge";
165-
version = "145.0.3800.58";
165+
version = "145.0.3800.70";
166166

167167
src = fetchurl {
168168
url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_${finalAttrs.version}-1_amd64.deb";
169-
hash = "sha256-RmXe5w7UQALjjEPfrH3l5nyi0U58x5OlNrtfWIY48U0=";
169+
hash = "sha256-gUyh9AD1ntnZb2iLRwKLxy0PxY0Dist73oT9AC2pFQI=";
170170
};
171171

172172
# With strictDeps on, some shebangs were not being patched correctly

‎pkgs/by-name/op/openasar/package.nix‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
lib,
3-
stdenv,
3+
stdenvNoCC,
44
fetchFromGitHub,
55
unstableGitUpdater,
66
nodejs,
@@ -12,7 +12,7 @@
1212
discord-development,
1313
}:
1414

15-
stdenv.mkDerivation (finalAttrs: {
15+
stdenvNoCC.mkDerivation (finalAttrs: {
1616
pname = "openasar";
1717
version = "0-unstable-2025-11-21";
1818

0 commit comments

Comments
 (0)