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

nixos/modules/programs/ssh.nix

+1 −1

Original line number	Diff line number	Diff line
		@@ -293,9 +293,9 @@ in

		# Generated options from other settings
		Host *
		AddressFamily ${if config.networking.enableIPv6 then "any" else "inet"}
		GlobalKnownHostsFile ${builtins.concatStringsSep " " knownHostsFiles}

		${lib.optionalString (!config.networking.enableIPv6) "AddressFamily inet"}
		${lib.optionalString cfg.setXAuthLocation "XAuthLocation ${pkgs.xorg.xauth}/bin/xauth"}
		${lib.optionalString (cfg.forwardX11 != null) "ForwardX11 ${if cfg.forwardX11 then "yes" else "no"}"}

+1 −0

Original line number	Diff line number	Diff line
		@@ -445,6 +445,7 @@ in {
		"${removeSuffix "/" cfg.serve.virtualRoot}/static/".alias = webSettings.STATIC_ROOT + "/";
		};
		});
		proxyTimeout = mkDefault "120s";
		};

		environment.systemPackages = [ (pkgs.buildEnv {

+1 −2

Original line number	Diff line number	Diff line
		@@ -73,8 +73,6 @@ in

		ott-mode = callPackage ./manual-packages/ott-mode { };

		perl-completion = callPackage ./manual-packages/perl-completion { };

		pod-mode = callPackage ./manual-packages/pod-mode { };

		prisma-mode = callPackage ./manual-packages/prisma-mode { };
		@@ -124,4 +122,5 @@ in
		ess-R-object-popup = throw "emacsPackages.ess-R-object-popup was deleted, since the upstream repo looks abandoned."; # Added 2024-07-15
		ghc-mod = throw "emacsPackages.ghc-mod was deleted because it is deprecated, use haskell-language-server instead."; # Added 2024-07-17
		haskell-unicode-input-method = throw "emacsPackages.haskell-unicode-input-method is contained in emacsPackages.haskell-mode, please use that instead."; # Added 2024-07-17
		perl-completion = throw "emacsPackages.perl-completion was removed, since it is broken."; # Added 2024-07-19
		}

+9 −5

Original line number	Diff line number	Diff line
		{ lib, trivialBuild, fetchurl }:
		{
		lib,
		fetchurl,
		melpaBuild,
		}:

		trivialBuild {
		melpaBuild {
		pname = "control-lock";
		version = "1.1.2";

		src = fetchurl {
		url = "https://raw.githubusercontent.com/emacsmirror/emacswiki.org/185fdc34fb1e02b43759ad933d3ee5646b0e78f8/control-lock.el";
		hash = "sha256-JCrmS3FSGDHSR+eAR0X/uO0nAgd3TUmFxwEVH5+KV+4=";
		};

		version = "1.1.2";

		meta = {
		description = "Like caps-lock, but for your control key. Give your pinky a rest!";
		homepage = "https://www.emacswiki.org/emacs/control-lock.el";
		description = "Like caps-lock, but for your control key";
		license = lib.licenses.free;
		platforms = lib.platforms.all;
		};
		}

+8 −6

Original line number	Diff line number	Diff line
		{ lib
		, fetchFromGitHub
		, trivialBuild
		{
		lib,
		fetchFromGitHub,
		melpaBuild,
		}:

		trivialBuild {
		melpaBuild {
		pname = "font-lock-plus";
		ename = "font-lock+";
		version = "208-unstable-2018-01-01";

		src = fetchFromGitHub {
		@@ -14,9 +16,9 @@ trivialBuild {
		hash = "sha256-lFmdVMXIIXZ9ZohAJw5rhxpTv017qIyzmpuKOWDdeJ4=";
		};

		meta = with lib; {
		meta = {
		homepage = "https://github.com/emacsmirror/font-lock-plus";
		description = "Enhancements to standard library font-lock.el";
		license = licenses.gpl2Plus;
		license = lib.licenses.gpl2Plus;
		};
		}