Merge master into staging-next (05ca3d82) · Commits · nix / nixpkgs

doc/languages-frameworks/cuda.section.md

+19 −0

Original line number	Diff line number	Diff line
		@@ -32,3 +32,22 @@ mypkg = let
		}});
		in callPackage { inherit cudaPackages; };
		```

		The CUDA NVCC compiler requires flags to determine which hardware you
		want to target for in terms of SASS (real hardware) or PTX (JIT kernels).

		Nixpkgs tries to target support real architecture defaults based on the
		CUDA toolkit version with PTX support for future hardware. Experienced
		users may optmize this configuration for a variety of reasons such as
		reducing binary size and compile time, supporting legacy hardware, or
		optimizing for specific hardware.

		You may provide capabilities to add support or reduce binary size through
		`config` using `cudaCapabilities = [ "6.0" "7.0" ];` and
		`cudaForwardCompat = true;` if you want PTX support for future hardware.

		Please consult [GPUs supported](https://en.wikipedia.org/wiki/CUDA#GPUs_supported)
		for your specific card(s).

		Library maintainers should consult [NVCC Docs](https://docs.nvidia.com/cuda/cuda-compiler-driver-nvcc/)
		and release notes for their software package.

+175 −173

File changed.

Preview size limit exceeded, changes collapsed.

0 → 100644

+27 −0

Original line number	Diff line number	Diff line
		{ config, lib, pkgs, ... }:

		let
		inherit (lib) mdDoc mkEnableOption mkIf mkPackageOption singleton;
		cfg = config.services.xserver.windowManager.katriawm;
		in
		{
		###### interface
		options = {
		services.xserver.windowManager.katriawm = {
		enable = mkEnableOption (mdDoc "katriawm");
		package = mkPackageOption pkgs "katriawm" {};
		};
		};

		###### implementation
		config = mkIf cfg.enable {
		services.xserver.windowManager.session = singleton {
		name = "katriawm";
		start = ''
		${cfg.package}/bin/katriawm &
		waitPID=$!
		'';
		};
		environment.systemPackages = [ cfg.package ];
		};
		}

+2 −5

Original line number	Diff line number	Diff line
		@@ -33,16 +33,13 @@ buildNpmPackage rec {
		makeCacheWritable = true;
		npmFlags = [ "--legacy-peer-deps" ];

		# Override installPhase so we can copy the only folders that matter (app and node_modules)
		# Override installPhase so we can copy the only directory that matters (app)
		installPhase = ''
		runHook preInstall

		# prune unused deps
		npm prune --omit dev --no-save $npmFlags

		# copy built app and node_modules directories
		mkdir -p $out/lib/node_modules/open-stage-control
		cp -r app node_modules $out/lib/node_modules/open-stage-control/
		cp -r app $out/lib/node_modules/open-stage-control/

		# copy icon
		install -Dm644 resources/images/logo.png $out/share/icons/hicolor/256x256/apps/open-stage-control.png

+7 −0

Original line number	Diff line number	Diff line
		@@ -44,6 +44,13 @@ stdenv.mkDerivation rec {
		hash = "sha256-9cpOwio69GvzVeDq79BSmJgds9WU5kA/KUlAkHcpN5c=";
		};

		outputs = [
		"out"
		"dev"
		"lib"
		"man"
		];

		nativeBuildInputs = [
		autoreconfHook
		autoconf-archive