Skip to content

Commit d75130e

Browse files
nixpkgs-ci[bot]nixpkgs-ci[bot]
authored
Merge staging-next into staging
2 parents b257495 + 9df9983 commit d75130e

File tree

49 files changed

+767
-741
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+767
-741
lines changed

‎nixos/modules/services/continuous-integration/gocd-agent/default.nix‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ in
216216
${pkgs.git}/bin/git config --global --add http.sslCAinfo ${config.security.pki.caBundle}
217217
${pkgs.jre}/bin/java ${lib.concatStringsSep " " cfg.startupOptions} \
218218
${lib.concatStringsSep " " cfg.extraOptions} \
219-
-jar ${pkgs.gocd-agent}/go-agent/agent-bootstrapper.jar \
219+
-jar ${pkgs.gocd-agent}/go-agent/lib/agent-bootstrapper.jar \
220220
-serverUrl ${cfg.goServer}
221221
'';
222222

‎nixos/modules/services/monitoring/netdata.nix‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,14 @@ let
1111
mkdir -p $out/libexec/netdata/plugins.d
1212
ln -s /run/wrappers/bin/apps.plugin $out/libexec/netdata/plugins.d/apps.plugin
1313
ln -s /run/wrappers/bin/cgroup-network $out/libexec/netdata/plugins.d/cgroup-network
14-
ln -s /run/wrappers/bin/perf.plugin $out/libexec/netdata/plugins.d/perf.plugin
15-
ln -s /run/wrappers/bin/slabinfo.plugin $out/libexec/netdata/plugins.d/slabinfo.plugin
14+
ln -s /run/wrappers/bin/debugfs.plugin $out/libexec/netdata/plugins.d/debugfs.plugin
1615
ln -s /run/wrappers/bin/freeipmi.plugin $out/libexec/netdata/plugins.d/freeipmi.plugin
17-
ln -s /run/wrappers/bin/systemd-journal.plugin $out/libexec/netdata/plugins.d/systemd-journal.plugin
1816
ln -s /run/wrappers/bin/logs-management.plugin $out/libexec/netdata/plugins.d/logs-management.plugin
1917
ln -s /run/wrappers/bin/network-viewer.plugin $out/libexec/netdata/plugins.d/network-viewer.plugin
20-
ln -s /run/wrappers/bin/debugfs.plugin $out/libexec/netdata/plugins.d/debugfs.plugin
18+
ln -s /run/wrappers/bin/otel-plugin $out/libexec/netdata/plugins.d/otel-plugin
19+
ln -s /run/wrappers/bin/perf.plugin $out/libexec/netdata/plugins.d/perf.plugin
20+
ln -s /run/wrappers/bin/slabinfo.plugin $out/libexec/netdata/plugins.d/slabinfo.plugin
21+
ln -s /run/wrappers/bin/systemd-journal.plugin $out/libexec/netdata/plugins.d/systemd-journal.plugin
2122
'';
2223

2324
plugins = [
@@ -452,7 +453,6 @@ in
452453
group = cfg.group;
453454
permissions = "u+rx,g+x,o-rwx";
454455
};
455-
456456
}
457457
// lib.optionalAttrs (cfg.package.withIpmi) {
458458
"freeipmi.plugin" = {
@@ -481,6 +481,15 @@ in
481481
permissions = "u+rx,g+x,o-rwx";
482482
};
483483
}
484+
// lib.optionalAttrs (cfg.package.withOtel) {
485+
"otel-plugin" = {
486+
source = "${cfg.package}/libexec/netdata/plugins.d/otel-plugin.org";
487+
setuid = true;
488+
owner = "root";
489+
group = cfg.group;
490+
permissions = "u+rx,g+x,o-rwx";
491+
};
492+
}
484493
// lib.optionalAttrs (cfg.package.withSystemdJournal) {
485494
"systemd-journal.plugin" = {
486495
source = "${cfg.package}/libexec/netdata/plugins.d/systemd-journal.plugin.org";

‎nixos/tests/charliecloud.nix‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ in
1515
name = "charliecloud";
1616
meta = with pkgs.lib.maintainers; {
1717
maintainers = [ bzizou ];
18+
broken = true;
1819
};
1920

2021
nodes = {

‎nixos/tests/common/x11.nix‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,15 @@
1515
services.displayManager.defaultSession = lib.mkDefault "none+icewm";
1616
services.xserver.windowManager.icewm.enable = true;
1717

18-
# Help with OCR
19-
environment.etc."icewm/theme".text = ''
20-
Theme="gtk2/default.theme"
21-
'';
18+
environment.etc = {
19+
# Help with OCR
20+
"icewm/theme".text = ''
21+
Theme="gtk2/default.theme"
22+
'';
23+
# Remove task bar to avoid non-determinism
24+
"icewm/preferences".text = ''
25+
ShowTaskBar=0
26+
'';
27+
};
28+
2229
}

‎pkgs/applications/editors/android-studio/default.nix‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,16 @@ let
1616
inherit tiling_wm;
1717
};
1818
stableVersion = {
19-
version = "2025.2.1.7"; # "Android Studio Otter | 2025.2.1"
20-
sha256Hash = "sha256-Fq8foC10bkwYLYhS/zhZu6XBgnaO/qz6GKi4HWXnjLE=";
19+
version = "2025.2.1.8"; # "Android Studio Otter | 2025.2.1 Patch 1"
20+
sha256Hash = "sha256-eqai5G60OH3vH06iK4tKK2gCHvqFBlNHxBGHQ5/SUJY=";
2121
};
2222
betaVersion = {
23-
version = "2025.2.1.6"; # "Android Studio Otter | 2025.2.1 RC 1"
24-
sha256Hash = "sha256-l+bJ0AWIrJ3qNcKJWiE+onrl6ZpLb6YWFXE3HtIejUs=";
23+
version = "2025.2.2.5"; # "Android Studio Otter 2 Feature Drop | 2025.2.2 RC 1"
24+
sha256Hash = "sha256-Z6HV0kx/28cn5IdUxQCWI5mhc8IIG64+9SAOzjzwcuI=";
2525
};
2626
latestVersion = {
27-
version = "2025.2.2.4"; # "Android Studio Otter 2 Feature Drop | 2025.2.2 Canary 4"
28-
sha256Hash = "sha256-i7IcD1/qOXJZM0Wzah9DIV9vsU6T2XemSvc5RK33jBI=";
27+
version = "2025.2.3.1"; # "Android Studio Otter 3 Feature Drop | 2025.2.3 Canary 1"
28+
sha256Hash = "sha256-OHUKe2FBaxql3bS9kxrM8SSsSt6UpNYoZpkiPWfpafA=";
2929
};
3030
in
3131
{

‎pkgs/applications/editors/vim/macvim-xcode26.patch‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/src/MacVim/MacVim.xcodeproj/project.pbxproj b/src/MacVim/MacVim.xcodeproj/project.pbxproj
2+
index 7481870..6355242 100644
3+
--- a/src/MacVim/MacVim.xcodeproj/project.pbxproj
4+
+++ b/src/MacVim/MacVim.xcodeproj/project.pbxproj
5+
@@ -1191,7 +1191,7 @@
6+
);
7+
runOnlyForDeploymentPostprocessing = 0;
8+
shellPath = /bin/zsh;
9+
- shellScript = "# Copy the runtime files to the app bundle, under Resources/vim/runtime folder.\n# We cannot do a direct copy of the runtime folder as it contains misc test\n# scripts and also man pages and we should use the Vim's defined rules to\n# install them properly.\n\n# Note that this will also install man pages, under a \"man\" folder. This is\n# useful if the user really wants to point their man page to MacVim's verison\n# instead of builtin Vim, using MANPATH=/Applications/MacVim.app/Contents/man).\n\n# prefix: Reset to empty as it's set to /Applications for fallback rt-folder\n# VIMNAME: Use the default \"vim\" to make sure man pages use that instead of \"Vim\"\n# VIMRTDIR: Make sure to use \"runtime\" as by default it uses a \"vim90\" style folder which is mostly a relic.\n\ncd \"${SRCROOT}\"/..\nmake \\\n DESTDIR=\"${TARGET_BUILD_DIR}\" \\\n prefix= \\\n VIMNAME=vim \\\n VIMRTDIR=/runtime \\\n macvim-install-runtime\n\n# Also add man pages for \"mvim\"\nfor curdir in \"$BUILT_PRODUCTS_DIR/$CONTENTS_FOLDER_PATH\"/man/**/man1; do\n (cd $curdir; ln -f -s gvim.1 mvim.1)\ndone\n";
10+
+ shellScript = "# Copy the runtime files to the app bundle, under Resources/vim/runtime folder.\n# We cannot do a direct copy of the runtime folder as it contains misc test\n# scripts and also man pages and we should use the Vim's defined rules to\n# install them properly.\n\n# Note that this will also install man pages, under a \"man\" folder. This is\n# useful if the user really wants to point their man page to MacVim's verison\n# instead of builtin Vim, using MANPATH=/Applications/MacVim.app/Contents/man).\n\n# prefix: Reset to empty as it's set to /Applications for fallback rt-folder\n# VIMNAME: Use the default \"vim\" to make sure man pages use that instead of \"Vim\"\n# VIMRTDIR: Make sure to use \"runtime\" as by default it uses a \"vim90\" style folder which is mostly a relic.\n\nset -e\n\ncd \"${SRCROOT}\"/..\nfor x in ${(k)parameters}; do if [[ $x = *_DEPLOYMENT_TARGET ]]; then [[ $x = MACOSX_DEPLOYMENT_TARGET ]] || unset $x; fi; done\nmake --jobs=1 \\\n DESTDIR=\"${TARGET_BUILD_DIR}\" \\\n prefix= \\\n VIMNAME=vim \\\n VIMRTDIR=/runtime \\\n macvim-install-runtime\n\n# Also add man pages for \"mvim\"\nfor curdir in \"$BUILT_PRODUCTS_DIR/$CONTENTS_FOLDER_PATH\"/man/**/man1; do\n (cd $curdir; ln -f -s gvim.1 mvim.1)\ndone\n";
11+
showEnvVarsInLog = 0;
12+
};
13+
90C052E1251E889500E2D81E /* Copy vimtutor */ = {

0 commit comments

Comments
 (0)