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

maintainers/maintainer-list.nix

+13 −0

Original line number	Diff line number	Diff line
		@@ -1230,6 +1230,19 @@
		githubId = 3017212;
		name = "Alex S. Kaye";
		};
		alexstaeding = {
		email = "alex@staeding.com";
		github = "alexstaeding";
		githubId = 24614463;
		keys = [
		# Primary key
		{ fingerprint = "AE72 51E3 A241 ECDA FB6B F59D 4399 191B 9DD5 FABA"; }
		# Subkey
		{ fingerprint = "F352 C405 5653 B943 0FE0 341A E4B4 7D6A 9A56 73CD"; }
		];
		matrix = "@alexstaeding:matrix.org";
		name = "Alexander Städing";
		};
		alexvorobiev = {
		email = "alexander.vorobiev@gmail.com";
		github = "alexvorobiev";

nixos/modules/services/hardware/nvidia-container-toolkit/cdi-generate.nix

+1 −0

Original line number	Diff line number	Diff line
		@@ -37,6 +37,7 @@ writeScriptBin "nvidia-cdi-generator" ''
		}
		--discovery-mode ${discovery-mode} \
		--device-name-strategy ${device-name-strategy} \
		--disable-hook create-symlinks \
		--ldconfig-path ${lib.getExe' glibc "ldconfig"} \
		--library-search-path ${lib.getLib nvidia-driver}/lib \
		--nvidia-cdi-hook-path ${lib.getOutput "tools" nvidia-container-toolkit}/bin/nvidia-cdi-hook \

nixos/modules/services/hardware/nvidia-container-toolkit/default.nix

+48 −7

Original line number	Diff line number	Diff line
		@@ -188,6 +188,10 @@
		])
		];

		services.udev.extraRules = ''
		KERNEL=="nvidia", RUN+="${lib.getExe' config.systemd.package "systemctl"} restart nvidia-container-toolkit-cdi-generator.service'"
		'';

		virtualisation = {
		containers.containersConf.settings = {
		engine = {
		@@ -232,12 +236,8 @@
		containerPath = pkgs.addDriverRunpath.driverLink;
		}
		{
		hostPath = "${lib.getLib nvidia-driver}/etc";
		containerPath = "${lib.getLib nvidia-driver}/etc";
		}
		{
		hostPath = "${lib.getLib nvidia-driver}/share";
		containerPath = "${lib.getLib nvidia-driver}/share";
		hostPath = "${lib.getLib nvidia-driver}";
		containerPath = "${lib.getLib nvidia-driver}";
		}
		{
		hostPath = "${lib.getLib pkgs.glibc}/lib";
		@@ -289,11 +289,52 @@

		systemd.services.nvidia-container-toolkit-cdi-generator = {
		description = "Container Device Interface (CDI) for Nvidia generator";
		requiredBy = lib.mkMerge [
		(lib.mkIf config.virtualisation.docker.enable [ "docker.service" ])
		(lib.mkIf config.virtualisation.podman.enable [ "podman.service" ])
		];
		wantedBy = [ "multi-user.target" ];
		after = [ "systemd-udev-settle.service" ];
		serviceConfig = {
		RuntimeDirectory = "cdi";
		RemainAfterExit = true;
		ExecStartPre = pkgs.writeShellScript "wait-for-nvidia-devices" ''
		set -eu

		gpus_dir="/proc/driver/nvidia/gpus"
		max_wait_seconds=60

		if [ ! -d "$gpus_dir" ]; then
		echo "wait-for-nvidia-devices: $gpus_dir does not exist; nothing to wait for."
		exit 0
		fi

		gpu_count=$(find "$gpus_dir" -mindepth 1 -maxdepth 1 -type d 2>/dev/null \| wc -l \| tr -d ' ')

		if [ "$gpu_count" -eq 0 ]; then
		echo "wait-for-nvidia-devices: no GPU entries found in $gpus_dir; nothing to wait for."
		exit 0
		fi

		echo "wait-for-nvidia-devices: expecting $gpu_count /dev/nvidiaN device node(s)."

		elapsed=0
		while true; do
		dev_count=$(find /dev -mindepth 1 -maxdepth 1 -type c -regex '.*/nvidia[0-9]+' 2>/dev/null \| wc -l \| tr -d ' ')

		if [ "$dev_count" -eq "$gpu_count" ]; then
		echo "wait-for-nvidia-devices: found $dev_count matching device node(s)."
		exit 0
		fi

		if [ "$elapsed" -ge "$max_wait_seconds" ]; then
		echo "wait-for-nvidia-devices: timed out after $max_wait_seconds seconds; expected $gpu_count node(s) but found $dev_count." >&2
		exit 1
		fi

		sleep 1
		elapsed=$((elapsed + 1))
		done
		'';
		ExecStart =
		let
		script = pkgs.callPackage ./cdi-generate.nix {

pkgs/applications/editors/eclipse/plugins.nix

+23 −154

Original line number	Diff line number	Diff line
		@@ -4,6 +4,7 @@
		fetchurl,
		fetchzip,
		unzip,
		config,
		}:

		rec {
		@@ -145,13 +146,13 @@ rec {
		version = "1.3.5.201612301822";

		srcFeature = fetchurl {
		url = "https://mihnita.github.io/ansi-econsole/install/features/net.mihai-nita.ansicon_${version}.jar";
		sha256 = "086ylxpsrlpbvwv5mw7v6b44j63cwzgi8apg2mq058ydr5ak6hxs";
		url = "https://github.com/mihnita/ansi-econsole/raw/refs/heads/main/AnsiConSitePublished/features/net.mihai-nita.ansicon_${version}.jar";
		hash = "sha256-o9hnMuZeohU+AKS+ueU8dWS9HomrnqaKpWYMG5vMeJs=";
		};

		srcPlugin = fetchurl {
		url = "https://mihnita.github.io/ansi-econsole/install/plugins/net.mihai-nita.ansicon.plugin_${version}.jar";
		sha256 = "1j42l0xxzs89shqkyn91lb0gia10mifzy0i73c3n7gj7sv2ddbjq";
		url = "https://github.com/mihnita/ansi-econsole/raw/refs/heads/main/AnsiConSitePublished/plugins/net.mihai-nita.ansicon.plugin_${version}.jar";
		hash = "sha256-WK7WxNZHvmMHGycC/12sIKj4wKIhWT8x1Anp3zuggsg=";
		};

		meta = with lib; {
		@@ -211,16 +212,16 @@ rec {

		anyedittools = buildEclipsePlugin rec {
		name = "anyedit-${version}";
		version = "2.7.2.202006062100";
		version = "2.7.3.202502241151";

		srcFeature = fetchurl {
		url = "https://github.com/iloveeclipse/plugins/blob/latest/features/AnyEditTools_${version}.jar";
		sha256 = "0dwwwvz8by10f5gnws1ahmg02g6v4xbaqcwc0cydvv1h52cyb40g";
		url = "https://github.com/iloveeclipse/plugins/raw/refs/heads/latest/features/AnyEditTools_${version}.jar";
		hash = "sha256-liEw+H8yTCrYQMe3gVQhJuxPXlSpEs4QwB2yv8n/CiE=";
		};

		srcPlugin = fetchurl {
		url = "https://github.com/iloveeclipse/plugins/blob/latest/plugins/de.loskutov.anyedit.AnyEditTools_${version}.jar";
		sha256 = "1ip8dk92ka7bczw1bkbs3zkclmwr28ds5q1wrzh525wb70x8v6fi";
		url = "https://github.com/iloveeclipse/plugins/raw/refs/heads/latest/plugins/de.loskutov.anyedit.AnyEditTools_${version}.jar";
		hash = "sha256-LrWCWJWZxsnMiBnTwXdWaXUoyXMYpLqXMUkHEOna2kk=";
		};

		meta = with lib; {
		@@ -255,29 +256,6 @@ rec {
		};
		};

		bytecode-outline = buildEclipsePlugin rec {
		name = "bytecode-outline-${version}";
		version = "1.0.1.202006062100";

		srcFeature = fetchurl {
		url = "https://github.com/iloveeclipse/plugins/blob/latest/features/org.eclipse.jdt.bcoview.feature_${version}.jar";
		sha256 = "0zbcph72lgv8cb5n4phcl3qsybc5q5yviwbv8yjv4v12m4l15wpk";
		};

		srcPlugin = fetchurl {
		url = "https://github.com/iloveeclipse/plugins/blob/latest/plugins/org.eclipse.jdt.bcoview_${version}.jar";
		sha256 = "1bx860k4haqcnhy8825kn4df0pyzd680qbnvjmxfrlxrqhr66fbb";
		};

		meta = with lib; {
		homepage = "https://github.com/iloveeclipse/plugins";
		description = "Shows disassembled bytecode of current java editor or class file";
		sourceProvenance = with sourceTypes; [ binaryBytecode ];
		license = licenses.bsd2;
		platforms = platforms.all;
		};
		};

		cdt = buildEclipseUpdateSite rec {
		name = "cdt-${version}";
		# find current version at https://github.com/eclipse-cdt/cdt/releases
		@@ -588,24 +566,6 @@ rec {
		};
		};

		scala = buildEclipseUpdateSite rec {
		name = "scala-${version}";
		version = "4.4.1.201605041056";

		src = fetchzip {
		url = "http://download.scala-ide.org/sdk/lithium/e44/scala211/stable/base-20160504-1321.zip";
		sha256 = "13xgx2rwlll0l4bs0g6gyvrx5gcc0125vzn501fdj0wv2fqxn5lw";
		};

		meta = with lib; {
		homepage = "http://scala-ide.org/";
		description = "Scala IDE for Eclipse";
		sourceProvenance = with sourceTypes; [ binaryBytecode ];
		license = licenses.bsd3;
		platforms = platforms.all;
		};
		};

		spotbugs = buildEclipseUpdateSite rec {
		name = "spotbugs-${version}";
		version = "3.1.11";
		@@ -630,13 +590,13 @@ rec {
		version = "6.9.13.201609291640";

		srcFeature = fetchurl {
		url = "http://beust.com/eclipse-old/eclipse_${version}/features/org.testng.eclipse_${version}.jar";
		sha256 = "02wzcysl7ga3wnvnwp6asl8d77wgc547c5qqawixw94lw6fn1a15";
		url = "https://github.com/testng-team/testng-eclipse-update-site/raw/refs/heads/main/updatesites/${version}/features/org.testng.eclipse_${version}.jar";
		hash = "sha256-JahgneGUJN4jVxgXdkhhj5/TENXKXG635UO9Q7Vnnws=";
		};

		srcPlugin = fetchurl {
		url = "http://beust.com/eclipse-old/eclipse_${version}/plugins/org.testng.eclipse_${version}.jar";
		sha256 = "1j4zw6392q3q6z3pcy803k3g0p220gk1x19fs99p0rmmdz83lc8d";
		url = "https://github.com/testng-team/testng-eclipse-update-site/raw/refs/heads/main/updatesites/${version}/plugins/org.testng.eclipse_${version}.jar";
		hash = "sha256-DTE60G+1ZnBT0i6FHuYDQlzwxhwAeXbHN3hgkYbhn8g=";
		};

		meta = with lib; {
		@@ -711,104 +671,13 @@ rec {
		maintainers = [ maintainers.romildo ];
		};
		};

		ivyde = buildEclipsePlugin rec {
		name = "ivyde-${version}";
		version = "2.2.0.final-201311091524-RELEASE";

		srcFeature = fetchurl {
		url = "https://downloads.apache.org/ant/ivyde/updatesite/ivyde-${version}/features/org.apache.ivyde.feature_${version}.jar";
		hash = "sha256-iKe7oOPjy6th0HmKt6NXexOHN60EDpQe1r+n6K+uoyw=";
		};

		srcPlugin = fetchurl {
		url = "https://downloads.apache.org/ant/ivyde/updatesite/ivyde-${version}/plugins/org.apache.ivyde.eclipse_${version}.jar";
		hash = "sha256-lhwFwdMDwCIUrQjdWfe5ZSutCIsKtZSBT6FWthUipdk=";
		};

		meta = with lib; {
		homepage = "https://ant.apache.org/ivy/ivyde/index.html";
		description = "Plugin which integrates Apache Ivy's dependency management";
		sourceProvenance = with sourceTypes; [ binaryBytecode ];
		license = licenses.asl20;
		platforms = platforms.all;
		maintainers = [ maintainers.r3dl3g ];
		};
		};

		ivyderv = buildEclipsePlugin rec {
		name = "ivyderv-${version}";
		version = "2.2.0.final-201311091524-RELEASE";

		srcFeature = fetchurl {
		url = "https://downloads.apache.org/ant/ivyde/updatesite/ivyde-${version}/features/org.apache.ivyde.eclipse.resolvevisualizer.feature_${version}.jar";
		hash = "sha256-PSH5NtE7hN2hHoHUhVK1CLkHN7YSDdTTqBP7711X4rU=";
		};

		srcPlugin = fetchurl {
		url = "https://downloads.apache.org/ant/ivyde/updatesite/ivyde-${version}/plugins/org.apache.ivyde.eclipse.resolvevisualizer_${version}.jar";
		hash = "sha256-qjTvn1j7viSfzLkWnYjyS9Pj2ExqsiFGLzot3+oB0Tw=";
		};

		meta = with lib; {
		homepage = "https://ant.apache.org/ivy/ivyde/index.html";
		description = "Graph viewer of the resolved dependencies";
		longDescription = ''
		Apache IvyDE Resolve Visualizer is an optional dependency of Apache IvyDE since
		it requires additional plugins to be installed (Zest).
		'';
		sourceProvenance = with sourceTypes; [ binaryBytecode ];
		license = licenses.asl20;
		platforms = platforms.all;
		maintainers = [ maintainers.r3dl3g ];
		};
		};

		ivy = buildEclipsePlugin rec {
		name = "ivy-${version}";
		version = "2.5.0.final_20191020104435";

		srcFeature = fetchurl {
		url = "https://downloads.apache.org/ant/ivyde/updatesite/ivy-${version}/features/org.apache.ivy.eclipse.ant.feature_${version}.jar";
		sha256 = "de6134171a0edf569bb9b4c3a91639d469f196e86804d218adfdd60a5d7fa133";
		};

		srcPlugin = fetchurl {
		url = "https://downloads.apache.org/ant/ivyde/updatesite/ivy-${version}/plugins/org.apache.ivy.eclipse.ant_${version}.jar";
		sha256 = "9e8ea20480cf73d0f0f3fb032d263c7536b24fd2eef71beb7d62af4e065f9ab5";
		};

		meta = with lib; {
		homepage = "https://ant.apache.org/ivy/index.html";
		description = "Popular dependency manager focusing on flexibility and simplicity";
		sourceProvenance = with sourceTypes; [ binaryBytecode ];
		license = licenses.asl20;
		platforms = platforms.all;
		maintainers = [ maintainers.r3dl3g ];
		};
		};

		ivyant = buildEclipsePlugin rec {
		name = "ivyant-${version}";
		version = "2.5.0.final_20191020104435";

		srcFeature = fetchurl {
		url = "https://downloads.apache.org/ant/ivyde/updatesite/ivy-${version}/features/org.apache.ivy.eclipse.ant.feature_${version}.jar";
		sha256 = "de6134171a0edf569bb9b4c3a91639d469f196e86804d218adfdd60a5d7fa133";
		};

		srcPlugin = fetchurl {
		url = "https://downloads.apache.org/ant/ivyde/updatesite/ivy-${version}/plugins/org.apache.ivy.eclipse.ant_${version}.jar";
		sha256 = "9e8ea20480cf73d0f0f3fb032d263c7536b24fd2eef71beb7d62af4e065f9ab5";
		};

		meta = with lib; {
		homepage = "https://ant.apache.org/ivy/ivyde/index.html";
		description = "Ant Tasks integrated into Eclipse's Ant runtime";
		sourceProvenance = with sourceTypes; [ binaryBytecode ];
		license = licenses.asl20;
		platforms = platforms.all;
		maintainers = [ maintainers.r3dl3g ];
		};
		};
		}
		// lib.optionalAttrs config.allowAliases {
		# Added 2025-11-16
		bytecode-outline = throw "eclipses.plugins.bytecode-outline has been removed due to being removed upstream.";
		ivyde = throw "eclipses.plugins.ivyde has been removed due to being archived upstream.";
		ivyderv = throw "eclipses.plugins.inyderv has been removed due to being archived upstream.";
		ivy = throw "eclipses.plugins.ivy has been removed due to being archived upstream.";
		ivyant = throw "eclipses.plugins.ivyant has been removed due to being archived upstream.";
		scala = throw "eclipses.plugins.scala has been removed due to being deprecated upstream.";
		}

pkgs/applications/editors/emacs/elisp-packages/manual-packages/el-easydraw/package.nix

+3 −3

Original line number	Diff line number	Diff line
		@@ -8,13 +8,13 @@

		melpaBuild {
		pname = "edraw";
		version = "1.2.0-unstable-2025-02-21";
		version = "1.2.0-unstable-2025-05-23";

		src = fetchFromGitHub {
		owner = "misohena";
		repo = "el-easydraw";
		rev = "f6b0f43138693b73cb65327d28bd2a4ee1b6caa7";
		hash = "sha256-IU+DMw8q1Si3CJ4FhJVkaRsjkh1Oc3psmbzdUgh0YMI=";
		rev = "8007f50c1c1734325c47939904f486753c7dd8ee";
		hash = "sha256-YESpl+gSSC1eIOEQ8QevfTZ0Ar9wO4pzC12wVmDpDOA=";
		};

		propagatedUserEnvPkgs = [ gzip ];