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

pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-plus/default.nix

+12 −9

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

		trivialBuild {
		melpaBuild {
		pname = "isearch-plus";
		ename = "isearch+";
		version = "3434-unstable-2021-08-23";

		src = fetchFromGitHub {
		@@ -15,11 +16,13 @@ trivialBuild {
		hash = "sha256-kD+Fyps3fc5YK6ATU1nrkKHazGMYJnU2gRcpQZf6A1E=";
		};

		meta = with lib; {
		meta = {
		homepage = "https://www.emacswiki.org/emacs/IsearchPlus";
		description = "Extensions to isearch";
		license = licenses.gpl2Plus;
		maintainers = with maintainers; [ leungbk AndersonTorres ];
		inherit (emacs.meta) platforms;
		license = lib.licenses.gpl2Plus;
		maintainers = with lib.maintainers; [
		leungbk
		AndersonTorres
		];
		};
		}

+8 −9

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

		trivialBuild {
		melpaBuild {
		pname = "isearch-prop";
		version = "0-unstable-2019-05-01";

		@@ -15,11 +15,10 @@ trivialBuild {
		hash = "sha256-A1Kt4nm7iRV9J5yaLupwiNL5g7ddZvQs79dggmqZ7Rk=";
		};

		meta = with lib; {
		meta = {
		homepage = "https://www.emacswiki.org/emacs/IsearchPlus";
		description = "Search text- or overlay-property contexts";
		license = licenses.gpl3Plus;
		maintainers = with maintainers; [ leungbk ];
		inherit (emacs.meta) platforms;
		license = lib.licenses.gpl3Plus;
		maintainers = with lib.maintainers; [ leungbk ];
		};
		}

+9 −10

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

		trivialBuild rec {
		melpaBuild rec {
		pname = "rect-mark";
		version = "1.4";

		src = fetchFromGitHub {
		owner = "emacsmirror";
		repo = pname;
		repo = "rect-mark";
		rev = version;
		hash = "sha256-/8T1VTYkKUxlNWXuuS54S5jpl4UxJBbgSuWc17a/VyM=";
		};

		meta = with lib; {
		meta = {
		homepage = "http://emacswiki.org/emacs/RectangleMark";
		description = "Mark a rectangle of text with highlighting";
		license = licenses.gpl2Plus;
		inherit (emacs.meta) platforms;
		license = lib.licenses.gpl2Plus;
		};
		}

+2 −2

Original line number	Diff line number	Diff line
		@@ -23,7 +23,7 @@ let
		inherit (pythonPackages) buildPythonApplication pythonOlder;
		in
		buildPythonApplication rec {
		version = "5.2.2";
		version = "5.2.3";
		pname = "gramps";
		pyproject = true;

		@@ -33,7 +33,7 @@ buildPythonApplication rec {
		owner = "gramps-project";
		repo = "gramps";
		rev = "refs/tags/v${version}";
		hash = "sha256-umyc5G4p0GSEQEtq6sPUgtq1waNL1OW7iLxnf5dGcLc=";
		hash = "sha256-DfKKB+rgMGQ8HTqhCp11UTYLj3Fdd0B0v4a922GJ8L8=";
		};

		patches = [

+1 −0

Original line number	Diff line number	Diff line
		@@ -47,6 +47,7 @@ buildPythonApplication rec {
		pygobject3
		dbus-python
		croniter
		setuptools
		];

		# Prevent double wrapping, let the Python wrapper use the args in preFixup.