Merge master into staging-next (9df9983e) · Commits · nix / nixpkgs

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -216,7 +216,7 @@ in
		${pkgs.git}/bin/git config --global --add http.sslCAinfo ${config.security.pki.caBundle}
		${pkgs.jre}/bin/java ${lib.concatStringsSep " " cfg.startupOptions} \
		${lib.concatStringsSep " " cfg.extraOptions} \
		-jar ${pkgs.gocd-agent}/go-agent/agent-bootstrapper.jar \
		-jar ${pkgs.gocd-agent}/go-agent/lib/agent-bootstrapper.jar \
		-serverUrl ${cfg.goServer}
		'';

nixos/modules/services/monitoring/netdata.nix

+14 −5

Original line number	Diff line number	Diff line
		@@ -11,13 +11,14 @@ let
		mkdir -p $out/libexec/netdata/plugins.d
		ln -s /run/wrappers/bin/apps.plugin $out/libexec/netdata/plugins.d/apps.plugin
		ln -s /run/wrappers/bin/cgroup-network $out/libexec/netdata/plugins.d/cgroup-network
		ln -s /run/wrappers/bin/perf.plugin $out/libexec/netdata/plugins.d/perf.plugin
		ln -s /run/wrappers/bin/slabinfo.plugin $out/libexec/netdata/plugins.d/slabinfo.plugin
		ln -s /run/wrappers/bin/debugfs.plugin $out/libexec/netdata/plugins.d/debugfs.plugin
		ln -s /run/wrappers/bin/freeipmi.plugin $out/libexec/netdata/plugins.d/freeipmi.plugin
		ln -s /run/wrappers/bin/systemd-journal.plugin $out/libexec/netdata/plugins.d/systemd-journal.plugin
		ln -s /run/wrappers/bin/logs-management.plugin $out/libexec/netdata/plugins.d/logs-management.plugin
		ln -s /run/wrappers/bin/network-viewer.plugin $out/libexec/netdata/plugins.d/network-viewer.plugin
		ln -s /run/wrappers/bin/debugfs.plugin $out/libexec/netdata/plugins.d/debugfs.plugin
		ln -s /run/wrappers/bin/otel-plugin $out/libexec/netdata/plugins.d/otel-plugin
		ln -s /run/wrappers/bin/perf.plugin $out/libexec/netdata/plugins.d/perf.plugin
		ln -s /run/wrappers/bin/slabinfo.plugin $out/libexec/netdata/plugins.d/slabinfo.plugin
		ln -s /run/wrappers/bin/systemd-journal.plugin $out/libexec/netdata/plugins.d/systemd-journal.plugin
		'';

		plugins = [
		@@ -452,7 +453,6 @@ in
		group = cfg.group;
		permissions = "u+rx,g+x,o-rwx";
		};

		}
		// lib.optionalAttrs (cfg.package.withIpmi) {
		"freeipmi.plugin" = {
		@@ -481,6 +481,15 @@ in
		permissions = "u+rx,g+x,o-rwx";
		};
		}
		// lib.optionalAttrs (cfg.package.withOtel) {
		"otel-plugin" = {
		source = "${cfg.package}/libexec/netdata/plugins.d/otel-plugin.org";
		setuid = true;
		owner = "root";
		group = cfg.group;
		permissions = "u+rx,g+x,o-rwx";
		};
		}
		// lib.optionalAttrs (cfg.package.withSystemdJournal) {
		"systemd-journal.plugin" = {
		source = "${cfg.package}/libexec/netdata/plugins.d/systemd-journal.plugin.org";

nixos/tests/charliecloud.nix

+1 −0

Original line number	Diff line number	Diff line
		@@ -15,6 +15,7 @@ in
		name = "charliecloud";
		meta = with pkgs.lib.maintainers; {
		maintainers = [ bzizou ];
		broken = true;
		};

		nodes = {

nixos/tests/common/x11.nix

+11 −4

Original line number	Diff line number	Diff line
		@@ -15,8 +15,15 @@
		services.displayManager.defaultSession = lib.mkDefault "none+icewm";
		services.xserver.windowManager.icewm.enable = true;

		environment.etc = {
		# Help with OCR
		environment.etc."icewm/theme".text = ''
		"icewm/theme".text = ''
		Theme="gtk2/default.theme"
		'';
		# Remove task bar to avoid non-determinism
		"icewm/preferences".text = ''
		ShowTaskBar=0
		'';
		};

		}

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

+6 −6

Original line number	Diff line number	Diff line
		@@ -16,16 +16,16 @@ let
		inherit tiling_wm;
		};
		stableVersion = {
		version = "2025.2.1.7"; # "Android Studio Otter \| 2025.2.1"
		sha256Hash = "sha256-Fq8foC10bkwYLYhS/zhZu6XBgnaO/qz6GKi4HWXnjLE=";
		version = "2025.2.1.8"; # "Android Studio Otter \| 2025.2.1 Patch 1"
		sha256Hash = "sha256-eqai5G60OH3vH06iK4tKK2gCHvqFBlNHxBGHQ5/SUJY=";
		};
		betaVersion = {
		version = "2025.2.1.6"; # "Android Studio Otter \| 2025.2.1 RC 1"
		sha256Hash = "sha256-l+bJ0AWIrJ3qNcKJWiE+onrl6ZpLb6YWFXE3HtIejUs=";
		version = "2025.2.2.5"; # "Android Studio Otter 2 Feature Drop \| 2025.2.2 RC 1"
		sha256Hash = "sha256-Z6HV0kx/28cn5IdUxQCWI5mhc8IIG64+9SAOzjzwcuI=";
		};
		latestVersion = {
		version = "2025.2.2.4"; # "Android Studio Otter 2 Feature Drop \| 2025.2.2 Canary 4"
		sha256Hash = "sha256-i7IcD1/qOXJZM0Wzah9DIV9vsU6T2XemSvc5RK33jBI=";
		version = "2025.2.3.1"; # "Android Studio Otter 3 Feature Drop \| 2025.2.3 Canary 1"
		sha256Hash = "sha256-OHUKe2FBaxql3bS9kxrM8SSsSt6UpNYoZpkiPWfpafA=";
		};
		in
		{