Merge master into staging-nixos (b3ca854a) · Commits · nix / nixpkgs

doc/release-notes/rl-2605.section.md

+2 −0

Original line number	Diff line number	Diff line
		@@ -284,6 +284,8 @@

		- the `autossh-ng` NixOS module was introduced as a simpler alternative to the existing `autossh` module.

		- Added `haskell.packages.microhs`, a set of Haskell packages built with MicroHs.

		- `gnuradio`: Overriding the `.pkgs` package set is now possible with a `packageOverrides` function, like with `python.pkgs` and other language-specific package sets.
		Example:

maintainers/maintainer-list.nix

+14 −0

Original line number	Diff line number	Diff line
		@@ -1192,6 +1192,20 @@
		githubId = 49609151;
		name = "Popa Ioan Alexandru";
		};
		AlexandreTunstall = {
		name = "Alex Tunstall";
		email = "alex@tunstall.xyz";
		matrix = "@alex:tunstall.xyz";
		github = "AlexandreTunstall";
		githubId = 32900877;
		keys = [
		{
		# Fetch with WKD (e.g. gpg --locate-external-keys alex@tunstall.xyz)
		# The fetched key should have this fingerprint (please let me know if not)
		fingerprint = "51A5 8478 068E B19D FD35 D542 F6CA 1AD5 54DC A5E4";
		}
		];
		};
		alexandru0-dev = {
		email = "alexandru.italia32+nixpkgs@gmail.com";
		github = "alexandru0-dev";

nixos/modules/programs/nix-required-mounts.nix

+35 −0

Original line number	Diff line number	Diff line
		@@ -67,6 +67,23 @@ let
		# TODO: Refactor `hardware.graphics` to ease referencing the closure
		# NOTE: A naive implementation may e.g. introduce a conditional infinite recursion (https://github.com/NixOS/nixpkgs/pull/488199)
		nvidia-gpu.unsafeFollowSymlinks = true;

		zluda = {
		onFeatures = [
		"cuda"
		];
		paths = [
		pkgs.addDriverRunpath.driverLink
		"/dev/dri"
		"/dev/kfd"
		"/sys/devices/virtual/kfd"
		# As per https://www.kernel.org/doc/Documentation/admin-guide/devices.txt
		# 226 is the major ID for "Direct Rendering Infrastructure (DRI)" devices
		"/sys/dev/char/226:*"
		]
		++ config.hardware.graphics.extraPackages;
		unsafeFollowSymlinks = true;
		};
		};
		in
		{
		@@ -82,6 +99,16 @@ in
		You may extend or override the exposed paths via the
		`programs.nix-required-mounts.allowedPatterns.nvidia-gpu.paths` option.
		'';

		presets.zluda.enable = lib.mkEnableOption ''
		Same as `programs.nix-required-mounts.presets.nvidia-gpu` but adds paths
		to the sandbox that are needed for running CUDA applications on top of
		the ZLUDA translation layer combined with AMD GPUs.

		You may extend or override the exposed paths via the
		`programs.nix-required-mounts.allowedPatterns.zluda.paths` option.
		'';

		allowedPatterns =
		with lib.types;
		lib.mkOption {
		@@ -122,6 +149,14 @@ in
		inherit (defaults) nvidia-gpu;
		};
		})
		(lib.mkIf cfg.presets.zluda.enable {
		hardware.graphics.enable = lib.mkDefault true;
		hardware.amdgpu.zluda.enable = lib.mkDefault true;
		nix.settings.system-features = cfg.allowedPatterns.zluda.onFeatures;
		programs.nix-required-mounts.allowedPatterns = {
		inherit (defaults) zluda;
		};
		})
		]
		);
		}

nixos/modules/services/hardware/amdgpu.nix

+32 −21

Original line number	Diff line number	Diff line
		@@ -40,9 +40,12 @@ in
		};

		opencl.enable = lib.mkEnableOption "OpenCL support using ROCM runtime library";
		zluda.enable = lib.mkEnableOption "CUDA support using ZLUDA runtime library";
		zluda.package = lib.mkPackageOption pkgs "zluda" { };
		};

		config = {
		config = lib.mkMerge [
		{
		boot.kernelParams =
		lib.optionals cfg.legacySupport.enable [
		"amdgpu.si_support=1"
		@@ -55,15 +58,23 @@ in
		];

		boot.initrd.kernelModules = lib.optionals cfg.initrd.enable [ "amdgpu" ];

		hardware.graphics = lib.mkIf cfg.opencl.enable {
		}
		(lib.mkIf cfg.opencl.enable {
		hardware.graphics = {
		enable = lib.mkDefault true;
		extraPackages = [
		pkgs.rocmPackages.clr
		pkgs.rocmPackages.clr.icd
		];
		};
		})
		(lib.mkIf cfg.zluda.enable {
		hardware.graphics = {
		enable = lib.mkDefault true;
		extraPackages = [ cfg.zluda.package ];
		};
		})
		];

		meta = {
		maintainers = with lib.maintainers; [ johnrtitor ];

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

+9 −9

Original line number	Diff line number	Diff line
		@@ -16,19 +16,19 @@ let
		inherit tiling_wm;
		};
		stableVersion = {
		version = "2025.3.2.6"; # "Android Studio Panda 2 \| 2025.3.2"
		sha256Hash = "sha256-MpQtjNdogZLPPNB78oL7EgA1ub2bVubxPFVA5tOYB+k=";
		url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2025.3.2.6/android-studio-panda2-linux.tar.gz";
		version = "2025.3.3.6"; # "Android Studio Panda 3 \| 2025.3.3"
		sha256Hash = "sha256-NBrA/BfbyYfQUw4M+zJxJUgFM9ZzOoifITdja+zUhqU=";
		url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2025.3.3.6/android-studio-panda3-linux.tar.gz";
		};
		betaVersion = {
		version = "2025.3.2.5"; # "Android Studio Panda 2 \| 2025.3.2 RC 1"
		sha256Hash = "sha256-qpmc7MO48GV2nnxEdRstg3ne0Gvlrgk9UX5Dr60gAMM=";
		url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2025.3.2.5/android-studio-panda2-rc1-linux.tar.gz";
		version = "2025.3.3.5"; # "Android Studio Panda 3 \| 2025.3.3 RC 1"
		sha256Hash = "sha256-lKpFKw2Oq7OlDrPjFJhMH3aQsJO7TeOKy7HGUCE0B1U=";
		url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2025.3.3.5/android-studio-panda3-rc1-linux.tar.gz";
		};
		latestVersion = {
		version = "2025.3.3.2"; # "Android Studio Panda 3 \| 2025.3.3 Canary 2"
		sha256Hash = "sha256-z8GpBqyEnbyyBc0XPo5q52WS5d7b4292QgUj0FPW+C0=";
		url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2025.3.3.2/android-studio-panda3-canary2-linux.tar.gz";
		version = "2025.3.4.3"; # "Android Studio Panda 4 \| 2025.3.4 Canary 3"
		sha256Hash = "sha256-8fqHdU6IPuRmcJeCZQOqUPgfild9k98sLnN77dl2Hs8=";
		url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2025.3.4.3/android-studio-panda4-canary3-linux.tar.gz";
		};
		in
		{

Admin message