2 changes: 1 addition & 1 deletion 2 nixos/modules/services/x11/xautolock.nix

Show comments

View file Delete file

Original file line number	Diff line number	Diff line change
Expand Up		@@ -21,7 +21,7 @@ in
		type = types.int;
		description = ''
		Idle time to wait until xautolock locks the computer.
		Idle time (in minutes) to wait until xautolock locks the computer.
		'';
		};
Expand Down

4 changes: 3 additions & 1 deletion 4 nixos/modules/system/boot/systemd.nix

Show comments

View file Delete file

Original file line number	Diff line number	Diff line change
Expand Up		@@ -321,7 +321,9 @@ let
		in concatMapStrings (n:
		let s = optionalString (env."${n}" != null)
		"Environment=${builtins.toJSON "${n}=${env.${n}}"}\n";
		in if stringLength s >= 2048 then throw "The value of the environment variable ‘${n}’ in systemd service ‘${name}.service’ is too long." else s) (attrNames env)}
		# systemd max line length is now 1MiB
		# https://github.com/systemd/systemd/commit/e6dde451a51dc5aaa7f4d98d39b8fe735f73d2af
		in if stringLength s >= 1048576 then throw "The value of the environment variable ‘${n}’ in systemd service ‘${name}.service’ is too long." else s) (attrNames env)}
		${if def.reloadIfChanged then ''
		X-ReloadIfChanged=true
		'' else if !def.restartIfChanged then ''
Expand Down

2 changes: 1 addition & 1 deletion 2 pkgs/applications/editors/texmaker/default.nix

Show comments

View file Delete file

Original file line number	Diff line number	Diff line change
Expand Up		@@ -31,6 +31,6 @@ stdenv.mkDerivation rec {
		homepage = http://www.xm1math.net/texmaker/;
		license = licenses.gpl2Plus;
		platforms = platforms.linux;
		maintainers = with maintainers; [ cfouche ];
		maintainers = with maintainers; [ cfouche markuskowa ];
		};
		}

0 pkgs/applications/misc/airspy/default.nix → pkgs/applications/radio/airspy/default.nix

Show comments

View file Delete file

File renamed without changes.

0 pkgs/applications/misc/chirp/default.nix → pkgs/applications/radio/chirp/default.nix

Show comments

View file Delete file

File renamed without changes.

0 pkgs/applications/misc/dmrconfig/default.nix → .../applications/radio/dmrconfig/default.nix

Show comments

View file Delete file

File renamed without changes.

0 pkgs/applications/audio/fldigi/default.nix → pkgs/applications/radio/fldigi/default.nix

Show comments

View file Delete file

File renamed without changes.

0 pkgs/applications/misc/fllog/default.nix → pkgs/applications/radio/fllog/default.nix

Show comments

View file Delete file

File renamed without changes.

0 pkgs/applications/misc/flmsg/default.nix → pkgs/applications/radio/flmsg/default.nix

Show comments

View file Delete file

File renamed without changes.

0 pkgs/applications/misc/flrig/default.nix → pkgs/applications/radio/flrig/default.nix

Show comments

View file Delete file

File renamed without changes.

0 pkgs/applications/misc/flwrap/default.nix → pkgs/applications/radio/flwrap/default.nix

Show comments

View file Delete file

File renamed without changes.

0 pkgs/applications/misc/gnss-sdr/default.nix → pkgs/applications/radio/gnss-sdr/default.nix

Show comments

View file Delete file

File renamed without changes.

0 pkgs/applications/misc/gnuradio/ais.nix → pkgs/applications/radio/gnuradio/ais.nix

Show comments

View file Delete file

File renamed without changes.

0 pkgs/applications/misc/gnuradio/default.nix → pkgs/applications/radio/gnuradio/default.nix

Show comments

View file Delete file

File renamed without changes.

0 pkgs/applications/misc/gnuradio/gsm.nix → pkgs/applications/radio/gnuradio/gsm.nix

Show comments

View file Delete file

File renamed without changes.

0 pkgs/applications/misc/gnuradio/limesdr.nix → pkgs/applications/radio/gnuradio/limesdr.nix

Show comments

View file Delete file

File renamed without changes.

0 pkgs/applications/misc/gnuradio/nacl.nix → pkgs/applications/radio/gnuradio/nacl.nix

Show comments

View file Delete file

File renamed without changes.

0 pkgs/applications/misc/gnuradio/osmosdr.nix → pkgs/applications/radio/gnuradio/osmosdr.nix

Show comments

View file Delete file

File renamed without changes.

0 pkgs/applications/misc/gnuradio/rds.nix → pkgs/applications/radio/gnuradio/rds.nix

Show comments

View file Delete file

File renamed without changes.

0 pkgs/applications/misc/gnuradio/wrapper.nix → pkgs/applications/radio/gnuradio/wrapper.nix

Show comments

View file Delete file

File renamed without changes.

0 pkgs/applications/misc/gqrx/default.nix → pkgs/applications/radio/gqrx/default.nix

Show comments

View file Delete file

File renamed without changes.

0 pkgs/applications/misc/hackrf/default.nix → pkgs/applications/radio/hackrf/default.nix

Show comments

View file Delete file

File renamed without changes.

0 .../applications/misc/inspectrum/default.nix → ...applications/radio/inspectrum/default.nix

Show comments

View file Delete file

File renamed without changes.

0 pkgs/tools/misc/kalibrate-hackrf/default.nix → ...ations/radio/kalibrate-hackrf/default.nix

Show comments

View file Delete file

File renamed without changes.

0 pkgs/tools/misc/kalibrate-rtl/default.nix → ...lications/radio/kalibrate-rtl/default.nix

Show comments

View file Delete file

File renamed without changes.

0 pkgs/applications/misc/limesuite/default.nix → .../applications/radio/limesuite/default.nix

Show comments

View file Delete file

File renamed without changes.

0 .../applications/audio/minimodem/default.nix → .../applications/radio/minimodem/default.nix

Show comments

View file Delete file

File renamed without changes.

0 ...applications/misc/multimon-ng/default.nix → ...pplications/radio/multimon-ng/default.nix

Show comments

View file Delete file

File renamed without changes.

0 .../applications/misc/qradiolink/default.nix → ...applications/radio/qradiolink/default.nix

Show comments

View file Delete file

File renamed without changes.

0 pkgs/applications/misc/qsstv/default.nix → pkgs/applications/radio/qsstv/default.nix

Show comments

View file Delete file

File renamed without changes.

0 pkgs/applications/misc/rtl-sdr/default.nix → pkgs/applications/radio/rtl-sdr/default.nix

Show comments

View file Delete file

File renamed without changes.

0 pkgs/applications/misc/rtl_433/default.nix → pkgs/applications/radio/rtl_433/default.nix

Show comments

View file Delete file

File renamed without changes.

0 ...applications/misc/soapyairspy/default.nix → ...pplications/radio/soapyairspy/default.nix

Show comments

View file Delete file

File renamed without changes.

0 ...pplications/misc/soapybladerf/default.nix → ...plications/radio/soapybladerf/default.nix

Show comments

View file Delete file

File renamed without changes.

0 ...applications/misc/soapyhackrf/default.nix → ...pplications/radio/soapyhackrf/default.nix

Show comments

View file Delete file

File renamed without changes.

0 ...applications/misc/soapyremote/default.nix → ...pplications/radio/soapyremote/default.nix

Show comments

View file Delete file

File renamed without changes.

0 ...applications/misc/soapyrtlsdr/default.nix → ...pplications/radio/soapyrtlsdr/default.nix

Show comments

View file Delete file

File renamed without changes.

0 pkgs/applications/misc/soapysdr/default.nix → pkgs/applications/radio/soapysdr/default.nix

Show comments

View file Delete file

File renamed without changes.

0 pkgs/applications/misc/soapyuhd/default.nix → pkgs/applications/radio/soapyuhd/default.nix

Show comments

View file Delete file

File renamed without changes.

0 pkgs/development/tools/misc/uhd/default.nix → pkgs/applications/radio/uhd/default.nix

Show comments

View file Delete file

File renamed without changes.

0 pkgs/development/tools/misc/uhd/neon.patch → pkgs/applications/radio/uhd/neon.patch

Show comments

View file Delete file

File renamed without changes.

0 pkgs/applications/misc/unixcw/default.nix → pkgs/applications/radio/unixcw/default.nix

Show comments

View file Delete file

File renamed without changes.

0 ...ns/misc/unixcw/remove-use-of-dlopen.patch → ...s/radio/unixcw/remove-use-of-dlopen.patch

Show comments

View file Delete file

File renamed without changes.

0 pkgs/applications/misc/urh/default.nix → pkgs/applications/radio/urh/default.nix

Show comments

View file Delete file

File renamed without changes.

2 changes: 1 addition & 1 deletion 2 pkgs/applications/misc/welle-io/default.nix → pkgs/applications/radio/welle-io/default.nix

Show comments

View file Delete file

Original file line number	Diff line number	Diff line change
Expand Up		@@ -40,7 +40,7 @@ in stdenv.mkDerivation {
		meta = with stdenv.lib; {
		description = "A DAB/DAB+ Software Radio";
		homepage = https://www.welle.io/;
		maintainers = with maintainers; [ ck3d ];
		maintainers = with maintainers; [ ck3d markuskowa ];
		license = licenses.gpl2;
		platforms = with platforms; [ "x86_64-linux" "i686-linux" ] ++ darwin;
		};
Expand Down

0 pkgs/applications/misc/wsjtx/default.nix → pkgs/applications/radio/wsjtx/default.nix

Show comments

View file Delete file

File renamed without changes.

0 pkgs/applications/misc/wsjtx/super.patch → pkgs/applications/radio/wsjtx/super.patch

Show comments

View file Delete file

File renamed without changes.

0 pkgs/applications/misc/wsjtx/wsjtx.patch → pkgs/applications/radio/wsjtx/wsjtx.patch

Show comments

View file Delete file

File renamed without changes.

0 pkgs/applications/misc/xlog/default.nix → pkgs/applications/radio/xlog/default.nix

Show comments

View file Delete file

File renamed without changes.

2 changes: 1 addition & 1 deletion 2 pkgs/applications/version-management/git-and-tools/qgit/default.nix

Show comments

View file Delete file

Original file line number	Diff line number	Diff line change
Expand Up		@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
		license = licenses.gpl2;
		homepage = http://libre.tibirna.org/projects/qgit/wiki/QGit;
		description = "Graphical front-end to Git";
		maintainers = with maintainers; [ peterhoeg ];
		maintainers = with maintainers; [ peterhoeg markuskowa ];
		inherit (qtbase.meta) platforms;
		};
		}

2 changes: 1 addition & 1 deletion 2 pkgs/desktops/gnome-3/default.nix

Show comments

View file Delete file

Original file line number	Diff line number	Diff line change
Expand Up		@@ -19,7 +19,7 @@ lib.makeScope pkgs.newScope (self: with self; {
		in
		lib.filter (x: !(builtins.elem (pkgName x) namesToRemove)) packages;
		maintainers = with pkgs.lib.maintainers; [ lethalman jtojnar hedning ];
		maintainers = with pkgs.lib.maintainers; [ lethalman jtojnar hedning worldofpeace ];
		corePackages = with gnome3; [
		pkgs.desktop-file-utils
Expand Down

3 changes: 3 additions & 0 deletions 3 pkgs/development/compilers/llvm/7/clang/default.nix

Show comments

View file Delete file

Original file line number	Diff line number	Diff line change
Expand Up		@@ -43,6 +43,9 @@ let
		sed -i '1s,^,find_package(Sphinx REQUIRED)\n,' docs/CMakeLists.txt
		'' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
		sed -i -e 's/lgcc_s/lgcc_eh/' lib/Driver/ToolChains/*.cpp
		'' + stdenv.lib.optionalString stdenv.hostPlatform.isDarwin ''
		substituteInPlace tools/extra/clangd/CMakeLists.txt \
		--replace "NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB" FALSE
		'';
		outputs = [ "out" "lib" "python" ];
Expand Down

4 changes: 2 additions & 2 deletions 4 pkgs/development/libraries/libwnck/3.x.nix

Show comments

View file Delete file

Original file line number	Diff line number	Diff line change
		@@ -1,4 +1,4 @@
		{stdenv, fetchurl, pkgconfig, libX11, gtk3, intltool, gobject-introspection, gnome3}:
		{ stdenv, fetchurl, pkgconfig, libX11, gtk3, intltool, gobject-introspection, gnome3 }:
		let
		pname = "libwnck";
Expand Down Expand Up		@@ -33,6 +33,6 @@ in stdenv.mkDerivation rec{
		description = "Library to manage X windows and workspaces (via pagers, tasklists, etc.)";
		license = licenses.lgpl21Plus;
		platforms = platforms.linux;
		maintainers = [];
		maintainers = [ maintainers.worldofpeace ];
		};
		}

54 changes: 37 additions & 17 deletions 54 pkgs/development/libraries/science/math/nccl/default.nix

Show comments

View file Delete file

Original file line number	Diff line number	Diff line change
		@@ -1,24 +1,44 @@
		{ callPackage, cudatoolkit_8, cudatoolkit_9 }:
		{ stdenv, fetchFromGitHub, which, cudatoolkit }:
		let
		generic = args: callPackage (import ./generic.nix (removeAttrs args ["cudatoolkit"])) {
		inherit (args) cudatoolkit;
		stdenv.mkDerivation rec {
		name = "nccl-${version}-cuda-${cudatoolkit.majorVersion}";
		version = "2.4.2-1";
		src = fetchFromGitHub {
		owner = "NVIDIA";
		repo = "nccl";
		rev = "v${version}";
		sha256 = "0aa4gv51nbmmdhx6vp40l249m4arp30sijrn6kwxdfi1k9kajiq5";
		};
		in
		outputs = [ "out" "dev" ];
		{
		nccl_cudatoolkit_8 = generic rec {
		version = "2.1.4";
		cudatoolkit = cudatoolkit_8;
		srcName = "nccl_${version}-1+cuda${cudatoolkit.majorVersion}_x86_64.txz";
		sha256 = "1lwwm8kdhna5m318yg304kl2gsz1jwhv4zv4gn8av2m57zh848zi";
		};
		nativeBuildInputs = [ which ];
		buildInputs = [ cudatoolkit ];
		preConfigure = ''
		patchShebangs src/collectives/device/gen_rules.sh
		'';
		makeFlags = [
		"CUDA_HOME=${cudatoolkit}"
		"PREFIX=$(out)"
		];
		postFixup = ''
		moveToOutput lib/libnccl_static.a $dev
		'';
		NIX_CFLAGS_COMPILE = [ "-Wno-unused-function" ];
		enableParallelBuilding = true;
		nccl_cudatoolkit_9 = generic rec {
		version = "2.1.4";
		cudatoolkit = cudatoolkit_9;
		srcName = "nccl_${version}-1+cuda${cudatoolkit.majorVersion}_x86_64.txz";
		sha256 = "0pajmqzkacpszs63jh2hw2qqc49kj75kcf7r0ky8hdh560q8xn0p";
		meta = with stdenv.lib; {
		description = "Multi-GPU and multi-node collective communication primitives for NVIDIA GPUs";
		homepage = https://developer.nvidia.com/nccl;
		license = licenses.bsd3;
		platforms = [ "x86_64-linux" ];
		maintainers = with maintainers; [ mdaiter orivej ];
		};
		}

57 changes: 0 additions & 57 deletions 57 pkgs/development/libraries/science/math/nccl/generic.nix

Show comments

View file Delete file

Load diff

This file was deleted.

43 changes: 0 additions & 43 deletions 43 pkgs/development/python-modules/django/2_0.nix

Show comments

View file Delete file

Load diff

This file was deleted.

4 changes: 2 additions & 2 deletions 4 pkgs/development/tools/misc/ccls/default.nix

Show comments

View file Delete file

Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,13 +3,13 @@
		stdenv.mkDerivation rec {
		name = "ccls-${version}";
		version = "0.20181225.7";
		version = "0.20181225.8";
		src = fetchFromGitHub {
		owner = "MaskRay";
		repo = "ccls";
		rev = version;
		sha256 = "1qgb2nk4nsgbx4qwymwlzi202daskk536a5l877fsp878jpp61cm";
		sha256 = "05vih8wi2lzp4zqlqd18fs3va6s8p74ws8sx7vwpcc8vcsdzq5w9";
		};
		nativeBuildInputs = [ cmake makeWrapper ];
Expand Down

4 changes: 2 additions & 2 deletions 4 pkgs/tools/admin/lego/default.nix

Show comments

View file Delete file

Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,14 +2,14 @@
		buildGoPackage rec {
		name = "lego-${version}";
		version = "2.0.1";
		version = "2.2.0";
		rev = "v${version}";
		src = fetchFromGitHub {
		inherit rev;
		owner = "xenolf";
		repo = "lego";
		sha256 = "17q5j2zxc2c0xw8pfhnls67dmwrkicjmd2jdyim3fhi5cgxl9h93";
		sha256 = "1bb4kjkbphay63z83a4z2859qrlrx2h7n3rgia17fhy38xp5zzqp";
		};
		goPackagePath = "github.com/xenolf/lego";
Expand Down

2 changes: 1 addition & 1 deletion 2 pkgs/tools/misc/snapper/default.nix

Show comments

View file Delete file

Original file line number	Diff line number	Diff line change
Expand Up		@@ -62,6 +62,6 @@ stdenv.mkDerivation rec {
		homepage = http://snapper.io;
		license = licenses.gpl2;
		platforms = platforms.linux;
		maintainers = with maintainers; [ tstrobel ];
		maintainers = with maintainers; [ tstrobel markuskowa ];
		};
		}

Loading