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

maintainers/maintainer-list.nix

+0 −6

Original line number	Diff line number	Diff line
		@@ -25082,12 +25082,6 @@
		githubId = 8904314;
		name = "Konstantin Nick";
		};
		squalus = {
		email = "squalus@squalus.net";
		github = "squalus";
		githubId = 36899624;
		name = "squalus";
		};
		squarepear = {
		email = "contact@jeffreyharmon.dev";
		github = "SquarePear";

+9 −0

Original line number	Diff line number	Diff line
		@@ -345,6 +345,15 @@ in
		NOTE: this will override default listening on all local addresses and port 22.
		NOTE: setting this option won't automatically enable given ports
		in firewall configuration.
		NOTE: If the IP address is not available at boot time, the following has
		to be added to make sure sshd will wait for dhcp configuration:
		```nix
		systemd.services.sshd = {
		wants = [ "network-online.target" ];
		after = [ "network-online.target" ];
		};
		```
		See the following issue for details: <https://github.com/NixOS/nixpkgs/issues/105570>
		'';
		};

+2 −2

Original line number	Diff line number	Diff line
		@@ -17,8 +17,8 @@ in

		{
		name = "systemd-coredump";
		meta = with pkgs.lib.maintainers; {
		maintainers = [ squalus ];
		meta = {
		maintainers = [ ];
		};

		nodes.machine1 = { pkgs, lib, ... }: commonConfig;

+0 −3

Original line number	Diff line number	Diff line
		@@ -47,9 +47,6 @@ lib.packagesFromDirectoryRecursive {

		zstd = callPackage ./manual-packages/zstd { inherit (pkgs) zstd; };

		# From old emacsPackages (pre emacsPackagesNg)
		cedille = callPackage ./manual-packages/cedille { inherit (pkgs) cedille; };

		# camelCase aliases for some of the kebab-case expressions above
		colorThemeSolarized = self.color-theme-solarized;
		emacsSessionManagement = self.session-management-for-emacs;

deleted100644 → 0

+0 −38

Original line number	Diff line number	Diff line
		{
		stdenv,
		cedille,
		emacs,
		}:

		stdenv.mkDerivation {
		pname = "cedille-mode";

		inherit (cedille) version src;

		buildInputs = [ emacs ];

		dontBuild = true;

		installPhase = ''
		runHook preInstall

		install -d $out/share/emacs/site-lisp
		install se-mode/.el se-mode/.elc $out/share/emacs/site-lisp
		install cedille-mode/.el cedille-mode/.elc $out/share/emacs/site-lisp
		install .el .elc $out/share/emacs/site-lisp
		substituteInPlace $out/share/emacs/site-lisp/cedille-mode.el \
		--replace /usr/bin/cedille ${cedille}/bin/cedille

		runHook postInstall
		'';

		meta = {
		inherit (cedille.meta)
		homepage
		license
		maintainers
		platforms
		;
		description = "Emacs major mode for Cedille";
		};
		}