colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #313309 from ibizaman/emacs-conflict

Browse Source 
emacsPackages.emacs-conflict: init at 9f236b
This commit is contained in:
Lin Jian 2024-05-22 21:25:43 +08:00 committed by GitHub
commit da73f74323
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix
View File

@ -33,6 +33,8 @@ in
elisp-ffi = callPackage ./manual-packages/elisp-ffi { };
emacs-conflict = callPackage ./manual-packages/emacs-conflict { };
ess-R-object-popup = callPackage ./manual-packages/ess-R-object-popup { };
evil-markdown = callPackage ./manual-packages/evil-markdown { };

25
pkgs/applications/editors/emacs/elisp-packages/manual-packages/emacs-conflict/default.nix Normal file
View File

@ -0,0 +1,25 @@
{ lib
, fetchFromGitHub
, trivialBuild
, emacs
}:
trivialBuild {
pname = "emacs-conflict";
version = "0-unstable-2022-11-21";
src = fetchFromGitHub {
owner = "ibizaman";
repo = "emacs-conflict";
rev = "9f236b93930f3ceb4cb0258cf935c99599191de3";
sha256 = "sha256-DIGvnotSQYIgHxGxtyCALHd8ZbrfkmdvjLXlkcqQ6v4=";
};
meta = with lib; {
description = "Resolve conflicts happening when using file synchronization tools";
homepage = "https://github.com/ibizaman/emacs-conflict";
license = licenses.gpl3;
maintainers = with maintainers; [ ibizaman ];
inherit (emacs.meta) platforms;
};
}