Skip to content

Commit a25c00d

Browse files
Merge staging-next into staging
2 parents 877d82a + 3e72182 commit a25c00d

34 files changed

Lines changed: 679 additions & 464 deletions

File tree

nixos/tests/systemd-coredump.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ in
3737
machine1.wait_for_unit("systemd-coredump.socket")
3838
machine1.systemctl("start crasher");
3939
machine1.wait_until_succeeds("coredumpctl list | grep crasher", timeout=10)
40-
machine1.fail("stat /var/lib/crasher/core")
40+
machine1.fail("stat /var/lib/crasher/core*")
4141
4242
with subtest("systemd-coredump disabled"):
4343
machine2.systemctl("start crasher");
44-
machine2.wait_until_succeeds("stat /var/lib/crasher/core", timeout=10)
44+
machine2.wait_until_succeeds("stat /var/lib/crasher/core*", timeout=10)
4545
'';
4646
}

pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,40 +5,49 @@
55
nix-update-script,
66
openssl,
77
perl,
8+
zig,
89
pkg-config,
910
stdenv,
1011
vimUtils,
1112
}:
1213
let
13-
version = "896355b-unstable-2026-02-07";
14+
version = "1001eb8-unstable-2026-03-13";
1415
src = fetchFromGitHub {
1516
owner = "dmtrKovalenko";
1617
repo = "fff.nvim";
17-
rev = "d7bc72786d4362ca70aa05d397f8d08bbaf39604";
18-
hash = "sha256-CqX2QoDO7InjXYMzvljufA0QYhvFbsht2auE0+nVktw=";
18+
rev = "fcdf4a9172fba824ca6834731b93b74eba51d1c3";
19+
hash = "sha256-AYxWrqru0/HCrfTXRqTExiOT6mNzNMk+pT6APRs0BUM=";
1920
};
2021
fff-nvim-lib = rustPlatform.buildRustPackage {
2122
pname = "fff-nvim-lib";
2223
inherit version src;
2324

24-
cargoHash = "sha256-jch2snZVoDqPkbeuF++yc/3ikoWal29bTKZjkyDgVjU=";
25+
cargoHash = "sha256-nXtJPE6HNZx5Ra4CwYi/f4EWww//1XwsiwtRG77RPJk=";
2526

2627
nativeBuildInputs = [
2728
pkg-config
2829
perl
30+
rustPlatform.bindgenHook
2931
];
3032

3133
buildInputs = [
3234
openssl
3335
];
3436

37+
# This test requires curl and GitHub access
38+
checkFlags = [
39+
"--skip=update_check::tests::test_update_check_end_to_end"
40+
];
41+
3542
env = {
3643
RUSTC_BOOTSTRAP = 1; # We need rust unstable features
3744

3845
OPENSSL_NO_VENDOR = true;
3946

4047
# Allow undefined symbols on Darwin - they will be provided by Neovim's LuaJIT runtime
4148
RUSTFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-C link-arg=-undefined -C link-arg=dynamic_lookup";
49+
50+
ZIG = lib.getExe zig; # zlob requires zig
4251
};
4352
};
4453
in

pkgs/applications/networking/cluster/terraform-providers/providers.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1310,11 +1310,11 @@
13101310
"vendorHash": "sha256-omxEb+ntQuHDfS2Rmt0rj0BF0Q2T8DLhobLua2uU/0o="
13111311
},
13121312
"tencentcloudstack_tencentcloud": {
1313-
"hash": "sha256-kEdt8shf0bLyPzz6Lysj0yyx6leLHl4g9BjuXRdWPVo=",
1313+
"hash": "sha256-TXyc0I+IKjatZyH3oKHDXD8ml8/IyaIMQfAKpbkUl8g=",
13141314
"homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud",
13151315
"owner": "tencentcloudstack",
13161316
"repo": "terraform-provider-tencentcloud",
1317-
"rev": "v1.82.73",
1317+
"rev": "v1.82.74",
13181318
"spdx": "MPL-2.0",
13191319
"vendorHash": null
13201320
},

pkgs/applications/networking/mailreaders/thunderbird-bin/release_esr_sources.nix

Lines changed: 397 additions & 397 deletions
Large diffs are not rendered by default.

pkgs/build-support/node/fetch-pnpm-deps/default.nix

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
cacert,
88
makeSetupHook,
99
pnpm,
10+
writableTmpDirAsHomeHook,
1011
yq,
1112
zstd,
1213
}:
@@ -198,6 +199,7 @@ in
198199
pnpmConfigHook = makeSetupHook {
199200
name = "pnpm-config-hook";
200201
propagatedBuildInputs = [
202+
writableTmpDirAsHomeHook
201203
zstd
202204
];
203205
substitutions = {

pkgs/build-support/node/fetch-pnpm-deps/pnpm-config-hook.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ pnpmConfigHook() {
2525

2626
echo "Configuring pnpm store"
2727

28-
export HOME=$(mktemp -d)
2928
export STORE_PATH=$(mktemp -d)
3029
export npm_config_arch="@npmArch@"
3130
export npm_config_platform="@npmPlatform@"
@@ -41,7 +40,7 @@ pnpmConfigHook() {
4140

4241
# If the packageManager field in package.json is set to a different pnpm version than what is in nixpkgs,
4342
# any pnpm command would fail in that directory, the following disables this
44-
pushd ..
43+
pushd $HOME
4544
pnpm config set manage-package-manager-versions false
4645
popd
4746

pkgs/by-name/ap/apache-orc/package.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: {
6666
cmakeFlags = [
6767
(lib.cmakeFeature "CMAKE_BUILD_TYPE" "Release")
6868
(lib.cmakeBool "BUILD_JAVA" false)
69-
(lib.cmakeBool "STOP_BUILD_ON_WARNING" true)
69+
(lib.cmakeBool "STOP_BUILD_ON_WARNING" stdenv.isLinux)
7070
(lib.cmakeBool "INSTALL_VENDORED_LIBS" false)
7171
]
7272
++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [
Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
{
2+
lib,
3+
cargo,
4+
desktop-file-utils,
5+
fetchFromGitHub,
6+
glib,
7+
gtk4,
8+
libadwaita,
9+
meson,
10+
ninja,
11+
pipewire,
12+
pkg-config,
13+
rustPlatform,
14+
rustc,
15+
stdenv,
16+
wrapGAppsHook4,
17+
}:
18+
19+
stdenv.mkDerivation rec {
20+
pname = "audio-mirroring";
21+
version = "0.1.1";
22+
23+
src = fetchFromGitHub {
24+
owner = "mkg20001";
25+
repo = "audio-mirroring";
26+
tag = "v${version}";
27+
hash = "sha256-f4V5ZJvXhdwqS4kx99Lr2Eb8r08PRd3T4mbRoAyyIqE=";
28+
};
29+
30+
cargoDeps = rustPlatform.fetchCargoVendor {
31+
inherit pname version src;
32+
hash = "sha256-+mAdxaaQOO7AIn/o/J13FbHIvtepk8/okGxO6p6aGzI=";
33+
};
34+
35+
nativeBuildInputs = [
36+
meson
37+
ninja
38+
pkg-config
39+
rustPlatform.cargoSetupHook
40+
cargo
41+
rustc
42+
rustPlatform.bindgenHook
43+
wrapGAppsHook4
44+
];
45+
46+
buildInputs = [
47+
desktop-file-utils
48+
glib
49+
gtk4
50+
libadwaita
51+
pipewire
52+
];
53+
54+
meta = with lib; {
55+
description = "Audio Mirroring for Linux";
56+
homepage = "https://github.com/mkg20001/audio-mirroring";
57+
license = licenses.gpl3Only;
58+
maintainers = with maintainers; [ mkg20001 ];
59+
platforms = platforms.linux;
60+
mainProgram = "audio-mirroring";
61+
};
62+
}

pkgs/by-name/cf/cfspeedtest/package.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@
88

99
rustPlatform.buildRustPackage (finalAttrs: {
1010
pname = "cfspeedtest";
11-
version = "2.2.0";
11+
version = "2.2.1";
1212

1313
src = fetchFromGitHub {
1414
owner = "code-inflation";
1515
repo = "cfspeedtest";
1616
tag = "v${finalAttrs.version}";
17-
hash = "sha256-EVZFmTjv2j7kax4MC5HTkVa7/IiDNZcIOgsntSGfzG4=";
17+
hash = "sha256-6ZlcZZSC5WPrlskxWnLheMt5sJlHI7K4UPAPsvr8zSc=";
1818
};
1919

20-
cargoHash = "sha256-cA+eRVZiZL+bbPc+Vr7nkwMLbQBKOO3uU0XzrxVajqg=";
20+
cargoHash = "sha256-h9X/WKKiXri4I2DBulkNnpiTaYAL9oXAx0BiTBKaEtE=";
2121

2222
nativeBuildInputs = [ installShellFiles ];
2323

pkgs/by-name/co/cosmic-greeter/package.nix

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
nix-update-script,
1616
nixosTests,
1717
orca,
18+
fetchpatch2,
1819
}:
1920

2021
rustPlatform.buildRustPackage (finalAttrs: {
@@ -29,7 +30,16 @@ rustPlatform.buildRustPackage (finalAttrs: {
2930
hash = "sha256-U0JrxvMWzISSA0tP8moasN7iN7TfZreEwbvWZGHRn8E=";
3031
};
3132

32-
cargoHash = "sha256-sNJTXBInr/h8w5dhOOP9ceBYWBcJW3qGjDuaG6UTV90=";
33+
cargoHash = "sha256-J5ycaeKZsEBPcI9JH8bHsOAcXXwcx/D21GlVhJZbGwM=";
34+
35+
cargoPatches = [
36+
(fetchpatch2 {
37+
# https://github.com/pop-os/cosmic-greeter/pull/426
38+
name = "security-hardening.patch";
39+
url = "https://github.com/pop-os/cosmic-greeter/commit/6049b50f8984f98c2c61117d86b9f6f9befc9300.patch?full_index=1";
40+
hash = "sha256-T9tc4Krmp5jieKhbaTgI1CByWqSWy97HWcKMIXzr7MU=";
41+
})
42+
];
3343

3444
env.VERGEN_GIT_SHA = finalAttrs.src.tag;
3545

0 commit comments

Comments
 (0)