2015-12-17 13:14:10 +00:00
|
|
|
/*
|
|
|
|
|
|
|
|
# Updating
|
|
|
|
|
|
|
|
To update the list of packages from MELPA,
|
|
|
|
|
2019-04-08 20:06:50 +00:00
|
|
|
1. Run ./update-melpa
|
|
|
|
2. Check for evaluation errors:
|
2019-08-07 22:52:22 +00:00
|
|
|
env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPackages.melpaStablePackages
|
|
|
|
env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPackages.melpaPackages
|
2019-04-08 20:06:50 +00:00
|
|
|
3. `git commit -m "melpa-packages: $(date -Idate)" recipes-archive-melpa.json`
|
2015-12-17 13:14:10 +00:00
|
|
|
|
2020-05-11 12:51:46 +00:00
|
|
|
## Update from overlay
|
|
|
|
|
|
|
|
Alternatively, run the following command:
|
|
|
|
|
|
|
|
./update-from-overlay
|
|
|
|
|
|
|
|
It will update both melpa and elpa packages using
|
|
|
|
https://github.com/nix-community/emacs-overlay. It's almost
|
|
|
|
instantenous and formats commits for you.
|
|
|
|
|
2015-12-17 13:14:10 +00:00
|
|
|
*/
|
|
|
|
|
2020-05-16 23:35:54 +00:00
|
|
|
{ lib, external, pkgs }: variant: self:
|
|
|
|
let
|
|
|
|
dontConfigure = pkg:
|
|
|
|
if pkg != null then pkg.override (args: {
|
|
|
|
melpaBuild = drv: args.melpaBuild (drv // {
|
|
|
|
dontConfigure = true;
|
|
|
|
});
|
|
|
|
}) else null;
|
|
|
|
|
|
|
|
markBroken = pkg:
|
|
|
|
if pkg != null then pkg.override (args: {
|
|
|
|
melpaBuild = drv: args.melpaBuild (drv // {
|
|
|
|
meta = (drv.meta or { }) // { broken = true; };
|
|
|
|
});
|
|
|
|
}) else null;
|
|
|
|
|
|
|
|
externalSrc = pkg: epkg:
|
|
|
|
if pkg != null then pkg.override (args: {
|
|
|
|
melpaBuild = drv: args.melpaBuild (drv // {
|
|
|
|
inherit (epkg) src version;
|
|
|
|
|
|
|
|
propagatedUserEnvPkgs = [ epkg ];
|
|
|
|
});
|
|
|
|
}) else null;
|
|
|
|
|
|
|
|
fix-rtags = pkg:
|
|
|
|
if pkg != null then dontConfigure (externalSrc pkg external.rtags)
|
|
|
|
else null;
|
|
|
|
|
|
|
|
generateMelpa = lib.makeOverridable ({ archiveJson ? ./recipes-archive-melpa.json
|
|
|
|
}:
|
|
|
|
let
|
|
|
|
inherit (import ./libgenerated.nix lib self) melpaDerivation;
|
|
|
|
super = (
|
|
|
|
lib.listToAttrs (builtins.filter
|
|
|
|
(s: s != null)
|
|
|
|
(map
|
|
|
|
(melpaDerivation variant)
|
|
|
|
(lib.importJSON archiveJson)
|
|
|
|
)
|
|
|
|
)
|
|
|
|
);
|
|
|
|
|
|
|
|
overrides = {
|
2019-08-03 19:48:11 +00:00
|
|
|
# Expects bash to be at /bin/bash
|
2019-10-29 11:51:11 +00:00
|
|
|
ac-rtags = fix-rtags super.ac-rtags;
|
2016-01-15 21:01:09 +00:00
|
|
|
|
2019-08-03 19:48:11 +00:00
|
|
|
airline-themes = super.airline-themes.override {
|
|
|
|
inherit (self.melpaPackages) powerline;
|
|
|
|
};
|
2017-12-11 08:52:48 +00:00
|
|
|
|
2020-05-16 23:35:54 +00:00
|
|
|
auto-complete-clang-async = super.auto-complete-clang-async.overrideAttrs (old: {
|
2019-09-01 18:39:17 +00:00
|
|
|
buildInputs = old.buildInputs ++ [ external.llvmPackages.llvm ];
|
|
|
|
CFLAGS = "-I${external.llvmPackages.clang}/include";
|
|
|
|
LDFLAGS = "-L${external.llvmPackages.clang}/lib";
|
|
|
|
});
|
2017-12-18 18:44:36 +00:00
|
|
|
|
2019-08-03 19:48:11 +00:00
|
|
|
# part of a larger package
|
|
|
|
caml = dontConfigure super.caml;
|
2016-01-15 21:01:09 +00:00
|
|
|
|
2019-10-29 00:27:27 +00:00
|
|
|
# part of a larger package
|
|
|
|
# upstream issue: missing package version
|
|
|
|
cmake-mode = dontConfigure super.cmake-mode;
|
2019-08-12 00:26:34 +00:00
|
|
|
|
2019-10-29 11:51:11 +00:00
|
|
|
company-rtags = fix-rtags super.company-rtags;
|
2018-09-11 14:48:33 +00:00
|
|
|
|
2019-08-03 19:48:11 +00:00
|
|
|
easy-kill-extras = super.easy-kill-extras.override {
|
|
|
|
inherit (self.melpaPackages) easy-kill;
|
|
|
|
};
|
2016-01-15 21:01:09 +00:00
|
|
|
|
2020-05-16 10:11:46 +00:00
|
|
|
dune = dontConfigure super.dune;
|
|
|
|
|
2020-05-16 23:35:54 +00:00
|
|
|
emacsql-sqlite = super.emacsql-sqlite.overrideAttrs (old: {
|
2019-08-14 20:42:01 +00:00
|
|
|
buildInputs = old.buildInputs ++ [ pkgs.sqlite ];
|
|
|
|
|
|
|
|
postBuild = ''
|
|
|
|
cd source/sqlite
|
|
|
|
make
|
|
|
|
cd -
|
|
|
|
'';
|
|
|
|
|
|
|
|
postInstall = ''
|
|
|
|
install -m=755 -D source/sqlite/emacsql-sqlite \
|
|
|
|
$out/share/emacs/site-lisp/elpa/emacsql-sqlite-${old.version}/sqlite/emacsql-sqlite
|
|
|
|
'';
|
|
|
|
|
|
|
|
stripDebugList = [ "share" ];
|
|
|
|
});
|
|
|
|
|
2019-10-18 17:15:21 +00:00
|
|
|
# https://github.com/syl20bnr/evil-escape/pull/86
|
|
|
|
evil-escape = super.evil-escape.overrideAttrs (attrs: {
|
|
|
|
postPatch = ''
|
|
|
|
substituteInPlace evil-escape.el \
|
|
|
|
--replace ' ;;; evil' ';;; evil'
|
|
|
|
'';
|
|
|
|
packageRequires = with self; [ evil ];
|
|
|
|
});
|
|
|
|
|
2019-08-03 19:48:11 +00:00
|
|
|
evil-magit = super.evil-magit.overrideAttrs (attrs: {
|
|
|
|
# searches for Git at build time
|
|
|
|
nativeBuildInputs =
|
2020-05-16 23:35:54 +00:00
|
|
|
(attrs.nativeBuildInputs or [ ]) ++ [ external.git ];
|
2019-08-03 19:48:11 +00:00
|
|
|
});
|
2020-04-27 11:18:13 +00:00
|
|
|
|
|
|
|
eopengrok = super.eopengrok.overrideAttrs (attrs: {
|
|
|
|
nativeBuildInputs =
|
2020-05-16 23:35:54 +00:00
|
|
|
(attrs.nativeBuildInputs or [ ]) ++ [ external.git ];
|
2020-04-27 11:18:13 +00:00
|
|
|
});
|
2016-01-15 21:01:09 +00:00
|
|
|
|
2019-08-03 19:48:11 +00:00
|
|
|
ess-R-data-view = super.ess-R-data-view.override {
|
|
|
|
inherit (self.melpaPackages) ess ctable popup;
|
|
|
|
};
|
2018-08-02 05:46:07 +00:00
|
|
|
|
2020-05-16 10:17:59 +00:00
|
|
|
forge = super.forge.overrideAttrs (attrs: {
|
|
|
|
# searches for Git at build time
|
|
|
|
nativeBuildInputs =
|
2020-05-16 23:35:54 +00:00
|
|
|
(attrs.nativeBuildInputs or [ ]) ++ [ external.git ];
|
2020-05-16 10:17:59 +00:00
|
|
|
});
|
|
|
|
|
2019-10-29 11:51:11 +00:00
|
|
|
flycheck-rtags = fix-rtags super.flycheck-rtags;
|
2018-08-02 05:46:21 +00:00
|
|
|
|
2020-01-13 08:37:11 +00:00
|
|
|
gnuplot = super.gnuplot.overrideAttrs (old: {
|
|
|
|
nativeBuildInputs =
|
2020-05-16 23:35:54 +00:00
|
|
|
(old.nativeBuildInputs or [ ]) ++ [ pkgs.autoreconfHook ];
|
2020-01-13 08:37:11 +00:00
|
|
|
});
|
|
|
|
|
2020-05-16 23:35:54 +00:00
|
|
|
pdf-tools = super.pdf-tools.overrideAttrs (old: {
|
2019-08-04 16:55:15 +00:00
|
|
|
nativeBuildInputs = [ external.pkgconfig ];
|
|
|
|
buildInputs = with external; old.buildInputs ++ [ autoconf automake libpng zlib poppler ];
|
|
|
|
preBuild = "make server/epdfinfo";
|
|
|
|
recipe = pkgs.writeText "recipe" ''
|
|
|
|
(pdf-tools
|
|
|
|
:repo "politza/pdf-tools" :fetcher github
|
|
|
|
:files ("lisp/pdf-*.el" "server/epdfinfo"))
|
|
|
|
'';
|
|
|
|
});
|
|
|
|
|
2019-08-03 19:48:11 +00:00
|
|
|
# Build same version as Haskell package
|
2019-10-29 11:51:11 +00:00
|
|
|
hindent = (externalSrc super.hindent external.hindent).overrideAttrs (attrs: {
|
2019-08-03 19:48:11 +00:00
|
|
|
packageRequires = [ self.haskell-mode ];
|
|
|
|
});
|
2019-01-10 16:16:04 +00:00
|
|
|
|
2019-08-26 01:54:45 +00:00
|
|
|
irony = super.irony.overrideAttrs (old: {
|
2020-05-16 23:35:54 +00:00
|
|
|
cmakeFlags = old.cmakeFlags or [ ] ++ [ "-DCMAKE_INSTALL_BINDIR=bin" ];
|
2019-08-29 22:22:00 +00:00
|
|
|
NIX_CFLAGS_COMPILE = "-UCLANG_RESOURCE_DIR";
|
2019-08-04 19:53:10 +00:00
|
|
|
preConfigure = ''
|
|
|
|
cd server
|
|
|
|
'';
|
|
|
|
preBuild = ''
|
|
|
|
make
|
2019-08-26 01:54:45 +00:00
|
|
|
install -D bin/irony-server $out/bin/irony-server
|
|
|
|
cd ..
|
2019-08-04 19:53:10 +00:00
|
|
|
'';
|
2019-08-26 01:54:45 +00:00
|
|
|
checkPhase = ''
|
2019-08-04 19:53:10 +00:00
|
|
|
cd source/server
|
2019-08-26 01:54:45 +00:00
|
|
|
make check
|
|
|
|
cd ../..
|
2019-08-04 19:53:10 +00:00
|
|
|
'';
|
2019-08-29 22:22:00 +00:00
|
|
|
preFixup = ''
|
|
|
|
rm -rf $out/share/emacs/site-lisp/elpa/*/server
|
|
|
|
'';
|
2019-08-04 19:53:10 +00:00
|
|
|
dontUseCmakeBuildDir = true;
|
|
|
|
doCheck = true;
|
|
|
|
packageRequires = [ self.emacs ];
|
|
|
|
nativeBuildInputs = [ external.cmake external.llvmPackages.llvm external.llvmPackages.clang ];
|
|
|
|
});
|
|
|
|
|
2019-08-03 19:48:11 +00:00
|
|
|
# tries to write a log file to $HOME
|
|
|
|
insert-shebang = super.insert-shebang.overrideAttrs (attrs: {
|
|
|
|
HOME = "/tmp";
|
|
|
|
});
|
2017-12-18 18:44:36 +00:00
|
|
|
|
2019-10-29 11:51:11 +00:00
|
|
|
ivy-rtags = fix-rtags super.ivy-rtags;
|
2018-07-26 20:34:39 +00:00
|
|
|
|
2020-09-20 20:27:19 +00:00
|
|
|
libgit = super.libgit.overrideAttrs(attrs: {
|
|
|
|
nativeBuildInputs = (attrs.nativeBuildInputs or []) ++ [ pkgs.cmake ];
|
|
|
|
buildInputs = attrs.buildInputs ++ [ pkgs.libgit2 ];
|
|
|
|
dontUseCmakeBuildDir = true;
|
|
|
|
postPatch = ''
|
|
|
|
sed -i s/'add_subdirectory(libgit2)'// CMakeLists.txt
|
|
|
|
'';
|
|
|
|
postBuild = ''
|
|
|
|
pushd working/libgit
|
|
|
|
make
|
|
|
|
popd
|
|
|
|
'';
|
|
|
|
postInstall = ''
|
|
|
|
outd=$(echo $out/share/emacs/site-lisp/elpa/libgit-**)
|
|
|
|
mkdir $outd/build
|
|
|
|
install -m444 -t $outd/build ./source/src/libegit2.so
|
|
|
|
rm -r $outd/src $outd/Makefile $outd/CMakeLists.txt
|
|
|
|
'';
|
|
|
|
});
|
|
|
|
|
2019-08-03 19:48:11 +00:00
|
|
|
magit = super.magit.overrideAttrs (attrs: {
|
|
|
|
# searches for Git at build time
|
|
|
|
nativeBuildInputs =
|
2020-05-16 23:35:54 +00:00
|
|
|
(attrs.nativeBuildInputs or [ ]) ++ [ external.git ];
|
2019-08-03 19:48:11 +00:00
|
|
|
});
|
2018-08-02 05:46:43 +00:00
|
|
|
|
2020-04-24 10:18:29 +00:00
|
|
|
magit-find-file = super.magit-find-file.overrideAttrs (attrs: {
|
|
|
|
# searches for Git at build time
|
|
|
|
nativeBuildInputs =
|
2020-05-16 23:35:54 +00:00
|
|
|
(attrs.nativeBuildInputs or [ ]) ++ [ external.git ];
|
2020-04-24 10:18:29 +00:00
|
|
|
});
|
|
|
|
|
2020-04-24 10:18:44 +00:00
|
|
|
magit-gh-pulls = super.magit-gh-pulls.overrideAttrs (attrs: {
|
|
|
|
# searches for Git at build time
|
|
|
|
nativeBuildInputs =
|
2020-05-16 23:35:54 +00:00
|
|
|
(attrs.nativeBuildInputs or [ ]) ++ [ external.git ];
|
2020-04-24 10:18:44 +00:00
|
|
|
});
|
|
|
|
|
2020-04-24 10:18:58 +00:00
|
|
|
magit-imerge = super.magit-imerge.overrideAttrs (attrs: {
|
|
|
|
# searches for Git at build time
|
|
|
|
nativeBuildInputs =
|
2020-05-16 23:35:54 +00:00
|
|
|
(attrs.nativeBuildInputs or [ ]) ++ [ external.git ];
|
2020-04-24 10:18:58 +00:00
|
|
|
});
|
|
|
|
|
2020-04-24 10:19:10 +00:00
|
|
|
magit-lfs = super.magit-lfs.overrideAttrs (attrs: {
|
|
|
|
# searches for Git at build time
|
|
|
|
nativeBuildInputs =
|
2020-05-16 23:35:54 +00:00
|
|
|
(attrs.nativeBuildInputs or [ ]) ++ [ external.git ];
|
2020-04-24 10:19:10 +00:00
|
|
|
});
|
|
|
|
|
2020-04-24 10:19:23 +00:00
|
|
|
magit-org-todos = super.magit-org-todos.overrideAttrs (attrs: {
|
|
|
|
# searches for Git at build time
|
|
|
|
nativeBuildInputs =
|
2020-05-16 23:35:54 +00:00
|
|
|
(attrs.nativeBuildInputs or [ ]) ++ [ external.git ];
|
2020-04-24 10:19:23 +00:00
|
|
|
});
|
|
|
|
|
2020-04-24 10:20:28 +00:00
|
|
|
magit-stgit = super.magit-stgit.overrideAttrs (attrs: {
|
|
|
|
# searches for Git at build time
|
|
|
|
nativeBuildInputs =
|
2020-05-16 23:35:54 +00:00
|
|
|
(attrs.nativeBuildInputs or [ ]) ++ [ external.git ];
|
2020-04-24 10:20:28 +00:00
|
|
|
});
|
|
|
|
|
2020-04-24 10:20:51 +00:00
|
|
|
magit-tbdiff = super.magit-tbdiff.overrideAttrs (attrs: {
|
|
|
|
# searches for Git at build time
|
|
|
|
nativeBuildInputs =
|
2020-05-16 23:35:54 +00:00
|
|
|
(attrs.nativeBuildInputs or [ ]) ++ [ external.git ];
|
2020-04-24 10:20:51 +00:00
|
|
|
});
|
|
|
|
|
2020-04-24 10:21:15 +00:00
|
|
|
magit-topgit = super.magit-topgit.overrideAttrs (attrs: {
|
|
|
|
# searches for Git at build time
|
|
|
|
nativeBuildInputs =
|
2020-05-16 23:35:54 +00:00
|
|
|
(attrs.nativeBuildInputs or [ ]) ++ [ external.git ];
|
2020-04-24 10:21:15 +00:00
|
|
|
});
|
|
|
|
|
2020-04-24 10:21:33 +00:00
|
|
|
magit-vcsh = super.magit-vcsh.overrideAttrs (attrs: {
|
|
|
|
# searches for Git at build time
|
|
|
|
nativeBuildInputs =
|
2020-05-16 23:35:54 +00:00
|
|
|
(attrs.nativeBuildInputs or [ ]) ++ [ external.git ];
|
2020-04-24 10:21:33 +00:00
|
|
|
});
|
|
|
|
|
2020-04-24 10:21:43 +00:00
|
|
|
magit-gerrit = super.magit-gerrit.overrideAttrs (attrs: {
|
|
|
|
# searches for Git at build time
|
|
|
|
nativeBuildInputs =
|
2020-05-16 23:35:54 +00:00
|
|
|
(attrs.nativeBuildInputs or [ ]) ++ [ external.git ];
|
2020-04-24 10:21:43 +00:00
|
|
|
});
|
|
|
|
|
2019-08-09 04:51:34 +00:00
|
|
|
magit-annex = super.magit-annex.overrideAttrs (attrs: {
|
|
|
|
# searches for Git at build time
|
|
|
|
nativeBuildInputs =
|
2020-05-16 23:35:54 +00:00
|
|
|
(attrs.nativeBuildInputs or [ ]) ++ [ external.git ];
|
2019-08-09 04:51:34 +00:00
|
|
|
});
|
|
|
|
|
2019-08-03 19:48:11 +00:00
|
|
|
magit-todos = super.magit-todos.overrideAttrs (attrs: {
|
|
|
|
# searches for Git at build time
|
|
|
|
nativeBuildInputs =
|
2020-05-16 23:35:54 +00:00
|
|
|
(attrs.nativeBuildInputs or [ ]) ++ [ external.git ];
|
2019-08-03 19:48:11 +00:00
|
|
|
});
|
2017-12-18 18:44:36 +00:00
|
|
|
|
2019-08-03 19:48:11 +00:00
|
|
|
magit-filenotify = super.magit-filenotify.overrideAttrs (attrs: {
|
|
|
|
# searches for Git at build time
|
|
|
|
nativeBuildInputs =
|
2020-05-16 23:35:54 +00:00
|
|
|
(attrs.nativeBuildInputs or [ ]) ++ [ external.git ];
|
2019-08-03 19:48:11 +00:00
|
|
|
});
|
2016-01-15 21:01:09 +00:00
|
|
|
|
2019-08-09 04:52:15 +00:00
|
|
|
magit-gitflow = super.magit-gitflow.overrideAttrs (attrs: {
|
|
|
|
# searches for Git at build time
|
|
|
|
nativeBuildInputs =
|
2020-05-16 23:35:54 +00:00
|
|
|
(attrs.nativeBuildInputs or [ ]) ++ [ external.git ];
|
2019-08-09 04:52:15 +00:00
|
|
|
});
|
|
|
|
|
2019-08-09 04:52:38 +00:00
|
|
|
magithub = super.magithub.overrideAttrs (attrs: {
|
|
|
|
# searches for Git at build time
|
|
|
|
nativeBuildInputs =
|
2020-05-16 23:35:54 +00:00
|
|
|
(attrs.nativeBuildInputs or [ ]) ++ [ external.git ];
|
2019-08-09 04:52:38 +00:00
|
|
|
});
|
|
|
|
|
2019-08-09 04:53:05 +00:00
|
|
|
magit-svn = super.magit-svn.overrideAttrs (attrs: {
|
|
|
|
# searches for Git at build time
|
|
|
|
nativeBuildInputs =
|
2020-05-16 23:35:54 +00:00
|
|
|
(attrs.nativeBuildInputs or [ ]) ++ [ external.git ];
|
2019-08-09 04:53:05 +00:00
|
|
|
});
|
|
|
|
|
2019-09-01 18:16:05 +00:00
|
|
|
kubernetes = super.kubernetes.overrideAttrs (attrs: {
|
|
|
|
# searches for Git at build time
|
|
|
|
nativeBuildInputs =
|
2020-05-16 23:35:54 +00:00
|
|
|
(attrs.nativeBuildInputs or [ ]) ++ [ external.git ];
|
2019-09-01 18:16:05 +00:00
|
|
|
});
|
2019-08-06 10:23:53 +00:00
|
|
|
|
2020-04-24 10:25:29 +00:00
|
|
|
kubernetes-evil = super.kubernetes-evil.overrideAttrs (attrs: {
|
|
|
|
# searches for Git at build time
|
|
|
|
nativeBuildInputs =
|
2020-05-16 23:35:54 +00:00
|
|
|
(attrs.nativeBuildInputs or [ ]) ++ [ external.git ];
|
2020-04-24 10:25:29 +00:00
|
|
|
});
|
|
|
|
|
2019-09-01 18:16:05 +00:00
|
|
|
# upstream issue: missing file header
|
2019-08-03 19:48:11 +00:00
|
|
|
mhc = super.mhc.override {
|
|
|
|
inherit (self.melpaPackages) calfw;
|
|
|
|
};
|
2016-01-15 21:01:09 +00:00
|
|
|
|
2019-08-03 19:48:11 +00:00
|
|
|
# missing .NET
|
|
|
|
nemerle = markBroken super.nemerle;
|
|
|
|
|
|
|
|
# part of a larger package
|
|
|
|
notmuch = dontConfigure super.notmuch;
|
|
|
|
|
2019-10-29 11:51:11 +00:00
|
|
|
rtags = dontConfigure (externalSrc super.rtags external.rtags);
|
|
|
|
|
2020-05-16 10:02:23 +00:00
|
|
|
rtags-xref = dontConfigure super.rtags;
|
|
|
|
|
2019-08-04 01:26:52 +00:00
|
|
|
shm = super.shm.overrideAttrs (attrs: {
|
|
|
|
propagatedUserEnvPkgs = [ external.structured-haskell-mode ];
|
|
|
|
});
|
|
|
|
|
2019-08-13 09:43:22 +00:00
|
|
|
# Telega has a server portion for it's network protocol
|
2020-05-16 23:35:54 +00:00
|
|
|
telega = super.telega.overrideAttrs (old: {
|
2019-08-13 09:43:22 +00:00
|
|
|
buildInputs = old.buildInputs ++ [ pkgs.tdlib ];
|
|
|
|
|
|
|
|
postBuild = ''
|
|
|
|
cd source/server
|
|
|
|
make
|
|
|
|
cd -
|
|
|
|
'';
|
|
|
|
|
|
|
|
postInstall = ''
|
|
|
|
mkdir -p $out/bin
|
|
|
|
install -m755 -Dt $out/bin ./source/server/telega-server
|
|
|
|
'';
|
|
|
|
});
|
|
|
|
|
2020-05-16 10:07:57 +00:00
|
|
|
treemacs-magit = super.treemacs-magit.overrideAttrs (attrs: {
|
|
|
|
# searches for Git at build time
|
|
|
|
nativeBuildInputs =
|
2020-05-16 23:35:54 +00:00
|
|
|
(attrs.nativeBuildInputs or [ ]) ++ [ external.git ];
|
2020-05-16 10:07:57 +00:00
|
|
|
});
|
|
|
|
|
2019-08-03 19:48:11 +00:00
|
|
|
vdiff-magit = super.vdiff-magit.overrideAttrs (attrs: {
|
2018-07-16 10:34:03 +00:00
|
|
|
nativeBuildInputs =
|
2020-05-16 23:35:54 +00:00
|
|
|
(attrs.nativeBuildInputs or [ ]) ++ [ external.git ];
|
2018-07-16 10:34:03 +00:00
|
|
|
});
|
2017-12-29 23:28:25 +00:00
|
|
|
|
2020-05-16 23:35:54 +00:00
|
|
|
zmq = super.zmq.overrideAttrs (old: {
|
2019-08-04 18:08:35 +00:00
|
|
|
stripDebugList = [ "share" ];
|
|
|
|
preBuild = ''
|
|
|
|
make
|
|
|
|
'';
|
|
|
|
nativeBuildInputs = [
|
2020-05-16 23:35:54 +00:00
|
|
|
external.autoconf
|
|
|
|
external.automake
|
|
|
|
external.pkgconfig
|
|
|
|
external.libtool
|
2019-08-04 18:08:35 +00:00
|
|
|
(external.zeromq.override { enableDrafts = true; })
|
|
|
|
];
|
|
|
|
postInstall = ''
|
|
|
|
mv $out/share/emacs/site-lisp/elpa/zmq-*/src/.libs/emacs-zmq.so $out/share/emacs/site-lisp/elpa/zmq-*
|
|
|
|
rm -r $out/share/emacs/site-lisp/elpa/zmq-*/src
|
|
|
|
rm $out/share/emacs/site-lisp/elpa/zmq-*/Makefile
|
|
|
|
'';
|
|
|
|
});
|
|
|
|
|
2019-08-03 19:48:11 +00:00
|
|
|
# Map legacy renames from emacs2nix since code generation was ported to emacs lisp
|
|
|
|
_0blayout = super."0blayout";
|
|
|
|
desktop-plus = super."desktop+";
|
|
|
|
ghub-plus = super."ghub+";
|
|
|
|
git-gutter-plus = super."git-gutter+";
|
|
|
|
git-gutter-fringe-plus = super."git-gutter-fringe+";
|
|
|
|
ido-completing-read-plus = super."ido-completing-read+";
|
|
|
|
image-plus = super."image+";
|
|
|
|
image-dired-plus = super."image-dired+";
|
|
|
|
markdown-mode-plus = super."markdown-mode+";
|
|
|
|
package-plus = super."package+";
|
|
|
|
rect-plus = super."rect+";
|
2019-08-31 22:44:41 +00:00
|
|
|
|
|
|
|
# upstream issue: missing file header
|
|
|
|
bufshow = markBroken super.bufshow;
|
|
|
|
|
2019-08-03 19:48:11 +00:00
|
|
|
# upstream issue: missing file header
|
|
|
|
connection = markBroken super.connection;
|
2018-10-01 03:37:47 +00:00
|
|
|
|
2019-08-03 19:48:11 +00:00
|
|
|
# upstream issue: missing file header
|
|
|
|
dictionary = markBroken super.dictionary;
|
2018-10-01 03:37:47 +00:00
|
|
|
|
2019-08-31 22:45:23 +00:00
|
|
|
# upstream issue: missing file header
|
|
|
|
elmine = markBroken super.elmine;
|
2016-01-15 21:01:09 +00:00
|
|
|
|
2019-08-31 22:46:42 +00:00
|
|
|
# upstream issue: missing file header
|
|
|
|
ido-complete-space-or-hyphen = markBroken super.ido-complete-space-or-hyphen;
|
2016-01-15 21:01:09 +00:00
|
|
|
|
2019-08-31 22:47:08 +00:00
|
|
|
# upstream issue: missing file header
|
|
|
|
initsplit = markBroken super.initsplit;
|
2016-01-15 21:01:09 +00:00
|
|
|
|
2019-08-31 22:47:34 +00:00
|
|
|
# upstream issue: missing file header
|
|
|
|
jsfmt = markBroken super.jsfmt;
|
2016-01-15 21:01:09 +00:00
|
|
|
|
2019-08-31 22:48:02 +00:00
|
|
|
# upstream issue: missing file header
|
|
|
|
maxframe = markBroken super.maxframe;
|
2018-07-21 15:45:08 +00:00
|
|
|
|
2019-08-31 22:52:28 +00:00
|
|
|
# upstream issue: doesn't build
|
|
|
|
eterm-256color = markBroken super.eterm-256color;
|
2018-08-02 08:04:57 +00:00
|
|
|
|
2019-08-31 22:48:53 +00:00
|
|
|
# upstream issue: missing file header
|
|
|
|
qiita = markBroken super.qiita;
|
|
|
|
|
2019-08-31 22:49:24 +00:00
|
|
|
# upstream issue: missing file header
|
|
|
|
speech-tagger = markBroken super.speech-tagger;
|
|
|
|
|
2019-08-31 22:50:11 +00:00
|
|
|
# upstream issue: missing file header
|
|
|
|
textmate = markBroken super.textmate;
|
|
|
|
|
2019-08-03 19:48:11 +00:00
|
|
|
# upstream issue: missing file header
|
|
|
|
link = markBroken super.link;
|
2016-01-15 21:01:09 +00:00
|
|
|
|
2019-08-31 22:50:54 +00:00
|
|
|
# upstream issue: missing file header
|
|
|
|
voca-builder = markBroken super.voca-builder;
|
2019-01-17 16:15:35 +00:00
|
|
|
|
2019-08-03 19:48:11 +00:00
|
|
|
# upstream issue: missing file header
|
2019-08-31 22:51:24 +00:00
|
|
|
window-numbering = markBroken super.window-numbering;
|
2016-01-15 21:01:09 +00:00
|
|
|
|
2019-08-03 19:48:11 +00:00
|
|
|
editorconfig = super.editorconfig.overrideAttrs (attrs: {
|
|
|
|
propagatedUserEnvPkgs = [ external.editorconfig-core-c ];
|
|
|
|
});
|
2016-01-15 21:01:09 +00:00
|
|
|
|
2019-08-03 19:48:11 +00:00
|
|
|
egg = super.egg.overrideAttrs (attrs: {
|
|
|
|
# searches for Git at build time
|
|
|
|
nativeBuildInputs =
|
2020-05-16 23:35:54 +00:00
|
|
|
(attrs.nativeBuildInputs or [ ]) ++ [ external.git ];
|
2019-08-03 19:48:11 +00:00
|
|
|
});
|
2017-12-18 18:45:27 +00:00
|
|
|
|
2019-08-03 19:48:11 +00:00
|
|
|
# missing dependencies
|
|
|
|
evil-search-highlight-persist = super.evil-search-highlight-persist.overrideAttrs (attrs: {
|
|
|
|
packageRequires = with self; [ evil highlight ];
|
|
|
|
});
|
2016-01-15 21:01:09 +00:00
|
|
|
|
2020-04-26 18:47:27 +00:00
|
|
|
kapacitor = super.kapacitor.overrideAttrs (attrs: {
|
|
|
|
# searches for Git at build time
|
|
|
|
nativeBuildInputs =
|
2020-05-16 23:35:54 +00:00
|
|
|
(attrs.nativeBuildInputs or [ ]) ++ [ external.git ];
|
2020-04-26 18:47:27 +00:00
|
|
|
});
|
|
|
|
|
2020-04-27 11:18:30 +00:00
|
|
|
gerrit = super.gerrit.overrideAttrs (attrs: {
|
2020-04-27 11:18:37 +00:00
|
|
|
nativeBuildInputs =
|
2020-05-16 23:35:54 +00:00
|
|
|
(attrs.nativeBuildInputs or [ ]) ++ [ external.git ];
|
2020-04-27 11:18:37 +00:00
|
|
|
});
|
|
|
|
|
|
|
|
gerrit-download = super.gerrit-download.overrideAttrs (attrs: {
|
2020-04-27 11:18:46 +00:00
|
|
|
nativeBuildInputs =
|
2020-05-16 23:35:54 +00:00
|
|
|
(attrs.nativeBuildInputs or [ ]) ++ [ external.git ];
|
2020-04-27 11:18:46 +00:00
|
|
|
});
|
|
|
|
|
|
|
|
github-pullrequest = super.github-pullrequest.overrideAttrs (attrs: {
|
2020-04-27 11:18:30 +00:00
|
|
|
nativeBuildInputs =
|
2020-05-16 23:35:54 +00:00
|
|
|
(attrs.nativeBuildInputs or [ ]) ++ [ external.git ];
|
2020-04-27 11:18:30 +00:00
|
|
|
});
|
|
|
|
|
2019-10-29 11:51:11 +00:00
|
|
|
helm-rtags = fix-rtags super.helm-rtags;
|
2016-01-15 21:01:09 +00:00
|
|
|
|
2020-04-27 11:18:57 +00:00
|
|
|
jist = super.jist.overrideAttrs (attrs: {
|
|
|
|
nativeBuildInputs =
|
2020-05-16 23:35:54 +00:00
|
|
|
(attrs.nativeBuildInputs or [ ]) ++ [ external.git ];
|
2020-04-27 11:18:57 +00:00
|
|
|
});
|
|
|
|
|
2020-04-26 18:47:27 +00:00
|
|
|
mandoku = super.mandoku.overrideAttrs (attrs: {
|
|
|
|
# searches for Git at build time
|
|
|
|
nativeBuildInputs =
|
2020-05-16 23:35:54 +00:00
|
|
|
(attrs.nativeBuildInputs or [ ]) ++ [ external.git ];
|
2020-04-26 18:47:27 +00:00
|
|
|
});
|
|
|
|
|
|
|
|
mandoku-tls = super.mandoku-tls.overrideAttrs (attrs: {
|
|
|
|
# searches for Git at build time
|
|
|
|
nativeBuildInputs =
|
2020-05-16 23:35:54 +00:00
|
|
|
(attrs.nativeBuildInputs or [ ]) ++ [ external.git ];
|
2020-04-26 18:47:27 +00:00
|
|
|
});
|
|
|
|
|
|
|
|
magit-p4 = super.magit-p4.overrideAttrs (attrs: {
|
|
|
|
# searches for Git at build time
|
|
|
|
nativeBuildInputs =
|
2020-05-16 23:35:54 +00:00
|
|
|
(attrs.nativeBuildInputs or [ ]) ++ [ external.git ];
|
2020-04-26 18:47:27 +00:00
|
|
|
});
|
|
|
|
|
|
|
|
magit-rbr = super.magit-rbr.overrideAttrs (attrs: {
|
|
|
|
# searches for Git at build time
|
|
|
|
nativeBuildInputs =
|
2020-05-16 23:35:54 +00:00
|
|
|
(attrs.nativeBuildInputs or [ ]) ++ [ external.git ];
|
2020-04-26 18:47:27 +00:00
|
|
|
});
|
|
|
|
|
|
|
|
magit-diff-flycheck = super.magit-diff-flycheck.overrideAttrs (attrs: {
|
|
|
|
# searches for Git at build time
|
|
|
|
nativeBuildInputs =
|
2020-05-16 23:35:54 +00:00
|
|
|
(attrs.nativeBuildInputs or [ ]) ++ [ external.git ];
|
2020-04-26 18:47:27 +00:00
|
|
|
});
|
|
|
|
|
|
|
|
magit-reviewboard = super.magit-reviewboard.overrideAttrs (attrs: {
|
|
|
|
# searches for Git at build time
|
|
|
|
nativeBuildInputs =
|
2020-05-16 23:35:54 +00:00
|
|
|
(attrs.nativeBuildInputs or [ ]) ++ [ external.git ];
|
2020-04-26 18:47:27 +00:00
|
|
|
});
|
|
|
|
|
|
|
|
magit-patch-changelog = super.magit-patch-changelog.overrideAttrs (attrs: {
|
|
|
|
# searches for Git at build time
|
|
|
|
nativeBuildInputs =
|
2020-05-16 23:35:54 +00:00
|
|
|
(attrs.nativeBuildInputs or [ ]) ++ [ external.git ];
|
2020-04-26 18:47:27 +00:00
|
|
|
});
|
|
|
|
|
|
|
|
magit-circleci = super.magit-circleci.overrideAttrs (attrs: {
|
|
|
|
# searches for Git at build time
|
|
|
|
nativeBuildInputs =
|
2020-05-16 23:35:54 +00:00
|
|
|
(attrs.nativeBuildInputs or [ ]) ++ [ external.git ];
|
2020-04-26 18:47:27 +00:00
|
|
|
});
|
|
|
|
|
2019-08-03 19:48:11 +00:00
|
|
|
orgit =
|
|
|
|
(super.orgit.overrideAttrs (attrs: {
|
|
|
|
# searches for Git at build time
|
|
|
|
nativeBuildInputs =
|
2020-05-16 23:35:54 +00:00
|
|
|
(attrs.nativeBuildInputs or [ ]) ++ [ external.git ];
|
|
|
|
}));
|
2019-08-03 19:48:11 +00:00
|
|
|
|
2020-08-29 03:40:12 +00:00
|
|
|
orgit-forge = super.orgit-forge.overrideAttrs (attrs: {
|
|
|
|
# searches for Git at build time
|
|
|
|
nativeBuildInputs =
|
|
|
|
(attrs.nativeBuildInputs or [ ]) ++ [ external.git ];
|
|
|
|
});
|
|
|
|
|
2019-08-03 19:48:11 +00:00
|
|
|
# tries to write to $HOME
|
|
|
|
php-auto-yasnippets = super.php-auto-yasnippets.overrideAttrs (attrs: {
|
|
|
|
HOME = "/tmp";
|
|
|
|
});
|
|
|
|
|
|
|
|
racer = super.racer.overrideAttrs (attrs: {
|
|
|
|
postPatch = attrs.postPatch or "" + ''
|
|
|
|
substituteInPlace racer.el \
|
|
|
|
--replace /usr/local/src/rust/src ${external.rustPlatform.rustcSrc}
|
|
|
|
'';
|
|
|
|
});
|
|
|
|
|
|
|
|
spaceline = super.spaceline.override {
|
|
|
|
inherit (self.melpaPackages) powerline;
|
|
|
|
};
|
2019-04-08 20:06:50 +00:00
|
|
|
|
2020-05-16 23:35:54 +00:00
|
|
|
vterm = super.vterm.overrideAttrs (old: {
|
2019-10-18 15:38:28 +00:00
|
|
|
buildInputs = old.buildInputs ++ [ self.emacs pkgs.cmake pkgs.libvterm-neovim ];
|
2019-08-13 10:20:23 +00:00
|
|
|
cmakeFlags = [
|
2019-10-18 15:38:28 +00:00
|
|
|
"-DEMACS_SOURCE=${self.emacs.src}"
|
|
|
|
"-DUSE_SYSTEM_LIBVTERM=ON"
|
2019-08-13 10:20:23 +00:00
|
|
|
];
|
2019-10-18 15:38:28 +00:00
|
|
|
# we need the proper out directory to exist, so we do this in the
|
|
|
|
# postInstall instead of postBuild
|
|
|
|
postInstall = ''
|
|
|
|
pushd source/build >/dev/null
|
|
|
|
make
|
|
|
|
install -m444 -t $out/share/emacs/site-lisp/elpa/vterm-** ../*.so
|
|
|
|
popd > /dev/null
|
|
|
|
rm -rf $out/share/emacs/site-lisp/elpa/vterm-**/{CMake*,build,*.c,*.h}
|
2019-08-13 10:20:23 +00:00
|
|
|
'';
|
2019-10-18 15:38:28 +00:00
|
|
|
});
|
2020-03-25 21:09:51 +00:00
|
|
|
|
2019-08-03 19:48:11 +00:00
|
|
|
w3m = super.w3m.override (args: {
|
|
|
|
melpaBuild = drv: args.melpaBuild (drv // {
|
|
|
|
prePatch =
|
2020-05-16 23:35:54 +00:00
|
|
|
let w3m = "${lib.getBin external.w3m}/bin/w3m"; in
|
|
|
|
''
|
2019-08-03 19:48:11 +00:00
|
|
|
substituteInPlace w3m.el \
|
2020-05-16 23:35:54 +00:00
|
|
|
--replace 'defcustom w3m-command nil' \
|
|
|
|
'defcustom w3m-command "${w3m}"'
|
2019-08-03 19:48:11 +00:00
|
|
|
'';
|
|
|
|
});
|
|
|
|
});
|
|
|
|
};
|
|
|
|
|
2020-05-16 23:35:54 +00:00
|
|
|
# Deprecated legacy aliases for backwards compat
|
|
|
|
aliases = lib.listToAttrs (lib.attrValues (lib.mapAttrs (n: v: { name = v; value = builtins.trace "Melpa attribute '${v}' is a legacy alias that will be removed in 21.03, use '${n}' instead" melpaPackages.${n}; }) (lib.filterAttrs (n: v: lib.hasAttr n melpaPackages) {
|
|
|
|
"auto-complete-clang-async" = "emacsClangCompleteAsync";
|
|
|
|
"vterm" = "emacs-libvterm";
|
|
|
|
"0xc" = "_0xc";
|
|
|
|
"2048-game" = "_2048-game";
|
|
|
|
"4clojure" = "_4clojure";
|
|
|
|
"@" = "at";
|
|
|
|
"term+" = "term-plus";
|
|
|
|
"term+key-intercept" = "term-plus-key-intercept";
|
|
|
|
"term+mux" = "term-plus-mux";
|
|
|
|
"xml+" = "xml-plus";
|
|
|
|
})));
|
|
|
|
|
|
|
|
melpaPackages = lib.mapAttrs (n: v: if lib.hasAttr n overrides then overrides.${n} else v) super;
|
|
|
|
|
|
|
|
in
|
|
|
|
melpaPackages // aliases);
|
|
|
|
|
|
|
|
in
|
|
|
|
generateMelpa { }
|