Merge staging-next into staging (0d797584) · Commits · nix / nixpkgs

pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix

+1 −1

Original line number	Diff line number	Diff line
		@@ -54,7 +54,7 @@ in
		llvm-mode = callPackage ./manual-packages/llvm-mode { };

		lsp-bridge = callPackage ./manual-packages/lsp-bridge {
		inherit (pkgs) python3 git go gopls pyright;
		inherit (pkgs) basedpyright git go gopls python3;
		};

		lspce = callPackage ./manual-packages/lspce { };

+14 −12

Original line number	Diff line number	Diff line
		{ lib, trivialBuild, fetchurl, haskell-mode }:
		{
		melpaBuild,
		haskell-mode,
		haskellPackages,
		}:

		trivialBuild rec {
		let
		inherit (haskellPackages) hsc3;
		in
		melpaBuild {
		pname = "hsc3-mode";
		version = "0.15";
		ename = "hsc3";
		inherit (hsc3) src version;

		src = fetchurl {
		url = "mirror://hackage/hsc3-${version}/hsc3-${version}.tar.gz";
		sha256 = "2f3b15655419cf8ebe25ab1c6ec22993b2589b4ffca7c3a75ce478ca78a0bde6";
		};
		files = ''("emacs/*.el")'';

		packageRequires = [ haskell-mode ];

		sourceRoot = "hsc3-${version}/emacs";

		meta = {
		homepage = "http://rd.slavepianos.org/?t=hsc3";
		description = "hsc3 mode package for Emacs";
		platforms = lib.platforms.unix;
		inherit (hsc3.meta) homepage license;
		description = "Emacs mode for hsc3";
		};
		}

+14 −8

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

		trivialBuild rec {
		melpaBuild rec {
		pname = "jam-mode";
		version = "0.3";

		@@ -20,10 +21,15 @@ trivialBuild rec {
		runHook postUnpack
		'';

		meta = with lib; {
		postPatch = ''
		echo ";;; jam-mode.el ---" > tmp.el
		cat jam-mode.el >> tmp.el
		mv tmp.el jam-mode.el
		'';

		meta = {
		description = "Emacs major mode for editing Jam files";
		license = licenses.gpl2Plus;
		maintainers = with maintainers; [ qyliss ];
		platforms = platforms.all;
		license = lib.licenses.gpl2Plus;
		maintainers = with lib.maintainers; [ qyliss ];
		};
		}

+9 −8

Original line number	Diff line number	Diff line
		@@ -6,11 +6,10 @@
		substituteAll,
		acm,
		markdown-mode,
		basedpyright,
		git,
		go,
		gopls,
		pyright,
		ruff,
		tempel,
		unstableGitUpdater,
		}:
		@@ -30,13 +29,13 @@ let
		in
		melpaBuild {
		pname = "lsp-bridge";
		version = "0-unstable-2024-06-29";
		version = "0-unstable-2024-07-14";

		src = fetchFromGitHub {
		owner = "manateelazycat";
		repo = "lsp-bridge";
		rev = "9e88e660d717ba597d9fe9366cf4278674734410";
		hash = "sha256-qpetTKZDQjoofp8ggothYALQBpwLjuNxCq46Pe4oZZA=";
		rev = "023924926ae6adfbcf5458c350b90dea7c05d51b";
		hash = "sha256-59bl4YbKS3HgrGJlUfM3LPabxKuuE+dT7CnVUJIl05k=";
		};

		patches = [
		@@ -54,13 +53,15 @@ melpaBuild {
		];

		checkInputs = [
		# Emacs packages
		tempel

		# Executables
		basedpyright
		git
		go
		gopls
		pyright
		python
		ruff
		tempel
		];

		files = ''

+2 −2

Original line number	Diff line number	Diff line
		@@ -62,14 +62,14 @@ let
		in
		stdenv.mkDerivation (finalAttrs: {
		pname = "telegram-desktop";
		version = "5.2.2";
		version = "5.2.3";

		src = fetchFromGitHub {
		owner = "telegramdesktop";
		repo = "tdesktop";
		rev = "v${finalAttrs.version}";
		fetchSubmodules = true;
		hash = "sha256-rvd4Ei4MpWiilHCV291UrJkHaUcwth9AWc3PSqjj+EI=";
		hash = "sha256-VSMSlR3rIUTYQ4GLQrVMZNrSAFfh3aJo6p92xgXMrvo=";
		};

		patches = [